From: Siebrand Mazeland <s.mazeland@xs4all.nl>
Date: Tue, 14 Sep 2010 20:01:27 +0000 (+0200)
Subject: Localisation updates from http://translatewiki.net
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=503afc4422636b03545007485bd64a2d33e92d3e;p=quix0rs-gnu-social.git

Localisation updates from http://translatewiki.net
---

diff --git a/locale/af/LC_MESSAGES/statusnet.po b/locale/af/LC_MESSAGES/statusnet.po
index 9824826018..aee41ce2ba 100644
--- a/locale/af/LC_MESSAGES/statusnet.po
+++ b/locale/af/LC_MESSAGES/statusnet.po
@@ -1,6 +1,7 @@
-# Translation of StatusNet to Afrikaans
+# Translation of StatusNet to Afrikaans (Afrikaans)
+# Expored from translatewiki.net
 #
-# Author@translatewiki.net: Naudefj
+# Author: Naudefj
 # --
 # This file is distributed under the same license as the StatusNet package.
 #
@@ -8,20 +9,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-08 22:33+0000\n"
-"PO-Revision-Date: 2010-09-08 22:33:04+0000\n"
-"Language-Team: Afrikaans\n"
+"POT-Creation-Date: 2010-09-14 19:53+0000\n"
+"PO-Revision-Date: 2010-09-14 19:53:37+0000\n"
+"Language-Team: Afrikaans <http://translatewiki.net/wiki/Portal:af>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r72348); Translate extension (2010-08-20)\n"
+"X-Generator: MediaWiki 1.17alpha (r73009); Translate extension (2010-08-20)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: af\n"
-"X-Message-Group: out-statusnet\n"
+"X-Message-Group: #out-statusnet\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-POT-Import-Date: 1284-49-16 34::+0000\n"
 
 #. TRANS: Page title
 #. TRANS: Menu item for site administration
-#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:376
+#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:363
 msgid "Access"
 msgstr "Toegang"
 
@@ -74,10 +76,10 @@ 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 actions/emailsettings.php:224
-#: actions/imsettings.php:184 actions/smssettings.php:209
-#: lib/applicationeditform.php:361
+#. TRANS: Button label in the "Edit application" form.
+#: actions/accessadminpanel.php:203 actions/emailsettings.php:228
+#: actions/imsettings.php:187 actions/smssettings.php:209
+#: lib/applicationeditform.php:351
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Stoor"
@@ -90,15 +92,15 @@ msgstr "Hierdie bladsy bestaan nie."
 
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #: actions/all.php:79 actions/allrss.php:68
-#: actions/apiaccountupdatedeliverydevice.php:114
-#: actions/apiaccountupdateprofile.php:105
-#: actions/apiaccountupdateprofilebackgroundimage.php:116
-#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
-#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
-#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:113
-#: actions/apigroupismember.php:91 actions/apigroupjoin.php:100
-#: actions/apigroupleave.php:100 actions/apigrouplist.php:73
-#: actions/apistatusesupdate.php:229 actions/apisubscriptions.php:87
+#: actions/apiaccountupdatedeliverydevice.php:115
+#: actions/apiaccountupdateprofile.php:106
+#: actions/apiaccountupdateprofilebackgroundimage.php:117
+#: actions/apiaccountupdateprofileimage.php:106 actions/apiblockcreate.php:98
+#: actions/apiblockdestroy.php:97 actions/apidirectmessage.php:77
+#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:114
+#: actions/apigroupismember.php:91 actions/apigroupjoin.php:101
+#: actions/apigroupleave.php:101 actions/apigrouplist.php:73
+#: actions/apistatusesupdate.php:230 actions/apisubscriptions.php:87
 #: actions/apitimelinefavorites.php:72 actions/apitimelinefriends.php:174
 #: actions/apitimelinehome.php:80 actions/apitimelinementions.php:80
 #: actions/apitimelineuser.php:82 actions/avatarbynickname.php:75
@@ -192,16 +194,16 @@ msgid "Updates from %1$s and friends on %2$s!"
 msgstr "Opdaterings van %1$s en vriende op %2$s."
 
 #: actions/apiaccountratelimitstatus.php:72
-#: actions/apiaccountupdatedeliverydevice.php:94
-#: actions/apiaccountupdateprofile.php:97
-#: actions/apiaccountupdateprofilebackgroundimage.php:94
-#: actions/apiaccountupdateprofilecolors.php:118
+#: actions/apiaccountupdatedeliverydevice.php:95
+#: actions/apiaccountupdateprofile.php:98
+#: actions/apiaccountupdateprofilebackgroundimage.php:95
+#: actions/apiaccountupdateprofilecolors.php:119
 #: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156
-#: actions/apifavoritecreate.php:100 actions/apifavoritedestroy.php:101
-#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100
-#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:139
-#: actions/apigroupismember.php:115 actions/apigroupjoin.php:156
-#: actions/apigroupleave.php:142 actions/apigrouplist.php:137
+#: actions/apifavoritecreate.php:101 actions/apifavoritedestroy.php:102
+#: actions/apifriendshipscreate.php:101 actions/apifriendshipsdestroy.php:101
+#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:140
+#: actions/apigroupismember.php:115 actions/apigroupjoin.php:157
+#: actions/apigroupleave.php:143 actions/apigrouplist.php:137
 #: actions/apigrouplistall.php:122 actions/apigroupmembership.php:107
 #: actions/apigroupshow.php:116 actions/apihelptest.php:88
 #: actions/apistatusesdestroy.php:104 actions/apistatusesretweets.php:112
@@ -216,47 +218,49 @@ msgstr "Opdaterings van %1$s en vriende op %2$s."
 msgid "API method not found."
 msgstr "Die API-funksie is nie gevind nie."
 
-#: actions/apiaccountupdatedeliverydevice.php:86
-#: actions/apiaccountupdateprofile.php:89
-#: actions/apiaccountupdateprofilebackgroundimage.php:86
-#: actions/apiaccountupdateprofilecolors.php:110
-#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89
-#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109
-#: actions/apifavoritecreate.php:91 actions/apifavoritedestroy.php:92
-#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
-#: actions/apigroupcreate.php:105 actions/apigroupjoin.php:92
-#: actions/apigroupleave.php:92 actions/apimediaupload.php:67
-#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:198
+#. TRANS: Client error message. POST is a HTTP command. It should not be translated.
+#. TRANS: Client error. POST is a HTTP command. It should not be translated.
+#: actions/apiaccountupdatedeliverydevice.php:87
+#: actions/apiaccountupdateprofile.php:90
+#: actions/apiaccountupdateprofilebackgroundimage.php:87
+#: actions/apiaccountupdateprofilecolors.php:111
+#: actions/apiaccountupdateprofileimage.php:85 actions/apiblockcreate.php:90
+#: actions/apiblockdestroy.php:89 actions/apidirectmessagenew.php:110
+#: actions/apifavoritecreate.php:92 actions/apifavoritedestroy.php:93
+#: actions/apifriendshipscreate.php:92 actions/apifriendshipsdestroy.php:92
+#: actions/apigroupcreate.php:106 actions/apigroupjoin.php:93
+#: actions/apigroupleave.php:93 actions/apimediaupload.php:68
+#: actions/apistatusesretweet.php:66 actions/apistatusesupdate.php:199
 msgid "This method requires a POST."
 msgstr "Hierdie metode benodig 'n POST."
 
-#: actions/apiaccountupdatedeliverydevice.php:106
+#: actions/apiaccountupdatedeliverydevice.php:107
 msgid ""
 "You must specify a parameter named 'device' with a value of one of: sms, im, "
 "none."
 msgstr ""
 
-#: actions/apiaccountupdatedeliverydevice.php:133
+#: actions/apiaccountupdatedeliverydevice.php:134
 msgid "Could not update user."
 msgstr "Kon nie die gebruiker opdateer nie."
 
-#: actions/apiaccountupdateprofile.php:112
-#: actions/apiaccountupdateprofilebackgroundimage.php:194
-#: actions/apiaccountupdateprofilecolors.php:185
-#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/apiaccountupdateprofile.php:113
+#: actions/apiaccountupdateprofilebackgroundimage.php:195
+#: actions/apiaccountupdateprofilecolors.php:186
+#: actions/apiaccountupdateprofileimage.php:131 actions/apiusershow.php:108
 #: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/hcard.php:74
 #: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
 #: lib/profileaction.php:84
 msgid "User has no profile."
 msgstr "Hierdie gebruiker het nie 'n profiel nie."
 
-#: actions/apiaccountupdateprofile.php:147
+#: actions/apiaccountupdateprofile.php:148
 msgid "Could not save profile."
 msgstr "Kon nie die profiel stoor nie."
 
-#: actions/apiaccountupdateprofilebackgroundimage.php:108
-#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
-#: actions/apistatusesupdate.php:212 actions/avatarsettings.php:257
+#: actions/apiaccountupdateprofilebackgroundimage.php:109
+#: actions/apiaccountupdateprofileimage.php:98 actions/apimediaupload.php:81
+#: actions/apistatusesupdate.php:213 actions/avatarsettings.php:257
 #: actions/designadminpanel.php:123 actions/editapplication.php:118
 #: actions/newapplication.php:101 actions/newnotice.php:94
 #: lib/designsettings.php:283
@@ -266,30 +270,30 @@ msgid ""
 "current configuration."
 msgstr ""
 
-#: actions/apiaccountupdateprofilebackgroundimage.php:136
-#: actions/apiaccountupdateprofilebackgroundimage.php:146
-#: actions/apiaccountupdateprofilecolors.php:164
-#: actions/apiaccountupdateprofilecolors.php:174
+#: actions/apiaccountupdateprofilebackgroundimage.php:137
+#: actions/apiaccountupdateprofilebackgroundimage.php:147
+#: actions/apiaccountupdateprofilecolors.php:165
+#: actions/apiaccountupdateprofilecolors.php:175
 #: actions/groupdesignsettings.php:290 actions/groupdesignsettings.php:300
 #: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
 #: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
 msgid "Unable to save your design settings."
 msgstr "Dit was nie moontlik om u ontwerp-instellings te stoor nie."
 
-#: actions/apiaccountupdateprofilebackgroundimage.php:187
-#: actions/apiaccountupdateprofilecolors.php:142
+#: actions/apiaccountupdateprofilebackgroundimage.php:188
+#: actions/apiaccountupdateprofilecolors.php:143
 msgid "Could not update your design."
 msgstr "Dit was nie moontlik om u ontwerp by te werk nie."
 
-#: actions/apiblockcreate.php:105
+#: actions/apiblockcreate.php:106
 msgid "You cannot block yourself!"
 msgstr "U kan nie uself blokkeer nie!"
 
-#: actions/apiblockcreate.php:126
+#: actions/apiblockcreate.php:127
 msgid "Block user failed."
 msgstr "Die blokkering van die gebruiker het gefaal."
 
-#: actions/apiblockdestroy.php:114
+#: actions/apiblockdestroy.php:115
 msgid "Unblock user failed."
 msgstr "Die deblokkering van die gebruiker het gefaal."
 
@@ -313,64 +317,64 @@ msgstr "Direkte boodskappe aan %s"
 msgid "All the direct messages sent to %s"
 msgstr "Alle direkte boodskappe gestuur aan %s"
 
-#: actions/apidirectmessagenew.php:118
+#: actions/apidirectmessagenew.php:119
 msgid "No message text!"
 msgstr "Die boodskap bevat geen inhoud nie!"
 
-#: actions/apidirectmessagenew.php:127 actions/newmessage.php:150
+#: actions/apidirectmessagenew.php:128 actions/newmessage.php:150
 #, php-format
 msgid "That's too long. Max message size is %d chars."
 msgstr "Dit is te lank. Die maksimum boodskaplengte is %d karakters."
 
-#: actions/apidirectmessagenew.php:138
+#: actions/apidirectmessagenew.php:139
 msgid "Recipient user not found."
 msgstr "Die ontvanger kon gevind word nie."
 
-#: actions/apidirectmessagenew.php:142
+#: actions/apidirectmessagenew.php:143
 msgid "Can't send direct messages to users who aren't your friend."
 msgstr ""
 "U kan nie direkte boodskappe aan gebruikers wat nie op u viendelys is stuur "
 "nie."
 
-#: actions/apifavoritecreate.php:109 actions/apifavoritedestroy.php:110
+#: actions/apifavoritecreate.php:110 actions/apifavoritedestroy.php:111
 #: actions/apistatusesdestroy.php:121
 msgid "No status found with that ID."
 msgstr "Geen status met die ID gevind nie."
 
-#: actions/apifavoritecreate.php:120
+#: actions/apifavoritecreate.php:121
 msgid "This status is already a favorite."
 msgstr "Hierdie status is reeds 'n gunsteling."
 
 #. TRANS: Error message text shown when a favorite could not be set.
-#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:296
+#: actions/apifavoritecreate.php:132 actions/favor.php:84 lib/command.php:296
 msgid "Could not create favorite."
 msgstr "Dit was nie moontlik om 'n gunsteling te skep nie."
 
-#: actions/apifavoritedestroy.php:123
+#: actions/apifavoritedestroy.php:124
 msgid "That status is not a favorite."
 msgstr "Hierdie status is nie 'n gunsteling nie."
 
-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
+#: actions/apifavoritedestroy.php:136 actions/disfavor.php:87
 msgid "Could not delete favorite."
 msgstr ""
 "Dit was nie moontlik om die boodskap van u gunstelinge te verwyder nie."
 
-#: actions/apifriendshipscreate.php:109
+#: actions/apifriendshipscreate.php:110
 msgid "Could not follow user: profile not found."
 msgstr "U kan nie die gebruiker volg nie: die gebruiker bestaan nie."
 
-#: actions/apifriendshipscreate.php:118
+#: actions/apifriendshipscreate.php:119
 #, php-format
 msgid "Could not follow user: %s is already on your list."
 msgstr "U kan nie die gebruiker volg nie: %1 is alreeds op u lys."
 
-#: actions/apifriendshipsdestroy.php:109
+#: actions/apifriendshipsdestroy.php:110
 msgid "Could not unfollow user: User not found."
 msgstr ""
 "U kan nie die gebruiker van u volglys verwyder nie: die gebruiker bestaan "
 "nie."
 
-#: actions/apifriendshipsdestroy.php:120
+#: actions/apifriendshipsdestroy.php:121
 msgid "You cannot unfollow yourself."
 msgstr "U kan nie ophou om uself te volg nie."
 
@@ -378,7 +382,7 @@ msgstr "U kan nie ophou om uself te volg nie."
 msgid "Two valid IDs or screen_names must be supplied."
 msgstr ""
 
-#: actions/apigroupcreate.php:167 actions/editgroup.php:186
+#: actions/apigroupcreate.php:168 actions/editgroup.php:186
 #: actions/newgroup.php:126 actions/profilesettings.php:215
 #: actions/register.php:212
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
@@ -386,77 +390,77 @@ msgstr ""
 "Die gebruikersnaam mag slegs uit kleinletters en syfers bestaan en mag geen "
 "spasies bevat nie."
 
-#: actions/apigroupcreate.php:176 actions/editgroup.php:190
+#: actions/apigroupcreate.php:177 actions/editgroup.php:190
 #: actions/newgroup.php:130 actions/profilesettings.php:238
 #: actions/register.php:215
 msgid "Nickname already in use. Try another one."
 msgstr "Die gebruikersnaam is reeds in gebruik. Kies 'n ander een."
 
-#: actions/apigroupcreate.php:183 actions/editgroup.php:193
+#: actions/apigroupcreate.php:184 actions/editgroup.php:193
 #: actions/newgroup.php:133 actions/profilesettings.php:218
 #: actions/register.php:217
 msgid "Not a valid nickname."
 msgstr "Nie 'n geldige gebruikersnaam nie."
 
-#: actions/apigroupcreate.php:199 actions/editapplication.php:215
+#: actions/apigroupcreate.php:200 actions/editapplication.php:215
 #: actions/editgroup.php:199 actions/newapplication.php:203
 #: actions/newgroup.php:139 actions/profilesettings.php:222
 #: actions/register.php:224
 msgid "Homepage is not a valid URL."
 msgstr "Tuisblad is nie 'n geldige URL nie."
 
-#: actions/apigroupcreate.php:208 actions/editgroup.php:202
+#: actions/apigroupcreate.php:209 actions/editgroup.php:202
 #: actions/newgroup.php:142 actions/profilesettings.php:225
 #: actions/register.php:227
 msgid "Full name is too long (max 255 chars)."
 msgstr "Volledige naam is te lang (maksimum 255 karakters)."
 
-#: actions/apigroupcreate.php:216 actions/editapplication.php:190
+#: actions/apigroupcreate.php:217 actions/editapplication.php:190
 #: actions/newapplication.php:172
 #, php-format
 msgid "Description is too long (max %d chars)."
 msgstr "Die beskrywing is te lank (die maksimum is %d karakters)."
 
-#: actions/apigroupcreate.php:227 actions/editgroup.php:208
+#: actions/apigroupcreate.php:228 actions/editgroup.php:208
 #: actions/newgroup.php:148 actions/profilesettings.php:232
 #: actions/register.php:234
 msgid "Location is too long (max 255 chars)."
 msgstr "Ligging is te lank is (maksimum 255 karakters)."
 
-#: actions/apigroupcreate.php:246 actions/editgroup.php:219
+#: actions/apigroupcreate.php:247 actions/editgroup.php:219
 #: actions/newgroup.php:159
 #, php-format
 msgid "Too many aliases! Maximum %d."
 msgstr "Te veel aliasse! Die maksimum aantal is %d."
 
-#: actions/apigroupcreate.php:276 actions/editgroup.php:232
+#: actions/apigroupcreate.php:277 actions/editgroup.php:232
 #: actions/newgroup.php:172
 #, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr "Die alias \"%s\" word al reeds gebruik. Probeer 'n ander een."
 
-#: actions/apigroupcreate.php:289 actions/editgroup.php:238
+#: actions/apigroupcreate.php:290 actions/editgroup.php:238
 #: actions/newgroup.php:178
 msgid "Alias can't be the same as nickname."
 msgstr "Die alias kan nie dieselfde as die gebruikersnaam wees nie."
 
-#: actions/apigroupismember.php:96 actions/apigroupjoin.php:105
-#: actions/apigroupleave.php:105 actions/apigroupmembership.php:92
+#: actions/apigroupismember.php:96 actions/apigroupjoin.php:106
+#: actions/apigroupleave.php:106 actions/apigroupmembership.php:92
 #: actions/apigroupshow.php:83 actions/apitimelinegroup.php:92
 msgid "Group not found."
 msgstr "Nie gevind nie."
 
 #. TRANS: Error text shown a user tries to join a group they already are a member of.
-#: actions/apigroupjoin.php:111 actions/joingroup.php:100 lib/command.php:336
+#: actions/apigroupjoin.php:112 actions/joingroup.php:100 lib/command.php:336
 msgid "You are already a member of that group."
 msgstr "U is reeds 'n lid van die groep."
 
 #. TRANS: Error text shown when a user tries to join a group they are blocked from joining.
-#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:341
+#: actions/apigroupjoin.php:121 actions/joingroup.php:105 lib/command.php:341
 msgid "You have been blocked from that group by the admin."
 msgstr ""
 
-#: actions/apigroupleave.php:115
+#: actions/apigroupleave.php:116
 msgid "You are not a member of this group."
 msgstr "U is nie 'n lid van die groep nie."
 
@@ -494,9 +498,9 @@ msgstr "Ongeldige token."
 
 #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
 #: actions/deletenotice.php:169 actions/disfavor.php:74
-#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:55
+#: actions/emailsettings.php:271 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:66 actions/imsettings.php:227
+#: actions/groupunblock.php:66 actions/imsettings.php:230
 #: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
@@ -535,8 +539,8 @@ msgstr ""
 #. 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:286 actions/grouplogo.php:322
-#: actions/imsettings.php:242 actions/newapplication.php:121
+#: actions/emailsettings.php:290 actions/grouplogo.php:322
+#: actions/imsettings.php:245 actions/newapplication.php:121
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
 #: actions/smssettings.php:277 lib/designsettings.php:304
 msgid "Unexpected form submission."
@@ -597,18 +601,18 @@ msgstr "Hierdie metode vereis 'n POST of DELETE."
 msgid "You may not delete another user's status."
 msgstr "U mag nie 'n ander gebruiker se status verwyder nie."
 
-#: actions/apistatusesretweet.php:75 actions/apistatusesretweets.php:72
+#: actions/apistatusesretweet.php:76 actions/apistatusesretweets.php:72
 #: actions/deletenotice.php:52 actions/shownotice.php:92
 msgid "No such notice."
 msgstr "Die kennisgewing bestaan nie."
 
 #. TRANS: Error text shown when trying to repeat an own notice.
-#: actions/apistatusesretweet.php:83 lib/command.php:538
+#: actions/apistatusesretweet.php:84 lib/command.php:538
 msgid "Cannot repeat your own notice."
 msgstr "U kan nie u eie kennisgewings herhaal nie."
 
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-#: actions/apistatusesretweet.php:91 lib/command.php:544
+#: actions/apistatusesretweet.php:92 lib/command.php:544
 msgid "Already repeated that notice."
 msgstr "U het reeds die kennisgewing herhaal."
 
@@ -620,21 +624,21 @@ msgstr "Die status is verwyder."
 msgid "No status with that ID found."
 msgstr "Geen status met die ID gevind nie."
 
-#: actions/apistatusesupdate.php:221
+#: actions/apistatusesupdate.php:222
 msgid "Client must provide a 'status' parameter with a value."
 msgstr ""
 
-#: actions/apistatusesupdate.php:242 actions/newnotice.php:157
+#: actions/apistatusesupdate.php:243 actions/newnotice.php:157
 #: lib/mailhandler.php:60
 #, php-format
 msgid "That's too long. Max notice size is %d chars."
 msgstr "Die kennisgewing is te lank. Gebruik maksimum %d karakters."
 
-#: actions/apistatusesupdate.php:283 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:284 actions/apiusershow.php:96
 msgid "Not found."
 msgstr "Nie gevind nie."
 
-#: actions/apistatusesupdate.php:306 actions/newnotice.php:181
+#: actions/apistatusesupdate.php:307 actions/newnotice.php:181
 #, php-format
 msgid "Max notice size is %d chars, including attachment URL."
 msgstr ""
@@ -796,7 +800,9 @@ msgid "Yes"
 msgstr "Ja"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
+#. TRANS: Submit button title.
+#. TRANS: Description of the form to block a user.
+#: actions/block.php:164 actions/groupmembers.php:403 lib/blockform.php:82
 msgid "Block this user"
 msgstr "Blokkeer hierdie gebruiker"
 
@@ -824,11 +830,13 @@ msgstr "Die groep bestaan nie."
 msgid "Unblock user from group"
 msgstr "Gee gebruiker weer toegang tot die groep"
 
-#: actions/blockedfromgroup.php:320 lib/unblockform.php:69
+#. TRANS: Title for the form to unblock a user.
+#: actions/blockedfromgroup.php:320 lib/unblockform.php:70
 msgid "Unblock"
 msgstr "Deblokkeer"
 
-#: actions/blockedfromgroup.php:320 lib/unblockform.php:80
+#. TRANS: Description of the form to unblock a user.
+#: actions/blockedfromgroup.php:320 lib/unblockform.php:82
 msgid "Unblock this user"
 msgstr "Deblokkeer hierdie gebruiker"
 
@@ -854,9 +862,9 @@ msgstr ""
 #. 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/confirmaddress.php:116 actions/emailsettings.php:331
+#: actions/emailsettings.php:477 actions/imsettings.php:283
+#: actions/imsettings.php:442 actions/othersettings.php:174
 #: actions/profilesettings.php:283 actions/smssettings.php:308
 #: actions/smssettings.php:464
 msgid "Couldn't update user."
@@ -864,7 +872,7 @@ msgstr "Kon nie gebruiker opdateer nie."
 
 #. 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/confirmaddress.php:128 actions/emailsettings.php:437
 #: actions/smssettings.php:422
 msgid "Couldn't delete email confirmation."
 msgstr "Kon nie e-posbevestiging verwyder nie."
@@ -900,9 +908,10 @@ msgstr "Die applikasie is nie gevind nie."
 msgid "You are not the owner of this application."
 msgstr "U is nie die eienaar van hierdie applikasie nie."
 
+#. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:127
 #: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1307
+#: lib/action.php:1315
 msgid "There was a problem with your session token."
 msgstr ""
 
@@ -933,7 +942,7 @@ msgstr "Skrap hierdie applikasie"
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
 #: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:73 lib/profileformaction.php:64
+#: lib/adminpanelaction.php:71 lib/profileformaction.php:64
 #: lib/settingsaction.php:72
 msgid "Not logged in."
 msgstr "Nie aangeteken nie."
@@ -992,7 +1001,6 @@ msgstr "Verwyder die gebruiker"
 #. TRANS: Message used as title for design settings for the site.
 #. TRANS: Link description in user account settings menu.
 #: actions/designadminpanel.php:63 lib/accountsettingsaction.php:139
-#: lib/groupnav.php:119
 msgid "Design"
 msgstr "Ontwerp"
 
@@ -1095,13 +1103,13 @@ msgstr "Gebruik verstekwaardes"
 msgid "Reset back to default"
 msgstr "Stel terug na standaard"
 
-#. TRANS: Submit button title
+#. TRANS: Submit button title.
 #: actions/designadminpanel.php:685 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/snapshotadminpanel.php:245
 #: actions/subscriptions.php:226 actions/tagother.php:154
-#: actions/useradminpanel.php:294 lib/applicationeditform.php:363
+#: actions/useradminpanel.php:294 lib/applicationeditform.php:353
 #: lib/designsettings.php:256 lib/groupeditform.php:202
 msgid "Save"
 msgstr "Stoor"
@@ -1257,7 +1265,7 @@ msgstr "Huidige bevestigde e-posadres."
 #. 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/emailsettings.php:115 actions/emailsettings.php:162
 #: actions/imsettings.php:116 actions/smssettings.php:124
 #: actions/smssettings.php:180
 msgctxt "BUTTON"
@@ -1273,22 +1281,26 @@ msgstr ""
 #. 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
+#. TRANS: Button label in the "Edit application" form.
 #: actions/emailsettings.php:127 actions/imsettings.php:131
-#: actions/smssettings.php:137 lib/applicationeditform.php:357
+#: actions/smssettings.php:137 lib/applicationeditform.php:347
 msgctxt "BUTTON"
 msgid "Cancel"
 msgstr "Kanselleer"
 
-#. TRANS: Instructions for e-mail address input form.
-#: actions/emailsettings.php:135
+#. TRANS: Instructions for e-mail address input form. Do not translate
+#. TRANS: "example.org". It is one of the domain names reserved for
+#. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
+#. TRANS: Any other domain may be owned by a legitimate person or
+#. TRANS: organization.
+#: actions/emailsettings.php:139
 msgid "Email address, like \"UserName@example.org\""
 msgstr "E-posadres, soos \"UserName@example.org\""
 
 #. 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/emailsettings.php:143 actions/imsettings.php:151
 #: actions/smssettings.php:162
 msgctxt "BUTTON"
 msgid "Add"
@@ -1296,129 +1308,129 @@ msgstr "Voeg by"
 
 #. 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
+#: actions/emailsettings.php:151 actions/smssettings.php:171
 msgid "Incoming email"
 msgstr "Inkomende e-pos"
 
 #. 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
+#: actions/emailsettings.php:159 actions/smssettings.php:178
 msgid "Send email to this address to post new notices."
 msgstr ""
 
 #. 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
+#: actions/emailsettings.php:168 actions/smssettings.php:186
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr ""
 
 #. 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
+#: actions/emailsettings.php:172 actions/smssettings.php:189
 msgctxt "BUTTON"
 msgid "New"
 msgstr "Nuut"
 
 #. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:174
+#: actions/emailsettings.php:178
 msgid "Email preferences"
 msgstr "E-posadresse"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:180
+#: actions/emailsettings.php:184
 msgid "Send me notices of new subscriptions through email."
 msgstr ""
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:186
+#: actions/emailsettings.php:190
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr ""
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:193
+#: actions/emailsettings.php:197
 msgid "Send me email when someone sends me a private message."
 msgstr ""
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:199
+#: actions/emailsettings.php:203
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr ""
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:205
+#: actions/emailsettings.php:209
 msgid "Allow friends to nudge me and send me an email."
 msgstr ""
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:212
+#: actions/emailsettings.php:216
 msgid "I want to post notices by email."
 msgstr ""
 
 #. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:334
+#: actions/emailsettings.php:338
 msgid "Email preferences saved."
 msgstr "E-posadresse"
 
 #. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:353
+#: actions/emailsettings.php:357
 msgid "No email address."
 msgstr "Geen e-posadres."
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:208
+#: actions/emailsettings.php:370 actions/register.php:208
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "Nie 'n geldige e-posadres nie."
 
 #. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:370
+#: actions/emailsettings.php:374
 msgid "That is already your email address."
 msgstr "Dit is al reeds u e-posadres."
 
 #. 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/emailsettings.php:395 actions/imsettings.php:351
 #: actions/smssettings.php:373
 msgid "Couldn't insert confirmation code."
 msgstr "Kon nie e-posbevestiging verwyder nie."
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:398
+#: actions/emailsettings.php:402
 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 ""
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:438
+#: actions/emailsettings.php:442
 msgid "Email confirmation cancelled."
 msgstr "Geen bevestigingskode."
 
 #. TRANS: Message given trying to remove an e-mail address that is not
 #. TRANS: registered for the active user.
-#: actions/emailsettings.php:458
+#: actions/emailsettings.php:462
 msgid "That is not your email address."
 msgstr "Dit is nie u e-posadres nie."
 
 #. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:479
+#: actions/emailsettings.php:483
 msgid "The email address was removed."
 msgstr "Inkomende e-posadres is verwyder."
 
-#: actions/emailsettings.php:493 actions/smssettings.php:568
+#: actions/emailsettings.php:497 actions/smssettings.php:568
 msgid "No incoming email address."
 msgstr "Geen inkomende e-posadres."
 
 #. 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/emailsettings.php:508 actions/emailsettings.php:532
 #: actions/smssettings.php:578 actions/smssettings.php:602
 msgid "Couldn't update user record."
 msgstr "Kon nie gebruikersdata opdateer nie."
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
-#: actions/emailsettings.php:508 actions/smssettings.php:581
+#: actions/emailsettings.php:512 actions/smssettings.php:581
 msgid "Incoming email address removed."
 msgstr "Inkomende e-posadres is verwyder."
 
@@ -1547,7 +1559,7 @@ msgstr "Geen groep verskaf nie."
 msgid "Only an admin can block group members."
 msgstr ""
 
-#: actions/groupblock.php:134 actions/groupmembers.php:360
+#: actions/groupblock.php:134 actions/groupmembers.php:364
 msgid "Block user from group"
 msgstr "Blok gebruiker toegang tot die groep"
 
@@ -1596,27 +1608,17 @@ msgstr "Logo opgedateer."
 msgid "Failed updating logo."
 msgstr "Die opdatering van die logo het gefaal."
 
-#: actions/groupmembers.php:100 lib/groupnav.php:92
+#. TRANS: Title of the page showing group members.
+#. TRANS: %s is the name of the group.
+#: actions/groupmembers.php:102
 #, php-format
 msgid "%s group members"
 msgstr "lede van die groep %s"
 
-#: actions/groupmembers.php:182 lib/groupnav.php:107
+#: actions/groupmembers.php:186
 msgid "Admin"
 msgstr "Administrateur"
 
-#: actions/groupmembers.php:392 lib/blockform.php:69
-msgid "Block"
-msgstr "Blokkeer"
-
-#: actions/groupmembers.php:519
-msgid "Make Admin"
-msgstr "Maak Admin"
-
-#: actions/groupmembers.php:519
-msgid "Make this user an admin"
-msgstr "Maak hierdie gebruiker 'n administrateur"
-
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Title in atom group notice feed. %s is a group name.
 #. TRANS: Title in atom user notice feed. %s is a user name.
@@ -1721,7 +1723,10 @@ msgstr ""
 
 #. TRANS: IM address input field instructions in IM settings form.
 #. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:140
+#. TRANS: Do not translate "example.org". It is one of the domain names reserved for use in examples by
+#. TRANS: http://www.rfc-editor.org/rfc/rfc2606.txt. Any other domain may be owned by a legitimate
+#. TRANS: person or organization.
+#: actions/imsettings.php:143
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -1729,63 +1734,63 @@ msgid ""
 msgstr ""
 
 #. TRANS: Form legend for IM preferences form.
-#: actions/imsettings.php:155
+#: actions/imsettings.php:158
 msgid "IM preferences"
 msgstr "Voorkeure is gestoor."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:160
+#: actions/imsettings.php:163
 msgid "Send me notices through Jabber/GTalk."
 msgstr ""
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:166
+#: actions/imsettings.php:169
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr ""
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:172
+#: actions/imsettings.php:175
 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr ""
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:179
+#: actions/imsettings.php:182
 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr ""
 
 #. TRANS: Confirmation message for successful IM preferences save.
-#: actions/imsettings.php:287 actions/othersettings.php:180
+#: actions/imsettings.php:290 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
+#: actions/imsettings.php:312
 msgid "No Jabber ID."
 msgstr "Geen Jabber-ID nie."
 
 #. TRANS: Message given saving IM address that cannot be normalised.
-#: actions/imsettings.php:317
+#: actions/imsettings.php:320
 msgid "Cannot normalize that Jabber ID"
 msgstr "Dit was nie moontlik om die Jabber-ID te normaliseer nie"
 
 #. TRANS: Message given saving IM address that not valid.
-#: actions/imsettings.php:322
+#: actions/imsettings.php:325
 msgid "Not a valid Jabber ID"
 msgstr "Nie 'n geldige Jabber-ID nie"
 
 #. TRANS: Message given saving IM address that is already set.
-#: actions/imsettings.php:326
+#: actions/imsettings.php:329
 msgid "That is already your Jabber ID."
 msgstr "Dit is al reeds u Jabber-ID."
 
 #. TRANS: Message given saving IM address that is already set for another user.
-#: actions/imsettings.php:330
+#: actions/imsettings.php:333
 msgid "Jabber ID already belongs to another user."
 msgstr "Die Jabber-ID word reeds deur 'n ander gebruiker gebruik."
 
 #. 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
+#: actions/imsettings.php:361
 #, php-format
 msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
@@ -1793,28 +1798,28 @@ msgid ""
 msgstr ""
 
 #. TRANS: Message given canceling IM address confirmation for the wrong IM address.
-#: actions/imsettings.php:388
+#: actions/imsettings.php:391
 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
+#: actions/imsettings.php:400
 msgid "Couldn't delete IM confirmation."
 msgstr "Kon nie e-posbevestiging verwyder nie."
 
 #. TRANS: Message given after successfully canceling IM address confirmation.
-#: actions/imsettings.php:402
+#: actions/imsettings.php:405
 msgid "IM confirmation cancelled."
 msgstr "Geen bevestigingskode."
 
 #. TRANS: Message given trying to remove an IM address that is not
 #. TRANS: registered for the active user.
-#: actions/imsettings.php:424
+#: actions/imsettings.php:427
 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
+#: actions/imsettings.php:450
 msgid "The IM address was removed."
 msgstr "Inkomende e-posadres is verwyder."
 
@@ -2236,7 +2241,7 @@ msgid "Password saved."
 msgstr "Wagwoord gestoor."
 
 #. TRANS: Menu item for site administration
-#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:384
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:371
 msgid "Paths"
 msgstr "Paaie"
 
@@ -2413,7 +2418,7 @@ msgstr "Volledige naam"
 
 #. TRANS: Form input field label.
 #: actions/profilesettings.php:115 actions/register.php:460
-#: lib/applicationeditform.php:244 lib/groupeditform.php:161
+#: lib/applicationeditform.php:235 lib/groupeditform.php:161
 msgid "Homepage"
 msgstr "Tuisblad"
 
@@ -2491,7 +2496,7 @@ msgid "Invalid tag: \"%s\""
 msgstr "Ongeldige etiket: \"$s\""
 
 #. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:391 lib/adminpanelaction.php:141
+#: actions/profilesettings.php:391 lib/adminpanelaction.php:138
 msgid "Settings saved."
 msgstr "Voorkeure is gestoor."
 
@@ -2811,7 +2816,7 @@ msgstr "StatusNet"
 
 #. TRANS: Menu item for site administration
 #: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
-#: lib/adminpanelaction.php:392
+#: lib/adminpanelaction.php:379
 msgid "Sessions"
 msgstr "Sessies"
 
@@ -2832,24 +2837,24 @@ msgid "Turn on debugging output for sessions."
 msgstr ""
 
 #. TRANS: Form input field label for application icon.
-#: actions/showapplication.php:159 lib/applicationeditform.php:182
+#: actions/showapplication.php:159 lib/applicationeditform.php:173
 msgid "Icon"
 msgstr "Ikoon"
 
 #. TRANS: Form input field label for application name.
 #: actions/showapplication.php:169 actions/version.php:197
-#: lib/applicationeditform.php:199
+#: lib/applicationeditform.php:190
 msgid "Name"
 msgstr "Naam"
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:178 lib/applicationeditform.php:235
+#: actions/showapplication.php:178 lib/applicationeditform.php:226
 msgid "Organization"
 msgstr "Organisasie"
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:216 lib/groupeditform.php:172
+#: lib/applicationeditform.php:207 lib/groupeditform.php:172
 msgid "Description"
 msgstr "Beskrywing"
 
@@ -2914,7 +2919,7 @@ msgstr ""
 msgid "This is a way to share what you like."
 msgstr ""
 
-#: actions/showgroup.php:82 lib/groupnav.php:86
+#: actions/showgroup.php:82
 #, php-format
 msgid "%s group"
 msgstr "%s groep"
@@ -2951,7 +2956,7 @@ msgstr "Groepsaksies"
 msgid "FOAF for %s group"
 msgstr "Vriend van 'n vriend vir die groep %s"
 
-#: actions/showgroup.php:393 actions/showgroup.php:445 lib/groupnav.php:91
+#: actions/showgroup.php:393 actions/showgroup.php:445
 msgid "Members"
 msgstr "Lede"
 
@@ -3238,7 +3243,7 @@ msgstr ""
 
 #. TRANS: Menu item for site administration
 #: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
-#: lib/adminpanelaction.php:408
+#: lib/adminpanelaction.php:395
 msgid "Snapshots"
 msgstr ""
 
@@ -3730,7 +3735,7 @@ msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
 
 #. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#: classes/Subscription.php:75 lib/oauthstore.php:465
+#: classes/Subscription.php:75 lib/oauthstore.php:466
 msgid "You have been banned from subscribing."
 msgstr ""
 
@@ -3832,7 +3837,8 @@ msgid "Change site configuration"
 msgstr ""
 
 #. TRANS: Main menu option when logged in and site admin for access to site configuration
-#: lib/action.php:474
+#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
+#: lib/action.php:474 lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr "Beheer"
@@ -3947,7 +3953,10 @@ msgid "StatusNet software license"
 msgstr ""
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
-#: lib/action.php:843
+#. TRANS: Text between [] is a link description, text between () is the link itself.
+#. TRANS: Make sure there is no whitespace between "]" and "(".
+#. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
+#: lib/action.php:846
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -3955,13 +3964,16 @@ msgid ""
 msgstr ""
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:846
+#: lib/action.php:849
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr ""
 
 #. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.
-#: lib/action.php:850
+#. TRANS: Make sure there is no whitespace between "]" and "(".
+#. TRANS: Text between [] is a link description, text between () is the link itself.
+#. TRANS: %s is the version of StatusNet that is being used.
+#: lib/action.php:856
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -3970,44 +3982,45 @@ msgid ""
 msgstr ""
 
 #. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:866
+#: lib/action.php:872
 msgid "Site content license"
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:873
+#: lib/action.php:879
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:880
+#: lib/action.php:886
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:884
+#: lib/action.php:890
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 
-#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:897
+#. TRANS: license message in footer.
+#. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
+#: lib/action.php:904
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr ""
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1247
+#: lib/action.php:1254
 msgid "After"
 msgstr "Na"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1257
+#: lib/action.php:1264
 msgid "Before"
 msgstr "Voor"
 
@@ -4016,109 +4029,138 @@ msgstr "Voor"
 msgid "Expecting a root feed element but got a whole XML document."
 msgstr ""
 
-#: lib/activityutils.php:208
+#. TRANS: Client exception thrown when there is no source attribute.
+#: lib/activityutils.php:203
 msgid "Can't handle remote content yet."
 msgstr ""
 
-#: lib/activityutils.php:244
+#. TRANS: Client exception thrown when there embedded XML content is found that cannot be processed yet.
+#: lib/activityutils.php:240
 msgid "Can't handle embedded XML content yet."
 msgstr ""
 
-#: lib/activityutils.php:248
+#. TRANS: Client exception thrown when base64 encoded content is found that cannot be processed yet.
+#: lib/activityutils.php:245
 msgid "Can't handle embedded Base64 content yet."
 msgstr ""
 
 #. TRANS: Client error message.
-#: lib/adminpanelaction.php:229
+#: lib/adminpanelaction.php:222
 msgid "showForm() not implemented."
 msgstr ""
 
 #. TRANS: Client error message
-#: lib/adminpanelaction.php:259
+#: lib/adminpanelaction.php:250
 msgid "saveSettings() not implemented."
 msgstr ""
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:352
+#: lib/adminpanelaction.php:339
 msgctxt "MENU"
 msgid "Site"
 msgstr "Webtuiste"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:360
+#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
+#: lib/adminpanelaction.php:347 lib/groupnav.php:135
 msgctxt "MENU"
 msgid "Design"
 msgstr "Ontwerp"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:368 lib/personalgroupnav.php:115
+#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:115
 msgid "User"
 msgstr "Gebruiker"
 
 #. TRANS: Client error 401.
-#: lib/apiauth.php:113
+#: lib/apiauth.php:111
 msgid "API resource requires read-write access, but you only have read access."
 msgstr ""
 
+#. TRANS: OAuth exception thrown when no application is found for a given consumer key.
+#: lib/apiauth.php:175
+msgid "No application for that consumer key."
+msgstr ""
+
+#. TRANS: OAuth exception given when an incorrect access token was given for a user.
+#: lib/apiauth.php:212
+msgid "Bad access token."
+msgstr ""
+
+#. TRANS: OAuth exception given when no user was found for a given token (no token was found).
+#: lib/apiauth.php:217
+msgid "No user for that token."
+msgstr ""
+
+#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
+#: lib/apioauthstore.php:178
+msgid "Tried to revoke unknown token"
+msgstr ""
+
+#. TRANS: Exception thrown when an attempt is made to remove a revoked token.
+#: lib/apioauthstore.php:182
+msgid "Failed to delete revoked token"
+msgstr ""
+
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:209
+#: lib/applicationeditform.php:200
 #, php-format
 msgid "Describe your application in %d characters"
 msgstr ""
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:242
+#: lib/applicationeditform.php:233
 msgid "URL for the homepage of the organization"
 msgstr ""
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:251
+#: lib/applicationeditform.php:242
 msgid "URL to redirect to after authentication"
 msgstr ""
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:278
+#: lib/applicationeditform.php:269
 msgid "Browser"
 msgstr "Webblaaier"
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:295
+#: lib/applicationeditform.php:286
 msgid "Desktop"
 msgstr ""
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:297
+#: lib/applicationeditform.php:288
 msgid "Type of application, browser or desktop"
 msgstr ""
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:320
+#: lib/applicationeditform.php:311
 msgid "Read-only"
 msgstr "Lees-alleen"
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:339
+#: lib/applicationeditform.php:330
 msgid "Read-write"
 msgstr "Lees-skryf"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:341
+#: lib/applicationeditform.php:332
 msgid "Default access for this application: read-only, or read-write"
 msgstr ""
 
-#. TRANS: Submit button title
-#: lib/applicationeditform.php:359
+#. TRANS: Submit button title.
+#: lib/applicationeditform.php:349
 msgid "Cancel"
 msgstr "Kanselleer"
 
 #. 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
+#: lib/applicationlist.php:143
 #, php-format
 msgid "Approved %1$s - \"%2$s\" access."
 msgstr ""
 
 #. TRANS: Button label
-#: lib/applicationlist.php:159
+#: lib/applicationlist.php:158
 msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "Verwyder"
@@ -4138,7 +4180,8 @@ msgstr "Outeur"
 msgid "Provider"
 msgstr "Verskaffer"
 
-#: lib/attachmenttagcloudsection.php:48
+#. TRANS: Title.
+#: lib/attachmenttagcloudsection.php:49
 msgid "Tags for this attachment"
 msgstr "Etikette vir hierdie aanhangsel"
 
@@ -4150,6 +4193,11 @@ msgstr "Wagwoord wysiging het misluk"
 msgid "Password changing is not allowed"
 msgstr "Wagwoord verandering word nie toegelaat nie"
 
+#. TRANS: Title for the form to block a user.
+#: lib/blockform.php:70
+msgid "Block"
+msgstr "Blokkeer"
+
 #: lib/channel.php:157 lib/channel.php:177
 msgid "Command results"
 msgstr "Opdragresultate"
@@ -4163,6 +4211,12 @@ msgstr "Opdrag voltooi"
 msgid "Notice with that id does not exist."
 msgstr ""
 
+#. TRANS: Command exception text shown when a last user notice is requested and it does not exist.
+#. TRANS: Error text shown when a last user notice is requested and it does not exist.
+#: lib/command.php:101 lib/command.php:630
+msgid "User has no last notice."
+msgstr ""
+
 #. 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:130
@@ -4187,6 +4241,13 @@ msgstr ""
 msgid "It does not make a lot of sense to nudge yourself!"
 msgstr ""
 
+#. TRANS: Message given having nudged another user.
+#. TRANS: %s is the nickname of the user that was nudged.
+#: lib/command.php:240
+#, php-format
+msgid "Nudge sent to %s."
+msgstr ""
+
 #. TRANS: User statistics text.
 #. TRANS: %1$s is the number of other user the user is subscribed to.
 #. TRANS: %2$s is the number of users that are subscribed to the user.
@@ -4204,6 +4265,20 @@ msgstr ""
 msgid "Notice marked as fave."
 msgstr ""
 
+#. 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.
+#: lib/command.php:360
+#, php-format
+msgid "%1$s joined group %2$s."
+msgstr ""
+
+#. 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.
+#: lib/command.php:408
+#, php-format
+msgid "%1$s left group %2$s."
+msgstr ""
+
 #. TRANS: Whois output. %s is the full name of the queried user.
 #: lib/command.php:434
 #, php-format
@@ -4252,6 +4327,20 @@ msgstr ""
 msgid "Error sending direct message."
 msgstr ""
 
+#. 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:554
+#, php-format
+msgid "Notice from %s repeated."
+msgstr ""
+
+#. TRANS: Message given if content of a notice for a reply is too long.
+#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
+#: lib/command.php:592
+#, php-format
+msgid "Notice too long - maximum is %1$d characters, you sent %2$d."
+msgstr ""
+
 #. TRANS: Text shown having sent a reply to a notice successfully.
 #. TRANS: %s is the nickname of the user of the notice the reply was sent to.
 #: lib/command.php:603
@@ -4282,6 +4371,13 @@ msgstr ""
 msgid "Specify the name of the user to unsubscribe from."
 msgstr ""
 
+#. TRANS: Text shown after having unsubscribed from another user successfully.
+#. TRANS: %s is the name of the user the unsubscription was requested for.
+#: lib/command.php:705
+#, php-format
+msgid "Unsubscribed from %s."
+msgstr ""
+
 #. TRANS: Error text shown when the command "off" fails for an unknown reason.
 #: lib/command.php:731
 msgid "Can't turn off notification."
@@ -4307,7 +4403,7 @@ msgid "Unsubscribed %s."
 msgstr ""
 
 #. TRANS: Text shown after requesting other users a user is subscribed to.
-#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.
 #: lib/command.php:836
 msgid "You are subscribed to this person:"
@@ -4316,7 +4412,7 @@ msgstr[0] "U volg hierdie gebruiker:"
 msgstr[1] "U volg hierdie gebruikers:"
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
-#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
 #: lib/command.php:863
 msgid "This person is subscribed to you:"
@@ -4331,7 +4427,7 @@ msgid "You are not a member of any groups."
 msgstr "U is nie 'n lid van enige groep nie."
 
 #. TRANS: Text shown after requesting groups a user is subscribed to.
-#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
 #: lib/command.php:890
 msgid "You are a member of this group:"
@@ -4339,6 +4435,7 @@ 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:"
 
+#. TRANS: Help text for commands.
 #: lib/command.php:905
 msgid ""
 "Commands:\n"
@@ -4490,30 +4587,19 @@ msgstr ""
 msgid "Extra nicknames for the group, comma- or space- separated, max %d"
 msgstr ""
 
-#: lib/groupnav.php:85
-msgid "Group"
-msgstr "Groep"
-
-#: lib/groupnav.php:101
-msgid "Blocked"
-msgstr "Geblokkeer"
-
-#: lib/groupnav.php:102
-#, php-format
-msgid "%s blocked users"
-msgstr "%s geblokkeerde gebruikers"
-
-#: lib/groupnav.php:113
-msgid "Logo"
-msgstr "Logo"
-
-#: lib/groupnav.php:114
+#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
+#. TRANS: %s is the nickname of the group.
+#: lib/groupnav.php:129
 #, php-format
+msgctxt "TOOLTIP"
 msgid "Add or edit %s logo"
 msgstr ""
 
-#: lib/groupnav.php:120
+#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
+#. TRANS: %s is the nickname of the group.
+#: lib/groupnav.php:138
 #, php-format
+msgctxt "TOOLTIP"
 msgid "Add or edit %s design"
 msgstr ""
 
@@ -4531,7 +4617,8 @@ msgstr "Etikette in groepsaankondigings van %s"
 msgid "This page is not available in a media type you accept"
 msgstr ""
 
-#: lib/imagefile.php:101 lib/mediafile.php:170
+#. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
+#: lib/imagefile.php:101 lib/mediafile.php:179
 msgid "System error uploading file."
 msgstr ""
 
@@ -4795,52 +4882,69 @@ msgstr "Jammer, dit is nie u inkomende e-posadres nie."
 msgid "Sorry, no incoming email allowed."
 msgstr "Jammer, inkomende e-pos word nie toegelaat nie."
 
-#: lib/mediafile.php:98 lib/mediafile.php:123
+#. TRANS: Client exception thrown when a database error was thrown during a file upload operation.
+#: lib/mediafile.php:99 lib/mediafile.php:125
 msgid "There was a database error while saving your file. Please try again."
 msgstr ""
 
-#: lib/mediafile.php:142
+#. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
+#: lib/mediafile.php:145
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
 msgstr ""
 
-#: lib/mediafile.php:147
+#. TRANS: Client exception.
+#: lib/mediafile.php:151
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form."
 msgstr ""
 
-#: lib/mediafile.php:152
+#. TRANS: Client exception.
+#: lib/mediafile.php:157
 msgid "The uploaded file was only partially uploaded."
 msgstr ""
 
-#: lib/mediafile.php:159
+#. TRANS: Client exception thrown when a temporary folder is not present to store a file upload.
+#: lib/mediafile.php:165
 msgid "Missing a temporary folder."
 msgstr ""
 
-#: lib/mediafile.php:162
+#. TRANS: Client exception thrown when writing to disk is not possible during a file upload operation.
+#: lib/mediafile.php:169
 msgid "Failed to write file to disk."
 msgstr ""
 
-#: lib/mediafile.php:165
+#. TRANS: Client exception thrown when a file upload operation has been stopped by an extension.
+#: lib/mediafile.php:173
 msgid "File upload stopped by extension."
 msgstr ""
 
-#: lib/mediafile.php:179 lib/mediafile.php:217
+#. TRANS: Client exception thrown when a file upload operation would cause a user to exceed a set quota.
+#: lib/mediafile.php:189 lib/mediafile.php:232
 msgid "File exceeds user's quota."
 msgstr ""
 
-#: lib/mediafile.php:197 lib/mediafile.php:234
+#. TRANS: Client exception thrown when a file upload operation fails because the file could
+#. TRANS: not be moved from the temporary folder to the permanent file location.
+#: lib/mediafile.php:209 lib/mediafile.php:251
 msgid "File could not be moved to destination directory."
 msgstr ""
 
-#: lib/mediafile.php:318
+#. TRANS: Client exception thrown trying to upload a forbidden MIME type.
+#. TRANS: %1$s is the file type that was denied, %2$s is the application part of
+#. TRANS: the MIME type that was denied.
+#: lib/mediafile.php:340
 #, php-format
-msgid " Try using another %s format."
+msgid ""
+"\"%1$s\" is not a supported file type on this server. Try using another %2$s "
+"format."
 msgstr ""
 
-#: lib/mediafile.php:323
+#. TRANS: Client exception thrown trying to upload a forbidden MIME type.
+#. TRANS: %s is the file type that was denied.
+#: lib/mediafile.php:345
 #, php-format
-msgid "%s is not a supported file type on this server."
+msgid "\"%s\" is not a supported file type on this server."
 msgstr ""
 
 #: lib/messageform.php:146
@@ -4928,18 +5032,6 @@ msgstr "Antwoord"
 msgid "Nudge"
 msgstr "Aanpor"
 
-#: lib/oauthstore.php:283
-msgid "Error inserting new profile"
-msgstr ""
-
-#: lib/oauthstore.php:306
-msgid "Error updating remote profile"
-msgstr ""
-
-#: lib/oauthstore.php:311
-msgid "Error inserting remote profile"
-msgstr ""
-
 #: lib/personalgroupnav.php:99
 msgid "Personal"
 msgstr "Persoonlik"
@@ -4969,7 +5061,8 @@ msgstr ""
 msgid "Tags in %s's notices"
 msgstr "Etikette in die aankondigings van %s"
 
-#: lib/plugin.php:115
+#. TRANS: Displayed as version information for a plugin if no version information was found.
+#: lib/plugin.php:116
 msgid "Unknown"
 msgstr "Onbekend"
 
@@ -5030,14 +5123,12 @@ msgstr ""
 msgid "Sandbox"
 msgstr ""
 
-#: lib/searchaction.php:126
+#. TRANS: Used as a field label for the field where one or more keywords
+#. TRANS: for searching can be entered.
+#: lib/searchaction.php:129
 msgid "Keyword(s)"
 msgstr "Term(e)"
 
-#: lib/searchaction.php:127
-msgid "Search"
-msgstr "Soek"
-
 #: lib/searchgroupnav.php:80
 msgid "People"
 msgstr "Gebruikers"
@@ -5130,10 +5221,6 @@ msgstr ""
 msgid "Theme contains file of type '.%s', which is not allowed."
 msgstr ""
 
-#: lib/themeuploader.php:259
-msgid "Error opening theme archive."
-msgstr ""
-
 #: lib/topposterssection.php:74
 msgid "Top posters"
 msgstr "Mees aktiewe gebruikers"
@@ -5193,56 +5280,32 @@ msgid "Moderator"
 msgstr "Moderator"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1102
+#: lib/util.php:1103
 msgid "a few seconds ago"
 msgstr "'n paar sekondes gelede"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1105
+#: lib/util.php:1106
 msgid "about a minute ago"
 msgstr "ongeveer 'n minuut gelede"
 
-#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1109
-#, php-format
-msgid "about %d minutes ago"
-msgstr "ongeveer %d minute gelede"
-
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 #: lib/util.php:1112
 msgid "about an hour ago"
 msgstr "ongeveer 'n uur gelede"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1116
-#, php-format
-msgid "about %d hours ago"
-msgstr "ongeveer %d uur gelede"
-
-#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1119
+#: lib/util.php:1118
 msgid "about a day ago"
 msgstr "ongeveer een dag gelede"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1123
-#, php-format
-msgid "about %d days ago"
-msgstr "ongeveer %d dae gelede"
-
-#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1126
+#: lib/util.php:1124
 msgid "about a month ago"
 msgstr "ongeveer een maand gelede"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 #: lib/util.php:1130
-#, php-format
-msgid "about %d months ago"
-msgstr "ongeveer %d maande gelede"
-
-#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1133
 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 36fb17ce4b..056cfb15e4 100644
--- a/locale/ar/LC_MESSAGES/statusnet.po
+++ b/locale/ar/LC_MESSAGES/statusnet.po
@@ -1,8 +1,9 @@
-# Translation of StatusNet to Arabic
+# Translation of StatusNet to Arabic (Ø§ÙØ¹Ø±Ø¨ÙØ©)
+# Expored from translatewiki.net
 #
-# Author@translatewiki.net: Brion
-# Author@translatewiki.net: Meno25
-# Author@translatewiki.net: OsamaK
+# Author: Brion
+# Author: Meno25
+# Author: OsamaK
 # --
 # This file is distributed under the same license as the StatusNet package.
 #
@@ -10,21 +11,23 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-08 22:33+0000\n"
-"PO-Revision-Date: 2010-09-08 22:33:10+0000\n"
-"Language-Team: Arabic\n"
+"POT-Creation-Date: 2010-09-14 19:53+0000\n"
+"PO-Revision-Date: 2010-09-14 19:53:38+0000\n"
+"Language-Team: Arabic <http://translatewiki.net/wiki/Portal:ar>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r72348); Translate extension (2010-08-20)\n"
+"X-Generator: MediaWiki 1.17alpha (r73009); Translate extension (2010-08-20)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ar\n"
-"X-Message-Group: out-statusnet\n"
-"Plural-Forms: nplurals=6; plural= n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
-"&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
+"X-Message-Group: #out-statusnet\n"
+"Plural-Forms: nplurals=6; plural=(n == 0) ? 0 : ( (n == 1) ? 1 : ( (n == "
+"2) ? 2 : ( (n%100 >= 3 && n%100 <= 10) ? 3 : ( (n%100 >= 11 && n%100 <= "
+"99) ? 4 : 5 ) ) ) );\n"
+"X-POT-Import-Date: 1284-49-16 34::+0000\n"
 
 #. TRANS: Page title
 #. TRANS: Menu item for site administration
-#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:376
+#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:363
 msgid "Access"
 msgstr "ÙÙØ§Ø°"
 
@@ -77,10 +80,10 @@ 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 actions/emailsettings.php:224
-#: actions/imsettings.php:184 actions/smssettings.php:209
-#: lib/applicationeditform.php:361
+#. TRANS: Button label in the "Edit application" form.
+#: actions/accessadminpanel.php:203 actions/emailsettings.php:228
+#: actions/imsettings.php:187 actions/smssettings.php:209
+#: lib/applicationeditform.php:351
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Ø§ØÙØ¸"
@@ -93,15 +96,15 @@ msgstr "ÙØ§ ØµÙØØ© ÙÙØ°Ù."
 
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #: actions/all.php:79 actions/allrss.php:68
-#: actions/apiaccountupdatedeliverydevice.php:114
-#: actions/apiaccountupdateprofile.php:105
-#: actions/apiaccountupdateprofilebackgroundimage.php:116
-#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
-#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
-#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:113
-#: actions/apigroupismember.php:91 actions/apigroupjoin.php:100
-#: actions/apigroupleave.php:100 actions/apigrouplist.php:73
-#: actions/apistatusesupdate.php:229 actions/apisubscriptions.php:87
+#: actions/apiaccountupdatedeliverydevice.php:115
+#: actions/apiaccountupdateprofile.php:106
+#: actions/apiaccountupdateprofilebackgroundimage.php:117
+#: actions/apiaccountupdateprofileimage.php:106 actions/apiblockcreate.php:98
+#: actions/apiblockdestroy.php:97 actions/apidirectmessage.php:77
+#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:114
+#: actions/apigroupismember.php:91 actions/apigroupjoin.php:101
+#: actions/apigroupleave.php:101 actions/apigrouplist.php:73
+#: actions/apistatusesupdate.php:230 actions/apisubscriptions.php:87
 #: actions/apitimelinefavorites.php:72 actions/apitimelinefriends.php:174
 #: actions/apitimelinehome.php:80 actions/apitimelinementions.php:80
 #: actions/apitimelineuser.php:82 actions/avatarbynickname.php:75
@@ -172,29 +175,22 @@ msgid ""
 "to them](%%%%action.newnotice%%%%?status_textarea=%3$s)."
 msgstr ""
 
-#: actions/all.php:149 actions/replies.php:210 actions/showstream.php:211
-#, php-format
-msgid ""
-"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
-"post a notice to them."
-msgstr ""
-
 #. TRANS: H1 text
 #: actions/all.php:182
 msgid "You and friends"
 msgstr "Ø£ÙØª ÙØ§ÙØ£ØµØ¯ÙØ§Ø¡"
 
 #: actions/apiaccountratelimitstatus.php:72
-#: actions/apiaccountupdatedeliverydevice.php:94
-#: actions/apiaccountupdateprofile.php:97
-#: actions/apiaccountupdateprofilebackgroundimage.php:94
-#: actions/apiaccountupdateprofilecolors.php:118
+#: actions/apiaccountupdatedeliverydevice.php:95
+#: actions/apiaccountupdateprofile.php:98
+#: actions/apiaccountupdateprofilebackgroundimage.php:95
+#: actions/apiaccountupdateprofilecolors.php:119
 #: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156
-#: actions/apifavoritecreate.php:100 actions/apifavoritedestroy.php:101
-#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100
-#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:139
-#: actions/apigroupismember.php:115 actions/apigroupjoin.php:156
-#: actions/apigroupleave.php:142 actions/apigrouplist.php:137
+#: actions/apifavoritecreate.php:101 actions/apifavoritedestroy.php:102
+#: actions/apifriendshipscreate.php:101 actions/apifriendshipsdestroy.php:101
+#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:140
+#: actions/apigroupismember.php:115 actions/apigroupjoin.php:157
+#: actions/apigroupleave.php:143 actions/apigrouplist.php:137
 #: actions/apigrouplistall.php:122 actions/apigroupmembership.php:107
 #: actions/apigroupshow.php:116 actions/apihelptest.php:88
 #: actions/apistatusesdestroy.php:104 actions/apistatusesretweets.php:112
@@ -209,47 +205,49 @@ msgstr "Ø£ÙØª ÙØ§ÙØ£ØµØ¯ÙØ§Ø¡"
 msgid "API method not found."
 msgstr "ÙÙ ÙØªÙ Ø§ÙØ¹Ø«ÙØ± Ø¹ÙÙ ÙØ³ÙÙØ© API."
 
-#: actions/apiaccountupdatedeliverydevice.php:86
-#: actions/apiaccountupdateprofile.php:89
-#: actions/apiaccountupdateprofilebackgroundimage.php:86
-#: actions/apiaccountupdateprofilecolors.php:110
-#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89
-#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109
-#: actions/apifavoritecreate.php:91 actions/apifavoritedestroy.php:92
-#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
-#: actions/apigroupcreate.php:105 actions/apigroupjoin.php:92
-#: actions/apigroupleave.php:92 actions/apimediaupload.php:67
-#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:198
+#. TRANS: Client error message. POST is a HTTP command. It should not be translated.
+#. TRANS: Client error. POST is a HTTP command. It should not be translated.
+#: actions/apiaccountupdatedeliverydevice.php:87
+#: actions/apiaccountupdateprofile.php:90
+#: actions/apiaccountupdateprofilebackgroundimage.php:87
+#: actions/apiaccountupdateprofilecolors.php:111
+#: actions/apiaccountupdateprofileimage.php:85 actions/apiblockcreate.php:90
+#: actions/apiblockdestroy.php:89 actions/apidirectmessagenew.php:110
+#: actions/apifavoritecreate.php:92 actions/apifavoritedestroy.php:93
+#: actions/apifriendshipscreate.php:92 actions/apifriendshipsdestroy.php:92
+#: actions/apigroupcreate.php:106 actions/apigroupjoin.php:93
+#: actions/apigroupleave.php:93 actions/apimediaupload.php:68
+#: actions/apistatusesretweet.php:66 actions/apistatusesupdate.php:199
 msgid "This method requires a POST."
 msgstr "ØªØªØ·ÙØ¨ ÙØ°Ù Ø§ÙØ·Ø±ÙÙØ© POST."
 
-#: actions/apiaccountupdatedeliverydevice.php:106
+#: actions/apiaccountupdatedeliverydevice.php:107
 msgid ""
 "You must specify a parameter named 'device' with a value of one of: sms, im, "
 "none."
 msgstr ""
 
-#: actions/apiaccountupdatedeliverydevice.php:133
+#: actions/apiaccountupdatedeliverydevice.php:134
 msgid "Could not update user."
 msgstr "ØªØ¹Ø°ÙØ± ØªØØ¯ÙØ« Ø§ÙÙØ³ØªØ®Ø¯Ù."
 
-#: actions/apiaccountupdateprofile.php:112
-#: actions/apiaccountupdateprofilebackgroundimage.php:194
-#: actions/apiaccountupdateprofilecolors.php:185
-#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/apiaccountupdateprofile.php:113
+#: actions/apiaccountupdateprofilebackgroundimage.php:195
+#: actions/apiaccountupdateprofilecolors.php:186
+#: actions/apiaccountupdateprofileimage.php:131 actions/apiusershow.php:108
 #: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/hcard.php:74
 #: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
 #: lib/profileaction.php:84
 msgid "User has no profile."
 msgstr "ÙÙØ³ ÙÙÙØ³ØªØ®Ø¯Ù ÙÙÙ Ø´Ø®ØµÙ."
 
-#: actions/apiaccountupdateprofile.php:147
+#: actions/apiaccountupdateprofile.php:148
 msgid "Could not save profile."
 msgstr "ÙÙ ÙÙÙÙ ØÙØ¸ Ø§ÙÙÙÙ."
 
-#: actions/apiaccountupdateprofilebackgroundimage.php:108
-#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
-#: actions/apistatusesupdate.php:212 actions/avatarsettings.php:257
+#: actions/apiaccountupdateprofilebackgroundimage.php:109
+#: actions/apiaccountupdateprofileimage.php:98 actions/apimediaupload.php:81
+#: actions/apistatusesupdate.php:213 actions/avatarsettings.php:257
 #: actions/designadminpanel.php:123 actions/editapplication.php:118
 #: actions/newapplication.php:101 actions/newnotice.php:94
 #: lib/designsettings.php:283
@@ -259,20 +257,20 @@ msgid ""
 "current configuration."
 msgstr ""
 
-#: actions/apiaccountupdateprofilebackgroundimage.php:187
-#: actions/apiaccountupdateprofilecolors.php:142
+#: actions/apiaccountupdateprofilebackgroundimage.php:188
+#: actions/apiaccountupdateprofilecolors.php:143
 msgid "Could not update your design."
 msgstr "ØªØ¹Ø°ÙØ± ØªØØ¯ÙØ« ØªØµÙÙÙÙ."
 
-#: actions/apiblockcreate.php:105
+#: actions/apiblockcreate.php:106
 msgid "You cannot block yourself!"
 msgstr "ÙØ§ ÙÙÙÙÙ ÙÙØ¹ ÙÙØ³Ù!"
 
-#: actions/apiblockcreate.php:126
+#: actions/apiblockcreate.php:127
 msgid "Block user failed."
 msgstr "ÙØ´Ù ÙÙØ¹ Ø§ÙÙØ³ØªØ®Ø¯Ù."
 
-#: actions/apiblockdestroy.php:114
+#: actions/apiblockdestroy.php:115
 msgid "Unblock user failed."
 msgstr "ÙØ´Ù Ø¥ÙØºØ§Ø¡ ÙÙØ¹ Ø§ÙÙØ³ØªØ®Ø¯Ù."
 
@@ -296,36 +294,36 @@ msgstr "Ø±Ø³Ø§ÙØ© ÙØ¨Ø§Ø´Ø±Ø© %s"
 msgid "All the direct messages sent to %s"
 msgstr "ÙÙ Ø§ÙØ±Ø³Ø§Ø¦Ù Ø§ÙÙØ¨Ø§Ø´Ø±Ø© Ø§ÙØªÙ Ø£Ø±Ø³ÙØª Ø¥ÙÙ %s"
 
-#: actions/apidirectmessagenew.php:118
+#: actions/apidirectmessagenew.php:119
 msgid "No message text!"
 msgstr "ÙØ§ ÙØµ ÙÙ Ø§ÙØ±Ø³Ø§ÙØ©!"
 
-#: actions/apidirectmessagenew.php:138
+#: actions/apidirectmessagenew.php:139
 msgid "Recipient user not found."
 msgstr "ÙÙ ÙÙØ¹Ø«Ø± Ø¹ÙÙ Ø§ÙÙØ³ØªØ®Ø¯Ù Ø§ÙÙØ³ØªÙÙ."
 
-#: actions/apidirectmessagenew.php:142
+#: actions/apidirectmessagenew.php:143
 msgid "Can't send direct messages to users who aren't your friend."
 msgstr ""
 
-#: actions/apifavoritecreate.php:120
+#: actions/apifavoritecreate.php:121
 msgid "This status is already a favorite."
 msgstr "ÙØ°Ù Ø§ÙØØ§ÙØ© ÙÙØ¶ÙØ© Ø¨Ø§ÙÙØ¹Ù."
 
 #. TRANS: Error message text shown when a favorite could not be set.
-#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:296
+#: actions/apifavoritecreate.php:132 actions/favor.php:84 lib/command.php:296
 msgid "Could not create favorite."
 msgstr "ØªØ¹Ø°ÙØ± Ø¥ÙØ´Ø§Ø¡ ÙÙØ¶ÙØ©."
 
-#: actions/apifavoritedestroy.php:123
+#: actions/apifavoritedestroy.php:124
 msgid "That status is not a favorite."
 msgstr "ØªÙÙ Ø§ÙØØ§ÙØ© ÙÙØ³Øª ÙÙØ¶ÙØ©."
 
-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
+#: actions/apifavoritedestroy.php:136 actions/disfavor.php:87
 msgid "Could not delete favorite."
 msgstr "ØªØ¹Ø°ÙØ± ØØ°Ù Ø§ÙÙÙØ¶ÙØ©."
 
-#: actions/apifriendshipsdestroy.php:120
+#: actions/apifriendshipsdestroy.php:121
 msgid "You cannot unfollow yourself."
 msgstr "ÙØ§ ÙÙÙÙÙ Ø¹Ø¯Ù ÙØªØ§Ø¨Ø¹Ø© ÙÙØ³Ù."
 
@@ -341,67 +339,67 @@ msgstr "ØªØ¹Ø°ÙØ± ØªØØ¯ÙØ¯ Ø§ÙÙØ³ØªØ®Ø¯Ù Ø§ÙÙØµØ¯Ø±."
 msgid "Could not find target user."
 msgstr "ØªØ¹Ø°ÙØ± Ø¥ÙØ¬Ø§Ø¯ Ø§ÙÙØ³ØªØ®Ø¯Ù Ø§ÙÙØ¯Ù."
 
-#: actions/apigroupcreate.php:176 actions/editgroup.php:190
+#: actions/apigroupcreate.php:177 actions/editgroup.php:190
 #: actions/newgroup.php:130 actions/profilesettings.php:238
 #: actions/register.php:215
 msgid "Nickname already in use. Try another one."
 msgstr "Ø§ÙØ§Ø³Ù Ø§ÙÙØ³ØªØ¹Ø§Ø± ÙØ³ØªØ®Ø¯Ù Ø¨Ø§ÙÙØ¹Ù. Ø¬Ø±ÙØ¨ Ø§Ø³ÙÙØ§ Ø¢Ø®Ø±ÙØ§."
 
-#: actions/apigroupcreate.php:183 actions/editgroup.php:193
+#: actions/apigroupcreate.php:184 actions/editgroup.php:193
 #: actions/newgroup.php:133 actions/profilesettings.php:218
 #: actions/register.php:217
 msgid "Not a valid nickname."
 msgstr "ÙÙØ³ Ø§Ø³ÙÙØ§ ÙØ³ØªØ¹Ø§Ø±ÙØ§ ØµØÙØÙØ§."
 
-#: actions/apigroupcreate.php:199 actions/editapplication.php:215
+#: actions/apigroupcreate.php:200 actions/editapplication.php:215
 #: actions/editgroup.php:199 actions/newapplication.php:203
 #: actions/newgroup.php:139 actions/profilesettings.php:222
 #: actions/register.php:224
 msgid "Homepage is not a valid URL."
 msgstr "Ø§ÙØµÙØØ© Ø§ÙØ±Ø¦ÙØ³ÙØ© ÙÙØ³Øª Ø¹ÙÙÙÙØ§ ØµØ§ÙØÙØ§."
 
-#: actions/apigroupcreate.php:208 actions/editgroup.php:202
+#: actions/apigroupcreate.php:209 actions/editgroup.php:202
 #: actions/newgroup.php:142 actions/profilesettings.php:225
 #: actions/register.php:227
 msgid "Full name is too long (max 255 chars)."
 msgstr "Ø§ÙØ§Ø³Ù Ø§ÙÙØ§ÙÙ Ø·ÙÙÙ Ø¬Ø¯Ø§ (Ø§ÙØ£ÙØµÙ 255 ØØ±ÙÙØ§)"
 
-#: actions/apigroupcreate.php:246 actions/editgroup.php:219
+#: actions/apigroupcreate.php:247 actions/editgroup.php:219
 #: actions/newgroup.php:159
 #, php-format
 msgid "Too many aliases! Maximum %d."
 msgstr "ÙÙÙØ§Øª ÙÙØ±Ø©! Ø§ÙØ¹Ø¯Ø¯ Ø§ÙØ£ÙØµÙ ÙÙ %d."
 
-#: actions/apigroupcreate.php:267
+#: actions/apigroupcreate.php:268
 #, php-format
 msgid "Invalid alias: \"%s\"."
 msgstr "ÙÙÙØ© ØºÙØ± ØµØ§ÙØØ©: \"%s\"."
 
-#: actions/apigroupcreate.php:289 actions/editgroup.php:238
+#: actions/apigroupcreate.php:290 actions/editgroup.php:238
 #: actions/newgroup.php:178
 msgid "Alias can't be the same as nickname."
 msgstr ""
 
-#: actions/apigroupismember.php:96 actions/apigroupjoin.php:105
-#: actions/apigroupleave.php:105 actions/apigroupmembership.php:92
+#: actions/apigroupismember.php:96 actions/apigroupjoin.php:106
+#: actions/apigroupleave.php:106 actions/apigroupmembership.php:92
 #: actions/apigroupshow.php:83 actions/apitimelinegroup.php:92
 msgid "Group not found."
 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.
-#: actions/apigroupjoin.php:139 actions/joingroup.php:134 lib/command.php:353
+#: actions/apigroupjoin.php:140 actions/joingroup.php:134 lib/command.php:353
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "ÙÙ ÙÙÙÙ Ø¶Ù Ø§ÙÙØ³ØªØ®Ø¯Ù %1$s Ø¥ÙÙ Ø§ÙÙØ¬ÙÙØ¹Ø© %2$s."
 
-#: actions/apigroupleave.php:115
+#: actions/apigroupleave.php:116
 msgid "You are not a member of this group."
 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.
-#: actions/apigroupleave.php:125 actions/leavegroup.php:129
+#: actions/apigroupleave.php:126 actions/leavegroup.php:129
 #: lib/command.php:401
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
@@ -437,9 +435,9 @@ msgstr ""
 
 #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
 #: actions/deletenotice.php:169 actions/disfavor.php:74
-#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:55
+#: actions/emailsettings.php:271 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:66 actions/imsettings.php:227
+#: actions/groupunblock.php:66 actions/imsettings.php:230
 #: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
@@ -482,8 +480,8 @@ msgstr ""
 #. 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:286 actions/grouplogo.php:322
-#: actions/imsettings.php:242 actions/newapplication.php:121
+#: actions/emailsettings.php:290 actions/grouplogo.php:322
+#: actions/imsettings.php:245 actions/newapplication.php:121
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
 #: actions/smssettings.php:277 lib/designsettings.php:304
 msgid "Unexpected form submission."
@@ -536,18 +534,18 @@ msgstr "Ø§Ø³ÙØ"
 msgid "Allow or deny access to your account information."
 msgstr ""
 
-#: actions/apistatusesretweet.php:75 actions/apistatusesretweets.php:72
+#: actions/apistatusesretweet.php:76 actions/apistatusesretweets.php:72
 #: actions/deletenotice.php:52 actions/shownotice.php:92
 msgid "No such notice."
 msgstr "ÙØ§ Ø¥Ø´Ø¹Ø§Ø± ÙÙØ°Ø§."
 
 #. TRANS: Error text shown when trying to repeat an own notice.
-#: actions/apistatusesretweet.php:83 lib/command.php:538
+#: actions/apistatusesretweet.php:84 lib/command.php:538
 msgid "Cannot repeat your own notice."
 msgstr "ÙØ§ ÙÙÙÙÙ ØªÙØ±Ø§Ø± ÙÙØÙØ¸ØªÙ Ø§ÙØ®Ø§ØµØ©."
 
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-#: actions/apistatusesretweet.php:91 lib/command.php:544
+#: actions/apistatusesretweet.php:92 lib/command.php:544
 msgid "Already repeated that notice."
 msgstr "ÙØ±Ø± Ø¨Ø§ÙÙØ¹Ù ÙØ°Ù Ø§ÙÙÙØ§ØØ¸Ø©."
 
@@ -559,21 +557,21 @@ msgstr "ØÙØ°ÙÙØª Ø§ÙØØ§ÙØ©."
 msgid "No status with that ID found."
 msgstr "ÙØ§ ØØ§ÙØ© ÙÙØ¬Ø¯Øª Ø¨ÙØ°Ù Ø§ÙÙÙÙØ©."
 
-#: actions/apistatusesupdate.php:221
+#: actions/apistatusesupdate.php:222
 msgid "Client must provide a 'status' parameter with a value."
 msgstr ""
 
-#: actions/apistatusesupdate.php:242 actions/newnotice.php:157
+#: actions/apistatusesupdate.php:243 actions/newnotice.php:157
 #: lib/mailhandler.php:60
 #, php-format
 msgid "That's too long. Max notice size is %d chars."
 msgstr "ÙØ°Ù Ø·ÙÙÙØ© Ø¬Ø¯ÙØ§. Ø£Ø·ÙÙ ØØ¬Ù ÙÙØ¥Ø´Ø¹Ø§Ø± %d  ØØ±ÙÙØ§."
 
-#: actions/apistatusesupdate.php:283 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:284 actions/apiusershow.php:96
 msgid "Not found."
 msgstr "ÙÙ ÙÙØ¬Ø¯."
 
-#: actions/apistatusesupdate.php:306 actions/newnotice.php:181
+#: actions/apistatusesupdate.php:307 actions/newnotice.php:181
 #, php-format
 msgid "Max notice size is %d chars, including attachment URL."
 msgstr ""
@@ -742,7 +740,9 @@ msgid "Yes"
 msgstr "ÙØ¹Ù"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
+#. TRANS: Submit button title.
+#. TRANS: Description of the form to block a user.
+#: actions/block.php:164 actions/groupmembers.php:403 lib/blockform.php:82
 msgid "Block this user"
 msgstr "Ø§ÙÙØ¹ ÙØ°Ø§ Ø§ÙÙØ³ØªØ®Ø¯Ù"
 
@@ -775,11 +775,13 @@ msgstr "%1$s ÙÙÙØ§Øª ÙÙÙÙØ¹Ø©, Ø§ÙØµÙØØ© %2$d"
 msgid "Unblock user from group"
 msgstr "Ø£ÙØº ÙÙØ¹ Ø§ÙÙØ³ØªØ®Ø¯Ù ÙÙ Ø§ÙÙØ¬ÙÙØ¹Ø©"
 
-#: actions/blockedfromgroup.php:320 lib/unblockform.php:69
+#. TRANS: Title for the form to unblock a user.
+#: actions/blockedfromgroup.php:320 lib/unblockform.php:70
 msgid "Unblock"
 msgstr "Ø£ÙØºÙ Ø§ÙÙÙØ¹"
 
-#: actions/blockedfromgroup.php:320 lib/unblockform.php:80
+#. TRANS: Description of the form to unblock a user.
+#: actions/blockedfromgroup.php:320 lib/unblockform.php:82
 msgid "Unblock this user"
 msgstr "Ø£ÙØºÙ ÙÙØ¹ ÙØ°Ø§ Ø§ÙÙØ³ØªØ®Ø¯Ù"
 
@@ -813,9 +815,9 @@ msgstr ""
 #. 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/confirmaddress.php:116 actions/emailsettings.php:331
+#: actions/emailsettings.php:477 actions/imsettings.php:283
+#: actions/imsettings.php:442 actions/othersettings.php:174
 #: actions/profilesettings.php:283 actions/smssettings.php:308
 #: actions/smssettings.php:464
 msgid "Couldn't update user."
@@ -823,7 +825,7 @@ msgstr "ØªØ¹Ø°ÙØ± ØªØØ¯ÙØ« Ø§ÙÙØ³ØªØ®Ø¯Ù."
 
 #. 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/confirmaddress.php:128 actions/emailsettings.php:437
 #: actions/smssettings.php:422
 msgid "Couldn't delete email confirmation."
 msgstr "ØªØ¹Ø°ÙØ± ØØ°Ù ØªØ£ÙÙØ¯ Ø§ÙØ¨Ø±ÙØ¯ Ø§ÙØ¥ÙÙØªØ±ÙÙÙ."
@@ -859,9 +861,10 @@ msgstr "ÙÙ ÙÙØ¬Ø¯ Ø§ÙØªØ·Ø¨ÙÙ."
 msgid "You are not the owner of this application."
 msgstr "Ø£ÙØª ÙØ³Øª ÙØ§ÙÙ ÙØ°Ø§ Ø§ÙØªØ·Ø¨ÙÙ."
 
+#. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:127
 #: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1307
+#: lib/action.php:1315
 msgid "There was a problem with your session token."
 msgstr ""
 
@@ -892,7 +895,7 @@ msgstr "Ø§ØØ°Ù ÙØ°Ø§ Ø§ÙØªØ·Ø¨ÙÙ"
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
 #: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:73 lib/profileformaction.php:64
+#: lib/adminpanelaction.php:71 lib/profileformaction.php:64
 #: lib/settingsaction.php:72
 msgid "Not logged in."
 msgstr "ÙØ³Øª ÙØ§ÙØ¬ÙØ§."
@@ -951,7 +954,6 @@ msgstr "Ø§ØØ°Ù ÙØ°Ø§ Ø§ÙÙØ³ØªØ®Ø¯Ù"
 #. TRANS: Message used as title for design settings for the site.
 #. TRANS: Link description in user account settings menu.
 #: actions/designadminpanel.php:63 lib/accountsettingsaction.php:139
-#: lib/groupnav.php:119
 msgid "Design"
 msgstr "Ø§ÙØªØµÙÙÙ"
 
@@ -1062,13 +1064,13 @@ msgstr "Ø§Ø³ØªØ¹Ø¯ Ø§ÙØªØµÙÙÙØ§Øª Ø§ÙÙØ¨Ø¯Ø¦ÙØ©"
 msgid "Reset back to default"
 msgstr "Ø§Ø±Ø¬Ø¹ Ø¥ÙÙ Ø§ÙÙØ¨Ø¯Ø¦Ù"
 
-#. TRANS: Submit button title
+#. TRANS: Submit button title.
 #: actions/designadminpanel.php:685 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/snapshotadminpanel.php:245
 #: actions/subscriptions.php:226 actions/tagother.php:154
-#: actions/useradminpanel.php:294 lib/applicationeditform.php:363
+#: actions/useradminpanel.php:294 lib/applicationeditform.php:353
 #: lib/designsettings.php:256 lib/groupeditform.php:202
 msgid "Save"
 msgstr "Ø£Ø±Ø³Ù"
@@ -1207,7 +1209,7 @@ msgstr "Ø¹ÙÙØ§Ù Ø§ÙØ¨Ø±ÙØ¯ Ø§ÙØ¥ÙÙØªØ±ÙÙÙ Ø§ÙÙÙØ¤ÙØ¯ Ø§ÙØØ§ÙÙ
 #. 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/emailsettings.php:115 actions/emailsettings.php:162
 #: actions/imsettings.php:116 actions/smssettings.php:124
 #: actions/smssettings.php:180
 msgctxt "BUTTON"
@@ -1223,22 +1225,26 @@ msgstr ""
 #. 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
+#. TRANS: Button label in the "Edit application" form.
 #: actions/emailsettings.php:127 actions/imsettings.php:131
-#: actions/smssettings.php:137 lib/applicationeditform.php:357
+#: actions/smssettings.php:137 lib/applicationeditform.php:347
 msgctxt "BUTTON"
 msgid "Cancel"
 msgstr "Ø£ÙØºÙ"
 
-#. TRANS: Instructions for e-mail address input form.
-#: actions/emailsettings.php:135
+#. TRANS: Instructions for e-mail address input form. Do not translate
+#. TRANS: "example.org". It is one of the domain names reserved for
+#. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
+#. TRANS: Any other domain may be owned by a legitimate person or
+#. TRANS: organization.
+#: actions/emailsettings.php:139
 msgid "Email address, like \"UserName@example.org\""
 msgstr "Ø¹ÙÙØ§Ù Ø§ÙØ¨Ø±ÙØ¯ Ø§ÙØ¥ÙÙØªØ±ÙÙÙØ ÙØ«Ù \"UserName@example.org\""
 
 #. 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/emailsettings.php:143 actions/imsettings.php:151
 #: actions/smssettings.php:162
 msgctxt "BUTTON"
 msgid "Add"
@@ -1246,138 +1252,138 @@ msgstr "Ø£Ø¶Ù"
 
 #. 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
+#: actions/emailsettings.php:151 actions/smssettings.php:171
 msgid "Incoming email"
 msgstr "Ø§ÙØ¨Ø±ÙØ¯ Ø§ÙØ¥ÙÙØªØ±ÙÙÙ Ø§ÙÙØ§Ø±Ø¯"
 
 #. 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
+#: actions/emailsettings.php:159 actions/smssettings.php:178
 msgid "Send email to this address to post new notices."
 msgstr "Ø£Ø±Ø³Ù Ø¨Ø±ÙØ¯ÙØ§ Ø¥ÙÙØªØ±ÙÙÙÙØ§ Ø¥ÙÙ ÙØ°Ø§ Ø§ÙØ¹ÙÙØ§Ù ÙØªØ±Ø³Ù Ø¥Ø´Ø¹Ø§Ø±Ø§Øª Ø¬Ø¯ÙØ¯Ø©."
 
 #. 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
+#: actions/emailsettings.php:168 actions/smssettings.php:186
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr "Ø£ÙØ´Ø¦ Ø¹ÙÙØ§Ù Ø¨Ø±ÙØ¯ Ø¥ÙÙØªØ±ÙÙÙ ÙØªØ±Ø³Ù Ø¥ÙÙÙØ Ø£ÙØºÙ Ø§ÙÙØ¯ÙÙ."
 
 #. 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
+#: actions/emailsettings.php:172 actions/smssettings.php:189
 msgctxt "BUTTON"
 msgid "New"
 msgstr "Ø¬Ø¯ÙØ¯"
 
 #. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:174
+#: actions/emailsettings.php:178
 msgid "Email preferences"
 msgstr "ØªÙØ¶ÙÙØ§Øª Ø§ÙØ¨Ø±ÙØ¯ Ø§ÙØ¥ÙÙØªØ±ÙÙÙ"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:180
+#: actions/emailsettings.php:184
 msgid "Send me notices of new subscriptions through email."
 msgstr "Ø£Ø±Ø³Ù ÙÙ Ø¥Ø´Ø¹Ø§Ø±Ø§Øª Ø¨Ø§ÙØ§Ø´ØªØ±Ø§ÙØ§Øª Ø§ÙØ¬Ø¯ÙØ¯Ø© Ø¹Ø¨Ø± Ø§ÙØ¨Ø±ÙØ¯ Ø§ÙØ¥ÙÙØªØ±ÙÙÙ."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:186
+#: actions/emailsettings.php:190
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr "Ø£Ø±Ø³Ù ÙÙ Ø¨Ø±ÙØ¯ÙØ§ Ø¥ÙÙØ±ØªÙÙÙÙØ§ Ø¹ÙØ¯ÙØ§ ÙØ¶ÙÙ Ø£ØØ¯ÙÙ Ø¥Ø´Ø¹Ø§Ø±Ù ÙÙØ¶ÙØ©."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:193
+#: actions/emailsettings.php:197
 msgid "Send me email when someone sends me a private message."
 msgstr "Ø£Ø±Ø³Ù ÙÙ Ø¨Ø±ÙØ¯ÙØ§ Ø¥ÙÙØªØ±ÙÙÙÙØ§ Ø¹ÙØ¯ÙØ§ ÙØ±Ø³Ù ÙÙ Ø£ØØ¯ Ø±Ø³Ø§ÙØ© Ø®Ø§ØµØ©."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:199
+#: actions/emailsettings.php:203
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr "Ø£Ø±Ø³Ù ÙÙ Ø¨Ø±ÙØ¯ÙØ§ Ø¥ÙÙØªØ±ÙÙÙÙØ§ Ø¹ÙØ¯ÙØ§ ÙØ±Ø³Ù ÙÙ Ø£ØØ¯ \"@-Ø±Ø¯\"."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:205
+#: actions/emailsettings.php:209
 msgid "Allow friends to nudge me and send me an email."
 msgstr "Ø§Ø³ÙØ ÙØ£ØµØ¯ÙØ§Ø¦Ù Ø¨ØªÙØ¨ÙÙÙ ÙÙØ±Ø§Ø³ÙØªÙ Ø¹Ø¨Ø± Ø§ÙØ¨Ø±ÙØ¯ Ø§ÙØ¥ÙÙØªØ±ÙÙÙ."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:212
+#: actions/emailsettings.php:216
 msgid "I want to post notices by email."
 msgstr "Ø£Ø±ÙØ¯ Ø£Ù Ø£Ø±Ø³Ù Ø§ÙÙÙØ§ØØ¸Ø§Øª Ø¹Ø¨Ø± Ø§ÙØ¨Ø±ÙØ¯ Ø§ÙØ¥ÙÙØªØ±ÙÙÙ."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:219
+#: actions/emailsettings.php:223
 msgid "Publish a MicroID for my email address."
 msgstr "Ø§ÙØ´Ø± ÙÙÙØ© ÙØµØºÙØ±Ø© ÙØ¹ÙÙØ§Ù Ø¨Ø±ÙØ¯Ù Ø§ÙØ¥ÙÙØªØ±ÙÙÙ."
 
 #. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:334
+#: actions/emailsettings.php:338
 msgid "Email preferences saved."
 msgstr "ØÙÙØ¸Øª ØªÙØ¶ÙÙØ§Øª Ø§ÙØ¨Ø±ÙØ¯ Ø§ÙØ¥ÙÙØ±ØªÙÙÙ."
 
 #. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:353
+#: actions/emailsettings.php:357
 msgid "No email address."
 msgstr "ÙØ§ Ø¹ÙÙØ§Ù Ø¨Ø±ÙØ¯ Ø¥ÙÙØªØ±ÙÙÙ."
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:208
+#: actions/emailsettings.php:370 actions/register.php:208
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "ÙÙØ³ Ø¹ÙÙØ§Ù Ø¨Ø±ÙØ¯ ØµØ§ÙØ."
 
 #. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:370
+#: actions/emailsettings.php:374
 msgid "That is already your email address."
 msgstr "ÙØ°Ø§ ÙÙ Ø¹ÙÙØ§Ù Ø¨Ø±ÙØ¯Ù Ø§ÙØ¥ÙØªØ±ÙÙÙ Ø³Ø§Ø¨ÙÙØ§."
 
 #. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:374
+#: actions/emailsettings.php:378
 msgid "That email address already belongs to another user."
 msgstr "ÙØ°Ø§ Ø§ÙØ¨Ø±ÙØ¯ Ø§ÙØ¥ÙÙØªØ±ÙÙÙ ÙÙÙ ÙØ³ØªØ®Ø¯Ù Ø¢Ø®Ø± Ø¨Ø§ÙÙØ¹Ù."
 
 #. 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/emailsettings.php:395 actions/imsettings.php:351
 #: actions/smssettings.php:373
 msgid "Couldn't insert confirmation code."
 msgstr "ØªØ¹Ø°ÙØ± Ø¥Ø¯Ø±Ø§Ø¬ Ø±ÙØ² Ø§ÙØªØ£ÙÙØ¯."
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:398
+#: actions/emailsettings.php:402
 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 ""
 
 #. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:424
+#: actions/emailsettings.php:428
 msgid "That is the wrong email address."
 msgstr "ÙØ°Ø§ Ø¹ÙÙØ§Ù Ø¨Ø±ÙØ¯ Ø¥ÙÙØªØ±ÙÙÙ Ø®Ø·Ø£."
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:438
+#: actions/emailsettings.php:442
 msgid "Email confirmation cancelled."
 msgstr "Ø£ÙÙØºÙ ØªØ£ÙÙØ¯ Ø§ÙØ¨Ø±ÙØ¯ Ø§ÙØ¥ÙÙØªØ±ÙÙÙ."
 
 #. TRANS: Message given trying to remove an e-mail address that is not
 #. TRANS: registered for the active user.
-#: actions/emailsettings.php:458
+#: actions/emailsettings.php:462
 msgid "That is not your email address."
 msgstr "ÙØ°Ø§ ÙÙØ³ Ø¹ÙÙØ§Ù Ø¨Ø±ÙØ¯Ù Ø§ÙØ¥ÙÙØªØ±ÙÙÙ."
 
 #. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:479
+#: actions/emailsettings.php:483
 msgid "The email address was removed."
 msgstr "Ø£Ø²ÙÙ Ø¹ÙÙØ§Ù Ø§ÙØ¨Ø±ÙØ¯ Ø§ÙØ¥ÙÙØªØ±ÙÙÙ."
 
-#: actions/emailsettings.php:493 actions/smssettings.php:568
+#: actions/emailsettings.php:497 actions/smssettings.php:568
 msgid "No incoming email address."
 msgstr "ÙØ§ Ø¹ÙÙØ§Ù Ø¨Ø±ÙØ¯ Ø¥ÙÙØªØ±ÙÙÙ ÙØ§Ø±Ø¯."
 
 #. 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/emailsettings.php:508 actions/emailsettings.php:532
 #: actions/smssettings.php:578 actions/smssettings.php:602
 msgid "Couldn't update user record."
 msgstr "ØªØ¹Ø°ÙØ± ØªØØ¯ÙØ« Ø³Ø¬Ù Ø§ÙÙØ³ØªØ®Ø¯Ù."
@@ -1487,7 +1493,7 @@ msgstr ""
 msgid "Remote service uses unknown version of OMB protocol."
 msgstr ""
 
-#: actions/finishremotesubscribe.php:138
+#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306
 msgid "Error updating remote profile."
 msgstr "Ø®Ø·Ø£ Ø£Ø«ÙØ§Ø¡ ØªØØ¯ÙØ« Ø§ÙÙÙÙ Ø§ÙØ´Ø®ØµÙ Ø§ÙØ¨Ø¹ÙØ¯."
 
@@ -1536,7 +1542,7 @@ msgstr ""
 msgid "User is not a member of group."
 msgstr "Ø§ÙÙØ³ØªØ®Ø¯Ù ÙÙØ³ Ø¹Ø¶ÙÙØ§ ÙÙ Ø§ÙÙØ¬ÙÙØ¹Ø©."
 
-#: actions/groupblock.php:134 actions/groupmembers.php:360
+#: actions/groupblock.php:134 actions/groupmembers.php:364
 msgid "Block user from group"
 msgstr "Ø§ÙÙØ¹ Ø§ÙÙØ³ØªØ®Ø¯Ù ÙÙ Ø§ÙÙØ¬ÙÙØ¹Ø©"
 
@@ -1605,40 +1611,32 @@ msgstr "ØÙØ¯ÙØ« Ø§ÙØ´Ø¹Ø§Ø±."
 msgid "Failed updating logo."
 msgstr "ÙØ´Ù Ø±ÙØ¹ Ø§ÙØ´Ø¹Ø§Ø±."
 
-#: actions/groupmembers.php:100 lib/groupnav.php:92
+#. TRANS: Title of the page showing group members.
+#. TRANS: %s is the name of the group.
+#: actions/groupmembers.php:102
 #, php-format
 msgid "%s group members"
 msgstr "Ø£Ø¹Ø¶Ø§Ø¡ ÙØ¬ÙÙØ¹Ø© %s"
 
-#: actions/groupmembers.php:103
+#. TRANS: Title of the page showing group members.
+#. TRANS: %1$s is the name of the group, %2$d is the page number of the members list.
+#: actions/groupmembers.php:107
 #, php-format
 msgid "%1$s group members, page %2$d"
 msgstr "%1$s Ø£Ø¹Ø¶Ø§Ø¡ Ø§ÙÙØ¬ÙÙØ¹Ø©, Ø§ÙØµÙØØ© %2$d"
 
-#: actions/groupmembers.php:118
+#: actions/groupmembers.php:122
 msgid "A list of the users in this group."
 msgstr "ÙØ§Ø¦ÙØ© Ø¨ÙØ³ØªØ®Ø¯ÙÙ ÙØ°Ù Ø§ÙÙØ¬ÙÙØ¹Ø©."
 
-#: actions/groupmembers.php:182 lib/groupnav.php:107
+#: actions/groupmembers.php:186
 msgid "Admin"
 msgstr "Ø¥Ø¯Ø§Ø±Ù"
 
-#: actions/groupmembers.php:392 lib/blockform.php:69
-msgid "Block"
-msgstr "Ø§ÙÙØ¹"
-
-#: actions/groupmembers.php:487
+#: actions/groupmembers.php:498
 msgid "Make user an admin of the group"
 msgstr "Ø§Ø¬Ø¹Ù Ø§ÙÙØ³ØªØ®Ø¯Ù Ø¥Ø¯Ø§Ø±ÙÙØ§ ÙÙ Ø§ÙÙØ¬ÙÙØ¹Ø©"
 
-#: actions/groupmembers.php:519
-msgid "Make Admin"
-msgstr "Ø§Ø¬Ø¹ÙÙ Ø¥Ø¯Ø§Ø±ÙÙØ§"
-
-#: actions/groupmembers.php:519
-msgid "Make this user an admin"
-msgstr "Ø§Ø¬Ø¹Ù ÙØ°Ø§ Ø§ÙÙØ³ØªØ®Ø¯Ù Ø¥Ø¯Ø§Ø±ÙÙØ§"
-
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Title in atom group notice feed. %s is a group name.
 #. TRANS: Title in atom user notice feed. %s is a user name.
@@ -1761,7 +1759,10 @@ msgstr ""
 
 #. TRANS: IM address input field instructions in IM settings form.
 #. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:140
+#. TRANS: Do not translate "example.org". It is one of the domain names reserved for use in examples by
+#. TRANS: http://www.rfc-editor.org/rfc/rfc2606.txt. Any other domain may be owned by a legitimate
+#. TRANS: person or organization.
+#: actions/imsettings.php:143
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -1769,38 +1770,38 @@ msgid ""
 msgstr ""
 
 #. TRANS: Form legend for IM preferences form.
-#: actions/imsettings.php:155
+#: actions/imsettings.php:158
 msgid "IM preferences"
 msgstr "ØªÙØ¶ÙÙØ§Øª Ø§ÙÙØØ§Ø¯Ø«Ø© Ø§ÙÙÙØ±ÙØ©"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:166
+#: actions/imsettings.php:169
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr ""
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:172
+#: actions/imsettings.php:175
 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr ""
 
 #. TRANS: Confirmation message for successful IM preferences save.
-#: actions/imsettings.php:287 actions/othersettings.php:180
+#: actions/imsettings.php:290 actions/othersettings.php:180
 msgid "Preferences saved."
 msgstr "ØÙÙÙØ¸Øª Ø§ÙØªÙØ¶ÙÙØ§Øª."
 
 #. TRANS: Message given saving IM address without having provided one.
-#: actions/imsettings.php:309
+#: actions/imsettings.php:312
 msgid "No Jabber ID."
 msgstr "ÙØ§ ÙÙÙØ© Ø¬Ø§Ø¨Ø±."
 
 #. TRANS: Message given saving IM address that not valid.
-#: actions/imsettings.php:322
+#: actions/imsettings.php:325
 msgid "Not a valid Jabber ID"
 msgstr "ÙÙØ³Øª ÙÙÙØ© Ø¬Ø§Ø¨Ø± ØµØ§ÙØØ©"
 
 #. 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
+#: actions/imsettings.php:361
 #, php-format
 msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
@@ -1808,28 +1809,28 @@ msgid ""
 msgstr ""
 
 #. TRANS: Message given canceling IM address confirmation for the wrong IM address.
-#: actions/imsettings.php:388
+#: actions/imsettings.php:391
 msgid "That is the wrong IM address."
 msgstr "ÙØ°Ø§ Ø¹ÙÙØ§Ù ÙØØ§Ø¯Ø«Ø© ÙÙØ±ÙØ© Ø®Ø§Ø·Ø¦."
 
 #. TRANS: Server error thrown on database error canceling IM address confirmation.
-#: actions/imsettings.php:397
+#: actions/imsettings.php:400
 msgid "Couldn't delete IM confirmation."
 msgstr "ØªØ¹Ø°ÙØ± ØØ°Ù ØªØ£ÙÙØ¯ Ø§ÙØ¨Ø±ÙØ¯ Ø§ÙÙØ±Ø§Ø³ÙØ© Ø§ÙÙÙØ±ÙØ©."
 
 #. TRANS: Message given after successfully canceling IM address confirmation.
-#: actions/imsettings.php:402
+#: actions/imsettings.php:405
 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
+#: actions/imsettings.php:427
 msgid "That is not your Jabber ID."
 msgstr "ÙØ°Ù ÙÙØ³Øª ÙÙÙØªÙ ÙÙ Ø¬Ø§Ø¨Ø±."
 
 #. TRANS: Message given after successfully removing a registered IM address.
-#: actions/imsettings.php:447
+#: actions/imsettings.php:450
 msgid "The IM address was removed."
 msgstr "Ø£Ø²ÙÙ Ø¹ÙÙØ§Ù Ø§ÙÙØ±Ø§Ø³ÙØ© Ø§ÙÙÙØ±ÙØ© ÙØ°Ø§."
 
@@ -2192,12 +2193,6 @@ msgstr ""
 msgid "%1$s's status on %2$s"
 msgstr "ØØ§ÙØ© %1$s ÙÙ ÙÙÙ %2$s"
 
-#. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
-#: actions/oembed.php:159
-#, php-format
-msgid "Content type %s not supported."
-msgstr ""
-
 #. TRANS: Error message displaying attachments. %s is the site's base URL.
 #: actions/oembed.php:163
 #, php-format
@@ -2205,8 +2200,8 @@ msgid "Only %s URLs over plain HTTP please."
 msgstr ""
 
 #. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1215
-#: lib/apiaction.php:1243 lib/apiaction.php:1366
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1206
+#: lib/apiaction.php:1233 lib/apiaction.php:1356
 msgid "Not a supported data format."
 msgstr "ÙÙØ³ ÙØ³Ù Ø¨ÙØ§ÙØ§Øª ÙØ¯Ø¹ÙÙ."
 
@@ -2342,7 +2337,7 @@ msgid "Password saved."
 msgstr "ØÙÙØ¸Øª ÙÙÙØ© Ø§ÙØ³Ø±."
 
 #. TRANS: Menu item for site administration
-#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:384
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:371
 msgid "Paths"
 msgstr "Ø§ÙÙØ³Ø§Ø±Ø§Øª"
 
@@ -2543,7 +2538,7 @@ msgstr "Ø§ÙØ§Ø³Ù Ø§ÙÙØ§ÙÙ"
 
 #. TRANS: Form input field label.
 #: actions/profilesettings.php:115 actions/register.php:460
-#: lib/applicationeditform.php:244 lib/groupeditform.php:161
+#: lib/applicationeditform.php:235 lib/groupeditform.php:161
 msgid "Homepage"
 msgstr "Ø§ÙØµÙØØ© Ø§ÙØ±Ø¦ÙØ³ÙØ©"
 
@@ -2634,7 +2629,7 @@ msgid "Couldn't save tags."
 msgstr "ØªØ¹Ø°ÙØ± ØÙØ¸ Ø§ÙÙØ³ÙÙ."
 
 #. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:391 lib/adminpanelaction.php:141
+#: actions/profilesettings.php:391 lib/adminpanelaction.php:138
 msgid "Settings saved."
 msgstr "ØÙÙØ¸Øª Ø§ÙØ¥Ø¹Ø¯Ø§Ø¯Ø§Øª."
 
@@ -3076,7 +3071,7 @@ msgstr "Ø³ØªØ§ØªØ³ ÙØª"
 
 #. TRANS: Menu item for site administration
 #: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
-#: lib/adminpanelaction.php:392
+#: lib/adminpanelaction.php:379
 msgid "Sessions"
 msgstr "Ø§ÙØ¬ÙØ³Ø§Øª"
 
@@ -3106,24 +3101,24 @@ msgid "You must be logged in to view an application."
 msgstr "ÙØ¬Ø¨ Ø£Ù ØªÙÙÙ ÙØ³Ø¬Ù Ø§ÙØ¯Ø®ÙÙ ÙØ±Ø¤ÙØ© ØªØ·Ø¨ÙÙ."
 
 #. TRANS: Form input field label for application icon.
-#: actions/showapplication.php:159 lib/applicationeditform.php:182
+#: actions/showapplication.php:159 lib/applicationeditform.php:173
 msgid "Icon"
 msgstr "Ø£ÙÙÙÙØ©"
 
 #. TRANS: Form input field label for application name.
 #: actions/showapplication.php:169 actions/version.php:197
-#: lib/applicationeditform.php:199
+#: lib/applicationeditform.php:190
 msgid "Name"
 msgstr "Ø§ÙØ§Ø³Ù"
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:178 lib/applicationeditform.php:235
+#: actions/showapplication.php:178 lib/applicationeditform.php:226
 msgid "Organization"
 msgstr "Ø§ÙÙÙØ¸ÙØ©"
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:216 lib/groupeditform.php:172
+#: lib/applicationeditform.php:207 lib/groupeditform.php:172
 msgid "Description"
 msgstr "Ø§ÙÙØµÙ"
 
@@ -3201,26 +3196,11 @@ msgid ""
 "notices you like to bookmark them for later or shed a spotlight on them."
 msgstr ""
 
-#: actions/showfavorites.php:208
-#, php-format
-msgid ""
-"%s hasn't added any favorite notices yet. Post something interesting they "
-"would add to their favorites :)"
-msgstr ""
-
-#: actions/showfavorites.php:212
-#, php-format
-msgid ""
-"%s hasn't added any favorite notices yet. Why not [register an account](%%%%"
-"action.register%%%%) and then post something interesting they would add to "
-"their favorites :)"
-msgstr ""
-
 #: actions/showfavorites.php:243
 msgid "This is a way to share what you like."
 msgstr "Ø¥ÙÙØ§ Ø¥ØØ¯Ù ÙØ³Ø§Ø¦Ù ÙØ´Ø§Ø±ÙØ© ÙØ§ ØªØØ¨."
 
-#: actions/showgroup.php:82 lib/groupnav.php:86
+#: actions/showgroup.php:82
 #, php-format
 msgid "%s group"
 msgstr "ÙØ¬ÙÙØ¹Ø© %s"
@@ -3263,7 +3243,7 @@ msgstr ""
 msgid "Notice feed for %s group (Atom)"
 msgstr ""
 
-#: actions/showgroup.php:393 actions/showgroup.php:445 lib/groupnav.php:91
+#: actions/showgroup.php:393 actions/showgroup.php:445
 msgid "Members"
 msgstr "Ø§ÙØ£Ø¹Ø¶Ø§Ø¡"
 
@@ -3645,7 +3625,7 @@ msgstr "ÙÙ ØªØ¯Ø®Ù Ø±ÙØ²ÙØ§"
 
 #. TRANS: Menu item for site administration
 #: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
-#: lib/adminpanelaction.php:408
+#: lib/adminpanelaction.php:395
 msgid "Snapshots"
 msgstr ""
 
@@ -4225,7 +4205,7 @@ msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
 
 #. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#: classes/Subscription.php:75 lib/oauthstore.php:465
+#: classes/Subscription.php:75 lib/oauthstore.php:466
 msgid "You have been banned from subscribing."
 msgstr ""
 
@@ -4368,7 +4348,8 @@ msgid "Change site configuration"
 msgstr "ØºÙÙØ± Ø¶Ø¨Ø· Ø§ÙÙÙÙØ¹"
 
 #. TRANS: Main menu option when logged in and site admin for access to site configuration
-#: lib/action.php:474
+#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
+#: lib/action.php:474 lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr "Ø¥Ø¯Ø§Ø±Ù"
@@ -4445,7 +4426,7 @@ msgstr "Ø§Ø¨ØØ«"
 
 #. TRANS: DT element for site notice. String is hidden in default CSS.
 #. TRANS: Menu item for site administration
-#: lib/action.php:538 lib/adminpanelaction.php:400
+#: lib/action.php:538 lib/adminpanelaction.php:387
 msgid "Site notice"
 msgstr "Ø¥Ø´Ø¹Ø§Ø± Ø§ÙÙÙÙØ¹"
 
@@ -4503,22 +4484,17 @@ msgstr "Ø§ÙØ¬Ø³Ø±"
 msgid "StatusNet software license"
 msgstr "Ø±Ø®ØµØ© Ø¨Ø±ÙØ§ÙØ¬ StatusNet"
 
-#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
-#: lib/action.php:843
-#, php-format
-msgid ""
-"**%%site.name%%** is a microblogging service brought to you by [%%site."
-"broughtby%%](%%site.broughtbyurl%%)."
-msgstr ""
-
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:846
+#: lib/action.php:849
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr ""
 
 #. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.
-#: lib/action.php:850
+#. TRANS: Make sure there is no whitespace between "]" and "(".
+#. TRANS: Text between [] is a link description, text between () is the link itself.
+#. TRANS: %s is the version of StatusNet that is being used.
+#: lib/action.php:856
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4530,44 +4506,45 @@ msgstr ""
 "agpl-3.0.html)."
 
 #. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:866
+#: lib/action.php:872
 msgid "Site content license"
 msgstr "Ø±Ø®ØµØ© ÙØØªÙÙ Ø§ÙÙÙÙØ¹"
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:873
+#: lib/action.php:879
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:880
+#: lib/action.php:886
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:884
+#: lib/action.php:890
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 
-#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:897
+#. TRANS: license message in footer.
+#. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
+#: lib/action.php:904
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr ""
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1247
+#: lib/action.php:1254
 msgid "After"
 msgstr "Ø¨Ø¹Ø¯"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1257
+#: lib/action.php:1264
 msgid "Before"
 msgstr "ÙØ¨Ù"
 
@@ -4576,174 +4553,198 @@ msgstr "ÙØ¨Ù"
 msgid "Expecting a root feed element but got a whole XML document."
 msgstr ""
 
-#: lib/activityutils.php:208
+#. TRANS: Client exception thrown when there is no source attribute.
+#: lib/activityutils.php:203
 msgid "Can't handle remote content yet."
 msgstr ""
 
-#: lib/activityutils.php:244
+#. TRANS: Client exception thrown when there embedded XML content is found that cannot be processed yet.
+#: lib/activityutils.php:240
 msgid "Can't handle embedded XML content yet."
 msgstr ""
 
-#: lib/activityutils.php:248
+#. TRANS: Client exception thrown when base64 encoded content is found that cannot be processed yet.
+#: lib/activityutils.php:245
 msgid "Can't handle embedded Base64 content yet."
 msgstr ""
 
 #. TRANS: Client error message thrown when a user tries to change admin settings but has no access rights.
-#: lib/adminpanelaction.php:98
+#: lib/adminpanelaction.php:96
 msgid "You cannot make changes to this site."
 msgstr "ÙØ§ ÙÙÙÙÙ Ø¥Ø¬Ø±Ø§Ø¡ ØªØºÙÙØ±Ø§Øª Ø¹ÙÙ ÙØ°Ø§ Ø§ÙÙÙÙØ¹."
 
 #. TRANS: Client error message throw when a certain panel's settings cannot be changed.
-#: lib/adminpanelaction.php:110
+#: lib/adminpanelaction.php:108
 msgid "Changes to that panel are not allowed."
 msgstr "Ø§ÙØªØºÙÙØ±Ø§Øª ÙÙØ°Ù Ø§ÙÙÙØØ© ØºÙØ± ÙØ³ÙÙØ Ø¨ÙØ§."
 
 #. TRANS: Client error message thrown if design settings could not be deleted in
 #. TRANS: the admin panel Design.
-#: lib/adminpanelaction.php:284
+#: lib/adminpanelaction.php:274
 msgid "Unable to delete design setting."
 msgstr "ØªØ¹Ø°ÙØ± ØØ°Ù Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª Ø§ÙØªØµÙÙÙ."
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:350
+#: lib/adminpanelaction.php:337
 msgid "Basic site configuration"
 msgstr "Ø¶Ø¨Ø· Ø§ÙÙÙÙØ¹ Ø§ÙØ£Ø³Ø§Ø³Ù"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:352
+#: lib/adminpanelaction.php:339
 msgctxt "MENU"
 msgid "Site"
 msgstr "Ø§ÙÙÙÙØ¹"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:358
+#: lib/adminpanelaction.php:345
 msgid "Design configuration"
 msgstr "Ø¶Ø¨Ø· Ø§ÙØªØµÙÙÙ"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:360
+#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
+#: lib/adminpanelaction.php:347 lib/groupnav.php:135
 msgctxt "MENU"
 msgid "Design"
 msgstr "Ø§ÙØªØµÙÙÙ"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:366
+#: lib/adminpanelaction.php:353
 msgid "User configuration"
 msgstr "Ø¶Ø¨Ø· Ø§ÙÙØ³ØªØ®Ø¯Ù"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:368 lib/personalgroupnav.php:115
+#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:115
 msgid "User"
 msgstr "Ø§ÙÙØ³ØªØ®Ø¯Ù"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:374
+#: lib/adminpanelaction.php:361
 msgid "Access configuration"
 msgstr "Ø¶Ø¨Ø· Ø§ÙØØ³Ø§Ø¨"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:382
+#: lib/adminpanelaction.php:369
 msgid "Paths configuration"
 msgstr "Ø¶Ø¨Ø· Ø§ÙÙØ³Ø§Ø±Ø§Øª"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:390
+#: lib/adminpanelaction.php:377
 msgid "Sessions configuration"
 msgstr "Ø¶Ø¨Ø· Ø§ÙØ¬ÙØ³Ø§Øª"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:398
+#: lib/adminpanelaction.php:385
 msgid "Edit site notice"
 msgstr "Ø¹Ø¯ÙÙ Ø¥Ø´Ø¹Ø§Ø± Ø§ÙÙÙÙØ¹"
 
 #. TRANS: Client error 401.
-#: lib/apiauth.php:113
+#: lib/apiauth.php:111
 msgid "API resource requires read-write access, but you only have read access."
 msgstr ""
 
+#. TRANS: OAuth exception thrown when no application is found for a given consumer key.
+#: lib/apiauth.php:175
+msgid "No application for that consumer key."
+msgstr ""
+
+#. TRANS: OAuth exception given when an incorrect access token was given for a user.
+#: lib/apiauth.php:212
+msgid "Bad access token."
+msgstr ""
+
+#. TRANS: OAuth exception given when no user was found for a given token (no token was found).
+#: lib/apiauth.php:217
+msgid "No user for that token."
+msgstr ""
+
+#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
+#: lib/apioauthstore.php:178
+msgid "Tried to revoke unknown token"
+msgstr ""
+
 #. TRANS: Form legend.
-#: lib/applicationeditform.php:137
+#: lib/applicationeditform.php:129
 msgid "Edit application"
 msgstr "Ø¹Ø¯ÙÙ Ø§ÙØªØ·Ø¨ÙÙ"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:187
+#: lib/applicationeditform.php:178
 msgid "Icon for this application"
 msgstr "Ø£ÙÙÙÙØ© ÙÙØ°Ø§ Ø§ÙØªØ·Ø¨ÙÙ"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:213
+#: lib/applicationeditform.php:204
 msgid "Describe your application"
 msgstr "ØµÙ ØªØ·Ø¨ÙÙÙ"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:224
+#: lib/applicationeditform.php:215
 msgid "URL of the homepage of this application"
 msgstr "ÙØ³Ø§Ø± ØµÙØØ© ÙØ°Ø§ Ø§ÙØªØ·Ø¨ÙÙ"
 
 #. TRANS: Form input field label.
-#: lib/applicationeditform.php:226
+#: lib/applicationeditform.php:217
 msgid "Source URL"
 msgstr "ÙØ³Ø§Ø± Ø§ÙÙØµØ¯Ø±"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:251
+#: lib/applicationeditform.php:242
 msgid "URL to redirect to after authentication"
 msgstr ""
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:278
+#: lib/applicationeditform.php:269
 msgid "Browser"
 msgstr "ÙØªØµÙØ"
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:295
+#: lib/applicationeditform.php:286
 msgid "Desktop"
 msgstr ""
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:297
+#: lib/applicationeditform.php:288
 msgid "Type of application, browser or desktop"
 msgstr ""
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:320
+#: lib/applicationeditform.php:311
 msgid "Read-only"
 msgstr ""
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:339
+#: lib/applicationeditform.php:330
 msgid "Read-write"
 msgstr ""
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:341
+#: lib/applicationeditform.php:332
 msgid "Default access for this application: read-only, or read-write"
 msgstr ""
 
-#. TRANS: Submit button title
-#: lib/applicationeditform.php:359
+#. TRANS: Submit button title.
+#: lib/applicationeditform.php:349
 msgid "Cancel"
 msgstr "Ø£ÙØºÙ"
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:136
+#: lib/applicationlist.php:135
 msgid "read-write"
 msgstr ""
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:138
+#: lib/applicationlist.php:137
 msgid "read-only"
 msgstr ""
 
 #. 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
+#: lib/applicationlist.php:143
 #, php-format
 msgid "Approved %1$s - \"%2$s\" access."
 msgstr ""
 
 #. TRANS: Button label
-#: lib/applicationlist.php:159
+#: lib/applicationlist.php:158
 msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "Ø£Ø²Ù"
@@ -4763,7 +4764,8 @@ msgstr "Ø§ÙÙØ¤ÙÙ"
 msgid "Provider"
 msgstr "Ø§ÙÙØ²ÙØ¯"
 
-#: lib/attachmenttagcloudsection.php:48
+#. TRANS: Title.
+#: lib/attachmenttagcloudsection.php:49
 msgid "Tags for this attachment"
 msgstr "ÙØ³ÙÙ ÙØ°Ø§ Ø§ÙÙØ±ÙÙ"
 
@@ -4775,6 +4777,11 @@ msgstr "ØªØºÙÙØ± ÙÙÙØ© Ø§ÙØ³Ø± ÙØ´Ù"
 msgid "Password changing is not allowed"
 msgstr "ØªØºÙÙØ± ÙÙÙØ© Ø§ÙØ³Ø± ØºÙØ± ÙØ³ÙÙØ Ø¨Ù"
 
+#. TRANS: Title for the form to block a user.
+#: lib/blockform.php:70
+msgid "Block"
+msgstr "Ø§ÙÙØ¹"
+
 #: lib/channel.php:157 lib/channel.php:177
 msgid "Command results"
 msgstr "ÙØªØ§Ø¦Ø¬ Ø§ÙØ£ÙØ±"
@@ -4787,6 +4794,13 @@ msgstr "Ø§ÙØªÙÙ Ø§ÙØ£ÙØ±"
 msgid "Command failed"
 msgstr "ÙØ´Ù Ø§ÙØ£ÙØ±"
 
+#. TRANS: Message given getting a non-existing user.
+#. TRANS: %s is the nickname of the user that could not be found.
+#: lib/command.php:150
+#, php-format
+msgid "Could not find a local user with nickname %s."
+msgstr ""
+
 #. TRANS: Command exception text shown when a user tries to nudge themselves.
 #: lib/command.php:231
 msgid "It does not make a lot of sense to nudge yourself!"
@@ -4807,6 +4821,20 @@ msgstr ""
 "Ø§ÙÙØ´ØªØ±ÙÙÙ: %2$s\n"
 "Ø§ÙØ¥Ø´Ø¹Ø§Ø±Ø§Øª: %3$s"
 
+#. 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.
+#: lib/command.php:360
+#, php-format
+msgid "%1$s joined group %2$s."
+msgstr ""
+
+#. 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.
+#: lib/command.php:408
+#, php-format
+msgid "%1$s left group %2$s."
+msgstr ""
+
 #. TRANS: Whois output. %s is the full name of the queried user.
 #: lib/command.php:434
 #, php-format
@@ -4875,12 +4903,26 @@ msgstr ""
 msgid "Can't subscribe to OMB profiles by command."
 msgstr ""
 
+#. TRANS: Text shown after having subscribed to another user successfully.
+#. TRANS: %s is the name of the user the subscription was requested for.
+#: lib/command.php:672
+#, php-format
+msgid "Subscribed to %s."
+msgstr ""
+
 #. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
 #. TRANS: Error text shown when no username was provided when issuing the command.
 #: lib/command.php:694 lib/command.php:804
 msgid "Specify the name of the user to unsubscribe from."
 msgstr ""
 
+#. TRANS: Text shown after having unsubscribed from another user successfully.
+#. TRANS: %s is the name of the user the unsubscription was requested for.
+#: lib/command.php:705
+#, php-format
+msgid "Unsubscribed from %s."
+msgstr ""
+
 #. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
 #. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
 #: lib/command.php:724 lib/command.php:750
@@ -4919,13 +4961,20 @@ msgstr ""
 msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr ""
 
+#. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
+#. TRANS: %s is the name of the user the unsubscription was requested for.
+#: lib/command.php:813
+#, php-format
+msgid "Unsubscribed %s."
+msgstr ""
+
 #. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
 #: lib/command.php:831
 msgid "You are not subscribed to anyone."
 msgstr "ÙØ³Øª ÙÙØ´ØªØ±ÙÙØ§ Ø¨Ø£Ù Ø£ØØ¯."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to.
-#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.
 #: lib/command.php:836
 msgid "You are subscribed to this person:"
@@ -4944,7 +4993,7 @@ msgid "No one is subscribed to you."
 msgstr "ÙØ§ Ø£ØØ¯ ÙØ´ØªØ±Ù Ø¨Ù."
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
-#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
 #: lib/command.php:863
 msgid "This person is subscribed to you:"
@@ -4963,7 +5012,7 @@ msgid "You are not a member of any groups."
 msgstr "ÙØ³Øª Ø¹Ø¶ÙÙØ§ ÙÙ Ø£Ù ÙØ¬ÙÙØ¹Ø©."
 
 #. TRANS: Text shown after requesting groups a user is subscribed to.
-#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
 #: lib/command.php:890
 msgid "You are a member of this group:"
@@ -4975,6 +5024,7 @@ msgstr[3] "Ø£ÙØª Ø¹Ø¶Ù ÙÙ ÙØ°Ù Ø§ÙÙØ¬ÙÙØ¹Ø§Øª:"
 msgstr[4] ""
 msgstr[5] ""
 
+#. TRANS: Help text for commands.
 #: lib/command.php:905
 msgid ""
 "Commands:\n"
@@ -5170,33 +5220,6 @@ msgstr "ØµÙÙ Ø§ÙÙØ¬ÙÙØ¹Ø© Ø£Ù Ø§ÙÙÙØ¶ÙØ¹"
 msgid "Extra nicknames for the group, comma- or space- separated, max %d"
 msgstr ""
 
-#: lib/groupnav.php:85
-msgid "Group"
-msgstr "ÙØ¬ÙÙØ¹Ø§Øª"
-
-#: lib/groupnav.php:101
-msgid "Blocked"
-msgstr "ÙÙÙÙØ¹"
-
-#: lib/groupnav.php:108
-#, php-format
-msgid "Edit %s group properties"
-msgstr "Ø¹Ø¯ÙÙ Ø®ØµØ§Ø¦Øµ ÙØ¬ÙÙØ¹Ø© %s"
-
-#: lib/groupnav.php:113
-msgid "Logo"
-msgstr "Ø§ÙØ´Ø¹Ø§Ø±"
-
-#: lib/groupnav.php:114
-#, php-format
-msgid "Add or edit %s logo"
-msgstr "Ø£Ø¶Ù Ø£Ù Ø¹Ø¯ÙÙ Ø´Ø¹Ø§Ø± %s"
-
-#: lib/groupnav.php:120
-#, php-format
-msgid "Add or edit %s design"
-msgstr "Ø£Ø¶Ù Ø£Ù Ø¹Ø¯Ù ØªØµÙÙÙ %s"
-
 #: lib/groupsbymemberssection.php:71
 msgid "Groups with most members"
 msgstr "Ø§ÙÙØ¬ÙÙØ¹Ø§Øª Ø§ÙØ£ÙØ«Ø± Ø£Ø¹Ø¶Ø§Ø¡Ù"
@@ -5220,7 +5243,8 @@ msgstr ""
 msgid "That file is too big. The maximum file size is %s."
 msgstr "ÙØ°Ø§ Ø§ÙÙÙÙ ÙØ¨ÙØ± Ø¬Ø¯ÙØ§. Ø¥Ù Ø£ÙØµÙ ØØ¬Ù ÙÙÙÙÙØ§Øª ÙÙ %s."
 
-#: lib/imagefile.php:101 lib/mediafile.php:170
+#. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
+#: lib/imagefile.php:101 lib/mediafile.php:179
 msgid "System error uploading file."
 msgstr ""
 
@@ -5525,56 +5549,75 @@ msgstr "ÙÙØ³ ÙØ³ØªØ®Ø¯ÙÙØ§ ÙØ³Ø¬ÙÙØ§."
 msgid "Unsupported message type: %s"
 msgstr "ÙÙØ¹ Ø±Ø³Ø§ÙØ© ØºÙØ± ÙØ¯Ø¹ÙÙ: %s"
 
-#: lib/mediafile.php:98 lib/mediafile.php:123
+#. TRANS: Client exception thrown when a database error was thrown during a file upload operation.
+#: lib/mediafile.php:99 lib/mediafile.php:125
 msgid "There was a database error while saving your file. Please try again."
 msgstr ""
 
-#: lib/mediafile.php:142
+#. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
+#: lib/mediafile.php:145
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
 msgstr ""
 
-#: lib/mediafile.php:147
+#. TRANS: Client exception.
+#: lib/mediafile.php:151
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form."
 msgstr ""
 
-#: lib/mediafile.php:152
+#. TRANS: Client exception.
+#: lib/mediafile.php:157
 msgid "The uploaded file was only partially uploaded."
 msgstr ""
 
-#: lib/mediafile.php:159
+#. TRANS: Client exception thrown when a temporary folder is not present to store a file upload.
+#: lib/mediafile.php:165
 msgid "Missing a temporary folder."
 msgstr ""
 
-#: lib/mediafile.php:162
+#. TRANS: Client exception thrown when writing to disk is not possible during a file upload operation.
+#: lib/mediafile.php:169
 msgid "Failed to write file to disk."
 msgstr "ÙØ´Ù ÙÙ ÙØªØ§Ø¨Ø© Ø§ÙÙÙÙ Ø¥ÙÙ Ø§ÙÙØ±Øµ."
 
-#: lib/mediafile.php:165
+#. TRANS: Client exception thrown when a file upload operation has been stopped by an extension.
+#: lib/mediafile.php:173
 msgid "File upload stopped by extension."
 msgstr "Ø£ÙÙÙØª Ø¥Ø¶Ø§ÙØ© Ø±ÙØ¹ Ø§ÙÙÙÙ."
 
-#: lib/mediafile.php:179 lib/mediafile.php:217
+#. TRANS: Client exception thrown when a file upload operation would cause a user to exceed a set quota.
+#: lib/mediafile.php:189 lib/mediafile.php:232
 msgid "File exceeds user's quota."
 msgstr ""
 
-#: lib/mediafile.php:197 lib/mediafile.php:234
+#. TRANS: Client exception thrown when a file upload operation fails because the file could
+#. TRANS: not be moved from the temporary folder to the permanent file location.
+#: lib/mediafile.php:209 lib/mediafile.php:251
 msgid "File could not be moved to destination directory."
 msgstr ""
 
-#: lib/mediafile.php:202 lib/mediafile.php:238
+#. TRANS: Client exception thrown when a file upload operation has been stopped because the MIME
+#. TRANS: type of the uploaded file could not be determined.
+#: lib/mediafile.php:216 lib/mediafile.php:257
 msgid "Could not determine file's MIME type."
 msgstr "ÙÙ ÙÙÙÙ ØªØØ¯ÙØ¯ ÙÙØ¹ MIME ÙÙÙÙÙ."
 
-#: lib/mediafile.php:318
+#. TRANS: Client exception thrown trying to upload a forbidden MIME type.
+#. TRANS: %1$s is the file type that was denied, %2$s is the application part of
+#. TRANS: the MIME type that was denied.
+#: lib/mediafile.php:340
 #, php-format
-msgid " Try using another %s format."
+msgid ""
+"\"%1$s\" is not a supported file type on this server. Try using another %2$s "
+"format."
 msgstr ""
 
-#: lib/mediafile.php:323
+#. TRANS: Client exception thrown trying to upload a forbidden MIME type.
+#. TRANS: %s is the file type that was denied.
+#: lib/mediafile.php:345
 #, php-format
-msgid "%s is not a supported file type on this server."
+msgid "\"%s\" is not a supported file type on this server."
 msgstr ""
 
 #: lib/messageform.php:120
@@ -5686,27 +5729,7 @@ msgstr "ÙØ¨ÙÙ ÙØ°Ø§ Ø§ÙÙØ³ØªØ®Ø¯Ù"
 msgid "Nudge"
 msgstr "ÙØ¨ÙÙ"
 
-#: lib/oauthstore.php:283
-msgid "Error inserting new profile"
-msgstr "Ø®Ø·Ø£ Ø£Ø«ÙØ§Ø¡ Ø¥Ø¯Ø±Ø§Ø¬ Ø§ÙÙÙÙ Ø§ÙØ´Ø®ØµÙ Ø§ÙØ¬Ø¯ÙØ¯"
-
-#: lib/oauthstore.php:291
-msgid "Error inserting avatar"
-msgstr "Ø®Ø·Ø£ ÙÙ Ø¥Ø¯Ø±Ø§Ø¬ Ø§ÙØ£ÙØªØ§Ø±"
-
-#: lib/oauthstore.php:306
-msgid "Error updating remote profile"
-msgstr "Ø®Ø·Ø£ Ø£Ø«ÙØ§Ø¡ ØªØØ¯ÙØ« Ø§ÙÙÙÙ Ø§ÙØ´Ø®ØµÙ Ø§ÙØ¨Ø¹ÙØ¯"
-
-#: lib/oauthstore.php:311
-msgid "Error inserting remote profile"
-msgstr "Ø®Ø·Ø£ Ø£Ø«ÙØ§Ø¡ Ø¥Ø¯Ø±Ø§Ø¬ Ø§ÙÙÙÙ Ø§ÙØ´Ø®ØµÙ Ø§ÙØ¨Ø¹ÙØ¯"
-
-#: lib/oauthstore.php:345
-msgid "Duplicate notice"
-msgstr "Ø¶Ø§Ø¹Ù Ø§ÙØ¥Ø´Ø¹Ø§Ø±"
-
-#: lib/oauthstore.php:490
+#: lib/oauthstore.php:491
 msgid "Couldn't insert new subscription."
 msgstr "ØªØ¹Ø°ÙØ± Ø¥Ø¯Ø±Ø§Ø¬ Ø§Ø´ØªØ±Ø§Ù Ø¬Ø¯ÙØ¯."
 
@@ -5743,7 +5766,8 @@ msgstr "Ø±Ø³Ø§Ø¦ÙÙ Ø§ÙÙÙØ±Ø³ÙØ©"
 msgid "Tags in %s's notices"
 msgstr "ÙØ³ÙÙ ÙÙ Ø¥Ø´Ø¹Ø§Ø±Ø§Øª %s"
 
-#: lib/plugin.php:115
+#. TRANS: Displayed as version information for a plugin if no version information was found.
+#: lib/plugin.php:116
 msgid "Unknown"
 msgstr "ØºÙØ± ÙØ¹Ø±ÙÙØ©"
 
@@ -5832,19 +5856,19 @@ msgstr ""
 msgid "Sandbox this user"
 msgstr "Ø£Ø¶Ù ÙØ°Ø§ Ø§ÙÙØ³ØªØ®Ø¯Ù Ø¥ÙÙ ØµÙØ¯ÙÙ Ø§ÙØ±ÙÙ"
 
-#: lib/searchaction.php:120
+#. TRANS: Fieldset legend for the search form.
+#: lib/searchaction.php:121
 msgid "Search site"
 msgstr "Ø§Ø¨ØØ« ÙÙ Ø§ÙÙÙÙØ¹"
 
-#: lib/searchaction.php:126
+#. TRANS: Used as a field label for the field where one or more keywords
+#. TRANS: for searching can be entered.
+#: lib/searchaction.php:129
 msgid "Keyword(s)"
 msgstr "Ø§ÙÙÙÙØ§Øª Ø§ÙÙÙØªØ§ØÙØ©"
 
-#: lib/searchaction.php:127
-msgid "Search"
-msgstr "Ø§Ø¨ØØ«"
-
-#: lib/searchaction.php:162
+#. TRANS: Definition list item with instructions on how to get (better) search results.
+#: lib/searchaction.php:170
 msgid "Search help"
 msgstr "Ø§Ø¨ØØ« ÙÙ Ø§ÙÙØ³Ø§Ø¹Ø¯Ø©"
 
@@ -6024,12 +6048,12 @@ msgid "Moderator"
 msgstr "ÙØ±Ø§ÙØ¨"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1102
+#: lib/util.php:1103
 msgid "a few seconds ago"
 msgstr "ÙØ¨Ù ÙØØ¸Ø§Øª ÙÙÙÙØ©"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1105
+#: lib/util.php:1106
 msgid "about a minute ago"
 msgstr "ÙØ¨Ù Ø¯ÙÙÙØ© ØªÙØ±ÙØ¨ÙØ§"
 
@@ -6039,17 +6063,17 @@ msgid "about an hour ago"
 msgstr "ÙØ¨Ù Ø³Ø§Ø¹Ø© ØªÙØ±ÙØ¨ÙØ§"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1119
+#: lib/util.php:1118
 msgid "about a day ago"
 msgstr "ÙØ¨Ù ÙÙÙ ØªÙØ±ÙØ¨Ø§"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1126
+#: lib/util.php:1124
 msgid "about a month ago"
 msgstr "ÙØ¨Ù Ø´ÙØ± ØªÙØ±ÙØ¨ÙØ§"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1133
+#: lib/util.php:1130
 msgid "about a year ago"
 msgstr "ÙØ¨Ù Ø³ÙØ© ØªÙØ±ÙØ¨ÙØ§"
 
diff --git a/locale/arz/LC_MESSAGES/statusnet.po b/locale/arz/LC_MESSAGES/statusnet.po
index 415c703931..e549610ab1 100644
--- a/locale/arz/LC_MESSAGES/statusnet.po
+++ b/locale/arz/LC_MESSAGES/statusnet.po
@@ -1,8 +1,9 @@
-# Translation of StatusNet to Egyptian Spoken Arabic
+# Translation of StatusNet to Egyptian Spoken Arabic (ÙØµØ±Ù)
+# Expored from translatewiki.net
 #
-# Author@translatewiki.net: Dudi
-# Author@translatewiki.net: Ghaly
-# Author@translatewiki.net: Meno25
+# Author: Dudi
+# Author: Ghaly
+# Author: Meno25
 # --
 # This file is distributed under the same license as the StatusNet package.
 #
@@ -10,21 +11,23 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-08 22:33+0000\n"
-"PO-Revision-Date: 2010-09-08 22:33:16+0000\n"
-"Language-Team: Egyptian Spoken Arabic\n"
+"POT-Creation-Date: 2010-09-14 19:53+0000\n"
+"PO-Revision-Date: 2010-09-14 19:53:40+0000\n"
+"Language-Team: Egyptian Spoken Arabic <http://translatewiki.net/wiki/Portal:"
+"arz>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r72348); Translate extension (2010-08-20)\n"
+"X-Generator: MediaWiki 1.17alpha (r73009); Translate extension (2010-08-20)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: arz\n"
-"X-Message-Group: out-statusnet\n"
+"X-Message-Group: #out-statusnet\n"
 "Plural-Forms: nplurals=6; plural= n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
 "&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
+"X-POT-Import-Date: 1284-49-16 34::+0000\n"
 
 #. TRANS: Page title
 #. TRANS: Menu item for site administration
-#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:376
+#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:363
 msgid "Access"
 msgstr "ÙÙØ§Ø°"
 
@@ -67,15 +70,15 @@ msgstr "ÙØ§ ÙØ³Ù ÙÙØ°Ø§."
 
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #: actions/all.php:79 actions/allrss.php:68
-#: actions/apiaccountupdatedeliverydevice.php:114
-#: actions/apiaccountupdateprofile.php:105
-#: actions/apiaccountupdateprofilebackgroundimage.php:116
-#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
-#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
-#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:113
-#: actions/apigroupismember.php:91 actions/apigroupjoin.php:100
-#: actions/apigroupleave.php:100 actions/apigrouplist.php:73
-#: actions/apistatusesupdate.php:229 actions/apisubscriptions.php:87
+#: actions/apiaccountupdatedeliverydevice.php:115
+#: actions/apiaccountupdateprofile.php:106
+#: actions/apiaccountupdateprofilebackgroundimage.php:117
+#: actions/apiaccountupdateprofileimage.php:106 actions/apiblockcreate.php:98
+#: actions/apiblockdestroy.php:97 actions/apidirectmessage.php:77
+#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:114
+#: actions/apigroupismember.php:91 actions/apigroupjoin.php:101
+#: actions/apigroupleave.php:101 actions/apigrouplist.php:73
+#: actions/apistatusesupdate.php:230 actions/apisubscriptions.php:87
 #: actions/apitimelinefavorites.php:72 actions/apitimelinefriends.php:174
 #: actions/apitimelinehome.php:80 actions/apitimelinementions.php:80
 #: actions/apitimelineuser.php:82 actions/avatarbynickname.php:75
@@ -146,29 +149,22 @@ msgid ""
 "to them](%%%%action.newnotice%%%%?status_textarea=%3$s)."
 msgstr ""
 
-#: actions/all.php:149 actions/replies.php:210 actions/showstream.php:211
-#, php-format
-msgid ""
-"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
-"post a notice to them."
-msgstr ""
-
 #. TRANS: H1 text
 #: actions/all.php:182
 msgid "You and friends"
 msgstr "Ø£ÙØª ÙØ§ÙØ£ØµØ¯ÙØ§Ø¡"
 
 #: actions/apiaccountratelimitstatus.php:72
-#: actions/apiaccountupdatedeliverydevice.php:94
-#: actions/apiaccountupdateprofile.php:97
-#: actions/apiaccountupdateprofilebackgroundimage.php:94
-#: actions/apiaccountupdateprofilecolors.php:118
+#: actions/apiaccountupdatedeliverydevice.php:95
+#: actions/apiaccountupdateprofile.php:98
+#: actions/apiaccountupdateprofilebackgroundimage.php:95
+#: actions/apiaccountupdateprofilecolors.php:119
 #: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156
-#: actions/apifavoritecreate.php:100 actions/apifavoritedestroy.php:101
-#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100
-#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:139
-#: actions/apigroupismember.php:115 actions/apigroupjoin.php:156
-#: actions/apigroupleave.php:142 actions/apigrouplist.php:137
+#: actions/apifavoritecreate.php:101 actions/apifavoritedestroy.php:102
+#: actions/apifriendshipscreate.php:101 actions/apifriendshipsdestroy.php:101
+#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:140
+#: actions/apigroupismember.php:115 actions/apigroupjoin.php:157
+#: actions/apigroupleave.php:143 actions/apigrouplist.php:137
 #: actions/apigrouplistall.php:122 actions/apigroupmembership.php:107
 #: actions/apigroupshow.php:116 actions/apihelptest.php:88
 #: actions/apistatusesdestroy.php:104 actions/apistatusesretweets.php:112
@@ -183,47 +179,49 @@ msgstr "Ø£ÙØª ÙØ§ÙØ£ØµØ¯ÙØ§Ø¡"
 msgid "API method not found."
 msgstr "Ø§ÙÙ API method ÙØ´ ÙÙØ¬ÙØ¯Ù."
 
-#: actions/apiaccountupdatedeliverydevice.php:86
-#: actions/apiaccountupdateprofile.php:89
-#: actions/apiaccountupdateprofilebackgroundimage.php:86
-#: actions/apiaccountupdateprofilecolors.php:110
-#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89
-#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109
-#: actions/apifavoritecreate.php:91 actions/apifavoritedestroy.php:92
-#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
-#: actions/apigroupcreate.php:105 actions/apigroupjoin.php:92
-#: actions/apigroupleave.php:92 actions/apimediaupload.php:67
-#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:198
+#. TRANS: Client error message. POST is a HTTP command. It should not be translated.
+#. TRANS: Client error. POST is a HTTP command. It should not be translated.
+#: actions/apiaccountupdatedeliverydevice.php:87
+#: actions/apiaccountupdateprofile.php:90
+#: actions/apiaccountupdateprofilebackgroundimage.php:87
+#: actions/apiaccountupdateprofilecolors.php:111
+#: actions/apiaccountupdateprofileimage.php:85 actions/apiblockcreate.php:90
+#: actions/apiblockdestroy.php:89 actions/apidirectmessagenew.php:110
+#: actions/apifavoritecreate.php:92 actions/apifavoritedestroy.php:93
+#: actions/apifriendshipscreate.php:92 actions/apifriendshipsdestroy.php:92
+#: actions/apigroupcreate.php:106 actions/apigroupjoin.php:93
+#: actions/apigroupleave.php:93 actions/apimediaupload.php:68
+#: actions/apistatusesretweet.php:66 actions/apistatusesupdate.php:199
 msgid "This method requires a POST."
 msgstr "ØªØªØ·ÙØ¨ ÙØ°Ù Ø§ÙØ·Ø±ÙÙÙ POST."
 
-#: actions/apiaccountupdatedeliverydevice.php:106
+#: actions/apiaccountupdatedeliverydevice.php:107
 msgid ""
 "You must specify a parameter named 'device' with a value of one of: sms, im, "
 "none."
 msgstr ""
 
-#: actions/apiaccountupdatedeliverydevice.php:133
+#: actions/apiaccountupdatedeliverydevice.php:134
 msgid "Could not update user."
 msgstr "ØªØ¹Ø°ÙØ± ØªØØ¯ÙØ« Ø§ÙÙØ³ØªØ®Ø¯Ù."
 
-#: actions/apiaccountupdateprofile.php:112
-#: actions/apiaccountupdateprofilebackgroundimage.php:194
-#: actions/apiaccountupdateprofilecolors.php:185
-#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/apiaccountupdateprofile.php:113
+#: actions/apiaccountupdateprofilebackgroundimage.php:195
+#: actions/apiaccountupdateprofilecolors.php:186
+#: actions/apiaccountupdateprofileimage.php:131 actions/apiusershow.php:108
 #: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/hcard.php:74
 #: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
 #: lib/profileaction.php:84
 msgid "User has no profile."
 msgstr "ÙÙØ³ ÙÙÙØ³ØªØ®Ø¯Ù ÙÙÙ Ø´Ø®ØµÙ."
 
-#: actions/apiaccountupdateprofile.php:147
+#: actions/apiaccountupdateprofile.php:148
 msgid "Could not save profile."
 msgstr "ÙÙ ÙÙÙÙ ØÙØ¸ Ø§ÙÙÙÙ."
 
-#: actions/apiaccountupdateprofilebackgroundimage.php:108
-#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
-#: actions/apistatusesupdate.php:212 actions/avatarsettings.php:257
+#: actions/apiaccountupdateprofilebackgroundimage.php:109
+#: actions/apiaccountupdateprofileimage.php:98 actions/apimediaupload.php:81
+#: actions/apistatusesupdate.php:213 actions/avatarsettings.php:257
 #: actions/designadminpanel.php:123 actions/editapplication.php:118
 #: actions/newapplication.php:101 actions/newnotice.php:94
 #: lib/designsettings.php:283
@@ -233,20 +231,20 @@ msgid ""
 "current configuration."
 msgstr ""
 
-#: actions/apiaccountupdateprofilebackgroundimage.php:187
-#: actions/apiaccountupdateprofilecolors.php:142
+#: actions/apiaccountupdateprofilebackgroundimage.php:188
+#: actions/apiaccountupdateprofilecolors.php:143
 msgid "Could not update your design."
 msgstr "ØªØ¹Ø°ÙØ± ØªØØ¯ÙØ« ØªØµÙÙÙÙ."
 
-#: actions/apiblockcreate.php:105
+#: actions/apiblockcreate.php:106
 msgid "You cannot block yourself!"
 msgstr "ÙØ§ ÙÙÙØ¹Ø´ ØªÙÙØ¹ ÙÙØ³Ù!"
 
-#: actions/apiblockcreate.php:126
+#: actions/apiblockcreate.php:127
 msgid "Block user failed."
 msgstr "ÙØ´Ù ÙÙØ¹ Ø§ÙÙØ³ØªØ®Ø¯Ù."
 
-#: actions/apiblockdestroy.php:114
+#: actions/apiblockdestroy.php:115
 msgid "Unblock user failed."
 msgstr "ÙØ´Ù Ø¥ÙØºØ§Ø¡ ÙÙØ¹ Ø§ÙÙØ³ØªØ®Ø¯Ù."
 
@@ -260,36 +258,36 @@ msgstr "Ø±Ø³Ø§Ø¦Ù ÙØ¨Ø§Ø´Ø±Ù ÙÙ %s"
 msgid "Direct messages to %s"
 msgstr "Ø±Ø³Ø§ÙÙ ÙØ¨Ø§Ø´Ø±Ù %s"
 
-#: actions/apidirectmessagenew.php:118
+#: actions/apidirectmessagenew.php:119
 msgid "No message text!"
 msgstr "ÙØ§ ÙØµ ÙÙ Ø§ÙØ±Ø³Ø§ÙØ©!"
 
-#: actions/apidirectmessagenew.php:138
+#: actions/apidirectmessagenew.php:139
 msgid "Recipient user not found."
 msgstr "ÙÙ ÙÙØ¹Ø«Ø± Ø¹ÙÙ Ø§ÙÙØ³ØªØ®Ø¯Ù Ø§ÙÙØ³ØªÙÙ."
 
-#: actions/apidirectmessagenew.php:142
+#: actions/apidirectmessagenew.php:143
 msgid "Can't send direct messages to users who aren't your friend."
 msgstr ""
 
-#: actions/apifavoritecreate.php:120
+#: actions/apifavoritecreate.php:121
 msgid "This status is already a favorite."
 msgstr "Ø§ÙØØ§ÙÙ Ø¯Ù ÙÙØ¬ÙØ¯Ù ÙØ¹ÙØ§ ÙÙ Ø§ÙØªÙØ¶ÙÙØ§Øª."
 
 #. TRANS: Error message text shown when a favorite could not be set.
-#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:296
+#: actions/apifavoritecreate.php:132 actions/favor.php:84 lib/command.php:296
 msgid "Could not create favorite."
 msgstr "ØªØ¹Ø°ÙØ± Ø¥ÙØ´Ø§Ø¡ ÙÙØ¶ÙÙ."
 
-#: actions/apifavoritedestroy.php:123
+#: actions/apifavoritedestroy.php:124
 msgid "That status is not a favorite."
 msgstr "Ø§ÙØØ§ÙÙ Ø¯Ù ÙØ´ ÙØØ·ÙØ·Ù ÙÙ Ø§ÙØªÙØ¶ÙÙØ§Øª."
 
-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
+#: actions/apifavoritedestroy.php:136 actions/disfavor.php:87
 msgid "Could not delete favorite."
 msgstr "ØªØ¹Ø°ÙØ± ØØ°Ù Ø§ÙÙÙØ¶ÙÙ."
 
-#: actions/apifriendshipsdestroy.php:120
+#: actions/apifriendshipsdestroy.php:121
 msgid "You cannot unfollow yourself."
 msgstr "ÙØ§ ÙÙÙØ¹Ø´ Ø¹Ø¯Ù ÙØªØ§Ø¨Ø¹Ø© ÙÙØ³Ù."
 
@@ -301,70 +299,70 @@ msgstr ""
 msgid "Could not find target user."
 msgstr "ØªØ¹Ø°ÙØ± Ø¥ÙØ¬Ø§Ø¯ Ø§ÙÙØ³ØªØ®Ø¯Ù Ø§ÙÙØ¯Ù."
 
-#: actions/apigroupcreate.php:167 actions/editgroup.php:186
+#: actions/apigroupcreate.php:168 actions/editgroup.php:186
 #: actions/newgroup.php:126 actions/profilesettings.php:215
 #: actions/register.php:212
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr ""
 
-#: actions/apigroupcreate.php:176 actions/editgroup.php:190
+#: actions/apigroupcreate.php:177 actions/editgroup.php:190
 #: actions/newgroup.php:130 actions/profilesettings.php:238
 #: actions/register.php:215
 msgid "Nickname already in use. Try another one."
 msgstr ""
 
-#: actions/apigroupcreate.php:183 actions/editgroup.php:193
+#: actions/apigroupcreate.php:184 actions/editgroup.php:193
 #: actions/newgroup.php:133 actions/profilesettings.php:218
 #: actions/register.php:217
 msgid "Not a valid nickname."
 msgstr "ÙÙØ³ Ø§Ø³ÙÙØ§ ÙØ³ØªØ¹Ø§Ø±ÙØ§ ØµØÙØÙØ§."
 
-#: actions/apigroupcreate.php:199 actions/editapplication.php:215
+#: actions/apigroupcreate.php:200 actions/editapplication.php:215
 #: actions/editgroup.php:199 actions/newapplication.php:203
 #: actions/newgroup.php:139 actions/profilesettings.php:222
 #: actions/register.php:224
 msgid "Homepage is not a valid URL."
 msgstr "Ø§ÙØµÙØÙ Ø§ÙØ±Ø¦ÙØ³ÙÙ ÙÙØ³Øª Ø¹ÙÙÙÙØ§ ØµØ§ÙØÙØ§."
 
-#: actions/apigroupcreate.php:208 actions/editgroup.php:202
+#: actions/apigroupcreate.php:209 actions/editgroup.php:202
 #: actions/newgroup.php:142 actions/profilesettings.php:225
 #: actions/register.php:227
 msgid "Full name is too long (max 255 chars)."
 msgstr "Ø§ÙØ§Ø³Ù Ø§ÙÙØ§ÙÙ Ø·ÙÙÙ Ø¬Ø¯Ø§ (Ø§ÙØ£ÙØµÙ 255 ØØ±ÙÙØ§)"
 
-#: actions/apigroupcreate.php:246 actions/editgroup.php:219
+#: actions/apigroupcreate.php:247 actions/editgroup.php:219
 #: actions/newgroup.php:159
 #, php-format
 msgid "Too many aliases! Maximum %d."
 msgstr ""
 
-#: actions/apigroupcreate.php:276 actions/editgroup.php:232
+#: actions/apigroupcreate.php:277 actions/editgroup.php:232
 #: actions/newgroup.php:172
 #, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr ""
 
-#: actions/apigroupcreate.php:289 actions/editgroup.php:238
+#: actions/apigroupcreate.php:290 actions/editgroup.php:238
 #: actions/newgroup.php:178
 msgid "Alias can't be the same as nickname."
 msgstr ""
 
-#: actions/apigroupismember.php:96 actions/apigroupjoin.php:105
-#: actions/apigroupleave.php:105 actions/apigroupmembership.php:92
+#: actions/apigroupismember.php:96 actions/apigroupjoin.php:106
+#: actions/apigroupleave.php:106 actions/apigroupmembership.php:92
 #: actions/apigroupshow.php:83 actions/apitimelinegroup.php:92
 msgid "Group not found."
 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.
-#: actions/apigroupjoin.php:139 actions/joingroup.php:134 lib/command.php:353
+#: actions/apigroupjoin.php:140 actions/joingroup.php:134 lib/command.php:353
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "ÙØ§ ÙÙØ¹Ø´ ÙØ¶Ù %1$s ÙÙØ¬Ø±ÙÙ¾ %2$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.
-#: actions/apigroupleave.php:125 actions/leavegroup.php:129
+#: actions/apigroupleave.php:126 actions/leavegroup.php:129
 #: lib/command.php:401
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
@@ -394,9 +392,9 @@ msgstr ""
 
 #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
 #: actions/deletenotice.php:169 actions/disfavor.php:74
-#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:55
+#: actions/emailsettings.php:271 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:66 actions/imsettings.php:227
+#: actions/groupunblock.php:66 actions/imsettings.php:230
 #: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
@@ -431,8 +429,8 @@ msgstr ""
 #. 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:286 actions/grouplogo.php:322
-#: actions/imsettings.php:242 actions/newapplication.php:121
+#: actions/emailsettings.php:290 actions/grouplogo.php:322
+#: actions/imsettings.php:245 actions/newapplication.php:121
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
 #: actions/smssettings.php:277 lib/designsettings.php:304
 msgid "Unexpected form submission."
@@ -485,18 +483,18 @@ msgstr "Ø§Ø³ÙØ"
 msgid "Allow or deny access to your account information."
 msgstr ""
 
-#: actions/apistatusesretweet.php:75 actions/apistatusesretweets.php:72
+#: actions/apistatusesretweet.php:76 actions/apistatusesretweets.php:72
 #: actions/deletenotice.php:52 actions/shownotice.php:92
 msgid "No such notice."
 msgstr "ÙØ§ Ø¥Ø´Ø¹Ø§Ø± ÙÙØ°Ø§."
 
 #. TRANS: Error text shown when trying to repeat an own notice.
-#: actions/apistatusesretweet.php:83 lib/command.php:538
+#: actions/apistatusesretweet.php:84 lib/command.php:538
 msgid "Cannot repeat your own notice."
 msgstr "ÙØ´ ÙØ§ÙØ¹Ù ØªØªÙØ±Ø± Ø§ÙÙÙØ§ØØ¸ØªÙ Ø¨ØªØ§Ø¹ØªÙ."
 
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-#: actions/apistatusesretweet.php:91 lib/command.php:544
+#: actions/apistatusesretweet.php:92 lib/command.php:544
 msgid "Already repeated that notice."
 msgstr "Ø§ÙÙÙØ§ØØ¸Ù Ø§ØªÙØ±Ø±Øª ÙØ¹ÙØ§."
 
@@ -504,15 +502,15 @@ msgstr "Ø§ÙÙÙØ§ØØ¸Ù Ø§ØªÙØ±Ø±Øª ÙØ¹ÙØ§."
 msgid "Status deleted."
 msgstr "ØÙØ°ÙÙØª Ø§ÙØØ§ÙÙ."
 
-#: actions/apistatusesupdate.php:221
+#: actions/apistatusesupdate.php:222
 msgid "Client must provide a 'status' parameter with a value."
 msgstr ""
 
-#: actions/apistatusesupdate.php:283 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:284 actions/apiusershow.php:96
 msgid "Not found."
 msgstr "ÙÙ ÙÙØ¬Ø¯."
 
-#: actions/apistatusesupdate.php:306 actions/newnotice.php:181
+#: actions/apistatusesupdate.php:307 actions/newnotice.php:181
 #, php-format
 msgid "Max notice size is %d chars, including attachment URL."
 msgstr ""
@@ -670,7 +668,9 @@ msgid "Do not block this user"
 msgstr "ÙØ§ ØªÙÙØ¹ ÙØ°Ø§ Ø§ÙÙØ³ØªØ®Ø¯Ù"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
+#. TRANS: Submit button title.
+#. TRANS: Description of the form to block a user.
+#: actions/block.php:164 actions/groupmembers.php:403 lib/blockform.php:82
 msgid "Block this user"
 msgstr "Ø§ÙÙØ¹ ÙØ°Ø§ Ø§ÙÙØ³ØªØ®Ø¯Ù"
 
@@ -703,11 +703,13 @@ msgstr "%1$s ÙØ§ÙÙØ§Øª ÙØ¹ÙÙÙ ÙÙÙØ§ Ø¨ÙÙÙ, Ø§ÙØµÙØÙ %2$d"
 msgid "Unblock user from group"
 msgstr "Ø£ÙØº ÙÙØ¹ Ø§ÙÙØ³ØªØ®Ø¯Ù ÙÙ Ø§ÙÙØ¬ÙÙØ¹Ø©"
 
-#: actions/blockedfromgroup.php:320 lib/unblockform.php:69
+#. TRANS: Title for the form to unblock a user.
+#: actions/blockedfromgroup.php:320 lib/unblockform.php:70
 msgid "Unblock"
 msgstr "Ø£ÙØºÙ Ø§ÙÙÙØ¹"
 
-#: actions/blockedfromgroup.php:320 lib/unblockform.php:80
+#. TRANS: Description of the form to unblock a user.
+#: actions/blockedfromgroup.php:320 lib/unblockform.php:82
 msgid "Unblock this user"
 msgstr "Ø£ÙØºÙ ÙÙØ¹ ÙØ°Ø§ Ø§ÙÙØ³ØªØ®Ø¯Ù"
 
@@ -735,9 +737,9 @@ msgstr ""
 #. 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/confirmaddress.php:116 actions/emailsettings.php:331
+#: actions/emailsettings.php:477 actions/imsettings.php:283
+#: actions/imsettings.php:442 actions/othersettings.php:174
 #: actions/profilesettings.php:283 actions/smssettings.php:308
 #: actions/smssettings.php:464
 msgid "Couldn't update user."
@@ -745,7 +747,7 @@ msgstr "ØªØ¹Ø°ÙØ± ØªØØ¯ÙØ« Ø§ÙÙØ³ØªØ®Ø¯Ù."
 
 #. 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/confirmaddress.php:128 actions/emailsettings.php:437
 #: actions/smssettings.php:422
 msgid "Couldn't delete email confirmation."
 msgstr "ØªØ¹Ø°ÙØ± ØØ°Ù ØªØ£ÙÙØ¯ Ø§ÙØ¨Ø±ÙØ¯ Ø§ÙØ¥ÙÙØªØ±ÙÙÙ."
@@ -777,9 +779,10 @@ msgstr "ÙØ§Ø²Ù ÙÙÙÙ ÙØªØ³Ø¬Ù Ø¯Ø®ÙÙÙ Ø¹ÙØ´Ø§Ù ØªØ¹Ø¯ÙÙ applicatio
 msgid "You are not the owner of this application."
 msgstr "Ø§ÙØª ÙØ´ Ø¨ØªÙÙÙ Ø§Ùapplication Ø¯Ù."
 
+#. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:127
 #: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1307
+#: lib/action.php:1315
 msgid "There was a problem with your session token."
 msgstr ""
 
@@ -800,7 +803,7 @@ msgstr ""
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
 #: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:73 lib/profileformaction.php:64
+#: lib/adminpanelaction.php:71 lib/profileformaction.php:64
 #: lib/settingsaction.php:72
 msgid "Not logged in."
 msgstr "ÙØ³Øª ÙØ§ÙØ¬ÙØ§."
@@ -859,7 +862,6 @@ msgstr "Ø§ØØ°Ù ÙØ°Ø§ Ø§ÙÙØ³ØªØ®Ø¯Ù"
 #. TRANS: Message used as title for design settings for the site.
 #. TRANS: Link description in user account settings menu.
 #: actions/designadminpanel.php:63 lib/accountsettingsaction.php:139
-#: lib/groupnav.php:119
 msgid "Design"
 msgstr "Ø§ÙØªØµÙÙÙ"
 
@@ -963,13 +965,13 @@ msgstr "Ø§Ø³ØªØ¹Ø¯ Ø§ÙØªØµÙÙÙØ§Øª Ø§ÙÙØ¨Ø¯Ø¦ÙØ©"
 msgid "Reset back to default"
 msgstr "Ø§Ø±Ø¬Ø¹ Ø¥ÙÙ Ø§ÙÙØ¨Ø¯Ø¦Ù"
 
-#. TRANS: Submit button title
+#. TRANS: Submit button title.
 #: actions/designadminpanel.php:685 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/snapshotadminpanel.php:245
 #: actions/subscriptions.php:226 actions/tagother.php:154
-#: actions/useradminpanel.php:294 lib/applicationeditform.php:363
+#: actions/useradminpanel.php:294 lib/applicationeditform.php:353
 #: lib/designsettings.php:256 lib/groupeditform.php:202
 msgid "Save"
 msgstr "Ø£Ø±Ø³Ù"
@@ -1104,7 +1106,7 @@ msgstr "Ø¹ÙÙØ§Ù Ø§ÙØ¨Ø±ÙØ¯ Ø§ÙØ¥ÙÙØªØ±ÙÙÙ Ø§ÙÙÙØ¤ÙØ¯ Ø§ÙØØ§ÙÙ
 #. 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/emailsettings.php:115 actions/emailsettings.php:162
 #: actions/imsettings.php:116 actions/smssettings.php:124
 #: actions/smssettings.php:180
 msgctxt "BUTTON"
@@ -1117,124 +1119,112 @@ msgid ""
 "a message with further instructions."
 msgstr ""
 
-#. TRANS: Instructions for e-mail address input form.
-#: actions/emailsettings.php:135
+#. TRANS: Instructions for e-mail address input form. Do not translate
+#. TRANS: "example.org". It is one of the domain names reserved for
+#. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
+#. TRANS: Any other domain may be owned by a legitimate person or
+#. TRANS: organization.
+#: actions/emailsettings.php:139
 msgid "Email address, like \"UserName@example.org\""
 msgstr "Ø¹ÙÙØ§Ù Ø§ÙØ¨Ø±ÙØ¯ Ø§ÙØ¥ÙÙØªØ±ÙÙÙØ ÙØ«Ù \"UserName@example.org\""
 
-#. 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 ""
-
 #. 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
+#: actions/emailsettings.php:151 actions/smssettings.php:171
 msgid "Incoming email"
 msgstr "Ø§ÙØ¨Ø±ÙØ¯ Ø§ÙØ¥ÙÙØªØ±ÙÙÙ Ø§ÙÙØ§Ø±Ø¯"
 
 #. 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
+#: actions/emailsettings.php:159 actions/smssettings.php:178
 msgid "Send email to this address to post new notices."
 msgstr "Ø£Ø±Ø³Ù Ø¨Ø±ÙØ¯ÙØ§ Ø¥ÙÙØªØ±ÙÙÙÙØ§ Ø¥ÙÙ ÙØ°Ø§ Ø§ÙØ¹ÙÙØ§Ù ÙØªØ±Ø³Ù Ø¥Ø´Ø¹Ø§Ø±Ø§Øª Ø¬Ø¯ÙØ¯Ù."
 
 #. 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
+#: actions/emailsettings.php:168 actions/smssettings.php:186
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr "Ø£ÙØ´Ø¦ Ø¹ÙÙØ§Ù Ø¨Ø±ÙØ¯ Ø¥ÙÙØªØ±ÙÙÙ ÙØªØ±Ø³Ù Ø¥ÙÙÙØ Ø£ÙØºÙ Ø§ÙÙØ¯ÙÙ."
 
-#. 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 ""
-
 #. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:174
+#: actions/emailsettings.php:178
 msgid "Email preferences"
 msgstr "Ø¹ÙØ§ÙÙÙ Ø§ÙØ¨Ø±ÙØ¯ Ø§ÙØ¥ÙÙØªØ±ÙÙÙ"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:180
+#: actions/emailsettings.php:184
 msgid "Send me notices of new subscriptions through email."
 msgstr "Ø£Ø±Ø³Ù ÙÙ Ø¥Ø´Ø¹Ø§Ø±Ø§Øª Ø¨Ø§ÙØ§Ø´ØªØ±Ø§ÙØ§Øª Ø§ÙØ¬Ø¯ÙØ¯Ù Ø¹Ø¨Ø± Ø§ÙØ¨Ø±ÙØ¯ Ø§ÙØ¥ÙÙØªØ±ÙÙÙ."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:186
+#: actions/emailsettings.php:190
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr "Ø£Ø±Ø³Ù ÙÙ Ø¨Ø±ÙØ¯ÙØ§ Ø¥ÙÙØ±ØªÙÙÙÙØ§ Ø¹ÙØ¯ÙØ§ ÙØ¶ÙÙ Ø£ØØ¯ÙÙ Ø¥Ø´Ø¹Ø§Ø±Ù ÙÙØ¶ÙÙ."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:199
+#: actions/emailsettings.php:203
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr "Ø£Ø±Ø³Ù ÙÙ Ø¨Ø±ÙØ¯ÙØ§ Ø¥ÙÙØªØ±ÙÙÙÙØ§ Ø¹ÙØ¯ÙØ§ ÙØ±Ø³Ù ÙÙ Ø£ØØ¯ÙÙ \"@-Ø±Ø¯\"."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:205
+#: actions/emailsettings.php:209
 msgid "Allow friends to nudge me and send me an email."
 msgstr ""
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:212
+#: actions/emailsettings.php:216
 msgid "I want to post notices by email."
 msgstr "Ø£Ø±ÙØ¯ Ø£Ù Ø£Ø±Ø³Ù Ø§ÙÙÙØ§ØØ¸Ø§Øª Ø¹Ø¨Ø± Ø§ÙØ¨Ø±ÙØ¯ Ø§ÙØ¥ÙÙØªØ±ÙÙÙ."
 
 #. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:353
+#: actions/emailsettings.php:357
 msgid "No email address."
 msgstr "ÙØ§ Ø¹ÙÙØ§Ù Ø¨Ø±ÙØ¯ Ø¥ÙÙØªØ±ÙÙÙ."
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:208
+#: actions/emailsettings.php:370 actions/register.php:208
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "ÙÙØ³ Ø¹ÙÙØ§Ù Ø¨Ø±ÙØ¯ ØµØ§ÙØ."
 
 #. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:370
+#: actions/emailsettings.php:374
 msgid "That is already your email address."
 msgstr "ÙØ°Ø§ ÙÙ Ø¹ÙÙØ§Ù Ø¨Ø±ÙØ¯Ù Ø§ÙØ¥ÙØªØ±ÙÙÙ Ø³Ø§Ø¨ÙÙØ§."
 
 #. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:374
+#: actions/emailsettings.php:378
 msgid "That email address already belongs to another user."
 msgstr "ÙØ°Ø§ Ø§ÙØ¨Ø±ÙØ¯ Ø§ÙØ¥ÙÙØªØ±ÙÙÙ ÙÙÙ ÙØ³ØªØ®Ø¯Ù Ø¢Ø®Ø± Ø¨Ø§ÙÙØ¹Ù."
 
 #. 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/emailsettings.php:395 actions/imsettings.php:351
 #: actions/smssettings.php:373
 msgid "Couldn't insert confirmation code."
 msgstr "ØªØ¹Ø°ÙØ± Ø¥Ø¯Ø±Ø§Ø¬ Ø±ÙØ² Ø§ÙØªØ£ÙÙØ¯."
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:398
+#: actions/emailsettings.php:402
 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 ""
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:438
+#: actions/emailsettings.php:442
 msgid "Email confirmation cancelled."
 msgstr "ÙØ§ Ø±ÙØ² ØªØ£ÙÙØ¯."
 
 #. TRANS: Message given trying to remove an e-mail address that is not
 #. TRANS: registered for the active user.
-#: actions/emailsettings.php:458
+#: actions/emailsettings.php:462
 msgid "That is not your email address."
 msgstr "ÙØ°Ø§ ÙÙØ³ Ø¹ÙÙØ§Ù Ø¨Ø±ÙØ¯Ù Ø§ÙØ¥ÙÙØªØ±ÙÙÙ."
 
 #. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:479
+#: actions/emailsettings.php:483
 msgid "The email address was removed."
 msgstr "ÙØ§ Ø¹ÙÙØ§Ù Ø¨Ø±ÙØ¯ Ø¥ÙÙØªØ±ÙÙÙ."
 
@@ -1371,7 +1361,7 @@ msgstr ""
 msgid "User is not a member of group."
 msgstr "Ø§ÙÙØ³ØªØ®Ø¯Ù ÙÙØ³ Ø¹Ø¶ÙÙØ§ ÙÙ Ø§ÙÙØ¬ÙÙØ¹Ù."
 
-#: actions/groupblock.php:134 actions/groupmembers.php:360
+#: actions/groupblock.php:134 actions/groupmembers.php:364
 msgid "Block user from group"
 msgstr "Ø§ÙÙØ¹ Ø§ÙÙØ³ØªØ®Ø¯Ù ÙÙ Ø§ÙÙØ¬ÙÙØ¹Ø©"
 
@@ -1436,32 +1426,28 @@ msgstr "ØÙØ¯ÙØ« Ø§ÙØ´Ø¹Ø§Ø±."
 msgid "Failed updating logo."
 msgstr "ÙØ´Ù Ø±ÙØ¹ Ø§ÙØ´Ø¹Ø§Ø±."
 
-#: actions/groupmembers.php:100 lib/groupnav.php:92
+#. TRANS: Title of the page showing group members.
+#. TRANS: %s is the name of the group.
+#: actions/groupmembers.php:102
 #, php-format
 msgid "%s group members"
 msgstr "Ø£Ø¹Ø¶Ø§Ø¡ ÙØ¬ÙÙØ¹Ù %s"
 
-#: actions/groupmembers.php:103
+#. TRANS: Title of the page showing group members.
+#. TRANS: %1$s is the name of the group, %2$d is the page number of the members list.
+#: actions/groupmembers.php:107
 #, php-format
 msgid "%1$s group members, page %2$d"
 msgstr "%1$s Ø§Ø¹Ø¶Ø§Ø¡ Ø§ÙØ¬Ø±ÙÙ¾, ØµÙØÙ %2$d"
 
-#: actions/groupmembers.php:118
+#: actions/groupmembers.php:122
 msgid "A list of the users in this group."
 msgstr "ÙØ§Ø¦ÙÙ Ø¨ÙØ³ØªØ®Ø¯ÙÙ ÙØ°Ù Ø§ÙÙØ¬ÙÙØ¹Ù."
 
-#: actions/groupmembers.php:182 lib/groupnav.php:107
+#: actions/groupmembers.php:186
 msgid "Admin"
 msgstr "Ø¥Ø¯Ø§Ø±Ù"
 
-#: actions/groupmembers.php:392 lib/blockform.php:69
-msgid "Block"
-msgstr "Ø§ÙÙØ¹"
-
-#: actions/groupmembers.php:519
-msgid "Make this user an admin"
-msgstr "Ø§Ø¬Ø¹Ù ÙØ°Ø§ Ø§ÙÙØ³ØªØ®Ø¯Ù Ø¥Ø¯Ø§Ø±ÙÙØ§"
-
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Title in atom group notice feed. %s is a group name.
 #. TRANS: Title in atom user notice feed. %s is a user name.
@@ -1580,7 +1566,10 @@ msgstr ""
 
 #. TRANS: IM address input field instructions in IM settings form.
 #. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:140
+#. TRANS: Do not translate "example.org". It is one of the domain names reserved for use in examples by
+#. TRANS: http://www.rfc-editor.org/rfc/rfc2606.txt. Any other domain may be owned by a legitimate
+#. TRANS: person or organization.
+#: actions/imsettings.php:143
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -1588,43 +1577,43 @@ msgid ""
 msgstr ""
 
 #. TRANS: Form legend for IM preferences form.
-#: actions/imsettings.php:155
+#: actions/imsettings.php:158
 msgid "IM preferences"
 msgstr "ØÙÙÙØ¸Øª Ø§ÙØªÙØ¶ÙÙØ§Øª."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:166
+#: actions/imsettings.php:169
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr ""
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:172
+#: actions/imsettings.php:175
 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr ""
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:179
+#: actions/imsettings.php:182
 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr ""
 
 #. TRANS: Confirmation message for successful IM preferences save.
-#: actions/imsettings.php:287 actions/othersettings.php:180
+#: actions/imsettings.php:290 actions/othersettings.php:180
 msgid "Preferences saved."
 msgstr "ØÙÙÙØ¸Øª Ø§ÙØªÙØ¶ÙÙØ§Øª."
 
 #. TRANS: Message given saving IM address without having provided one.
-#: actions/imsettings.php:309
+#: actions/imsettings.php:312
 msgid "No Jabber ID."
 msgstr "ÙØ§ ÙÙÙÙ Ø¬Ø§Ø¨Ø±."
 
 #. TRANS: Message given saving IM address that not valid.
-#: actions/imsettings.php:322
+#: actions/imsettings.php:325
 msgid "Not a valid Jabber ID"
 msgstr "ÙÙØ³Øª ÙÙÙÙ Ø¬Ø§Ø¨Ø± ØµØ§ÙØØ©"
 
 #. 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
+#: actions/imsettings.php:361
 #, php-format
 msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
@@ -1632,21 +1621,26 @@ msgid ""
 msgstr ""
 
 #. TRANS: Message given canceling IM address confirmation for the wrong IM address.
-#: actions/imsettings.php:388
+#: actions/imsettings.php:391
 msgid "That is the wrong IM address."
 msgstr "ÙØ°Ø§ Ø¹ÙÙØ§Ù ÙØØ§Ø¯Ø«Ù ÙÙØ±ÙÙ Ø®Ø§Ø·Ø¦."
 
 #. TRANS: Message given after successfully canceling IM address confirmation.
-#: actions/imsettings.php:402
+#: actions/imsettings.php:405
 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
+#: actions/imsettings.php:427
 msgid "That is not your Jabber ID."
 msgstr "ÙØ°Ù ÙÙØ³Øª ÙÙÙØªÙ ÙÙ Ø¬Ø§Ø¨Ø±."
 
+#: actions/inbox.php:59
+#, php-format
+msgid "Inbox for %1$s - page %2$d"
+msgstr ""
+
 #: actions/inbox.php:62
 #, php-format
 msgid "Inbox for %s"
@@ -1712,12 +1706,6 @@ msgstr "Ø±Ø³Ø§ÙÙ Ø´Ø®ØµÙØ©"
 msgid "Optionally add a personal message to the invitation."
 msgstr ""
 
-#. TRANS: Send button for inviting friends
-#: actions/invite.php:198
-msgctxt "BUTTON"
-msgid "Send"
-msgstr ""
-
 #. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English.
 #: actions/invite.php:228
 #, php-format
@@ -1987,12 +1975,6 @@ msgstr ""
 msgid "Developers can edit the registration settings for their applications "
 msgstr ""
 
-#. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
-#: actions/oembed.php:159
-#, php-format
-msgid "Content type %s not supported."
-msgstr ""
-
 #. TRANS: Error message displaying attachments. %s is the site's base URL.
 #: actions/oembed.php:163
 #, php-format
@@ -2000,8 +1982,8 @@ msgid "Only %s URLs over plain HTTP please."
 msgstr ""
 
 #. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1215
-#: lib/apiaction.php:1243 lib/apiaction.php:1366
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1206
+#: lib/apiaction.php:1233 lib/apiaction.php:1356
 msgid "Not a supported data format."
 msgstr " ÙØ´ ÙØ¸Ø§Ù Ø¨ÙØ§ÙØ§Øª ÙØ¯Ø¹ÙÙ."
 
@@ -2061,6 +2043,11 @@ msgstr "Ø§ÙØ§Ø±Ø© ØªØ³Ø¬ÙÙ Ø§ÙØ¯Ø®ÙÙ Ø§ÙÙÙ Ø§ØªØØ·Øª ÙØ´ ÙÙØ¬ÙØ¯Ù
 msgid "Login token expired."
 msgstr "ØªØ§Ø±ÙØ® ØµÙØ§ØÙØ© Ø§ÙØ§ÙØ§Ø±Ù Ø®ÙØµ."
 
+#: actions/outbox.php:58
+#, php-format
+msgid "Outbox for %1$s - page %2$d"
+msgstr ""
+
 #: actions/outbox.php:116
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr ""
@@ -2123,7 +2110,7 @@ msgid "Password saved."
 msgstr "ØÙÙØ¸Øª ÙÙÙÙ Ø§ÙØ³Ø±."
 
 #. TRANS: Menu item for site administration
-#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:384
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:371
 msgid "Paths"
 msgstr "Ø§ÙÙØ³Ø§Ø±Ø§Øª"
 
@@ -2321,7 +2308,7 @@ msgstr "Ø§ÙØ§Ø³Ù Ø§ÙÙØ§ÙÙ"
 
 #. TRANS: Form input field label.
 #: actions/profilesettings.php:115 actions/register.php:460
-#: lib/applicationeditform.php:244 lib/groupeditform.php:161
+#: lib/applicationeditform.php:235 lib/groupeditform.php:161
 msgid "Homepage"
 msgstr "Ø§ÙØµÙØÙ Ø§ÙØ±Ø¦ÙØ³ÙØ©"
 
@@ -2401,15 +2388,10 @@ msgid "Couldn't save tags."
 msgstr "ØªØ¹Ø°ÙØ± ØÙØ¸ Ø§ÙÙØ³ÙÙ."
 
 #. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:391 lib/adminpanelaction.php:141
+#: actions/profilesettings.php:391 lib/adminpanelaction.php:138
 msgid "Settings saved."
 msgstr "ØÙÙØ¸Øª Ø§ÙØ¥Ø¹Ø¯Ø§Ø¯Ø§Øª."
 
-#: actions/public.php:83
-#, php-format
-msgid "Beyond the page limit (%s)."
-msgstr ""
-
 #: actions/public.php:130
 #, php-format
 msgid "Public timeline, page %d"
@@ -2830,14 +2812,10 @@ msgstr "StatusNet"
 
 #. TRANS: Menu item for site administration
 #: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
-#: lib/adminpanelaction.php:392
+#: lib/adminpanelaction.php:379
 msgid "Sessions"
 msgstr "Ø§ÙØ¬ÙØ³Ø§Øª"
 
-#: actions/sessionsadminpanel.php:65
-msgid "Session settings for this StatusNet site."
-msgstr ""
-
 #: actions/sessionsadminpanel.php:177
 msgid "Whether to handle sessions ourselves."
 msgstr ""
@@ -2859,25 +2837,29 @@ msgstr "Ø§Ø°Ù Ø¥Ø¹Ø¯Ø§Ø¯Øª Ø§ÙÙÙÙØ¹"
 msgid "You must be logged in to view an application."
 msgstr "ÙØ§Ø²Ù ØªÙÙÙ ÙØ³Ø¬Ù Ø¯Ø®ÙÙÙ Ø¹ÙØ´Ø§Ù ØªØ´ÙÙ Ø§Ù application."
 
+#: actions/showapplication.php:157
+msgid "Application profile"
+msgstr ""
+
 #. TRANS: Form input field label for application icon.
-#: actions/showapplication.php:159 lib/applicationeditform.php:182
+#: actions/showapplication.php:159 lib/applicationeditform.php:173
 msgid "Icon"
 msgstr ""
 
 #. TRANS: Form input field label for application name.
 #: actions/showapplication.php:169 actions/version.php:197
-#: lib/applicationeditform.php:199
+#: lib/applicationeditform.php:190
 msgid "Name"
 msgstr "Ø§ÙØ§Ø³Ù"
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:178 lib/applicationeditform.php:235
+#: actions/showapplication.php:178 lib/applicationeditform.php:226
 msgid "Organization"
 msgstr "Ø§ÙÙÙØ¸ÙÙ"
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:216 lib/groupeditform.php:172
+#: lib/applicationeditform.php:207 lib/groupeditform.php:172
 msgid "Description"
 msgstr "Ø§ÙÙØµÙ"
 
@@ -2942,26 +2924,11 @@ msgid ""
 "notices you like to bookmark them for later or shed a spotlight on them."
 msgstr ""
 
-#: actions/showfavorites.php:208
-#, php-format
-msgid ""
-"%s hasn't added any favorite notices yet. Post something interesting they "
-"would add to their favorites :)"
-msgstr ""
-
-#: actions/showfavorites.php:212
-#, php-format
-msgid ""
-"%s hasn't added any favorite notices yet. Why not [register an account](%%%%"
-"action.register%%%%) and then post something interesting they would add to "
-"their favorites :)"
-msgstr ""
-
 #: actions/showfavorites.php:243
 msgid "This is a way to share what you like."
 msgstr "Ø¥ÙÙØ§ Ø¥ØØ¯Ù ÙØ³Ø§Ø¦Ù ÙØ´Ø§Ø±ÙÙ ÙØ§ ØªØØ¨."
 
-#: actions/showgroup.php:82 lib/groupnav.php:86
+#: actions/showgroup.php:82
 #, php-format
 msgid "%s group"
 msgstr "ÙØ¬ÙÙØ¹Ù %s"
@@ -3004,7 +2971,7 @@ msgstr ""
 msgid "Notice feed for %s group (Atom)"
 msgstr ""
 
-#: actions/showgroup.php:393 actions/showgroup.php:445 lib/groupnav.php:91
+#: actions/showgroup.php:393 actions/showgroup.php:445
 msgid "Members"
 msgstr "Ø§ÙØ£Ø¹Ø¶Ø§Ø¡"
 
@@ -3099,10 +3066,6 @@ msgstr "ÙØ§ ÙÙÙÙÙ Ø¥Ø³ÙØ§Øª Ø§ÙÙØ³ØªØ®Ø¯ÙÙÙ Ø¹ÙÙ ÙØ°Ø§ Ø§ÙÙÙÙ
 msgid "User is already silenced."
 msgstr "Ø§ÙÙØ³ØªØ®Ø¯Ù ÙØ³ÙØª ÙÙ ÙØ¨Ù."
 
-#: actions/siteadminpanel.php:69
-msgid "Basic settings for this StatusNet site"
-msgstr ""
-
 #: actions/siteadminpanel.php:133
 msgid "Site name must have non-zero length."
 msgstr "ÙØ¬Ø¨ Ø£ÙØ§ ÙÙÙÙ Ø·ÙÙ Ø§Ø³Ù Ø§ÙÙÙÙØ¹ ØµÙØ±ÙØ§."
@@ -3116,10 +3079,6 @@ msgstr "ÙØ§Ø²Ù ÙÙÙÙ Ø¹ÙØ¯Ù Ø¹ÙÙØ§Ù Ø§ÙÙÙÙ ØµØ§ÙØ."
 msgid "Unknown language \"%s\"."
 msgstr "ÙØºÙ ÙØ´ ÙØ¹Ø±ÙÙÙ \"%s\"."
 
-#: actions/siteadminpanel.php:165
-msgid "Minimum text limit is 0 (unlimited)."
-msgstr ""
-
 #: actions/siteadminpanel.php:171
 msgid "Dupe limit must be one or more seconds."
 msgstr ""
@@ -3288,7 +3247,7 @@ msgstr ""
 
 #. TRANS: Menu item for site administration
 #: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
-#: lib/adminpanelaction.php:408
+#: lib/adminpanelaction.php:395
 msgid "Snapshots"
 msgstr ""
 
@@ -3296,6 +3255,10 @@ msgstr ""
 msgid "Manage snapshot configuration"
 msgstr "Ø¶Ø¨Ø· Ø§ÙØªØµÙÙÙ"
 
+#: actions/snapshotadminpanel.php:127
+msgid "Invalid snapshot run value."
+msgstr ""
+
 #: actions/snapshotadminpanel.php:133
 msgid "Snapshot frequency must be a number."
 msgstr ""
@@ -3852,7 +3815,7 @@ msgid "Unable to save tag."
 msgstr "ØªØ¹Ø°ÙØ± ØÙØ¸ Ø§ÙÙØ³ÙÙ."
 
 #. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#: classes/Subscription.php:75 lib/oauthstore.php:465
+#: classes/Subscription.php:75 lib/oauthstore.php:466
 msgid "You have been banned from subscribing."
 msgstr ""
 
@@ -3954,12 +3917,6 @@ msgstr "%1$s - %2$s"
 msgid "Untitled page"
 msgstr "ØµÙØÙ ØºÙØ± ÙÙØ¹ÙÙÙØ©"
 
-#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:455
-msgctxt "TOOLTIP"
-msgid "Personal profile and friends timeline"
-msgstr ""
-
 #. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
 #: lib/action.php:468
 msgid "Connect"
@@ -4002,15 +3959,9 @@ msgctxt "TOOLTIP"
 msgid "Help me!"
 msgstr "ÙØ³Ø§Ø¹Ø¯Ø©"
 
-#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:513
-msgctxt "TOOLTIP"
-msgid "Search for people or text"
-msgstr ""
-
 #. TRANS: DT element for site notice. String is hidden in default CSS.
 #. TRANS: Menu item for site administration
-#: lib/action.php:538 lib/adminpanelaction.php:400
+#: lib/action.php:538 lib/adminpanelaction.php:387
 msgid "Site notice"
 msgstr "Ø¥Ø´Ø¹Ø§Ø± Ø§ÙÙÙÙØ¹"
 
@@ -4059,22 +4010,17 @@ msgstr "Ø§ÙÙØµØ¯Ø±"
 msgid "Contact"
 msgstr "Ø§ØªØµÙ"
 
-#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
-#: lib/action.php:843
-#, php-format
-msgid ""
-"**%%site.name%%** is a microblogging service brought to you by [%%site."
-"broughtby%%](%%site.broughtbyurl%%)."
-msgstr ""
-
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:846
+#: lib/action.php:849
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr ""
 
 #. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.
-#: lib/action.php:850
+#. TRANS: Make sure there is no whitespace between "]" and "(".
+#. TRANS: Text between [] is a link description, text between () is the link itself.
+#. TRANS: %s is the version of StatusNet that is being used.
+#: lib/action.php:856
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4086,44 +4032,45 @@ msgstr ""
 "agpl-3.0.html)."
 
 #. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:866
+#: lib/action.php:872
 msgid "Site content license"
 msgstr "Ø±Ø®ØµÙ ÙØØªÙÙ Ø§ÙÙÙÙØ¹"
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:873
+#: lib/action.php:879
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:880
+#: lib/action.php:886
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:884
+#: lib/action.php:890
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 
-#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:897
+#. TRANS: license message in footer.
+#. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
+#: lib/action.php:904
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr ""
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1247
+#: lib/action.php:1254
 msgid "After"
 msgstr "Ø¨Ø¹Ø¯"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1257
+#: lib/action.php:1264
 msgid "Before"
 msgstr "ÙØ¨Ù"
 
@@ -4132,132 +4079,155 @@ msgstr "ÙØ¨Ù"
 msgid "Expecting a root feed element but got a whole XML document."
 msgstr ""
 
-#: lib/activityutils.php:208
+#. TRANS: Client exception thrown when there is no source attribute.
+#: lib/activityutils.php:203
 msgid "Can't handle remote content yet."
 msgstr ""
 
-#: lib/activityutils.php:244
+#. TRANS: Client exception thrown when there embedded XML content is found that cannot be processed yet.
+#: lib/activityutils.php:240
 msgid "Can't handle embedded XML content yet."
 msgstr ""
 
-#: lib/activityutils.php:248
+#. TRANS: Client exception thrown when base64 encoded content is found that cannot be processed yet.
+#: lib/activityutils.php:245
 msgid "Can't handle embedded Base64 content yet."
 msgstr ""
 
 #. TRANS: Client error message throw when a certain panel's settings cannot be changed.
-#: lib/adminpanelaction.php:110
+#: lib/adminpanelaction.php:108
 msgid "Changes to that panel are not allowed."
 msgstr "Ø§ÙØªØºÙÙØ±Ø§Øª ÙØ´ ÙØ³ÙÙØÙ ÙÙÙ ÙÙØÙ Ø¯Ù."
 
 #. TRANS: Client error message.
-#: lib/adminpanelaction.php:229
+#: lib/adminpanelaction.php:222
 msgid "showForm() not implemented."
 msgstr ""
 
 #. TRANS: Client error message thrown if design settings could not be deleted in
 #. TRANS: the admin panel Design.
-#: lib/adminpanelaction.php:284
+#: lib/adminpanelaction.php:274
 msgid "Unable to delete design setting."
 msgstr "ØªØ¹Ø°ÙØ± ØØ°Ù Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª Ø§ÙØªØµÙÙÙ."
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:350
+#: lib/adminpanelaction.php:337
 msgid "Basic site configuration"
 msgstr "Ø¶Ø¨Ø· Ø§ÙÙÙÙØ¹ Ø§ÙØ£Ø³Ø§Ø³Ù"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:358
+#: lib/adminpanelaction.php:345
 msgid "Design configuration"
 msgstr "Ø¶Ø¨Ø· Ø§ÙØªØµÙÙÙ"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:368 lib/personalgroupnav.php:115
+#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:115
 msgid "User"
 msgstr "Ø§ÙÙØ³ØªØ®Ø¯Ù"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:382
+#: lib/adminpanelaction.php:369
 msgid "Paths configuration"
 msgstr "Ø¶Ø¨Ø· Ø§ÙÙØ³Ø§Ø±Ø§Øª"
 
 #. TRANS: Client error 401.
-#: lib/apiauth.php:113
+#: lib/apiauth.php:111
 msgid "API resource requires read-write access, but you only have read access."
 msgstr ""
 
+#. TRANS: OAuth exception thrown when no application is found for a given consumer key.
+#: lib/apiauth.php:175
+msgid "No application for that consumer key."
+msgstr ""
+
+#. TRANS: OAuth exception given when an incorrect access token was given for a user.
+#: lib/apiauth.php:212
+msgid "Bad access token."
+msgstr ""
+
+#. TRANS: OAuth exception given when no user was found for a given token (no token was found).
+#: lib/apiauth.php:217
+msgid "No user for that token."
+msgstr ""
+
+#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
+#: lib/apioauthstore.php:178
+msgid "Tried to revoke unknown token"
+msgstr ""
+
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:213
+#: lib/applicationeditform.php:204
 msgid "Describe your application"
 msgstr "Ø§ÙØµÙ Ø§Ùapplication Ø¨ØªØ§Ø¹ØªÙ"
 
 #. TRANS: Form input field label.
-#: lib/applicationeditform.php:226
+#: lib/applicationeditform.php:217
 msgid "Source URL"
 msgstr "Source URL"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:242
+#: lib/applicationeditform.php:233
 msgid "URL for the homepage of the organization"
 msgstr ""
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:251
+#: lib/applicationeditform.php:242
 msgid "URL to redirect to after authentication"
 msgstr ""
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:278
+#: lib/applicationeditform.php:269
 msgid "Browser"
 msgstr ""
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:295
+#: lib/applicationeditform.php:286
 msgid "Desktop"
 msgstr ""
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:297
+#: lib/applicationeditform.php:288
 msgid "Type of application, browser or desktop"
 msgstr ""
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:320
+#: lib/applicationeditform.php:311
 msgid "Read-only"
 msgstr ""
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:339
+#: lib/applicationeditform.php:330
 msgid "Read-write"
 msgstr ""
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:341
+#: lib/applicationeditform.php:332
 msgid "Default access for this application: read-only, or read-write"
 msgstr ""
 
-#. TRANS: Submit button title
-#: lib/applicationeditform.php:359
+#. TRANS: Submit button title.
+#: lib/applicationeditform.php:349
 msgid "Cancel"
 msgstr "Ø£ÙØºÙ"
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:136
+#: lib/applicationlist.php:135
 msgid "read-write"
 msgstr ""
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:138
+#: lib/applicationlist.php:137
 msgid "read-only"
 msgstr ""
 
 #. 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
+#: lib/applicationlist.php:143
 #, php-format
 msgid "Approved %1$s - \"%2$s\" access."
 msgstr ""
 
 #. TRANS: Button label
-#: lib/applicationlist.php:159
+#: lib/applicationlist.php:158
 msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "Ø§Ø³ØªØ±Ø¬Ø¹"
@@ -4277,7 +4247,8 @@ msgstr "Ø§ÙÙØ¤ÙÙ"
 msgid "Provider"
 msgstr "Ø§ÙÙØ²ÙØ¯"
 
-#: lib/attachmenttagcloudsection.php:48
+#. TRANS: Title.
+#: lib/attachmenttagcloudsection.php:49
 msgid "Tags for this attachment"
 msgstr "ÙØ³ÙÙ ÙØ°Ø§ Ø§ÙÙØ±ÙÙ"
 
@@ -4289,6 +4260,11 @@ msgstr "ØªØºÙÙØ± Ø§ÙÙ¾Ø§Ø³ÙÙØ±Ø¯ ÙØ´Ù"
 msgid "Password changing is not allowed"
 msgstr "ØªØºÙÙØ± Ø§ÙÙ¾Ø§Ø³ÙÙØ±Ø¯ ÙØ´ ÙØ³ÙÙØ"
 
+#. TRANS: Title for the form to block a user.
+#: lib/blockform.php:70
+msgid "Block"
+msgstr "Ø§ÙÙØ¹"
+
 #: lib/channel.php:157 lib/channel.php:177
 msgid "Command results"
 msgstr "ÙØªØ§Ø¦Ø¬ Ø§ÙØ£ÙØ±"
@@ -4301,6 +4277,13 @@ msgstr "Ø§ÙØªÙÙ Ø§ÙØ£ÙØ±"
 msgid "Command failed"
 msgstr "ÙØ´Ù Ø§ÙØ£ÙØ±"
 
+#. TRANS: Message given getting a non-existing user.
+#. TRANS: %s is the nickname of the user that could not be found.
+#: lib/command.php:150
+#, php-format
+msgid "Could not find a local user with nickname %s."
+msgstr ""
+
 #. TRANS: Error text shown when an unimplemented command is given.
 #: lib/command.php:185
 msgid "Sorry, this command is not yet implemented."
@@ -4326,6 +4309,20 @@ msgstr ""
 "Ø§ÙÙØ´ØªØ±ÙÙÙ: %2$s\n"
 "Ø§ÙØ¥Ø´Ø¹Ø§Ø±Ø§Øª: %3$s"
 
+#. 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.
+#: lib/command.php:360
+#, php-format
+msgid "%1$s joined group %2$s."
+msgstr ""
+
+#. 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.
+#: lib/command.php:408
+#, php-format
+msgid "%1$s left group %2$s."
+msgstr ""
+
 #. TRANS: Whois output. %s is the full name of the queried user.
 #: lib/command.php:434
 #, php-format
@@ -4394,12 +4391,26 @@ msgstr ""
 msgid "Can't subscribe to OMB profiles by command."
 msgstr ""
 
+#. TRANS: Text shown after having subscribed to another user successfully.
+#. TRANS: %s is the name of the user the subscription was requested for.
+#: lib/command.php:672
+#, php-format
+msgid "Subscribed to %s."
+msgstr ""
+
 #. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
 #. TRANS: Error text shown when no username was provided when issuing the command.
 #: lib/command.php:694 lib/command.php:804
 msgid "Specify the name of the user to unsubscribe from."
 msgstr ""
 
+#. TRANS: Text shown after having unsubscribed from another user successfully.
+#. TRANS: %s is the name of the user the unsubscription was requested for.
+#: lib/command.php:705
+#, php-format
+msgid "Unsubscribed from %s."
+msgstr ""
+
 #. TRANS: Error text shown when the command "off" fails for an unknown reason.
 #: lib/command.php:731
 msgid "Can't turn off notification."
@@ -4417,13 +4428,20 @@ msgstr ""
 msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr ""
 
+#. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
+#. TRANS: %s is the name of the user the unsubscription was requested for.
+#: lib/command.php:813
+#, php-format
+msgid "Unsubscribed %s."
+msgstr ""
+
 #. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
 #: lib/command.php:831
 msgid "You are not subscribed to anyone."
 msgstr "ÙØ³Øª ÙÙØ´ØªØ±ÙÙØ§ Ø¨Ø£Ù Ø£ØØ¯."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to.
-#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.
 #: lib/command.php:836
 msgid "You are subscribed to this person:"
@@ -4442,7 +4460,7 @@ msgid "No one is subscribed to you."
 msgstr "ÙØ§ Ø£ØØ¯ ÙØ´ØªØ±Ù Ø¨Ù."
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
-#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
 #: lib/command.php:863
 msgid "This person is subscribed to you:"
@@ -4461,7 +4479,7 @@ msgid "You are not a member of any groups."
 msgstr "ÙØ³Øª Ø¹Ø¶ÙÙØ§ ÙÙ Ø£Ù ÙØ¬ÙÙØ¹Ù."
 
 #. TRANS: Text shown after requesting groups a user is subscribed to.
-#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
 #: lib/command.php:890
 msgid "You are a member of this group:"
@@ -4473,6 +4491,7 @@ msgstr[3] "Ø£ÙØª Ø¹Ø¶Ù ÙÙ ÙØ°Ù Ø§ÙÙØ¬ÙÙØ¹Ø§Øª:"
 msgstr[4] ""
 msgstr[5] ""
 
+#. TRANS: Help text for commands.
 #: lib/command.php:905
 msgid ""
 "Commands:\n"
@@ -4640,28 +4659,6 @@ msgstr ""
 msgid "Extra nicknames for the group, comma- or space- separated, max %d"
 msgstr ""
 
-#: lib/groupnav.php:85
-msgid "Group"
-msgstr "ÙØ¬ÙÙØ¹Ø§Øª"
-
-#: lib/groupnav.php:101
-msgid "Blocked"
-msgstr "ÙÙÙÙØ¹"
-
-#: lib/groupnav.php:108
-#, php-format
-msgid "Edit %s group properties"
-msgstr "Ø¹Ø¯ÙÙ Ø®ØµØ§Ø¦Øµ ÙØ¬ÙÙØ¹Ù %s"
-
-#: lib/groupnav.php:113
-msgid "Logo"
-msgstr "Ø§ÙØ´Ø¹Ø§Ø±"
-
-#: lib/groupnav.php:114
-#, php-format
-msgid "Add or edit %s logo"
-msgstr "Ø£Ø¶Ù Ø£Ù Ø¹Ø¯ÙÙ Ø´Ø¹Ø§Ø± %s"
-
 #: lib/groupsbymemberssection.php:71
 msgid "Groups with most members"
 msgstr "Ø§ÙÙØ¬ÙÙØ¹Ø§Øª Ø§ÙØ£ÙØ«Ø± Ø£Ø¹Ø¶Ø§Ø¡Ù"
@@ -4680,7 +4677,8 @@ msgstr ""
 msgid "That file is too big. The maximum file size is %s."
 msgstr "ÙØ°Ø§ Ø§ÙÙÙÙ ÙØ¨ÙØ± Ø¬Ø¯ÙØ§. Ø¥Ù Ø£ÙØµÙ ØØ¬Ù ÙÙÙÙÙØ§Øª ÙÙ %s."
 
-#: lib/imagefile.php:101 lib/mediafile.php:170
+#. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
+#: lib/imagefile.php:101 lib/mediafile.php:179
 msgid "System error uploading file."
 msgstr ""
 
@@ -4940,56 +4938,75 @@ msgstr ""
 msgid "Unsupported message type: %s"
 msgstr "ÙÙØ¹ Ø±Ø³Ø§ÙÙ ÙØ´ ÙØ¯Ø¹ÙÙ: %s"
 
-#: lib/mediafile.php:98 lib/mediafile.php:123
+#. TRANS: Client exception thrown when a database error was thrown during a file upload operation.
+#: lib/mediafile.php:99 lib/mediafile.php:125
 msgid "There was a database error while saving your file. Please try again."
 msgstr ""
 
-#: lib/mediafile.php:142
+#. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
+#: lib/mediafile.php:145
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
 msgstr ""
 
-#: lib/mediafile.php:147
+#. TRANS: Client exception.
+#: lib/mediafile.php:151
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form."
 msgstr ""
 
-#: lib/mediafile.php:152
+#. TRANS: Client exception.
+#: lib/mediafile.php:157
 msgid "The uploaded file was only partially uploaded."
 msgstr ""
 
-#: lib/mediafile.php:159
+#. TRANS: Client exception thrown when a temporary folder is not present to store a file upload.
+#: lib/mediafile.php:165
 msgid "Missing a temporary folder."
 msgstr ""
 
-#: lib/mediafile.php:162
+#. TRANS: Client exception thrown when writing to disk is not possible during a file upload operation.
+#: lib/mediafile.php:169
 msgid "Failed to write file to disk."
 msgstr "ÙØ´Ù ÙÙ ÙØªØ§Ø¨Ù Ø§ÙÙÙÙ Ø¥ÙÙ Ø§ÙÙØ±Øµ."
 
-#: lib/mediafile.php:165
+#. TRANS: Client exception thrown when a file upload operation has been stopped by an extension.
+#: lib/mediafile.php:173
 msgid "File upload stopped by extension."
 msgstr ""
 
-#: lib/mediafile.php:179 lib/mediafile.php:217
+#. TRANS: Client exception thrown when a file upload operation would cause a user to exceed a set quota.
+#: lib/mediafile.php:189 lib/mediafile.php:232
 msgid "File exceeds user's quota."
 msgstr ""
 
-#: lib/mediafile.php:197 lib/mediafile.php:234
+#. TRANS: Client exception thrown when a file upload operation fails because the file could
+#. TRANS: not be moved from the temporary folder to the permanent file location.
+#: lib/mediafile.php:209 lib/mediafile.php:251
 msgid "File could not be moved to destination directory."
 msgstr ""
 
-#: lib/mediafile.php:202 lib/mediafile.php:238
+#. TRANS: Client exception thrown when a file upload operation has been stopped because the MIME
+#. TRANS: type of the uploaded file could not be determined.
+#: lib/mediafile.php:216 lib/mediafile.php:257
 msgid "Could not determine file's MIME type."
 msgstr "ÙØ´ ÙØ§ÙØ¹ ÙØªØØ¯Ø¯ ÙÙØ¹ Ø§ÙÙMIME Ø¨ØªØ§Ø¹ Ø§ÙÙØ§ÙÙ."
 
-#: lib/mediafile.php:318
+#. TRANS: Client exception thrown trying to upload a forbidden MIME type.
+#. TRANS: %1$s is the file type that was denied, %2$s is the application part of
+#. TRANS: the MIME type that was denied.
+#: lib/mediafile.php:340
 #, php-format
-msgid " Try using another %s format."
+msgid ""
+"\"%1$s\" is not a supported file type on this server. Try using another %2$s "
+"format."
 msgstr ""
 
-#: lib/mediafile.php:323
+#. TRANS: Client exception thrown trying to upload a forbidden MIME type.
+#. TRANS: %s is the file type that was denied.
+#: lib/mediafile.php:345
 #, php-format
-msgid "%s is not a supported file type on this server."
+msgid "\"%s\" is not a supported file type on this server."
 msgstr ""
 
 #: lib/messageform.php:120
@@ -5004,11 +5021,6 @@ msgstr "Ø¥ÙÙ"
 msgid "Available characters"
 msgstr "Ø§ÙÙØØ§Ø±Ù Ø§ÙÙØªÙÙØ±Ø©"
 
-#: lib/messageform.php:178 lib/noticeform.php:237
-msgctxt "Send button for sending notice"
-msgid "Send"
-msgstr ""
-
 #: lib/noticeform.php:160
 msgid "Send a notice"
 msgstr "Ø£Ø±Ø³Ù Ø¥Ø´Ø¹Ø§Ø±ÙØ§"
@@ -5101,27 +5113,7 @@ msgstr "ÙØ¨ÙÙ ÙØ°Ø§ Ø§ÙÙØ³ØªØ®Ø¯Ù"
 msgid "Nudge"
 msgstr "ÙØ¨ÙÙ"
 
-#: lib/oauthstore.php:283
-msgid "Error inserting new profile"
-msgstr "Ø®Ø·Ø£ Ø£Ø«ÙØ§Ø¡ Ø¥Ø¯Ø±Ø§Ø¬ Ø§ÙÙÙÙ Ø§ÙØ´Ø®ØµÙ Ø§ÙØ¬Ø¯ÙØ¯"
-
-#: lib/oauthstore.php:291
-msgid "Error inserting avatar"
-msgstr "Ø®Ø·Ø£ ÙÙ Ø¥Ø¯Ø±Ø§Ø¬ Ø§ÙØ£ÙØªØ§Ø±"
-
-#: lib/oauthstore.php:306
-msgid "Error updating remote profile"
-msgstr "Ø®Ø·Ø£ Ø£Ø«ÙØ§Ø¡ ØªØØ¯ÙØ« Ø§ÙÙÙÙ Ø§ÙØ´Ø®ØµÙ Ø§ÙØ¨Ø¹ÙØ¯"
-
-#: lib/oauthstore.php:311
-msgid "Error inserting remote profile"
-msgstr "Ø®Ø·Ø£ Ø£Ø«ÙØ§Ø¡ Ø¥Ø¯Ø±Ø§Ø¬ Ø§ÙÙÙÙ Ø§ÙØ´Ø®ØµÙ Ø§ÙØ¨Ø¹ÙØ¯"
-
-#: lib/oauthstore.php:345
-msgid "Duplicate notice"
-msgstr "Ø¶Ø§Ø¹Ù Ø§ÙØ¥Ø´Ø¹Ø§Ø±"
-
-#: lib/oauthstore.php:490
+#: lib/oauthstore.php:491
 msgid "Couldn't insert new subscription."
 msgstr "ØªØ¹Ø°ÙØ± Ø¥Ø¯Ø±Ø§Ø¬ Ø§Ø´ØªØ±Ø§Ù Ø¬Ø¯ÙØ¯."
 
@@ -5153,12 +5145,8 @@ msgstr "ØµÙØ¯ÙÙ Ø§ÙØµØ§Ø¯Ø±"
 msgid "Your sent messages"
 msgstr "Ø±Ø³Ø§Ø¦ÙÙ Ø§ÙÙÙØ±Ø³ÙØ©"
 
-#: lib/personaltagcloudsection.php:56
-#, php-format
-msgid "Tags in %s's notices"
-msgstr ""
-
-#: lib/plugin.php:115
+#. TRANS: Displayed as version information for a plugin if no version information was found.
+#: lib/plugin.php:116
 msgid "Unknown"
 msgstr "ÙØ´ ÙØ¹Ø±ÙÙ"
 
@@ -5243,19 +5231,19 @@ msgstr ""
 msgid "Sandbox this user"
 msgstr "Ø£Ø¶Ù ÙØ°Ø§ Ø§ÙÙØ³ØªØ®Ø¯Ù Ø¥ÙÙ ØµÙØ¯ÙÙ Ø§ÙØ±ÙÙ"
 
-#: lib/searchaction.php:120
+#. TRANS: Fieldset legend for the search form.
+#: lib/searchaction.php:121
 msgid "Search site"
 msgstr "Ø§Ø¨ØØ« ÙÙ Ø§ÙÙÙÙØ¹"
 
-#: lib/searchaction.php:126
+#. TRANS: Used as a field label for the field where one or more keywords
+#. TRANS: for searching can be entered.
+#: lib/searchaction.php:129
 msgid "Keyword(s)"
 msgstr "Ø§ÙÙÙÙØ§Øª Ø§ÙÙÙØªØ§ØÙØ©"
 
-#: lib/searchaction.php:127
-msgid "Search"
-msgstr "Ø§Ø¨ØØ«"
-
-#: lib/searchaction.php:162
+#. TRANS: Definition list item with instructions on how to get (better) search results.
+#: lib/searchaction.php:170
 msgid "Search help"
 msgstr "Ø§Ø¨ØØ« ÙÙ Ø§ÙÙØ³Ø§Ø¹Ø¯Ø©"
 
@@ -5431,12 +5419,12 @@ msgid "Moderator"
 msgstr ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1102
+#: lib/util.php:1103
 msgid "a few seconds ago"
 msgstr "ÙØ¨Ù ÙØØ¸Ø§Øª ÙÙÙÙØ©"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1105
+#: lib/util.php:1106
 msgid "about a minute ago"
 msgstr "ÙØ¨Ù Ø¯ÙÙÙÙ ØªÙØ±ÙØ¨ÙØ§"
 
@@ -5446,17 +5434,17 @@ msgid "about an hour ago"
 msgstr "ÙØ¨Ù Ø³Ø§Ø¹Ù ØªÙØ±ÙØ¨ÙØ§"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1119
+#: lib/util.php:1118
 msgid "about a day ago"
 msgstr "ÙØ¨Ù ÙÙÙ ØªÙØ±ÙØ¨Ø§"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1126
+#: lib/util.php:1124
 msgid "about a month ago"
 msgstr "ÙØ¨Ù Ø´ÙØ± ØªÙØ±ÙØ¨ÙØ§"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1133
+#: lib/util.php:1130
 msgid "about a year ago"
 msgstr "ÙØ¨Ù Ø³ÙÙ ØªÙØ±ÙØ¨ÙØ§"
 
diff --git a/locale/bg/LC_MESSAGES/statusnet.po b/locale/bg/LC_MESSAGES/statusnet.po
index d4eb9fe7f9..02f1172d0f 100644
--- a/locale/bg/LC_MESSAGES/statusnet.po
+++ b/locale/bg/LC_MESSAGES/statusnet.po
@@ -1,7 +1,8 @@
-# Translation of StatusNet to Bulgarian
+# Translation of StatusNet to Bulgarian (ÐÑÐ»Ð³Ð°ÑÑÐºÐ¸)
+# Expored from translatewiki.net
 #
-# Author@translatewiki.net: DCLXVI
-# Author@translatewiki.net: Turin
+# Author: DCLXVI
+# Author: Turin
 # --
 # This file is distributed under the same license as the StatusNet package.
 #
@@ -9,20 +10,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-08 22:33+0000\n"
-"PO-Revision-Date: 2010-09-08 22:33:22+0000\n"
-"Language-Team: Bulgarian\n"
+"POT-Creation-Date: 2010-09-14 19:53+0000\n"
+"PO-Revision-Date: 2010-09-14 19:53:41+0000\n"
+"Language-Team: Bulgarian <http://translatewiki.net/wiki/Portal:bg>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r72348); Translate extension (2010-08-20)\n"
+"X-Generator: MediaWiki 1.17alpha (r73009); Translate extension (2010-08-20)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: bg\n"
-"X-Message-Group: out-statusnet\n"
+"X-Message-Group: #out-statusnet\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-POT-Import-Date: 1284-49-16 34::+0000\n"
 
 #. TRANS: Page title
 #. TRANS: Menu item for site administration
-#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:376
+#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:363
 msgid "Access"
 msgstr "ÐÐ¾ÑÑÑÐ¿"
 
@@ -75,10 +77,10 @@ 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 actions/emailsettings.php:224
-#: actions/imsettings.php:184 actions/smssettings.php:209
-#: lib/applicationeditform.php:361
+#. TRANS: Button label in the "Edit application" form.
+#: actions/accessadminpanel.php:203 actions/emailsettings.php:228
+#: actions/imsettings.php:187 actions/smssettings.php:209
+#: lib/applicationeditform.php:351
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "ÐÐ°Ð¿Ð°Ð·Ð²Ð°Ð½Ðµ"
@@ -91,15 +93,15 @@ msgstr "ÐÑÐ¼Ð° ÑÐ°ÐºÐ°ÐºÐ° ÑÑÑÐ°Ð½Ð¸ÑÐ°."
 
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #: actions/all.php:79 actions/allrss.php:68
-#: actions/apiaccountupdatedeliverydevice.php:114
-#: actions/apiaccountupdateprofile.php:105
-#: actions/apiaccountupdateprofilebackgroundimage.php:116
-#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
-#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
-#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:113
-#: actions/apigroupismember.php:91 actions/apigroupjoin.php:100
-#: actions/apigroupleave.php:100 actions/apigrouplist.php:73
-#: actions/apistatusesupdate.php:229 actions/apisubscriptions.php:87
+#: actions/apiaccountupdatedeliverydevice.php:115
+#: actions/apiaccountupdateprofile.php:106
+#: actions/apiaccountupdateprofilebackgroundimage.php:117
+#: actions/apiaccountupdateprofileimage.php:106 actions/apiblockcreate.php:98
+#: actions/apiblockdestroy.php:97 actions/apidirectmessage.php:77
+#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:114
+#: actions/apigroupismember.php:91 actions/apigroupjoin.php:101
+#: actions/apigroupleave.php:101 actions/apigrouplist.php:73
+#: actions/apistatusesupdate.php:230 actions/apisubscriptions.php:87
 #: actions/apitimelinefavorites.php:72 actions/apitimelinefriends.php:174
 #: actions/apitimelinehome.php:80 actions/apitimelinementions.php:80
 #: actions/apitimelineuser.php:82 actions/avatarbynickname.php:75
@@ -191,16 +193,16 @@ msgid "Updates from %1$s and friends on %2$s!"
 msgstr "ÐÐµÐ»ÐµÐ¶ÐºÐ¸ Ð¾Ñ %1$s Ð¸ Ð¿ÑÐ¸ÑÑÐµÐ»Ð¸ Ð² %2$s."
 
 #: actions/apiaccountratelimitstatus.php:72
-#: actions/apiaccountupdatedeliverydevice.php:94
-#: actions/apiaccountupdateprofile.php:97
-#: actions/apiaccountupdateprofilebackgroundimage.php:94
-#: actions/apiaccountupdateprofilecolors.php:118
+#: actions/apiaccountupdatedeliverydevice.php:95
+#: actions/apiaccountupdateprofile.php:98
+#: actions/apiaccountupdateprofilebackgroundimage.php:95
+#: actions/apiaccountupdateprofilecolors.php:119
 #: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156
-#: actions/apifavoritecreate.php:100 actions/apifavoritedestroy.php:101
-#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100
-#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:139
-#: actions/apigroupismember.php:115 actions/apigroupjoin.php:156
-#: actions/apigroupleave.php:142 actions/apigrouplist.php:137
+#: actions/apifavoritecreate.php:101 actions/apifavoritedestroy.php:102
+#: actions/apifriendshipscreate.php:101 actions/apifriendshipsdestroy.php:101
+#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:140
+#: actions/apigroupismember.php:115 actions/apigroupjoin.php:157
+#: actions/apigroupleave.php:143 actions/apigrouplist.php:137
 #: actions/apigrouplistall.php:122 actions/apigroupmembership.php:107
 #: actions/apigroupshow.php:116 actions/apihelptest.php:88
 #: actions/apistatusesdestroy.php:104 actions/apistatusesretweets.php:112
@@ -215,47 +217,49 @@ msgstr "ÐÐµÐ»ÐµÐ¶ÐºÐ¸ Ð¾Ñ %1$s Ð¸ Ð¿ÑÐ¸ÑÑÐµÐ»Ð¸ Ð² %2$s."
 msgid "API method not found."
 msgstr "ÐÐµ Ðµ Ð¾ÑÐºÑÐ¸Ñ Ð¼ÐµÑÐ¾Ð´ÑÑ Ð² API."
 
-#: actions/apiaccountupdatedeliverydevice.php:86
-#: actions/apiaccountupdateprofile.php:89
-#: actions/apiaccountupdateprofilebackgroundimage.php:86
-#: actions/apiaccountupdateprofilecolors.php:110
-#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89
-#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109
-#: actions/apifavoritecreate.php:91 actions/apifavoritedestroy.php:92
-#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
-#: actions/apigroupcreate.php:105 actions/apigroupjoin.php:92
-#: actions/apigroupleave.php:92 actions/apimediaupload.php:67
-#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:198
+#. TRANS: Client error message. POST is a HTTP command. It should not be translated.
+#. TRANS: Client error. POST is a HTTP command. It should not be translated.
+#: actions/apiaccountupdatedeliverydevice.php:87
+#: actions/apiaccountupdateprofile.php:90
+#: actions/apiaccountupdateprofilebackgroundimage.php:87
+#: actions/apiaccountupdateprofilecolors.php:111
+#: actions/apiaccountupdateprofileimage.php:85 actions/apiblockcreate.php:90
+#: actions/apiblockdestroy.php:89 actions/apidirectmessagenew.php:110
+#: actions/apifavoritecreate.php:92 actions/apifavoritedestroy.php:93
+#: actions/apifriendshipscreate.php:92 actions/apifriendshipsdestroy.php:92
+#: actions/apigroupcreate.php:106 actions/apigroupjoin.php:93
+#: actions/apigroupleave.php:93 actions/apimediaupload.php:68
+#: actions/apistatusesretweet.php:66 actions/apistatusesupdate.php:199
 msgid "This method requires a POST."
 msgstr "Ð¢Ð¾Ð·Ð¸ Ð¼ÐµÑÐ¾Ð´ Ð¸Ð·Ð¸ÑÐºÐ²Ð° Ð·Ð°ÑÐ²ÐºÐ° POST."
 
-#: actions/apiaccountupdatedeliverydevice.php:106
+#: actions/apiaccountupdatedeliverydevice.php:107
 msgid ""
 "You must specify a parameter named 'device' with a value of one of: sms, im, "
 "none."
 msgstr ""
 
-#: actions/apiaccountupdatedeliverydevice.php:133
+#: actions/apiaccountupdatedeliverydevice.php:134
 msgid "Could not update user."
 msgstr "ÐÑÐµÑÐºÐ° Ð¿ÑÐ¸ Ð¾Ð±Ð½Ð¾Ð²ÑÐ²Ð°Ð½Ðµ Ð½Ð° Ð¿Ð¾ÑÑÐµÐ±Ð¸ÑÐµÐ»Ñ."
 
-#: actions/apiaccountupdateprofile.php:112
-#: actions/apiaccountupdateprofilebackgroundimage.php:194
-#: actions/apiaccountupdateprofilecolors.php:185
-#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/apiaccountupdateprofile.php:113
+#: actions/apiaccountupdateprofilebackgroundimage.php:195
+#: actions/apiaccountupdateprofilecolors.php:186
+#: actions/apiaccountupdateprofileimage.php:131 actions/apiusershow.php:108
 #: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/hcard.php:74
 #: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
 #: lib/profileaction.php:84
 msgid "User has no profile."
 msgstr "ÐÐ¾ÑÑÐµÐ±Ð¸ÑÐµÐ»ÑÑ Ð½ÑÐ¼Ð° Ð¿ÑÐ¾ÑÐ¸Ð»."
 
-#: actions/apiaccountupdateprofile.php:147
+#: actions/apiaccountupdateprofile.php:148
 msgid "Could not save profile."
 msgstr "ÐÑÐµÑÐºÐ° Ð¿ÑÐ¸ Ð·Ð°Ð¿Ð°Ð·Ð²Ð°Ð½Ðµ Ð½Ð° Ð¿ÑÐ¾ÑÐ¸Ð»Ð°."
 
-#: actions/apiaccountupdateprofilebackgroundimage.php:108
-#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
-#: actions/apistatusesupdate.php:212 actions/avatarsettings.php:257
+#: actions/apiaccountupdateprofilebackgroundimage.php:109
+#: actions/apiaccountupdateprofileimage.php:98 actions/apimediaupload.php:81
+#: actions/apistatusesupdate.php:213 actions/avatarsettings.php:257
 #: actions/designadminpanel.php:123 actions/editapplication.php:118
 #: actions/newapplication.php:101 actions/newnotice.php:94
 #: lib/designsettings.php:283
@@ -265,15 +269,15 @@ msgid ""
 "current configuration."
 msgstr ""
 
-#: actions/apiblockcreate.php:105
+#: actions/apiblockcreate.php:106
 msgid "You cannot block yourself!"
 msgstr "ÐÐµ Ð¼Ð¾Ð¶ÐµÑÐµ Ð´Ð° Ð±Ð»Ð¾ÐºÐ¸ÑÐ°ÑÐµ ÑÐµÐ±Ðµ ÑÐ¸!"
 
-#: actions/apiblockcreate.php:126
+#: actions/apiblockcreate.php:127
 msgid "Block user failed."
 msgstr "ÐÑÐµÑÐºÐ° Ð¿ÑÐ¸ Ð±Ð»Ð¾ÐºÐ¸ÑÐ°Ð½Ðµ Ð½Ð° Ð¿Ð¾ÑÑÐµÐ±Ð¸ÑÐµÐ»Ñ."
 
-#: actions/apiblockdestroy.php:114
+#: actions/apiblockdestroy.php:115
 msgid "Unblock user failed."
 msgstr "ÐÑÐµÑÐºÐ° Ð¿ÑÐ¸ ÑÐ°Ð·Ð±Ð»Ð¾ÐºÐ¸ÑÐ°Ð½Ðµ Ð½Ð° Ð¿Ð¾ÑÑÐµÐ±Ð¸ÑÐµÐ»Ñ."
 
@@ -297,68 +301,64 @@ msgstr "ÐÑÐµÐºÐ¸ ÑÑÐ¾Ð±ÑÐµÐ½Ð¸Ñ Ð´Ð¾ %s"
 msgid "All the direct messages sent to %s"
 msgstr "ÐÑÐ¸ÑÐºÐ¸ Ð¿ÑÐµÐºÐ¸ ÑÑÐ¾Ð±ÑÐµÐ½Ð¸Ñ, Ð¸Ð·Ð¿ÑÐ°ÑÐµÐ½Ð¸ Ð´Ð¾ %s"
 
-#: actions/apidirectmessagenew.php:118
+#: actions/apidirectmessagenew.php:119
 msgid "No message text!"
 msgstr "ÐÐ¸Ð¿ÑÐ²Ð° ÑÐµÐºÑÑ Ð½Ð° ÑÑÐ¾Ð±ÑÐµÐ½Ð¸ÐµÑÐ¾"
 
-#: actions/apidirectmessagenew.php:127 actions/newmessage.php:150
+#: actions/apidirectmessagenew.php:128 actions/newmessage.php:150
 #, php-format
 msgid "That's too long. Max message size is %d chars."
 msgstr "Ð¢Ð²ÑÑÐ´Ðµ Ð´ÑÐ»Ð³Ð¾. ÐÐ¾Ð¶Ðµ Ð´Ð° Ðµ Ð½Ð°Ð¹-Ð¼Ð½Ð¾Ð³Ð¾ %d Ð·Ð½Ð°ÐºÐ°."
 
-#: actions/apidirectmessagenew.php:138
+#: actions/apidirectmessagenew.php:139
 msgid "Recipient user not found."
 msgstr "ÐÐ¾Ð»ÑÑÐ°ÑÐµÐ»ÑÑ Ð½Ðµ Ðµ Ð¾ÑÐºÑÐ¸Ñ"
 
-#: actions/apidirectmessagenew.php:142
+#: actions/apidirectmessagenew.php:143
 msgid "Can't send direct messages to users who aren't your friend."
 msgstr ""
 "ÐÐµ Ð¼Ð¾Ð¶Ðµ Ð´Ð° Ð¸Ð·Ð¿ÑÐ°ÑÐ°ÑÐµ Ð¿ÑÐµÐºÐ¸ ÑÑÐ¾Ð±ÑÐµÐ½Ð¸Ñ Ð´Ð¾ ÑÐ¾ÑÐ°, ÐºÐ¾Ð¸ÑÐ¾ Ð½Ðµ ÑÐ° Ð² ÑÐ¿Ð¸ÑÑÐºÐ° Ð²Ð¸ Ñ "
 "Ð¿ÑÐ¸ÑÑÐµÐ»Ð¸."
 
-#: actions/apifavoritecreate.php:109 actions/apifavoritedestroy.php:110
+#: actions/apifavoritecreate.php:110 actions/apifavoritedestroy.php:111
 #: actions/apistatusesdestroy.php:121
 msgid "No status found with that ID."
 msgstr "ÐÐµ Ðµ Ð¾ÑÐºÑÐ¸ÑÐ° Ð±ÐµÐ»ÐµÐ¶ÐºÐ° Ñ ÑÐ°ÐºÑÐ² Ð¸Ð´ÐµÐ½ÑÐ¸ÑÐ¸ÐºÐ°ÑÐ¾Ñ."
 
-#: actions/apifavoritecreate.php:120
+#: actions/apifavoritecreate.php:121
 msgid "This status is already a favorite."
 msgstr "Ð¢Ð°Ð·Ð¸ Ð±ÐµÐ»ÐµÐ¶ÐºÐ° Ð²ÐµÑÐµ Ðµ Ð¾ÑÐ±ÐµÐ»ÑÐ·Ð°Ð½Ð° ÐºÐ°ÑÐ¾ Ð»ÑÐ±Ð¸Ð¼Ð°."
 
 #. TRANS: Error message text shown when a favorite could not be set.
-#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:296
+#: actions/apifavoritecreate.php:132 actions/favor.php:84 lib/command.php:296
 msgid "Could not create favorite."
 msgstr "ÐÑÐµÑÐºÐ° Ð¿ÑÐ¸ Ð¾ÑÐ±ÐµÐ»ÑÐ·Ð²Ð°Ð½Ðµ ÐºÐ°ÑÐ¾ Ð»ÑÐ±Ð¸Ð¼Ð°."
 
-#: actions/apifavoritedestroy.php:123
+#: actions/apifavoritedestroy.php:124
 msgid "That status is not a favorite."
 msgstr "Ð¢Ð°Ð·Ð¸ Ð±ÐµÐ»ÐµÐ¶ÐºÐ° Ð½Ðµ Ðµ Ð¾ÑÐ±ÐµÐ»ÑÐ·Ð°Ð½Ð° ÐºÐ°ÑÐ¾ Ð»ÑÐ±Ð¸Ð¼Ð°."
 
-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
+#: actions/apifavoritedestroy.php:136 actions/disfavor.php:87
 msgid "Could not delete favorite."
 msgstr "ÐÑÐµÑÐºÐ° Ð¿ÑÐ¸ Ð¸Ð·ÑÑÐ¸Ð²Ð°Ð½Ðµ Ð½Ð° Ð»ÑÐ±Ð¸Ð¼Ð° Ð±ÐµÐ»ÐµÐ¶ÐºÐ°."
 
-#: actions/apifriendshipscreate.php:109
+#: actions/apifriendshipscreate.php:110
 msgid "Could not follow user: profile not found."
 msgstr "ÐÑÐµÑÐºÐ° Ð¿ÑÐ¸ ÑÐ¿Ð¸ÑÐ°Ð½Ðµ Ð½Ð° Ð¿ÑÐ¾ÑÐ»ÐµÐ´ÑÐ²Ð°Ð½ÐµÑÐ¾ â Ð¿Ð¾ÑÑÐµÐ±Ð¸ÑÐµÐ»ÑÑ Ð½Ðµ Ðµ Ð½Ð°Ð¼ÐµÑÐµÐ½."
 
-#: actions/apifriendshipscreate.php:118
+#: actions/apifriendshipscreate.php:119
 #, php-format
 msgid "Could not follow user: %s is already on your list."
 msgstr "ÐÑÐµÑÐºÐ° Ð¿ÑÐ¸ Ð¿ÑÐ¾ÑÐ»ÐµÐ´ÑÐ²Ð°Ð½Ðµ Ð½Ð° Ð¿Ð¾ÑÑÐµÐ±Ð¸ÑÐµÐ»: %s Ð²ÐµÑÐµ Ðµ Ð² ÑÐ¿Ð¸ÑÑÐºÐ° Ð²Ð¸."
 
-#: actions/apifriendshipsdestroy.php:109
+#: actions/apifriendshipsdestroy.php:110
 msgid "Could not unfollow user: User not found."
 msgstr "ÐÑÐµÑÐºÐ° Ð¿ÑÐ¸ ÑÐ¿Ð¸ÑÐ°Ð½Ðµ Ð½Ð° Ð¿ÑÐ¾ÑÐ»ÐµÐ´ÑÐ²Ð°Ð½ÐµÑÐ¾ â Ð¿Ð¾ÑÑÐµÐ±Ð¸ÑÐµÐ»ÑÑ Ð½Ðµ Ðµ Ð½Ð°Ð¼ÐµÑÐµÐ½."
 
-#: actions/apifriendshipsdestroy.php:120
+#: actions/apifriendshipsdestroy.php:121
 msgid "You cannot unfollow yourself."
 msgstr "ÐÐµ Ð¼Ð¾Ð¶ÐµÑÐµ Ð´Ð° ÑÐ¿ÑÐµÑÐµ Ð´Ð° ÑÐ»ÐµÐ´Ð¸ÑÐµ ÑÐµÐ±Ðµ ÑÐ¸."
 
-#: actions/apifriendshipsexists.php:91
-msgid "Two valid IDs or screen_names must be supplied."
-msgstr ""
-
 #: actions/apifriendshipsshow.php:134
 msgid "Could not determine source user."
 msgstr "Ð¦ÐµÐ»ÐµÐ²Ð¸ÑÑ Ð¿Ð¾ÑÑÐµÐ±Ð¸ÑÐµÐ» Ð½Ðµ Ð±ÐµÑÐµ Ð¾ÑÐºÑÐ¸Ñ."
@@ -367,7 +367,7 @@ msgstr "Ð¦ÐµÐ»ÐµÐ²Ð¸ÑÑ Ð¿Ð¾ÑÑÐµÐ±Ð¸ÑÐµÐ» Ð½Ðµ Ð±ÐµÑÐµ Ð¾ÑÐºÑÐ¸Ñ."
 msgid "Could not find target user."
 msgstr "Ð¦ÐµÐ»ÐµÐ²Ð¸ÑÑ Ð¿Ð¾ÑÑÐµÐ±Ð¸ÑÐµÐ» Ð½Ðµ Ð±ÐµÑÐµ Ð¾ÑÐºÑÐ¸Ñ."
 
-#: actions/apigroupcreate.php:167 actions/editgroup.php:186
+#: actions/apigroupcreate.php:168 actions/editgroup.php:186
 #: actions/newgroup.php:126 actions/profilesettings.php:215
 #: actions/register.php:212
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
@@ -375,90 +375,90 @@ msgstr ""
 "ÐÑÐµÐ²Ð´Ð¾Ð½Ð¸Ð¼ÑÑ Ð¼Ð¾Ð¶Ðµ Ð´Ð° ÑÑÐ´ÑÑÐ¶Ð° ÑÐ°Ð¼Ð¾ Ð¼Ð°Ð»ÐºÐ¸ Ð±ÑÐºÐ²Ð¸, ÑÐ¸ÑÐ»Ð° Ð¸ Ð½Ð¸ÐºÐ°ÐºÐ²Ð¾ ÑÐ°Ð·ÑÑÐ¾ÑÐ½Ð¸Ðµ "
 "Ð¼ÐµÐ¶Ð´Ñ ÑÑÑ."
 
-#: actions/apigroupcreate.php:176 actions/editgroup.php:190
+#: actions/apigroupcreate.php:177 actions/editgroup.php:190
 #: actions/newgroup.php:130 actions/profilesettings.php:238
 #: actions/register.php:215
 msgid "Nickname already in use. Try another one."
 msgstr "ÐÐ¿Ð¸ÑÐ°Ð¹ÑÐµ Ð´ÑÑÐ³ Ð¿ÑÐµÐ²Ð´Ð¾Ð½Ð¸Ð¼, ÑÐ¾Ð·Ð¸ Ð²ÐµÑÐµ Ðµ Ð·Ð°ÐµÑ."
 
-#: actions/apigroupcreate.php:183 actions/editgroup.php:193
+#: actions/apigroupcreate.php:184 actions/editgroup.php:193
 #: actions/newgroup.php:133 actions/profilesettings.php:218
 #: actions/register.php:217
 msgid "Not a valid nickname."
 msgstr "ÐÐµÐ¿ÑÐ°Ð²Ð¸Ð»ÐµÐ½ Ð¿ÑÐµÐ²Ð´Ð¾Ð½Ð¸Ð¼."
 
-#: actions/apigroupcreate.php:199 actions/editapplication.php:215
+#: actions/apigroupcreate.php:200 actions/editapplication.php:215
 #: actions/editgroup.php:199 actions/newapplication.php:203
 #: actions/newgroup.php:139 actions/profilesettings.php:222
 #: actions/register.php:224
 msgid "Homepage is not a valid URL."
 msgstr "ÐÐ´ÑÐµÑÑÑ Ð½Ð° Ð»Ð¸ÑÐ½Ð°ÑÐ° ÑÑÑÐ°Ð½Ð¸ÑÐ° Ð½Ðµ Ðµ Ð¿ÑÐ°Ð²Ð¸Ð»ÐµÐ½ URL."
 
-#: actions/apigroupcreate.php:208 actions/editgroup.php:202
+#: actions/apigroupcreate.php:209 actions/editgroup.php:202
 #: actions/newgroup.php:142 actions/profilesettings.php:225
 #: actions/register.php:227
 msgid "Full name is too long (max 255 chars)."
 msgstr "ÐÑÐ»Ð½Ð¾ÑÐ¾ Ð¸Ð¼Ðµ Ðµ ÑÐ²ÑÑÐ´Ðµ Ð´ÑÐ»Ð³Ð¾ (Ð¼Ð°ÐºÑ. 255 Ð·Ð½Ð°ÐºÐ°)"
 
-#: actions/apigroupcreate.php:216 actions/editapplication.php:190
+#: actions/apigroupcreate.php:217 actions/editapplication.php:190
 #: actions/newapplication.php:172
 #, php-format
 msgid "Description is too long (max %d chars)."
 msgstr "ÐÐ¿Ð¸ÑÐ°Ð½Ð¸ÐµÑÐ¾ Ðµ ÑÐ²ÑÑÐ´Ðµ Ð´ÑÐ»Ð³Ð¾ (Ð´Ð¾ %d ÑÐ¸Ð¼Ð²Ð¾Ð»Ð°)."
 
-#: actions/apigroupcreate.php:227 actions/editgroup.php:208
+#: actions/apigroupcreate.php:228 actions/editgroup.php:208
 #: actions/newgroup.php:148 actions/profilesettings.php:232
 #: actions/register.php:234
 msgid "Location is too long (max 255 chars)."
 msgstr "ÐÐ¼ÐµÑÐ¾ Ð½Ð° Ð¼ÐµÑÑÐ¾Ð¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ð¸ÐµÑÐ¾ Ðµ ÑÐ²ÑÑÐ´Ðµ Ð´ÑÐ»Ð³Ð¾ (Ð¼Ð°ÐºÑ. 255 Ð·Ð½Ð°ÐºÐ°)."
 
-#: actions/apigroupcreate.php:246 actions/editgroup.php:219
+#: actions/apigroupcreate.php:247 actions/editgroup.php:219
 #: actions/newgroup.php:159
 #, php-format
 msgid "Too many aliases! Maximum %d."
 msgstr ""
 
-#: actions/apigroupcreate.php:267
+#: actions/apigroupcreate.php:268
 #, php-format
 msgid "Invalid alias: \"%s\"."
 msgstr "ÐÐµÐ¿ÑÐ°Ð²Ð¸Ð»ÐµÐ½ Ð¿ÑÐµÐ²Ð´Ð¾Ð½Ð¸Ð¼: \"%s\""
 
-#: actions/apigroupcreate.php:276 actions/editgroup.php:232
+#: actions/apigroupcreate.php:277 actions/editgroup.php:232
 #: actions/newgroup.php:172
 #, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr "ÐÑÐµÐ²Ð´Ð¾Ð½Ð¸Ð¼ÑÑ \"%s\" Ð²ÐµÑÐµ Ðµ Ð·Ð°ÐµÑ. ÐÐ¿Ð¸ÑÐ°Ð¹ÑÐµ Ð´ÑÑÐ³."
 
-#: actions/apigroupcreate.php:289 actions/editgroup.php:238
+#: actions/apigroupcreate.php:290 actions/editgroup.php:238
 #: actions/newgroup.php:178
 msgid "Alias can't be the same as nickname."
 msgstr ""
 
-#: actions/apigroupismember.php:96 actions/apigroupjoin.php:105
-#: actions/apigroupleave.php:105 actions/apigroupmembership.php:92
+#: actions/apigroupismember.php:96 actions/apigroupjoin.php:106
+#: actions/apigroupleave.php:106 actions/apigroupmembership.php:92
 #: actions/apigroupshow.php:83 actions/apitimelinegroup.php:92
 msgid "Group not found."
 msgstr "ÐÑÑÐ¿Ð°ÑÐ° Ð½Ðµ Ðµ Ð¾ÑÐºÑÐ¸ÑÐ°."
 
 #. TRANS: Error text shown a user tries to join a group they already are a member of.
-#: actions/apigroupjoin.php:111 actions/joingroup.php:100 lib/command.php:336
+#: actions/apigroupjoin.php:112 actions/joingroup.php:100 lib/command.php:336
 msgid "You are already a member of that group."
 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.
-#: actions/apigroupjoin.php:139 actions/joingroup.php:134 lib/command.php:353
+#: actions/apigroupjoin.php:140 actions/joingroup.php:134 lib/command.php:353
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "ÐÑÐµÑÐºÐ° Ð¿ÑÐ¸ Ð¾Ð±Ð½Ð¾Ð²ÑÐ²Ð°Ð½Ðµ Ð½Ð° Ð³ÑÑÐ¿Ð°ÑÐ°."
 
-#: actions/apigroupleave.php:115
+#: actions/apigroupleave.php:116
 msgid "You are not a member of this group."
 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.
-#: actions/apigroupleave.php:125 actions/leavegroup.php:129
+#: actions/apigroupleave.php:126 actions/leavegroup.php:129
 #: lib/command.php:401
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
@@ -488,9 +488,9 @@ msgstr ""
 
 #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
 #: actions/deletenotice.php:169 actions/disfavor.php:74
-#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:55
+#: actions/emailsettings.php:271 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:66 actions/imsettings.php:227
+#: actions/groupunblock.php:66 actions/imsettings.php:230
 #: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
@@ -529,8 +529,8 @@ msgstr ""
 #. 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:286 actions/grouplogo.php:322
-#: actions/imsettings.php:242 actions/newapplication.php:121
+#: actions/emailsettings.php:290 actions/grouplogo.php:322
+#: actions/imsettings.php:245 actions/newapplication.php:121
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
 #: actions/smssettings.php:277 lib/designsettings.php:304
 msgid "Unexpected form submission."
@@ -591,18 +591,18 @@ msgstr "Ð¢Ð¾Ð·Ð¸ Ð¼ÐµÑÐ¾Ð´ Ð¸Ð·Ð¸ÑÐºÐ²Ð° Ð·Ð°ÑÐ²ÐºÐ° POST Ð¸Ð»Ð¸ DELETE."
 msgid "You may not delete another user's status."
 msgstr "ÐÐµ Ð¼Ð¾Ð¶Ðµ Ð´Ð° Ð¸Ð·ÑÑÐ¸Ð²Ð°ÑÐµ Ð±ÐµÐ»ÐµÐ¶ÐºÐ¸ Ð½Ð° Ð´ÑÑÐ³ Ð¿Ð¾ÑÑÐµÐ±Ð¸ÑÐµÐ»."
 
-#: actions/apistatusesretweet.php:75 actions/apistatusesretweets.php:72
+#: actions/apistatusesretweet.php:76 actions/apistatusesretweets.php:72
 #: actions/deletenotice.php:52 actions/shownotice.php:92
 msgid "No such notice."
 msgstr "ÐÑÐ¼Ð° ÑÐ°ÐºÐ°Ð²Ð° Ð±ÐµÐ»ÐµÐ¶ÐºÐ°."
 
 #. TRANS: Error text shown when trying to repeat an own notice.
-#: actions/apistatusesretweet.php:83 lib/command.php:538
+#: actions/apistatusesretweet.php:84 lib/command.php:538
 msgid "Cannot repeat your own notice."
 msgstr "ÐÐµ Ð¼Ð¾Ð¶ÐµÑÐµ Ð´Ð° Ð¿Ð¾Ð²ÑÐ°ÑÑÑÐµ ÑÐ¾Ð±ÑÑÐ²ÐµÐ½Ð¸ Ð±ÐµÐ»ÐµÐ¶ÐºÐ¸."
 
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-#: actions/apistatusesretweet.php:91 lib/command.php:544
+#: actions/apistatusesretweet.php:92 lib/command.php:544
 msgid "Already repeated that notice."
 msgstr "ÐÐµÑÐµ ÑÑÐµ Ð¿Ð¾Ð²ÑÐ¾ÑÐ¸Ð»Ð¸ ÑÐ°Ð·Ð¸ Ð±ÐµÐ»ÐµÐ¶ÐºÐ°."
 
@@ -614,21 +614,21 @@ msgstr "ÐÐµÐ»ÐµÐ¶ÐºÐ°ÑÐ° Ðµ Ð¸Ð·ÑÑÐ¸ÑÐ°."
 msgid "No status with that ID found."
 msgstr "ÐÐµ Ðµ Ð¾ÑÐºÑÐ¸ÑÐ° Ð±ÐµÐ»ÐµÐ¶ÐºÐ° Ñ ÑÐ°ÐºÑÐ² Ð¸Ð´ÐµÐ½ÑÐ¸ÑÐ¸ÐºÐ°ÑÐ¾Ñ."
 
-#: actions/apistatusesupdate.php:221
+#: actions/apistatusesupdate.php:222
 msgid "Client must provide a 'status' parameter with a value."
 msgstr ""
 
-#: actions/apistatusesupdate.php:242 actions/newnotice.php:157
+#: actions/apistatusesupdate.php:243 actions/newnotice.php:157
 #: lib/mailhandler.php:60
 #, php-format
 msgid "That's too long. Max notice size is %d chars."
 msgstr "Ð¢Ð²ÑÑÐ´Ðµ Ð´ÑÐ»Ð³Ð¾. ÐÐ¾Ð¶Ðµ Ð´Ð° Ðµ Ð½Ð°Ð¹-Ð¼Ð½Ð¾Ð³Ð¾ %d Ð·Ð½Ð°ÐºÐ°."
 
-#: actions/apistatusesupdate.php:283 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:284 actions/apiusershow.php:96
 msgid "Not found."
 msgstr "ÐÐµ Ðµ Ð¾ÑÐºÑÐ¸ÑÐ¾."
 
-#: actions/apistatusesupdate.php:306 actions/newnotice.php:181
+#: actions/apistatusesupdate.php:307 actions/newnotice.php:181
 #, php-format
 msgid "Max notice size is %d chars, including attachment URL."
 msgstr ""
@@ -759,6 +759,10 @@ msgstr "ÐÑÐ¼Ð° ÐºÐ°ÑÐµÐ½ ÑÐ°Ð¹Ð»."
 msgid "Pick a square area of the image to be your avatar"
 msgstr "ÐÐ·Ð±ÐµÑÐµÑÐµ ÐºÐ²Ð°Ð´ÑÐ°ÑÐ½Ð° Ð¾Ð±Ð»Ð°ÑÑ Ð¾Ñ Ð¸Ð·Ð¾Ð±ÑÐ°Ð¶ÐµÐ½Ð¸ÐµÑÐ¾ Ð·Ð° Ð°Ð²Ð°ÑÐ°Ñ"
 
+#: actions/avatarsettings.php:347 actions/grouplogo.php:380
+msgid "Lost our file data."
+msgstr ""
+
 #: actions/avatarsettings.php:370
 msgid "Avatar updated."
 msgstr "ÐÐ²Ð°ÑÐ°ÑÑÑ Ðµ Ð¾Ð±Ð½Ð¾Ð²ÐµÐ½."
@@ -817,7 +821,9 @@ msgid "Yes"
 msgstr "ÐÐ°"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
+#. TRANS: Submit button title.
+#. TRANS: Description of the form to block a user.
+#: actions/block.php:164 actions/groupmembers.php:403 lib/blockform.php:82
 msgid "Block this user"
 msgstr "ÐÐ»Ð¾ÐºÐ¸ÑÐ°Ð½Ðµ Ð½Ð° Ð¿Ð¾ÑÑÐµÐ±Ð¸ÑÐµÐ»Ñ"
 
@@ -855,11 +861,13 @@ msgstr "%1$s Ð¸ Ð¿ÑÐ¸ÑÑÐµÐ»Ð¸, ÑÑÑÐ°Ð½Ð¸ÑÐ° %2$d"
 msgid "Unblock user from group"
 msgstr "Ð Ð°Ð·Ð±Ð»Ð¾ÐºÐ¸ÑÐ°Ð½Ðµ Ð½Ð° Ð¿Ð¾ÑÑÐµÐ±Ð¸ÑÐµÐ»Ñ Ð¾Ñ Ð³ÑÑÐ¿Ð°ÑÐ°"
 
-#: actions/blockedfromgroup.php:320 lib/unblockform.php:69
+#. TRANS: Title for the form to unblock a user.
+#: actions/blockedfromgroup.php:320 lib/unblockform.php:70
 msgid "Unblock"
 msgstr "Ð Ð°Ð·Ð±Ð»Ð¾ÐºÐ¸ÑÐ°Ð½Ðµ"
 
-#: actions/blockedfromgroup.php:320 lib/unblockform.php:80
+#. TRANS: Description of the form to unblock a user.
+#: actions/blockedfromgroup.php:320 lib/unblockform.php:82
 msgid "Unblock this user"
 msgstr "Ð Ð°Ð·Ð±Ð»Ð¾ÐºÐ¸ÑÐ°Ð½Ðµ Ð½Ð° ÑÐ¾Ð·Ð¸ Ð¿Ð¾ÑÑÐµÐ±Ð¸ÑÐµÐ»"
 
@@ -881,12 +889,6 @@ msgstr "ÐÐ¾Ð´ÑÑ Ð·Ð° Ð¿Ð¾ÑÐ²ÑÑÐ¶Ð´ÐµÐ½Ð¸Ðµ Ð½Ðµ Ðµ Ð¾ÑÐºÑÐ¸Ñ."
 msgid "That confirmation code is not for you!"
 msgstr "Ð¢Ð¾Ð·Ð¸ ÐºÐ¾Ð´ Ð·Ð° Ð¿Ð¾ÑÐ²ÑÑÐ¶Ð´ÐµÐ½Ð¸Ðµ Ð½Ðµ Ðµ Ð·Ð° Ð²Ð°Ñ!"
 
-#. TRANS: Server error for an unknow address type, which can be 'email', 'jabber', or 'sms'.
-#: actions/confirmaddress.php:91
-#, php-format
-msgid "Unrecognized address type %s."
-msgstr ""
-
 #. TRANS: Client error for an already confirmed email/jabbel/sms address.
 #: actions/confirmaddress.php:96
 msgid "That address has already been confirmed."
@@ -898,9 +900,9 @@ msgstr "Ð¢Ð¾Ð·Ð¸ Ð°Ð´ÑÐµÑ Ðµ Ð²ÐµÑÐµ Ð¿Ð¾ÑÐ²ÑÑÐ´ÐµÐ½."
 #. 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/confirmaddress.php:116 actions/emailsettings.php:331
+#: actions/emailsettings.php:477 actions/imsettings.php:283
+#: actions/imsettings.php:442 actions/othersettings.php:174
 #: actions/profilesettings.php:283 actions/smssettings.php:308
 #: actions/smssettings.php:464
 msgid "Couldn't update user."
@@ -908,7 +910,7 @@ msgstr "ÐÑÐµÑÐºÐ° Ð¿ÑÐ¸ Ð¾Ð±Ð½Ð¾Ð²ÑÐ²Ð°Ð½Ðµ Ð½Ð° Ð¿Ð¾ÑÑÐµÐ±Ð¸ÑÐµÐ»Ñ."
 
 #. 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/confirmaddress.php:128 actions/emailsettings.php:437
 #: actions/smssettings.php:422
 msgid "Couldn't delete email confirmation."
 msgstr "ÐÑÐµÑÐºÐ° Ð¿ÑÐ¸ Ð¸Ð·ÑÑÐ¸Ð²Ð°Ð½Ðµ Ð¿Ð¾ÑÐ²ÑÑÐ¶Ð´ÐµÐ½Ð¸ÐµÑÐ¾ Ð¿Ð¾ Ðµ-Ð¿Ð¾ÑÐ°."
@@ -944,9 +946,10 @@ msgstr "ÐÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸ÐµÑÐ¾ Ð½Ðµ Ðµ Ð¾ÑÐºÑÐ¸ÑÐ¾."
 msgid "You are not the owner of this application."
 msgstr "ÐÐµ ÑÑÐµ ÑÐ¾Ð±ÑÑÐ²ÐµÐ½Ð¸Ðº Ð½Ð° ÑÐ¾Ð²Ð° Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ."
 
+#. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:127
 #: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1307
+#: lib/action.php:1315
 msgid "There was a problem with your session token."
 msgstr "ÐÐ¼Ð°ÑÐµ Ð¿ÑÐ¾Ð±Ð»ÐµÐ¼ ÑÑÑ ÑÐµÑÐ¸ÑÑÐ° Ð²Ð¸ Ð² ÑÐ°Ð¹ÑÐ°."
 
@@ -977,7 +980,7 @@ msgstr "ÐÐ·ÑÑÐ¸Ð²Ð°Ð½Ðµ Ð½Ð° ÑÐ¾Ð²Ð° Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ"
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
 #: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:73 lib/profileformaction.php:64
+#: lib/adminpanelaction.php:71 lib/profileformaction.php:64
 #: lib/settingsaction.php:72
 msgid "Not logged in."
 msgstr "ÐÐµ ÑÑÐµ Ð²Ð»ÐµÐ·Ð»Ð¸ Ð² ÑÐ¸ÑÑÐµÐ¼Ð°ÑÐ°."
@@ -1033,11 +1036,6 @@ msgstr ""
 msgid "Delete this user"
 msgstr "ÐÐ·ÑÑÐ¸Ð²Ð°Ð½Ðµ Ð½Ð° ÑÐ¾Ð·Ð¸ Ð¿Ð¾ÑÑÐµÐ±Ð¸ÑÐµÐ»"
 
-#: actions/designadminpanel.php:322
-#, php-format
-msgid "Theme not available: %s."
-msgstr ""
-
 #: actions/designadminpanel.php:426
 msgid "Change logo"
 msgstr "Ð¡Ð¼ÑÐ½Ð° Ð½Ð° Ð»Ð¾Ð³Ð¾ÑÐ¾"
@@ -1122,13 +1120,13 @@ msgstr ""
 msgid "Reset back to default"
 msgstr ""
 
-#. TRANS: Submit button title
+#. TRANS: Submit button title.
 #: actions/designadminpanel.php:685 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/snapshotadminpanel.php:245
 #: actions/subscriptions.php:226 actions/tagother.php:154
-#: actions/useradminpanel.php:294 lib/applicationeditform.php:363
+#: actions/useradminpanel.php:294 lib/applicationeditform.php:353
 #: lib/designsettings.php:256 lib/groupeditform.php:202
 msgid "Save"
 msgstr "ÐÐ°Ð¿Ð°Ð·Ð²Ð°Ð½Ðµ"
@@ -1243,7 +1241,7 @@ msgstr "Ð¢ÐµÐºÑÑ Ð¿Ð¾ÑÐ²ÑÑÐ´ÐµÐ½ Ð°Ð´ÑÐµÑ Ð½Ð° Ðµ-Ð¿Ð¾ÑÐ°."
 #. 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/emailsettings.php:115 actions/emailsettings.php:162
 #: actions/imsettings.php:116 actions/smssettings.php:124
 #: actions/smssettings.php:180
 msgctxt "BUTTON"
@@ -1261,22 +1259,26 @@ msgstr ""
 #. 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
+#. TRANS: Button label in the "Edit application" form.
 #: actions/emailsettings.php:127 actions/imsettings.php:131
-#: actions/smssettings.php:137 lib/applicationeditform.php:357
+#: actions/smssettings.php:137 lib/applicationeditform.php:347
 msgctxt "BUTTON"
 msgid "Cancel"
 msgstr "ÐÑÐºÐ°Ð·"
 
-#. TRANS: Instructions for e-mail address input form.
-#: actions/emailsettings.php:135
+#. TRANS: Instructions for e-mail address input form. Do not translate
+#. TRANS: "example.org". It is one of the domain names reserved for
+#. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
+#. TRANS: Any other domain may be owned by a legitimate person or
+#. TRANS: organization.
+#: actions/emailsettings.php:139
 msgid "Email address, like \"UserName@example.org\""
 msgstr "ÐÐ´ÑÐµÑ Ð½Ð° Ðµ-Ð¿Ð¾ÑÐ°, ÐºÐ°ÑÐ¾ \"UserName@example.org\""
 
 #. 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/emailsettings.php:143 actions/imsettings.php:151
 #: actions/smssettings.php:162
 msgctxt "BUTTON"
 msgid "Add"
@@ -1284,105 +1286,98 @@ msgstr "ÐÐ¾Ð±Ð°Ð²ÑÐ½Ðµ"
 
 #. 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
+#: actions/emailsettings.php:151 actions/smssettings.php:171
 msgid "Incoming email"
 msgstr "ÐÑÐ¾Ð´ÑÑÐ° Ð¿Ð¾ÑÐ°"
 
 #. 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
+#: actions/emailsettings.php:159 actions/smssettings.php:178
 msgid "Send email to this address to post new notices."
 msgstr "ÐÐ·Ð¿ÑÐ°ÑÐµÑÐµ Ð¿Ð¸ÑÐ¼Ð¾ Ð´Ð¾ ÑÐ¾Ð·Ð¸ Ð°Ð´ÑÐµÑ Ð·Ð° Ð¿ÑÐ±Ð»Ð¸ÐºÑÐ²Ð°Ð½Ðµ ÐºÐ°ÑÐ¾ Ð±ÐµÐ»ÐµÐ¶ÐºÐ°."
 
 #. 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
+#: actions/emailsettings.php:168 actions/smssettings.php:186
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr "ÐÐ°Ð´Ð°Ð²Ð°Ð½Ðµ Ð½Ð° Ð½Ð¾Ð²Ð° Ðµ-Ð¿Ð¾ÑÐ°, Ð¾Ñ ÐºÐ¾ÑÑÐ¾ Ð´Ð° ÑÐµ Ð¿ÑÐ±Ð»Ð¸ÐºÑÐ²Ð°. ÐÑÐ¼ÐµÐ½Ñ Ð¿ÑÐµÐ´Ð¸ÑÐ½Ð°ÑÐ°."
 
-#. 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 ""
-
 #. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:174
+#: actions/emailsettings.php:178
 msgid "Email preferences"
 msgstr "ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ¸ Ð½Ð° Ðµ-Ð¿Ð¾ÑÐ°"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:180
+#: actions/emailsettings.php:184
 msgid "Send me notices of new subscriptions through email."
 msgstr "ÐÐ·Ð¿ÑÐ°ÑÐ°Ð½Ðµ Ð½Ð° ÑÐ²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸Ñ Ð·Ð° Ð½Ð¾Ð²Ð¸ Ð°Ð±Ð¾Ð½Ð°Ð¼ÐµÐ½ÑÐ¸ Ð¿Ð¾ Ð¿Ð¾ÑÐ°ÑÐ°."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:186
+#: actions/emailsettings.php:190
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr "ÐÐ·Ð¿ÑÐ°ÑÐ°Ð½Ðµ Ð½Ð° Ð¿Ð¸ÑÐ¼Ð¾ Ð¿ÑÐ¸ Ð¾ÑÐ±ÐµÐ»ÑÐ·Ð²Ð°Ð½Ðµ Ð½Ð° Ð¼Ð¾Ñ Ð±ÐµÐ»ÐµÐ¶ÐºÐ° ÐºÐ°ÑÐ¾ Ð»ÑÐ±Ð¸Ð¼Ð°."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:193
+#: actions/emailsettings.php:197
 msgid "Send me email when someone sends me a private message."
 msgstr "ÐÐ·Ð¿ÑÐ°ÑÐ°Ð½Ðµ Ð½Ð° Ð¿Ð¸ÑÐ¼Ð¾ Ð¿ÑÐ¸ Ð½Ð¾Ð²Ð¾ Ð»Ð¸ÑÐ½Ð¾ ÑÑÐ¾Ð±ÑÐµÐ½Ð¸Ðµ."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:205
+#: actions/emailsettings.php:209
 msgid "Allow friends to nudge me and send me an email."
 msgstr ""
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:212
+#: actions/emailsettings.php:216
 msgid "I want to post notices by email."
 msgstr "ÐÑÐºÐ°Ð¼ Ð´Ð° Ð¸Ð·Ð¿ÑÐ°ÑÐ°Ð¼ Ð±ÐµÐ»ÐµÐ¶ÐºÐ¸ Ð¿Ð¾ Ð¿Ð¾ÑÐ°ÑÐ°."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:219
+#: actions/emailsettings.php:223
 msgid "Publish a MicroID for my email address."
 msgstr "ÐÑÐ±Ð»Ð¸ÐºÑÐ²Ð°Ð½Ðµ Ð½Ð° MicroID Ð·Ð° Ð°Ð´ÑÐµÑÐ° Ð½Ð° Ðµ-Ð¿Ð¾ÑÐ°ÑÐ°."
 
 #. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:334
+#: actions/emailsettings.php:338
 msgid "Email preferences saved."
 msgstr "ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ¸ÑÐµ Ð½Ð° Ðµ-Ð¿Ð¾ÑÐ° ÑÐ° Ð·Ð°Ð¿Ð°Ð·ÐµÐ½Ð¸."
 
 #. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:353
+#: actions/emailsettings.php:357
 msgid "No email address."
 msgstr "ÐÐµ Ðµ Ð²ÑÐ²ÐµÐ´ÐµÐ½Ð° Ðµ-Ð¿Ð¾ÑÐ°."
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:361
+#: actions/emailsettings.php:365
 msgid "Cannot normalize that email address"
 msgstr "ÐÑÐµÑÐºÐ° Ð¿ÑÐ¸ Ð½Ð¾ÑÐ¼Ð°Ð»Ð¸Ð·Ð¸ÑÐ°Ð½Ðµ Ð°Ð´ÑÐµÑÐ° Ð½Ð° Ðµ-Ð¿Ð¾ÑÐ°ÑÐ°"
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:208
+#: actions/emailsettings.php:370 actions/register.php:208
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "ÐÐµÐ¿ÑÐ°Ð²Ð¸Ð»ÐµÐ½ Ð°Ð´ÑÐµÑ Ð½Ð° Ðµ-Ð¿Ð¾ÑÐ°."
 
 #. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:370
+#: actions/emailsettings.php:374
 msgid "That is already your email address."
 msgstr "Ð¢Ð¾Ð²Ð° Ð¸ ÑÐµÐ³Ð° Ðµ Ð°Ð´ÑÐµÑÑÑ Ð½Ð° Ðµ-Ð¿Ð¾ÑÐ°ÑÐ° Ð²Ð¸."
 
 #. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:374
+#: actions/emailsettings.php:378
 msgid "That email address already belongs to another user."
 msgstr "Ð¢Ð°Ð·Ð¸ Ðµ-Ð¿Ð¾ÑÐ° Ð²ÐµÑÐµ ÑÐµ Ð¸Ð·Ð¿Ð¾Ð»Ð·Ð²Ð° Ð¾Ñ Ð´ÑÑÐ³ Ð¿Ð¾ÑÑÐµÐ±Ð¸ÑÐµÐ»."
 
 #. 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/emailsettings.php:395 actions/imsettings.php:351
 #: actions/smssettings.php:373
 msgid "Couldn't insert confirmation code."
 msgstr "ÐÐµ Ð¼Ð¾Ð¶Ðµ Ð´Ð° ÑÐµ Ð²Ð¼ÑÐºÐ½Ðµ ÐºÐ¾Ð´ Ð·Ð° Ð¿Ð¾ÑÐ²ÑÑÐ¶Ð´ÐµÐ½Ð¸Ðµ."
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:398
+#: actions/emailsettings.php:402
 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."
@@ -1394,45 +1389,45 @@ msgstr ""
 #. 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/emailsettings.php:423 actions/imsettings.php:386
 #: actions/smssettings.php:408
 msgid "No pending confirmation to cancel."
 msgstr "ÐÑÐ¼Ð° Ð¿Ð¾ÑÐ²ÑÑÐ¶Ð´ÐµÐ½Ð¸Ñ, Ð¾ÑÐ°ÐºÐ²Ð°ÑÐ¸ Ð´Ð° Ð±ÑÐ´Ð°Ñ Ð¾ÑÐºÐ°Ð·Ð°Ð½Ð¸."
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:438
+#: actions/emailsettings.php:442
 msgid "Email confirmation cancelled."
 msgstr "ÐÑÐ¼Ð° Ð¿Ð¾ÑÐ²ÑÑÐ¶Ð´ÐµÐ½Ð¸Ñ, Ð¾ÑÐ°ÐºÐ²Ð°ÑÐ¸ Ð´Ð° Ð±ÑÐ´Ð°Ñ Ð¾ÑÐºÐ°Ð·Ð°Ð½Ð¸."
 
 #. TRANS: Message given trying to remove an e-mail address that is not
 #. TRANS: registered for the active user.
-#: actions/emailsettings.php:458
+#: actions/emailsettings.php:462
 msgid "That is not your email address."
 msgstr "Ð¢Ð¾Ð²Ð° Ð½Ðµ Ðµ Ð²Ð°ÑÐ¸ÑÑ Ð°Ð´ÑÐµÑ Ð½Ð° Ðµ-Ð¿Ð¾ÑÐ°."
 
 #. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:479
+#: actions/emailsettings.php:483
 msgid "The email address was removed."
 msgstr "ÐÑÐ¾Ð´ÑÑÐ¸ÑÑ Ð°Ð´ÑÐµÑ Ð½Ð° Ðµ-Ð¿Ð¾ÑÐ° Ðµ Ð¿ÑÐµÐ¼Ð°ÑÐ½Ð°Ñ."
 
-#: actions/emailsettings.php:493 actions/smssettings.php:568
+#: actions/emailsettings.php:497 actions/smssettings.php:568
 msgid "No incoming email address."
 msgstr "ÐÑÐ¼Ð° Ð²ÑÐ¾Ð´ÑÑ Ð°Ð´ÑÐµÑ Ð½Ð° Ðµ-Ð¿Ð¾ÑÐ°."
 
 #. 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/emailsettings.php:508 actions/emailsettings.php:532
 #: actions/smssettings.php:578 actions/smssettings.php:602
 msgid "Couldn't update user record."
 msgstr "ÐÑÐµÑÐºÐ° Ð¿ÑÐ¸ Ð¾Ð±Ð½Ð¾Ð²ÑÐ²Ð°Ð½Ðµ Ð·Ð°Ð¿Ð¸ÑÐ° Ð½Ð° Ð¿Ð¾ÑÑÐµÐ±Ð¸ÑÐµÐ»."
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
-#: actions/emailsettings.php:508 actions/smssettings.php:581
+#: actions/emailsettings.php:512 actions/smssettings.php:581
 msgid "Incoming email address removed."
 msgstr "ÐÑÐ¾Ð´ÑÑÐ¸ÑÑ Ð°Ð´ÑÐµÑ Ð½Ð° Ðµ-Ð¿Ð¾ÑÐ° Ðµ Ð¿ÑÐµÐ¼Ð°ÑÐ½Ð°Ñ."
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
-#: actions/emailsettings.php:532 actions/smssettings.php:605
+#: actions/emailsettings.php:536 actions/smssettings.php:605
 msgid "New incoming email address added."
 msgstr "ÐÐ¾Ð±Ð°Ð²ÐµÐ½ Ðµ Ð½Ð¾Ð² Ð²ÑÐ¾Ð´ÑÑ Ð°Ð´ÑÐµÑ Ð½Ð° Ðµ-Ð¿Ð¾ÑÐ°."
 
@@ -1516,10 +1511,6 @@ msgstr "ÐÑÐ¼Ð° Ð¿ÑÐ¸ÐºÐ°ÑÐµÐ½Ð¸ ÑÐ°Ð¹Ð»Ð¾Ð²Ðµ."
 msgid "Not expecting this response!"
 msgstr "ÐÐµÐ¾ÑÐ°ÐºÐ²Ð°Ð½ Ð¾ÑÐ³Ð¾Ð²Ð¾Ñ."
 
-#: actions/finishremotesubscribe.php:80
-msgid "User being listened to does not exist."
-msgstr ""
-
 #: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59
 msgid "You can use the local subscription!"
 msgstr "ÐÐ¾Ð¶ÐµÑÐµ Ð´Ð° Ð¿Ð¾Ð»Ð·Ð²Ð°ÑÐµ Ð»Ð¾ÐºÐ°Ð»ÐµÐ½ Ð°Ð±Ð¾Ð½Ð°Ð¼ÐµÐ½Ñ!"
@@ -1532,14 +1523,6 @@ msgstr "ÐÐ¾ÑÑÐµÐ±Ð¸ÑÐµÐ»ÑÑ Ðµ Ð·Ð°Ð±ÑÐ°Ð½Ð¸Ð» Ð´Ð° ÑÐµ Ð°Ð±Ð¾Ð½Ð¸ÑÐ°Ñ
 msgid "You are not authorized."
 msgstr "ÐÐµ ÑÑÐµ Ð°Ð±Ð¾Ð½Ð¸ÑÐ°Ð½Ð¸ Ð·Ð° Ð½Ð¸ÐºÐ¾Ð³Ð¾."
 
-#: actions/finishremotesubscribe.php:113
-msgid "Could not convert request token to access token."
-msgstr ""
-
-#: actions/finishremotesubscribe.php:118
-msgid "Remote service uses unknown version of OMB protocol."
-msgstr ""
-
 #: actions/getfile.php:79
 msgid "No such file."
 msgstr "ÐÑÐ¼Ð° ÑÐ°ÐºÑÐ² ÑÐ°Ð¹Ð»."
@@ -1585,7 +1568,7 @@ msgstr "ÐÐ¾ÑÑÐµÐ±Ð¸ÑÐµÐ»ÑÑ Ð²ÐµÑÐµ Ðµ Ð±Ð»Ð¾ÐºÐ¸ÑÐ°Ð½ Ð·Ð° Ð³ÑÑÐ¿Ð°Ñ
 msgid "User is not a member of group."
 msgstr "ÐÐ¾ÑÑÐµÐ±Ð¸ÑÐµÐ»ÑÑ Ð½Ðµ ÑÐ»ÐµÐ½ÑÐ²Ð° Ð² Ð³ÑÑÐ¿Ð°ÑÐ°."
 
-#: actions/groupblock.php:134 actions/groupmembers.php:360
+#: actions/groupblock.php:134 actions/groupmembers.php:364
 msgid "Block user from group"
 msgstr "Ð Ð°Ð·Ð±Ð»Ð¾ÐºÐ¸ÑÐ°Ð½Ðµ Ð½Ð° Ð¿Ð¾ÑÑÐµÐ±Ð¸ÑÐµÐ»Ñ Ð¾Ñ Ð³ÑÑÐ¿Ð°ÑÐ°"
 
@@ -1644,32 +1627,28 @@ msgstr "ÐÐ¾ÑÐ¾Ð³Ð¾ Ðµ Ð¾Ð±Ð½Ð¾Ð²ÐµÐ½Ð¾."
 msgid "Failed updating logo."
 msgstr "ÐÐµÑÑÐ¿ÐµÑÐ½Ð¾ Ð¾Ð±Ð½Ð¾Ð²ÑÐ²Ð°Ð½Ðµ Ð½Ð° Ð»Ð¾Ð³Ð¾ÑÐ¾."
 
-#: actions/groupmembers.php:100 lib/groupnav.php:92
+#. TRANS: Title of the page showing group members.
+#. TRANS: %s is the name of the group.
+#: actions/groupmembers.php:102
 #, php-format
 msgid "%s group members"
 msgstr "Ð§Ð»ÐµÐ½Ð¾Ð²Ðµ Ð½Ð° Ð³ÑÑÐ¿Ð°ÑÐ° %s"
 
-#: actions/groupmembers.php:103
+#. TRANS: Title of the page showing group members.
+#. TRANS: %1$s is the name of the group, %2$d is the page number of the members list.
+#: actions/groupmembers.php:107
 #, php-format
 msgid "%1$s group members, page %2$d"
 msgstr "ÐÐ±Ð¾Ð½Ð°ÑÐ¸ Ð½Ð° %1$s, ÑÑÑÐ°Ð½Ð¸ÑÐ° %2$d"
 
-#: actions/groupmembers.php:118
+#: actions/groupmembers.php:122
 msgid "A list of the users in this group."
 msgstr "Ð¡Ð¿Ð¸ÑÑÐº Ñ Ð¿Ð¾ÑÑÐµÐ±Ð¸ÑÐµÐ»Ð¸ÑÐµ Ð² ÑÐ°Ð·Ð¸ Ð³ÑÑÐ¿Ð°."
 
-#: actions/groupmembers.php:182 lib/groupnav.php:107
+#: actions/groupmembers.php:186
 msgid "Admin"
 msgstr "ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ¸"
 
-#: actions/groupmembers.php:392 lib/blockform.php:69
-msgid "Block"
-msgstr "ÐÐ»Ð¾ÐºÐ¸ÑÐ°Ð½Ðµ"
-
-#: actions/groupmembers.php:519
-msgid "Make this user an admin"
-msgstr ""
-
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Title in atom group notice feed. %s is a group name.
 #. TRANS: Title in atom user notice feed. %s is a user name.
@@ -1751,11 +1730,6 @@ msgstr ""
 "ÐÐ¾Ð¶ÐµÑÐµ Ð´Ð° Ð¿Ð¾Ð»ÑÑÐ°Ð²Ð°ÑÐµ ÑÑÐ¾Ð±ÑÐµÐ½Ð¸Ñ Ð¿Ð¾ Jabber/GTalk [instant messages](%%doc.im%"
 "%). ÐÑÐ²ÐµÐ´ÐµÑÐµ Ð°Ð´ÑÐµÑÐ° ÑÐ¸ Ð² Ð½Ð°ÑÑÑÐ¾Ð¹ÐºÐ¸ÑÐµ Ð¿Ð¾-Ð´Ð¾Ð»Ñ."
 
-#. 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 ""
-
 #. 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
@@ -1779,7 +1753,10 @@ msgstr ""
 
 #. TRANS: IM address input field instructions in IM settings form.
 #. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:140
+#. TRANS: Do not translate "example.org". It is one of the domain names reserved for use in examples by
+#. TRANS: http://www.rfc-editor.org/rfc/rfc2606.txt. Any other domain may be owned by a legitimate
+#. TRANS: person or organization.
+#: actions/imsettings.php:143
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -1789,63 +1766,63 @@ msgstr ""
 "ÑÑÐµ Ð´Ð¾Ð±Ð°Ð²Ð¸Ð»Ð¸ %s Ð² ÑÐ¿Ð¸ÑÑÐºÐ° ÑÐ¸ Ñ Ð¿ÑÐ¸ÑÑÐµÐ»Ð¸ Ð² IM Ð¸Ð»Ð¸ GTalk ÐºÐ»Ð¸ÐµÐ½ÑÐ° ÑÐ¸."
 
 #. TRANS: Form legend for IM preferences form.
-#: actions/imsettings.php:155
+#: actions/imsettings.php:158
 msgid "IM preferences"
 msgstr "ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ¸ Ð½Ð° Ðµ-Ð¿Ð¾ÑÐ°"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:160
+#: actions/imsettings.php:163
 msgid "Send me notices through Jabber/GTalk."
 msgstr "ÐÐ·Ð¿ÑÐ°ÑÐ°Ð½Ðµ Ð½Ð° Ð±ÐµÐ»ÐµÐ¶ÐºÐ¸ÑÐµ Ð¿Ð¾ Jabber/GTalk."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:166
+#: actions/imsettings.php:169
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr "ÐÑÐ±Ð»Ð¸ÐºÑÐ²Ð°Ð½Ðµ Ð¿ÑÐ¾Ð¼ÑÐ½Ð°ÑÐ° Ð½Ð° ÑÑÑÑÐ¾ÑÐ½Ð¸ÐµÑÐ¾ Ð¼Ð¸ Ð² Jabber/GTalk."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:172
+#: actions/imsettings.php:175
 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr "ÐÐ·Ð¿ÑÐ°ÑÐ°Ð½Ðµ Ð¿Ð¾ Jabber/GTalk Ð½Ð° Ð¾ÑÐ³Ð¾Ð²Ð¾ÑÐ¸ Ð¾Ñ ÑÐ¾ÑÐ°, "
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:179
+#: actions/imsettings.php:182
 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "ÐÑÐ±Ð»Ð¸ÐºÑÐ²Ð°Ð½Ðµ Ð½Ð° MicroID Ð·Ð° Ð°Ð´ÑÐµÑÐ° Ð² Jabber/GTalk."
 
 #. TRANS: Confirmation message for successful IM preferences save.
-#: actions/imsettings.php:287 actions/othersettings.php:180
+#: actions/imsettings.php:290 actions/othersettings.php:180
 msgid "Preferences saved."
 msgstr "ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ¸ÑÐµ ÑÐ° Ð·Ð°Ð¿Ð°Ð·ÐµÐ½Ð¸."
 
 #. TRANS: Message given saving IM address without having provided one.
-#: actions/imsettings.php:309
+#: actions/imsettings.php:312
 msgid "No Jabber ID."
 msgstr "ÐÑÐ¼Ð° Jabber ID."
 
 #. TRANS: Message given saving IM address that cannot be normalised.
-#: actions/imsettings.php:317
+#: actions/imsettings.php:320
 msgid "Cannot normalize that Jabber ID"
 msgstr "ÐÑÐµÑÐºÐ° Ð¿ÑÐ¸ Ð½Ð¾ÑÐ¼Ð°Ð»Ð¸Ð·Ð°ÑÐ¸Ñ Ð½Ð° ÑÐ¾Ð·Ð¸ Jabber ID"
 
 #. TRANS: Message given saving IM address that not valid.
-#: actions/imsettings.php:322
+#: actions/imsettings.php:325
 msgid "Not a valid Jabber ID"
 msgstr "ÐÐµÐ¿ÑÐ°Ð²Ð¸Ð»ÐµÐ½ Jabber ID"
 
 #. TRANS: Message given saving IM address that is already set.
-#: actions/imsettings.php:326
+#: actions/imsettings.php:329
 msgid "That is already your Jabber ID."
 msgstr "Ð¢Ð¾Ð²Ð° Ð²ÐµÑÐµ Ðµ Ð²Ð°ÑÐ¸ÑÑ Jabber ID."
 
 #. TRANS: Message given saving IM address that is already set for another user.
-#: actions/imsettings.php:330
+#: actions/imsettings.php:333
 msgid "Jabber ID already belongs to another user."
 msgstr "Ð¢Ð¾Ð·Ð¸ Jabber ID Ð¿ÑÐ¸Ð½Ð°Ð´Ð»ÐµÐ¶Ð¸ Ð½Ð° Ð´ÑÑÐ³ Ð¿Ð¾ÑÑÐµÐ±Ð¸ÑÐµÐ»."
 
 #. 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
+#: actions/imsettings.php:361
 #, php-format
 msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
@@ -1855,23 +1832,23 @@ msgstr ""
 "Ð¾Ñ %s, ÑÑÑÐ±Ð²Ð° Ð´Ð° Ð³Ð¾ Ð¾Ð´Ð¾Ð±ÑÐ¸ÑÐµ."
 
 #. TRANS: Message given canceling IM address confirmation for the wrong IM address.
-#: actions/imsettings.php:388
+#: actions/imsettings.php:391
 msgid "That is the wrong IM address."
 msgstr "ÐÑÐµÑÐµÐ½ IM Ð°Ð´ÑÐµÑ."
 
 #. TRANS: Message given after successfully canceling IM address confirmation.
-#: actions/imsettings.php:402
+#: actions/imsettings.php:405
 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
+#: actions/imsettings.php:427
 msgid "That is not your Jabber ID."
 msgstr "Ð¢Ð¾Ð²Ð° Ð½Ðµ Ðµ Ð²Ð°ÑÐ¸ÑÑ Jabber ID."
 
 #. TRANS: Message given after successfully removing a registered IM address.
-#: actions/imsettings.php:447
+#: actions/imsettings.php:450
 msgid "The IM address was removed."
 msgstr "ÐÑÐ¾Ð´ÑÑÐ¸ÑÑ Ð°Ð´ÑÐµÑ Ð½Ð° Ðµ-Ð¿Ð¾ÑÐ° Ðµ Ð¿ÑÐµÐ¼Ð°ÑÐ½Ð°Ñ."
 
@@ -1962,12 +1939,6 @@ msgstr "ÐÐ¸ÑÐ½Ð¾ ÑÑÐ¾Ð±ÑÐµÐ½Ð¸Ðµ"
 msgid "Optionally add a personal message to the invitation."
 msgstr "ÐÐ¾Ð¶Ðµ Ð´Ð° Ð´Ð¾Ð±Ð°Ð²Ð¸ÑÐµ Ð¸ Ð»Ð¸ÑÐ½Ð¾ ÑÑÐ¾Ð±ÑÐµÐ½Ð¸Ðµ ÐºÑÐ¼ Ð¿Ð¾ÐºÐ°Ð½Ð°ÑÐ°."
 
-#. TRANS: Send button for inviting friends
-#: actions/invite.php:198
-msgctxt "BUTTON"
-msgid "Send"
-msgstr ""
-
 #. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English.
 #: actions/invite.php:228
 #, php-format
@@ -2091,17 +2062,6 @@ msgstr ""
 "ÐÐ° Ð¿Ð¾-Ð³Ð¾Ð»ÑÐ¼Ð° ÑÐ¸Ð³ÑÑÐ½Ð¾ÑÑ, Ð¼Ð¾Ð»Ñ Ð²ÑÐ²ÐµÐ´ÐµÑÐµ Ð¾ÑÐ½Ð¾Ð²Ð¾ Ð¿Ð¾ÑÑÐµÐ±Ð¸ÑÐµÐ»ÑÐºÐ¾ÑÐ¾ ÑÐ¸ Ð¸Ð¼Ðµ Ð¸ Ð¿Ð°ÑÐ¾Ð»Ð° "
 "Ð¿ÑÐ¸ Ð¿ÑÐ¾Ð¼ÑÐ½Ð° Ð½Ð° Ð½Ð°ÑÑÑÐ¾Ð¹ÐºÐ¸ÑÐµ."
 
-#: actions/login.php:295
-#, php-format
-msgid ""
-"Don't have a username yet? [Register](%%action.register%%) a new account."
-msgstr ""
-
-#: actions/makeadmin.php:133
-#, php-format
-msgid "Can't get membership record for %1$s in group %2$s."
-msgstr ""
-
 #: actions/newapplication.php:52
 msgid "New Application"
 msgstr "ÐÐ¾Ð²Ð¾ Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ"
@@ -2259,12 +2219,6 @@ msgstr "ÐÐ¾ÑÑÐµÐ±Ð¸ÑÐµÐ»ÑÑ Ð½ÑÐ¼Ð° Ð¿ÑÐ¾ÑÐ¸Ð»."
 msgid "%1$s's status on %2$s"
 msgstr "ÐÐµÐ»ÐµÐ¶ÐºÐ° Ð½Ð° %1$s Ð¾Ñ %2$s"
 
-#. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
-#: actions/oembed.php:159
-#, php-format
-msgid "Content type %s not supported."
-msgstr ""
-
 #. TRANS: Error message displaying attachments. %s is the site's base URL.
 #: actions/oembed.php:163
 #, php-format
@@ -2272,8 +2226,8 @@ msgid "Only %s URLs over plain HTTP please."
 msgstr ""
 
 #. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1215
-#: lib/apiaction.php:1243 lib/apiaction.php:1366
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1206
+#: lib/apiaction.php:1233 lib/apiaction.php:1356
 msgid "Not a supported data format."
 msgstr "ÐÐµÐ¿Ð¾Ð´Ð´ÑÑÐ¶Ð°Ð½ ÑÐ¾ÑÐ¼Ð°Ñ Ð½Ð° Ð´Ð°Ð½Ð½Ð¸ÑÐµ"
 
@@ -2309,6 +2263,10 @@ msgstr "Ð£ÑÐ»ÑÐ³Ð° Ð·Ð° Ð°Ð²ÑÐ¾Ð¼Ð°ÑÐ¸ÑÐ½Ð¾ ÑÑÐºÑÐ°ÑÐ°Ð²Ð°Ð½Ðµ, ÐºÐ¾Ñ
 msgid "View profile designs"
 msgstr "Ð ÐµÐ´Ð°ÐºÑÐ¸ÑÐ°Ð½Ðµ Ð½Ð° Ð¿ÑÐ¾ÑÐ¸Ð»Ð°"
 
+#: actions/othersettings.php:123
+msgid "Show or hide profile designs."
+msgstr ""
+
 #: actions/othersettings.php:153
 msgid "URL shortening service is too long (max 50 chars)."
 msgstr "Ð£ÑÐ»ÑÐ³Ð°ÑÐ° Ð·Ð° ÑÑÐºÑÐ°ÑÐ°Ð²Ð°Ð½Ðµ Ðµ ÑÐ²ÑÑÐ´Ðµ Ð´ÑÐ»Ð³Ð° (Ð¼Ð¾Ð¶Ðµ Ð´Ð° Ðµ Ð´Ð¾ 50 Ð·Ð½Ð°ÐºÐ°)."
@@ -2397,7 +2355,7 @@ msgid "Password saved."
 msgstr "ÐÐ°ÑÐ¾Ð»Ð°ÑÐ° Ðµ Ð·Ð°Ð¿Ð¸ÑÐ°Ð½Ð°."
 
 #. TRANS: Menu item for site administration
-#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:384
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:371
 msgid "Paths"
 msgstr "ÐÑÑÐ¸ÑÐ°"
 
@@ -2574,7 +2532,7 @@ msgstr "ÐÑÐ»Ð½Ð¾ Ð¸Ð¼Ðµ"
 
 #. TRANS: Form input field label.
 #: actions/profilesettings.php:115 actions/register.php:460
-#: lib/applicationeditform.php:244 lib/groupeditform.php:161
+#: lib/applicationeditform.php:235 lib/groupeditform.php:161
 msgid "Homepage"
 msgstr "ÐÐ¸ÑÐ½Ð° ÑÑÑÐ°Ð½Ð¸ÑÐ°"
 
@@ -2671,7 +2629,7 @@ msgid "Couldn't save tags."
 msgstr "ÐÑÐµÑÐºÐ° Ð¿ÑÐ¸ Ð·Ð°Ð¿Ð°Ð·Ð²Ð°Ð½Ðµ ÐµÑÐ¸ÐºÐµÑÐ¸ÑÐµ."
 
 #. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:391 lib/adminpanelaction.php:141
+#: actions/profilesettings.php:391 lib/adminpanelaction.php:138
 msgid "Settings saved."
 msgstr "ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ¸ÑÐµ ÑÐ° Ð·Ð°Ð¿Ð°Ð·ÐµÐ½Ð¸."
 
@@ -2963,14 +2921,6 @@ msgstr ""
 msgid "All rights reserved."
 msgstr ""
 
-#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:540
-#, php-format
-msgid ""
-"My text and files are available under %s except this private data: password, "
-"email address, IM address, and phone number."
-msgstr ""
-
 #: actions/register.php:583
 #, php-format
 msgid ""
@@ -3066,10 +3016,6 @@ msgstr ""
 msgid "Thatâs a local profile! Login to subscribe."
 msgstr "Ð¢Ð¾Ð²Ð° Ðµ Ð»Ð¾ÐºÐ°Ð»ÐµÐ½ Ð¿ÑÐ¾ÑÐ¸Ð»! ÐÐ»ÐµÐ·ÑÐµ, Ð·Ð° Ð´Ð° ÑÐµ Ð°Ð±Ð¾Ð½Ð¸ÑÐ°ÑÐµ."
 
-#: actions/remotesubscribe.php:183
-msgid "Couldnât get a request token."
-msgstr ""
-
 #: actions/repeat.php:57
 msgid "Only logged-in users can repeat notices."
 msgstr "Ð¡Ð°Ð¼Ð¾ Ð²Ð»ÐµÐ·Ð»Ð¸ Ð¿Ð¾ÑÑÐµÐ±Ð¸ÑÐµÐ»Ð¸ Ð¼Ð¾Ð³Ð°Ñ Ð´Ð° Ð¿Ð¾Ð²ÑÐ°ÑÑÑ Ð±ÐµÐ»ÐµÐ¶ÐºÐ¸."
@@ -3155,7 +3101,7 @@ msgstr "ÐÐ¾ÑÑÐµÐ±Ð¸ÑÐµÐ»ÑÑ Ð²ÐµÑÐµ Ðµ Ð·Ð°Ð³Ð»ÑÑÐµÐ½."
 
 #. TRANS: Menu item for site administration
 #: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
-#: lib/adminpanelaction.php:392
+#: lib/adminpanelaction.php:379
 msgid "Sessions"
 msgstr "Ð¡ÐµÑÐ¸Ð¸"
 
@@ -3193,24 +3139,24 @@ msgid "Application profile"
 msgstr "ÐÑÐ¾ÑÐ¸Ð» Ð½Ð° Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸ÐµÑÐ¾"
 
 #. TRANS: Form input field label for application icon.
-#: actions/showapplication.php:159 lib/applicationeditform.php:182
+#: actions/showapplication.php:159 lib/applicationeditform.php:173
 msgid "Icon"
 msgstr "ÐÐºÐ¾Ð½Ð°"
 
 #. TRANS: Form input field label for application name.
 #: actions/showapplication.php:169 actions/version.php:197
-#: lib/applicationeditform.php:199
+#: lib/applicationeditform.php:190
 msgid "Name"
 msgstr "ÐÐ¼Ðµ"
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:178 lib/applicationeditform.php:235
+#: actions/showapplication.php:178 lib/applicationeditform.php:226
 msgid "Organization"
 msgstr "ÐÑÐ³Ð°Ð½Ð¸Ð·Ð°ÑÐ¸Ñ"
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:216 lib/groupeditform.php:172
+#: lib/applicationeditform.php:207 lib/groupeditform.php:172
 msgid "Description"
 msgstr "ÐÐ¿Ð¸ÑÐ°Ð½Ð¸Ðµ"
 
@@ -3303,7 +3249,7 @@ msgstr ""
 msgid "This is a way to share what you like."
 msgstr "Ð¢Ð°ÐºÐ° Ð¼Ð¾Ð¶ÐµÑÐµ Ð´Ð° ÑÐ¿Ð¾Ð´ÐµÐ»Ð¸ÑÐµ ÐºÐ°ÐºÐ²Ð¾ ÑÐ°ÑÐµÑÐ²Ð°ÑÐµ."
 
-#: actions/showgroup.php:82 lib/groupnav.php:86
+#: actions/showgroup.php:82
 #, php-format
 msgid "%s group"
 msgstr "ÐÑÑÐ¿Ð° %s"
@@ -3351,7 +3297,7 @@ msgstr "ÐÐ¼Ð¸ÑÐ¸Ñ Ñ Ð±ÐµÐ»ÐµÐ¶ÐºÐ¸ Ð½Ð° %s (Atom)"
 msgid "FOAF for %s group"
 msgstr "ÐÐ·ÑÐ¾Ð´ÑÑÐ° ÐºÑÑÐ¸Ñ Ð·Ð° %s"
 
-#: actions/showgroup.php:393 actions/showgroup.php:445 lib/groupnav.php:91
+#: actions/showgroup.php:393 actions/showgroup.php:445
 msgid "Members"
 msgstr "Ð§Ð»ÐµÐ½Ð¾Ð²Ðµ"
 
@@ -3509,10 +3455,6 @@ msgstr "ÐÐµÐ¿ÑÐ°Ð²Ð¸Ð»ÐµÐ½ Ð°Ð´ÑÐµÑ Ð½Ð° Ðµ-Ð¿Ð¾ÑÐ°."
 msgid "Unknown language \"%s\"."
 msgstr "ÐÐµÐ¿Ð¾Ð·Ð½Ð°Ñ ÐµÐ·Ð¸Ðº \"%s\"."
 
-#: actions/siteadminpanel.php:165
-msgid "Minimum text limit is 0 (unlimited)."
-msgstr ""
-
 #: actions/siteadminpanel.php:171
 msgid "Dupe limit must be one or more seconds."
 msgstr ""
@@ -3617,11 +3559,6 @@ msgstr "ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ¸ Ð·Ð° SMS"
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr "ÐÐ¾Ð¶Ðµ Ð´Ð° Ð¿Ð¾Ð»ÑÑÐ°Ð²Ð°ÑÐµ Ð½Ð° Ðµ-Ð¿Ð¾ÑÐ°ÑÐ° ÑÐ¸ SMS-ÑÑÐ¾Ð±ÑÐµÐ½Ð¸Ñ Ð¾Ñ %%site.name%%."
 
-#. 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 ""
-
 #. TRANS: Form legend for SMS settings form.
 #: actions/smssettings.php:111
 msgid "SMS address"
@@ -3745,10 +3682,14 @@ msgstr "ÐÐµ Ðµ Ð²ÑÐ²ÐµÐ´ÐµÐ½ ÐºÐ¾Ð´."
 
 #. TRANS: Menu item for site administration
 #: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
-#: lib/adminpanelaction.php:408
+#: lib/adminpanelaction.php:395
 msgid "Snapshots"
 msgstr ""
 
+#: actions/snapshotadminpanel.php:127
+msgid "Invalid snapshot run value."
+msgstr ""
+
 #: actions/snapshotadminpanel.php:133
 msgid "Snapshot frequency must be a number."
 msgstr ""
@@ -4016,13 +3957,6 @@ msgstr ""
 msgid "Authorize subscription"
 msgstr "ÐÐ´Ð¾Ð±ÑÑÐ²Ð°Ð½Ðµ Ð½Ð° Ð°Ð±Ð¾Ð½Ð°Ð¼ÐµÐ½ÑÐ°"
 
-#: actions/userauthorization.php:110
-msgid ""
-"Please check these details to make sure that you want to subscribe to this "
-"userâs notices. If you didnât just ask to subscribe to someoneâs notices, "
-"click âRejectâ."
-msgstr ""
-
 #: actions/userauthorization.php:196 actions/version.php:167
 msgid "License"
 msgstr "ÐÐ¸ÑÐµÐ½Ð·"
@@ -4048,24 +3982,10 @@ msgstr "ÐÑÐ¼Ð° Ð·Ð°ÑÐ²ÐºÐ° Ð·Ð° Ð¾Ð´Ð¾Ð±ÑÐµÐ½Ð¸Ðµ."
 msgid "Subscription authorized"
 msgstr "ÐÐ±Ð¾Ð½Ð°Ð¼ÐµÐ½ÑÑÑ Ðµ Ð¾Ð´Ð¾Ð±ÑÐµÐ½"
 
-#: actions/userauthorization.php:256
-msgid ""
-"The subscription has been authorized, but no callback URL was passed. Check "
-"with the siteâs instructions for details on how to authorize the "
-"subscription. Your subscription token is:"
-msgstr ""
-
 #: actions/userauthorization.php:266
 msgid "Subscription rejected"
 msgstr "ÐÐ±Ð¾Ð½Ð°Ð¼ÐµÐ½ÑÑÑ Ðµ Ð¾ÑÐºÐ°Ð·Ð°Ð½"
 
-#: actions/userauthorization.php:268
-msgid ""
-"The subscription has been rejected, but no callback URL was passed. Check "
-"with the siteâs instructions for details on how to fully reject the "
-"subscription."
-msgstr ""
-
 #: actions/userauthorization.php:303
 #, php-format
 msgid "Listener URI â%sâ not found here."
@@ -4091,16 +4011,6 @@ msgstr ""
 msgid "Avatar URL â%sâ is not valid."
 msgstr ""
 
-#: actions/userauthorization.php:350
-#, php-format
-msgid "Canât read avatar URL â%sâ."
-msgstr ""
-
-#: actions/userauthorization.php:355
-#, php-format
-msgid "Wrong image type for avatar URL â%sâ."
-msgstr ""
-
 #: actions/userdesignsettings.php:87 lib/designsettings.php:76
 msgid ""
 "Customize the way your profile looks with a background image and a colour "
@@ -4546,22 +4456,17 @@ msgstr "Ð¢Ð°Ð±ÐµÐ»ÐºÐ°"
 msgid "StatusNet software license"
 msgstr "ÐÐ¸ÑÐµÐ½Ð· Ð½Ð° Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð°ÑÐ° StatusNet"
 
-#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
-#: lib/action.php:843
-#, php-format
-msgid ""
-"**%%site.name%%** is a microblogging service brought to you by [%%site."
-"broughtby%%](%%site.broughtbyurl%%)."
-msgstr ""
-
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:846
+#: lib/action.php:849
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** Ðµ ÑÑÐ»ÑÐ³Ð° Ð·Ð° Ð¼Ð¸ÐºÑÐ¾Ð±Ð»Ð¾Ð³Ð²Ð°Ð½Ðµ."
 
 #. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.
-#: lib/action.php:850
+#. TRANS: Make sure there is no whitespace between "]" and "(".
+#. TRANS: Text between [] is a link description, text between () is the link itself.
+#. TRANS: %s is the version of StatusNet that is being used.
+#: lib/action.php:856
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4573,49 +4478,50 @@ msgstr ""
 "licensing/licenses/agpl-3.0.html)."
 
 #. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:866
+#: lib/action.php:872
 msgid "Site content license"
 msgstr "ÐÐ¸ÑÐµÐ½Ð· Ð½Ð° ÑÑÐ´ÑÑÐ¶Ð°Ð½Ð¸ÐµÑÐ¾"
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:873
+#: lib/action.php:879
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:880
+#: lib/action.php:886
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:884
+#: lib/action.php:890
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 
-#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:897
+#. TRANS: license message in footer.
+#. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
+#: lib/action.php:904
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr ""
 
 #. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1236
+#: lib/action.php:1243
 msgid "Pagination"
 msgstr "Ð¡ÑÑÐ°Ð½Ð¸ÑÐ°Ð½Ðµ"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1247
+#: lib/action.php:1254
 msgid "After"
 msgstr "Ð¡Ð»ÐµÐ´"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1257
+#: lib/action.php:1264
 msgid "Before"
 msgstr "ÐÑÐµÐ´Ð¸"
 
@@ -4624,121 +4530,144 @@ msgstr "ÐÑÐµÐ´Ð¸"
 msgid "Expecting a root feed element but got a whole XML document."
 msgstr ""
 
-#: lib/activityutils.php:208
+#. TRANS: Client exception thrown when there is no source attribute.
+#: lib/activityutils.php:203
 msgid "Can't handle remote content yet."
 msgstr ""
 
-#: lib/activityutils.php:244
+#. TRANS: Client exception thrown when there embedded XML content is found that cannot be processed yet.
+#: lib/activityutils.php:240
 msgid "Can't handle embedded XML content yet."
 msgstr ""
 
-#: lib/activityutils.php:248
+#. TRANS: Client exception thrown when base64 encoded content is found that cannot be processed yet.
+#: lib/activityutils.php:245
 msgid "Can't handle embedded Base64 content yet."
 msgstr ""
 
 #. TRANS: Client error message thrown when a user tries to change admin settings but has no access rights.
-#: lib/adminpanelaction.php:98
+#: lib/adminpanelaction.php:96
 msgid "You cannot make changes to this site."
 msgstr "ÐÐµ Ð¼Ð¾Ð¶ÐµÑÐµ Ð´Ð° Ð¿ÑÐ¾Ð¼ÐµÐ½ÑÑÐµ ÑÐ¾Ð·Ð¸ ÑÐ°Ð¹Ñ."
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:350
+#: lib/adminpanelaction.php:337
 msgid "Basic site configuration"
 msgstr "ÐÑÐ½Ð¾Ð²Ð½Ð° Ð½Ð°ÑÑÑÐ¾Ð¹ÐºÐ° Ð½Ð° ÑÐ°Ð¹ÑÐ°"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:352
+#: lib/adminpanelaction.php:339
 msgctxt "MENU"
 msgid "Site"
 msgstr "Ð¡Ð°Ð¹Ñ"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:358
+#: lib/adminpanelaction.php:345
 msgid "Design configuration"
 msgstr "ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ° Ð½Ð° Ð¾ÑÐ¾ÑÐ¼Ð»ÐµÐ½Ð¸ÐµÑÐ¾"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:368 lib/personalgroupnav.php:115
+#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:115
 msgid "User"
 msgstr "ÐÐ¾ÑÑÐµÐ±Ð¸ÑÐµÐ»"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:382
+#: lib/adminpanelaction.php:369
 msgid "Paths configuration"
 msgstr "ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ° Ð½Ð° Ð¿ÑÑÐ¸ÑÐ°ÑÐ°"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:398
+#: lib/adminpanelaction.php:385
 msgid "Edit site notice"
 msgstr "ÐÐ·ÑÑÐ¸Ð²Ð°Ð½Ðµ Ð½Ð° Ð±ÐµÐ»ÐµÐ¶ÐºÐ°ÑÐ°"
 
 #. TRANS: Client error 401.
-#: lib/apiauth.php:113
+#: lib/apiauth.php:111
 msgid "API resource requires read-write access, but you only have read access."
 msgstr ""
 
+#. TRANS: OAuth exception thrown when no application is found for a given consumer key.
+#: lib/apiauth.php:175
+msgid "No application for that consumer key."
+msgstr ""
+
+#. TRANS: OAuth exception given when an incorrect access token was given for a user.
+#: lib/apiauth.php:212
+msgid "Bad access token."
+msgstr ""
+
+#. TRANS: OAuth exception given when no user was found for a given token (no token was found).
+#: lib/apiauth.php:217
+msgid "No user for that token."
+msgstr ""
+
+#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
+#: lib/apioauthstore.php:178
+msgid "Tried to revoke unknown token"
+msgstr ""
+
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:213
+#: lib/applicationeditform.php:204
 msgid "Describe your application"
 msgstr "ÐÐ·ÑÑÐ¸Ð²Ð°Ð½Ðµ Ð½Ð° Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸ÐµÑÐ¾"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:224
+#: lib/applicationeditform.php:215
 msgid "URL of the homepage of this application"
 msgstr "ÐÐµ ÑÑÐµ ÑÐ¾Ð±ÑÑÐ²ÐµÐ½Ð¸Ðº Ð½Ð° ÑÐ¾Ð²Ð° Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ."
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:251
+#: lib/applicationeditform.php:242
 msgid "URL to redirect to after authentication"
 msgstr ""
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:278
+#: lib/applicationeditform.php:269
 msgid "Browser"
 msgstr ""
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:295
+#: lib/applicationeditform.php:286
 msgid "Desktop"
 msgstr ""
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:297
+#: lib/applicationeditform.php:288
 msgid "Type of application, browser or desktop"
 msgstr ""
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:320
+#: lib/applicationeditform.php:311
 msgid "Read-only"
 msgstr ""
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:339
+#: lib/applicationeditform.php:330
 msgid "Read-write"
 msgstr ""
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:341
+#: lib/applicationeditform.php:332
 msgid "Default access for this application: read-only, or read-write"
 msgstr ""
 
-#. TRANS: Submit button title
-#: lib/applicationeditform.php:359
+#. TRANS: Submit button title.
+#: lib/applicationeditform.php:349
 msgid "Cancel"
 msgstr "ÐÑÐºÐ°Ð·"
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:136
+#: lib/applicationlist.php:135
 msgid "read-write"
 msgstr ""
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:138
+#: lib/applicationlist.php:137
 msgid "read-only"
 msgstr ""
 
 #. 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
+#: lib/applicationlist.php:143
 #, php-format
 msgid "Approved %1$s - \"%2$s\" access."
 msgstr ""
@@ -4753,13 +4682,15 @@ msgstr "ÐÐ²ÑÐ¾Ñ"
 msgid "Provider"
 msgstr "ÐÐ¾ÑÑÐ°Ð²ÑÐ¸Ðº"
 
-#: lib/attachmentnoticesection.php:67
+#. TRANS: Title.
+#: lib/attachmentnoticesection.php:68
 msgid "Notices where this attachment appears"
 msgstr ""
 
-#: lib/authenticationplugin.php:236
-msgid "Password changing is not allowed"
-msgstr ""
+#. TRANS: Title for the form to block a user.
+#: lib/blockform.php:70
+msgid "Block"
+msgstr "ÐÐ»Ð¾ÐºÐ¸ÑÐ°Ð½Ðµ"
 
 #: lib/channel.php:157 lib/channel.php:177
 msgid "Command results"
@@ -4773,6 +4704,13 @@ msgstr "ÐÐ¾Ð¼Ð°Ð½Ð´Ð°ÑÐ° Ðµ Ð¸Ð·Ð¿ÑÐ»Ð½ÐµÐ½Ð°"
 msgid "Command failed"
 msgstr "ÐÑÐµÑÐºÐ° Ð¿ÑÐ¸ Ð¸Ð·Ð¿ÑÐ»Ð½ÐµÐ½Ð¸Ðµ Ð½Ð° ÐºÐ¾Ð¼Ð°Ð½Ð´Ð°ÑÐ°"
 
+#. TRANS: Message given getting a non-existing user.
+#. TRANS: %s is the nickname of the user that could not be found.
+#: lib/command.php:150
+#, php-format
+msgid "Could not find a local user with nickname %s."
+msgstr ""
+
 #. TRANS: Error text shown when an unimplemented command is given.
 #: lib/command.php:185
 msgid "Sorry, this command is not yet implemented."
@@ -4803,6 +4741,20 @@ msgstr ""
 msgid "Notice marked as fave."
 msgstr "ÐÐµÐ»ÐµÐ¶ÐºÐ°ÑÐ° Ðµ Ð¾ÑÐ±ÐµÐ»ÑÐ·Ð°Ð½Ð° ÐºÐ°ÑÐ¾ Ð»ÑÐ±Ð¸Ð¼Ð°."
 
+#. 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.
+#: lib/command.php:360
+#, php-format
+msgid "%1$s joined group %2$s."
+msgstr ""
+
+#. 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.
+#: lib/command.php:408
+#, php-format
+msgid "%1$s left group %2$s."
+msgstr ""
+
 #. TRANS: Whois output. %s is the full name of the queried user.
 #: lib/command.php:434
 #, php-format
@@ -4861,15 +4813,18 @@ msgstr "ÐÑÐµÑÐºÐ° Ð¿ÑÐ¸ Ð¿Ð¾Ð²ÑÐ°ÑÑÐ½Ðµ Ð½Ð° Ð±ÐµÐ»ÐµÐ¶ÐºÐ°ÑÐ°."
 msgid "Error saving notice."
 msgstr "ÐÑÐµÑÐºÐ° Ð¿ÑÐ¸ Ð·Ð°Ð¿Ð¸ÑÐ²Ð°Ð½Ðµ Ð½Ð° Ð±ÐµÐ»ÐµÐ¶ÐºÐ°ÑÐ°."
 
-#. TRANS: Error text shown when no username was provided when issuing a subscribe command.
-#: lib/command.php:655
-msgid "Specify the name of the user to subscribe to."
+#. TRANS: Text shown after having subscribed to another user successfully.
+#. TRANS: %s is the name of the user the subscription was requested for.
+#: lib/command.php:672
+#, php-format
+msgid "Subscribed to %s."
 msgstr ""
 
-#. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
-#. TRANS: Error text shown when no username was provided when issuing the command.
-#: lib/command.php:694 lib/command.php:804
-msgid "Specify the name of the user to unsubscribe from."
+#. TRANS: Text shown after having unsubscribed from another user successfully.
+#. TRANS: %s is the name of the user the unsubscription was requested for.
+#: lib/command.php:705
+#, php-format
+msgid "Unsubscribed from %s."
 msgstr ""
 
 #. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
@@ -4910,13 +4865,20 @@ msgstr ""
 msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr ""
 
+#. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
+#. TRANS: %s is the name of the user the unsubscription was requested for.
+#: lib/command.php:813
+#, php-format
+msgid "Unsubscribed %s."
+msgstr ""
+
 #. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
 #: lib/command.php:831
 msgid "You are not subscribed to anyone."
 msgstr "ÐÐµ ÑÑÐµ Ð°Ð±Ð¾Ð½Ð¸ÑÐ°Ð½Ð¸ Ð·Ð° Ð½Ð¸ÐºÐ¾Ð³Ð¾."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to.
-#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.
 #: lib/command.php:836
 msgid "You are subscribed to this person:"
@@ -4931,7 +4893,7 @@ msgid "No one is subscribed to you."
 msgstr "ÐÐ¸ÐºÐ¾Ð¹ Ð½Ðµ Ðµ Ð°Ð±Ð¾Ð½Ð¸ÑÐ°Ð½ Ð·Ð° Ð²Ð°Ñ."
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
-#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
 #: lib/command.php:863
 msgid "This person is subscribed to you:"
@@ -4946,7 +4908,7 @@ msgid "You are not a member of any groups."
 msgstr "ÐÐµ ÑÐ»ÐµÐ½ÑÐ²Ð°ÑÐµ Ð² Ð½Ð¸ÑÐ¾ ÐµÐ´Ð½Ð° Ð³ÑÑÐ¿Ð°."
 
 #. TRANS: Text shown after requesting groups a user is subscribed to.
-#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
 #: lib/command.php:890
 msgid "You are a member of this group:"
@@ -4954,6 +4916,7 @@ msgid_plural "You are a member of these groups:"
 msgstr[0] "ÐÐµ ÑÐ»ÐµÐ½ÑÐ²Ð°ÑÐµ Ð² ÑÐ°Ð·Ð¸ Ð³ÑÑÐ¿Ð°."
 msgstr[1] "ÐÐµ ÑÐ»ÐµÐ½ÑÐ²Ð°ÑÐµ Ð² ÑÐ°Ð·Ð¸ Ð³ÑÑÐ¿Ð°."
 
+#. TRANS: Help text for commands.
 #: lib/command.php:905
 msgid ""
 "Commands:\n"
@@ -5035,6 +4998,10 @@ msgstr ""
 "ÐÐ¾Ð¶ÐµÑÐµ Ð´Ð° ÐºÐ°ÑÐ¸ÑÐµ Ð»Ð¸ÑÐ½Ð¾ Ð¸Ð·Ð¾Ð±ÑÐ°Ð¶ÐµÐ½Ð¸Ðµ Ð·Ð° ÑÐ¾Ð½. ÐÐ°ÐºÑÐ¸Ð¼Ð°Ð»Ð½Ð°ÑÐ° Ð³Ð¾Ð»ÐµÐ¼Ð¸Ð½Ð° Ð½Ð° ÑÐ°Ð¹Ð»Ð° Ðµ "
 "2MB."
 
+#: lib/designsettings.php:418
+msgid "Design defaults restored."
+msgstr ""
+
 #: lib/disfavorform.php:114 lib/disfavorform.php:140
 msgid "Disfavor this notice"
 msgstr "ÐÑÐ±ÐµÐ»ÑÐ·Ð²Ð°Ð½Ðµ ÐºÐ°ÑÐ¾ Ð»ÑÐ±Ð¸Ð¼Ð¾"
@@ -5120,33 +5087,6 @@ msgstr ""
 msgid "Extra nicknames for the group, comma- or space- separated, max %d"
 msgstr ""
 
-#: lib/groupnav.php:85
-msgid "Group"
-msgstr "ÐÑÑÐ¿Ð°"
-
-#: lib/groupnav.php:101
-msgid "Blocked"
-msgstr "ÐÐ»Ð¾ÐºÐ¸ÑÐ°Ð½Ð¸"
-
-#: lib/groupnav.php:102
-#, php-format
-msgid "%s blocked users"
-msgstr "%s Ð±Ð»Ð¾ÐºÐ¸ÑÐ°Ð½Ð¸ Ð¿Ð¾ÑÑÐµÐ±Ð¸ÑÐµÐ»Ñ"
-
-#: lib/groupnav.php:108
-#, php-format
-msgid "Edit %s group properties"
-msgstr "Ð ÐµÐ´Ð°ÐºÑÐ¸ÑÐ°Ð½Ðµ Ð½Ð°ÑÑÑÐ¾Ð¹ÐºÐ¸ÑÐµ Ð½Ð° Ð³ÑÑÐ¿Ð°ÑÐ° %s"
-
-#: lib/groupnav.php:113
-msgid "Logo"
-msgstr "ÐÐ¾Ð³Ð¾"
-
-#: lib/groupnav.php:114
-#, php-format
-msgid "Add or edit %s logo"
-msgstr "ÐÐ¾Ð±Ð°Ð²ÑÐ½Ðµ Ð¸Ð»Ð¸ ÑÐµÐ´Ð°ÐºÑÐ¸ÑÐ°Ð½Ðµ Ð»Ð¾Ð³Ð¾ÑÐ¾ Ð½Ð° %s"
-
 #: lib/groupsbymemberssection.php:71
 msgid "Groups with most members"
 msgstr "ÐÑÑÐ¿Ð¸ Ñ Ð½Ð°Ð¹-Ð¼Ð½Ð¾Ð³Ð¾ ÑÐ»ÐµÐ½Ð¾Ð²Ðµ"
@@ -5173,7 +5113,8 @@ msgstr "Ð¤Ð¾ÑÐ¼Ð°ÑÑÑ Ð½Ð° ÑÐ°Ð¹Ð»Ð° Ñ Ð¸Ð·Ð¾Ð±ÑÐ°Ð¶ÐµÐ½Ð¸ÐµÑÐ¾ Ð½Ðµ ÑÐµ
 msgid "Partial upload."
 msgstr "Ð§Ð°ÑÑÐ¸ÑÐ½Ð¾ ÐºÐ°ÑÐ²Ð°Ð½Ðµ Ð½Ð° ÑÐ°Ð¹Ð»Ð°."
 
-#: lib/imagefile.php:101 lib/mediafile.php:170
+#. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
+#: lib/imagefile.php:101 lib/mediafile.php:179
 msgid "System error uploading file."
 msgstr "Ð¡Ð¸ÑÑÐµÐ¼Ð½Ð° Ð³ÑÐµÑÐºÐ° Ð¿ÑÐ¸ ÐºÐ°ÑÐ²Ð°Ð½Ðµ Ð½Ð° ÑÐ°Ð¹Ð»."
 
@@ -5466,56 +5407,75 @@ msgstr "Ð¢Ð¾Ð²Ð° Ð½Ðµ Ðµ Ð²Ð°ÑÐ¸ÑÑ Ð²ÑÐ¾Ð´ÑÑ Ð°Ð´ÑÐµÑ."
 msgid "Sorry, no incoming email allowed."
 msgstr "ÐÑÐ¾Ð´ÑÑÐ°ÑÐ° Ð¿Ð¾ÑÐ° Ð½Ðµ Ðµ ÑÐ°Ð·ÑÐµÑÐµÐ½Ð°."
 
-#: lib/mediafile.php:98 lib/mediafile.php:123
+#. TRANS: Client exception thrown when a database error was thrown during a file upload operation.
+#: lib/mediafile.php:99 lib/mediafile.php:125
 msgid "There was a database error while saving your file. Please try again."
 msgstr ""
 
-#: lib/mediafile.php:142
+#. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
+#: lib/mediafile.php:145
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
 msgstr ""
 
-#: lib/mediafile.php:147
+#. TRANS: Client exception.
+#: lib/mediafile.php:151
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form."
 msgstr ""
 
-#: lib/mediafile.php:152
+#. TRANS: Client exception.
+#: lib/mediafile.php:157
 msgid "The uploaded file was only partially uploaded."
 msgstr ""
 
-#: lib/mediafile.php:159
+#. TRANS: Client exception thrown when a temporary folder is not present to store a file upload.
+#: lib/mediafile.php:165
 msgid "Missing a temporary folder."
 msgstr "ÐÐ¸Ð¿ÑÐ²Ð° Ð²ÑÐµÐ¼ÐµÐ½Ð½Ð° Ð¿Ð°Ð¿ÐºÐ°."
 
-#: lib/mediafile.php:162
+#. TRANS: Client exception thrown when writing to disk is not possible during a file upload operation.
+#: lib/mediafile.php:169
 msgid "Failed to write file to disk."
 msgstr "ÐÑÐµÑÐºÐ° Ð¿ÑÐ¸ Ð·Ð°Ð¿Ð¸ÑÐ²Ð°Ð½Ðµ ÑÐ°Ð¹Ð»Ð° Ð½Ð° Ð´Ð¸ÑÐºÐ°."
 
-#: lib/mediafile.php:165
+#. TRANS: Client exception thrown when a file upload operation has been stopped by an extension.
+#: lib/mediafile.php:173
 msgid "File upload stopped by extension."
 msgstr ""
 
-#: lib/mediafile.php:179 lib/mediafile.php:217
+#. TRANS: Client exception thrown when a file upload operation would cause a user to exceed a set quota.
+#: lib/mediafile.php:189 lib/mediafile.php:232
 msgid "File exceeds user's quota."
 msgstr ""
 
-#: lib/mediafile.php:197 lib/mediafile.php:234
+#. TRANS: Client exception thrown when a file upload operation fails because the file could
+#. TRANS: not be moved from the temporary folder to the permanent file location.
+#: lib/mediafile.php:209 lib/mediafile.php:251
 msgid "File could not be moved to destination directory."
 msgstr ""
 
-#: lib/mediafile.php:202 lib/mediafile.php:238
+#. TRANS: Client exception thrown when a file upload operation has been stopped because the MIME
+#. TRANS: type of the uploaded file could not be determined.
+#: lib/mediafile.php:216 lib/mediafile.php:257
 msgid "Could not determine file's MIME type."
 msgstr "ÐÑÐµÑÐºÐ° Ð¿ÑÐ¸ Ð¸Ð·ÑÑÐ¸Ð²Ð°Ð½Ðµ Ð½Ð° Ð»ÑÐ±Ð¸Ð¼Ð° Ð±ÐµÐ»ÐµÐ¶ÐºÐ°."
 
-#: lib/mediafile.php:318
+#. TRANS: Client exception thrown trying to upload a forbidden MIME type.
+#. TRANS: %1$s is the file type that was denied, %2$s is the application part of
+#. TRANS: the MIME type that was denied.
+#: lib/mediafile.php:340
 #, php-format
-msgid " Try using another %s format."
+msgid ""
+"\"%1$s\" is not a supported file type on this server. Try using another %2$s "
+"format."
 msgstr ""
 
-#: lib/mediafile.php:323
+#. TRANS: Client exception thrown trying to upload a forbidden MIME type.
+#. TRANS: %s is the file type that was denied.
+#: lib/mediafile.php:345
 #, php-format
-msgid "%s is not a supported file type on this server."
+msgid "\"%s\" is not a supported file type on this server."
 msgstr ""
 
 #: lib/messageform.php:120
@@ -5530,11 +5490,6 @@ msgstr "ÐÐ¾"
 msgid "Available characters"
 msgstr "ÐÐ°Ð»Ð¸ÑÐ½Ð¸ Ð·Ð½Ð°ÑÐ¸"
 
-#: lib/messageform.php:178 lib/noticeform.php:237
-msgctxt "Send button for sending notice"
-msgid "Send"
-msgstr ""
-
 #: lib/noticeform.php:160
 msgid "Send a notice"
 msgstr "ÐÐ·Ð¿ÑÐ°ÑÐ°Ð½Ðµ Ð½Ð° Ð±ÐµÐ»ÐµÐ¶ÐºÐ°"
@@ -5627,23 +5582,7 @@ msgstr "ÐÐ¾Ð±ÑÑÐ²Ð°Ð½Ðµ"
 msgid "Send a nudge to this user"
 msgstr "ÐÐ¾Ð±ÑÑÐ²Ð°Ð½Ðµ Ð½Ð° ÑÐ¾Ð·Ð¸ Ð¿Ð¾ÑÑÐµÐ±Ð¸ÑÐµÐ»"
 
-#: lib/oauthstore.php:283
-msgid "Error inserting new profile"
-msgstr "ÐÑÐµÑÐºÐ° Ð¿ÑÐ¸ Ð²Ð¼ÑÐºÐ²Ð°Ð½Ðµ Ð½Ð° Ð½Ð¾Ð² Ð¿ÑÐ¾ÑÐ¸Ð»"
-
-#: lib/oauthstore.php:291
-msgid "Error inserting avatar"
-msgstr "ÐÑÐµÑÐºÐ° Ð¿ÑÐ¸ Ð²Ð¼ÑÐºÐ²Ð°Ð½Ðµ Ð½Ð° Ð°Ð²Ð°ÑÐ°Ñ"
-
-#: lib/oauthstore.php:306
-msgid "Error updating remote profile"
-msgstr "ÐÑÐµÑÐºÐ° Ð¿ÑÐ¸ Ð¾Ð±Ð½Ð¾Ð²ÑÐ²Ð°Ð½Ðµ Ð½Ð° Ð¾ÑÐ´Ð°Ð»ÐµÑÐµÐ½ Ð¿ÑÐ¾ÑÐ¸Ð»"
-
-#: lib/oauthstore.php:311
-msgid "Error inserting remote profile"
-msgstr "ÐÑÐµÑÐºÐ° Ð¿ÑÐ¸ Ð²Ð¼ÑÐºÐ²Ð°Ð½Ðµ Ð½Ð° Ð¾ÑÐ´Ð°Ð»ÐµÑÐµÐ½ Ð¿ÑÐ¾ÑÐ¸Ð»"
-
-#: lib/oauthstore.php:490
+#: lib/oauthstore.php:491
 msgid "Couldn't insert new subscription."
 msgstr "ÐÑÐµÑÐºÐ° Ð¿ÑÐ¸ Ð´Ð¾Ð±Ð°Ð²ÑÐ½Ðµ Ð½Ð° Ð½Ð¾Ð² Ð°Ð±Ð¾Ð½Ð°Ð¼ÐµÐ½Ñ."
 
@@ -5680,7 +5619,8 @@ msgstr "ÐÐ·Ð¿ÑÐ°ÑÐµÐ½Ð¸ÑÐµ Ð¾Ñ Ð²Ð°Ñ ÑÑÐ¾Ð±ÑÐµÐ½Ð¸Ñ"
 msgid "Tags in %s's notices"
 msgstr "ÐÑÐ¸ÐºÐµÑÐ¸ Ð² Ð±ÐµÐ»ÐµÐ¶ÐºÐ¸ÑÐµ Ð½Ð° %s"
 
-#: lib/plugin.php:115
+#. TRANS: Displayed as version information for a plugin if no version information was found.
+#: lib/plugin.php:116
 msgid "Unknown"
 msgstr "ÐÐµÐ¿Ð¾Ð·Ð½Ð°ÑÐ¾"
 
@@ -5757,19 +5697,19 @@ msgstr "ÐÐ¾Ð²ÑÐ°ÑÑÐ½Ðµ Ð½Ð° ÑÐ°Ð·Ð¸ Ð±ÐµÐ»ÐµÐ¶ÐºÐ°"
 msgid "No single user defined for single-user mode."
 msgstr ""
 
-#: lib/searchaction.php:120
+#. TRANS: Fieldset legend for the search form.
+#: lib/searchaction.php:121
 msgid "Search site"
 msgstr "Ð¢ÑÑÑÐµÐ½Ðµ Ð² ÑÐ°Ð¹ÑÐ°"
 
-#: lib/searchaction.php:126
+#. TRANS: Used as a field label for the field where one or more keywords
+#. TRANS: for searching can be entered.
+#: lib/searchaction.php:129
 msgid "Keyword(s)"
 msgstr "ÐÐ»ÑÑÐ¾Ð²Ð¸ Ð´ÑÐ¼Ð¸"
 
-#: lib/searchaction.php:127
-msgid "Search"
-msgstr "Ð¢ÑÑÑÐµÐ½Ðµ"
-
-#: lib/searchaction.php:162
+#. TRANS: Definition list item with instructions on how to get (better) search results.
+#: lib/searchaction.php:170
 msgid "Search help"
 msgstr "ÐÐ¾Ð¼Ð¾Ñ Ð·Ð° ÑÑÑÑÐµÐ½ÐµÑÐ¾"
 
@@ -5946,56 +5886,32 @@ msgid "Moderator"
 msgstr "ÐÐ¾Ð´ÐµÑÐ°ÑÐ¾Ñ"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1102
+#: lib/util.php:1103
 msgid "a few seconds ago"
 msgstr "Ð¿ÑÐµÐ´Ð¸ Ð½ÑÐºÐ¾Ð»ÐºÐ¾ ÑÐµÐºÑÐ½Ð´Ð¸"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1105
+#: lib/util.php:1106
 msgid "about a minute ago"
 msgstr "Ð¿ÑÐµÐ´Ð¸ Ð¾ÐºÐ¾Ð»Ð¾ Ð¼Ð¸Ð½ÑÑÐ°"
 
-#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1109
-#, php-format
-msgid "about %d minutes ago"
-msgstr "Ð¿ÑÐµÐ´Ð¸ Ð¾ÐºÐ¾Ð»Ð¾ %d Ð¼Ð¸Ð½ÑÑÐ¸"
-
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 #: lib/util.php:1112
 msgid "about an hour ago"
 msgstr "Ð¿ÑÐµÐ´Ð¸ Ð¾ÐºÐ¾Ð»Ð¾ ÑÐ°Ñ"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1116
-#, php-format
-msgid "about %d hours ago"
-msgstr "Ð¿ÑÐµÐ´Ð¸ Ð¾ÐºÐ¾Ð»Ð¾ %d ÑÐ°ÑÐ°"
-
-#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1119
+#: lib/util.php:1118
 msgid "about a day ago"
 msgstr "Ð¿ÑÐµÐ´Ð¸ Ð¾ÐºÐ¾Ð»Ð¾ Ð´ÐµÐ½"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1123
-#, php-format
-msgid "about %d days ago"
-msgstr "Ð¿ÑÐµÐ´Ð¸ Ð¾ÐºÐ¾Ð»Ð¾ %d Ð´Ð½Ð¸"
-
-#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1126
+#: lib/util.php:1124
 msgid "about a month ago"
 msgstr "Ð¿ÑÐµÐ´Ð¸ Ð¾ÐºÐ¾Ð»Ð¾ Ð¼ÐµÑÐµÑ"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 #: lib/util.php:1130
-#, php-format
-msgid "about %d months ago"
-msgstr "Ð¿ÑÐµÐ´Ð¸ Ð¾ÐºÐ¾Ð»Ð¾ %d Ð¼ÐµÑÐµÑÐ°"
-
-#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1133
 msgid "about a year ago"
 msgstr "Ð¿ÑÐµÐ´Ð¸ Ð¾ÐºÐ¾Ð»Ð¾ Ð³Ð¾Ð´Ð¸Ð½Ð°"
 
diff --git a/locale/br/LC_MESSAGES/statusnet.po b/locale/br/LC_MESSAGES/statusnet.po
index 82213ba432..4e5bdf2e04 100644
--- a/locale/br/LC_MESSAGES/statusnet.po
+++ b/locale/br/LC_MESSAGES/statusnet.po
@@ -1,8 +1,9 @@
-# Translation of StatusNet to Breton
+# Translation of StatusNet to Breton (Brezhoneg)
+# Expored from translatewiki.net
 #
-# Author@translatewiki.net: Fulup
-# Author@translatewiki.net: Gwendal
-# Author@translatewiki.net: Y-M D
+# Author: Fulup
+# Author: Gwendal
+# Author: Y-M D
 # --
 # This file is distributed under the same license as the StatusNet package.
 #
@@ -10,20 +11,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-08 22:33+0000\n"
-"PO-Revision-Date: 2010-09-08 22:33:29+0000\n"
-"Language-Team: Dutch\n"
+"POT-Creation-Date: 2010-09-14 19:53+0000\n"
+"PO-Revision-Date: 2010-09-14 19:53:42+0000\n"
+"Language-Team: Breton <http://translatewiki.net/wiki/Portal:br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r72348); Translate extension (2010-08-20)\n"
+"X-Generator: MediaWiki 1.17alpha (r73009); Translate extension (2010-08-20)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: br\n"
-"X-Message-Group: out-statusnet\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Message-Group: #out-statusnet\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-POT-Import-Date: 1284-49-16 34::+0000\n"
 
 #. TRANS: Page title
 #. TRANS: Menu item for site administration
-#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:376
+#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:363
 msgid "Access"
 msgstr "Moned"
 
@@ -76,10 +78,10 @@ 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 actions/emailsettings.php:224
-#: actions/imsettings.php:184 actions/smssettings.php:209
-#: lib/applicationeditform.php:361
+#. TRANS: Button label in the "Edit application" form.
+#: actions/accessadminpanel.php:203 actions/emailsettings.php:228
+#: actions/imsettings.php:187 actions/smssettings.php:209
+#: lib/applicationeditform.php:351
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "EnrollaÃ±"
@@ -92,15 +94,15 @@ msgstr "N'eus ket eus ar bajenn-se."
 
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #: actions/all.php:79 actions/allrss.php:68
-#: actions/apiaccountupdatedeliverydevice.php:114
-#: actions/apiaccountupdateprofile.php:105
-#: actions/apiaccountupdateprofilebackgroundimage.php:116
-#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
-#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
-#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:113
-#: actions/apigroupismember.php:91 actions/apigroupjoin.php:100
-#: actions/apigroupleave.php:100 actions/apigrouplist.php:73
-#: actions/apistatusesupdate.php:229 actions/apisubscriptions.php:87
+#: actions/apiaccountupdatedeliverydevice.php:115
+#: actions/apiaccountupdateprofile.php:106
+#: actions/apiaccountupdateprofilebackgroundimage.php:117
+#: actions/apiaccountupdateprofileimage.php:106 actions/apiblockcreate.php:98
+#: actions/apiblockdestroy.php:97 actions/apidirectmessage.php:77
+#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:114
+#: actions/apigroupismember.php:91 actions/apigroupjoin.php:101
+#: actions/apigroupleave.php:101 actions/apigrouplist.php:73
+#: actions/apistatusesupdate.php:230 actions/apisubscriptions.php:87
 #: actions/apitimelinefavorites.php:72 actions/apitimelinefriends.php:174
 #: actions/apitimelinehome.php:80 actions/apitimelinementions.php:80
 #: actions/apitimelineuser.php:82 actions/avatarbynickname.php:75
@@ -187,16 +189,16 @@ msgid "Updates from %1$s and friends on %2$s!"
 msgstr "HizivadennoÃ¹ %1$s ha mignoned e %2$s!"
 
 #: actions/apiaccountratelimitstatus.php:72
-#: actions/apiaccountupdatedeliverydevice.php:94
-#: actions/apiaccountupdateprofile.php:97
-#: actions/apiaccountupdateprofilebackgroundimage.php:94
-#: actions/apiaccountupdateprofilecolors.php:118
+#: actions/apiaccountupdatedeliverydevice.php:95
+#: actions/apiaccountupdateprofile.php:98
+#: actions/apiaccountupdateprofilebackgroundimage.php:95
+#: actions/apiaccountupdateprofilecolors.php:119
 #: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156
-#: actions/apifavoritecreate.php:100 actions/apifavoritedestroy.php:101
-#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100
-#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:139
-#: actions/apigroupismember.php:115 actions/apigroupjoin.php:156
-#: actions/apigroupleave.php:142 actions/apigrouplist.php:137
+#: actions/apifavoritecreate.php:101 actions/apifavoritedestroy.php:102
+#: actions/apifriendshipscreate.php:101 actions/apifriendshipsdestroy.php:101
+#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:140
+#: actions/apigroupismember.php:115 actions/apigroupjoin.php:157
+#: actions/apigroupleave.php:143 actions/apigrouplist.php:137
 #: actions/apigrouplistall.php:122 actions/apigroupmembership.php:107
 #: actions/apigroupshow.php:116 actions/apihelptest.php:88
 #: actions/apistatusesdestroy.php:104 actions/apistatusesretweets.php:112
@@ -211,47 +213,49 @@ msgstr "HizivadennoÃ¹ %1$s ha mignoned e %2$s!"
 msgid "API method not found."
 msgstr "N'eo ket bet kavet an hentenn API !"
 
-#: actions/apiaccountupdatedeliverydevice.php:86
-#: actions/apiaccountupdateprofile.php:89
-#: actions/apiaccountupdateprofilebackgroundimage.php:86
-#: actions/apiaccountupdateprofilecolors.php:110
-#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89
-#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109
-#: actions/apifavoritecreate.php:91 actions/apifavoritedestroy.php:92
-#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
-#: actions/apigroupcreate.php:105 actions/apigroupjoin.php:92
-#: actions/apigroupleave.php:92 actions/apimediaupload.php:67
-#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:198
+#. TRANS: Client error message. POST is a HTTP command. It should not be translated.
+#. TRANS: Client error. POST is a HTTP command. It should not be translated.
+#: actions/apiaccountupdatedeliverydevice.php:87
+#: actions/apiaccountupdateprofile.php:90
+#: actions/apiaccountupdateprofilebackgroundimage.php:87
+#: actions/apiaccountupdateprofilecolors.php:111
+#: actions/apiaccountupdateprofileimage.php:85 actions/apiblockcreate.php:90
+#: actions/apiblockdestroy.php:89 actions/apidirectmessagenew.php:110
+#: actions/apifavoritecreate.php:92 actions/apifavoritedestroy.php:93
+#: actions/apifriendshipscreate.php:92 actions/apifriendshipsdestroy.php:92
+#: actions/apigroupcreate.php:106 actions/apigroupjoin.php:93
+#: actions/apigroupleave.php:93 actions/apimediaupload.php:68
+#: actions/apistatusesretweet.php:66 actions/apistatusesupdate.php:199
 msgid "This method requires a POST."
 msgstr "Ezhomm en deus an argerzh-maÃ± eus ur POST."
 
-#: actions/apiaccountupdatedeliverydevice.php:106
+#: actions/apiaccountupdatedeliverydevice.php:107
 msgid ""
 "You must specify a parameter named 'device' with a value of one of: sms, im, "
 "none."
 msgstr ""
 
-#: actions/apiaccountupdatedeliverydevice.php:133
+#: actions/apiaccountupdatedeliverydevice.php:134
 msgid "Could not update user."
 msgstr "Diposubl eo hizivaat an implijer."
 
-#: actions/apiaccountupdateprofile.php:112
-#: actions/apiaccountupdateprofilebackgroundimage.php:194
-#: actions/apiaccountupdateprofilecolors.php:185
-#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/apiaccountupdateprofile.php:113
+#: actions/apiaccountupdateprofilebackgroundimage.php:195
+#: actions/apiaccountupdateprofilecolors.php:186
+#: actions/apiaccountupdateprofileimage.php:131 actions/apiusershow.php:108
 #: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/hcard.php:74
 #: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
 #: lib/profileaction.php:84
 msgid "User has no profile."
 msgstr "An implijer-maÃ± n'eus profil ebet dezhaÃ±."
 
-#: actions/apiaccountupdateprofile.php:147
+#: actions/apiaccountupdateprofile.php:148
 msgid "Could not save profile."
 msgstr "Diposubl eo enrollaÃ± ar profil."
 
-#: actions/apiaccountupdateprofilebackgroundimage.php:108
-#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
-#: actions/apistatusesupdate.php:212 actions/avatarsettings.php:257
+#: actions/apiaccountupdateprofilebackgroundimage.php:109
+#: actions/apiaccountupdateprofileimage.php:98 actions/apimediaupload.php:81
+#: actions/apistatusesupdate.php:213 actions/avatarsettings.php:257
 #: actions/designadminpanel.php:123 actions/editapplication.php:118
 #: actions/newapplication.php:101 actions/newnotice.php:94
 #: lib/designsettings.php:283
@@ -261,30 +265,30 @@ msgid ""
 "current configuration."
 msgstr ""
 
-#: actions/apiaccountupdateprofilebackgroundimage.php:136
-#: actions/apiaccountupdateprofilebackgroundimage.php:146
-#: actions/apiaccountupdateprofilecolors.php:164
-#: actions/apiaccountupdateprofilecolors.php:174
+#: actions/apiaccountupdateprofilebackgroundimage.php:137
+#: actions/apiaccountupdateprofilebackgroundimage.php:147
+#: actions/apiaccountupdateprofilecolors.php:165
+#: actions/apiaccountupdateprofilecolors.php:175
 #: actions/groupdesignsettings.php:290 actions/groupdesignsettings.php:300
 #: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
 #: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
 msgid "Unable to save your design settings."
 msgstr "Dibosupl eo enrollaÃ± an arventennoÃ¹ empentiÃ±."
 
-#: actions/apiaccountupdateprofilebackgroundimage.php:187
-#: actions/apiaccountupdateprofilecolors.php:142
+#: actions/apiaccountupdateprofilebackgroundimage.php:188
+#: actions/apiaccountupdateprofilecolors.php:143
 msgid "Could not update your design."
 msgstr "Diposubl eo hizivat ho design."
 
-#: actions/apiblockcreate.php:105
+#: actions/apiblockcreate.php:106
 msgid "You cannot block yourself!"
 msgstr "N'hallit ket en em stankaÃ± hoc'h-unan !"
 
-#: actions/apiblockcreate.php:126
+#: actions/apiblockcreate.php:127
 msgid "Block user failed."
 msgstr "N'eus ket bet tu da stankaÃ± an implijer."
 
-#: actions/apiblockdestroy.php:114
+#: actions/apiblockdestroy.php:115
 msgid "Unblock user failed."
 msgstr "N'eus ket bet tu da zistankaÃ± an implijer."
 
@@ -308,69 +312,65 @@ msgstr "KemennadennoÃ¹ war-eeun kaset da %s"
 msgid "All the direct messages sent to %s"
 msgstr "An holl gemennadennoÃ¹ war-eeun kaset da %s"
 
-#: actions/apidirectmessagenew.php:118
+#: actions/apidirectmessagenew.php:119
 msgid "No message text!"
 msgstr "Kemenadenn hep testenn !"
 
-#: actions/apidirectmessagenew.php:127 actions/newmessage.php:150
+#: actions/apidirectmessagenew.php:128 actions/newmessage.php:150
 #, php-format
 msgid "That's too long. Max message size is %d chars."
 msgstr "Re hir eo ! Ment hiraÃ± ar gemenadenn a zo a %d arouezenn."
 
-#: actions/apidirectmessagenew.php:138
+#: actions/apidirectmessagenew.php:139
 msgid "Recipient user not found."
 msgstr "N'eo ket bet kavet ar resever."
 
-#: actions/apidirectmessagenew.php:142
+#: actions/apidirectmessagenew.php:143
 msgid "Can't send direct messages to users who aren't your friend."
 msgstr ""
 "Ne c'helloc'h ket kas kemennadennoÃ¹ personel d'an implijerien n'int ket ho "
 "mignoned."
 
-#: actions/apifavoritecreate.php:109 actions/apifavoritedestroy.php:110
+#: actions/apifavoritecreate.php:110 actions/apifavoritedestroy.php:111
 #: actions/apistatusesdestroy.php:121
 msgid "No status found with that ID."
 msgstr "N'eo bet kavet statud ebet gant an ID-maÃ±."
 
-#: actions/apifavoritecreate.php:120
+#: actions/apifavoritecreate.php:121
 msgid "This status is already a favorite."
 msgstr "Ur pennroll eo dija an ali-maÃ±."
 
 #. TRANS: Error message text shown when a favorite could not be set.
-#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:296
+#: actions/apifavoritecreate.php:132 actions/favor.php:84 lib/command.php:296
 msgid "Could not create favorite."
 msgstr "Diposupl eo krouiÃ± ar pennroll-maÃ±."
 
-#: actions/apifavoritedestroy.php:123
+#: actions/apifavoritedestroy.php:124
 msgid "That status is not a favorite."
 msgstr "N'eo ket ar statud-maÃ± ur pennroll."
 
-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
+#: actions/apifavoritedestroy.php:136 actions/disfavor.php:87
 msgid "Could not delete favorite."
 msgstr "Diposupl eo dilemel ar pennroll-maÃ±."
 
-#: actions/apifriendshipscreate.php:109
+#: actions/apifriendshipscreate.php:110
 msgid "Could not follow user: profile not found."
 msgstr "Dibosupl eo heuliaÃ± an implijer : n'eo ket bet kavet ar profil."
 
-#: actions/apifriendshipscreate.php:118
+#: actions/apifriendshipscreate.php:119
 #, php-format
 msgid "Could not follow user: %s is already on your list."
 msgstr "Diposubl eo heuliaÃ± an implijer : war ho listenn emaÃ± %s dija."
 
-#: actions/apifriendshipsdestroy.php:109
+#: actions/apifriendshipsdestroy.php:110
 msgid "Could not unfollow user: User not found."
 msgstr ""
 "Diposupl eo paouez heuliaÃ± an implijer : N'eo ket bet kavet an implijer."
 
-#: actions/apifriendshipsdestroy.php:120
+#: actions/apifriendshipsdestroy.php:121
 msgid "You cannot unfollow yourself."
 msgstr "Ne c'hallit ket chom hep ho heuliaÃ± hoc'h-unan."
 
-#: actions/apifriendshipsexists.php:91
-msgid "Two valid IDs or screen_names must be supplied."
-msgstr ""
-
 #: actions/apifriendshipsshow.php:134
 msgid "Could not determine source user."
 msgstr "Diposubl eo termeniÃ± an implijer mammenn."
@@ -379,95 +379,95 @@ msgstr "Diposubl eo termeniÃ± an implijer mammenn."
 msgid "Could not find target user."
 msgstr "Diposubl eo kavout an implijer pal."
 
-#: actions/apigroupcreate.php:176 actions/editgroup.php:190
+#: actions/apigroupcreate.php:177 actions/editgroup.php:190
 #: actions/newgroup.php:130 actions/profilesettings.php:238
 #: actions/register.php:215
 msgid "Nickname already in use. Try another one."
 msgstr "Implijet eo dija al lesanv-se. Klaskit unan all."
 
-#: actions/apigroupcreate.php:183 actions/editgroup.php:193
+#: actions/apigroupcreate.php:184 actions/editgroup.php:193
 #: actions/newgroup.php:133 actions/profilesettings.php:218
 #: actions/register.php:217
 msgid "Not a valid nickname."
 msgstr "N'eo ket ul lesanv mat."
 
-#: actions/apigroupcreate.php:199 actions/editapplication.php:215
+#: actions/apigroupcreate.php:200 actions/editapplication.php:215
 #: actions/editgroup.php:199 actions/newapplication.php:203
 #: actions/newgroup.php:139 actions/profilesettings.php:222
 #: actions/register.php:224
 msgid "Homepage is not a valid URL."
 msgstr "N'eo ket chomlec'h al lec'hienn personel un URL reizh."
 
-#: actions/apigroupcreate.php:208 actions/editgroup.php:202
+#: actions/apigroupcreate.php:209 actions/editgroup.php:202
 #: actions/newgroup.php:142 actions/profilesettings.php:225
 #: actions/register.php:227
 msgid "Full name is too long (max 255 chars)."
 msgstr "Re hir eo an anv klok (255 arouezenn d'ar muiaÃ±)."
 
-#: actions/apigroupcreate.php:216 actions/editapplication.php:190
+#: actions/apigroupcreate.php:217 actions/editapplication.php:190
 #: actions/newapplication.php:172
 #, php-format
 msgid "Description is too long (max %d chars)."
 msgstr "Re hir eo an deskrivadur (%d arouezenn d'ar muiaÃ±)."
 
-#: actions/apigroupcreate.php:227 actions/editgroup.php:208
+#: actions/apigroupcreate.php:228 actions/editgroup.php:208
 #: actions/newgroup.php:148 actions/profilesettings.php:232
 #: actions/register.php:234
 msgid "Location is too long (max 255 chars)."
 msgstr "Re hir eo al lec'hiadur (255 arouezenn d'ar muiaÃ±)."
 
-#: actions/apigroupcreate.php:246 actions/editgroup.php:219
+#: actions/apigroupcreate.php:247 actions/editgroup.php:219
 #: actions/newgroup.php:159
 #, php-format
 msgid "Too many aliases! Maximum %d."
 msgstr "Re a aliasoÃ¹ ! %d d'ar muiaÃ±."
 
-#: actions/apigroupcreate.php:267
+#: actions/apigroupcreate.php:268
 #, php-format
 msgid "Invalid alias: \"%s\"."
 msgstr "Alias fall : \"%s\"."
 
-#: actions/apigroupcreate.php:276 actions/editgroup.php:232
+#: actions/apigroupcreate.php:277 actions/editgroup.php:232
 #: actions/newgroup.php:172
 #, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr "Implijet e vez an alias \"%s\" dija. Klaskit gant unan all."
 
-#: actions/apigroupcreate.php:289 actions/editgroup.php:238
+#: actions/apigroupcreate.php:290 actions/editgroup.php:238
 #: actions/newgroup.php:178
 msgid "Alias can't be the same as nickname."
 msgstr "Ne c'hell ket an alias bezaÃ± ar memes hini eget al lesanv."
 
-#: actions/apigroupismember.php:96 actions/apigroupjoin.php:105
-#: actions/apigroupleave.php:105 actions/apigroupmembership.php:92
+#: actions/apigroupismember.php:96 actions/apigroupjoin.php:106
+#: actions/apigroupleave.php:106 actions/apigroupmembership.php:92
 #: actions/apigroupshow.php:83 actions/apitimelinegroup.php:92
 msgid "Group not found."
 msgstr "N'eo ket bet kavet ar strollad."
 
 #. TRANS: Error text shown a user tries to join a group they already are a member of.
-#: actions/apigroupjoin.php:111 actions/joingroup.php:100 lib/command.php:336
+#: actions/apigroupjoin.php:112 actions/joingroup.php:100 lib/command.php:336
 msgid "You are already a member of that group."
 msgstr "Un ezel eus ar strollad-maÃ± eo dija."
 
 #. TRANS: Error text shown when a user tries to join a group they are blocked from joining.
-#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:341
+#: actions/apigroupjoin.php:121 actions/joingroup.php:105 lib/command.php:341
 msgid "You have been blocked from that group by the admin."
 msgstr "Stanket oc'h bet eus ar strollad-maÃ± gant ur merour."
 
 #. 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.
-#: actions/apigroupjoin.php:139 actions/joingroup.php:134 lib/command.php:353
+#: actions/apigroupjoin.php:140 actions/joingroup.php:134 lib/command.php:353
 #, 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."
 
-#: actions/apigroupleave.php:115
+#: actions/apigroupleave.php:116
 msgid "You are not a member of this group."
 msgstr "N'oc'h ket ezel eus ar strollad-maÃ±."
 
 #. 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.
-#: actions/apigroupleave.php:125 actions/leavegroup.php:129
+#: actions/apigroupleave.php:126 actions/leavegroup.php:129
 #: lib/command.php:401
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
@@ -497,7 +497,7 @@ msgstr "StrolladoÃ¹ %s"
 msgid "groups on %s"
 msgstr "strolladoÃ¹ war %s"
 
-#: actions/apimediaupload.php:99
+#: actions/apimediaupload.php:100
 msgid "Upload failed."
 msgstr "Enporzhiadenn c'hwitet."
 
@@ -511,9 +511,9 @@ msgstr "Fichenn direizh."
 
 #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
 #: actions/deletenotice.php:169 actions/disfavor.php:74
-#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:55
+#: actions/emailsettings.php:271 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:66 actions/imsettings.php:227
+#: actions/groupunblock.php:66 actions/imsettings.php:230
 #: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
@@ -552,8 +552,8 @@ msgstr ""
 #. 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:286 actions/grouplogo.php:322
-#: actions/imsettings.php:242 actions/newapplication.php:121
+#: actions/emailsettings.php:290 actions/grouplogo.php:322
+#: actions/imsettings.php:245 actions/newapplication.php:121
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
 #: actions/smssettings.php:277 lib/designsettings.php:304
 msgid "Unexpected form submission."
@@ -614,18 +614,18 @@ msgstr "Ezhomm en deus an argerzh-maÃ± ur POST pe un DELETE."
 msgid "You may not delete another user's status."
 msgstr "Ne c'helloc'h ket dilemel statud un implijer all."
 
-#: actions/apistatusesretweet.php:75 actions/apistatusesretweets.php:72
+#: actions/apistatusesretweet.php:76 actions/apistatusesretweets.php:72
 #: actions/deletenotice.php:52 actions/shownotice.php:92
 msgid "No such notice."
 msgstr "N'eus ket eus an ali-se."
 
 #. TRANS: Error text shown when trying to repeat an own notice.
-#: actions/apistatusesretweet.php:83 lib/command.php:538
+#: actions/apistatusesretweet.php:84 lib/command.php:538
 msgid "Cannot repeat your own notice."
 msgstr "Ne c'helloc'h ket adlavar ho alioÃ¹."
 
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-#: actions/apistatusesretweet.php:91 lib/command.php:544
+#: actions/apistatusesretweet.php:92 lib/command.php:544
 msgid "Already repeated that notice."
 msgstr "Adlavaret o peus dija an ali-maÃ±."
 
@@ -637,21 +637,21 @@ msgstr "Statud diverket."
 msgid "No status with that ID found."
 msgstr "N'eo ket bet kavet a statud evit an ID-maÃ±"
 
-#: actions/apistatusesupdate.php:221
+#: actions/apistatusesupdate.php:222
 msgid "Client must provide a 'status' parameter with a value."
 msgstr ""
 
-#: actions/apistatusesupdate.php:242 actions/newnotice.php:157
+#: actions/apistatusesupdate.php:243 actions/newnotice.php:157
 #: lib/mailhandler.php:60
 #, php-format
 msgid "That's too long. Max notice size is %d chars."
 msgstr "Re hir eo ! Ment hiraÃ± an ali a zo a %d arouezenn."
 
-#: actions/apistatusesupdate.php:283 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:284 actions/apiusershow.php:96
 msgid "Not found."
 msgstr "N'eo ket bet kavet."
 
-#: actions/apistatusesupdate.php:306 actions/newnotice.php:181
+#: actions/apistatusesupdate.php:307 actions/newnotice.php:181
 #, php-format
 msgid "Max notice size is %d chars, including attachment URL."
 msgstr ""
@@ -843,7 +843,9 @@ msgid "Yes"
 msgstr "Ya"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
+#. TRANS: Submit button title.
+#. TRANS: Description of the form to block a user.
+#: actions/block.php:164 actions/groupmembers.php:403 lib/blockform.php:82
 msgid "Block this user"
 msgstr "StankaÃ± an implijer-maÃ±"
 
@@ -886,11 +888,13 @@ msgstr ""
 msgid "Unblock user from group"
 msgstr "DistankaÃ± implijer ar strollad"
 
-#: actions/blockedfromgroup.php:320 lib/unblockform.php:69
+#. TRANS: Title for the form to unblock a user.
+#: actions/blockedfromgroup.php:320 lib/unblockform.php:70
 msgid "Unblock"
 msgstr "DistankaÃ±"
 
-#: actions/blockedfromgroup.php:320 lib/unblockform.php:80
+#. TRANS: Description of the form to unblock a user.
+#: actions/blockedfromgroup.php:320 lib/unblockform.php:82
 msgid "Unblock this user"
 msgstr "DistankaÃ± an implijer-maÃ±"
 
@@ -929,9 +933,9 @@ msgstr "Kadarnaet eo bet dija ar chomlec'h-maÃ±."
 #. 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/confirmaddress.php:116 actions/emailsettings.php:331
+#: actions/emailsettings.php:477 actions/imsettings.php:283
+#: actions/imsettings.php:442 actions/othersettings.php:174
 #: actions/profilesettings.php:283 actions/smssettings.php:308
 #: actions/smssettings.php:464
 msgid "Couldn't update user."
@@ -939,7 +943,7 @@ msgstr "Diposubl eo hizivaat an implijer."
 
 #. 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/confirmaddress.php:128 actions/emailsettings.php:437
 #: actions/smssettings.php:422
 msgid "Couldn't delete email confirmation."
 msgstr "Diposubl eo dilemel ar postel kadarnadur."
@@ -975,9 +979,10 @@ msgstr "N'eo ket bet kavet ar poellad"
 msgid "You are not the owner of this application."
 msgstr "N'oc'h ket perc'henn ar poellad-se."
 
+#. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:127
 #: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1307
+#: lib/action.php:1315
 msgid "There was a problem with your session token."
 msgstr "Ur gudenn 'zo bet gant ho jedaouer dalc'h."
 
@@ -1008,7 +1013,7 @@ msgstr "Dilemel ar poelad-se"
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
 #: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:73 lib/profileformaction.php:64
+#: lib/adminpanelaction.php:71 lib/profileformaction.php:64
 #: lib/settingsaction.php:72
 msgid "Not logged in."
 msgstr "Nann-luget."
@@ -1067,7 +1072,6 @@ msgstr "DiverkaÃ± an implijer-maÃ±"
 #. TRANS: Message used as title for design settings for the site.
 #. TRANS: Link description in user account settings menu.
 #: actions/designadminpanel.php:63 lib/accountsettingsaction.php:139
-#: lib/groupnav.php:119
 msgid "Design"
 msgstr "Design"
 
@@ -1186,13 +1190,13 @@ msgstr "Adlakaat an neuz dre ziouer."
 msgid "Reset back to default"
 msgstr "Adlakaat an arventennoÃ¹ dre ziouer"
 
-#. TRANS: Submit button title
+#. TRANS: Submit button title.
 #: actions/designadminpanel.php:685 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/snapshotadminpanel.php:245
 #: actions/subscriptions.php:226 actions/tagother.php:154
-#: actions/useradminpanel.php:294 lib/applicationeditform.php:363
+#: actions/useradminpanel.php:294 lib/applicationeditform.php:353
 #: lib/designsettings.php:256 lib/groupeditform.php:202
 msgid "Save"
 msgstr "EnrollaÃ±"
@@ -1348,7 +1352,7 @@ msgstr "Chomlec'h postel gwiriekaet er mare-maÃ±."
 #. 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/emailsettings.php:115 actions/emailsettings.php:162
 #: actions/imsettings.php:116 actions/smssettings.php:124
 #: actions/smssettings.php:180
 msgctxt "BUTTON"
@@ -1364,22 +1368,26 @@ msgstr ""
 #. 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
+#. TRANS: Button label in the "Edit application" form.
 #: actions/emailsettings.php:127 actions/imsettings.php:131
-#: actions/smssettings.php:137 lib/applicationeditform.php:357
+#: actions/smssettings.php:137 lib/applicationeditform.php:347
 msgctxt "BUTTON"
 msgid "Cancel"
 msgstr "NullaÃ±"
 
-#. TRANS: Instructions for e-mail address input form.
-#: actions/emailsettings.php:135
+#. TRANS: Instructions for e-mail address input form. Do not translate
+#. TRANS: "example.org". It is one of the domain names reserved for
+#. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
+#. TRANS: Any other domain may be owned by a legitimate person or
+#. TRANS: organization.
+#: actions/emailsettings.php:139
 msgid "Email address, like \"UserName@example.org\""
 msgstr "Chomlec'h postel, evel \"AnvImplijer@example.org\""
 
 #. 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/emailsettings.php:143 actions/imsettings.php:151
 #: actions/smssettings.php:162
 msgctxt "BUTTON"
 msgid "Add"
@@ -1387,116 +1395,116 @@ msgstr "OuzhpennaÃ±"
 
 #. 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
+#: actions/emailsettings.php:151 actions/smssettings.php:171
 msgid "Incoming email"
 msgstr "Postel o tont"
 
 #. 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
+#: actions/emailsettings.php:172 actions/smssettings.php:189
 msgctxt "BUTTON"
 msgid "New"
 msgstr "Nevez"
 
 #. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:174
+#: actions/emailsettings.php:178
 msgid "Email preferences"
 msgstr "PenndibaboÃ¹ ar posteloÃ¹"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:186
+#: actions/emailsettings.php:190
 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."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:193
+#: actions/emailsettings.php:197
 msgid "Send me email when someone sends me a private message."
 msgstr "Kas din ur postel pa gas unan bennak ur gemennadenn bersonel din."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:199
+#: actions/emailsettings.php:203
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr "Kas din ur postel pa gas unan bennak ur \"@-respont\" din."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:205
+#: actions/emailsettings.php:209
 msgid "Allow friends to nudge me and send me an email."
 msgstr ""
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:212
+#: actions/emailsettings.php:216
 msgid "I want to post notices by email."
 msgstr "C'hoant am eus kas va alioÃ¹ dre bostel."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:219
+#: actions/emailsettings.php:223
 msgid "Publish a MicroID for my email address."
 msgstr "Embann ur MicroID evit ma chomlec'h postel."
 
 #. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:334
+#: actions/emailsettings.php:338
 msgid "Email preferences saved."
 msgstr "Enrollet eo bet an arventennoÃ¹ postel."
 
 #. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:353
+#: actions/emailsettings.php:357
 msgid "No email address."
 msgstr "Chomlec'h postel ebet."
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:208
+#: actions/emailsettings.php:370 actions/register.php:208
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "N'eo ket ur chomlec'h postel reizh."
 
 #. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:370
+#: actions/emailsettings.php:374
 msgid "That is already your email address."
 msgstr "Ho postel eo dija."
 
 #. 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/emailsettings.php:395 actions/imsettings.php:351
 #: actions/smssettings.php:373
 msgid "Couldn't insert confirmation code."
 msgstr "Dibosupl eo ensoc'haÃ± ar c'hod gwiriekaat."
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:398
+#: actions/emailsettings.php:402
 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 ""
 
 #. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:424
+#: actions/emailsettings.php:428
 msgid "That is the wrong email address."
 msgstr "N'eo ket mat ar chomlec'h postelerezh prim."
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:438
+#: actions/emailsettings.php:442
 msgid "Email confirmation cancelled."
 msgstr "Nullet eo bet kadarnadenn ar postel."
 
 #. TRANS: Message given trying to remove an e-mail address that is not
 #. TRANS: registered for the active user.
-#: actions/emailsettings.php:458
+#: actions/emailsettings.php:462
 msgid "That is not your email address."
 msgstr "N'eo ket ho postel."
 
 #. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:479
+#: actions/emailsettings.php:483
 msgid "The email address was removed."
 msgstr "Dilamet eo bet ar chomlec'h postel."
 
-#: actions/emailsettings.php:493 actions/smssettings.php:568
+#: actions/emailsettings.php:497 actions/smssettings.php:568
 msgid "No incoming email address."
 msgstr "Chomlec'h postel ebet o tont."
 
 #. 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/emailsettings.php:508 actions/emailsettings.php:532
 #: actions/smssettings.php:578 actions/smssettings.php:602
 msgid "Couldn't update user record."
 msgstr "Dibosupl eo hizivaat doser an implijer."
@@ -1581,7 +1589,7 @@ msgstr "N'oc'h ket aotreet."
 msgid "Remote service uses unknown version of OMB protocol."
 msgstr ""
 
-#: actions/finishremotesubscribe.php:138
+#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306
 msgid "Error updating remote profile."
 msgstr "Fazi en ur hizivaat ar profil a-bell."
 
@@ -1638,7 +1646,7 @@ msgstr "An implijer-maÃ± a zo stanket dija eus ar strollad."
 msgid "User is not a member of group."
 msgstr "N'eo ket an implijer-maÃ± ezel eus ur strollad."
 
-#: actions/groupblock.php:134 actions/groupmembers.php:360
+#: actions/groupblock.php:134 actions/groupmembers.php:364
 msgid "Block user from group"
 msgstr "StankaÃ± an implijer-maÃ± eus ar strollad"
 
@@ -1701,40 +1709,32 @@ msgstr "Logo hizivaet."
 msgid "Failed updating logo."
 msgstr "N'eo ket bet kaset da benn an hizivadenn."
 
-#: actions/groupmembers.php:100 lib/groupnav.php:92
+#. TRANS: Title of the page showing group members.
+#. TRANS: %s is the name of the group.
+#: actions/groupmembers.php:102
 #, php-format
 msgid "%s group members"
 msgstr "Izili ar strollad %s"
 
-#: actions/groupmembers.php:103
+#. TRANS: Title of the page showing group members.
+#. TRANS: %1$s is the name of the group, %2$d is the page number of the members list.
+#: actions/groupmembers.php:107
 #, php-format
 msgid "%1$s group members, page %2$d"
 msgstr "Izili ar strollad %1$s, pajenn %2$d"
 
-#: actions/groupmembers.php:118
+#: actions/groupmembers.php:122
 msgid "A list of the users in this group."
 msgstr "Roll an implijerien enrollet er strollad-maÃ±."
 
-#: actions/groupmembers.php:182 lib/groupnav.php:107
+#: actions/groupmembers.php:186
 msgid "Admin"
 msgstr "MeraÃ±"
 
-#: actions/groupmembers.php:392 lib/blockform.php:69
-msgid "Block"
-msgstr "StankaÃ±"
-
-#: actions/groupmembers.php:487
+#: actions/groupmembers.php:498
 msgid "Make user an admin of the group"
 msgstr "Lakaat an implijer da vezaÃ± ur merour eus ar strollad"
 
-#: actions/groupmembers.php:519
-msgid "Make Admin"
-msgstr "Lakaat ur merour"
-
-#: actions/groupmembers.php:519
-msgid "Make this user an admin"
-msgstr "Lakaat an implijer-maÃ± da verour"
-
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Title in atom group notice feed. %s is a group name.
 #. TRANS: Title in atom user notice feed. %s is a user name.
@@ -1845,7 +1845,10 @@ msgstr ""
 
 #. TRANS: IM address input field instructions in IM settings form.
 #. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:140
+#. TRANS: Do not translate "example.org". It is one of the domain names reserved for use in examples by
+#. TRANS: http://www.rfc-editor.org/rfc/rfc2606.txt. Any other domain may be owned by a legitimate
+#. TRANS: person or organization.
+#: actions/imsettings.php:143
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -1853,53 +1856,53 @@ msgid ""
 msgstr ""
 
 #. TRANS: Form legend for IM preferences form.
-#: actions/imsettings.php:155
+#: actions/imsettings.php:158
 msgid "IM preferences"
 msgstr "PenndibaboÃ¹ ar bostelerezh prim"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:160
+#: actions/imsettings.php:163
 msgid "Send me notices through Jabber/GTalk."
 msgstr "Kas din an alioÃ¹ dre Jabber/GTalk."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:179
+#: actions/imsettings.php:182
 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "Embann ur MicroID evit ma chomlec'h Jabber/GTalk."
 
 #. TRANS: Confirmation message for successful IM preferences save.
-#: actions/imsettings.php:287 actions/othersettings.php:180
+#: actions/imsettings.php:290 actions/othersettings.php:180
 msgid "Preferences saved."
 msgstr "PenndibaboÃ¹ enrollet"
 
 #. TRANS: Message given saving IM address without having provided one.
-#: actions/imsettings.php:309
+#: actions/imsettings.php:312
 msgid "No Jabber ID."
 msgstr "ID Jabber ebet."
 
 #. TRANS: Message given saving IM address that cannot be normalised.
-#: actions/imsettings.php:317
+#: actions/imsettings.php:320
 msgid "Cannot normalize that Jabber ID"
 msgstr "Diposubl eo implijout an ID Jabber-maÃ±"
 
 #. TRANS: Message given saving IM address that not valid.
-#: actions/imsettings.php:322
+#: actions/imsettings.php:325
 msgid "Not a valid Jabber ID"
 msgstr "N'eo ket un ID Jabber reizh."
 
 #. TRANS: Message given saving IM address that is already set.
-#: actions/imsettings.php:326
+#: actions/imsettings.php:329
 msgid "That is already your Jabber ID."
 msgstr "Ho ID Jabber eo dija"
 
 #. TRANS: Message given saving IM address that is already set for another user.
-#: actions/imsettings.php:330
+#: actions/imsettings.php:333
 msgid "Jabber ID already belongs to another user."
 msgstr "Implijet eo an Jabber ID-maÃ± gant un implijer all."
 
 #. 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
+#: actions/imsettings.php:361
 #, php-format
 msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
@@ -1907,23 +1910,23 @@ msgid ""
 msgstr ""
 
 #. TRANS: Message given canceling IM address confirmation for the wrong IM address.
-#: actions/imsettings.php:388
+#: actions/imsettings.php:391
 msgid "That is the wrong IM address."
 msgstr "N'eo ket mat ar chomlec'h postelerezh prim."
 
 #. TRANS: Message given after successfully canceling IM address confirmation.
-#: actions/imsettings.php:402
+#: actions/imsettings.php:405
 msgid "IM confirmation cancelled."
 msgstr "Nullet eo bet kadarnadenn ar bostelerezh prim."
 
 #. TRANS: Message given trying to remove an IM address that is not
 #. TRANS: registered for the active user.
-#: actions/imsettings.php:424
+#: actions/imsettings.php:427
 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
+#: actions/imsettings.php:450
 msgid "The IM address was removed."
 msgstr "Ar chomlec'h IM zo bet dilamet."
 
@@ -2294,11 +2297,6 @@ msgstr ""
 msgid "You are not a user of that application."
 msgstr "N'oc'h ket un implijer eus ar poellad-maÃ±."
 
-#: actions/oauthconnectionssettings.php:186
-#, php-format
-msgid "Unable to revoke access for app: %s."
-msgstr ""
-
 #: actions/oauthconnectionssettings.php:211
 msgid "Developers can edit the registration settings for their applications "
 msgstr ""
@@ -2312,12 +2310,6 @@ msgstr "N'en deus ket an ali a profil."
 msgid "%1$s's status on %2$s"
 msgstr "Statud %1$s war %2$s"
 
-#. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
-#: actions/oembed.php:159
-#, php-format
-msgid "Content type %s not supported."
-msgstr ""
-
 #. TRANS: Error message displaying attachments. %s is the site's base URL.
 #: actions/oembed.php:163
 #, php-format
@@ -2436,7 +2428,7 @@ msgid "Password saved."
 msgstr "Ger-tremen enrollet."
 
 #. TRANS: Menu item for site administration
-#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:384
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:371
 msgid "Paths"
 msgstr "HentoÃ¹"
 
@@ -2628,7 +2620,7 @@ msgstr "Anv klok"
 
 #. TRANS: Form input field label.
 #: actions/profilesettings.php:115 actions/register.php:460
-#: lib/applicationeditform.php:244 lib/groupeditform.php:161
+#: lib/applicationeditform.php:235 lib/groupeditform.php:161
 msgid "Homepage"
 msgstr "Pajenn degemer"
 
@@ -2731,7 +2723,7 @@ msgid "Couldn't save tags."
 msgstr "Diposubl eo enrollaÃ± ar balizennoÃ¹."
 
 #. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:391 lib/adminpanelaction.php:141
+#: actions/profilesettings.php:391 lib/adminpanelaction.php:138
 msgid "Settings saved."
 msgstr "Enrollet eo bet an arventennoÃ¹."
 
@@ -3212,7 +3204,7 @@ msgstr "Er poull-traezh emaÃ± dija an implijer."
 
 #. TRANS: Menu item for site administration
 #: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
-#: lib/adminpanelaction.php:392
+#: lib/adminpanelaction.php:379
 msgid "Sessions"
 msgstr "Dalc'hoÃ¹"
 
@@ -3250,24 +3242,24 @@ msgid "Application profile"
 msgstr "Profil ar poellad"
 
 #. TRANS: Form input field label for application icon.
-#: actions/showapplication.php:159 lib/applicationeditform.php:182
+#: actions/showapplication.php:159 lib/applicationeditform.php:173
 msgid "Icon"
 msgstr "Arlun"
 
 #. TRANS: Form input field label for application name.
 #: actions/showapplication.php:169 actions/version.php:197
-#: lib/applicationeditform.php:199
+#: lib/applicationeditform.php:190
 msgid "Name"
 msgstr "Anv"
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:178 lib/applicationeditform.php:235
+#: actions/showapplication.php:178 lib/applicationeditform.php:226
 msgid "Organization"
 msgstr "Aozadur"
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:216 lib/groupeditform.php:172
+#: lib/applicationeditform.php:207 lib/groupeditform.php:172
 msgid "Description"
 msgstr "Deskrivadur"
 
@@ -3369,7 +3361,7 @@ msgstr ""
 msgid "This is a way to share what you like."
 msgstr "Un doare eo evit kevranaÃ± ar pezh a blij deoc'h."
 
-#: actions/showgroup.php:82 lib/groupnav.php:86
+#: actions/showgroup.php:82
 #, php-format
 msgid "%s group"
 msgstr "strollad %s"
@@ -3421,7 +3413,7 @@ msgstr "Neudenn alioÃ¹ ar strollad %s (Atom)"
 msgid "FOAF for %s group"
 msgstr "Mignon ur mignon evit ar strollad %s"
 
-#: actions/showgroup.php:393 actions/showgroup.php:445 lib/groupnav.php:91
+#: actions/showgroup.php:393 actions/showgroup.php:445
 msgid "Members"
 msgstr "Izili"
 
@@ -3791,7 +3783,7 @@ msgstr "N'eo bet lakaet kod ebet"
 
 #. TRANS: Menu item for site administration
 #: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
-#: lib/adminpanelaction.php:408
+#: lib/adminpanelaction.php:395
 msgid "Snapshots"
 msgstr "Prim"
 
@@ -4367,7 +4359,7 @@ msgid "Unable to save tag."
 msgstr "Dibosupl eo enrollaÃ± an tikedenn."
 
 #. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#: classes/Subscription.php:75 lib/oauthstore.php:465
+#: classes/Subscription.php:75 lib/oauthstore.php:466
 msgid "You have been banned from subscribing."
 msgstr "Nac'het ez eus bet deoc'h en em goumanantiÃ±."
 
@@ -4510,7 +4502,8 @@ msgid "Change site configuration"
 msgstr "KemmaÃ± arventennoÃ¹ al lec'hienn"
 
 #. TRANS: Main menu option when logged in and site admin for access to site configuration
-#: lib/action.php:474
+#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
+#: lib/action.php:474 lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr "MeraÃ±"
@@ -4587,7 +4580,7 @@ msgstr "Klask"
 
 #. TRANS: DT element for site notice. String is hidden in default CSS.
 #. TRANS: Menu item for site administration
-#: lib/action.php:538 lib/adminpanelaction.php:400
+#: lib/action.php:538 lib/adminpanelaction.php:387
 msgid "Site notice"
 msgstr "Ali al lec'hienn"
 
@@ -4646,7 +4639,10 @@ msgid "StatusNet software license"
 msgstr "Aotre-implijout ar meziant StatusNet"
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
-#: lib/action.php:843
+#. TRANS: Text between [] is a link description, text between () is the link itself.
+#. TRANS: Make sure there is no whitespace between "]" and "(".
+#. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
+#: lib/action.php:846
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4654,13 +4650,16 @@ msgid ""
 msgstr ""
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:846
+#: lib/action.php:849
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** a zo ur servij microblogging."
 
 #. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.
-#: lib/action.php:850
+#. TRANS: Make sure there is no whitespace between "]" and "(".
+#. TRANS: Text between [] is a link description, text between () is the link itself.
+#. TRANS: %s is the version of StatusNet that is being used.
+#: lib/action.php:856
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4669,42 +4668,43 @@ msgid ""
 msgstr ""
 
 #. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:866
+#: lib/action.php:872
 msgid "Site content license"
 msgstr "Aotre-implijout diwar-benn danvez al lec'hienn"
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:880
+#: lib/action.php:886
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:884
+#: lib/action.php:890
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 
-#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:897
+#. TRANS: license message in footer.
+#. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
+#: lib/action.php:904
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr ""
 
 #. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1236
+#: lib/action.php:1243
 msgid "Pagination"
 msgstr "Pajennadur"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1247
+#: lib/action.php:1254
 msgid "After"
 msgstr "War-lerc'h"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1257
+#: lib/action.php:1264
 msgid "Before"
 msgstr "Kent"
 
@@ -4713,194 +4713,218 @@ msgstr "Kent"
 msgid "Expecting a root feed element but got a whole XML document."
 msgstr ""
 
-#: lib/activityutils.php:208
+#. TRANS: Client exception thrown when there is no source attribute.
+#: lib/activityutils.php:203
 msgid "Can't handle remote content yet."
 msgstr ""
 
-#: lib/activityutils.php:244
+#. TRANS: Client exception thrown when there embedded XML content is found that cannot be processed yet.
+#: lib/activityutils.php:240
 msgid "Can't handle embedded XML content yet."
 msgstr ""
 
-#: lib/activityutils.php:248
+#. TRANS: Client exception thrown when base64 encoded content is found that cannot be processed yet.
+#: lib/activityutils.php:245
 msgid "Can't handle embedded Base64 content yet."
 msgstr ""
 
 #. TRANS: Client error message throw when a certain panel's settings cannot be changed.
-#: lib/adminpanelaction.php:110
+#: lib/adminpanelaction.php:108
 msgid "Changes to that panel are not allowed."
 msgstr "N'eo ket aotreet kemmaÃ± ar panell-se"
 
 #. TRANS: Client error message.
-#: lib/adminpanelaction.php:229
+#: lib/adminpanelaction.php:222
 msgid "showForm() not implemented."
 msgstr "N'eo ket bet emplementet showForm()."
 
 #. TRANS: Client error message
-#: lib/adminpanelaction.php:259
+#: lib/adminpanelaction.php:250
 msgid "saveSettings() not implemented."
 msgstr "N'eo ket bet emplementet saveSettings()."
 
 #. TRANS: Client error message thrown if design settings could not be deleted in
 #. TRANS: the admin panel Design.
-#: lib/adminpanelaction.php:284
+#: lib/adminpanelaction.php:274
 msgid "Unable to delete design setting."
 msgstr "Dibosupl eo dilemel an arventennoÃ¹ krouiÃ±."
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:350
+#: lib/adminpanelaction.php:337
 msgid "Basic site configuration"
 msgstr "ArventennoÃ¹ diazez al lec'hienn"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:352
+#: lib/adminpanelaction.php:339
 msgctxt "MENU"
 msgid "Site"
 msgstr "Lec'hienn"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:358
+#: lib/adminpanelaction.php:345
 msgid "Design configuration"
 msgstr "Kefluniadur ar c'hrouiÃ±"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:360
+#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
+#: lib/adminpanelaction.php:347 lib/groupnav.php:135
 msgctxt "MENU"
 msgid "Design"
 msgstr "Design"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:366
+#: lib/adminpanelaction.php:353
 msgid "User configuration"
 msgstr "Kefluniadur an implijer"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:368 lib/personalgroupnav.php:115
+#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:115
 msgid "User"
 msgstr "Implijer"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:374
+#: lib/adminpanelaction.php:361
 msgid "Access configuration"
 msgstr "Kefluniadur ar moned"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:382
+#: lib/adminpanelaction.php:369
 msgid "Paths configuration"
 msgstr "Kefluniadur an hentoÃ¹"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:390
+#: lib/adminpanelaction.php:377
 msgid "Sessions configuration"
 msgstr "Kefluniadur an dalc'hoÃ¹"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:398
+#: lib/adminpanelaction.php:385
 msgid "Edit site notice"
 msgstr "KemmaÃ± ali al lec'hienn"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:406
+#: lib/adminpanelaction.php:393
 msgid "Snapshots configuration"
 msgstr "Kefluniadur ar primoÃ¹"
 
 #. TRANS: Client error 401.
-#: lib/apiauth.php:113
+#: lib/apiauth.php:111
 msgid "API resource requires read-write access, but you only have read access."
 msgstr ""
 
+#. TRANS: OAuth exception thrown when no application is found for a given consumer key.
+#: lib/apiauth.php:175
+msgid "No application for that consumer key."
+msgstr ""
+
+#. TRANS: OAuth exception given when no user was found for a given token (no token was found).
+#: lib/apiauth.php:217
+msgid "No user for that token."
+msgstr ""
+
+#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
+#: lib/apioauthstore.php:178
+msgid "Tried to revoke unknown token"
+msgstr ""
+
+#. TRANS: Exception thrown when an attempt is made to remove a revoked token.
+#: lib/apioauthstore.php:182
+msgid "Failed to delete revoked token"
+msgstr ""
+
 #. TRANS: Form legend.
-#: lib/applicationeditform.php:137
+#: lib/applicationeditform.php:129
 msgid "Edit application"
 msgstr "KemmaÃ± an arload"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:187
+#: lib/applicationeditform.php:178
 msgid "Icon for this application"
 msgstr "Arlun evit ar poellad-maÃ±"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:209
+#: lib/applicationeditform.php:200
 #, php-format
 msgid "Describe your application in %d characters"
 msgstr "Diskrivit ho poellad gant %d arouezenn"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:213
+#: lib/applicationeditform.php:204
 msgid "Describe your application"
 msgstr "Deskrivit ho poellad"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:224
+#: lib/applicationeditform.php:215
 msgid "URL of the homepage of this application"
 msgstr "URL pajenn degemer ar poellad-maÃ±"
 
 #. TRANS: Form input field label.
-#: lib/applicationeditform.php:226
+#: lib/applicationeditform.php:217
 msgid "Source URL"
 msgstr "Mammenn URL"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:233
+#: lib/applicationeditform.php:224
 msgid "Organization responsible for this application"
 msgstr "An aozadur e karg eus ar poellad-maÃ±"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:242
+#: lib/applicationeditform.php:233
 msgid "URL for the homepage of the organization"
 msgstr "URL pajenn degemer an aozadur-se"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:251
+#: lib/applicationeditform.php:242
 msgid "URL to redirect to after authentication"
 msgstr "URL davet pehini e o ret adkas goude bezaÃ± kevreet"
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:278
+#: lib/applicationeditform.php:269
 msgid "Browser"
 msgstr "Merdeer"
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:295
+#: lib/applicationeditform.php:286
 msgid "Desktop"
 msgstr "Burev"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:297
+#: lib/applicationeditform.php:288
 msgid "Type of application, browser or desktop"
 msgstr "Seurt ar poellad, merdeer pe burev"
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:320
+#: lib/applicationeditform.php:311
 msgid "Read-only"
 msgstr "Lenn hepken"
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:339
+#: lib/applicationeditform.php:330
 msgid "Read-write"
 msgstr "Lenn-skrivaÃ±"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:341
+#: lib/applicationeditform.php:332
 msgid "Default access for this application: read-only, or read-write"
 msgstr ""
 
-#. TRANS: Submit button title
-#: lib/applicationeditform.php:359
+#. TRANS: Submit button title.
+#: lib/applicationeditform.php:349
 msgid "Cancel"
 msgstr "NullaÃ±"
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:136
+#: lib/applicationlist.php:135
 msgid "read-write"
 msgstr "lenn-skrivaÃ±"
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:138
+#: lib/applicationlist.php:137
 msgid "read-only"
 msgstr "lenn hepken"
 
 #. 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
+#: lib/applicationlist.php:143
 #, php-format
 msgid "Approved %1$s - \"%2$s\" access."
 msgstr "Aprouet d'an %1$s - moned \"%2$s\"."
@@ -4920,7 +4944,8 @@ msgstr "Aozer"
 msgid "Provider"
 msgstr "Pourvezer"
 
-#: lib/attachmentnoticesection.php:67
+#. TRANS: Title.
+#: lib/attachmentnoticesection.php:68
 msgid "Notices where this attachment appears"
 msgstr ""
 
@@ -4932,6 +4957,11 @@ msgstr "N'eo ket aet betek penn kemmaÃ± ar ger-tremen"
 msgid "Password changing is not allowed"
 msgstr "N'eo ket aotreet kemmaÃ± ar ger-tremen"
 
+#. TRANS: Title for the form to block a user.
+#: lib/blockform.php:70
+msgid "Block"
+msgstr "StankaÃ±"
+
 #: lib/channel.php:157 lib/channel.php:177
 msgid "Command results"
 msgstr "Disoc'hoÃ¹ an urzhiad"
@@ -4944,6 +4974,31 @@ msgstr "Urzhiad bet klokaet"
 msgid "Command failed"
 msgstr "C'hwitet en deus an urzhiad"
 
+#. TRANS: Command exception text shown when a notice ID is requested that does not exist.
+#: lib/command.php:84 lib/command.php:108
+msgid "Notice with that id does not exist."
+msgstr ""
+
+#. TRANS: Command exception text shown when a last user notice is requested and it does not exist.
+#. TRANS: Error text shown when a last user notice is requested and it does not exist.
+#: lib/command.php:101 lib/command.php:630
+msgid "User has no last notice."
+msgstr ""
+
+#. 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:130
+#, php-format
+msgid "Could not find a user with nickname %s."
+msgstr ""
+
+#. TRANS: Message given getting a non-existing user.
+#. TRANS: %s is the nickname of the user that could not be found.
+#: lib/command.php:150
+#, php-format
+msgid "Could not find a local user with nickname %s."
+msgstr ""
+
 #. TRANS: Error text shown when an unimplemented command is given.
 #: lib/command.php:185
 msgid "Sorry, this command is not yet implemented."
@@ -4955,6 +5010,13 @@ msgid "It does not make a lot of sense to nudge yourself!"
 msgstr ""
 "N'eus tamm talvoudegezh ebet ober ur blinkadenn deoc'h c'hwi oc'h unan !"
 
+#. TRANS: Message given having nudged another user.
+#. TRANS: %s is the nickname of the user that was nudged.
+#: lib/command.php:240
+#, php-format
+msgid "Nudge sent to %s."
+msgstr ""
+
 #. TRANS: User statistics text.
 #. TRANS: %1$s is the number of other user the user is subscribed to.
 #. TRANS: %2$s is the number of users that are subscribed to the user.
@@ -4975,6 +5037,20 @@ msgstr ""
 msgid "Notice marked as fave."
 msgstr "Ali bet ouzhpennet d'ar pennroll."
 
+#. 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.
+#: lib/command.php:360
+#, php-format
+msgid "%1$s joined group %2$s."
+msgstr ""
+
+#. 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.
+#: lib/command.php:408
+#, php-format
+msgid "%1$s left group %2$s."
+msgstr ""
+
 #. TRANS: Whois output. %s is the full name of the queried user.
 #: lib/command.php:434
 #, php-format
@@ -5023,6 +5099,27 @@ msgstr ""
 msgid "Error sending direct message."
 msgstr "Ur gudenn 'zo bet pa veze kaset ho kemennadenn."
 
+#. 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:554
+#, php-format
+msgid "Notice from %s repeated."
+msgstr ""
+
+#. TRANS: Message given if content of a notice for a reply is too long.
+#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
+#: lib/command.php:592
+#, php-format
+msgid "Notice too long - maximum is %1$d characters, you sent %2$d."
+msgstr ""
+
+#. TRANS: Text shown having sent a reply to a notice successfully.
+#. TRANS: %s is the nickname of the user of the notice the reply was sent to.
+#: lib/command.php:603
+#, php-format
+msgid "Reply to %s sent."
+msgstr ""
+
 #. TRANS: Error text shown when no username was provided when issuing a subscribe command.
 #: lib/command.php:655
 msgid "Specify the name of the user to subscribe to."
@@ -5033,12 +5130,26 @@ msgstr ""
 msgid "Can't subscribe to OMB profiles by command."
 msgstr ""
 
+#. TRANS: Text shown after having subscribed to another user successfully.
+#. TRANS: %s is the name of the user the subscription was requested for.
+#: lib/command.php:672
+#, php-format
+msgid "Subscribed to %s."
+msgstr ""
+
 #. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
 #. TRANS: Error text shown when no username was provided when issuing the command.
 #: lib/command.php:694 lib/command.php:804
 msgid "Specify the name of the user to unsubscribe from."
 msgstr ""
 
+#. TRANS: Text shown after having unsubscribed from another user successfully.
+#. TRANS: %s is the name of the user the unsubscription was requested for.
+#: lib/command.php:705
+#, php-format
+msgid "Unsubscribed from %s."
+msgstr ""
+
 #. TRANS: Text shown when issuing the command "off" successfully.
 #: lib/command.php:728
 msgid "Notification off."
@@ -5071,6 +5182,13 @@ msgstr ""
 msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr ""
 
+#. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
+#. TRANS: %s is the name of the user the unsubscription was requested for.
+#: lib/command.php:813
+#, php-format
+msgid "Unsubscribed %s."
+msgstr ""
+
 #. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
 #: lib/command.php:831
 msgid "You are not subscribed to anyone."
@@ -5088,6 +5206,7 @@ msgstr "Den n'eo koumanantet deoc'h."
 msgid "You are not a member of any groups."
 msgstr "N'oc'h ezel eus strollad ebet."
 
+#. TRANS: Help text for commands.
 #: lib/command.php:905
 msgid ""
 "Commands:\n"
@@ -5237,28 +5356,6 @@ msgstr ""
 msgid "Extra nicknames for the group, comma- or space- separated, max %d"
 msgstr ""
 
-#: lib/groupnav.php:85
-msgid "Group"
-msgstr "Strollad"
-
-#: lib/groupnav.php:101
-msgid "Blocked"
-msgstr "Stanket"
-
-#: lib/groupnav.php:102
-#, php-format
-msgid "%s blocked users"
-msgstr "%s implijer stanket"
-
-#: lib/groupnav.php:113
-msgid "Logo"
-msgstr "Logo"
-
-#: lib/groupnav.php:114
-#, php-format
-msgid "Add or edit %s logo"
-msgstr "OuzhpennaÃ± pe kemmaÃ± logo %s"
-
 #: lib/groupsbypostssection.php:71
 msgid "Groups with most posts"
 msgstr ""
@@ -5273,7 +5370,8 @@ msgstr ""
 msgid "This page is not available in a media type you accept"
 msgstr ""
 
-#: lib/imagefile.php:101 lib/mediafile.php:170
+#. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
+#: lib/imagefile.php:101 lib/mediafile.php:179
 msgid "System error uploading file."
 msgstr ""
 
@@ -5521,52 +5619,69 @@ msgstr "eus"
 msgid "Not a registered user."
 msgstr "N'eo ket un implijer enrollet."
 
-#: lib/mediafile.php:98 lib/mediafile.php:123
+#. TRANS: Client exception thrown when a database error was thrown during a file upload operation.
+#: lib/mediafile.php:99 lib/mediafile.php:125
 msgid "There was a database error while saving your file. Please try again."
 msgstr ""
 
-#: lib/mediafile.php:142
+#. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
+#: lib/mediafile.php:145
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
 msgstr ""
 
-#: lib/mediafile.php:147
+#. TRANS: Client exception.
+#: lib/mediafile.php:151
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form."
 msgstr ""
 
-#: lib/mediafile.php:152
+#. TRANS: Client exception.
+#: lib/mediafile.php:157
 msgid "The uploaded file was only partially uploaded."
 msgstr ""
 
-#: lib/mediafile.php:159
+#. TRANS: Client exception thrown when a temporary folder is not present to store a file upload.
+#: lib/mediafile.php:165
 msgid "Missing a temporary folder."
 msgstr "Mankout a ra un doser padennek."
 
-#: lib/mediafile.php:162
+#. TRANS: Client exception thrown when writing to disk is not possible during a file upload operation.
+#: lib/mediafile.php:169
 msgid "Failed to write file to disk."
 msgstr ""
 
-#: lib/mediafile.php:165
+#. TRANS: Client exception thrown when a file upload operation has been stopped by an extension.
+#: lib/mediafile.php:173
 msgid "File upload stopped by extension."
 msgstr ""
 
-#: lib/mediafile.php:179 lib/mediafile.php:217
+#. TRANS: Client exception thrown when a file upload operation would cause a user to exceed a set quota.
+#: lib/mediafile.php:189 lib/mediafile.php:232
 msgid "File exceeds user's quota."
 msgstr ""
 
-#: lib/mediafile.php:197 lib/mediafile.php:234
+#. TRANS: Client exception thrown when a file upload operation fails because the file could
+#. TRANS: not be moved from the temporary folder to the permanent file location.
+#: lib/mediafile.php:209 lib/mediafile.php:251
 msgid "File could not be moved to destination directory."
 msgstr ""
 
-#: lib/mediafile.php:318
+#. TRANS: Client exception thrown trying to upload a forbidden MIME type.
+#. TRANS: %1$s is the file type that was denied, %2$s is the application part of
+#. TRANS: the MIME type that was denied.
+#: lib/mediafile.php:340
 #, php-format
-msgid " Try using another %s format."
-msgstr "Klaskit implijout ur furmad %s all."
+msgid ""
+"\"%1$s\" is not a supported file type on this server. Try using another %2$s "
+"format."
+msgstr ""
 
-#: lib/mediafile.php:323
+#. TRANS: Client exception thrown trying to upload a forbidden MIME type.
+#. TRANS: %s is the file type that was denied.
+#: lib/mediafile.php:345
 #, php-format
-msgid "%s is not a supported file type on this server."
+msgid "\"%s\" is not a supported file type on this server."
 msgstr ""
 
 #: lib/messageform.php:120
@@ -5678,18 +5793,6 @@ msgstr "Blinkadenn"
 msgid "Send a nudge to this user"
 msgstr "Kas ur blinkadenn d'an implijer-maÃ±"
 
-#: lib/oauthstore.php:283
-msgid "Error inserting new profile"
-msgstr "Ur fazi 'zo bet en ur ensoc'haÃ± ar profil nevez"
-
-#: lib/oauthstore.php:291
-msgid "Error inserting avatar"
-msgstr "Ur fazi 'zo bet en ur ensoc'haÃ± an avatar"
-
-#: lib/oauthstore.php:345
-msgid "Duplicate notice"
-msgstr "EilaÃ± an ali"
-
 #: lib/personalgroupnav.php:99
 msgid "Personal"
 msgstr "Hiniennel"
@@ -5718,12 +5821,8 @@ msgstr "Boest kas"
 msgid "Your sent messages"
 msgstr "Ar c'hemenadennoÃ¹ kaset ganeoc'h"
 
-#: lib/personaltagcloudsection.php:56
-#, php-format
-msgid "Tags in %s's notices"
-msgstr ""
-
-#: lib/plugin.php:115
+#. TRANS: Displayed as version information for a plugin if no version information was found.
+#: lib/plugin.php:116
 msgid "Unknown"
 msgstr "Dianav"
 
@@ -5800,19 +5899,19 @@ msgstr ""
 msgid "Sandbox"
 msgstr "Poull-traezh"
 
-#: lib/searchaction.php:120
+#. TRANS: Fieldset legend for the search form.
+#: lib/searchaction.php:121
 msgid "Search site"
 msgstr "Klask el lec'hienn"
 
-#: lib/searchaction.php:126
+#. TRANS: Used as a field label for the field where one or more keywords
+#. TRANS: for searching can be entered.
+#: lib/searchaction.php:129
 msgid "Keyword(s)"
 msgstr "Ger(ioÃ¹) alc'hwez"
 
-#: lib/searchaction.php:127
-msgid "Search"
-msgstr "Klask"
-
-#: lib/searchaction.php:162
+#. TRANS: Definition list item with instructions on how to get (better) search results.
+#: lib/searchaction.php:170
 msgid "Search help"
 msgstr "Skoazell diwar-benn ar c'hlask"
 
@@ -5962,56 +6061,32 @@ msgid "Moderator"
 msgstr "Habasker"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1102
+#: lib/util.php:1103
 msgid "a few seconds ago"
 msgstr "un nebeud eilennoÃ¹ zo"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1105
+#: lib/util.php:1106
 msgid "about a minute ago"
 msgstr "1 vunutenn zo well-wazh"
 
-#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1109
-#, php-format
-msgid "about %d minutes ago"
-msgstr "%d munutenn zo well-wazh"
-
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 #: lib/util.php:1112
 msgid "about an hour ago"
 msgstr "1 eurvezh zo well-wazh"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1116
-#, php-format
-msgid "about %d hours ago"
-msgstr "%d eurvezh zo well-wazh"
-
-#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1119
+#: lib/util.php:1118
 msgid "about a day ago"
 msgstr "1 devezh zo well-wazh"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1123
-#, php-format
-msgid "about %d days ago"
-msgstr "%d devezh zo well-wazh"
-
-#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1126
+#: lib/util.php:1124
 msgid "about a month ago"
 msgstr "miz zo well-wazh"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 #: lib/util.php:1130
-#, php-format
-msgid "about %d months ago"
-msgstr "%d miz zo well-wazh"
-
-#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1133
 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 3233ac9a3d..914e8a189d 100644
--- a/locale/ca/LC_MESSAGES/statusnet.po
+++ b/locale/ca/LC_MESSAGES/statusnet.po
@@ -1,9 +1,10 @@
-# Translation of StatusNet to Catalan
+# Translation of StatusNet to Catalan (CatalÃ )
+# Expored from translatewiki.net
 #
-# Author@translatewiki.net: Aleator
-# Author@translatewiki.net: McDutchie
-# Author@translatewiki.net: Paucabot
-# Author@translatewiki.net: Toniher
+# Author: Aleator
+# Author: McDutchie
+# Author: Paucabot
+# Author: Toniher
 # --
 # This file is distributed under the same license as the StatusNet package.
 #
@@ -11,20 +12,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-08 22:33+0000\n"
-"PO-Revision-Date: 2010-09-08 22:33:34+0000\n"
-"Language-Team: Catalan\n"
+"POT-Creation-Date: 2010-09-14 19:53+0000\n"
+"PO-Revision-Date: 2010-09-14 19:53:43+0000\n"
+"Language-Team: Catalan <http://translatewiki.net/wiki/Portal:ca>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r72348); Translate extension (2010-08-20)\n"
+"X-Generator: MediaWiki 1.17alpha (r73009); Translate extension (2010-08-20)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ca\n"
-"X-Message-Group: out-statusnet\n"
+"X-Message-Group: #out-statusnet\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-POT-Import-Date: 1284-49-16 34::+0000\n"
 
 #. TRANS: Page title
 #. TRANS: Menu item for site administration
-#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:376
+#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:363
 msgid "Access"
 msgstr "AccÃ©s"
 
@@ -79,10 +81,10 @@ msgstr "Desa els parÃ metres 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 actions/emailsettings.php:224
-#: actions/imsettings.php:184 actions/smssettings.php:209
-#: lib/applicationeditform.php:361
+#. TRANS: Button label in the "Edit application" form.
+#: actions/accessadminpanel.php:203 actions/emailsettings.php:228
+#: actions/imsettings.php:187 actions/smssettings.php:209
+#: lib/applicationeditform.php:351
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Desa"
@@ -95,15 +97,15 @@ msgstr "No existeix la pÃ gina."
 
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #: actions/all.php:79 actions/allrss.php:68
-#: actions/apiaccountupdatedeliverydevice.php:114
-#: actions/apiaccountupdateprofile.php:105
-#: actions/apiaccountupdateprofilebackgroundimage.php:116
-#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
-#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
-#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:113
-#: actions/apigroupismember.php:91 actions/apigroupjoin.php:100
-#: actions/apigroupleave.php:100 actions/apigrouplist.php:73
-#: actions/apistatusesupdate.php:229 actions/apisubscriptions.php:87
+#: actions/apiaccountupdatedeliverydevice.php:115
+#: actions/apiaccountupdateprofile.php:106
+#: actions/apiaccountupdateprofilebackgroundimage.php:117
+#: actions/apiaccountupdateprofileimage.php:106 actions/apiblockcreate.php:98
+#: actions/apiblockdestroy.php:97 actions/apidirectmessage.php:77
+#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:114
+#: actions/apigroupismember.php:91 actions/apigroupjoin.php:101
+#: actions/apigroupleave.php:101 actions/apigrouplist.php:73
+#: actions/apistatusesupdate.php:230 actions/apisubscriptions.php:87
 #: actions/apitimelinefavorites.php:72 actions/apitimelinefriends.php:174
 #: actions/apitimelinehome.php:80 actions/apitimelinementions.php:80
 #: actions/apitimelineuser.php:82 actions/avatarbynickname.php:75
@@ -203,16 +205,16 @@ msgid "Updates from %1$s and friends on %2$s!"
 msgstr "Actualitzacions de %1$s i amics a %2$s!"
 
 #: actions/apiaccountratelimitstatus.php:72
-#: actions/apiaccountupdatedeliverydevice.php:94
-#: actions/apiaccountupdateprofile.php:97
-#: actions/apiaccountupdateprofilebackgroundimage.php:94
-#: actions/apiaccountupdateprofilecolors.php:118
+#: actions/apiaccountupdatedeliverydevice.php:95
+#: actions/apiaccountupdateprofile.php:98
+#: actions/apiaccountupdateprofilebackgroundimage.php:95
+#: actions/apiaccountupdateprofilecolors.php:119
 #: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156
-#: actions/apifavoritecreate.php:100 actions/apifavoritedestroy.php:101
-#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100
-#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:139
-#: actions/apigroupismember.php:115 actions/apigroupjoin.php:156
-#: actions/apigroupleave.php:142 actions/apigrouplist.php:137
+#: actions/apifavoritecreate.php:101 actions/apifavoritedestroy.php:102
+#: actions/apifriendshipscreate.php:101 actions/apifriendshipsdestroy.php:101
+#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:140
+#: actions/apigroupismember.php:115 actions/apigroupjoin.php:157
+#: actions/apigroupleave.php:143 actions/apigrouplist.php:137
 #: actions/apigrouplistall.php:122 actions/apigroupmembership.php:107
 #: actions/apigroupshow.php:116 actions/apihelptest.php:88
 #: actions/apistatusesdestroy.php:104 actions/apistatusesretweets.php:112
@@ -227,21 +229,23 @@ msgstr "Actualitzacions de %1$s i amics a %2$s!"
 msgid "API method not found."
 msgstr "No s'ha trobat el mÃ¨tode API!"
 
-#: actions/apiaccountupdatedeliverydevice.php:86
-#: actions/apiaccountupdateprofile.php:89
-#: actions/apiaccountupdateprofilebackgroundimage.php:86
-#: actions/apiaccountupdateprofilecolors.php:110
-#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89
-#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109
-#: actions/apifavoritecreate.php:91 actions/apifavoritedestroy.php:92
-#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
-#: actions/apigroupcreate.php:105 actions/apigroupjoin.php:92
-#: actions/apigroupleave.php:92 actions/apimediaupload.php:67
-#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:198
+#. TRANS: Client error message. POST is a HTTP command. It should not be translated.
+#. TRANS: Client error. POST is a HTTP command. It should not be translated.
+#: actions/apiaccountupdatedeliverydevice.php:87
+#: actions/apiaccountupdateprofile.php:90
+#: actions/apiaccountupdateprofilebackgroundimage.php:87
+#: actions/apiaccountupdateprofilecolors.php:111
+#: actions/apiaccountupdateprofileimage.php:85 actions/apiblockcreate.php:90
+#: actions/apiblockdestroy.php:89 actions/apidirectmessagenew.php:110
+#: actions/apifavoritecreate.php:92 actions/apifavoritedestroy.php:93
+#: actions/apifriendshipscreate.php:92 actions/apifriendshipsdestroy.php:92
+#: actions/apigroupcreate.php:106 actions/apigroupjoin.php:93
+#: actions/apigroupleave.php:93 actions/apimediaupload.php:68
+#: actions/apistatusesretweet.php:66 actions/apistatusesupdate.php:199
 msgid "This method requires a POST."
 msgstr "Aquest mÃ¨tode requereix POST."
 
-#: actions/apiaccountupdatedeliverydevice.php:106
+#: actions/apiaccountupdatedeliverydevice.php:107
 msgid ""
 "You must specify a parameter named 'device' with a value of one of: sms, im, "
 "none."
@@ -249,27 +253,27 @@ msgstr ""
 "Heu d'especificar un parÃ metre anomenat 'device' (dispositiu) amb un valor "
 "dels segÃ¼ents: sms, im, none (cap)"
 
-#: actions/apiaccountupdatedeliverydevice.php:133
+#: actions/apiaccountupdatedeliverydevice.php:134
 msgid "Could not update user."
 msgstr "No s'ha pogut actualitzar l'usuari."
 
-#: actions/apiaccountupdateprofile.php:112
-#: actions/apiaccountupdateprofilebackgroundimage.php:194
-#: actions/apiaccountupdateprofilecolors.php:185
-#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/apiaccountupdateprofile.php:113
+#: actions/apiaccountupdateprofilebackgroundimage.php:195
+#: actions/apiaccountupdateprofilecolors.php:186
+#: actions/apiaccountupdateprofileimage.php:131 actions/apiusershow.php:108
 #: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/hcard.php:74
 #: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
 #: lib/profileaction.php:84
 msgid "User has no profile."
 msgstr "L'usuari no tÃ© perfil."
 
-#: actions/apiaccountupdateprofile.php:147
+#: actions/apiaccountupdateprofile.php:148
 msgid "Could not save profile."
 msgstr "No s'ha pogut desar el perfil."
 
-#: actions/apiaccountupdateprofilebackgroundimage.php:108
-#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
-#: actions/apistatusesupdate.php:212 actions/avatarsettings.php:257
+#: actions/apiaccountupdateprofilebackgroundimage.php:109
+#: actions/apiaccountupdateprofileimage.php:98 actions/apimediaupload.php:81
+#: actions/apistatusesupdate.php:213 actions/avatarsettings.php:257
 #: actions/designadminpanel.php:123 actions/editapplication.php:118
 #: actions/newapplication.php:101 actions/newnotice.php:94
 #: lib/designsettings.php:283
@@ -281,30 +285,30 @@ msgstr ""
 "El servidor no ha pogut gestionar tantes dades POST (%s bytes) a causa de la "
 "configuraciÃ³ actual."
 
-#: actions/apiaccountupdateprofilebackgroundimage.php:136
-#: actions/apiaccountupdateprofilebackgroundimage.php:146
-#: actions/apiaccountupdateprofilecolors.php:164
-#: actions/apiaccountupdateprofilecolors.php:174
+#: actions/apiaccountupdateprofilebackgroundimage.php:137
+#: actions/apiaccountupdateprofilebackgroundimage.php:147
+#: actions/apiaccountupdateprofilecolors.php:165
+#: actions/apiaccountupdateprofilecolors.php:175
 #: actions/groupdesignsettings.php:290 actions/groupdesignsettings.php:300
 #: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
 #: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
 msgid "Unable to save your design settings."
 msgstr "No s'han pogut desar els parÃ metres de disseny."
 
-#: actions/apiaccountupdateprofilebackgroundimage.php:187
-#: actions/apiaccountupdateprofilecolors.php:142
+#: actions/apiaccountupdateprofilebackgroundimage.php:188
+#: actions/apiaccountupdateprofilecolors.php:143
 msgid "Could not update your design."
 msgstr "No s'ha pogut actualitzar el vostre disseny."
 
-#: actions/apiblockcreate.php:105
+#: actions/apiblockcreate.php:106
 msgid "You cannot block yourself!"
 msgstr "No podeu bloquejar-vos a vosaltres mateixos!"
 
-#: actions/apiblockcreate.php:126
+#: actions/apiblockcreate.php:127
 msgid "Block user failed."
 msgstr "Ha fallat el blocatge de l'usuari."
 
-#: actions/apiblockdestroy.php:114
+#: actions/apiblockdestroy.php:115
 msgid "Unblock user failed."
 msgstr "Ha fallat el desblocatge de l'usuari."
 
@@ -328,61 +332,61 @@ msgstr "Missatges directes a %s"
 msgid "All the direct messages sent to %s"
 msgstr "Tots els missatges directes enviats a %s"
 
-#: actions/apidirectmessagenew.php:118
+#: actions/apidirectmessagenew.php:119
 msgid "No message text!"
 msgstr "No hi ha text al missatge!"
 
-#: actions/apidirectmessagenew.php:127 actions/newmessage.php:150
+#: actions/apidirectmessagenew.php:128 actions/newmessage.php:150
 #, php-format
 msgid "That's too long. Max message size is %d chars."
 msgstr "Ãs massa llarg. La mida mÃ xima del missatge Ã©s %d carÃ cters."
 
-#: actions/apidirectmessagenew.php:138
+#: actions/apidirectmessagenew.php:139
 msgid "Recipient user not found."
 msgstr "No s'ha trobat l'usuari destinatari."
 
-#: actions/apidirectmessagenew.php:142
+#: actions/apidirectmessagenew.php:143
 msgid "Can't send direct messages to users who aren't your friend."
 msgstr ""
 "No es pot enviar missatges directes a usuaris que no siguin els vostres "
 "amics."
 
-#: actions/apifavoritecreate.php:109 actions/apifavoritedestroy.php:110
+#: actions/apifavoritecreate.php:110 actions/apifavoritedestroy.php:111
 #: actions/apistatusesdestroy.php:121
 msgid "No status found with that ID."
 msgstr "No s'ha trobat cap estat amb aquest ID."
 
-#: actions/apifavoritecreate.php:120
+#: actions/apifavoritecreate.php:121
 msgid "This status is already a favorite."
 msgstr "Aquest estat ja Ã©s un preferit."
 
 #. TRANS: Error message text shown when a favorite could not be set.
-#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:296
+#: actions/apifavoritecreate.php:132 actions/favor.php:84 lib/command.php:296
 msgid "Could not create favorite."
 msgstr "No es pot crear el preferit."
 
-#: actions/apifavoritedestroy.php:123
+#: actions/apifavoritedestroy.php:124
 msgid "That status is not a favorite."
 msgstr "L'estat no Ã©s un preferit."
 
-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
+#: actions/apifavoritedestroy.php:136 actions/disfavor.php:87
 msgid "Could not delete favorite."
 msgstr "No s'ha pogut eliminar el preferit."
 
-#: actions/apifriendshipscreate.php:109
+#: actions/apifriendshipscreate.php:110
 msgid "Could not follow user: profile not found."
 msgstr "No es pot deixar de seguir l'usuari: no s'ha trobat l'usuari."
 
-#: actions/apifriendshipscreate.php:118
+#: actions/apifriendshipscreate.php:119
 #, php-format
 msgid "Could not follow user: %s is already on your list."
 msgstr "No s'ha pogut seguir l'usuari: %s ja estÃ  a la vostra llista."
 
-#: actions/apifriendshipsdestroy.php:109
+#: actions/apifriendshipsdestroy.php:110
 msgid "Could not unfollow user: User not found."
 msgstr "No es pot deixar de seguir l'usuari: no s'ha trobat l'usuari."
 
-#: actions/apifriendshipsdestroy.php:120
+#: actions/apifriendshipsdestroy.php:121
 msgid "You cannot unfollow yourself."
 msgstr "No podeu deixar de seguir-vos a un mateix."
 
@@ -398,7 +402,7 @@ msgstr "No s'ha pogut determinar l'usuari d'origen."
 msgid "Could not find target user."
 msgstr "No s'ha pogut trobar l'usuari de destinaciÃ³."
 
-#: actions/apigroupcreate.php:167 actions/editgroup.php:186
+#: actions/apigroupcreate.php:168 actions/editgroup.php:186
 #: actions/newgroup.php:126 actions/profilesettings.php:215
 #: actions/register.php:212
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
@@ -406,95 +410,95 @@ msgstr ""
 "El sobrenom ha de tenir nomÃ©s lletres minÃºscules i nÃºmeros i no pot tenir "
 "espais."
 
-#: actions/apigroupcreate.php:176 actions/editgroup.php:190
+#: actions/apigroupcreate.php:177 actions/editgroup.php:190
 #: actions/newgroup.php:130 actions/profilesettings.php:238
 #: actions/register.php:215
 msgid "Nickname already in use. Try another one."
 msgstr "Aquest sobrenom ja existeix. Prova un altre. "
 
-#: actions/apigroupcreate.php:183 actions/editgroup.php:193
+#: actions/apigroupcreate.php:184 actions/editgroup.php:193
 #: actions/newgroup.php:133 actions/profilesettings.php:218
 #: actions/register.php:217
 msgid "Not a valid nickname."
 msgstr "Sobrenom no vÃ lid."
 
-#: actions/apigroupcreate.php:199 actions/editapplication.php:215
+#: actions/apigroupcreate.php:200 actions/editapplication.php:215
 #: actions/editgroup.php:199 actions/newapplication.php:203
 #: actions/newgroup.php:139 actions/profilesettings.php:222
 #: actions/register.php:224
 msgid "Homepage is not a valid URL."
 msgstr "La pÃ gina personal no Ã©s un URL vÃ lid."
 
-#: actions/apigroupcreate.php:208 actions/editgroup.php:202
+#: actions/apigroupcreate.php:209 actions/editgroup.php:202
 #: actions/newgroup.php:142 actions/profilesettings.php:225
 #: actions/register.php:227
 msgid "Full name is too long (max 255 chars)."
 msgstr "El vostre nom sencer Ã©s massa llarg (mÃ x. 255 carÃ cters)."
 
-#: actions/apigroupcreate.php:216 actions/editapplication.php:190
+#: actions/apigroupcreate.php:217 actions/editapplication.php:190
 #: actions/newapplication.php:172
 #, php-format
 msgid "Description is too long (max %d chars)."
 msgstr "La descripciÃ³ Ã©s massa llarga (mÃ x. %d carÃ cters)."
 
-#: actions/apigroupcreate.php:227 actions/editgroup.php:208
+#: actions/apigroupcreate.php:228 actions/editgroup.php:208
 #: actions/newgroup.php:148 actions/profilesettings.php:232
 #: actions/register.php:234
 msgid "Location is too long (max 255 chars)."
 msgstr "La ubicaciÃ³ Ã©s massa llarga (mÃ x. 255 carÃ cters)."
 
-#: actions/apigroupcreate.php:246 actions/editgroup.php:219
+#: actions/apigroupcreate.php:247 actions/editgroup.php:219
 #: actions/newgroup.php:159
 #, php-format
 msgid "Too many aliases! Maximum %d."
 msgstr "Hi ha massa Ã lies! MÃ xim %d."
 
-#: actions/apigroupcreate.php:267
+#: actions/apigroupcreate.php:268
 #, php-format
 msgid "Invalid alias: \"%s\"."
 msgstr "L'Ã lies no Ã©s vÃ lid: Â«%sÂ»."
 
-#: actions/apigroupcreate.php:276 actions/editgroup.php:232
+#: actions/apigroupcreate.php:277 actions/editgroup.php:232
 #: actions/newgroup.php:172
 #, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr "L'Ã lies Â«%sÂ» ja estÃ  en Ãºs. Proveu-ne un altre."
 
-#: actions/apigroupcreate.php:289 actions/editgroup.php:238
+#: actions/apigroupcreate.php:290 actions/editgroup.php:238
 #: actions/newgroup.php:178
 msgid "Alias can't be the same as nickname."
 msgstr "L'Ã lies no pot ser el mateix que el sobrenom."
 
-#: actions/apigroupismember.php:96 actions/apigroupjoin.php:105
-#: actions/apigroupleave.php:105 actions/apigroupmembership.php:92
+#: actions/apigroupismember.php:96 actions/apigroupjoin.php:106
+#: actions/apigroupleave.php:106 actions/apigroupmembership.php:92
 #: actions/apigroupshow.php:83 actions/apitimelinegroup.php:92
 msgid "Group not found."
 msgstr "No s'ha trobat el grup."
 
 #. TRANS: Error text shown a user tries to join a group they already are a member of.
-#: actions/apigroupjoin.php:111 actions/joingroup.php:100 lib/command.php:336
+#: actions/apigroupjoin.php:112 actions/joingroup.php:100 lib/command.php:336
 msgid "You are already a member of that group."
 msgstr "Ja sou membre del grup."
 
 #. TRANS: Error text shown when a user tries to join a group they are blocked from joining.
-#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:341
+#: actions/apigroupjoin.php:121 actions/joingroup.php:105 lib/command.php:341
 msgid "You have been blocked from that group by the admin."
 msgstr "L'administrador us ha blocat del grup."
 
 #. 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.
-#: actions/apigroupjoin.php:139 actions/joingroup.php:134 lib/command.php:353
+#: actions/apigroupjoin.php:140 actions/joingroup.php:134 lib/command.php:353
 #, 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."
 
-#: actions/apigroupleave.php:115
+#: actions/apigroupleave.php:116
 msgid "You are not a member of this group."
 msgstr "No sou un membre del grup."
 
 #. 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.
-#: actions/apigroupleave.php:125 actions/leavegroup.php:129
+#: actions/apigroupleave.php:126 actions/leavegroup.php:129
 #: lib/command.php:401
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
@@ -524,7 +528,7 @@ msgstr "%s grups"
 msgid "groups on %s"
 msgstr "grups sobre %s"
 
-#: actions/apimediaupload.php:99
+#: actions/apimediaupload.php:100
 msgid "Upload failed."
 msgstr "La pujada ha fallat."
 
@@ -538,9 +542,9 @@ msgstr "El testimoni no Ã©s vÃ lid."
 
 #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
 #: actions/deletenotice.php:169 actions/disfavor.php:74
-#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:55
+#: actions/emailsettings.php:271 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:66 actions/imsettings.php:227
+#: actions/groupunblock.php:66 actions/imsettings.php:230
 #: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
@@ -587,8 +591,8 @@ msgstr "S'ha denegat i revocat el testimoni de solÂ·licitud %s."
 #. 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:286 actions/grouplogo.php:322
-#: actions/imsettings.php:242 actions/newapplication.php:121
+#: actions/emailsettings.php:290 actions/grouplogo.php:322
+#: actions/imsettings.php:245 actions/newapplication.php:121
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
 #: actions/smssettings.php:277 lib/designsettings.php:304
 msgid "Unexpected form submission."
@@ -652,18 +656,18 @@ msgstr "Aquest mÃ¨tode requereix POST o DELETE."
 msgid "You may not delete another user's status."
 msgstr "No podeu eliminar l'estat d'un altre usuari."
 
-#: actions/apistatusesretweet.php:75 actions/apistatusesretweets.php:72
+#: actions/apistatusesretweet.php:76 actions/apistatusesretweets.php:72
 #: actions/deletenotice.php:52 actions/shownotice.php:92
 msgid "No such notice."
 msgstr "No existeix aquest avÃs."
 
 #. TRANS: Error text shown when trying to repeat an own notice.
-#: actions/apistatusesretweet.php:83 lib/command.php:538
+#: actions/apistatusesretweet.php:84 lib/command.php:538
 msgid "Cannot repeat your own notice."
 msgstr "No podeu repetir els vostres propis avisos."
 
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-#: actions/apistatusesretweet.php:91 lib/command.php:544
+#: actions/apistatusesretweet.php:92 lib/command.php:544
 msgid "Already repeated that notice."
 msgstr "AvÃs duplicat."
 
@@ -675,21 +679,21 @@ msgstr "S'ha eliminat l'estat."
 msgid "No status with that ID found."
 msgstr "No s'ha trobat cap estatus amb la ID trobada."
 
-#: actions/apistatusesupdate.php:221
+#: actions/apistatusesupdate.php:222
 msgid "Client must provide a 'status' parameter with a value."
 msgstr "El client ha de proporcionar un parÃ metre 'status' amb un valor."
 
-#: actions/apistatusesupdate.php:242 actions/newnotice.php:157
+#: actions/apistatusesupdate.php:243 actions/newnotice.php:157
 #: lib/mailhandler.php:60
 #, php-format
 msgid "That's too long. Max notice size is %d chars."
 msgstr "Massa llarg. La longitud mÃ xima Ã©s de %d carÃ cters."
 
-#: actions/apistatusesupdate.php:283 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:284 actions/apiusershow.php:96
 msgid "Not found."
 msgstr "No s'ha trobat."
 
-#: actions/apistatusesupdate.php:306 actions/newnotice.php:181
+#: actions/apistatusesupdate.php:307 actions/newnotice.php:181
 #, php-format
 msgid "Max notice size is %d chars, including attachment URL."
 msgstr "La mida mÃ xima de l'avÃs Ã©s %d carÃ cters, incloent l'URL de l'adjunt."
@@ -892,7 +896,9 @@ msgid "Yes"
 msgstr "SÃ"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
+#. TRANS: Submit button title.
+#. TRANS: Description of the form to block a user.
+#: actions/block.php:164 actions/groupmembers.php:403 lib/blockform.php:82
 msgid "Block this user"
 msgstr "Bloca aquest usuari"
 
@@ -934,11 +940,13 @@ msgstr "Una llista d'usuaris que han estat blocats d'afegir-se a aquest grup."
 msgid "Unblock user from group"
 msgstr "Desbloca l'usuari del grup"
 
-#: actions/blockedfromgroup.php:320 lib/unblockform.php:69
+#. TRANS: Title for the form to unblock a user.
+#: actions/blockedfromgroup.php:320 lib/unblockform.php:70
 msgid "Unblock"
 msgstr "Desbloca"
 
-#: actions/blockedfromgroup.php:320 lib/unblockform.php:80
+#. TRANS: Description of the form to unblock a user.
+#: actions/blockedfromgroup.php:320 lib/unblockform.php:82
 msgid "Unblock this user"
 msgstr "Desbloca l'usuari"
 
@@ -977,9 +985,9 @@ msgstr "Aquesta adreÃ§a ja ha estat confirmada."
 #. 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/confirmaddress.php:116 actions/emailsettings.php:331
+#: actions/emailsettings.php:477 actions/imsettings.php:283
+#: actions/imsettings.php:442 actions/othersettings.php:174
 #: actions/profilesettings.php:283 actions/smssettings.php:308
 #: actions/smssettings.php:464
 msgid "Couldn't update user."
@@ -987,7 +995,7 @@ msgstr "No s'ha pogut actualitzar l'usuari."
 
 #. 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/confirmaddress.php:128 actions/emailsettings.php:437
 #: actions/smssettings.php:422
 msgid "Couldn't delete email confirmation."
 msgstr "No s'ha pogut eliminar la confirmaciÃ³ de correu electrÃ²nic."
@@ -1023,9 +1031,10 @@ msgstr "No s'ha trobat l'aplicaciÃ³."
 msgid "You are not the owner of this application."
 msgstr "No sou el propietari d'aquesta aplicaciÃ³."
 
+#. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:127
 #: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1307
+#: lib/action.php:1315
 msgid "There was a problem with your session token."
 msgstr "S'ha produÃ¯t un problema amb el testimoni de la vostra sessiÃ³."
 
@@ -1059,7 +1068,7 @@ msgstr "Elimina aquesta aplicaciÃ³"
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
 #: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:73 lib/profileformaction.php:64
+#: lib/adminpanelaction.php:71 lib/profileformaction.php:64
 #: lib/settingsaction.php:72
 msgid "Not logged in."
 msgstr "No heu iniciat una sessiÃ³."
@@ -1122,7 +1131,6 @@ msgstr "Elimina l'usuari"
 #. TRANS: Message used as title for design settings for the site.
 #. TRANS: Link description in user account settings menu.
 #: actions/designadminpanel.php:63 lib/accountsettingsaction.php:139
-#: lib/groupnav.php:119
 msgid "Design"
 msgstr "Disseny"
 
@@ -1242,13 +1250,13 @@ msgstr "Restaura els dissenys per defecte"
 msgid "Reset back to default"
 msgstr "Torna a restaurar al valor per defecte"
 
-#. TRANS: Submit button title
+#. TRANS: Submit button title.
 #: actions/designadminpanel.php:685 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/snapshotadminpanel.php:245
 #: actions/subscriptions.php:226 actions/tagother.php:154
-#: actions/useradminpanel.php:294 lib/applicationeditform.php:363
+#: actions/useradminpanel.php:294 lib/applicationeditform.php:353
 #: lib/designsettings.php:256 lib/groupeditform.php:202
 msgid "Save"
 msgstr "Desa"
@@ -1404,7 +1412,7 @@ msgstr "AdreÃ§a electrÃ²nica confirmada actualment."
 #. 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/emailsettings.php:115 actions/emailsettings.php:162
 #: actions/imsettings.php:116 actions/smssettings.php:124
 #: actions/smssettings.php:180
 msgctxt "BUTTON"
@@ -1422,22 +1430,26 @@ msgstr ""
 #. 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
+#. TRANS: Button label in the "Edit application" form.
 #: actions/emailsettings.php:127 actions/imsettings.php:131
-#: actions/smssettings.php:137 lib/applicationeditform.php:357
+#: actions/smssettings.php:137 lib/applicationeditform.php:347
 msgctxt "BUTTON"
 msgid "Cancel"
 msgstr "CancelÂ·la"
 
-#. TRANS: Instructions for e-mail address input form.
-#: actions/emailsettings.php:135
+#. TRANS: Instructions for e-mail address input form. Do not translate
+#. TRANS: "example.org". It is one of the domain names reserved for
+#. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
+#. TRANS: Any other domain may be owned by a legitimate person or
+#. TRANS: organization.
+#: actions/emailsettings.php:139
 msgid "Email address, like \"UserName@example.org\""
 msgstr "AdreÃ§a electrÃ²nica, com ara Â«nomusuari@example.orgÂ»"
 
 #. 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/emailsettings.php:143 actions/imsettings.php:151
 #: actions/smssettings.php:162
 msgctxt "BUTTON"
 msgid "Add"
@@ -1445,112 +1457,112 @@ msgstr "Afegeix"
 
 #. 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
+#: actions/emailsettings.php:151 actions/smssettings.php:171
 msgid "Incoming email"
 msgstr "Correu electrÃ²nic entrant"
 
 #. 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
+#: actions/emailsettings.php:159 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 nous avisos."
 
 #. 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
+#: actions/emailsettings.php:168 actions/smssettings.php:186
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr "Estableix una nova adreÃ§a electrÃ²nica d'enviament; cancelÂ·la l'antiga."
 
 #. 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
+#: actions/emailsettings.php:172 actions/smssettings.php:189
 msgctxt "BUTTON"
 msgid "New"
 msgstr "Nou"
 
 #. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:174
+#: actions/emailsettings.php:178
 msgid "Email preferences"
 msgstr "PreferÃ¨ncies del correu electrÃ²nic"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:180
+#: actions/emailsettings.php:184
 msgid "Send me notices of new subscriptions through email."
 msgstr "Envia'm avisos per correu electrÃ²nic quan algÃº nou se'm subscrigui."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:186
+#: actions/emailsettings.php:190
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr ""
 "Envia'm un correu electrÃ²nic quan algÃº afegeixi un avÃs meu com a preferit."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:193
+#: actions/emailsettings.php:197
 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."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:199
+#: actions/emailsettings.php:203
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr "Envia'm un correu electrÃ²nic quan algÃº m'enviÃ¯ una resposta amb @."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:205
+#: actions/emailsettings.php:209
 msgid "Allow friends to nudge me and send me an email."
 msgstr ""
 "Permetre que els amics em cridin l'atenciÃ³ i m'enviÃ¯n un correu electrÃ²nic."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:212
+#: actions/emailsettings.php:216
 msgid "I want to post notices by email."
 msgstr "Vull publicar avisos amb el correu electrÃ²nic."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:219
+#: actions/emailsettings.php:223
 msgid "Publish a MicroID for my email address."
 msgstr "Publica una MicroID per al meu correu electrÃ²nic."
 
 #. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:334
+#: actions/emailsettings.php:338
 msgid "Email preferences saved."
 msgstr "S'han desat les preferÃ¨ncies del correu electrÃ²nic."
 
 #. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:353
+#: actions/emailsettings.php:357
 msgid "No email address."
 msgstr "No hi ha cap adreÃ§a electrÃ²nica."
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:361
+#: actions/emailsettings.php:365
 msgid "Cannot normalize that email address"
 msgstr "No es pot normalitzar l'adreÃ§a electrÃ²nica."
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:208
+#: actions/emailsettings.php:370 actions/register.php:208
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "AdreÃ§a de correu electrÃ²nic no vÃ lida."
 
 #. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:370
+#: actions/emailsettings.php:374
 msgid "That is already your email address."
 msgstr "Ja Ã©s la vostra adreÃ§a electrÃ²nica."
 
 #. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:374
+#: actions/emailsettings.php:378
 msgid "That email address already belongs to another user."
 msgstr "L'adreÃ§a electrÃ²nica ja pertany a un altre usuari."
 
 #. 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/emailsettings.php:395 actions/imsettings.php:351
 #: actions/smssettings.php:373
 msgid "Couldn't insert confirmation code."
 msgstr "No s'ha pogut inserir el codi de confirmaciÃ³."
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:398
+#: actions/emailsettings.php:402
 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."
@@ -1562,50 +1574,50 @@ msgstr ""
 #. 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/emailsettings.php:423 actions/imsettings.php:386
 #: actions/smssettings.php:408
 msgid "No pending confirmation to cancel."
 msgstr "Cap confirmaciÃ³ pendent per cancelÂ·lar."
 
 #. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:424
+#: actions/emailsettings.php:428
 msgid "That is the wrong email address."
 msgstr "Aquesta l'adreÃ§a de correu electrÃ²nic incorrecta."
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:438
+#: actions/emailsettings.php:442
 msgid "Email confirmation cancelled."
 msgstr "S'ha cancelÂ·lat la confirmaciÃ³ de correu electrÃ²nic."
 
 #. TRANS: Message given trying to remove an e-mail address that is not
 #. TRANS: registered for the active user.
-#: actions/emailsettings.php:458
+#: actions/emailsettings.php:462
 msgid "That is not your email address."
 msgstr "Aquest no Ã©s el teu correu electrÃ²nic"
 
 #. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:479
+#: actions/emailsettings.php:483
 msgid "The email address was removed."
 msgstr "S'ha eliminat l'adreÃ§a de correu electrÃ²nic."
 
-#: actions/emailsettings.php:493 actions/smssettings.php:568
+#: actions/emailsettings.php:497 actions/smssettings.php:568
 msgid "No incoming email address."
 msgstr "No hi ha cap direcciÃ³ de correu electrÃ²nic entrant."
 
 #. 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/emailsettings.php:508 actions/emailsettings.php:532
 #: 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."
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
-#: actions/emailsettings.php:508 actions/smssettings.php:581
+#: actions/emailsettings.php:512 actions/smssettings.php:581
 msgid "Incoming email address removed."
 msgstr "Eliminat el correu electrÃ²nic entrant."
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
-#: actions/emailsettings.php:532 actions/smssettings.php:605
+#: actions/emailsettings.php:536 actions/smssettings.php:605
 msgid "New incoming email address added."
 msgstr "Nou correu electrÃ²nic entrant afegit."
 
@@ -1724,7 +1736,7 @@ msgstr "No s'ha pogut convertir el testimoni de solÂ·licitud a un d'accÃ©s."
 msgid "Remote service uses unknown version of OMB protocol."
 msgstr "El servei remot utilitza una versiÃ³ desconeguda del protocol OMB."
 
-#: actions/finishremotesubscribe.php:138
+#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306
 msgid "Error updating remote profile."
 msgstr "S'ha produÃ¯t un error en actualitzar el perfil remot."
 
@@ -1781,7 +1793,7 @@ msgstr "L'usuari ja estÃ  blocat del grup."
 msgid "User is not a member of group."
 msgstr "L'usuari no Ã©s membre del grup."
 
-#: actions/groupblock.php:134 actions/groupmembers.php:360
+#: actions/groupblock.php:134 actions/groupmembers.php:364
 msgid "Block user from group"
 msgstr "Bloca l'usuari del grup"
 
@@ -1862,40 +1874,32 @@ msgstr "Logo actualitzat."
 msgid "Failed updating logo."
 msgstr "Error en actualitzar logo."
 
-#: actions/groupmembers.php:100 lib/groupnav.php:92
+#. TRANS: Title of the page showing group members.
+#. TRANS: %s is the name of the group.
+#: actions/groupmembers.php:102
 #, php-format
 msgid "%s group members"
 msgstr "%s membre/s en el grup"
 
-#: actions/groupmembers.php:103
+#. TRANS: Title of the page showing group members.
+#. TRANS: %1$s is the name of the group, %2$d is the page number of the members list.
+#: actions/groupmembers.php:107
 #, php-format
 msgid "%1$s group members, page %2$d"
 msgstr "%1$s membres del grup, pÃ gina %2$d"
 
-#: actions/groupmembers.php:118
+#: actions/groupmembers.php:122
 msgid "A list of the users in this group."
 msgstr "La llista dels usuaris d'aquest grup."
 
-#: actions/groupmembers.php:182 lib/groupnav.php:107
+#: actions/groupmembers.php:186
 msgid "Admin"
 msgstr "Admin"
 
-#: actions/groupmembers.php:392 lib/blockform.php:69
-msgid "Block"
-msgstr "Bloca"
-
-#: actions/groupmembers.php:487
+#: actions/groupmembers.php:498
 msgid "Make user an admin of the group"
 msgstr "Fes l'usuari un administrador del grup"
 
-#: actions/groupmembers.php:519
-msgid "Make Admin"
-msgstr "Fes-lo administrador"
-
-#: actions/groupmembers.php:519
-msgid "Make this user an admin"
-msgstr "Fes l'usuari administrador"
-
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Title in atom group notice feed. %s is a group name.
 #. TRANS: Title in atom user notice feed. %s is a user name.
@@ -2034,7 +2038,10 @@ msgstr ""
 
 #. TRANS: IM address input field instructions in IM settings form.
 #. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:140
+#. TRANS: Do not translate "example.org". It is one of the domain names reserved for use in examples by
+#. TRANS: http://www.rfc-editor.org/rfc/rfc2606.txt. Any other domain may be owned by a legitimate
+#. TRANS: person or organization.
+#: actions/imsettings.php:143
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -2045,65 +2052,65 @@ msgstr ""
 "missatgeria instantÃ nia o al GTalk."
 
 #. TRANS: Form legend for IM preferences form.
-#: actions/imsettings.php:155
+#: actions/imsettings.php:158
 msgid "IM preferences"
 msgstr "PreferÃ¨ncies de MI"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:160
+#: actions/imsettings.php:163
 msgid "Send me notices through Jabber/GTalk."
 msgstr "Envia'm avisos per Jabber/GTalk."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:166
+#: actions/imsettings.php:169
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr "Envia'm un avÃs quan el meu estat Jabber/GTalk canvii."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:172
+#: actions/imsettings.php:175
 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."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:179
+#: actions/imsettings.php:182
 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "Publica una MicroID per a la meva direcciÃ³ de Jabber/GTalk."
 
 #. TRANS: Confirmation message for successful IM preferences save.
-#: actions/imsettings.php:287 actions/othersettings.php:180
+#: actions/imsettings.php:290 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
+#: actions/imsettings.php:312
 msgid "No Jabber ID."
 msgstr "Cap Jabber ID."
 
 #. TRANS: Message given saving IM address that cannot be normalised.
-#: actions/imsettings.php:317
+#: actions/imsettings.php:320
 msgid "Cannot normalize that Jabber ID"
 msgstr "Impossible normalitzar aquest Jabber ID"
 
 #. TRANS: Message given saving IM address that not valid.
-#: actions/imsettings.php:322
+#: actions/imsettings.php:325
 msgid "Not a valid Jabber ID"
 msgstr "Jabber ID no vÃ lid"
 
 #. TRANS: Message given saving IM address that is already set.
-#: actions/imsettings.php:326
+#: actions/imsettings.php:329
 msgid "That is already your Jabber ID."
 msgstr "Aquest ja Ã©s el teu Jabber ID."
 
 #. TRANS: Message given saving IM address that is already set for another user.
-#: actions/imsettings.php:330
+#: actions/imsettings.php:333
 msgid "Jabber ID already belongs to another user."
 msgstr "Aquest Jabber ID ja estÃ  sent utilitzat per un altre usuari."
 
 #. 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
+#: actions/imsettings.php:361
 #, php-format
 msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
@@ -2113,28 +2120,28 @@ msgstr ""
 "heu afegit. Heu d'acceptar que %s us pugui enviar missatges."
 
 #. TRANS: Message given canceling IM address confirmation for the wrong IM address.
-#: actions/imsettings.php:388
+#: actions/imsettings.php:391
 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
+#: actions/imsettings.php:400
 msgid "Couldn't delete IM confirmation."
 msgstr "No s'ha pogut eliminar la confirmaciÃ³ de MI."
 
 #. TRANS: Message given after successfully canceling IM address confirmation.
-#: actions/imsettings.php:402
+#: actions/imsettings.php:405
 msgid "IM confirmation cancelled."
 msgstr "S'ha cancelÂ·lat la confirmaciÃ³ de MI."
 
 #. TRANS: Message given trying to remove an IM address that is not
 #. TRANS: registered for the active user.
-#: actions/imsettings.php:424
+#: actions/imsettings.php:427
 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
+#: actions/imsettings.php:450
 msgid "The IM address was removed."
 msgstr "S'ha eliminat l'adreÃ§a de MI."
 
@@ -2609,8 +2616,8 @@ msgid "Only %s URLs over plain HTTP please."
 msgstr "Si us plau, nomÃ©s URL %s sobre HTTP pla."
 
 #. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1215
-#: lib/apiaction.php:1243 lib/apiaction.php:1366
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1206
+#: lib/apiaction.php:1233 lib/apiaction.php:1356
 msgid "Not a supported data format."
 msgstr "Format de data no suportat."
 
@@ -2753,7 +2760,7 @@ msgid "Password saved."
 msgstr "Contrasenya guardada."
 
 #. TRANS: Menu item for site administration
-#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:384
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:371
 msgid "Paths"
 msgstr "Camins"
 
@@ -2967,7 +2974,7 @@ msgstr "Nom complet"
 
 #. TRANS: Form input field label.
 #: actions/profilesettings.php:115 actions/register.php:460
-#: lib/applicationeditform.php:244 lib/groupeditform.php:161
+#: lib/applicationeditform.php:235 lib/groupeditform.php:161
 msgid "Homepage"
 msgstr "PÃ gina personal"
 
@@ -3074,7 +3081,7 @@ msgid "Couldn't save tags."
 msgstr "No s'han pogut desar les etiquetes."
 
 #. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:391 lib/adminpanelaction.php:141
+#: actions/profilesettings.php:391 lib/adminpanelaction.php:138
 msgid "Settings saved."
 msgstr "S'ha desat la configuraciÃ³."
 
@@ -3615,7 +3622,7 @@ msgstr "L'usuari ja es troba en un entorn de proves."
 
 #. TRANS: Menu item for site administration
 #: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
-#: lib/adminpanelaction.php:392
+#: lib/adminpanelaction.php:379
 msgid "Sessions"
 msgstr "Sessions"
 
@@ -3653,24 +3660,24 @@ msgid "Application profile"
 msgstr "Perfil de l'aplicaciÃ³"
 
 #. TRANS: Form input field label for application icon.
-#: actions/showapplication.php:159 lib/applicationeditform.php:182
+#: actions/showapplication.php:159 lib/applicationeditform.php:173
 msgid "Icon"
 msgstr "Icona"
 
 #. TRANS: Form input field label for application name.
 #: actions/showapplication.php:169 actions/version.php:197
-#: lib/applicationeditform.php:199
+#: lib/applicationeditform.php:190
 msgid "Name"
 msgstr "Nom"
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:178 lib/applicationeditform.php:235
+#: actions/showapplication.php:178 lib/applicationeditform.php:226
 msgid "Organization"
 msgstr "OrganitzaciÃ³"
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:216 lib/groupeditform.php:172
+#: lib/applicationeditform.php:207 lib/groupeditform.php:172
 msgid "Description"
 msgstr "DescripciÃ³"
 
@@ -3784,7 +3791,7 @@ msgstr ""
 msgid "This is a way to share what you like."
 msgstr "Ãs una forma de compartir allÃ² que us agrada."
 
-#: actions/showgroup.php:82 lib/groupnav.php:86
+#: actions/showgroup.php:82
 #, php-format
 msgid "%s group"
 msgstr "%s grup"
@@ -3836,7 +3843,7 @@ msgstr "Canal d'avisos del grup %s (Atom)"
 msgid "FOAF for %s group"
 msgstr "Safata de sortida per %s"
 
-#: actions/showgroup.php:393 actions/showgroup.php:445 lib/groupnav.php:91
+#: actions/showgroup.php:393 actions/showgroup.php:445
 msgid "Members"
 msgstr "Membres"
 
@@ -4294,7 +4301,7 @@ msgstr "No s'ha introduÃ¯t cap codi"
 
 #. TRANS: Menu item for site administration
 #: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
-#: lib/adminpanelaction.php:408
+#: lib/adminpanelaction.php:395
 msgid "Snapshots"
 msgstr "InstantÃ nies"
 
@@ -5032,7 +5039,7 @@ msgid "Unable to save tag."
 msgstr "No s'ha pogut desar l'etiqueta."
 
 #. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#: classes/Subscription.php:75 lib/oauthstore.php:465
+#: classes/Subscription.php:75 lib/oauthstore.php:466
 msgid "You have been banned from subscribing."
 msgstr "Se us ha banejat la subscripciÃ³."
 
@@ -5180,7 +5187,8 @@ msgid "Change site configuration"
 msgstr "Canvia la configuraciÃ³ del lloc"
 
 #. TRANS: Main menu option when logged in and site admin for access to site configuration
-#: lib/action.php:474
+#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
+#: lib/action.php:474 lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr "Administrador"
@@ -5257,7 +5265,7 @@ msgstr "Cerca"
 
 #. TRANS: DT element for site notice. String is hidden in default CSS.
 #. TRANS: Menu item for site administration
-#: lib/action.php:538 lib/adminpanelaction.php:400
+#: lib/action.php:538 lib/adminpanelaction.php:387
 msgid "Site notice"
 msgstr "AvÃs del lloc"
 
@@ -5321,7 +5329,10 @@ msgid "StatusNet software license"
 msgstr "LlicÃ¨ncia del programari StatusNet"
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
-#: lib/action.php:843
+#. TRANS: Text between [] is a link description, text between () is the link itself.
+#. TRANS: Make sure there is no whitespace between "]" and "(".
+#. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
+#: lib/action.php:846
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -5331,13 +5342,16 @@ msgstr ""
 "site.broughtbyurl%%)."
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:846
+#: lib/action.php:849
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** Ã©s un servei de microblogging."
 
 #. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.
-#: lib/action.php:850
+#. TRANS: Make sure there is no whitespace between "]" and "(".
+#. TRANS: Text between [] is a link description, text between () is the link itself.
+#. TRANS: %s is the version of StatusNet that is being used.
+#: lib/action.php:856
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -5349,34 +5363,35 @@ msgstr ""
 "org/licensing/licenses/agpl-3.0.html)."
 
 #. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:866
+#: lib/action.php:872
 msgid "Site content license"
 msgstr "LlicÃ¨ncia de contingut del lloc"
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:873
+#: lib/action.php:879
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr "El contingut i les dades de %1$s sÃ³n privades i confidencials."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:880
+#: lib/action.php:886
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
 "El contingut i les dades sÃ³n copyright de %1$s. Tots els drets reservats."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:884
+#: lib/action.php:890
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 "El contingut i les dades sÃ³n copyright dels colÂ·laboradors. Tots els drets "
 "reservats."
 
-#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:897
+#. TRANS: license message in footer.
+#. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
+#: lib/action.php:904
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr ""
@@ -5384,19 +5399,19 @@ msgstr ""
 "llicÃ¨ncia %2$s."
 
 #. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1236
+#: lib/action.php:1243
 msgid "Pagination"
 msgstr "PaginaciÃ³"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1247
+#: lib/action.php:1254
 msgid "After"
 msgstr "Posteriors"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1257
+#: lib/action.php:1264
 msgid "Before"
 msgstr "Anteriors"
 
@@ -5407,208 +5422,227 @@ msgstr ""
 "S'esperava un element del canal arrel, perÃ² se n'ha obtingut tot un document "
 "XML sencer."
 
-#: lib/activityutils.php:208
+#. TRANS: Client exception thrown when there is no source attribute.
+#: lib/activityutils.php:203
 msgid "Can't handle remote content yet."
 msgstr "No es pot gestionar el contingut remot encara."
 
-#: lib/activityutils.php:244
+#. TRANS: Client exception thrown when there embedded XML content is found that cannot be processed yet.
+#: lib/activityutils.php:240
 msgid "Can't handle embedded XML content yet."
 msgstr "No es pot gestionar el contingut XML incrustat encara."
 
-#: lib/activityutils.php:248
+#. TRANS: Client exception thrown when base64 encoded content is found that cannot be processed yet.
+#: lib/activityutils.php:245
 msgid "Can't handle embedded Base64 content yet."
 msgstr "No es pot gestionar el contingut Base64 incrustat encara."
 
 #. TRANS: Client error message thrown when a user tries to change admin settings but has no access rights.
-#: lib/adminpanelaction.php:98
+#: lib/adminpanelaction.php:96
 msgid "You cannot make changes to this site."
 msgstr "No podeu fer canvis al lloc."
 
 #. TRANS: Client error message throw when a certain panel's settings cannot be changed.
-#: lib/adminpanelaction.php:110
+#: lib/adminpanelaction.php:108
 msgid "Changes to that panel are not allowed."
 msgstr "No es permeten canvis a aquell tauler."
 
 #. TRANS: Client error message.
-#: lib/adminpanelaction.php:229
+#: lib/adminpanelaction.php:222
 msgid "showForm() not implemented."
 msgstr "El showForm() no estÃ  implementat."
 
 #. TRANS: Client error message
-#: lib/adminpanelaction.php:259
+#: lib/adminpanelaction.php:250
 msgid "saveSettings() not implemented."
 msgstr "El saveSettings() no estÃ  implementat."
 
 #. TRANS: Client error message thrown if design settings could not be deleted in
 #. TRANS: the admin panel Design.
-#: lib/adminpanelaction.php:284
+#: lib/adminpanelaction.php:274
 msgid "Unable to delete design setting."
 msgstr "No s'ha pogut eliminar el parÃ metre de disseny."
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:350
+#: lib/adminpanelaction.php:337
 msgid "Basic site configuration"
 msgstr "ConfiguraciÃ³ bÃ sica del lloc"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:352
+#: lib/adminpanelaction.php:339
 msgctxt "MENU"
 msgid "Site"
 msgstr "Lloc"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:358
+#: lib/adminpanelaction.php:345
 msgid "Design configuration"
 msgstr "ConfiguraciÃ³ del disseny"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:360
+#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
+#: lib/adminpanelaction.php:347 lib/groupnav.php:135
 msgctxt "MENU"
 msgid "Design"
 msgstr "Disseny"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:366
+#: lib/adminpanelaction.php:353
 msgid "User configuration"
 msgstr "ConfiguraciÃ³ de l'usuari"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:368 lib/personalgroupnav.php:115
+#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:115
 msgid "User"
 msgstr "Usuari"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:374
+#: lib/adminpanelaction.php:361
 msgid "Access configuration"
 msgstr "ConfiguraciÃ³ de l'accÃ©s"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:382
+#: lib/adminpanelaction.php:369
 msgid "Paths configuration"
 msgstr "ConfiguraciÃ³ dels camins"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:390
+#: lib/adminpanelaction.php:377
 msgid "Sessions configuration"
 msgstr "ConfiguraciÃ³ de les sessions"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:398
+#: lib/adminpanelaction.php:385
 msgid "Edit site notice"
 msgstr "Edita l'avÃs del lloc"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:406
+#: lib/adminpanelaction.php:393
 msgid "Snapshots configuration"
 msgstr "ConfiguraciÃ³ de les instantÃ nies"
 
 #. TRANS: Client error 401.
-#: lib/apiauth.php:113
+#: lib/apiauth.php:111
 msgid "API resource requires read-write access, but you only have read access."
 msgstr ""
 "El recurs API requereix accÃ©s de lectura i d'escriptura, perÃ² nomÃ©s en teniu "
 "de lectura."
 
+#. TRANS: OAuth exception thrown when no application is found for a given consumer key.
+#: lib/apiauth.php:175
+msgid "No application for that consumer key."
+msgstr ""
+
+#. TRANS: OAuth exception given when no user was found for a given token (no token was found).
+#: lib/apiauth.php:217
+msgid "No user for that token."
+msgstr ""
+
+#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
+#: lib/apioauthstore.php:178
+msgid "Tried to revoke unknown token"
+msgstr ""
+
 #. TRANS: Form legend.
-#: lib/applicationeditform.php:137
+#: lib/applicationeditform.php:129
 msgid "Edit application"
 msgstr "Edita l'aplicaciÃ³"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:187
+#: lib/applicationeditform.php:178
 msgid "Icon for this application"
 msgstr "Icona de l'aplicaciÃ³"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:209
+#: lib/applicationeditform.php:200
 #, php-format
 msgid "Describe your application in %d characters"
 msgstr "Descriviu la vostra aplicaciÃ³ en %d carÃ cters"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:213
+#: lib/applicationeditform.php:204
 msgid "Describe your application"
 msgstr "Descriviu la vostra aplicaciÃ³"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:224
+#: lib/applicationeditform.php:215
 msgid "URL of the homepage of this application"
 msgstr "URL de la pÃ gina d'inici de l'aplicaciÃ³"
 
 #. TRANS: Form input field label.
-#: lib/applicationeditform.php:226
+#: lib/applicationeditform.php:217
 msgid "Source URL"
 msgstr "URL d'origen"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:233
+#: lib/applicationeditform.php:224
 msgid "Organization responsible for this application"
 msgstr "OrganitzaciÃ³ responsable de l'aplicaciÃ³"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:242
+#: lib/applicationeditform.php:233
 msgid "URL for the homepage of the organization"
 msgstr "L'URL de la pÃ gina d'inici de l'organitzaciÃ³"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:251
+#: lib/applicationeditform.php:242
 msgid "URL to redirect to after authentication"
 msgstr "URL on redirigir-hi desprÃ©s de l'autenticaciÃ³."
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:278
+#: lib/applicationeditform.php:269
 msgid "Browser"
 msgstr "Navegador"
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:295
+#: lib/applicationeditform.php:286
 msgid "Desktop"
 msgstr "Escriptori"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:297
+#: lib/applicationeditform.php:288
 msgid "Type of application, browser or desktop"
 msgstr "Tipus d'aplicaciÃ³, navegador o escriptori"
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:320
+#: lib/applicationeditform.php:311
 msgid "Read-only"
 msgstr "NomÃ©s lectura"
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:339
+#: lib/applicationeditform.php:330
 msgid "Read-write"
 msgstr "Lectura i escriptura"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:341
+#: lib/applicationeditform.php:332
 msgid "Default access for this application: read-only, or read-write"
 msgstr ""
 "AccÃ©s per defecte per a l'aplicaciÃ³: nomÃ©s lectura, o lectura i escriptura"
 
-#. TRANS: Submit button title
-#: lib/applicationeditform.php:359
+#. TRANS: Submit button title.
+#: lib/applicationeditform.php:349
 msgid "Cancel"
 msgstr "CancelÂ·la"
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:136
+#: lib/applicationlist.php:135
 msgid "read-write"
 msgstr "de lectura i d'escriptura"
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:138
+#: lib/applicationlist.php:137
 msgid "read-only"
 msgstr "nomÃ©s de lectura"
 
 #. 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
+#: lib/applicationlist.php:143
 #, php-format
 msgid "Approved %1$s - \"%2$s\" access."
 msgstr "Aprovat: %1$s - accÃ©s Â«%2$sÂ»."
 
 #. TRANS: Button label
-#: lib/applicationlist.php:159
+#: lib/applicationlist.php:158
 msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "Revoca"
@@ -5628,11 +5662,13 @@ msgstr "Autoria"
 msgid "Provider"
 msgstr "ProveÃ¯dor"
 
-#: lib/attachmentnoticesection.php:67
+#. TRANS: Title.
+#: lib/attachmentnoticesection.php:68
 msgid "Notices where this attachment appears"
 msgstr "Avisos on apareix l'adjunt"
 
-#: lib/attachmenttagcloudsection.php:48
+#. TRANS: Title.
+#: lib/attachmenttagcloudsection.php:49
 msgid "Tags for this attachment"
 msgstr "Etiquetes de l'adjunciÃ³"
 
@@ -5644,6 +5680,11 @@ msgstr "El canvi de contrasenya ha fallat"
 msgid "Password changing is not allowed"
 msgstr "No es permet el canvi de contrasenya"
 
+#. TRANS: Title for the form to block a user.
+#: lib/blockform.php:70
+msgid "Block"
+msgstr "Bloca"
+
 #: lib/channel.php:157 lib/channel.php:177
 msgid "Command results"
 msgstr "Resultats de les comandes"
@@ -5895,7 +5936,7 @@ msgid "You are not subscribed to anyone."
 msgstr "No esteu subscrit a ningÃº."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to.
-#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.
 #: lib/command.php:836
 msgid "You are subscribed to this person:"
@@ -5910,7 +5951,7 @@ msgid "No one is subscribed to you."
 msgstr "NingÃº no us ha subscrit."
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
-#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
 #: lib/command.php:863
 msgid "This person is subscribed to you:"
@@ -5925,7 +5966,7 @@ msgid "You are not a member of any groups."
 msgstr "No sou membre de cap grup."
 
 #. TRANS: Text shown after requesting groups a user is subscribed to.
-#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
 #: lib/command.php:890
 msgid "You are a member of this group:"
@@ -5933,6 +5974,7 @@ 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:"
 
+#. TRANS: Help text for commands.
 #: lib/command.php:905
 msgid ""
 "Commands:\n"
@@ -6153,38 +6195,6 @@ msgstr ""
 msgid "Extra nicknames for the group, comma- or space- separated, max %d"
 msgstr "Sobrenoms addicionals del grup, separats amb comes o espais, mÃ x. %d"
 
-#: lib/groupnav.php:85
-msgid "Group"
-msgstr "Grup"
-
-#: lib/groupnav.php:101
-msgid "Blocked"
-msgstr "Blocat"
-
-#: lib/groupnav.php:102
-#, php-format
-msgid "%s blocked users"
-msgstr "%s usuaris blocats"
-
-#: lib/groupnav.php:108
-#, php-format
-msgid "Edit %s group properties"
-msgstr "Edita les propietats del grup %s"
-
-#: lib/groupnav.php:113
-msgid "Logo"
-msgstr "Logo"
-
-#: lib/groupnav.php:114
-#, php-format
-msgid "Add or edit %s logo"
-msgstr "Afegeix o edita el logo %s"
-
-#: lib/groupnav.php:120
-#, php-format
-msgid "Add or edit %s design"
-msgstr "Afegeix o edita el disseny %s"
-
 #: lib/groupsbymemberssection.php:71
 msgid "Groups with most members"
 msgstr "Grups amb mÃ©s membres"
@@ -6216,7 +6226,8 @@ msgstr "La mida del fitxer Ã©s massa gran, La mida mÃ xima Ã©s %s."
 msgid "Partial upload."
 msgstr "CÃ rrega parcial."
 
-#: lib/imagefile.php:101 lib/mediafile.php:170
+#. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
+#: lib/imagefile.php:101 lib/mediafile.php:179
 msgid "System error uploading file."
 msgstr "Error del sistema en pujar el fitxer."
 
@@ -6618,19 +6629,22 @@ msgstr "Ho sentim, no s'hi permet correu d'entrada."
 msgid "Unsupported message type: %s"
 msgstr "Tipus de missatge no permÃ¨s: %s"
 
-#: lib/mediafile.php:98 lib/mediafile.php:123
+#. TRANS: Client exception thrown when a database error was thrown during a file upload operation.
+#: lib/mediafile.php:99 lib/mediafile.php:125
 msgid "There was a database error while saving your file. Please try again."
 msgstr ""
 "S'ha produÃ¯t un error a la base de dades mentre es desava el vostre fitxer. "
 "Torneu-ho a provar."
 
-#: lib/mediafile.php:142
+#. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
+#: lib/mediafile.php:145
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
 msgstr ""
 "El fitxer pujat excedeix la mida de la directiva upload_max_filesize del php."
 "ini."
 
-#: lib/mediafile.php:147
+#. TRANS: Client exception.
+#: lib/mediafile.php:151
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form."
@@ -6638,44 +6652,43 @@ msgstr ""
 "El fitxer pujat excedeix la mida de la directiva MAX_FILE_SIZE especificada "
 "en el formulari HTML."
 
-#: lib/mediafile.php:152
+#. TRANS: Client exception.
+#: lib/mediafile.php:157
 msgid "The uploaded file was only partially uploaded."
 msgstr "El fitxer pujat nomÃ©s s'ha pujat parcialment."
 
-#: lib/mediafile.php:159
+#. TRANS: Client exception thrown when a temporary folder is not present to store a file upload.
+#: lib/mediafile.php:165
 msgid "Missing a temporary folder."
 msgstr "Manca una carpeta temporal."
 
-#: lib/mediafile.php:162
+#. TRANS: Client exception thrown when writing to disk is not possible during a file upload operation.
+#: lib/mediafile.php:169
 msgid "Failed to write file to disk."
 msgstr "No s'ha pogut escriure el fitxer al disc."
 
-#: lib/mediafile.php:165
+#. TRANS: Client exception thrown when a file upload operation has been stopped by an extension.
+#: lib/mediafile.php:173
 msgid "File upload stopped by extension."
 msgstr "L'extensiÃ³ ha aturat la cÃ rrega del fitxer."
 
-#: lib/mediafile.php:179 lib/mediafile.php:217
+#. TRANS: Client exception thrown when a file upload operation would cause a user to exceed a set quota.
+#: lib/mediafile.php:189 lib/mediafile.php:232
 msgid "File exceeds user's quota."
 msgstr "El fitxer excedeix la quota de l'usuari."
 
-#: lib/mediafile.php:197 lib/mediafile.php:234
+#. TRANS: Client exception thrown when a file upload operation fails because the file could
+#. TRANS: not be moved from the temporary folder to the permanent file location.
+#: lib/mediafile.php:209 lib/mediafile.php:251
 msgid "File could not be moved to destination directory."
 msgstr "No s'ha pogut moure el fitxer al directori de destinaciÃ³."
 
-#: lib/mediafile.php:202 lib/mediafile.php:238
+#. TRANS: Client exception thrown when a file upload operation has been stopped because the MIME
+#. TRANS: type of the uploaded file could not be determined.
+#: lib/mediafile.php:216 lib/mediafile.php:257
 msgid "Could not determine file's MIME type."
 msgstr "No s'ha pogut determinar el tipus MIME del fitxer."
 
-#: lib/mediafile.php:318
-#, php-format
-msgid " Try using another %s format."
-msgstr "Proveu d'emprar un altre format %s."
-
-#: lib/mediafile.php:323
-#, php-format
-msgid "%s is not a supported file type on this server."
-msgstr "%s no Ã©s un tipus de fitxer permÃ¨s al servidor."
-
 #: lib/messageform.php:120
 msgid "Send a direct notice"
 msgstr "Envia un avÃs directe"
@@ -6791,27 +6804,7 @@ msgstr "Crida l'atenciÃ³"
 msgid "Send a nudge to this user"
 msgstr "Crida l'atenciÃ³ a l'usuari"
 
-#: lib/oauthstore.php:283
-msgid "Error inserting new profile"
-msgstr "Error en inserir el nou perfil"
-
-#: lib/oauthstore.php:291
-msgid "Error inserting avatar"
-msgstr "Error en inserir avatar"
-
-#: lib/oauthstore.php:306
-msgid "Error updating remote profile"
-msgstr "Error en actualitzar el perfil remot"
-
-#: lib/oauthstore.php:311
-msgid "Error inserting remote profile"
-msgstr "Error en inserir perfil remot"
-
-#: lib/oauthstore.php:345
-msgid "Duplicate notice"
-msgstr "Duplica l'avÃs"
-
-#: lib/oauthstore.php:490
+#: lib/oauthstore.php:491
 msgid "Couldn't insert new subscription."
 msgstr "No s'ha pogut inserir una nova subscripciÃ³."
 
@@ -6848,7 +6841,8 @@ msgstr "Els teus missatges enviats"
 msgid "Tags in %s's notices"
 msgstr "Etiquetes en els avisos de %s"
 
-#: lib/plugin.php:115
+#. TRANS: Displayed as version information for a plugin if no version information was found.
+#: lib/plugin.php:116
 msgid "Unknown"
 msgstr "Desconegut"
 
@@ -6942,19 +6936,19 @@ msgstr "Entorn de proves"
 msgid "Sandbox this user"
 msgstr "Posa l'usuari a l'entorn de proves"
 
-#: lib/searchaction.php:120
+#. TRANS: Fieldset legend for the search form.
+#: lib/searchaction.php:121
 msgid "Search site"
 msgstr "Cerca al lloc"
 
-#: lib/searchaction.php:126
+#. TRANS: Used as a field label for the field where one or more keywords
+#. TRANS: for searching can be entered.
+#: lib/searchaction.php:129
 msgid "Keyword(s)"
 msgstr "Paraules clau"
 
-#: lib/searchaction.php:127
-msgid "Search"
-msgstr "Cerca"
-
-#: lib/searchaction.php:162
+#. TRANS: Definition list item with instructions on how to get (better) search results.
+#: lib/searchaction.php:170
 msgid "Search help"
 msgstr "Ajuda de la cerca"
 
@@ -7152,56 +7146,32 @@ msgid "Moderator"
 msgstr "Moderador"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1102
+#: lib/util.php:1103
 msgid "a few seconds ago"
 msgstr "fa pocs segons"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1105
+#: lib/util.php:1106
 msgid "about a minute ago"
 msgstr "fa un minut"
 
-#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1109
-#, php-format
-msgid "about %d minutes ago"
-msgstr "fa %d minuts"
-
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 #: lib/util.php:1112
 msgid "about an hour ago"
 msgstr "fa una hora"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1116
-#, php-format
-msgid "about %d hours ago"
-msgstr "fa %d hores"
-
-#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1119
+#: lib/util.php:1118
 msgid "about a day ago"
 msgstr "fa un dia"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1123
-#, php-format
-msgid "about %d days ago"
-msgstr "fa %d dies"
-
-#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1126
+#: lib/util.php:1124
 msgid "about a month ago"
 msgstr "fa un mes"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 #: lib/util.php:1130
-#, php-format
-msgid "about %d months ago"
-msgstr "fa %d mesos"
-
-#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1133
 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 e5baa2ff50..f01a064290 100644
--- a/locale/cs/LC_MESSAGES/statusnet.po
+++ b/locale/cs/LC_MESSAGES/statusnet.po
@@ -1,7 +1,8 @@
-# Translation of StatusNet to Czech
+# Translation of StatusNet to Czech (Äesky)
+# Expored from translatewiki.net
 #
-# Author@translatewiki.net: Koo6
-# Author@translatewiki.net: Kuvaly
+# Author: Koo6
+# Author: Kuvaly
 # --
 # This file is distributed under the same license as the StatusNet package.
 #
@@ -9,20 +10,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-08 22:33+0000\n"
-"PO-Revision-Date: 2010-09-09 18:08:09+0000\n"
-"Language-Team: Czech\n"
+"POT-Creation-Date: 2010-09-14 19:53+0000\n"
+"PO-Revision-Date: 2010-09-14 19:53:45+0000\n"
+"Language-Team: Czech <http://translatewiki.net/wiki/Portal:cs>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r72348); Translate extension (2010-08-20)\n"
+"X-Generator: MediaWiki 1.17alpha (r73009); Translate extension (2010-08-20)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: cs\n"
-"X-Message-Group: out-statusnet\n"
-"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n< =4) ? 1 : 2 ;\n"
+"X-Message-Group: #out-statusnet\n"
+"Plural-Forms: nplurals=3; plural=(n == 1) ? 0 : ( (n >= 2 && n <= 4) ? 1 : "
+"2 );\n"
+"X-POT-Import-Date: 1284-49-16 34::+0000\n"
 
 #. TRANS: Page title
 #. TRANS: Menu item for site administration
-#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:376
+#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:363
 msgid "Access"
 msgstr "PÅÃstup"
 
@@ -75,10 +78,10 @@ msgstr "uloÅ¾it nastavenÃ pÅÃstupu"
 #. 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 actions/emailsettings.php:224
-#: actions/imsettings.php:184 actions/smssettings.php:209
-#: lib/applicationeditform.php:361
+#. TRANS: Button label in the "Edit application" form.
+#: actions/accessadminpanel.php:203 actions/emailsettings.php:228
+#: actions/imsettings.php:187 actions/smssettings.php:209
+#: lib/applicationeditform.php:351
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "UloÅ¾it"
@@ -91,15 +94,15 @@ msgstr "Tady Å¾Ã¡dnÃ¡ takovÃ¡ strÃ¡nka nenÃ."
 
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #: actions/all.php:79 actions/allrss.php:68
-#: actions/apiaccountupdatedeliverydevice.php:114
-#: actions/apiaccountupdateprofile.php:105
-#: actions/apiaccountupdateprofilebackgroundimage.php:116
-#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
-#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
-#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:113
-#: actions/apigroupismember.php:91 actions/apigroupjoin.php:100
-#: actions/apigroupleave.php:100 actions/apigrouplist.php:73
-#: actions/apistatusesupdate.php:229 actions/apisubscriptions.php:87
+#: actions/apiaccountupdatedeliverydevice.php:115
+#: actions/apiaccountupdateprofile.php:106
+#: actions/apiaccountupdateprofilebackgroundimage.php:117
+#: actions/apiaccountupdateprofileimage.php:106 actions/apiblockcreate.php:98
+#: actions/apiblockdestroy.php:97 actions/apidirectmessage.php:77
+#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:114
+#: actions/apigroupismember.php:91 actions/apigroupjoin.php:101
+#: actions/apigroupleave.php:101 actions/apigrouplist.php:73
+#: actions/apistatusesupdate.php:230 actions/apisubscriptions.php:87
 #: actions/apitimelinefavorites.php:72 actions/apitimelinefriends.php:174
 #: actions/apitimelinehome.php:80 actions/apitimelinementions.php:80
 #: actions/apitimelineuser.php:82 actions/avatarbynickname.php:75
@@ -188,7 +191,7 @@ msgstr ""
 #. TRANS: H1 text
 #: actions/all.php:182
 msgid "You and friends"
-msgstr "%s a pÅÃ¡telÃ©"
+msgstr "Vy a pÅÃ¡telÃ©"
 
 #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
 #. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name.
@@ -199,16 +202,16 @@ msgid "Updates from %1$s and friends on %2$s!"
 msgstr "Novinky od uÅ¾ivatele %1$s a pÅÃ¡tel na %2$s!"
 
 #: actions/apiaccountratelimitstatus.php:72
-#: actions/apiaccountupdatedeliverydevice.php:94
-#: actions/apiaccountupdateprofile.php:97
-#: actions/apiaccountupdateprofilebackgroundimage.php:94
-#: actions/apiaccountupdateprofilecolors.php:118
+#: actions/apiaccountupdatedeliverydevice.php:95
+#: actions/apiaccountupdateprofile.php:98
+#: actions/apiaccountupdateprofilebackgroundimage.php:95
+#: actions/apiaccountupdateprofilecolors.php:119
 #: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156
-#: actions/apifavoritecreate.php:100 actions/apifavoritedestroy.php:101
-#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100
-#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:139
-#: actions/apigroupismember.php:115 actions/apigroupjoin.php:156
-#: actions/apigroupleave.php:142 actions/apigrouplist.php:137
+#: actions/apifavoritecreate.php:101 actions/apifavoritedestroy.php:102
+#: actions/apifriendshipscreate.php:101 actions/apifriendshipsdestroy.php:101
+#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:140
+#: actions/apigroupismember.php:115 actions/apigroupjoin.php:157
+#: actions/apigroupleave.php:143 actions/apigrouplist.php:137
 #: actions/apigrouplistall.php:122 actions/apigroupmembership.php:107
 #: actions/apigroupshow.php:116 actions/apihelptest.php:88
 #: actions/apistatusesdestroy.php:104 actions/apistatusesretweets.php:112
@@ -223,48 +226,50 @@ msgstr "Novinky od uÅ¾ivatele %1$s a pÅÃ¡tel na %2$s!"
 msgid "API method not found."
 msgstr " API metoda nebyla nalezena."
 
-#: actions/apiaccountupdatedeliverydevice.php:86
-#: actions/apiaccountupdateprofile.php:89
-#: actions/apiaccountupdateprofilebackgroundimage.php:86
-#: actions/apiaccountupdateprofilecolors.php:110
-#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89
-#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109
-#: actions/apifavoritecreate.php:91 actions/apifavoritedestroy.php:92
-#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
-#: actions/apigroupcreate.php:105 actions/apigroupjoin.php:92
-#: actions/apigroupleave.php:92 actions/apimediaupload.php:67
-#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:198
+#. TRANS: Client error message. POST is a HTTP command. It should not be translated.
+#. TRANS: Client error. POST is a HTTP command. It should not be translated.
+#: actions/apiaccountupdatedeliverydevice.php:87
+#: actions/apiaccountupdateprofile.php:90
+#: actions/apiaccountupdateprofilebackgroundimage.php:87
+#: actions/apiaccountupdateprofilecolors.php:111
+#: actions/apiaccountupdateprofileimage.php:85 actions/apiblockcreate.php:90
+#: actions/apiblockdestroy.php:89 actions/apidirectmessagenew.php:110
+#: actions/apifavoritecreate.php:92 actions/apifavoritedestroy.php:93
+#: actions/apifriendshipscreate.php:92 actions/apifriendshipsdestroy.php:92
+#: actions/apigroupcreate.php:106 actions/apigroupjoin.php:93
+#: actions/apigroupleave.php:93 actions/apimediaupload.php:68
+#: actions/apistatusesretweet.php:66 actions/apistatusesupdate.php:199
 msgid "This method requires a POST."
 msgstr "Tato metoda vyÅ¾aduje POST."
 
-#: actions/apiaccountupdatedeliverydevice.php:106
+#: actions/apiaccountupdatedeliverydevice.php:107
 msgid ""
 "You must specify a parameter named 'device' with a value of one of: sms, im, "
 "none."
 msgstr ""
 "Je nutnÃ© zadat parametr s nÃ¡zvem 'device' s jednou z hodnot: sms, im, none."
 
-#: actions/apiaccountupdatedeliverydevice.php:133
+#: actions/apiaccountupdatedeliverydevice.php:134
 msgid "Could not update user."
 msgstr "NepodaÅilo se aktualizovat nastavenÃ uÅ¾ivatele"
 
-#: actions/apiaccountupdateprofile.php:112
-#: actions/apiaccountupdateprofilebackgroundimage.php:194
-#: actions/apiaccountupdateprofilecolors.php:185
-#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/apiaccountupdateprofile.php:113
+#: actions/apiaccountupdateprofilebackgroundimage.php:195
+#: actions/apiaccountupdateprofilecolors.php:186
+#: actions/apiaccountupdateprofileimage.php:131 actions/apiusershow.php:108
 #: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/hcard.php:74
 #: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
 #: lib/profileaction.php:84
 msgid "User has no profile."
 msgstr "UÅ¾ivatel nemÃ¡ profil."
 
-#: actions/apiaccountupdateprofile.php:147
+#: actions/apiaccountupdateprofile.php:148
 msgid "Could not save profile."
 msgstr "NepodaÅilo se uloÅ¾it profil."
 
-#: actions/apiaccountupdateprofilebackgroundimage.php:108
-#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
-#: actions/apistatusesupdate.php:212 actions/avatarsettings.php:257
+#: actions/apiaccountupdateprofilebackgroundimage.php:109
+#: actions/apiaccountupdateprofileimage.php:98 actions/apimediaupload.php:81
+#: actions/apistatusesupdate.php:213 actions/avatarsettings.php:257
 #: actions/designadminpanel.php:123 actions/editapplication.php:118
 #: actions/newapplication.php:101 actions/newnotice.php:94
 #: lib/designsettings.php:283
@@ -276,30 +281,30 @@ msgstr ""
 "Server nebyl schopen zpracovat tolik POST dat (%s bytÅ¯) vzhledem k jeho "
 "aktuÃ¡lnÃ konfiguraci."
 
-#: actions/apiaccountupdateprofilebackgroundimage.php:136
-#: actions/apiaccountupdateprofilebackgroundimage.php:146
-#: actions/apiaccountupdateprofilecolors.php:164
-#: actions/apiaccountupdateprofilecolors.php:174
+#: actions/apiaccountupdateprofilebackgroundimage.php:137
+#: actions/apiaccountupdateprofilebackgroundimage.php:147
+#: actions/apiaccountupdateprofilecolors.php:165
+#: actions/apiaccountupdateprofilecolors.php:175
 #: actions/groupdesignsettings.php:290 actions/groupdesignsettings.php:300
 #: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
 #: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
 msgid "Unable to save your design settings."
 msgstr "Nelze uloÅ¾it vaÅ¡e nastavenÃ designu."
 
-#: actions/apiaccountupdateprofilebackgroundimage.php:187
-#: actions/apiaccountupdateprofilecolors.php:142
+#: actions/apiaccountupdateprofilebackgroundimage.php:188
+#: actions/apiaccountupdateprofilecolors.php:143
 msgid "Could not update your design."
 msgstr "Nelze uloÅ¾it design."
 
-#: actions/apiblockcreate.php:105
+#: actions/apiblockcreate.php:106
 msgid "You cannot block yourself!"
 msgstr "NemÅ¯Å¾ete zablokovat sami sebe!"
 
-#: actions/apiblockcreate.php:126
+#: actions/apiblockcreate.php:127
 msgid "Block user failed."
 msgstr "Zablokovat uÅ¾ivatele se nezdaÅilo."
 
-#: actions/apiblockdestroy.php:114
+#: actions/apiblockdestroy.php:115
 msgid "Unblock user failed."
 msgstr "Odblokovat uÅ¾ivatele se nezdaÅilo."
 
@@ -323,59 +328,59 @@ msgstr "PÅÃmÃ© zprÃ¡vy uÅ¾ivateli %s"
 msgid "All the direct messages sent to %s"
 msgstr "VÅ¡echny pÅÃmÃ© zprÃ¡vy odeslanÃ© uÅ¾ivateli %s"
 
-#: actions/apidirectmessagenew.php:118
+#: actions/apidirectmessagenew.php:119
 msgid "No message text!"
 msgstr "zprÃ¡va bez textu!"
 
-#: actions/apidirectmessagenew.php:127 actions/newmessage.php:150
+#: actions/apidirectmessagenew.php:128 actions/newmessage.php:150
 #, php-format
 msgid "That's too long. Max message size is %d chars."
 msgstr "Je to pÅÃliÅ¡ dlouhÃ©. MaximÃ¡lnÃ dÃ©lka sdÄlenÃ je %d znakÅ¯."
 
-#: actions/apidirectmessagenew.php:138
+#: actions/apidirectmessagenew.php:139
 msgid "Recipient user not found."
 msgstr "PÅÃjemce nebyl nalezen."
 
-#: actions/apidirectmessagenew.php:142
+#: actions/apidirectmessagenew.php:143
 msgid "Can't send direct messages to users who aren't your friend."
 msgstr "Nelze odesÃlat zprÃ¡vy uÅ¾ivatelÅ¯m, kteÅÃ nejsou vaÅ¡imi pÅÃ¡teli."
 
-#: actions/apifavoritecreate.php:109 actions/apifavoritedestroy.php:110
+#: actions/apifavoritecreate.php:110 actions/apifavoritedestroy.php:111
 #: actions/apistatusesdestroy.php:121
 msgid "No status found with that ID."
 msgstr "HlÃ¡Å¡ka s tÃmto ID nenalezena."
 
-#: actions/apifavoritecreate.php:120
+#: actions/apifavoritecreate.php:121
 msgid "This status is already a favorite."
 msgstr "Tuto hlÃ¡Å¡ku jiÅ¾ mÃ¡te v oblÃbenÃ½ch."
 
 #. TRANS: Error message text shown when a favorite could not be set.
-#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:296
+#: actions/apifavoritecreate.php:132 actions/favor.php:84 lib/command.php:296
 msgid "Could not create favorite."
 msgstr "Nelze vytvoÅit oblÃbenou poloÅ¾ku."
 
-#: actions/apifavoritedestroy.php:123
+#: actions/apifavoritedestroy.php:124
 msgid "That status is not a favorite."
 msgstr "Tato hlÃ¡Å¡ka nenÃ oblÃbenÃ¡."
 
-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
+#: actions/apifavoritedestroy.php:136 actions/disfavor.php:87
 msgid "Could not delete favorite."
 msgstr "Nelze smazat oblÃbenou poloÅ¾ku."
 
-#: actions/apifriendshipscreate.php:109
+#: actions/apifriendshipscreate.php:110
 msgid "Could not follow user: profile not found."
 msgstr "NemÅ¯Å¾u zaÄÃt sledovat uÅ¾ivatele, profil nenalezen."
 
-#: actions/apifriendshipscreate.php:118
+#: actions/apifriendshipscreate.php:119
 #, php-format
 msgid "Could not follow user: %s is already on your list."
 msgstr "Nemohu zaÄÃt sledovat uÅ¾ivatele: %s je jiÅ¾ na vaÅ¡em seznamu."
 
-#: actions/apifriendshipsdestroy.php:109
+#: actions/apifriendshipsdestroy.php:110
 msgid "Could not unfollow user: User not found."
 msgstr "Nemohu pÅestat sledovat uÅ¾ivatele, uÅ¾ivatel nebyl nalezen."
 
-#: actions/apifriendshipsdestroy.php:120
+#: actions/apifriendshipsdestroy.php:121
 msgid "You cannot unfollow yourself."
 msgstr "NemÅ¯Å¾ete pÅestat sledovat sami sebe."
 
@@ -391,101 +396,101 @@ msgstr "Nelze urÄit zdrojovÃ©ho uÅ¾ivatele."
 msgid "Could not find target user."
 msgstr "NepodaÅilo se najÃt cÃlovÃ©ho uÅ¾ivatele."
 
-#: actions/apigroupcreate.php:167 actions/editgroup.php:186
+#: actions/apigroupcreate.php:168 actions/editgroup.php:186
 #: actions/newgroup.php:126 actions/profilesettings.php:215
 #: actions/register.php:212
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr "PÅezdÃvka mÅ¯Å¾e obsahovat pouze malÃ¡ pÃsmena a ÄÃsla a Å¾Ã¡dnÃ© mezery."
 
-#: actions/apigroupcreate.php:176 actions/editgroup.php:190
+#: actions/apigroupcreate.php:177 actions/editgroup.php:190
 #: actions/newgroup.php:130 actions/profilesettings.php:238
 #: actions/register.php:215
 msgid "Nickname already in use. Try another one."
 msgstr "PÅezdÃvku jiÅ¾ nÄkdo pouÅ¾ÃvÃ¡. Zkuste jinou."
 
-#: actions/apigroupcreate.php:183 actions/editgroup.php:193
+#: actions/apigroupcreate.php:184 actions/editgroup.php:193
 #: actions/newgroup.php:133 actions/profilesettings.php:218
 #: actions/register.php:217
 msgid "Not a valid nickname."
 msgstr "NenÃ platnou pÅezdÃvkou."
 
-#: actions/apigroupcreate.php:199 actions/editapplication.php:215
+#: actions/apigroupcreate.php:200 actions/editapplication.php:215
 #: actions/editgroup.php:199 actions/newapplication.php:203
 #: actions/newgroup.php:139 actions/profilesettings.php:222
 #: actions/register.php:224
 msgid "Homepage is not a valid URL."
 msgstr "DomovskÃ¡ strÃ¡nka nenÃ platnÃ¡ URL."
 
-#: actions/apigroupcreate.php:208 actions/editgroup.php:202
+#: actions/apigroupcreate.php:209 actions/editgroup.php:202
 #: actions/newgroup.php:142 actions/profilesettings.php:225
 #: actions/register.php:227
 msgid "Full name is too long (max 255 chars)."
 msgstr "CelÃ© jmÃ©no je moc dlouhÃ© (maximÃ¡lnÃ dÃ©lka je 255 znakÅ¯)."
 
-#: actions/apigroupcreate.php:216 actions/editapplication.php:190
+#: actions/apigroupcreate.php:217 actions/editapplication.php:190
 #: actions/newapplication.php:172
 #, php-format
 msgid "Description is too long (max %d chars)."
 msgstr "Popis je pÅÃliÅ¡ dlouhÃ½ (maximÃ¡lnÄ %d znakÅ¯)."
 
-#: actions/apigroupcreate.php:227 actions/editgroup.php:208
+#: actions/apigroupcreate.php:228 actions/editgroup.php:208
 #: actions/newgroup.php:148 actions/profilesettings.php:232
 #: actions/register.php:234
 msgid "Location is too long (max 255 chars)."
 msgstr "UmÃstÄnÃ je pÅÃliÅ¡ dlouhÃ© (maximÃ¡lnÄ 255 znakÅ¯)."
 
-#: actions/apigroupcreate.php:246 actions/editgroup.php:219
+#: actions/apigroupcreate.php:247 actions/editgroup.php:219
 #: actions/newgroup.php:159
 #, php-format
 msgid "Too many aliases! Maximum %d."
 msgstr "PÅÃliÅ¡ mnoho aliasÅ¯! MaximÃ¡lnÄ %d."
 
-#: actions/apigroupcreate.php:267
+#: actions/apigroupcreate.php:268
 #, php-format
 msgid "Invalid alias: \"%s\"."
 msgstr "NeplatnÃ½ alias: \"%s\"."
 
-#: actions/apigroupcreate.php:276 actions/editgroup.php:232
+#: actions/apigroupcreate.php:277 actions/editgroup.php:232
 #: actions/newgroup.php:172
 #, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr "Alias \"%s\" se jiÅ¾ pouÅ¾ÃvÃ¡. Zkuste jinÃ½."
 
-#: actions/apigroupcreate.php:289 actions/editgroup.php:238
+#: actions/apigroupcreate.php:290 actions/editgroup.php:238
 #: actions/newgroup.php:178
 msgid "Alias can't be the same as nickname."
 msgstr "Alias nemÅ¯Å¾e bÃ½t stejnÃ½ jako pÅezdÃvka."
 
-#: actions/apigroupismember.php:96 actions/apigroupjoin.php:105
-#: actions/apigroupleave.php:105 actions/apigroupmembership.php:92
+#: actions/apigroupismember.php:96 actions/apigroupjoin.php:106
+#: actions/apigroupleave.php:106 actions/apigroupmembership.php:92
 #: actions/apigroupshow.php:83 actions/apitimelinegroup.php:92
 msgid "Group not found."
 msgstr "Skupina nebyla nalezena."
 
 #. TRANS: Error text shown a user tries to join a group they already are a member of.
-#: actions/apigroupjoin.php:111 actions/joingroup.php:100 lib/command.php:336
+#: actions/apigroupjoin.php:112 actions/joingroup.php:100 lib/command.php:336
 msgid "You are already a member of that group."
 msgstr "Jste jiÅ¾ Älenem tÃ©to skupiny."
 
 #. TRANS: Error text shown when a user tries to join a group they are blocked from joining.
-#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:341
+#: actions/apigroupjoin.php:121 actions/joingroup.php:105 lib/command.php:341
 msgid "You have been blocked from that group by the admin."
 msgstr "Z tÃ©to skupiny jste byl zablokovÃ¡n adminem."
 
 #. 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.
-#: actions/apigroupjoin.php:139 actions/joingroup.php:134 lib/command.php:353
+#: actions/apigroupjoin.php:140 actions/joingroup.php:134 lib/command.php:353
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "Nemohu pÅipojit uÅ¾ivatele %1$s do skupiny %2$s."
 
-#: actions/apigroupleave.php:115
+#: actions/apigroupleave.php:116
 msgid "You are not a member of this group."
 msgstr "Nejste Älenem tÃ©to skupiny."
 
 #. 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.
-#: actions/apigroupleave.php:125 actions/leavegroup.php:129
+#: actions/apigroupleave.php:126 actions/leavegroup.php:129
 #: lib/command.php:401
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
@@ -515,7 +520,7 @@ msgstr "skupiny uÅ¾ivatele %s"
 msgid "groups on %s"
 msgstr "skupiny na %s"
 
-#: actions/apimediaupload.php:99
+#: actions/apimediaupload.php:100
 msgid "Upload failed."
 msgstr "NahrÃ¡nÃ se nezdaÅilo."
 
@@ -529,9 +534,9 @@ msgstr "NeplatnÃ½ token."
 
 #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
 #: actions/deletenotice.php:169 actions/disfavor.php:74
-#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:55
+#: actions/emailsettings.php:271 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:66 actions/imsettings.php:227
+#: actions/groupunblock.php:66 actions/imsettings.php:230
 #: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
@@ -575,8 +580,8 @@ msgstr "Token Å¾Ã¡dosti %s byl odepÅen a zruÅ¡en."
 #. 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:286 actions/grouplogo.php:322
-#: actions/imsettings.php:242 actions/newapplication.php:121
+#: actions/emailsettings.php:290 actions/grouplogo.php:322
+#: actions/imsettings.php:245 actions/newapplication.php:121
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
 #: actions/smssettings.php:277 lib/designsettings.php:304
 msgid "Unexpected form submission."
@@ -640,18 +645,18 @@ msgstr "Tato metoda vyÅ¾aduje POST nebo DELETE."
 msgid "You may not delete another user's status."
 msgstr "NesmÃte odstraÅovat status jinÃ©ho uÅ¾ivatele."
 
-#: actions/apistatusesretweet.php:75 actions/apistatusesretweets.php:72
+#: actions/apistatusesretweet.php:76 actions/apistatusesretweets.php:72
 #: actions/deletenotice.php:52 actions/shownotice.php:92
 msgid "No such notice."
 msgstr "Å½Ã¡dnÃ© takovÃ© oznÃ¡menÃ."
 
 #. TRANS: Error text shown when trying to repeat an own notice.
-#: actions/apistatusesretweet.php:83 lib/command.php:538
+#: actions/apistatusesretweet.php:84 lib/command.php:538
 msgid "Cannot repeat your own notice."
 msgstr "Nelze opakovat svÃ© vlastnÃ oznÃ¡menÃ."
 
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-#: actions/apistatusesretweet.php:91 lib/command.php:544
+#: actions/apistatusesretweet.php:92 lib/command.php:544
 msgid "Already repeated that notice."
 msgstr "JiÅ¾ jste zopakoval toto oznÃ¡menÃ."
 
@@ -663,21 +668,21 @@ msgstr "Status smazÃ¡n."
 msgid "No status with that ID found."
 msgstr "Nenalezen status s tÃmto ID."
 
-#: actions/apistatusesupdate.php:221
+#: actions/apistatusesupdate.php:222
 msgid "Client must provide a 'status' parameter with a value."
 msgstr "Klient musÃ poskytnout 'status' parametr s hodnotou."
 
-#: actions/apistatusesupdate.php:242 actions/newnotice.php:157
+#: actions/apistatusesupdate.php:243 actions/newnotice.php:157
 #: lib/mailhandler.php:60
 #, php-format
 msgid "That's too long. Max notice size is %d chars."
 msgstr "Je to pÅÃliÅ¡ dlouhÃ©. MaximÃ¡lnÃ dÃ©lka sdÄlenÃ je %d znakÅ¯"
 
-#: actions/apistatusesupdate.php:283 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:284 actions/apiusershow.php:96
 msgid "Not found."
 msgstr "Nebyl nalezen."
 
-#: actions/apistatusesupdate.php:306 actions/newnotice.php:181
+#: actions/apistatusesupdate.php:307 actions/newnotice.php:181
 #, php-format
 msgid "Max notice size is %d chars, including attachment URL."
 msgstr "MaximÃ¡lnÃ dÃ©lka notice je %d znakÅ¯ vÄetnÄ pÅiloÅ¾enÃ© URL."
@@ -877,7 +882,9 @@ msgid "Yes"
 msgstr "Ano"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
+#. TRANS: Submit button title.
+#. TRANS: Description of the form to block a user.
+#: actions/block.php:164 actions/groupmembers.php:403 lib/blockform.php:82
 msgid "Block this user"
 msgstr "Zablokovat tohoto uÅ¾ivatele"
 
@@ -919,11 +926,13 @@ msgstr "Seznam uÅ¾ivatelÅ¯ blokovanÃ½ch od pÅipojenÃ k tÃ©to skupinÄ."
 msgid "Unblock user from group"
 msgstr "Odblokovat uÅ¾ivatele ze skupiny"
 
-#: actions/blockedfromgroup.php:320 lib/unblockform.php:69
+#. TRANS: Title for the form to unblock a user.
+#: actions/blockedfromgroup.php:320 lib/unblockform.php:70
 msgid "Unblock"
 msgstr "Odblokovat"
 
-#: actions/blockedfromgroup.php:320 lib/unblockform.php:80
+#. TRANS: Description of the form to unblock a user.
+#: actions/blockedfromgroup.php:320 lib/unblockform.php:82
 msgid "Unblock this user"
 msgstr "Odblokovat tohoto uÅ¾ivatele"
 
@@ -962,9 +971,9 @@ msgstr "Adresa jiÅ¾ byla potvrzena"
 #. 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/confirmaddress.php:116 actions/emailsettings.php:331
+#: actions/emailsettings.php:477 actions/imsettings.php:283
+#: actions/imsettings.php:442 actions/othersettings.php:174
 #: actions/profilesettings.php:283 actions/smssettings.php:308
 #: actions/smssettings.php:464
 msgid "Couldn't update user."
@@ -972,7 +981,7 @@ msgstr "Nelze aktualizovat uÅ¾ivatele"
 
 #. 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/confirmaddress.php:128 actions/emailsettings.php:437
 #: actions/smssettings.php:422
 msgid "Couldn't delete email confirmation."
 msgstr "Nelze smazat potvrzenÃ emailu"
@@ -1008,9 +1017,10 @@ msgstr "Aplikace nebyla nalezena."
 msgid "You are not the owner of this application."
 msgstr "Nejste vlastnÃkem tÃ©to aplikace."
 
+#. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:127
 #: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1307
+#: lib/action.php:1315
 msgid "There was a problem with your session token."
 msgstr "Nastal problÃ©m s vaÅ¡Ãm session tokenem."
 
@@ -1043,7 +1053,7 @@ msgstr "Odstranit tuto aplikaci"
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
 #: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:73 lib/profileformaction.php:64
+#: lib/adminpanelaction.php:71 lib/profileformaction.php:64
 #: lib/settingsaction.php:72
 msgid "Not logged in."
 msgstr "Nejste pÅihlÃ¡Å¡en(a)."
@@ -1106,7 +1116,6 @@ msgstr "Odstranit tohoto uÅ¾ivatele"
 #. TRANS: Message used as title for design settings for the site.
 #. TRANS: Link description in user account settings menu.
 #: actions/designadminpanel.php:63 lib/accountsettingsaction.php:139
-#: lib/groupnav.php:119
 msgid "Design"
 msgstr "Vzhled"
 
@@ -1226,13 +1235,13 @@ msgstr "Obnovit vÃ½chozÃ vzhledy"
 msgid "Reset back to default"
 msgstr "Reset zpÄt do vÃ½chozÃho"
 
-#. TRANS: Submit button title
+#. TRANS: Submit button title.
 #: actions/designadminpanel.php:685 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/snapshotadminpanel.php:245
 #: actions/subscriptions.php:226 actions/tagother.php:154
-#: actions/useradminpanel.php:294 lib/applicationeditform.php:363
+#: actions/useradminpanel.php:294 lib/applicationeditform.php:353
 #: lib/designsettings.php:256 lib/groupeditform.php:202
 msgid "Save"
 msgstr "UloÅ¾it"
@@ -1388,7 +1397,7 @@ msgstr "AktuÃ¡lnÃ potvrzenÃ¡ e-mailovÃ¡ adresa."
 #. 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/emailsettings.php:115 actions/emailsettings.php:162
 #: actions/imsettings.php:116 actions/smssettings.php:124
 #: actions/smssettings.php:180
 msgctxt "BUTTON"
@@ -1406,22 +1415,26 @@ msgstr ""
 #. 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
+#. TRANS: Button label in the "Edit application" form.
 #: actions/emailsettings.php:127 actions/imsettings.php:131
-#: actions/smssettings.php:137 lib/applicationeditform.php:357
+#: actions/smssettings.php:137 lib/applicationeditform.php:347
 msgctxt "BUTTON"
 msgid "Cancel"
 msgstr "ZruÅ¡it"
 
-#. TRANS: Instructions for e-mail address input form.
-#: actions/emailsettings.php:135
+#. TRANS: Instructions for e-mail address input form. Do not translate
+#. TRANS: "example.org". It is one of the domain names reserved for
+#. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
+#. TRANS: Any other domain may be owned by a legitimate person or
+#. TRANS: organization.
+#: actions/emailsettings.php:139
 msgid "Email address, like \"UserName@example.org\""
 msgstr "E-mailovÃ¡ adresa, ve stylu \"UzivatelskeJmeno@example.org\""
 
 #. 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/emailsettings.php:143 actions/imsettings.php:151
 #: actions/smssettings.php:162
 msgctxt "BUTTON"
 msgid "Add"
@@ -1429,110 +1442,110 @@ msgstr "PÅidat"
 
 #. 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
+#: actions/emailsettings.php:151 actions/smssettings.php:171
 msgid "Incoming email"
 msgstr "PÅÃchozÃ e-mail"
 
 #. 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
+#: actions/emailsettings.php:159 actions/smssettings.php:178
 msgid "Send email to this address to post new notices."
 msgstr "PoÅ¡lete e-mail na tuto adresu pro poslÃ¡nÃ novÃ©ho oznÃ¡menÃ."
 
 #. 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
+#: actions/emailsettings.php:168 actions/smssettings.php:186
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr "VytvoÅenÃ novÃ© e-mailovÃ© adresy pro zasÃlÃ¡nÃ, ruÅ¡Ã starou."
 
 #. 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
+#: actions/emailsettings.php:172 actions/smssettings.php:189
 msgctxt "BUTTON"
 msgid "New"
 msgstr "NovÃ¡"
 
 #. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:174
+#: actions/emailsettings.php:178
 msgid "Email preferences"
 msgstr "NastavenÃ e-mailu"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:180
+#: actions/emailsettings.php:184
 msgid "Send me notices of new subscriptions through email."
 msgstr "PoÅ¡lete mi oznÃ¡menÃ o novÃ½ch pÅihlÃ¡Å¡enÃch e-mailem."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:186
+#: actions/emailsettings.php:190
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr "PoÅ¡lete mi e-mail, kdyÅ¾ nÄkdo pÅidÃ¡ moje oznÃ¡menÃ mezi oblÃbenÃ©."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:193
+#: actions/emailsettings.php:197
 msgid "Send me email when someone sends me a private message."
 msgstr "PoÅ¡lete mi e-mail, kdyÅ¾ mi nÄkdo poÅ¡le soukromou zprÃ¡vu."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:199
+#: actions/emailsettings.php:203
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr "PoÅ¡lete mi e-mail, kdyÅ¾ mi nÄkdo poÅ¡le \"@-odpovÄÄ\"."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:205
+#: actions/emailsettings.php:209
 msgid "Allow friends to nudge me and send me an email."
 msgstr "Povolit pÅÃ¡telÅ¯m mÄ poÅ¡Å¥ouchnout a poslat mi email."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:212
+#: actions/emailsettings.php:216
 msgid "I want to post notices by email."
 msgstr "Chci posÃlat oznÃ¡menÃ e-mailem."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:219
+#: actions/emailsettings.php:223
 msgid "Publish a MicroID for my email address."
 msgstr "Publikovat MicroID pro mou e-mailovou adresu."
 
 #. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:334
+#: actions/emailsettings.php:338
 msgid "Email preferences saved."
 msgstr "Email nastavenÃ uloÅ¾eno."
 
 #. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:353
+#: actions/emailsettings.php:357
 msgid "No email address."
 msgstr "ChybÃ e-mailovÃ¡ adresa."
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:361
+#: actions/emailsettings.php:365
 msgid "Cannot normalize that email address"
 msgstr "NepodaÅilo se normalizovat (kanonizovat) e-mailovou adresu."
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:208
+#: actions/emailsettings.php:370 actions/register.php:208
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "NenÃ platnou mailovou adresou."
 
 #. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:370
+#: actions/emailsettings.php:374
 msgid "That is already your email address."
 msgstr "To je jiÅ¾ vaÅ¡Ã e-mailovou adresou."
 
 #. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:374
+#: actions/emailsettings.php:378
 msgid "That email address already belongs to another user."
 msgstr "Tato e-mailovÃ¡ adresa jiÅ¾ patÅÃ jinÃ©mu uÅ¾ivateli."
 
 #. 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/emailsettings.php:395 actions/imsettings.php:351
 #: actions/smssettings.php:373
 msgid "Couldn't insert confirmation code."
 msgstr "Nelze vloÅ¾it potvrzujÃcÃ kÃ³d."
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:398
+#: actions/emailsettings.php:402
 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."
@@ -1544,50 +1557,50 @@ msgstr ""
 #. 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/emailsettings.php:423 actions/imsettings.php:386
 #: actions/smssettings.php:408
 msgid "No pending confirmation to cancel."
 msgstr "Å½Ã¡dnÃ© potvrzenÃ ke zruÅ¡enÃ."
 
 #. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:424
+#: actions/emailsettings.php:428
 msgid "That is the wrong email address."
 msgstr "Toto je Å¡patnÃ¡ e-mailovÃ¡ adresa."
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:438
+#: actions/emailsettings.php:442
 msgid "Email confirmation cancelled."
 msgstr "PotvrzenÃ e-mailu zruÅ¡eno."
 
 #. TRANS: Message given trying to remove an e-mail address that is not
 #. TRANS: registered for the active user.
-#: actions/emailsettings.php:458
+#: actions/emailsettings.php:462
 msgid "That is not your email address."
 msgstr "To nenÃ vaÅ¡e e-mailovÃ¡ adresa."
 
 #. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:479
+#: actions/emailsettings.php:483
 msgid "The email address was removed."
 msgstr "E-mailovÃ¡ adresa byla odstranÄna."
 
-#: actions/emailsettings.php:493 actions/smssettings.php:568
+#: actions/emailsettings.php:497 actions/smssettings.php:568
 msgid "No incoming email address."
 msgstr "NemÃ¡te pÅÃchozÃ e-mailovou adresu."
 
 #. 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/emailsettings.php:508 actions/emailsettings.php:532
 #: actions/smssettings.php:578 actions/smssettings.php:602
 msgid "Couldn't update user record."
 msgstr "Nelze aktualizovat zÃ¡znam uÅ¾ivatele."
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
-#: actions/emailsettings.php:508 actions/smssettings.php:581
+#: actions/emailsettings.php:512 actions/smssettings.php:581
 msgid "Incoming email address removed."
 msgstr "PÅÃchozÃ e-mailovÃ¡ adresa odstranÄna."
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
-#: actions/emailsettings.php:532 actions/smssettings.php:605
+#: actions/emailsettings.php:536 actions/smssettings.php:605
 msgid "New incoming email address added."
 msgstr "PÅidÃ¡na novÃ¡ pÅÃchozÃ e-mailovÃ¡ adresa."
 
@@ -1706,7 +1719,7 @@ msgstr "Nemohu pÅevÃ©st Å¾Ã¡dost token na pÅÃstup token."
 msgid "Remote service uses unknown version of OMB protocol."
 msgstr "VzdÃ¡lenÃ¡ sluÅ¾ba pouÅ¾ÃvÃ¡ neznÃ¡mou verzi protokolu OMB."
 
-#: actions/finishremotesubscribe.php:138
+#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306
 msgid "Error updating remote profile."
 msgstr "Chyba pÅi aktualizaci vzdÃ¡lenÃ©ho profilu."
 
@@ -1763,7 +1776,7 @@ msgstr "UÅ¾ivatel jiÅ¾ je zablokovÃ¡n ze skupiny."
 msgid "User is not a member of group."
 msgstr "UÅ¾ivatel nenÃ Älenem skupiny."
 
-#: actions/groupblock.php:134 actions/groupmembers.php:360
+#: actions/groupblock.php:134 actions/groupmembers.php:364
 msgid "Block user from group"
 msgstr "Zablokovat uÅ¾ivatele ze skupiny"
 
@@ -1844,40 +1857,32 @@ msgstr "Logo aktualizovÃ¡no."
 msgid "Failed updating logo."
 msgstr "NepodaÅilo se aktualizovat logo."
 
-#: actions/groupmembers.php:100 lib/groupnav.php:92
+#. TRANS: Title of the page showing group members.
+#. TRANS: %s is the name of the group.
+#: actions/groupmembers.php:102
 #, php-format
 msgid "%s group members"
 msgstr "ÄlenovÃ© skupiny %s"
 
-#: actions/groupmembers.php:103
+#. TRANS: Title of the page showing group members.
+#. TRANS: %1$s is the name of the group, %2$d is the page number of the members list.
+#: actions/groupmembers.php:107
 #, php-format
 msgid "%1$s group members, page %2$d"
 msgstr "ÄlenovÃ© skupiny %1$s, strana %2$d"
 
-#: actions/groupmembers.php:118
+#: actions/groupmembers.php:122
 msgid "A list of the users in this group."
 msgstr "Seznam uÅ¾ivatelÅ¯ v tÃ©to skupinÄ."
 
-#: actions/groupmembers.php:182 lib/groupnav.php:107
+#: actions/groupmembers.php:186
 msgid "Admin"
 msgstr "Admin"
 
-#: actions/groupmembers.php:392 lib/blockform.php:69
-msgid "Block"
-msgstr "Blokovat"
-
-#: actions/groupmembers.php:487
+#: actions/groupmembers.php:498
 msgid "Make user an admin of the group"
 msgstr "UÄelat uÅ¾ivatele adminem skupiny"
 
-#: actions/groupmembers.php:519
-msgid "Make Admin"
-msgstr "UdÄlat adminem"
-
-#: actions/groupmembers.php:519
-msgid "Make this user an admin"
-msgstr "UdÄlat tohoto uÅ¾ivatele adminem"
-
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Title in atom group notice feed. %s is a group name.
 #. TRANS: Title in atom user notice feed. %s is a user name.
@@ -2015,7 +2020,10 @@ msgstr ""
 
 #. TRANS: IM address input field instructions in IM settings form.
 #. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:140
+#. TRANS: Do not translate "example.org". It is one of the domain names reserved for use in examples by
+#. TRANS: http://www.rfc-editor.org/rfc/rfc2606.txt. Any other domain may be owned by a legitimate
+#. TRANS: person or organization.
+#: actions/imsettings.php:143
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -2026,64 +2034,64 @@ msgstr ""
 "nebo na GTalku."
 
 #. TRANS: Form legend for IM preferences form.
-#: actions/imsettings.php:155
+#: actions/imsettings.php:158
 msgid "IM preferences"
 msgstr "NastavenÃ IM"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:160
+#: actions/imsettings.php:163
 msgid "Send me notices through Jabber/GTalk."
 msgstr "ZasÃlat oznÃ¡menÃ pomocÃ Jabber/GTalk"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:166
+#: actions/imsettings.php:169
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr "Poslat oznÃ¡menÃ, kdyÅ¾ se zmÄnÃ mÅ¯j Jabber/Gtalk status."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:172
+#: actions/imsettings.php:175
 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr ""
 "PoÅ¡lete mi odpovÄdi pÅes Jabber / GTalk od lidÃ, ke kterÃ½m nejsem pÅihlÃ¡Å¡en."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:179
+#: actions/imsettings.php:182
 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "Publikovat MicroID pro mou Jabber / GTalk adresu."
 
 #. TRANS: Confirmation message for successful IM preferences save.
-#: actions/imsettings.php:287 actions/othersettings.php:180
+#: actions/imsettings.php:290 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
+#: actions/imsettings.php:312
 msgid "No Jabber ID."
 msgstr "ChybÃ Jabber ID."
 
 #. TRANS: Message given saving IM address that cannot be normalised.
-#: actions/imsettings.php:317
+#: actions/imsettings.php:320
 msgid "Cannot normalize that Jabber ID"
 msgstr "Nelze normalizovat tento JabberID"
 
 #. TRANS: Message given saving IM address that not valid.
-#: actions/imsettings.php:322
+#: actions/imsettings.php:325
 msgid "Not a valid Jabber ID"
 msgstr "NenÃ platnÃ½m Jabber ID"
 
 #. TRANS: Message given saving IM address that is already set.
-#: actions/imsettings.php:326
+#: actions/imsettings.php:329
 msgid "That is already your Jabber ID."
 msgstr "Toto je jiÅ¾ vaÅ¡e Jabber ID"
 
 #. TRANS: Message given saving IM address that is already set for another user.
-#: actions/imsettings.php:330
+#: actions/imsettings.php:333
 msgid "Jabber ID already belongs to another user."
 msgstr "Jabber ID jiÅ¾ patÅÃ jinÃ©mu uÅ¾ivateli"
 
 #. 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
+#: actions/imsettings.php:361
 #, php-format
 msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
@@ -2093,28 +2101,28 @@ msgstr ""
 "posÃlal zprÃ¡vy."
 
 #. TRANS: Message given canceling IM address confirmation for the wrong IM address.
-#: actions/imsettings.php:388
+#: actions/imsettings.php:391
 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
+#: actions/imsettings.php:400
 msgid "Couldn't delete IM confirmation."
 msgstr "Nelze smazat potvrzenÃ IM"
 
 #. TRANS: Message given after successfully canceling IM address confirmation.
-#: actions/imsettings.php:402
+#: actions/imsettings.php:405
 msgid "IM confirmation cancelled."
 msgstr "IM potvrzenÃ zruÅ¡eno."
 
 #. TRANS: Message given trying to remove an IM address that is not
 #. TRANS: registered for the active user.
-#: actions/imsettings.php:424
+#: actions/imsettings.php:427
 msgid "That is not your Jabber ID."
 msgstr "Toto nenÃ vÃ¡Å¡ Jabber ID"
 
 #. TRANS: Message given after successfully removing a registered IM address.
-#: actions/imsettings.php:447
+#: actions/imsettings.php:450
 msgid "The IM address was removed."
 msgstr "IM adresa byla odstranÄna."
 
@@ -2525,7 +2533,7 @@ msgstr "OAuth aplikace"
 
 #: actions/oauthappssettings.php:85
 msgid "Applications you have registered"
-msgstr "Aplikace kterÃ© jste se zaregistrovali"
+msgstr "Aplikace kterÃ© jste zaregistrovali"
 
 #: actions/oauthappssettings.php:135
 #, php-format
@@ -2579,8 +2587,8 @@ msgid "Only %s URLs over plain HTTP please."
 msgstr "Only %s URLs over plain HTTP please."
 
 #. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1215
-#: lib/apiaction.php:1243 lib/apiaction.php:1366
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1206
+#: lib/apiaction.php:1233 lib/apiaction.php:1356
 msgid "Not a supported data format."
 msgstr "NepodporovanÃ½ formÃ¡t dat."
 
@@ -2722,7 +2730,7 @@ msgid "Password saved."
 msgstr "Heslo uloÅ¾eno"
 
 #. TRANS: Menu item for site administration
-#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:384
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:371
 msgid "Paths"
 msgstr "Cesty"
 
@@ -2933,7 +2941,7 @@ msgstr "CelÃ© jmÃ©no"
 
 #. TRANS: Form input field label.
 #: actions/profilesettings.php:115 actions/register.php:460
-#: lib/applicationeditform.php:244 lib/groupeditform.php:161
+#: lib/applicationeditform.php:235 lib/groupeditform.php:161
 msgid "Homepage"
 msgstr "Moje strÃ¡nky"
 
@@ -3038,7 +3046,7 @@ msgid "Couldn't save tags."
 msgstr "Nelze uloÅ¾it tagy."
 
 #. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:391 lib/adminpanelaction.php:141
+#: actions/profilesettings.php:391 lib/adminpanelaction.php:138
 msgid "Settings saved."
 msgstr "NastavenÃ uloÅ¾eno"
 
@@ -3569,7 +3577,7 @@ msgstr "UÅ¾ivatel je jiÅ¾ sandboxovÃ¡n."
 
 #. TRANS: Menu item for site administration
 #: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
-#: lib/adminpanelaction.php:392
+#: lib/adminpanelaction.php:379
 msgid "Sessions"
 msgstr "Sessions"
 
@@ -3607,24 +3615,24 @@ msgid "Application profile"
 msgstr "Profil aplikace"
 
 #. TRANS: Form input field label for application icon.
-#: actions/showapplication.php:159 lib/applicationeditform.php:182
+#: actions/showapplication.php:159 lib/applicationeditform.php:173
 msgid "Icon"
 msgstr "Ikona"
 
 #. TRANS: Form input field label for application name.
 #: actions/showapplication.php:169 actions/version.php:197
-#: lib/applicationeditform.php:199
+#: lib/applicationeditform.php:190
 msgid "Name"
 msgstr "NÃ¡zev"
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:178 lib/applicationeditform.php:235
+#: actions/showapplication.php:178 lib/applicationeditform.php:226
 msgid "Organization"
 msgstr "Organizace"
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:216 lib/groupeditform.php:172
+#: lib/applicationeditform.php:207 lib/groupeditform.php:172
 msgid "Description"
 msgstr "Popis"
 
@@ -3738,7 +3746,7 @@ msgstr ""
 msgid "This is a way to share what you like."
 msgstr "Toto je zpÅ¯sob, jak sdÃlet to, co se vÃ¡m lÃbÃ."
 
-#: actions/showgroup.php:82 lib/groupnav.php:86
+#: actions/showgroup.php:82
 #, php-format
 msgid "%s group"
 msgstr "skupina %s"
@@ -3790,7 +3798,7 @@ msgstr "Feed sdÄlenÃ skupiny %s (Atom)"
 msgid "FOAF for %s group"
 msgstr "FOAF pro skupinu %s"
 
-#: actions/showgroup.php:393 actions/showgroup.php:445 lib/groupnav.php:91
+#: actions/showgroup.php:393 actions/showgroup.php:445
 msgid "Members"
 msgstr "ÄlenovÃ©"
 
@@ -4237,7 +4245,7 @@ msgstr "NezadÃ¡n kÃ³d"
 
 #. TRANS: Menu item for site administration
 #: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
-#: lib/adminpanelaction.php:408
+#: lib/adminpanelaction.php:395
 msgid "Snapshots"
 msgstr "SnÃmky (snapshoty)"
 
@@ -4968,7 +4976,7 @@ msgid "Unable to save tag."
 msgstr "Nelze uloÅ¾it tag."
 
 #. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#: classes/Subscription.php:75 lib/oauthstore.php:465
+#: classes/Subscription.php:75 lib/oauthstore.php:466
 msgid "You have been banned from subscribing."
 msgstr "Byl jste vykÃ¡zÃ¡n (banned) z pÅihlaÅ¡ovÃ¡nÃ se."
 
@@ -5116,7 +5124,8 @@ msgid "Change site configuration"
 msgstr "ZmÄna konfigurace webu"
 
 #. TRANS: Main menu option when logged in and site admin for access to site configuration
-#: lib/action.php:474
+#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
+#: lib/action.php:474 lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr "Admin"
@@ -5193,7 +5202,7 @@ msgstr "Hledat"
 
 #. TRANS: DT element for site notice. String is hidden in default CSS.
 #. TRANS: Menu item for site administration
-#: lib/action.php:538 lib/adminpanelaction.php:400
+#: lib/action.php:538 lib/adminpanelaction.php:387
 msgid "Site notice"
 msgstr "SdÄlenÃ"
 
@@ -5257,7 +5266,10 @@ msgid "StatusNet software license"
 msgstr "Licence softwaru StatusNet"
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
-#: lib/action.php:843
+#. TRANS: Text between [] is a link description, text between () is the link itself.
+#. TRANS: Make sure there is no whitespace between "]" and "(".
+#. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
+#: lib/action.php:846
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -5267,13 +5279,16 @@ msgstr ""
 "broughtby%%](%%site.broughtbyurl%%)."
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:846
+#: lib/action.php:849
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** je sluÅ¾ba mikroblogÅ¯."
 
 #. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.
-#: lib/action.php:850
+#. TRANS: Make sure there is no whitespace between "]" and "(".
+#. TRANS: Text between [] is a link description, text between () is the link itself.
+#. TRANS: %s is the version of StatusNet that is being used.
+#: lib/action.php:856
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -5285,49 +5300,50 @@ msgstr ""
 "licensing/licenses/agpl-3.0.html)."
 
 #. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:866
+#: lib/action.php:872
 msgid "Site content license"
 msgstr "Licence k obsahu strÃ¡nek"
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:873
+#: lib/action.php:879
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr "Obsah a data z %1$S jsou soukromÃ© a dÅ¯vÄrnÃ©."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:880
+#: lib/action.php:886
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr "Obsah a data copyright %1$s. VÅ¡echna prÃ¡va vyhrazena."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:884
+#: lib/action.php:890
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr "Obsah a data copyright pÅispÄvatelÅ¯. VÅ¡echna prÃ¡va vyhrazena."
 
-#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:897
+#. TRANS: license message in footer.
+#. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
+#: lib/action.php:904
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr "VÅ¡echen obsah a data %1$s jsou k dispozici v rÃ¡mci licence %2$s."
 
 #. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1236
+#: lib/action.php:1243
 msgid "Pagination"
 msgstr "StrÃ¡nkovÃ¡nÃ"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1247
+#: lib/action.php:1254
 msgid "After"
 msgstr "Po"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1257
+#: lib/action.php:1264
 msgid "Before"
 msgstr "PÅed"
 
@@ -5336,207 +5352,226 @@ msgstr "PÅed"
 msgid "Expecting a root feed element but got a whole XML document."
 msgstr "OÄekÃ¡vÃ¡m koÅenovÃ½ element feedu, ale dostal jsem celÃ½ XML dokument."
 
-#: lib/activityutils.php:208
+#. TRANS: Client exception thrown when there is no source attribute.
+#: lib/activityutils.php:203
 msgid "Can't handle remote content yet."
 msgstr "JeÅ¡tÄ neumÃ zpracovat vzdÃ¡lenÃ½ obsah."
 
-#: lib/activityutils.php:244
+#. TRANS: Client exception thrown when there embedded XML content is found that cannot be processed yet.
+#: lib/activityutils.php:240
 msgid "Can't handle embedded XML content yet."
 msgstr "NeumÃ zachÃ¡zet s vloÅ¾enÃ½m XML obsahem."
 
-#: lib/activityutils.php:248
+#. TRANS: Client exception thrown when base64 encoded content is found that cannot be processed yet.
+#: lib/activityutils.php:245
 msgid "Can't handle embedded Base64 content yet."
 msgstr "NeumÃ zachÃ¡zet s vloÅ¾enÃ½m Base64 obsahem."
 
 #. TRANS: Client error message thrown when a user tries to change admin settings but has no access rights.
-#: lib/adminpanelaction.php:98
+#: lib/adminpanelaction.php:96
 msgid "You cannot make changes to this site."
 msgstr "NemÅ¯Å¾ete provÃ¡dÄt zmÄny na tÃ©to strÃ¡nce."
 
 #. TRANS: Client error message throw when a certain panel's settings cannot be changed.
-#: lib/adminpanelaction.php:110
+#: lib/adminpanelaction.php:108
 msgid "Changes to that panel are not allowed."
 msgstr "ZmÄny, tohoto panelu nejsou povoleny."
 
 #. TRANS: Client error message.
-#: lib/adminpanelaction.php:229
+#: lib/adminpanelaction.php:222
 msgid "showForm() not implemented."
 msgstr "showForm () nenÃ implementovÃ¡na."
 
 #. TRANS: Client error message
-#: lib/adminpanelaction.php:259
+#: lib/adminpanelaction.php:250
 msgid "saveSettings() not implemented."
 msgstr "saveSettings () nenÃ implementovÃ¡na."
 
 #. TRANS: Client error message thrown if design settings could not be deleted in
 #. TRANS: the admin panel Design.
-#: lib/adminpanelaction.php:284
+#: lib/adminpanelaction.php:274
 msgid "Unable to delete design setting."
 msgstr "Nelze smazat nastavenÃ vzhledu."
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:350
+#: lib/adminpanelaction.php:337
 msgid "Basic site configuration"
 msgstr "ZÃ¡kladnÃ konfigurace webu"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:352
+#: lib/adminpanelaction.php:339
 msgctxt "MENU"
 msgid "Site"
 msgstr "StrÃ¡nky"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:358
+#: lib/adminpanelaction.php:345
 msgid "Design configuration"
 msgstr "NastavenÃ vzhledu"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:360
+#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
+#: lib/adminpanelaction.php:347 lib/groupnav.php:135
 msgctxt "MENU"
 msgid "Design"
 msgstr "Vzhled"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:366
+#: lib/adminpanelaction.php:353
 msgid "User configuration"
 msgstr "Akce uÅ¾ivatele"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:368 lib/personalgroupnav.php:115
+#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:115
 msgid "User"
 msgstr "UÅ¾ivatel"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:374
+#: lib/adminpanelaction.php:361
 msgid "Access configuration"
 msgstr "NastavenÃ pÅÃstupu"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:382
+#: lib/adminpanelaction.php:369
 msgid "Paths configuration"
 msgstr "NaastavenÃ cest"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:390
+#: lib/adminpanelaction.php:377
 msgid "Sessions configuration"
 msgstr "NastavenÃ sessions"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:398
+#: lib/adminpanelaction.php:385
 msgid "Edit site notice"
 msgstr "Upravit oznÃ¡menÃ strÃ¡nky"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:406
+#: lib/adminpanelaction.php:393
 msgid "Snapshots configuration"
 msgstr "Konfigurace snÃmkÅ¯"
 
 #. TRANS: Client error 401.
-#: lib/apiauth.php:113
+#: lib/apiauth.php:111
 msgid "API resource requires read-write access, but you only have read access."
 msgstr ""
 "API droj vyÅ¾aduje pÅÃstup pro ÄtenÃ a zÃ¡pis, ale vy mÃ¡te pÅÃstup pouze pro "
 "ÄtenÃ."
 
+#. TRANS: OAuth exception thrown when no application is found for a given consumer key.
+#: lib/apiauth.php:175
+msgid "No application for that consumer key."
+msgstr ""
+
+#. TRANS: OAuth exception given when no user was found for a given token (no token was found).
+#: lib/apiauth.php:217
+msgid "No user for that token."
+msgstr ""
+
+#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
+#: lib/apioauthstore.php:178
+msgid "Tried to revoke unknown token"
+msgstr ""
+
 #. TRANS: Form legend.
-#: lib/applicationeditform.php:137
+#: lib/applicationeditform.php:129
 msgid "Edit application"
 msgstr "Upravit aplikaci"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:187
+#: lib/applicationeditform.php:178
 msgid "Icon for this application"
 msgstr "Ikona pro tuto aplikaci"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:209
+#: lib/applicationeditform.php:200
 #, php-format
 msgid "Describe your application in %d characters"
 msgstr "PopiÅ¡te vaÅ¡i aplikaci v %d znacÃch"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:213
+#: lib/applicationeditform.php:204
 msgid "Describe your application"
 msgstr "PopiÅ¡te vaÅ¡i aplikaci"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:224
+#: lib/applicationeditform.php:215
 msgid "URL of the homepage of this application"
 msgstr "URL domovskÃ© strÃ¡nky tÃ©to aplikace"
 
 #. TRANS: Form input field label.
-#: lib/applicationeditform.php:226
+#: lib/applicationeditform.php:217
 msgid "Source URL"
 msgstr "ZdrojovÃ© URL"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:233
+#: lib/applicationeditform.php:224
 msgid "Organization responsible for this application"
 msgstr "Organizace odpovÄdnÃ¡ za tuto aplikaci"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:242
+#: lib/applicationeditform.php:233
 msgid "URL for the homepage of the organization"
 msgstr "URL homepage organizace"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:251
+#: lib/applicationeditform.php:242
 msgid "URL to redirect to after authentication"
 msgstr "URL pro pÅesmÄrovÃ¡nÃ po autentikaci"
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:278
+#: lib/applicationeditform.php:269
 msgid "Browser"
 msgstr "ProhlÃÅ¾eÄ"
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:295
+#: lib/applicationeditform.php:286
 msgid "Desktop"
 msgstr "Desktop"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:297
+#: lib/applicationeditform.php:288
 msgid "Type of application, browser or desktop"
 msgstr "Typ aplikace, prohlÃÅ¾eÄ nebo desktop"
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:320
+#: lib/applicationeditform.php:311
 msgid "Read-only"
 msgstr "pouze pro ÄtenÃ"
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:339
+#: lib/applicationeditform.php:330
 msgid "Read-write"
 msgstr "ÄtenÃ a zÃ¡pis"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:341
+#: lib/applicationeditform.php:332
 msgid "Default access for this application: read-only, or read-write"
 msgstr "VÃ½chozÃ pÅÃstup pro tuto aplikaci: pouze pro ÄtenÃ, nebo ÄÃst-psÃ¡t"
 
-#. TRANS: Submit button title
-#: lib/applicationeditform.php:359
+#. TRANS: Submit button title.
+#: lib/applicationeditform.php:349
 msgid "Cancel"
 msgstr "ZruÅ¡it"
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:136
+#: lib/applicationlist.php:135
 msgid "read-write"
 msgstr "ÄÃst-psÃ¡t"
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:138
+#: lib/applicationlist.php:137
 msgid "read-only"
 msgstr "pouze pro ÄtenÃ"
 
 #. 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
+#: lib/applicationlist.php:143
 #, php-format
 msgid "Approved %1$s - \"%2$s\" access."
 msgstr "SchvÃ¡leno %1$s - pÅÃstup \"%2$s\""
 
 #. TRANS: Button label
-#: lib/applicationlist.php:159
+#: lib/applicationlist.php:158
 msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "Obnovit"
@@ -5556,11 +5591,13 @@ msgstr "Autor"
 msgid "Provider"
 msgstr "Poskytovatel"
 
-#: lib/attachmentnoticesection.php:67
+#. TRANS: Title.
+#: lib/attachmentnoticesection.php:68
 msgid "Notices where this attachment appears"
 msgstr "Notices where this attachment appears"
 
-#: lib/attachmenttagcloudsection.php:48
+#. TRANS: Title.
+#: lib/attachmenttagcloudsection.php:49
 msgid "Tags for this attachment"
 msgstr "OznaÄenÃ tÃ©to pÅÃlohy"
 
@@ -5572,6 +5609,11 @@ msgstr "ZmÄna hesla se nezdaÅila"
 msgid "Password changing is not allowed"
 msgstr "ZmÄna hesla nenÃ povolena"
 
+#. TRANS: Title for the form to block a user.
+#: lib/blockform.php:70
+msgid "Block"
+msgstr "Blokovat"
+
 #: lib/channel.php:157 lib/channel.php:177
 msgid "Command results"
 msgstr "VÃ½sledky pÅÃkazu"
@@ -5820,7 +5862,7 @@ msgid "You are not subscribed to anyone."
 msgstr "Nejste pÅihlÃ¡Å¡en k nikomu."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to.
-#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.
 #: lib/command.php:836
 msgid "You are subscribed to this person:"
@@ -5836,7 +5878,7 @@ msgid "No one is subscribed to you."
 msgstr "Nikdo k vÃ¡m nenÃ pÅihlÃ¡Å¡en."
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
-#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
 #: lib/command.php:863
 msgid "This person is subscribed to you:"
@@ -5852,7 +5894,7 @@ msgid "You are not a member of any groups."
 msgstr "Nejste Älenem Å¾Ã¡dnÃ© skupiny."
 
 #. TRANS: Text shown after requesting groups a user is subscribed to.
-#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
 #: lib/command.php:890
 msgid "You are a member of this group:"
@@ -5861,6 +5903,7 @@ msgstr[0] "Jste Älenem tÃ©to skupiny:"
 msgstr[1] "Jste Älenem tÄchto skupin:"
 msgstr[2] ""
 
+#. TRANS: Help text for commands.
 #: lib/command.php:905
 msgid ""
 "Commands:\n"
@@ -6082,38 +6125,6 @@ msgstr ""
 msgid "Extra nicknames for the group, comma- or space- separated, max %d"
 msgstr "DalÅ¡Ã pÅezdÃvky pro skupinu, oddÄlenÃ© ÄÃ¡rkou nebo mezerou, max %d"
 
-#: lib/groupnav.php:85
-msgid "Group"
-msgstr "Skupina"
-
-#: lib/groupnav.php:101
-msgid "Blocked"
-msgstr "ZablokovÃ¡n"
-
-#: lib/groupnav.php:102
-#, php-format
-msgid "%s blocked users"
-msgstr "%s blokovanÃ uÅ¾ivatelÃ©"
-
-#: lib/groupnav.php:108
-#, php-format
-msgid "Edit %s group properties"
-msgstr "Editovat vlastnosti skupiny %s"
-
-#: lib/groupnav.php:113
-msgid "Logo"
-msgstr "Logo"
-
-#: lib/groupnav.php:114
-#, php-format
-msgid "Add or edit %s logo"
-msgstr "PÅidat nebo upravit logo %s"
-
-#: lib/groupnav.php:120
-#, php-format
-msgid "Add or edit %s design"
-msgstr "PÅidat nebo upravit vzhled %s"
-
 #: lib/groupsbymemberssection.php:71
 msgid "Groups with most members"
 msgstr "Skupiny s nejvÃce Äleny"
@@ -6145,7 +6156,8 @@ msgstr "Ten soubor je pÅÃliÅ¡ velkÃ½. MaximÃ¡lnÃ velikost souboru je %s."
 msgid "Partial upload."
 msgstr "ÄÃ¡steÄnÃ© nÃ¡hrÃ¡nÃ."
 
-#: lib/imagefile.php:101 lib/mediafile.php:170
+#. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
+#: lib/imagefile.php:101 lib/mediafile.php:179
 msgid "System error uploading file."
 msgstr "Chyba systÃ©mu pÅi nahrÃ¡vÃ¡nÃ souboru"
 
@@ -6548,16 +6560,19 @@ msgstr "Je nÃ¡m lÃto, Å¾Ã¡dnÃ½ pÅÃchozÃ e-mail nenÃ dovolen."
 msgid "Unsupported message type: %s"
 msgstr "NepodporovanÃ½ typ zprÃ¡vy: %s"
 
-#: lib/mediafile.php:98 lib/mediafile.php:123
+#. TRANS: Client exception thrown when a database error was thrown during a file upload operation.
+#: lib/mediafile.php:99 lib/mediafile.php:125
 msgid "There was a database error while saving your file. Please try again."
 msgstr "Nastala chyba v databÃ¡zi pÅi uklÃ¡dÃ¡nÃ souboru. ProsÃm zkuste to znovu."
 
-#: lib/mediafile.php:142
+#. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
+#: lib/mediafile.php:145
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
 msgstr ""
 "Velkost uploadovanÃ©ho souboru pÅekraÄuje upload_max_filesize limit v php.ini."
 
-#: lib/mediafile.php:147
+#. TRANS: Client exception.
+#: lib/mediafile.php:151
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form."
@@ -6565,44 +6580,43 @@ msgstr ""
 "Velkost uploadovanÃ©ho souboru pÅekraÄuje MAX_FILE_SIZE limit, kterÃ© bylo "
 "uvedeno v HTML formulÃ¡Åi."
 
-#: lib/mediafile.php:152
+#. TRANS: Client exception.
+#: lib/mediafile.php:157
 msgid "The uploaded file was only partially uploaded."
 msgstr "NahrÃ¡vanÃ½ soubor byl nahrÃ¡n pouze ÄÃ¡steÄnÄ."
 
-#: lib/mediafile.php:159
+#. TRANS: Client exception thrown when a temporary folder is not present to store a file upload.
+#: lib/mediafile.php:165
 msgid "Missing a temporary folder."
 msgstr "ChybÃ doÄasnÃ½ adresÃ¡Å."
 
-#: lib/mediafile.php:162
+#. TRANS: Client exception thrown when writing to disk is not possible during a file upload operation.
+#: lib/mediafile.php:169
 msgid "Failed to write file to disk."
 msgstr "NepodaÅilo se zapsat soubor na disk."
 
-#: lib/mediafile.php:165
+#. TRANS: Client exception thrown when a file upload operation has been stopped by an extension.
+#: lib/mediafile.php:173
 msgid "File upload stopped by extension."
 msgstr "NahrÃ¡vÃ¡nÃ souboru zastaveno rozÅ¡ÃÅenÃm PHP."
 
-#: lib/mediafile.php:179 lib/mediafile.php:217
+#. TRANS: Client exception thrown when a file upload operation would cause a user to exceed a set quota.
+#: lib/mediafile.php:189 lib/mediafile.php:232
 msgid "File exceeds user's quota."
 msgstr "Soubor pÅekraÄuje kvÃ³tu uÅ¾ivatele."
 
-#: lib/mediafile.php:197 lib/mediafile.php:234
+#. TRANS: Client exception thrown when a file upload operation fails because the file could
+#. TRANS: not be moved from the temporary folder to the permanent file location.
+#: lib/mediafile.php:209 lib/mediafile.php:251
 msgid "File could not be moved to destination directory."
 msgstr "Soubor nemohl bÃ½t pÅesunut do cÃlovÃ©ho adresÃ¡Åe."
 
-#: lib/mediafile.php:202 lib/mediafile.php:238
+#. TRANS: Client exception thrown when a file upload operation has been stopped because the MIME
+#. TRANS: type of the uploaded file could not be determined.
+#: lib/mediafile.php:216 lib/mediafile.php:257
 msgid "Could not determine file's MIME type."
 msgstr "Nelze urÄit typ MIME souboru."
 
-#: lib/mediafile.php:318
-#, php-format
-msgid " Try using another %s format."
-msgstr "Zkuste pouÅ¾Ãt jinÃ½ formÃ¡t %s."
-
-#: lib/mediafile.php:323
-#, php-format
-msgid "%s is not a supported file type on this server."
-msgstr "%s nenÃ typ souboru podporovan na tomto serveru."
-
 #: lib/messageform.php:120
 msgid "Send a direct notice"
 msgstr "PoÅ¡lete pÅÃmou zprÃ¡vu"
@@ -6718,27 +6732,7 @@ msgstr "PoÅ¡Å¥ouchnout"
 msgid "Send a nudge to this user"
 msgstr "Poslat poÅ¡Å¥ouchnutÃ tomuto uÅ¾ivateli"
 
-#: lib/oauthstore.php:283
-msgid "Error inserting new profile"
-msgstr "Chyba pÅi vklÃ¡dÃ¡nÃ novÃ©ho profilu"
-
-#: lib/oauthstore.php:291
-msgid "Error inserting avatar"
-msgstr "Chyba pÅi vklÃ¡dÃ¡nÃ avataru"
-
-#: lib/oauthstore.php:306
-msgid "Error updating remote profile"
-msgstr "Chyba pÅi aktualizaci vzdÃ¡lenÃ©ho profilu"
-
-#: lib/oauthstore.php:311
-msgid "Error inserting remote profile"
-msgstr "Chyba pÅi vklÃ¡danÃ vzdÃ¡lenÃ©ho profilu"
-
-#: lib/oauthstore.php:345
-msgid "Duplicate notice"
-msgstr "Odstranit toto oznÃ¡menÃ"
-
-#: lib/oauthstore.php:490
+#: lib/oauthstore.php:491
 msgid "Couldn't insert new subscription."
 msgstr "Nelze vloÅ¾it odebÃrÃ¡nÃ"
 
@@ -6775,7 +6769,8 @@ msgstr "VaÅ¡e odeslanÃ© zprÃ¡vy"
 msgid "Tags in %s's notices"
 msgstr "ZnaÄky v oznÃ¡menÃch %s"
 
-#: lib/plugin.php:115
+#. TRANS: Displayed as version information for a plugin if no version information was found.
+#: lib/plugin.php:116
 msgid "Unknown"
 msgstr "NeznÃ¡mÃ©"
 
@@ -6869,19 +6864,19 @@ msgstr "Sandbox"
 msgid "Sandbox this user"
 msgstr "Sandboxovat tohoto uÅ¾ivatele"
 
-#: lib/searchaction.php:120
+#. TRANS: Fieldset legend for the search form.
+#: lib/searchaction.php:121
 msgid "Search site"
 msgstr "Prohledat strÃ¡nky"
 
-#: lib/searchaction.php:126
+#. TRANS: Used as a field label for the field where one or more keywords
+#. TRANS: for searching can be entered.
+#: lib/searchaction.php:129
 msgid "Keyword(s)"
 msgstr "KlÃÄovÃ¡ slova"
 
-#: lib/searchaction.php:127
-msgid "Search"
-msgstr "Hledat"
-
-#: lib/searchaction.php:162
+#. TRANS: Definition list item with instructions on how to get (better) search results.
+#: lib/searchaction.php:170
 msgid "Search help"
 msgstr "NÃ¡povÄda k hledÃ¡nÃ"
 
@@ -7079,56 +7074,32 @@ msgid "Moderator"
 msgstr "ModerÃ¡tor"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1102
+#: lib/util.php:1103
 msgid "a few seconds ago"
 msgstr "pÅed pÃ¡r sekundami"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1105
+#: lib/util.php:1106
 msgid "about a minute ago"
 msgstr "asi pÅed minutou"
 
-#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1109
-#, php-format
-msgid "about %d minutes ago"
-msgstr "asi pÅed %d minutami"
-
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 #: lib/util.php:1112
 msgid "about an hour ago"
 msgstr "asi pÅed hodinou"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1116
-#, php-format
-msgid "about %d hours ago"
-msgstr "asi pÅed %d hodinami"
-
-#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1119
+#: lib/util.php:1118
 msgid "about a day ago"
 msgstr "asi pÅede dnem"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1123
-#, php-format
-msgid "about %d days ago"
-msgstr "pÅed %d dny"
-
-#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1126
+#: lib/util.php:1124
 msgid "about a month ago"
 msgstr "asi pÅed mÄsÃcem"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 #: lib/util.php:1130
-#, php-format
-msgid "about %d months ago"
-msgstr "asi pÅed %d mesÃci"
-
-#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1133
 msgid "about a year ago"
 msgstr "asi pÅed rokem"
 
diff --git a/locale/da/LC_MESSAGES/statusnet.po b/locale/da/LC_MESSAGES/statusnet.po
index 2deacb309d..915d860a51 100644
--- a/locale/da/LC_MESSAGES/statusnet.po
+++ b/locale/da/LC_MESSAGES/statusnet.po
@@ -1,7 +1,8 @@
-# Translation of StatusNet to Danish
+# Translation of StatusNet to Danish (Dansk)
+# Expored from translatewiki.net
 #
-# Author@translatewiki.net: Brion
-# Author@translatewiki.net: Mstenbaek
+# Author: Brion
+# Author: Mstenbaek
 # --
 # This file is distributed under the same license as the StatusNet package.
 #
@@ -9,20 +10,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-08 22:33+0000\n"
-"PO-Revision-Date: 2010-09-08 22:33:39+0000\n"
-"Language-Team: Danish\n"
+"POT-Creation-Date: 2010-09-14 19:53+0000\n"
+"PO-Revision-Date: 2010-09-14 19:53:46+0000\n"
+"Language-Team: Danish <http://translatewiki.net/wiki/Portal:da>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r72348); Translate extension (2010-08-20)\n"
+"X-Generator: MediaWiki 1.17alpha (r73009); Translate extension (2010-08-20)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: da\n"
-"X-Message-Group: out-statusnet\n"
+"X-Message-Group: #out-statusnet\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-POT-Import-Date: 1284-49-16 34::+0000\n"
 
 #. TRANS: Page title
 #. TRANS: Menu item for site administration
-#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:376
+#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:363
 msgid "Access"
 msgstr "Adgang"
 
@@ -75,10 +77,10 @@ msgstr "Gem adgangsindstillinger"
 #. 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 actions/emailsettings.php:224
-#: actions/imsettings.php:184 actions/smssettings.php:209
-#: lib/applicationeditform.php:361
+#. TRANS: Button label in the "Edit application" form.
+#: actions/accessadminpanel.php:203 actions/emailsettings.php:228
+#: actions/imsettings.php:187 actions/smssettings.php:209
+#: lib/applicationeditform.php:351
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Gem"
@@ -91,15 +93,15 @@ msgstr "Siden findes ikke"
 
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #: actions/all.php:79 actions/allrss.php:68
-#: actions/apiaccountupdatedeliverydevice.php:114
-#: actions/apiaccountupdateprofile.php:105
-#: actions/apiaccountupdateprofilebackgroundimage.php:116
-#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
-#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
-#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:113
-#: actions/apigroupismember.php:91 actions/apigroupjoin.php:100
-#: actions/apigroupleave.php:100 actions/apigrouplist.php:73
-#: actions/apistatusesupdate.php:229 actions/apisubscriptions.php:87
+#: actions/apiaccountupdatedeliverydevice.php:115
+#: actions/apiaccountupdateprofile.php:106
+#: actions/apiaccountupdateprofilebackgroundimage.php:117
+#: actions/apiaccountupdateprofileimage.php:106 actions/apiblockcreate.php:98
+#: actions/apiblockdestroy.php:97 actions/apidirectmessage.php:77
+#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:114
+#: actions/apigroupismember.php:91 actions/apigroupjoin.php:101
+#: actions/apigroupleave.php:101 actions/apigrouplist.php:73
+#: actions/apistatusesupdate.php:230 actions/apisubscriptions.php:87
 #: actions/apitimelinefavorites.php:72 actions/apitimelinefriends.php:174
 #: actions/apitimelinehome.php:80 actions/apitimelinementions.php:80
 #: actions/apitimelineuser.php:82 actions/avatarbynickname.php:75
@@ -199,16 +201,16 @@ msgid "Updates from %1$s and friends on %2$s!"
 msgstr "Opdateringer fra %1$s og venner pÃ¥ %2$s!"
 
 #: actions/apiaccountratelimitstatus.php:72
-#: actions/apiaccountupdatedeliverydevice.php:94
-#: actions/apiaccountupdateprofile.php:97
-#: actions/apiaccountupdateprofilebackgroundimage.php:94
-#: actions/apiaccountupdateprofilecolors.php:118
+#: actions/apiaccountupdatedeliverydevice.php:95
+#: actions/apiaccountupdateprofile.php:98
+#: actions/apiaccountupdateprofilebackgroundimage.php:95
+#: actions/apiaccountupdateprofilecolors.php:119
 #: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156
-#: actions/apifavoritecreate.php:100 actions/apifavoritedestroy.php:101
-#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100
-#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:139
-#: actions/apigroupismember.php:115 actions/apigroupjoin.php:156
-#: actions/apigroupleave.php:142 actions/apigrouplist.php:137
+#: actions/apifavoritecreate.php:101 actions/apifavoritedestroy.php:102
+#: actions/apifriendshipscreate.php:101 actions/apifriendshipsdestroy.php:101
+#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:140
+#: actions/apigroupismember.php:115 actions/apigroupjoin.php:157
+#: actions/apigroupleave.php:143 actions/apigrouplist.php:137
 #: actions/apigrouplistall.php:122 actions/apigroupmembership.php:107
 #: actions/apigroupshow.php:116 actions/apihelptest.php:88
 #: actions/apistatusesdestroy.php:104 actions/apistatusesretweets.php:112
@@ -223,21 +225,23 @@ msgstr "Opdateringer fra %1$s og venner pÃ¥ %2$s!"
 msgid "API method not found."
 msgstr "API metode ikke fundet."
 
-#: actions/apiaccountupdatedeliverydevice.php:86
-#: actions/apiaccountupdateprofile.php:89
-#: actions/apiaccountupdateprofilebackgroundimage.php:86
-#: actions/apiaccountupdateprofilecolors.php:110
-#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89
-#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109
-#: actions/apifavoritecreate.php:91 actions/apifavoritedestroy.php:92
-#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
-#: actions/apigroupcreate.php:105 actions/apigroupjoin.php:92
-#: actions/apigroupleave.php:92 actions/apimediaupload.php:67
-#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:198
+#. TRANS: Client error message. POST is a HTTP command. It should not be translated.
+#. TRANS: Client error. POST is a HTTP command. It should not be translated.
+#: actions/apiaccountupdatedeliverydevice.php:87
+#: actions/apiaccountupdateprofile.php:90
+#: actions/apiaccountupdateprofilebackgroundimage.php:87
+#: actions/apiaccountupdateprofilecolors.php:111
+#: actions/apiaccountupdateprofileimage.php:85 actions/apiblockcreate.php:90
+#: actions/apiblockdestroy.php:89 actions/apidirectmessagenew.php:110
+#: actions/apifavoritecreate.php:92 actions/apifavoritedestroy.php:93
+#: actions/apifriendshipscreate.php:92 actions/apifriendshipsdestroy.php:92
+#: actions/apigroupcreate.php:106 actions/apigroupjoin.php:93
+#: actions/apigroupleave.php:93 actions/apimediaupload.php:68
+#: actions/apistatusesretweet.php:66 actions/apistatusesupdate.php:199
 msgid "This method requires a POST."
 msgstr "Denne metode krÃ¦ver en POST."
 
-#: actions/apiaccountupdatedeliverydevice.php:106
+#: actions/apiaccountupdatedeliverydevice.php:107
 msgid ""
 "You must specify a parameter named 'device' with a value of one of: sms, im, "
 "none."
@@ -245,27 +249,27 @@ msgstr ""
 "Du skal angive en parameter med navnet 'device', med vÃ¦rdien sat til en af "
 "fÃ¸lgende: sms, im, none."
 
-#: actions/apiaccountupdatedeliverydevice.php:133
+#: actions/apiaccountupdatedeliverydevice.php:134
 msgid "Could not update user."
 msgstr "Kunne ikke opdatere brugeren."
 
-#: actions/apiaccountupdateprofile.php:112
-#: actions/apiaccountupdateprofilebackgroundimage.php:194
-#: actions/apiaccountupdateprofilecolors.php:185
-#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/apiaccountupdateprofile.php:113
+#: actions/apiaccountupdateprofilebackgroundimage.php:195
+#: actions/apiaccountupdateprofilecolors.php:186
+#: actions/apiaccountupdateprofileimage.php:131 actions/apiusershow.php:108
 #: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/hcard.php:74
 #: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
 #: lib/profileaction.php:84
 msgid "User has no profile."
 msgstr "Brugeren har ingen profil."
 
-#: actions/apiaccountupdateprofile.php:147
+#: actions/apiaccountupdateprofile.php:148
 msgid "Could not save profile."
 msgstr "Kunne ikke gemme profilen."
 
-#: actions/apiaccountupdateprofilebackgroundimage.php:108
-#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
-#: actions/apistatusesupdate.php:212 actions/avatarsettings.php:257
+#: actions/apiaccountupdateprofilebackgroundimage.php:109
+#: actions/apiaccountupdateprofileimage.php:98 actions/apimediaupload.php:81
+#: actions/apistatusesupdate.php:213 actions/avatarsettings.php:257
 #: actions/designadminpanel.php:123 actions/editapplication.php:118
 #: actions/newapplication.php:101 actions/newnotice.php:94
 #: lib/designsettings.php:283
@@ -277,30 +281,30 @@ msgstr ""
 "Serveren var ikke i stand til at hÃ¥ndtere sÃ¥ meget POST data (%s bytes) pÃ¥ "
 "grund af sin nuvÃ¦rende konfiguration."
 
-#: actions/apiaccountupdateprofilebackgroundimage.php:136
-#: actions/apiaccountupdateprofilebackgroundimage.php:146
-#: actions/apiaccountupdateprofilecolors.php:164
-#: actions/apiaccountupdateprofilecolors.php:174
+#: actions/apiaccountupdateprofilebackgroundimage.php:137
+#: actions/apiaccountupdateprofilebackgroundimage.php:147
+#: actions/apiaccountupdateprofilecolors.php:165
+#: actions/apiaccountupdateprofilecolors.php:175
 #: actions/groupdesignsettings.php:290 actions/groupdesignsettings.php:300
 #: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
 #: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
 msgid "Unable to save your design settings."
 msgstr "Kunne ikke gemme dine design indstillinger."
 
-#: actions/apiaccountupdateprofilebackgroundimage.php:187
-#: actions/apiaccountupdateprofilecolors.php:142
+#: actions/apiaccountupdateprofilebackgroundimage.php:188
+#: actions/apiaccountupdateprofilecolors.php:143
 msgid "Could not update your design."
 msgstr "Kunne ikke opdatere dit design."
 
-#: actions/apiblockcreate.php:105
+#: actions/apiblockcreate.php:106
 msgid "You cannot block yourself!"
 msgstr "Du kan ikke blokere dig selv!"
 
-#: actions/apiblockcreate.php:126
+#: actions/apiblockcreate.php:127
 msgid "Block user failed."
 msgstr "Blokering af bruger mislykkedes"
 
-#: actions/apiblockdestroy.php:114
+#: actions/apiblockdestroy.php:115
 msgid "Unblock user failed."
 msgstr "OphÃ¦v blokering af bruger mislykkedes."
 
@@ -324,59 +328,59 @@ msgstr "Direkte beskeder til %s"
 msgid "All the direct messages sent to %s"
 msgstr "Alle direkte beskeder, sendt til %s"
 
-#: actions/apidirectmessagenew.php:118
+#: actions/apidirectmessagenew.php:119
 msgid "No message text!"
 msgstr "Ingen besked tekst!"
 
-#: actions/apidirectmessagenew.php:127 actions/newmessage.php:150
+#: actions/apidirectmessagenew.php:128 actions/newmessage.php:150
 #, php-format
 msgid "That's too long. Max message size is %d chars."
 msgstr "Det er for langt. Maksimal besked stÃ¸rrelse er %d tegn."
 
-#: actions/apidirectmessagenew.php:138
+#: actions/apidirectmessagenew.php:139
 msgid "Recipient user not found."
 msgstr "Modtager bruger ikke fundet"
 
-#: actions/apidirectmessagenew.php:142
+#: actions/apidirectmessagenew.php:143
 msgid "Can't send direct messages to users who aren't your friend."
 msgstr "Kan ikke sende direkte beskeder til brugere, som ikke din ven."
 
-#: actions/apifavoritecreate.php:109 actions/apifavoritedestroy.php:110
+#: actions/apifavoritecreate.php:110 actions/apifavoritedestroy.php:111
 #: actions/apistatusesdestroy.php:121
 msgid "No status found with that ID."
 msgstr "Ingen status fundet med dette ID."
 
-#: actions/apifavoritecreate.php:120
+#: actions/apifavoritecreate.php:121
 msgid "This status is already a favorite."
 msgstr "Denne status er allerede en favorit."
 
 #. TRANS: Error message text shown when a favorite could not be set.
-#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:296
+#: actions/apifavoritecreate.php:132 actions/favor.php:84 lib/command.php:296
 msgid "Could not create favorite."
 msgstr "Kunne ikke oprette favorit."
 
-#: actions/apifavoritedestroy.php:123
+#: actions/apifavoritedestroy.php:124
 msgid "That status is not a favorite."
 msgstr "Denne status er ikke en favorit."
 
-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
+#: actions/apifavoritedestroy.php:136 actions/disfavor.php:87
 msgid "Could not delete favorite."
 msgstr "Kunne ikke slette favorit."
 
-#: actions/apifriendshipscreate.php:109
+#: actions/apifriendshipscreate.php:110
 msgid "Could not follow user: profile not found."
 msgstr "Kunne ikke fÃ¸lge bruger: bruger profil ikke fundet."
 
-#: actions/apifriendshipscreate.php:118
+#: actions/apifriendshipscreate.php:119
 #, php-format
 msgid "Could not follow user: %s is already on your list."
 msgstr "Kunne ikke fÃ¸lge bruger: %s er allerede pÃ¥ din liste."
 
-#: actions/apifriendshipsdestroy.php:109
+#: actions/apifriendshipsdestroy.php:110
 msgid "Could not unfollow user: User not found."
 msgstr "Kunne ikke stoppe fÃ¸lgeskab af bruger: Bruger ikke fundet."
 
-#: actions/apifriendshipsdestroy.php:120
+#: actions/apifriendshipsdestroy.php:121
 msgid "You cannot unfollow yourself."
 msgstr "Du kan ikke ophÃ¦ve fÃ¸lgeskab til dig selv."
 
@@ -392,101 +396,101 @@ msgstr "Kunne ikke finde kilde bruger"
 msgid "Could not find target user."
 msgstr "Kunne ikke finde mÃ¥l bruger."
 
-#: actions/apigroupcreate.php:167 actions/editgroup.php:186
+#: actions/apigroupcreate.php:168 actions/editgroup.php:186
 #: actions/newgroup.php:126 actions/profilesettings.php:215
 #: actions/register.php:212
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr "Kaldenavn mÃ¥ kun have smÃ¥ bogstaver og tal og ingen mellemrum."
 
-#: actions/apigroupcreate.php:176 actions/editgroup.php:190
+#: actions/apigroupcreate.php:177 actions/editgroup.php:190
 #: actions/newgroup.php:130 actions/profilesettings.php:238
 #: actions/register.php:215
 msgid "Nickname already in use. Try another one."
 msgstr "Kaldenavn allerede er i brug. PrÃ¸v med et andet."
 
-#: actions/apigroupcreate.php:183 actions/editgroup.php:193
+#: actions/apigroupcreate.php:184 actions/editgroup.php:193
 #: actions/newgroup.php:133 actions/profilesettings.php:218
 #: actions/register.php:217
 msgid "Not a valid nickname."
 msgstr "Ikke et gyldigt kaldenavn"
 
-#: actions/apigroupcreate.php:199 actions/editapplication.php:215
+#: actions/apigroupcreate.php:200 actions/editapplication.php:215
 #: actions/editgroup.php:199 actions/newapplication.php:203
 #: actions/newgroup.php:139 actions/profilesettings.php:222
 #: actions/register.php:224
 msgid "Homepage is not a valid URL."
 msgstr "Hjemmesiden er ikke en gyldig URL adresse."
 
-#: actions/apigroupcreate.php:208 actions/editgroup.php:202
+#: actions/apigroupcreate.php:209 actions/editgroup.php:202
 #: actions/newgroup.php:142 actions/profilesettings.php:225
 #: actions/register.php:227
 msgid "Full name is too long (max 255 chars)."
 msgstr "Fulde navn er for langt (max 255 tegn)."
 
-#: actions/apigroupcreate.php:216 actions/editapplication.php:190
+#: actions/apigroupcreate.php:217 actions/editapplication.php:190
 #: actions/newapplication.php:172
 #, php-format
 msgid "Description is too long (max %d chars)."
 msgstr "Beskrivelse er for lang (max %d tegn)."
 
-#: actions/apigroupcreate.php:227 actions/editgroup.php:208
+#: actions/apigroupcreate.php:228 actions/editgroup.php:208
 #: actions/newgroup.php:148 actions/profilesettings.php:232
 #: actions/register.php:234
 msgid "Location is too long (max 255 chars)."
 msgstr "Placering er for lang (max 255 tegn)."
 
-#: actions/apigroupcreate.php:246 actions/editgroup.php:219
+#: actions/apigroupcreate.php:247 actions/editgroup.php:219
 #: actions/newgroup.php:159
 #, php-format
 msgid "Too many aliases! Maximum %d."
 msgstr "Alt for mange aliaser! Maksimum %d."
 
-#: actions/apigroupcreate.php:267
+#: actions/apigroupcreate.php:268
 #, php-format
 msgid "Invalid alias: \"%s\"."
 msgstr "Ugyldigt alias: \"%s\"."
 
-#: actions/apigroupcreate.php:276 actions/editgroup.php:232
+#: actions/apigroupcreate.php:277 actions/editgroup.php:232
 #: actions/newgroup.php:172
 #, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr "Alias \"%s\" er allerede i brug. PrÃ¸v med et andet."
 
-#: actions/apigroupcreate.php:289 actions/editgroup.php:238
+#: actions/apigroupcreate.php:290 actions/editgroup.php:238
 #: actions/newgroup.php:178
 msgid "Alias can't be the same as nickname."
 msgstr "Alias kan ikke vÃ¦re det samme som kaldenavn."
 
-#: actions/apigroupismember.php:96 actions/apigroupjoin.php:105
-#: actions/apigroupleave.php:105 actions/apigroupmembership.php:92
+#: actions/apigroupismember.php:96 actions/apigroupjoin.php:106
+#: actions/apigroupleave.php:106 actions/apigroupmembership.php:92
 #: actions/apigroupshow.php:83 actions/apitimelinegroup.php:92
 msgid "Group not found."
 msgstr "Gruppen blev ikke fundet."
 
 #. TRANS: Error text shown a user tries to join a group they already are a member of.
-#: actions/apigroupjoin.php:111 actions/joingroup.php:100 lib/command.php:336
+#: actions/apigroupjoin.php:112 actions/joingroup.php:100 lib/command.php:336
 msgid "You are already a member of that group."
 msgstr "Du er allerede medlem af denne gruppe."
 
 #. TRANS: Error text shown when a user tries to join a group they are blocked from joining.
-#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:341
+#: actions/apigroupjoin.php:121 actions/joingroup.php:105 lib/command.php:341
 msgid "You have been blocked from that group by the admin."
 msgstr "Du er blevet blokeret fra denne gruppe af administratoren."
 
 #. 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.
-#: actions/apigroupjoin.php:139 actions/joingroup.php:134 lib/command.php:353
+#: actions/apigroupjoin.php:140 actions/joingroup.php:134 lib/command.php:353
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "Kunne ikke tilslutte bruger %1$s til gruppe %2$s."
 
-#: actions/apigroupleave.php:115
+#: actions/apigroupleave.php:116
 msgid "You are not a member of this group."
 msgstr "Du er ikke medlem af denne gruppe."
 
 #. 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.
-#: actions/apigroupleave.php:125 actions/leavegroup.php:129
+#: actions/apigroupleave.php:126 actions/leavegroup.php:129
 #: lib/command.php:401
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
@@ -516,7 +520,7 @@ msgstr "%s's grupper"
 msgid "groups on %s"
 msgstr "grupper pÃ¥ %s"
 
-#: actions/apimediaupload.php:99
+#: actions/apimediaupload.php:100
 msgid "Upload failed."
 msgstr "Upload mislykkedes."
 
@@ -530,9 +534,9 @@ msgstr "Ugyldigt token."
 
 #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
 #: actions/deletenotice.php:169 actions/disfavor.php:74
-#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:55
+#: actions/emailsettings.php:271 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:66 actions/imsettings.php:227
+#: actions/groupunblock.php:66 actions/imsettings.php:230
 #: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
@@ -577,8 +581,8 @@ msgstr "Anmodnings-token %s er blevet afvist og trukket tilbage."
 #. 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:286 actions/grouplogo.php:322
-#: actions/imsettings.php:242 actions/newapplication.php:121
+#: actions/emailsettings.php:290 actions/grouplogo.php:322
+#: actions/imsettings.php:245 actions/newapplication.php:121
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
 #: actions/smssettings.php:277 lib/designsettings.php:304
 msgid "Unexpected form submission."
@@ -642,18 +646,18 @@ msgstr "Denne metode krÃ¦ver en POST eller DELETE."
 msgid "You may not delete another user's status."
 msgstr "Du kan ikke slette en anden brugers status."
 
-#: actions/apistatusesretweet.php:75 actions/apistatusesretweets.php:72
+#: actions/apistatusesretweet.php:76 actions/apistatusesretweets.php:72
 #: actions/deletenotice.php:52 actions/shownotice.php:92
 msgid "No such notice."
 msgstr "Ingen sÃ¥dan meddelelse."
 
 #. TRANS: Error text shown when trying to repeat an own notice.
-#: actions/apistatusesretweet.php:83 lib/command.php:538
+#: actions/apistatusesretweet.php:84 lib/command.php:538
 msgid "Cannot repeat your own notice."
 msgstr "Kan ikke gentage din egen meddelelse."
 
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-#: actions/apistatusesretweet.php:91 lib/command.php:544
+#: actions/apistatusesretweet.php:92 lib/command.php:544
 msgid "Already repeated that notice."
 msgstr "Allerede gentaget denne medelelse."
 
@@ -665,21 +669,21 @@ msgstr "Status slettet."
 msgid "No status with that ID found."
 msgstr "Ingen status med dette ID fundet."
 
-#: actions/apistatusesupdate.php:221
+#: actions/apistatusesupdate.php:222
 msgid "Client must provide a 'status' parameter with a value."
 msgstr "Klienten programmet skal give en \"status\" parameter med en vÃ¦rdi."
 
-#: actions/apistatusesupdate.php:242 actions/newnotice.php:157
+#: actions/apistatusesupdate.php:243 actions/newnotice.php:157
 #: lib/mailhandler.php:60
 #, php-format
 msgid "That's too long. Max notice size is %d chars."
 msgstr "Det er for langt. Maksimal besked stÃ¸rrelse er %d tegn."
 
-#: actions/apistatusesupdate.php:283 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:284 actions/apiusershow.php:96
 msgid "Not found."
 msgstr "Ikke fundet."
 
-#: actions/apistatusesupdate.php:306 actions/newnotice.php:181
+#: actions/apistatusesupdate.php:307 actions/newnotice.php:181
 #, php-format
 msgid "Max notice size is %d chars, including attachment URL."
 msgstr "Max meddelelse stÃ¸rrelse er %d tegn, inklusiv vedlagt URL."
@@ -880,7 +884,9 @@ msgid "Yes"
 msgstr "Ja"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
+#. TRANS: Submit button title.
+#. TRANS: Description of the form to block a user.
+#: actions/block.php:164 actions/groupmembers.php:403 lib/blockform.php:82
 msgid "Block this user"
 msgstr "Bloker denne bruger"
 
@@ -922,11 +928,13 @@ msgstr "En liste over brugere blokeret fra at deltage i denne gruppe."
 msgid "Unblock user from group"
 msgstr "OphÃ¦v blokering af bruger fra gruppe"
 
-#: actions/blockedfromgroup.php:320 lib/unblockform.php:69
+#. TRANS: Title for the form to unblock a user.
+#: actions/blockedfromgroup.php:320 lib/unblockform.php:70
 msgid "Unblock"
 msgstr "Fjern blokering"
 
-#: actions/blockedfromgroup.php:320 lib/unblockform.php:80
+#. TRANS: Description of the form to unblock a user.
+#: actions/blockedfromgroup.php:320 lib/unblockform.php:82
 msgid "Unblock this user"
 msgstr "Fjern blokeringen af denne bruger"
 
@@ -965,9 +973,9 @@ msgstr "Denne adresse er allerede blevet bekrÃ¦ftet."
 #. 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/confirmaddress.php:116 actions/emailsettings.php:331
+#: actions/emailsettings.php:477 actions/imsettings.php:283
+#: actions/imsettings.php:442 actions/othersettings.php:174
 #: actions/profilesettings.php:283 actions/smssettings.php:308
 #: actions/smssettings.php:464
 msgid "Couldn't update user."
@@ -975,7 +983,7 @@ msgstr "Kunne ikke opdatere brugeren."
 
 #. 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/confirmaddress.php:128 actions/emailsettings.php:437
 #: actions/smssettings.php:422
 msgid "Couldn't delete email confirmation."
 msgstr "Kunne ikke slette e-mail bekrÃ¦ftelse."
@@ -1011,9 +1019,10 @@ msgstr "Program ikke fundet."
 msgid "You are not the owner of this application."
 msgstr "Du er ikke ejer af dette program."
 
+#. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:127
 #: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1307
+#: lib/action.php:1315
 msgid "There was a problem with your session token."
 msgstr "Der var et problem med din session token."
 
@@ -1046,7 +1055,7 @@ msgstr "Slet dette program"
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
 #: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:73 lib/profileformaction.php:64
+#: lib/adminpanelaction.php:71 lib/profileformaction.php:64
 #: lib/settingsaction.php:72
 msgid "Not logged in."
 msgstr "Ikke logget ind"
@@ -1109,7 +1118,6 @@ msgstr "Slet denne bruger"
 #. TRANS: Message used as title for design settings for the site.
 #. TRANS: Link description in user account settings menu.
 #: actions/designadminpanel.php:63 lib/accountsettingsaction.php:139
-#: lib/groupnav.php:119
 msgid "Design"
 msgstr "Design"
 
@@ -1230,13 +1238,13 @@ msgstr "Gendan standard indstillinger"
 msgid "Reset back to default"
 msgstr "Nulstil til standard vÃ¦rdier"
 
-#. TRANS: Submit button title
+#. TRANS: Submit button title.
 #: actions/designadminpanel.php:685 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/snapshotadminpanel.php:245
 #: actions/subscriptions.php:226 actions/tagother.php:154
-#: actions/useradminpanel.php:294 lib/applicationeditform.php:363
+#: actions/useradminpanel.php:294 lib/applicationeditform.php:353
 #: lib/designsettings.php:256 lib/groupeditform.php:202
 msgid "Save"
 msgstr "Gem"
@@ -1392,7 +1400,7 @@ msgstr "NuvÃ¦rende bekrÃ¦ftet email-adresse."
 #. 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/emailsettings.php:115 actions/emailsettings.php:162
 #: actions/imsettings.php:116 actions/smssettings.php:124
 #: actions/smssettings.php:180
 msgctxt "BUTTON"
@@ -1410,22 +1418,26 @@ msgstr ""
 #. 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
+#. TRANS: Button label in the "Edit application" form.
 #: actions/emailsettings.php:127 actions/imsettings.php:131
-#: actions/smssettings.php:137 lib/applicationeditform.php:357
+#: actions/smssettings.php:137 lib/applicationeditform.php:347
 msgctxt "BUTTON"
 msgid "Cancel"
 msgstr "Afbryd"
 
-#. TRANS: Instructions for e-mail address input form.
-#: actions/emailsettings.php:135
+#. TRANS: Instructions for e-mail address input form. Do not translate
+#. TRANS: "example.org". It is one of the domain names reserved for
+#. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
+#. TRANS: Any other domain may be owned by a legitimate person or
+#. TRANS: organization.
+#: actions/emailsettings.php:139
 msgid "Email address, like \"UserName@example.org\""
 msgstr "E-mail adresse, som \"UserName@example.org\""
 
 #. 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/emailsettings.php:143 actions/imsettings.php:151
 #: actions/smssettings.php:162
 msgctxt "BUTTON"
 msgid "Add"
@@ -1433,111 +1445,111 @@ msgstr "TilfÃ¸j"
 
 #. 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
+#: actions/emailsettings.php:151 actions/smssettings.php:171
 msgid "Incoming email"
 msgstr "IndgÃ¥ende e-mail"
 
 #. 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
+#: actions/emailsettings.php:159 actions/smssettings.php:178
 msgid "Send email to this address to post new notices."
 msgstr "Send e-mail til denne adresse for at skrive nye bekendtgÃ¸relser."
 
 #. 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
+#: actions/emailsettings.php:168 actions/smssettings.php:186
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr ""
 "Opret en ny e-mail adresse til postering af beskeder; annullerer den gamle."
 
 #. 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
+#: actions/emailsettings.php:172 actions/smssettings.php:189
 msgctxt "BUTTON"
 msgid "New"
 msgstr "Ny"
 
 #. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:174
+#: actions/emailsettings.php:178
 msgid "Email preferences"
 msgstr "Email indstillinger"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:180
+#: actions/emailsettings.php:184
 msgid "Send me notices of new subscriptions through email."
 msgstr "Send mig meddelelser om nye abonnementer via e-mail."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:186
+#: actions/emailsettings.php:190
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr "Send mig email, nÃ¥r nogen har tilfÃ¸jet min meddelelse som en favorit."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:193
+#: actions/emailsettings.php:197
 msgid "Send me email when someone sends me a private message."
 msgstr "Send mig email, nÃ¥r nogen sender mig en privat besked."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:199
+#: actions/emailsettings.php:203
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr "Send mig email, nÃ¥r nogen sender mig et \"@-svar\"."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:205
+#: actions/emailsettings.php:209
 msgid "Allow friends to nudge me and send me an email."
 msgstr "Tillad venner at puffe mig og at sende mig en e-mail."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:212
+#: actions/emailsettings.php:216
 msgid "I want to post notices by email."
 msgstr "Jeg Ã¸nsker at sende meddelelser via e-mail."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:219
+#: actions/emailsettings.php:223
 msgid "Publish a MicroID for my email address."
 msgstr "Udgiv et MicroID til min email adresse."
 
 #. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:334
+#: actions/emailsettings.php:338
 msgid "Email preferences saved."
 msgstr "Email indstillinger gemt."
 
 #. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:353
+#: actions/emailsettings.php:357
 msgid "No email address."
 msgstr "Ingen e-mail-adresse."
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:361
+#: actions/emailsettings.php:365
 msgid "Cannot normalize that email address"
 msgstr "Kan ikke normalisere denne e-mail adresse"
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:208
+#: actions/emailsettings.php:370 actions/register.php:208
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "Ikke en gyldig e-mail adresse."
 
 #. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:370
+#: actions/emailsettings.php:374
 msgid "That is already your email address."
 msgstr "Det er allerede din e-mail adresse."
 
 #. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:374
+#: actions/emailsettings.php:378
 msgid "That email address already belongs to another user."
 msgstr "Denne e-mail adresse tilhÃ¸rer allerede en anden bruger."
 
 #. 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/emailsettings.php:395 actions/imsettings.php:351
 #: actions/smssettings.php:373
 msgid "Couldn't insert confirmation code."
 msgstr "Kunne ikke indsÃ¦tte bekrÃ¦ftelseskode."
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:398
+#: actions/emailsettings.php:402
 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."
@@ -1549,50 +1561,50 @@ msgstr ""
 #. 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/emailsettings.php:423 actions/imsettings.php:386
 #: actions/smssettings.php:408
 msgid "No pending confirmation to cancel."
 msgstr "Ingen afventende bekrÃ¦ftelse at annullere."
 
 #. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:424
+#: actions/emailsettings.php:428
 msgid "That is the wrong email address."
 msgstr "Det er den forkerte e-mail adresse."
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:438
+#: actions/emailsettings.php:442
 msgid "Email confirmation cancelled."
 msgstr "Email bekrÃ¦ftelse aflyst."
 
 #. TRANS: Message given trying to remove an e-mail address that is not
 #. TRANS: registered for the active user.
-#: actions/emailsettings.php:458
+#: actions/emailsettings.php:462
 msgid "That is not your email address."
 msgstr "Det er ikke din e-mail adresse."
 
 #. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:479
+#: actions/emailsettings.php:483
 msgid "The email address was removed."
 msgstr "E-mail adressen blev fjernet."
 
-#: actions/emailsettings.php:493 actions/smssettings.php:568
+#: actions/emailsettings.php:497 actions/smssettings.php:568
 msgid "No incoming email address."
 msgstr "Ingen indkommende e-mail adresse."
 
 #. 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/emailsettings.php:508 actions/emailsettings.php:532
 #: actions/smssettings.php:578 actions/smssettings.php:602
 msgid "Couldn't update user record."
 msgstr "Kunne ikke opdatere bruger oplysninger."
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
-#: actions/emailsettings.php:508 actions/smssettings.php:581
+#: actions/emailsettings.php:512 actions/smssettings.php:581
 msgid "Incoming email address removed."
 msgstr "IndgÃ¥ende e-mail adresse fjernet."
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
-#: actions/emailsettings.php:532 actions/smssettings.php:605
+#: actions/emailsettings.php:536 actions/smssettings.php:605
 msgid "New incoming email address added."
 msgstr "Ny indkommende e-mail adresse tilfÃ¸jet."
 
@@ -1711,7 +1723,7 @@ msgstr "Kunne ikke konvertere anmodnings-token til et adgangs-token."
 msgid "Remote service uses unknown version of OMB protocol."
 msgstr "Fjerntjenesten bruger en ukendt version af 0MB protokol."
 
-#: actions/finishremotesubscribe.php:138
+#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306
 msgid "Error updating remote profile."
 msgstr "Fejl ved opdatering af fjernbetjeningsprofil."
 
@@ -1768,7 +1780,7 @@ msgstr "Bruger er allerede blokeret fra gruppen."
 msgid "User is not a member of group."
 msgstr "Brugeren er ikke medlem af gruppen."
 
-#: actions/groupblock.php:134 actions/groupmembers.php:360
+#: actions/groupblock.php:134 actions/groupmembers.php:364
 msgid "Block user from group"
 msgstr "Bloker bruger fra gruppe"
 
@@ -1850,40 +1862,32 @@ msgstr "Logo opdateret."
 msgid "Failed updating logo."
 msgstr "Mislykket ajourfÃ¸ring af logo."
 
-#: actions/groupmembers.php:100 lib/groupnav.php:92
+#. TRANS: Title of the page showing group members.
+#. TRANS: %s is the name of the group.
+#: actions/groupmembers.php:102
 #, php-format
 msgid "%s group members"
 msgstr "%s gruppe medlemmer"
 
-#: actions/groupmembers.php:103
+#. TRANS: Title of the page showing group members.
+#. TRANS: %1$s is the name of the group, %2$d is the page number of the members list.
+#: actions/groupmembers.php:107
 #, php-format
 msgid "%1$s group members, page %2$d"
 msgstr "%1$s gruppe medlemmer, side %2$d"
 
-#: actions/groupmembers.php:118
+#: actions/groupmembers.php:122
 msgid "A list of the users in this group."
 msgstr "En liste over brugerne i denne gruppe."
 
-#: actions/groupmembers.php:182 lib/groupnav.php:107
+#: actions/groupmembers.php:186
 msgid "Admin"
 msgstr "Administrator"
 
-#: actions/groupmembers.php:392 lib/blockform.php:69
-msgid "Block"
-msgstr "Bloker"
-
-#: actions/groupmembers.php:487
+#: actions/groupmembers.php:498
 msgid "Make user an admin of the group"
 msgstr "GÃ¸r bruger til administrator af gruppen"
 
-#: actions/groupmembers.php:519
-msgid "Make Admin"
-msgstr "GÃ¸r til administrator"
-
-#: actions/groupmembers.php:519
-msgid "Make this user an admin"
-msgstr "GÃ¸r denne bruger til administrator"
-
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Title in atom group notice feed. %s is a group name.
 #. TRANS: Title in atom user notice feed. %s is a user name.
@@ -2022,7 +2026,10 @@ msgstr ""
 
 #. TRANS: IM address input field instructions in IM settings form.
 #. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:140
+#. TRANS: Do not translate "example.org". It is one of the domain names reserved for use in examples by
+#. TRANS: http://www.rfc-editor.org/rfc/rfc2606.txt. Any other domain may be owned by a legitimate
+#. TRANS: person or organization.
+#: actions/imsettings.php:143
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -2032,63 +2039,63 @@ msgstr ""
 "sÃ¸rge for at tilfÃ¸je %s til din venneliste i din IM klient eller pÃ¥ GTalk."
 
 #. TRANS: Form legend for IM preferences form.
-#: actions/imsettings.php:155
+#: actions/imsettings.php:158
 msgid "IM preferences"
 msgstr "Chat indstillinger"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:160
+#: actions/imsettings.php:163
 msgid "Send me notices through Jabber/GTalk."
 msgstr "Send mig meddelelser via Jabber / GTalk."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:166
+#: actions/imsettings.php:169
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr "Send en note, nÃ¥r min Jabber / GTalk status Ã¦ndringer."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:172
+#: actions/imsettings.php:175
 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr "Send mig svar gennem Jabber / GTalk fra folk, jeg ikke abonnerer pÃ¥."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:179
+#: actions/imsettings.php:182
 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "Udgiv et MicroID for min Jabber / GTalk adresse."
 
 #. TRANS: Confirmation message for successful IM preferences save.
-#: actions/imsettings.php:287 actions/othersettings.php:180
+#: actions/imsettings.php:290 actions/othersettings.php:180
 msgid "Preferences saved."
 msgstr "Indstillinger gemt."
 
 #. TRANS: Message given saving IM address without having provided one.
-#: actions/imsettings.php:309
+#: actions/imsettings.php:312
 msgid "No Jabber ID."
 msgstr "Ingen Jabber ID."
 
 #. TRANS: Message given saving IM address that cannot be normalised.
-#: actions/imsettings.php:317
+#: actions/imsettings.php:320
 msgid "Cannot normalize that Jabber ID"
 msgstr "Kan ikke normalisere denne Jabber ID"
 
 #. TRANS: Message given saving IM address that not valid.
-#: actions/imsettings.php:322
+#: actions/imsettings.php:325
 msgid "Not a valid Jabber ID"
 msgstr "Ikke et gyldigt Jabber ID"
 
 #. TRANS: Message given saving IM address that is already set.
-#: actions/imsettings.php:326
+#: actions/imsettings.php:329
 msgid "That is already your Jabber ID."
 msgstr "Det er allerede din Jabber ID."
 
 #. TRANS: Message given saving IM address that is already set for another user.
-#: actions/imsettings.php:330
+#: actions/imsettings.php:333
 msgid "Jabber ID already belongs to another user."
 msgstr "Jabber ID tilhÃ¸rer allerede en anden bruger."
 
 #. 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
+#: actions/imsettings.php:361
 #, php-format
 msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
@@ -2098,28 +2105,28 @@ msgstr ""
 "godkende %s for at sende beskeder til dig."
 
 #. TRANS: Message given canceling IM address confirmation for the wrong IM address.
-#: actions/imsettings.php:388
+#: actions/imsettings.php:391
 msgid "That is the wrong IM address."
 msgstr "Det er den forkerte IM-adresse."
 
 #. TRANS: Server error thrown on database error canceling IM address confirmation.
-#: actions/imsettings.php:397
+#: actions/imsettings.php:400
 msgid "Couldn't delete IM confirmation."
 msgstr "Kunne ikke slette IM bekrÃ¦ftelse."
 
 #. TRANS: Message given after successfully canceling IM address confirmation.
-#: actions/imsettings.php:402
+#: actions/imsettings.php:405
 msgid "IM confirmation cancelled."
 msgstr "IM bekrÃ¦ftelse afbrudt."
 
 #. TRANS: Message given trying to remove an IM address that is not
 #. TRANS: registered for the active user.
-#: actions/imsettings.php:424
+#: actions/imsettings.php:427
 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
+#: actions/imsettings.php:450
 msgid "The IM address was removed."
 msgstr "IM-adresse blev fjernet."
 
@@ -2380,6 +2387,10 @@ msgstr "Kan ikke finde medlemskab oplysninger for %1$s i gruppen %2$s."
 msgid "Can't make %1$s an admin for group %2$s."
 msgstr "Kan ikke gÃ¸re %1$s til admin for gruppen %2$s."
 
+#: actions/microsummary.php:69
+msgid "No current status."
+msgstr ""
+
 #: actions/newapplication.php:52
 msgid "New Application"
 msgstr "Nyt program"
@@ -2555,6 +2566,10 @@ msgstr "Du er ikke bruger af dette program."
 msgid "Unable to revoke access for app: %s."
 msgstr ""
 
+#: actions/oauthconnectionssettings.php:198
+msgid "You have not authorized any applications to use your account."
+msgstr ""
+
 #: actions/oauthconnectionssettings.php:211
 msgid "Developers can edit the registration settings for their applications "
 msgstr ""
@@ -2571,6 +2586,10 @@ msgstr ""
 msgid "Only %s URLs over plain HTTP please."
 msgstr ""
 
+#: actions/opensearch.php:64
+msgid "People Search"
+msgstr ""
+
 #: actions/othersettings.php:71
 msgid "Manage various other options."
 msgstr ""
@@ -2599,6 +2618,24 @@ msgstr ""
 msgid "No login token requested."
 msgstr ""
 
+#: actions/otp.php:104
+msgid "Login token expired."
+msgstr ""
+
+#: actions/outbox.php:58
+#, php-format
+msgid "Outbox for %1$s - page %2$d"
+msgstr ""
+
+#: actions/outbox.php:61
+#, php-format
+msgid "Outbox for %s"
+msgstr ""
+
+#: actions/outbox.php:116
+msgid "This is your outbox, which lists private messages you have sent."
+msgstr ""
+
 #: actions/passwordsettings.php:104
 msgid "Old password"
 msgstr "Gammel adgangskode"
@@ -2616,6 +2653,10 @@ msgstr ""
 msgid "Confirm"
 msgstr "BekrÃ¦ft"
 
+#: actions/passwordsettings.php:113 actions/recoverpassword.php:240
+msgid "Same as password above"
+msgstr ""
+
 #: actions/passwordsettings.php:117
 msgid "Change"
 msgstr "Ãndre"
@@ -2628,12 +2669,20 @@ msgstr ""
 msgid "Passwords don't match."
 msgstr ""
 
+#: actions/passwordsettings.php:165
+msgid "Incorrect old password"
+msgstr ""
+
 #: actions/passwordsettings.php:181
 msgid "Error saving user; invalid."
 msgstr ""
 
+#: actions/passwordsettings.php:186 actions/recoverpassword.php:381
+msgid "Can't save new password."
+msgstr ""
+
 #. TRANS: Menu item for site administration
-#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:384
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:371
 msgid "Paths"
 msgstr ""
 
@@ -2688,6 +2737,10 @@ msgstr "Tema"
 msgid "Theme server"
 msgstr ""
 
+#: actions/pathsadminpanel.php:268
+msgid "Theme path"
+msgstr ""
+
 #: actions/pathsadminpanel.php:272
 msgid "Theme directory"
 msgstr ""
@@ -2724,6 +2777,17 @@ msgstr ""
 msgid "Save paths"
 msgstr ""
 
+#: actions/peoplesearch.php:52
+#, php-format
+msgid ""
+"Search for people on %%site.name%% by their name, location, or interests. "
+"Separate the terms by spaces; they must be 3 characters or more."
+msgstr ""
+
+#: actions/peoplesearch.php:58
+msgid "People search"
+msgstr ""
+
 #: actions/postnotice.php:101
 #, php-format
 msgid "Notice license â%1$sâ is not compatible with site license â%2$sâ."
@@ -2746,7 +2810,7 @@ msgstr ""
 
 #. TRANS: Form input field label.
 #: actions/profilesettings.php:115 actions/register.php:460
-#: lib/applicationeditform.php:244 lib/groupeditform.php:161
+#: lib/applicationeditform.php:235 lib/groupeditform.php:161
 msgid "Homepage"
 msgstr "Hjemmeside"
 
@@ -2900,6 +2964,10 @@ msgstr ""
 msgid "Reset password"
 msgstr "Nulstil adgangskode"
 
+#: actions/recoverpassword.php:209
+msgid "Recover password"
+msgstr ""
+
 #: actions/recoverpassword.php:210 actions/recoverpassword.php:335
 msgid "Password recovery requested"
 msgstr ""
@@ -3085,6 +3153,11 @@ msgstr ""
 msgid "Only logged-in users can repeat notices."
 msgstr ""
 
+#: actions/replies.php:128
+#, php-format
+msgid "Replies to %1$s, page %2$d"
+msgstr ""
+
 #: actions/replies.php:204
 #, php-format
 msgid ""
@@ -3092,9 +3165,16 @@ msgid ""
 "[join groups](%%action.groups%%)."
 msgstr ""
 
+#: actions/replies.php:206
+#, php-format
+msgid ""
+"You can try to [nudge %1$s](../%2$s) or [post something to them](%%%%action."
+"newnotice%%%%?status_textarea=%3$s)."
+msgstr ""
+
 #. TRANS: Menu item for site administration
 #: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
-#: lib/adminpanelaction.php:392
+#: lib/adminpanelaction.php:379
 msgid "Sessions"
 msgstr ""
 
@@ -3115,7 +3195,7 @@ msgid "Turn on debugging output for sessions."
 msgstr ""
 
 #. TRANS: Form input field label for application icon.
-#: actions/showapplication.php:159 lib/applicationeditform.php:182
+#: actions/showapplication.php:159 lib/applicationeditform.php:173
 msgid "Icon"
 msgstr ""
 
@@ -3181,7 +3261,11 @@ msgstr ""
 msgid "URL"
 msgstr ""
 
-#: actions/showgroup.php:393 actions/showgroup.php:445 lib/groupnav.php:91
+#: actions/showgroup.php:293 lib/groupeditform.php:184
+msgid "Aliases"
+msgstr ""
+
+#: actions/showgroup.php:393 actions/showgroup.php:445
 msgid "Members"
 msgstr ""
 
@@ -3218,16 +3302,32 @@ msgid ""
 "their life and interests. "
 msgstr ""
 
+#: actions/showgroup.php:489
+msgid "Admins"
+msgstr ""
+
 #: actions/showmessage.php:98
 msgid "Only the sender and recipient may read this message."
 msgstr ""
 
+#: actions/showstream.php:148
+#, php-format
+msgid "FOAF for %s"
+msgstr ""
+
 #: actions/showstream.php:205
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
 msgstr ""
 
+#: actions/showstream.php:207
+#, php-format
+msgid ""
+"You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
+"%?status_textarea=%2$s)."
+msgstr ""
+
 #: actions/showstream.php:243
 #, php-format
 msgid ""
@@ -3286,6 +3386,10 @@ msgstr ""
 msgid "URL used for credits link in footer of each page"
 msgstr ""
 
+#: actions/siteadminpanel.php:245
+msgid "Local"
+msgstr ""
+
 #: actions/siteadminpanel.php:256
 msgid "Default timezone"
 msgstr ""
@@ -3322,6 +3426,10 @@ msgstr ""
 msgid "How long users must wait (in seconds) to post the same thing again."
 msgstr ""
 
+#: actions/sitenoticeadminpanel.php:67
+msgid "Edit site-wide message"
+msgstr ""
+
 #: actions/sitenoticeadminpanel.php:113
 msgid "Max length for the site-wide notice is 255 chars."
 msgstr ""
@@ -3376,9 +3484,14 @@ msgid ""
 "email but isn't listed here, send email to let us know at %s."
 msgstr ""
 
+#. TRANS: Message given saving SMS phone number confirmation code without having provided one.
+#: actions/smssettings.php:548
+msgid "No code entered"
+msgstr ""
+
 #. TRANS: Menu item for site administration
 #: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
-#: lib/adminpanelaction.php:408
+#: lib/adminpanelaction.php:395
 msgid "Snapshots"
 msgstr ""
 
@@ -3488,6 +3601,10 @@ msgstr ""
 msgid "%s is not listening to anyone."
 msgstr ""
 
+#: actions/subscriptions.php:208
+msgid "Jabber"
+msgstr ""
+
 #: actions/subscriptions.php:222 lib/connectsettingsaction.php:115
 msgid "SMS"
 msgstr ""
@@ -3568,6 +3685,14 @@ msgstr ""
 msgid "Default subscription"
 msgstr ""
 
+#: actions/useradminpanel.php:242
+msgid "Automatically subscribe new users to this user."
+msgstr ""
+
+#: actions/useradminpanel.php:256
+msgid "Invitations enabled"
+msgstr ""
+
 #: actions/useradminpanel.php:258
 msgid "Whether to allow users to invite new users."
 msgstr ""
@@ -3583,6 +3708,10 @@ msgid ""
 "click âRejectâ."
 msgstr ""
 
+#: actions/userauthorization.php:219
+msgid "Reject"
+msgstr ""
+
 #: actions/userauthorization.php:232
 msgid "No authorization request!"
 msgstr ""
@@ -3725,6 +3854,11 @@ msgstr ""
 msgid "A file this large would exceed your monthly quota of %d bytes."
 msgstr ""
 
+#. TRANS: Exception thrown when trying to leave a group fails.
+#: classes/Group_member.php:63
+msgid "Group leave failed."
+msgstr ""
+
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
 #: classes/Memcached_DataObject.php:533
 msgid "No database name or DSN found anywhere."
@@ -3781,6 +3915,13 @@ msgstr ""
 msgid "Problem saving group inbox."
 msgstr ""
 
+#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
+#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
+#: classes/Notice.php:1759
+#, php-format
+msgid "RT @%1$s %2$s"
+msgstr ""
+
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
 #: classes/Profile.php:737
@@ -3822,11 +3963,22 @@ msgstr ""
 msgid "Change email handling"
 msgstr ""
 
+#. TRANS: Link title attribute in user account settings menu.
+#: lib/accountsettingsaction.php:144
+msgid "Other options"
+msgstr ""
+
 #. TRANS: Link description in user account settings menu.
 #: lib/accountsettingsaction.php:146
 msgid "Other"
 msgstr ""
 
+#. TRANS: Page title. %1$s is the title, %2$s is the site name.
+#: lib/action.php:148
+#, php-format
+msgid "%1$s - %2$s"
+msgstr ""
+
 #. TRANS: Page title for a page without a title set.
 #: lib/action.php:164
 msgid "Untitled page"
@@ -3843,6 +3995,12 @@ msgctxt "TOOLTIP"
 msgid "Personal profile and friends timeline"
 msgstr ""
 
+#. TRANS: Main menu option when logged in for access to personal profile and friends timeline
+#: lib/action.php:458
+msgctxt "MENU"
+msgid "Personal"
+msgstr ""
+
 #. TRANS: Tooltip for main menu option "Account"
 #: lib/action.php:460
 msgctxt "TOOLTIP"
@@ -3861,6 +4019,26 @@ msgctxt "TOOLTIP"
 msgid "Change site configuration"
 msgstr ""
 
+#. TRANS: Main menu option when logged in and site admin for access to site configuration
+#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
+#: lib/action.php:474 lib/groupnav.php:117
+msgctxt "MENU"
+msgid "Admin"
+msgstr ""
+
+#. TRANS: Tooltip for main menu option "Invite"
+#: lib/action.php:478
+#, php-format
+msgctxt "TOOLTIP"
+msgid "Invite friends and colleagues to join you on %s"
+msgstr ""
+
+#. TRANS: Tooltip for main menu option "Register"
+#: lib/action.php:495
+msgctxt "TOOLTIP"
+msgid "Create an account"
+msgstr ""
+
 #. TRANS: Tooltip for main menu option "Help"
 #: lib/action.php:507
 msgctxt "TOOLTIP"
@@ -3918,7 +4096,10 @@ msgid "StatusNet software license"
 msgstr ""
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
-#: lib/action.php:843
+#. TRANS: Text between [] is a link description, text between () is the link itself.
+#. TRANS: Make sure there is no whitespace between "]" and "(".
+#. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
+#: lib/action.php:846
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -3926,13 +4107,16 @@ msgid ""
 msgstr ""
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:846
+#: lib/action.php:849
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr ""
 
 #. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.
-#: lib/action.php:850
+#. TRANS: Make sure there is no whitespace between "]" and "(".
+#. TRANS: Text between [] is a link description, text between () is the link itself.
+#. TRANS: %s is the version of StatusNet that is being used.
+#: lib/action.php:856
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -3941,44 +4125,45 @@ msgid ""
 msgstr ""
 
 #. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:866
+#: lib/action.php:872
 msgid "Site content license"
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:873
+#: lib/action.php:879
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:880
+#: lib/action.php:886
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:884
+#: lib/action.php:890
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 
-#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:897
+#. TRANS: license message in footer.
+#. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
+#: lib/action.php:904
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr ""
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1247
+#: lib/action.php:1254
 msgid "After"
 msgstr ""
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1257
+#: lib/action.php:1264
 msgid "Before"
 msgstr ""
 
@@ -3987,121 +4172,149 @@ msgstr ""
 msgid "Expecting a root feed element but got a whole XML document."
 msgstr ""
 
-#: lib/activityutils.php:208
+#. TRANS: Client exception thrown when there is no source attribute.
+#: lib/activityutils.php:203
 msgid "Can't handle remote content yet."
 msgstr ""
 
-#: lib/activityutils.php:244
+#. TRANS: Client exception thrown when there embedded XML content is found that cannot be processed yet.
+#: lib/activityutils.php:240
 msgid "Can't handle embedded XML content yet."
 msgstr ""
 
-#: lib/activityutils.php:248
+#. TRANS: Client exception thrown when base64 encoded content is found that cannot be processed yet.
+#: lib/activityutils.php:245
 msgid "Can't handle embedded Base64 content yet."
 msgstr ""
 
 #. TRANS: Client error message throw when a certain panel's settings cannot be changed.
-#: lib/adminpanelaction.php:110
+#: lib/adminpanelaction.php:108
 msgid "Changes to that panel are not allowed."
 msgstr ""
 
 #. TRANS: Client error message.
-#: lib/adminpanelaction.php:229
+#: lib/adminpanelaction.php:222
 msgid "showForm() not implemented."
 msgstr ""
 
 #. TRANS: Client error message
-#: lib/adminpanelaction.php:259
+#: lib/adminpanelaction.php:250
 msgid "saveSettings() not implemented."
 msgstr ""
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:350
+#: lib/adminpanelaction.php:337
 msgid "Basic site configuration"
 msgstr ""
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:358
+#: lib/adminpanelaction.php:345
 msgid "Design configuration"
 msgstr ""
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:368 lib/personalgroupnav.php:115
+#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:115
 msgid "User"
 msgstr ""
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:374
+#: lib/adminpanelaction.php:361
 msgid "Access configuration"
 msgstr ""
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:406
+#: lib/adminpanelaction.php:393
 msgid "Snapshots configuration"
 msgstr ""
 
 #. TRANS: Client error 401.
-#: lib/apiauth.php:113
+#: lib/apiauth.php:111
 msgid "API resource requires read-write access, but you only have read access."
 msgstr ""
 
+#. TRANS: OAuth exception thrown when no application is found for a given consumer key.
+#: lib/apiauth.php:175
+msgid "No application for that consumer key."
+msgstr ""
+
+#. TRANS: OAuth exception given when an incorrect access token was given for a user.
+#: lib/apiauth.php:212
+msgid "Bad access token."
+msgstr ""
+
+#. TRANS: OAuth exception given when no user was found for a given token (no token was found).
+#: lib/apiauth.php:217
+msgid "No user for that token."
+msgstr ""
+
+#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
+#: lib/apioauthstore.php:178
+msgid "Tried to revoke unknown token"
+msgstr ""
+
+#. TRANS: Exception thrown when an attempt is made to remove a revoked token.
+#: lib/apioauthstore.php:182
+msgid "Failed to delete revoked token"
+msgstr ""
+
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:209
+#: lib/applicationeditform.php:200
 #, php-format
 msgid "Describe your application in %d characters"
 msgstr ""
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:242
+#: lib/applicationeditform.php:233
 msgid "URL for the homepage of the organization"
 msgstr ""
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:251
+#: lib/applicationeditform.php:242
 msgid "URL to redirect to after authentication"
 msgstr ""
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:278
+#: lib/applicationeditform.php:269
 msgid "Browser"
 msgstr ""
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:295
+#: lib/applicationeditform.php:286
 msgid "Desktop"
 msgstr ""
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:297
+#: lib/applicationeditform.php:288
 msgid "Type of application, browser or desktop"
 msgstr ""
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:320
+#: lib/applicationeditform.php:311
 msgid "Read-only"
 msgstr ""
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:339
+#: lib/applicationeditform.php:330
 msgid "Read-write"
 msgstr ""
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:341
+#: lib/applicationeditform.php:332
 msgid "Default access for this application: read-only, or read-write"
 msgstr ""
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:136
+#: lib/applicationlist.php:135
 msgid "read-write"
 msgstr ""
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:138
+#: lib/applicationlist.php:137
 msgid "read-only"
 msgstr ""
 
 #. 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
+#: lib/applicationlist.php:143
 #, php-format
 msgid "Approved %1$s - \"%2$s\" access."
 msgstr ""
@@ -4111,7 +4324,8 @@ msgstr ""
 msgid "Author"
 msgstr ""
 
-#: lib/attachmentnoticesection.php:67
+#. TRANS: Title.
+#: lib/attachmentnoticesection.php:68
 msgid "Notices where this attachment appears"
 msgstr ""
 
@@ -4123,10 +4337,40 @@ msgstr ""
 msgid "Password changing is not allowed"
 msgstr ""
 
+#. TRANS: Title for the form to block a user.
+#: lib/blockform.php:70
+msgid "Block"
+msgstr "Bloker"
+
 #: lib/channel.php:229 lib/mailhandler.php:142
 msgid "Command complete"
 msgstr ""
 
+#. TRANS: Command exception text shown when a notice ID is requested that does not exist.
+#: lib/command.php:84 lib/command.php:108
+msgid "Notice with that id does not exist."
+msgstr ""
+
+#. TRANS: Command exception text shown when a last user notice is requested and it does not exist.
+#. TRANS: Error text shown when a last user notice is requested and it does not exist.
+#: lib/command.php:101 lib/command.php:630
+msgid "User has no last notice."
+msgstr ""
+
+#. 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:130
+#, php-format
+msgid "Could not find a user with nickname %s."
+msgstr ""
+
+#. TRANS: Message given getting a non-existing user.
+#. TRANS: %s is the nickname of the user that could not be found.
+#: lib/command.php:150
+#, php-format
+msgid "Could not find a local user with nickname %s."
+msgstr ""
+
 #. TRANS: Error text shown when an unimplemented command is given.
 #: lib/command.php:185
 msgid "Sorry, this command is not yet implemented."
@@ -4137,6 +4381,13 @@ msgstr ""
 msgid "It does not make a lot of sense to nudge yourself!"
 msgstr ""
 
+#. TRANS: Message given having nudged another user.
+#. TRANS: %s is the nickname of the user that was nudged.
+#: lib/command.php:240
+#, php-format
+msgid "Nudge sent to %s."
+msgstr ""
+
 #. TRANS: User statistics text.
 #. TRANS: %1$s is the number of other user the user is subscribed to.
 #. TRANS: %2$s is the number of users that are subscribed to the user.
@@ -4149,12 +4400,40 @@ msgid ""
 "Notices: %3$s"
 msgstr ""
 
+#. 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.
+#: lib/command.php:360
+#, php-format
+msgid "%1$s joined group %2$s."
+msgstr ""
+
+#. 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.
+#: lib/command.php:408
+#, php-format
+msgid "%1$s left group %2$s."
+msgstr ""
+
 #. TRANS: Whois output. %s is the full name of the queried user.
 #: lib/command.php:434
 #, 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:438 lib/mail.php:268
+#, 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:442 lib/mail.php:271
+#, php-format
+msgid "Homepage: %s"
+msgstr ""
+
 #. TRANS: Whois output. %s is the bio information of the queried user.
 #: lib/command.php:446
 #, php-format
@@ -4181,6 +4460,13 @@ msgstr ""
 msgid "Error sending direct message."
 msgstr ""
 
+#. 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:554
+#, php-format
+msgid "Notice from %s repeated."
+msgstr ""
+
 #. TRANS: Message given if content of a notice for a reply is too long.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
 #: lib/command.php:592
@@ -4188,6 +4474,13 @@ msgstr ""
 msgid "Notice too long - maximum is %1$d characters, you sent %2$d."
 msgstr ""
 
+#. TRANS: Text shown having sent a reply to a notice successfully.
+#. TRANS: %s is the nickname of the user of the notice the reply was sent to.
+#: lib/command.php:603
+#, php-format
+msgid "Reply to %s sent."
+msgstr ""
+
 #. TRANS: Error text shown when no username was provided when issuing a subscribe command.
 #: lib/command.php:655
 msgid "Specify the name of the user to subscribe to."
@@ -4211,6 +4504,13 @@ msgstr ""
 msgid "Specify the name of the user to unsubscribe from."
 msgstr ""
 
+#. TRANS: Text shown after having unsubscribed from another user successfully.
+#. TRANS: %s is the name of the user the unsubscription was requested for.
+#: lib/command.php:705
+#, php-format
+msgid "Unsubscribed from %s."
+msgstr ""
+
 #. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
 #. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
 #: lib/command.php:724 lib/command.php:750
@@ -4247,15 +4547,7 @@ msgstr ""
 msgid "No one is subscribed to you."
 msgstr ""
 
-#. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
-#. TRANS: This message support plural forms. This message is followed by a
-#. TRANS: hard coded space and a comma separated list of subscribing users.
-#: lib/command.php:863
-msgid "This person is subscribed to you:"
-msgid_plural "These people are subscribed to you:"
-msgstr[0] ""
-msgstr[1] ""
-
+#. TRANS: Help text for commands.
 #: lib/command.php:905
 msgid ""
 "Commands:\n"
@@ -4398,13 +4690,25 @@ msgstr ""
 msgid "Extra nicknames for the group, comma- or space- separated, max %d"
 msgstr ""
 
-#: lib/groupnav.php:114
+#. TRANS: Menu item in the group navigation page.
+#: lib/groupnav.php:95
+msgctxt "MENU"
+msgid "Members"
+msgstr ""
+
+#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
+#. TRANS: %s is the nickname of the group.
+#: lib/groupnav.php:129
 #, php-format
+msgctxt "TOOLTIP"
 msgid "Add or edit %s logo"
 msgstr ""
 
-#: lib/groupnav.php:120
+#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
+#. TRANS: %s is the nickname of the group.
+#: lib/groupnav.php:138
 #, php-format
+msgctxt "TOOLTIP"
 msgid "Add or edit %s design"
 msgstr ""
 
@@ -4422,7 +4726,8 @@ msgstr ""
 msgid "This page is not available in a media type you accept"
 msgstr ""
 
-#: lib/imagefile.php:101 lib/mediafile.php:170
+#. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
+#: lib/imagefile.php:101 lib/mediafile.php:179
 msgid "System error uploading file."
 msgstr ""
 
@@ -4452,6 +4757,14 @@ msgstr ""
 msgid "Unknown inbox source %d."
 msgstr ""
 
+#: lib/joinform.php:114
+msgid "Join"
+msgstr ""
+
+#: lib/logingroupnav.php:80
+msgid "Login with a username and password"
+msgstr ""
+
 #: lib/logingroupnav.php:86
 msgid "Sign up for a new account"
 msgstr ""
@@ -4474,6 +4787,12 @@ msgid ""
 "%s\n"
 msgstr ""
 
+#. TRANS: Subject of new-subscriber notification e-mail
+#: lib/mail.php:243
+#, php-format
+msgid "%1$s is now listening to your notices on %2$s."
+msgstr ""
+
 #: lib/mail.php:248
 #, php-format
 msgid ""
@@ -4654,52 +4973,69 @@ msgstr ""
 msgid "Not a registered user."
 msgstr ""
 
-#: lib/mediafile.php:98 lib/mediafile.php:123
+#. TRANS: Client exception thrown when a database error was thrown during a file upload operation.
+#: lib/mediafile.php:99 lib/mediafile.php:125
 msgid "There was a database error while saving your file. Please try again."
 msgstr ""
 
-#: lib/mediafile.php:142
+#. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
+#: lib/mediafile.php:145
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
 msgstr ""
 
-#: lib/mediafile.php:147
+#. TRANS: Client exception.
+#: lib/mediafile.php:151
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form."
 msgstr ""
 
-#: lib/mediafile.php:152
+#. TRANS: Client exception.
+#: lib/mediafile.php:157
 msgid "The uploaded file was only partially uploaded."
 msgstr ""
 
-#: lib/mediafile.php:159
+#. TRANS: Client exception thrown when a temporary folder is not present to store a file upload.
+#: lib/mediafile.php:165
 msgid "Missing a temporary folder."
 msgstr ""
 
-#: lib/mediafile.php:162
+#. TRANS: Client exception thrown when writing to disk is not possible during a file upload operation.
+#: lib/mediafile.php:169
 msgid "Failed to write file to disk."
 msgstr ""
 
-#: lib/mediafile.php:165
+#. TRANS: Client exception thrown when a file upload operation has been stopped by an extension.
+#: lib/mediafile.php:173
 msgid "File upload stopped by extension."
 msgstr ""
 
-#: lib/mediafile.php:179 lib/mediafile.php:217
+#. TRANS: Client exception thrown when a file upload operation would cause a user to exceed a set quota.
+#: lib/mediafile.php:189 lib/mediafile.php:232
 msgid "File exceeds user's quota."
 msgstr ""
 
-#: lib/mediafile.php:197 lib/mediafile.php:234
+#. TRANS: Client exception thrown when a file upload operation fails because the file could
+#. TRANS: not be moved from the temporary folder to the permanent file location.
+#: lib/mediafile.php:209 lib/mediafile.php:251
 msgid "File could not be moved to destination directory."
 msgstr ""
 
-#: lib/mediafile.php:318
+#. TRANS: Client exception thrown trying to upload a forbidden MIME type.
+#. TRANS: %1$s is the file type that was denied, %2$s is the application part of
+#. TRANS: the MIME type that was denied.
+#: lib/mediafile.php:340
 #, php-format
-msgid " Try using another %s format."
+msgid ""
+"\"%1$s\" is not a supported file type on this server. Try using another %2$s "
+"format."
 msgstr ""
 
-#: lib/mediafile.php:323
+#. TRANS: Client exception thrown trying to upload a forbidden MIME type.
+#. TRANS: %s is the file type that was denied.
+#: lib/mediafile.php:345
 #, php-format
-msgid "%s is not a supported file type on this server."
+msgid "\"%s\" is not a supported file type on this server."
 msgstr ""
 
 #: lib/messageform.php:146
@@ -4710,6 +5046,11 @@ msgstr ""
 msgid "Available characters"
 msgstr ""
 
+#: lib/messageform.php:178 lib/noticeform.php:237
+msgctxt "Send button for sending notice"
+msgid "Send"
+msgstr ""
+
 #: lib/noticeform.php:174
 #, php-format
 msgid "What's up, %s?"
@@ -4761,12 +5102,24 @@ msgstr ""
 msgid "web"
 msgstr ""
 
+#: lib/noticelist.php:568
+msgid "in context"
+msgstr ""
+
 #: lib/noticelist.php:631
 msgid "Reply"
 msgstr ""
 
-#: lib/oauthstore.php:291
-msgid "Error inserting avatar"
+#: lib/noticelist.php:675
+msgid "Notice repeated"
+msgstr ""
+
+#: lib/nudgeform.php:128
+msgid "Nudge"
+msgstr ""
+
+#: lib/personalgroupnav.php:99
+msgid "Personal"
 msgstr ""
 
 #: lib/personalgroupnav.php:104
@@ -4786,7 +5139,8 @@ msgstr ""
 msgid "Tags in %s's notices"
 msgstr ""
 
-#: lib/plugin.php:115
+#. TRANS: Displayed as version information for a plugin if no version information was found.
+#: lib/plugin.php:116
 msgid "Unknown"
 msgstr ""
 
@@ -4810,6 +5164,10 @@ msgstr ""
 msgid "User ID"
 msgstr ""
 
+#: lib/profileaction.php:196
+msgid "Member since"
+msgstr ""
+
 #. TRANS: Average count of posts made per day since account registration
 #: lib/profileaction.php:235
 msgid "Daily average"
@@ -4835,15 +5193,19 @@ msgstr ""
 msgid "Sandbox"
 msgstr ""
 
-#: lib/searchaction.php:120
+#. TRANS: Fieldset legend for the search form.
+#: lib/searchaction.php:121
 msgid "Search site"
 msgstr ""
 
-#: lib/searchaction.php:126
+#. TRANS: Used as a field label for the field where one or more keywords
+#. TRANS: for searching can be entered.
+#: lib/searchaction.php:129
 msgid "Keyword(s)"
 msgstr ""
 
-#: lib/searchaction.php:162
+#. TRANS: Definition list item with instructions on how to get (better) search results.
+#: lib/searchaction.php:170
 msgid "Search help"
 msgstr ""
 
@@ -4881,6 +5243,11 @@ msgstr ""
 msgid "People subscribed to %s"
 msgstr ""
 
+#: lib/subgroupnav.php:106
+#, php-format
+msgid "Invite friends and colleagues to join you on %s"
+msgstr ""
+
 #: lib/subscriberspeopleselftagcloudsection.php:48
 #: lib/subscriptionspeopleselftagcloudsection.php:48
 msgid "People Tagcloud as self-tagged"
@@ -4955,6 +5322,10 @@ msgstr ""
 msgid "Edit"
 msgstr ""
 
+#: lib/userprofile.php:288
+msgid "Message"
+msgstr ""
+
 #: lib/userprofile.php:326
 msgid "Moderate"
 msgstr ""
@@ -4970,20 +5341,22 @@ msgid "Moderator"
 msgstr ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1102
+#: lib/util.php:1103
 msgid "a few seconds ago"
 msgstr ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1105
+#: lib/util.php:1106
 msgid "about a minute ago"
 msgstr ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 #: lib/util.php:1109
 #, php-format
-msgid "about %d minutes ago"
-msgstr ""
+msgid "about one minute ago"
+msgid_plural "about %d minutes ago"
+msgstr[0] ""
+msgstr[1] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 #: lib/util.php:1112
@@ -4991,35 +5364,41 @@ msgid "about an hour ago"
 msgstr ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1116
+#: lib/util.php:1115
 #, php-format
-msgid "about %d hours ago"
-msgstr ""
+msgid "about one hour ago"
+msgid_plural "about %d hours ago"
+msgstr[0] ""
+msgstr[1] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1119
+#: lib/util.php:1118
 msgid "about a day ago"
 msgstr ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1123
+#: lib/util.php:1121
 #, php-format
-msgid "about %d days ago"
-msgstr ""
+msgid "about one day ago"
+msgid_plural "about %d days ago"
+msgstr[0] ""
+msgstr[1] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1126
+#: lib/util.php:1124
 msgid "about a month ago"
 msgstr ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1130
+#: lib/util.php:1127
 #, php-format
-msgid "about %d months ago"
-msgstr ""
+msgid "about one month ago"
+msgid_plural "about %d months ago"
+msgstr[0] ""
+msgstr[1] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1133
+#: lib/util.php:1130
 msgid "about a year ago"
 msgstr ""
 
diff --git a/locale/de/LC_MESSAGES/statusnet.po b/locale/de/LC_MESSAGES/statusnet.po
index 8d6d9a9a74..ab5c443404 100644
--- a/locale/de/LC_MESSAGES/statusnet.po
+++ b/locale/de/LC_MESSAGES/statusnet.po
@@ -1,16 +1,17 @@
-# Translation of StatusNet to German
+# Translation of StatusNet to German (Deutsch)
+# Expored from translatewiki.net
 #
-# Author@translatewiki.net: Apmon
-# Author@translatewiki.net: Bavatar
-# Author@translatewiki.net: Brion
-# Author@translatewiki.net: Kghbln
-# Author@translatewiki.net: Lutzgh
-# Author@translatewiki.net: March
-# Author@translatewiki.net: McDutchie
-# Author@translatewiki.net: Michael
-# Author@translatewiki.net: Michi
-# Author@translatewiki.net: The Evil IP address
-# Author@translatewiki.net: Umherirrender
+# Author: Apmon
+# Author: Bavatar
+# Author: Brion
+# Author: Kghbln
+# Author: Lutzgh
+# Author: March
+# Author: McDutchie
+# Author: Michael
+# Author: Michi
+# Author: The Evil IP address
+# Author: Umherirrender
 # --
 # This file is distributed under the same license as the StatusNet package.
 #
@@ -18,20 +19,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-08 22:33+0000\n"
-"PO-Revision-Date: 2010-09-08 22:33:44+0000\n"
-"Language-Team: German\n"
+"POT-Creation-Date: 2010-09-14 19:53+0000\n"
+"PO-Revision-Date: 2010-09-14 19:53:47+0000\n"
+"Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r72348); Translate extension (2010-08-20)\n"
+"X-Generator: MediaWiki 1.17alpha (r73009); Translate extension (2010-08-20)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
-"X-Message-Group: out-statusnet\n"
+"X-Message-Group: #out-statusnet\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-POT-Import-Date: 1284-49-16 34::+0000\n"
 
 #. TRANS: Page title
 #. TRANS: Menu item for site administration
-#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:376
+#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:363
 msgid "Access"
 msgstr "Zugang"
 
@@ -85,10 +87,10 @@ 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 actions/emailsettings.php:224
-#: actions/imsettings.php:184 actions/smssettings.php:209
-#: lib/applicationeditform.php:361
+#. TRANS: Button label in the "Edit application" form.
+#: actions/accessadminpanel.php:203 actions/emailsettings.php:228
+#: actions/imsettings.php:187 actions/smssettings.php:209
+#: lib/applicationeditform.php:351
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Speichern"
@@ -101,15 +103,15 @@ msgstr "Seite nicht vorhanden"
 
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #: actions/all.php:79 actions/allrss.php:68
-#: actions/apiaccountupdatedeliverydevice.php:114
-#: actions/apiaccountupdateprofile.php:105
-#: actions/apiaccountupdateprofilebackgroundimage.php:116
-#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
-#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
-#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:113
-#: actions/apigroupismember.php:91 actions/apigroupjoin.php:100
-#: actions/apigroupleave.php:100 actions/apigrouplist.php:73
-#: actions/apistatusesupdate.php:229 actions/apisubscriptions.php:87
+#: actions/apiaccountupdatedeliverydevice.php:115
+#: actions/apiaccountupdateprofile.php:106
+#: actions/apiaccountupdateprofilebackgroundimage.php:117
+#: actions/apiaccountupdateprofileimage.php:106 actions/apiblockcreate.php:98
+#: actions/apiblockdestroy.php:97 actions/apidirectmessage.php:77
+#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:114
+#: actions/apigroupismember.php:91 actions/apigroupjoin.php:101
+#: actions/apigroupleave.php:101 actions/apigrouplist.php:73
+#: actions/apistatusesupdate.php:230 actions/apisubscriptions.php:87
 #: actions/apitimelinefavorites.php:72 actions/apitimelinefriends.php:174
 #: actions/apitimelinehome.php:80 actions/apitimelinementions.php:80
 #: actions/apitimelineuser.php:82 actions/avatarbynickname.php:75
@@ -209,16 +211,16 @@ msgid "Updates from %1$s and friends on %2$s!"
 msgstr "Aktualisierungen von %1$s und Freunden auf %2$s!"
 
 #: actions/apiaccountratelimitstatus.php:72
-#: actions/apiaccountupdatedeliverydevice.php:94
-#: actions/apiaccountupdateprofile.php:97
-#: actions/apiaccountupdateprofilebackgroundimage.php:94
-#: actions/apiaccountupdateprofilecolors.php:118
+#: actions/apiaccountupdatedeliverydevice.php:95
+#: actions/apiaccountupdateprofile.php:98
+#: actions/apiaccountupdateprofilebackgroundimage.php:95
+#: actions/apiaccountupdateprofilecolors.php:119
 #: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156
-#: actions/apifavoritecreate.php:100 actions/apifavoritedestroy.php:101
-#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100
-#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:139
-#: actions/apigroupismember.php:115 actions/apigroupjoin.php:156
-#: actions/apigroupleave.php:142 actions/apigrouplist.php:137
+#: actions/apifavoritecreate.php:101 actions/apifavoritedestroy.php:102
+#: actions/apifriendshipscreate.php:101 actions/apifriendshipsdestroy.php:101
+#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:140
+#: actions/apigroupismember.php:115 actions/apigroupjoin.php:157
+#: actions/apigroupleave.php:143 actions/apigrouplist.php:137
 #: actions/apigrouplistall.php:122 actions/apigroupmembership.php:107
 #: actions/apigroupshow.php:116 actions/apihelptest.php:88
 #: actions/apistatusesdestroy.php:104 actions/apistatusesretweets.php:112
@@ -233,21 +235,23 @@ msgstr "Aktualisierungen von %1$s und Freunden auf %2$s!"
 msgid "API method not found."
 msgstr "API-Methode nicht gefunden."
 
-#: actions/apiaccountupdatedeliverydevice.php:86
-#: actions/apiaccountupdateprofile.php:89
-#: actions/apiaccountupdateprofilebackgroundimage.php:86
-#: actions/apiaccountupdateprofilecolors.php:110
-#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89
-#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109
-#: actions/apifavoritecreate.php:91 actions/apifavoritedestroy.php:92
-#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
-#: actions/apigroupcreate.php:105 actions/apigroupjoin.php:92
-#: actions/apigroupleave.php:92 actions/apimediaupload.php:67
-#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:198
+#. TRANS: Client error message. POST is a HTTP command. It should not be translated.
+#. TRANS: Client error. POST is a HTTP command. It should not be translated.
+#: actions/apiaccountupdatedeliverydevice.php:87
+#: actions/apiaccountupdateprofile.php:90
+#: actions/apiaccountupdateprofilebackgroundimage.php:87
+#: actions/apiaccountupdateprofilecolors.php:111
+#: actions/apiaccountupdateprofileimage.php:85 actions/apiblockcreate.php:90
+#: actions/apiblockdestroy.php:89 actions/apidirectmessagenew.php:110
+#: actions/apifavoritecreate.php:92 actions/apifavoritedestroy.php:93
+#: actions/apifriendshipscreate.php:92 actions/apifriendshipsdestroy.php:92
+#: actions/apigroupcreate.php:106 actions/apigroupjoin.php:93
+#: actions/apigroupleave.php:93 actions/apimediaupload.php:68
+#: actions/apistatusesretweet.php:66 actions/apistatusesupdate.php:199
 msgid "This method requires a POST."
 msgstr "Diese Methode benÃ¶tigt ein POST."
 
-#: actions/apiaccountupdatedeliverydevice.php:106
+#: actions/apiaccountupdatedeliverydevice.php:107
 msgid ""
 "You must specify a parameter named 'device' with a value of one of: sms, im, "
 "none."
@@ -255,27 +259,27 @@ msgstr ""
 "Du musst einen Parameter mit Namen âdeviceâ Ã¼bergeben. MÃ¶gliche Werte sind: "
 "sms, im, none."
 
-#: actions/apiaccountupdatedeliverydevice.php:133
+#: actions/apiaccountupdatedeliverydevice.php:134
 msgid "Could not update user."
 msgstr "Konnte Benutzerdaten nicht aktualisieren."
 
-#: actions/apiaccountupdateprofile.php:112
-#: actions/apiaccountupdateprofilebackgroundimage.php:194
-#: actions/apiaccountupdateprofilecolors.php:185
-#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/apiaccountupdateprofile.php:113
+#: actions/apiaccountupdateprofilebackgroundimage.php:195
+#: actions/apiaccountupdateprofilecolors.php:186
+#: actions/apiaccountupdateprofileimage.php:131 actions/apiusershow.php:108
 #: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/hcard.php:74
 #: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
 #: lib/profileaction.php:84
 msgid "User has no profile."
 msgstr "Benutzer hat kein Profil."
 
-#: actions/apiaccountupdateprofile.php:147
+#: actions/apiaccountupdateprofile.php:148
 msgid "Could not save profile."
 msgstr "Konnte Profil nicht speichern."
 
-#: actions/apiaccountupdateprofilebackgroundimage.php:108
-#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
-#: actions/apistatusesupdate.php:212 actions/avatarsettings.php:257
+#: actions/apiaccountupdateprofilebackgroundimage.php:109
+#: actions/apiaccountupdateprofileimage.php:98 actions/apimediaupload.php:81
+#: actions/apistatusesupdate.php:213 actions/avatarsettings.php:257
 #: actions/designadminpanel.php:123 actions/editapplication.php:118
 #: actions/newapplication.php:101 actions/newnotice.php:94
 #: lib/designsettings.php:283
@@ -287,30 +291,30 @@ msgstr ""
 "Der Server kann so groÃe POST Abfragen (%s bytes) aufgrund der Konfiguration "
 "nicht verarbeiten."
 
-#: actions/apiaccountupdateprofilebackgroundimage.php:136
-#: actions/apiaccountupdateprofilebackgroundimage.php:146
-#: actions/apiaccountupdateprofilecolors.php:164
-#: actions/apiaccountupdateprofilecolors.php:174
+#: actions/apiaccountupdateprofilebackgroundimage.php:137
+#: actions/apiaccountupdateprofilebackgroundimage.php:147
+#: actions/apiaccountupdateprofilecolors.php:165
+#: actions/apiaccountupdateprofilecolors.php:175
 #: actions/groupdesignsettings.php:290 actions/groupdesignsettings.php:300
 #: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
 #: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
 msgid "Unable to save your design settings."
 msgstr "Konnte Twitter-Einstellungen nicht speichern."
 
-#: actions/apiaccountupdateprofilebackgroundimage.php:187
-#: actions/apiaccountupdateprofilecolors.php:142
+#: actions/apiaccountupdateprofilebackgroundimage.php:188
+#: actions/apiaccountupdateprofilecolors.php:143
 msgid "Could not update your design."
 msgstr "Konnte Benutzerdesign nicht aktualisieren."
 
-#: actions/apiblockcreate.php:105
+#: actions/apiblockcreate.php:106
 msgid "You cannot block yourself!"
 msgstr "Du kannst dich nicht selbst sperren!"
 
-#: actions/apiblockcreate.php:126
+#: actions/apiblockcreate.php:127
 msgid "Block user failed."
 msgstr "Blockieren des Benutzers fehlgeschlagen."
 
-#: actions/apiblockdestroy.php:114
+#: actions/apiblockdestroy.php:115
 msgid "Unblock user failed."
 msgstr "Freigeben des Benutzers fehlgeschlagen."
 
@@ -334,62 +338,62 @@ msgstr "Direkte Nachrichten an %s"
 msgid "All the direct messages sent to %s"
 msgstr "Alle an %s gesendeten direkten Nachrichten"
 
-#: actions/apidirectmessagenew.php:118
+#: actions/apidirectmessagenew.php:119
 msgid "No message text!"
 msgstr "Fehlender Nachrichtentext!"
 
-#: actions/apidirectmessagenew.php:127 actions/newmessage.php:150
+#: actions/apidirectmessagenew.php:128 actions/newmessage.php:150
 #, php-format
 msgid "That's too long. Max message size is %d chars."
 msgstr ""
 "Die Nachricht ist zu lang. Die maximale NachrichtenlÃ¤nge ist %d Zeichen."
 
-#: actions/apidirectmessagenew.php:138
+#: actions/apidirectmessagenew.php:139
 msgid "Recipient user not found."
 msgstr "EmpfÃ¤nger nicht gefunden."
 
-#: actions/apidirectmessagenew.php:142
+#: actions/apidirectmessagenew.php:143
 msgid "Can't send direct messages to users who aren't your friend."
 msgstr ""
 "Es kÃ¶nnen keine direkten Nachrichten an Benutzer geschickt werden mit denen "
 "du nicht befreundet bist."
 
-#: actions/apifavoritecreate.php:109 actions/apifavoritedestroy.php:110
+#: actions/apifavoritecreate.php:110 actions/apifavoritedestroy.php:111
 #: actions/apistatusesdestroy.php:121
 msgid "No status found with that ID."
 msgstr "Keine Nachricht mit dieser ID gefunden."
 
-#: actions/apifavoritecreate.php:120
+#: actions/apifavoritecreate.php:121
 msgid "This status is already a favorite."
 msgstr "Diese Nachricht ist bereits ein Favorit!"
 
 #. TRANS: Error message text shown when a favorite could not be set.
-#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:296
+#: actions/apifavoritecreate.php:132 actions/favor.php:84 lib/command.php:296
 msgid "Could not create favorite."
 msgstr "Konnte keinen Favoriten erstellen."
 
-#: actions/apifavoritedestroy.php:123
+#: actions/apifavoritedestroy.php:124
 msgid "That status is not a favorite."
 msgstr "Diese Nachricht ist kein Favorit!"
 
-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
+#: actions/apifavoritedestroy.php:136 actions/disfavor.php:87
 msgid "Could not delete favorite."
 msgstr "Konnte Favoriten nicht lÃ¶schen."
 
-#: actions/apifriendshipscreate.php:109
+#: actions/apifriendshipscreate.php:110
 msgid "Could not follow user: profile not found."
 msgstr "Konnte Nutzer nicht folgen: Profil nicht gefunden"
 
-#: actions/apifriendshipscreate.php:118
+#: actions/apifriendshipscreate.php:119
 #, php-format
 msgid "Could not follow user: %s is already on your list."
 msgstr "Kann Nutzer %s nicht folgen: schon in deiner Kontaktliste eingetragen"
 
-#: actions/apifriendshipsdestroy.php:109
+#: actions/apifriendshipsdestroy.php:110
 msgid "Could not unfollow user: User not found."
 msgstr "Kann Benutzer nicht entfolgen: Benutzer nicht gefunden."
 
-#: actions/apifriendshipsdestroy.php:120
+#: actions/apifriendshipsdestroy.php:121
 msgid "You cannot unfollow yourself."
 msgstr "Du kannst dich nicht selbst entfolgen!"
 
@@ -405,7 +409,7 @@ msgstr "Konnte Ã¶ffentlichen Stream nicht abrufen."
 msgid "Could not find target user."
 msgstr "Konnte keine Statusmeldungen finden."
 
-#: actions/apigroupcreate.php:167 actions/editgroup.php:186
+#: actions/apigroupcreate.php:168 actions/editgroup.php:186
 #: actions/newgroup.php:126 actions/profilesettings.php:215
 #: actions/register.php:212
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
@@ -413,19 +417,19 @@ msgstr ""
 "Der Nutzername darf nur aus Kleinbuchstaben und Ziffern bestehen. "
 "Leerzeichen sind nicht erlaubt."
 
-#: actions/apigroupcreate.php:176 actions/editgroup.php:190
+#: actions/apigroupcreate.php:177 actions/editgroup.php:190
 #: actions/newgroup.php:130 actions/profilesettings.php:238
 #: actions/register.php:215
 msgid "Nickname already in use. Try another one."
 msgstr "Nutzername wird bereits verwendet. Suche dir einen anderen aus."
 
-#: actions/apigroupcreate.php:183 actions/editgroup.php:193
+#: actions/apigroupcreate.php:184 actions/editgroup.php:193
 #: actions/newgroup.php:133 actions/profilesettings.php:218
 #: actions/register.php:217
 msgid "Not a valid nickname."
 msgstr "UngÃ¼ltiger Nutzername."
 
-#: actions/apigroupcreate.php:199 actions/editapplication.php:215
+#: actions/apigroupcreate.php:200 actions/editapplication.php:215
 #: actions/editgroup.php:199 actions/newapplication.php:203
 #: actions/newgroup.php:139 actions/profilesettings.php:222
 #: actions/register.php:224
@@ -433,76 +437,76 @@ msgid "Homepage is not a valid URL."
 msgstr ""
 "Homepage ist keine gÃ¼ltige URL. URLs mÃ¼ssen ein PrÃ¤fix wie http enthalten."
 
-#: actions/apigroupcreate.php:208 actions/editgroup.php:202
+#: actions/apigroupcreate.php:209 actions/editgroup.php:202
 #: actions/newgroup.php:142 actions/profilesettings.php:225
 #: actions/register.php:227
 msgid "Full name is too long (max 255 chars)."
 msgstr "Der vollstÃ¤ndige Name ist zu lang (maximal 255 Zeichen)."
 
-#: actions/apigroupcreate.php:216 actions/editapplication.php:190
+#: actions/apigroupcreate.php:217 actions/editapplication.php:190
 #: actions/newapplication.php:172
 #, php-format
 msgid "Description is too long (max %d chars)."
 msgstr "Die Beschreibung ist zu lang (max. %d Zeichen)."
 
-#: actions/apigroupcreate.php:227 actions/editgroup.php:208
+#: actions/apigroupcreate.php:228 actions/editgroup.php:208
 #: actions/newgroup.php:148 actions/profilesettings.php:232
 #: actions/register.php:234
 msgid "Location is too long (max 255 chars)."
 msgstr "Der eingegebene Aufenthaltsort ist zu lang (maximal 255 Zeichen)."
 
-#: actions/apigroupcreate.php:246 actions/editgroup.php:219
+#: actions/apigroupcreate.php:247 actions/editgroup.php:219
 #: actions/newgroup.php:159
 #, php-format
 msgid "Too many aliases! Maximum %d."
 msgstr "Zu viele Pseudonyme! Maximale Anzahl ist %d."
 
-#: actions/apigroupcreate.php:267
+#: actions/apigroupcreate.php:268
 #, php-format
 msgid "Invalid alias: \"%s\"."
 msgstr "UngÃ¼ltiges Alias: â%sâ"
 
-#: actions/apigroupcreate.php:276 actions/editgroup.php:232
+#: actions/apigroupcreate.php:277 actions/editgroup.php:232
 #: actions/newgroup.php:172
 #, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr "Nutzername â%sâ wird bereits verwendet. Suche dir einen anderen aus."
 
-#: actions/apigroupcreate.php:289 actions/editgroup.php:238
+#: actions/apigroupcreate.php:290 actions/editgroup.php:238
 #: actions/newgroup.php:178
 msgid "Alias can't be the same as nickname."
 msgstr "Alias kann nicht das gleiche wie der Spitzname sein."
 
-#: actions/apigroupismember.php:96 actions/apigroupjoin.php:105
-#: actions/apigroupleave.php:105 actions/apigroupmembership.php:92
+#: actions/apigroupismember.php:96 actions/apigroupjoin.php:106
+#: actions/apigroupleave.php:106 actions/apigroupmembership.php:92
 #: actions/apigroupshow.php:83 actions/apitimelinegroup.php:92
 msgid "Group not found."
 msgstr "Gruppe nicht gefunden!"
 
 #. TRANS: Error text shown a user tries to join a group they already are a member of.
-#: actions/apigroupjoin.php:111 actions/joingroup.php:100 lib/command.php:336
+#: actions/apigroupjoin.php:112 actions/joingroup.php:100 lib/command.php:336
 msgid "You are already a member of that group."
 msgstr "Du bist bereits Mitglied dieser Gruppe"
 
 #. TRANS: Error text shown when a user tries to join a group they are blocked from joining.
-#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:341
+#: actions/apigroupjoin.php:121 actions/joingroup.php:105 lib/command.php:341
 msgid "You have been blocked from that group by the admin."
 msgstr "Der Admin dieser Gruppe hat dich gesperrt."
 
 #. 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.
-#: actions/apigroupjoin.php:139 actions/joingroup.php:134 lib/command.php:353
+#: actions/apigroupjoin.php:140 actions/joingroup.php:134 lib/command.php:353
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "Konnte Benutzer %1$s nicht der Gruppe %2$s hinzufÃ¼gen."
 
-#: actions/apigroupleave.php:115
+#: actions/apigroupleave.php:116
 msgid "You are not a member of this group."
 msgstr "Du bist kein Mitglied dieser Gruppe."
 
 #. 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.
-#: actions/apigroupleave.php:125 actions/leavegroup.php:129
+#: actions/apigroupleave.php:126 actions/leavegroup.php:129
 #: lib/command.php:401
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
@@ -532,7 +536,7 @@ msgstr "%s Gruppen"
 msgid "groups on %s"
 msgstr "Gruppen von %s"
 
-#: actions/apimediaupload.php:99
+#: actions/apimediaupload.php:100
 msgid "Upload failed."
 msgstr "Hochladen fehlgeschlagen."
 
@@ -546,9 +550,9 @@ msgstr "UngÃ¼ltiges Token."
 
 #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
 #: actions/deletenotice.php:169 actions/disfavor.php:74
-#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:55
+#: actions/emailsettings.php:271 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:66 actions/imsettings.php:227
+#: actions/groupunblock.php:66 actions/imsettings.php:230
 #: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
@@ -593,8 +597,8 @@ msgstr "Die Anfrage %s wurde gesperrt und widerrufen."
 #. 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:286 actions/grouplogo.php:322
-#: actions/imsettings.php:242 actions/newapplication.php:121
+#: actions/emailsettings.php:290 actions/grouplogo.php:322
+#: actions/imsettings.php:245 actions/newapplication.php:121
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
 #: actions/smssettings.php:277 lib/designsettings.php:304
 msgid "Unexpected form submission."
@@ -658,18 +662,18 @@ msgstr "Diese Methode benÃ¶tigt ein POST oder DELETE."
 msgid "You may not delete another user's status."
 msgstr "Du kannst den Status eines anderen Benutzers nicht lÃ¶schen."
 
-#: actions/apistatusesretweet.php:75 actions/apistatusesretweets.php:72
+#: actions/apistatusesretweet.php:76 actions/apistatusesretweets.php:72
 #: actions/deletenotice.php:52 actions/shownotice.php:92
 msgid "No such notice."
 msgstr "Unbekannte Nachricht."
 
 #. TRANS: Error text shown when trying to repeat an own notice.
-#: actions/apistatusesretweet.php:83 lib/command.php:538
+#: actions/apistatusesretweet.php:84 lib/command.php:538
 msgid "Cannot repeat your own notice."
 msgstr "Du kannst deine eigenen Nachrichten nicht wiederholen."
 
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-#: actions/apistatusesretweet.php:91 lib/command.php:544
+#: actions/apistatusesretweet.php:92 lib/command.php:544
 msgid "Already repeated that notice."
 msgstr "Nachricht bereits wiederholt"
 
@@ -681,24 +685,24 @@ msgstr "Status gelÃ¶scht."
 msgid "No status with that ID found."
 msgstr "Keine Nachricht mit dieser ID gefunden."
 
-#: actions/apistatusesupdate.php:221
+#: actions/apistatusesupdate.php:222
 msgid "Client must provide a 'status' parameter with a value."
 msgstr ""
 "Der Client muss einen âstatusâ-Parameter mit einen Wert zur VerfÃ¼gung "
 "stellen."
 
-#: actions/apistatusesupdate.php:242 actions/newnotice.php:157
+#: actions/apistatusesupdate.php:243 actions/newnotice.php:157
 #: lib/mailhandler.php:60
 #, php-format
 msgid "That's too long. Max notice size is %d chars."
 msgstr ""
 "Das war zu lang. Die LÃ¤nge einer Nachricht ist auf %d Zeichen beschrÃ¤nkt."
 
-#: actions/apistatusesupdate.php:283 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:284 actions/apiusershow.php:96
 msgid "Not found."
 msgstr "Nicht gefunden."
 
-#: actions/apistatusesupdate.php:306 actions/newnotice.php:181
+#: actions/apistatusesupdate.php:307 actions/newnotice.php:181
 #, php-format
 msgid "Max notice size is %d chars, including attachment URL."
 msgstr ""
@@ -902,7 +906,9 @@ msgid "Yes"
 msgstr "Ja"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
+#. TRANS: Submit button title.
+#. TRANS: Description of the form to block a user.
+#: actions/block.php:164 actions/groupmembers.php:403 lib/blockform.php:82
 msgid "Block this user"
 msgstr "Diesen Benutzer blockieren"
 
@@ -944,11 +950,13 @@ msgstr "Liste der blockierten Benutzer in dieser Gruppe."
 msgid "Unblock user from group"
 msgstr "Sperrung des Nutzers fÃ¼r die Gruppe aufheben."
 
-#: actions/blockedfromgroup.php:320 lib/unblockform.php:69
+#. TRANS: Title for the form to unblock a user.
+#: actions/blockedfromgroup.php:320 lib/unblockform.php:70
 msgid "Unblock"
 msgstr "Freigeben"
 
-#: actions/blockedfromgroup.php:320 lib/unblockform.php:80
+#. TRANS: Description of the form to unblock a user.
+#: actions/blockedfromgroup.php:320 lib/unblockform.php:82
 msgid "Unblock this user"
 msgstr "Diesen Benutzer freigeben"
 
@@ -987,9 +995,9 @@ msgstr "Diese Adresse wurde bereits bestÃ¤tigt."
 #. 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/confirmaddress.php:116 actions/emailsettings.php:331
+#: actions/emailsettings.php:477 actions/imsettings.php:283
+#: actions/imsettings.php:442 actions/othersettings.php:174
 #: actions/profilesettings.php:283 actions/smssettings.php:308
 #: actions/smssettings.php:464
 msgid "Couldn't update user."
@@ -997,7 +1005,7 @@ msgstr "Konnte Benutzerdaten nicht aktualisieren."
 
 #. 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/confirmaddress.php:128 actions/emailsettings.php:437
 #: actions/smssettings.php:422
 msgid "Couldn't delete email confirmation."
 msgstr "Konnte E-Mail-BestÃ¤tigung nicht lÃ¶schen."
@@ -1033,9 +1041,10 @@ msgstr "Programm nicht gefunden."
 msgid "You are not the owner of this application."
 msgstr "Du bist Besitzer dieses Programms"
 
+#. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:127
 #: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1307
+#: lib/action.php:1315
 msgid "There was a problem with your session token."
 msgstr "Es gab ein Problem mit deinem Sessiontoken."
 
@@ -1068,7 +1077,7 @@ msgstr "Programm lÃ¶schen"
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
 #: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:73 lib/profileformaction.php:64
+#: lib/adminpanelaction.php:71 lib/profileformaction.php:64
 #: lib/settingsaction.php:72
 msgid "Not logged in."
 msgstr "Nicht angemeldet."
@@ -1131,7 +1140,6 @@ msgstr "Diesen Benutzer lÃ¶schen"
 #. TRANS: Message used as title for design settings for the site.
 #. TRANS: Link description in user account settings menu.
 #: actions/designadminpanel.php:63 lib/accountsettingsaction.php:139
-#: lib/groupnav.php:119
 msgid "Design"
 msgstr "Design"
 
@@ -1252,13 +1260,13 @@ msgstr "Standard-Design wiederherstellen"
 msgid "Reset back to default"
 msgstr "Standard wiederherstellen"
 
-#. TRANS: Submit button title
+#. TRANS: Submit button title.
 #: actions/designadminpanel.php:685 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/snapshotadminpanel.php:245
 #: actions/subscriptions.php:226 actions/tagother.php:154
-#: actions/useradminpanel.php:294 lib/applicationeditform.php:363
+#: actions/useradminpanel.php:294 lib/applicationeditform.php:353
 #: lib/designsettings.php:256 lib/groupeditform.php:202
 msgid "Save"
 msgstr "Speichern"
@@ -1415,7 +1423,7 @@ msgstr "Aktuelle bestÃ¤tigte E-Mail-Adresse."
 #. 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/emailsettings.php:115 actions/emailsettings.php:162
 #: actions/imsettings.php:116 actions/smssettings.php:124
 #: actions/smssettings.php:180
 msgctxt "BUTTON"
@@ -1433,22 +1441,26 @@ msgstr ""
 #. 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
+#. TRANS: Button label in the "Edit application" form.
 #: actions/emailsettings.php:127 actions/imsettings.php:131
-#: actions/smssettings.php:137 lib/applicationeditform.php:357
+#: actions/smssettings.php:137 lib/applicationeditform.php:347
 msgctxt "BUTTON"
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#. TRANS: Instructions for e-mail address input form.
-#: actions/emailsettings.php:135
+#. TRANS: Instructions for e-mail address input form. Do not translate
+#. TRANS: "example.org". It is one of the domain names reserved for
+#. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
+#. TRANS: Any other domain may be owned by a legitimate person or
+#. TRANS: organization.
+#: actions/emailsettings.php:139
 msgid "Email address, like \"UserName@example.org\""
 msgstr "E-Mail-Adresse, beispielsweise âBenutzername@example.orgâ"
 
 #. 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/emailsettings.php:143 actions/imsettings.php:151
 #: actions/smssettings.php:162
 msgctxt "BUTTON"
 msgid "Add"
@@ -1456,19 +1468,19 @@ msgstr "HinzufÃ¼gen"
 
 #. 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
+#: actions/emailsettings.php:151 actions/smssettings.php:171
 msgid "Incoming email"
 msgstr "Eingehende E-Mail"
 
 #. 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
+#: actions/emailsettings.php:159 actions/smssettings.php:178
 msgid "Send email to this address to post new notices."
 msgstr "Schicke eine E-Mail an diese Adresse um eine Nachricht zu posten."
 
 #. 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
+#: actions/emailsettings.php:168 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 "
@@ -1476,94 +1488,94 @@ msgstr ""
 
 #. 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
+#: actions/emailsettings.php:172 actions/smssettings.php:189
 msgctxt "BUTTON"
 msgid "New"
 msgstr "Neu"
 
 #. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:174
+#: actions/emailsettings.php:178
 msgid "Email preferences"
 msgstr "E-Mail Einstellungen"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:180
+#: actions/emailsettings.php:184
 msgid "Send me notices of new subscriptions through email."
 msgstr "Informiere mich Ã¼ber neues Abonnements per E-Mail."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:186
+#: actions/emailsettings.php:190
 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."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:193
+#: actions/emailsettings.php:197
 msgid "Send me email when someone sends me a private message."
 msgstr ""
 "Mir eine E-Mail schicken, wenn mir jemand eine private Nachricht schickt."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:199
+#: actions/emailsettings.php:203
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr "Schick mir eine E-Mail, wenn mir jemand eine @Nachricht schickt."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:205
+#: actions/emailsettings.php:209
 msgid "Allow friends to nudge me and send me an email."
 msgstr "Erlaube Freunden mich zu stupsen und mir E-Mails zu senden."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:212
+#: actions/emailsettings.php:216
 msgid "I want to post notices by email."
 msgstr "Ich mÃ¶chte EintrÃ¤ge per E-Mail verÃ¶ffentlichen."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:219
+#: actions/emailsettings.php:223
 msgid "Publish a MicroID for my email address."
 msgstr "MicroID fÃ¼r meine E-Mail-Adresse verÃ¶ffentlichen."
 
 #. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:334
+#: actions/emailsettings.php:338
 msgid "Email preferences saved."
 msgstr "E-Mail-Einstellungen gespeichert."
 
 #. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:353
+#: actions/emailsettings.php:357
 msgid "No email address."
 msgstr "Keine E-Mail-Adresse."
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:361
+#: actions/emailsettings.php:365
 msgid "Cannot normalize that email address"
 msgstr "Konnte diese E-Mail-Adresse nicht normalisieren"
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:208
+#: actions/emailsettings.php:370 actions/register.php:208
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "UngÃ¼ltige E-Mail-Adresse."
 
 #. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:370
+#: actions/emailsettings.php:374
 msgid "That is already your email address."
 msgstr "Dies ist bereits deine E-Mail-Adresse."
 
 #. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:374
+#: actions/emailsettings.php:378
 msgid "That email address already belongs to another user."
 msgstr "Diese E-Mail-Adresse gehÃ¶rt einem anderen Nutzer."
 
 #. 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/emailsettings.php:395 actions/imsettings.php:351
 #: actions/smssettings.php:373
 msgid "Couldn't insert confirmation code."
 msgstr "Konnte keinen BestÃ¤tigungscode einfÃ¼gen."
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:398
+#: actions/emailsettings.php:402
 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."
@@ -1575,50 +1587,50 @@ msgstr ""
 #. 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/emailsettings.php:423 actions/imsettings.php:386
 #: actions/smssettings.php:408
 msgid "No pending confirmation to cancel."
 msgstr "Keine ausstehende BestÃ¤tigung, die abgebrochen werden kann."
 
 #. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:424
+#: actions/emailsettings.php:428
 msgid "That is the wrong email address."
 msgstr "Dies ist die falsche E-Mail Adresse"
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:438
+#: actions/emailsettings.php:442
 msgid "Email confirmation cancelled."
 msgstr "E-Mail-BestÃ¤tigung abgebrochen."
 
 #. TRANS: Message given trying to remove an e-mail address that is not
 #. TRANS: registered for the active user.
-#: actions/emailsettings.php:458
+#: actions/emailsettings.php:462
 msgid "That is not your email address."
 msgstr "Dies ist nicht deine E-Mail-Adresse."
 
 #. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:479
+#: actions/emailsettings.php:483
 msgid "The email address was removed."
 msgstr "Die E-Mail-Adresse wurde entfernt."
 
-#: actions/emailsettings.php:493 actions/smssettings.php:568
+#: actions/emailsettings.php:497 actions/smssettings.php:568
 msgid "No incoming email address."
 msgstr "Keine Eingangs-E-Mail-Adresse."
 
 #. 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/emailsettings.php:508 actions/emailsettings.php:532
 #: actions/smssettings.php:578 actions/smssettings.php:602
 msgid "Couldn't update user record."
 msgstr "Konnte Nutzereintrag nicht schreiben"
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
-#: actions/emailsettings.php:508 actions/smssettings.php:581
+#: actions/emailsettings.php:512 actions/smssettings.php:581
 msgid "Incoming email address removed."
 msgstr "Eingehende E-Mail-Adresse entfernt"
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
-#: actions/emailsettings.php:532 actions/smssettings.php:605
+#: actions/emailsettings.php:536 actions/smssettings.php:605
 msgid "New incoming email address added."
 msgstr "Neue Eingangs-E-Mail-Adresse hinzugefÃ¼gt."
 
@@ -1737,7 +1749,7 @@ msgstr "Konnte Anfrage-Token nicht in Zugriffs-Token umwandeln."
 msgid "Remote service uses unknown version of OMB protocol."
 msgstr "Service nutzt unbekannte OMB-Protokollversion."
 
-#: actions/finishremotesubscribe.php:138
+#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306
 msgid "Error updating remote profile."
 msgstr "Fehler beim Aktualisieren des entfernten Profils."
 
@@ -1794,7 +1806,7 @@ msgstr "Dieser Nutzer ist bereits von der Gruppe gesperrt"
 msgid "User is not a member of group."
 msgstr "Nutzer ist kein Mitglied dieser Gruppe."
 
-#: actions/groupblock.php:134 actions/groupmembers.php:360
+#: actions/groupblock.php:134 actions/groupmembers.php:364
 msgid "Block user from group"
 msgstr "Benutzerzugang zu der Gruppe blockieren"
 
@@ -1876,40 +1888,32 @@ msgstr "Logo aktualisiert."
 msgid "Failed updating logo."
 msgstr "Aktualisierung des Logos fehlgeschlagen."
 
-#: actions/groupmembers.php:100 lib/groupnav.php:92
+#. TRANS: Title of the page showing group members.
+#. TRANS: %s is the name of the group.
+#: actions/groupmembers.php:102
 #, php-format
 msgid "%s group members"
 msgstr "%s Gruppen-Mitglieder"
 
-#: actions/groupmembers.php:103
+#. TRANS: Title of the page showing group members.
+#. TRANS: %1$s is the name of the group, %2$d is the page number of the members list.
+#: actions/groupmembers.php:107
 #, php-format
 msgid "%1$s group members, page %2$d"
 msgstr "%1$s Gruppen-Mitglieder, Seite %2$d"
 
-#: actions/groupmembers.php:118
+#: actions/groupmembers.php:122
 msgid "A list of the users in this group."
 msgstr "Liste der Benutzer in dieser Gruppe."
 
-#: actions/groupmembers.php:182 lib/groupnav.php:107
+#: actions/groupmembers.php:186
 msgid "Admin"
 msgstr "Admin"
 
-#: actions/groupmembers.php:392 lib/blockform.php:69
-msgid "Block"
-msgstr "Blockieren"
-
-#: actions/groupmembers.php:487
+#: actions/groupmembers.php:498
 msgid "Make user an admin of the group"
 msgstr "Benutzer zu einem Admin dieser Gruppe ernennen"
 
-#: actions/groupmembers.php:519
-msgid "Make Admin"
-msgstr "Zum Admin ernennen"
-
-#: actions/groupmembers.php:519
-msgid "Make this user an admin"
-msgstr "Diesen Benutzer zu einem Admin ernennen"
-
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Title in atom group notice feed. %s is a group name.
 #. TRANS: Title in atom user notice feed. %s is a user name.
@@ -2049,7 +2053,10 @@ msgstr ""
 
 #. TRANS: IM address input field instructions in IM settings form.
 #. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:140
+#. TRANS: Do not translate "example.org". It is one of the domain names reserved for use in examples by
+#. TRANS: http://www.rfc-editor.org/rfc/rfc2606.txt. Any other domain may be owned by a legitimate
+#. TRANS: person or organization.
+#: actions/imsettings.php:143
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -2060,65 +2067,65 @@ msgstr ""
 "Programm oder GTalk aufgenommen hast."
 
 #. TRANS: Form legend for IM preferences form.
-#: actions/imsettings.php:155
+#: actions/imsettings.php:158
 msgid "IM preferences"
 msgstr "IM-Einstellungen"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:160
+#: actions/imsettings.php:163
 msgid "Send me notices through Jabber/GTalk."
 msgstr "Schicke mir Nachrichten mittels Jabber/GTalk."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:166
+#: actions/imsettings.php:169
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr "Schicke eine Nachricht, wenn sich mein Jabber/GTalk-Status verÃ¤ndert."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:172
+#: actions/imsettings.php:175
 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."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:179
+#: actions/imsettings.php:182
 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "MicroID fÃ¼r meine Jabber/GTalk-Adresse verÃ¶ffentlichen."
 
 #. TRANS: Confirmation message for successful IM preferences save.
-#: actions/imsettings.php:287 actions/othersettings.php:180
+#: actions/imsettings.php:290 actions/othersettings.php:180
 msgid "Preferences saved."
 msgstr "Einstellungen gesichert."
 
 #. TRANS: Message given saving IM address without having provided one.
-#: actions/imsettings.php:309
+#: actions/imsettings.php:312
 msgid "No Jabber ID."
 msgstr "Keine Jabber-ID"
 
 #. TRANS: Message given saving IM address that cannot be normalised.
-#: actions/imsettings.php:317
+#: actions/imsettings.php:320
 msgid "Cannot normalize that Jabber ID"
 msgstr "Konnte diese Jabber-ID nicht normalisieren"
 
 #. TRANS: Message given saving IM address that not valid.
-#: actions/imsettings.php:322
+#: actions/imsettings.php:325
 msgid "Not a valid Jabber ID"
 msgstr "UngÃ¼ltige Jabber-ID"
 
 #. TRANS: Message given saving IM address that is already set.
-#: actions/imsettings.php:326
+#: actions/imsettings.php:329
 msgid "That is already your Jabber ID."
 msgstr "Diese Jabber-ID hast du schon angegeben."
 
 #. TRANS: Message given saving IM address that is already set for another user.
-#: actions/imsettings.php:330
+#: actions/imsettings.php:333
 msgid "Jabber ID already belongs to another user."
 msgstr "Diese Jabber-ID wird bereits von einem anderen Benutzer verwendet."
 
 #. 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
+#: actions/imsettings.php:361
 #, php-format
 msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
@@ -2128,28 +2135,28 @@ msgstr ""
 "hast. Du musst zulassen, dass %s dir Nachrichten schicken darf."
 
 #. TRANS: Message given canceling IM address confirmation for the wrong IM address.
-#: actions/imsettings.php:388
+#: actions/imsettings.php:391
 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
+#: actions/imsettings.php:400
 msgid "Couldn't delete IM confirmation."
 msgstr "Konnte die IM-BestÃ¤tigung nicht lÃ¶schen."
 
 #. TRANS: Message given after successfully canceling IM address confirmation.
-#: actions/imsettings.php:402
+#: actions/imsettings.php:405
 msgid "IM confirmation cancelled."
 msgstr "IM-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
+#: actions/imsettings.php:427
 msgid "That is not your Jabber ID."
 msgstr "Dies ist nicht deine Jabber-ID."
 
 #. TRANS: Message given after successfully removing a registered IM address.
-#: actions/imsettings.php:447
+#: actions/imsettings.php:450
 msgid "The IM address was removed."
 msgstr "Die IM-Adresse wurde entfernt."
 
@@ -2628,8 +2635,8 @@ msgid "Only %s URLs over plain HTTP please."
 msgstr "Bitte nur %s URLs Ã¼ber einfaches HTTP."
 
 #. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1215
-#: lib/apiaction.php:1243 lib/apiaction.php:1366
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1206
+#: lib/apiaction.php:1233 lib/apiaction.php:1356
 msgid "Not a supported data format."
 msgstr "Kein unterstÃ¼tztes Datenformat."
 
@@ -2770,7 +2777,7 @@ msgid "Password saved."
 msgstr "Passwort gespeichert."
 
 #. TRANS: Menu item for site administration
-#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:384
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:371
 msgid "Paths"
 msgstr "Pfad"
 
@@ -2984,7 +2991,7 @@ msgstr "VollstÃ¤ndiger Name"
 
 #. TRANS: Form input field label.
 #: actions/profilesettings.php:115 actions/register.php:460
-#: lib/applicationeditform.php:244 lib/groupeditform.php:161
+#: lib/applicationeditform.php:235 lib/groupeditform.php:161
 msgid "Homepage"
 msgstr "Homepage"
 
@@ -3092,7 +3099,7 @@ msgid "Couldn't save tags."
 msgstr "Konnte Tags nicht speichern."
 
 #. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:391 lib/adminpanelaction.php:141
+#: actions/profilesettings.php:391 lib/adminpanelaction.php:138
 msgid "Settings saved."
 msgstr "Einstellungen gespeichert."
 
@@ -3635,7 +3642,7 @@ msgstr "Benutzer ist schon blockiert."
 
 #. TRANS: Menu item for site administration
 #: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
-#: lib/adminpanelaction.php:392
+#: lib/adminpanelaction.php:379
 msgid "Sessions"
 msgstr "Sitzung"
 
@@ -3673,24 +3680,24 @@ msgid "Application profile"
 msgstr "Anwendungsprofil"
 
 #. TRANS: Form input field label for application icon.
-#: actions/showapplication.php:159 lib/applicationeditform.php:182
+#: actions/showapplication.php:159 lib/applicationeditform.php:173
 msgid "Icon"
 msgstr "Symbol"
 
 #. TRANS: Form input field label for application name.
 #: actions/showapplication.php:169 actions/version.php:197
-#: lib/applicationeditform.php:199
+#: lib/applicationeditform.php:190
 msgid "Name"
 msgstr "Name"
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:178 lib/applicationeditform.php:235
+#: actions/showapplication.php:178 lib/applicationeditform.php:226
 msgid "Organization"
 msgstr "Organisation"
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:216 lib/groupeditform.php:172
+#: lib/applicationeditform.php:207 lib/groupeditform.php:172
 msgid "Description"
 msgstr "Beschreibung"
 
@@ -3805,7 +3812,7 @@ msgstr ""
 msgid "This is a way to share what you like."
 msgstr "Dies ist ein Weg, Dinge zu teilen, die dir gefallen."
 
-#: actions/showgroup.php:82 lib/groupnav.php:86
+#: actions/showgroup.php:82
 #, php-format
 msgid "%s group"
 msgstr "%s Gruppe"
@@ -3857,7 +3864,7 @@ msgstr "Nachrichtenfeed der Gruppe %s (Atom)"
 msgid "FOAF for %s group"
 msgstr "Postausgang von %s"
 
-#: actions/showgroup.php:393 actions/showgroup.php:445 lib/groupnav.php:91
+#: actions/showgroup.php:393 actions/showgroup.php:445
 msgid "Members"
 msgstr "Mitglieder"
 
@@ -4314,7 +4321,7 @@ msgstr "Kein Code eingegeben"
 
 #. TRANS: Menu item for site administration
 #: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
-#: lib/adminpanelaction.php:408
+#: lib/adminpanelaction.php:395
 msgid "Snapshots"
 msgstr "Snapshots"
 
@@ -5054,7 +5061,7 @@ msgid "Unable to save tag."
 msgstr "Konnte Seitenbenachrichtigung nicht speichern."
 
 #. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#: classes/Subscription.php:75 lib/oauthstore.php:465
+#: classes/Subscription.php:75 lib/oauthstore.php:466
 msgid "You have been banned from subscribing."
 msgstr "Dieser Benutzer erlaubt dir nicht ihn zu abonnieren."
 
@@ -5197,7 +5204,8 @@ msgid "Change site configuration"
 msgstr "Seiteneinstellung Ã¤ndern"
 
 #. TRANS: Main menu option when logged in and site admin for access to site configuration
-#: lib/action.php:474
+#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
+#: lib/action.php:474 lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr "Administrator"
@@ -5274,7 +5282,7 @@ msgstr "Suchen"
 
 #. TRANS: DT element for site notice. String is hidden in default CSS.
 #. TRANS: Menu item for site administration
-#: lib/action.php:538 lib/adminpanelaction.php:400
+#: lib/action.php:538 lib/adminpanelaction.php:387
 msgid "Site notice"
 msgstr "Seitennachricht"
 
@@ -5338,7 +5346,10 @@ msgid "StatusNet software license"
 msgstr "StatusNet-Software-Lizenz"
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
-#: lib/action.php:843
+#. TRANS: Text between [] is a link description, text between () is the link itself.
+#. TRANS: Make sure there is no whitespace between "]" and "(".
+#. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
+#: lib/action.php:846
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -5348,13 +5359,16 @@ msgstr ""
 "site.broughtbyurl%%)."
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:846
+#: lib/action.php:849
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** ist ein Microbloggingdienst."
 
 #. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.
-#: lib/action.php:850
+#. TRANS: Make sure there is no whitespace between "]" and "(".
+#. TRANS: Text between [] is a link description, text between () is the link itself.
+#. TRANS: %s is the version of StatusNet that is being used.
+#: lib/action.php:856
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -5366,20 +5380,20 @@ msgstr ""
 "(http://www.fsf.org/licensing/licenses/agpl-3.0.html) erhÃ¤ltlich ist."
 
 #. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:866
+#: lib/action.php:872
 msgid "Site content license"
 msgstr "StatusNet-Software-Lizenz"
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:873
+#: lib/action.php:879
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr "Inhalte und Daten von %1$s sind privat und vertraulich."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:880
+#: lib/action.php:886
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
@@ -5387,32 +5401,33 @@ msgstr ""
 "vorbehalten."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:884
+#: lib/action.php:890
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 "Urheberrecht von Inhalt und Daten liegt bei den Beteiligten. Alle Rechte "
 "vorbehalten."
 
-#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:897
+#. TRANS: license message in footer.
+#. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
+#: lib/action.php:904
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr "Alle Inhalte und Daten von %1$s sind unter der %2$s Lizenz verfÃ¼gbar."
 
 #. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1236
+#: lib/action.php:1243
 msgid "Pagination"
 msgstr "Seitenerstellung"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1247
+#: lib/action.php:1254
 msgid "After"
 msgstr "SpÃ¤ter"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1257
+#: lib/action.php:1264
 msgid "Before"
 msgstr "Vorher"
 
@@ -5421,207 +5436,226 @@ msgstr "Vorher"
 msgid "Expecting a root feed element but got a whole XML document."
 msgstr "Root-Element eines Feeds erwartet, aber ganzes XML-Dokument erhalten."
 
-#: lib/activityutils.php:208
+#. TRANS: Client exception thrown when there is no source attribute.
+#: lib/activityutils.php:203
 msgid "Can't handle remote content yet."
 msgstr "Fremdinhalt kann noch nicht eingebunden werden."
 
-#: lib/activityutils.php:244
+#. TRANS: Client exception thrown when there embedded XML content is found that cannot be processed yet.
+#: lib/activityutils.php:240
 msgid "Can't handle embedded XML content yet."
 msgstr "Kann eingebundenen XML-Inhalt nicht verarbeiten."
 
-#: lib/activityutils.php:248
+#. TRANS: Client exception thrown when base64 encoded content is found that cannot be processed yet.
+#: lib/activityutils.php:245
 msgid "Can't handle embedded Base64 content yet."
 msgstr "Eingebundener Base64-Inhalt kann noch nicht verarbeitet werden."
 
 #. TRANS: Client error message thrown when a user tries to change admin settings but has no access rights.
-#: lib/adminpanelaction.php:98
+#: lib/adminpanelaction.php:96
 msgid "You cannot make changes to this site."
 msgstr "Du kannst keine Ãnderungen an dieser Seite vornehmen."
 
 #. TRANS: Client error message throw when a certain panel's settings cannot be changed.
-#: lib/adminpanelaction.php:110
+#: lib/adminpanelaction.php:108
 msgid "Changes to that panel are not allowed."
 msgstr "Ãnderungen an dieser Seite sind nicht erlaubt."
 
 #. TRANS: Client error message.
-#: lib/adminpanelaction.php:229
+#: lib/adminpanelaction.php:222
 msgid "showForm() not implemented."
 msgstr "showForm() noch nicht implementiert."
 
 #. TRANS: Client error message
-#: lib/adminpanelaction.php:259
+#: lib/adminpanelaction.php:250
 msgid "saveSettings() not implemented."
 msgstr "saveSettings() noch nicht implementiert."
 
 #. TRANS: Client error message thrown if design settings could not be deleted in
 #. TRANS: the admin panel Design.
-#: lib/adminpanelaction.php:284
+#: lib/adminpanelaction.php:274
 msgid "Unable to delete design setting."
 msgstr "Konnte die Design-Einstellungen nicht lÃ¶schen."
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:350
+#: lib/adminpanelaction.php:337
 msgid "Basic site configuration"
 msgstr "Basis-Seiteneinstellungen"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:352
+#: lib/adminpanelaction.php:339
 msgctxt "MENU"
 msgid "Site"
 msgstr "Seite"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:358
+#: lib/adminpanelaction.php:345
 msgid "Design configuration"
 msgstr "Motiv-Konfiguration"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:360
+#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
+#: lib/adminpanelaction.php:347 lib/groupnav.php:135
 msgctxt "MENU"
 msgid "Design"
 msgstr "Design"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:366
+#: lib/adminpanelaction.php:353
 msgid "User configuration"
 msgstr "Benutzereinstellung"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:368 lib/personalgroupnav.php:115
+#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:115
 msgid "User"
 msgstr "Benutzer"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:374
+#: lib/adminpanelaction.php:361
 msgid "Access configuration"
 msgstr "Zugangskonfiguration"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:382
+#: lib/adminpanelaction.php:369
 msgid "Paths configuration"
 msgstr "Pfadkonfiguration"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:390
+#: lib/adminpanelaction.php:377
 msgid "Sessions configuration"
 msgstr "Sitzungseinstellungen"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:398
+#: lib/adminpanelaction.php:385
 msgid "Edit site notice"
 msgstr "Seitennachricht bearbeiten"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:406
+#: lib/adminpanelaction.php:393
 msgid "Snapshots configuration"
 msgstr "Snapshot-Konfiguration"
 
 #. TRANS: Client error 401.
-#: lib/apiauth.php:113
+#: lib/apiauth.php:111
 msgid "API resource requires read-write access, but you only have read access."
 msgstr "API-Ressource erfordert lesen/schreib Zugriff; du hast nur Leserechte."
 
+#. TRANS: OAuth exception thrown when no application is found for a given consumer key.
+#: lib/apiauth.php:175
+msgid "No application for that consumer key."
+msgstr ""
+
+#. TRANS: OAuth exception given when no user was found for a given token (no token was found).
+#: lib/apiauth.php:217
+msgid "No user for that token."
+msgstr ""
+
+#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
+#: lib/apioauthstore.php:178
+msgid "Tried to revoke unknown token"
+msgstr ""
+
 #. TRANS: Form legend.
-#: lib/applicationeditform.php:137
+#: lib/applicationeditform.php:129
 msgid "Edit application"
 msgstr "Programm bearbeiten"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:187
+#: lib/applicationeditform.php:178
 msgid "Icon for this application"
 msgstr "Programmsymbol"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:209
+#: lib/applicationeditform.php:200
 #, php-format
 msgid "Describe your application in %d characters"
 msgstr "Beschreibe dein Programm in %d Zeichen"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:213
+#: lib/applicationeditform.php:204
 msgid "Describe your application"
 msgstr "Beschreibe dein Programm"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:224
+#: lib/applicationeditform.php:215
 msgid "URL of the homepage of this application"
 msgstr "Adresse der Homepage dieses Programms"
 
 #. TRANS: Form input field label.
-#: lib/applicationeditform.php:226
+#: lib/applicationeditform.php:217
 msgid "Source URL"
 msgstr "Quelladresse"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:233
+#: lib/applicationeditform.php:224
 msgid "Organization responsible for this application"
 msgstr "FÃ¼r diese Anwendung verantwortliche Organisation"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:242
+#: lib/applicationeditform.php:233
 msgid "URL for the homepage of the organization"
 msgstr "Homepage der Gruppe oder des Themas"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:251
+#: lib/applicationeditform.php:242
 msgid "URL to redirect to after authentication"
 msgstr "aufzurufende Adresse nach der Authentifizierung"
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:278
+#: lib/applicationeditform.php:269
 msgid "Browser"
 msgstr "Browser"
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:295
+#: lib/applicationeditform.php:286
 msgid "Desktop"
 msgstr "ArbeitsflÃ¤che"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:297
+#: lib/applicationeditform.php:288
 msgid "Type of application, browser or desktop"
 msgstr "Typ der Anwendung, Browser oder ArbeitsflÃ¤che"
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:320
+#: lib/applicationeditform.php:311
 msgid "Read-only"
 msgstr "SchreibgeschÃ¼tzt"
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:339
+#: lib/applicationeditform.php:330
 msgid "Read-write"
 msgstr "Lese/Schreibzugriff"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:341
+#: lib/applicationeditform.php:332
 msgid "Default access for this application: read-only, or read-write"
 msgstr ""
 "Standardeinstellung dieses Programms: SchreibgeschÃ¼tzt oder Lese/"
 "Schreibzugriff"
 
-#. TRANS: Submit button title
-#: lib/applicationeditform.php:359
+#. TRANS: Submit button title.
+#: lib/applicationeditform.php:349
 msgid "Cancel"
 msgstr "Abbrechen"
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:136
+#: lib/applicationlist.php:135
 msgid "read-write"
 msgstr "Lese/Schreibzugriff"
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:138
+#: lib/applicationlist.php:137
 msgid "read-only"
 msgstr "SchreibgeschÃ¼tzt"
 
 #. 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
+#: lib/applicationlist.php:143
 #, php-format
 msgid "Approved %1$s - \"%2$s\" access."
 msgstr "Genehmigte %1$s - â%2$sâ Zugriff."
 
 #. TRANS: Button label
-#: lib/applicationlist.php:159
+#: lib/applicationlist.php:158
 msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "Widerrufen"
@@ -5641,11 +5675,13 @@ msgstr "Autor"
 msgid "Provider"
 msgstr "Anbieter"
 
-#: lib/attachmentnoticesection.php:67
+#. TRANS: Title.
+#: lib/attachmentnoticesection.php:68
 msgid "Notices where this attachment appears"
 msgstr "Nachrichten in denen dieser Anhang erscheint"
 
-#: lib/attachmenttagcloudsection.php:48
+#. TRANS: Title.
+#: lib/attachmenttagcloudsection.php:49
 msgid "Tags for this attachment"
 msgstr "Stichworte fÃ¼r diesen Anhang"
 
@@ -5657,6 +5693,11 @@ msgstr "Passwort konnte nicht geÃ¤ndert werden"
 msgid "Password changing is not allowed"
 msgstr "Passwort kann nicht geÃ¤ndert werden"
 
+#. TRANS: Title for the form to block a user.
+#: lib/blockform.php:70
+msgid "Block"
+msgstr "Blockieren"
+
 #: lib/channel.php:157 lib/channel.php:177
 msgid "Command results"
 msgstr "Befehl-Ergebnisse"
@@ -5907,7 +5948,7 @@ msgid "You are not subscribed to anyone."
 msgstr "Du hast niemanden abonniert."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to.
-#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.
 #: lib/command.php:836
 msgid "You are subscribed to this person:"
@@ -5922,7 +5963,7 @@ msgid "No one is subscribed to you."
 msgstr "Niemand hat dich abonniert."
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
-#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
 #: lib/command.php:863
 msgid "This person is subscribed to you:"
@@ -5937,7 +5978,7 @@ msgid "You are not a member of any groups."
 msgstr "Du bist in keiner Gruppe Mitglied."
 
 #. TRANS: Text shown after requesting groups a user is subscribed to.
-#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
 #: lib/command.php:890
 msgid "You are a member of this group:"
@@ -5945,6 +5986,7 @@ msgid_plural "You are a member of these groups:"
 msgstr[0] "Du bist Mitglied dieser Gruppe:"
 msgstr[1] "Du bist Mitglied dieser Gruppen:"
 
+#. TRANS: Help text for commands.
 #: lib/command.php:905
 msgid ""
 "Commands:\n"
@@ -6166,38 +6208,6 @@ msgstr ""
 "ZusÃ¤tzliche Spitznamen fÃ¼r die Gruppe, Komma oder Leerzeichen getrennt, max %"
 "d"
 
-#: lib/groupnav.php:85
-msgid "Group"
-msgstr "Gruppe"
-
-#: lib/groupnav.php:101
-msgid "Blocked"
-msgstr "Blockiert"
-
-#: lib/groupnav.php:102
-#, php-format
-msgid "%s blocked users"
-msgstr "in %s blockierte Nutzer"
-
-#: lib/groupnav.php:108
-#, php-format
-msgid "Edit %s group properties"
-msgstr "%s Gruppeneinstellungen bearbeiten"
-
-#: lib/groupnav.php:113
-msgid "Logo"
-msgstr "Logo"
-
-#: lib/groupnav.php:114
-#, php-format
-msgid "Add or edit %s logo"
-msgstr "%s Logo hinzufÃ¼gen oder bearbeiten"
-
-#: lib/groupnav.php:120
-#, php-format
-msgid "Add or edit %s design"
-msgstr "%s Design hinzufÃ¼gen oder bearbeiten"
-
 #: lib/groupsbymemberssection.php:71
 msgid "Groups with most members"
 msgstr "Gruppen mit den meisten Mitgliedern"
@@ -6229,7 +6239,8 @@ msgstr "Du kannst ein Logo fÃ¼r deine Gruppe hochladen."
 msgid "Partial upload."
 msgstr "UnvollstÃ¤ndiges Hochladen."
 
-#: lib/imagefile.php:101 lib/mediafile.php:170
+#. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
+#: lib/imagefile.php:101 lib/mediafile.php:179
 msgid "System error uploading file."
 msgstr "Systemfehler beim Hochladen der Datei."
 
@@ -6630,19 +6641,22 @@ msgstr "Sorry, keinen eingehenden E-Mails gestattet."
 msgid "Unsupported message type: %s"
 msgstr "Nachrichten-Typ %s wird nicht unterstÃ¼tzt."
 
-#: lib/mediafile.php:98 lib/mediafile.php:123
+#. TRANS: Client exception thrown when a database error was thrown during a file upload operation.
+#: lib/mediafile.php:99 lib/mediafile.php:125
 msgid "There was a database error while saving your file. Please try again."
 msgstr ""
 "Beim Speichern der Datei trat ein Datenbankfehler auf. Bitte versuche es "
 "noch einmal."
 
-#: lib/mediafile.php:142
+#. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
+#: lib/mediafile.php:145
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
 msgstr ""
 "Die GrÃ¶Ãe der hochgeladenen Datei Ã¼berschreitet die upload_max_filesize "
 "Angabe in der php.ini."
 
-#: lib/mediafile.php:147
+#. TRANS: Client exception.
+#: lib/mediafile.php:151
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form."
@@ -6650,44 +6664,43 @@ msgstr ""
 "Die GrÃ¶Ãe der hochgeladenen Datei Ã¼berschreitet die MAX_FILE_SIZE Angabe, "
 "die im HTML-Formular angegeben wurde."
 
-#: lib/mediafile.php:152
+#. TRANS: Client exception.
+#: lib/mediafile.php:157
 msgid "The uploaded file was only partially uploaded."
 msgstr "Die Datei wurde nur teilweise auf den Server geladen."
 
-#: lib/mediafile.php:159
+#. TRANS: Client exception thrown when a temporary folder is not present to store a file upload.
+#: lib/mediafile.php:165
 msgid "Missing a temporary folder."
 msgstr "Kein temporÃ¤res Verzeichnis gefunden."
 
-#: lib/mediafile.php:162
+#. TRANS: Client exception thrown when writing to disk is not possible during a file upload operation.
+#: lib/mediafile.php:169
 msgid "Failed to write file to disk."
 msgstr "Konnte die Datei nicht auf die Festplatte schreiben."
 
-#: lib/mediafile.php:165
+#. TRANS: Client exception thrown when a file upload operation has been stopped by an extension.
+#: lib/mediafile.php:173
 msgid "File upload stopped by extension."
 msgstr "Upload der Datei wurde wegen der Dateiendung gestoppt."
 
-#: lib/mediafile.php:179 lib/mediafile.php:217
+#. TRANS: Client exception thrown when a file upload operation would cause a user to exceed a set quota.
+#: lib/mediafile.php:189 lib/mediafile.php:232
 msgid "File exceeds user's quota."
 msgstr "DateigrÃ¶Ãe liegt Ã¼ber dem Benutzerlimit"
 
-#: lib/mediafile.php:197 lib/mediafile.php:234
+#. TRANS: Client exception thrown when a file upload operation fails because the file could
+#. TRANS: not be moved from the temporary folder to the permanent file location.
+#: lib/mediafile.php:209 lib/mediafile.php:251
 msgid "File could not be moved to destination directory."
 msgstr "Datei konnte nicht in das Zielverzeichnis verschoben werden."
 
-#: lib/mediafile.php:202 lib/mediafile.php:238
+#. TRANS: Client exception thrown when a file upload operation has been stopped because the MIME
+#. TRANS: type of the uploaded file could not be determined.
+#: lib/mediafile.php:216 lib/mediafile.php:257
 msgid "Could not determine file's MIME type."
 msgstr "Konnte den MIME-Typ nicht feststellen."
 
-#: lib/mediafile.php:318
-#, php-format
-msgid " Try using another %s format."
-msgstr "Versuche ein anderes %s Format."
-
-#: lib/mediafile.php:323
-#, php-format
-msgid "%s is not a supported file type on this server."
-msgstr "%s ist kein unterstÃ¼tztes Dateiformat auf diesem Server."
-
 #: lib/messageform.php:120
 msgid "Send a direct notice"
 msgstr "Versende eine direkte Nachricht"
@@ -6803,27 +6816,7 @@ msgstr "Stups"
 msgid "Send a nudge to this user"
 msgstr "Sende diesem Benutzer einen Stups"
 
-#: lib/oauthstore.php:283
-msgid "Error inserting new profile"
-msgstr "Neues Profil konnte nicht angelegt werden"
-
-#: lib/oauthstore.php:291
-msgid "Error inserting avatar"
-msgstr "Fehler beim EinfÃ¼gen des Avatars"
-
-#: lib/oauthstore.php:306
-msgid "Error updating remote profile"
-msgstr "Fehler beim Aktualisieren des entfernten Profils"
-
-#: lib/oauthstore.php:311
-msgid "Error inserting remote profile"
-msgstr "Fehler beim EinfÃ¼gen des entfernten Profils"
-
-#: lib/oauthstore.php:345
-msgid "Duplicate notice"
-msgstr "Doppelte Nachricht"
-
-#: lib/oauthstore.php:490
+#: lib/oauthstore.php:491
 msgid "Couldn't insert new subscription."
 msgstr "Konnte neues Abonnement nicht eintragen."
 
@@ -6860,7 +6853,8 @@ msgstr "Deine gesendeten Nachrichten"
 msgid "Tags in %s's notices"
 msgstr "Stichworte in %ss Nachrichten"
 
-#: lib/plugin.php:115
+#. TRANS: Displayed as version information for a plugin if no version information was found.
+#: lib/plugin.php:116
 msgid "Unknown"
 msgstr "Unbekannter Befehl"
 
@@ -6954,19 +6948,19 @@ msgstr "Spielwiese"
 msgid "Sandbox this user"
 msgstr "Diesen Nutzer auf die Spielwiese setzen"
 
-#: lib/searchaction.php:120
+#. TRANS: Fieldset legend for the search form.
+#: lib/searchaction.php:121
 msgid "Search site"
 msgstr "Site durchsuchen"
 
-#: lib/searchaction.php:126
+#. TRANS: Used as a field label for the field where one or more keywords
+#. TRANS: for searching can be entered.
+#: lib/searchaction.php:129
 msgid "Keyword(s)"
 msgstr "Suchbegriff"
 
-#: lib/searchaction.php:127
-msgid "Search"
-msgstr "Suchen"
-
-#: lib/searchaction.php:162
+#. TRANS: Definition list item with instructions on how to get (better) search results.
+#: lib/searchaction.php:170
 msgid "Search help"
 msgstr "Hilfe suchen"
 
@@ -7163,56 +7157,32 @@ msgid "Moderator"
 msgstr "Moderator"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1102
+#: lib/util.php:1103
 msgid "a few seconds ago"
 msgstr "vor wenigen Sekunden"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1105
+#: lib/util.php:1106
 msgid "about a minute ago"
 msgstr "vor einer Minute"
 
-#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1109
-#, php-format
-msgid "about %d minutes ago"
-msgstr "vor %d Minuten"
-
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 #: lib/util.php:1112
 msgid "about an hour ago"
 msgstr "vor einer Stunde"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1116
-#, php-format
-msgid "about %d hours ago"
-msgstr "vor %d Stunden"
-
-#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1119
+#: lib/util.php:1118
 msgid "about a day ago"
 msgstr "vor einem Tag"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1123
-#, php-format
-msgid "about %d days ago"
-msgstr "vor %d Tagen"
-
-#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1126
+#: lib/util.php:1124
 msgid "about a month ago"
 msgstr "vor einem Monat"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 #: lib/util.php:1130
-#, php-format
-msgid "about %d months ago"
-msgstr "vor %d Monaten"
-
-#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1133
 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 7923464797..fbc7354d0e 100644
--- a/locale/el/LC_MESSAGES/statusnet.po
+++ b/locale/el/LC_MESSAGES/statusnet.po
@@ -1,8 +1,9 @@
-# Translation of StatusNet to Greek
+# Translation of StatusNet to Greek (ÎÎ»Î»Î·Î½Î¹ÎºÎ¬)
+# Expored from translatewiki.net
 #
-# Author@translatewiki.net: Crazymadlover
-# Author@translatewiki.net: Dead3y3
-# Author@translatewiki.net: Omnipaedista
+# Author: Crazymadlover
+# Author: Dead3y3
+# Author: Omnipaedista
 # --
 # This file is distributed under the same license as the StatusNet package.
 #
@@ -10,20 +11,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-08 22:33+0000\n"
-"PO-Revision-Date: 2010-09-08 22:33:46+0000\n"
-"Language-Team: Greek\n"
+"POT-Creation-Date: 2010-09-14 19:53+0000\n"
+"PO-Revision-Date: 2010-09-14 19:53:48+0000\n"
+"Language-Team: Greek <http://translatewiki.net/wiki/Portal:el>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r72348); Translate extension (2010-08-20)\n"
+"X-Generator: MediaWiki 1.17alpha (r73009); Translate extension (2010-08-20)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: el\n"
-"X-Message-Group: out-statusnet\n"
+"X-Message-Group: #out-statusnet\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-POT-Import-Date: 1284-49-16 34::+0000\n"
 
 #. TRANS: Page title
 #. TRANS: Menu item for site administration
-#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:376
+#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:363
 msgid "Access"
 msgstr "Î ÏÏÏÎ²Î±ÏÎ·"
 
@@ -77,10 +79,10 @@ 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 actions/emailsettings.php:224
-#: actions/imsettings.php:184 actions/smssettings.php:209
-#: lib/applicationeditform.php:361
+#. TRANS: Button label in the "Edit application" form.
+#: actions/accessadminpanel.php:203 actions/emailsettings.php:228
+#: actions/imsettings.php:187 actions/smssettings.php:209
+#: lib/applicationeditform.php:351
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "ÎÏÎ¿Î¸Î®ÎºÎµÏÏÎ·"
@@ -93,15 +95,15 @@ msgstr "ÎÎ±Î½ÎÎ½Î±Ï ÏÎÏÎ¿Î¹Î¿Ï ÏÏÎ®ÏÏÎ·Ï."
 
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #: actions/all.php:79 actions/allrss.php:68
-#: actions/apiaccountupdatedeliverydevice.php:114
-#: actions/apiaccountupdateprofile.php:105
-#: actions/apiaccountupdateprofilebackgroundimage.php:116
-#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
-#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
-#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:113
-#: actions/apigroupismember.php:91 actions/apigroupjoin.php:100
-#: actions/apigroupleave.php:100 actions/apigrouplist.php:73
-#: actions/apistatusesupdate.php:229 actions/apisubscriptions.php:87
+#: actions/apiaccountupdatedeliverydevice.php:115
+#: actions/apiaccountupdateprofile.php:106
+#: actions/apiaccountupdateprofilebackgroundimage.php:117
+#: actions/apiaccountupdateprofileimage.php:106 actions/apiblockcreate.php:98
+#: actions/apiblockdestroy.php:97 actions/apidirectmessage.php:77
+#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:114
+#: actions/apigroupismember.php:91 actions/apigroupjoin.php:101
+#: actions/apigroupleave.php:101 actions/apigrouplist.php:73
+#: actions/apistatusesupdate.php:230 actions/apisubscriptions.php:87
 #: actions/apitimelinefavorites.php:72 actions/apitimelinefriends.php:174
 #: actions/apitimelinehome.php:80 actions/apitimelinementions.php:80
 #: actions/apitimelineuser.php:82 actions/avatarbynickname.php:75
@@ -188,29 +190,31 @@ msgstr ""
 msgid "You and friends"
 msgstr "ÎÏÎµÎ¯Ï ÎºÎ±Î¹ Î¿Î¹ ÏÎ¯Î»Î¿Î¹ ÏÎ±Ï"
 
-#: actions/apiaccountupdatedeliverydevice.php:86
-#: actions/apiaccountupdateprofile.php:89
-#: actions/apiaccountupdateprofilebackgroundimage.php:86
-#: actions/apiaccountupdateprofilecolors.php:110
-#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89
-#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109
-#: actions/apifavoritecreate.php:91 actions/apifavoritedestroy.php:92
-#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
-#: actions/apigroupcreate.php:105 actions/apigroupjoin.php:92
-#: actions/apigroupleave.php:92 actions/apimediaupload.php:67
-#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:198
+#. TRANS: Client error message. POST is a HTTP command. It should not be translated.
+#. TRANS: Client error. POST is a HTTP command. It should not be translated.
+#: actions/apiaccountupdatedeliverydevice.php:87
+#: actions/apiaccountupdateprofile.php:90
+#: actions/apiaccountupdateprofilebackgroundimage.php:87
+#: actions/apiaccountupdateprofilecolors.php:111
+#: actions/apiaccountupdateprofileimage.php:85 actions/apiblockcreate.php:90
+#: actions/apiblockdestroy.php:89 actions/apidirectmessagenew.php:110
+#: actions/apifavoritecreate.php:92 actions/apifavoritedestroy.php:93
+#: actions/apifriendshipscreate.php:92 actions/apifriendshipsdestroy.php:92
+#: actions/apigroupcreate.php:106 actions/apigroupjoin.php:93
+#: actions/apigroupleave.php:93 actions/apimediaupload.php:68
+#: actions/apistatusesretweet.php:66 actions/apistatusesupdate.php:199
 msgid "This method requires a POST."
 msgstr ""
 
-#: actions/apiaccountupdatedeliverydevice.php:106
+#: actions/apiaccountupdatedeliverydevice.php:107
 msgid ""
 "You must specify a parameter named 'device' with a value of one of: sms, im, "
 "none."
 msgstr ""
 
-#: actions/apiaccountupdateprofilebackgroundimage.php:108
-#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
-#: actions/apistatusesupdate.php:212 actions/avatarsettings.php:257
+#: actions/apiaccountupdateprofilebackgroundimage.php:109
+#: actions/apiaccountupdateprofileimage.php:98 actions/apimediaupload.php:81
+#: actions/apistatusesupdate.php:213 actions/avatarsettings.php:257
 #: actions/designadminpanel.php:123 actions/editapplication.php:118
 #: actions/newapplication.php:101 actions/newnotice.php:94
 #: lib/designsettings.php:283
@@ -220,21 +224,25 @@ msgid ""
 "current configuration."
 msgstr ""
 
-#: actions/apiaccountupdateprofilebackgroundimage.php:136
-#: actions/apiaccountupdateprofilebackgroundimage.php:146
-#: actions/apiaccountupdateprofilecolors.php:164
-#: actions/apiaccountupdateprofilecolors.php:174
+#: actions/apiaccountupdateprofilebackgroundimage.php:137
+#: actions/apiaccountupdateprofilebackgroundimage.php:147
+#: actions/apiaccountupdateprofilecolors.php:165
+#: actions/apiaccountupdateprofilecolors.php:175
 #: actions/groupdesignsettings.php:290 actions/groupdesignsettings.php:300
 #: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
 #: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
 msgid "Unable to save your design settings."
 msgstr ""
 
-#: actions/apiblockcreate.php:105
+#: actions/apiblockcreate.php:106
 msgid "You cannot block yourself!"
 msgstr "ÎÎµÎ½ Î¼ÏÎ¿ÏÎµÎ¯ÏÎµ Î½Î± ÎºÎ¬Î½ÎµÏÎµ ÏÏÎ±Î³Î® ÏÏÎ¿Î½ ÎµÎ±ÏÏÏ ÏÎ±Ï!"
 
-#: actions/apiblockdestroy.php:114
+#: actions/apiblockcreate.php:127
+msgid "Block user failed."
+msgstr ""
+
+#: actions/apiblockdestroy.php:115
 msgid "Unblock user failed."
 msgstr ""
 
@@ -258,49 +266,49 @@ msgstr ""
 msgid "All the direct messages sent to %s"
 msgstr ""
 
-#: actions/apidirectmessagenew.php:118
+#: actions/apidirectmessagenew.php:119
 msgid "No message text!"
 msgstr ""
 
-#: actions/apidirectmessagenew.php:127 actions/newmessage.php:150
+#: actions/apidirectmessagenew.php:128 actions/newmessage.php:150
 #, php-format
 msgid "That's too long. Max message size is %d chars."
 msgstr ""
 
-#: actions/apidirectmessagenew.php:142
+#: actions/apidirectmessagenew.php:143
 msgid "Can't send direct messages to users who aren't your friend."
 msgstr ""
 
-#: actions/apifavoritecreate.php:109 actions/apifavoritedestroy.php:110
+#: actions/apifavoritecreate.php:110 actions/apifavoritedestroy.php:111
 #: actions/apistatusesdestroy.php:121
 msgid "No status found with that ID."
 msgstr ""
 
-#: actions/apifavoritecreate.php:120
+#: actions/apifavoritecreate.php:121
 msgid "This status is already a favorite."
 msgstr ""
 
-#: actions/apifavoritedestroy.php:123
+#: actions/apifavoritedestroy.php:124
 msgid "That status is not a favorite."
 msgstr ""
 
-#: actions/apifriendshipscreate.php:109
+#: actions/apifriendshipscreate.php:110
 msgid "Could not follow user: profile not found."
 msgstr ""
 "ÎÎµ Î¼ÏÎ¿ÏÏ Î½Î± Î±ÎºÎ¿Î»Î¿ÏÎ¸Î®ÏÏ ÏÎ¿ ÏÏÎ®ÏÏÎ·: Î¿ ÏÏÎ®ÏÏÎ·Ï %s ÎµÎ¯Î½Î±Î¹ Î®Î´Î· ÏÏÎ· Î»Î¯ÏÏÎ± ÏÎ¿Ï."
 
-#: actions/apifriendshipscreate.php:118
+#: actions/apifriendshipscreate.php:119
 #, php-format
 msgid "Could not follow user: %s is already on your list."
 msgstr ""
 "ÎÎµ Î¼ÏÎ¿ÏÏ Î½Î± Î±ÎºÎ¿Î»Î¿ÏÎ¸Î®ÏÏ ÏÎ¿ ÏÏÎ®ÏÏÎ·: Î¿ ÏÏÎ®ÏÏÎ·Ï %s ÎµÎ¯Î½Î±Î¹ Î®Î´Î· ÏÏÎ· Î»Î¯ÏÏÎ± ÏÎ¿Ï."
 
-#: actions/apifriendshipsdestroy.php:109
+#: actions/apifriendshipsdestroy.php:110
 msgid "Could not unfollow user: User not found."
 msgstr ""
 "ÎÎµ Î¼ÏÎ¿ÏÏ Î½Î± Î±ÎºÎ¿Î»Î¿ÏÎ¸Î®ÏÏ ÏÎ¿ ÏÏÎ®ÏÏÎ·: Î¿ ÏÏÎ®ÏÏÎ·Ï %s ÎµÎ¯Î½Î±Î¹ Î®Î´Î· ÏÏÎ· Î»Î¯ÏÏÎ± ÏÎ¿Ï."
 
-#: actions/apifriendshipsdestroy.php:120
+#: actions/apifriendshipsdestroy.php:121
 msgid "You cannot unfollow yourself."
 msgstr "ÎÎµÎ½ Î¼ÏÎ¿ÏÎµÎ¯ÏÎµ Î½Î± ÎºÎ¬Î½ÎµÏÎµ ÏÏÎ±Î³Î® ÏÏÎ¿Î½ ÎµÎ±ÏÏÏ ÏÎ±Ï!"
 
@@ -312,75 +320,81 @@ msgstr ""
 msgid "Could not find target user."
 msgstr "ÎÏÎÏÏÏÎµ Î· ÎµÎ½Î·Î¼ÎÏÏÏÎ· ÏÎ¿Ï ÏÏÎ®ÏÏÎ·."
 
-#: actions/apigroupcreate.php:167 actions/editgroup.php:186
+#: actions/apigroupcreate.php:168 actions/editgroup.php:186
 #: actions/newgroup.php:126 actions/profilesettings.php:215
 #: actions/register.php:212
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr "Î¤Î¿ ÏÎµÏÎ´ÏÎ½ÏÎ¼Î¿ ÏÏÎÏÎµÎ¹ Î½Î± ÎÏÎµÎ¹ Î¼ÏÎ½Î¿ ÏÎµÎ¶Î¿ÏÏ ÏÎ±ÏÎ±ÎºÏÎ®ÏÎµÏ ÎºÎ±Î¹ ÏÏÏÎ¯Ï ÎºÎµÎ½Î¬."
 
-#: actions/apigroupcreate.php:176 actions/editgroup.php:190
+#: actions/apigroupcreate.php:177 actions/editgroup.php:190
 #: actions/newgroup.php:130 actions/profilesettings.php:238
 #: actions/register.php:215
 msgid "Nickname already in use. Try another one."
 msgstr "Î¤Î¿ ÏÎµÏÎ´ÏÎ½ÏÎ¼Î¿ ÎµÎ¯Î½Î±Î¹ Î®Î´Î· ÏÎµ ÏÏÎ®ÏÎ·. ÎÎ¿ÎºÎ¹Î¼Î¬ÏÏÎµ ÎºÎ¬ÏÎ¿Î¹Î¿ Î¬Î»Î»Î¿."
 
-#: actions/apigroupcreate.php:199 actions/editapplication.php:215
+#: actions/apigroupcreate.php:184 actions/editgroup.php:193
+#: actions/newgroup.php:133 actions/profilesettings.php:218
+#: actions/register.php:217
+msgid "Not a valid nickname."
+msgstr ""
+
+#: actions/apigroupcreate.php:200 actions/editapplication.php:215
 #: actions/editgroup.php:199 actions/newapplication.php:203
 #: actions/newgroup.php:139 actions/profilesettings.php:222
 #: actions/register.php:224
 msgid "Homepage is not a valid URL."
 msgstr "Î Î±ÏÏÎ¹ÎºÎ® ÏÎµÎ»Î¯Î´Î± Î´ÎµÎ½ ÎµÎ¯Î½Î±Î¹ ÎÎ³ÎºÏÏÎ¿ URL."
 
-#: actions/apigroupcreate.php:208 actions/editgroup.php:202
+#: actions/apigroupcreate.php:209 actions/editgroup.php:202
 #: actions/newgroup.php:142 actions/profilesettings.php:225
 #: actions/register.php:227
 msgid "Full name is too long (max 255 chars)."
 msgstr "Î¤Î¿ Î¿Î½Î¿Î¼Î±ÏÎµÏÏÎ½ÏÎ¼Î¿ ÎµÎ¯Î½Î±Î¹ ÏÎ¿Î»Ï Î¼ÎµÎ³Î¬Î»Î¿ (Î¼ÎÎ³Î¹ÏÏÎ¿ 255 ÏÎ±ÏÎ±ÎºÏ.)."
 
-#: actions/apigroupcreate.php:216 actions/editapplication.php:190
+#: actions/apigroupcreate.php:217 actions/editapplication.php:190
 #: actions/newapplication.php:172
 #, php-format
 msgid "Description is too long (max %d chars)."
 msgstr "Î ÏÎµÏÎ¹Î³ÏÎ±ÏÎ® ÎµÎ¯Î½Î±Î¹ ÏÎ¿Î»Ï Î¼ÎµÎ³Î¬Î»Î· (Î¼ÎÎ³Î¹ÏÏÎ¿ %d ÏÎ±ÏÎ±ÎºÏ.)."
 
-#: actions/apigroupcreate.php:227 actions/editgroup.php:208
+#: actions/apigroupcreate.php:228 actions/editgroup.php:208
 #: actions/newgroup.php:148 actions/profilesettings.php:232
 #: actions/register.php:234
 msgid "Location is too long (max 255 chars)."
 msgstr "Î ÏÎ¿ÏÎ¿Î¸ÎµÏÎ¯Î± ÎµÎ¯Î½Î±Î¹ ÏÎ¿Î»Ï Î¼ÎµÎ³Î¬Î»Î· (Î¼ÎÎ³Î¹ÏÏÎ¿ 255 ÏÎ±ÏÎ±ÎºÏ.)."
 
-#: actions/apigroupcreate.php:246 actions/editgroup.php:219
+#: actions/apigroupcreate.php:247 actions/editgroup.php:219
 #: actions/newgroup.php:159
 #, php-format
 msgid "Too many aliases! Maximum %d."
 msgstr ""
 
-#: actions/apigroupcreate.php:267
-#, php-format
-msgid "Invalid alias: \"%s\"."
-msgstr ""
-
-#: actions/apigroupcreate.php:289 actions/editgroup.php:238
+#: actions/apigroupcreate.php:290 actions/editgroup.php:238
 #: actions/newgroup.php:178
 msgid "Alias can't be the same as nickname."
 msgstr ""
 
-#: actions/apigroupismember.php:96 actions/apigroupjoin.php:105
-#: actions/apigroupleave.php:105 actions/apigroupmembership.php:92
+#: actions/apigroupismember.php:96 actions/apigroupjoin.php:106
+#: actions/apigroupleave.php:106 actions/apigroupmembership.php:92
 #: actions/apigroupshow.php:83 actions/apitimelinegroup.php:92
 msgid "Group not found."
 msgstr "Î Î¼ÎÎ¸Î¿Î´Î¿Ï ÏÎ¿Ï ÎÎ¡Î Î´Îµ Î²ÏÎÎ¸Î·ÎºÎµ!"
 
+#. TRANS: Error text shown when a user tries to join a group they are blocked from joining.
+#: actions/apigroupjoin.php:121 actions/joingroup.php:105 lib/command.php:341
+msgid "You have been blocked from that group by the admin."
+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.
-#: actions/apigroupjoin.php:139 actions/joingroup.php:134 lib/command.php:353
+#: actions/apigroupjoin.php:140 actions/joingroup.php:134 lib/command.php:353
 #, php-format
 msgid "Could not join user %1$s to group %2$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.
-#: actions/apigroupleave.php:125 actions/leavegroup.php:129
+#: actions/apigroupleave.php:126 actions/leavegroup.php:129
 #: lib/command.php:401
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
@@ -392,12 +406,6 @@ msgstr "ÎÎµÎ½ Î®ÏÎ±Î½ Î´ÏÎ½Î±ÏÎ® Î· Î´Î·Î¼Î¹Î¿ÏÏÎ³Î¯Î± Î¿Î¼Î¬Î´Î±Ï."
 msgid "%s's groups"
 msgstr "Î¿Î¼Î¬Î´ÎµÏ ÏÏÎ½ ÏÏÎ·ÏÏÏÎ½ %s"
 
-#. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s
-#: actions/apigrouplist.php:108
-#, php-format
-msgid "%1$s groups %2$s is a member of."
-msgstr ""
-
 #: actions/apigrouplistall.php:96
 #, php-format
 msgid "groups on %s"
@@ -407,15 +415,11 @@ msgstr "Î¿Î¼Î¬Î´ÎµÏ ÏÎ¿Ï ÏÏÎ®ÏÏÎ· %s"
 msgid "No oauth_token parameter provided."
 msgstr ""
 
-#: actions/apioauthauthorize.php:106
-msgid "Invalid token."
-msgstr ""
-
 #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
 #: actions/deletenotice.php:169 actions/disfavor.php:74
-#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:55
+#: actions/emailsettings.php:271 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:66 actions/imsettings.php:227
+#: actions/groupunblock.php:66 actions/imsettings.php:230
 #: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
@@ -433,14 +437,6 @@ msgstr ""
 msgid "Invalid nickname / password!"
 msgstr ""
 
-#: actions/apioauthauthorize.php:159
-msgid "Database error deleting OAuth application user."
-msgstr ""
-
-#: actions/apioauthauthorize.php:185
-msgid "Database error inserting OAuth application user."
-msgstr ""
-
 #: actions/apioauthauthorize.php:214
 #, php-format
 msgid ""
@@ -458,8 +454,8 @@ msgstr ""
 #. 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:286 actions/grouplogo.php:322
-#: actions/imsettings.php:242 actions/newapplication.php:121
+#: actions/emailsettings.php:290 actions/grouplogo.php:322
+#: actions/imsettings.php:245 actions/newapplication.php:121
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
 #: actions/smssettings.php:277 lib/designsettings.php:304
 msgid "Unexpected form submission."
@@ -528,11 +524,21 @@ msgstr "Î ÎºÎ±ÏÎ¬ÏÏÎ±ÏÎ· Î´Î¹ÎµÎ³ÏÎ¬ÏÎ·."
 msgid "No status with that ID found."
 msgstr ""
 
-#: actions/apistatusesupdate.php:221
+#: actions/apistatusesupdate.php:222
 msgid "Client must provide a 'status' parameter with a value."
 msgstr ""
 
-#: actions/apistatusesupdate.php:306 actions/newnotice.php:181
+#: actions/apistatusesupdate.php:243 actions/newnotice.php:157
+#: lib/mailhandler.php:60
+#, php-format
+msgid "That's too long. Max notice size is %d chars."
+msgstr ""
+
+#: actions/apistatusesupdate.php:284 actions/apiusershow.php:96
+msgid "Not found."
+msgstr ""
+
+#: actions/apistatusesupdate.php:307 actions/newnotice.php:181
 #, php-format
 msgid "Max notice size is %d chars, including attachment URL."
 msgstr ""
@@ -541,6 +547,11 @@ msgstr ""
 msgid "Unsupported format."
 msgstr ""
 
+#: actions/apitimelinefavorites.php:110
+#, php-format
+msgid "%1$s / Favorites from %2$s"
+msgstr ""
+
 #: actions/apitimelinefavorites.php:119
 #, php-format
 msgid "%1$s updates favorited by %2$s / %2$s."
@@ -580,10 +591,20 @@ msgstr ""
 msgid "API method under construction."
 msgstr "Î Î¼ÎÎ¸Î¿Î´Î¿Ï ÏÎ¿Ï ÎÎ¡Î ÎµÎ¯Î½Î±Î¹ ÏÏÏ ÎºÎ±ÏÎ±ÏÎºÎµÏÎ®."
 
+#: actions/avatarbynickname.php:64
+msgid "No size."
+msgstr ""
+
 #: actions/avatarbynickname.php:69
 msgid "Invalid size."
 msgstr ""
 
+#. TRANS: Link description in user account settings menu.
+#: actions/avatarsettings.php:67 actions/showgroup.php:230
+#: lib/accountsettingsaction.php:118
+msgid "Avatar"
+msgstr ""
+
 #: actions/avatarsettings.php:78
 #, php-format
 msgid "You can upload your personal avatar. The maximum file size is %s."
@@ -615,6 +636,10 @@ msgstr ""
 msgid "Delete"
 msgstr "ÎÎ¹Î±Î³ÏÎ±ÏÎ®"
 
+#: actions/avatarsettings.php:166 actions/grouplogo.php:236
+msgid "Upload"
+msgstr ""
+
 #: actions/avatarsettings.php:305
 msgid "No file uploaded."
 msgstr ""
@@ -623,6 +648,14 @@ msgstr ""
 msgid "Pick a square area of the image to be your avatar"
 msgstr ""
 
+#: actions/avatarsettings.php:347 actions/grouplogo.php:380
+msgid "Lost our file data."
+msgstr ""
+
+#: actions/avatarsettings.php:370
+msgid "Avatar updated."
+msgstr ""
+
 #: actions/avatarsettings.php:373
 msgid "Failed updating avatar."
 msgstr ""
@@ -694,7 +727,8 @@ msgstr ""
 msgid "Unblock user from group"
 msgstr ""
 
-#: actions/blockedfromgroup.php:320 lib/unblockform.php:69
+#. TRANS: Title for the form to unblock a user.
+#: actions/blockedfromgroup.php:320 lib/unblockform.php:70
 msgid "Unblock"
 msgstr ""
 
@@ -714,9 +748,9 @@ msgstr ""
 #. 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/confirmaddress.php:116 actions/emailsettings.php:331
+#: actions/emailsettings.php:477 actions/imsettings.php:283
+#: actions/imsettings.php:442 actions/othersettings.php:174
 #: actions/profilesettings.php:283 actions/smssettings.php:308
 #: actions/smssettings.php:464
 msgid "Couldn't update user."
@@ -724,7 +758,7 @@ msgstr "ÎÏÎÏÏÏÎµ Î· ÎµÎ½Î·Î¼ÎÏÏÏÎ· ÏÎ¿Ï ÏÏÎ®ÏÏÎ·."
 
 #. 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/confirmaddress.php:128 actions/emailsettings.php:437
 #: actions/smssettings.php:422
 msgid "Couldn't delete email confirmation."
 msgstr "ÎÏÎÏÏÏÎµ Î· Î´Î¹Î±Î³ÏÎ±ÏÎ® email ÎµÏÎ¹Î²ÎµÎ²Î±Î¯ÏÏÎ·Ï."
@@ -742,9 +776,15 @@ msgstr ""
 msgid "Conversation"
 msgstr "Î£ÏÎ¶Î®ÏÎ·ÏÎ·"
 
+#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
+#: lib/profileaction.php:229 lib/searchgroupnav.php:82
+msgid "Notices"
+msgstr ""
+
+#. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:127
 #: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1307
+#: lib/action.php:1315
 msgid "There was a problem with your session token."
 msgstr ""
 
@@ -805,7 +845,6 @@ msgstr "ÎÎ¹Î±Î³ÏÎ¬ÏÏÎµ Î±ÏÏÏÎ½ ÏÎ¿Î½ ÏÏÎ®ÏÏÎ·"
 #. TRANS: Message used as title for design settings for the site.
 #. TRANS: Link description in user account settings menu.
 #: actions/designadminpanel.php:63 lib/accountsettingsaction.php:139
-#: lib/groupnav.php:119
 msgid "Design"
 msgstr ""
 
@@ -817,27 +856,18 @@ msgstr ""
 msgid "Invalid logo URL."
 msgstr ""
 
-#: actions/designadminpanel.php:322
-#, php-format
-msgid "Theme not available: %s."
-msgstr ""
-
 #: actions/designadminpanel.php:426
 msgid "Change logo"
 msgstr "ÎÎ»Î»Î±Î³Î® ÏÏÏÎ¼Î¬ÏÏÎ½"
 
-#: actions/designadminpanel.php:460
-msgid "Site theme"
+#: actions/designadminpanel.php:431
+msgid "Site logo"
 msgstr ""
 
 #: actions/designadminpanel.php:461
 msgid "Theme for the site."
 msgstr ""
 
-#: actions/designadminpanel.php:467
-msgid "Custom theme"
-msgstr ""
-
 #: actions/designadminpanel.php:471
 msgid "You can upload a custom StatusNet theme as a .ZIP archive."
 msgstr ""
@@ -916,6 +946,10 @@ msgstr ""
 msgid "Reset back to default"
 msgstr ""
 
+#: actions/designadminpanel.php:686 lib/designsettings.php:257
+msgid "Save design"
+msgstr ""
+
 #: actions/disfavor.php:81
 msgid "This notice is not a favorite!"
 msgstr ""
@@ -929,6 +963,10 @@ msgstr ""
 msgid "No such document \"%s\""
 msgstr ""
 
+#: actions/editapplication.php:66
+msgid "You must be logged in to edit an application."
+msgstr ""
+
 #: actions/editapplication.php:161
 msgid "Use this form to edit your application."
 msgstr ""
@@ -1015,7 +1053,7 @@ msgstr "Î¤ÏÎÏÎ¿ÏÏÎ± ÎµÏÎ¹Î²ÎµÎ²Î±Î¹ÏÎ¼ÎÎ½Î· email Î´Î¹ÎµÏÎ¸ÏÎ½ÏÎ·."
 #. 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/emailsettings.php:115 actions/emailsettings.php:162
 #: actions/imsettings.php:116 actions/smssettings.php:124
 #: actions/smssettings.php:180
 msgctxt "BUTTON"
@@ -1031,95 +1069,90 @@ msgstr ""
 "ÏÏÎ¿ÏÎ¸ÎÏÎ±ÏÎµ. ÎÎ»ÎÎ³Î¾ÏÎµ ÏÎ± ÎµÎ¹ÏÎµÏÏÏÎ¼ÎµÎ½Î± (ÎºÎ±Î¹ ÏÎ¿Î½ ÏÎ¬ÎºÎµÎ»Î¿ Î±Î½ÎµÏÎ¹Î¸ÏÎ¼Î·ÏÎ·Ï "
 "Î±Î»Î»Î·Î»Î¿Î³ÏÎ±ÏÎ¯Î±Ï) Î³Î¹Î± ÏÎ¿Î½ ÎºÏÎ´Î¹ÎºÏ ÎºÎ±Î¹ Î³Î¹Î± ÏÎ¿ ÏÏÏ Î½Î± ÏÎ¿Î½ ÏÏÎ·ÏÎ¹Î¼Î¿ÏÎ¿Î¹Î®ÏÎµÏÎµ."
 
-#. TRANS: Instructions for e-mail address input form.
-#: actions/emailsettings.php:135
+#. TRANS: Instructions for e-mail address input form. Do not translate
+#. TRANS: "example.org". It is one of the domain names reserved for
+#. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
+#. TRANS: Any other domain may be owned by a legitimate person or
+#. TRANS: organization.
+#: actions/emailsettings.php:139
 msgid "Email address, like \"UserName@example.org\""
 msgstr "ÎÎ¹ÎµÏÎ¸ÏÎ½ÏÎ· email, Ï.Ï: \"UserName@example.org\""
 
-#. 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 ""
-
 #. 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
+#: actions/emailsettings.php:151 actions/smssettings.php:171
 msgid "Incoming email"
 msgstr "ÎÎ¹ÏÎµÏÏÏÎ¼ÎµÎ½Î¿ email"
 
 #. 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
+#: actions/emailsettings.php:159 actions/smssettings.php:178
 msgid "Send email to this address to post new notices."
 msgstr ""
 
 #. 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
+#: actions/emailsettings.php:168 actions/smssettings.php:186
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr ""
 
 #. 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
+#: actions/emailsettings.php:172 actions/smssettings.php:189
 msgctxt "BUTTON"
 msgid "New"
 msgstr ""
 
 #. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:174
+#: actions/emailsettings.php:178
 msgid "Email preferences"
 msgstr "ÎÎ¹ÎµÏÎ¸ÏÎ½ÏÎµÎ¹Ï email"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:180
+#: actions/emailsettings.php:184
 msgid "Send me notices of new subscriptions through email."
 msgstr ""
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:186
+#: actions/emailsettings.php:190
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr ""
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:193
+#: actions/emailsettings.php:197
 msgid "Send me email when someone sends me a private message."
 msgstr ""
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:199
+#: actions/emailsettings.php:203
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr ""
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:205
+#: actions/emailsettings.php:209
 msgid "Allow friends to nudge me and send me an email."
 msgstr ""
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:212
+#: actions/emailsettings.php:216
 msgid "I want to post notices by email."
 msgstr "ÎÎÎ»Ï Î½Î± Î´Î·Î¼Î¿ÏÎ¹ÎµÏÏ ÎµÎ½Î·Î¼ÎµÏÏÏÎµÎ¹Ï Î¼ÎÏÏ email"
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:361
+#: actions/emailsettings.php:365
 msgid "Cannot normalize that email address"
 msgstr "ÎÎ´ÏÎ½Î±Î¼Î¯Î± ÎºÎ±Î½Î¿Î½Î¹ÎºÎ¿ÏÎ¿Î¯Î·ÏÎ·Ï Î±ÏÏÎ®Ï ÏÎ·Ï email Î´Î¹ÎµÏÎ¸ÏÎ½ÏÎ·Ï"
 
 #. 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/emailsettings.php:395 actions/imsettings.php:351
 #: actions/smssettings.php:373
 msgid "Couldn't insert confirmation code."
 msgstr "ÎÏÎÏÏÏÎµ Î· ÎµÎ¹ÏÎ±Î³ÏÎ³Î® ÎºÏÎ´Î¹ÎºÎ¿Ï ÎµÏÎ¹Î²ÎµÎ²Î±Î¯ÏÏÎ·Ï."
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:398
+#: actions/emailsettings.php:402
 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."
@@ -1129,19 +1162,19 @@ msgstr ""
 "Î±Î»Î»Î·Î»Î¿Î³ÏÎ±ÏÎ¯Î±Ï) Î³Î¹Î± ÏÎ¿Î½ ÎºÏÎ´Î¹ÎºÏ ÎºÎ±Î¹ Î³Î¹Î± ÏÎ¿ ÏÏÏ Î½Î± ÏÎ¿Î½ ÏÏÎ·ÏÎ¹Î¼Î¿ÏÎ¿Î¹Î®ÏÎµÏÎµ."
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:438
+#: actions/emailsettings.php:442
 msgid "Email confirmation cancelled."
 msgstr "ÎÏÎ¹Î²ÎµÎ²Î±Î¯ÏÏÎ· Î´Î¹ÎµÏÎ¸ÏÎ½ÏÎ·Ï email"
 
 #. 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/emailsettings.php:508 actions/emailsettings.php:532
 #: actions/smssettings.php:578 actions/smssettings.php:602
 msgid "Couldn't update user record."
 msgstr "ÎÏÎÏÏÏÎµ Î· ÎµÎ½Î·Î¼ÎÏÏÏÎ· ÎµÎ³Î³ÏÎ±ÏÎ®Ï ÏÎ¿Ï ÏÏÎ®ÏÏÎ·."
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
-#: actions/emailsettings.php:508 actions/smssettings.php:581
+#: actions/emailsettings.php:512 actions/smssettings.php:581
 msgid "Incoming email address removed."
 msgstr "Î Î´Î¹ÎµÏÎ¸ÏÎ½ÏÎ· ÏÎ¿Ï ÎµÎ¹ÏÎµÏÏÏÎ¼ÎµÎ½Î¿Ï email Î±ÏÎ±Î¹ÏÎÎ¸Î·ÎºÎµ."
 
@@ -1153,6 +1186,11 @@ msgstr ""
 msgid "Disfavor favorite"
 msgstr ""
 
+#: actions/favorited.php:67
+#, php-format
+msgid "Popular notices, page %d"
+msgstr ""
+
 #: actions/favorited.php:79
 msgid "The most popular notices on the site right now."
 msgstr ""
@@ -1174,11 +1212,22 @@ msgid ""
 "notice to your favorites!"
 msgstr ""
 
+#: actions/favoritesrss.php:111 actions/showfavorites.php:77
+#: lib/personalgroupnav.php:115
+#, php-format
+msgid "%s's favorite notices"
+msgstr ""
+
 #: actions/favoritesrss.php:115
 #, php-format
 msgid "Updates favored by %1$s on %2$s!"
 msgstr ""
 
+#: actions/featured.php:71
+#, php-format
+msgid "Featured users, page %d"
+msgstr ""
+
 #: actions/featured.php:99
 #, php-format
 msgid "A selection of some great users on %s"
@@ -1212,10 +1261,6 @@ msgstr ""
 msgid "You are not authorized."
 msgstr ""
 
-#: actions/finishremotesubscribe.php:113
-msgid "Could not convert request token to access token."
-msgstr ""
-
 #: actions/finishremotesubscribe.php:118
 msgid "Remote service uses unknown version of OMB protocol."
 msgstr ""
@@ -1228,18 +1273,10 @@ msgstr "ÎÎ±Î½ÎÎ½Î±Ï ÏÎÏÎ¿Î¹Î¿Ï ÏÏÎ®ÏÏÎ·Ï."
 msgid "Cannot read file."
 msgstr "ÎÏÎÏÏÏÎµ Î· Î±ÏÎ¿Î¸Î®ÎºÎµÏÏÎ· ÏÎ¿Ï ÏÏÎ¿ÏÎ¯Î»."
 
-#: actions/grantrole.php:62 actions/revokerole.php:62
-msgid "Invalid role."
-msgstr ""
-
 #: actions/grantrole.php:66 actions/revokerole.php:66
 msgid "This role is reserved and cannot be set."
 msgstr ""
 
-#: actions/grantrole.php:75
-msgid "You cannot grant user roles on this site."
-msgstr ""
-
 #: actions/grantrole.php:82
 msgid "User already has this role."
 msgstr ""
@@ -1269,7 +1306,7 @@ msgstr ""
 msgid "User is already blocked from group."
 msgstr ""
 
-#: actions/groupblock.php:134 actions/groupmembers.php:360
+#: actions/groupblock.php:134 actions/groupmembers.php:364
 msgid "Block user from group"
 msgstr ""
 
@@ -1281,6 +1318,11 @@ msgid ""
 "the group in the future."
 msgstr ""
 
+#. 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 ""
+
 #. TRANS: Submit button title for 'Yes' when blocking a user from a group.
 #: actions/groupblock.php:189
 msgid "Block this user from this group"
@@ -1322,23 +1364,21 @@ msgstr ""
 msgid "Failed updating logo."
 msgstr ""
 
-#: actions/groupmembers.php:118
+#: actions/groupmembers.php:122
 msgid "A list of the users in this group."
 msgstr ""
 
-#: actions/groupmembers.php:182 lib/groupnav.php:107
+#: actions/groupmembers.php:186
 msgid "Admin"
 msgstr "ÎÎ¹Î±ÏÎµÎ¹ÏÎ¹ÏÏÎ®Ï"
 
-#: actions/groupmembers.php:392 lib/blockform.php:69
-msgid "Block"
-msgstr ""
-
-#: actions/groupmembers.php:487
+#: actions/groupmembers.php:498
 msgid "Make user an admin of the group"
 msgstr ""
 
-#: actions/groupmembers.php:519
+#. TRANS: Submit button title.
+#: actions/groupmembers.php:537
+msgctxt "TOOLTIP"
 msgid "Make this user an admin"
 msgstr ""
 
@@ -1357,6 +1397,11 @@ msgstr "ÏÏÎ¿Î½Î¿Î´Î¹Î¬Î³ÏÎ±Î¼Î¼Î± ÏÎ¿Ï ÏÏÎ®ÏÏÎ· %s"
 msgid "Updates from members of %1$s on %2$s!"
 msgstr ""
 
+#: actions/groups.php:64
+#, php-format
+msgid "Groups, page %d"
+msgstr ""
+
 #: actions/groups.php:90
 #, php-format
 msgid ""
@@ -1367,10 +1412,6 @@ msgid ""
 "%%%%)"
 msgstr ""
 
-#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:122
-msgid "Create a new group"
-msgstr ""
-
 #: actions/groupsearch.php:52
 #, php-format
 msgid ""
@@ -1428,11 +1469,6 @@ msgid ""
 "doc.im%%). Configure your address and settings below."
 msgstr ""
 
-#. 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 ""
-
 #. 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
@@ -1445,7 +1481,10 @@ msgstr "Î¤ÏÎÏÎ¿ÏÏÎ± ÎµÏÎ¹Î²ÎµÎ²Î±Î¹ÏÎ¼ÎÎ½Î· Jabber/GTalk Î´Î¹ÎµÏÎ¸ÏÎ½
 
 #. TRANS: IM address input field instructions in IM settings form.
 #. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:140
+#. TRANS: Do not translate "example.org". It is one of the domain names reserved for use in examples by
+#. TRANS: http://www.rfc-editor.org/rfc/rfc2606.txt. Any other domain may be owned by a legitimate
+#. TRANS: person or organization.
+#: actions/imsettings.php:143
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -1453,43 +1492,48 @@ msgid ""
 msgstr ""
 
 #. TRANS: Form legend for IM preferences form.
-#: actions/imsettings.php:155
+#: actions/imsettings.php:158
 msgid "IM preferences"
 msgstr "ÎÎ¹ ÏÏÎ¿ÏÎ¹Î¼Î®ÏÎµÎ¹Ï Î±ÏÎ¿Î¸Î·ÎºÎµÏÏÎ·ÎºÎ±Î½"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:160
+#: actions/imsettings.php:163
 msgid "Send me notices through Jabber/GTalk."
 msgstr ""
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:166
+#: actions/imsettings.php:169
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr ""
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:172
+#: actions/imsettings.php:175
 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr ""
 
 #. TRANS: Confirmation message for successful IM preferences save.
-#: actions/imsettings.php:287 actions/othersettings.php:180
+#: actions/imsettings.php:290 actions/othersettings.php:180
 msgid "Preferences saved."
 msgstr "ÎÎ¹ ÏÏÎ¿ÏÎ¹Î¼Î®ÏÎµÎ¹Ï Î±ÏÎ¿Î¸Î·ÎºÎµÏÏÎ·ÎºÎ±Î½"
 
+#. TRANS: Message given saving IM address without having provided one.
+#: actions/imsettings.php:312
+msgid "No Jabber ID."
+msgstr ""
+
 #. TRANS: Message given saving IM address that cannot be normalised.
-#: actions/imsettings.php:317
+#: actions/imsettings.php:320
 msgid "Cannot normalize that Jabber ID"
 msgstr "ÎÎ´ÏÎ½Î±Î¼Î¯Î± ÎºÎ±Î½Î¿Î½Î¹ÎºÎ¿ÏÎ¿Î¯Î·ÏÎ·Ï ÏÎ¿Ï Jabber ID"
 
 #. TRANS: Message given saving IM address that is already set.
-#: actions/imsettings.php:326
+#: actions/imsettings.php:329
 msgid "That is already your Jabber ID."
 msgstr ""
 
 #. 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
+#: actions/imsettings.php:361
 #, php-format
 msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
@@ -1499,16 +1543,21 @@ msgstr ""
 "Î ÏÎÏÎµÎ¹ Î½Î± Î±ÏÎ¿Î´ÎµÏÏÎµÎ¯ÏÎµ ÏÎ¿Î½/ÏÎ·Î½ %s Î³Î¹Î± Î±ÏÎ¿ÏÏÎ¿Î»Î® Î¼Î·Î½ÏÎ¼Î¬ÏÏÎ½ ÏÏÎ¿Ï ÎµÏÎ±Ï. "
 
 #. TRANS: Message given canceling IM address confirmation for the wrong IM address.
-#: actions/imsettings.php:388
+#: actions/imsettings.php:391
 msgid "That is the wrong IM address."
 msgstr ""
 
 #. TRANS: Message given trying to remove an IM address that is not
 #. TRANS: registered for the active user.
-#: actions/imsettings.php:424
+#: actions/imsettings.php:427
 msgid "That is not your Jabber ID."
 msgstr ""
 
+#: actions/inbox.php:59
+#, php-format
+msgid "Inbox for %1$s - page %2$d"
+msgstr ""
+
 #: actions/inbox.php:62
 #, php-format
 msgid "Inbox for %s"
@@ -1522,9 +1571,11 @@ msgstr ""
 msgid "Invites have been disabled."
 msgstr ""
 
-#: actions/invite.php:41
+#. 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:430
 #, php-format
-msgid "You must be logged in to invite other users to use %s."
+msgid "%1$s (%2$s)"
 msgstr ""
 
 #: actions/invite.php:136
@@ -1606,10 +1657,20 @@ msgstr ""
 msgid "No nickname or ID."
 msgstr "Î¨ÎµÏÎ´ÏÎ½ÏÎ¼Î¿"
 
+#: actions/joingroup.php:141
+#, php-format
+msgid "%1$s joined group %2$s"
+msgstr ""
+
 #: actions/leavegroup.php:60
 msgid "You must be logged in to leave a group."
 msgstr ""
 
+#: actions/leavegroup.php:137
+#, php-format
+msgid "%1$s left group %2$s"
+msgstr ""
+
 #: actions/login.php:102 actions/otp.php:62 actions/register.php:144
 msgid "Already logged in."
 msgstr "ÎÎ´Î· ÏÏÎ½Î´ÎµÎ´ÎµÎ¼ÎÎ½Î¿Ï."
@@ -1646,12 +1707,6 @@ msgstr ""
 "ÎÎ¹Î± Î»ÏÎ³Î¿ÏÏ Î±ÏÏÎ±Î»ÎµÎ¯Î±Ï, ÏÎ±ÏÎ±ÎºÎ±Î»Ï ÎµÎ¹ÏÎ¬Î³ÎµÏÎµ Î¾Î±Î½Î¬ ÏÎ¿ ÏÎ½Î¿Î¼Î± ÏÏÎ®ÏÏÎ· ÎºÎ±Î¹ ÏÎ¿Î½ ÎºÏÎ´Î¹ÎºÏ "
 "ÏÎ±Ï, ÏÏÎ¹Î½ Î±Î»Î»Î¬Î¾ÎµÏÎµ ÏÎ¹Ï ÏÏÎ¸Î¼Î¯ÏÎµÎ¹Ï ÏÎ±Ï."
 
-#: actions/login.php:295
-#, php-format
-msgid ""
-"Don't have a username yet? [Register](%%action.register%%) a new account."
-msgstr ""
-
 #: actions/makeadmin.php:92
 msgid "Only an admin can make another user an admin."
 msgstr ""
@@ -1661,15 +1716,14 @@ msgstr ""
 msgid "%1$s is already an admin for group \"%2$s\"."
 msgstr ""
 
-#: actions/makeadmin.php:133
-#, php-format
-msgid "Can't get membership record for %1$s in group %2$s."
-msgstr ""
-
 #: actions/microsummary.php:69
 msgid "No current status."
 msgstr ""
 
+#: actions/newapplication.php:64
+msgid "You must be logged in to register an application."
+msgstr ""
+
 #: actions/newapplication.php:143
 msgid "Use this form to register a new application."
 msgstr ""
@@ -1707,6 +1761,10 @@ msgstr ""
 msgid "Ajax Error"
 msgstr ""
 
+#: actions/newnotice.php:227
+msgid "Notice posted"
+msgstr ""
+
 #: actions/noticesearch.php:68
 #, php-format
 msgid ""
@@ -1718,11 +1776,6 @@ msgstr ""
 msgid "Text search"
 msgstr ""
 
-#: actions/noticesearch.php:91
-#, php-format
-msgid "Search results for \"%1$s\" on %2$s"
-msgstr ""
-
 #: actions/noticesearch.php:121
 #, php-format
 msgid ""
@@ -1742,11 +1795,6 @@ msgstr ""
 msgid "Updates with \"%s\""
 msgstr ""
 
-#: actions/noticesearchrss.php:98
-#, php-format
-msgid "Updates matching search term \"%1$s\" on %2$s!"
-msgstr ""
-
 #: actions/nudge.php:85
 msgid ""
 "This user doesn't allow nudges or hasn't confirmed or set their email yet."
@@ -1764,10 +1812,23 @@ msgstr ""
 msgid "You must be logged in to list your applications."
 msgstr ""
 
+#: actions/oauthappssettings.php:74
+msgid "OAuth applications"
+msgstr ""
+
 #: actions/oauthappssettings.php:85
 msgid "Applications you have registered"
 msgstr ""
 
+#: actions/oauthappssettings.php:135
+#, php-format
+msgid "You have not registered any applications yet."
+msgstr ""
+
+#: actions/oauthconnectionssettings.php:72
+msgid "Connected applications"
+msgstr ""
+
 #: actions/oauthconnectionssettings.php:83
 msgid "You have allowed the following applications to access you account."
 msgstr ""
@@ -1785,12 +1846,6 @@ msgstr ""
 msgid "Developers can edit the registration settings for their applications "
 msgstr ""
 
-#. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
-#: actions/oembed.php:159
-#, php-format
-msgid "Content type %s not supported."
-msgstr ""
-
 #. TRANS: Error message displaying attachments. %s is the site's base URL.
 #: actions/oembed.php:163
 #, php-format
@@ -1798,8 +1853,8 @@ msgid "Only %s URLs over plain HTTP please."
 msgstr ""
 
 #. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1215
-#: lib/apiaction.php:1243 lib/apiaction.php:1366
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1206
+#: lib/apiaction.php:1233 lib/apiaction.php:1356
 msgid "Not a supported data format."
 msgstr ""
 
@@ -1823,30 +1878,27 @@ msgstr ""
 msgid "Shorten URLs with"
 msgstr ""
 
-#: actions/othersettings.php:123
-msgid "Show or hide profile designs."
-msgstr ""
-
-#: actions/otp.php:69
-msgid "No user ID specified."
+#: actions/othersettings.php:117
+msgid "Automatic shortening service to use."
 msgstr ""
 
-#: actions/otp.php:83
-msgid "No login token specified."
+#: actions/othersettings.php:123
+msgid "Show or hide profile designs."
 msgstr ""
 
 #: actions/otp.php:90
 msgid "No login token requested."
 msgstr ""
 
-#: actions/otp.php:95
-msgid "Invalid login token specified."
-msgstr ""
-
 #: actions/otp.php:104
 msgid "Login token expired."
 msgstr ""
 
+#: actions/outbox.php:58
+#, php-format
+msgid "Outbox for %1$s - page %2$d"
+msgstr ""
+
 #: actions/outbox.php:61
 #, php-format
 msgid "Outbox for %s"
@@ -1906,7 +1958,7 @@ msgid "Password saved."
 msgstr "Î ÎºÏÎ´Î¹ÎºÏÏ Î±ÏÎ¿Î¸Î·ÎºÎµÏÏÎ·ÎºÎµ."
 
 #. TRANS: Menu item for site administration
-#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:384
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:371
 msgid "Paths"
 msgstr ""
 
@@ -1914,26 +1966,6 @@ msgstr ""
 msgid "Path and server settings for this StatusNet site."
 msgstr ""
 
-#: actions/pathsadminpanel.php:157
-#, php-format
-msgid "Theme directory not readable: %s."
-msgstr ""
-
-#: actions/pathsadminpanel.php:163
-#, php-format
-msgid "Avatar directory not writable: %s."
-msgstr ""
-
-#: actions/pathsadminpanel.php:169
-#, php-format
-msgid "Background directory not writable: %s."
-msgstr ""
-
-#: actions/pathsadminpanel.php:177
-#, php-format
-msgid "Locales directory not readable: %s."
-msgstr ""
-
 #: actions/pathsadminpanel.php:183
 msgid "Invalid SSL server. The maximum length is 255 characters."
 msgstr ""
@@ -1942,10 +1974,6 @@ msgstr ""
 msgid "Site"
 msgstr ""
 
-#: actions/pathsadminpanel.php:238
-msgid "Server"
-msgstr ""
-
 #: actions/pathsadminpanel.php:238
 msgid "Site's server hostname."
 msgstr ""
@@ -1954,6 +1982,10 @@ msgstr ""
 msgid "Path"
 msgstr ""
 
+#: actions/pathsadminpanel.php:242
+msgid "Site path"
+msgstr ""
+
 #: actions/pathsadminpanel.php:246
 msgid "Path to locales"
 msgstr ""
@@ -2002,6 +2034,10 @@ msgstr "Î¡ÏÎ¸Î¼Î¯ÏÎµÎ¹Ï ÏÎ¿Ï Î¬Î²Î±ÏÎ±Ï"
 msgid "Backgrounds"
 msgstr ""
 
+#: actions/pathsadminpanel.php:305
+msgid "Background server"
+msgstr ""
+
 #: actions/pathsadminpanel.php:309
 msgid "Background path"
 msgstr ""
@@ -2055,10 +2091,6 @@ msgstr ""
 msgid "Users self-tagged with %1$s - page %2$d"
 msgstr ""
 
-#: actions/postnotice.php:95
-msgid "Invalid notice content."
-msgstr ""
-
 #: actions/postnotice.php:101
 #, php-format
 msgid "Notice license â%1$sâ is not compatible with site license â%2$sâ."
@@ -2085,7 +2117,7 @@ msgstr "ÎÎ½Î¿Î¼Î±ÏÎµÏÏÎ½ÏÎ¼Î¿"
 
 #. TRANS: Form input field label.
 #: actions/profilesettings.php:115 actions/register.php:460
-#: lib/applicationeditform.php:244 lib/groupeditform.php:161
+#: lib/applicationeditform.php:235 lib/groupeditform.php:161
 msgid "Homepage"
 msgstr "ÎÏÏÎ¹ÎºÎ® ÏÎµÎ»Î¯Î´Î±"
 
@@ -2188,10 +2220,6 @@ msgstr ""
 msgid "Public Stream Feed (RSS 2.0)"
 msgstr ""
 
-#: actions/public.php:168
-msgid "Public Stream Feed (Atom)"
-msgstr ""
-
 #: actions/public.php:191
 msgid "Be the first to post!"
 msgstr ""
@@ -2284,6 +2312,10 @@ msgstr ""
 msgid "6 or more characters, and don't forget it!"
 msgstr "6 Î® ÏÎµÏÎ¹ÏÏÏÏÎµÏÎ¿Î¹ ÏÎ±ÏÎ±ÎºÏÎ®ÏÎµÏ ÎºÎ±Î¹ Î¼Î·Î½ ÏÎ¿ Î¾ÎµÏÎ¬ÏÎµÏÎµ!"
 
+#: actions/recoverpassword.php:243
+msgid "Reset"
+msgstr ""
+
 #: actions/recoverpassword.php:252
 msgid "Enter a nickname or email address."
 msgstr "ÎÎ¹ÏÎ¬Î³ÎµÏÎµ ÏÎµÏÎ´ÏÎ½ÏÎ¼Î¿ Î® Î´Î¹ÎµÏÎ¸ÏÎ½ÏÎ· email."
@@ -2389,33 +2421,6 @@ msgstr ""
 msgid "All rights reserved."
 msgstr ""
 
-#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:540
-#, php-format
-msgid ""
-"My text and files are available under %s except this private data: password, "
-"email address, IM address, and phone number."
-msgstr ""
-
-#: actions/register.php:583
-#, php-format
-msgid ""
-"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
-"want to...\n"
-"\n"
-"* Go to [your profile](%2$s) and post your first message.\n"
-"* Add a [Jabber/GTalk address](%%%%action.imsettings%%%%) so you can send "
-"notices through instant messages.\n"
-"* [Search for people](%%%%action.peoplesearch%%%%) that you may know or that "
-"share your interests. \n"
-"* Update your [profile settings](%%%%action.profilesettings%%%%) to tell "
-"others more about you. \n"
-"* Read over the [online docs](%%%%doc.help%%%%) for features you may have "
-"missed. \n"
-"\n"
-"Thanks for signing up and we hope you enjoy using this service."
-msgstr ""
-
 #: actions/register.php:607
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
@@ -2456,10 +2461,6 @@ msgstr ""
 msgid "Thatâs a local profile! Login to subscribe."
 msgstr ""
 
-#: actions/remotesubscribe.php:183
-msgid "Couldnât get a request token."
-msgstr ""
-
 #: actions/repeat.php:57
 msgid "Only logged-in users can repeat notices."
 msgstr ""
@@ -2468,10 +2469,6 @@ msgstr ""
 msgid "You can't repeat your own notice."
 msgstr ""
 
-#: actions/repeat.php:90
-msgid "You already repeated that notice."
-msgstr ""
-
 #: actions/repeat.php:114 lib/noticelist.php:676
 msgid "Repeated"
 msgstr "ÎÏÎ±Î½Î±Î»Î±Î¼Î²Î¬Î½ÎµÏÎ±Î¹ Î±ÏÏ"
@@ -2480,6 +2477,17 @@ msgstr "ÎÏÎ±Î½Î±Î»Î±Î¼Î²Î¬Î½ÎµÏÎ±Î¹ Î±ÏÏ"
 msgid "Repeated!"
 msgstr "ÎÏÎ±Î½Î±Î»Î±Î¼Î²Î¬Î½ÎµÏÎ±Î¹ Î±ÏÏ"
 
+#: actions/replies.php:126 actions/repliesrss.php:68
+#: lib/personalgroupnav.php:105
+#, php-format
+msgid "Replies to %s"
+msgstr ""
+
+#: actions/replies.php:128
+#, php-format
+msgid "Replies to %1$s, page %2$d"
+msgstr ""
+
 #: actions/replies.php:145
 #, php-format
 msgid "Replies feed for %s (RSS 1.0)"
@@ -2514,10 +2522,6 @@ msgstr ""
 msgid "Replies to %1$s on %2$s!"
 msgstr ""
 
-#: actions/revokerole.php:75
-msgid "You cannot revoke user roles on this site."
-msgstr ""
-
 #: actions/revokerole.php:82
 msgid "User doesn't have this role."
 msgstr ""
@@ -2536,7 +2540,7 @@ msgstr ""
 
 #. TRANS: Menu item for site administration
 #: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
-#: lib/adminpanelaction.php:392
+#: lib/adminpanelaction.php:379
 msgid "Sessions"
 msgstr ""
 
@@ -2565,21 +2569,30 @@ msgstr ""
 msgid "Save site settings"
 msgstr "ÎÏÎ¿Î¸Î®ÎºÎµÏÏÎ· ÏÏÎ¸Î¼Î¯ÏÎµÏÎ½ ÏÏÏÏÎ²Î±ÏÎ·Ï"
 
+#: actions/showapplication.php:82
+msgid "You must be logged in to view an application."
+msgstr ""
+
 #: actions/showapplication.php:157
 msgid "Application profile"
 msgstr ""
 
 #. TRANS: Form input field label for application icon.
-#: actions/showapplication.php:159 lib/applicationeditform.php:182
+#: actions/showapplication.php:159 lib/applicationeditform.php:173
 msgid "Icon"
 msgstr ""
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:216 lib/groupeditform.php:172
+#: lib/applicationeditform.php:207 lib/groupeditform.php:172
 msgid "Description"
 msgstr "Î ÎµÏÎ¹Î³ÏÎ±ÏÎ®"
 
+#: actions/showapplication.php:192 actions/showgroup.php:436
+#: lib/profileaction.php:187
+msgid "Statistics"
+msgstr ""
+
 #: actions/showapplication.php:203
 #, php-format
 msgid "Created by %1$s - %2$s access by default - %3$d users"
@@ -2686,12 +2699,7 @@ msgstr ""
 msgid "Aliases"
 msgstr ""
 
-#: actions/showgroup.php:355
-#, php-format
-msgid "FOAF for %s group"
-msgstr ""
-
-#: actions/showgroup.php:393 actions/showgroup.php:445 lib/groupnav.php:91
+#: actions/showgroup.php:393 actions/showgroup.php:445
 msgid "Members"
 msgstr "ÎÎÎ»Î·"
 
@@ -2790,6 +2798,10 @@ msgid ""
 "[StatusNet](http://status.net/) tool. "
 msgstr ""
 
+#: actions/silence.php:65 actions/unsilence.php:65
+msgid "You cannot silence users on this site."
+msgstr ""
+
 #: actions/silence.php:72
 msgid "User is already silenced."
 msgstr ""
@@ -2891,6 +2903,10 @@ msgstr ""
 msgid "Edit site-wide message"
 msgstr ""
 
+#: actions/sitenoticeadminpanel.php:103
+msgid "Unable to save site notice."
+msgstr ""
+
 #: actions/sitenoticeadminpanel.php:113
 msgid "Max length for the site-wide notice is 255 chars."
 msgstr ""
@@ -2915,11 +2931,6 @@ msgstr "Î¡ÏÎ¸Î¼Î¯ÏÎµÎ¹Ï ÏÎ¿Ï Î¬Î²Î±ÏÎ±Ï"
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr ""
 
-#. 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 ""
-
 #. TRANS: Form legend for SMS settings form.
 #: actions/smssettings.php:111
 msgid "SMS address"
@@ -2957,6 +2968,11 @@ msgid ""
 "from my carrier."
 msgstr ""
 
+#. TRANS: Message given saving SMS phone number without having selected a carrier.
+#: actions/smssettings.php:344
+msgid "No carrier selected."
+msgstr ""
+
 #. TRANS: Message given saving SMS phone number that is already set.
 #: actions/smssettings.php:352
 msgid "That is already your phone number."
@@ -3001,9 +3017,14 @@ msgid ""
 "email but isn't listed here, send email to let us know at %s."
 msgstr ""
 
+#. TRANS: Message given saving SMS phone number confirmation code without having provided one.
+#: actions/smssettings.php:548
+msgid "No code entered"
+msgstr ""
+
 #. TRANS: Menu item for site administration
 #: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
-#: lib/adminpanelaction.php:408
+#: lib/adminpanelaction.php:395
 msgid "Snapshots"
 msgstr ""
 
@@ -3027,6 +3048,10 @@ msgstr ""
 msgid "In a scheduled job"
 msgstr ""
 
+#: actions/snapshotadminpanel.php:206
+msgid "Data snapshots"
+msgstr ""
+
 #: actions/snapshotadminpanel.php:208
 msgid "When to send statistical data to status.net servers"
 msgstr ""
@@ -3142,6 +3167,11 @@ msgstr ""
 msgid "SMS"
 msgstr ""
 
+#: actions/tag.php:69
+#, php-format
+msgid "Notices tagged with %1$s, page %2$d"
+msgstr ""
+
 #: actions/tag.php:93
 #, php-format
 msgid "Notice feed for tag %s (RSS 2.0)"
@@ -3386,6 +3416,11 @@ msgstr ""
 msgid "Updates from %1$s on %2$s!"
 msgstr ""
 
+#: actions/version.php:75
+#, php-format
+msgid "StatusNet %s"
+msgstr ""
+
 #: actions/version.php:155
 #, php-format
 msgid ""
@@ -3462,11 +3497,6 @@ msgstr ""
 msgid "A file this large would exceed your monthly quota of %d bytes."
 msgstr ""
 
-#. TRANS: Client exception thrown if a file upload does not have a valid name.
-#: classes/File.php:248 classes/File.php:263
-msgid "Invalid filename."
-msgstr ""
-
 #. TRANS: Server exception thrown when updating a local group fails.
 #: classes/Local_group.php:42
 msgid "Could not update local group."
@@ -3496,12 +3526,6 @@ msgstr ""
 msgid "No such profile (%1$d) for notice (%2$d)."
 msgstr ""
 
-#. TRANS: Server exception. %s are the error details.
-#: classes/Notice.php:193
-#, php-format
-msgid "Database error inserting hashtag: %s"
-msgstr ""
-
 #. TRANS: Client exception thrown if a notice contains too many characters.
 #: classes/Notice.php:265
 msgid "Problem saving notice. Too long."
@@ -3568,7 +3592,7 @@ msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
 
 #. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#: classes/Subscription.php:75 lib/oauthstore.php:465
+#: classes/Subscription.php:75 lib/oauthstore.php:466
 msgid "You have been banned from subscribing."
 msgstr ""
 
@@ -3644,11 +3668,22 @@ msgstr ""
 msgid "Design your profile"
 msgstr "Î£ÏÎµÎ´Î¹Î¬ÏÏÎµ ÏÎ¿ ÏÏÎ¿ÏÎ¯Î» ÏÎ±Ï"
 
+#. TRANS: Link title attribute in user account settings menu.
+#: lib/accountsettingsaction.php:144
+msgid "Other options"
+msgstr ""
+
 #. TRANS: Link description in user account settings menu.
 #: lib/accountsettingsaction.php:146
 msgid "Other"
 msgstr ""
 
+#. TRANS: Page title. %1$s is the title, %2$s is the site name.
+#: lib/action.php:148
+#, php-format
+msgid "%1$s - %2$s"
+msgstr ""
+
 #. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
 #: lib/action.php:449
 msgid "Primary site navigation"
@@ -3660,23 +3695,11 @@ msgctxt "TOOLTIP"
 msgid "Personal profile and friends timeline"
 msgstr ""
 
-#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:465
-msgctxt "TOOLTIP"
-msgid "Connect to services"
-msgstr ""
-
 #. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
 #: lib/action.php:468
 msgid "Connect"
 msgstr "Î£ÏÎ½Î´ÎµÏÎ·"
 
-#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:471
-msgctxt "TOOLTIP"
-msgid "Change site configuration"
-msgstr ""
-
 #. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
 #: lib/action.php:481
 msgctxt "MENU"
@@ -3695,12 +3718,6 @@ msgctxt "MENU"
 msgid "Logout"
 msgstr "ÎÎ¿Î³ÏÏÏÏÎ¿"
 
-#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:495
-msgctxt "TOOLTIP"
-msgid "Create an account"
-msgstr ""
-
 #. TRANS: Main menu option when not logged in to register a new account
 #: lib/action.php:498
 msgctxt "MENU"
@@ -3774,23 +3791,18 @@ msgstr ""
 msgid "StatusNet software license"
 msgstr ""
 
-#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
-#: lib/action.php:843
-#, php-format
-msgid ""
-"**%%site.name%%** is a microblogging service brought to you by [%%site."
-"broughtby%%](%%site.broughtbyurl%%)."
-msgstr ""
-
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:846
+#: lib/action.php:849
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr ""
 "Î¤Î¿ **%%site.name%%** ÎµÎ¯Î½Î±Î¹ Î¼Î¯Î± ÏÏÎ·ÏÎµÏÎ¯Î± microblogging (Î¼Î¹ÎºÏÎ¿-Î¹ÏÏÎ¿Î»Î¿Î³Î¯Î¿Ï)."
 
 #. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.
-#: lib/action.php:850
+#. TRANS: Make sure there is no whitespace between "]" and "(".
+#. TRANS: Text between [] is a link description, text between () is the link itself.
+#. TRANS: %s is the version of StatusNet that is being used.
+#: lib/action.php:856
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -3799,44 +3811,45 @@ msgid ""
 msgstr ""
 
 #. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:866
+#: lib/action.php:872
 msgid "Site content license"
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:873
+#: lib/action.php:879
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:880
+#: lib/action.php:886
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:884
+#: lib/action.php:890
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 
-#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:897
+#. TRANS: license message in footer.
+#. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
+#: lib/action.php:904
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr ""
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1247
+#: lib/action.php:1254
 msgid "After"
 msgstr ""
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1257
+#: lib/action.php:1264
 msgid "Before"
 msgstr ""
 
@@ -3845,144 +3858,182 @@ msgstr ""
 msgid "Expecting a root feed element but got a whole XML document."
 msgstr ""
 
-#: lib/activityutils.php:208
+#. TRANS: Client exception thrown when there is no source attribute.
+#: lib/activityutils.php:203
 msgid "Can't handle remote content yet."
 msgstr ""
 
-#: lib/activityutils.php:244
+#. TRANS: Client exception thrown when there embedded XML content is found that cannot be processed yet.
+#: lib/activityutils.php:240
 msgid "Can't handle embedded XML content yet."
 msgstr ""
 
-#: lib/activityutils.php:248
+#. TRANS: Client exception thrown when base64 encoded content is found that cannot be processed yet.
+#: lib/activityutils.php:245
 msgid "Can't handle embedded Base64 content yet."
 msgstr ""
 
 #. TRANS: Client error message thrown when a user tries to change admin settings but has no access rights.
-#: lib/adminpanelaction.php:98
+#: lib/adminpanelaction.php:96
 msgid "You cannot make changes to this site."
 msgstr ""
 
 #. TRANS: Client error message throw when a certain panel's settings cannot be changed.
-#: lib/adminpanelaction.php:110
+#: lib/adminpanelaction.php:108
 msgid "Changes to that panel are not allowed."
 msgstr ""
 
 #. TRANS: Client error message.
-#: lib/adminpanelaction.php:229
+#: lib/adminpanelaction.php:222
 msgid "showForm() not implemented."
 msgstr ""
 
 #. TRANS: Client error message
-#: lib/adminpanelaction.php:259
+#: lib/adminpanelaction.php:250
 msgid "saveSettings() not implemented."
 msgstr ""
 
 #. TRANS: Client error message thrown if design settings could not be deleted in
 #. TRANS: the admin panel Design.
-#: lib/adminpanelaction.php:284
+#: lib/adminpanelaction.php:274
 msgid "Unable to delete design setting."
 msgstr ""
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:360
+#: lib/adminpanelaction.php:339
 msgctxt "MENU"
-msgid "Design"
-msgstr ""
-
-#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:366
-msgid "User configuration"
+msgid "Site"
 msgstr ""
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:368 lib/personalgroupnav.php:115
+#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:115
 msgid "User"
 msgstr ""
 
 #. TRANS: Client error 401.
-#: lib/apiauth.php:113
+#: lib/apiauth.php:111
 msgid "API resource requires read-write access, but you only have read access."
 msgstr ""
 
+#. TRANS: OAuth exception thrown when no application is found for a given consumer key.
+#: lib/apiauth.php:175
+msgid "No application for that consumer key."
+msgstr ""
+
+#. TRANS: OAuth exception given when an incorrect access token was given for a user.
+#: lib/apiauth.php:212
+msgid "Bad access token."
+msgstr ""
+
+#. TRANS: OAuth exception given when no user was found for a given token (no token was found).
+#: lib/apiauth.php:217
+msgid "No user for that token."
+msgstr ""
+
+#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
+#: lib/apioauthstore.php:178
+msgid "Tried to revoke unknown token"
+msgstr ""
+
+#. TRANS: Exception thrown when an attempt is made to remove a revoked token.
+#: lib/apioauthstore.php:182
+msgid "Failed to delete revoked token"
+msgstr ""
+
+#. TRANS: Form legend.
+#: lib/applicationeditform.php:129
+msgid "Edit application"
+msgstr ""
+
+#. TRANS: Form guide.
+#: lib/applicationeditform.php:178
+msgid "Icon for this application"
+msgstr ""
+
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:209
+#: lib/applicationeditform.php:200
 #, php-format
 msgid "Describe your application in %d characters"
 msgstr "Î ÎµÏÎ¹Î³ÏÎ¬ÏÏÎµ ÏÎ·Î½ Î¿Î¼Î¬Î´Î± Î® ÏÎ¿ Î¸ÎÎ¼Î± ÏÏÎ·ÏÎ¹Î¼Î¿ÏÎ¿Î¹ÏÎ½ÏÎ±Ï Î¼ÎÏÏÎ¹ %d ÏÎ±ÏÎ±ÎºÏÎ®ÏÎµÏ"
 
+#. TRANS: Form input field instructions.
+#: lib/applicationeditform.php:215
+msgid "URL of the homepage of this application"
+msgstr ""
+
 #. TRANS: Form input field label.
-#: lib/applicationeditform.php:226
+#: lib/applicationeditform.php:217
 msgid "Source URL"
 msgstr ""
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:233
+#: lib/applicationeditform.php:224
 msgid "Organization responsible for this application"
 msgstr ""
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:242
+#: lib/applicationeditform.php:233
 msgid "URL for the homepage of the organization"
 msgstr ""
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:251
+#: lib/applicationeditform.php:242
 msgid "URL to redirect to after authentication"
 msgstr ""
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:278
+#: lib/applicationeditform.php:269
 msgid "Browser"
 msgstr ""
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:295
+#: lib/applicationeditform.php:286
 msgid "Desktop"
 msgstr ""
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:297
+#: lib/applicationeditform.php:288
 msgid "Type of application, browser or desktop"
 msgstr ""
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:320
+#: lib/applicationeditform.php:311
 msgid "Read-only"
 msgstr ""
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:339
+#: lib/applicationeditform.php:330
 msgid "Read-write"
 msgstr ""
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:341
+#: lib/applicationeditform.php:332
 msgid "Default access for this application: read-only, or read-write"
 msgstr ""
 
-#. TRANS: Submit button title
-#: lib/applicationeditform.php:359
+#. TRANS: Submit button title.
+#: lib/applicationeditform.php:349
 msgid "Cancel"
 msgstr "ÎÎºÏÏÏÏÎ·"
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:136
+#: lib/applicationlist.php:135
 msgid "read-write"
 msgstr ""
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:138
+#: lib/applicationlist.php:137
 msgid "read-only"
 msgstr ""
 
 #. 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
+#: lib/applicationlist.php:143
 #, php-format
 msgid "Approved %1$s - \"%2$s\" access."
 msgstr ""
 
 #. TRANS: Button label
-#: lib/applicationlist.php:159
+#: lib/applicationlist.php:158
 msgctxt "BUTTON"
 msgid "Revoke"
 msgstr ""
@@ -4002,16 +4053,23 @@ msgstr ""
 msgid "Provider"
 msgstr ""
 
-#: lib/attachmentnoticesection.php:67
+#. TRANS: Title.
+#: lib/attachmentnoticesection.php:68
 msgid "Notices where this attachment appears"
 msgstr ""
 
-#: lib/attachmenttagcloudsection.php:48
+#. TRANS: Title.
+#: lib/attachmenttagcloudsection.php:49
 msgid "Tags for this attachment"
 msgstr ""
 
-#: lib/authenticationplugin.php:236
-msgid "Password changing is not allowed"
+#. TRANS: Title for the form to block a user.
+#: lib/blockform.php:70
+msgid "Block"
+msgstr ""
+
+#: lib/channel.php:157 lib/channel.php:177
+msgid "Command results"
 msgstr ""
 
 #: lib/channel.php:229 lib/mailhandler.php:142
@@ -4029,6 +4087,13 @@ msgstr ""
 msgid "User has no last notice."
 msgstr ""
 
+#. TRANS: Message given getting a non-existing user.
+#. TRANS: %s is the nickname of the user that could not be found.
+#: lib/command.php:150
+#, php-format
+msgid "Could not find a local user with nickname %s."
+msgstr ""
+
 #. TRANS: Error text shown when an unimplemented command is given.
 #: lib/command.php:185
 msgid "Sorry, this command is not yet implemented."
@@ -4063,6 +4128,20 @@ msgstr ""
 msgid "Notice marked as fave."
 msgstr ""
 
+#. 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.
+#: lib/command.php:360
+#, php-format
+msgid "%1$s joined group %2$s."
+msgstr ""
+
+#. 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.
+#: lib/command.php:408
+#, php-format
+msgid "%1$s left group %2$s."
+msgstr ""
+
 #. TRANS: Command exception text shown when trying to send a direct message to a remote user (a user not registered at the current server).
 #: lib/command.php:474
 #, php-format
@@ -4083,6 +4162,11 @@ msgstr ""
 msgid "Error sending direct message."
 msgstr ""
 
+#. TRANS: Error text shown when repeating a notice fails with an unknown reason.
+#: lib/command.php:557
+msgid "Error repeating notice."
+msgstr ""
+
 #. TRANS: Message given if content of a notice for a reply is too long.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
 #: lib/command.php:592
@@ -4097,6 +4181,11 @@ msgstr ""
 msgid "Reply to %s sent."
 msgstr ""
 
+#. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
+#: lib/command.php:606
+msgid "Error saving notice."
+msgstr ""
+
 #. TRANS: Error text shown when no username was provided when issuing a subscribe command.
 #: lib/command.php:655
 msgid "Specify the name of the user to subscribe to."
@@ -4107,6 +4196,13 @@ msgstr ""
 msgid "Can't subscribe to OMB profiles by command."
 msgstr ""
 
+#. TRANS: Text shown after having subscribed to another user successfully.
+#. TRANS: %s is the name of the user the subscription was requested for.
+#: lib/command.php:672
+#, php-format
+msgid "Subscribed to %s."
+msgstr ""
+
 #. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
 #. TRANS: Error text shown when no username was provided when issuing the command.
 #: lib/command.php:694 lib/command.php:804
@@ -4158,8 +4254,15 @@ msgstr ""
 msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr ""
 
+#. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
+#. TRANS: %s is the name of the user the unsubscription was requested for.
+#: lib/command.php:813
+#, php-format
+msgid "Unsubscribed %s."
+msgstr ""
+
 #. TRANS: Text shown after requesting other users a user is subscribed to.
-#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.
 #: lib/command.php:836
 msgid "You are subscribed to this person:"
@@ -4168,7 +4271,7 @@ msgstr[0] "ÎÎµÎ½ ÎµÏÎ¹ÏÏÎÏÎµÏÎ±Î¹ Î½Î± ÎºÎ¬Î½ÎµÎ¹Ï ÏÏÎ½Î´ÏÎ¿Î¼Î·ÏÎ
 msgstr[1] "ÎÎµÎ½ ÎµÏÎ¹ÏÏÎÏÎµÏÎ±Î¹ Î½Î± ÎºÎ¬Î½ÎµÎ¹Ï ÏÏÎ½Î´ÏÎ¿Î¼Î·ÏÎÏ ÏÎ¿Ï Î»Î¿Î³Î±ÏÎ¹Î±ÏÎ¼Î¿Ï ÏÎ¿Ï Î¬Î»Î»Î¿ÏÏ."
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
-#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
 #: lib/command.php:863
 msgid "This person is subscribed to you:"
@@ -4183,7 +4286,7 @@ msgid "You are not a member of any groups."
 msgstr "ÎÎµÎ½ ÎµÎ¯ÏÏÎµ Î¼ÎÎ»Î¿Ï ÎºÎ±Î¼Î¯Î±Ï Î¿Î¼Î¬Î´Î±Ï."
 
 #. TRANS: Text shown after requesting groups a user is subscribed to.
-#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
 #: lib/command.php:890
 msgid "You are a member of this group:"
@@ -4191,6 +4294,7 @@ msgid_plural "You are a member of these groups:"
 msgstr[0] "ÎÎ¼Î¬Î´ÎµÏ Î¼Îµ ÏÎ± ÏÎµÏÎ¹ÏÏÏÏÎµÏÎ± Î¼ÎÎ»Î·"
 msgstr[1] "ÎÎ¼Î¬Î´ÎµÏ Î¼Îµ ÏÎ± ÏÎµÏÎ¹ÏÏÏÏÎµÏÎ± Î¼ÎÎ»Î·"
 
+#. TRANS: Help text for commands.
 #: lib/command.php:905
 msgid ""
 "Commands:\n"
@@ -4257,6 +4361,10 @@ msgstr ""
 msgid "Updates by SMS"
 msgstr ""
 
+#: lib/connectsettingsaction.php:121
+msgid "Authorized connected applications"
+msgstr ""
+
 #: lib/dberroraction.php:60
 msgid "Database error"
 msgstr ""
@@ -4274,6 +4382,14 @@ msgstr ""
 msgid "Design defaults restored."
 msgstr ""
 
+#: lib/disfavorform.php:114 lib/disfavorform.php:140
+msgid "Disfavor this notice"
+msgstr ""
+
+#: lib/favorform.php:114 lib/favorform.php:140
+msgid "Favor this notice"
+msgstr ""
+
 #: lib/favorform.php:140
 msgid "Favor"
 msgstr ""
@@ -4346,24 +4462,6 @@ msgstr "Î¤Î¿ÏÎ¿Î¸ÎµÏÎ¯Î± ÏÎ·Ï Î¿Î¼Î¬Î´Î±Ï (ÎµÎ¬Î½ ÏÏÎ¬ÏÏÎµÎ¹), ÏÏ: \"
 msgid "Extra nicknames for the group, comma- or space- separated, max %d"
 msgstr ""
 
-#: lib/groupnav.php:85
-msgid "Group"
-msgstr "ÎÎ¼Î¬Î´Î±"
-
-#: lib/groupnav.php:108
-#, php-format
-msgid "Edit %s group properties"
-msgstr "ÎÏÎµÎ¾ÎµÏÎ³Î±ÏÎ¯Î± Î¹Î´Î¹Î¿ÏÎ®ÏÏÎ½ ÏÎ·Ï Î¿Î¼Î¬Î´Î±Ï %s"
-
-#: lib/groupnav.php:113
-msgid "Logo"
-msgstr "ÎÎ¿Î³ÏÏÏÏÎ¿"
-
-#: lib/groupnav.php:114
-#, php-format
-msgid "Add or edit %s logo"
-msgstr "Î ÏÎ¿ÏÎ¸Î®ÎºÎ· Î® ÎµÏÎµÎ¾ÎµÏÎ³Î±ÏÎ¯Î± Î»Î¿Î³ÏÏÏÏÎ¿Ï Î³Î¹Î± ÏÎ·Î½ Î¿Î¼Î¬Î´Î± %s"
-
 #: lib/groupsbymemberssection.php:71
 msgid "Groups with most members"
 msgstr "ÎÎ¼Î¬Î´ÎµÏ Î¼Îµ ÏÎ± ÏÎµÏÎ¹ÏÏÏÏÎµÏÎ± Î¼ÎÎ»Î·"
@@ -4390,7 +4488,8 @@ msgstr ""
 msgid "Partial upload."
 msgstr ""
 
-#: lib/imagefile.php:101 lib/mediafile.php:170
+#. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
+#: lib/imagefile.php:101 lib/mediafile.php:179
 msgid "System error uploading file."
 msgstr ""
 
@@ -4674,56 +4773,69 @@ msgstr ""
 msgid "Unsupported message type: %s"
 msgstr ""
 
-#: lib/mediafile.php:98 lib/mediafile.php:123
+#. TRANS: Client exception thrown when a database error was thrown during a file upload operation.
+#: lib/mediafile.php:99 lib/mediafile.php:125
 msgid "There was a database error while saving your file. Please try again."
 msgstr ""
 
-#: lib/mediafile.php:142
+#. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
+#: lib/mediafile.php:145
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
 msgstr ""
 
-#: lib/mediafile.php:147
+#. TRANS: Client exception.
+#: lib/mediafile.php:151
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form."
 msgstr ""
 
-#: lib/mediafile.php:152
+#. TRANS: Client exception.
+#: lib/mediafile.php:157
 msgid "The uploaded file was only partially uploaded."
 msgstr ""
 
-#: lib/mediafile.php:159
+#. TRANS: Client exception thrown when a temporary folder is not present to store a file upload.
+#: lib/mediafile.php:165
 msgid "Missing a temporary folder."
 msgstr ""
 
-#: lib/mediafile.php:162
+#. TRANS: Client exception thrown when writing to disk is not possible during a file upload operation.
+#: lib/mediafile.php:169
 msgid "Failed to write file to disk."
 msgstr ""
 
-#: lib/mediafile.php:165
+#. TRANS: Client exception thrown when a file upload operation has been stopped by an extension.
+#: lib/mediafile.php:173
 msgid "File upload stopped by extension."
 msgstr ""
 
-#: lib/mediafile.php:179 lib/mediafile.php:217
+#. TRANS: Client exception thrown when a file upload operation would cause a user to exceed a set quota.
+#: lib/mediafile.php:189 lib/mediafile.php:232
 msgid "File exceeds user's quota."
 msgstr ""
 
-#: lib/mediafile.php:197 lib/mediafile.php:234
+#. TRANS: Client exception thrown when a file upload operation fails because the file could
+#. TRANS: not be moved from the temporary folder to the permanent file location.
+#: lib/mediafile.php:209 lib/mediafile.php:251
 msgid "File could not be moved to destination directory."
 msgstr ""
 
-#: lib/mediafile.php:202 lib/mediafile.php:238
-msgid "Could not determine file's MIME type."
-msgstr ""
-
-#: lib/mediafile.php:318
+#. TRANS: Client exception thrown trying to upload a forbidden MIME type.
+#. TRANS: %1$s is the file type that was denied, %2$s is the application part of
+#. TRANS: the MIME type that was denied.
+#: lib/mediafile.php:340
 #, php-format
-msgid " Try using another %s format."
+msgid ""
+"\"%1$s\" is not a supported file type on this server. Try using another %2$s "
+"format."
 msgstr ""
 
-#: lib/mediafile.php:323
+#. TRANS: Client exception thrown trying to upload a forbidden MIME type.
+#. TRANS: %s is the file type that was denied.
+#: lib/mediafile.php:345
 #, php-format
-msgid "%s is not a supported file type on this server."
+msgid "\"%s\" is not a supported file type on this server."
 msgstr ""
 
 #: lib/messageform.php:146
@@ -4752,16 +4864,17 @@ msgstr ""
 msgid "Attach a file"
 msgstr ""
 
-#: lib/noticeform.php:213
-msgid "Share my location"
-msgstr ""
-
 #: lib/noticeform.php:217
 msgid ""
 "Sorry, retrieving your geo location is taking longer than expected, please "
 "try again later"
 msgstr ""
 
+#. TRANS: Used in coordinates as abbreviation of north
+#: lib/noticelist.php:436
+msgid "N"
+msgstr ""
+
 #. TRANS: Used in coordinates as abbreviation of south
 #: lib/noticelist.php:438
 msgid "S"
@@ -4806,23 +4919,7 @@ msgstr ""
 msgid "Nudge"
 msgstr ""
 
-#: lib/oauthstore.php:283
-msgid "Error inserting new profile"
-msgstr ""
-
-#: lib/oauthstore.php:291
-msgid "Error inserting avatar"
-msgstr ""
-
-#: lib/oauthstore.php:306
-msgid "Error updating remote profile"
-msgstr ""
-
-#: lib/oauthstore.php:311
-msgid "Error inserting remote profile"
-msgstr ""
-
-#: lib/oauthstore.php:490
+#: lib/oauthstore.php:491
 msgid "Couldn't insert new subscription."
 msgstr "ÎÏÎÏÏÏÎµ Î· ÎµÎ¹ÏÎ±Î³ÏÎ³Î® Î½ÎÎ±Ï ÏÏÎ½Î´ÏÎ¿Î¼Î®Ï."
 
@@ -4859,7 +4956,8 @@ msgstr ""
 msgid "Tags in %s's notices"
 msgstr ""
 
-#: lib/plugin.php:115
+#. TRANS: Displayed as version information for a plugin if no version information was found.
+#: lib/plugin.php:116
 msgid "Unknown"
 msgstr ""
 
@@ -4937,19 +5035,19 @@ msgstr ""
 msgid "Sandbox this user"
 msgstr "ÎÎ¯Î½Îµ ÏÏÎ½Î´ÏÎ¿Î¼Î·ÏÎ®Ï Î±ÏÏÎ¿Ï ÏÎ¿Ï ÏÏÎ®ÏÏÎ·"
 
-#: lib/searchaction.php:120
+#. TRANS: Fieldset legend for the search form.
+#: lib/searchaction.php:121
 msgid "Search site"
 msgstr ""
 
-#: lib/searchaction.php:126
+#. TRANS: Used as a field label for the field where one or more keywords
+#. TRANS: for searching can be entered.
+#: lib/searchaction.php:129
 msgid "Keyword(s)"
 msgstr ""
 
-#: lib/searchaction.php:127
-msgid "Search"
-msgstr ""
-
-#: lib/searchaction.php:162
+#. TRANS: Definition list item with instructions on how to get (better) search results.
+#: lib/searchaction.php:170
 msgid "Search help"
 msgstr ""
 
@@ -5038,22 +5136,30 @@ msgstr ""
 msgid "Theme contains file of type '.%s', which is not allowed."
 msgstr ""
 
-#: lib/themeuploader.php:259
-msgid "Error opening theme archive."
-msgstr ""
-
 #: lib/topposterssection.php:74
 msgid "Top posters"
 msgstr "ÎÎ¿ÏÏÏÎ±Î¯Î¿Î¹ Î´Î·Î¼Î¿ÏÎ¹ÎµÏÏÎÏ"
 
+#: lib/unsandboxform.php:69
+msgid "Unsandbox"
+msgstr ""
+
 #: lib/unsandboxform.php:80
 msgid "Unsandbox this user"
 msgstr "ÎÎ¯Î½Îµ ÏÏÎ½Î´ÏÎ¿Î¼Î·ÏÎ®Ï Î±ÏÏÎ¿Ï ÏÎ¿Ï ÏÏÎ®ÏÏÎ·"
 
+#: lib/unsilenceform.php:67
+msgid "Unsilence"
+msgstr ""
+
 #: lib/unsilenceform.php:78
 msgid "Unsilence this user"
 msgstr "ÎÎ¹Î±Î³ÏÎ¬ÏÏÎµ Î±ÏÏÏÎ½ ÏÎ¿Î½ ÏÏÎ®ÏÏÎ·"
 
+#: lib/userprofile.php:117
+msgid "Edit Avatar"
+msgstr ""
+
 #: lib/userprofile.php:237
 msgid "User deletion in progress..."
 msgstr ""
@@ -5085,20 +5191,22 @@ msgid "Moderator"
 msgstr "Î£ÏÎ½ÏÎ¿Î½Î¹ÏÏÎ®Ï"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1102
+#: lib/util.php:1103
 msgid "a few seconds ago"
 msgstr ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1105
+#: lib/util.php:1106
 msgid "about a minute ago"
 msgstr ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 #: lib/util.php:1109
 #, php-format
-msgid "about %d minutes ago"
-msgstr ""
+msgid "about one minute ago"
+msgid_plural "about %d minutes ago"
+msgstr[0] ""
+msgstr[1] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 #: lib/util.php:1112
@@ -5106,35 +5214,41 @@ msgid "about an hour ago"
 msgstr ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1116
+#: lib/util.php:1115
 #, php-format
-msgid "about %d hours ago"
-msgstr ""
+msgid "about one hour ago"
+msgid_plural "about %d hours ago"
+msgstr[0] ""
+msgstr[1] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1119
+#: lib/util.php:1118
 msgid "about a day ago"
 msgstr ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1123
+#: lib/util.php:1121
 #, php-format
-msgid "about %d days ago"
-msgstr ""
+msgid "about one day ago"
+msgid_plural "about %d days ago"
+msgstr[0] ""
+msgstr[1] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1126
+#: lib/util.php:1124
 msgid "about a month ago"
 msgstr ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1130
+#: lib/util.php:1127
 #, php-format
-msgid "about %d months ago"
-msgstr ""
+msgid "about one month ago"
+msgid_plural "about %d months ago"
+msgstr[0] ""
+msgstr[1] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1133
+#: lib/util.php:1130
 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 e828b02149..0d66123b4f 100644
--- a/locale/en_GB/LC_MESSAGES/statusnet.po
+++ b/locale/en_GB/LC_MESSAGES/statusnet.po
@@ -1,9 +1,10 @@
-# Translation of StatusNet to British English
+# Translation of StatusNet to British English (British English)
+# Expored from translatewiki.net
 #
-# Author@translatewiki.net: Brion
-# Author@translatewiki.net: Bruce89
-# Author@translatewiki.net: CiaranG
-# Author@translatewiki.net: Reedy
+# Author: Brion
+# Author: Bruce89
+# Author: CiaranG
+# Author: Reedy
 # --
 # This file is distributed under the same license as the StatusNet package.
 #
@@ -11,20 +12,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-08 22:33+0000\n"
-"PO-Revision-Date: 2010-09-08 22:33:55+0000\n"
-"Language-Team: British English\n"
+"POT-Creation-Date: 2010-09-14 19:53+0000\n"
+"PO-Revision-Date: 2010-09-14 19:53:50+0000\n"
+"Language-Team: British English <http://translatewiki.net/wiki/Portal:en-gb>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r72348); Translate extension (2010-08-20)\n"
+"X-Generator: MediaWiki 1.17alpha (r73009); Translate extension (2010-08-20)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: en-gb\n"
-"X-Message-Group: out-statusnet\n"
+"X-Message-Group: #out-statusnet\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-POT-Import-Date: 1284-49-16 34::+0000\n"
 
 #. TRANS: Page title
 #. TRANS: Menu item for site administration
-#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:376
+#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:363
 msgid "Access"
 msgstr "Access"
 
@@ -77,10 +79,10 @@ 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 actions/emailsettings.php:224
-#: actions/imsettings.php:184 actions/smssettings.php:209
-#: lib/applicationeditform.php:361
+#. TRANS: Button label in the "Edit application" form.
+#: actions/accessadminpanel.php:203 actions/emailsettings.php:228
+#: actions/imsettings.php:187 actions/smssettings.php:209
+#: lib/applicationeditform.php:351
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Save"
@@ -93,15 +95,15 @@ msgstr "No such page."
 
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #: actions/all.php:79 actions/allrss.php:68
-#: actions/apiaccountupdatedeliverydevice.php:114
-#: actions/apiaccountupdateprofile.php:105
-#: actions/apiaccountupdateprofilebackgroundimage.php:116
-#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
-#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
-#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:113
-#: actions/apigroupismember.php:91 actions/apigroupjoin.php:100
-#: actions/apigroupleave.php:100 actions/apigrouplist.php:73
-#: actions/apistatusesupdate.php:229 actions/apisubscriptions.php:87
+#: actions/apiaccountupdatedeliverydevice.php:115
+#: actions/apiaccountupdateprofile.php:106
+#: actions/apiaccountupdateprofilebackgroundimage.php:117
+#: actions/apiaccountupdateprofileimage.php:106 actions/apiblockcreate.php:98
+#: actions/apiblockdestroy.php:97 actions/apidirectmessage.php:77
+#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:114
+#: actions/apigroupismember.php:91 actions/apigroupjoin.php:101
+#: actions/apigroupleave.php:101 actions/apigrouplist.php:73
+#: actions/apistatusesupdate.php:230 actions/apisubscriptions.php:87
 #: actions/apitimelinefavorites.php:72 actions/apitimelinefriends.php:174
 #: actions/apitimelinehome.php:80 actions/apitimelinementions.php:80
 #: actions/apitimelineuser.php:82 actions/avatarbynickname.php:75
@@ -200,16 +202,16 @@ msgid "Updates from %1$s and friends on %2$s!"
 msgstr "Updates from %1$s and friends on %2$s!"
 
 #: actions/apiaccountratelimitstatus.php:72
-#: actions/apiaccountupdatedeliverydevice.php:94
-#: actions/apiaccountupdateprofile.php:97
-#: actions/apiaccountupdateprofilebackgroundimage.php:94
-#: actions/apiaccountupdateprofilecolors.php:118
+#: actions/apiaccountupdatedeliverydevice.php:95
+#: actions/apiaccountupdateprofile.php:98
+#: actions/apiaccountupdateprofilebackgroundimage.php:95
+#: actions/apiaccountupdateprofilecolors.php:119
 #: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156
-#: actions/apifavoritecreate.php:100 actions/apifavoritedestroy.php:101
-#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100
-#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:139
-#: actions/apigroupismember.php:115 actions/apigroupjoin.php:156
-#: actions/apigroupleave.php:142 actions/apigrouplist.php:137
+#: actions/apifavoritecreate.php:101 actions/apifavoritedestroy.php:102
+#: actions/apifriendshipscreate.php:101 actions/apifriendshipsdestroy.php:101
+#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:140
+#: actions/apigroupismember.php:115 actions/apigroupjoin.php:157
+#: actions/apigroupleave.php:143 actions/apigrouplist.php:137
 #: actions/apigrouplistall.php:122 actions/apigroupmembership.php:107
 #: actions/apigroupshow.php:116 actions/apihelptest.php:88
 #: actions/apistatusesdestroy.php:104 actions/apistatusesretweets.php:112
@@ -224,21 +226,23 @@ msgstr "Updates from %1$s and friends on %2$s!"
 msgid "API method not found."
 msgstr "API method not found."
 
-#: actions/apiaccountupdatedeliverydevice.php:86
-#: actions/apiaccountupdateprofile.php:89
-#: actions/apiaccountupdateprofilebackgroundimage.php:86
-#: actions/apiaccountupdateprofilecolors.php:110
-#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89
-#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109
-#: actions/apifavoritecreate.php:91 actions/apifavoritedestroy.php:92
-#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
-#: actions/apigroupcreate.php:105 actions/apigroupjoin.php:92
-#: actions/apigroupleave.php:92 actions/apimediaupload.php:67
-#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:198
+#. TRANS: Client error message. POST is a HTTP command. It should not be translated.
+#. TRANS: Client error. POST is a HTTP command. It should not be translated.
+#: actions/apiaccountupdatedeliverydevice.php:87
+#: actions/apiaccountupdateprofile.php:90
+#: actions/apiaccountupdateprofilebackgroundimage.php:87
+#: actions/apiaccountupdateprofilecolors.php:111
+#: actions/apiaccountupdateprofileimage.php:85 actions/apiblockcreate.php:90
+#: actions/apiblockdestroy.php:89 actions/apidirectmessagenew.php:110
+#: actions/apifavoritecreate.php:92 actions/apifavoritedestroy.php:93
+#: actions/apifriendshipscreate.php:92 actions/apifriendshipsdestroy.php:92
+#: actions/apigroupcreate.php:106 actions/apigroupjoin.php:93
+#: actions/apigroupleave.php:93 actions/apimediaupload.php:68
+#: actions/apistatusesretweet.php:66 actions/apistatusesupdate.php:199
 msgid "This method requires a POST."
 msgstr "This method requires a POST."
 
-#: actions/apiaccountupdatedeliverydevice.php:106
+#: actions/apiaccountupdatedeliverydevice.php:107
 msgid ""
 "You must specify a parameter named 'device' with a value of one of: sms, im, "
 "none."
@@ -246,19 +250,19 @@ msgstr ""
 "You must specify a parameter named 'device' with a value of one of: sms, im, "
 "none."
 
-#: actions/apiaccountupdateprofile.php:112
-#: actions/apiaccountupdateprofilebackgroundimage.php:194
-#: actions/apiaccountupdateprofilecolors.php:185
-#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/apiaccountupdateprofile.php:113
+#: actions/apiaccountupdateprofilebackgroundimage.php:195
+#: actions/apiaccountupdateprofilecolors.php:186
+#: actions/apiaccountupdateprofileimage.php:131 actions/apiusershow.php:108
 #: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/hcard.php:74
 #: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
 #: lib/profileaction.php:84
 msgid "User has no profile."
 msgstr "User has no profile."
 
-#: actions/apiaccountupdateprofilebackgroundimage.php:108
-#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
-#: actions/apistatusesupdate.php:212 actions/avatarsettings.php:257
+#: actions/apiaccountupdateprofilebackgroundimage.php:109
+#: actions/apiaccountupdateprofileimage.php:98 actions/apimediaupload.php:81
+#: actions/apistatusesupdate.php:213 actions/avatarsettings.php:257
 #: actions/designadminpanel.php:123 actions/editapplication.php:118
 #: actions/newapplication.php:101 actions/newnotice.php:94
 #: lib/designsettings.php:283
@@ -270,30 +274,30 @@ msgstr ""
 "The server was unable to handle that much POST data (%s bytes) due to its "
 "current configuration."
 
-#: actions/apiaccountupdateprofilebackgroundimage.php:136
-#: actions/apiaccountupdateprofilebackgroundimage.php:146
-#: actions/apiaccountupdateprofilecolors.php:164
-#: actions/apiaccountupdateprofilecolors.php:174
+#: actions/apiaccountupdateprofilebackgroundimage.php:137
+#: actions/apiaccountupdateprofilebackgroundimage.php:147
+#: actions/apiaccountupdateprofilecolors.php:165
+#: actions/apiaccountupdateprofilecolors.php:175
 #: actions/groupdesignsettings.php:290 actions/groupdesignsettings.php:300
 #: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
 #: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
 msgid "Unable to save your design settings."
 msgstr "Unable to save your design settings!"
 
-#: actions/apiaccountupdateprofilebackgroundimage.php:187
-#: actions/apiaccountupdateprofilecolors.php:142
+#: actions/apiaccountupdateprofilebackgroundimage.php:188
+#: actions/apiaccountupdateprofilecolors.php:143
 msgid "Could not update your design."
 msgstr "Could not update your design."
 
-#: actions/apiblockcreate.php:105
+#: actions/apiblockcreate.php:106
 msgid "You cannot block yourself!"
 msgstr "You cannot block yourself!"
 
-#: actions/apiblockcreate.php:126
+#: actions/apiblockcreate.php:127
 msgid "Block user failed."
 msgstr "Block user failed."
 
-#: actions/apiblockdestroy.php:114
+#: actions/apiblockdestroy.php:115
 msgid "Unblock user failed."
 msgstr "Unblock user failed."
 
@@ -317,59 +321,59 @@ msgstr "Direct messages to %s"
 msgid "All the direct messages sent to %s"
 msgstr "All the direct messages sent to %s"
 
-#: actions/apidirectmessagenew.php:118
+#: actions/apidirectmessagenew.php:119
 msgid "No message text!"
 msgstr "No message text!"
 
-#: actions/apidirectmessagenew.php:127 actions/newmessage.php:150
+#: actions/apidirectmessagenew.php:128 actions/newmessage.php:150
 #, php-format
 msgid "That's too long. Max message size is %d chars."
 msgstr "That's too long. Max message size is %d chars."
 
-#: actions/apidirectmessagenew.php:138
+#: actions/apidirectmessagenew.php:139
 msgid "Recipient user not found."
 msgstr "Recipient user not found."
 
-#: actions/apidirectmessagenew.php:142
+#: actions/apidirectmessagenew.php:143
 msgid "Can't send direct messages to users who aren't your friend."
 msgstr "Can't send direct messages to users who aren't your friend."
 
-#: actions/apifavoritecreate.php:109 actions/apifavoritedestroy.php:110
+#: actions/apifavoritecreate.php:110 actions/apifavoritedestroy.php:111
 #: actions/apistatusesdestroy.php:121
 msgid "No status found with that ID."
 msgstr "No status found with that ID."
 
-#: actions/apifavoritecreate.php:120
+#: actions/apifavoritecreate.php:121
 msgid "This status is already a favorite."
 msgstr "This status is already a favourite."
 
 #. TRANS: Error message text shown when a favorite could not be set.
-#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:296
+#: actions/apifavoritecreate.php:132 actions/favor.php:84 lib/command.php:296
 msgid "Could not create favorite."
 msgstr "Could not create favourite."
 
-#: actions/apifavoritedestroy.php:123
+#: actions/apifavoritedestroy.php:124
 msgid "That status is not a favorite."
 msgstr "That status is not a favourite."
 
-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
+#: actions/apifavoritedestroy.php:136 actions/disfavor.php:87
 msgid "Could not delete favorite."
 msgstr "Could not delete favourite."
 
-#: actions/apifriendshipscreate.php:109
+#: actions/apifriendshipscreate.php:110
 msgid "Could not follow user: profile not found."
 msgstr "Could not follow user: profile not found."
 
-#: actions/apifriendshipscreate.php:118
+#: actions/apifriendshipscreate.php:119
 #, php-format
 msgid "Could not follow user: %s is already on your list."
 msgstr "Could not follow user: %s is already on your list."
 
-#: actions/apifriendshipsdestroy.php:109
+#: actions/apifriendshipsdestroy.php:110
 msgid "Could not unfollow user: User not found."
 msgstr "Could not unfollow user: User not found."
 
-#: actions/apifriendshipsdestroy.php:120
+#: actions/apifriendshipsdestroy.php:121
 msgid "You cannot unfollow yourself."
 msgstr "You cannot unfollow yourself."
 
@@ -385,101 +389,101 @@ msgstr "Could not determine source user."
 msgid "Could not find target user."
 msgstr "Could not find target user."
 
-#: actions/apigroupcreate.php:167 actions/editgroup.php:186
+#: actions/apigroupcreate.php:168 actions/editgroup.php:186
 #: actions/newgroup.php:126 actions/profilesettings.php:215
 #: actions/register.php:212
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr "Nickname must have only lowercase letters and numbers, and no spaces."
 
-#: actions/apigroupcreate.php:176 actions/editgroup.php:190
+#: actions/apigroupcreate.php:177 actions/editgroup.php:190
 #: actions/newgroup.php:130 actions/profilesettings.php:238
 #: actions/register.php:215
 msgid "Nickname already in use. Try another one."
 msgstr "Nickname already in use. Try another one."
 
-#: actions/apigroupcreate.php:183 actions/editgroup.php:193
+#: actions/apigroupcreate.php:184 actions/editgroup.php:193
 #: actions/newgroup.php:133 actions/profilesettings.php:218
 #: actions/register.php:217
 msgid "Not a valid nickname."
 msgstr "Not a valid nickname."
 
-#: actions/apigroupcreate.php:199 actions/editapplication.php:215
+#: actions/apigroupcreate.php:200 actions/editapplication.php:215
 #: actions/editgroup.php:199 actions/newapplication.php:203
 #: actions/newgroup.php:139 actions/profilesettings.php:222
 #: actions/register.php:224
 msgid "Homepage is not a valid URL."
 msgstr "Homepage is not a valid URL."
 
-#: actions/apigroupcreate.php:208 actions/editgroup.php:202
+#: actions/apigroupcreate.php:209 actions/editgroup.php:202
 #: actions/newgroup.php:142 actions/profilesettings.php:225
 #: actions/register.php:227
 msgid "Full name is too long (max 255 chars)."
 msgstr "Full name is too long (max 255 chars)."
 
-#: actions/apigroupcreate.php:216 actions/editapplication.php:190
+#: actions/apigroupcreate.php:217 actions/editapplication.php:190
 #: actions/newapplication.php:172
 #, php-format
 msgid "Description is too long (max %d chars)."
 msgstr "Description is too long (max %d chars)"
 
-#: actions/apigroupcreate.php:227 actions/editgroup.php:208
+#: actions/apigroupcreate.php:228 actions/editgroup.php:208
 #: actions/newgroup.php:148 actions/profilesettings.php:232
 #: actions/register.php:234
 msgid "Location is too long (max 255 chars)."
 msgstr "Location is too long (max 255 chars)."
 
-#: actions/apigroupcreate.php:246 actions/editgroup.php:219
+#: actions/apigroupcreate.php:247 actions/editgroup.php:219
 #: actions/newgroup.php:159
 #, php-format
 msgid "Too many aliases! Maximum %d."
 msgstr "Too many aliases! Maximum %d."
 
-#: actions/apigroupcreate.php:267
+#: actions/apigroupcreate.php:268
 #, php-format
 msgid "Invalid alias: \"%s\"."
 msgstr "Invalid alias: \"%s\"."
 
-#: actions/apigroupcreate.php:276 actions/editgroup.php:232
+#: actions/apigroupcreate.php:277 actions/editgroup.php:232
 #: actions/newgroup.php:172
 #, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr "Alias \"%s\" already in use. Try another one."
 
-#: actions/apigroupcreate.php:289 actions/editgroup.php:238
+#: actions/apigroupcreate.php:290 actions/editgroup.php:238
 #: actions/newgroup.php:178
 msgid "Alias can't be the same as nickname."
 msgstr "Alias can't be the same as nickname."
 
-#: actions/apigroupismember.php:96 actions/apigroupjoin.php:105
-#: actions/apigroupleave.php:105 actions/apigroupmembership.php:92
+#: actions/apigroupismember.php:96 actions/apigroupjoin.php:106
+#: actions/apigroupleave.php:106 actions/apigroupmembership.php:92
 #: actions/apigroupshow.php:83 actions/apitimelinegroup.php:92
 msgid "Group not found."
 msgstr "Group not found."
 
 #. TRANS: Error text shown a user tries to join a group they already are a member of.
-#: actions/apigroupjoin.php:111 actions/joingroup.php:100 lib/command.php:336
+#: actions/apigroupjoin.php:112 actions/joingroup.php:100 lib/command.php:336
 msgid "You are already a member of that group."
 msgstr "You are already a member of that group."
 
 #. TRANS: Error text shown when a user tries to join a group they are blocked from joining.
-#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:341
+#: actions/apigroupjoin.php:121 actions/joingroup.php:105 lib/command.php:341
 msgid "You have been blocked from that group by the admin."
 msgstr "You have been blocked from that group by the admin."
 
 #. 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.
-#: actions/apigroupjoin.php:139 actions/joingroup.php:134 lib/command.php:353
+#: actions/apigroupjoin.php:140 actions/joingroup.php:134 lib/command.php:353
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "Could not join user %1$s to group %2$s."
 
-#: actions/apigroupleave.php:115
+#: actions/apigroupleave.php:116
 msgid "You are not a member of this group."
 msgstr "You are not a member of this group."
 
 #. 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.
-#: actions/apigroupleave.php:125 actions/leavegroup.php:129
+#: actions/apigroupleave.php:126 actions/leavegroup.php:129
 #: lib/command.php:401
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
@@ -519,9 +523,9 @@ msgstr "Invalid token."
 
 #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
 #: actions/deletenotice.php:169 actions/disfavor.php:74
-#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:55
+#: actions/emailsettings.php:271 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:66 actions/imsettings.php:227
+#: actions/groupunblock.php:66 actions/imsettings.php:230
 #: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
@@ -566,8 +570,8 @@ msgstr "The request token %s has been denied and revoked."
 #. 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:286 actions/grouplogo.php:322
-#: actions/imsettings.php:242 actions/newapplication.php:121
+#: actions/emailsettings.php:290 actions/grouplogo.php:322
+#: actions/imsettings.php:245 actions/newapplication.php:121
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
 #: actions/smssettings.php:277 lib/designsettings.php:304
 msgid "Unexpected form submission."
@@ -631,18 +635,18 @@ msgstr "This method requires a POST or DELETE."
 msgid "You may not delete another user's status."
 msgstr "You may not delete another user's status."
 
-#: actions/apistatusesretweet.php:75 actions/apistatusesretweets.php:72
+#: actions/apistatusesretweet.php:76 actions/apistatusesretweets.php:72
 #: actions/deletenotice.php:52 actions/shownotice.php:92
 msgid "No such notice."
 msgstr "No such notice."
 
 #. TRANS: Error text shown when trying to repeat an own notice.
-#: actions/apistatusesretweet.php:83 lib/command.php:538
+#: actions/apistatusesretweet.php:84 lib/command.php:538
 msgid "Cannot repeat your own notice."
 msgstr "Cannot repeat your own notice."
 
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-#: actions/apistatusesretweet.php:91 lib/command.php:544
+#: actions/apistatusesretweet.php:92 lib/command.php:544
 msgid "Already repeated that notice."
 msgstr "Already repeated that notice."
 
@@ -654,21 +658,21 @@ msgstr "Status deleted."
 msgid "No status with that ID found."
 msgstr "No status with that ID found."
 
-#: actions/apistatusesupdate.php:221
+#: actions/apistatusesupdate.php:222
 msgid "Client must provide a 'status' parameter with a value."
 msgstr ""
 
-#: actions/apistatusesupdate.php:242 actions/newnotice.php:157
+#: actions/apistatusesupdate.php:243 actions/newnotice.php:157
 #: lib/mailhandler.php:60
 #, php-format
 msgid "That's too long. Max notice size is %d chars."
 msgstr "That's too long. Max notice size is %d chars."
 
-#: actions/apistatusesupdate.php:283 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:284 actions/apiusershow.php:96
 msgid "Not found."
 msgstr "Not found."
 
-#: actions/apistatusesupdate.php:306 actions/newnotice.php:181
+#: actions/apistatusesupdate.php:307 actions/newnotice.php:181
 #, php-format
 msgid "Max notice size is %d chars, including attachment URL."
 msgstr "Max notice size is %d chars, including attachment URL."
@@ -868,7 +872,9 @@ msgid "Yes"
 msgstr "Yes"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
+#. TRANS: Submit button title.
+#. TRANS: Description of the form to block a user.
+#: actions/block.php:164 actions/groupmembers.php:403 lib/blockform.php:82
 msgid "Block this user"
 msgstr "Block this user"
 
@@ -910,11 +916,13 @@ msgstr "A list of the users blocked from joining this group."
 msgid "Unblock user from group"
 msgstr "Unblock user from group"
 
-#: actions/blockedfromgroup.php:320 lib/unblockform.php:69
+#. TRANS: Title for the form to unblock a user.
+#: actions/blockedfromgroup.php:320 lib/unblockform.php:70
 msgid "Unblock"
 msgstr "Unblock"
 
-#: actions/blockedfromgroup.php:320 lib/unblockform.php:80
+#. TRANS: Description of the form to unblock a user.
+#: actions/blockedfromgroup.php:320 lib/unblockform.php:82
 msgid "Unblock this user"
 msgstr "Unblock this user"
 
@@ -953,9 +961,9 @@ msgstr "That address has already been confirmed."
 #. 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/confirmaddress.php:116 actions/emailsettings.php:331
+#: actions/emailsettings.php:477 actions/imsettings.php:283
+#: actions/imsettings.php:442 actions/othersettings.php:174
 #: actions/profilesettings.php:283 actions/smssettings.php:308
 #: actions/smssettings.php:464
 msgid "Couldn't update user."
@@ -963,7 +971,7 @@ msgstr "Couldn't update user."
 
 #. 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/confirmaddress.php:128 actions/emailsettings.php:437
 #: actions/smssettings.php:422
 msgid "Couldn't delete email confirmation."
 msgstr "Couldn't delete e-mail confirmation."
@@ -999,9 +1007,10 @@ msgstr "Application not found."
 msgid "You are not the owner of this application."
 msgstr "You are not the owner of this application."
 
+#. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:127
 #: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1307
+#: lib/action.php:1315
 msgid "There was a problem with your session token."
 msgstr "There was a problem with your session token."
 
@@ -1035,7 +1044,7 @@ msgstr "Delete this application"
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
 #: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:73 lib/profileformaction.php:64
+#: lib/adminpanelaction.php:71 lib/profileformaction.php:64
 #: lib/settingsaction.php:72
 msgid "Not logged in."
 msgstr "Not logged in."
@@ -1098,7 +1107,6 @@ msgstr "Delete this user"
 #. TRANS: Message used as title for design settings for the site.
 #. TRANS: Link description in user account settings menu.
 #: actions/designadminpanel.php:63 lib/accountsettingsaction.php:139
-#: lib/groupnav.php:119
 msgid "Design"
 msgstr "Design"
 
@@ -1215,13 +1223,13 @@ msgstr "Restore default designs"
 msgid "Reset back to default"
 msgstr "Reset back to default"
 
-#. TRANS: Submit button title
+#. TRANS: Submit button title.
 #: actions/designadminpanel.php:685 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/snapshotadminpanel.php:245
 #: actions/subscriptions.php:226 actions/tagother.php:154
-#: actions/useradminpanel.php:294 lib/applicationeditform.php:363
+#: actions/useradminpanel.php:294 lib/applicationeditform.php:353
 #: lib/designsettings.php:256 lib/groupeditform.php:202
 msgid "Save"
 msgstr "Save"
@@ -1377,7 +1385,7 @@ msgstr "Current confirmed e-mail address."
 #. 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/emailsettings.php:115 actions/emailsettings.php:162
 #: actions/imsettings.php:116 actions/smssettings.php:124
 #: actions/smssettings.php:180
 msgctxt "BUTTON"
@@ -1395,22 +1403,26 @@ msgstr ""
 #. 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
+#. TRANS: Button label in the "Edit application" form.
 #: actions/emailsettings.php:127 actions/imsettings.php:131
-#: actions/smssettings.php:137 lib/applicationeditform.php:357
+#: actions/smssettings.php:137 lib/applicationeditform.php:347
 msgctxt "BUTTON"
 msgid "Cancel"
 msgstr "Cancel"
 
-#. TRANS: Instructions for e-mail address input form.
-#: actions/emailsettings.php:135
+#. TRANS: Instructions for e-mail address input form. Do not translate
+#. TRANS: "example.org". It is one of the domain names reserved for
+#. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
+#. TRANS: Any other domain may be owned by a legitimate person or
+#. TRANS: organization.
+#: actions/emailsettings.php:139
 msgid "Email address, like \"UserName@example.org\""
 msgstr "E-mail address, like \"UserName@example.org\""
 
 #. 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/emailsettings.php:143 actions/imsettings.php:151
 #: actions/smssettings.php:162
 msgctxt "BUTTON"
 msgid "Add"
@@ -1418,110 +1430,110 @@ msgstr "Add"
 
 #. 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
+#: actions/emailsettings.php:151 actions/smssettings.php:171
 msgid "Incoming email"
 msgstr "Incoming e-mail"
 
 #. 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
+#: actions/emailsettings.php:159 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."
 
 #. 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
+#: actions/emailsettings.php:168 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."
 
 #. 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
+#: actions/emailsettings.php:172 actions/smssettings.php:189
 msgctxt "BUTTON"
 msgid "New"
 msgstr "New"
 
 #. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:174
+#: actions/emailsettings.php:178
 msgid "Email preferences"
 msgstr "Email preferences"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:180
+#: actions/emailsettings.php:184
 msgid "Send me notices of new subscriptions through email."
 msgstr "Send me notices of new subscriptions through e-mail."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:186
+#: actions/emailsettings.php:190
 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."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:193
+#: actions/emailsettings.php:197
 msgid "Send me email when someone sends me a private message."
 msgstr "Send me e-mail when someone sends me a private message."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:199
+#: actions/emailsettings.php:203
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr "Send me e-mail when someone sends me an \"@-reply\"."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:205
+#: actions/emailsettings.php:209
 msgid "Allow friends to nudge me and send me an email."
 msgstr "Allow friends to nudge me and send me an e-mail."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:212
+#: actions/emailsettings.php:216
 msgid "I want to post notices by email."
 msgstr "I want to post notices by e-mail."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:219
+#: actions/emailsettings.php:223
 msgid "Publish a MicroID for my email address."
 msgstr "Publish a MicroID for my e-mail address."
 
 #. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:334
+#: actions/emailsettings.php:338
 msgid "Email preferences saved."
 msgstr "Email preferences saved."
 
 #. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:353
+#: actions/emailsettings.php:357
 msgid "No email address."
 msgstr "No e-mail address."
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:361
+#: actions/emailsettings.php:365
 msgid "Cannot normalize that email address"
 msgstr "Cannot normalise that e-mail address"
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:208
+#: actions/emailsettings.php:370 actions/register.php:208
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "Not a valid e-mail address."
 
 #. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:370
+#: actions/emailsettings.php:374
 msgid "That is already your email address."
 msgstr "That is already your e-mail address."
 
 #. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:374
+#: actions/emailsettings.php:378
 msgid "That email address already belongs to another user."
 msgstr "That e-mail address already belongs to another user."
 
 #. 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/emailsettings.php:395 actions/imsettings.php:351
 #: actions/smssettings.php:373
 msgid "Couldn't insert confirmation code."
 msgstr "Couldn't insert confirmation code."
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:398
+#: actions/emailsettings.php:402
 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."
@@ -1532,50 +1544,50 @@ msgstr ""
 #. 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/emailsettings.php:423 actions/imsettings.php:386
 #: actions/smssettings.php:408
 msgid "No pending confirmation to cancel."
 msgstr "No pending confirmation to cancel."
 
 #. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:424
+#: actions/emailsettings.php:428
 msgid "That is the wrong email address."
 msgstr "That is the wrong email address."
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:438
+#: actions/emailsettings.php:442
 msgid "Email confirmation cancelled."
 msgstr "Email confirmation cancelled."
 
 #. TRANS: Message given trying to remove an e-mail address that is not
 #. TRANS: registered for the active user.
-#: actions/emailsettings.php:458
+#: actions/emailsettings.php:462
 msgid "That is not your email address."
 msgstr "That is not your e-mail address."
 
 #. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:479
+#: actions/emailsettings.php:483
 msgid "The email address was removed."
 msgstr "The email address was removed."
 
-#: actions/emailsettings.php:493 actions/smssettings.php:568
+#: actions/emailsettings.php:497 actions/smssettings.php:568
 msgid "No incoming email address."
 msgstr "No incoming e-mail address."
 
 #. 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/emailsettings.php:508 actions/emailsettings.php:532
 #: actions/smssettings.php:578 actions/smssettings.php:602
 msgid "Couldn't update user record."
 msgstr "Couldn't update user record."
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
-#: actions/emailsettings.php:508 actions/smssettings.php:581
+#: actions/emailsettings.php:512 actions/smssettings.php:581
 msgid "Incoming email address removed."
 msgstr "Incoming e-mail address removed."
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
-#: actions/emailsettings.php:532 actions/smssettings.php:605
+#: actions/emailsettings.php:536 actions/smssettings.php:605
 msgid "New incoming email address added."
 msgstr "New incoming e-mail address added."
 
@@ -1693,7 +1705,7 @@ msgstr "Couldn't convert request tokens to access tokens."
 msgid "Remote service uses unknown version of OMB protocol."
 msgstr "Remote service uses unknown version of OMB protocol."
 
-#: actions/finishremotesubscribe.php:138
+#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306
 msgid "Error updating remote profile."
 msgstr "Error updating remote profile."
 
@@ -1750,7 +1762,7 @@ msgstr "User is already blocked from group."
 msgid "User is not a member of group."
 msgstr "User is not a member of group."
 
-#: actions/groupblock.php:134 actions/groupmembers.php:360
+#: actions/groupblock.php:134 actions/groupmembers.php:364
 msgid "Block user from group"
 msgstr "Block user from group"
 
@@ -1831,40 +1843,32 @@ msgstr "Logo updated."
 msgid "Failed updating logo."
 msgstr "Failed updating logo."
 
-#: actions/groupmembers.php:100 lib/groupnav.php:92
+#. TRANS: Title of the page showing group members.
+#. TRANS: %s is the name of the group.
+#: actions/groupmembers.php:102
 #, php-format
 msgid "%s group members"
 msgstr "%s group members"
 
-#: actions/groupmembers.php:103
+#. TRANS: Title of the page showing group members.
+#. TRANS: %1$s is the name of the group, %2$d is the page number of the members list.
+#: actions/groupmembers.php:107
 #, php-format
 msgid "%1$s group members, page %2$d"
 msgstr "%1$s group members, page %2$d"
 
-#: actions/groupmembers.php:118
+#: actions/groupmembers.php:122
 msgid "A list of the users in this group."
 msgstr "A list of the users in this group."
 
-#: actions/groupmembers.php:182 lib/groupnav.php:107
+#: actions/groupmembers.php:186
 msgid "Admin"
 msgstr "Admin"
 
-#: actions/groupmembers.php:392 lib/blockform.php:69
-msgid "Block"
-msgstr "Block"
-
-#: actions/groupmembers.php:487
+#: actions/groupmembers.php:498
 msgid "Make user an admin of the group"
 msgstr "Make user an admin of the group"
 
-#: actions/groupmembers.php:519
-msgid "Make Admin"
-msgstr "Make admin"
-
-#: actions/groupmembers.php:519
-msgid "Make this user an admin"
-msgstr "Make this user an admin"
-
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Title in atom group notice feed. %s is a group name.
 #. TRANS: Title in atom user notice feed. %s is a user name.
@@ -2002,7 +2006,10 @@ msgstr ""
 
 #. TRANS: IM address input field instructions in IM settings form.
 #. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:140
+#. TRANS: Do not translate "example.org". It is one of the domain names reserved for use in examples by
+#. TRANS: http://www.rfc-editor.org/rfc/rfc2606.txt. Any other domain may be owned by a legitimate
+#. TRANS: person or organization.
+#: actions/imsettings.php:143
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -2012,64 +2019,64 @@ msgstr ""
 "add %s to your buddy list in your IM client or on GTalk."
 
 #. TRANS: Form legend for IM preferences form.
-#: actions/imsettings.php:155
+#: actions/imsettings.php:158
 msgid "IM preferences"
 msgstr "IM preferences"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:160
+#: actions/imsettings.php:163
 msgid "Send me notices through Jabber/GTalk."
 msgstr "Send me notices through Jabber/GTalk."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:166
+#: actions/imsettings.php:169
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr "Post a notice when my Jabber/GTalk status changes."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:172
+#: actions/imsettings.php:175
 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."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:179
+#: actions/imsettings.php:182
 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "Publish a MicroID for my Jabber/GTalk address."
 
 #. TRANS: Confirmation message for successful IM preferences save.
-#: actions/imsettings.php:287 actions/othersettings.php:180
+#: actions/imsettings.php:290 actions/othersettings.php:180
 msgid "Preferences saved."
 msgstr "Preferences saved."
 
 #. TRANS: Message given saving IM address without having provided one.
-#: actions/imsettings.php:309
+#: actions/imsettings.php:312
 msgid "No Jabber ID."
 msgstr "No Jabber ID."
 
 #. TRANS: Message given saving IM address that cannot be normalised.
-#: actions/imsettings.php:317
+#: actions/imsettings.php:320
 msgid "Cannot normalize that Jabber ID"
 msgstr "Cannot normalise Jabber ID"
 
 #. TRANS: Message given saving IM address that not valid.
-#: actions/imsettings.php:322
+#: actions/imsettings.php:325
 msgid "Not a valid Jabber ID"
 msgstr "Not a valid Jabber ID"
 
 #. TRANS: Message given saving IM address that is already set.
-#: actions/imsettings.php:326
+#: actions/imsettings.php:329
 msgid "That is already your Jabber ID."
 msgstr "That is already your Jabber ID."
 
 #. TRANS: Message given saving IM address that is already set for another user.
-#: actions/imsettings.php:330
+#: actions/imsettings.php:333
 msgid "Jabber ID already belongs to another user."
 msgstr "Jabber ID already belongs to another user."
 
 #. 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
+#: actions/imsettings.php:361
 #, php-format
 msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
@@ -2079,28 +2086,28 @@ msgstr ""
 "s for sending messages to you."
 
 #. TRANS: Message given canceling IM address confirmation for the wrong IM address.
-#: actions/imsettings.php:388
+#: actions/imsettings.php:391
 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
+#: actions/imsettings.php:400
 msgid "Couldn't delete IM confirmation."
 msgstr "Couldn't delete IM confirmation."
 
 #. TRANS: Message given after successfully canceling IM address confirmation.
-#: actions/imsettings.php:402
+#: actions/imsettings.php:405
 msgid "IM confirmation cancelled."
 msgstr "IM confirmation cancelled."
 
 #. TRANS: Message given trying to remove an IM address that is not
 #. TRANS: registered for the active user.
-#: actions/imsettings.php:424
+#: actions/imsettings.php:427
 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
+#: actions/imsettings.php:450
 msgid "The IM address was removed."
 msgstr "The IM address was removed."
 
@@ -2557,8 +2564,8 @@ msgid "Only %s URLs over plain HTTP please."
 msgstr ""
 
 #. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1215
-#: lib/apiaction.php:1243 lib/apiaction.php:1366
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1206
+#: lib/apiaction.php:1233 lib/apiaction.php:1356
 msgid "Not a supported data format."
 msgstr "Not a supported data format."
 
@@ -2694,7 +2701,7 @@ msgid "Password saved."
 msgstr "Password saved."
 
 #. TRANS: Menu item for site administration
-#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:384
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:371
 msgid "Paths"
 msgstr ""
 
@@ -2868,7 +2875,7 @@ msgstr "Full name"
 
 #. TRANS: Form input field label.
 #: actions/profilesettings.php:115 actions/register.php:460
-#: lib/applicationeditform.php:244 lib/groupeditform.php:161
+#: lib/applicationeditform.php:235 lib/groupeditform.php:161
 msgid "Homepage"
 msgstr "Homepage"
 
@@ -2973,7 +2980,7 @@ msgid "Couldn't save tags."
 msgstr "Couldn't save tags."
 
 #. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:391 lib/adminpanelaction.php:141
+#: actions/profilesettings.php:391 lib/adminpanelaction.php:138
 msgid "Settings saved."
 msgstr "Settings saved."
 
@@ -3503,24 +3510,24 @@ msgid "Application profile"
 msgstr "Application profile"
 
 #. TRANS: Form input field label for application icon.
-#: actions/showapplication.php:159 lib/applicationeditform.php:182
+#: actions/showapplication.php:159 lib/applicationeditform.php:173
 msgid "Icon"
 msgstr ""
 
 #. TRANS: Form input field label for application name.
 #: actions/showapplication.php:169 actions/version.php:197
-#: lib/applicationeditform.php:199
+#: lib/applicationeditform.php:190
 msgid "Name"
 msgstr "Name"
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:178 lib/applicationeditform.php:235
+#: actions/showapplication.php:178 lib/applicationeditform.php:226
 msgid "Organization"
 msgstr "Organization"
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:216 lib/groupeditform.php:172
+#: lib/applicationeditform.php:207 lib/groupeditform.php:172
 msgid "Description"
 msgstr "Description"
 
@@ -3624,7 +3631,7 @@ msgstr ""
 msgid "This is a way to share what you like."
 msgstr ""
 
-#: actions/showgroup.php:82 lib/groupnav.php:86
+#: actions/showgroup.php:82
 #, php-format
 msgid "%s group"
 msgstr "%s group"
@@ -3676,7 +3683,7 @@ msgstr "Notice feed for %s group (Atom)"
 msgid "FOAF for %s group"
 msgstr "Outbox for %s"
 
-#: actions/showgroup.php:393 actions/showgroup.php:445 lib/groupnav.php:91
+#: actions/showgroup.php:393 actions/showgroup.php:445
 msgid "Members"
 msgstr "Members"
 
@@ -4103,7 +4110,7 @@ msgstr "No code entered"
 
 #. TRANS: Menu item for site administration
 #: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
-#: lib/adminpanelaction.php:408
+#: lib/adminpanelaction.php:395
 msgid "Snapshots"
 msgstr ""
 
@@ -4195,6 +4202,11 @@ msgstr ""
 "You have no subscribers. Try subscribing to people you know and they might "
 "return the favour"
 
+#: actions/subscribers.php:110
+#, php-format
+msgid "%s has no subscribers. Want to be the first?"
+msgstr ""
+
 #: actions/subscribers.php:114
 #, php-format
 msgid ""
@@ -4763,7 +4775,7 @@ msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
 
 #. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#: classes/Subscription.php:75 lib/oauthstore.php:465
+#: classes/Subscription.php:75 lib/oauthstore.php:466
 msgid "You have been banned from subscribing."
 msgstr "You have been banned from subscribing."
 
@@ -4901,7 +4913,8 @@ msgid "Change site configuration"
 msgstr "Change site configuration"
 
 #. TRANS: Main menu option when logged in and site admin for access to site configuration
-#: lib/action.php:474
+#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
+#: lib/action.php:474 lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr "Admin"
@@ -4978,7 +4991,7 @@ msgstr "Search"
 
 #. TRANS: DT element for site notice. String is hidden in default CSS.
 #. TRANS: Menu item for site administration
-#: lib/action.php:538 lib/adminpanelaction.php:400
+#: lib/action.php:538 lib/adminpanelaction.php:387
 msgid "Site notice"
 msgstr "Site notice"
 
@@ -5042,7 +5055,10 @@ msgid "StatusNet software license"
 msgstr "StatusNet software licence"
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
-#: lib/action.php:843
+#. TRANS: Text between [] is a link description, text between () is the link itself.
+#. TRANS: Make sure there is no whitespace between "]" and "(".
+#. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
+#: lib/action.php:846
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -5052,13 +5068,16 @@ msgstr ""
 "broughtby%%](%%site.broughtbyurl%%)."
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:846
+#: lib/action.php:849
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** is a microblogging service."
 
 #. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.
-#: lib/action.php:850
+#. TRANS: Make sure there is no whitespace between "]" and "(".
+#. TRANS: Text between [] is a link description, text between () is the link itself.
+#. TRANS: %s is the version of StatusNet that is being used.
+#: lib/action.php:856
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -5070,49 +5089,50 @@ msgstr ""
 "org/licensing/licenses/agpl-3.0.html)."
 
 #. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:866
+#: lib/action.php:872
 msgid "Site content license"
 msgstr "Site content license"
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:873
+#: lib/action.php:879
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:880
+#: lib/action.php:886
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:884
+#: lib/action.php:890
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 
-#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:897
+#. TRANS: license message in footer.
+#. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
+#: lib/action.php:904
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr "All %1$s content and data are available under the %2$s licence."
 
 #. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1236
+#: lib/action.php:1243
 msgid "Pagination"
 msgstr "Pagination"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1247
+#: lib/action.php:1254
 msgid "After"
 msgstr "After"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1257
+#: lib/action.php:1264
 msgid "Before"
 msgstr "Before"
 
@@ -5121,195 +5141,224 @@ msgstr "Before"
 msgid "Expecting a root feed element but got a whole XML document."
 msgstr ""
 
-#: lib/activityutils.php:208
+#. TRANS: Client exception thrown when there is no source attribute.
+#: lib/activityutils.php:203
 msgid "Can't handle remote content yet."
 msgstr ""
 
-#: lib/activityutils.php:244
+#. TRANS: Client exception thrown when there embedded XML content is found that cannot be processed yet.
+#: lib/activityutils.php:240
 msgid "Can't handle embedded XML content yet."
 msgstr ""
 
-#: lib/activityutils.php:248
+#. TRANS: Client exception thrown when base64 encoded content is found that cannot be processed yet.
+#: lib/activityutils.php:245
 msgid "Can't handle embedded Base64 content yet."
 msgstr ""
 
 #. TRANS: Client error message thrown when a user tries to change admin settings but has no access rights.
-#: lib/adminpanelaction.php:98
+#: lib/adminpanelaction.php:96
 msgid "You cannot make changes to this site."
 msgstr "You cannot make changes to this site."
 
 #. TRANS: Client error message throw when a certain panel's settings cannot be changed.
-#: lib/adminpanelaction.php:110
+#: lib/adminpanelaction.php:108
 msgid "Changes to that panel are not allowed."
 msgstr "Changes to that panel are not allowed."
 
 #. TRANS: Client error message.
-#: lib/adminpanelaction.php:229
+#: lib/adminpanelaction.php:222
 msgid "showForm() not implemented."
 msgstr "showForm() not implemented."
 
 #. TRANS: Client error message
-#: lib/adminpanelaction.php:259
+#: lib/adminpanelaction.php:250
 msgid "saveSettings() not implemented."
 msgstr "saveSettings() not implemented."
 
 #. TRANS: Client error message thrown if design settings could not be deleted in
 #. TRANS: the admin panel Design.
-#: lib/adminpanelaction.php:284
+#: lib/adminpanelaction.php:274
 msgid "Unable to delete design setting."
 msgstr "Unable to delete design setting."
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:350
+#: lib/adminpanelaction.php:337
 msgid "Basic site configuration"
 msgstr "Basic site configuration"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:352
+#: lib/adminpanelaction.php:339
 msgctxt "MENU"
 msgid "Site"
 msgstr "Site"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:358
+#: lib/adminpanelaction.php:345
 msgid "Design configuration"
 msgstr "Design configuration"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:360
+#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
+#: lib/adminpanelaction.php:347 lib/groupnav.php:135
 msgctxt "MENU"
 msgid "Design"
 msgstr "Design"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:366
+#: lib/adminpanelaction.php:353
 msgid "User configuration"
 msgstr "User configuration"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:368 lib/personalgroupnav.php:115
+#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:115
 msgid "User"
 msgstr "User"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:374
+#: lib/adminpanelaction.php:361
 msgid "Access configuration"
 msgstr "Access configuration"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:382
+#: lib/adminpanelaction.php:369
 msgid "Paths configuration"
 msgstr "Paths configuration"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:390
+#: lib/adminpanelaction.php:377
 msgid "Sessions configuration"
 msgstr "Sessions configuration"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:398
+#: lib/adminpanelaction.php:385
 msgid "Edit site notice"
 msgstr "Edit site notice"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:406
+#: lib/adminpanelaction.php:393
 msgid "Snapshots configuration"
 msgstr "Snapshots configuration"
 
 #. TRANS: Client error 401.
-#: lib/apiauth.php:113
+#: lib/apiauth.php:111
 msgid "API resource requires read-write access, but you only have read access."
 msgstr ""
 
+#. TRANS: OAuth exception thrown when no application is found for a given consumer key.
+#: lib/apiauth.php:175
+msgid "No application for that consumer key."
+msgstr ""
+
+#. TRANS: OAuth exception given when an incorrect access token was given for a user.
+#: lib/apiauth.php:212
+msgid "Bad access token."
+msgstr ""
+
+#. TRANS: OAuth exception given when no user was found for a given token (no token was found).
+#: lib/apiauth.php:217
+msgid "No user for that token."
+msgstr ""
+
+#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
+#: lib/apioauthstore.php:178
+msgid "Tried to revoke unknown token"
+msgstr ""
+
+#. TRANS: Exception thrown when an attempt is made to remove a revoked token.
+#: lib/apioauthstore.php:182
+msgid "Failed to delete revoked token"
+msgstr ""
+
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:209
+#: lib/applicationeditform.php:200
 #, php-format
 msgid "Describe your application in %d characters"
 msgstr "Describe your application in %d characters"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:213
+#: lib/applicationeditform.php:204
 msgid "Describe your application"
 msgstr "Describe your application"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:224
+#: lib/applicationeditform.php:215
 msgid "URL of the homepage of this application"
 msgstr "URL of the homepage of this application"
 
 #. TRANS: Form input field label.
-#: lib/applicationeditform.php:226
+#: lib/applicationeditform.php:217
 msgid "Source URL"
 msgstr "Source URL"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:233
+#: lib/applicationeditform.php:224
 msgid "Organization responsible for this application"
 msgstr "Organisation responsible for this application"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:242
+#: lib/applicationeditform.php:233
 msgid "URL for the homepage of the organization"
 msgstr "URL for the homepage of the organisation"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:251
+#: lib/applicationeditform.php:242
 msgid "URL to redirect to after authentication"
 msgstr ""
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:278
+#: lib/applicationeditform.php:269
 msgid "Browser"
 msgstr ""
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:295
+#: lib/applicationeditform.php:286
 msgid "Desktop"
 msgstr ""
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:297
+#: lib/applicationeditform.php:288
 msgid "Type of application, browser or desktop"
 msgstr ""
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:320
+#: lib/applicationeditform.php:311
 msgid "Read-only"
 msgstr ""
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:339
+#: lib/applicationeditform.php:330
 msgid "Read-write"
 msgstr ""
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:341
+#: lib/applicationeditform.php:332
 msgid "Default access for this application: read-only, or read-write"
 msgstr ""
 
-#. TRANS: Submit button title
-#: lib/applicationeditform.php:359
+#. TRANS: Submit button title.
+#: lib/applicationeditform.php:349
 msgid "Cancel"
 msgstr "Cancel"
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:136
+#: lib/applicationlist.php:135
 msgid "read-write"
 msgstr ""
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:138
+#: lib/applicationlist.php:137
 msgid "read-only"
 msgstr ""
 
 #. 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
+#: lib/applicationlist.php:143
 #, php-format
 msgid "Approved %1$s - \"%2$s\" access."
 msgstr ""
 
 #. TRANS: Button label
-#: lib/applicationlist.php:159
+#: lib/applicationlist.php:158
 msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "Revoke"
@@ -5319,7 +5368,8 @@ msgstr "Revoke"
 msgid "Provider"
 msgstr "Provider"
 
-#: lib/attachmentnoticesection.php:67
+#. TRANS: Title.
+#: lib/attachmentnoticesection.php:68
 msgid "Notices where this attachment appears"
 msgstr ""
 
@@ -5331,6 +5381,11 @@ msgstr "Password changing failed"
 msgid "Password changing is not allowed"
 msgstr "Password changing is not allowed"
 
+#. TRANS: Title for the form to block a user.
+#: lib/blockform.php:70
+msgid "Block"
+msgstr "Block"
+
 #: lib/channel.php:157 lib/channel.php:177
 msgid "Command results"
 msgstr "Command results"
@@ -5343,6 +5398,13 @@ msgstr "Command complete"
 msgid "Command failed"
 msgstr "Command failed"
 
+#. TRANS: Message given getting a non-existing user.
+#. TRANS: %s is the nickname of the user that could not be found.
+#: lib/command.php:150
+#, php-format
+msgid "Could not find a local user with nickname %s."
+msgstr ""
+
 #. TRANS: Error text shown when an unimplemented command is given.
 #: lib/command.php:185
 msgid "Sorry, this command is not yet implemented."
@@ -5370,6 +5432,20 @@ msgstr ""
 msgid "Notice marked as fave."
 msgstr "Notice marked as fave."
 
+#. 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.
+#: lib/command.php:360
+#, php-format
+msgid "%1$s joined group %2$s."
+msgstr ""
+
+#. 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.
+#: lib/command.php:408
+#, php-format
+msgid "%1$s left group %2$s."
+msgstr ""
+
 #. TRANS: Whois output. %s is the full name of the queried user.
 #: lib/command.php:434
 #, php-format
@@ -5426,20 +5502,23 @@ msgstr "Error repeating notice."
 msgid "Error saving notice."
 msgstr "Error saving notice."
 
-#. TRANS: Error text shown when no username was provided when issuing a subscribe command.
-#: lib/command.php:655
-msgid "Specify the name of the user to subscribe to."
-msgstr ""
-
 #. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
 #: lib/command.php:664
 msgid "Can't subscribe to OMB profiles by command."
 msgstr "Can't subscribe to OMB profiles by command."
 
-#. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
-#. TRANS: Error text shown when no username was provided when issuing the command.
-#: lib/command.php:694 lib/command.php:804
-msgid "Specify the name of the user to unsubscribe from."
+#. TRANS: Text shown after having subscribed to another user successfully.
+#. TRANS: %s is the name of the user the subscription was requested for.
+#: lib/command.php:672
+#, php-format
+msgid "Subscribed to %s."
+msgstr ""
+
+#. TRANS: Text shown after having unsubscribed from another user successfully.
+#. TRANS: %s is the name of the user the unsubscription was requested for.
+#: lib/command.php:705
+#, php-format
+msgid "Unsubscribed from %s."
 msgstr ""
 
 #. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
@@ -5480,13 +5559,20 @@ msgstr ""
 msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr ""
 
+#. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
+#. TRANS: %s is the name of the user the unsubscription was requested for.
+#: lib/command.php:813
+#, php-format
+msgid "Unsubscribed %s."
+msgstr ""
+
 #. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
 #: lib/command.php:831
 msgid "You are not subscribed to anyone."
 msgstr "You are not subscribed to anyone."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to.
-#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.
 #: lib/command.php:836
 msgid "You are subscribed to this person:"
@@ -5501,7 +5587,7 @@ msgid "No one is subscribed to you."
 msgstr "No one is subscribed to you."
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
-#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
 #: lib/command.php:863
 msgid "This person is subscribed to you:"
@@ -5516,7 +5602,7 @@ msgid "You are not a member of any groups."
 msgstr "You are not a member of any groups."
 
 #. TRANS: Text shown after requesting groups a user is subscribed to.
-#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
 #: lib/command.php:890
 msgid "You are a member of this group:"
@@ -5524,6 +5610,7 @@ 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."
 
+#. TRANS: Help text for commands.
 #: lib/command.php:905
 msgid ""
 "Commands:\n"
@@ -5739,38 +5826,6 @@ msgstr ""
 msgid "Extra nicknames for the group, comma- or space- separated, max %d"
 msgstr ""
 
-#: lib/groupnav.php:85
-msgid "Group"
-msgstr "Group"
-
-#: lib/groupnav.php:101
-msgid "Blocked"
-msgstr "Blocked"
-
-#: lib/groupnav.php:102
-#, php-format
-msgid "%s blocked users"
-msgstr "%s blocked users"
-
-#: lib/groupnav.php:108
-#, php-format
-msgid "Edit %s group properties"
-msgstr "Edit %s group properties"
-
-#: lib/groupnav.php:113
-msgid "Logo"
-msgstr "Logo"
-
-#: lib/groupnav.php:114
-#, php-format
-msgid "Add or edit %s logo"
-msgstr "Add or edit %s logo"
-
-#: lib/groupnav.php:120
-#, php-format
-msgid "Add or edit %s design"
-msgstr "Add or edit %s design"
-
 #: lib/groupsbymemberssection.php:71
 msgid "Groups with most members"
 msgstr "Groups with most members"
@@ -5802,7 +5857,8 @@ msgstr "That file is too big. The maximum file size is %s."
 msgid "Partial upload."
 msgstr "Partial upload."
 
-#: lib/imagefile.php:101 lib/mediafile.php:170
+#. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
+#: lib/imagefile.php:101 lib/mediafile.php:179
 msgid "System error uploading file."
 msgstr "System error uploading file."
 
@@ -6114,56 +6170,75 @@ msgstr "Sorry, no incoming e-mail allowed."
 msgid "Unsupported message type: %s"
 msgstr "Unsupported message type: %s"
 
-#: lib/mediafile.php:98 lib/mediafile.php:123
+#. TRANS: Client exception thrown when a database error was thrown during a file upload operation.
+#: lib/mediafile.php:99 lib/mediafile.php:125
 msgid "There was a database error while saving your file. Please try again."
 msgstr ""
 
-#: lib/mediafile.php:142
+#. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
+#: lib/mediafile.php:145
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
 msgstr ""
 
-#: lib/mediafile.php:147
+#. TRANS: Client exception.
+#: lib/mediafile.php:151
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form."
 msgstr ""
 
-#: lib/mediafile.php:152
+#. TRANS: Client exception.
+#: lib/mediafile.php:157
 msgid "The uploaded file was only partially uploaded."
 msgstr ""
 
-#: lib/mediafile.php:159
+#. TRANS: Client exception thrown when a temporary folder is not present to store a file upload.
+#: lib/mediafile.php:165
 msgid "Missing a temporary folder."
 msgstr ""
 
-#: lib/mediafile.php:162
+#. TRANS: Client exception thrown when writing to disk is not possible during a file upload operation.
+#: lib/mediafile.php:169
 msgid "Failed to write file to disk."
 msgstr ""
 
-#: lib/mediafile.php:165
+#. TRANS: Client exception thrown when a file upload operation has been stopped by an extension.
+#: lib/mediafile.php:173
 msgid "File upload stopped by extension."
 msgstr ""
 
-#: lib/mediafile.php:179 lib/mediafile.php:217
+#. TRANS: Client exception thrown when a file upload operation would cause a user to exceed a set quota.
+#: lib/mediafile.php:189 lib/mediafile.php:232
 msgid "File exceeds user's quota."
 msgstr ""
 
-#: lib/mediafile.php:197 lib/mediafile.php:234
+#. TRANS: Client exception thrown when a file upload operation fails because the file could
+#. TRANS: not be moved from the temporary folder to the permanent file location.
+#: lib/mediafile.php:209 lib/mediafile.php:251
 msgid "File could not be moved to destination directory."
 msgstr ""
 
-#: lib/mediafile.php:202 lib/mediafile.php:238
+#. TRANS: Client exception thrown when a file upload operation has been stopped because the MIME
+#. TRANS: type of the uploaded file could not be determined.
+#: lib/mediafile.php:216 lib/mediafile.php:257
 msgid "Could not determine file's MIME type."
 msgstr "Could not determine file's MIME type."
 
-#: lib/mediafile.php:318
+#. TRANS: Client exception thrown trying to upload a forbidden MIME type.
+#. TRANS: %1$s is the file type that was denied, %2$s is the application part of
+#. TRANS: the MIME type that was denied.
+#: lib/mediafile.php:340
 #, php-format
-msgid " Try using another %s format."
+msgid ""
+"\"%1$s\" is not a supported file type on this server. Try using another %2$s "
+"format."
 msgstr ""
 
-#: lib/mediafile.php:323
+#. TRANS: Client exception thrown trying to upload a forbidden MIME type.
+#. TRANS: %s is the file type that was denied.
+#: lib/mediafile.php:345
 #, php-format
-msgid "%s is not a supported file type on this server."
+msgid "\"%s\" is not a supported file type on this server."
 msgstr ""
 
 #: lib/messageform.php:120
@@ -6279,27 +6354,7 @@ msgstr "Nudge"
 msgid "Send a nudge to this user"
 msgstr "Send a nudge to this user"
 
-#: lib/oauthstore.php:283
-msgid "Error inserting new profile"
-msgstr "Error inserting new profile."
-
-#: lib/oauthstore.php:291
-msgid "Error inserting avatar"
-msgstr "Error inserting avatar."
-
-#: lib/oauthstore.php:306
-msgid "Error updating remote profile"
-msgstr "Error updating remote profile."
-
-#: lib/oauthstore.php:311
-msgid "Error inserting remote profile"
-msgstr "Error inserting remote profile."
-
-#: lib/oauthstore.php:345
-msgid "Duplicate notice"
-msgstr "Duplicate notice"
-
-#: lib/oauthstore.php:490
+#: lib/oauthstore.php:491
 msgid "Couldn't insert new subscription."
 msgstr "Couldn't insert new subscription."
 
@@ -6336,7 +6391,8 @@ msgstr "Your sent messages"
 msgid "Tags in %s's notices"
 msgstr "Tags in %s's notices"
 
-#: lib/plugin.php:115
+#. TRANS: Displayed as version information for a plugin if no version information was found.
+#: lib/plugin.php:116
 msgid "Unknown"
 msgstr "Unknown"
 
@@ -6430,19 +6486,19 @@ msgstr "Sandbox"
 msgid "Sandbox this user"
 msgstr "Sandbox this user"
 
-#: lib/searchaction.php:120
+#. TRANS: Fieldset legend for the search form.
+#: lib/searchaction.php:121
 msgid "Search site"
 msgstr "Search site"
 
-#: lib/searchaction.php:126
+#. TRANS: Used as a field label for the field where one or more keywords
+#. TRANS: for searching can be entered.
+#: lib/searchaction.php:129
 msgid "Keyword(s)"
 msgstr ""
 
-#: lib/searchaction.php:127
-msgid "Search"
-msgstr "Search"
-
-#: lib/searchaction.php:162
+#. TRANS: Definition list item with instructions on how to get (better) search results.
+#: lib/searchaction.php:170
 msgid "Search help"
 msgstr "Search help"
 
@@ -6619,56 +6675,32 @@ msgid "Moderator"
 msgstr "Moderator"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1102
+#: lib/util.php:1103
 msgid "a few seconds ago"
 msgstr "a few seconds ago"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1105
+#: lib/util.php:1106
 msgid "about a minute ago"
 msgstr "about a minute ago"
 
-#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1109
-#, php-format
-msgid "about %d minutes ago"
-msgstr "about %d minutes ago"
-
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 #: lib/util.php:1112
 msgid "about an hour ago"
 msgstr "about an hour ago"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1116
-#, php-format
-msgid "about %d hours ago"
-msgstr "about %d hours ago"
-
-#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1119
+#: lib/util.php:1118
 msgid "about a day ago"
 msgstr "about a day ago"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1123
-#, php-format
-msgid "about %d days ago"
-msgstr "about %d days ago"
-
-#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1126
+#: lib/util.php:1124
 msgid "about a month ago"
 msgstr "about a month ago"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 #: lib/util.php:1130
-#, php-format
-msgid "about %d months ago"
-msgstr "about %d months ago"
-
-#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1133
 msgid "about a year ago"
 msgstr "about a year ago"
 
diff --git a/locale/eo/LC_MESSAGES/statusnet.po b/locale/eo/LC_MESSAGES/statusnet.po
index 16e5ae58b6..c5b268ea09 100644
--- a/locale/eo/LC_MESSAGES/statusnet.po
+++ b/locale/eo/LC_MESSAGES/statusnet.po
@@ -1,10 +1,11 @@
-# Translation of StatusNet to Esperanto
+# Translation of StatusNet to Esperanto (Esperanto)
+# Expored from translatewiki.net
 #
-# Author@translatewiki.net: AVRS
-# Author@translatewiki.net: Brion
-# Author@translatewiki.net: Ianmcorvidae
-# Author@translatewiki.net: Kris10
-# Author@translatewiki.net: LyzTyphone
+# Author: AVRS
+# Author: Brion
+# Author: Ianmcorvidae
+# Author: Kris10
+# Author: LyzTyphone
 # --
 # This file is distributed under the same license as the StatusNet package.
 #
@@ -12,20 +13,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-08 22:33+0000\n"
-"PO-Revision-Date: 2010-09-08 22:33:49+0000\n"
-"Language-Team: Esperanto\n"
+"POT-Creation-Date: 2010-09-14 19:53+0000\n"
+"PO-Revision-Date: 2010-09-14 19:53:49+0000\n"
+"Language-Team: Esperanto <http://translatewiki.net/wiki/Portal:eo>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r72348); Translate extension (2010-08-20)\n"
+"X-Generator: MediaWiki 1.17alpha (r73009); Translate extension (2010-08-20)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: eo\n"
-"X-Message-Group: out-statusnet\n"
+"X-Message-Group: #out-statusnet\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-POT-Import-Date: 1284-49-16 34::+0000\n"
 
 #. TRANS: Page title
 #. TRANS: Menu item for site administration
-#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:376
+#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:363
 msgid "Access"
 msgstr "Atingo"
 
@@ -78,10 +80,10 @@ msgstr "Konservu atingan agordon"
 #. 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 actions/emailsettings.php:224
-#: actions/imsettings.php:184 actions/smssettings.php:209
-#: lib/applicationeditform.php:361
+#. TRANS: Button label in the "Edit application" form.
+#: actions/accessadminpanel.php:203 actions/emailsettings.php:228
+#: actions/imsettings.php:187 actions/smssettings.php:209
+#: lib/applicationeditform.php:351
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Konservu"
@@ -94,15 +96,15 @@ msgstr "Ne estas tiu paÄo."
 
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #: actions/all.php:79 actions/allrss.php:68
-#: actions/apiaccountupdatedeliverydevice.php:114
-#: actions/apiaccountupdateprofile.php:105
-#: actions/apiaccountupdateprofilebackgroundimage.php:116
-#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
-#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
-#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:113
-#: actions/apigroupismember.php:91 actions/apigroupjoin.php:100
-#: actions/apigroupleave.php:100 actions/apigrouplist.php:73
-#: actions/apistatusesupdate.php:229 actions/apisubscriptions.php:87
+#: actions/apiaccountupdatedeliverydevice.php:115
+#: actions/apiaccountupdateprofile.php:106
+#: actions/apiaccountupdateprofilebackgroundimage.php:117
+#: actions/apiaccountupdateprofileimage.php:106 actions/apiblockcreate.php:98
+#: actions/apiblockdestroy.php:97 actions/apidirectmessage.php:77
+#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:114
+#: actions/apigroupismember.php:91 actions/apigroupjoin.php:101
+#: actions/apigroupleave.php:101 actions/apigrouplist.php:73
+#: actions/apistatusesupdate.php:230 actions/apisubscriptions.php:87
 #: actions/apitimelinefavorites.php:72 actions/apitimelinefriends.php:174
 #: actions/apitimelinehome.php:80 actions/apitimelinementions.php:80
 #: actions/apitimelineuser.php:82 actions/avatarbynickname.php:75
@@ -201,16 +203,16 @@ msgid "Updates from %1$s and friends on %2$s!"
 msgstr "ÄisdatiÄoj de %1$s kaj amikoj Äe %2$s!"
 
 #: actions/apiaccountratelimitstatus.php:72
-#: actions/apiaccountupdatedeliverydevice.php:94
-#: actions/apiaccountupdateprofile.php:97
-#: actions/apiaccountupdateprofilebackgroundimage.php:94
-#: actions/apiaccountupdateprofilecolors.php:118
+#: actions/apiaccountupdatedeliverydevice.php:95
+#: actions/apiaccountupdateprofile.php:98
+#: actions/apiaccountupdateprofilebackgroundimage.php:95
+#: actions/apiaccountupdateprofilecolors.php:119
 #: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156
-#: actions/apifavoritecreate.php:100 actions/apifavoritedestroy.php:101
-#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100
-#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:139
-#: actions/apigroupismember.php:115 actions/apigroupjoin.php:156
-#: actions/apigroupleave.php:142 actions/apigrouplist.php:137
+#: actions/apifavoritecreate.php:101 actions/apifavoritedestroy.php:102
+#: actions/apifriendshipscreate.php:101 actions/apifriendshipsdestroy.php:101
+#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:140
+#: actions/apigroupismember.php:115 actions/apigroupjoin.php:157
+#: actions/apigroupleave.php:143 actions/apigrouplist.php:137
 #: actions/apigrouplistall.php:122 actions/apigroupmembership.php:107
 #: actions/apigroupshow.php:116 actions/apihelptest.php:88
 #: actions/apistatusesdestroy.php:104 actions/apistatusesretweets.php:112
@@ -225,21 +227,23 @@ msgstr "ÄisdatiÄoj de %1$s kaj amikoj Äe %2$s!"
 msgid "API method not found."
 msgstr "Metodo de API ne troviÄas."
 
-#: actions/apiaccountupdatedeliverydevice.php:86
-#: actions/apiaccountupdateprofile.php:89
-#: actions/apiaccountupdateprofilebackgroundimage.php:86
-#: actions/apiaccountupdateprofilecolors.php:110
-#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89
-#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109
-#: actions/apifavoritecreate.php:91 actions/apifavoritedestroy.php:92
-#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
-#: actions/apigroupcreate.php:105 actions/apigroupjoin.php:92
-#: actions/apigroupleave.php:92 actions/apimediaupload.php:67
-#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:198
+#. TRANS: Client error message. POST is a HTTP command. It should not be translated.
+#. TRANS: Client error. POST is a HTTP command. It should not be translated.
+#: actions/apiaccountupdatedeliverydevice.php:87
+#: actions/apiaccountupdateprofile.php:90
+#: actions/apiaccountupdateprofilebackgroundimage.php:87
+#: actions/apiaccountupdateprofilecolors.php:111
+#: actions/apiaccountupdateprofileimage.php:85 actions/apiblockcreate.php:90
+#: actions/apiblockdestroy.php:89 actions/apidirectmessagenew.php:110
+#: actions/apifavoritecreate.php:92 actions/apifavoritedestroy.php:93
+#: actions/apifriendshipscreate.php:92 actions/apifriendshipsdestroy.php:92
+#: actions/apigroupcreate.php:106 actions/apigroupjoin.php:93
+#: actions/apigroupleave.php:93 actions/apimediaupload.php:68
+#: actions/apistatusesretweet.php:66 actions/apistatusesupdate.php:199
 msgid "This method requires a POST."
 msgstr "Äi tiu metodo bezonas POST-on."
 
-#: actions/apiaccountupdatedeliverydevice.php:106
+#: actions/apiaccountupdatedeliverydevice.php:107
 msgid ""
 "You must specify a parameter named 'device' with a value of one of: sms, im, "
 "none."
@@ -247,27 +251,27 @@ msgstr ""
 "Vi devas specifi parametron nomitan 'device' kun valoro de interalie: 'sms', "
 "'im', 'none'."
 
-#: actions/apiaccountupdatedeliverydevice.php:133
+#: actions/apiaccountupdatedeliverydevice.php:134
 msgid "Could not update user."
 msgstr "Malsukcesis Äisdatigi uzanton"
 
-#: actions/apiaccountupdateprofile.php:112
-#: actions/apiaccountupdateprofilebackgroundimage.php:194
-#: actions/apiaccountupdateprofilecolors.php:185
-#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/apiaccountupdateprofile.php:113
+#: actions/apiaccountupdateprofilebackgroundimage.php:195
+#: actions/apiaccountupdateprofilecolors.php:186
+#: actions/apiaccountupdateprofileimage.php:131 actions/apiusershow.php:108
 #: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/hcard.php:74
 #: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
 #: lib/profileaction.php:84
 msgid "User has no profile."
 msgstr "La uzanto ne havas profilon."
 
-#: actions/apiaccountupdateprofile.php:147
+#: actions/apiaccountupdateprofile.php:148
 msgid "Could not save profile."
 msgstr "Malsukcesis konservi la profilon."
 
-#: actions/apiaccountupdateprofilebackgroundimage.php:108
-#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
-#: actions/apistatusesupdate.php:212 actions/avatarsettings.php:257
+#: actions/apiaccountupdateprofilebackgroundimage.php:109
+#: actions/apiaccountupdateprofileimage.php:98 actions/apimediaupload.php:81
+#: actions/apistatusesupdate.php:213 actions/avatarsettings.php:257
 #: actions/designadminpanel.php:123 actions/editapplication.php:118
 #: actions/newapplication.php:101 actions/newnotice.php:94
 #: lib/designsettings.php:283
@@ -279,30 +283,30 @@ msgstr ""
 "La servilo ne povis trakti tiom da POST-datumo (% bajtoj) pro Äia nuna "
 "agordo."
 
-#: actions/apiaccountupdateprofilebackgroundimage.php:136
-#: actions/apiaccountupdateprofilebackgroundimage.php:146
-#: actions/apiaccountupdateprofilecolors.php:164
-#: actions/apiaccountupdateprofilecolors.php:174
+#: actions/apiaccountupdateprofilebackgroundimage.php:137
+#: actions/apiaccountupdateprofilebackgroundimage.php:147
+#: actions/apiaccountupdateprofilecolors.php:165
+#: actions/apiaccountupdateprofilecolors.php:175
 #: actions/groupdesignsettings.php:290 actions/groupdesignsettings.php:300
 #: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
 #: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
 msgid "Unable to save your design settings."
 msgstr "Malsukcesis konservi vian desegnan agordon"
 
-#: actions/apiaccountupdateprofilebackgroundimage.php:187
-#: actions/apiaccountupdateprofilecolors.php:142
+#: actions/apiaccountupdateprofilebackgroundimage.php:188
+#: actions/apiaccountupdateprofilecolors.php:143
 msgid "Could not update your design."
 msgstr "Malsukcesis Äisdatigi vian desegnon."
 
-#: actions/apiblockcreate.php:105
+#: actions/apiblockcreate.php:106
 msgid "You cannot block yourself!"
 msgstr "Vi ne povas bloki vin mem!"
 
-#: actions/apiblockcreate.php:126
+#: actions/apiblockcreate.php:127
 msgid "Block user failed."
 msgstr "Ne sukcesis bloki uzanton."
 
-#: actions/apiblockdestroy.php:114
+#: actions/apiblockdestroy.php:115
 msgid "Unblock user failed."
 msgstr "Ne sukcesis malbloki uzanton."
 
@@ -326,59 +330,59 @@ msgstr "Rektaj mesaÄoj al %s"
 msgid "All the direct messages sent to %s"
 msgstr "Äiuj rektaj mesaÄoj senditaj al %s"
 
-#: actions/apidirectmessagenew.php:118
+#: actions/apidirectmessagenew.php:119
 msgid "No message text!"
 msgstr "Sen mesaÄteksto!"
 
-#: actions/apidirectmessagenew.php:127 actions/newmessage.php:150
+#: actions/apidirectmessagenew.php:128 actions/newmessage.php:150
 #, php-format
 msgid "That's too long. Max message size is %d chars."
 msgstr "Tro longas. MesaÄa longlimo estas %d signoj."
 
-#: actions/apidirectmessagenew.php:138
+#: actions/apidirectmessagenew.php:139
 msgid "Recipient user not found."
 msgstr "Ricevonta uzanto ne troviÄas."
 
-#: actions/apidirectmessagenew.php:142
+#: actions/apidirectmessagenew.php:143
 msgid "Can't send direct messages to users who aren't your friend."
 msgstr "Vi ne povas sendi rektan mesaÄon al uzanto kiu ne estas via amiko."
 
-#: actions/apifavoritecreate.php:109 actions/apifavoritedestroy.php:110
+#: actions/apifavoritecreate.php:110 actions/apifavoritedestroy.php:111
 #: actions/apistatusesdestroy.php:121
 msgid "No status found with that ID."
 msgstr "Stato kun tiu ID ne trovitas."
 
-#: actions/apifavoritecreate.php:120
+#: actions/apifavoritecreate.php:121
 msgid "This status is already a favorite."
 msgstr "Äi tiu stato jam estas  Åatata."
 
 #. TRANS: Error message text shown when a favorite could not be set.
-#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:296
+#: actions/apifavoritecreate.php:132 actions/favor.php:84 lib/command.php:296
 msgid "Could not create favorite."
 msgstr "Malsukcesis krei Åataton."
 
-#: actions/apifavoritedestroy.php:123
+#: actions/apifavoritedestroy.php:124
 msgid "That status is not a favorite."
 msgstr "La stato ne estas Åatata."
 
-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
+#: actions/apifavoritedestroy.php:136 actions/disfavor.php:87
 msgid "Could not delete favorite."
 msgstr "Malsukcesis forigi Åataton."
 
-#: actions/apifriendshipscreate.php:109
+#: actions/apifriendshipscreate.php:110
 msgid "Could not follow user: profile not found."
 msgstr "Malsukcesis aboni uzanton: profilo ne troviÄas."
 
-#: actions/apifriendshipscreate.php:118
+#: actions/apifriendshipscreate.php:119
 #, php-format
 msgid "Could not follow user: %s is already on your list."
 msgstr "Ne povas aboni uzanton: %s estas jam en via listo."
 
-#: actions/apifriendshipsdestroy.php:109
+#: actions/apifriendshipsdestroy.php:110
 msgid "Could not unfollow user: User not found."
 msgstr "Ne povas malaboni uzanton. Uzanto ne troviÄas."
 
-#: actions/apifriendshipsdestroy.php:120
+#: actions/apifriendshipsdestroy.php:121
 msgid "You cannot unfollow yourself."
 msgstr "Vi ne povas malaboni vin mem."
 
@@ -394,102 +398,102 @@ msgstr " Malsukcesis certigi fontan uzanton."
 msgid "Could not find target user."
 msgstr "Malsukcesis trovi celan uzanton."
 
-#: actions/apigroupcreate.php:167 actions/editgroup.php:186
+#: actions/apigroupcreate.php:168 actions/editgroup.php:186
 #: actions/newgroup.php:126 actions/profilesettings.php:215
 #: actions/register.php:212
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr ""
 "Kromnomo devas havi nur minuskulajn literojn kaj numerojn sed neniun spacon."
 
-#: actions/apigroupcreate.php:176 actions/editgroup.php:190
+#: actions/apigroupcreate.php:177 actions/editgroup.php:190
 #: actions/newgroup.php:130 actions/profilesettings.php:238
 #: actions/register.php:215
 msgid "Nickname already in use. Try another one."
 msgstr "La uzantnomo jam uziÄis. Provu ion alian."
 
-#: actions/apigroupcreate.php:183 actions/editgroup.php:193
+#: actions/apigroupcreate.php:184 actions/editgroup.php:193
 #: actions/newgroup.php:133 actions/profilesettings.php:218
 #: actions/register.php:217
 msgid "Not a valid nickname."
 msgstr "Ne valida kromnomo."
 
-#: actions/apigroupcreate.php:199 actions/editapplication.php:215
+#: actions/apigroupcreate.php:200 actions/editapplication.php:215
 #: actions/editgroup.php:199 actions/newapplication.php:203
 #: actions/newgroup.php:139 actions/profilesettings.php:222
 #: actions/register.php:224
 msgid "Homepage is not a valid URL."
 msgstr "ÄefpaÄo ne estas valida URL."
 
-#: actions/apigroupcreate.php:208 actions/editgroup.php:202
+#: actions/apigroupcreate.php:209 actions/editgroup.php:202
 #: actions/newgroup.php:142 actions/profilesettings.php:225
 #: actions/register.php:227
 msgid "Full name is too long (max 255 chars)."
 msgstr "Plennomo estas tro longa (maksimume 255 literoj)"
 
-#: actions/apigroupcreate.php:216 actions/editapplication.php:190
+#: actions/apigroupcreate.php:217 actions/editapplication.php:190
 #: actions/newapplication.php:172
 #, php-format
 msgid "Description is too long (max %d chars)."
 msgstr "Priskribo estas tro longa (maksimume %d signoj)."
 
-#: actions/apigroupcreate.php:227 actions/editgroup.php:208
+#: actions/apigroupcreate.php:228 actions/editgroup.php:208
 #: actions/newgroup.php:148 actions/profilesettings.php:232
 #: actions/register.php:234
 msgid "Location is too long (max 255 chars)."
 msgstr "lokonomo estas tro longa (maksimume 255 literoj)"
 
-#: actions/apigroupcreate.php:246 actions/editgroup.php:219
+#: actions/apigroupcreate.php:247 actions/editgroup.php:219
 #: actions/newgroup.php:159
 #, php-format
 msgid "Too many aliases! Maximum %d."
 msgstr "Tro da alinomoj! Maksimume %d."
 
-#: actions/apigroupcreate.php:267
+#: actions/apigroupcreate.php:268
 #, php-format
 msgid "Invalid alias: \"%s\"."
 msgstr "La alinomo estas nevalida: \"%*s\"."
 
-#: actions/apigroupcreate.php:276 actions/editgroup.php:232
+#: actions/apigroupcreate.php:277 actions/editgroup.php:232
 #: actions/newgroup.php:172
 #, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr "La alinomo \"%s\" estas jam okupita. Provu ion alian."
 
-#: actions/apigroupcreate.php:289 actions/editgroup.php:238
+#: actions/apigroupcreate.php:290 actions/editgroup.php:238
 #: actions/newgroup.php:178
 msgid "Alias can't be the same as nickname."
 msgstr "La alinomo devas ne esti sama al la kromnomo."
 
-#: actions/apigroupismember.php:96 actions/apigroupjoin.php:105
-#: actions/apigroupleave.php:105 actions/apigroupmembership.php:92
+#: actions/apigroupismember.php:96 actions/apigroupjoin.php:106
+#: actions/apigroupleave.php:106 actions/apigroupmembership.php:92
 #: actions/apigroupshow.php:83 actions/apitimelinegroup.php:92
 msgid "Group not found."
 msgstr "Grupo ne troviÄas."
 
 #. TRANS: Error text shown a user tries to join a group they already are a member of.
-#: actions/apigroupjoin.php:111 actions/joingroup.php:100 lib/command.php:336
+#: actions/apigroupjoin.php:112 actions/joingroup.php:100 lib/command.php:336
 msgid "You are already a member of that group."
 msgstr "Vi estas jam grupano."
 
 #. TRANS: Error text shown when a user tries to join a group they are blocked from joining.
-#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:341
+#: actions/apigroupjoin.php:121 actions/joingroup.php:105 lib/command.php:341
 msgid "You have been blocked from that group by the admin."
 msgstr "La administranto blokis vin de tiu grupo."
 
 #. 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.
-#: actions/apigroupjoin.php:139 actions/joingroup.php:134 lib/command.php:353
+#: actions/apigroupjoin.php:140 actions/joingroup.php:134 lib/command.php:353
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "La uzanto %1$*s ne povas aliÄi al la grupo %2$*s."
 
-#: actions/apigroupleave.php:115
+#: actions/apigroupleave.php:116
 msgid "You are not a member of this group."
 msgstr "Vi ne estas grupano."
 
 #. 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.
-#: actions/apigroupleave.php:125 actions/leavegroup.php:129
+#: actions/apigroupleave.php:126 actions/leavegroup.php:129
 #: lib/command.php:401
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
@@ -519,7 +523,7 @@ msgstr "Grupoj de %s"
 msgid "groups on %s"
 msgstr "grupoj Äe %s"
 
-#: actions/apimediaupload.php:99
+#: actions/apimediaupload.php:100
 msgid "Upload failed."
 msgstr "Malsukcesis alÅuti"
 
@@ -533,9 +537,9 @@ msgstr "Nevalida Äµetono"
 
 #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
 #: actions/deletenotice.php:169 actions/disfavor.php:74
-#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:55
+#: actions/emailsettings.php:271 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:66 actions/imsettings.php:227
+#: actions/groupunblock.php:66 actions/imsettings.php:230
 #: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
@@ -580,8 +584,8 @@ msgstr "La demanda token %s estis neita kaj revokita."
 #. 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:286 actions/grouplogo.php:322
-#: actions/imsettings.php:242 actions/newapplication.php:121
+#: actions/emailsettings.php:290 actions/grouplogo.php:322
+#: actions/imsettings.php:245 actions/newapplication.php:121
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
 #: actions/smssettings.php:277 lib/designsettings.php:304
 msgid "Unexpected form submission."
@@ -645,18 +649,18 @@ msgstr "Äi tiu metodo bezonas POST aÇ DELETE."
 msgid "You may not delete another user's status."
 msgstr "Vi ne povas forigi la staton de alia uzanto."
 
-#: actions/apistatusesretweet.php:75 actions/apistatusesretweets.php:72
+#: actions/apistatusesretweet.php:76 actions/apistatusesretweets.php:72
 #: actions/deletenotice.php:52 actions/shownotice.php:92
 msgid "No such notice."
 msgstr "Ne estas tiu avizo."
 
 #. TRANS: Error text shown when trying to repeat an own notice.
-#: actions/apistatusesretweet.php:83 lib/command.php:538
+#: actions/apistatusesretweet.php:84 lib/command.php:538
 msgid "Cannot repeat your own notice."
 msgstr "Vi ne povas ripeti vian propran avizon."
 
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-#: actions/apistatusesretweet.php:91 lib/command.php:544
+#: actions/apistatusesretweet.php:92 lib/command.php:544
 msgid "Already repeated that notice."
 msgstr "La avizo jam ripetiÄis."
 
@@ -668,21 +672,21 @@ msgstr "Stato forigita."
 msgid "No status with that ID found."
 msgstr "Neniu stato kun tiu ID troviÄas."
 
-#: actions/apistatusesupdate.php:221
+#: actions/apistatusesupdate.php:222
 msgid "Client must provide a 'status' parameter with a value."
 msgstr "Kliento devas providi al \"stato\"-parametro valoron."
 
-#: actions/apistatusesupdate.php:242 actions/newnotice.php:157
+#: actions/apistatusesupdate.php:243 actions/newnotice.php:157
 #: lib/mailhandler.php:60
 #, php-format
 msgid "That's too long. Max notice size is %d chars."
 msgstr "Tro longas. Longlimo por avizo estas %d signoj."
 
-#: actions/apistatusesupdate.php:283 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:284 actions/apiusershow.php:96
 msgid "Not found."
 msgstr "Ne troviÄas."
 
-#: actions/apistatusesupdate.php:306 actions/newnotice.php:181
+#: actions/apistatusesupdate.php:307 actions/newnotice.php:181
 #, php-format
 msgid "Max notice size is %d chars, including attachment URL."
 msgstr "Longlimo por avizo estas %d signoj, enkalkulante ankaÅ la retadresojn."
@@ -881,7 +885,9 @@ msgid "Yes"
 msgstr "Jes"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
+#. TRANS: Submit button title.
+#. TRANS: Description of the form to block a user.
+#: actions/block.php:164 actions/groupmembers.php:403 lib/blockform.php:82
 msgid "Block this user"
 msgstr "Bloki la uzanton"
 
@@ -923,11 +929,13 @@ msgstr "Listo de uzantoj blokita de aniÄi al Äi tiun grupo."
 msgid "Unblock user from group"
 msgstr "Malbloki uzanton de grupo"
 
-#: actions/blockedfromgroup.php:320 lib/unblockform.php:69
+#. TRANS: Title for the form to unblock a user.
+#: actions/blockedfromgroup.php:320 lib/unblockform.php:70
 msgid "Unblock"
 msgstr "Malbloki"
 
-#: actions/blockedfromgroup.php:320 lib/unblockform.php:80
+#. TRANS: Description of the form to unblock a user.
+#: actions/blockedfromgroup.php:320 lib/unblockform.php:82
 msgid "Unblock this user"
 msgstr "Malbloki Äi tiun uzanton"
 
@@ -966,9 +974,9 @@ msgstr "La adreso jam estis konfirmita."
 #. 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/confirmaddress.php:116 actions/emailsettings.php:331
+#: actions/emailsettings.php:477 actions/imsettings.php:283
+#: actions/imsettings.php:442 actions/othersettings.php:174
 #: actions/profilesettings.php:283 actions/smssettings.php:308
 #: actions/smssettings.php:464
 msgid "Couldn't update user."
@@ -976,7 +984,7 @@ msgstr "Ne povus Äisdatigi uzanton."
 
 #. 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/confirmaddress.php:128 actions/emailsettings.php:437
 #: actions/smssettings.php:422
 msgid "Couldn't delete email confirmation."
 msgstr "Ne povas forigi retpoÅtan konfirmon."
@@ -1012,9 +1020,10 @@ msgstr "AplikaÄµo ne trovita."
 msgid "You are not the owner of this application."
 msgstr "Vi ne estas la posedanto de Äi tiu aplikaÄµo."
 
+#. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:127
 #: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1307
+#: lib/action.php:1315
 msgid "There was a problem with your session token."
 msgstr "Problemo okazas pri via seancÄµetono."
 
@@ -1047,7 +1056,7 @@ msgstr "ViÅi Äi tiun aplikon"
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
 #: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:73 lib/profileformaction.php:64
+#: lib/adminpanelaction.php:71 lib/profileformaction.php:64
 #: lib/settingsaction.php:72
 msgid "Not logged in."
 msgstr "Ne konektita."
@@ -1109,7 +1118,6 @@ msgstr "Forigi la uzanton"
 #. TRANS: Message used as title for design settings for the site.
 #. TRANS: Link description in user account settings menu.
 #: actions/designadminpanel.php:63 lib/accountsettingsaction.php:139
-#: lib/groupnav.php:119
 msgid "Design"
 msgstr "Aspekto"
 
@@ -1228,13 +1236,13 @@ msgstr "RestaÅri defaÅltajn desegnojn"
 msgid "Reset back to default"
 msgstr "RedefaÅltiÄi"
 
-#. TRANS: Submit button title
+#. TRANS: Submit button title.
 #: actions/designadminpanel.php:685 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/snapshotadminpanel.php:245
 #: actions/subscriptions.php:226 actions/tagother.php:154
-#: actions/useradminpanel.php:294 lib/applicationeditform.php:363
+#: actions/useradminpanel.php:294 lib/applicationeditform.php:353
 #: lib/designsettings.php:256 lib/groupeditform.php:202
 msgid "Save"
 msgstr "Konservi"
@@ -1390,7 +1398,7 @@ msgstr "Nuna konfirmita retpoÅtadreso."
 #. 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/emailsettings.php:115 actions/emailsettings.php:162
 #: actions/imsettings.php:116 actions/smssettings.php:124
 #: actions/smssettings.php:180
 msgctxt "BUTTON"
@@ -1408,22 +1416,26 @@ msgstr ""
 #. 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
+#. TRANS: Button label in the "Edit application" form.
 #: actions/emailsettings.php:127 actions/imsettings.php:131
-#: actions/smssettings.php:137 lib/applicationeditform.php:357
+#: actions/smssettings.php:137 lib/applicationeditform.php:347
 msgctxt "BUTTON"
 msgid "Cancel"
 msgstr "Nuligi"
 
-#. TRANS: Instructions for e-mail address input form.
-#: actions/emailsettings.php:135
+#. TRANS: Instructions for e-mail address input form. Do not translate
+#. TRANS: "example.org". It is one of the domain names reserved for
+#. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
+#. TRANS: Any other domain may be owned by a legitimate person or
+#. TRANS: organization.
+#: actions/emailsettings.php:139
 msgid "Email address, like \"UserName@example.org\""
 msgstr "RetpoÅtadreso, ekzemple \"ViaNomo@example.org\""
 
 #. 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/emailsettings.php:143 actions/imsettings.php:151
 #: actions/smssettings.php:162
 msgctxt "BUTTON"
 msgid "Add"
@@ -1431,110 +1443,110 @@ msgstr "Aldoni"
 
 #. 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
+#: actions/emailsettings.php:151 actions/smssettings.php:171
 msgid "Incoming email"
 msgstr "Alveninta poÅto"
 
 #. 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
+#: actions/emailsettings.php:159 actions/smssettings.php:178
 msgid "Send email to this address to post new notices."
 msgstr "Sendu mesaÄon al la adreso por afiÅi novan avizon."
 
 #. 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
+#: actions/emailsettings.php:168 actions/smssettings.php:186
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr "Krei novan retpoÅtadreson por afiÅado kaj nuligi la antaÅan."
 
 #. 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
+#: actions/emailsettings.php:172 actions/smssettings.php:189
 msgctxt "BUTTON"
 msgid "New"
 msgstr "Nova"
 
 #. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:174
+#: actions/emailsettings.php:178
 msgid "Email preferences"
 msgstr "RetpoÅta agordo."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:180
+#: actions/emailsettings.php:184
 msgid "Send me notices of new subscriptions through email."
 msgstr "Sendu al mi avizon pri nova abonado per retpoÅto."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:186
+#: actions/emailsettings.php:190
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr "Sendu al mi mesaÄon tiam, kiam iu Åatas mian avizon ."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:193
+#: actions/emailsettings.php:197
 msgid "Send me email when someone sends me a private message."
 msgstr "Sendu al mi mesaÄon tiam, kiam iu sendas al mi privatan mesaÄon."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:199
+#: actions/emailsettings.php:203
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr "Sendu al mi mesaÄon tiam, kiam iu sendas al mi \"@-respondon\"."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:205
+#: actions/emailsettings.php:209
 msgid "Allow friends to nudge me and send me an email."
 msgstr "Permesi al amikoj puÅeti min kaj sendi al mi retpoÅtan mesaÄon."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:212
+#: actions/emailsettings.php:216
 msgid "I want to post notices by email."
 msgstr "Mi volas afiÅi avizon per retpoÅto."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:219
+#: actions/emailsettings.php:223
 msgid "Publish a MicroID for my email address."
 msgstr "Publikigi MikroID por mia retpoÅtadreso."
 
 #. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:334
+#: actions/emailsettings.php:338
 msgid "Email preferences saved."
 msgstr "RetpoÅta prefero konserviÄis."
 
 #. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:353
+#: actions/emailsettings.php:357
 msgid "No email address."
 msgstr "Neniu retpoÅta adreso."
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:361
+#: actions/emailsettings.php:365
 msgid "Cannot normalize that email address"
 msgstr "Malsukcesis normigi tiun retpoÅtadreson"
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:208
+#: actions/emailsettings.php:370 actions/register.php:208
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "RetpoÅta adreso ne valida"
 
 #. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:370
+#: actions/emailsettings.php:374
 msgid "That is already your email address."
 msgstr "Tiu jam estas via retpoÅtadreso."
 
 #. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:374
+#: actions/emailsettings.php:378
 msgid "That email address already belongs to another user."
 msgstr "Tiu retpoÅtadreso jam apartenas al alia uzanto."
 
 #. 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/emailsettings.php:395 actions/imsettings.php:351
 #: actions/smssettings.php:373
 msgid "Couldn't insert confirmation code."
 msgstr "Malsukcesis enmeti konfirmkodon."
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:398
+#: actions/emailsettings.php:402
 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."
@@ -1545,50 +1557,50 @@ msgstr ""
 #. 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/emailsettings.php:423 actions/imsettings.php:386
 #: actions/smssettings.php:408
 msgid "No pending confirmation to cancel."
 msgstr "Ne estas peto-konfirmo por nuligi."
 
 #. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:424
+#: actions/emailsettings.php:428
 msgid "That is the wrong email address."
 msgstr "Tiu retpoÅtadreso estas malÄusta."
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:438
+#: actions/emailsettings.php:442
 msgid "Email confirmation cancelled."
 msgstr "RetpoÅta konfirmo nuligita."
 
 #. TRANS: Message given trying to remove an e-mail address that is not
 #. TRANS: registered for the active user.
-#: actions/emailsettings.php:458
+#: actions/emailsettings.php:462
 msgid "That is not your email address."
 msgstr "Tiu ne estas via retpoÅtadreso."
 
 #. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:479
+#: actions/emailsettings.php:483
 msgid "The email address was removed."
 msgstr "La retpoÅtadreso estas forigita."
 
-#: actions/emailsettings.php:493 actions/smssettings.php:568
+#: actions/emailsettings.php:497 actions/smssettings.php:568
 msgid "No incoming email address."
 msgstr "Ne estas alvena retpoÅtadreso"
 
 #. 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/emailsettings.php:508 actions/emailsettings.php:532
 #: actions/smssettings.php:578 actions/smssettings.php:602
 msgid "Couldn't update user record."
 msgstr "Malsukcesis Äisdatigi uzantan informon."
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
-#: actions/emailsettings.php:508 actions/smssettings.php:581
+#: actions/emailsettings.php:512 actions/smssettings.php:581
 msgid "Incoming email address removed."
 msgstr "Alvena retpoÅtadreso forigita."
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
-#: actions/emailsettings.php:532 actions/smssettings.php:605
+#: actions/emailsettings.php:536 actions/smssettings.php:605
 msgid "New incoming email address added."
 msgstr "Nova alvena retpoÅtadreso aldonita."
 
@@ -1705,7 +1717,7 @@ msgstr "Malsukcesis interÅanÄi petÄµetonon al atingoÄµetono."
 msgid "Remote service uses unknown version of OMB protocol."
 msgstr "Fora servo uzas nekonatan version de OMB-protokolo."
 
-#: actions/finishremotesubscribe.php:138
+#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306
 msgid "Error updating remote profile."
 msgstr "Eraro je Äisdatigo de fora profilo."
 
@@ -1762,7 +1774,7 @@ msgstr "La uzanto jam de grupo blokiÄas."
 msgid "User is not a member of group."
 msgstr "La uzanto ne estas grupano."
 
-#: actions/groupblock.php:134 actions/groupmembers.php:360
+#: actions/groupblock.php:134 actions/groupmembers.php:364
 msgid "Block user from group"
 msgstr "Bloki uzanton de grupo"
 
@@ -1840,40 +1852,32 @@ msgstr "Emblemo Äisdatigita."
 msgid "Failed updating logo."
 msgstr "Malsukcesis Äisdatigi emblemon."
 
-#: actions/groupmembers.php:100 lib/groupnav.php:92
+#. TRANS: Title of the page showing group members.
+#. TRANS: %s is the name of the group.
+#: actions/groupmembers.php:102
 #, php-format
 msgid "%s group members"
 msgstr "%s grupanoj"
 
-#: actions/groupmembers.php:103
+#. TRANS: Title of the page showing group members.
+#. TRANS: %1$s is the name of the group, %2$d is the page number of the members list.
+#: actions/groupmembers.php:107
 #, php-format
 msgid "%1$s group members, page %2$d"
 msgstr "%1$s grupanoj, paÄo %2$d"
 
-#: actions/groupmembers.php:118
+#: actions/groupmembers.php:122
 msgid "A list of the users in this group."
 msgstr "Listo de uzantoj en tiu Äi grupo"
 
-#: actions/groupmembers.php:182 lib/groupnav.php:107
+#: actions/groupmembers.php:186
 msgid "Admin"
 msgstr "Administranto"
 
-#: actions/groupmembers.php:392 lib/blockform.php:69
-msgid "Block"
-msgstr "Bloki"
-
-#: actions/groupmembers.php:487
+#: actions/groupmembers.php:498
 msgid "Make user an admin of the group"
 msgstr "Elekti uzanton grupestro."
 
-#: actions/groupmembers.php:519
-msgid "Make Admin"
-msgstr "Estrigi"
-
-#: actions/groupmembers.php:519
-msgid "Make this user an admin"
-msgstr "Estrigi la uzanton"
-
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Title in atom group notice feed. %s is a group name.
 #. TRANS: Title in atom user notice feed. %s is a user name.
@@ -2011,7 +2015,10 @@ msgstr ""
 
 #. TRANS: IM address input field instructions in IM settings form.
 #. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:140
+#. TRANS: Do not translate "example.org". It is one of the domain names reserved for use in examples by
+#. TRANS: http://www.rfc-editor.org/rfc/rfc2606.txt. Any other domain may be owned by a legitimate
+#. TRANS: person or organization.
+#: actions/imsettings.php:143
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -2021,64 +2028,64 @@ msgstr ""
 "s al via amikolisto je via tujmesaÄilo-kliento aÅ je GTalk."
 
 #. TRANS: Form legend for IM preferences form.
-#: actions/imsettings.php:155
+#: actions/imsettings.php:158
 msgid "IM preferences"
 msgstr "TujmesaÄilaj preferoj"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:160
+#: actions/imsettings.php:163
 msgid "Send me notices through Jabber/GTalk."
 msgstr "Sendu al mi avizojn per Jabber/GTalk."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:166
+#: actions/imsettings.php:169
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr "AfiÅu avizon tiam, kiam mia Jabber/GTalk-stato ÅanÄiÄas."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:172
+#: actions/imsettings.php:175
 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr ""
 "Sendu al mi per Jabber/GTalk respondojn de personoj, kiujn mi ne abonas."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:179
+#: actions/imsettings.php:182
 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "Publikigu MikroID por mia Jabber/GTalk-adreso."
 
 #. TRANS: Confirmation message for successful IM preferences save.
-#: actions/imsettings.php:287 actions/othersettings.php:180
+#: actions/imsettings.php:290 actions/othersettings.php:180
 msgid "Preferences saved."
 msgstr "Prefero konservita."
 
 #. TRANS: Message given saving IM address without having provided one.
-#: actions/imsettings.php:309
+#: actions/imsettings.php:312
 msgid "No Jabber ID."
 msgstr "Mankas Jabber-ID."
 
 #. TRANS: Message given saving IM address that cannot be normalised.
-#: actions/imsettings.php:317
+#: actions/imsettings.php:320
 msgid "Cannot normalize that Jabber ID"
 msgstr "Malsukcesis normigi la Jabber-ID"
 
 #. TRANS: Message given saving IM address that not valid.
-#: actions/imsettings.php:322
+#: actions/imsettings.php:325
 msgid "Not a valid Jabber ID"
 msgstr "Tio ne estas valida Jabber-ID"
 
 #. TRANS: Message given saving IM address that is already set.
-#: actions/imsettings.php:326
+#: actions/imsettings.php:329
 msgid "That is already your Jabber ID."
 msgstr "Tio estas jam via Jabber-ID."
 
 #. TRANS: Message given saving IM address that is already set for another user.
-#: actions/imsettings.php:330
+#: actions/imsettings.php:333
 msgid "Jabber ID already belongs to another user."
 msgstr "Jabber-ID jam apartenas al alia uzanto."
 
 #. 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
+#: actions/imsettings.php:361
 #, php-format
 msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
@@ -2088,28 +2095,28 @@ msgstr ""
 "al %s sendi mesaÄojn al vi."
 
 #. TRANS: Message given canceling IM address confirmation for the wrong IM address.
-#: actions/imsettings.php:388
+#: actions/imsettings.php:391
 msgid "That is the wrong IM address."
 msgstr "Tiu tujmesaÄila adreso estas malÄusta."
 
 #. TRANS: Server error thrown on database error canceling IM address confirmation.
-#: actions/imsettings.php:397
+#: actions/imsettings.php:400
 msgid "Couldn't delete IM confirmation."
 msgstr "Malsukcesis forigi tujmesaÄila agordo."
 
 #. TRANS: Message given after successfully canceling IM address confirmation.
-#: actions/imsettings.php:402
+#: actions/imsettings.php:405
 msgid "IM confirmation cancelled."
 msgstr "TujmesaÄila konfirmo nuligita."
 
 #. TRANS: Message given trying to remove an IM address that is not
 #. TRANS: registered for the active user.
-#: actions/imsettings.php:424
+#: actions/imsettings.php:427
 msgid "That is not your Jabber ID."
 msgstr "Tio ne estas via Jabber-ID."
 
 #. TRANS: Message given after successfully removing a registered IM address.
-#: actions/imsettings.php:447
+#: actions/imsettings.php:450
 msgid "The IM address was removed."
 msgstr "La tujmesaÄila adreso estas forigita."
 
@@ -2570,8 +2577,8 @@ msgid "Only %s URLs over plain HTTP please."
 msgstr "Bonvolu, nur %s-URL per plata HTTP."
 
 #. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1215
-#: lib/apiaction.php:1243 lib/apiaction.php:1366
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1206
+#: lib/apiaction.php:1233 lib/apiaction.php:1356
 msgid "Not a supported data format."
 msgstr "Datumformato ne subteniÄas."
 
@@ -2712,7 +2719,7 @@ msgid "Password saved."
 msgstr "Pasvorto konservitas."
 
 #. TRANS: Menu item for site administration
-#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:384
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:371
 msgid "Paths"
 msgstr "Vojoj"
 
@@ -2923,7 +2930,7 @@ msgstr "Plena nomo"
 
 #. TRANS: Form input field label.
 #: actions/profilesettings.php:115 actions/register.php:460
-#: lib/applicationeditform.php:244 lib/groupeditform.php:161
+#: lib/applicationeditform.php:235 lib/groupeditform.php:161
 msgid "Homepage"
 msgstr "HejmpaÄo"
 
@@ -3028,7 +3035,7 @@ msgid "Couldn't save tags."
 msgstr "Malsukcesis konservi markilojn."
 
 #. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:391 lib/adminpanelaction.php:141
+#: actions/profilesettings.php:391 lib/adminpanelaction.php:138
 msgid "Settings saved."
 msgstr "Agordo konservitas."
 
@@ -3543,9 +3550,17 @@ msgstr "La uzanto ne havas la rolon."
 msgid "StatusNet"
 msgstr "StatusNet"
 
+#: actions/sandbox.php:65 actions/unsandbox.php:65
+msgid "You cannot sandbox users on this site."
+msgstr ""
+
+#: actions/sandbox.php:72
+msgid "User is already sandboxed."
+msgstr ""
+
 #. TRANS: Menu item for site administration
 #: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
-#: lib/adminpanelaction.php:392
+#: lib/adminpanelaction.php:379
 msgid "Sessions"
 msgstr "Seancoj"
 
@@ -3583,24 +3598,24 @@ msgid "Application profile"
 msgstr "AplikaÄµa profilo"
 
 #. TRANS: Form input field label for application icon.
-#: actions/showapplication.php:159 lib/applicationeditform.php:182
+#: actions/showapplication.php:159 lib/applicationeditform.php:173
 msgid "Icon"
 msgstr "Ikono"
 
 #. TRANS: Form input field label for application name.
 #: actions/showapplication.php:169 actions/version.php:197
-#: lib/applicationeditform.php:199
+#: lib/applicationeditform.php:190
 msgid "Name"
 msgstr "Nomo"
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:178 lib/applicationeditform.php:235
+#: actions/showapplication.php:178 lib/applicationeditform.php:226
 msgid "Organization"
 msgstr "OrganizaÄµo"
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:216 lib/groupeditform.php:172
+#: lib/applicationeditform.php:207 lib/groupeditform.php:172
 msgid "Description"
 msgstr "Priskribo"
 
@@ -3708,7 +3723,7 @@ msgstr ""
 msgid "This is a way to share what you like."
 msgstr "Tiel vi povas diskonigi vian Åataton."
 
-#: actions/showgroup.php:82 lib/groupnav.php:86
+#: actions/showgroup.php:82
 #, php-format
 msgid "%s group"
 msgstr "Grupo %s"
@@ -3760,7 +3775,7 @@ msgstr "Avizofluo de grupo %s (Atom)"
 msgid "FOAF for %s group"
 msgstr "Foramiko de grupo %s"
 
-#: actions/showgroup.php:393 actions/showgroup.php:445 lib/groupnav.php:91
+#: actions/showgroup.php:393 actions/showgroup.php:445
 msgid "Members"
 msgstr "Grupanoj"
 
@@ -3965,6 +3980,14 @@ msgstr "Nomo de via retejo, ekzemple \"Viafirmo Mikroblogo\""
 msgid "Brought by"
 msgstr "Eblige de"
 
+#: actions/siteadminpanel.php:230
+msgid "Text used for credits link in footer of each page"
+msgstr ""
+
+#: actions/siteadminpanel.php:234
+msgid "Brought by URL"
+msgstr ""
+
 #: actions/siteadminpanel.php:235
 msgid "URL used for credits link in footer of each page"
 msgstr "URL por danko-ligilo je subaÄµo sur Äiu paÄo"
@@ -3989,10 +4012,6 @@ msgstr "DefaÅlta horzono de la retejo; kutime UTC."
 msgid "Default language"
 msgstr "DefaÅlta lingvo"
 
-#: actions/siteadminpanel.php:263
-msgid "Site language when autodetection from browser settings is not available"
-msgstr ""
-
 #: actions/siteadminpanel.php:271
 msgid "Limits"
 msgstr "Limoj"
@@ -4013,10 +4032,22 @@ msgstr ""
 msgid "How long users must wait (in seconds) to post the same thing again."
 msgstr ""
 
+#: actions/sitenoticeadminpanel.php:56
+msgid "Site Notice"
+msgstr ""
+
+#: actions/sitenoticeadminpanel.php:103
+msgid "Unable to save site notice."
+msgstr ""
+
 #: actions/sitenoticeadminpanel.php:113
 msgid "Max length for the site-wide notice is 255 chars."
 msgstr ""
 
+#: actions/sitenoticeadminpanel.php:176
+msgid "Site notice text"
+msgstr ""
+
 #: actions/sitenoticeadminpanel.php:178
 msgid "Site-wide notice text (255 chars max; HTML okay)"
 msgstr ""
@@ -4041,6 +4072,16 @@ msgctxt "BUTTON"
 msgid "Confirm"
 msgstr "Konfirmi"
 
+#. TRANS: Field label for SMS phone number input in SMS settings form.
+#: actions/smssettings.php:153
+msgid "SMS phone number"
+msgstr ""
+
+#. 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 ""
+
 #. TRANS: Checkbox label in SMS preferences form.
 #: actions/smssettings.php:201
 msgid ""
@@ -4074,7 +4115,7 @@ msgstr ""
 
 #. TRANS: Menu item for site administration
 #: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
-#: lib/adminpanelaction.php:408
+#: lib/adminpanelaction.php:395
 msgid "Snapshots"
 msgstr ""
 
@@ -4090,6 +4131,10 @@ msgstr ""
 msgid "In a scheduled job"
 msgstr ""
 
+#: actions/snapshotadminpanel.php:206
+msgid "Data snapshots"
+msgstr ""
+
 #: actions/snapshotadminpanel.php:208
 msgid "When to send statistical data to status.net servers"
 msgstr ""
@@ -4146,6 +4191,16 @@ msgstr ""
 msgid "%s has no subscribers. Want to be the first?"
 msgstr ""
 
+#: actions/subscriptions.php:52
+#, php-format
+msgid "%s subscriptions"
+msgstr ""
+
+#: actions/subscriptions.php:54
+#, php-format
+msgid "%1$s subscriptions, page %2$d"
+msgstr ""
+
 #: actions/subscriptions.php:65
 msgid "These are the people whose notices you listen to."
 msgstr ""
@@ -4165,6 +4220,11 @@ msgid ""
 "automatically subscribe to people you already follow there."
 msgstr ""
 
+#: actions/subscriptions.php:128 actions/subscriptions.php:132
+#, php-format
+msgid "%s is not listening to anyone."
+msgstr ""
+
 #: actions/subscriptions.php:208
 msgid "Jabber"
 msgstr "Jabber"
@@ -4173,6 +4233,21 @@ msgstr "Jabber"
 msgid "SMS"
 msgstr "SMS"
 
+#: actions/tag.php:87
+#, php-format
+msgid "Notice feed for tag %s (RSS 1.0)"
+msgstr ""
+
+#: actions/tag.php:93
+#, php-format
+msgid "Notice feed for tag %s (RSS 2.0)"
+msgstr ""
+
+#: actions/tag.php:99
+#, php-format
+msgid "Notice feed for tag %s (Atom)"
+msgstr ""
+
 #: actions/tagother.php:81 actions/userauthorization.php:132
 #: lib/userprofile.php:103
 msgid "Photo"
@@ -4183,6 +4258,10 @@ msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
 
+#: actions/unsilence.php:72
+msgid "User is not silenced."
+msgstr ""
+
 #. TRANS: User admin panel title
 #: actions/useradminpanel.php:59
 msgctxt "TITLE"
@@ -4491,6 +4570,11 @@ msgstr "Dosiero tiel granda superos vian uzantan kvoton kun %d bajtoj."
 msgid "A file this large would exceed your monthly quota of %d bytes."
 msgstr "Dosiero tiel granda superos vian monatan kvoton kun %d bajtoj."
 
+#. TRANS: Exception thrown when joining a group fails.
+#: classes/Group_member.php:42
+msgid "Group join failed."
+msgstr ""
+
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
 #: classes/Memcached_DataObject.php:533
 msgid "No database name or DSN found anywhere."
@@ -4531,6 +4615,11 @@ msgid ""
 "few minutes."
 msgstr ""
 
+#. TRANS: Client exception thrown when a user tries to post while being banned.
+#: classes/Notice.php:291
+msgid "You are banned from posting notices on this site."
+msgstr ""
+
 #. TRANS: Server exception thrown when a notice cannot be saved.
 #. TRANS: Server exception thrown when a notice cannot be updated.
 #: classes/Notice.php:358 classes/Notice.php:385
@@ -4568,6 +4657,16 @@ msgstr ""
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
 
+#. TRANS: Exception thrown when trying to subscribe while already subscribed.
+#: classes/Subscription.php:80
+msgid "Already subscribed!"
+msgstr ""
+
+#. TRANS: Exception thrown when trying to unsibscribe without a subscription.
+#: classes/Subscription.php:171
+msgid "Not subscribed!"
+msgstr ""
+
 #. TRANS: Notice given on user registration.
 #. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
 #: classes/User.php:365
@@ -4580,6 +4679,11 @@ msgstr "Bonvenon al %1$s, @%2$s!"
 msgid "Change email handling"
 msgstr ""
 
+#. TRANS: Link title attribute in user account settings menu.
+#: lib/accountsettingsaction.php:137
+msgid "Design your profile"
+msgstr ""
+
 #. TRANS: Link description in user account settings menu.
 #: lib/accountsettingsaction.php:146
 msgid "Other"
@@ -4626,7 +4730,8 @@ msgid "Change site configuration"
 msgstr "ÅanÄi agordojn de la retejo"
 
 #. TRANS: Main menu option when logged in and site admin for access to site configuration
-#: lib/action.php:474
+#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
+#: lib/action.php:474 lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr "Administri"
@@ -4673,6 +4778,23 @@ msgctxt "MENU"
 msgid "Help"
 msgstr "Helpo"
 
+#. TRANS: Tooltip for main menu option "Search"
+#: lib/action.php:513
+msgctxt "TOOLTIP"
+msgid "Search for people or text"
+msgstr ""
+
+#. TRANS: DT element for site notice. String is hidden in default CSS.
+#. TRANS: Menu item for site administration
+#: lib/action.php:538 lib/adminpanelaction.php:387
+msgid "Site notice"
+msgstr ""
+
+#. TRANS: DT element for local views block. String is hidden in default CSS.
+#: lib/action.php:605
+msgid "Local views"
+msgstr ""
+
 #. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
 #: lib/action.php:778
 msgid "Secondary site navigation"
@@ -4723,7 +4845,10 @@ msgid "StatusNet software license"
 msgstr "Licenco de la programaro StatusNet"
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
-#: lib/action.php:843
+#. TRANS: Text between [] is a link description, text between () is the link itself.
+#. TRANS: Make sure there is no whitespace between "]" and "(".
+#. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
+#: lib/action.php:846
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4731,13 +4856,16 @@ msgid ""
 msgstr ""
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:846
+#: lib/action.php:849
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr ""
 
 #. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.
-#: lib/action.php:850
+#. TRANS: Make sure there is no whitespace between "]" and "(".
+#. TRANS: Text between [] is a link description, text between () is the link itself.
+#. TRANS: %s is the version of StatusNet that is being used.
+#: lib/action.php:856
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4745,33 +4873,41 @@ msgid ""
 "org/licensing/licenses/agpl-3.0.html)."
 msgstr ""
 
+#. TRANS: Content license displayed when license is set to 'private'.
+#. TRANS: %1$s is the site name.
+#: lib/action.php:879
+#, php-format
+msgid "Content and data of %1$s are private and confidential."
+msgstr ""
+
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:880
+#: lib/action.php:886
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:884
+#: lib/action.php:890
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 
-#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:897
+#. TRANS: license message in footer.
+#. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
+#: lib/action.php:904
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr ""
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1247
+#: lib/action.php:1254
 msgid "After"
 msgstr "Poste"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1257
+#: lib/action.php:1264
 msgid "Before"
 msgstr "AntaÅe"
 
@@ -4780,108 +4916,177 @@ msgstr "AntaÅe"
 msgid "Expecting a root feed element but got a whole XML document."
 msgstr ""
 
-#: lib/activityutils.php:208
+#. TRANS: Client exception thrown when there is no source attribute.
+#: lib/activityutils.php:203
 msgid "Can't handle remote content yet."
 msgstr ""
 
-#: lib/activityutils.php:244
+#. TRANS: Client exception thrown when there embedded XML content is found that cannot be processed yet.
+#: lib/activityutils.php:240
 msgid "Can't handle embedded XML content yet."
 msgstr ""
 
-#: lib/activityutils.php:248
+#. TRANS: Client exception thrown when base64 encoded content is found that cannot be processed yet.
+#: lib/activityutils.php:245
 msgid "Can't handle embedded Base64 content yet."
 msgstr ""
 
+#. TRANS: Client error message thrown when a user tries to change admin settings but has no access rights.
+#: lib/adminpanelaction.php:96
+msgid "You cannot make changes to this site."
+msgstr ""
+
 #. TRANS: Client error message.
-#: lib/adminpanelaction.php:229
+#: lib/adminpanelaction.php:222
 msgid "showForm() not implemented."
 msgstr ""
 
 #. TRANS: Client error message
-#: lib/adminpanelaction.php:259
+#: lib/adminpanelaction.php:250
 msgid "saveSettings() not implemented."
 msgstr ""
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:352
+#: lib/adminpanelaction.php:339
 msgctxt "MENU"
 msgid "Site"
 msgstr "Retejo"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:368 lib/personalgroupnav.php:115
+#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:115
 msgid "User"
 msgstr "Uzanto"
 
+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:385
+msgid "Edit site notice"
+msgstr ""
+
 #. TRANS: Client error 401.
-#: lib/apiauth.php:113
+#: lib/apiauth.php:111
 msgid "API resource requires read-write access, but you only have read access."
 msgstr ""
 
+#. TRANS: OAuth exception thrown when no application is found for a given consumer key.
+#: lib/apiauth.php:175
+msgid "No application for that consumer key."
+msgstr ""
+
+#. TRANS: OAuth exception given when an incorrect access token was given for a user.
+#: lib/apiauth.php:212
+msgid "Bad access token."
+msgstr ""
+
+#. TRANS: OAuth exception given when no user was found for a given token (no token was found).
+#: lib/apiauth.php:217
+msgid "No user for that token."
+msgstr ""
+
+#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
+#: lib/apioauthstore.php:178
+msgid "Tried to revoke unknown token"
+msgstr ""
+
+#. TRANS: Exception thrown when an attempt is made to remove a revoked token.
+#: lib/apioauthstore.php:182
+msgid "Failed to delete revoked token"
+msgstr ""
+
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:242
+#: lib/applicationeditform.php:233
 msgid "URL for the homepage of the organization"
 msgstr ""
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:251
+#: lib/applicationeditform.php:242
 msgid "URL to redirect to after authentication"
 msgstr ""
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:278
+#: lib/applicationeditform.php:269
 msgid "Browser"
 msgstr ""
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:295
+#: lib/applicationeditform.php:286
 msgid "Desktop"
 msgstr ""
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:297
+#: lib/applicationeditform.php:288
 msgid "Type of application, browser or desktop"
 msgstr ""
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:320
+#: lib/applicationeditform.php:311
 msgid "Read-only"
 msgstr ""
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:339
+#: lib/applicationeditform.php:330
 msgid "Read-write"
 msgstr ""
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:341
+#: lib/applicationeditform.php:332
 msgid "Default access for this application: read-only, or read-write"
 msgstr ""
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:136
+#: lib/applicationlist.php:135
 msgid "read-write"
 msgstr ""
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:138
+#: lib/applicationlist.php:137
 msgid "read-only"
 msgstr ""
 
 #. 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
+#: lib/applicationlist.php:143
 #, php-format
 msgid "Approved %1$s - \"%2$s\" access."
 msgstr ""
 
-#: lib/attachmentnoticesection.php:67
+#. TRANS: Title.
+#: lib/attachmentnoticesection.php:68
 msgid "Notices where this attachment appears"
 msgstr ""
 
+#. TRANS: Title for the form to block a user.
+#: lib/blockform.php:70
+msgid "Block"
+msgstr "Bloki"
+
 #: lib/channel.php:229 lib/mailhandler.php:142
 msgid "Command complete"
 msgstr ""
 
+#. TRANS: Command exception text shown when a notice ID is requested that does not exist.
+#: lib/command.php:84 lib/command.php:108
+msgid "Notice with that id does not exist."
+msgstr ""
+
+#. TRANS: Command exception text shown when a last user notice is requested and it does not exist.
+#. TRANS: Error text shown when a last user notice is requested and it does not exist.
+#: lib/command.php:101 lib/command.php:630
+msgid "User has no last notice."
+msgstr ""
+
+#. 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:130
+#, php-format
+msgid "Could not find a user with nickname %s."
+msgstr ""
+
+#. TRANS: Message given getting a non-existing user.
+#. TRANS: %s is the nickname of the user that could not be found.
+#: lib/command.php:150
+#, php-format
+msgid "Could not find a local user with nickname %s."
+msgstr ""
+
 #. TRANS: Error text shown when an unimplemented command is given.
 #: lib/command.php:185
 msgid "Sorry, this command is not yet implemented."
@@ -4892,6 +5097,13 @@ msgstr ""
 msgid "It does not make a lot of sense to nudge yourself!"
 msgstr ""
 
+#. TRANS: Message given having nudged another user.
+#. TRANS: %s is the nickname of the user that was nudged.
+#: lib/command.php:240
+#, php-format
+msgid "Nudge sent to %s."
+msgstr ""
+
 #. TRANS: User statistics text.
 #. TRANS: %1$s is the number of other user the user is subscribed to.
 #. TRANS: %2$s is the number of users that are subscribed to the user.
@@ -4904,6 +5116,20 @@ msgid ""
 "Notices: %3$s"
 msgstr ""
 
+#. 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.
+#: lib/command.php:360
+#, php-format
+msgid "%1$s joined group %2$s."
+msgstr ""
+
+#. 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.
+#: lib/command.php:408
+#, php-format
+msgid "%1$s left group %2$s."
+msgstr ""
+
 #. TRANS: Command exception text shown when trying to send a direct message to a remote user (a user not registered at the current server).
 #: lib/command.php:474
 #, php-format
@@ -4924,6 +5150,13 @@ msgstr ""
 msgid "Error sending direct message."
 msgstr ""
 
+#. 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:554
+#, php-format
+msgid "Notice from %s repeated."
+msgstr ""
+
 #. TRANS: Message given if content of a notice for a reply is too long.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
 #: lib/command.php:592
@@ -4931,6 +5164,13 @@ msgstr ""
 msgid "Notice too long - maximum is %1$d characters, you sent %2$d."
 msgstr ""
 
+#. TRANS: Text shown having sent a reply to a notice successfully.
+#. TRANS: %s is the nickname of the user of the notice the reply was sent to.
+#: lib/command.php:603
+#, php-format
+msgid "Reply to %s sent."
+msgstr ""
+
 #. TRANS: Error text shown when no username was provided when issuing a subscribe command.
 #: lib/command.php:655
 msgid "Specify the name of the user to subscribe to."
@@ -4941,12 +5181,26 @@ msgstr ""
 msgid "Can't subscribe to OMB profiles by command."
 msgstr ""
 
+#. TRANS: Text shown after having subscribed to another user successfully.
+#. TRANS: %s is the name of the user the subscription was requested for.
+#: lib/command.php:672
+#, php-format
+msgid "Subscribed to %s."
+msgstr ""
+
 #. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
 #. TRANS: Error text shown when no username was provided when issuing the command.
 #: lib/command.php:694 lib/command.php:804
 msgid "Specify the name of the user to unsubscribe from."
 msgstr ""
 
+#. TRANS: Text shown after having unsubscribed from another user successfully.
+#. TRANS: %s is the name of the user the unsubscription was requested for.
+#: lib/command.php:705
+#, php-format
+msgid "Unsubscribed from %s."
+msgstr ""
+
 #. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
 #. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
 #: lib/command.php:724 lib/command.php:750
@@ -4970,6 +5224,13 @@ msgstr ""
 msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr ""
 
+#. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
+#. TRANS: %s is the name of the user the unsubscription was requested for.
+#: lib/command.php:813
+#, php-format
+msgid "Unsubscribed %s."
+msgstr ""
+
 #. TRANS: Text shown after requesting other users that are subscribed to a user
 #. TRANS: (followers) without having any subscribers.
 #: lib/command.php:858
@@ -4977,7 +5238,7 @@ msgid "No one is subscribed to you."
 msgstr ""
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
-#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
 #: lib/command.php:863
 msgid "This person is subscribed to you:"
@@ -4985,6 +5246,7 @@ msgid_plural "These people are subscribed to you:"
 msgstr[0] ""
 msgstr[1] ""
 
+#. TRANS: Help text for commands.
 #: lib/command.php:905
 msgid ""
 "Commands:\n"
@@ -5109,13 +5371,19 @@ msgstr ""
 msgid "Extra nicknames for the group, comma- or space- separated, max %d"
 msgstr ""
 
-#: lib/groupnav.php:114
+#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
+#. TRANS: %s is the nickname of the group.
+#: lib/groupnav.php:129
 #, php-format
+msgctxt "TOOLTIP"
 msgid "Add or edit %s logo"
 msgstr ""
 
-#: lib/groupnav.php:120
+#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
+#. TRANS: %s is the nickname of the group.
+#: lib/groupnav.php:138
 #, php-format
+msgctxt "TOOLTIP"
 msgid "Add or edit %s design"
 msgstr ""
 
@@ -5133,7 +5401,8 @@ msgstr ""
 msgid "This page is not available in a media type you accept"
 msgstr ""
 
-#: lib/imagefile.php:101 lib/mediafile.php:170
+#. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
+#: lib/imagefile.php:101 lib/mediafile.php:179
 msgid "System error uploading file."
 msgstr ""
 
@@ -5158,6 +5427,11 @@ msgstr ""
 msgid "[%s]"
 msgstr ""
 
+#: lib/jabber.php:567
+#, php-format
+msgid "Unknown inbox source %d."
+msgstr ""
+
 #: lib/leaveform.php:114
 msgid "Leave"
 msgstr "Forlasi"
@@ -5166,6 +5440,11 @@ msgstr "Forlasi"
 msgid "Sign up for a new account"
 msgstr ""
 
+#. TRANS: Subject for address confirmation email
+#: lib/mail.php:174
+msgid "Email address confirmation"
+msgstr ""
+
 #. TRANS: Body for address confirmation email.
 #: lib/mail.php:177
 #, php-format
@@ -5334,6 +5613,10 @@ msgid ""
 "P.S. You can turn off these email notifications here: %8$s\n"
 msgstr ""
 
+#: lib/mailbox.php:89
+msgid "Only the user can read their own mailboxes."
+msgstr ""
+
 #: lib/mailbox.php:139
 msgid ""
 "You have no private messages. You can send private message to engage other "
@@ -5344,52 +5627,73 @@ msgstr ""
 msgid "from"
 msgstr ""
 
-#: lib/mediafile.php:98 lib/mediafile.php:123
+#. TRANS: Client exception thrown when a database error was thrown during a file upload operation.
+#: lib/mediafile.php:99 lib/mediafile.php:125
 msgid "There was a database error while saving your file. Please try again."
 msgstr ""
 
-#: lib/mediafile.php:142
+#. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
+#: lib/mediafile.php:145
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
 msgstr ""
 
-#: lib/mediafile.php:147
+#. TRANS: Client exception.
+#: lib/mediafile.php:151
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form."
 msgstr ""
 
-#: lib/mediafile.php:152
+#. TRANS: Client exception.
+#: lib/mediafile.php:157
 msgid "The uploaded file was only partially uploaded."
 msgstr ""
 
-#: lib/mediafile.php:159
+#. TRANS: Client exception thrown when a temporary folder is not present to store a file upload.
+#: lib/mediafile.php:165
 msgid "Missing a temporary folder."
 msgstr ""
 
-#: lib/mediafile.php:162
+#. TRANS: Client exception thrown when writing to disk is not possible during a file upload operation.
+#: lib/mediafile.php:169
 msgid "Failed to write file to disk."
 msgstr ""
 
-#: lib/mediafile.php:165
+#. TRANS: Client exception thrown when a file upload operation has been stopped by an extension.
+#: lib/mediafile.php:173
 msgid "File upload stopped by extension."
 msgstr ""
 
-#: lib/mediafile.php:179 lib/mediafile.php:217
+#. TRANS: Client exception thrown when a file upload operation would cause a user to exceed a set quota.
+#: lib/mediafile.php:189 lib/mediafile.php:232
 msgid "File exceeds user's quota."
 msgstr ""
 
-#: lib/mediafile.php:197 lib/mediafile.php:234
+#. TRANS: Client exception thrown when a file upload operation fails because the file could
+#. TRANS: not be moved from the temporary folder to the permanent file location.
+#: lib/mediafile.php:209 lib/mediafile.php:251
 msgid "File could not be moved to destination directory."
 msgstr ""
 
-#: lib/mediafile.php:318
+#. TRANS: Client exception thrown trying to upload a forbidden MIME type.
+#. TRANS: %1$s is the file type that was denied, %2$s is the application part of
+#. TRANS: the MIME type that was denied.
+#: lib/mediafile.php:340
 #, php-format
-msgid " Try using another %s format."
+msgid ""
+"\"%1$s\" is not a supported file type on this server. Try using another %2$s "
+"format."
 msgstr ""
 
-#: lib/mediafile.php:323
+#. TRANS: Client exception thrown trying to upload a forbidden MIME type.
+#. TRANS: %s is the file type that was denied.
+#: lib/mediafile.php:345
 #, php-format
-msgid "%s is not a supported file type on this server."
+msgid "\"%s\" is not a supported file type on this server."
+msgstr ""
+
+#: lib/messageform.php:120
+msgid "Send a direct notice"
 msgstr ""
 
 #: lib/messageform.php:146
@@ -5460,6 +5764,14 @@ msgstr ""
 msgid "Reply"
 msgstr ""
 
+#: lib/nudgeform.php:128
+msgid "Send a nudge to this user"
+msgstr ""
+
+#: lib/personalgroupnav.php:104
+msgid "Replies"
+msgstr ""
+
 #: lib/personalgroupnav.php:125
 msgid "Inbox"
 msgstr ""
@@ -5469,6 +5781,10 @@ msgstr ""
 msgid "Tags in %s's notices"
 msgstr ""
 
+#: lib/profileaction.php:126
+msgid "All subscriptions"
+msgstr ""
+
 #. TRANS: Average count of posts made per day since account registration
 #: lib/profileaction.php:235
 msgid "Daily average"
@@ -5502,15 +5818,19 @@ msgstr ""
 msgid "Sandbox"
 msgstr ""
 
-#: lib/searchaction.php:120
+#. TRANS: Fieldset legend for the search form.
+#: lib/searchaction.php:121
 msgid "Search site"
 msgstr ""
 
-#: lib/searchaction.php:126
+#. TRANS: Used as a field label for the field where one or more keywords
+#. TRANS: for searching can be entered.
+#: lib/searchaction.php:129
 msgid "Keyword(s)"
 msgstr ""
 
-#: lib/searchaction.php:162
+#. TRANS: Definition list item with instructions on how to get (better) search results.
+#: lib/searchaction.php:170
 msgid "Search help"
 msgstr ""
 
@@ -5534,6 +5854,16 @@ msgstr "Pli..."
 msgid "Silence"
 msgstr "Silento"
 
+#: lib/subgroupnav.php:83
+#, php-format
+msgid "People %s subscribes to"
+msgstr ""
+
+#: lib/subgroupnav.php:91
+#, php-format
+msgid "People subscribed to %s"
+msgstr ""
+
 #: lib/subscriberspeopleselftagcloudsection.php:48
 #: lib/subscriptionspeopleselftagcloudsection.php:48
 msgid "People Tagcloud as self-tagged"
@@ -5544,6 +5874,10 @@ msgstr ""
 msgid "People Tagcloud as tagged"
 msgstr ""
 
+#: lib/tagcloudsection.php:56
+msgid "None"
+msgstr ""
+
 #: lib/themeuploader.php:50
 msgid "This server cannot handle theme uploads without ZIP support."
 msgstr ""
@@ -5588,6 +5922,10 @@ msgstr ""
 msgid "Unsandbox"
 msgstr ""
 
+#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
+msgid "Unsubscribe from this user"
+msgstr ""
+
 #: lib/unsubscribeform.php:137
 msgid "Unsubscribe"
 msgstr "Malaboni"
@@ -5623,34 +5961,22 @@ msgid "Moderator"
 msgstr "Moderanto"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1102
+#: lib/util.php:1103
 msgid "a few seconds ago"
 msgstr "antaÅ kelkaj sekundoj"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1105
+#: lib/util.php:1106
 msgid "about a minute ago"
 msgstr "antaÅ ÄirkaÅ unu minuto"
 
-#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1109
-#, php-format
-msgid "about %d minutes ago"
-msgstr "antaÅ ÄirkaÅ %d minutoj"
-
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 #: lib/util.php:1112
 msgid "about an hour ago"
 msgstr "antaÅ ÄirkaÅ unu horo"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1116
-#, php-format
-msgid "about %d hours ago"
-msgstr "antaÅ ÄirkaÅ %d horoj"
-
-#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1119
+#: lib/util.php:1118
 msgid "about a day ago"
 msgstr "antaÅ ÄirkaÅ unu tago"
 
diff --git a/locale/es/LC_MESSAGES/statusnet.po b/locale/es/LC_MESSAGES/statusnet.po
index a2d80329e3..22692c8915 100644
--- a/locale/es/LC_MESSAGES/statusnet.po
+++ b/locale/es/LC_MESSAGES/statusnet.po
@@ -1,13 +1,14 @@
-# Translation of StatusNet to Spanish
+# Translation of StatusNet to Spanish (EspaÃ±ol)
+# Expored from translatewiki.net
 #
-# Author@translatewiki.net: Brion
-# Author@translatewiki.net: Crazymadlover
-# Author@translatewiki.net: Locos epraix
-# Author@translatewiki.net: McDutchie
-# Author@translatewiki.net: Patcito
-# Author@translatewiki.net: PerroVerd
-# Author@translatewiki.net: Peter17
-# Author@translatewiki.net: Translationista
+# Author: Brion
+# Author: Crazymadlover
+# Author: Locos epraix
+# Author: McDutchie
+# Author: Patcito
+# Author: PerroVerd
+# Author: Peter17
+# Author: Translationista
 # --
 # This file is distributed under the same license as the StatusNet package.
 #
@@ -15,20 +16,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-08 22:33+0000\n"
-"PO-Revision-Date: 2010-09-09 17:36:47+0000\n"
-"Language-Team: Spanish\n"
+"POT-Creation-Date: 2010-09-14 19:53+0000\n"
+"PO-Revision-Date: 2010-09-14 19:53:52+0000\n"
+"Language-Team: Spanish <http://translatewiki.net/wiki/Portal:es>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r72348); Translate extension (2010-08-20)\n"
+"X-Generator: MediaWiki 1.17alpha (r73009); Translate extension (2010-08-20)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: es\n"
-"X-Message-Group: out-statusnet\n"
+"X-Message-Group: #out-statusnet\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-POT-Import-Date: 1284-49-16 34::+0000\n"
 
 #. TRANS: Page title
 #. TRANS: Menu item for site administration
-#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:376
+#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:363
 msgid "Access"
 msgstr "Acceder"
 
@@ -81,10 +83,10 @@ 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 actions/emailsettings.php:224
-#: actions/imsettings.php:184 actions/smssettings.php:209
-#: lib/applicationeditform.php:361
+#. TRANS: Button label in the "Edit application" form.
+#: actions/accessadminpanel.php:203 actions/emailsettings.php:228
+#: actions/imsettings.php:187 actions/smssettings.php:209
+#: lib/applicationeditform.php:351
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Guardar"
@@ -97,15 +99,15 @@ msgstr "No existe tal pÃ¡gina."
 
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #: actions/all.php:79 actions/allrss.php:68
-#: actions/apiaccountupdatedeliverydevice.php:114
-#: actions/apiaccountupdateprofile.php:105
-#: actions/apiaccountupdateprofilebackgroundimage.php:116
-#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
-#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
-#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:113
-#: actions/apigroupismember.php:91 actions/apigroupjoin.php:100
-#: actions/apigroupleave.php:100 actions/apigrouplist.php:73
-#: actions/apistatusesupdate.php:229 actions/apisubscriptions.php:87
+#: actions/apiaccountupdatedeliverydevice.php:115
+#: actions/apiaccountupdateprofile.php:106
+#: actions/apiaccountupdateprofilebackgroundimage.php:117
+#: actions/apiaccountupdateprofileimage.php:106 actions/apiblockcreate.php:98
+#: actions/apiblockdestroy.php:97 actions/apidirectmessage.php:77
+#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:114
+#: actions/apigroupismember.php:91 actions/apigroupjoin.php:101
+#: actions/apigroupleave.php:101 actions/apigrouplist.php:73
+#: actions/apistatusesupdate.php:230 actions/apisubscriptions.php:87
 #: actions/apitimelinefavorites.php:72 actions/apitimelinefriends.php:174
 #: actions/apitimelinehome.php:80 actions/apitimelinementions.php:80
 #: actions/apitimelineuser.php:82 actions/avatarbynickname.php:75
@@ -205,16 +207,16 @@ msgid "Updates from %1$s and friends on %2$s!"
 msgstr "Â¡Actualizaciones de %1$s y sus amistades en %2$s!"
 
 #: actions/apiaccountratelimitstatus.php:72
-#: actions/apiaccountupdatedeliverydevice.php:94
-#: actions/apiaccountupdateprofile.php:97
-#: actions/apiaccountupdateprofilebackgroundimage.php:94
-#: actions/apiaccountupdateprofilecolors.php:118
+#: actions/apiaccountupdatedeliverydevice.php:95
+#: actions/apiaccountupdateprofile.php:98
+#: actions/apiaccountupdateprofilebackgroundimage.php:95
+#: actions/apiaccountupdateprofilecolors.php:119
 #: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156
-#: actions/apifavoritecreate.php:100 actions/apifavoritedestroy.php:101
-#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100
-#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:139
-#: actions/apigroupismember.php:115 actions/apigroupjoin.php:156
-#: actions/apigroupleave.php:142 actions/apigrouplist.php:137
+#: actions/apifavoritecreate.php:101 actions/apifavoritedestroy.php:102
+#: actions/apifriendshipscreate.php:101 actions/apifriendshipsdestroy.php:101
+#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:140
+#: actions/apigroupismember.php:115 actions/apigroupjoin.php:157
+#: actions/apigroupleave.php:143 actions/apigrouplist.php:137
 #: actions/apigrouplistall.php:122 actions/apigroupmembership.php:107
 #: actions/apigroupshow.php:116 actions/apihelptest.php:88
 #: actions/apistatusesdestroy.php:104 actions/apistatusesretweets.php:112
@@ -229,21 +231,23 @@ msgstr "Â¡Actualizaciones de %1$s y sus amistades en %2$s!"
 msgid "API method not found."
 msgstr "MÃ©todo de API no encontrado."
 
-#: actions/apiaccountupdatedeliverydevice.php:86
-#: actions/apiaccountupdateprofile.php:89
-#: actions/apiaccountupdateprofilebackgroundimage.php:86
-#: actions/apiaccountupdateprofilecolors.php:110
-#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89
-#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109
-#: actions/apifavoritecreate.php:91 actions/apifavoritedestroy.php:92
-#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
-#: actions/apigroupcreate.php:105 actions/apigroupjoin.php:92
-#: actions/apigroupleave.php:92 actions/apimediaupload.php:67
-#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:198
+#. TRANS: Client error message. POST is a HTTP command. It should not be translated.
+#. TRANS: Client error. POST is a HTTP command. It should not be translated.
+#: actions/apiaccountupdatedeliverydevice.php:87
+#: actions/apiaccountupdateprofile.php:90
+#: actions/apiaccountupdateprofilebackgroundimage.php:87
+#: actions/apiaccountupdateprofilecolors.php:111
+#: actions/apiaccountupdateprofileimage.php:85 actions/apiblockcreate.php:90
+#: actions/apiblockdestroy.php:89 actions/apidirectmessagenew.php:110
+#: actions/apifavoritecreate.php:92 actions/apifavoritedestroy.php:93
+#: actions/apifriendshipscreate.php:92 actions/apifriendshipsdestroy.php:92
+#: actions/apigroupcreate.php:106 actions/apigroupjoin.php:93
+#: actions/apigroupleave.php:93 actions/apimediaupload.php:68
+#: actions/apistatusesretweet.php:66 actions/apistatusesupdate.php:199
 msgid "This method requires a POST."
 msgstr "Este mÃ©todo requiere un POST."
 
-#: actions/apiaccountupdatedeliverydevice.php:106
+#: actions/apiaccountupdatedeliverydevice.php:107
 msgid ""
 "You must specify a parameter named 'device' with a value of one of: sms, im, "
 "none."
@@ -251,27 +255,27 @@ msgstr ""
 "Tienes que especificar un parÃ¡metro llamdao 'dispositivo' con un valor a "
 "elegir entre: sms, im, ninguno."
 
-#: actions/apiaccountupdatedeliverydevice.php:133
+#: actions/apiaccountupdatedeliverydevice.php:134
 msgid "Could not update user."
 msgstr "No se pudo actualizar el usuario."
 
-#: actions/apiaccountupdateprofile.php:112
-#: actions/apiaccountupdateprofilebackgroundimage.php:194
-#: actions/apiaccountupdateprofilecolors.php:185
-#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/apiaccountupdateprofile.php:113
+#: actions/apiaccountupdateprofilebackgroundimage.php:195
+#: actions/apiaccountupdateprofilecolors.php:186
+#: actions/apiaccountupdateprofileimage.php:131 actions/apiusershow.php:108
 #: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/hcard.php:74
 #: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
 #: lib/profileaction.php:84
 msgid "User has no profile."
 msgstr "El usuario no tiene un perfil."
 
-#: actions/apiaccountupdateprofile.php:147
+#: actions/apiaccountupdateprofile.php:148
 msgid "Could not save profile."
 msgstr "No se pudo guardar el perfil."
 
-#: actions/apiaccountupdateprofilebackgroundimage.php:108
-#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
-#: actions/apistatusesupdate.php:212 actions/avatarsettings.php:257
+#: actions/apiaccountupdateprofilebackgroundimage.php:109
+#: actions/apiaccountupdateprofileimage.php:98 actions/apimediaupload.php:81
+#: actions/apistatusesupdate.php:213 actions/avatarsettings.php:257
 #: actions/designadminpanel.php:123 actions/editapplication.php:118
 #: actions/newapplication.php:101 actions/newnotice.php:94
 #: lib/designsettings.php:283
@@ -283,30 +287,30 @@ msgstr ""
 "El servidor no ha podido manejar tanta informaciÃ³n del tipo POST (% de "
 "bytes) a causa de su configuraciÃ³n actual."
 
-#: actions/apiaccountupdateprofilebackgroundimage.php:136
-#: actions/apiaccountupdateprofilebackgroundimage.php:146
-#: actions/apiaccountupdateprofilecolors.php:164
-#: actions/apiaccountupdateprofilecolors.php:174
+#: actions/apiaccountupdateprofilebackgroundimage.php:137
+#: actions/apiaccountupdateprofilebackgroundimage.php:147
+#: actions/apiaccountupdateprofilecolors.php:165
+#: actions/apiaccountupdateprofilecolors.php:175
 #: actions/groupdesignsettings.php:290 actions/groupdesignsettings.php:300
 #: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
 #: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
 msgid "Unable to save your design settings."
 msgstr "No se pudo grabar tu configuraciÃ³n de diseÃ±o."
 
-#: actions/apiaccountupdateprofilebackgroundimage.php:187
-#: actions/apiaccountupdateprofilecolors.php:142
+#: actions/apiaccountupdateprofilebackgroundimage.php:188
+#: actions/apiaccountupdateprofilecolors.php:143
 msgid "Could not update your design."
 msgstr "No se pudo actualizar tu diseÃ±o."
 
-#: actions/apiblockcreate.php:105
+#: actions/apiblockcreate.php:106
 msgid "You cannot block yourself!"
 msgstr "Â¡No puedes bloquearte a tÃ mismo!"
 
-#: actions/apiblockcreate.php:126
+#: actions/apiblockcreate.php:127
 msgid "Block user failed."
 msgstr "FallÃ³ bloquear usuario."
 
-#: actions/apiblockdestroy.php:114
+#: actions/apiblockdestroy.php:115
 msgid "Unblock user failed."
 msgstr "FallÃ³ desbloquear usuario."
 
@@ -330,59 +334,59 @@ msgstr "Mensajes directos a %s"
 msgid "All the direct messages sent to %s"
 msgstr "Todos los mensajes directos enviados a %s"
 
-#: actions/apidirectmessagenew.php:118
+#: actions/apidirectmessagenew.php:119
 msgid "No message text!"
 msgstr "Â¡Sin texto de mensaje!"
 
-#: actions/apidirectmessagenew.php:127 actions/newmessage.php:150
+#: actions/apidirectmessagenew.php:128 actions/newmessage.php:150
 #, php-format
 msgid "That's too long. Max message size is %d chars."
 msgstr "Demasiado largo. TamaÃ±o mÃ¡x. de los mensajes es %d caracteres."
 
-#: actions/apidirectmessagenew.php:138
+#: actions/apidirectmessagenew.php:139
 msgid "Recipient user not found."
 msgstr "No se encuentra usuario receptor."
 
-#: actions/apidirectmessagenew.php:142
+#: actions/apidirectmessagenew.php:143
 msgid "Can't send direct messages to users who aren't your friend."
 msgstr "No se puede enviar mensajes directos a usuarios que no son tu amigo."
 
-#: actions/apifavoritecreate.php:109 actions/apifavoritedestroy.php:110
+#: actions/apifavoritecreate.php:110 actions/apifavoritedestroy.php:111
 #: actions/apistatusesdestroy.php:121
 msgid "No status found with that ID."
 msgstr "No se encontrÃ³ estado para ese ID"
 
-#: actions/apifavoritecreate.php:120
+#: actions/apifavoritecreate.php:121
 msgid "This status is already a favorite."
 msgstr "Este status ya estÃ¡ en favoritos."
 
 #. TRANS: Error message text shown when a favorite could not be set.
-#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:296
+#: actions/apifavoritecreate.php:132 actions/favor.php:84 lib/command.php:296
 msgid "Could not create favorite."
 msgstr "No se pudo crear favorito."
 
-#: actions/apifavoritedestroy.php:123
+#: actions/apifavoritedestroy.php:124
 msgid "That status is not a favorite."
 msgstr "Este status no es un favorito."
 
-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
+#: actions/apifavoritedestroy.php:136 actions/disfavor.php:87
 msgid "Could not delete favorite."
 msgstr "No se pudo borrar favorito."
 
-#: actions/apifriendshipscreate.php:109
+#: actions/apifriendshipscreate.php:110
 msgid "Could not follow user: profile not found."
 msgstr "No se pudo seguir al usuario: Perfil no encontrado."
 
-#: actions/apifriendshipscreate.php:118
+#: actions/apifriendshipscreate.php:119
 #, php-format
 msgid "Could not follow user: %s is already on your list."
 msgstr "No puede seguir al usuario: %s ya esta en su lista."
 
-#: actions/apifriendshipsdestroy.php:109
+#: actions/apifriendshipsdestroy.php:110
 msgid "Could not unfollow user: User not found."
 msgstr "No se pudo dejar de seguir al usuario. Usuario no encontrado"
 
-#: actions/apifriendshipsdestroy.php:120
+#: actions/apifriendshipsdestroy.php:121
 msgid "You cannot unfollow yourself."
 msgstr "No puedes dejar de seguirte a ti mismo."
 
@@ -398,7 +402,7 @@ msgstr "No se pudo determinar el usuario fuente."
 msgid "Could not find target user."
 msgstr "No se pudo encontrar ningÃºn usuario de destino."
 
-#: actions/apigroupcreate.php:167 actions/editgroup.php:186
+#: actions/apigroupcreate.php:168 actions/editgroup.php:186
 #: actions/newgroup.php:126 actions/profilesettings.php:215
 #: actions/register.php:212
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
@@ -406,95 +410,95 @@ msgstr ""
 "El usuario debe tener solamente letras minÃºsculas y nÃºmeros y no puede tener "
 "espacios."
 
-#: actions/apigroupcreate.php:176 actions/editgroup.php:190
+#: actions/apigroupcreate.php:177 actions/editgroup.php:190
 #: actions/newgroup.php:130 actions/profilesettings.php:238
 #: actions/register.php:215
 msgid "Nickname already in use. Try another one."
 msgstr "El usuario ya existe. Prueba con otro."
 
-#: actions/apigroupcreate.php:183 actions/editgroup.php:193
+#: actions/apigroupcreate.php:184 actions/editgroup.php:193
 #: actions/newgroup.php:133 actions/profilesettings.php:218
 #: actions/register.php:217
 msgid "Not a valid nickname."
 msgstr "Usuario invÃ¡lido"
 
-#: actions/apigroupcreate.php:199 actions/editapplication.php:215
+#: actions/apigroupcreate.php:200 actions/editapplication.php:215
 #: actions/editgroup.php:199 actions/newapplication.php:203
 #: actions/newgroup.php:139 actions/profilesettings.php:222
 #: actions/register.php:224
 msgid "Homepage is not a valid URL."
 msgstr "La pÃ¡gina de inicio no es un URL vÃ¡lido."
 
-#: actions/apigroupcreate.php:208 actions/editgroup.php:202
+#: actions/apigroupcreate.php:209 actions/editgroup.php:202
 #: actions/newgroup.php:142 actions/profilesettings.php:225
 #: actions/register.php:227
 msgid "Full name is too long (max 255 chars)."
 msgstr "Tu nombre es demasiado largo (max. 255 carac.)"
 
-#: actions/apigroupcreate.php:216 actions/editapplication.php:190
+#: actions/apigroupcreate.php:217 actions/editapplication.php:190
 #: actions/newapplication.php:172
 #, php-format
 msgid "Description is too long (max %d chars)."
 msgstr "La descripciÃ³n es demasiado larga (mÃ¡x. %d caracteres)."
 
-#: actions/apigroupcreate.php:227 actions/editgroup.php:208
+#: actions/apigroupcreate.php:228 actions/editgroup.php:208
 #: actions/newgroup.php:148 actions/profilesettings.php:232
 #: actions/register.php:234
 msgid "Location is too long (max 255 chars)."
 msgstr "La ubicaciÃ³n es demasiado larga (mÃ¡x. 255 caracteres)."
 
-#: actions/apigroupcreate.php:246 actions/editgroup.php:219
+#: actions/apigroupcreate.php:247 actions/editgroup.php:219
 #: actions/newgroup.php:159
 #, php-format
 msgid "Too many aliases! Maximum %d."
 msgstr "Â¡Muchos seudÃ³nimos! El mÃ¡ximo es %d."
 
-#: actions/apigroupcreate.php:267
+#: actions/apigroupcreate.php:268
 #, php-format
 msgid "Invalid alias: \"%s\"."
 msgstr "Alias invÃ¡lido: \"%s\"."
 
-#: actions/apigroupcreate.php:276 actions/editgroup.php:232
+#: actions/apigroupcreate.php:277 actions/editgroup.php:232
 #: actions/newgroup.php:172
 #, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr "El alias \"%s\" ya estÃ¡ en uso. Intenta usar otro."
 
-#: actions/apigroupcreate.php:289 actions/editgroup.php:238
+#: actions/apigroupcreate.php:290 actions/editgroup.php:238
 #: actions/newgroup.php:178
 msgid "Alias can't be the same as nickname."
 msgstr "El alias no puede ser el mismo que el usuario."
 
-#: actions/apigroupismember.php:96 actions/apigroupjoin.php:105
-#: actions/apigroupleave.php:105 actions/apigroupmembership.php:92
+#: actions/apigroupismember.php:96 actions/apigroupjoin.php:106
+#: actions/apigroupleave.php:106 actions/apigroupmembership.php:92
 #: actions/apigroupshow.php:83 actions/apitimelinegroup.php:92
 msgid "Group not found."
 msgstr "Grupo no encontrado."
 
 #. TRANS: Error text shown a user tries to join a group they already are a member of.
-#: actions/apigroupjoin.php:111 actions/joingroup.php:100 lib/command.php:336
+#: actions/apigroupjoin.php:112 actions/joingroup.php:100 lib/command.php:336
 msgid "You are already a member of that group."
 msgstr "Ya eres miembro de ese grupo"
 
 #. TRANS: Error text shown when a user tries to join a group they are blocked from joining.
-#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:341
+#: actions/apigroupjoin.php:121 actions/joingroup.php:105 lib/command.php:341
 msgid "You have been blocked from that group by the admin."
 msgstr "Has sido bloqueado de ese grupo por el administrador."
 
 #. 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.
-#: actions/apigroupjoin.php:139 actions/joingroup.php:134 lib/command.php:353
+#: actions/apigroupjoin.php:140 actions/joingroup.php:134 lib/command.php:353
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "No se pudo unir el usuario %s al grupo %s"
 
-#: actions/apigroupleave.php:115
+#: actions/apigroupleave.php:116
 msgid "You are not a member of this group."
 msgstr "No eres miembro de este grupo."
 
 #. 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.
-#: actions/apigroupleave.php:125 actions/leavegroup.php:129
+#: actions/apigroupleave.php:126 actions/leavegroup.php:129
 #: lib/command.php:401
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
@@ -524,7 +528,7 @@ msgstr "Grupos %s"
 msgid "groups on %s"
 msgstr "Grupos en %s"
 
-#: actions/apimediaupload.php:99
+#: actions/apimediaupload.php:100
 msgid "Upload failed."
 msgstr "Carga fallÃ³."
 
@@ -538,9 +542,9 @@ msgstr "Token invÃ¡lido."
 
 #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
 #: actions/deletenotice.php:169 actions/disfavor.php:74
-#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:55
+#: actions/emailsettings.php:271 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:66 actions/imsettings.php:227
+#: actions/groupunblock.php:66 actions/imsettings.php:230
 #: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
@@ -588,8 +592,8 @@ msgstr "El token de solicitud %2 ha sido denegado y revocado."
 #. 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:286 actions/grouplogo.php:322
-#: actions/imsettings.php:242 actions/newapplication.php:121
+#: actions/emailsettings.php:290 actions/grouplogo.php:322
+#: actions/imsettings.php:245 actions/newapplication.php:121
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
 #: actions/smssettings.php:277 lib/designsettings.php:304
 msgid "Unexpected form submission."
@@ -653,18 +657,18 @@ msgstr "Este mÃ©todo requiere un PUBLICAR O ELIMINAR"
 msgid "You may not delete another user's status."
 msgstr "No puedes borrar el estado de otro usuario."
 
-#: actions/apistatusesretweet.php:75 actions/apistatusesretweets.php:72
+#: actions/apistatusesretweet.php:76 actions/apistatusesretweets.php:72
 #: actions/deletenotice.php:52 actions/shownotice.php:92
 msgid "No such notice."
 msgstr "No existe ese aviso."
 
 #. TRANS: Error text shown when trying to repeat an own notice.
-#: actions/apistatusesretweet.php:83 lib/command.php:538
+#: actions/apistatusesretweet.php:84 lib/command.php:538
 msgid "Cannot repeat your own notice."
 msgstr "No puedes repetir tus propias notificaciones."
 
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-#: actions/apistatusesretweet.php:91 lib/command.php:544
+#: actions/apistatusesretweet.php:92 lib/command.php:544
 msgid "Already repeated that notice."
 msgstr "Esta notificaciÃ³n ya se ha repetido."
 
@@ -676,21 +680,21 @@ msgstr "Status borrado."
 msgid "No status with that ID found."
 msgstr "No hay estado para ese ID"
 
-#: actions/apistatusesupdate.php:221
+#: actions/apistatusesupdate.php:222
 msgid "Client must provide a 'status' parameter with a value."
 msgstr "El cliente debe proveer un parÃ¡metro de 'status' con un valor."
 
-#: actions/apistatusesupdate.php:242 actions/newnotice.php:157
+#: actions/apistatusesupdate.php:243 actions/newnotice.php:157
 #: lib/mailhandler.php:60
 #, php-format
 msgid "That's too long. Max notice size is %d chars."
 msgstr "La entrada es muy larga. El tamaÃ±o mÃ¡ximo es de %d caracteres."
 
-#: actions/apistatusesupdate.php:283 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:284 actions/apiusershow.php:96
 msgid "Not found."
 msgstr "No encontrado."
 
-#: actions/apistatusesupdate.php:306 actions/newnotice.php:181
+#: actions/apistatusesupdate.php:307 actions/newnotice.php:181
 #, php-format
 msgid "Max notice size is %d chars, including attachment URL."
 msgstr ""
@@ -892,7 +896,9 @@ msgid "Yes"
 msgstr "SÃ"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
+#. TRANS: Submit button title.
+#. TRANS: Description of the form to block a user.
+#: actions/block.php:164 actions/groupmembers.php:403 lib/blockform.php:82
 msgid "Block this user"
 msgstr "Bloquear este usuario."
 
@@ -935,11 +941,13 @@ msgstr ""
 msgid "Unblock user from group"
 msgstr "Desbloquear usuario de grupo"
 
-#: actions/blockedfromgroup.php:320 lib/unblockform.php:69
+#. TRANS: Title for the form to unblock a user.
+#: actions/blockedfromgroup.php:320 lib/unblockform.php:70
 msgid "Unblock"
 msgstr "Desbloquear"
 
-#: actions/blockedfromgroup.php:320 lib/unblockform.php:80
+#. TRANS: Description of the form to unblock a user.
+#: actions/blockedfromgroup.php:320 lib/unblockform.php:82
 msgid "Unblock this user"
 msgstr "Desbloquear este usuario"
 
@@ -978,9 +986,9 @@ msgstr "Esa direcciÃ³n ya fue confirmada."
 #. 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/confirmaddress.php:116 actions/emailsettings.php:331
+#: actions/emailsettings.php:477 actions/imsettings.php:283
+#: actions/imsettings.php:442 actions/othersettings.php:174
 #: actions/profilesettings.php:283 actions/smssettings.php:308
 #: actions/smssettings.php:464
 msgid "Couldn't update user."
@@ -988,7 +996,7 @@ msgstr "No se pudo actualizar el usuario."
 
 #. 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/confirmaddress.php:128 actions/emailsettings.php:437
 #: actions/smssettings.php:422
 msgid "Couldn't delete email confirmation."
 msgstr "No se pudo eliminar la confirmaciÃ³n de correo electrÃ³nico."
@@ -1024,9 +1032,10 @@ msgstr "AplicaciÃ³n no encontrada."
 msgid "You are not the owner of this application."
 msgstr "No eres el propietario de esta aplicaciÃ³n."
 
+#. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:127
 #: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1307
+#: lib/action.php:1315
 msgid "There was a problem with your session token."
 msgstr "Hubo problemas con tu clave de sesiÃ³n."
 
@@ -1060,7 +1069,7 @@ msgstr "Borrar esta aplicaciÃ³n"
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
 #: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:73 lib/profileformaction.php:64
+#: lib/adminpanelaction.php:71 lib/profileformaction.php:64
 #: lib/settingsaction.php:72
 msgid "Not logged in."
 msgstr "No conectado."
@@ -1123,7 +1132,6 @@ msgstr "Borrar este usuario"
 #. TRANS: Message used as title for design settings for the site.
 #. TRANS: Link description in user account settings menu.
 #: actions/designadminpanel.php:63 lib/accountsettingsaction.php:139
-#: lib/groupnav.php:119
 msgid "Design"
 msgstr "DiseÃ±o"
 
@@ -1244,13 +1252,13 @@ msgstr "Restaurar los diseÃ±os predeterminados"
 msgid "Reset back to default"
 msgstr "Volver a los valores predeterminados"
 
-#. TRANS: Submit button title
+#. TRANS: Submit button title.
 #: actions/designadminpanel.php:685 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/snapshotadminpanel.php:245
 #: actions/subscriptions.php:226 actions/tagother.php:154
-#: actions/useradminpanel.php:294 lib/applicationeditform.php:363
+#: actions/useradminpanel.php:294 lib/applicationeditform.php:353
 #: lib/designsettings.php:256 lib/groupeditform.php:202
 msgid "Save"
 msgstr "Guardar"
@@ -1406,7 +1414,7 @@ msgstr "Actual direcciÃ³n de correo electrÃ³nico confirmada"
 #. 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/emailsettings.php:115 actions/emailsettings.php:162
 #: actions/imsettings.php:116 actions/smssettings.php:124
 #: actions/smssettings.php:180
 msgctxt "BUTTON"
@@ -1424,22 +1432,26 @@ msgstr ""
 #. 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
+#. TRANS: Button label in the "Edit application" form.
 #: actions/emailsettings.php:127 actions/imsettings.php:131
-#: actions/smssettings.php:137 lib/applicationeditform.php:357
+#: actions/smssettings.php:137 lib/applicationeditform.php:347
 msgctxt "BUTTON"
 msgid "Cancel"
 msgstr "Cancelar"
 
-#. TRANS: Instructions for e-mail address input form.
-#: actions/emailsettings.php:135
+#. TRANS: Instructions for e-mail address input form. Do not translate
+#. TRANS: "example.org". It is one of the domain names reserved for
+#. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
+#. TRANS: Any other domain may be owned by a legitimate person or
+#. TRANS: organization.
+#: actions/emailsettings.php:139
 msgid "Email address, like \"UserName@example.org\""
 msgstr "Correo electrÃ³nico, como \"NombredeUsuario@example.org\""
 
 #. 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/emailsettings.php:143 actions/imsettings.php:151
 #: actions/smssettings.php:162
 msgctxt "BUTTON"
 msgid "Add"
@@ -1447,113 +1459,113 @@ msgstr "AÃ±adir"
 
 #. 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
+#: actions/emailsettings.php:151 actions/smssettings.php:171
 msgid "Incoming email"
 msgstr "Correo entrante"
 
 #. 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
+#: actions/emailsettings.php:159 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"
 
 #. 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
+#: actions/emailsettings.php:168 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."
 
 #. 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
+#: actions/emailsettings.php:172 actions/smssettings.php:189
 msgctxt "BUTTON"
 msgid "New"
 msgstr "Nuevo"
 
 #. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:174
+#: actions/emailsettings.php:178
 msgid "Email preferences"
 msgstr "Preferencias de correo electrÃ³nico"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:180
+#: actions/emailsettings.php:184
 msgid "Send me notices of new subscriptions through email."
 msgstr "Enviarme avisos de suscripciones nuevas por correo."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:186
+#: actions/emailsettings.php:190
 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."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:193
+#: actions/emailsettings.php:197
 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."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:199
+#: actions/emailsettings.php:203
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr ""
 "Enviarme un correo electrÃ³nico cuando alguien me envÃe una \"@-respuesta\"."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:205
+#: actions/emailsettings.php:209
 msgid "Allow friends to nudge me and send me an email."
 msgstr "Permitir que amigos me contacten y enviÃ©n un correo."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:212
+#: actions/emailsettings.php:216
 msgid "I want to post notices by email."
 msgstr "Deseo enviar estados por email"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:219
+#: actions/emailsettings.php:223
 msgid "Publish a MicroID for my email address."
 msgstr "Publicar un MicroID para mi direcciÃ³n de correo."
 
 #. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:334
+#: actions/emailsettings.php:338
 msgid "Email preferences saved."
 msgstr "Preferencias de correo electrÃ³nico guardadas."
 
 #. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:353
+#: actions/emailsettings.php:357
 msgid "No email address."
 msgstr "Sin direcciÃ³n de correo electrÃ³nico"
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:361
+#: actions/emailsettings.php:365
 msgid "Cannot normalize that email address"
 msgstr "No se puede normalizar esta direcciÃ³n de correo electrÃ³nico."
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:208
+#: actions/emailsettings.php:370 actions/register.php:208
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "Correo electrÃ³nico no vÃ¡lido"
 
 #. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:370
+#: actions/emailsettings.php:374
 msgid "That is already your email address."
 msgstr "Esa ya es tu direcciÃ³n de correo electrÃ³nico"
 
 #. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:374
+#: actions/emailsettings.php:378
 msgid "That email address already belongs to another user."
 msgstr "Esa direcciÃ³n de correo pertenece a otro usuario."
 
 #. 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/emailsettings.php:395 actions/imsettings.php:351
 #: actions/smssettings.php:373
 msgid "Couldn't insert confirmation code."
 msgstr "No se pudo insertar el cÃ³digo de confirmaciÃ³n."
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:398
+#: actions/emailsettings.php:402
 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."
@@ -1565,50 +1577,50 @@ msgstr ""
 #. 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/emailsettings.php:423 actions/imsettings.php:386
 #: actions/smssettings.php:408
 msgid "No pending confirmation to cancel."
 msgstr "Ninguna confirmaciÃ³n pendiente para cancelar."
 
 #. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:424
+#: actions/emailsettings.php:428
 msgid "That is the wrong email address."
 msgstr "Esa es la direcciÃ³n de correo electrÃ³nico incorrecta."
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:438
+#: actions/emailsettings.php:442
 msgid "Email confirmation cancelled."
 msgstr "ConfirmaciÃ³n de correo electrÃ³nico cancelada."
 
 #. TRANS: Message given trying to remove an e-mail address that is not
 #. TRANS: registered for the active user.
-#: actions/emailsettings.php:458
+#: actions/emailsettings.php:462
 msgid "That is not your email address."
 msgstr "Esa no es tu direcciÃ³n de correo electrÃ³nico"
 
 #. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:479
+#: actions/emailsettings.php:483
 msgid "The email address was removed."
 msgstr "La direcciÃ³n de correo electrÃ³nico ha sido eliminada."
 
-#: actions/emailsettings.php:493 actions/smssettings.php:568
+#: actions/emailsettings.php:497 actions/smssettings.php:568
 msgid "No incoming email address."
 msgstr "No hay direcciÃ³n de correo entrante."
 
 #. 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/emailsettings.php:508 actions/emailsettings.php:532
 #: actions/smssettings.php:578 actions/smssettings.php:602
 msgid "Couldn't update user record."
 msgstr "No se pudo actualizar informaciÃ³n de usuario."
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
-#: actions/emailsettings.php:508 actions/smssettings.php:581
+#: actions/emailsettings.php:512 actions/smssettings.php:581
 msgid "Incoming email address removed."
 msgstr "DirecciÃ³n de correo entrante removida."
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
-#: actions/emailsettings.php:532 actions/smssettings.php:605
+#: actions/emailsettings.php:536 actions/smssettings.php:605
 msgid "New incoming email address added."
 msgstr "Nueva direcciÃ³n de correo entrante agregada."
 
@@ -1727,7 +1739,7 @@ msgstr "No se pudo convertir el token de solicitud en token de acceso."
 msgid "Remote service uses unknown version of OMB protocol."
 msgstr "El servicio remoto utiliza una versiÃ³n desconocida del protocolo OMB."
 
-#: actions/finishremotesubscribe.php:138
+#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306
 msgid "Error updating remote profile."
 msgstr "Error al actualizar el perfil remoto."
 
@@ -1784,7 +1796,7 @@ msgstr "Usuario ya estÃ¡ bloqueado del grupo."
 msgid "User is not a member of group."
 msgstr "Usuario no es miembro del grupo"
 
-#: actions/groupblock.php:134 actions/groupmembers.php:360
+#: actions/groupblock.php:134 actions/groupmembers.php:364
 msgid "Block user from group"
 msgstr "Bloquear usuario de grupo"
 
@@ -1868,40 +1880,32 @@ msgstr "Logo actualizado."
 msgid "Failed updating logo."
 msgstr "Error al actualizar el logo."
 
-#: actions/groupmembers.php:100 lib/groupnav.php:92
+#. TRANS: Title of the page showing group members.
+#. TRANS: %s is the name of the group.
+#: actions/groupmembers.php:102
 #, php-format
 msgid "%s group members"
 msgstr "Miembros del grupo %s"
 
-#: actions/groupmembers.php:103
+#. TRANS: Title of the page showing group members.
+#. TRANS: %1$s is the name of the group, %2$d is the page number of the members list.
+#: actions/groupmembers.php:107
 #, php-format
 msgid "%1$s group members, page %2$d"
 msgstr "%1$s miembros de grupo, pÃ¡gina %2$d"
 
-#: actions/groupmembers.php:118
+#: actions/groupmembers.php:122
 msgid "A list of the users in this group."
 msgstr "Lista de los usuarios en este grupo."
 
-#: actions/groupmembers.php:182 lib/groupnav.php:107
+#: actions/groupmembers.php:186
 msgid "Admin"
 msgstr "Admin"
 
-#: actions/groupmembers.php:392 lib/blockform.php:69
-msgid "Block"
-msgstr "Bloquear"
-
-#: actions/groupmembers.php:487
+#: actions/groupmembers.php:498
 msgid "Make user an admin of the group"
 msgstr "Convertir al usuario en administrador del grupo"
 
-#: actions/groupmembers.php:519
-msgid "Make Admin"
-msgstr "Convertir en administrador"
-
-#: actions/groupmembers.php:519
-msgid "Make this user an admin"
-msgstr "Convertir a este usuario en administrador"
-
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Title in atom group notice feed. %s is a group name.
 #. TRANS: Title in atom user notice feed. %s is a user name.
@@ -2040,7 +2044,10 @@ msgstr ""
 
 #. TRANS: IM address input field instructions in IM settings form.
 #. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:140
+#. TRANS: Do not translate "example.org". It is one of the domain names reserved for use in examples by
+#. TRANS: http://www.rfc-editor.org/rfc/rfc2606.txt. Any other domain may be owned by a legitimate
+#. TRANS: person or organization.
+#: actions/imsettings.php:143
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -2051,64 +2058,64 @@ msgstr ""
 "mensajerÃa instantÃ¡nea o en GTalk."
 
 #. TRANS: Form legend for IM preferences form.
-#: actions/imsettings.php:155
+#: actions/imsettings.php:158
 msgid "IM preferences"
 msgstr "Preferencias de mensajerÃa instantÃ¡nea"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:160
+#: actions/imsettings.php:163
 msgid "Send me notices through Jabber/GTalk."
 msgstr "Enviarme avisos por Jabber/GTalk"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:166
+#: actions/imsettings.php:169
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr "Enviar un aviso cuando el estado de mi Jabber/GTalk cambie."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:172
+#: actions/imsettings.php:175
 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."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:179
+#: actions/imsettings.php:182
 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "Publicar un MicroID para mi cuenta Jabber/GTalk."
 
 #. TRANS: Confirmation message for successful IM preferences save.
-#: actions/imsettings.php:287 actions/othersettings.php:180
+#: actions/imsettings.php:290 actions/othersettings.php:180
 msgid "Preferences saved."
 msgstr "Preferencias guardadas."
 
 #. TRANS: Message given saving IM address without having provided one.
-#: actions/imsettings.php:309
+#: actions/imsettings.php:312
 msgid "No Jabber ID."
 msgstr "NingÃºn Jabber ID."
 
 #. TRANS: Message given saving IM address that cannot be normalised.
-#: actions/imsettings.php:317
+#: actions/imsettings.php:320
 msgid "Cannot normalize that Jabber ID"
 msgstr "No se puede normalizar este Jabber ID"
 
 #. TRANS: Message given saving IM address that not valid.
-#: actions/imsettings.php:322
+#: actions/imsettings.php:325
 msgid "Not a valid Jabber ID"
 msgstr "Jabber ID no vÃ¡lido"
 
 #. TRANS: Message given saving IM address that is already set.
-#: actions/imsettings.php:326
+#: actions/imsettings.php:329
 msgid "That is already your Jabber ID."
 msgstr "Ese ya es tu Jabber ID."
 
 #. TRANS: Message given saving IM address that is already set for another user.
-#: actions/imsettings.php:330
+#: actions/imsettings.php:333
 msgid "Jabber ID already belongs to another user."
 msgstr "El Jabber ID ya pertenece a otro usuario."
 
 #. 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
+#: actions/imsettings.php:361
 #, php-format
 msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
@@ -2119,28 +2126,28 @@ msgstr ""
 "mensajes."
 
 #. TRANS: Message given canceling IM address confirmation for the wrong IM address.
-#: actions/imsettings.php:388
+#: actions/imsettings.php:391
 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
+#: actions/imsettings.php:400
 msgid "Couldn't delete IM confirmation."
 msgstr "No se pudo eliminar la confirmaciÃ³n de mensajerÃa instantÃ¡nea."
 
 #. TRANS: Message given after successfully canceling IM address confirmation.
-#: actions/imsettings.php:402
+#: actions/imsettings.php:405
 msgid "IM confirmation cancelled."
 msgstr "ConfirmaciÃ³n de mensajerÃa instantÃ¡nea cancelada."
 
 #. TRANS: Message given trying to remove an IM address that is not
 #. TRANS: registered for the active user.
-#: actions/imsettings.php:424
+#: actions/imsettings.php:427
 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
+#: actions/imsettings.php:450
 msgid "The IM address was removed."
 msgstr "La direcciÃ³n de mensajerÃa instantÃ¡nea ha sido eliminada."
 
@@ -2613,8 +2620,8 @@ msgid "Only %s URLs over plain HTTP please."
 msgstr "Solamente %s URLs sobre HTTP simples por favor."
 
 #. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1215
-#: lib/apiaction.php:1243 lib/apiaction.php:1366
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1206
+#: lib/apiaction.php:1233 lib/apiaction.php:1356
 msgid "Not a supported data format."
 msgstr "No es un formato de dato soportado"
 
@@ -2755,7 +2762,7 @@ msgid "Password saved."
 msgstr "Se guardÃ³ ContraseÃ±a."
 
 #. TRANS: Menu item for site administration
-#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:384
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:371
 msgid "Paths"
 msgstr "Rutas"
 
@@ -2969,7 +2976,7 @@ msgstr "Nombre completo"
 
 #. TRANS: Form input field label.
 #: actions/profilesettings.php:115 actions/register.php:460
-#: lib/applicationeditform.php:244 lib/groupeditform.php:161
+#: lib/applicationeditform.php:235 lib/groupeditform.php:161
 msgid "Homepage"
 msgstr "PÃ¡gina de inicio"
 
@@ -3076,7 +3083,7 @@ msgid "Couldn't save tags."
 msgstr "No se pudo guardar las etiquetas."
 
 #. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:391 lib/adminpanelaction.php:141
+#: actions/profilesettings.php:391 lib/adminpanelaction.php:138
 msgid "Settings saved."
 msgstr "Se guardÃ³ configuraciÃ³n."
 
@@ -3625,7 +3632,7 @@ msgstr "Al usuario ya se le ha impuesto restricciones."
 
 #. TRANS: Menu item for site administration
 #: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
-#: lib/adminpanelaction.php:392
+#: lib/adminpanelaction.php:379
 msgid "Sessions"
 msgstr "Sesiones"
 
@@ -3663,24 +3670,24 @@ msgid "Application profile"
 msgstr "Perfil de la aplicaciÃ³n"
 
 #. TRANS: Form input field label for application icon.
-#: actions/showapplication.php:159 lib/applicationeditform.php:182
+#: actions/showapplication.php:159 lib/applicationeditform.php:173
 msgid "Icon"
 msgstr "Icono"
 
 #. TRANS: Form input field label for application name.
 #: actions/showapplication.php:169 actions/version.php:197
-#: lib/applicationeditform.php:199
+#: lib/applicationeditform.php:190
 msgid "Name"
 msgstr "Nombre"
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:178 lib/applicationeditform.php:235
+#: actions/showapplication.php:178 lib/applicationeditform.php:226
 msgid "Organization"
 msgstr "OrganizaciÃ³n"
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:216 lib/groupeditform.php:172
+#: lib/applicationeditform.php:207 lib/groupeditform.php:172
 msgid "Description"
 msgstr "DescripciÃ³n"
 
@@ -3794,7 +3801,7 @@ msgstr ""
 msgid "This is a way to share what you like."
 msgstr "Esta es una manera de compartir lo que te gusta."
 
-#: actions/showgroup.php:82 lib/groupnav.php:86
+#: actions/showgroup.php:82
 #, php-format
 msgid "%s group"
 msgstr "Grupo %s"
@@ -3846,7 +3853,7 @@ msgstr "Canal de avisos del grupo %s (Atom)"
 msgid "FOAF for %s group"
 msgstr "Amistades de amistades del grupo %s"
 
-#: actions/showgroup.php:393 actions/showgroup.php:445 lib/groupnav.php:91
+#: actions/showgroup.php:393 actions/showgroup.php:445
 msgid "Members"
 msgstr "Miembros"
 
@@ -4303,7 +4310,7 @@ msgstr "No ingresÃ³ cÃ³digo"
 
 #. TRANS: Menu item for site administration
 #: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
-#: lib/adminpanelaction.php:408
+#: lib/adminpanelaction.php:395
 msgid "Snapshots"
 msgstr "Capturas"
 
@@ -5037,7 +5044,7 @@ msgid "Unable to save tag."
 msgstr "Incapaz de grabar etiqueta."
 
 #. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#: classes/Subscription.php:75 lib/oauthstore.php:465
+#: classes/Subscription.php:75 lib/oauthstore.php:466
 msgid "You have been banned from subscribing."
 msgstr "Se te ha prohibido la suscripciÃ³n."
 
@@ -5180,7 +5187,8 @@ msgid "Change site configuration"
 msgstr "Cambiar la configuraciÃ³n del sitio"
 
 #. TRANS: Main menu option when logged in and site admin for access to site configuration
-#: lib/action.php:474
+#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
+#: lib/action.php:474 lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr "Admin"
@@ -5257,7 +5265,7 @@ msgstr "Buscar"
 
 #. TRANS: DT element for site notice. String is hidden in default CSS.
 #. TRANS: Menu item for site administration
-#: lib/action.php:538 lib/adminpanelaction.php:400
+#: lib/action.php:538 lib/adminpanelaction.php:387
 msgid "Site notice"
 msgstr "Aviso de sitio"
 
@@ -5321,7 +5329,10 @@ msgid "StatusNet software license"
 msgstr "Licencia de software de StatusNet"
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
-#: lib/action.php:843
+#. TRANS: Text between [] is a link description, text between () is the link itself.
+#. TRANS: Make sure there is no whitespace between "]" and "(".
+#. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
+#: lib/action.php:846
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -5331,13 +5342,16 @@ msgstr ""
 "[%%site.broughtby%%**](%%site.broughtbyurl%%)."
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:846
+#: lib/action.php:849
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** es un servicio de microblogueo."
 
 #. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.
-#: lib/action.php:850
+#. TRANS: Make sure there is no whitespace between "]" and "(".
+#. TRANS: Text between [] is a link description, text between () is the link itself.
+#. TRANS: %s is the version of StatusNet that is being used.
+#: lib/action.php:856
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -5349,34 +5363,35 @@ msgstr ""
 "licensing/licenses/agpl-3.0.html)."
 
 #. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:866
+#: lib/action.php:872
 msgid "Site content license"
 msgstr "Licencia de contenido del sitio"
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:873
+#: lib/action.php:879
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr "El contenido y datos de %1$s son privados y confidenciales."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:880
+#: lib/action.php:886
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
 "Copyright del contenido y los datos de%1$s. Todos los derechos reservados."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:884
+#: lib/action.php:890
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 "Derechos de autor de contenido y datos por los colaboradores. Todos los "
 "derechos reservados."
 
-#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:897
+#. TRANS: license message in footer.
+#. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
+#: lib/action.php:904
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr ""
@@ -5384,19 +5399,19 @@ msgstr ""
 "$s."
 
 #. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1236
+#: lib/action.php:1243
 msgid "Pagination"
 msgstr "PaginaciÃ³n"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1247
+#: lib/action.php:1254
 msgid "After"
 msgstr "DespuÃ©s"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1257
+#: lib/action.php:1264
 msgid "Before"
 msgstr "Antes"
 
@@ -5407,208 +5422,227 @@ msgstr ""
 "A espera de un elemento de alimentaciÃ³n de raÃz, pero se obtuvo un documento "
 "XML entero."
 
-#: lib/activityutils.php:208
+#. TRANS: Client exception thrown when there is no source attribute.
+#: lib/activityutils.php:203
 msgid "Can't handle remote content yet."
 msgstr "AÃºn no se puede manejar contenido remoto."
 
-#: lib/activityutils.php:244
+#. TRANS: Client exception thrown when there embedded XML content is found that cannot be processed yet.
+#: lib/activityutils.php:240
 msgid "Can't handle embedded XML content yet."
 msgstr "AÃºn no se puede manejar contenido XML incrustado."
 
-#: lib/activityutils.php:248
+#. TRANS: Client exception thrown when base64 encoded content is found that cannot be processed yet.
+#: lib/activityutils.php:245
 msgid "Can't handle embedded Base64 content yet."
 msgstr "AÃºn no se puede manejar contenido incrustado Base64."
 
 #. TRANS: Client error message thrown when a user tries to change admin settings but has no access rights.
-#: lib/adminpanelaction.php:98
+#: lib/adminpanelaction.php:96
 msgid "You cannot make changes to this site."
 msgstr "No puedes hacer cambios a este sitio."
 
 #. TRANS: Client error message throw when a certain panel's settings cannot be changed.
-#: lib/adminpanelaction.php:110
+#: lib/adminpanelaction.php:108
 msgid "Changes to that panel are not allowed."
 msgstr "No se permite realizar cambios a ese panel."
 
 #. TRANS: Client error message.
-#: lib/adminpanelaction.php:229
+#: lib/adminpanelaction.php:222
 msgid "showForm() not implemented."
 msgstr "showForm() no implementada."
 
 #. TRANS: Client error message
-#: lib/adminpanelaction.php:259
+#: lib/adminpanelaction.php:250
 msgid "saveSettings() not implemented."
 msgstr "saveSettings() no implementada."
 
 #. TRANS: Client error message thrown if design settings could not be deleted in
 #. TRANS: the admin panel Design.
-#: lib/adminpanelaction.php:284
+#: lib/adminpanelaction.php:274
 msgid "Unable to delete design setting."
 msgstr "No se puede eliminar la configuraciÃ³n de diseÃ±o."
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:350
+#: lib/adminpanelaction.php:337
 msgid "Basic site configuration"
 msgstr "ConfiguraciÃ³n bÃ¡sica del sitio"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:352
+#: lib/adminpanelaction.php:339
 msgctxt "MENU"
 msgid "Site"
 msgstr "Sitio"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:358
+#: lib/adminpanelaction.php:345
 msgid "Design configuration"
 msgstr "ConfiguraciÃ³n del diseÃ±o"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:360
+#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
+#: lib/adminpanelaction.php:347 lib/groupnav.php:135
 msgctxt "MENU"
 msgid "Design"
 msgstr "DiseÃ±o"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:366
+#: lib/adminpanelaction.php:353
 msgid "User configuration"
 msgstr "ConfiguraciÃ³n de usuario"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:368 lib/personalgroupnav.php:115
+#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:115
 msgid "User"
 msgstr "Usuario"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:374
+#: lib/adminpanelaction.php:361
 msgid "Access configuration"
 msgstr "ConfiguraciÃ³n de acceso"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:382
+#: lib/adminpanelaction.php:369
 msgid "Paths configuration"
 msgstr "ConfiguraciÃ³n de rutas"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:390
+#: lib/adminpanelaction.php:377
 msgid "Sessions configuration"
 msgstr "ConfiguraciÃ³n de sesiones"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:398
+#: lib/adminpanelaction.php:385
 msgid "Edit site notice"
 msgstr "Editar el aviso del sitio"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:406
+#: lib/adminpanelaction.php:393
 msgid "Snapshots configuration"
 msgstr "ConfiguraciÃ³n de instantÃ¡neas"
 
 #. TRANS: Client error 401.
-#: lib/apiauth.php:113
+#: lib/apiauth.php:111
 msgid "API resource requires read-write access, but you only have read access."
 msgstr ""
 "API requiere acceso de lectura y escritura, pero sÃ³lo tienes acceso de "
 "lectura."
 
+#. TRANS: OAuth exception thrown when no application is found for a given consumer key.
+#: lib/apiauth.php:175
+msgid "No application for that consumer key."
+msgstr ""
+
+#. TRANS: OAuth exception given when no user was found for a given token (no token was found).
+#: lib/apiauth.php:217
+msgid "No user for that token."
+msgstr ""
+
+#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
+#: lib/apioauthstore.php:178
+msgid "Tried to revoke unknown token"
+msgstr ""
+
 #. TRANS: Form legend.
-#: lib/applicationeditform.php:137
+#: lib/applicationeditform.php:129
 msgid "Edit application"
 msgstr "Editar aplicaciÃ³n"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:187
+#: lib/applicationeditform.php:178
 msgid "Icon for this application"
 msgstr "Icono para esta aplicaciÃ³n"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:209
+#: lib/applicationeditform.php:200
 #, php-format
 msgid "Describe your application in %d characters"
 msgstr "Describe tu aplicaciÃ³n en %d caracteres"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:213
+#: lib/applicationeditform.php:204
 msgid "Describe your application"
 msgstr "Describe tu aplicaciÃ³n"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:224
+#: lib/applicationeditform.php:215
 msgid "URL of the homepage of this application"
 msgstr "URL de la pÃ¡gina principal de esta aplicaciÃ³n"
 
 #. TRANS: Form input field label.
-#: lib/applicationeditform.php:226
+#: lib/applicationeditform.php:217
 msgid "Source URL"
 msgstr "La URL de origen"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:233
+#: lib/applicationeditform.php:224
 msgid "Organization responsible for this application"
 msgstr "OrganizaciÃ³n responsable de esta aplicaciÃ³n"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:242
+#: lib/applicationeditform.php:233
 msgid "URL for the homepage of the organization"
 msgstr "URL de la pÃ¡gina principal de la organizaciÃ³n"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:251
+#: lib/applicationeditform.php:242
 msgid "URL to redirect to after authentication"
 msgstr "URL al que se redirigirÃ¡ despuÃ©s de la autenticaciÃ³n"
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:278
+#: lib/applicationeditform.php:269
 msgid "Browser"
 msgstr "Navegador"
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:295
+#: lib/applicationeditform.php:286
 msgid "Desktop"
 msgstr "Escritorio"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:297
+#: lib/applicationeditform.php:288
 msgid "Type of application, browser or desktop"
 msgstr "Tipo de aplicaciÃ³n, de navegador o de escritorio"
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:320
+#: lib/applicationeditform.php:311
 msgid "Read-only"
 msgstr "Solo lectura"
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:339
+#: lib/applicationeditform.php:330
 msgid "Read-write"
 msgstr "Solo escritura"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:341
+#: lib/applicationeditform.php:332
 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: Submit button title
-#: lib/applicationeditform.php:359
+#. TRANS: Submit button title.
+#: lib/applicationeditform.php:349
 msgid "Cancel"
 msgstr "Cancelar"
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:136
+#: lib/applicationlist.php:135
 msgid "read-write"
 msgstr "lectura y escritura"
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:138
+#: lib/applicationlist.php:137
 msgid "read-only"
 msgstr "sÃ³lo lectura"
 
 #. 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
+#: lib/applicationlist.php:143
 #, php-format
 msgid "Approved %1$s - \"%2$s\" access."
 msgstr "Aprobado el %1$s - acceso \"%2$s\"."
 
 #. TRANS: Button label
-#: lib/applicationlist.php:159
+#: lib/applicationlist.php:158
 msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "Revocar"
@@ -5628,11 +5662,13 @@ msgstr "Autor"
 msgid "Provider"
 msgstr "Proveedor"
 
-#: lib/attachmentnoticesection.php:67
+#. TRANS: Title.
+#: lib/attachmentnoticesection.php:68
 msgid "Notices where this attachment appears"
 msgstr "Mensajes donde aparece este adjunto"
 
-#: lib/attachmenttagcloudsection.php:48
+#. TRANS: Title.
+#: lib/attachmenttagcloudsection.php:49
 msgid "Tags for this attachment"
 msgstr "Etiquetas de este archivo adjunto"
 
@@ -5644,6 +5680,11 @@ msgstr "El cambio de contraseÃ±a ha fallado"
 msgid "Password changing is not allowed"
 msgstr "No estÃ¡ permitido cambiar la contraseÃ±a"
 
+#. TRANS: Title for the form to block a user.
+#: lib/blockform.php:70
+msgid "Block"
+msgstr "Bloquear"
+
 #: lib/channel.php:157 lib/channel.php:177
 msgid "Command results"
 msgstr "Resultados de comando"
@@ -5895,7 +5936,7 @@ msgid "You are not subscribed to anyone."
 msgstr "No estÃ¡s suscrito a nadie."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to.
-#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.
 #: lib/command.php:836
 msgid "You are subscribed to this person:"
@@ -5910,7 +5951,7 @@ msgid "No one is subscribed to you."
 msgstr "Nadie estÃ¡ suscrito a ti."
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
-#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
 #: lib/command.php:863
 msgid "This person is subscribed to you:"
@@ -5925,7 +5966,7 @@ msgid "You are not a member of any groups."
 msgstr "No eres miembro de ningÃºn grupo"
 
 #. TRANS: Text shown after requesting groups a user is subscribed to.
-#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
 #: lib/command.php:890
 msgid "You are a member of this group:"
@@ -5933,6 +5974,7 @@ msgid_plural "You are a member of these groups:"
 msgstr[0] "Eres miembro de este grupo:"
 msgstr[1] "Eres miembro de estos grupos:"
 
+#. TRANS: Help text for commands.
 #: lib/command.php:905
 msgid ""
 "Commands:\n"
@@ -6155,38 +6197,6 @@ msgid "Extra nicknames for the group, comma- or space- separated, max %d"
 msgstr ""
 "Nombres adicionales para el grupo, separados por comas o espacios. MÃ¡ximo: %d"
 
-#: lib/groupnav.php:85
-msgid "Group"
-msgstr "Grupo"
-
-#: lib/groupnav.php:101
-msgid "Blocked"
-msgstr "Bloqueado"
-
-#: lib/groupnav.php:102
-#, php-format
-msgid "%s blocked users"
-msgstr "usuarios bloqueados"
-
-#: lib/groupnav.php:108
-#, php-format
-msgid "Edit %s group properties"
-msgstr "Editar propiedades del grupo %s"
-
-#: lib/groupnav.php:113
-msgid "Logo"
-msgstr "Logo"
-
-#: lib/groupnav.php:114
-#, php-format
-msgid "Add or edit %s logo"
-msgstr "Agregar o editar el logo de %s"
-
-#: lib/groupnav.php:120
-#, php-format
-msgid "Add or edit %s design"
-msgstr "Agregar o editar el diseÃ±o de %s"
-
 #: lib/groupsbymemberssection.php:71
 msgid "Groups with most members"
 msgstr "Grupos con mÃ¡s miembros"
@@ -6218,7 +6228,8 @@ msgstr "El archivo es muy grande. El tamaÃ±o mÃ¡ximo permitido es %s."
 msgid "Partial upload."
 msgstr "Subida parcial"
 
-#: lib/imagefile.php:101 lib/mediafile.php:170
+#. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
+#: lib/imagefile.php:101 lib/mediafile.php:179
 msgid "System error uploading file."
 msgstr "Error del sistema subir el archivo"
 
@@ -6623,18 +6634,21 @@ msgstr "Lo sentimos, pero no se permite correos entrantes"
 msgid "Unsupported message type: %s"
 msgstr "Tipo de mensaje no compatible: %s"
 
-#: lib/mediafile.php:98 lib/mediafile.php:123
+#. TRANS: Client exception thrown when a database error was thrown during a file upload operation.
+#: lib/mediafile.php:99 lib/mediafile.php:125
 msgid "There was a database error while saving your file. Please try again."
 msgstr ""
 "Hubo un error en la base de datos mientras subÃas tu archivo. Por favor, "
 "intÃ©ntalo de nuevo."
 
-#: lib/mediafile.php:142
+#. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
+#: lib/mediafile.php:145
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
 msgstr ""
 "El archivo subido sobrepasa la directiva upload_max_filesize en php.ini"
 
-#: lib/mediafile.php:147
+#. TRANS: Client exception.
+#: lib/mediafile.php:151
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form."
@@ -6642,44 +6656,43 @@ msgstr ""
 "El archivo subido sobrepasa la directiva MAX_FILE_SIZE que se especificÃ³ en "
 "el formulario HTML."
 
-#: lib/mediafile.php:152
+#. TRANS: Client exception.
+#: lib/mediafile.php:157
 msgid "The uploaded file was only partially uploaded."
 msgstr "El archivo subido sÃ³lo fue parcialmente subido."
 
-#: lib/mediafile.php:159
+#. TRANS: Client exception thrown when a temporary folder is not present to store a file upload.
+#: lib/mediafile.php:165
 msgid "Missing a temporary folder."
 msgstr "Falta una carpeta temporal."
 
-#: lib/mediafile.php:162
+#. TRANS: Client exception thrown when writing to disk is not possible during a file upload operation.
+#: lib/mediafile.php:169
 msgid "Failed to write file to disk."
 msgstr "No se pudo escribir el archivo en el disco."
 
-#: lib/mediafile.php:165
+#. TRANS: Client exception thrown when a file upload operation has been stopped by an extension.
+#: lib/mediafile.php:173
 msgid "File upload stopped by extension."
 msgstr "La subida de archivos se detuvo por extensiÃ³n."
 
-#: lib/mediafile.php:179 lib/mediafile.php:217
+#. TRANS: Client exception thrown when a file upload operation would cause a user to exceed a set quota.
+#: lib/mediafile.php:189 lib/mediafile.php:232
 msgid "File exceeds user's quota."
 msgstr "Archivo sobrepasa la cuota del usuario."
 
-#: lib/mediafile.php:197 lib/mediafile.php:234
+#. TRANS: Client exception thrown when a file upload operation fails because the file could
+#. TRANS: not be moved from the temporary folder to the permanent file location.
+#: lib/mediafile.php:209 lib/mediafile.php:251
 msgid "File could not be moved to destination directory."
 msgstr "El archivo no se pudo mover al directorio de destino."
 
-#: lib/mediafile.php:202 lib/mediafile.php:238
+#. TRANS: Client exception thrown when a file upload operation has been stopped because the MIME
+#. TRANS: type of the uploaded file could not be determined.
+#: lib/mediafile.php:216 lib/mediafile.php:257
 msgid "Could not determine file's MIME type."
 msgstr "No se pudo determinar tipo MIME del archivo"
 
-#: lib/mediafile.php:318
-#, php-format
-msgid " Try using another %s format."
-msgstr "Pruebe a usar otro formato %s."
-
-#: lib/mediafile.php:323
-#, php-format
-msgid "%s is not a supported file type on this server."
-msgstr "%s no es un tipo de archivo soportado en este servidor."
-
 #: lib/messageform.php:120
 msgid "Send a direct notice"
 msgstr "Enviar un aviso directo"
@@ -6795,27 +6808,7 @@ msgstr "Dar un toque a "
 msgid "Send a nudge to this user"
 msgstr "Dar un toque a este usuario"
 
-#: lib/oauthstore.php:283
-msgid "Error inserting new profile"
-msgstr "Error al insertar el nuevo perfil"
-
-#: lib/oauthstore.php:291
-msgid "Error inserting avatar"
-msgstr "Error al insertar la imagen"
-
-#: lib/oauthstore.php:306
-msgid "Error updating remote profile"
-msgstr "Error al actualizar el perfil remoto"
-
-#: lib/oauthstore.php:311
-msgid "Error inserting remote profile"
-msgstr "Error al insertar perfil remoto"
-
-#: lib/oauthstore.php:345
-msgid "Duplicate notice"
-msgstr "Duplicar aviso"
-
-#: lib/oauthstore.php:490
+#: lib/oauthstore.php:491
 msgid "Couldn't insert new subscription."
 msgstr "No se pudo insertar una nueva suscripciÃ³n."
 
@@ -6852,7 +6845,8 @@ msgstr "Mensajes enviados"
 msgid "Tags in %s's notices"
 msgstr "Etiquetas en avisos de %s"
 
-#: lib/plugin.php:115
+#. TRANS: Displayed as version information for a plugin if no version information was found.
+#: lib/plugin.php:116
 msgid "Unknown"
 msgstr "Desconocido"
 
@@ -6946,19 +6940,19 @@ msgstr "Restringir"
 msgid "Sandbox this user"
 msgstr "Imponer restricciones a este usuario"
 
-#: lib/searchaction.php:120
+#. TRANS: Fieldset legend for the search form.
+#: lib/searchaction.php:121
 msgid "Search site"
 msgstr "Buscar sitio"
 
-#: lib/searchaction.php:126
+#. TRANS: Used as a field label for the field where one or more keywords
+#. TRANS: for searching can be entered.
+#: lib/searchaction.php:129
 msgid "Keyword(s)"
 msgstr "Palabra(s) clave"
 
-#: lib/searchaction.php:127
-msgid "Search"
-msgstr "Buscar"
-
-#: lib/searchaction.php:162
+#. TRANS: Definition list item with instructions on how to get (better) search results.
+#: lib/searchaction.php:170
 msgid "Search help"
 msgstr "Buscar ayuda"
 
@@ -7158,56 +7152,32 @@ msgid "Moderator"
 msgstr "Moderador"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1102
+#: lib/util.php:1103
 msgid "a few seconds ago"
 msgstr "hace unos segundos"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1105
+#: lib/util.php:1106
 msgid "about a minute ago"
 msgstr "hace un minuto"
 
-#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1109
-#, php-format
-msgid "about %d minutes ago"
-msgstr "hace %d minutos"
-
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 #: lib/util.php:1112
 msgid "about an hour ago"
 msgstr "hace una hora"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1116
-#, php-format
-msgid "about %d hours ago"
-msgstr "hace %d horas"
-
-#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1119
+#: lib/util.php:1118
 msgid "about a day ago"
 msgstr "hace un dÃa"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1123
-#, php-format
-msgid "about %d days ago"
-msgstr "hace %d dÃas"
-
-#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1126
+#: lib/util.php:1124
 msgid "about a month ago"
 msgstr "hace un mes"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 #: lib/util.php:1130
-#, php-format
-msgid "about %d months ago"
-msgstr "hace %d meses"
-
-#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1133
 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 5585a34634..6af53edae3 100644
--- a/locale/fa/LC_MESSAGES/statusnet.po
+++ b/locale/fa/LC_MESSAGES/statusnet.po
@@ -1,10 +1,11 @@
-# Translation of StatusNet to Persian
+# Translation of StatusNet to Persian (ÙØ§Ø±Ø³Û)
+# Expored from translatewiki.net
 #
-# Author@translatewiki.net: ArianHT
-# Author@translatewiki.net: Brion
-# Author@translatewiki.net: Choxos
-# Author@translatewiki.net: Everplays
-# Author@translatewiki.net: Narcissus
+# Author: ArianHT
+# Author: Brion
+# Author: Choxos
+# Author: Everplays
+# Author: Narcissus
 # --
 # This file is distributed under the same license as the StatusNet package.
 #
@@ -12,22 +13,23 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-09 17:35+0000\n"
-"PO-Revision-Date: 2010-09-09 17:36:54+0000\n"
+"POT-Creation-Date: 2010-09-14 19:53+0000\n"
+"PO-Revision-Date: 2010-09-14 19:53:54+0000\n"
 "Last-Translator: Ahmad Sufi Mahmudi\n"
-"Language-Team: Persian\n"
+"Language-Team: Persian <http://translatewiki.net/wiki/Portal:fa>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Language-Code: fa\n"
-"X-Message-Group: out-statusnet\n"
+"X-Message-Group: #out-statusnet\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: MediaWiki 1.17alpha (r72348); Translate extension (2010-08-20)\n"
+"X-Generator: MediaWiki 1.17alpha (r73009); Translate extension (2010-08-20)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 1284-49-16 34::+0000\n"
 
 #. TRANS: Page title
 #. TRANS: Menu item for site administration
-#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:376
+#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:363
 msgid "Access"
 msgstr "Ø¯Ø³ØªØ±Ø³Û"
 
@@ -80,10 +82,10 @@ 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 actions/emailsettings.php:224
-#: actions/imsettings.php:184 actions/smssettings.php:209
-#: lib/applicationeditform.php:361
+#. TRANS: Button label in the "Edit application" form.
+#: actions/accessadminpanel.php:203 actions/emailsettings.php:228
+#: actions/imsettings.php:187 actions/smssettings.php:209
+#: lib/applicationeditform.php:351
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Ø°Ø®ÛØ±Ù"
@@ -96,15 +98,15 @@ msgstr "ÚÙÛÙ ØµÙØÙâØ§Û ÙØ¬ÙØ¯ ÙØ¯Ø§Ø±Ø¯."
 
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #: actions/all.php:79 actions/allrss.php:68
-#: actions/apiaccountupdatedeliverydevice.php:114
-#: actions/apiaccountupdateprofile.php:105
-#: actions/apiaccountupdateprofilebackgroundimage.php:116
-#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
-#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
-#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:113
-#: actions/apigroupismember.php:91 actions/apigroupjoin.php:100
-#: actions/apigroupleave.php:100 actions/apigrouplist.php:73
-#: actions/apistatusesupdate.php:229 actions/apisubscriptions.php:87
+#: actions/apiaccountupdatedeliverydevice.php:115
+#: actions/apiaccountupdateprofile.php:106
+#: actions/apiaccountupdateprofilebackgroundimage.php:117
+#: actions/apiaccountupdateprofileimage.php:106 actions/apiblockcreate.php:98
+#: actions/apiblockdestroy.php:97 actions/apidirectmessage.php:77
+#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:114
+#: actions/apigroupismember.php:91 actions/apigroupjoin.php:101
+#: actions/apigroupleave.php:101 actions/apigrouplist.php:73
+#: actions/apistatusesupdate.php:230 actions/apisubscriptions.php:87
 #: actions/apitimelinefavorites.php:72 actions/apitimelinefriends.php:174
 #: actions/apitimelinehome.php:80 actions/apitimelinementions.php:80
 #: actions/apitimelineuser.php:82 actions/avatarbynickname.php:75
@@ -202,16 +204,16 @@ msgid "Updates from %1$s and friends on %2$s!"
 msgstr "Ø¨Ù Ø±ÙØ² Ø±Ø³Ø§ÙÛ Ø§Ø² %1$s Ù Ø¯ÙØ³ØªØ§Ù Ø¯Ø± %2$s"
 
 #: actions/apiaccountratelimitstatus.php:72
-#: actions/apiaccountupdatedeliverydevice.php:94
-#: actions/apiaccountupdateprofile.php:97
-#: actions/apiaccountupdateprofilebackgroundimage.php:94
-#: actions/apiaccountupdateprofilecolors.php:118
+#: actions/apiaccountupdatedeliverydevice.php:95
+#: actions/apiaccountupdateprofile.php:98
+#: actions/apiaccountupdateprofilebackgroundimage.php:95
+#: actions/apiaccountupdateprofilecolors.php:119
 #: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156
-#: actions/apifavoritecreate.php:100 actions/apifavoritedestroy.php:101
-#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100
-#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:139
-#: actions/apigroupismember.php:115 actions/apigroupjoin.php:156
-#: actions/apigroupleave.php:142 actions/apigrouplist.php:137
+#: actions/apifavoritecreate.php:101 actions/apifavoritedestroy.php:102
+#: actions/apifriendshipscreate.php:101 actions/apifriendshipsdestroy.php:101
+#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:140
+#: actions/apigroupismember.php:115 actions/apigroupjoin.php:157
+#: actions/apigroupleave.php:143 actions/apigrouplist.php:137
 #: actions/apigrouplistall.php:122 actions/apigroupmembership.php:107
 #: actions/apigroupshow.php:116 actions/apihelptest.php:88
 #: actions/apistatusesdestroy.php:104 actions/apistatusesretweets.php:112
@@ -226,48 +228,50 @@ msgstr "Ø¨Ù Ø±ÙØ² Ø±Ø³Ø§ÙÛ Ø§Ø² %1$s Ù Ø¯ÙØ³ØªØ§Ù Ø¯Ø± %2$s"
 msgid "API method not found."
 msgstr "Ø±Ø§Ø¨Ø· ÙÙØ±Ø¯ ÙØ¸Ø± Ù¾ÛØ¯Ø§ ÙØ´Ø¯."
 
-#: actions/apiaccountupdatedeliverydevice.php:86
-#: actions/apiaccountupdateprofile.php:89
-#: actions/apiaccountupdateprofilebackgroundimage.php:86
-#: actions/apiaccountupdateprofilecolors.php:110
-#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89
-#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109
-#: actions/apifavoritecreate.php:91 actions/apifavoritedestroy.php:92
-#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
-#: actions/apigroupcreate.php:105 actions/apigroupjoin.php:92
-#: actions/apigroupleave.php:92 actions/apimediaupload.php:67
-#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:198
+#. TRANS: Client error message. POST is a HTTP command. It should not be translated.
+#. TRANS: Client error. POST is a HTTP command. It should not be translated.
+#: actions/apiaccountupdatedeliverydevice.php:87
+#: actions/apiaccountupdateprofile.php:90
+#: actions/apiaccountupdateprofilebackgroundimage.php:87
+#: actions/apiaccountupdateprofilecolors.php:111
+#: actions/apiaccountupdateprofileimage.php:85 actions/apiblockcreate.php:90
+#: actions/apiblockdestroy.php:89 actions/apidirectmessagenew.php:110
+#: actions/apifavoritecreate.php:92 actions/apifavoritedestroy.php:93
+#: actions/apifriendshipscreate.php:92 actions/apifriendshipsdestroy.php:92
+#: actions/apigroupcreate.php:106 actions/apigroupjoin.php:93
+#: actions/apigroupleave.php:93 actions/apimediaupload.php:68
+#: actions/apistatusesretweet.php:66 actions/apistatusesupdate.php:199
 msgid "This method requires a POST."
 msgstr "Ø¨Ø±Ø§Û Ø§Ø³ØªÙØ§Ø¯Ù Ø§Ø² Ø§ÛÙ Ø±ÙØ´ Ø¨Ø§ÛØ¯ Ø§Ø·ÙØ§Ø¹Ø§Øª Ø±Ø§ Ø¨Ù ØµÙØ±Øª Ù¾Ø³Øª Ø¨ÙØ±Ø³ØªÛØ¯"
 
-#: actions/apiaccountupdatedeliverydevice.php:106
+#: actions/apiaccountupdatedeliverydevice.php:107
 msgid ""
 "You must specify a parameter named 'device' with a value of one of: sms, im, "
 "none."
 msgstr ""
 "Ø´ÙØ§ Ø¨Ø§ÛØ¯ ÛÚ© Ù¾Ø§Ø±Ø§ÙØªØ± Ø±Ø§ Ø¨Ù ÙØ§Ù device Ù ÙÙØ¯Ø§Ø± smsØ im ÛØ§ none ÙØ´Ø®Øµ Ú©ÙÛØ¯."
 
-#: actions/apiaccountupdatedeliverydevice.php:133
+#: actions/apiaccountupdatedeliverydevice.php:134
 msgid "Could not update user."
 msgstr "ÙÙÛâØªÙØ§Ù Ú©Ø§Ø±Ø¨Ø± Ø±Ø§ Ø¨ÙâÙÙÚ¯Ø§ÙâØ³Ø§Ø²Û Ú©Ø±Ø¯."
 
-#: actions/apiaccountupdateprofile.php:112
-#: actions/apiaccountupdateprofilebackgroundimage.php:194
-#: actions/apiaccountupdateprofilecolors.php:185
-#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/apiaccountupdateprofile.php:113
+#: actions/apiaccountupdateprofilebackgroundimage.php:195
+#: actions/apiaccountupdateprofilecolors.php:186
+#: actions/apiaccountupdateprofileimage.php:131 actions/apiusershow.php:108
 #: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/hcard.php:74
 #: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
 #: lib/profileaction.php:84
 msgid "User has no profile."
 msgstr "Ú©Ø§Ø±Ø¨Ø± ÙÛÚ ÙÙØ§ÛÙâØ§Û ÙØ¯Ø§Ø±Ø¯."
 
-#: actions/apiaccountupdateprofile.php:147
+#: actions/apiaccountupdateprofile.php:148
 msgid "Could not save profile."
 msgstr "ÙÙÛâØªÙØ§Ù ÙÙØ§ÛÙ Ø±Ø§ Ø°Ø®ÛØ±Ù Ú©Ø±Ø¯."
 
-#: actions/apiaccountupdateprofilebackgroundimage.php:108
-#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
-#: actions/apistatusesupdate.php:212 actions/avatarsettings.php:257
+#: actions/apiaccountupdateprofilebackgroundimage.php:109
+#: actions/apiaccountupdateprofileimage.php:98 actions/apimediaupload.php:81
+#: actions/apistatusesupdate.php:213 actions/avatarsettings.php:257
 #: actions/designadminpanel.php:123 actions/editapplication.php:118
 #: actions/newapplication.php:101 actions/newnotice.php:94
 #: lib/designsettings.php:283
@@ -278,30 +282,30 @@ msgid ""
 msgstr ""
 "Ø¨Ù Ø¯ÙÛÙ ØªÙØ¸Ø¨ÙØ§ØªØ Ø³Ø±ÙØ± ÙÙÛâØªÙØ§ÙØ¯ Ø§ÛÙ ÙÙØ¯Ø§Ø± Ø§Ø·ÙØ§Ø¹Ø§Øª (%s Ø¨Ø§ÛØª( Ø±Ø§ Ø¯Ø±ÛØ§ÙØª Ú©ÙØ¯."
 
-#: actions/apiaccountupdateprofilebackgroundimage.php:136
-#: actions/apiaccountupdateprofilebackgroundimage.php:146
-#: actions/apiaccountupdateprofilecolors.php:164
-#: actions/apiaccountupdateprofilecolors.php:174
+#: actions/apiaccountupdateprofilebackgroundimage.php:137
+#: actions/apiaccountupdateprofilebackgroundimage.php:147
+#: actions/apiaccountupdateprofilecolors.php:165
+#: actions/apiaccountupdateprofilecolors.php:175
 #: actions/groupdesignsettings.php:290 actions/groupdesignsettings.php:300
 #: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
 #: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
 msgid "Unable to save your design settings."
 msgstr "ÙÙÛâØªÙØ§Ù ØªÙØ¸ÛÙØ§Øª Ø·Ø±ØâØªØ§Ù Ø±Ø§ Ø°Ø®ÛØ±Ù Ú©Ø±Ø¯."
 
-#: actions/apiaccountupdateprofilebackgroundimage.php:187
-#: actions/apiaccountupdateprofilecolors.php:142
+#: actions/apiaccountupdateprofilebackgroundimage.php:188
+#: actions/apiaccountupdateprofilecolors.php:143
 msgid "Could not update your design."
 msgstr "ÙÙÛâØªÙØ§Ù Ø·Ø±ØâØªØ§Ù Ø¨ÙâÙÙÚ¯Ø§ÙâØ³Ø§Ø²Û Ú©Ø±Ø¯."
 
-#: actions/apiblockcreate.php:105
+#: actions/apiblockcreate.php:106
 msgid "You cannot block yourself!"
 msgstr "Ø´ÙØ§ ÙÙÛâØªÙØ§ÙÛØ¯ Ø®ÙØ¯ØªØ§Ù Ø±Ù ÙØ³Ø¯ÙØ¯ Ú©ÙÛØ¯!"
 
-#: actions/apiblockcreate.php:126
+#: actions/apiblockcreate.php:127
 msgid "Block user failed."
 msgstr "ÙØ³Ø¯ÙØ¯ Ú©Ø±Ø¯Ù Ú©Ø§Ø±Ø¨Ø± Ø´Ú©Ø³Øª Ø®ÙØ±Ø¯."
 
-#: actions/apiblockdestroy.php:114
+#: actions/apiblockdestroy.php:115
 msgid "Unblock user failed."
 msgstr "Ø¨Ø§Ø² Ú©Ø±Ø¯Ù Ú©Ø§Ø±Ø¨Ø± ÙØ§ÙÙÙÙ Ø¨ÙØ¯."
 
@@ -325,66 +329,62 @@ msgstr "Ù¾ÛØ§ÙâÙØ§Û ÙØ³ØªÙÛÙ Ø¨Ù %s"
 msgid "All the direct messages sent to %s"
 msgstr "ØªÙØ§Ù Ù¾ÛØ§ÙâÙØ§Û ÙØ³ØªÙÛÙ ÙØ±Ø³ØªØ§Ø¯ÙâØ´Ø¯Ù Ø¨Ù %s"
 
-#: actions/apidirectmessagenew.php:118
+#: actions/apidirectmessagenew.php:119
 msgid "No message text!"
 msgstr "ÙÛÚ Ù¾ÛØ§Ù ÙØªÙÛ ÙØ¬ÙØ¯ ÙØ¯Ø§Ø±Ø¯!"
 
-#: actions/apidirectmessagenew.php:127 actions/newmessage.php:150
+#: actions/apidirectmessagenew.php:128 actions/newmessage.php:150
 #, php-format
 msgid "That's too long. Max message size is %d chars."
 msgstr "Ø§ÛÙ Ø¨Ø³ÛØ§Ø± Ø·ÙÙØ§ÙÛ Ø§Ø³Øª. Ø¨ÛØ´ÛÙÙÙ Ø§ÙØ¯Ø§Ø²ÙÙ Ù¾ÛØ§Ù %d ÙÙÛØ³Ù Ø§Ø³Øª."
 
-#: actions/apidirectmessagenew.php:138
+#: actions/apidirectmessagenew.php:139
 msgid "Recipient user not found."
 msgstr "Ú©Ø§Ø±Ø¨Ø± Ú¯ÛØ±ÙØ¯Ù ÛØ§ÙØª ÙØ´Ø¯."
 
-#: actions/apidirectmessagenew.php:142
+#: actions/apidirectmessagenew.php:143
 msgid "Can't send direct messages to users who aren't your friend."
 msgstr "ÙÙÛâØªÙØ§Ù Ù¾ÛØ§Ù ÙØ³ØªÙÛÙ Ø±Ø§ Ø¨Ù Ú©Ø§Ø±Ø¨Ø±Ø§ÙÛ Ú©Ù Ø¯ÙØ³Øª Ø´ÙØ§ ÙÛØ³ØªÙØ¯Ø ÙØ±Ø³ØªØ§Ø¯."
 
-#: actions/apifavoritecreate.php:109 actions/apifavoritedestroy.php:110
+#: actions/apifavoritecreate.php:110 actions/apifavoritedestroy.php:111
 #: actions/apistatusesdestroy.php:121
 msgid "No status found with that ID."
 msgstr "ÙÛÚ ÙØ¶Ø¹ÛØªÛ Ø¨Ø§ Ø¢Ù Ø´ÙØ§Ø³Ù Ù¾ÛØ¯Ø§ ÙØ´Ø¯."
 
-#: actions/apifavoritecreate.php:120
+#: actions/apifavoritecreate.php:121
 msgid "This status is already a favorite."
 msgstr "Ø§ÛÙ Ù¾ÛØºØ§Ù Ø±Ø§ Ù¾ÛØ´âØªØ± Ø¨Ù Ø¨Ø±Ú¯Ø²ÛØ¯ÙâÙØ§Û Ø®ÙØ¯ Ø§Ø¶Ø§ÙÙ Ú©Ø±Ø¯ÙâØ§ÛØ¯"
 
 #. TRANS: Error message text shown when a favorite could not be set.
-#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:296
+#: actions/apifavoritecreate.php:132 actions/favor.php:84 lib/command.php:296
 msgid "Could not create favorite."
 msgstr "ÙÙÛâØªÙØ§Ù Ù¾ÛØ§Ù Ø±Ø§ Ø¨Ø±Ú¯Ø²ÛØ¯."
 
-#: actions/apifavoritedestroy.php:123
+#: actions/apifavoritedestroy.php:124
 msgid "That status is not a favorite."
 msgstr "Ø§ÛÙ Ù¾ÛØ§Ù ÛÚ© Ù¾ÛØ§Ù Ø¨Ø±Ú¯Ø²ÛØ¯Ù ÙÛØ³Øª."
 
-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
+#: actions/apifavoritedestroy.php:136 actions/disfavor.php:87
 msgid "Could not delete favorite."
 msgstr "ÙÙÛâØªÙØ§Ù Ù¾ÛØ§Ù Ø¨Ø±Ú¯Ø²ÛØ¯Ù Ø±Ø§ ØØ°Ù Ú©Ø±Ø¯."
 
-#: actions/apifriendshipscreate.php:109
+#: actions/apifriendshipscreate.php:110
 msgid "Could not follow user: profile not found."
 msgstr "ÙÙÛâØªÙØ§Ù Ú©Ø§Ø±Ø¨Ø± Ø±Ø§ Ø¯ÙØ¨Ø§Ù ÙÚ©Ø±Ø¯: Ú©Ø§Ø±Ø¨Ø± ÛØ§ÙØª ÙØ´Ø¯."
 
-#: actions/apifriendshipscreate.php:118
+#: actions/apifriendshipscreate.php:119
 #, php-format
 msgid "Could not follow user: %s is already on your list."
 msgstr "ÙÙÛâØªÙØ§Ù Ú©Ø§Ø±Ø¨Ø± Ø±Ø§ Ø¯ÙØ¨Ø§Ù Ú©Ø±Ø¯: %s  ÙÙâØ§Ú©ÙÙÙ Ø¯Ø± ÙÛØ³Øª Ø´ÙØ§ Ø§Ø³Øª."
 
-#: actions/apifriendshipsdestroy.php:109
+#: actions/apifriendshipsdestroy.php:110
 msgid "Could not unfollow user: User not found."
 msgstr "ÙÙÛâØªÙØ§Ù Ú©Ø§Ø±Ø¨Ø± Ø±Ø§ Ø¯ÙØ¨Ø§Ù ÙÚ©Ø±Ø¯: Ú©Ø§Ø±Ø¨Ø± ÛØ§ÙØª ÙØ´Ø¯."
 
-#: actions/apifriendshipsdestroy.php:120
+#: actions/apifriendshipsdestroy.php:121
 msgid "You cannot unfollow yourself."
 msgstr "ÙÙÛâØªÙØ§ÙÛØ¯ Ø®ÙØ¯ØªØ§Ù Ø±Ø§ Ø¯ÙØ¨Ø§Ù Ú©ÙÛØ¯."
 
-#: actions/apifriendshipsexists.php:91
-msgid "Two valid IDs or screen_names must be supplied."
-msgstr ""
-
 #: actions/apifriendshipsshow.php:134
 msgid "Could not determine source user."
 msgstr "ÙÙÛâØªÙØ§Ù Ú©Ø§Ø±Ø¨Ø± ÙÙØ¨Ø¹ Ø±Ø§ ØªØ¹ÛÛÙ Ú©Ø±Ø¯."
@@ -393,101 +393,101 @@ msgstr "ÙÙÛâØªÙØ§Ù Ú©Ø§Ø±Ø¨Ø± ÙÙØ¨Ø¹ Ø±Ø§ ØªØ¹ÛÛÙ Ú©Ø±Ø¯."
 msgid "Could not find target user."
 msgstr "ÙÙÛâØªÙØ§Ù Ú©Ø§Ø±Ø¨Ø± ÙØ¯Ù Ø±Ø§ Ù¾ÛØ¯Ø§ Ú©Ø±Ø¯."
 
-#: actions/apigroupcreate.php:167 actions/editgroup.php:186
+#: actions/apigroupcreate.php:168 actions/editgroup.php:186
 #: actions/newgroup.php:126 actions/profilesettings.php:215
 #: actions/register.php:212
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr "ÙÙØ¨ Ø¨Ø§ÛØ¯ Ø´Ø§ÙÙ ØØ±ÙÙ Ú©ÙÚÚ© Ù Ø§Ø¹Ø¯Ø§Ø¯ Ù Ø¨Ø¯ÙÙ ÙØ§ØµÙÙ Ø¨Ø§Ø´Ø¯."
 
-#: actions/apigroupcreate.php:176 actions/editgroup.php:190
+#: actions/apigroupcreate.php:177 actions/editgroup.php:190
 #: actions/newgroup.php:130 actions/profilesettings.php:238
 #: actions/register.php:215
 msgid "Nickname already in use. Try another one."
 msgstr "Ø§ÛÙ ÙÙØ¨ Ø¯Ø± ØØ§Ù ØØ§Ø¶Ø± Ø«Ø¨Øª Ø´Ø¯Ù Ø§Ø³Øª. ÙØ·ÙØ§ ÛÚ©Û Ø¯ÛÚ¯Ø± Ø§ÙØªØ®Ø§Ø¨ Ú©ÙÛØ¯."
 
-#: actions/apigroupcreate.php:183 actions/editgroup.php:193
+#: actions/apigroupcreate.php:184 actions/editgroup.php:193
 #: actions/newgroup.php:133 actions/profilesettings.php:218
 #: actions/register.php:217
 msgid "Not a valid nickname."
 msgstr "ÙÙØ¨ ÙØ§ ÙØ¹ØªØ¨Ø±."
 
-#: actions/apigroupcreate.php:199 actions/editapplication.php:215
+#: actions/apigroupcreate.php:200 actions/editapplication.php:215
 #: actions/editgroup.php:199 actions/newapplication.php:203
 #: actions/newgroup.php:139 actions/profilesettings.php:222
 #: actions/register.php:224
 msgid "Homepage is not a valid URL."
 msgstr "ØµÙØÙÙ Ø®Ø§ÙÚ¯Û ÛÚ© ÙØ´Ø§ÙÛ ÙØ¹ØªØ¨Ø± ÙÛØ³Øª."
 
-#: actions/apigroupcreate.php:208 actions/editgroup.php:202
+#: actions/apigroupcreate.php:209 actions/editgroup.php:202
 #: actions/newgroup.php:142 actions/profilesettings.php:225
 #: actions/register.php:227
 msgid "Full name is too long (max 255 chars)."
 msgstr "ÙØ§Ù Ú©Ø§ÙÙ Ø®ÛÙÛ Ø·ÙÙØ§ÙÛ Ø§Ø³Øª (ØØ¯Ø§Ú©Ø«Ø± Û²ÛµÛµ ÙÙÛØ³Ù)."
 
-#: actions/apigroupcreate.php:216 actions/editapplication.php:190
+#: actions/apigroupcreate.php:217 actions/editapplication.php:190
 #: actions/newapplication.php:172
 #, php-format
 msgid "Description is too long (max %d chars)."
 msgstr "ØªÙØµÛÙ Ø®ÛÙÛ Ø·ÙÙØ§ÙÛ Ø§Ø³Øª (ØØ¯Ø§Ú©Ø«Ø± %d ÙÙÛØ³Ù)"
 
-#: actions/apigroupcreate.php:227 actions/editgroup.php:208
+#: actions/apigroupcreate.php:228 actions/editgroup.php:208
 #: actions/newgroup.php:148 actions/profilesettings.php:232
 #: actions/register.php:234
 msgid "Location is too long (max 255 chars)."
 msgstr "ÙØ§Ù ÙÚ©Ø§Ù Ø®ÛÙÛ Ø·ÙÙØ§ÙÛ Ø§Ø³Øª (ØØ¯Ø§Ú©Ø«Ø± Û²ÛµÛµ ÙÙÛØ³Ù)"
 
-#: actions/apigroupcreate.php:246 actions/editgroup.php:219
+#: actions/apigroupcreate.php:247 actions/editgroup.php:219
 #: actions/newgroup.php:159
 #, php-format
 msgid "Too many aliases! Maximum %d."
 msgstr "ÙØ§ÙâÙØ§Û ÙØ³ØªØ¹Ø§Ø± Ø¨Ø³ÛØ§Ø± Ø²ÛØ§Ø¯ ÙØ³ØªÙØ¯! ØØ¯Ø§Ú©Ø«Ø± %d."
 
-#: actions/apigroupcreate.php:267
+#: actions/apigroupcreate.php:268
 #, php-format
 msgid "Invalid alias: \"%s\"."
 msgstr "ÙØ§Ù ÙØ³ØªØ¹Ø§Ø± ÙØ§ÙØ¹ØªØ¨Ø± Ø§Ø³Øª: Â«%sÂ»."
 
-#: actions/apigroupcreate.php:276 actions/editgroup.php:232
+#: actions/apigroupcreate.php:277 actions/editgroup.php:232
 #: actions/newgroup.php:172
 #, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr "ÙØ§ÙâÙØ³ØªØ¹Ø§Ø± Â«%sÂ» Ø§Ø²Ù¾ÛØ´ Ú¯Ø±ÙØªÙâØ´Ø¯ÙâØ§Ø³Øª. ÛÚ©Û Ø¯ÛÚ¯Ø± Ø±Ø§ Ø§ÙØªØØ§Ù Ú©ÙÛØ¯."
 
-#: actions/apigroupcreate.php:289 actions/editgroup.php:238
+#: actions/apigroupcreate.php:290 actions/editgroup.php:238
 #: actions/newgroup.php:178
 msgid "Alias can't be the same as nickname."
 msgstr "ÙØ§Ù Ù ÙØ§Ù ÙØ³ØªØ¹Ø§Ø± Ø´ÙØ§ ÙÙÛ ØªÙØ§ÙØ¯ ÛÚ©Û Ø¨Ø§Ø´Ø¯ ."
 
-#: actions/apigroupismember.php:96 actions/apigroupjoin.php:105
-#: actions/apigroupleave.php:105 actions/apigroupmembership.php:92
+#: actions/apigroupismember.php:96 actions/apigroupjoin.php:106
+#: actions/apigroupleave.php:106 actions/apigroupmembership.php:92
 #: actions/apigroupshow.php:83 actions/apitimelinegroup.php:92
 msgid "Group not found."
 msgstr "Ú¯Ø±ÙÙ ÛØ§ÙØª ÙØ´Ø¯."
 
 #. TRANS: Error text shown a user tries to join a group they already are a member of.
-#: actions/apigroupjoin.php:111 actions/joingroup.php:100 lib/command.php:336
+#: actions/apigroupjoin.php:112 actions/joingroup.php:100 lib/command.php:336
 msgid "You are already a member of that group."
 msgstr "Ø´ÙØ§ Ø§Ø² Ù¾ÛØ´ ÛÚ© Ø¹Ø¶Ù Ø§ÛÙ Ú¯Ø±ÙÙ ÙØ³ØªÛØ¯."
 
 #. TRANS: Error text shown when a user tries to join a group they are blocked from joining.
-#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:341
+#: actions/apigroupjoin.php:121 actions/joingroup.php:105 lib/command.php:341
 msgid "You have been blocked from that group by the admin."
 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.
-#: actions/apigroupjoin.php:139 actions/joingroup.php:134 lib/command.php:353
+#: actions/apigroupjoin.php:140 actions/joingroup.php:134 lib/command.php:353
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "ÙÙÛâØªÙØ§Ù Ú©Ø§Ø±Ø¨Ø± %1$s Ø±Ø§ Ø¹Ø¶Ù Ú¯Ø±ÙÙ %2$s Ú©Ø±Ø¯."
 
-#: actions/apigroupleave.php:115
+#: actions/apigroupleave.php:116
 msgid "You are not a member of this group."
 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.
-#: actions/apigroupleave.php:125 actions/leavegroup.php:129
+#: actions/apigroupleave.php:126 actions/leavegroup.php:129
 #: lib/command.php:401
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
@@ -511,7 +511,7 @@ msgstr "%s Ú¯Ø±ÙÙ"
 msgid "groups on %s"
 msgstr "Ú¯Ø±ÙÙâÙØ§ Ø¯Ø± %s"
 
-#: actions/apimediaupload.php:99
+#: actions/apimediaupload.php:100
 msgid "Upload failed."
 msgstr "Ø¨Ø§Ø±Ú¯Ø°Ø§Ø±Û Ø´Ú©Ø³Øª Ø®ÙØ±Ø¯."
 
@@ -525,9 +525,9 @@ msgstr "Ø±ÙØ² ÙØ§ÙØ¹ØªØ¨Ø± Ø§Ø³Øª."
 
 #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
 #: actions/deletenotice.php:169 actions/disfavor.php:74
-#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:55
+#: actions/emailsettings.php:271 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:66 actions/imsettings.php:227
+#: actions/groupunblock.php:66 actions/imsettings.php:230
 #: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
@@ -571,8 +571,8 @@ msgstr "ÙØ´Ø§ÙÙÙ Ø¯Ø±Ø®ÙØ§Ø³Øª %s Ù¾Ø°ÛØ±ÙØªÙ ÙØ´Ø¯ Ù ÙØºÙ Ø´Ø¯."
 #. 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:286 actions/grouplogo.php:322
-#: actions/imsettings.php:242 actions/newapplication.php:121
+#: actions/emailsettings.php:290 actions/grouplogo.php:322
+#: actions/imsettings.php:245 actions/newapplication.php:121
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
 #: actions/smssettings.php:277 lib/designsettings.php:304
 msgid "Unexpected form submission."
@@ -637,18 +637,18 @@ msgstr "Ø§ÛÙ Ø±ÙØ´ ÙÛØ§Ø²ÙÙØ¯ POST ÛØ§ DELETE Ø§Ø³Øª."
 msgid "You may not delete another user's status."
 msgstr "Ø´ÙØ§ ØªÙØ§ÙØ§ÛÛ ØØ°Ù ÙØ¶Ø¹ÛØª Ú©Ø§Ø±Ø¨Ø± Ø¯ÛÚ¯Ø±Û Ø±Ø§ ÙØ¯Ø§Ø±ÛØ¯."
 
-#: actions/apistatusesretweet.php:75 actions/apistatusesretweets.php:72
+#: actions/apistatusesretweet.php:76 actions/apistatusesretweets.php:72
 #: actions/deletenotice.php:52 actions/shownotice.php:92
 msgid "No such notice."
 msgstr "ÚÙÛÙ Ù¾ÛØ§ÙÛ ÙØ¬ÙØ¯ ÙØ¯Ø§Ø±Ø¯."
 
 #. TRANS: Error text shown when trying to repeat an own notice.
-#: actions/apistatusesretweet.php:83 lib/command.php:538
+#: actions/apistatusesretweet.php:84 lib/command.php:538
 msgid "Cannot repeat your own notice."
 msgstr "ÙÙÛ ØªÙØ§ÙÛØ¯ Ù¾ÛØ§Ù Ø®ÙØ¯ Ø±Ø§ ØªÚ©Ø±Ø§Ø± Ú©ÙÛØ¯."
 
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-#: actions/apistatusesretweet.php:91 lib/command.php:544
+#: actions/apistatusesretweet.php:92 lib/command.php:544
 msgid "Already repeated that notice."
 msgstr "ÙØ¨ÙØ§ Ø¢Ù Ù¾ÛØ§Ù ØªÚ©Ø±Ø§Ø± Ø´Ø¯Ù Ø§Ø³Øª."
 
@@ -660,21 +660,21 @@ msgstr "ÙØ¶Ø¹ÛØª ØØ°Ù Ø´Ø¯."
 msgid "No status with that ID found."
 msgstr "ÙÛÚ ÙØ¶Ø¹ÛØªÛ Ø¨Ø§ Ø¢Ù Ø´ÙØ§Ø³Ù ÛØ§ÙØª ÙØ´Ø¯."
 
-#: actions/apistatusesupdate.php:221
+#: actions/apistatusesupdate.php:222
 msgid "Client must provide a 'status' parameter with a value."
 msgstr ""
 
-#: actions/apistatusesupdate.php:242 actions/newnotice.php:157
+#: actions/apistatusesupdate.php:243 actions/newnotice.php:157
 #: lib/mailhandler.php:60
 #, php-format
 msgid "That's too long. Max notice size is %d chars."
 msgstr "Ø§ÛÙ Ø®ÛÙÛ Ø·ÙÙØ§ÙÛ Ø§Ø³Øª. Ø¨ÛØ´ÛÙÙÙ Ø·ÙÙ Ù¾ÛØ§Ù %d ÙÙÛØ³Ù Ø§Ø³Øª."
 
-#: actions/apistatusesupdate.php:283 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:284 actions/apiusershow.php:96
 msgid "Not found."
 msgstr "ÛØ§ÙØª ÙØ´Ø¯."
 
-#: actions/apistatusesupdate.php:306 actions/newnotice.php:181
+#: actions/apistatusesupdate.php:307 actions/newnotice.php:181
 #, php-format
 msgid "Max notice size is %d chars, including attachment URL."
 msgstr "Ø¨ÛØ´ÛÙÙÙ Ø·ÙÙ Ù¾ÛØ§Ù %d ÙÙÛØ³Ù Ú©Ù Ø´Ø§ÙÙ ÙØ´Ø§ÙÛ Ø§ÛÙØªØ±ÙØªÛ Ù¾ÛÙØ³Øª ÙÙ ÙØ³Øª."
@@ -877,7 +877,9 @@ msgid "Yes"
 msgstr "Ø¨ÙÙ"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
+#. TRANS: Submit button title.
+#. TRANS: Description of the form to block a user.
+#: actions/block.php:164 actions/groupmembers.php:403 lib/blockform.php:82
 msgid "Block this user"
 msgstr "Ú©Ø§Ø±Ø¨Ø± Ø±Ø§ ÙØ³Ø¯ÙØ¯ Ú©Ù"
 
@@ -919,11 +921,13 @@ msgstr "ÙÙØ±Ø³ØªÛ Ø§Ø² Ø§ÙØ±Ø§Ø¯ ÙØ³Ø¯ÙØ¯ Ø´Ø¯Ù Ø¯Ø± Ù¾ÛÙØ³ØªÙ Ø¨Ù Ø§
 msgid "Unblock user from group"
 msgstr "Ø¢Ø²Ø§Ø¯ Ú©Ø±Ø¯Ù Ú©Ø§Ø±Ø¨Ø± Ø¯Ø± Ù¾ÛÙØ³ØªÙ Ø¨Ù Ú¯Ø±ÙÙ"
 
-#: actions/blockedfromgroup.php:320 lib/unblockform.php:69
+#. TRANS: Title for the form to unblock a user.
+#: actions/blockedfromgroup.php:320 lib/unblockform.php:70
 msgid "Unblock"
 msgstr "Ø¢Ø²Ø§Ø¯ Ø³Ø§Ø²Û"
 
-#: actions/blockedfromgroup.php:320 lib/unblockform.php:80
+#. TRANS: Description of the form to unblock a user.
+#: actions/blockedfromgroup.php:320 lib/unblockform.php:82
 msgid "Unblock this user"
 msgstr "Ø¢Ø²Ø§Ø¯ Ø³Ø§Ø²Û Ú©Ø§Ø±Ø¨Ø±"
 
@@ -962,9 +966,9 @@ msgstr "Ø¢Ù ÙØ´Ø§ÙÛ Ø¯Ø± ØØ§Ù ØØ§Ø¶Ø± ØªØµØ¯ÛÙ Ø´Ø¯Ù Ø§Ø³Øª."
 #. 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/confirmaddress.php:116 actions/emailsettings.php:331
+#: actions/emailsettings.php:477 actions/imsettings.php:283
+#: actions/imsettings.php:442 actions/othersettings.php:174
 #: actions/profilesettings.php:283 actions/smssettings.php:308
 #: actions/smssettings.php:464
 msgid "Couldn't update user."
@@ -972,7 +976,7 @@ msgstr "ÙÙÛâØªÙØ§Ù Ú©Ø§Ø±Ø¨Ø± Ø±Ø§ Ø¨Ù Ø±ÙØ² Ú©Ø±Ø¯."
 
 #. 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/confirmaddress.php:128 actions/emailsettings.php:437
 #: actions/smssettings.php:422
 msgid "Couldn't delete email confirmation."
 msgstr "ÙÙÛâØªÙØ§Ù ØªØµØ¯ÛÙ Ù¾Ø³Øª Ø§ÙÚ©ØªØ±ÙÙÛÚ© Ø±Ø§ Ù¾Ø§Ú© Ú©Ø±Ø¯."
@@ -1008,9 +1012,10 @@ msgstr "Ø¨Ø±ÙØ§ÙÙ ÛØ§ÙØª ÙØ´Ø¯."
 msgid "You are not the owner of this application."
 msgstr "Ø´ÙØ§ ÙØ§ÙÚ© Ø§ÛÙ Ø¨Ø±ÙØ§ÙÙ ÙÛØ³ØªÛØ¯."
 
+#. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:127
 #: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1307
+#: lib/action.php:1315
 msgid "There was a problem with your session token."
 msgstr "ÛÚ© ÙØ´Ú©Ù Ø¨Ø§ Ø±ÙØ² ÙØ´Ø³Øª Ø´ÙØ§ ÙØ¬ÙØ¯ Ø¯Ø§Ø´Øª."
 
@@ -1044,7 +1049,7 @@ msgstr "Ø§ÛÙ Ø¨Ø±ÙØ§ÙÙ ØØ°Ù Ø´ÙØ¯"
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
 #: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:73 lib/profileformaction.php:64
+#: lib/adminpanelaction.php:71 lib/profileformaction.php:64
 #: lib/settingsaction.php:72
 msgid "Not logged in."
 msgstr "Ø´ÙØ§ Ø¨Ù Ø³ÛØ³ØªÙ ÙØ§Ø±Ø¯ ÙØ´Ø¯Ù Ø§ÛØ¯."
@@ -1107,7 +1112,6 @@ msgstr "ØØ°Ù Ø§ÛÙ Ú©Ø§Ø±Ø¨Ø±"
 #. TRANS: Message used as title for design settings for the site.
 #. TRANS: Link description in user account settings menu.
 #: actions/designadminpanel.php:63 lib/accountsettingsaction.php:139
-#: lib/groupnav.php:119
 msgid "Design"
 msgstr "Ø·Ø±Ø"
 
@@ -1230,13 +1234,13 @@ msgstr "Ø¨Ø§Ø²Ú¯Ø±Ø¯Ø§ÙØ¯Ù Ø·Ø±ØâÙØ§Û Ù¾ÛØ´âÙØ±Ø¶"
 msgid "Reset back to default"
 msgstr "Ø¨Ø±Ú¯Ø´Øª Ø¨Ù ØØ§ÙØª Ù¾ÛØ´ Ú¯Ø²ÛØ¯Ù"
 
-#. TRANS: Submit button title
+#. TRANS: Submit button title.
 #: actions/designadminpanel.php:685 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/snapshotadminpanel.php:245
 #: actions/subscriptions.php:226 actions/tagother.php:154
-#: actions/useradminpanel.php:294 lib/applicationeditform.php:363
+#: actions/useradminpanel.php:294 lib/applicationeditform.php:353
 #: lib/designsettings.php:256 lib/groupeditform.php:202
 msgid "Save"
 msgstr "Ø°Ø®ÛØ±ÙâÚ©Ø±Ø¯Ù"
@@ -1384,7 +1388,7 @@ msgstr "ÙØ´Ø§ÙÛ Ù¾Ø³Øª Ø§ÙÚ©ØªØ±ÙÙÛÚ©Û ØªØ§ÛÛØ¯ Ø´Ø¯ÙÙ Ú©ÙÙÙÛ"
 #. 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/emailsettings.php:115 actions/emailsettings.php:162
 #: actions/imsettings.php:116 actions/smssettings.php:124
 #: actions/smssettings.php:180
 msgctxt "BUTTON"
@@ -1402,22 +1406,26 @@ msgstr ""
 #. 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
+#. TRANS: Button label in the "Edit application" form.
 #: actions/emailsettings.php:127 actions/imsettings.php:131
-#: actions/smssettings.php:137 lib/applicationeditform.php:357
+#: actions/smssettings.php:137 lib/applicationeditform.php:347
 msgctxt "BUTTON"
 msgid "Cancel"
 msgstr "Ø§ÙØµØ±Ø§Ù"
 
-#. TRANS: Instructions for e-mail address input form.
-#: actions/emailsettings.php:135
+#. TRANS: Instructions for e-mail address input form. Do not translate
+#. TRANS: "example.org". It is one of the domain names reserved for
+#. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
+#. TRANS: Any other domain may be owned by a legitimate person or
+#. TRANS: organization.
+#: actions/emailsettings.php:139
 msgid "Email address, like \"UserName@example.org\""
 msgstr "ÙØ´Ø§ÙÛ Ù¾Ø³Øª Ø§ÙÚ©ØªØ±ÙÙÛÚ©ÛØ ÙØ§ÙÙØ¯ Â«UserName@example.orgÂ»"
 
 #. 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/emailsettings.php:143 actions/imsettings.php:151
 #: actions/smssettings.php:162
 msgctxt "BUTTON"
 msgid "Add"
@@ -1425,113 +1433,113 @@ msgstr "Ø§ÙØ²ÙØ¯Ù"
 
 #. 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
+#: actions/emailsettings.php:151 actions/smssettings.php:171
 msgid "Incoming email"
 msgstr "Ù¾Ø³Øª Ø§ÙÚ©ØªØ±ÙÙÛÚ© ÙØ±ÙØ¯Û"
 
 #. 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
+#: actions/emailsettings.php:159 actions/smssettings.php:178
 msgid "Send email to this address to post new notices."
 msgstr ""
 "Ø¨Ø±Ø§Û ÙØ±Ø³ØªØ§Ø¯Ù Ù¾ÛØ§Ù Ø¨Ø§ Ø§Ø³ØªÙØ§Ø¯Ù Ø§Ø² Ù¾Ø³Øª Ø§ÙÚ©ØªØ±ÙÙÛÚ© Ø¨Ù Ø§ÛÙ ÙØ´Ø§ÙÛ ÙØ§ÙÙ Ø¨ÙØ±Ø³ØªÛØ¯."
 
 #. 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
+#: actions/emailsettings.php:168 actions/smssettings.php:186
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr "ÙØ´Ø§ÙÛ Ø¬Ø¯ÛØ¯ Ø¨Ø±Ø§Û ÙØ±Ø³ØªØ§Ø¯Ù Ù¾ÛØ§Ù Ø§ÛØ¬Ø§Ø¯ Ú©ÙØ ÙØ´Ø§ÙÛ ÙØ¨ÙÛ ÙØºÙ ÙÛâØ´ÙØ¯."
 
 #. 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
+#: actions/emailsettings.php:172 actions/smssettings.php:189
 msgctxt "BUTTON"
 msgid "New"
 msgstr "ØªØ§Ø²Ù"
 
 #. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:174
+#: actions/emailsettings.php:178
 msgid "Email preferences"
 msgstr "ØªØ±Ø¬ÛØØ§Øª Ù¾Ø³Øª Ø§ÙÚ©ØªØ±ÙÙÛÚ©Û"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:180
+#: actions/emailsettings.php:184
 msgid "Send me notices of new subscriptions through email."
 msgstr "Ù¾ÛØ§ÙâÙØ§Û Ú©Ø³Ø§ÙÛ Ø±Ø§ Ú©Ù Ø¨Ù ØªØ§Ø²Ú¯Û Ø¯ÙØ¨Ø§Ù ÙÛâÚ©ÙÙ Ø¨Ø§ Ù¾Ø³Øª Ø§ÙÚ©ØªØ±ÙÙÛÚ© Ø¨Ø±Ø§ÛÙ Ø¨ÙØ±Ø³Øª."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:186
+#: actions/emailsettings.php:190
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr ""
 "ÙØ±Ú¯Ø§Ù Ú©Ø³Û Ù¾ÛØ§Ù ÙÙ Ø±Ø§ Ø¨Ù Ø¹ÙÙØ§Ù Ø¨Ø±Ú¯Ø²ÛØ¯Ù Ø§Ø¶Ø§ÙÙ Ú©Ø±Ø¯Ø Ø¨Ù ÙÙ ÙØ§ÙÙ ÙØ±Ø³ØªØ§Ø¯Ù Ø´ÙØ¯."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:193
+#: actions/emailsettings.php:197
 msgid "Send me email when someone sends me a private message."
 msgstr "ÙØ± ÙÙØª Ú©Ø³Û Ø¨Ø±Ø§Û ÙÙ Ù¾ÛØ§Ù Ø®ØµÙØµÛ ÙØ±Ø³ØªØ§Ø¯Ø ÙØ±Ø§ Ø¨Ø§ Ù¾Ø³Øª Ø§ÙÚ©ØªØ±ÙÙÛÚ© Ø¨Ø§ Ø®Ø¨Ø± Ú©Ù."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:199
+#: actions/emailsettings.php:203
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr "ÙØ±Ú¯Ø§Ù Ú©Ø³Û Ø¨Ù ÙÙ ÛÚ© Â«@-Ù¾Ø§Ø³Ø®Â» ÙÛâÙØ±Ø³ØªØ¯Ø Ø¨Ù ÙÙ ÙØ§ÙÙ Ø¨ÙØ±Ø³Øª."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:205
+#: actions/emailsettings.php:209
 msgid "Allow friends to nudge me and send me an email."
 msgstr ""
 "Ø¨Ù Ø¯ÙØ³ØªØ§Ù Ø§Ø¬Ø§Ø²Ù Ø¯Ø§Ø¯Ù Ø´ÙØ¯ Ú©Ù Ø¨Ù ÙÙ ÛØ§Ø¯Ø¢ÙØ±Û Ú©ÙÙØ¯ Ù ÛÚ© ÙØ§ÙÙ Ø¨Ù ÙÙ Ø¨ÙØ±Ø³ØªÙØ¯."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:212
+#: actions/emailsettings.php:216
 msgid "I want to post notices by email."
 msgstr "ÙÛâØ®ÙØ§ÙÙ Ø¨Ø§ ÙØ§ÙÙ Ù¾ÛØ§Ù Ø¨ÙØ±Ø³ØªÙ."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:219
+#: actions/emailsettings.php:223
 msgid "Publish a MicroID for my email address."
 msgstr "ÛÚ© Ø´ÙØ§Ø³Ù Ø¨Ø±Ø§Û Ù¾Ø³Øª Ø§ÙÚ©ØªØ±ÙÙÛÚ©  ÙÙ ÙÙØªØ´Ø± Ú©Ù."
 
 #. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:334
+#: actions/emailsettings.php:338
 msgid "Email preferences saved."
 msgstr "ØªØ±Ø¬ÛØØ§Øª Ù¾Ø³Øª Ø§ÙÚ©ØªØ±ÙÙÛÚ©Û Ø°Ø®ÛØ±Ù Ø´Ø¯."
 
 #. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:353
+#: actions/emailsettings.php:357
 msgid "No email address."
 msgstr "Ù¾Ø³Øª Ø§ÙÚ©ØªØ±ÙÙÛÚ© ÙØ¬ÙØ¯ ÙØ¯Ø§Ø±Ø¯."
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:361
+#: actions/emailsettings.php:365
 msgid "Cannot normalize that email address"
 msgstr "ÙÙÛâØªÙØ§Ù ÙØ´Ø§ÙÛ Ø±Ø§ ÙØ§ÙÙÙÛ Ú©Ø±Ø¯"
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:208
+#: actions/emailsettings.php:370 actions/register.php:208
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "ÛÚ© ÙØ´Ø§ÙÛ Ù¾Ø³Øª Ø§ÙÚ©ØªØ±ÙÙÛÚ©Û ÙØ¹ØªØ¨Ø± ÙÛØ³Øª."
 
 #. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:370
+#: actions/emailsettings.php:374
 msgid "That is already your email address."
 msgstr "ÙÙ Ø§Ú©ÙÙÙ ÙØ´Ø§ÙÛ Ø´ÙØ§ ÙÙÛÙ Ø§Ø³Øª."
 
 #. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:374
+#: actions/emailsettings.php:378
 msgid "That email address already belongs to another user."
 msgstr "Ø§ÛÙ ÙØ´Ø§ÙÛ Ø¯Ø± ØØ§Ù ØØ§Ø¶Ø± ÙØªØ¹ÙÙ Ø¨Ù ÙØ±Ø¯ Ø¯ÛÚ¯Ø±Û Ø§Ø³Øª."
 
 #. 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/emailsettings.php:395 actions/imsettings.php:351
 #: actions/smssettings.php:373
 msgid "Couldn't insert confirmation code."
 msgstr "ÙÙÛâØªÙØ§Ù Ú©Ø¯ ØªØ§ÛÛØ¯ Ø±Ø§ Ø§Ø¶Ø§ÙÙ Ú©Ø±Ø¯."
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:398
+#: actions/emailsettings.php:402
 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."
@@ -1542,50 +1550,50 @@ msgstr ""
 #. 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/emailsettings.php:423 actions/imsettings.php:386
 #: actions/smssettings.php:408
 msgid "No pending confirmation to cancel."
 msgstr "ÙÛÚ ØªØ§ÛÛØ¯Û Ø¨Ø±Ø§Û ÙØ³Ø® Ú©Ø±Ø¯Ù ÙØ¬ÙØ¯ ÙØ¯Ø§Ø±Ø¯."
 
 #. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:424
+#: actions/emailsettings.php:428
 msgid "That is the wrong email address."
 msgstr "Ø§ÛÙ ÙØ´Ø§ÙÛ Ù¾Ø³Øª Ø§ÙÚ©ØªØ±ÙÙÛÚ©Û ÙØ§Ø¯Ø±Ø³Øª Ø§Ø³Øª."
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:438
+#: actions/emailsettings.php:442
 msgid "Email confirmation cancelled."
 msgstr "ØªØ§ÛÛØ¯ Ù¾Ø³Øª Ø§ÙÚ©ØªØ±ÙÙÛÚ©Û ÙØºÙ Ø´Ø¯."
 
 #. TRANS: Message given trying to remove an e-mail address that is not
 #. TRANS: registered for the active user.
-#: actions/emailsettings.php:458
+#: actions/emailsettings.php:462
 msgid "That is not your email address."
 msgstr "Ø¢Ù ÙØ´Ø§ÙÛ Ø´ÙØ§ ÙÛØ³Øª."
 
 #. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:479
+#: actions/emailsettings.php:483
 msgid "The email address was removed."
 msgstr "ÙØ´Ø§ÙÛ Ù¾Ø³Øª Ø§ÙÚ©ØªØ±ÙÙÛÚ©Û Ù¾Ø§Ú© Ø´Ø¯Ù Ø§Ø³Øª."
 
-#: actions/emailsettings.php:493 actions/smssettings.php:568
+#: actions/emailsettings.php:497 actions/smssettings.php:568
 msgid "No incoming email address."
 msgstr "ÙÛÚ ÙØ´Ø§ÙÛ ÙØ±ÙØ¯Û ÙØ¬ÙØ¯ ÙØ¯Ø§Ø±Ø¯."
 
 #. 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/emailsettings.php:508 actions/emailsettings.php:532
 #: actions/smssettings.php:578 actions/smssettings.php:602
 msgid "Couldn't update user record."
 msgstr "ÙÙÛâØªÙØ§Ù Ø§Ø·ÙØ§Ø¹Ø§Øª Ú©Ø§Ø±Ø¨Ø± Ø±Ø§ Ø¨Ù Ø±ÙØ² Ú©Ø±Ø¯."
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
-#: actions/emailsettings.php:508 actions/smssettings.php:581
+#: actions/emailsettings.php:512 actions/smssettings.php:581
 msgid "Incoming email address removed."
 msgstr "ÙØ´Ø§ÙÛ ÙØ±ÙØ¯Û Ù¾Ø§Ú© Ø´Ø¯."
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
-#: actions/emailsettings.php:532 actions/smssettings.php:605
+#: actions/emailsettings.php:536 actions/smssettings.php:605
 msgid "New incoming email address added."
 msgstr "ÙØ´Ø§ÙÛ ÙØ±ÙØ¯Û Ø¬Ø¯ÛØ¯ Ø§Ø¶Ø§ÙÙ Ø´Ø¯."
 
@@ -1704,7 +1712,7 @@ msgstr "ÙÙÛâØªÙØ§Ù ÙØ´Ø§ÙÙÙ Ø¯Ø±Ø®ÙØ§Ø³Øª Ø´ÙØ§ Ø±Ø§ Ø¨Ù ÙØ´Ø§Ù
 msgid "Remote service uses unknown version of OMB protocol."
 msgstr "Ø®Ø¯ÙØ§Øª ÙÙØ±Ø¯ ÙØ¸Ø± Ø§Ø² ÙØ³Ø®ÙÙ ÙØ§ÙÙÙÙÙÛ Ø§Ø² ÙØ±Ø§Ø±Ø¯Ø§Ø¯ OMB Ø§Ø³ØªÙØ§Ø¯Ù ÙÛâÚ©ÙØ¯."
 
-#: actions/finishremotesubscribe.php:138
+#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306
 msgid "Error updating remote profile."
 msgstr "Ø®Ø·Ø§ ÙÙÚ¯Ø§Ù Ø¨ÙâÙÙÚ¯Ø§ÙâØ³Ø§Ø²Û ÙÙØ§ÛÙÙ Ø§Ø² Ø±Ø§Ù Ø¯ÙØ±."
 
@@ -1761,7 +1769,7 @@ msgstr "ÙÙ Ø§Ú©ÙÙÙ Ø¯Ø³ØªØ±Ø³Û Ú©Ø§Ø±Ø¨Ø± Ø¨Ù Ú¯Ø±ÙÙ ÙØ³Ø¯ÙØ¯ Ø´Ø¯Ù
 msgid "User is not a member of group."
 msgstr "Ú©Ø§Ø±Ø¨Ø± Ø¹Ø¶Ù Ú¯Ø±ÙÙ ÙÛØ³Øª."
 
-#: actions/groupblock.php:134 actions/groupmembers.php:360
+#: actions/groupblock.php:134 actions/groupmembers.php:364
 msgid "Block user from group"
 msgstr "Ø¯Ø³ØªØ±Ø³Û Ú©Ø§Ø±Ø¨Ø± Ø¨Ù Ú¯Ø±ÙÙ ÙØ³Ø¯ÙØ¯ Ø´ÙØ¯"
 
@@ -1839,40 +1847,32 @@ msgstr "ÙØ´Ø§Ù Ø¨ÙâÙÙÚ¯Ø§ÙâØ³Ø§Ø²Û Ø´Ø¯."
 msgid "Failed updating logo."
 msgstr "Ø¨ÙâÙÙÚ¯Ø§ÙâØ³Ø§Ø²Û ÙØ´Ø§Ù Ø´Ú©Ø³Øª Ø®ÙØ±Ø¯."
 
-#: actions/groupmembers.php:100 lib/groupnav.php:92
+#. TRANS: Title of the page showing group members.
+#. TRANS: %s is the name of the group.
+#: actions/groupmembers.php:102
 #, php-format
 msgid "%s group members"
 msgstr "Ø§Ø¹Ø¶Ø§Û Ú¯Ø±ÙÙ %s"
 
-#: actions/groupmembers.php:103
+#. TRANS: Title of the page showing group members.
+#. TRANS: %1$s is the name of the group, %2$d is the page number of the members list.
+#: actions/groupmembers.php:107
 #, php-format
 msgid "%1$s group members, page %2$d"
 msgstr "Ø§Ø¹Ø¶Ø§Û Ú¯Ø±ÙÙ %1$sØ ØµÙØÙÙ %2$d"
 
-#: actions/groupmembers.php:118
+#: actions/groupmembers.php:122
 msgid "A list of the users in this group."
 msgstr "ÛÚ© ÙÙØ±Ø³Øª Ø§Ø² Ú©Ø§Ø±Ø¨Ø±Ø§Ù Ø¯Ø± Ø§ÛÙ Ú¯Ø±ÙÙ"
 
-#: actions/groupmembers.php:182 lib/groupnav.php:107
+#: actions/groupmembers.php:186
 msgid "Admin"
 msgstr "ÙØ¯ÛØ±"
 
-#: actions/groupmembers.php:392 lib/blockform.php:69
-msgid "Block"
-msgstr "Ø¨Ø§Ø²Ø¯Ø§Ø´ØªÙ"
-
-#: actions/groupmembers.php:487
+#: actions/groupmembers.php:498
 msgid "Make user an admin of the group"
 msgstr "Ú©Ø§Ø±Ø¨Ø± ÛÚ© ÙØ¯ÛØ± Ú¯Ø±ÙÙ Ø´ÙØ¯"
 
-#: actions/groupmembers.php:519
-msgid "Make Admin"
-msgstr "ÙØ¯ÛØ± Ø´ÙØ¯"
-
-#: actions/groupmembers.php:519
-msgid "Make this user an admin"
-msgstr "Ø§ÛÙ Ú©Ø§Ø±Ø¨Ø± ÛÚ© ÙØ¯ÛØ± Ø´ÙØ¯"
-
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Title in atom group notice feed. %s is a group name.
 #. TRANS: Title in atom user notice feed. %s is a user name.
@@ -2010,7 +2010,10 @@ msgstr ""
 
 #. TRANS: IM address input field instructions in IM settings form.
 #. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:140
+#. TRANS: Do not translate "example.org". It is one of the domain names reserved for use in examples by
+#. TRANS: http://www.rfc-editor.org/rfc/rfc2606.txt. Any other domain may be owned by a legitimate
+#. TRANS: person or organization.
+#: actions/imsettings.php:143
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -2020,63 +2023,63 @@ msgstr ""
 "Ø¨Ù ÙÙØ±Ø³Øª Ø¯ÙØ³ØªØ§Ù Ø®ÙØ¯ Ø¯Ø± Ú©Ø§Ø±Ú¯ÛØ± Ù¾ÛØ§ÙâØ±Ø³Ø§Ù ÙÙØ±ÛâØªØ§Ù ÛØ§ Ø¯Ø± GTalk ÙØ·ÙØ¦Ù Ø´ÙÛØ¯."
 
 #. TRANS: Form legend for IM preferences form.
-#: actions/imsettings.php:155
+#: actions/imsettings.php:158
 msgid "IM preferences"
 msgstr "ØªØ±Ø¬ÛØØ§Øª Ù¾ÛØ§ÙâØ±Ø³Ø§Ù ÙÙØ±Û"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:160
+#: actions/imsettings.php:163
 msgid "Send me notices through Jabber/GTalk."
 msgstr "Ù¾ÛØ§ÙâÙØ§ Ø±Ø§ Ø§Ø² Ø±Ø§Ù Jabber/GTalk Ø¨Ø±Ø§Û ÙÙ Ø¨ÙØ±Ø³Øª."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:166
+#: actions/imsettings.php:169
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr "ÙØ± ÙÙØª Ú©Ù ÙØ¶Ø¹ÛØª Jabber/Gtalk ÙÙ ØªØºÛÛØ± Ú©Ø±Ø¯Ø ÛÚ© Ù¾ÛØ§Ù Ø¨ÙØ±Ø³Øª."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:172
+#: actions/imsettings.php:175
 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr "Ù¾Ø§Ø³Ø® Ú©Ø³Ø§ÙÛ Ú©Ù ÙÙ Ø¢ÙâÙØ§ Ø±Ø§ Ø¯ÙØ¨Ø§Ù ÙÙÛâÚ©ÙÙ Ø±Ø§ Ø¨Ø§ Jabber/Gtalk Ø¨Ø±Ø§ÛÙ Ø¨ÙØ±Ø³Øª."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:179
+#: actions/imsettings.php:182
 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "ÛÚ© Ø´ÙØ§Ø³ÙÙ Ú©ÙÚÚ© Ø¨Ø±Ø§Û Jabber/Gtalk ÙÙ ÙÙØªØ´Ø± Ú©Ù."
 
 #. TRANS: Confirmation message for successful IM preferences save.
-#: actions/imsettings.php:287 actions/othersettings.php:180
+#: actions/imsettings.php:290 actions/othersettings.php:180
 msgid "Preferences saved."
 msgstr "ØªÙØ¸ÛÙØ§Øª Ø°Ø®ÛØ±Ù Ø´Ø¯."
 
 #. TRANS: Message given saving IM address without having provided one.
-#: actions/imsettings.php:309
+#: actions/imsettings.php:312
 msgid "No Jabber ID."
 msgstr "ÙÛÚ Ø´ÙØ§Ø³ÙÙ Jabber Ø§Û ÙØ¬ÙØ¯ ÙØ¯Ø§Ø±Ø¯."
 
 #. TRANS: Message given saving IM address that cannot be normalised.
-#: actions/imsettings.php:317
+#: actions/imsettings.php:320
 msgid "Cannot normalize that Jabber ID"
 msgstr "ÙÙÛâØªÙØ§Ù Ø´ÙØ§Ø³ÙÙ Jabber Ø±Ø§ ØªØ§ÛÛØ¯ Ú©Ø±Ø¯"
 
 #. TRANS: Message given saving IM address that not valid.
-#: actions/imsettings.php:322
+#: actions/imsettings.php:325
 msgid "Not a valid Jabber ID"
 msgstr "Ø´ÙØ§Ø³ÙÙ Jabber Ø¯Ø±Ø³Øª ÙÛØ³Øª"
 
 #. TRANS: Message given saving IM address that is already set.
-#: actions/imsettings.php:326
+#: actions/imsettings.php:329
 msgid "That is already your Jabber ID."
 msgstr "Ø§ÛÙ Ø´ÙØ§Ø³Ù Jabber Ú©ÙÙÙÛ Ø´ÙØ§Ø³Øª."
 
 #. TRANS: Message given saving IM address that is already set for another user.
-#: actions/imsettings.php:330
+#: actions/imsettings.php:333
 msgid "Jabber ID already belongs to another user."
 msgstr "Ø´ÙØ§Ø³ÙÙ Jabber Ø¨Ù ÛÚ© Ú©Ø§Ø±Ø¨Ø± Ø¯ÛÚ¯Ø± ÙØ±Ø¨ÙØ· Ø§Ø³Øª."
 
 #. 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
+#: actions/imsettings.php:361
 #, php-format
 msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
@@ -2086,28 +2089,28 @@ msgstr ""
 "Ø¨Ø±Ø§Û ÙØ±Ø³ØªØ§Ø¯Ù Ù¾ÛØ§Ù Ø¨Ù Ø´ÙØ§Ø ØªØ§ÛÛØ¯ Ú©ÙÛØ¯."
 
 #. TRANS: Message given canceling IM address confirmation for the wrong IM address.
-#: actions/imsettings.php:388
+#: actions/imsettings.php:391
 msgid "That is the wrong IM address."
 msgstr "ÙØ´Ø§ÙÛ Ù¾ÛØ§Ù Ø±Ø³Ø§Ù Ø§Ø´ØªØ¨Ø§Ù Ø§Ø³Øª."
 
 #. TRANS: Server error thrown on database error canceling IM address confirmation.
-#: actions/imsettings.php:397
+#: actions/imsettings.php:400
 msgid "Couldn't delete IM confirmation."
 msgstr "ÙÙÛâØªÙØ§Ù ØªØ§ÛÛØ¯ Ù¾ÛØ§ÙâØ±Ø³Ø§Ù ÙÙØ±Û Ø±Ø§ Ù¾Ø§Ú© Ú©Ø±Ø¯."
 
 #. TRANS: Message given after successfully canceling IM address confirmation.
-#: actions/imsettings.php:402
+#: actions/imsettings.php:405
 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
+#: actions/imsettings.php:427
 msgid "That is not your Jabber ID."
 msgstr "Ø§ÛÙ Ø´ÙØ§Ø³ÙÙ Jabber Ø´ÙØ§ ÙÛØ³Øª."
 
 #. TRANS: Message given after successfully removing a registered IM address.
-#: actions/imsettings.php:447
+#: actions/imsettings.php:450
 msgid "The IM address was removed."
 msgstr "ÙØ´Ø§ÙÛ Ù¾ÛØ§ÙâØ±Ø³Ø§Ù ÙÙØ±Û Ù¾Ø§Ú© Ø´Ø¯Ù Ø§Ø³Øª."
 
@@ -2572,8 +2575,8 @@ msgid "Only %s URLs over plain HTTP please."
 msgstr "ÙØ·ÙØ§ ØªÙÙØ§ Ø§Ø² ÙØ´Ø§ÙÛâÙØ§Û Ø§ÛÙØªØ±ÙØªÛ %s Ø§Ø² Ø±Ø§Ù HTTP Ø³Ø§Ø¯Ù Ø§Ø³ØªÙØ§Ø¯Ù Ú©ÙÛØ¯."
 
 #. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1215
-#: lib/apiaction.php:1243 lib/apiaction.php:1366
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1206
+#: lib/apiaction.php:1233 lib/apiaction.php:1356
 msgid "Not a supported data format."
 msgstr "ÛÚ© ÙØ§ÙØ¨ Ø¯Ø§Ø¯ÙÙ Ù¾Ø´ØªÛØ¨Ø§ÙÛâØ´Ø¯Ù ÙÛØ³Øª."
 
@@ -2715,7 +2718,7 @@ msgid "Password saved."
 msgstr "Ú¯Ø°Ø±ÙØ§ÚÙ Ø°Ø®ÛØ±Ù Ø´Ø¯."
 
 #. TRANS: Menu item for site administration
-#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:384
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:371
 msgid "Paths"
 msgstr "ÙØ³ÛØ± ÙØ§"
 
@@ -2926,7 +2929,7 @@ msgstr "ÙØ§ÙâÚ©Ø§ÙÙ"
 
 #. TRANS: Form input field label.
 #: actions/profilesettings.php:115 actions/register.php:460
-#: lib/applicationeditform.php:244 lib/groupeditform.php:161
+#: lib/applicationeditform.php:235 lib/groupeditform.php:161
 msgid "Homepage"
 msgstr "ØµÙØÙÙ Ø®Ø§ÙÚ¯Û"
 
@@ -3031,7 +3034,7 @@ msgid "Couldn't save tags."
 msgstr "ÙÙÛâØªÙØ§Ù ÙØ´Ø§Ù Ø±Ø§ Ø°Ø®ÛØ±Ù Ú©Ø±Ø¯."
 
 #. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:391 lib/adminpanelaction.php:141
+#: actions/profilesettings.php:391 lib/adminpanelaction.php:138
 msgid "Settings saved."
 msgstr "ØªÙØ¸ÛÙØ§Øª Ø°Ø®ÛØ±Ù Ø´Ø¯."
 
@@ -3555,7 +3558,7 @@ msgstr "StatusNet"
 
 #. TRANS: Menu item for site administration
 #: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
-#: lib/adminpanelaction.php:392
+#: lib/adminpanelaction.php:379
 msgid "Sessions"
 msgstr "ÙØ´Ø³ØªâÙØ§"
 
@@ -3589,24 +3592,24 @@ msgid "Application profile"
 msgstr "ÙÙØ§ÛÙÙ Ø¨Ø±ÙØ§ÙÙ"
 
 #. TRANS: Form input field label for application icon.
-#: actions/showapplication.php:159 lib/applicationeditform.php:182
+#: actions/showapplication.php:159 lib/applicationeditform.php:173
 msgid "Icon"
 msgstr "Ø´ÙØ§ÛÙ"
 
 #. TRANS: Form input field label for application name.
 #: actions/showapplication.php:169 actions/version.php:197
-#: lib/applicationeditform.php:199
+#: lib/applicationeditform.php:190
 msgid "Name"
 msgstr "ÙØ§Ù"
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:178 lib/applicationeditform.php:235
+#: actions/showapplication.php:178 lib/applicationeditform.php:226
 msgid "Organization"
 msgstr "Ø³Ø§Ø²ÙØ§Ù"
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:216 lib/groupeditform.php:172
+#: lib/applicationeditform.php:207 lib/groupeditform.php:172
 msgid "Description"
 msgstr "ØªÙØµÛÙ"
 
@@ -3720,7 +3723,7 @@ msgstr ""
 msgid "This is a way to share what you like."
 msgstr "Ø§ÛÙ ÛÚ© Ø±Ø§Ù Ø§Ø³Øª Ø¨Ø±Ø§Û Ø¨Ù Ø§Ø´ØªØ±Ø§Ú© Ú¯Ø°Ø§Ø´ØªÙ Ø¢ÙÚÙ Ú©Ù Ø¯ÙØ³Øª Ø¯Ø§Ø±ÛØ¯."
 
-#: actions/showgroup.php:82 lib/groupnav.php:86
+#: actions/showgroup.php:82
 #, php-format
 msgid "%s group"
 msgstr "Ú¯Ø±ÙÙ %s"
@@ -3772,7 +3775,7 @@ msgstr "Ø®ÙØ±Ø§Ú© Ù¾ÛØ§Ù Ø¨Ø±Ø§Û Ú¯Ø±ÙÙ %s (Atom)"
 msgid "FOAF for %s group"
 msgstr "FOAF Ø¨Ø±Ø§Û Ú¯Ø±ÙÙ %s"
 
-#: actions/showgroup.php:393 actions/showgroup.php:445 lib/groupnav.php:91
+#: actions/showgroup.php:393 actions/showgroup.php:445
 msgid "Members"
 msgstr "Ø§Ø¹Ø¶Ø§"
 
@@ -4220,7 +4223,7 @@ msgstr "Ú©Ø¯Û ÙØ§Ø±Ø¯ ÙØ´Ø¯"
 
 #. TRANS: Menu item for site administration
 #: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
-#: lib/adminpanelaction.php:408
+#: lib/adminpanelaction.php:395
 msgid "Snapshots"
 msgstr "ØªØµØ§ÙÛØ± ÙØØ¸ÙâØ§Û"
 
@@ -4737,15 +4740,6 @@ msgstr ""
 msgid "Robin thinks something is impossible."
 msgstr ""
 
-#. TRANS: Message given if an upload is larger than the configured maximum.
-#. TRANS: %1$d is the byte limit for uploads, %2$d is the byte count for the uploaded file.
-#: classes/File.php:190
-#, php-format
-msgid ""
-"No file may be larger than %1$d bytes and the file you sent was %2$d bytes. "
-"Try to upload a smaller version."
-msgstr ""
-
 #. TRANS: Message given if an upload would exceed user quota.
 #. TRANS: %d (number) is the user quota in bytes.
 #: classes/File.php:202
@@ -4899,7 +4893,7 @@ msgid "Missing profile."
 msgstr "ÙÙØ§ÛÙ ÙØ¬ÙØ¯ ÙØ¯Ø§Ø±Ø¯."
 
 #. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#: classes/Subscription.php:75 lib/oauthstore.php:465
+#: classes/Subscription.php:75 lib/oauthstore.php:466
 msgid "You have been banned from subscribing."
 msgstr "Ø´ÙØ§ Ø§Ø² Ø§Ø´ØªØ±Ø§Ú© ÙÙØ¹ Ø´Ø¯ÙâØ§ÛØ¯."
 
@@ -5042,7 +5036,8 @@ msgid "Change site configuration"
 msgstr "ØªØºÛÛØ± Ù¾ÛÚ©Ø±Ø¨ÙØ¯Û ÙØ¨âÚ¯Ø§Ù"
 
 #. TRANS: Main menu option when logged in and site admin for access to site configuration
-#: lib/action.php:474
+#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
+#: lib/action.php:474 lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr "ÙØ¯ÛØ±"
@@ -5119,7 +5114,7 @@ msgstr "Ø¬Ø³ØªâÙØ¬Ù"
 
 #. TRANS: DT element for site notice. String is hidden in default CSS.
 #. TRANS: Menu item for site administration
-#: lib/action.php:538 lib/adminpanelaction.php:400
+#: lib/action.php:538 lib/adminpanelaction.php:387
 msgid "Site notice"
 msgstr "Ù¾ÛØ§Ù ÙØ¨âÚ¯Ø§Ù"
 
@@ -5183,7 +5178,10 @@ msgid "StatusNet software license"
 msgstr "StatusNet ÙØ¬ÙØ² ÙØ±Ù Ø§ÙØ²Ø§Ø±"
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
-#: lib/action.php:843
+#. TRANS: Text between [] is a link description, text between () is the link itself.
+#. TRANS: Make sure there is no whitespace between "]" and "(".
+#. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
+#: lib/action.php:846
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -5193,13 +5191,16 @@ msgstr ""
 "broughtbyurl%%) Ø¨Ø±Ø§Û Ø´ÙØ§ Ø±Ø§ÙâØ§ÙØ¯Ø§Ø²Û Ø´Ø¯Ù Ø§Ø³Øª."
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:846
+#: lib/action.php:849
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** ÛÚ© Ø³Ø±ÙÛØ³ ÙÛÚ©Ø±ÙØ¨ÙØ§Ú¯ÛÙÚ¯ Ø§Ø³Øª."
 
 #. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.
-#: lib/action.php:850
+#. TRANS: Make sure there is no whitespace between "]" and "(".
+#. TRANS: Text between [] is a link description, text between () is the link itself.
+#. TRANS: %s is the version of StatusNet that is being used.
+#: lib/action.php:856
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -5211,49 +5212,50 @@ msgstr ""
 "org/licensing/licenses/agpl-3.0.html) Ø¯Ø± Ø¯Ø³ØªØ±Ø³ Ø§Ø³Øª."
 
 #. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:866
+#: lib/action.php:872
 msgid "Site content license"
 msgstr "ÙØ¬ÙØ² ÙØØªÙÛØ§Øª ÙØ¨âÚ¯Ø§Ù"
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:873
+#: lib/action.php:879
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr "ÙØØªÙÛØ§Øª Ù Ø¯Ø§Ø¯ÙâÙØ§Û %1$s Ø®ØµÙØµÛ Ù ÙØØ±ÙØ§ÙÙ ÙØ³ØªÙØ¯."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:880
+#: lib/action.php:886
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr "ØÙ ØªÚ©Ø«ÛØ± ÙØØªÙØ§ Ù Ø¯Ø§Ø¯ÙâÙØ§ Ø¨Ø§ %1$s Ø§Ø³Øª. ØªÙØ§Ù ØÙÙÙ ÙØÙÙØ¸ Ø§Ø³Øª."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:884
+#: lib/action.php:890
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr "ØÙ ØªÚ©Ø«ÛØ± ÙØØªÙØ§ Ù Ø¯Ø§Ø¯ÙâÙØ§ Ø¨Ø§ ÙØ´Ø§Ø±Ú©ØªâÚ©ÙÙØ¯Ú¯Ø§Ù Ø§Ø³Øª. ØªÙØ§Ù ØÙÙÙ ÙØÙÙØ¸ Ø§Ø³Øª."
 
-#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:897
+#. TRANS: license message in footer.
+#. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
+#: lib/action.php:904
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr "ØªÙØ§Ù ÙØØªÙÛØ§Øª Ù Ø¯Ø§Ø¯ÙâÙØ§Û %1$s Ø²ÛØ± ÙØ¬ÙØ² %2$s Ø¯Ø± Ø¯Ø³ØªØ±Ø³ ÙØ³ØªÙØ¯."
 
 #. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1236
+#: lib/action.php:1243
 msgid "Pagination"
 msgstr "ØµÙØÙ Ø¨ÙØ¯Ù"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1247
+#: lib/action.php:1254
 msgid "After"
 msgstr "Ù¾Ø³ Ø§Ø²"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1257
+#: lib/action.php:1264
 msgid "Before"
 msgstr "ÙØ¨Ù Ø§Ø²"
 
@@ -5263,207 +5265,226 @@ msgid "Expecting a root feed element but got a whole XML document."
 msgstr ""
 "Ø¯Ø± ØØ§Ù Ø§ÙØªØ¸Ø§Ø± Ø¨Ø±Ø§Û ÛÚ© Ø¹Ø§ÙÙ Ø®ÙØ±Ø§Ú© Ø±ÛØ´ÙâØ§ÛØ Ø§ÙØ§ ÛÚ© Ø³ÙØ¯ XML Ú©Ø§ÙÙ Ø¯Ø±ÛØ§ÙØª Ø´Ø¯."
 
-#: lib/activityutils.php:208
+#. TRANS: Client exception thrown when there is no source attribute.
+#: lib/activityutils.php:203
 msgid "Can't handle remote content yet."
 msgstr "ÙÙÙØ² ÙÙÛâØªÙØ§Ù ÙØØªÙÛØ§Øª Ø§Ø²Ø±Ø§ÙâØ¯ÙØ± Ø±Ø§ Ø¨ÙâÚ©Ø§Ø± Ø¨Ø±Ø¯."
 
-#: lib/activityutils.php:244
+#. TRANS: Client exception thrown when there embedded XML content is found that cannot be processed yet.
+#: lib/activityutils.php:240
 msgid "Can't handle embedded XML content yet."
 msgstr "ÙÙÙØ² ÙÙÛâØªÙØ§Ù ÙØØªÙÛØ§Øª XML Ø¬Ø§Ø³Ø§Ø²ÛâØ´Ø¯Ù Ø±Ø§ Ø¨ÙâÚ©Ø§Ø± Ø¨Ø±Ø¯."
 
-#: lib/activityutils.php:248
+#. TRANS: Client exception thrown when base64 encoded content is found that cannot be processed yet.
+#: lib/activityutils.php:245
 msgid "Can't handle embedded Base64 content yet."
 msgstr "ÙÙÙØ² ÙÙÛâØªÙØ§Ù ÙØØªÙØ§Û Ø¬Ø§Ø³Ø§Ø²ÛâØ´Ø¯ÙÙ Base64 Ø±Ø§ Ø¨ÙâÚ©Ø§Ø± Ø¨Ø±Ø¯."
 
 #. TRANS: Client error message thrown when a user tries to change admin settings but has no access rights.
-#: lib/adminpanelaction.php:98
+#: lib/adminpanelaction.php:96
 msgid "You cannot make changes to this site."
 msgstr "Ø´ÙØ§ ÙÙÛ ØªÙØ§ÙÛØ¯ Ø¯Ø± Ø§ÛÙ ÙØ¨âÚ¯Ø§Ù ØªØºÛÛØ± Ø§ÛØ¬Ø§Ø¯ Ú©ÙÛØ¯"
 
 #. TRANS: Client error message throw when a certain panel's settings cannot be changed.
-#: lib/adminpanelaction.php:110
+#: lib/adminpanelaction.php:108
 msgid "Changes to that panel are not allowed."
 msgstr "ØªØºÛÛØ±Ø§Øª Ø¯Ø± Ø¢Ù ÙØ·Ø¹Ù ÙØ¬Ø§Ø² ÙÛØ³Øª."
 
 #. TRANS: Client error message.
-#: lib/adminpanelaction.php:229
+#: lib/adminpanelaction.php:222
 msgid "showForm() not implemented."
 msgstr "showForm() Ù¾ÛØ§Ø¯Ù ÙØ´Ø¯Ù Ø§Ø³Øª."
 
 #. TRANS: Client error message
-#: lib/adminpanelaction.php:259
+#: lib/adminpanelaction.php:250
 msgid "saveSettings() not implemented."
 msgstr "saveSettings() Ù¾ÛØ§Ø¯Ù ÙØ´Ø¯Ù Ø§Ø³Øª."
 
 #. TRANS: Client error message thrown if design settings could not be deleted in
 #. TRANS: the admin panel Design.
-#: lib/adminpanelaction.php:284
+#: lib/adminpanelaction.php:274
 msgid "Unable to delete design setting."
 msgstr "ÙÙÛ ØªÙØ§Ù ØªÙØ¸ÛÙØ§Øª Ø·Ø±Ø§ØÛ Ø´Ø¯Ù Ø±Ø§ Ù¾Ø§Ú© Ú©Ø±Ø¯ ."
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:350
+#: lib/adminpanelaction.php:337
 msgid "Basic site configuration"
 msgstr "Ù¾ÛÚ©Ø±Ø¨ÙØ¯Û Ø§ÙÙÛÙ ÙØ¨âÚ¯Ø§Ù"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:352
+#: lib/adminpanelaction.php:339
 msgctxt "MENU"
 msgid "Site"
 msgstr "ÙØ¨âÚ¯Ø§Ù"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:358
+#: lib/adminpanelaction.php:345
 msgid "Design configuration"
 msgstr "Ù¾ÛÚ©Ø±Ø¨ÙØ¯Û Ø·Ø±Ø"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:360
+#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
+#: lib/adminpanelaction.php:347 lib/groupnav.php:135
 msgctxt "MENU"
 msgid "Design"
 msgstr "Ø·Ø±Ø"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:366
+#: lib/adminpanelaction.php:353
 msgid "User configuration"
 msgstr "Ù¾ÛÚ©Ø±Ø¨ÙØ¯Û Ú©Ø§Ø±Ø¨Ø±"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:368 lib/personalgroupnav.php:115
+#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:115
 msgid "User"
 msgstr "Ú©Ø§Ø±Ø¨Ø±"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:374
+#: lib/adminpanelaction.php:361
 msgid "Access configuration"
 msgstr "Ù¾ÛÚ©Ø±Ø¨ÙØ¯Û Ø¯Ø³ØªØ±Ø³Û"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:382
+#: lib/adminpanelaction.php:369
 msgid "Paths configuration"
 msgstr "Ù¾ÛÚ©Ø±Ø¨ÙØ¯Û ÙØ³ÛØ±ÙØ§"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:390
+#: lib/adminpanelaction.php:377
 msgid "Sessions configuration"
 msgstr "Ù¾ÛÚ©Ø±Ø¨ÙØ¯Û ÙØ´Ø³ØªâÙØ§"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:398
+#: lib/adminpanelaction.php:385
 msgid "Edit site notice"
 msgstr "ÙÛØ±Ø§ÛØ´ Ù¾ÛØ§Ù ÙØ¨âÚ¯Ø§Ù"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:406
+#: lib/adminpanelaction.php:393
 msgid "Snapshots configuration"
 msgstr "Ù¾ÛÚ©Ø±Ø¨ÙØ¯Û ØªØµØ§ÙÛØ± ÙØØ¸ÙâØ§Û"
 
 #. TRANS: Client error 401.
-#: lib/apiauth.php:113
+#: lib/apiauth.php:111
 msgid "API resource requires read-write access, but you only have read access."
 msgstr ""
 "ÙÙØ¨Ø¹ API Ø¨Ù Ø¯Ø³ØªØ±Ø³Û Ø®ÙØ§ÙØ¯Ù-ÙÙØ´ØªÙ ÙÛØ§Ø² Ø¯Ø§Ø±Ø¯Ø Ø§ÙØ§ Ø´ÙØ§ ØªÙÙØ§ Ø¯Ø³ØªØ±Ø³Û Ø®ÙØ§ÙØ¯Ù Ø±Ø§ "
 "Ø¯Ø§Ø±ÛØ¯."
 
+#. TRANS: OAuth exception thrown when no application is found for a given consumer key.
+#: lib/apiauth.php:175
+msgid "No application for that consumer key."
+msgstr ""
+
+#. TRANS: OAuth exception given when no user was found for a given token (no token was found).
+#: lib/apiauth.php:217
+msgid "No user for that token."
+msgstr ""
+
+#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
+#: lib/apioauthstore.php:178
+msgid "Tried to revoke unknown token"
+msgstr ""
+
 #. TRANS: Form legend.
-#: lib/applicationeditform.php:137
+#: lib/applicationeditform.php:129
 msgid "Edit application"
 msgstr "ÙÛØ±Ø§ÛØ´ Ø¨Ø±ÙØ§ÙÙ"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:187
+#: lib/applicationeditform.php:178
 msgid "Icon for this application"
 msgstr "Ø´ÙØ§ÛÙ Ø§ÛÙ Ø¨Ø±ÙØ§ÙÙ"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:209
+#: lib/applicationeditform.php:200
 #, php-format
 msgid "Describe your application in %d characters"
 msgstr "Ø¨Ø±ÙØ§ÙÙÙ Ø®ÙØ¯ Ø±Ø§ Ø¯Ø± %d ÙÙÛØ³Ù ØªÙØµÛÙ Ú©ÙÛØ¯"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:213
+#: lib/applicationeditform.php:204
 msgid "Describe your application"
 msgstr "Ø¨Ø±ÙØ§ÙÙÙ Ø®ÙØ¯ Ø±Ø§ ØªÙØµÛÙ Ú©ÙÛØ¯"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:224
+#: lib/applicationeditform.php:215
 msgid "URL of the homepage of this application"
 msgstr "ÙØ´Ø§ÙÛ Ø§ÛÙØªØ±ÙØªÛ ØµÙØÙÙ Ø®Ø§ÙÚ¯Û Ø§ÛÙ Ø¨Ø±ÙØ§ÙÙ"
 
 #. TRANS: Form input field label.
-#: lib/applicationeditform.php:226
+#: lib/applicationeditform.php:217
 msgid "Source URL"
 msgstr "ÙØ´Ø§ÙÛ Ø§ÛÙØªØ±ÙØªÛ ÙÙØ¨Ø¹"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:233
+#: lib/applicationeditform.php:224
 msgid "Organization responsible for this application"
 msgstr "Ø³Ø§Ø²ÙØ§Ù ÙØ³Ø¦ÙÙ Ø§ÛÙ Ø¨Ø±ÙØ§ÙÙ"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:242
+#: lib/applicationeditform.php:233
 msgid "URL for the homepage of the organization"
 msgstr "ÙØ´Ø§ÙÛ Ø§ÛÙØªØ±ÙØªÛ Ø¨Ø±Ø§Û ØµÙØÙÙ Ø®Ø§ÙÚ¯Û Ø³Ø§Ø²ÙØ§Ù"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:251
+#: lib/applicationeditform.php:242
 msgid "URL to redirect to after authentication"
 msgstr "ÙØ´Ø§ÙÛ Ø§ÛÙØªØ±ÙØªÛ Ø¨Ø±Ø§Û Ø¯ÙØ¨Ø§Ø±ÙâÙØ¯Ø§ÛØªâÚ©Ø±Ø¯Ù Ø¨Ø¹Ø¯ Ø§Ø² ØªØµØ¯ÛÙ"
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:278
+#: lib/applicationeditform.php:269
 msgid "Browser"
 msgstr "ÙØ±ÙØ±Ú¯Ø±"
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:295
+#: lib/applicationeditform.php:286
 msgid "Desktop"
 msgstr "ÙÛØ²Ú©Ø§Ø±"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:297
+#: lib/applicationeditform.php:288
 msgid "Type of application, browser or desktop"
 msgstr "ÙÙØ¹ Ø¨Ø±ÙØ§ÙÙØ ÙØ±ÙØ±Ú¯Ø± ÛØ§ ÙÛØ²Ú©Ø§Ø±"
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:320
+#: lib/applicationeditform.php:311
 msgid "Read-only"
 msgstr "ØªÙÙØ§ Ø®ÙØ§ÙØ¯ÙÛ"
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:339
+#: lib/applicationeditform.php:330
 msgid "Read-write"
 msgstr "Ø®ÙØ§ÙØ¯Ù-ÙÙØ´ØªÙ"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:341
+#: lib/applicationeditform.php:332
 msgid "Default access for this application: read-only, or read-write"
 msgstr "Ø¯Ø³ØªØ±Ø³Û Ù¾ÛØ´âÙØ±Ø¶ Ø¨Ø±Ø§Û Ø§ÛÙ Ø¨Ø±ÙØ§ÙÙ: ØªÙÙØ§ Ø®ÙØ§ÙØ¯ÙÛ ÛØ§ Ø®ÙØ§ÙØ¯Ù-ÙÙØ´ØªÙ"
 
-#. TRANS: Submit button title
-#: lib/applicationeditform.php:359
+#. TRANS: Submit button title.
+#: lib/applicationeditform.php:349
 msgid "Cancel"
 msgstr "Ø§ÙØµØ±Ø§Ù"
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:136
+#: lib/applicationlist.php:135
 msgid "read-write"
 msgstr "Ø®ÙØ§ÙØ¯Ù-ÙÙØ´ØªÙ"
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:138
+#: lib/applicationlist.php:137
 msgid "read-only"
 msgstr "ØªÙÙØ§ Ø®ÙØ§ÙØ¯ÙÛ"
 
 #. 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
+#: lib/applicationlist.php:143
 #, php-format
 msgid "Approved %1$s - \"%2$s\" access."
 msgstr "ØªØ§ÛÛØ¯ Ø´Ø¯Ù %1$s - Ø¨Ø§ Ø¯Ø³ØªØ±Ø³Û Â«%2$sÂ»"
 
 #. TRANS: Button label
-#: lib/applicationlist.php:159
+#: lib/applicationlist.php:158
 msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "ÙØºÙ Ú©Ø±Ø¯Ù"
@@ -5483,11 +5504,13 @@ msgstr "ÙØ¤ÙÙ"
 msgid "Provider"
 msgstr "ÙÙÛØ§ Ú©ÙÙØ¯Ù"
 
-#: lib/attachmentnoticesection.php:67
+#. TRANS: Title.
+#: lib/attachmentnoticesection.php:68
 msgid "Notices where this attachment appears"
 msgstr "Ù¾ÛØ§ÙâÙØ§ÛÛ Ú©Ù Ø§ÛÙ Ù¾ÛÙØ³Øª Ø¯Ø± Ø¢ÙâØ¬Ø§ Ø¸Ø§ÙØ± ÙÛâØ´ÙØ¯"
 
-#: lib/attachmenttagcloudsection.php:48
+#. TRANS: Title.
+#: lib/attachmenttagcloudsection.php:49
 msgid "Tags for this attachment"
 msgstr "Ø¨Ø±ÚØ³Ø¨âÙØ§ Ø¨Ø±Ø§Û Ø§ÛÙ Ù¾ÛÙØ³Øª"
 
@@ -5499,6 +5522,11 @@ msgstr "ØªØºÛÛØ± Ú¯Ø°Ø±ÙØ§ÚÙ Ø´Ú©Ø³Øª Ø®ÙØ±Ø¯"
 msgid "Password changing is not allowed"
 msgstr "ØªØºÛÛØ± Ú¯Ø°Ø±ÙØ§ÚÙ ÙØ¬Ø§Ø² ÙÛØ³Øª"
 
+#. TRANS: Title for the form to block a user.
+#: lib/blockform.php:70
+msgid "Block"
+msgstr "Ø¨Ø§Ø²Ø¯Ø§Ø´ØªÙ"
+
 #: lib/channel.php:157 lib/channel.php:177
 msgid "Command results"
 msgstr "ÙØªÛØ¬Ù Ø¯Ø³ØªÙØ±"
@@ -5674,6 +5702,13 @@ msgstr ""
 msgid "Can't subscribe to OMB profiles by command."
 msgstr "ÙÙÛâØªÙØ§Ù Ø¨Ø§ Ø¯Ø³ØªÙØ± ÙØ´ØªØ±Ú© ÙÙØ§ÛÙâÙØ§Û OMB Ø´Ø¯."
 
+#. TRANS: Text shown after having subscribed to another user successfully.
+#. TRANS: %s is the name of the user the subscription was requested for.
+#: lib/command.php:672
+#, php-format
+msgid "Subscribed to %s."
+msgstr ""
+
 #. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
 #. TRANS: Error text shown when no username was provided when issuing the command.
 #: lib/command.php:694 lib/command.php:804
@@ -5739,7 +5774,7 @@ msgid "You are not subscribed to anyone."
 msgstr "Ø´ÙØ§ ÙØ´ØªØ±Ú© ÙÛÚâÚ©Ø³Û ÙØ´Ø¯ÙâØ§ÛØ¯."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to.
-#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.
 #: lib/command.php:836
 msgid "You are subscribed to this person:"
@@ -5753,7 +5788,7 @@ msgid "No one is subscribed to you."
 msgstr "ÙÛÚâÚ©Ø³ ÙØ´ØªØ±Ú© Ø´ÙØ§ ÙØ´Ø¯Ù Ø§Ø³Øª."
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
-#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
 #: lib/command.php:863
 msgid "This person is subscribed to you:"
@@ -5767,13 +5802,14 @@ msgid "You are not a member of any groups."
 msgstr "Ø´ÙØ§ Ø¯Ø± ÙÛÚ Ú¯Ø±ÙÙÛ Ø¹Ø¶Ù ÙÛØ³ØªÛØ¯ ."
 
 #. TRANS: Text shown after requesting groups a user is subscribed to.
-#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
 #: lib/command.php:890
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "Ø´ÙØ§ ÛÚ© Ø¹Ø¶Ù Ø§ÛÙ Ú¯Ø±ÙÙ ÙØ³ØªÛØ¯:"
 
+#. TRANS: Help text for commands.
 #: lib/command.php:905
 msgid ""
 "Commands:\n"
@@ -5985,38 +6021,6 @@ msgstr "ÙÚ©Ø§Ù Ú¯Ø±ÙÙØ Ø¯Ø± ØµÙØ±Øª ÙØ¬ÙØ¯ Ø¯Ø§Ø´ØªÙØ ÙØ§ÙÙØ¯ Â«Ø´
 msgid "Extra nicknames for the group, comma- or space- separated, max %d"
 msgstr "ÙØ§ÙâÙØ§Û ÙØ³ØªØ¹Ø§Ø± Ø§Ø¶Ø§ÙÛ Ø¨Ø±Ø§Û Ú¯Ø±ÙÙØ Ø¨Ø§ Ú©Ø§ÙØ§- ÛØ§ ÙØ§ØµÙÙ- Ø¬Ø¯Ø§ Ø´ÙØ¯Ø Ø¨ÛØ´ÛÙÙ %d"
 
-#: lib/groupnav.php:85
-msgid "Group"
-msgstr "Ú¯Ø±ÙÙ"
-
-#: lib/groupnav.php:101
-msgid "Blocked"
-msgstr "ÙØ³Ø¯ÙØ¯ Ø´Ø¯Ù"
-
-#: lib/groupnav.php:102
-#, php-format
-msgid "%s blocked users"
-msgstr "%s Ú©Ø§Ø±Ø¨Ø± ÙØ³Ø¯ÙØ¯ Ø´Ø¯Ù"
-
-#: lib/groupnav.php:108
-#, php-format
-msgid "Edit %s group properties"
-msgstr "Ø®ØµÙØµÛÙØª Ú¯Ø±ÙÙ %s ÙÛØ±Ø§ÛØ´"
-
-#: lib/groupnav.php:113
-msgid "Logo"
-msgstr "ÙØ´Ø§Ù"
-
-#: lib/groupnav.php:114
-#, php-format
-msgid "Add or edit %s logo"
-msgstr "Ø§ÙØ²ÙØ¯Ù ÛØ§ ÙÛØ±Ø§ÛØ´ ÙØ´Ø§Ù"
-
-#: lib/groupnav.php:120
-#, php-format
-msgid "Add or edit %s design"
-msgstr "Ø·Ø±Ø %s Ø±Ø§ Ø§Ø¶Ø§ÙÙ ÛØ§ ÙÛØ±Ø§ÛØ´ Ú©ÙÛØ¯"
-
 #: lib/groupsbymemberssection.php:71
 msgid "Groups with most members"
 msgstr "Ú¯Ø±ÙÙ ÙØ§Û Ø¨Ø§ Ø§Ø¹Ø¶Ø§Ø¡ Ø¨ÛØ´ØªØ±"
@@ -6044,7 +6048,8 @@ msgstr "ÙØ±ÙØª(ÙØ§ÛÙ) Ø¹Ú©Ø³ Ù¾Ø´ØªÛØ¨Ø§ÙÛ ÙØ´Ø¯Ù."
 msgid "That file is too big. The maximum file size is %s."
 msgstr "Ø§ÛÙ Ù¾Ø±ÙÙØ¯Ù Ø®ÛÙÛ Ø¨Ø²Ø±Ú¯ Ø§Ø³Øª. Ø¨ÛØ´ÛÙÙÙ Ø§ÙØ¯Ø§Ø²ÙÙ Ù¾Ø±ÙÙØ¯Ù %s Ø§Ø³Øª."
 
-#: lib/imagefile.php:101 lib/mediafile.php:170
+#. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
+#: lib/imagefile.php:101 lib/mediafile.php:179
 msgid "System error uploading file."
 msgstr "ÙÙÚ¯Ø§Ù Ø¨Ø§Ø±Ú¯Ø°Ø§Ø±Û Ù¾Ø±ÙÙØ¯Ù Ø®Ø·Ø§Û Ø³ÛØ³ØªÙÛ Ø±Ø® Ø¯Ø§Ø¯."
 
@@ -6444,59 +6449,61 @@ msgstr "Ø¨Ø§ Ø¹Ø±Ø¶ Ù¾ÙØ²Ø´Ø Ø§Ø¬Ø§Ø²ÙâÛ ÙØ±ÙØ¯Û Ù¾Ø³Øª Ø§ÙÚ©ØªØ±ÙÙ
 msgid "Unsupported message type: %s"
 msgstr "ÙÙØ¹ Ù¾ÛØ§Ù Ù¾Ø´ØªÛØ¨Ø§ÙÛ ÙØ´Ø¯Ù Ø§Ø³Øª: %s"
 
-#: lib/mediafile.php:98 lib/mediafile.php:123
+#. TRANS: Client exception thrown when a database error was thrown during a file upload operation.
+#: lib/mediafile.php:99 lib/mediafile.php:125
 msgid "There was a database error while saving your file. Please try again."
 msgstr ""
 "ÛÚ© Ø®Ø·Ø§Û Ù¾Ø§ÛÚ¯Ø§Ù Ø¯Ø§Ø¯Ù ÙÙÚ¯Ø§Ù Ø°Ø®ÛØ±Ù Ú©Ø±Ø¯Ù ÙØ§ÛÙ Ø´ÙØ§ Ø±Ø® Ø¯Ø§Ø¯. ÙØ·ÙØ§ Ø¨Ø¹Ø¯Ø§ Ø³Ø¹Û Ú©ÙÛØ¯."
 
-#: lib/mediafile.php:142
+#. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
+#: lib/mediafile.php:145
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
 msgstr ""
 
-#: lib/mediafile.php:147
+#. TRANS: Client exception.
+#: lib/mediafile.php:151
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form."
 msgstr ""
 
-#: lib/mediafile.php:152
+#. TRANS: Client exception.
+#: lib/mediafile.php:157
 msgid "The uploaded file was only partially uploaded."
 msgstr "ÙØªÙØ§ Ø§ÙØ¯Ú©Û Ø§Ø² ÙØ§ÛÙ Ø¨Ø§Ø±Ú¯Ø°Ø§Ø±ÛâØ´Ø¯Ù ÙØ±Ø³ØªØ§Ø¯Ù Ø´Ø¯."
 
-#: lib/mediafile.php:159
+#. TRANS: Client exception thrown when a temporary folder is not present to store a file upload.
+#: lib/mediafile.php:165
 msgid "Missing a temporary folder."
 msgstr "Ú¯Ù Ø´Ø¯Ù ÛÚ© Ù¾ÙØ´Ù Û ÙÙÙØªÛ."
 
-#: lib/mediafile.php:162
+#. TRANS: Client exception thrown when writing to disk is not possible during a file upload operation.
+#: lib/mediafile.php:169
 msgid "Failed to write file to disk."
 msgstr "Ø´Ú©Ø³Øª Ø®ÙØ±Ø¯Ù Ø¯Ø± ÙÙØ´ØªÙ ÙØ§ÛÙ Ø±ÙÛ Ø¯ÛØ³Ú©."
 
-#: lib/mediafile.php:165
+#. TRANS: Client exception thrown when a file upload operation has been stopped by an extension.
+#: lib/mediafile.php:173
 msgid "File upload stopped by extension."
 msgstr "Ø¨Ø§Ø±Ú¯Ø°Ø§Ø±Û Ù¾Ø±ÙÙØ¯Ù ØªÙØ³Ø· Ø§ÙØ²ÙÙÙ ÙØªÙÙÙ Ø´Ø¯."
 
-#: lib/mediafile.php:179 lib/mediafile.php:217
+#. TRANS: Client exception thrown when a file upload operation would cause a user to exceed a set quota.
+#: lib/mediafile.php:189 lib/mediafile.php:232
 msgid "File exceeds user's quota."
 msgstr "Ù¾Ø±ÙÙØ¯Ù Ø§Ø² Ø³ÙÙÛÙÙ Ú©Ø§Ø±Ø¨Ø± ÙÛâÚ¯Ø°Ø±Ø¯."
 
-#: lib/mediafile.php:197 lib/mediafile.php:234
+#. TRANS: Client exception thrown when a file upload operation fails because the file could
+#. TRANS: not be moved from the temporary folder to the permanent file location.
+#: lib/mediafile.php:209 lib/mediafile.php:251
 msgid "File could not be moved to destination directory."
 msgstr "ÙØ§ÛÙ ÙØªÙØ§ÙØ³Øª Ø¨Ù Ø¯Ø§ÛØ±Ú©ØªÙØ±Û ÙÙØµØ¯ ÙÙØªÙÙ Ø´ÙØ¯."
 
-#: lib/mediafile.php:202 lib/mediafile.php:238
+#. TRANS: Client exception thrown when a file upload operation has been stopped because the MIME
+#. TRANS: type of the uploaded file could not be determined.
+#: lib/mediafile.php:216 lib/mediafile.php:257
 msgid "Could not determine file's MIME type."
 msgstr "ÙÙÛâØªÙØ§Ù ÙØ±ÙØª Ù¾Ø±ÙÙØ¯Ù Ø±Ø§ ØªØ¹ÛÛÙ Ú©Ø±Ø¯."
 
-#: lib/mediafile.php:318
-#, php-format
-msgid " Try using another %s format."
-msgstr "ØªÙØ§Ø´ Ø¨Ø±Ø§Û Ø§ÙØªØØ§Ù ÙÙØ¹ Ø¯ÛÚ¯Ø± %s"
-
-#: lib/mediafile.php:323
-#, php-format
-msgid "%s is not a supported file type on this server."
-msgstr "%s ÛÚ© Ú¯ÙÙÙÙ Ù¾Ø±ÙÙØ¯ÙÙ Ù¾ÛØ´ØªÛØ¨Ø§ÙÛ Ø´Ø¯Ù Ø±ÙÛ Ø§ÛÙ Ú©Ø§Ø±Ú¯Ø²Ø§Ø± ÙÛØ³Øª."
-
 #: lib/messageform.php:120
 msgid "Send a direct notice"
 msgstr "ÙØ±Ø³ØªØ§Ø¯Ù ÛÚ© Ù¾ÛØ§Ù ÙØ³ØªÙÛÙ"
@@ -6607,27 +6614,7 @@ msgstr "ÛØ§Ø¯Ø¢ÙØ±ÛâÚ©Ø±Ø¯Ù"
 msgid "Send a nudge to this user"
 msgstr "ÛÚ© ÛØ§Ø¯Ø¢ÙØ±Û Ø¨Ù Ø§ÛÙ Ú©Ø§Ø±Ø¨Ø± ÙØ±Ø³ØªØ§Ø¯Ù Ø´ÙØ¯"
 
-#: lib/oauthstore.php:283
-msgid "Error inserting new profile"
-msgstr "ÙÙÚ¯Ø§Ù ÙØ±Ø§Ø± Ø¯Ø§Ø¯Ù ÙÙØ§ÛÙÙ ØªØ§Ø²Ù Ø®Ø·Ø§ Ø±Ø® Ø¯Ø§Ø¯"
-
-#: lib/oauthstore.php:291
-msgid "Error inserting avatar"
-msgstr "ÙÙÚ¯Ø§Ù Ø§ÙØ²ÙØ¯Ù ÚÙØ±Ù Ø®Ø·Ø§ÛÛ Ø±Ø® Ø¯Ø§Ø¯"
-
-#: lib/oauthstore.php:306
-msgid "Error updating remote profile"
-msgstr "ÙÙÚ¯Ø§Ù Ø¨ÙâØ±ÙØ² Ú©Ø±Ø¯Ù ÙÙØ§ÛÙÙ Ø§Ø² Ø±Ø§Ù Ø¯ÙØ± Ø®Ø·Ø§ Ø±Ø® Ø¯Ø§Ø¯"
-
-#: lib/oauthstore.php:311
-msgid "Error inserting remote profile"
-msgstr "ÙÙÚ¯Ø§Ù Ø§ÙØ²ÙØ¯Ù ÙÙØ§ÛÙÙ Ø§Ø²Ø±Ø§ÙâØ¯ÙØ± Ø®Ø·Ø§ÛÛ Ø±Ø® Ø¯Ø§Ø¯"
-
-#: lib/oauthstore.php:345
-msgid "Duplicate notice"
-msgstr "Ø±ÙÙÙØ´ØªâØ¨Ø±Ø¯Ø§Ø±Û Ø§Ø² Ù¾ÛØ§Ù"
-
-#: lib/oauthstore.php:490
+#: lib/oauthstore.php:491
 msgid "Couldn't insert new subscription."
 msgstr "ÙÙÛâØªÙØ§Ù Ø§Ø´ØªØ±Ø§Ú© ØªØ§Ø²ÙâØ§Û Ø§ÙØ²ÙØ¯."
 
@@ -6664,7 +6651,8 @@ msgstr "Ù¾ÛØ§ÙâÙØ§Û ÙØ±Ø³ØªØ§Ø¯Ù Ø´Ø¯ÙÙ Ø´ÙØ§"
 msgid "Tags in %s's notices"
 msgstr "Ø¨Ø±ÚØ³Ø¨âÙØ§ Ø¯Ø± Ù¾ÛØ§ÙâÙØ§Û %s"
 
-#: lib/plugin.php:115
+#. TRANS: Displayed as version information for a plugin if no version information was found.
+#: lib/plugin.php:116
 msgid "Unknown"
 msgstr "ÙØ§Ø´ÙØ§Ø®ØªÙ"
 
@@ -6746,19 +6734,19 @@ msgstr "Ø¯Ø³ØªØ±Ø³Û Ú©Ø§Ø±Ø¨Ø± Ø¨Ù Ú¯Ø±ÙÙ ÙØ³Ø¯ÙØ¯ Ø´ÙØ¯"
 msgid "No single user defined for single-user mode."
 msgstr "ÙÛÚ Ú©Ø§Ø±Ø¨Ø± ØªÙÙØ§ÛÛ Ø¨Ø±Ø§Û ØØ§ÙØª ØªÚ© Ú©Ø§Ø±Ø¨Ø±Ù ÙØ´Ø®Øµ ÙØ´Ø¯Ù Ø§Ø³Øª."
 
-#: lib/searchaction.php:120
+#. TRANS: Fieldset legend for the search form.
+#: lib/searchaction.php:121
 msgid "Search site"
 msgstr "Ø¬Ø³ØªâÙØ¬ÙÛ ÙØ¨âÚ¯Ø§Ù"
 
-#: lib/searchaction.php:126
+#. TRANS: Used as a field label for the field where one or more keywords
+#. TRANS: for searching can be entered.
+#: lib/searchaction.php:129
 msgid "Keyword(s)"
 msgstr "Ú©ÙÙÙ(ÙØ§Û) Ú©ÙÛØ¯Û"
 
-#: lib/searchaction.php:127
-msgid "Search"
-msgstr "Ø¬Ø³ØªâÙØ¬Ù"
-
-#: lib/searchaction.php:162
+#. TRANS: Definition list item with instructions on how to get (better) search results.
+#: lib/searchaction.php:170
 msgid "Search help"
 msgstr "Ø±Ø§ÙÙÙØ§Û Ø¬Ø³ØªØ¬Ù"
 
@@ -6934,56 +6922,32 @@ msgid "Moderator"
 msgstr "ÙØ¯ÛØ±"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1102
+#: lib/util.php:1103
 msgid "a few seconds ago"
 msgstr "ÚÙØ¯ Ø«Ø§ÙÛÙ Ù¾ÛØ´"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1105
+#: lib/util.php:1106
 msgid "about a minute ago"
 msgstr "ØØ¯ÙØ¯ ÛÚ© Ø¯ÙÛÙÙ Ù¾ÛØ´"
 
-#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1109
-#, php-format
-msgid "about %d minutes ago"
-msgstr "ØØ¯ÙØ¯ %d Ø¯ÙÛÙÙ Ù¾ÛØ´"
-
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 #: lib/util.php:1112
 msgid "about an hour ago"
 msgstr "ØØ¯ÙØ¯ ÛÚ© Ø³Ø§Ø¹Øª Ù¾ÛØ´"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1116
-#, php-format
-msgid "about %d hours ago"
-msgstr "ØØ¯ÙØ¯ %d Ø³Ø§Ø¹Øª Ù¾ÛØ´"
-
-#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1119
+#: lib/util.php:1118
 msgid "about a day ago"
 msgstr "ØØ¯ÙØ¯ ÛÚ© Ø±ÙØ² Ù¾ÛØ´"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1123
-#, php-format
-msgid "about %d days ago"
-msgstr "ØØ¯ÙØ¯ %d Ø±ÙØ² Ù¾ÛØ´"
-
-#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1126
+#: lib/util.php:1124
 msgid "about a month ago"
 msgstr "ØØ¯ÙØ¯ ÛÚ© ÙØ§Ù Ù¾ÛØ´"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 #: lib/util.php:1130
-#, php-format
-msgid "about %d months ago"
-msgstr "ØØ¯ÙØ¯ %d ÙØ§Ù Ù¾ÛØ´"
-
-#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1133
 msgid "about a year ago"
 msgstr "ØØ¯ÙØ¯ ÛÚ© Ø³Ø§Ù Ù¾ÛØ´"
 
diff --git a/locale/fi/LC_MESSAGES/statusnet.po b/locale/fi/LC_MESSAGES/statusnet.po
index 5cb62b22da..fd00b99d7d 100644
--- a/locale/fi/LC_MESSAGES/statusnet.po
+++ b/locale/fi/LC_MESSAGES/statusnet.po
@@ -1,8 +1,12 @@
-# Translation of StatusNet to Finnish
+# Translation of StatusNet to Finnish (Suomi)
+# Expored from translatewiki.net
 #
-# Author@translatewiki.net: Crt
-# Author@translatewiki.net: Jaakko
-# Author@translatewiki.net: McDutchie
+# Author: Crt
+# Author: Jaakko
+# Author: Josutus
+# Author: McDutchie
+# Author: Nike
+# Author: Str4nd
 # --
 # This file is distributed under the same license as the StatusNet package.
 #
@@ -10,16 +14,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-08 22:33+0000\n"
-"PO-Revision-Date: 2010-09-08 22:34:01+0000\n"
-"Language-Team: Finnish\n"
+"POT-Creation-Date: 2010-09-14 19:53+0000\n"
+"PO-Revision-Date: 2010-09-14 19:53:53+0000\n"
+"Language-Team: Finnish <http://translatewiki.net/wiki/Portal:fi>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r72348); Translate extension (2010-08-20)\n"
+"X-Generator: MediaWiki 1.17alpha (r73009); Translate extension (2010-08-20)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fi\n"
-"X-Message-Group: out-statusnet\n"
+"X-Message-Group: #out-statusnet\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-POT-Import-Date: 1284-49-16 34::+0000\n"
 
 #. TRANS: Checkbox instructions for admin setting "Private"
 #: actions/accessadminpanel.php:165
@@ -41,23 +46,34 @@ msgstr ""
 msgid "Closed"
 msgstr "Suljettu"
 
+#. 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 in the "Edit application" form.
+#: actions/accessadminpanel.php:203 actions/emailsettings.php:228
+#: actions/imsettings.php:187 actions/smssettings.php:209
+#: lib/applicationeditform.php:351
+msgctxt "BUTTON"
+msgid "Save"
+msgstr "Tallenna"
+
 #. TRANS: Server error when page not found (404)
 #: actions/all.php:68 actions/public.php:98 actions/replies.php:93
 #: actions/showfavorites.php:138 actions/tag.php:52
 msgid "No such page."
-msgstr "Tuota tagia ei ole."
+msgstr "Sivua ei ole."
 
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #: actions/all.php:79 actions/allrss.php:68
-#: actions/apiaccountupdatedeliverydevice.php:114
-#: actions/apiaccountupdateprofile.php:105
-#: actions/apiaccountupdateprofilebackgroundimage.php:116
-#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
-#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
-#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:113
-#: actions/apigroupismember.php:91 actions/apigroupjoin.php:100
-#: actions/apigroupleave.php:100 actions/apigrouplist.php:73
-#: actions/apistatusesupdate.php:229 actions/apisubscriptions.php:87
+#: actions/apiaccountupdatedeliverydevice.php:115
+#: actions/apiaccountupdateprofile.php:106
+#: actions/apiaccountupdateprofilebackgroundimage.php:117
+#: actions/apiaccountupdateprofileimage.php:106 actions/apiblockcreate.php:98
+#: actions/apiblockdestroy.php:97 actions/apidirectmessage.php:77
+#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:114
+#: actions/apigroupismember.php:91 actions/apigroupjoin.php:101
+#: actions/apigroupleave.php:101 actions/apigrouplist.php:73
+#: actions/apistatusesupdate.php:230 actions/apisubscriptions.php:87
 #: actions/apitimelinefavorites.php:72 actions/apitimelinefriends.php:174
 #: actions/apitimelinehome.php:80 actions/apitimelinementions.php:80
 #: actions/apitimelineuser.php:82 actions/avatarbynickname.php:75
@@ -72,12 +88,6 @@ msgstr "Tuota tagia ei ole."
 msgid "No such user."
 msgstr "KÃ¤yttÃ¤jÃ¤Ã¤ ei ole."
 
-#. TRANS: Page title. %1$s is user nickname, %2$d is page number
-#: actions/all.php:90
-#, php-format
-msgid "%1$s and friends, page %2$d"
-msgstr "%s ja kaverit"
-
 #. TRANS: Page title. %1$s is user nickname
 #. TRANS: H1 text. %1$s is user nickname
 #. TRANS: Message is used as link title. %s is a user nickname.
@@ -121,8 +131,8 @@ msgid ""
 "Try subscribing to more people, [join a group](%%action.groups%%) or post "
 "something yourself."
 msgstr ""
-"Kokeile useamman kÃ¤yttÃ¤jÃ¤n tilaamista, [liity ryhmÃ¤Ã¤n] (%%action.groups%%) "
-"tai lÃ¤hetÃ¤ pÃ¤ivitys itse."
+"Kokeile useamman kÃ¤yttÃ¤jÃ¤n tilaamista [liittymÃ¤llÃ¤ ryhmÃ¤Ã¤n](%%action.groups%"
+"%) tai kirjoita pÃ¤ivitys."
 
 #: actions/all.php:149 actions/replies.php:210 actions/showstream.php:211
 #, php-format
@@ -134,7 +144,7 @@ msgstr ""
 #. TRANS: H1 text
 #: actions/all.php:182
 msgid "You and friends"
-msgstr "SinÃ¤ ja kaverit"
+msgstr "SinÃ¤ ja kaverisi"
 
 #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
 #. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name.
@@ -144,39 +154,74 @@ msgstr "SinÃ¤ ja kaverit"
 msgid "Updates from %1$s and friends on %2$s!"
 msgstr "KÃ¤yttÃ¤jÃ¤n %1$s ja kavereiden pÃ¤ivitykset palvelussa %2$s!"
 
-#: actions/apiaccountupdatedeliverydevice.php:86
-#: actions/apiaccountupdateprofile.php:89
-#: actions/apiaccountupdateprofilebackgroundimage.php:86
-#: actions/apiaccountupdateprofilecolors.php:110
-#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89
-#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109
-#: actions/apifavoritecreate.php:91 actions/apifavoritedestroy.php:92
-#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
-#: actions/apigroupcreate.php:105 actions/apigroupjoin.php:92
-#: actions/apigroupleave.php:92 actions/apimediaupload.php:67
-#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:198
+#: actions/apiaccountratelimitstatus.php:72
+#: actions/apiaccountupdatedeliverydevice.php:95
+#: actions/apiaccountupdateprofile.php:98
+#: actions/apiaccountupdateprofilebackgroundimage.php:95
+#: actions/apiaccountupdateprofilecolors.php:119
+#: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156
+#: actions/apifavoritecreate.php:101 actions/apifavoritedestroy.php:102
+#: actions/apifriendshipscreate.php:101 actions/apifriendshipsdestroy.php:101
+#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:140
+#: actions/apigroupismember.php:115 actions/apigroupjoin.php:157
+#: actions/apigroupleave.php:143 actions/apigrouplist.php:137
+#: actions/apigrouplistall.php:122 actions/apigroupmembership.php:107
+#: actions/apigroupshow.php:116 actions/apihelptest.php:88
+#: actions/apistatusesdestroy.php:104 actions/apistatusesretweets.php:112
+#: actions/apistatusesshow.php:109 actions/apistatusnetconfig.php:141
+#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
+#: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:271
+#: actions/apitimelinegroup.php:154 actions/apitimelinehome.php:175
+#: actions/apitimelinementions.php:174 actions/apitimelinepublic.php:241
+#: actions/apitimelineretweetedtome.php:121
+#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:161
+#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
+msgid "API method not found."
+msgstr "API-metodia ei lÃ¶ytynyt."
+
+#. TRANS: Client error message. POST is a HTTP command. It should not be translated.
+#. TRANS: Client error. POST is a HTTP command. It should not be translated.
+#: actions/apiaccountupdatedeliverydevice.php:87
+#: actions/apiaccountupdateprofile.php:90
+#: actions/apiaccountupdateprofilebackgroundimage.php:87
+#: actions/apiaccountupdateprofilecolors.php:111
+#: actions/apiaccountupdateprofileimage.php:85 actions/apiblockcreate.php:90
+#: actions/apiblockdestroy.php:89 actions/apidirectmessagenew.php:110
+#: actions/apifavoritecreate.php:92 actions/apifavoritedestroy.php:93
+#: actions/apifriendshipscreate.php:92 actions/apifriendshipsdestroy.php:92
+#: actions/apigroupcreate.php:106 actions/apigroupjoin.php:93
+#: actions/apigroupleave.php:93 actions/apimediaupload.php:68
+#: actions/apistatusesretweet.php:66 actions/apistatusesupdate.php:199
 msgid "This method requires a POST."
-msgstr "TÃ¤mÃ¤ metodi edellyttÃ¤Ã¤ POST sanoman."
+msgstr "TÃ¤mÃ¤ metodi edellyttÃ¤Ã¤ POST-pyynnÃ¶n."
 
-#: actions/apiaccountupdatedeliverydevice.php:106
+#: actions/apiaccountupdatedeliverydevice.php:107
 msgid ""
 "You must specify a parameter named 'device' with a value of one of: sms, im, "
 "none."
 msgstr ""
 
-#: actions/apiaccountupdateprofile.php:112
-#: actions/apiaccountupdateprofilebackgroundimage.php:194
-#: actions/apiaccountupdateprofilecolors.php:185
-#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/apiaccountupdatedeliverydevice.php:134
+msgid "Could not update user."
+msgstr "KÃ¤yttÃ¤jÃ¤n pÃ¤ivitys epÃ¤onnistui."
+
+#: actions/apiaccountupdateprofile.php:113
+#: actions/apiaccountupdateprofilebackgroundimage.php:195
+#: actions/apiaccountupdateprofilecolors.php:186
+#: actions/apiaccountupdateprofileimage.php:131 actions/apiusershow.php:108
 #: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/hcard.php:74
 #: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
 #: lib/profileaction.php:84
 msgid "User has no profile."
 msgstr "KÃ¤yttÃ¤jÃ¤llÃ¤ ei ole profiilia."
 
-#: actions/apiaccountupdateprofilebackgroundimage.php:108
-#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
-#: actions/apistatusesupdate.php:212 actions/avatarsettings.php:257
+#: actions/apiaccountupdateprofile.php:148
+msgid "Could not save profile."
+msgstr "Profiilin tallennus epÃ¤onnistui."
+
+#: actions/apiaccountupdateprofilebackgroundimage.php:109
+#: actions/apiaccountupdateprofileimage.php:98 actions/apimediaupload.php:81
+#: actions/apistatusesupdate.php:213 actions/avatarsettings.php:257
 #: actions/designadminpanel.php:123 actions/editapplication.php:118
 #: actions/newapplication.php:101 actions/newnotice.php:94
 #: lib/designsettings.php:283
@@ -186,15 +231,25 @@ msgid ""
 "current configuration."
 msgstr ""
 
-#: actions/apiblockcreate.php:105
+#: actions/apiaccountupdateprofilebackgroundimage.php:137
+#: actions/apiaccountupdateprofilebackgroundimage.php:147
+#: actions/apiaccountupdateprofilecolors.php:165
+#: actions/apiaccountupdateprofilecolors.php:175
+#: actions/groupdesignsettings.php:290 actions/groupdesignsettings.php:300
+#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
+#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
+msgid "Unable to save your design settings."
+msgstr "Ulkoasun tallennus epÃ¤onnistui."
+
+#: actions/apiblockcreate.php:106
 msgid "You cannot block yourself!"
 msgstr "SinÃ¤ et voi poistaa kÃ¤yttÃ¤jiÃ¤."
 
-#: actions/apiblockcreate.php:126
+#: actions/apiblockcreate.php:127
 msgid "Block user failed."
 msgstr "KÃ¤yttÃ¤jÃ¤n esto epÃ¤onnistui."
 
-#: actions/apiblockdestroy.php:114
+#: actions/apiblockdestroy.php:115
 msgid "Unblock user failed."
 msgstr "KÃ¤yttÃ¤jÃ¤n eston poisto epÃ¤onnistui."
 
@@ -218,59 +273,50 @@ msgstr "Suorat viestit kÃ¤yttÃ¤jÃ¤lle %s"
 msgid "All the direct messages sent to %s"
 msgstr "Kaikki suorat viestit kÃ¤yttÃ¤jÃ¤lle %s"
 
-#: actions/apidirectmessagenew.php:118
+#: actions/apidirectmessagenew.php:119
 msgid "No message text!"
 msgstr "ViestissÃ¤ ei ole tekstiÃ¤!"
 
-#: actions/apidirectmessagenew.php:127 actions/newmessage.php:150
+#: actions/apidirectmessagenew.php:128 actions/newmessage.php:150
 #, php-format
 msgid "That's too long. Max message size is %d chars."
 msgstr "Liian pitkÃ¤ pÃ¤ivitys. Maksimikoko pÃ¤ivitykselle on %d merkkiÃ¤."
 
-#: actions/apidirectmessagenew.php:138
+#: actions/apidirectmessagenew.php:139
 msgid "Recipient user not found."
 msgstr "Vastaanottajaa ei lÃ¶ytynyt."
 
-#: actions/apidirectmessagenew.php:142
-msgid "Can't send direct messages to users who aren't your friend."
-msgstr ""
-"Et voi lÃ¤hettÃ¤Ã¤ suoraa viestiÃ¤ kÃ¤yttÃ¤jÃ¤lle, jonka kanssa et ole vielÃ¤ kaveri."
-
-#: actions/apifavoritecreate.php:109 actions/apifavoritedestroy.php:110
+#: actions/apifavoritecreate.php:110 actions/apifavoritedestroy.php:111
 #: actions/apistatusesdestroy.php:121
 msgid "No status found with that ID."
 msgstr "KÃ¤yttÃ¤jÃ¤tunnukselle ei lÃ¶ytynyt statusviestiÃ¤."
 
 #. TRANS: Error message text shown when a favorite could not be set.
-#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:296
+#: actions/apifavoritecreate.php:132 actions/favor.php:84 lib/command.php:296
 msgid "Could not create favorite."
 msgstr "Ei voitu lisÃ¤tÃ¤ suosikiksi."
 
-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
+#: actions/apifavoritedestroy.php:136 actions/disfavor.php:87
 msgid "Could not delete favorite."
 msgstr "Ei voitu poistaa suosikkia."
 
-#: actions/apifriendshipscreate.php:109
+#: actions/apifriendshipscreate.php:110
 msgid "Could not follow user: profile not found."
 msgstr "Ei voitu lopettaa tilausta: KÃ¤yttÃ¤jÃ¤Ã¤ ei lÃ¶ytynyt."
 
-#: actions/apifriendshipscreate.php:118
+#: actions/apifriendshipscreate.php:119
 #, php-format
 msgid "Could not follow user: %s is already on your list."
 msgstr "Ei voitu tilata kÃ¤yttÃ¤jÃ¤Ã¤: %s on jo listallasi"
 
-#: actions/apifriendshipsdestroy.php:109
+#: actions/apifriendshipsdestroy.php:110
 msgid "Could not unfollow user: User not found."
 msgstr "Ei voitu lopettaa tilausta: KÃ¤yttÃ¤jÃ¤Ã¤ ei lÃ¶ytynyt."
 
-#: actions/apifriendshipsdestroy.php:120
+#: actions/apifriendshipsdestroy.php:121
 msgid "You cannot unfollow yourself."
 msgstr "SinÃ¤ et voi poistaa kÃ¤yttÃ¤jiÃ¤."
 
-#: actions/apifriendshipsexists.php:91
-msgid "Two valid IDs or screen_names must be supplied."
-msgstr ""
-
 #: actions/apifriendshipsshow.php:134
 msgid "Could not determine source user."
 msgstr "Ei voitu pÃ¤ivittÃ¤Ã¤ kÃ¤yttÃ¤jÃ¤Ã¤."
@@ -279,7 +325,7 @@ msgstr "Ei voitu pÃ¤ivittÃ¤Ã¤ kÃ¤yttÃ¤jÃ¤Ã¤."
 msgid "Could not find target user."
 msgstr "Ei voitu pÃ¤ivittÃ¤Ã¤ kÃ¤yttÃ¤jÃ¤Ã¤."
 
-#: actions/apigroupcreate.php:167 actions/editgroup.php:186
+#: actions/apigroupcreate.php:168 actions/editgroup.php:186
 #: actions/newgroup.php:126 actions/profilesettings.php:215
 #: actions/register.php:212
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
@@ -287,83 +333,83 @@ msgstr ""
 "KÃ¤yttÃ¤jÃ¤tunnuksessa voi olla ainoastaan pieniÃ¤ kirjaimia ja numeroita ilman "
 "vÃ¤lilyÃ¶ntiÃ¤."
 
-#: actions/apigroupcreate.php:176 actions/editgroup.php:190
+#: actions/apigroupcreate.php:177 actions/editgroup.php:190
 #: actions/newgroup.php:130 actions/profilesettings.php:238
 #: actions/register.php:215
 msgid "Nickname already in use. Try another one."
 msgstr "Tunnus on jo kÃ¤ytÃ¶ssÃ¤. YritÃ¤ toista tunnusta."
 
-#: actions/apigroupcreate.php:183 actions/editgroup.php:193
+#: actions/apigroupcreate.php:184 actions/editgroup.php:193
 #: actions/newgroup.php:133 actions/profilesettings.php:218
 #: actions/register.php:217
 msgid "Not a valid nickname."
 msgstr "Tuo ei ole kelvollinen tunnus."
 
-#: actions/apigroupcreate.php:199 actions/editapplication.php:215
+#: actions/apigroupcreate.php:200 actions/editapplication.php:215
 #: actions/editgroup.php:199 actions/newapplication.php:203
 #: actions/newgroup.php:139 actions/profilesettings.php:222
 #: actions/register.php:224
 msgid "Homepage is not a valid URL."
 msgstr "Kotisivun verkko-osoite ei ole toimiva."
 
-#: actions/apigroupcreate.php:208 actions/editgroup.php:202
+#: actions/apigroupcreate.php:209 actions/editgroup.php:202
 #: actions/newgroup.php:142 actions/profilesettings.php:225
 #: actions/register.php:227
 msgid "Full name is too long (max 255 chars)."
 msgstr "Koko nimi on liian pitkÃ¤ (max 255 merkkiÃ¤)."
 
-#: actions/apigroupcreate.php:216 actions/editapplication.php:190
+#: actions/apigroupcreate.php:217 actions/editapplication.php:190
 #: actions/newapplication.php:172
 #, php-format
 msgid "Description is too long (max %d chars)."
 msgstr "kuvaus on liian pitkÃ¤ (max %d merkkiÃ¤)."
 
-#: actions/apigroupcreate.php:227 actions/editgroup.php:208
+#: actions/apigroupcreate.php:228 actions/editgroup.php:208
 #: actions/newgroup.php:148 actions/profilesettings.php:232
 #: actions/register.php:234
 msgid "Location is too long (max 255 chars)."
 msgstr "Kotipaikka on liian pitkÃ¤ (max 255 merkkiÃ¤)."
 
-#: actions/apigroupcreate.php:246 actions/editgroup.php:219
+#: actions/apigroupcreate.php:247 actions/editgroup.php:219
 #: actions/newgroup.php:159
 #, php-format
 msgid "Too many aliases! Maximum %d."
 msgstr "Liikaa aliaksia. MaksimimÃ¤Ã¤rÃ¤ on %d."
 
-#: actions/apigroupcreate.php:276 actions/editgroup.php:232
+#: actions/apigroupcreate.php:277 actions/editgroup.php:232
 #: actions/newgroup.php:172
 #, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr "Alias \"%s\" on jo kÃ¤ytÃ¶ssÃ¤. YritÃ¤ toista aliasta."
 
-#: actions/apigroupcreate.php:289 actions/editgroup.php:238
+#: actions/apigroupcreate.php:290 actions/editgroup.php:238
 #: actions/newgroup.php:178
 msgid "Alias can't be the same as nickname."
 msgstr "Alias ei voi olla sama kuin ryhmÃ¤tunnus."
 
-#: actions/apigroupismember.php:96 actions/apigroupjoin.php:105
-#: actions/apigroupleave.php:105 actions/apigroupmembership.php:92
+#: actions/apigroupismember.php:96 actions/apigroupjoin.php:106
+#: actions/apigroupleave.php:106 actions/apigroupmembership.php:92
 #: actions/apigroupshow.php:83 actions/apitimelinegroup.php:92
 msgid "Group not found."
 msgstr "Ei lÃ¶ytynyt."
 
 #. TRANS: Error text shown a user tries to join a group they already are a member of.
-#: actions/apigroupjoin.php:111 actions/joingroup.php:100 lib/command.php:336
+#: actions/apigroupjoin.php:112 actions/joingroup.php:100 lib/command.php:336
 msgid "You are already a member of that group."
 msgstr "SinÃ¤ kuulut jo tÃ¤hÃ¤n ryhmÃ¤Ã¤n."
 
 #. TRANS: Error text shown when a user tries to join a group they are blocked from joining.
-#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:341
+#: actions/apigroupjoin.php:121 actions/joingroup.php:105 lib/command.php:341
 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."
 
-#: actions/apigroupleave.php:115
+#: actions/apigroupleave.php:116
 msgid "You are not a member of this group."
 msgstr "SinÃ¤ et kuulu tÃ¤hÃ¤n ryhmÃ¤Ã¤n."
 
 #. 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.
-#: actions/apigroupleave.php:125 actions/leavegroup.php:129
+#: actions/apigroupleave.php:126 actions/leavegroup.php:129
 #: lib/command.php:401
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
@@ -382,7 +428,7 @@ msgstr "KÃ¤yttÃ¤jÃ¤n %s ryhmÃ¤t"
 msgid "%s groups"
 msgstr "KÃ¤yttÃ¤jÃ¤n %s ryhmÃ¤t"
 
-#: actions/apimediaupload.php:99
+#: actions/apimediaupload.php:100
 msgid "Upload failed."
 msgstr "Komento epÃ¤onnistui"
 
@@ -392,9 +438,9 @@ msgstr ""
 
 #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
 #: actions/deletenotice.php:169 actions/disfavor.php:74
-#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:55
+#: actions/emailsettings.php:271 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:66 actions/imsettings.php:227
+#: actions/groupunblock.php:66 actions/imsettings.php:230
 #: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
@@ -427,8 +473,8 @@ msgstr ""
 #. 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:286 actions/grouplogo.php:322
-#: actions/imsettings.php:242 actions/newapplication.php:121
+#: actions/emailsettings.php:290 actions/grouplogo.php:322
+#: actions/imsettings.php:245 actions/newapplication.php:121
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
 #: actions/smssettings.php:277 lib/designsettings.php:304
 msgid "Unexpected form submission."
@@ -481,13 +527,13 @@ msgstr "TÃ¤mÃ¤ metodi edellyttÃ¤Ã¤ joko POST tai DELETE sanoman."
 msgid "You may not delete another user's status."
 msgstr "Et voi poistaa toisen kÃ¤yttÃ¤jÃ¤n pÃ¤ivitystÃ¤."
 
-#: actions/apistatusesretweet.php:75 actions/apistatusesretweets.php:72
+#: actions/apistatusesretweet.php:76 actions/apistatusesretweets.php:72
 #: actions/deletenotice.php:52 actions/shownotice.php:92
 msgid "No such notice."
 msgstr "PÃ¤ivitystÃ¤ ei ole."
 
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-#: actions/apistatusesretweet.php:91 lib/command.php:544
+#: actions/apistatusesretweet.php:92 lib/command.php:544
 msgid "Already repeated that notice."
 msgstr "TÃ¤tÃ¤ pÃ¤ivitystÃ¤ ei voi poistaa."
 
@@ -499,21 +545,21 @@ msgstr "PÃ¤ivitys poistettu."
 msgid "No status with that ID found."
 msgstr "KÃ¤yttÃ¤jÃ¤tunnukselle ei lÃ¶ytynyt statusviestiÃ¤."
 
-#: actions/apistatusesupdate.php:221
+#: actions/apistatusesupdate.php:222
 msgid "Client must provide a 'status' parameter with a value."
 msgstr ""
 
-#: actions/apistatusesupdate.php:242 actions/newnotice.php:157
+#: actions/apistatusesupdate.php:243 actions/newnotice.php:157
 #: lib/mailhandler.php:60
 #, php-format
 msgid "That's too long. Max notice size is %d chars."
 msgstr "PÃ¤ivitys on liian pitkÃ¤. Maksimipituus on %d merkkiÃ¤."
 
-#: actions/apistatusesupdate.php:283 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:284 actions/apiusershow.php:96
 msgid "Not found."
 msgstr "Ei lÃ¶ytynyt."
 
-#: actions/apistatusesupdate.php:306 actions/newnotice.php:181
+#: actions/apistatusesupdate.php:307 actions/newnotice.php:181
 #, php-format
 msgid "Max notice size is %d chars, including attachment URL."
 msgstr "Maksimikoko pÃ¤ivitykselle on %d merkkiÃ¤, mukaan lukien URL-osoite."
@@ -548,11 +594,6 @@ msgstr ""
 msgid "%s public timeline"
 msgstr "%s julkinen aikajana"
 
-#: actions/apitimelinepublic.php:202 actions/publicrss.php:105
-#, php-format
-msgid "%s updates from everyone!"
-msgstr "%s pÃ¤ivitykset kaikilta!"
-
 #: actions/apitimelinetag.php:105 actions/tag.php:67
 #, php-format
 msgid "Notices tagged with %s"
@@ -653,7 +694,7 @@ msgstr "Kuva poistettu."
 
 #: actions/block.php:69
 msgid "You already blocked that user."
-msgstr "Olet jos tilannut seuraavien kÃ¤yttÃ¤jien pÃ¤ivitykset:"
+msgstr "!!FUZZZY!!Olet jos tilannut seuraavien kÃ¤yttÃ¤jien pÃ¤ivitykset:"
 
 #: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158
 msgid "Block user"
@@ -685,7 +726,9 @@ msgid "Do not block this user"
 msgstr "ÃlÃ¤ estÃ¤ tÃ¤tÃ¤ kÃ¤yttÃ¤jÃ¤Ã¤"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
+#. TRANS: Submit button title.
+#. TRANS: Description of the form to block a user.
+#: actions/block.php:164 actions/groupmembers.php:403 lib/blockform.php:82
 msgid "Block this user"
 msgstr "EstÃ¤ tÃ¤mÃ¤ kÃ¤yttÃ¤jÃ¤"
 
@@ -717,11 +760,13 @@ msgstr "Lista kÃ¤yttÃ¤jistÃ¤, jotka ovat estetty liittymÃ¤stÃ¤ tÃ¤hÃ¤n ryhmÃ¤Ã¤n
 msgid "Unblock user from group"
 msgstr "Poista kÃ¤yttÃ¤jÃ¤n esto ryhmÃ¤stÃ¤"
 
-#: actions/blockedfromgroup.php:320 lib/unblockform.php:69
+#. TRANS: Title for the form to unblock a user.
+#: actions/blockedfromgroup.php:320 lib/unblockform.php:70
 msgid "Unblock"
 msgstr "Poista esto"
 
-#: actions/blockedfromgroup.php:320 lib/unblockform.php:80
+#. TRANS: Description of the form to unblock a user.
+#: actions/blockedfromgroup.php:320 lib/unblockform.php:82
 msgid "Unblock this user"
 msgstr "Poista esto tÃ¤ltÃ¤ kÃ¤yttÃ¤jÃ¤ltÃ¤"
 
@@ -743,12 +788,6 @@ msgstr "Vahvistuskoodia ei lÃ¶ytynyt."
 msgid "That confirmation code is not for you!"
 msgstr "TÃ¤mÃ¤ vahvistuskoodi ei ole sinun!"
 
-#. TRANS: Server error for an unknow address type, which can be 'email', 'jabber', or 'sms'.
-#: actions/confirmaddress.php:91
-#, php-format
-msgid "Unrecognized address type %s."
-msgstr ""
-
 #. TRANS: Client error for an already confirmed email/jabbel/sms address.
 #: actions/confirmaddress.php:96
 msgid "That address has already been confirmed."
@@ -760,9 +799,9 @@ msgstr "TÃ¤mÃ¤ osoite on jo vahvistettu."
 #. 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/confirmaddress.php:116 actions/emailsettings.php:331
+#: actions/emailsettings.php:477 actions/imsettings.php:283
+#: actions/imsettings.php:442 actions/othersettings.php:174
 #: actions/profilesettings.php:283 actions/smssettings.php:308
 #: actions/smssettings.php:464
 msgid "Couldn't update user."
@@ -770,7 +809,7 @@ msgstr "Ei voitu pÃ¤ivittÃ¤Ã¤ kÃ¤yttÃ¤jÃ¤Ã¤."
 
 #. 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/confirmaddress.php:128 actions/emailsettings.php:437
 #: actions/smssettings.php:422
 msgid "Couldn't delete email confirmation."
 msgstr "Ei voitu poistaa sÃ¤hkÃ¶postivahvistusta."
@@ -801,9 +840,10 @@ msgstr "Sinun pitÃ¤Ã¤ olla kirjautunut sisÃ¤Ã¤n, jotta voit erota ryhmÃ¤stÃ¤."
 msgid "Application not found."
 msgstr "Vahvistuskoodia ei lÃ¶ytynyt."
 
+#. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:127
 #: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1307
+#: lib/action.php:1315
 msgid "There was a problem with your session token."
 msgstr "Istuntoavaimesi kanssa oli ongelma."
 
@@ -820,7 +860,7 @@ msgstr ""
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
 #: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:73 lib/profileformaction.php:64
+#: lib/adminpanelaction.php:71 lib/profileformaction.php:64
 #: lib/settingsaction.php:72
 msgid "Not logged in."
 msgstr "Et ole kirjautunut sisÃ¤Ã¤n."
@@ -881,7 +921,6 @@ msgstr "Poista kÃ¤yttÃ¤jÃ¤"
 #. TRANS: Message used as title for design settings for the site.
 #. TRANS: Link description in user account settings menu.
 #: actions/designadminpanel.php:63 lib/accountsettingsaction.php:139
-#: lib/groupnav.php:119
 msgid "Design"
 msgstr "Ulkoasu"
 
@@ -897,10 +936,6 @@ msgstr "Vaihda vÃ¤riÃ¤"
 msgid "Site logo"
 msgstr "Palvelun ilmoitus"
 
-#: actions/designadminpanel.php:467
-msgid "Custom theme"
-msgstr ""
-
 #: actions/designadminpanel.php:471
 msgid "You can upload a custom StatusNet theme as a .ZIP archive."
 msgstr ""
@@ -952,13 +987,13 @@ msgstr ""
 msgid "Use defaults"
 msgstr "KÃ¤ytÃ¤ oletusasetuksia"
 
-#. TRANS: Submit button title
+#. TRANS: Submit button title.
 #: actions/designadminpanel.php:685 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/snapshotadminpanel.php:245
 #: actions/subscriptions.php:226 actions/tagother.php:154
-#: actions/useradminpanel.php:294 lib/applicationeditform.php:363
+#: actions/useradminpanel.php:294 lib/applicationeditform.php:353
 #: lib/designsettings.php:256 lib/groupeditform.php:202
 msgid "Save"
 msgstr "Tallenna"
@@ -976,10 +1011,6 @@ msgstr "LisÃ¤Ã¤ suosikkeihin"
 msgid "No such document \"%s\""
 msgstr "LiitettÃ¤ ei ole."
 
-#: actions/editapplication.php:54
-msgid "Edit Application"
-msgstr ""
-
 #: actions/editapplication.php:194
 msgid "Source URL is too long."
 msgstr ""
@@ -1064,7 +1095,7 @@ msgstr "TÃ¤mÃ¤n hetken vahvistettu sÃ¤hkÃ¶postiosoite."
 #. 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/emailsettings.php:115 actions/emailsettings.php:162
 #: actions/imsettings.php:116 actions/smssettings.php:124
 #: actions/smssettings.php:180
 msgctxt "BUTTON"
@@ -1080,123 +1111,111 @@ msgstr ""
 "sÃ¤hkÃ¶postilaatikostasi (ja roskapostikansiosta!) viesti, jossa on "
 "lisÃ¤ohjeita. "
 
-#. TRANS: Instructions for e-mail address input form.
-#: actions/emailsettings.php:135
+#. TRANS: Instructions for e-mail address input form. Do not translate
+#. TRANS: "example.org". It is one of the domain names reserved for
+#. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
+#. TRANS: Any other domain may be owned by a legitimate person or
+#. TRANS: organization.
+#: actions/emailsettings.php:139
 msgid "Email address, like \"UserName@example.org\""
 msgstr "SÃ¤hkÃ¶postiosoite, esimerkiksi \"kÃ¤yttÃ¤jÃ¤tunnus@example.org\""
 
-#. 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 ""
-
 #. 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
+#: actions/emailsettings.php:151 actions/smssettings.php:171
 msgid "Incoming email"
 msgstr "Saapuva sÃ¤hkÃ¶posti"
 
 #. 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
+#: actions/emailsettings.php:159 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Ã¤."
 
 #. 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
+#: actions/emailsettings.php:168 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"
 
-#. 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 ""
-
 #. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:174
+#: actions/emailsettings.php:178
 msgid "Email preferences"
 msgstr "SÃ¤hkÃ¶postiosoitteet"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:180
+#: actions/emailsettings.php:184
 msgid "Send me notices of new subscriptions through email."
 msgstr "LÃ¤hetÃ¤ sÃ¤hkÃ¶postilla tieto uusista tilaajista."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:186
+#: actions/emailsettings.php:190
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr "LÃ¤hetÃ¤ sÃ¤hkÃ¶postia, jos joku lisÃ¤Ã¤ pÃ¤ivitykseni suosikiksi."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:193
+#: actions/emailsettings.php:197
 msgid "Send me email when someone sends me a private message."
 msgstr "LÃ¤hetÃ¤ sÃ¤hkÃ¶postia, jos joku lÃ¤hettÃ¤Ã¤ minulle yksityisviestin."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:199
+#: actions/emailsettings.php:203
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr "LÃ¤hetÃ¤ sÃ¤hkÃ¶postia, jos joku lÃ¤hettÃ¤Ã¤ minulle \"@-vastauksen\"."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:205
+#: actions/emailsettings.php:209
 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."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:212
+#: actions/emailsettings.php:216
 msgid "I want to post notices by email."
 msgstr "Haluan lÃ¤hettÃ¤Ã¤ pÃ¤ivityksiÃ¤ sÃ¤hkÃ¶postilla."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:219
+#: actions/emailsettings.php:223
 msgid "Publish a MicroID for my email address."
 msgstr "Julkaise MicroID sÃ¤hkÃ¶postiosoitteelleni."
 
 #. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:353
+#: actions/emailsettings.php:357
 msgid "No email address."
 msgstr "SÃ¤hkÃ¶postiosoitetta ei ole."
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:361
+#: actions/emailsettings.php:365
 msgid "Cannot normalize that email address"
 msgstr "Ei voida normalisoida sÃ¤hkÃ¶postiosoitetta"
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:208
+#: actions/emailsettings.php:370 actions/register.php:208
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "Tuo ei ole kelvollinen sÃ¤hkÃ¶postiosoite."
 
 #. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:370
+#: actions/emailsettings.php:374
 msgid "That is already your email address."
 msgstr "TÃ¤mÃ¤ on jo sÃ¤hkÃ¶postiosoitteesi."
 
 #. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:374
+#: actions/emailsettings.php:378
 msgid "That email address already belongs to another user."
 msgstr "TÃ¤mÃ¤ sÃ¤hkÃ¶postiosoite kuuluu jo toisella kÃ¤yttÃ¤jÃ¤llÃ¤."
 
 #. 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/emailsettings.php:395 actions/imsettings.php:351
 #: actions/smssettings.php:373
 msgid "Couldn't insert confirmation code."
 msgstr "Ei voitu asettaa vahvistuskoodia."
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:398
+#: actions/emailsettings.php:402
 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."
@@ -1208,45 +1227,45 @@ msgstr ""
 #. 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/emailsettings.php:423 actions/imsettings.php:386
 #: actions/smssettings.php:408
 msgid "No pending confirmation to cancel."
 msgstr "Avoimia vahvistuksia ei ole peruutettavana."
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:438
+#: actions/emailsettings.php:442
 msgid "Email confirmation cancelled."
 msgstr "Avoimia vahvistuksia ei ole peruutettavana."
 
 #. TRANS: Message given trying to remove an e-mail address that is not
 #. TRANS: registered for the active user.
-#: actions/emailsettings.php:458
+#: actions/emailsettings.php:462
 msgid "That is not your email address."
 msgstr "TÃ¤mÃ¤ ei ole sÃ¤hkÃ¶postiosoitteesi."
 
 #. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:479
+#: actions/emailsettings.php:483
 msgid "The email address was removed."
 msgstr "Saapuvan sÃ¤hkÃ¶postin osoite poistettu."
 
-#: actions/emailsettings.php:493 actions/smssettings.php:568
+#: actions/emailsettings.php:497 actions/smssettings.php:568
 msgid "No incoming email address."
 msgstr "Saapuvan sÃ¤hkÃ¶postin osoitetta ei ole."
 
 #. 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/emailsettings.php:508 actions/emailsettings.php:532
 #: actions/smssettings.php:578 actions/smssettings.php:602
 msgid "Couldn't update user record."
 msgstr "Ei voitu pÃ¤ivittÃ¤Ã¤ kÃ¤yttÃ¤jÃ¤tietoja."
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
-#: actions/emailsettings.php:508 actions/smssettings.php:581
+#: actions/emailsettings.php:512 actions/smssettings.php:581
 msgid "Incoming email address removed."
 msgstr "Saapuvan sÃ¤hkÃ¶postin osoite poistettu."
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
-#: actions/emailsettings.php:532 actions/smssettings.php:605
+#: actions/emailsettings.php:536 actions/smssettings.php:605
 msgid "New incoming email address added."
 msgstr "Uusi saapuvan sÃ¤hkÃ¶postin osoite lisÃ¤tty."
 
@@ -1310,11 +1329,6 @@ msgstr "EsittelyssÃ¤ olevat kÃ¤yttÃ¤jÃ¤t"
 msgid "Featured users, page %d"
 msgstr "EsittelyssÃ¤ olevat kÃ¤yttÃ¤jÃ¤t, sivu %d"
 
-#: actions/featured.php:99
-#, php-format
-msgid "A selection of some great users on %s"
-msgstr ""
-
 #: actions/file.php:34
 msgid "No notice ID."
 msgstr "PÃ¤ivitystÃ¤ ei ole."
@@ -1335,10 +1349,6 @@ msgstr "LiitettÃ¤ ei ole."
 msgid "Not expecting this response!"
 msgstr "Odottamaton vastaus saatu!"
 
-#: actions/finishremotesubscribe.php:80
-msgid "User being listened to does not exist."
-msgstr ""
-
 #: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59
 msgid "You can use the local subscription!"
 msgstr "Voit kÃ¤yttÃ¤Ã¤ paikallista tilausta!"
@@ -1355,10 +1365,6 @@ msgstr "Sinulla ei ole valtuutusta tÃ¤hÃ¤n."
 msgid "Could not convert request token to access token."
 msgstr "Ei saatu request tokenia."
 
-#: actions/finishremotesubscribe.php:118
-msgid "Remote service uses unknown version of OMB protocol."
-msgstr ""
-
 #: actions/getfile.php:79
 msgid "No such file."
 msgstr "Tiedostoa ei ole."
@@ -1385,12 +1391,6 @@ msgstr "KÃ¤yttÃ¤jÃ¤llÃ¤ ei ole profiilia."
 msgid "No profile specified."
 msgstr "Profiilia ei ole mÃ¤Ã¤ritelty."
 
-#: actions/groupblock.php:76 actions/groupunblock.php:76
-#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:86
-msgid "No profile with that ID."
-msgstr "Ei profiilia tuolle ID:lle."
-
 #: actions/groupblock.php:81 actions/groupunblock.php:81
 #: actions/makeadmin.php:81
 msgid "No group specified."
@@ -1408,7 +1408,7 @@ msgstr "KÃ¤yttÃ¤jÃ¤Ã¤ ei ole estetty ryhmÃ¤stÃ¤."
 msgid "User is not a member of group."
 msgstr "KÃ¤yttÃ¤jÃ¤ ei kuulu tÃ¤hÃ¤n ryhmÃ¤Ã¤n."
 
-#: actions/groupblock.php:134 actions/groupmembers.php:360
+#: actions/groupblock.php:134 actions/groupmembers.php:364
 msgid "Block user from group"
 msgstr "EstÃ¤ kÃ¤yttÃ¤jÃ¤ ryhmÃ¤stÃ¤"
 
@@ -1430,10 +1430,6 @@ msgstr "ÃlÃ¤ estÃ¤ tÃ¤tÃ¤ kÃ¤yttÃ¤jÃ¤Ã¤ tÃ¤stÃ¤ ryhmÃ¤stÃ¤"
 msgid "Block this user from this group"
 msgstr "EstÃ¤ tÃ¤tÃ¤ kÃ¤yttÃ¤jÃ¤Ã¤ osallistumassa tÃ¤hÃ¤n ryhmÃ¤Ã¤n"
 
-#: actions/groupbyid.php:74 actions/userbyid.php:70
-msgid "No ID."
-msgstr "Ei Jabber ID -osoitetta"
-
 #: actions/groupdesignsettings.php:68
 msgid "You must be logged in to edit a group."
 msgstr ""
@@ -1462,12 +1458,6 @@ msgstr "Ulkoasuasetukset tallennettu."
 msgid "Group logo"
 msgstr "RyhmÃ¤n logo"
 
-#: actions/grouplogo.php:153
-#, php-format
-msgid ""
-"You can upload a logo image for your group. The maximum file size is %s."
-msgstr "Voit ladata ryhmÃ¤lle logokuvan. Maksimikoko on %s."
-
 #: actions/grouplogo.php:365
 msgid "Pick a square area of the image to be the logo."
 msgstr "Valitse neliÃ¶n muotoinen alue kuvasta logokuvaksi"
@@ -1480,40 +1470,32 @@ msgstr "Logo pÃ¤ivitetty."
 msgid "Failed updating logo."
 msgstr "Logon pÃ¤ivittÃ¤minen epÃ¤onnistui."
 
-#: actions/groupmembers.php:100 lib/groupnav.php:92
+#. TRANS: Title of the page showing group members.
+#. TRANS: %s is the name of the group.
+#: actions/groupmembers.php:102
 #, php-format
 msgid "%s group members"
 msgstr "RyhmÃ¤n %s jÃ¤senet"
 
-#: actions/groupmembers.php:103
+#. TRANS: Title of the page showing group members.
+#. TRANS: %1$s is the name of the group, %2$d is the page number of the members list.
+#: actions/groupmembers.php:107
 #, php-format
 msgid "%1$s group members, page %2$d"
 msgstr "RyhmÃ¤n %s jÃ¤senet"
 
-#: actions/groupmembers.php:118
+#: actions/groupmembers.php:122
 msgid "A list of the users in this group."
 msgstr "Lista ryhmÃ¤n kÃ¤yttÃ¤jistÃ¤."
 
-#: actions/groupmembers.php:182 lib/groupnav.php:107
+#: actions/groupmembers.php:186
 msgid "Admin"
 msgstr "YllÃ¤pito"
 
-#: actions/groupmembers.php:392 lib/blockform.php:69
-msgid "Block"
-msgstr "EstÃ¤"
-
-#: actions/groupmembers.php:487
+#: actions/groupmembers.php:498
 msgid "Make user an admin of the group"
 msgstr "Tee tÃ¤stÃ¤ kÃ¤yttÃ¤jÃ¤stÃ¤ yllÃ¤pitÃ¤jÃ¤"
 
-#: actions/groupmembers.php:519
-msgid "Make Admin"
-msgstr "Tee yllÃ¤pitÃ¤jÃ¤ksi"
-
-#: actions/groupmembers.php:519
-msgid "Make this user an admin"
-msgstr "Tee tÃ¤stÃ¤ kÃ¤yttÃ¤jÃ¤stÃ¤ yllÃ¤pitÃ¤jÃ¤"
-
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Title in atom group notice feed. %s is a group name.
 #. TRANS: Title in atom user notice feed. %s is a user name.
@@ -1634,7 +1616,10 @@ msgstr ""
 
 #. TRANS: IM address input field instructions in IM settings form.
 #. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:140
+#. TRANS: Do not translate "example.org". It is one of the domain names reserved for use in examples by
+#. TRANS: http://www.rfc-editor.org/rfc/rfc2606.txt. Any other domain may be owned by a legitimate
+#. TRANS: person or organization.
+#: actions/imsettings.php:143
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -1645,65 +1630,65 @@ msgstr ""
 "GTalkissa."
 
 #. TRANS: Form legend for IM preferences form.
-#: actions/imsettings.php:155
+#: actions/imsettings.php:158
 msgid "IM preferences"
 msgstr "Asetukset tallennettu."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:160
+#: actions/imsettings.php:163
 msgid "Send me notices through Jabber/GTalk."
 msgstr "LÃ¤hetÃ¤ minulle pÃ¤ivityksiÃ¤ Jabberilla/GTalkilla."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:166
+#: actions/imsettings.php:169
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr "LÃ¤hetÃ¤ pÃ¤ivitys kun Jabber/GTalk -tilatietoni vaihtuu."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:172
+#: actions/imsettings.php:175
 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. "
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:179
+#: actions/imsettings.php:182
 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "Julkaise MicroID Jabber/GTalk-osoitteelleni."
 
 #. TRANS: Confirmation message for successful IM preferences save.
-#: actions/imsettings.php:287 actions/othersettings.php:180
+#: actions/imsettings.php:290 actions/othersettings.php:180
 msgid "Preferences saved."
 msgstr "Asetukset tallennettu."
 
 #. TRANS: Message given saving IM address without having provided one.
-#: actions/imsettings.php:309
+#: actions/imsettings.php:312
 msgid "No Jabber ID."
 msgstr "Ei Jabber ID -osoitetta"
 
 #. TRANS: Message given saving IM address that cannot be normalised.
-#: actions/imsettings.php:317
+#: actions/imsettings.php:320
 msgid "Cannot normalize that Jabber ID"
 msgstr "Ei voida normalisoida Jabber ID -tunnusta"
 
 #. TRANS: Message given saving IM address that not valid.
-#: actions/imsettings.php:322
+#: actions/imsettings.php:325
 msgid "Not a valid Jabber ID"
 msgstr "Tuo ei ole kelvollinen Jabber ID."
 
 #. TRANS: Message given saving IM address that is already set.
-#: actions/imsettings.php:326
+#: actions/imsettings.php:329
 msgid "That is already your Jabber ID."
 msgstr "TÃ¤mÃ¤ on jo Jabber ID -tunnuksesi."
 
 #. TRANS: Message given saving IM address that is already set for another user.
-#: actions/imsettings.php:330
+#: actions/imsettings.php:333
 msgid "Jabber ID already belongs to another user."
 msgstr "Jabber ID kuuluu jo toiselle kÃ¤yttÃ¤jÃ¤lle."
 
 #. 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
+#: actions/imsettings.php:361
 #, php-format
 msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
@@ -1713,23 +1698,23 @@ msgstr ""
 "antaa osoitteelle %s oikeus lÃ¤hettÃ¤Ã¤ viestejÃ¤ sinulle."
 
 #. TRANS: Message given canceling IM address confirmation for the wrong IM address.
-#: actions/imsettings.php:388
+#: actions/imsettings.php:391
 msgid "That is the wrong IM address."
 msgstr "TÃ¤mÃ¤ on vÃ¤Ã¤rÃ¤ pikaviestiosoite."
 
 #. TRANS: Message given after successfully canceling IM address confirmation.
-#: actions/imsettings.php:402
+#: actions/imsettings.php:405
 msgid "IM confirmation cancelled."
 msgstr "Varmistuskoodia ei ole annettu."
 
 #. TRANS: Message given trying to remove an IM address that is not
 #. TRANS: registered for the active user.
-#: actions/imsettings.php:424
+#: actions/imsettings.php:427
 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
+#: actions/imsettings.php:450
 msgid "The IM address was removed."
 msgstr "Saapuvan sÃ¤hkÃ¶postin osoite poistettu."
 
@@ -1767,7 +1752,7 @@ msgstr "Kutsu uusia kÃ¤yttÃ¤jiÃ¤"
 
 #: actions/invite.php:128
 msgid "You are already subscribed to these users:"
-msgstr "Olet jos tilannut seuraavien kÃ¤yttÃ¤jien pÃ¤ivitykset:"
+msgstr "Olet jo tilannut seuraavien kÃ¤yttÃ¤jien pÃ¤ivitykset:"
 
 #. TRANS: Whois output.
 #. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
@@ -1818,12 +1803,6 @@ msgstr "HenkilÃ¶kohtainen viesti"
 msgid "Optionally add a personal message to the invitation."
 msgstr "Voit myÃ¶s lisÃ¤tÃ¤ oman viestisi kutsuun"
 
-#. TRANS: Send button for inviting friends
-#: actions/invite.php:198
-msgctxt "BUTTON"
-msgid "Send"
-msgstr ""
-
 #. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English.
 #: actions/invite.php:228
 #, php-format
@@ -1943,12 +1922,6 @@ msgstr ""
 "SyÃ¶tÃ¤ turvallisuussyistÃ¤ kÃ¤yttÃ¤jÃ¤tunnuksesi ja salasanasi uudelleen ennen "
 "asetuksiesi muuttamista."
 
-#: actions/login.php:295
-#, php-format
-msgid ""
-"Don't have a username yet? [Register](%%action.register%%) a new account."
-msgstr ""
-
 #: actions/makeadmin.php:92
 msgid "Only an admin can make another user an admin."
 msgstr "Vain yllÃ¤pitÃ¤jÃ¤ voi tehdÃ¤ toisesta kÃ¤yttÃ¤jÃ¤stÃ¤ yllÃ¤pitÃ¤jÃ¤n."
@@ -2048,11 +2021,6 @@ msgstr ""
 msgid "Updates matching search term \"%1$s\" on %2$s!"
 msgstr "KÃ¤yttÃ¤jÃ¤n %1$s pÃ¤ivitykset palvelussa %2$s!"
 
-#: actions/nudge.php:85
-msgid ""
-"This user doesn't allow nudges or hasn't confirmed or set their email yet."
-msgstr ""
-
 #: actions/nudge.php:94
 msgid "Nudge sent"
 msgstr "TÃ¶nÃ¤isy lÃ¤hetetty"
@@ -2065,6 +2033,15 @@ msgstr "TÃ¶nÃ¤isy lÃ¤hetetty!"
 msgid "Applications you have registered"
 msgstr ""
 
+#: actions/oauthappssettings.php:135
+#, php-format
+msgid "You have not registered any applications yet."
+msgstr ""
+
+#: actions/oauthconnectionssettings.php:72
+msgid "Connected applications"
+msgstr ""
+
 #: actions/oauthconnectionssettings.php:83
 msgid "You have allowed the following applications to access you account."
 msgstr ""
@@ -2091,12 +2068,6 @@ msgstr "KÃ¤yttÃ¤jÃ¤llÃ¤ ei ole profiilia."
 msgid "%1$s's status on %2$s"
 msgstr "KÃ¤yttÃ¤jÃ¤n %1$s pÃ¤ivitys %2$s"
 
-#. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
-#: actions/oembed.php:159
-#, php-format
-msgid "Content type %s not supported."
-msgstr ""
-
 #. TRANS: Error message displaying attachments. %s is the site's base URL.
 #: actions/oembed.php:163
 #, php-format
@@ -2104,8 +2075,8 @@ msgid "Only %s URLs over plain HTTP please."
 msgstr ""
 
 #. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1215
-#: lib/apiaction.php:1243 lib/apiaction.php:1366
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1206
+#: lib/apiaction.php:1233 lib/apiaction.php:1356
 msgid "Not a supported data format."
 msgstr "Tuo ei ole tuettu tietomuoto."
 
@@ -2224,7 +2195,7 @@ msgid "Password saved."
 msgstr "Salasana tallennettu."
 
 #. TRANS: Menu item for site administration
-#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:384
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:371
 msgid "Paths"
 msgstr "Polut"
 
@@ -2232,16 +2203,6 @@ msgstr "Polut"
 msgid "Path and server settings for this StatusNet site."
 msgstr "Polut ja palvelin asetukset tÃ¤lle StatusNet palvelulle."
 
-#: actions/pathsadminpanel.php:157
-#, php-format
-msgid "Theme directory not readable: %s."
-msgstr ""
-
-#: actions/pathsadminpanel.php:177
-#, php-format
-msgid "Locales directory not readable: %s."
-msgstr ""
-
 #: actions/pathsadminpanel.php:183
 msgid "Invalid SSL server. The maximum length is 255 characters."
 msgstr ""
@@ -2278,6 +2239,10 @@ msgstr ""
 msgid "Theme path"
 msgstr ""
 
+#: actions/pathsadminpanel.php:272
+msgid "Theme directory"
+msgstr ""
+
 #: actions/pathsadminpanel.php:292
 msgid "Avatar directory"
 msgstr "Taustakuvan hakemisto"
@@ -2306,18 +2271,10 @@ msgstr ""
 msgid "When to use SSL"
 msgstr ""
 
-#: actions/pathsadminpanel.php:335
-msgid "SSL server"
-msgstr ""
-
 #: actions/pathsadminpanel.php:336
 msgid "Server to direct SSL requests to"
 msgstr ""
 
-#: actions/pathsadminpanel.php:352
-msgid "Save paths"
-msgstr ""
-
 #: actions/peoplesearch.php:52
 #, php-format
 msgid ""
@@ -2375,7 +2332,7 @@ msgstr "Koko nimi"
 
 #. TRANS: Form input field label.
 #: actions/profilesettings.php:115 actions/register.php:460
-#: lib/applicationeditform.php:244 lib/groupeditform.php:161
+#: lib/applicationeditform.php:235 lib/groupeditform.php:161
 msgid "Homepage"
 msgstr "Kotisivu"
 
@@ -2403,10 +2360,6 @@ msgstr "Tietoja"
 msgid "Location"
 msgstr "Kotipaikka"
 
-#: actions/profilesettings.php:134 actions/register.php:480
-msgid "Where you are, like \"City, State (or Region), Country\""
-msgstr "Olinpaikka kuten \"Kaupunki, Maakunta (tai LÃ¤Ã¤ni), Maa\""
-
 #: actions/profilesettings.php:138
 msgid "Share my current location when posting notices"
 msgstr ""
@@ -2438,7 +2391,7 @@ msgstr "AikavyÃ¶hyke"
 
 #: actions/profilesettings.php:162
 msgid "What timezone are you normally in?"
-msgstr "MissÃ¤ aikavyÃ¶hykkeessÃ¤ olet normaalisti?"
+msgstr "MillÃ¤ aikavyÃ¶hykkeellÃ¤ olet tavallisesti?"
 
 #: actions/profilesettings.php:167
 msgid ""
@@ -2458,7 +2411,7 @@ msgstr "AikavyÃ¶hykettÃ¤ ei ole valittu."
 
 #: actions/profilesettings.php:241
 msgid "Language is too long (max 50 chars)."
-msgstr "Kieli on liian pitkÃ¤ (max 50 merkkiÃ¤)."
+msgstr "Kieli on liian pitkÃ¤ (enintÃ¤Ã¤n 50 merkkiÃ¤)."
 
 #: actions/profilesettings.php:253 actions/tagother.php:178
 #, php-format
@@ -2478,7 +2431,7 @@ msgid "Couldn't save tags."
 msgstr "Tageja ei voitu tallentaa."
 
 #. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:391 lib/adminpanelaction.php:141
+#: actions/profilesettings.php:391 lib/adminpanelaction.php:138
 msgid "Settings saved."
 msgstr "Asetukset tallennettu."
 
@@ -2531,14 +2484,6 @@ msgid ""
 "friends, family, and colleagues! ([Read more](%%doc.help%%))"
 msgstr ""
 
-#: actions/public.php:247
-#, php-format
-msgid ""
-"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
-"blogging) service based on the Free Software [StatusNet](http://status.net/) "
-"tool."
-msgstr ""
-
 #: actions/publictagcloud.php:57
 msgid "Public tag cloud"
 msgstr "Julkinen tagipilvi"
@@ -2635,10 +2580,6 @@ msgstr "Salasanan palautuspyyntÃ¶ lÃ¤hetetty."
 msgid "Unknown action"
 msgstr "Tuntematon toiminto"
 
-#: actions/recoverpassword.php:236
-msgid "6 or more characters, and don't forget it!"
-msgstr "6 tai useampia merkkejÃ¤ Ã¤lÃ¤kÃ¤ unohda mitÃ¤ kirjoitit!"
-
 #: actions/recoverpassword.php:243
 msgid "Reset"
 msgstr "Vaihda"
@@ -2777,33 +2718,6 @@ msgstr ""
 msgid "All rights reserved."
 msgstr ""
 
-#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:540
-#, php-format
-msgid ""
-"My text and files are available under %s except this private data: password, "
-"email address, IM address, and phone number."
-msgstr ""
-
-#: actions/register.php:583
-#, php-format
-msgid ""
-"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
-"want to...\n"
-"\n"
-"* Go to [your profile](%2$s) and post your first message.\n"
-"* Add a [Jabber/GTalk address](%%%%action.imsettings%%%%) so you can send "
-"notices through instant messages.\n"
-"* [Search for people](%%%%action.peoplesearch%%%%) that you may know or that "
-"share your interests. \n"
-"* Update your [profile settings](%%%%action.profilesettings%%%%) to tell "
-"others more about you. \n"
-"* Read over the [online docs](%%%%doc.help%%%%) for features you may have "
-"missed. \n"
-"\n"
-"Thanks for signing up and we hope you enjoy using this service."
-msgstr ""
-
 #: actions/register.php:607
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
@@ -2857,19 +2771,11 @@ msgstr "Tilaa"
 msgid "Invalid profile URL (bad format)"
 msgstr "Profiilin URL-osoite '%s' ei kelpaa (virheellinen muoto)."
 
-#: actions/remotesubscribe.php:168
-msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
-msgstr ""
-
 #: actions/remotesubscribe.php:176
 msgid "Thatâs a local profile! Login to subscribe."
 msgstr ""
 "TÃ¤mÃ¤ on paikallinen profiili. Kirjaudu sisÃ¤Ã¤n, jotta voit tilata pÃ¤ivitykset."
 
-#: actions/remotesubscribe.php:183
-msgid "Couldnât get a request token."
-msgstr "Ei saatu request tokenia."
-
 #: actions/repeat.php:90
 msgid "You already repeated that notice."
 msgstr "SinÃ¤ kuulut jo tÃ¤hÃ¤n ryhmÃ¤Ã¤n."
@@ -2912,7 +2818,7 @@ msgstr "PÃ¤ivityksesi tÃ¤hÃ¤n palveluun on estetty."
 
 #. TRANS: Menu item for site administration
 #: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
-#: lib/adminpanelaction.php:392
+#: lib/adminpanelaction.php:379
 msgid "Sessions"
 msgstr ""
 
@@ -2933,13 +2839,13 @@ msgid "Turn on debugging output for sessions."
 msgstr ""
 
 #. TRANS: Form input field label for application icon.
-#: actions/showapplication.php:159 lib/applicationeditform.php:182
+#: actions/showapplication.php:159 lib/applicationeditform.php:173
 msgid "Icon"
 msgstr ""
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:216 lib/groupeditform.php:172
+#: lib/applicationeditform.php:207 lib/groupeditform.php:172
 msgid "Description"
 msgstr "Kuvaus"
 
@@ -2953,10 +2859,18 @@ msgstr "Tilastot"
 msgid "Created by %1$s - %2$s access by default - %3$d users"
 msgstr ""
 
+#: actions/showapplication.php:213
+msgid "Application actions"
+msgstr ""
+
 #: actions/showapplication.php:236
 msgid "Reset key & secret"
 msgstr ""
 
+#: actions/showapplication.php:261
+msgid "Application info"
+msgstr ""
+
 #: actions/showapplication.php:263
 msgid "Consumer key"
 msgstr ""
@@ -3027,7 +2941,7 @@ msgstr ""
 msgid "This is a way to share what you like."
 msgstr ""
 
-#: actions/showgroup.php:82 lib/groupnav.php:86
+#: actions/showgroup.php:82
 #, php-format
 msgid "%s group"
 msgstr "RyhmÃ¤ %s"
@@ -3079,16 +2993,10 @@ msgstr "SyÃ¶te ryhmÃ¤n %s pÃ¤ivityksille (Atom)"
 msgid "FOAF for %s group"
 msgstr "KÃ¤yttÃ¤jÃ¤n %s lÃ¤hetetyt viestit"
 
-#: actions/showgroup.php:393 actions/showgroup.php:445 lib/groupnav.php:91
+#: actions/showgroup.php:393 actions/showgroup.php:445
 msgid "Members"
 msgstr "JÃ¤senet"
 
-#: actions/showgroup.php:398 lib/profileaction.php:117
-#: lib/profileaction.php:152 lib/profileaction.php:255 lib/section.php:95
-#: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71
-msgid "(None)"
-msgstr "(TyhjÃ¤)"
-
 #: actions/showgroup.php:404
 msgid "All members"
 msgstr "Kaikki jÃ¤senet"
@@ -3107,15 +3015,6 @@ msgid ""
 "of this group and many more! ([Read more](%%%%doc.help%%%%))"
 msgstr ""
 
-#: actions/showgroup.php:461
-#, php-format
-msgid ""
-"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
-"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
-"[StatusNet](http://status.net/) tool. Its members share short messages about "
-"their life and interests. "
-msgstr ""
-
 #: actions/showgroup.php:489
 msgid "Admins"
 msgstr "YllÃ¤pitÃ¤jÃ¤t"
@@ -3189,14 +3088,6 @@ msgid ""
 "follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))"
 msgstr ""
 
-#: actions/showstream.php:248
-#, php-format
-msgid ""
-"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
-"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
-"[StatusNet](http://status.net/) tool. "
-msgstr ""
-
 #: actions/siteadminpanel.php:133
 msgid "Site name must have non-zero length."
 msgstr ""
@@ -3423,7 +3314,7 @@ msgstr "Koodia ei ole syÃ¶tetty."
 
 #. TRANS: Menu item for site administration
 #: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
-#: lib/adminpanelaction.php:408
+#: lib/adminpanelaction.php:395
 msgid "Snapshots"
 msgstr ""
 
@@ -3431,6 +3322,10 @@ msgstr ""
 msgid "Manage snapshot configuration"
 msgstr "SÃ¤hkÃ¶postiosoitteen vahvistus"
 
+#: actions/snapshotadminpanel.php:127
+msgid "Invalid snapshot run value."
+msgstr ""
+
 #: actions/snapshotadminpanel.php:133
 msgid "Snapshot frequency must be a number."
 msgstr ""
@@ -3695,13 +3590,6 @@ msgstr ""
 msgid "Authorize subscription"
 msgstr "Valtuuta tilaus"
 
-#: actions/userauthorization.php:110
-msgid ""
-"Please check these details to make sure that you want to subscribe to this "
-"userâs notices. If you didnât just ask to subscribe to someoneâs notices, "
-"click âRejectâ."
-msgstr ""
-
 #: actions/userauthorization.php:196 actions/version.php:167
 msgid "License"
 msgstr "Lisenssi"
@@ -3727,24 +3615,10 @@ msgstr "Ei valtuutuspyyntÃ¶Ã¤!"
 msgid "Subscription authorized"
 msgstr "Tilaus sallittu"
 
-#: actions/userauthorization.php:256
-msgid ""
-"The subscription has been authorized, but no callback URL was passed. Check "
-"with the siteâs instructions for details on how to authorize the "
-"subscription. Your subscription token is:"
-msgstr ""
-
 #: actions/userauthorization.php:266
 msgid "Subscription rejected"
 msgstr "Tilaus hylÃ¤tty"
 
-#: actions/userauthorization.php:268
-msgid ""
-"The subscription has been rejected, but no callback URL was passed. Check "
-"with the siteâs instructions for details on how to fully reject the "
-"subscription."
-msgstr ""
-
 #: actions/userauthorization.php:303
 #, php-format
 msgid "Listener URI â%sâ not found here."
@@ -3770,16 +3644,6 @@ msgstr ""
 msgid "Avatar URL â%sâ is not valid."
 msgstr ""
 
-#: actions/userauthorization.php:350
-#, php-format
-msgid "Canât read avatar URL â%sâ."
-msgstr ""
-
-#: actions/userauthorization.php:355
-#, php-format
-msgid "Wrong image type for avatar URL â%sâ."
-msgstr ""
-
 #: actions/userdesignsettings.php:87 lib/designsettings.php:76
 msgid ""
 "Customize the way your profile looks with a background image and a colour "
@@ -4064,24 +3928,12 @@ msgstr "NimetÃ¶n sivu"
 msgid "Primary site navigation"
 msgstr "Ensisijainen sivunavigointi"
 
-#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:455
-msgctxt "TOOLTIP"
-msgid "Personal profile and friends timeline"
-msgstr ""
-
 #. TRANS: Tooltip for main menu option "Account"
 #: lib/action.php:460
 msgctxt "TOOLTIP"
 msgid "Change your email, avatar, password, profile"
 msgstr "Vaihda salasanasi"
 
-#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:465
-msgctxt "TOOLTIP"
-msgid "Connect to services"
-msgstr ""
-
 #. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
 #: lib/action.php:468
 msgid "Connect"
@@ -4097,7 +3949,7 @@ msgstr "Kirjaudu sisÃ¤Ã¤n"
 #: lib/action.php:490
 msgctxt "MENU"
 msgid "Logout"
-msgstr "Logo"
+msgstr "Kirjaudu ulos"
 
 #. TRANS: Tooltip for main menu option "Register"
 #: lib/action.php:495
@@ -4125,7 +3977,7 @@ msgstr "Hae lisÃ¤Ã¤ ryhmiÃ¤"
 
 #. TRANS: DT element for site notice. String is hidden in default CSS.
 #. TRANS: Menu item for site administration
-#: lib/action.php:538 lib/adminpanelaction.php:400
+#: lib/action.php:538 lib/adminpanelaction.php:387
 msgid "Site notice"
 msgstr "Palvelun ilmoitus"
 
@@ -4184,22 +4036,17 @@ msgstr "Ota yhteyttÃ¤"
 msgid "StatusNet software license"
 msgstr "StatusNet-ohjelmiston lisenssi"
 
-#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
-#: lib/action.php:843
-#, php-format
-msgid ""
-"**%%site.name%%** is a microblogging service brought to you by [%%site."
-"broughtby%%](%%site.broughtbyurl%%)."
-msgstr ""
-
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:846
+#: lib/action.php:849
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** on mikroblogipalvelu."
 
 #. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.
-#: lib/action.php:850
+#. TRANS: Make sure there is no whitespace between "]" and "(".
+#. TRANS: Text between [] is a link description, text between () is the link itself.
+#. TRANS: %s is the version of StatusNet that is being used.
+#: lib/action.php:856
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4212,43 +4059,44 @@ msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:873
+#: lib/action.php:879
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:880
+#: lib/action.php:886
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:884
+#: lib/action.php:890
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 
-#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:897
+#. TRANS: license message in footer.
+#. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
+#: lib/action.php:904
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr ""
 
 #. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1236
+#: lib/action.php:1243
 msgid "Pagination"
 msgstr "Sivutus"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1247
+#: lib/action.php:1254
 msgid "After"
 msgstr "MyÃ¶hemmin"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1257
+#: lib/action.php:1264
 msgid "Before"
 msgstr "Aiemmin"
 
@@ -4257,96 +4105,134 @@ msgstr "Aiemmin"
 msgid "Expecting a root feed element but got a whole XML document."
 msgstr ""
 
-#: lib/activityutils.php:208
+#. TRANS: Client exception thrown when there is no source attribute.
+#: lib/activityutils.php:203
 msgid "Can't handle remote content yet."
 msgstr ""
 
-#: lib/activityutils.php:244
+#. TRANS: Client exception thrown when there embedded XML content is found that cannot be processed yet.
+#: lib/activityutils.php:240
 msgid "Can't handle embedded XML content yet."
 msgstr ""
 
-#: lib/activityutils.php:248
+#. TRANS: Client exception thrown when base64 encoded content is found that cannot be processed yet.
+#: lib/activityutils.php:245
 msgid "Can't handle embedded Base64 content yet."
 msgstr ""
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:368 lib/personalgroupnav.php:115
+#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:115
 msgid "User"
 msgstr "KÃ¤yttÃ¤jÃ¤"
 
 #. TRANS: Client error 401.
-#: lib/apiauth.php:113
+#: lib/apiauth.php:111
 msgid "API resource requires read-write access, but you only have read access."
 msgstr ""
 
+#. TRANS: OAuth exception thrown when no application is found for a given consumer key.
+#: lib/apiauth.php:175
+msgid "No application for that consumer key."
+msgstr ""
+
+#. TRANS: OAuth exception given when an incorrect access token was given for a user.
+#: lib/apiauth.php:212
+msgid "Bad access token."
+msgstr ""
+
+#. TRANS: OAuth exception given when no user was found for a given token (no token was found).
+#: lib/apiauth.php:217
+msgid "No user for that token."
+msgstr ""
+
+#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
+#: lib/apioauthstore.php:178
+msgid "Tried to revoke unknown token"
+msgstr ""
+
+#. TRANS: Exception thrown when an attempt is made to remove a revoked token.
+#: lib/apioauthstore.php:182
+msgid "Failed to delete revoked token"
+msgstr ""
+
+#. TRANS: Form legend.
+#: lib/applicationeditform.php:129
+msgid "Edit application"
+msgstr ""
+
+#. TRANS: Form guide.
+#: lib/applicationeditform.php:178
+msgid "Icon for this application"
+msgstr ""
+
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:209
+#: lib/applicationeditform.php:200
 #, php-format
 msgid "Describe your application in %d characters"
 msgstr "Kuvaile itseÃ¤si ja kiinnostuksen kohteitasi %d merkillÃ¤"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:213
+#: lib/applicationeditform.php:204
 msgid "Describe your application"
 msgstr "Kuvaus"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:233
+#: lib/applicationeditform.php:224
 msgid "Organization responsible for this application"
 msgstr ""
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:251
+#: lib/applicationeditform.php:242
 msgid "URL to redirect to after authentication"
 msgstr ""
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:278
+#: lib/applicationeditform.php:269
 msgid "Browser"
 msgstr ""
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:295
+#: lib/applicationeditform.php:286
 msgid "Desktop"
 msgstr ""
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:297
+#: lib/applicationeditform.php:288
 msgid "Type of application, browser or desktop"
 msgstr ""
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:320
+#: lib/applicationeditform.php:311
 msgid "Read-only"
 msgstr ""
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:339
+#: lib/applicationeditform.php:330
 msgid "Read-write"
 msgstr ""
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:341
+#: lib/applicationeditform.php:332
 msgid "Default access for this application: read-only, or read-write"
 msgstr ""
 
-#. TRANS: Submit button title
-#: lib/applicationeditform.php:359
+#. TRANS: Submit button title.
+#: lib/applicationeditform.php:349
 msgid "Cancel"
 msgstr "Peruuta"
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:136
+#: lib/applicationlist.php:135
 msgid "read-write"
 msgstr ""
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:138
+#: lib/applicationlist.php:137
 msgid "read-only"
 msgstr ""
 
 #. 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
+#: lib/applicationlist.php:143
 #, php-format
 msgid "Approved %1$s - \"%2$s\" access."
 msgstr ""
@@ -4356,10 +4242,16 @@ msgstr ""
 msgid "Provider"
 msgstr "Esikatselu"
 
-#: lib/attachmentnoticesection.php:67
+#. TRANS: Title.
+#: lib/attachmentnoticesection.php:68
 msgid "Notices where this attachment appears"
 msgstr ""
 
+#. TRANS: Title for the form to block a user.
+#: lib/blockform.php:70
+msgid "Block"
+msgstr "EstÃ¤"
+
 #: lib/channel.php:157 lib/channel.php:177
 msgid "Command results"
 msgstr "Komennon tulos"
@@ -4372,6 +4264,13 @@ msgstr "Komento suoritettu"
 msgid "Command failed"
 msgstr "Komento epÃ¤onnistui"
 
+#. TRANS: Message given getting a non-existing user.
+#. TRANS: %s is the nickname of the user that could not be found.
+#: lib/command.php:150
+#, php-format
+msgid "Could not find a local user with nickname %s."
+msgstr ""
+
 #. TRANS: Error text shown when an unimplemented command is given.
 #: lib/command.php:185
 msgid "Sorry, this command is not yet implemented."
@@ -4399,6 +4298,20 @@ msgstr ""
 msgid "Notice marked as fave."
 msgstr "PÃ¤ivitys on merkitty suosikiksi."
 
+#. 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.
+#: lib/command.php:360
+#, php-format
+msgid "%1$s joined group %2$s."
+msgstr ""
+
+#. 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.
+#: lib/command.php:408
+#, php-format
+msgid "%1$s left group %2$s."
+msgstr ""
+
 #. TRANS: Whois output. %s is the full name of the queried user.
 #: lib/command.php:434
 #, php-format
@@ -4433,13 +4346,6 @@ msgid ""
 "same server."
 msgstr ""
 
-#. 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:491 lib/xmppmanager.php:403
-#, php-format
-msgid "Message too long - maximum is %1$d characters, you sent %2$d."
-msgstr ""
-
 #. TRANS: Error text shown sending a direct message fails with an unknown reason.
 #: lib/command.php:517
 msgid "Error sending direct message."
@@ -4450,22 +4356,18 @@ msgstr "Tapahtui virhe suoran viestin lÃ¤hetyksessÃ¤."
 msgid "Error repeating notice."
 msgstr "Virhe tapahtui kÃ¤yttÃ¤jÃ¤n asettamisessa."
 
-#. TRANS: Message given if content of a notice for a reply is too long.
-#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:592
+#. TRANS: Text shown after having subscribed to another user successfully.
+#. TRANS: %s is the name of the user the subscription was requested for.
+#: lib/command.php:672
 #, php-format
-msgid "Notice too long - maximum is %1$d characters, you sent %2$d."
+msgid "Subscribed to %s."
 msgstr ""
 
-#. TRANS: Error text shown when no username was provided when issuing a subscribe command.
-#: lib/command.php:655
-msgid "Specify the name of the user to subscribe to."
-msgstr ""
-
-#. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
-#. TRANS: Error text shown when no username was provided when issuing the command.
-#: lib/command.php:694 lib/command.php:804
-msgid "Specify the name of the user to unsubscribe from."
+#. TRANS: Text shown after having unsubscribed from another user successfully.
+#. TRANS: %s is the name of the user the unsubscription was requested for.
+#: lib/command.php:705
+#, php-format
+msgid "Unsubscribed from %s."
 msgstr ""
 
 #. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
@@ -4506,26 +4408,15 @@ msgstr ""
 msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr ""
 
-#. TRANS: Text shown after requesting other users a user is subscribed to.
-#. TRANS: This message support plural forms. This message is followed by a
-#. TRANS: hard coded space and a comma separated list of subscribed users.
-#: lib/command.php:836
-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:"
-
-#. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
-#. TRANS: This message support plural forms. This message is followed by a
-#. TRANS: hard coded space and a comma separated list of subscribing users.
-#: lib/command.php:863
-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."
+#. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
+#. TRANS: %s is the name of the user the unsubscription was requested for.
+#: lib/command.php:813
+#, php-format
+msgid "Unsubscribed %s."
+msgstr ""
 
 #. TRANS: Text shown after requesting groups a user is subscribed to.
-#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
 #: lib/command.php:890
 msgid "You are a member of this group:"
@@ -4533,6 +4424,7 @@ 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."
 
+#. TRANS: Help text for commands.
 #: lib/command.php:905
 msgid ""
 "Commands:\n"
@@ -4681,24 +4573,6 @@ msgstr ""
 msgid "Extra nicknames for the group, comma- or space- separated, max %d"
 msgstr ""
 
-#: lib/groupnav.php:85
-msgid "Group"
-msgstr "RyhmÃ¤"
-
-#: lib/groupnav.php:108
-#, php-format
-msgid "Edit %s group properties"
-msgstr "Muokkaa %s ryhmÃ¤n ominaisuuksia"
-
-#: lib/groupnav.php:113
-msgid "Logo"
-msgstr "Logo"
-
-#: lib/groupnav.php:114
-#, php-format
-msgid "Add or edit %s logo"
-msgstr "LisÃ¤Ã¤ ryhmÃ¤lle %s logo tai muokkaa sitÃ¤ "
-
 #: lib/groupsbymemberssection.php:71
 msgid "Groups with most members"
 msgstr "RyhmÃ¤t, joissa eniten jÃ¤seniÃ¤"
@@ -4725,7 +4599,8 @@ msgstr "Kuvatiedoston formaattia ei ole tuettu."
 msgid "Partial upload."
 msgstr "Osittain ladattu palvelimelle."
 
-#: lib/imagefile.php:101 lib/mediafile.php:170
+#. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
+#: lib/imagefile.php:101 lib/mediafile.php:179
 msgid "System error uploading file."
 msgstr "Tiedoston lÃ¤hetyksessÃ¤ tapahtui jÃ¤rjestelmÃ¤virhe."
 
@@ -4968,6 +4843,11 @@ msgid ""
 "\t%s"
 msgstr ""
 
+#: lib/mail.php:657
+#, php-format
+msgid "%s (@%s) sent a notice to your attention"
+msgstr ""
+
 #. TRANS: Body of @-reply notification e-mail.
 #: lib/mail.php:660
 #, php-format
@@ -5006,10 +4886,6 @@ msgid ""
 "users in conversation. People can send you messages for your eyes only."
 msgstr ""
 
-#: lib/mailbox.php:228 lib/noticelist.php:506
-msgid "from"
-msgstr ""
-
 #: lib/mailhandler.php:37
 msgid "Could not parse message."
 msgstr "Ei voitu lukea viestiÃ¤."
@@ -5026,56 +4902,75 @@ msgstr "Valitettavasti tuo ei ole oikea osoite sÃ¤hkÃ¶postipÃ¤ivityksille."
 msgid "Sorry, no incoming email allowed."
 msgstr "Valitettavasti pÃ¤ivitysten teko sÃ¤hkÃ¶postilla ei ole sallittua."
 
-#: lib/mediafile.php:98 lib/mediafile.php:123
+#. TRANS: Client exception thrown when a database error was thrown during a file upload operation.
+#: lib/mediafile.php:99 lib/mediafile.php:125
 msgid "There was a database error while saving your file. Please try again."
 msgstr ""
 
-#: lib/mediafile.php:142
+#. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
+#: lib/mediafile.php:145
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
 msgstr ""
 
-#: lib/mediafile.php:147
+#. TRANS: Client exception.
+#: lib/mediafile.php:151
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form."
 msgstr ""
 
-#: lib/mediafile.php:152
+#. TRANS: Client exception.
+#: lib/mediafile.php:157
 msgid "The uploaded file was only partially uploaded."
 msgstr ""
 
-#: lib/mediafile.php:159
+#. TRANS: Client exception thrown when a temporary folder is not present to store a file upload.
+#: lib/mediafile.php:165
 msgid "Missing a temporary folder."
 msgstr ""
 
-#: lib/mediafile.php:162
+#. TRANS: Client exception thrown when writing to disk is not possible during a file upload operation.
+#: lib/mediafile.php:169
 msgid "Failed to write file to disk."
 msgstr ""
 
-#: lib/mediafile.php:165
+#. TRANS: Client exception thrown when a file upload operation has been stopped by an extension.
+#: lib/mediafile.php:173
 msgid "File upload stopped by extension."
 msgstr ""
 
-#: lib/mediafile.php:179 lib/mediafile.php:217
+#. TRANS: Client exception thrown when a file upload operation would cause a user to exceed a set quota.
+#: lib/mediafile.php:189 lib/mediafile.php:232
 msgid "File exceeds user's quota."
 msgstr ""
 
-#: lib/mediafile.php:197 lib/mediafile.php:234
+#. TRANS: Client exception thrown when a file upload operation fails because the file could
+#. TRANS: not be moved from the temporary folder to the permanent file location.
+#: lib/mediafile.php:209 lib/mediafile.php:251
 msgid "File could not be moved to destination directory."
 msgstr ""
 
-#: lib/mediafile.php:202 lib/mediafile.php:238
+#. TRANS: Client exception thrown when a file upload operation has been stopped because the MIME
+#. TRANS: type of the uploaded file could not be determined.
+#: lib/mediafile.php:216 lib/mediafile.php:257
 msgid "Could not determine file's MIME type."
 msgstr "Ei voitu poistaa suosikkia."
 
-#: lib/mediafile.php:318
+#. TRANS: Client exception thrown trying to upload a forbidden MIME type.
+#. TRANS: %1$s is the file type that was denied, %2$s is the application part of
+#. TRANS: the MIME type that was denied.
+#: lib/mediafile.php:340
 #, php-format
-msgid " Try using another %s format."
+msgid ""
+"\"%1$s\" is not a supported file type on this server. Try using another %2$s "
+"format."
 msgstr ""
 
-#: lib/mediafile.php:323
+#. TRANS: Client exception thrown trying to upload a forbidden MIME type.
+#. TRANS: %s is the file type that was denied.
+#: lib/mediafile.php:345
 #, php-format
-msgid "%s is not a supported file type on this server."
+msgid "\"%s\" is not a supported file type on this server."
 msgstr ""
 
 #: lib/messageform.php:120
@@ -5090,11 +4985,6 @@ msgstr "Vastaanottaja"
 msgid "Available characters"
 msgstr "Sallitut merkit"
 
-#: lib/messageform.php:178 lib/noticeform.php:237
-msgctxt "Send button for sending notice"
-msgid "Send"
-msgstr ""
-
 #: lib/noticeform.php:160
 msgid "Send a notice"
 msgstr "LÃ¤hetÃ¤ pÃ¤ivitys"
@@ -5112,14 +5002,6 @@ msgstr ""
 msgid "Attach a file"
 msgstr ""
 
-#: lib/noticeform.php:213
-msgid "Share my location"
-msgstr ""
-
-#: lib/noticeform.php:216
-msgid "Do not share my location"
-msgstr ""
-
 #: lib/noticeform.php:217
 msgid ""
 "Sorry, retrieving your geo location is taking longer than expected, please "
@@ -5154,10 +5036,6 @@ msgstr ""
 msgid "web"
 msgstr ""
 
-#: lib/noticelist.php:603
-msgid "Repeated by"
-msgstr ""
-
 #: lib/noticelist.php:630
 msgid "Reply to this notice"
 msgstr "Vastaa tÃ¤hÃ¤n pÃ¤ivitykseen"
@@ -5178,23 +5056,7 @@ msgstr "TÃ¶nÃ¤ise"
 msgid "Send a nudge to this user"
 msgstr "LÃ¤hetÃ¤ tÃ¶nÃ¤isy tÃ¤lle kÃ¤yttÃ¤jÃ¤lle"
 
-#: lib/oauthstore.php:283
-msgid "Error inserting new profile"
-msgstr "Virhe tapahtui uuden profiilin lisÃ¤Ã¤misessÃ¤"
-
-#: lib/oauthstore.php:291
-msgid "Error inserting avatar"
-msgstr "Virhe tapahtui profiilikuvan lisÃ¤Ã¤misessÃ¤"
-
-#: lib/oauthstore.php:306
-msgid "Error updating remote profile"
-msgstr "Virhe tapahtui etÃ¤profiilin pÃ¤ivittÃ¤misessÃ¤"
-
-#: lib/oauthstore.php:311
-msgid "Error inserting remote profile"
-msgstr "Virhe tapahtui uuden etÃ¤profiilin lisÃ¤Ã¤misessÃ¤"
-
-#: lib/oauthstore.php:490
+#: lib/oauthstore.php:491
 msgid "Couldn't insert new subscription."
 msgstr "Ei voitu lisÃ¤tÃ¤ uutta tilausta."
 
@@ -5292,14 +5154,12 @@ msgstr "KyllÃ¤"
 msgid "No single user defined for single-user mode."
 msgstr ""
 
-#: lib/searchaction.php:126
+#. TRANS: Used as a field label for the field where one or more keywords
+#. TRANS: for searching can be entered.
+#: lib/searchaction.php:129
 msgid "Keyword(s)"
 msgstr ""
 
-#: lib/searchaction.php:127
-msgid "Search"
-msgstr "Haku"
-
 #: lib/searchgroupnav.php:80
 msgid "People"
 msgstr "HenkilÃ¶"
@@ -5452,56 +5312,32 @@ msgid "Moderator"
 msgstr ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1102
+#: lib/util.php:1103
 msgid "a few seconds ago"
 msgstr "muutama sekunti sitten"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1105
+#: lib/util.php:1106
 msgid "about a minute ago"
 msgstr "noin minuutti sitten"
 
-#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1109
-#, php-format
-msgid "about %d minutes ago"
-msgstr "noin %d minuuttia sitten"
-
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 #: lib/util.php:1112
 msgid "about an hour ago"
 msgstr "noin tunti sitten"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1116
-#, php-format
-msgid "about %d hours ago"
-msgstr "noin %d tuntia sitten"
-
-#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1119
+#: lib/util.php:1118
 msgid "about a day ago"
 msgstr "noin pÃ¤ivÃ¤ sitten"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1123
-#, php-format
-msgid "about %d days ago"
-msgstr "noin %d pÃ¤ivÃ¤Ã¤ sitten"
-
-#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1126
+#: lib/util.php:1124
 msgid "about a month ago"
 msgstr "noin kuukausi sitten"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 #: lib/util.php:1130
-#, php-format
-msgid "about %d months ago"
-msgstr "noin %d kuukautta sitten"
-
-#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1133
 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 bd905de29f..3d33750341 100644
--- a/locale/fr/LC_MESSAGES/statusnet.po
+++ b/locale/fr/LC_MESSAGES/statusnet.po
@@ -1,16 +1,17 @@
-# Translation of StatusNet to French
+# Translation of StatusNet to French (FranÃ§ais)
+# Expored from translatewiki.net
 #
-# Author@translatewiki.net: Brion
-# Author@translatewiki.net: Crochet.david
-# Author@translatewiki.net: IAlex
-# Author@translatewiki.net: Isoph
-# Author@translatewiki.net: Jean-FrÃ©dÃ©ric
-# Author@translatewiki.net: Julien C
-# Author@translatewiki.net: McDutchie
-# Author@translatewiki.net: Patcito
-# Author@translatewiki.net: Peter17
-# Author@translatewiki.net: Sherbrooke
-# Author@translatewiki.net: Y-M D
+# Author: Brion
+# Author: Crochet.david
+# Author: IAlex
+# Author: Isoph
+# Author: Jean-FrÃ©dÃ©ric
+# Author: Julien C
+# Author: McDutchie
+# Author: Patcito
+# Author: Peter17
+# Author: Sherbrooke
+# Author: Y-M D
 # --
 # This file is distributed under the same license as the StatusNet package.
 #
@@ -18,20 +19,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-08 22:33+0000\n"
-"PO-Revision-Date: 2010-09-08 22:34:11+0000\n"
-"Language-Team: French\n"
+"POT-Creation-Date: 2010-09-14 19:53+0000\n"
+"PO-Revision-Date: 2010-09-14 19:53:55+0000\n"
+"Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r72348); Translate extension (2010-08-20)\n"
+"X-Generator: MediaWiki 1.17alpha (r73009); Translate extension (2010-08-20)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
-"X-Message-Group: out-statusnet\n"
+"X-Message-Group: #out-statusnet\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-POT-Import-Date: 1284-49-16 34::+0000\n"
 
 #. TRANS: Page title
 #. TRANS: Menu item for site administration
-#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:376
+#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:363
 msgid "Access"
 msgstr "AccÃ¨s"
 
@@ -84,10 +86,10 @@ 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 actions/emailsettings.php:224
-#: actions/imsettings.php:184 actions/smssettings.php:209
-#: lib/applicationeditform.php:361
+#. TRANS: Button label in the "Edit application" form.
+#: actions/accessadminpanel.php:203 actions/emailsettings.php:228
+#: actions/imsettings.php:187 actions/smssettings.php:209
+#: lib/applicationeditform.php:351
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Enregistrer"
@@ -100,15 +102,15 @@ msgstr "Page non trouvÃ©e."
 
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #: actions/all.php:79 actions/allrss.php:68
-#: actions/apiaccountupdatedeliverydevice.php:114
-#: actions/apiaccountupdateprofile.php:105
-#: actions/apiaccountupdateprofilebackgroundimage.php:116
-#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
-#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
-#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:113
-#: actions/apigroupismember.php:91 actions/apigroupjoin.php:100
-#: actions/apigroupleave.php:100 actions/apigrouplist.php:73
-#: actions/apistatusesupdate.php:229 actions/apisubscriptions.php:87
+#: actions/apiaccountupdatedeliverydevice.php:115
+#: actions/apiaccountupdateprofile.php:106
+#: actions/apiaccountupdateprofilebackgroundimage.php:117
+#: actions/apiaccountupdateprofileimage.php:106 actions/apiblockcreate.php:98
+#: actions/apiblockdestroy.php:97 actions/apidirectmessage.php:77
+#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:114
+#: actions/apigroupismember.php:91 actions/apigroupjoin.php:101
+#: actions/apigroupleave.php:101 actions/apigrouplist.php:73
+#: actions/apistatusesupdate.php:230 actions/apisubscriptions.php:87
 #: actions/apitimelinefavorites.php:72 actions/apitimelinefriends.php:174
 #: actions/apitimelinehome.php:80 actions/apitimelinementions.php:80
 #: actions/apitimelineuser.php:82 actions/avatarbynickname.php:75
@@ -209,16 +211,16 @@ msgid "Updates from %1$s and friends on %2$s!"
 msgstr "Statuts de %1$s et ses amis dans %2$s!"
 
 #: actions/apiaccountratelimitstatus.php:72
-#: actions/apiaccountupdatedeliverydevice.php:94
-#: actions/apiaccountupdateprofile.php:97
-#: actions/apiaccountupdateprofilebackgroundimage.php:94
-#: actions/apiaccountupdateprofilecolors.php:118
+#: actions/apiaccountupdatedeliverydevice.php:95
+#: actions/apiaccountupdateprofile.php:98
+#: actions/apiaccountupdateprofilebackgroundimage.php:95
+#: actions/apiaccountupdateprofilecolors.php:119
 #: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156
-#: actions/apifavoritecreate.php:100 actions/apifavoritedestroy.php:101
-#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100
-#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:139
-#: actions/apigroupismember.php:115 actions/apigroupjoin.php:156
-#: actions/apigroupleave.php:142 actions/apigrouplist.php:137
+#: actions/apifavoritecreate.php:101 actions/apifavoritedestroy.php:102
+#: actions/apifriendshipscreate.php:101 actions/apifriendshipsdestroy.php:101
+#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:140
+#: actions/apigroupismember.php:115 actions/apigroupjoin.php:157
+#: actions/apigroupleave.php:143 actions/apigrouplist.php:137
 #: actions/apigrouplistall.php:122 actions/apigroupmembership.php:107
 #: actions/apigroupshow.php:116 actions/apihelptest.php:88
 #: actions/apistatusesdestroy.php:104 actions/apistatusesretweets.php:112
@@ -233,21 +235,23 @@ msgstr "Statuts de %1$s et ses amis dans %2$s!"
 msgid "API method not found."
 msgstr "MÃ©thode API non trouvÃ©e !"
 
-#: actions/apiaccountupdatedeliverydevice.php:86
-#: actions/apiaccountupdateprofile.php:89
-#: actions/apiaccountupdateprofilebackgroundimage.php:86
-#: actions/apiaccountupdateprofilecolors.php:110
-#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89
-#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109
-#: actions/apifavoritecreate.php:91 actions/apifavoritedestroy.php:92
-#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
-#: actions/apigroupcreate.php:105 actions/apigroupjoin.php:92
-#: actions/apigroupleave.php:92 actions/apimediaupload.php:67
-#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:198
+#. TRANS: Client error message. POST is a HTTP command. It should not be translated.
+#. TRANS: Client error. POST is a HTTP command. It should not be translated.
+#: actions/apiaccountupdatedeliverydevice.php:87
+#: actions/apiaccountupdateprofile.php:90
+#: actions/apiaccountupdateprofilebackgroundimage.php:87
+#: actions/apiaccountupdateprofilecolors.php:111
+#: actions/apiaccountupdateprofileimage.php:85 actions/apiblockcreate.php:90
+#: actions/apiblockdestroy.php:89 actions/apidirectmessagenew.php:110
+#: actions/apifavoritecreate.php:92 actions/apifavoritedestroy.php:93
+#: actions/apifriendshipscreate.php:92 actions/apifriendshipsdestroy.php:92
+#: actions/apigroupcreate.php:106 actions/apigroupjoin.php:93
+#: actions/apigroupleave.php:93 actions/apimediaupload.php:68
+#: actions/apistatusesretweet.php:66 actions/apistatusesupdate.php:199
 msgid "This method requires a POST."
 msgstr "Ce processus requiert un POST."
 
-#: actions/apiaccountupdatedeliverydevice.php:106
+#: actions/apiaccountupdatedeliverydevice.php:107
 msgid ""
 "You must specify a parameter named 'device' with a value of one of: sms, im, "
 "none."
@@ -255,27 +259,27 @@ msgstr ""
 "Vous devez spÃ©cifier un paramÃ¨tre Â« device Â» avec une des valeurs suivantes : "
 "sms, im, none."
 
-#: actions/apiaccountupdatedeliverydevice.php:133
+#: actions/apiaccountupdatedeliverydevice.php:134
 msgid "Could not update user."
 msgstr "Impossible de mettre Ã  jour lâutilisateur."
 
-#: actions/apiaccountupdateprofile.php:112
-#: actions/apiaccountupdateprofilebackgroundimage.php:194
-#: actions/apiaccountupdateprofilecolors.php:185
-#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/apiaccountupdateprofile.php:113
+#: actions/apiaccountupdateprofilebackgroundimage.php:195
+#: actions/apiaccountupdateprofilecolors.php:186
+#: actions/apiaccountupdateprofileimage.php:131 actions/apiusershow.php:108
 #: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/hcard.php:74
 #: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
 #: lib/profileaction.php:84
 msgid "User has no profile."
 msgstr "Aucun profil ne correspond Ã  cet utilisateur."
 
-#: actions/apiaccountupdateprofile.php:147
+#: actions/apiaccountupdateprofile.php:148
 msgid "Could not save profile."
 msgstr "Impossible dâenregistrer le profil."
 
-#: actions/apiaccountupdateprofilebackgroundimage.php:108
-#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
-#: actions/apistatusesupdate.php:212 actions/avatarsettings.php:257
+#: actions/apiaccountupdateprofilebackgroundimage.php:109
+#: actions/apiaccountupdateprofileimage.php:98 actions/apimediaupload.php:81
+#: actions/apistatusesupdate.php:213 actions/avatarsettings.php:257
 #: actions/designadminpanel.php:123 actions/editapplication.php:118
 #: actions/newapplication.php:101 actions/newnotice.php:94
 #: lib/designsettings.php:283
@@ -287,30 +291,30 @@ msgstr ""
 "Le serveur nâa pas pu gÃ©rer autant de donnÃ©es de POST (%s octets) en raison "
 "de sa configuration actuelle."
 
-#: actions/apiaccountupdateprofilebackgroundimage.php:136
-#: actions/apiaccountupdateprofilebackgroundimage.php:146
-#: actions/apiaccountupdateprofilecolors.php:164
-#: actions/apiaccountupdateprofilecolors.php:174
+#: actions/apiaccountupdateprofilebackgroundimage.php:137
+#: actions/apiaccountupdateprofilebackgroundimage.php:147
+#: actions/apiaccountupdateprofilecolors.php:165
+#: actions/apiaccountupdateprofilecolors.php:175
 #: actions/groupdesignsettings.php:290 actions/groupdesignsettings.php:300
 #: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
 #: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
 msgid "Unable to save your design settings."
 msgstr "Impossible de sauvegarder les parmÃ¨tres de la conception."
 
-#: actions/apiaccountupdateprofilebackgroundimage.php:187
-#: actions/apiaccountupdateprofilecolors.php:142
+#: actions/apiaccountupdateprofilebackgroundimage.php:188
+#: actions/apiaccountupdateprofilecolors.php:143
 msgid "Could not update your design."
 msgstr "Impossible de mettre Ã  jour votre conception."
 
-#: actions/apiblockcreate.php:105
+#: actions/apiblockcreate.php:106
 msgid "You cannot block yourself!"
 msgstr "Vous ne pouvez pas vous bloquer vous-mÃªme !"
 
-#: actions/apiblockcreate.php:126
+#: actions/apiblockcreate.php:127
 msgid "Block user failed."
 msgstr "Le blocage de lâutilisateur a Ã©chouÃ©."
 
-#: actions/apiblockdestroy.php:114
+#: actions/apiblockdestroy.php:115
 msgid "Unblock user failed."
 msgstr "Le dÃ©blocage de lâutilisateur a Ã©chouÃ©."
 
@@ -334,61 +338,61 @@ msgstr "Messages directs envoyÃ©s Ã  %s"
 msgid "All the direct messages sent to %s"
 msgstr "Tous les messages directs envoyÃ©s Ã  %s"
 
-#: actions/apidirectmessagenew.php:118
+#: actions/apidirectmessagenew.php:119
 msgid "No message text!"
 msgstr "Message sans texte !"
 
-#: actions/apidirectmessagenew.php:127 actions/newmessage.php:150
+#: actions/apidirectmessagenew.php:128 actions/newmessage.php:150
 #, php-format
 msgid "That's too long. Max message size is %d chars."
 msgstr "Câest trop long ! La taille maximale du message est de %d caractÃ¨res."
 
-#: actions/apidirectmessagenew.php:138
+#: actions/apidirectmessagenew.php:139
 msgid "Recipient user not found."
 msgstr "Destinataire non trouvÃ©."
 
-#: actions/apidirectmessagenew.php:142
+#: actions/apidirectmessagenew.php:143
 msgid "Can't send direct messages to users who aren't your friend."
 msgstr ""
 "Vous ne pouvez envoyer des messages personnels quâaux utilisateurs inscrits "
 "comme amis."
 
-#: actions/apifavoritecreate.php:109 actions/apifavoritedestroy.php:110
+#: actions/apifavoritecreate.php:110 actions/apifavoritedestroy.php:111
 #: actions/apistatusesdestroy.php:121
 msgid "No status found with that ID."
 msgstr "Aucun statut trouvÃ© avec cet identifiant. "
 
-#: actions/apifavoritecreate.php:120
+#: actions/apifavoritecreate.php:121
 msgid "This status is already a favorite."
 msgstr "Cet avis est dÃ©jÃ  un favori."
 
 #. TRANS: Error message text shown when a favorite could not be set.
-#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:296
+#: actions/apifavoritecreate.php:132 actions/favor.php:84 lib/command.php:296
 msgid "Could not create favorite."
 msgstr "Impossible de crÃ©er le favori."
 
-#: actions/apifavoritedestroy.php:123
+#: actions/apifavoritedestroy.php:124
 msgid "That status is not a favorite."
 msgstr "Cet avis nâest pas un favori."
 
-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
+#: actions/apifavoritedestroy.php:136 actions/disfavor.php:87
 msgid "Could not delete favorite."
 msgstr "Impossible de supprimer le favori."
 
-#: actions/apifriendshipscreate.php:109
+#: actions/apifriendshipscreate.php:110
 msgid "Could not follow user: profile not found."
 msgstr "Impossible de suivre lâutilisateur : profil non trouvÃ©."
 
-#: actions/apifriendshipscreate.php:118
+#: actions/apifriendshipscreate.php:119
 #, php-format
 msgid "Could not follow user: %s is already on your list."
 msgstr "Impossible de suivre lâutilisateur : %s est dÃ©jÃ  dans votre liste."
 
-#: actions/apifriendshipsdestroy.php:109
+#: actions/apifriendshipsdestroy.php:110
 msgid "Could not unfollow user: User not found."
 msgstr "Impossible de ne plus suivre lâutilisateur : utilisateur non trouvÃ©."
 
-#: actions/apifriendshipsdestroy.php:120
+#: actions/apifriendshipsdestroy.php:121
 msgid "You cannot unfollow yourself."
 msgstr "Vous ne pouvez pas ne plus vous suivre vous-mÃªme."
 
@@ -404,7 +408,7 @@ msgstr "Impossible de dÃ©terminer lâutilisateur source."
 msgid "Could not find target user."
 msgstr "Impossible de trouver lâutilisateur cible."
 
-#: actions/apigroupcreate.php:167 actions/editgroup.php:186
+#: actions/apigroupcreate.php:168 actions/editgroup.php:186
 #: actions/newgroup.php:126 actions/profilesettings.php:215
 #: actions/register.php:212
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
@@ -412,95 +416,95 @@ msgstr ""
 "Les pseudos ne peuvent contenir que des caractÃ¨res minuscules et des "
 "chiffres, sans espaces."
 
-#: actions/apigroupcreate.php:176 actions/editgroup.php:190
+#: actions/apigroupcreate.php:177 actions/editgroup.php:190
 #: actions/newgroup.php:130 actions/profilesettings.php:238
 #: actions/register.php:215
 msgid "Nickname already in use. Try another one."
 msgstr "Pseudo dÃ©jÃ  utilisÃ©. Essayez-en un autre."
 
-#: actions/apigroupcreate.php:183 actions/editgroup.php:193
+#: actions/apigroupcreate.php:184 actions/editgroup.php:193
 #: actions/newgroup.php:133 actions/profilesettings.php:218
 #: actions/register.php:217
 msgid "Not a valid nickname."
 msgstr "Pseudo invalide."
 
-#: actions/apigroupcreate.php:199 actions/editapplication.php:215
+#: actions/apigroupcreate.php:200 actions/editapplication.php:215
 #: actions/editgroup.php:199 actions/newapplication.php:203
 #: actions/newgroup.php:139 actions/profilesettings.php:222
 #: actions/register.php:224
 msgid "Homepage is not a valid URL."
 msgstr "Lâadresse du site personnel nâest pas un URL valide. "
 
-#: actions/apigroupcreate.php:208 actions/editgroup.php:202
+#: actions/apigroupcreate.php:209 actions/editgroup.php:202
 #: actions/newgroup.php:142 actions/profilesettings.php:225
 #: actions/register.php:227
 msgid "Full name is too long (max 255 chars)."
 msgstr "Nom complet trop long (maximum de 255 caractÃ¨res)."
 
-#: actions/apigroupcreate.php:216 actions/editapplication.php:190
+#: actions/apigroupcreate.php:217 actions/editapplication.php:190
 #: actions/newapplication.php:172
 #, php-format
 msgid "Description is too long (max %d chars)."
 msgstr "La description est trop longue (%d caractÃ¨res maximum)."
 
-#: actions/apigroupcreate.php:227 actions/editgroup.php:208
+#: actions/apigroupcreate.php:228 actions/editgroup.php:208
 #: actions/newgroup.php:148 actions/profilesettings.php:232
 #: actions/register.php:234
 msgid "Location is too long (max 255 chars)."
 msgstr "Emplacement trop long (maximum de 255 caractÃ¨res)."
 
-#: actions/apigroupcreate.php:246 actions/editgroup.php:219
+#: actions/apigroupcreate.php:247 actions/editgroup.php:219
 #: actions/newgroup.php:159
 #, php-format
 msgid "Too many aliases! Maximum %d."
 msgstr "Trop dâalias ! Maximum %d."
 
-#: actions/apigroupcreate.php:267
+#: actions/apigroupcreate.php:268
 #, php-format
 msgid "Invalid alias: \"%s\"."
 msgstr "Alias invalide : Â« %s Â»."
 
-#: actions/apigroupcreate.php:276 actions/editgroup.php:232
+#: actions/apigroupcreate.php:277 actions/editgroup.php:232
 #: actions/newgroup.php:172
 #, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr "Alias Â« %s Â» dÃ©jÃ  utilisÃ©. Essayez-en un autre."
 
-#: actions/apigroupcreate.php:289 actions/editgroup.php:238
+#: actions/apigroupcreate.php:290 actions/editgroup.php:238
 #: actions/newgroup.php:178
 msgid "Alias can't be the same as nickname."
 msgstr "Lâalias ne peut pas Ãªtre le mÃªme que le pseudo."
 
-#: actions/apigroupismember.php:96 actions/apigroupjoin.php:105
-#: actions/apigroupleave.php:105 actions/apigroupmembership.php:92
+#: actions/apigroupismember.php:96 actions/apigroupjoin.php:106
+#: actions/apigroupleave.php:106 actions/apigroupmembership.php:92
 #: actions/apigroupshow.php:83 actions/apitimelinegroup.php:92
 msgid "Group not found."
 msgstr "Groupe non trouvÃ©."
 
 #. TRANS: Error text shown a user tries to join a group they already are a member of.
-#: actions/apigroupjoin.php:111 actions/joingroup.php:100 lib/command.php:336
+#: actions/apigroupjoin.php:112 actions/joingroup.php:100 lib/command.php:336
 msgid "You are already a member of that group."
 msgstr "Vous Ãªtes dÃ©jÃ  membre de ce groupe."
 
 #. TRANS: Error text shown when a user tries to join a group they are blocked from joining.
-#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:341
+#: actions/apigroupjoin.php:121 actions/joingroup.php:105 lib/command.php:341
 msgid "You have been blocked from that group by the admin."
 msgstr "Vous avez Ã©tÃ© bloquÃ© de ce groupe par lâadministrateur."
 
 #. 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.
-#: actions/apigroupjoin.php:139 actions/joingroup.php:134 lib/command.php:353
+#: actions/apigroupjoin.php:140 actions/joingroup.php:134 lib/command.php:353
 #, 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."
 
-#: actions/apigroupleave.php:115
+#: actions/apigroupleave.php:116
 msgid "You are not a member of this group."
 msgstr "Vous nâÃªtes pas membre de ce groupe."
 
 #. 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.
-#: actions/apigroupleave.php:125 actions/leavegroup.php:129
+#: actions/apigroupleave.php:126 actions/leavegroup.php:129
 #: lib/command.php:401
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
@@ -530,7 +534,7 @@ msgstr "Groupes de %s"
 msgid "groups on %s"
 msgstr "groupes sur %s"
 
-#: actions/apimediaupload.php:99
+#: actions/apimediaupload.php:100
 msgid "Upload failed."
 msgstr "Ãchec du tÃ©lÃ©versement."
 
@@ -544,9 +548,9 @@ msgstr "Jeton incorrect."
 
 #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
 #: actions/deletenotice.php:169 actions/disfavor.php:74
-#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:55
+#: actions/emailsettings.php:271 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:66 actions/imsettings.php:227
+#: actions/groupunblock.php:66 actions/imsettings.php:230
 #: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
@@ -596,8 +600,8 @@ msgstr "Le jeton de connexion %s a Ã©tÃ© refusÃ© et rÃ©voquÃ©."
 #. 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:286 actions/grouplogo.php:322
-#: actions/imsettings.php:242 actions/newapplication.php:121
+#: actions/emailsettings.php:290 actions/grouplogo.php:322
+#: actions/imsettings.php:245 actions/newapplication.php:121
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
 #: actions/smssettings.php:277 lib/designsettings.php:304
 msgid "Unexpected form submission."
@@ -663,18 +667,18 @@ msgstr "Ce processus requiert un POST ou un DELETE."
 msgid "You may not delete another user's status."
 msgstr "Vous ne pouvez pas supprimer le statut dâun autre utilisateur."
 
-#: actions/apistatusesretweet.php:75 actions/apistatusesretweets.php:72
+#: actions/apistatusesretweet.php:76 actions/apistatusesretweets.php:72
 #: actions/deletenotice.php:52 actions/shownotice.php:92
 msgid "No such notice."
 msgstr "Avis non trouvÃ©."
 
 #. TRANS: Error text shown when trying to repeat an own notice.
-#: actions/apistatusesretweet.php:83 lib/command.php:538
+#: actions/apistatusesretweet.php:84 lib/command.php:538
 msgid "Cannot repeat your own notice."
 msgstr "Vous ne pouvez pas reprendre votre propre avis."
 
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-#: actions/apistatusesretweet.php:91 lib/command.php:544
+#: actions/apistatusesretweet.php:92 lib/command.php:544
 msgid "Already repeated that notice."
 msgstr "Vous avez dÃ©jÃ  repris cet avis."
 
@@ -686,21 +690,21 @@ msgstr "Statut supprimÃ©."
 msgid "No status with that ID found."
 msgstr "Aucun statut trouvÃ© avec cet identifiant."
 
-#: actions/apistatusesupdate.php:221
+#: actions/apistatusesupdate.php:222
 msgid "Client must provide a 'status' parameter with a value."
 msgstr "Le client doit fournir un paramÃ¨tre Â« statut Â» avec une valeur."
 
-#: actions/apistatusesupdate.php:242 actions/newnotice.php:157
+#: actions/apistatusesupdate.php:243 actions/newnotice.php:157
 #: lib/mailhandler.php:60
 #, php-format
 msgid "That's too long. Max notice size is %d chars."
 msgstr "Câest trop long ! La taille maximale de lâavis est de %d caractÃ¨res."
 
-#: actions/apistatusesupdate.php:283 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:284 actions/apiusershow.php:96
 msgid "Not found."
 msgstr "Non trouvÃ©."
 
-#: actions/apistatusesupdate.php:306 actions/newnotice.php:181
+#: actions/apistatusesupdate.php:307 actions/newnotice.php:181
 #, php-format
 msgid "Max notice size is %d chars, including attachment URL."
 msgstr ""
@@ -904,7 +908,9 @@ msgid "Yes"
 msgstr "Oui"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
+#. TRANS: Submit button title.
+#. TRANS: Description of the form to block a user.
+#: actions/block.php:164 actions/groupmembers.php:403 lib/blockform.php:82
 msgid "Block this user"
 msgstr "Bloquer cet utilisateur"
 
@@ -946,11 +952,13 @@ msgstr "Une liste des utilisateurs dont lâinscription Ã  ce groupe est bloquÃ©
 msgid "Unblock user from group"
 msgstr "DÃ©bloquer lâutilisateur de ce groupe"
 
-#: actions/blockedfromgroup.php:320 lib/unblockform.php:69
+#. TRANS: Title for the form to unblock a user.
+#: actions/blockedfromgroup.php:320 lib/unblockform.php:70
 msgid "Unblock"
 msgstr "DÃ©bloquer"
 
-#: actions/blockedfromgroup.php:320 lib/unblockform.php:80
+#. TRANS: Description of the form to unblock a user.
+#: actions/blockedfromgroup.php:320 lib/unblockform.php:82
 msgid "Unblock this user"
 msgstr "DÃ©bloquer cet utilisateur"
 
@@ -989,9 +997,9 @@ msgstr "Cette adresse a dÃ©jÃ  Ã©tÃ© confirmÃ©e."
 #. 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/confirmaddress.php:116 actions/emailsettings.php:331
+#: actions/emailsettings.php:477 actions/imsettings.php:283
+#: actions/imsettings.php:442 actions/othersettings.php:174
 #: actions/profilesettings.php:283 actions/smssettings.php:308
 #: actions/smssettings.php:464
 msgid "Couldn't update user."
@@ -999,7 +1007,7 @@ msgstr "Impossible de mettre Ã  jour lâutilisateur."
 
 #. 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/confirmaddress.php:128 actions/emailsettings.php:437
 #: actions/smssettings.php:422
 msgid "Couldn't delete email confirmation."
 msgstr "Impossible de supprimer le courriel de confirmation."
@@ -1035,9 +1043,10 @@ msgstr "Application non trouvÃ©e."
 msgid "You are not the owner of this application."
 msgstr "Vous nâÃªtes pas le propriÃ©taire de cette application."
 
+#. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:127
 #: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1307
+#: lib/action.php:1315
 msgid "There was a problem with your session token."
 msgstr "Un problÃ¨me est survenu avec votre jeton de session."
 
@@ -1071,7 +1080,7 @@ msgstr "Supprimer cette application"
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
 #: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:73 lib/profileformaction.php:64
+#: lib/adminpanelaction.php:71 lib/profileformaction.php:64
 #: lib/settingsaction.php:72
 msgid "Not logged in."
 msgstr "Non connectÃ©."
@@ -1134,7 +1143,6 @@ msgstr "Supprimer cet utilisateur"
 #. TRANS: Message used as title for design settings for the site.
 #. TRANS: Link description in user account settings menu.
 #: actions/designadminpanel.php:63 lib/accountsettingsaction.php:139
-#: lib/groupnav.php:119
 msgid "Design"
 msgstr "Conception"
 
@@ -1256,13 +1264,13 @@ msgstr "Restaurer les conceptions par dÃ©faut"
 msgid "Reset back to default"
 msgstr "Revenir aux valeurs par dÃ©faut"
 
-#. TRANS: Submit button title
+#. TRANS: Submit button title.
 #: actions/designadminpanel.php:685 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/snapshotadminpanel.php:245
 #: actions/subscriptions.php:226 actions/tagother.php:154
-#: actions/useradminpanel.php:294 lib/applicationeditform.php:363
+#: actions/useradminpanel.php:294 lib/applicationeditform.php:353
 #: lib/designsettings.php:256 lib/groupeditform.php:202
 msgid "Save"
 msgstr "Enregistrer"
@@ -1418,7 +1426,7 @@ msgstr "Adresse courriel actuellement confirmÃ©e."
 #. 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/emailsettings.php:115 actions/emailsettings.php:162
 #: actions/imsettings.php:116 actions/smssettings.php:124
 #: actions/smssettings.php:180
 msgctxt "BUTTON"
@@ -1436,22 +1444,26 @@ msgstr ""
 #. 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
+#. TRANS: Button label in the "Edit application" form.
 #: actions/emailsettings.php:127 actions/imsettings.php:131
-#: actions/smssettings.php:137 lib/applicationeditform.php:357
+#: actions/smssettings.php:137 lib/applicationeditform.php:347
 msgctxt "BUTTON"
 msgid "Cancel"
 msgstr "Annuler"
 
-#. TRANS: Instructions for e-mail address input form.
-#: actions/emailsettings.php:135
+#. TRANS: Instructions for e-mail address input form. Do not translate
+#. TRANS: "example.org". It is one of the domain names reserved for
+#. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
+#. TRANS: Any other domain may be owned by a legitimate person or
+#. TRANS: organization.
+#: actions/emailsettings.php:139
 msgid "Email address, like \"UserName@example.org\""
 msgstr "Adresse de courriel (ex : nom@example.org)"
 
 #. 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/emailsettings.php:143 actions/imsettings.php:151
 #: actions/smssettings.php:162
 msgctxt "BUTTON"
 msgid "Add"
@@ -1459,112 +1471,112 @@ msgstr "Ajouter"
 
 #. 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
+#: actions/emailsettings.php:151 actions/smssettings.php:171
 msgid "Incoming email"
 msgstr "Courriel entrant"
 
 #. 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
+#: actions/emailsettings.php:159 actions/smssettings.php:178
 msgid "Send email to this address to post new notices."
 msgstr "Ãcrivez Ã  cette adresse courriel pour poster de nouveaux avis."
 
 #. 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
+#: actions/emailsettings.php:168 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."
 
 #. 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
+#: actions/emailsettings.php:172 actions/smssettings.php:189
 msgctxt "BUTTON"
 msgid "New"
 msgstr "Nouveau"
 
 #. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:174
+#: actions/emailsettings.php:178
 msgid "Email preferences"
 msgstr "PrÃ©fÃ©rences de courrier Ã©lectronique"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:180
+#: actions/emailsettings.php:184
 msgid "Send me notices of new subscriptions through email."
 msgstr "Avertissez-moi par courriel des nouveaux abonnements."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:186
+#: actions/emailsettings.php:190
 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."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:193
+#: actions/emailsettings.php:197
 msgid "Send me email when someone sends me a private message."
 msgstr "Envoyez-moi un courriel quand quelquâun mâenvoie un message personnel."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:199
+#: actions/emailsettings.php:203
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr "Envoyez-moi un courriel quand quelquâun mâenvoie une rÃ©ponse Â« @Â Â»."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:205
+#: actions/emailsettings.php:209
 msgid "Allow friends to nudge me and send me an email."
 msgstr "Autoriser mes amis Ã  mâenvoyer des courriels et des clins dâÅil."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:212
+#: actions/emailsettings.php:216
 msgid "I want to post notices by email."
 msgstr "Je veux envoyer mes avis par courriel."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:219
+#: actions/emailsettings.php:223
 msgid "Publish a MicroID for my email address."
 msgstr "Publier un MicroID pour mon adresse courriel."
 
 #. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:334
+#: actions/emailsettings.php:338
 msgid "Email preferences saved."
 msgstr "PrÃ©fÃ©rences de courrier Ã©lectronique enregistrÃ©es."
 
 #. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:353
+#: actions/emailsettings.php:357
 msgid "No email address."
 msgstr "Aucune adresse Ã©lectronique."
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:361
+#: actions/emailsettings.php:365
 msgid "Cannot normalize that email address"
 msgstr "Impossible dâutiliser cette adresse courriel"
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:208
+#: actions/emailsettings.php:370 actions/register.php:208
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "Adresse courriel invalide."
 
 #. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:370
+#: actions/emailsettings.php:374
 msgid "That is already your email address."
 msgstr "Vous utilisez dÃ©jÃ  cette adresse courriel."
 
 #. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:374
+#: actions/emailsettings.php:378
 msgid "That email address already belongs to another user."
 msgstr "Cette adresse courriel appartient dÃ©jÃ  Ã  un autre utilisateur."
 
 #. 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/emailsettings.php:395 actions/imsettings.php:351
 #: actions/smssettings.php:373
 msgid "Couldn't insert confirmation code."
 msgstr "Impossible dâinsÃ©rer le code de confirmation."
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:398
+#: actions/emailsettings.php:402
 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."
@@ -1575,50 +1587,50 @@ msgstr ""
 #. 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/emailsettings.php:423 actions/imsettings.php:386
 #: actions/smssettings.php:408
 msgid "No pending confirmation to cancel."
 msgstr "Aucune confirmation Ã  annuler."
 
 #. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:424
+#: actions/emailsettings.php:428
 msgid "That is the wrong email address."
 msgstr "Cette adresse de messagerie Ã©lectronique est erronÃ©e."
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:438
+#: actions/emailsettings.php:442
 msgid "Email confirmation cancelled."
 msgstr "Confirmation de courrier Ã©lectronique annulÃ©e."
 
 #. TRANS: Message given trying to remove an e-mail address that is not
 #. TRANS: registered for the active user.
-#: actions/emailsettings.php:458
+#: actions/emailsettings.php:462
 msgid "That is not your email address."
 msgstr "Ceci nâest pas votre adresse courriel."
 
 #. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:479
+#: actions/emailsettings.php:483
 msgid "The email address was removed."
 msgstr "Lâadresse Ã©lectronique a Ã©tÃ© supprimÃ©e."
 
-#: actions/emailsettings.php:493 actions/smssettings.php:568
+#: actions/emailsettings.php:497 actions/smssettings.php:568
 msgid "No incoming email address."
 msgstr "Aucune adresse de courriel entrant."
 
 #. 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/emailsettings.php:508 actions/emailsettings.php:532
 #: actions/smssettings.php:578 actions/smssettings.php:602
 msgid "Couldn't update user record."
 msgstr "Impossible de mettre Ã  jour le dossier de lâutilisateur."
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
-#: actions/emailsettings.php:508 actions/smssettings.php:581
+#: actions/emailsettings.php:512 actions/smssettings.php:581
 msgid "Incoming email address removed."
 msgstr "Lâadresse de courriel entrant a Ã©tÃ© supprimÃ©e."
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
-#: actions/emailsettings.php:532 actions/smssettings.php:605
+#: actions/emailsettings.php:536 actions/smssettings.php:605
 msgid "New incoming email address added."
 msgstr "Nouvelle adresse de courriel entrant ajoutÃ©e."
 
@@ -1737,7 +1749,7 @@ msgstr "Impossible de convertir le jeton de requÃªte en jeton dâaccÃ¨s."
 msgid "Remote service uses unknown version of OMB protocol."
 msgstr "Le service distant utilise une version inconnue du protocole OMB."
 
-#: actions/finishremotesubscribe.php:138
+#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306
 msgid "Error updating remote profile."
 msgstr "Erreur lors de la mise Ã  jour du profil distant."
 
@@ -1794,7 +1806,7 @@ msgstr "Cet utilisateur est dÃ©jÃ  bloquÃ© pour le groupe."
 msgid "User is not a member of group."
 msgstr "Lâutilisateur nâest pas membre du groupe."
 
-#: actions/groupblock.php:134 actions/groupmembers.php:360
+#: actions/groupblock.php:134 actions/groupmembers.php:364
 msgid "Block user from group"
 msgstr "Bloquer cet utilisateur du groupe"
 
@@ -1877,40 +1889,32 @@ msgstr "Logo mis Ã  jour."
 msgid "Failed updating logo."
 msgstr "La mise Ã  jour du logo a Ã©chouÃ©."
 
-#: actions/groupmembers.php:100 lib/groupnav.php:92
+#. TRANS: Title of the page showing group members.
+#. TRANS: %s is the name of the group.
+#: actions/groupmembers.php:102
 #, php-format
 msgid "%s group members"
 msgstr "Membres du groupe %s"
 
-#: actions/groupmembers.php:103
+#. TRANS: Title of the page showing group members.
+#. TRANS: %1$s is the name of the group, %2$d is the page number of the members list.
+#: actions/groupmembers.php:107
 #, php-format
 msgid "%1$s group members, page %2$d"
 msgstr "Membres du groupe %1$s - page %2$d"
 
-#: actions/groupmembers.php:118
+#: actions/groupmembers.php:122
 msgid "A list of the users in this group."
 msgstr "Liste des utilisateurs inscrits Ã  ce groupe."
 
-#: actions/groupmembers.php:182 lib/groupnav.php:107
+#: actions/groupmembers.php:186
 msgid "Admin"
 msgstr "Administrer"
 
-#: actions/groupmembers.php:392 lib/blockform.php:69
-msgid "Block"
-msgstr "Bloquer"
-
-#: actions/groupmembers.php:487
+#: actions/groupmembers.php:498
 msgid "Make user an admin of the group"
 msgstr "Faire de cet utilisateur un administrateur du groupe"
 
-#: actions/groupmembers.php:519
-msgid "Make Admin"
-msgstr "Faire un administrateur"
-
-#: actions/groupmembers.php:519
-msgid "Make this user an admin"
-msgstr "Faire de cet utilisateur un administrateur"
-
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Title in atom group notice feed. %s is a group name.
 #. TRANS: Title in atom user notice feed. %s is a user name.
@@ -2052,7 +2056,10 @@ msgstr ""
 
 #. TRANS: IM address input field instructions in IM settings form.
 #. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:140
+#. TRANS: Do not translate "example.org". It is one of the domain names reserved for use in examples by
+#. TRANS: http://www.rfc-editor.org/rfc/rfc2606.txt. Any other domain may be owned by a legitimate
+#. TRANS: person or organization.
+#: actions/imsettings.php:143
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -2063,66 +2070,66 @@ msgstr ""
 "GTalk."
 
 #. TRANS: Form legend for IM preferences form.
-#: actions/imsettings.php:155
+#: actions/imsettings.php:158
 msgid "IM preferences"
 msgstr "PrÃ©fÃ©rences de messagerie instantanÃ©e"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:160
+#: actions/imsettings.php:163
 msgid "Send me notices through Jabber/GTalk."
 msgstr "Envoyez-moi les avis par Jabber/GTalk."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:166
+#: actions/imsettings.php:169
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr ""
 "Poster un avis chaque fois que mon statut est modifiÃ© dans Jabber/GTalk"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:172
+#: actions/imsettings.php:175
 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Ã©."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:179
+#: actions/imsettings.php:182
 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "Publier un MicroID pour mon adresse Jabber/GTalk."
 
 #. TRANS: Confirmation message for successful IM preferences save.
-#: actions/imsettings.php:287 actions/othersettings.php:180
+#: actions/imsettings.php:290 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
+#: actions/imsettings.php:312
 msgid "No Jabber ID."
 msgstr "Aucun identifiant Jabber"
 
 #. TRANS: Message given saving IM address that cannot be normalised.
-#: actions/imsettings.php:317
+#: actions/imsettings.php:320
 msgid "Cannot normalize that Jabber ID"
 msgstr "Impossible dâutiliser cet identifiant Jabber"
 
 #. TRANS: Message given saving IM address that not valid.
-#: actions/imsettings.php:322
+#: actions/imsettings.php:325
 msgid "Not a valid Jabber ID"
 msgstr "Identifiant Jabber invalide."
 
 #. TRANS: Message given saving IM address that is already set.
-#: actions/imsettings.php:326
+#: actions/imsettings.php:329
 msgid "That is already your Jabber ID."
 msgstr "Vous utilisez dÃ©jÃ  cet idenfiant Jabber."
 
 #. TRANS: Message given saving IM address that is already set for another user.
-#: actions/imsettings.php:330
+#: actions/imsettings.php:333
 msgid "Jabber ID already belongs to another user."
 msgstr "Identifiant Jabber dÃ©jÃ  utilisÃ© par un autre utilisateur."
 
 #. 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
+#: actions/imsettings.php:361
 #, php-format
 msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
@@ -2132,28 +2139,28 @@ msgstr ""
 "instantanÃ©e. Vous devez approuver %s pour recevoir des messages."
 
 #. TRANS: Message given canceling IM address confirmation for the wrong IM address.
-#: actions/imsettings.php:388
+#: actions/imsettings.php:391
 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
+#: actions/imsettings.php:400
 msgid "Couldn't delete IM confirmation."
 msgstr "Impossible de supprimer la confirmation de messagerie instantanÃ©e."
 
 #. TRANS: Message given after successfully canceling IM address confirmation.
-#: actions/imsettings.php:402
+#: actions/imsettings.php:405
 msgid "IM confirmation cancelled."
 msgstr "Confirmation de messagerie instantanÃ©e annulÃ©e."
 
 #. TRANS: Message given trying to remove an IM address that is not
 #. TRANS: registered for the active user.
-#: actions/imsettings.php:424
+#: actions/imsettings.php:427
 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
+#: actions/imsettings.php:450
 msgid "The IM address was removed."
 msgstr "Lâadresse de messagerie instantanÃ©e a Ã©tÃ© supprimÃ©e."
 
@@ -2636,8 +2643,8 @@ msgid "Only %s URLs over plain HTTP please."
 msgstr "Veuillez n'utiliser que des URL HTTP complÃ¨tes en %s."
 
 #. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1215
-#: lib/apiaction.php:1243 lib/apiaction.php:1366
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1206
+#: lib/apiaction.php:1233 lib/apiaction.php:1356
 msgid "Not a supported data format."
 msgstr "Format de donnÃ©es non supportÃ©."
 
@@ -2778,7 +2785,7 @@ msgid "Password saved."
 msgstr "Mot de passe enregistrÃ©."
 
 #. TRANS: Menu item for site administration
-#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:384
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:371
 msgid "Paths"
 msgstr "Chemins"
 
@@ -2992,7 +2999,7 @@ msgstr "Nom complet"
 
 #. TRANS: Form input field label.
 #: actions/profilesettings.php:115 actions/register.php:460
-#: lib/applicationeditform.php:244 lib/groupeditform.php:161
+#: lib/applicationeditform.php:235 lib/groupeditform.php:161
 msgid "Homepage"
 msgstr "Site personnel"
 
@@ -3099,7 +3106,7 @@ msgid "Couldn't save tags."
 msgstr "Impossible dâenregistrer les marques."
 
 #. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:391 lib/adminpanelaction.php:141
+#: actions/profilesettings.php:391 lib/adminpanelaction.php:138
 msgid "Settings saved."
 msgstr "PrÃ©fÃ©rences enregistrÃ©es."
 
@@ -3648,7 +3655,7 @@ msgstr "Lâutilisateur est dÃ©jÃ  dans le bac Ã  sable."
 
 #. TRANS: Menu item for site administration
 #: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
-#: lib/adminpanelaction.php:392
+#: lib/adminpanelaction.php:379
 msgid "Sessions"
 msgstr "Sessions"
 
@@ -3686,24 +3693,24 @@ msgid "Application profile"
 msgstr "Profil de lâapplication"
 
 #. TRANS: Form input field label for application icon.
-#: actions/showapplication.php:159 lib/applicationeditform.php:182
+#: actions/showapplication.php:159 lib/applicationeditform.php:173
 msgid "Icon"
 msgstr "IcÃ´ne"
 
 #. TRANS: Form input field label for application name.
 #: actions/showapplication.php:169 actions/version.php:197
-#: lib/applicationeditform.php:199
+#: lib/applicationeditform.php:190
 msgid "Name"
 msgstr "Nom"
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:178 lib/applicationeditform.php:235
+#: actions/showapplication.php:178 lib/applicationeditform.php:226
 msgid "Organization"
 msgstr "Organisation"
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:216 lib/groupeditform.php:172
+#: lib/applicationeditform.php:207 lib/groupeditform.php:172
 msgid "Description"
 msgstr "Description"
 
@@ -3818,7 +3825,7 @@ msgstr ""
 msgid "This is a way to share what you like."
 msgstr "Câest un moyen de partager ce que vous aimez."
 
-#: actions/showgroup.php:82 lib/groupnav.php:86
+#: actions/showgroup.php:82
 #, php-format
 msgid "%s group"
 msgstr "Groupe %s"
@@ -3870,7 +3877,7 @@ msgstr "Fil des avis du groupe %s (Atom)"
 msgid "FOAF for %s group"
 msgstr "ami dâun ami pour le groupe %s"
 
-#: actions/showgroup.php:393 actions/showgroup.php:445 lib/groupnav.php:91
+#: actions/showgroup.php:393 actions/showgroup.php:445
 msgid "Members"
 msgstr "Membres"
 
@@ -4331,7 +4338,7 @@ msgstr "Aucun code entrÃ©"
 
 #. TRANS: Menu item for site administration
 #: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
-#: lib/adminpanelaction.php:408
+#: lib/adminpanelaction.php:395
 msgid "Snapshots"
 msgstr "InstantanÃ©s"
 
@@ -5073,7 +5080,7 @@ msgid "Unable to save tag."
 msgstr "Impossible dâenregistrer lâÃ©tiquette."
 
 #. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#: classes/Subscription.php:75 lib/oauthstore.php:465
+#: classes/Subscription.php:75 lib/oauthstore.php:466
 msgid "You have been banned from subscribing."
 msgstr "Il vous a Ã©tÃ© interdit de vous abonner."
 
@@ -5221,7 +5228,8 @@ msgid "Change site configuration"
 msgstr "Modifier la configuration du site"
 
 #. TRANS: Main menu option when logged in and site admin for access to site configuration
-#: lib/action.php:474
+#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
+#: lib/action.php:474 lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr "Administrer"
@@ -5298,7 +5306,7 @@ msgstr "Rechercher"
 
 #. TRANS: DT element for site notice. String is hidden in default CSS.
 #. TRANS: Menu item for site administration
-#: lib/action.php:538 lib/adminpanelaction.php:400
+#: lib/action.php:538 lib/adminpanelaction.php:387
 msgid "Site notice"
 msgstr "Notice du site"
 
@@ -5362,7 +5370,10 @@ msgid "StatusNet software license"
 msgstr "Licence du logiciel StatusNet"
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
-#: lib/action.php:843
+#. TRANS: Text between [] is a link description, text between () is the link itself.
+#. TRANS: Make sure there is no whitespace between "]" and "(".
+#. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
+#: lib/action.php:846
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -5372,13 +5383,16 @@ msgstr ""
 "%site.broughtby%%](%%site.broughtbyurl%%)."
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:846
+#: lib/action.php:849
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** est un service de micro-blogging."
 
 #. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.
-#: lib/action.php:850
+#. TRANS: Make sure there is no whitespace between "]" and "(".
+#. TRANS: Text between [] is a link description, text between () is the link itself.
+#. TRANS: %s is the version of StatusNet that is being used.
+#: lib/action.php:856
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -5390,20 +5404,20 @@ msgstr ""
 "(http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
 
 #. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:866
+#: lib/action.php:872
 msgid "Site content license"
 msgstr "Licence du contenu du site"
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:873
+#: lib/action.php:879
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr "Le contenu et les donnÃ©es de %1$s sont privÃ©s et confidentiels."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:880
+#: lib/action.php:886
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
@@ -5411,33 +5425,34 @@ msgstr ""
 "rÃ©servÃ©s."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:884
+#: lib/action.php:890
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 "Le contenu et les donnÃ©es sont sous le droit dâauteur du contributeur. Tous "
 "droits rÃ©servÃ©s."
 
-#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:897
+#. TRANS: license message in footer.
+#. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
+#: lib/action.php:904
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr ""
 "Tous les contenus %1$s et les donnÃ©es sont disponibles sous la licence %2$s."
 
 #. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1236
+#: lib/action.php:1243
 msgid "Pagination"
 msgstr "Pagination"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1247
+#: lib/action.php:1254
 msgid "After"
 msgstr "AprÃ¨s"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1257
+#: lib/action.php:1264
 msgid "Before"
 msgstr "Avant"
 
@@ -5446,209 +5461,228 @@ msgstr "Avant"
 msgid "Expecting a root feed element but got a whole XML document."
 msgstr "Attendait un Ã©lÃ©ment racine mais a reÃ§u tout un document XML."
 
-#: lib/activityutils.php:208
+#. TRANS: Client exception thrown when there is no source attribute.
+#: lib/activityutils.php:203
 msgid "Can't handle remote content yet."
 msgstr "Impossible de gÃ©rer le contenu distant pour le moment."
 
-#: lib/activityutils.php:244
+#. TRANS: Client exception thrown when there embedded XML content is found that cannot be processed yet.
+#: lib/activityutils.php:240
 msgid "Can't handle embedded XML content yet."
 msgstr "Impossible de gÃ©rer le contenu XML embarquÃ© pour le moment."
 
-#: lib/activityutils.php:248
+#. TRANS: Client exception thrown when base64 encoded content is found that cannot be processed yet.
+#: lib/activityutils.php:245
 msgid "Can't handle embedded Base64 content yet."
 msgstr "Impossible de gÃ©rer le contenu en Base64 embarquÃ© pour le moment."
 
 #. TRANS: Client error message thrown when a user tries to change admin settings but has no access rights.
-#: lib/adminpanelaction.php:98
+#: lib/adminpanelaction.php:96
 msgid "You cannot make changes to this site."
 msgstr "Vous ne pouvez pas faire de modifications sur ce site."
 
 #. TRANS: Client error message throw when a certain panel's settings cannot be changed.
-#: lib/adminpanelaction.php:110
+#: lib/adminpanelaction.php:108
 msgid "Changes to that panel are not allowed."
 msgstr "La modification de ce panneau nâest pas autorisÃ©e."
 
 #. TRANS: Client error message.
-#: lib/adminpanelaction.php:229
+#: lib/adminpanelaction.php:222
 msgid "showForm() not implemented."
 msgstr "showForm() nâa pas Ã©tÃ© implÃ©mentÃ©e."
 
 #. TRANS: Client error message
-#: lib/adminpanelaction.php:259
+#: lib/adminpanelaction.php:250
 msgid "saveSettings() not implemented."
 msgstr "saveSettings() nâa pas Ã©tÃ© implÃ©mentÃ©e."
 
 #. TRANS: Client error message thrown if design settings could not be deleted in
 #. TRANS: the admin panel Design.
-#: lib/adminpanelaction.php:284
+#: lib/adminpanelaction.php:274
 msgid "Unable to delete design setting."
 msgstr "Impossible de supprimer les paramÃ¨tres de conception."
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:350
+#: lib/adminpanelaction.php:337
 msgid "Basic site configuration"
 msgstr "Configuration basique du site"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:352
+#: lib/adminpanelaction.php:339
 msgctxt "MENU"
 msgid "Site"
 msgstr "Site"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:358
+#: lib/adminpanelaction.php:345
 msgid "Design configuration"
 msgstr "Configuration de la conception"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:360
+#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
+#: lib/adminpanelaction.php:347 lib/groupnav.php:135
 msgctxt "MENU"
 msgid "Design"
 msgstr "Conception"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:366
+#: lib/adminpanelaction.php:353
 msgid "User configuration"
 msgstr "Configuration utilisateur"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:368 lib/personalgroupnav.php:115
+#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:115
 msgid "User"
 msgstr "Utilisateur"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:374
+#: lib/adminpanelaction.php:361
 msgid "Access configuration"
 msgstr "Configuration dâaccÃ¨s"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:382
+#: lib/adminpanelaction.php:369
 msgid "Paths configuration"
 msgstr "Configuration des chemins"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:390
+#: lib/adminpanelaction.php:377
 msgid "Sessions configuration"
 msgstr "Configuration des sessions"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:398
+#: lib/adminpanelaction.php:385
 msgid "Edit site notice"
 msgstr "Modifier l'avis du site"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:406
+#: lib/adminpanelaction.php:393
 msgid "Snapshots configuration"
 msgstr "Configuration des instantanÃ©s"
 
 #. TRANS: Client error 401.
-#: lib/apiauth.php:113
+#: lib/apiauth.php:111
 msgid "API resource requires read-write access, but you only have read access."
 msgstr ""
 "La ressource de lâAPI a besoin de lâaccÃ¨s en lecture et en Ã©criture, mais "
 "vous nây avez accÃ¨s quâen lecture."
 
+#. TRANS: OAuth exception thrown when no application is found for a given consumer key.
+#: lib/apiauth.php:175
+msgid "No application for that consumer key."
+msgstr ""
+
+#. TRANS: OAuth exception given when no user was found for a given token (no token was found).
+#: lib/apiauth.php:217
+msgid "No user for that token."
+msgstr ""
+
+#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
+#: lib/apioauthstore.php:178
+msgid "Tried to revoke unknown token"
+msgstr ""
+
 #. TRANS: Form legend.
-#: lib/applicationeditform.php:137
+#: lib/applicationeditform.php:129
 msgid "Edit application"
 msgstr "Modifier votre application"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:187
+#: lib/applicationeditform.php:178
 msgid "Icon for this application"
 msgstr "IcÃ´ne pour cette application"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:209
+#: lib/applicationeditform.php:200
 #, php-format
 msgid "Describe your application in %d characters"
 msgstr "DÃ©crivez votre application en %d caractÃ¨res"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:213
+#: lib/applicationeditform.php:204
 msgid "Describe your application"
 msgstr "DÃ©crivez votre application"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:224
+#: lib/applicationeditform.php:215
 msgid "URL of the homepage of this application"
 msgstr "URL de la page dâaccueil de cette application"
 
 #. TRANS: Form input field label.
-#: lib/applicationeditform.php:226
+#: lib/applicationeditform.php:217
 msgid "Source URL"
 msgstr "URL source"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:233
+#: lib/applicationeditform.php:224
 msgid "Organization responsible for this application"
 msgstr "Organisation responsable de cette application"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:242
+#: lib/applicationeditform.php:233
 msgid "URL for the homepage of the organization"
 msgstr "URL de la page dâaccueil de lâorganisation"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:251
+#: lib/applicationeditform.php:242
 msgid "URL to redirect to after authentication"
 msgstr "URL vers laquelle rediriger aprÃ¨s lâauthentification"
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:278
+#: lib/applicationeditform.php:269
 msgid "Browser"
 msgstr "Navigateur"
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:295
+#: lib/applicationeditform.php:286
 msgid "Desktop"
 msgstr "Bureau"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:297
+#: lib/applicationeditform.php:288
 msgid "Type of application, browser or desktop"
 msgstr "Type dâapplication, navigateur ou bureau"
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:320
+#: lib/applicationeditform.php:311
 msgid "Read-only"
 msgstr "Lecture seule"
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:339
+#: lib/applicationeditform.php:330
 msgid "Read-write"
 msgstr "Lecture-Ã©criture"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:341
+#: lib/applicationeditform.php:332
 msgid "Default access for this application: read-only, or read-write"
 msgstr ""
 "AccÃ¨s par dÃ©faut pour cette application : en lecture seule ou en lecture-"
 "Ã©criture"
 
-#. TRANS: Submit button title
-#: lib/applicationeditform.php:359
+#. TRANS: Submit button title.
+#: lib/applicationeditform.php:349
 msgid "Cancel"
 msgstr "Annuler"
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:136
+#: lib/applicationlist.php:135
 msgid "read-write"
 msgstr "lecture-Ã©criture"
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:138
+#: lib/applicationlist.php:137
 msgid "read-only"
 msgstr "lecture seule"
 
 #. 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
+#: lib/applicationlist.php:143
 #, php-format
 msgid "Approved %1$s - \"%2$s\" access."
 msgstr "AccÃ¨s Â« %2$s Â» approuvÃ© le %1$s."
 
 #. TRANS: Button label
-#: lib/applicationlist.php:159
+#: lib/applicationlist.php:158
 msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "RÃ©voquer"
@@ -5668,11 +5702,13 @@ msgstr "Auteur"
 msgid "Provider"
 msgstr "Fournisseur"
 
-#: lib/attachmentnoticesection.php:67
+#. TRANS: Title.
+#: lib/attachmentnoticesection.php:68
 msgid "Notices where this attachment appears"
 msgstr "Avis sur lesquels cette piÃ¨ce jointe apparaÃ®t."
 
-#: lib/attachmenttagcloudsection.php:48
+#. TRANS: Title.
+#: lib/attachmenttagcloudsection.php:49
 msgid "Tags for this attachment"
 msgstr "Marques de cette piÃ¨ce jointe"
 
@@ -5684,6 +5720,11 @@ msgstr "La modification du mot de passe a Ã©chouÃ©"
 msgid "Password changing is not allowed"
 msgstr "La modification du mot de passe nâest pas autorisÃ©e"
 
+#. TRANS: Title for the form to block a user.
+#: lib/blockform.php:70
+msgid "Block"
+msgstr "Bloquer"
+
 #: lib/channel.php:157 lib/channel.php:177
 msgid "Command results"
 msgstr "RÃ©sultats de la commande"
@@ -5939,7 +5980,7 @@ msgid "You are not subscribed to anyone."
 msgstr "Vous nâÃªtes abonnÃ©(e) Ã  personne."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to.
-#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.
 #: lib/command.php:836
 msgid "You are subscribed to this person:"
@@ -5954,7 +5995,7 @@ msgid "No one is subscribed to you."
 msgstr "Personne ne sâest abonnÃ© Ã  vous."
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
-#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
 #: lib/command.php:863
 msgid "This person is subscribed to you:"
@@ -5969,7 +6010,7 @@ msgid "You are not a member of any groups."
 msgstr "Vous nâÃªtes membre dâaucun groupe."
 
 #. TRANS: Text shown after requesting groups a user is subscribed to.
-#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
 #: lib/command.php:890
 msgid "You are a member of this group:"
@@ -5977,6 +6018,7 @@ 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 :"
 
+#. TRANS: Help text for commands.
 #: lib/command.php:905
 msgid ""
 "Commands:\n"
@@ -6202,38 +6244,6 @@ msgstr ""
 "Pseudos supplÃ©mentaires pour le groupe, sÃ©parÃ©s par des virgules ou des "
 "espaces, %d au maximum"
 
-#: lib/groupnav.php:85
-msgid "Group"
-msgstr "Groupe"
-
-#: lib/groupnav.php:101
-msgid "Blocked"
-msgstr "BloquÃ©"
-
-#: lib/groupnav.php:102
-#, php-format
-msgid "%s blocked users"
-msgstr "%s utilisateurs bloquÃ©s"
-
-#: lib/groupnav.php:108
-#, php-format
-msgid "Edit %s group properties"
-msgstr "Modifier les propriÃ©tÃ©s du groupe %s"
-
-#: lib/groupnav.php:113
-msgid "Logo"
-msgstr "Logo"
-
-#: lib/groupnav.php:114
-#, php-format
-msgid "Add or edit %s logo"
-msgstr "Ajouter ou modifier le logo de %s"
-
-#: lib/groupnav.php:120
-#, php-format
-msgid "Add or edit %s design"
-msgstr "Ajouter ou modifier la conception de %s"
-
 #: lib/groupsbymemberssection.php:71
 msgid "Groups with most members"
 msgstr "Groupes avec le plus de membres"
@@ -6266,7 +6276,8 @@ msgstr "Ce fichier est trop grand. La taille maximale est %s."
 msgid "Partial upload."
 msgstr "Transfert partiel."
 
-#: lib/imagefile.php:101 lib/mediafile.php:170
+#. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
+#: lib/imagefile.php:101 lib/mediafile.php:179
 msgid "System error uploading file."
 msgstr "Erreur systÃ¨me lors du transfert du fichier."
 
@@ -6671,17 +6682,20 @@ msgstr "DÃ©solÃ©, la rÃ©ception de courriels nâest pas permise."
 msgid "Unsupported message type: %s"
 msgstr "Type de message non supportÃ© : %s"
 
-#: lib/mediafile.php:98 lib/mediafile.php:123
+#. TRANS: Client exception thrown when a database error was thrown during a file upload operation.
+#: lib/mediafile.php:99 lib/mediafile.php:125
 msgid "There was a database error while saving your file. Please try again."
 msgstr ""
 "Une erreur de base de donnÃ©es sâest produite pendant la sauvegarde de votre "
 "fichier. Veuillez rÃ©essayer."
 
-#: lib/mediafile.php:142
+#. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
+#: lib/mediafile.php:145
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
 msgstr "Le fichier importÃ© dÃ©passe le rÃ©glage upload_max_filesize de php.ini."
 
-#: lib/mediafile.php:147
+#. TRANS: Client exception.
+#: lib/mediafile.php:151
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form."
@@ -6689,44 +6703,43 @@ msgstr ""
 "Le fichier importÃ© dÃ©passe le rÃ©glage MAX_FILE_SIZE qui a Ã©tÃ© prÃ©cisÃ© dans "
 "le formulaire HTML."
 
-#: lib/mediafile.php:152
+#. TRANS: Client exception.
+#: lib/mediafile.php:157
 msgid "The uploaded file was only partially uploaded."
 msgstr "Le fichier nâa Ã©tÃ© que partiellement importÃ©."
 
-#: lib/mediafile.php:159
+#. TRANS: Client exception thrown when a temporary folder is not present to store a file upload.
+#: lib/mediafile.php:165
 msgid "Missing a temporary folder."
 msgstr "Un dossier temporaire est manquant."
 
-#: lib/mediafile.php:162
+#. TRANS: Client exception thrown when writing to disk is not possible during a file upload operation.
+#: lib/mediafile.php:169
 msgid "Failed to write file to disk."
 msgstr "Impossible dâÃ©crire sur le disque."
 
-#: lib/mediafile.php:165
+#. TRANS: Client exception thrown when a file upload operation has been stopped by an extension.
+#: lib/mediafile.php:173
 msgid "File upload stopped by extension."
 msgstr "Import de fichier stoppÃ© par une extension."
 
-#: lib/mediafile.php:179 lib/mediafile.php:217
+#. TRANS: Client exception thrown when a file upload operation would cause a user to exceed a set quota.
+#: lib/mediafile.php:189 lib/mediafile.php:232
 msgid "File exceeds user's quota."
 msgstr "Le fichier dÃ©passe le quota de lâutilisateur."
 
-#: lib/mediafile.php:197 lib/mediafile.php:234
+#. TRANS: Client exception thrown when a file upload operation fails because the file could
+#. TRANS: not be moved from the temporary folder to the permanent file location.
+#: lib/mediafile.php:209 lib/mediafile.php:251
 msgid "File could not be moved to destination directory."
 msgstr "Le fichier nâa pas pu Ãªtre dÃ©placÃ© dans le dossier de destination."
 
-#: lib/mediafile.php:202 lib/mediafile.php:238
+#. TRANS: Client exception thrown when a file upload operation has been stopped because the MIME
+#. TRANS: type of the uploaded file could not be determined.
+#: lib/mediafile.php:216 lib/mediafile.php:257
 msgid "Could not determine file's MIME type."
 msgstr "Impossible de dÃ©terminer le type MIME du fichier."
 
-#: lib/mediafile.php:318
-#, php-format
-msgid " Try using another %s format."
-msgstr " Essayez dâutiliser un autre %s format."
-
-#: lib/mediafile.php:323
-#, php-format
-msgid "%s is not a supported file type on this server."
-msgstr "%s nâest pas un type de fichier supportÃ© sur ce serveur."
-
 #: lib/messageform.php:120
 msgid "Send a direct notice"
 msgstr "Envoyer un message direct"
@@ -6842,27 +6855,7 @@ msgstr "Clin dâÅil"
 msgid "Send a nudge to this user"
 msgstr "Envoyer un clin dâÅil Ã  cet utilisateur"
 
-#: lib/oauthstore.php:283
-msgid "Error inserting new profile"
-msgstr "Erreur lors de lâinsertion du nouveau profil"
-
-#: lib/oauthstore.php:291
-msgid "Error inserting avatar"
-msgstr "Erreur lors de lâinsertion de lâavatar"
-
-#: lib/oauthstore.php:306
-msgid "Error updating remote profile"
-msgstr "Erreur lors de la mise Ã  jour du profil distant"
-
-#: lib/oauthstore.php:311
-msgid "Error inserting remote profile"
-msgstr "Erreur lors de lâinsertion du profil distant"
-
-#: lib/oauthstore.php:345
-msgid "Duplicate notice"
-msgstr "Dupliquer lâavis"
-
-#: lib/oauthstore.php:490
+#: lib/oauthstore.php:491
 msgid "Couldn't insert new subscription."
 msgstr "Impossible dâinsÃ©rer un nouvel abonnement."
 
@@ -6899,7 +6892,8 @@ msgstr "Vos messages envoyÃ©s"
 msgid "Tags in %s's notices"
 msgstr "Marques dans les avis de %s"
 
-#: lib/plugin.php:115
+#. TRANS: Displayed as version information for a plugin if no version information was found.
+#: lib/plugin.php:116
 msgid "Unknown"
 msgstr "Inconnu"
 
@@ -6993,19 +6987,19 @@ msgstr "Bac Ã  sable"
 msgid "Sandbox this user"
 msgstr "Mettre cet utilisateur dans un bac Ã  sable"
 
-#: lib/searchaction.php:120
+#. TRANS: Fieldset legend for the search form.
+#: lib/searchaction.php:121
 msgid "Search site"
 msgstr "Rechercher sur le site"
 
-#: lib/searchaction.php:126
+#. TRANS: Used as a field label for the field where one or more keywords
+#. TRANS: for searching can be entered.
+#: lib/searchaction.php:129
 msgid "Keyword(s)"
 msgstr "Mot(s) clef(s)"
 
-#: lib/searchaction.php:127
-msgid "Search"
-msgstr "Rechercher"
-
-#: lib/searchaction.php:162
+#. TRANS: Definition list item with instructions on how to get (better) search results.
+#: lib/searchaction.php:170
 msgid "Search help"
 msgstr "Aide sur la recherche"
 
@@ -7208,56 +7202,32 @@ msgid "Moderator"
 msgstr "ModÃ©rateur"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1102
+#: lib/util.php:1103
 msgid "a few seconds ago"
 msgstr "il y a quelques secondes"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1105
+#: lib/util.php:1106
 msgid "about a minute ago"
 msgstr "il y a 1 minute"
 
-#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1109
-#, php-format
-msgid "about %d minutes ago"
-msgstr "il y a %d minutes"
-
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 #: lib/util.php:1112
 msgid "about an hour ago"
 msgstr "il y a 1 heure"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1116
-#, php-format
-msgid "about %d hours ago"
-msgstr "il y a %d heures"
-
-#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1119
+#: lib/util.php:1118
 msgid "about a day ago"
 msgstr "il y a 1 jour"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1123
-#, php-format
-msgid "about %d days ago"
-msgstr "il y a %d jours"
-
-#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1126
+#: lib/util.php:1124
 msgid "about a month ago"
 msgstr "il y a 1 mois"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 #: lib/util.php:1130
-#, php-format
-msgid "about %d months ago"
-msgstr "il y a %d mois"
-
-#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1133
 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 0758448f24..e69fe18318 100644
--- a/locale/ga/LC_MESSAGES/statusnet.po
+++ b/locale/ga/LC_MESSAGES/statusnet.po
@@ -1,6 +1,7 @@
-# Translation of StatusNet to Irish
+# Translation of StatusNet to Irish (Gaeilge)
+# Expored from translatewiki.net
 #
-# Author@translatewiki.net: McDutchie
+# Author: McDutchie
 # --
 # This file is distributed under the same license as the StatusNet package.
 #
@@ -8,17 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-08 22:33+0000\n"
-"PO-Revision-Date: 2010-09-08 22:34:13+0000\n"
-"Language-Team: Irish\n"
+"POT-Creation-Date: 2010-09-14 19:53+0000\n"
+"PO-Revision-Date: 2010-09-14 19:53:56+0000\n"
+"Language-Team: Irish <http://translatewiki.net/wiki/Portal:ga>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r72348); Translate extension (2010-08-20)\n"
+"X-Generator: MediaWiki 1.17alpha (r73009); Translate extension (2010-08-20)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ga\n"
-"X-Message-Group: out-statusnet\n"
-"Plural-Forms: nplurals=5; plural=n==1 ? 0 : n==2 ? 1 : n<7 ? 2 : n<11 ? 3 : "
-"4;\n"
+"X-Message-Group: #out-statusnet\n"
+"Plural-Forms: nplurals=5; plural=(n == 1) ? 0 : ( (n == 2) ? 1 : ( (n < 7) ? "
+"2 : ( (n < 11) ? 3 : 4 ) ) );\n"
+"X-POT-Import-Date: 1284-49-16 34::+0000\n"
 
 #. TRANS: Page notice
 #: actions/accessadminpanel.php:67
@@ -40,22 +42,17 @@ msgstr ""
 msgid "Disable new registrations."
 msgstr ""
 
-#. TRANS: Checkbox label for disabling new user registrations.
-#: actions/accessadminpanel.php:185
-msgid "Closed"
-msgstr ""
-
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #: actions/all.php:79 actions/allrss.php:68
-#: actions/apiaccountupdatedeliverydevice.php:114
-#: actions/apiaccountupdateprofile.php:105
-#: actions/apiaccountupdateprofilebackgroundimage.php:116
-#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
-#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
-#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:113
-#: actions/apigroupismember.php:91 actions/apigroupjoin.php:100
-#: actions/apigroupleave.php:100 actions/apigrouplist.php:73
-#: actions/apistatusesupdate.php:229 actions/apisubscriptions.php:87
+#: actions/apiaccountupdatedeliverydevice.php:115
+#: actions/apiaccountupdateprofile.php:106
+#: actions/apiaccountupdateprofilebackgroundimage.php:117
+#: actions/apiaccountupdateprofileimage.php:106 actions/apiblockcreate.php:98
+#: actions/apiblockdestroy.php:97 actions/apidirectmessage.php:77
+#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:114
+#: actions/apigroupismember.php:91 actions/apigroupjoin.php:101
+#: actions/apigroupleave.php:101 actions/apigrouplist.php:73
+#: actions/apistatusesupdate.php:230 actions/apisubscriptions.php:87
 #: actions/apitimelinefavorites.php:72 actions/apitimelinefriends.php:174
 #: actions/apitimelinehome.php:80 actions/apitimelinementions.php:80
 #: actions/apitimelineuser.php:82 actions/avatarbynickname.php:75
@@ -117,39 +114,41 @@ msgstr ""
 msgid "Updates from %1$s and friends on %2$s!"
 msgstr "ActualizaciÃ³ns dende %1$s e amigos en %2$s!"
 
-#: actions/apiaccountupdatedeliverydevice.php:86
-#: actions/apiaccountupdateprofile.php:89
-#: actions/apiaccountupdateprofilebackgroundimage.php:86
-#: actions/apiaccountupdateprofilecolors.php:110
-#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89
-#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109
-#: actions/apifavoritecreate.php:91 actions/apifavoritedestroy.php:92
-#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
-#: actions/apigroupcreate.php:105 actions/apigroupjoin.php:92
-#: actions/apigroupleave.php:92 actions/apimediaupload.php:67
-#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:198
+#. TRANS: Client error message. POST is a HTTP command. It should not be translated.
+#. TRANS: Client error. POST is a HTTP command. It should not be translated.
+#: actions/apiaccountupdatedeliverydevice.php:87
+#: actions/apiaccountupdateprofile.php:90
+#: actions/apiaccountupdateprofilebackgroundimage.php:87
+#: actions/apiaccountupdateprofilecolors.php:111
+#: actions/apiaccountupdateprofileimage.php:85 actions/apiblockcreate.php:90
+#: actions/apiblockdestroy.php:89 actions/apidirectmessagenew.php:110
+#: actions/apifavoritecreate.php:92 actions/apifavoritedestroy.php:93
+#: actions/apifriendshipscreate.php:92 actions/apifriendshipsdestroy.php:92
+#: actions/apigroupcreate.php:106 actions/apigroupjoin.php:93
+#: actions/apigroupleave.php:93 actions/apimediaupload.php:68
+#: actions/apistatusesretweet.php:66 actions/apistatusesupdate.php:199
 msgid "This method requires a POST."
 msgstr "Este mÃ©todo require un POST."
 
-#: actions/apiaccountupdatedeliverydevice.php:106
+#: actions/apiaccountupdatedeliverydevice.php:107
 msgid ""
 "You must specify a parameter named 'device' with a value of one of: sms, im, "
 "none."
 msgstr ""
 
-#: actions/apiaccountupdateprofile.php:112
-#: actions/apiaccountupdateprofilebackgroundimage.php:194
-#: actions/apiaccountupdateprofilecolors.php:185
-#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/apiaccountupdateprofile.php:113
+#: actions/apiaccountupdateprofilebackgroundimage.php:195
+#: actions/apiaccountupdateprofilecolors.php:186
+#: actions/apiaccountupdateprofileimage.php:131 actions/apiusershow.php:108
 #: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/hcard.php:74
 #: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
 #: lib/profileaction.php:84
 msgid "User has no profile."
 msgstr "O usuario non ten perfil."
 
-#: actions/apiaccountupdateprofilebackgroundimage.php:108
-#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
-#: actions/apistatusesupdate.php:212 actions/avatarsettings.php:257
+#: actions/apiaccountupdateprofilebackgroundimage.php:109
+#: actions/apiaccountupdateprofileimage.php:98 actions/apimediaupload.php:81
+#: actions/apistatusesupdate.php:213 actions/avatarsettings.php:257
 #: actions/designadminpanel.php:123 actions/editapplication.php:118
 #: actions/newapplication.php:101 actions/newnotice.php:94
 #: lib/designsettings.php:283
@@ -159,11 +158,11 @@ msgid ""
 "current configuration."
 msgstr ""
 
-#: actions/apiblockcreate.php:126
+#: actions/apiblockcreate.php:127
 msgid "Block user failed."
 msgstr "Bloqueo de usuario fallido."
 
-#: actions/apiblockdestroy.php:114
+#: actions/apiblockdestroy.php:115
 msgid "Unblock user failed."
 msgstr "Desbloqueo de usuario fallido."
 
@@ -182,55 +181,51 @@ msgstr "Mensaxes directas para %s"
 msgid "All the direct messages sent to %s"
 msgstr "TÃ³dalas mensaxes directas enviadas a %s"
 
-#: actions/apidirectmessagenew.php:118
+#: actions/apidirectmessagenew.php:119
 msgid "No message text!"
 msgstr "Non hai mensaxes de texto!"
 
-#: actions/apidirectmessagenew.php:127 actions/newmessage.php:150
+#: actions/apidirectmessagenew.php:128 actions/newmessage.php:150
 #, php-format
 msgid "That's too long. Max message size is %d chars."
 msgstr "Podes actualizar a tÃºa informaciÃ³n do perfil persoal aquÃ"
 
-#: actions/apidirectmessagenew.php:138
+#: actions/apidirectmessagenew.php:139
 msgid "Recipient user not found."
 msgstr "Usuario destinatario non atopado."
 
-#: actions/apidirectmessagenew.php:142
+#: actions/apidirectmessagenew.php:143
 msgid "Can't send direct messages to users who aren't your friend."
 msgstr ""
 "Non se pode enviar a mensaxe directa a usuarios dos que non eres amigo."
 
-#: actions/apifavoritecreate.php:109 actions/apifavoritedestroy.php:110
+#: actions/apifavoritecreate.php:110 actions/apifavoritedestroy.php:111
 #: actions/apistatusesdestroy.php:121
 msgid "No status found with that ID."
 msgstr "Non se atopou un estado con ese ID."
 
 #. TRANS: Error message text shown when a favorite could not be set.
-#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:296
+#: actions/apifavoritecreate.php:132 actions/favor.php:84 lib/command.php:296
 msgid "Could not create favorite."
 msgstr "Non se puido crear o favorito."
 
-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
+#: actions/apifavoritedestroy.php:136 actions/disfavor.php:87
 msgid "Could not delete favorite."
 msgstr "Non se puido eliminar o favorito."
 
-#: actions/apifriendshipscreate.php:109
+#: actions/apifriendshipscreate.php:110
 msgid "Could not follow user: profile not found."
 msgstr "Non podes seguir a este usuario: %s xa estÃ¡ na tÃºa lista."
 
-#: actions/apifriendshipscreate.php:118
+#: actions/apifriendshipscreate.php:119
 #, php-format
 msgid "Could not follow user: %s is already on your list."
 msgstr "Non podes seguir a este usuario: %s xa estÃ¡ na tÃºa lista."
 
-#: actions/apifriendshipsdestroy.php:109
+#: actions/apifriendshipsdestroy.php:110
 msgid "Could not unfollow user: User not found."
 msgstr "Non podes seguir a este usuario: %s xa estÃ¡ na tÃºa lista."
 
-#: actions/apifriendshipsexists.php:91
-msgid "Two valid IDs or screen_names must be supplied."
-msgstr ""
-
 #: actions/apifriendshipsshow.php:134
 msgid "Could not determine source user."
 msgstr "Non se puido actualizar o usuario."
@@ -239,103 +234,103 @@ msgstr "Non se puido actualizar o usuario."
 msgid "Could not find target user."
 msgstr "Non se puido actualizar o usuario."
 
-#: actions/apigroupcreate.php:167 actions/editgroup.php:186
+#: actions/apigroupcreate.php:168 actions/editgroup.php:186
 #: actions/newgroup.php:126 actions/profilesettings.php:215
 #: actions/register.php:212
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr "O alcume debe ter sÃ³ letras minÃºsculas e nÃºmeros, e sen espazos."
 
-#: actions/apigroupcreate.php:176 actions/editgroup.php:190
+#: actions/apigroupcreate.php:177 actions/editgroup.php:190
 #: actions/newgroup.php:130 actions/profilesettings.php:238
 #: actions/register.php:215
 msgid "Nickname already in use. Try another one."
 msgstr "O alcume xa estÃ¡ sendo empregado por outro usuario. Tenta con outro."
 
-#: actions/apigroupcreate.php:183 actions/editgroup.php:193
+#: actions/apigroupcreate.php:184 actions/editgroup.php:193
 #: actions/newgroup.php:133 actions/profilesettings.php:218
 #: actions/register.php:217
 msgid "Not a valid nickname."
 msgstr "Non Ã© un alcume vÃ¡lido."
 
-#: actions/apigroupcreate.php:199 actions/editapplication.php:215
+#: actions/apigroupcreate.php:200 actions/editapplication.php:215
 #: actions/editgroup.php:199 actions/newapplication.php:203
 #: actions/newgroup.php:139 actions/profilesettings.php:222
 #: actions/register.php:224
 msgid "Homepage is not a valid URL."
 msgstr "A pÃ¡xina persoal semella que non Ã© unha URL vÃ¡lida."
 
-#: actions/apigroupcreate.php:208 actions/editgroup.php:202
+#: actions/apigroupcreate.php:209 actions/editgroup.php:202
 #: actions/newgroup.php:142 actions/profilesettings.php:225
 #: actions/register.php:227
 msgid "Full name is too long (max 255 chars)."
 msgstr "O nome completo Ã© demasiado longo (max 255 car)."
 
-#: actions/apigroupcreate.php:216 actions/editapplication.php:190
+#: actions/apigroupcreate.php:217 actions/editapplication.php:190
 #: actions/newapplication.php:172
 #, php-format
 msgid "Description is too long (max %d chars)."
 msgstr "O teu Bio Ã© demasiado longo (max %d car.)."
 
-#: actions/apigroupcreate.php:227 actions/editgroup.php:208
+#: actions/apigroupcreate.php:228 actions/editgroup.php:208
 #: actions/newgroup.php:148 actions/profilesettings.php:232
 #: actions/register.php:234
 msgid "Location is too long (max 255 chars)."
 msgstr "A localizaciÃ³n Ã© demasiado longa (max 255 car.)."
 
-#: actions/apigroupcreate.php:246 actions/editgroup.php:219
+#: actions/apigroupcreate.php:247 actions/editgroup.php:219
 #: actions/newgroup.php:159
 #, php-format
 msgid "Too many aliases! Maximum %d."
 msgstr ""
 
-#: actions/apigroupcreate.php:289 actions/editgroup.php:238
+#: actions/apigroupcreate.php:290 actions/editgroup.php:238
 #: actions/newgroup.php:178
 msgid "Alias can't be the same as nickname."
 msgstr ""
 
-#: actions/apigroupismember.php:96 actions/apigroupjoin.php:105
-#: actions/apigroupleave.php:105 actions/apigroupmembership.php:92
+#: actions/apigroupismember.php:96 actions/apigroupjoin.php:106
+#: actions/apigroupleave.php:106 actions/apigroupmembership.php:92
 #: actions/apigroupshow.php:83 actions/apitimelinegroup.php:92
 msgid "Group not found."
 msgstr "Non atopado"
 
 #. TRANS: Error text shown a user tries to join a group they already are a member of.
-#: actions/apigroupjoin.php:111 actions/joingroup.php:100 lib/command.php:336
+#: actions/apigroupjoin.php:112 actions/joingroup.php:100 lib/command.php:336
 msgid "You are already a member of that group."
 msgstr "Xa estas suscrito a estes usuarios:"
 
+#. TRANS: Error text shown when a user tries to join a group they are blocked from joining.
+#: actions/apigroupjoin.php:121 actions/joingroup.php:105 lib/command.php:341
+msgid "You have been blocked from that group by the admin."
+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.
-#: actions/apigroupjoin.php:139 actions/joingroup.php:134 lib/command.php:353
+#: actions/apigroupjoin.php:140 actions/joingroup.php:134 lib/command.php:353
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "Non podes seguir a este usuario: %s xa estÃ¡ na tÃºa lista."
 
-#: actions/apigroupleave.php:115
+#: actions/apigroupleave.php:116
 msgid "You are not a member of this group."
 msgstr "Non estÃ¡s suscrito a ese perfil"
 
 #. 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.
-#: actions/apigroupleave.php:125 actions/leavegroup.php:129
+#: actions/apigroupleave.php:126 actions/leavegroup.php:129
 #: lib/command.php:401
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
 msgstr "Non podes seguir a este usuario: %s xa estÃ¡ na tÃºa lista."
 
-#. TRANS: %s is a user name
-#: actions/apigrouplist.php:98
+#. TRANS: Message is used as a title. %s is a site name.
+#. TRANS: Message is used as a page title. %s is a nick name.
+#: actions/apigrouplistall.php:92 actions/usergroups.php:63
 #, php-format
-msgid "%s's groups"
+msgid "%s groups"
 msgstr ""
 
-#. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s
-#: actions/apigrouplist.php:108
-#, php-format
-msgid "%1$s groups %2$s is a member of."
-msgstr ""
-
-#: actions/apimediaupload.php:99
+#: actions/apimediaupload.php:100
 msgid "Upload failed."
 msgstr "Comando fallido"
 
@@ -345,9 +340,9 @@ msgstr ""
 
 #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
 #: actions/deletenotice.php:169 actions/disfavor.php:74
-#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:55
+#: actions/emailsettings.php:271 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:66 actions/imsettings.php:227
+#: actions/groupunblock.php:66 actions/imsettings.php:230
 #: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
@@ -378,8 +373,8 @@ msgstr ""
 #. 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:286 actions/grouplogo.php:322
-#: actions/imsettings.php:242 actions/newapplication.php:121
+#: actions/emailsettings.php:290 actions/grouplogo.php:322
+#: actions/imsettings.php:245 actions/newapplication.php:121
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
 #: actions/smssettings.php:277 lib/designsettings.php:304
 msgid "Unexpected form submission."
@@ -431,13 +426,13 @@ msgstr "Este mÃ©todo require un POST ou DELETE."
 msgid "You may not delete another user's status."
 msgstr "Non deberÃas eliminar o estado de outro usuario"
 
-#: actions/apistatusesretweet.php:75 actions/apistatusesretweets.php:72
+#: actions/apistatusesretweet.php:76 actions/apistatusesretweets.php:72
 #: actions/deletenotice.php:52 actions/shownotice.php:92
 msgid "No such notice."
 msgstr "NingÃºn chÃo."
 
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-#: actions/apistatusesretweet.php:91 lib/command.php:544
+#: actions/apistatusesretweet.php:92 lib/command.php:544
 msgid "Already repeated that notice."
 msgstr "Non se pode eliminar este chÃos."
 
@@ -445,21 +440,21 @@ msgstr "Non se pode eliminar este chÃos."
 msgid "No status with that ID found."
 msgstr "Non existe ningÃºn estado con esa ID atopada."
 
-#: actions/apistatusesupdate.php:221
+#: actions/apistatusesupdate.php:222
 msgid "Client must provide a 'status' parameter with a value."
 msgstr ""
 
-#: actions/apistatusesupdate.php:242 actions/newnotice.php:157
+#: actions/apistatusesupdate.php:243 actions/newnotice.php:157
 #: lib/mailhandler.php:60
 #, php-format
 msgid "That's too long. Max notice size is %d chars."
 msgstr "Podes actualizar a tÃºa informaciÃ³n do perfil persoal aquÃ"
 
-#: actions/apistatusesupdate.php:283 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:284 actions/apiusershow.php:96
 msgid "Not found."
 msgstr "Non atopado"
 
-#: actions/apistatusesupdate.php:306 actions/newnotice.php:181
+#: actions/apistatusesupdate.php:307 actions/newnotice.php:181
 #, php-format
 msgid "Max notice size is %d chars, including attachment URL."
 msgstr ""
@@ -566,6 +561,10 @@ msgstr ""
 msgid "Pick a square area of the image to be your avatar"
 msgstr ""
 
+#: actions/avatarsettings.php:347 actions/grouplogo.php:380
+msgid "Lost our file data."
+msgstr ""
+
 #: actions/avatarsettings.php:370
 msgid "Avatar updated."
 msgstr "Avatar actualizado."
@@ -592,18 +591,6 @@ msgstr ""
 "do teur perfil, non serÃ¡ capaz de suscribirse a ti nun futuro, e non vas a "
 "ser notificado de ningunha resposta-@ del."
 
-#. 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:153 actions/deleteapplication.php:154
-#: actions/deletenotice.php:147 actions/deleteuser.php:152
-#: actions/groupblock.php:178
-msgctxt "BUTTON"
-msgid "No"
-msgstr ""
-
 #: actions/block.php:187
 msgid "Failed to save block information."
 msgstr "Erro ao gardar informaciÃ³n de bloqueo."
@@ -617,7 +604,8 @@ msgstr ""
 msgid "A list of the users blocked from joining this group."
 msgstr ""
 
-#: actions/blockedfromgroup.php:320 lib/unblockform.php:69
+#. TRANS: Title for the form to unblock a user.
+#: actions/blockedfromgroup.php:320 lib/unblockform.php:70
 msgid "Unblock"
 msgstr "Desbloquear"
 
@@ -639,12 +627,6 @@ msgstr "Confirmation code not found."
 msgid "That confirmation code is not for you!"
 msgstr "Â¡Ese cÃ³digo de confirmaciÃ³n non Ã© para ti!"
 
-#. TRANS: Server error for an unknow address type, which can be 'email', 'jabber', or 'sms'.
-#: actions/confirmaddress.php:91
-#, php-format
-msgid "Unrecognized address type %s."
-msgstr ""
-
 #. TRANS: Client error for an already confirmed email/jabbel/sms address.
 #: actions/confirmaddress.php:96
 msgid "That address has already been confirmed."
@@ -656,9 +638,9 @@ msgstr "Esa direcciÃ³n xa foi confirmada."
 #. 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/confirmaddress.php:116 actions/emailsettings.php:331
+#: actions/emailsettings.php:477 actions/imsettings.php:283
+#: actions/imsettings.php:442 actions/othersettings.php:174
 #: actions/profilesettings.php:283 actions/smssettings.php:308
 #: actions/smssettings.php:464
 msgid "Couldn't update user."
@@ -666,7 +648,7 @@ msgstr "Non se puido actualizar o usuario."
 
 #. 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/confirmaddress.php:128 actions/emailsettings.php:437
 #: actions/smssettings.php:422
 msgid "Couldn't delete email confirmation."
 msgstr "Non se pode eliminar a confirmaciÃ³n de email."
@@ -689,10 +671,6 @@ msgstr "ChÃos"
 msgid "Application not found."
 msgstr "Confirmation code not found."
 
-#: actions/deleteapplication.php:123 actions/deleteapplication.php:147
-msgid "Delete application"
-msgstr ""
-
 #: actions/deleteapplication.php:149
 msgid ""
 "Are you sure you want to delete this application? This will clear all data "
@@ -700,18 +678,13 @@ msgid ""
 "connections."
 msgstr ""
 
-#. TRANS: Submit button title for 'Yes' when deleting an application.
-#: actions/deleteapplication.php:164
-msgid "Delete this application"
-msgstr ""
-
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
 #: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62
 #: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
 #: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:73 lib/profileformaction.php:64
+#: lib/adminpanelaction.php:71 lib/profileformaction.php:64
 #: lib/settingsaction.php:72
 msgid "Not logged in."
 msgstr "Non estÃ¡ logueado."
@@ -720,12 +693,6 @@ msgstr "Non estÃ¡ logueado."
 msgid "Can't delete this notice."
 msgstr "Non se pode eliminar este chÃos."
 
-#: actions/deletenotice.php:103
-msgid ""
-"You are about to permanently delete a notice. Once this is done, it cannot "
-"be undone."
-msgstr ""
-
 #: actions/deletenotice.php:109 actions/deletenotice.php:141
 msgid "Delete notice"
 msgstr "Eliminar chÃo"
@@ -747,7 +714,6 @@ msgstr ""
 #. TRANS: Message used as title for design settings for the site.
 #. TRANS: Link description in user account settings menu.
 #: actions/designadminpanel.php:63 lib/accountsettingsaction.php:139
-#: lib/groupnav.php:119
 msgid "Design"
 msgstr ""
 
@@ -763,10 +729,6 @@ msgstr "Modificado"
 msgid "Theme for the site."
 msgstr ""
 
-#: actions/designadminpanel.php:467
-msgid "Custom theme"
-msgstr ""
-
 #: actions/designadminpanel.php:471
 msgid "You can upload a custom StatusNet theme as a .ZIP archive."
 msgstr ""
@@ -826,17 +788,21 @@ msgstr ""
 msgid "Reset back to default"
 msgstr ""
 
-#. TRANS: Submit button title
+#. TRANS: Submit button title.
 #: actions/designadminpanel.php:685 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/snapshotadminpanel.php:245
 #: actions/subscriptions.php:226 actions/tagother.php:154
-#: actions/useradminpanel.php:294 lib/applicationeditform.php:363
+#: actions/useradminpanel.php:294 lib/applicationeditform.php:353
 #: lib/designsettings.php:256 lib/groupeditform.php:202
 msgid "Save"
 msgstr "Gardar"
 
+#: actions/designadminpanel.php:686 lib/designsettings.php:257
+msgid "Save design"
+msgstr ""
+
 #: actions/disfavor.php:81
 msgid "This notice is not a favorite!"
 msgstr "Este chÃo non Ã© un favorito!"
@@ -850,10 +816,6 @@ msgstr "Engadir a favoritos"
 msgid "No such document \"%s\""
 msgstr "NingÃºn chÃo."
 
-#: actions/editapplication.php:54
-msgid "Edit Application"
-msgstr ""
-
 #: actions/editapplication.php:186 actions/newapplication.php:168
 msgid "Description is required."
 msgstr "SubscriciÃ³n rexeitada"
@@ -862,6 +824,14 @@ msgstr "SubscriciÃ³n rexeitada"
 msgid "Source URL is too long."
 msgstr ""
 
+#: actions/editapplication.php:203 actions/newapplication.php:188
+msgid "Organization is required."
+msgstr ""
+
+#: actions/editapplication.php:209 actions/newapplication.php:194
+msgid "Organization homepage is required."
+msgstr ""
+
 #: actions/editapplication.php:218 actions/newapplication.php:206
 msgid "Callback is too long."
 msgstr ""
@@ -875,6 +845,10 @@ msgstr ""
 msgid "Edit %s group"
 msgstr ""
 
+#: actions/editgroup.php:158
+msgid "Use this form to edit the group."
+msgstr ""
+
 #: actions/editgroup.php:205 actions/newgroup.php:145
 #, php-format
 msgid "description is too long (max %d chars)."
@@ -902,7 +876,7 @@ msgstr "DirecciÃ³ns de correo confirmadas actualmente."
 #. 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/emailsettings.php:115 actions/emailsettings.php:162
 #: actions/imsettings.php:116 actions/smssettings.php:124
 #: actions/smssettings.php:180
 msgctxt "BUTTON"
@@ -918,116 +892,104 @@ msgstr ""
 "GTalk que ten que haber unha mensaxe coas seguintes instruciÃ³ns. (Engadiches "
 "a %s Ã¡ tÃºa lista de contactos?)"
 
-#. TRANS: Instructions for e-mail address input form.
-#: actions/emailsettings.php:135
+#. TRANS: Instructions for e-mail address input form. Do not translate
+#. TRANS: "example.org". It is one of the domain names reserved for
+#. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
+#. TRANS: Any other domain may be owned by a legitimate person or
+#. TRANS: organization.
+#: actions/emailsettings.php:139
 msgid "Email address, like \"UserName@example.org\""
 msgstr "DirecciÃ³n de correo, coma \"Nomede Usuario@example.org\""
 
-#. 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 ""
-
 #. 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
+#: actions/emailsettings.php:151 actions/smssettings.php:171
 msgid "Incoming email"
 msgstr "Correo Entrante"
 
 #. 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
+#: actions/emailsettings.php:159 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."
 
 #. 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
+#: actions/emailsettings.php:168 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."
 
-#. 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 ""
-
 #. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:174
+#: actions/emailsettings.php:178
 msgid "Email preferences"
 msgstr "Enderezos de correo"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:180
+#: actions/emailsettings.php:184
 msgid "Send me notices of new subscriptions through email."
 msgstr "EnvÃame chios de novas suscriciÃ³ns por email."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:186
+#: actions/emailsettings.php:190
 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."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:193
+#: actions/emailsettings.php:197
 msgid "Send me email when someone sends me a private message."
 msgstr "Enviarme un email cando alguÃ©n me envÃe unha mensaxe privada."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:205
+#: actions/emailsettings.php:209
 msgid "Allow friends to nudge me and send me an email."
 msgstr "Permitir aos amigos darme toques e enviarme correos electrÃ³nicos."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:212
+#: actions/emailsettings.php:216
 msgid "I want to post notices by email."
 msgstr "Quero enviar chÃos dende o mail."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:219
+#: actions/emailsettings.php:223
 msgid "Publish a MicroID for my email address."
 msgstr "Publicar unha MicroID dende a miÃ±a direcciÃ³n de correo."
 
 #. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:353
+#: actions/emailsettings.php:357
 msgid "No email address."
 msgstr "Non se inseriu unha direcciÃ³n de correo"
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:361
+#: actions/emailsettings.php:365
 msgid "Cannot normalize that email address"
 msgstr "Esa direcciÃ³n de correo non se pode normalizar "
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:208
+#: actions/emailsettings.php:370 actions/register.php:208
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "Non Ã© un enderezo de correo vÃ¡lido."
 
 #. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:370
+#: actions/emailsettings.php:374
 msgid "That is already your email address."
 msgstr "Xa Ã© o teu enderezo de correo."
 
 #. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:374
+#: actions/emailsettings.php:378
 msgid "That email address already belongs to another user."
 msgstr "Este enderezo de correo xa pertence a outro usuario."
 
 #. 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/emailsettings.php:395 actions/imsettings.php:351
 #: actions/smssettings.php:373
 msgid "Couldn't insert confirmation code."
 msgstr "Non se puido inserir o cÃ³digo de confirmaciÃ³n."
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:398
+#: actions/emailsettings.php:402
 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."
@@ -1039,45 +1001,45 @@ msgstr ""
 #. 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/emailsettings.php:423 actions/imsettings.php:386
 #: actions/smssettings.php:408
 msgid "No pending confirmation to cancel."
 msgstr "Non hai ningunha confirmaciÃ³n pendente para cancelar."
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:438
+#: actions/emailsettings.php:442
 msgid "Email confirmation cancelled."
 msgstr "Non hai ningunha confirmaciÃ³n pendente para cancelar."
 
 #. TRANS: Message given trying to remove an e-mail address that is not
 #. TRANS: registered for the active user.
-#: actions/emailsettings.php:458
+#: actions/emailsettings.php:462
 msgid "That is not your email address."
 msgstr "Esa non Ã© a tÃºa direcciÃ³n de correo."
 
 #. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:479
+#: actions/emailsettings.php:483
 msgid "The email address was removed."
 msgstr "DirecciÃ³n de correo entrante eliminada."
 
-#: actions/emailsettings.php:493 actions/smssettings.php:568
+#: actions/emailsettings.php:497 actions/smssettings.php:568
 msgid "No incoming email address."
 msgstr "Non hai direcciÃ³ns de correo entrante"
 
 #. 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/emailsettings.php:508 actions/emailsettings.php:532
 #: actions/smssettings.php:578 actions/smssettings.php:602
 msgid "Couldn't update user record."
 msgstr "Non se puido actualizar o rexistro de usuario."
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
-#: actions/emailsettings.php:508 actions/smssettings.php:581
+#: actions/emailsettings.php:512 actions/smssettings.php:581
 msgid "Incoming email address removed."
 msgstr "DirecciÃ³n de correo entrante eliminada."
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
-#: actions/emailsettings.php:532 actions/smssettings.php:605
+#: actions/emailsettings.php:536 actions/smssettings.php:605
 msgid "New incoming email address added."
 msgstr "Engadida nova direcciÃ³n de correo entrante."
 
@@ -1094,10 +1056,6 @@ msgstr "Desactivar favorito"
 msgid "Popular notices"
 msgstr "ChÃos populares"
 
-#: actions/favorited.php:79
-msgid "The most popular notices on the site right now."
-msgstr ""
-
 #: actions/favorited.php:150
 msgid "Favorite notices appear on this page but no one has favorited one yet."
 msgstr ""
@@ -1143,10 +1101,6 @@ msgstr "NingÃºn chÃo."
 msgid "Not expecting this response!"
 msgstr "Â¡Non esperaba esa resposta!"
 
-#: actions/finishremotesubscribe.php:80
-msgid "User being listened to does not exist."
-msgstr ""
-
 #: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59
 msgid "You can use the local subscription!"
 msgstr "Â¡Podes empregar a tÃºa subscriciÃ³n local!"
@@ -1159,14 +1113,6 @@ msgstr "Este usuario non che permite suscribirte a el."
 msgid "You are not authorized."
 msgstr "Non estÃ¡s suscrito a ese perfil"
 
-#: actions/finishremotesubscribe.php:113
-msgid "Could not convert request token to access token."
-msgstr ""
-
-#: actions/finishremotesubscribe.php:118
-msgid "Remote service uses unknown version of OMB protocol."
-msgstr ""
-
 #: actions/getfile.php:79
 msgid "No such file."
 msgstr "NingÃºn chÃo."
@@ -1230,36 +1176,49 @@ msgid ""
 "palette of your choice."
 msgstr ""
 
+#: actions/grouplogo.php:142 actions/grouplogo.php:195
+msgid "Group logo"
+msgstr ""
+
 #: actions/grouplogo.php:365
 msgid "Pick a square area of the image to be the logo."
 msgstr ""
 
-#: actions/groupmembers.php:100 lib/groupnav.php:92
+#. TRANS: Title of the page showing group members.
+#. TRANS: %s is the name of the group.
+#: actions/groupmembers.php:102
 #, php-format
 msgid "%s group members"
 msgstr ""
 
-#: actions/groupmembers.php:118
+#. TRANS: Title of the page showing group members.
+#. TRANS: %1$s is the name of the group, %2$d is the page number of the members list.
+#: actions/groupmembers.php:107
+#, php-format
+msgid "%1$s group members, page %2$d"
+msgstr ""
+
+#: actions/groupmembers.php:122
 msgid "A list of the users in this group."
 msgstr ""
 
-#: actions/groupmembers.php:182 lib/groupnav.php:107
+#: actions/groupmembers.php:186
 msgid "Admin"
 msgstr ""
 
-#: actions/groupmembers.php:392 lib/blockform.php:69
-msgid "Block"
-msgstr "Bloquear"
-
-#: actions/groupmembers.php:487
+#: actions/groupmembers.php:498
 msgid "Make user an admin of the group"
 msgstr ""
 
-#: actions/groupmembers.php:519
+#. TRANS: Button text for the form that will make a user administrator.
+#: actions/groupmembers.php:533
+msgctxt "BUTTON"
 msgid "Make Admin"
 msgstr ""
 
-#: actions/groupmembers.php:519
+#. TRANS: Submit button title.
+#: actions/groupmembers.php:537
+msgctxt "TOOLTIP"
 msgid "Make this user an admin"
 msgstr ""
 
@@ -1277,6 +1236,11 @@ msgstr "LiÃ±a de tempo de %s"
 msgid "Groups"
 msgstr ""
 
+#: actions/groups.php:64
+#, php-format
+msgid "Groups, page %d"
+msgstr ""
+
 #: actions/groups.php:90
 #, php-format
 msgid ""
@@ -1287,10 +1251,6 @@ msgid ""
 "%%%%)"
 msgstr ""
 
-#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:122
-msgid "Create a new group"
-msgstr ""
-
 #: actions/groupsearch.php:79 actions/noticesearch.php:117
 #: actions/peoplesearch.php:83
 msgid "No results."
@@ -1363,7 +1323,10 @@ msgstr ""
 
 #. TRANS: IM address input field instructions in IM settings form.
 #. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:140
+#. TRANS: Do not translate "example.org". It is one of the domain names reserved for use in examples by
+#. TRANS: http://www.rfc-editor.org/rfc/rfc2606.txt. Any other domain may be owned by a legitimate
+#. TRANS: person or organization.
+#: actions/imsettings.php:143
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -1374,64 +1337,64 @@ msgstr ""
 "GTalk."
 
 #. TRANS: Form legend for IM preferences form.
-#: actions/imsettings.php:155
+#: actions/imsettings.php:158
 msgid "IM preferences"
 msgstr "Preferencias gardadas."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:160
+#: actions/imsettings.php:163
 msgid "Send me notices through Jabber/GTalk."
 msgstr "Enviarme advertencias a travÃ©s de Jabber/GTalk."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:166
+#: actions/imsettings.php:169
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr "Post a notice when my Jabber/GTalk status changes."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:172
+#: actions/imsettings.php:175
 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."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:179
+#: actions/imsettings.php:182
 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "Publicar unha MicroID dende a miÃ±a direcciÃ³n de Jabber/GTalk."
 
 #. TRANS: Confirmation message for successful IM preferences save.
-#: actions/imsettings.php:287 actions/othersettings.php:180
+#: actions/imsettings.php:290 actions/othersettings.php:180
 msgid "Preferences saved."
 msgstr "Preferencias gardadas."
 
 #. TRANS: Message given saving IM address without having provided one.
-#: actions/imsettings.php:309
+#: actions/imsettings.php:312
 msgid "No Jabber ID."
 msgstr "Sen Identificador de Jabber."
 
 #. TRANS: Message given saving IM address that cannot be normalised.
-#: actions/imsettings.php:317
+#: actions/imsettings.php:320
 msgid "Cannot normalize that Jabber ID"
 msgstr "Non se pode normalizar ese identificador de Jabber"
 
 #. TRANS: Message given saving IM address that not valid.
-#: actions/imsettings.php:322
+#: actions/imsettings.php:325
 msgid "Not a valid Jabber ID"
 msgstr "Non Ã© un Identificador de Jabber vÃ¡lido"
 
 #. TRANS: Message given saving IM address that is already set.
-#: actions/imsettings.php:326
+#: actions/imsettings.php:329
 msgid "That is already your Jabber ID."
 msgstr "Xa Ã© a tÃºa conta de Jabber."
 
 #. TRANS: Message given saving IM address that is already set for another user.
-#: actions/imsettings.php:330
+#: actions/imsettings.php:333
 msgid "Jabber ID already belongs to another user."
 msgstr "O identificador de Jabber xa pertence a outro usuario."
 
 #. 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
+#: actions/imsettings.php:361
 #, php-format
 msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
@@ -1441,23 +1404,23 @@ msgstr ""
 "engadir a %s como contacto para que che poida enviar mensaxes."
 
 #. TRANS: Message given canceling IM address confirmation for the wrong IM address.
-#: actions/imsettings.php:388
+#: actions/imsettings.php:391
 msgid "That is the wrong IM address."
 msgstr "Esa Ã© unha enderezo IM incorrecto."
 
 #. TRANS: Message given after successfully canceling IM address confirmation.
-#: actions/imsettings.php:402
+#: actions/imsettings.php:405
 msgid "IM confirmation cancelled."
 msgstr "Sen cÃ³digo de confirmaciÃ³n."
 
 #. TRANS: Message given trying to remove an IM address that is not
 #. TRANS: registered for the active user.
-#: actions/imsettings.php:424
+#: actions/imsettings.php:427
 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
+#: actions/imsettings.php:450
 msgid "The IM address was removed."
 msgstr "DirecciÃ³n de correo entrante eliminada."
 
@@ -1544,12 +1507,6 @@ msgstr "Mensaxe persoal"
 msgid "Optionally add a personal message to the invitation."
 msgstr "Opcionalmente engadir unha mensaxe persoal Ã¡ invitaciÃ³n."
 
-#. TRANS: Send button for inviting friends
-#: actions/invite.php:198
-msgctxt "BUTTON"
-msgid "Send"
-msgstr ""
-
 #. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English.
 #: actions/invite.php:228
 #, php-format
@@ -1657,25 +1614,10 @@ msgstr ""
 msgid "Login with your username and password."
 msgstr "Usuario ou contrasinal incorrectos."
 
-#: actions/login.php:295
-#, php-format
-msgid ""
-"Don't have a username yet? [Register](%%action.register%%) a new account."
-msgstr ""
-
 #: actions/makeadmin.php:92
 msgid "Only an admin can make another user an admin."
 msgstr ""
 
-#: actions/makeadmin.php:133
-#, php-format
-msgid "Can't get membership record for %1$s in group %2$s."
-msgstr ""
-
-#: actions/newapplication.php:52
-msgid "New Application"
-msgstr ""
-
 #: actions/newapplication.php:143
 msgid "Use this form to register a new application."
 msgstr ""
@@ -1688,6 +1630,10 @@ msgstr ""
 msgid "New group"
 msgstr ""
 
+#: actions/newgroup.php:110
+msgid "Use this form to create a new group."
+msgstr ""
+
 #: actions/newmessage.php:71 actions/newmessage.php:231
 msgid "New message"
 msgstr "Nova mensaxe"
@@ -1760,21 +1706,11 @@ msgid ""
 "[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
 msgstr ""
 
-#: actions/noticesearchrss.php:96
-#, php-format
-msgid "Updates with \"%s\""
-msgstr ""
-
 #: actions/noticesearchrss.php:98
 #, php-format
 msgid "Updates matching search term \"%1$s\" on %2$s!"
 msgstr "ActualizaciÃ³ns dende %1$s en %2$s!"
 
-#: actions/nudge.php:85
-msgid ""
-"This user doesn't allow nudges or hasn't confirmed or set their email yet."
-msgstr ""
-
 #: actions/nudge.php:94
 msgid "Nudge sent"
 msgstr "Toque enviado"
@@ -1822,12 +1758,6 @@ msgstr "O usuario non ten perfil."
 msgid "%1$s's status on %2$s"
 msgstr "Estado de %1$s en  %2$s"
 
-#. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
-#: actions/oembed.php:159
-#, php-format
-msgid "Content type %s not supported."
-msgstr ""
-
 #. TRANS: Error message displaying attachments. %s is the site's base URL.
 #: actions/oembed.php:163
 #, php-format
@@ -1835,8 +1765,8 @@ msgid "Only %s URLs over plain HTTP please."
 msgstr ""
 
 #. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1215
-#: lib/apiaction.php:1243 lib/apiaction.php:1366
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1206
+#: lib/apiaction.php:1233 lib/apiaction.php:1356
 msgid "Not a supported data format."
 msgstr "Non Ã© un formato de datos soportado."
 
@@ -1880,6 +1810,10 @@ msgstr "Sistema de acortamento de URLs demasiado longo (max 50 car.)."
 msgid "No login token requested."
 msgstr "Sen peticiÃ³n de autorizaciÃ³n!"
 
+#: actions/otp.php:104
+msgid "Login token expired."
+msgstr ""
+
 #: actions/outbox.php:61
 #, php-format
 msgid "Outbox for %s"
@@ -1944,7 +1878,7 @@ msgid "Password saved."
 msgstr "Contrasinal gardada."
 
 #. TRANS: Menu item for site administration
-#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:384
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:371
 msgid "Paths"
 msgstr ""
 
@@ -1952,26 +1886,6 @@ msgstr ""
 msgid "Path and server settings for this StatusNet site."
 msgstr ""
 
-#: actions/pathsadminpanel.php:157
-#, php-format
-msgid "Theme directory not readable: %s."
-msgstr ""
-
-#: actions/pathsadminpanel.php:163
-#, php-format
-msgid "Avatar directory not writable: %s."
-msgstr ""
-
-#: actions/pathsadminpanel.php:169
-#, php-format
-msgid "Background directory not writable: %s."
-msgstr ""
-
-#: actions/pathsadminpanel.php:177
-#, php-format
-msgid "Locales directory not readable: %s."
-msgstr ""
-
 #: actions/pathsadminpanel.php:183
 msgid "Invalid SSL server. The maximum length is 255 characters."
 msgstr ""
@@ -2024,6 +1938,10 @@ msgstr "Avatar"
 msgid "Backgrounds"
 msgstr ""
 
+#: actions/pathsadminpanel.php:305
+msgid "Background server"
+msgstr ""
+
 #: actions/pathsadminpanel.php:309
 msgid "Background path"
 msgstr ""
@@ -2048,10 +1966,6 @@ msgstr ""
 msgid "Server to direct SSL requests to"
 msgstr ""
 
-#: actions/pathsadminpanel.php:352
-msgid "Save paths"
-msgstr ""
-
 #: actions/peoplesearch.php:52
 #, php-format
 msgid ""
@@ -2107,7 +2021,7 @@ msgstr "Nome completo"
 
 #. TRANS: Form input field label.
 #: actions/profilesettings.php:115 actions/register.php:460
-#: lib/applicationeditform.php:244 lib/groupeditform.php:161
+#: lib/applicationeditform.php:235 lib/groupeditform.php:161
 msgid "Homepage"
 msgstr "PÃ¡xina persoal"
 
@@ -2115,15 +2029,6 @@ msgstr "PÃ¡xina persoal"
 msgid "URL of your homepage, blog, or profile on another site"
 msgstr "Enderezo da tÃºa pÃ¡xina persoal, blogue, ou perfil noutro sitio"
 
-#: actions/profilesettings.php:122 actions/register.php:468
-#, php-format
-msgid "Describe yourself and your interests in %d chars"
-msgstr ""
-
-#: actions/profilesettings.php:125 actions/register.php:471
-msgid "Describe yourself and your interests"
-msgstr ""
-
 #: actions/profilesettings.php:127 actions/register.php:473
 msgid "Bio"
 msgstr "Bio"
@@ -2205,7 +2110,7 @@ msgid "Couldn't save tags."
 msgstr "Non se puideron gardar as etiquetas."
 
 #. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:391 lib/adminpanelaction.php:141
+#: actions/profilesettings.php:391 lib/adminpanelaction.php:138
 msgid "Settings saved."
 msgstr "ConfiguraciÃ³ns gardadas."
 
@@ -2222,10 +2127,6 @@ msgstr "Non se pudo recuperar a liÃ±a de tempo publica."
 msgid "Public timeline"
 msgstr "LiÃ±a de tempo pÃºblica"
 
-#: actions/public.php:168
-msgid "Public Stream Feed (Atom)"
-msgstr ""
-
 #: actions/public.php:188
 #, php-format
 msgid ""
@@ -2256,10 +2157,6 @@ msgstr ""
 "(http://status.net/). [Ãnete agora](%%action.register%%) para compartir "
 "chÃos cos teus amigos, colegas e familia! ([Ler mais](%%doc.help%%))"
 
-#: actions/publictagcloud.php:57
-msgid "Public tag cloud"
-msgstr ""
-
 #: actions/publictagcloud.php:63
 #, php-format
 msgid "These are most popular recent tags on %s "
@@ -2421,12 +2318,6 @@ msgstr "O enderezo de correo xa existe."
 msgid "Invalid username or password."
 msgstr "Usuario ou contrasinal invÃ¡lidos."
 
-#: actions/register.php:350
-msgid ""
-"With this form you can create a new account. You can then post notices and "
-"link up to friends and colleagues. "
-msgstr ""
-
 #: actions/register.php:432
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
 msgstr ""
@@ -2477,33 +2368,6 @@ msgstr ""
 msgid "All rights reserved."
 msgstr ""
 
-#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:540
-#, php-format
-msgid ""
-"My text and files are available under %s except this private data: password, "
-"email address, IM address, and phone number."
-msgstr ""
-
-#: actions/register.php:583
-#, php-format
-msgid ""
-"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
-"want to...\n"
-"\n"
-"* Go to [your profile](%2$s) and post your first message.\n"
-"* Add a [Jabber/GTalk address](%%%%action.imsettings%%%%) so you can send "
-"notices through instant messages.\n"
-"* [Search for people](%%%%action.peoplesearch%%%%) that you may know or that "
-"share your interests. \n"
-"* Update your [profile settings](%%%%action.profilesettings%%%%) to tell "
-"others more about you. \n"
-"* Read over the [online docs](%%%%doc.help%%%%) for features you may have "
-"missed. \n"
-"\n"
-"Thanks for signing up and we hope you enjoy using this service."
-msgstr ""
-
 #: actions/register.php:607
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
@@ -2528,10 +2392,6 @@ msgstr ""
 msgid "Remote subscribe"
 msgstr "SuscriciÃ³n remota"
 
-#: actions/remotesubscribe.php:124
-msgid "Subscribe to a remote user"
-msgstr ""
-
 #: actions/remotesubscribe.php:129
 msgid "User nickname"
 msgstr "Alcume de usuario"
@@ -2557,18 +2417,6 @@ msgstr "Subscribir"
 msgid "Invalid profile URL (bad format)"
 msgstr "Enderezo de perfil invÃ¡lido (formato incorrecto)"
 
-#: actions/remotesubscribe.php:168
-msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
-msgstr ""
-
-#: actions/remotesubscribe.php:176
-msgid "Thatâs a local profile! Login to subscribe."
-msgstr ""
-
-#: actions/remotesubscribe.php:183
-msgid "Couldnât get a request token."
-msgstr ""
-
 #: actions/repeat.php:90
 msgid "You already repeated that notice."
 msgstr "Xa estas suscrito a estes usuarios:"
@@ -2634,7 +2482,7 @@ msgstr "EstatÃsticas"
 
 #. TRANS: Menu item for site administration
 #: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
-#: lib/adminpanelaction.php:392
+#: lib/adminpanelaction.php:379
 msgid "Sessions"
 msgstr ""
 
@@ -2664,15 +2512,10 @@ msgid "Save site settings"
 msgstr "ConfiguraciÃ³n de perfil"
 
 #. TRANS: Form input field label for application icon.
-#: actions/showapplication.php:159 lib/applicationeditform.php:182
+#: actions/showapplication.php:159 lib/applicationeditform.php:173
 msgid "Icon"
 msgstr ""
 
-#. TRANS: Form input field label.
-#: actions/showapplication.php:178 lib/applicationeditform.php:235
-msgid "Organization"
-msgstr ""
-
 #: actions/showapplication.php:192 actions/showgroup.php:436
 #: lib/profileaction.php:187
 msgid "Statistics"
@@ -2683,10 +2526,18 @@ msgstr "EstatÃsticas"
 msgid "Created by %1$s - %2$s access by default - %3$d users"
 msgstr ""
 
+#: actions/showapplication.php:213
+msgid "Application actions"
+msgstr ""
+
 #: actions/showapplication.php:236
 msgid "Reset key & secret"
 msgstr ""
 
+#: actions/showapplication.php:261
+msgid "Application info"
+msgstr ""
+
 #: actions/showapplication.php:263
 msgid "Consumer key"
 msgstr ""
@@ -2757,7 +2608,7 @@ msgstr ""
 msgid "This is a way to share what you like."
 msgstr ""
 
-#: actions/showgroup.php:82 lib/groupnav.php:86
+#: actions/showgroup.php:82
 #, php-format
 msgid "%s group"
 msgstr ""
@@ -2785,17 +2636,6 @@ msgstr "Fonte para os amigos de %s"
 msgid "Notice feed for %s group (RSS 2.0)"
 msgstr "Fonte para os amigos de %s"
 
-#: actions/showgroup.php:355
-#, php-format
-msgid "FOAF for %s group"
-msgstr ""
-
-#: actions/showgroup.php:398 lib/profileaction.php:117
-#: lib/profileaction.php:152 lib/profileaction.php:255 lib/section.php:95
-#: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71
-msgid "(None)"
-msgstr ""
-
 #: actions/showgroup.php:404
 msgid "All members"
 msgstr ""
@@ -3105,7 +2945,7 @@ msgstr "Non se inseriu ningÃºn cÃ³digo"
 
 #. TRANS: Menu item for site administration
 #: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
-#: lib/adminpanelaction.php:408
+#: lib/adminpanelaction.php:395
 msgid "Snapshots"
 msgstr ""
 
@@ -3113,6 +2953,10 @@ msgstr ""
 msgid "Manage snapshot configuration"
 msgstr "Confirmar correo electrÃ³nico"
 
+#: actions/snapshotadminpanel.php:127
+msgid "Invalid snapshot run value."
+msgstr ""
+
 #: actions/snapshotadminpanel.php:133
 msgid "Snapshot frequency must be a number."
 msgstr ""
@@ -3244,10 +3088,6 @@ msgstr "Fonte para os amigos de %s"
 msgid "Notice feed for tag %s (Atom)"
 msgstr "Fonte para os amigos de %s"
 
-#: actions/tagother.php:39
-msgid "No ID argument."
-msgstr ""
-
 #: actions/tagother.php:81 actions/userauthorization.php:132
 #: lib/userprofile.php:103
 msgid "Photo"
@@ -3351,11 +3191,8 @@ msgstr ""
 msgid "Authorize subscription"
 msgstr "SubscriciÃ³n de autorizaciÃ³n."
 
-#: actions/userauthorization.php:110
-msgid ""
-"Please check these details to make sure that you want to subscribe to this "
-"userâs notices. If you didnât just ask to subscribe to someoneâs notices, "
-"click âRejectâ."
+#: actions/userauthorization.php:196 actions/version.php:167
+msgid "License"
 msgstr ""
 
 #: actions/userauthorization.php:217
@@ -3374,24 +3211,10 @@ msgstr "Sen peticiÃ³n de autorizaciÃ³n!"
 msgid "Subscription authorized"
 msgstr "SubscriciÃ³n autorizada"
 
-#: actions/userauthorization.php:256
-msgid ""
-"The subscription has been authorized, but no callback URL was passed. Check "
-"with the siteâs instructions for details on how to authorize the "
-"subscription. Your subscription token is:"
-msgstr ""
-
 #: actions/userauthorization.php:266
 msgid "Subscription rejected"
 msgstr "SubscriciÃ³n rexeitada"
 
-#: actions/userauthorization.php:268
-msgid ""
-"The subscription has been rejected, but no callback URL was passed. Check "
-"with the siteâs instructions for details on how to fully reject the "
-"subscription."
-msgstr ""
-
 #: actions/userauthorization.php:303
 #, php-format
 msgid "Listener URI â%sâ not found here."
@@ -3417,16 +3240,6 @@ msgstr ""
 msgid "Avatar URL â%sâ is not valid."
 msgstr ""
 
-#: actions/userauthorization.php:350
-#, php-format
-msgid "Canât read avatar URL â%sâ."
-msgstr ""
-
-#: actions/userauthorization.php:355
-#, php-format
-msgid "Wrong image type for avatar URL â%sâ."
-msgstr ""
-
 #: actions/userdesignsettings.php:87 lib/designsettings.php:76
 msgid ""
 "Customize the way your profile looks with a background image and a colour "
@@ -3687,19 +3500,14 @@ msgctxt "TOOLTIP"
 msgid "Personal profile and friends timeline"
 msgstr ""
 
-#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:465
-msgctxt "TOOLTIP"
-msgid "Connect to services"
-msgstr ""
-
 #. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
 #: lib/action.php:468
 msgid "Connect"
 msgstr "Conectar"
 
 #. TRANS: Main menu option when logged in and site admin for access to site configuration
-#: lib/action.php:474
+#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
+#: lib/action.php:474 lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr ""
@@ -3710,12 +3518,6 @@ msgctxt "TOOLTIP"
 msgid "Logout from the site"
 msgstr ""
 
-#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:495
-msgctxt "TOOLTIP"
-msgid "Create an account"
-msgstr ""
-
 #. TRANS: Tooltip for main menu option "Login"
 #: lib/action.php:501
 msgctxt "TOOLTIP"
@@ -3733,11 +3535,6 @@ msgstr ""
 msgid "Local views"
 msgstr ""
 
-#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:778
-msgid "Secondary site navigation"
-msgstr ""
-
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
 #: lib/action.php:784
 msgid "Help"
@@ -3782,22 +3579,17 @@ msgstr ""
 msgid "StatusNet software license"
 msgstr ""
 
-#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
-#: lib/action.php:843
-#, php-format
-msgid ""
-"**%%site.name%%** is a microblogging service brought to you by [%%site."
-"broughtby%%](%%site.broughtbyurl%%)."
-msgstr ""
-
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:846
+#: lib/action.php:849
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** Ã© un servizo de microbloguexo."
 
 #. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.
-#: lib/action.php:850
+#. TRANS: Make sure there is no whitespace between "]" and "(".
+#. TRANS: Text between [] is a link description, text between () is the link itself.
+#. TRANS: %s is the version of StatusNet that is being used.
+#: lib/action.php:856
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -3810,195 +3602,203 @@ msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:873
+#: lib/action.php:879
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:880
+#: lib/action.php:886
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:884
+#: lib/action.php:890
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 
-#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:897
+#. TRANS: license message in footer.
+#. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
+#: lib/action.php:904
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr ""
 
 #. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1236
+#: lib/action.php:1243
 msgid "Pagination"
 msgstr ""
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1247
+#: lib/action.php:1254
 msgid "After"
 msgstr "Outros"
 
-#. TRANS: Pagination message to go to a page displaying information more in the
-#. TRANS: past than the currently displayed information.
-#: lib/action.php:1257
-msgid "Before"
-msgstr ""
-
 #. TRANS: Client exception thrown when a feed instance is a DOMDocument.
 #: lib/activity.php:122
 msgid "Expecting a root feed element but got a whole XML document."
 msgstr ""
 
-#: lib/activityutils.php:208
+#. TRANS: Client exception thrown when there is no source attribute.
+#: lib/activityutils.php:203
 msgid "Can't handle remote content yet."
 msgstr ""
 
-#: lib/activityutils.php:244
+#. TRANS: Client exception thrown when there embedded XML content is found that cannot be processed yet.
+#: lib/activityutils.php:240
 msgid "Can't handle embedded XML content yet."
 msgstr ""
 
-#: lib/activityutils.php:248
+#. TRANS: Client exception thrown when base64 encoded content is found that cannot be processed yet.
+#: lib/activityutils.php:245
 msgid "Can't handle embedded Base64 content yet."
 msgstr ""
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:360
-msgctxt "MENU"
-msgid "Design"
-msgstr ""
-
-#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:368 lib/personalgroupnav.php:115
+#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:115
 msgid "User"
 msgstr "Usuario"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:398
+#: lib/adminpanelaction.php:385
 msgid "Edit site notice"
 msgstr "Eliminar chÃo"
 
 #. TRANS: Client error 401.
-#: lib/apiauth.php:113
+#: lib/apiauth.php:111
 msgid "API resource requires read-write access, but you only have read access."
 msgstr ""
 
-#. TRANS: Form legend.
-#: lib/applicationeditform.php:137
-msgid "Edit application"
+#. TRANS: OAuth exception thrown when no application is found for a given consumer key.
+#: lib/apiauth.php:175
+msgid "No application for that consumer key."
 msgstr ""
 
-#. TRANS: Form guide.
-#: lib/applicationeditform.php:187
-msgid "Icon for this application"
+#. TRANS: OAuth exception given when an incorrect access token was given for a user.
+#: lib/apiauth.php:212
+msgid "Bad access token."
 msgstr ""
 
-#. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:209
-#, php-format
-msgid "Describe your application in %d characters"
+#. TRANS: OAuth exception given when no user was found for a given token (no token was found).
+#: lib/apiauth.php:217
+msgid "No user for that token."
 msgstr ""
 
-#. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:213
-msgid "Describe your application"
+#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
+#: lib/apioauthstore.php:178
+msgid "Tried to revoke unknown token"
 msgstr ""
 
-#. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:224
-msgid "URL of the homepage of this application"
+#. TRANS: Exception thrown when an attempt is made to remove a revoked token.
+#: lib/apioauthstore.php:182
+msgid "Failed to delete revoked token"
 msgstr ""
 
-#. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:233
-msgid "Organization responsible for this application"
+#. TRANS: Form legend.
+#: lib/applicationeditform.php:129
+msgid "Edit application"
+msgstr ""
+
+#. TRANS: Form guide.
+#: lib/applicationeditform.php:178
+msgid "Icon for this application"
 msgstr ""
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:242
-msgid "URL for the homepage of the organization"
+#: lib/applicationeditform.php:224
+msgid "Organization responsible for this application"
 msgstr ""
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:251
+#: lib/applicationeditform.php:242
 msgid "URL to redirect to after authentication"
 msgstr ""
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:278
+#: lib/applicationeditform.php:269
 msgid "Browser"
 msgstr ""
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:295
+#: lib/applicationeditform.php:286
 msgid "Desktop"
 msgstr ""
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:297
+#: lib/applicationeditform.php:288
 msgid "Type of application, browser or desktop"
 msgstr ""
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:320
+#: lib/applicationeditform.php:311
 msgid "Read-only"
 msgstr ""
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:339
+#: lib/applicationeditform.php:330
 msgid "Read-write"
 msgstr ""
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:341
+#: lib/applicationeditform.php:332
 msgid "Default access for this application: read-only, or read-write"
 msgstr ""
 
-#. TRANS: Submit button title
-#: lib/applicationeditform.php:359
+#. TRANS: Submit button title.
+#: lib/applicationeditform.php:349
 msgid "Cancel"
 msgstr "Cancelar"
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:136
+#: lib/applicationlist.php:135
 msgid "read-write"
 msgstr ""
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:138
+#: lib/applicationlist.php:137
 msgid "read-only"
 msgstr ""
 
 #. 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
+#: lib/applicationlist.php:143
 #, php-format
 msgid "Approved %1$s - \"%2$s\" access."
 msgstr ""
 
 #. TRANS: Button label
-#: lib/applicationlist.php:159
+#: lib/applicationlist.php:158
 msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "Recuperar"
 
+#. TRANS: DT element label in attachment list.
+#: lib/attachmentlist.php:88
+msgid "Attachments"
+msgstr ""
+
 #. TRANS: DT element label in attachment list item.
 #: lib/attachmentlist.php:265
 msgid "Author"
 msgstr ""
 
-#: lib/attachmentnoticesection.php:67
+#. TRANS: Title.
+#: lib/attachmentnoticesection.php:68
 msgid "Notices where this attachment appears"
 msgstr ""
 
-#: lib/authenticationplugin.php:236
-msgid "Password changing is not allowed"
+#. TRANS: Title.
+#: lib/attachmenttagcloudsection.php:49
+msgid "Tags for this attachment"
 msgstr ""
 
+#. TRANS: Title for the form to block a user.
+#: lib/blockform.php:70
+msgid "Block"
+msgstr "Bloquear"
+
 #: lib/channel.php:157 lib/channel.php:177
 msgid "Command results"
 msgstr "Resultados do comando"
@@ -4011,6 +3811,13 @@ msgstr "Comando completo"
 msgid "Command failed"
 msgstr "Comando fallido"
 
+#. TRANS: Message given getting a non-existing user.
+#. TRANS: %s is the nickname of the user that could not be found.
+#: lib/command.php:150
+#, php-format
+msgid "Could not find a local user with nickname %s."
+msgstr ""
+
 #. TRANS: Error text shown when an unimplemented command is given.
 #: lib/command.php:185
 msgid "Sorry, this command is not yet implemented."
@@ -4041,6 +3848,20 @@ msgstr ""
 msgid "Notice marked as fave."
 msgstr "ChÃo marcado coma favorito."
 
+#. 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.
+#: lib/command.php:360
+#, php-format
+msgid "%1$s joined group %2$s."
+msgstr ""
+
+#. 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.
+#: lib/command.php:408
+#, php-format
+msgid "%1$s left group %2$s."
+msgstr ""
+
 #. TRANS: Whois output. %s is the full name of the queried user.
 #: lib/command.php:434
 #, php-format
@@ -4075,13 +3896,6 @@ msgid ""
 "same server."
 msgstr ""
 
-#. 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:491 lib/xmppmanager.php:403
-#, php-format
-msgid "Message too long - maximum is %1$d characters, you sent %2$d."
-msgstr ""
-
 #. TRANS: Error text shown sending a direct message fails with an unknown reason.
 #: lib/command.php:517
 msgid "Error sending direct message."
@@ -4092,22 +3906,18 @@ msgstr "Erro Ã³ enviar a mensaxe directa."
 msgid "Error repeating notice."
 msgstr "Acounteceu un erro configurando o usuario."
 
-#. TRANS: Message given if content of a notice for a reply is too long.
-#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:592
+#. TRANS: Text shown after having subscribed to another user successfully.
+#. TRANS: %s is the name of the user the subscription was requested for.
+#: lib/command.php:672
 #, php-format
-msgid "Notice too long - maximum is %1$d characters, you sent %2$d."
-msgstr ""
-
-#. TRANS: Error text shown when no username was provided when issuing a subscribe command.
-#: lib/command.php:655
-msgid "Specify the name of the user to subscribe to."
+msgid "Subscribed to %s."
 msgstr ""
 
-#. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
-#. TRANS: Error text shown when no username was provided when issuing the command.
-#: lib/command.php:694 lib/command.php:804
-msgid "Specify the name of the user to unsubscribe from."
+#. TRANS: Text shown after having unsubscribed from another user successfully.
+#. TRANS: %s is the name of the user the unsubscription was requested for.
+#: lib/command.php:705
+#, php-format
+msgid "Unsubscribed from %s."
 msgstr ""
 
 #. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
@@ -4148,8 +3958,15 @@ msgstr ""
 msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr ""
 
+#. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
+#. TRANS: %s is the name of the user the unsubscription was requested for.
+#: lib/command.php:813
+#, php-format
+msgid "Unsubscribed %s."
+msgstr ""
+
 #. TRANS: Text shown after requesting other users a user is subscribed to.
-#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.
 #: lib/command.php:836
 msgid "You are subscribed to this person:"
@@ -4161,7 +3978,7 @@ msgstr[3] ""
 msgstr[4] ""
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
-#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
 #: lib/command.php:863
 msgid "This person is subscribed to you:"
@@ -4173,7 +3990,7 @@ msgstr[3] ""
 msgstr[4] ""
 
 #. TRANS: Text shown after requesting groups a user is subscribed to.
-#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
 #: lib/command.php:890
 msgid "You are a member of this group:"
@@ -4184,48 +4001,6 @@ msgstr[2] ""
 msgstr[3] ""
 msgstr[4] ""
 
-#: lib/command.php:905
-msgid ""
-"Commands:\n"
-"on - turn on notifications\n"
-"off - turn off notifications\n"
-"help - show this help\n"
-"follow <nickname> - subscribe to user\n"
-"groups - lists the groups you have joined\n"
-"subscriptions - list the people you follow\n"
-"subscribers - list the people that follow you\n"
-"leave <nickname> - unsubscribe from user\n"
-"d <nickname> <text> - direct message to user\n"
-"get <nickname> - get last notice from user\n"
-"whois <nickname> - get profile info on user\n"
-"lose <nickname> - force user to stop following you\n"
-"fav <nickname> - add user's last notice as a 'fave'\n"
-"fav #<notice_id> - add notice with the given id as a 'fave'\n"
-"repeat #<notice_id> - repeat a notice with a given id\n"
-"repeat <nickname> - repeat the last notice from user\n"
-"reply #<notice_id> - reply to notice with a given id\n"
-"reply <nickname> - reply to the last notice from user\n"
-"join <group> - join group\n"
-"login - Get a link to login to the web interface\n"
-"drop <group> - leave group\n"
-"stats - get your stats\n"
-"stop - same as 'off'\n"
-"quit - same as 'off'\n"
-"sub <nickname> - same as 'follow'\n"
-"unsub <nickname> - same as 'leave'\n"
-"last <nickname> - same as 'get'\n"
-"on <nickname> - not yet implemented.\n"
-"off <nickname> - not yet implemented.\n"
-"nudge <nickname> - remind a user to update.\n"
-"invite <phone number> - not yet implemented.\n"
-"track <word> - not yet implemented.\n"
-"untrack <word> - not yet implemented.\n"
-"track off - not yet implemented.\n"
-"untrack all - not yet implemented.\n"
-"tracks - not yet implemented.\n"
-"tracking - not yet implemented.\n"
-msgstr ""
-
 #: lib/common.php:136
 msgid "I looked for configuration files in the following places: "
 msgstr ""
@@ -4319,40 +4094,38 @@ msgstr "Ir"
 msgid "Grant this user the \"%s\" role"
 msgstr ""
 
-#: lib/groupeditform.php:168
-msgid "Describe the group or topic"
-msgstr ""
-
-#: lib/groupeditform.php:170
-#, php-format
-msgid "Describe the group or topic in %d characters"
-msgstr ""
-
 #: lib/groupeditform.php:187
 #, php-format
 msgid "Extra nicknames for the group, comma- or space- separated, max %d"
 msgstr ""
 
-#: lib/groupnav.php:85
+#. TRANS: Menu item in the group navigation page.
+#: lib/groupnav.php:86
+msgctxt "MENU"
 msgid "Group"
 msgstr ""
 
-#: lib/groupnav.php:108
+#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
+#. TRANS: %s is the nickname of the group.
+#: lib/groupnav.php:120
 #, php-format
+msgctxt "TOOLTIP"
 msgid "Edit %s group properties"
 msgstr ""
 
-#: lib/groupnav.php:113
-msgid "Logo"
-msgstr "Inicio de sesiÃ³n"
-
-#: lib/groupnav.php:114
+#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
+#. TRANS: %s is the nickname of the group.
+#: lib/groupnav.php:129
 #, php-format
+msgctxt "TOOLTIP"
 msgid "Add or edit %s logo"
 msgstr ""
 
-#: lib/groupnav.php:120
+#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
+#. TRANS: %s is the nickname of the group.
+#: lib/groupnav.php:138
 #, php-format
+msgctxt "TOOLTIP"
 msgid "Add or edit %s design"
 msgstr ""
 
@@ -4382,7 +4155,8 @@ msgstr "Formato de ficheiro de imaxe non soportado."
 msgid "Partial upload."
 msgstr "Carga parcial."
 
-#: lib/imagefile.php:101 lib/mediafile.php:170
+#. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
+#: lib/imagefile.php:101 lib/mediafile.php:179
 msgid "System error uploading file."
 msgstr "Aconteceu un erro no sistema namentras se estaba cargando o ficheiro."
 
@@ -4394,10 +4168,6 @@ msgstr "Non Ã© unha imaxe ou estÃ¡ corrupta."
 msgid "Lost our file."
 msgstr "NingÃºn chÃo."
 
-#: lib/imagefile.php:163 lib/imagefile.php:224
-msgid "Unknown file type"
-msgstr ""
-
 #: lib/imagefile.php:244
 msgid "MB"
 msgstr ""
@@ -4420,10 +4190,6 @@ msgstr ""
 msgid "Login with a username and password"
 msgstr "Usuario ou contrasinal invÃ¡lidos."
 
-#: lib/logingroupnav.php:86
-msgid "Sign up for a new account"
-msgstr ""
-
 #. TRANS: Subject for address confirmation email
 #: lib/mail.php:174
 msgid "Email address confirmation"
@@ -4472,22 +4238,6 @@ msgid ""
 "your subscribers list and report as spam to site administrators at %s"
 msgstr ""
 
-#. TRANS: Main body of new-subscriber notification e-mail
-#: lib/mail.php:254
-#, php-format
-msgid ""
-"%1$s is now listening to your notices on %2$s.\n"
-"\n"
-"\t%3$s\n"
-"\n"
-"%4$s%5$s%6$s\n"
-"Faithfully yours,\n"
-"%7$s.\n"
-"\n"
-"----\n"
-"Change your email address or notification options at %8$s\n"
-msgstr ""
-
 #. TRANS: Subject of notification mail for new posting email address
 #: lib/mail.php:304
 #, php-format
@@ -4606,28 +4356,6 @@ msgstr ""
 msgid "%s (@%s) added your notice as a favorite"
 msgstr "Enviar un correo cando alguen enganda un chÃo meu coma favorito."
 
-#. TRANS: Body for favorite notification email
-#: lib/mail.php:592
-#, php-format
-msgid ""
-"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
-"\n"
-"The URL of your notice is:\n"
-"\n"
-"%3$s\n"
-"\n"
-"The text of your notice is:\n"
-"\n"
-"%4$s\n"
-"\n"
-"You can see the list of %1$s's favorites here:\n"
-"\n"
-"%5$s\n"
-"\n"
-"Faithfully yours,\n"
-"%6$s\n"
-msgstr ""
-
 #. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
 #: lib/mail.php:651
 #, php-format
@@ -4637,6 +4365,11 @@ msgid ""
 "\t%s"
 msgstr ""
 
+#: lib/mail.php:657
+#, php-format
+msgid "%s (@%s) sent a notice to your attention"
+msgstr ""
+
 #. TRANS: Body of @-reply notification e-mail.
 #: lib/mail.php:660
 #, php-format
@@ -4675,10 +4408,6 @@ msgid ""
 "users in conversation. People can send you messages for your eyes only."
 msgstr ""
 
-#: lib/mailbox.php:228 lib/noticelist.php:506
-msgid "from"
-msgstr ""
-
 #: lib/mailhandler.php:37
 msgid "Could not parse message."
 msgstr "Non se puido analizaar a mensaxe."
@@ -4695,67 +4424,81 @@ msgstr "Ise Ã© un enderezo IM incorrecto."
 msgid "Sorry, no incoming email allowed."
 msgstr "AivÃ¡, non se permiten correos entrantes."
 
-#: lib/mediafile.php:98 lib/mediafile.php:123
+#. TRANS: Client exception thrown when a database error was thrown during a file upload operation.
+#: lib/mediafile.php:99 lib/mediafile.php:125
 msgid "There was a database error while saving your file. Please try again."
 msgstr ""
 
-#: lib/mediafile.php:142
+#. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
+#: lib/mediafile.php:145
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
 msgstr ""
 
-#: lib/mediafile.php:147
+#. TRANS: Client exception.
+#: lib/mediafile.php:151
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form."
 msgstr ""
 
-#: lib/mediafile.php:152
+#. TRANS: Client exception.
+#: lib/mediafile.php:157
 msgid "The uploaded file was only partially uploaded."
 msgstr ""
 
-#: lib/mediafile.php:159
+#. TRANS: Client exception thrown when a temporary folder is not present to store a file upload.
+#: lib/mediafile.php:165
 msgid "Missing a temporary folder."
 msgstr ""
 
-#: lib/mediafile.php:162
+#. TRANS: Client exception thrown when writing to disk is not possible during a file upload operation.
+#: lib/mediafile.php:169
 msgid "Failed to write file to disk."
 msgstr ""
 
-#: lib/mediafile.php:165
+#. TRANS: Client exception thrown when a file upload operation has been stopped by an extension.
+#: lib/mediafile.php:173
 msgid "File upload stopped by extension."
 msgstr ""
 
-#: lib/mediafile.php:179 lib/mediafile.php:217
+#. TRANS: Client exception thrown when a file upload operation would cause a user to exceed a set quota.
+#: lib/mediafile.php:189 lib/mediafile.php:232
 msgid "File exceeds user's quota."
 msgstr ""
 
-#: lib/mediafile.php:197 lib/mediafile.php:234
+#. TRANS: Client exception thrown when a file upload operation fails because the file could
+#. TRANS: not be moved from the temporary folder to the permanent file location.
+#: lib/mediafile.php:209 lib/mediafile.php:251
 msgid "File could not be moved to destination directory."
 msgstr ""
 
-#: lib/mediafile.php:202 lib/mediafile.php:238
+#. TRANS: Client exception thrown when a file upload operation has been stopped because the MIME
+#. TRANS: type of the uploaded file could not be determined.
+#: lib/mediafile.php:216 lib/mediafile.php:257
 msgid "Could not determine file's MIME type."
 msgstr "Non se puido eliminar o favorito."
 
-#: lib/mediafile.php:318
+#. TRANS: Client exception thrown trying to upload a forbidden MIME type.
+#. TRANS: %1$s is the file type that was denied, %2$s is the application part of
+#. TRANS: the MIME type that was denied.
+#: lib/mediafile.php:340
 #, php-format
-msgid " Try using another %s format."
+msgid ""
+"\"%1$s\" is not a supported file type on this server. Try using another %2$s "
+"format."
 msgstr ""
 
-#: lib/mediafile.php:323
+#. TRANS: Client exception thrown trying to upload a forbidden MIME type.
+#. TRANS: %s is the file type that was denied.
+#: lib/mediafile.php:345
 #, php-format
-msgid "%s is not a supported file type on this server."
+msgid "\"%s\" is not a supported file type on this server."
 msgstr ""
 
 #: lib/messageform.php:146
 msgid "To"
 msgstr "A"
 
-#: lib/messageform.php:178 lib/noticeform.php:237
-msgctxt "Send button for sending notice"
-msgid "Send"
-msgstr ""
-
 #: lib/noticeform.php:160
 msgid "Send a notice"
 msgstr "Novo chÃo"
@@ -4773,25 +4516,12 @@ msgstr ""
 msgid "Attach a file"
 msgstr ""
 
-#: lib/noticeform.php:213
-msgid "Share my location"
-msgstr ""
-
-#: lib/noticeform.php:216
-msgid "Do not share my location"
-msgstr ""
-
 #: lib/noticeform.php:217
 msgid ""
 "Sorry, retrieving your geo location is taking longer than expected, please "
 "try again later"
 msgstr ""
 
-#. TRANS: Used in coordinates as abbreviation of north
-#: lib/noticelist.php:436
-msgid "N"
-msgstr ""
-
 #. TRANS: Used in coordinates as abbreviation of south
 #: lib/noticelist.php:438
 msgid "S"
@@ -4824,23 +4554,7 @@ msgstr ""
 msgid "Reply"
 msgstr "Respostas"
 
-#: lib/oauthstore.php:283
-msgid "Error inserting new profile"
-msgstr "Acounteceu un erro Ã³ inserir o novo perfil"
-
-#: lib/oauthstore.php:291
-msgid "Error inserting avatar"
-msgstr "Acounteceu un erro Ã³ inserir o avatar"
-
-#: lib/oauthstore.php:306
-msgid "Error updating remote profile"
-msgstr "Acounteceu un erro actualizando o perfil remoto"
-
-#: lib/oauthstore.php:311
-msgid "Error inserting remote profile"
-msgstr "Aconteceu un erro Ã³ inserir o perfil remoto"
-
-#: lib/oauthstore.php:490
+#: lib/oauthstore.php:491
 msgid "Couldn't insert new subscription."
 msgstr "Non se puido inserir a nova subscriciÃ³n."
 
@@ -4872,11 +4586,6 @@ msgstr "Band. SaÃda"
 msgid "Your sent messages"
 msgstr "As tÃºas mensaxes enviadas"
 
-#: lib/personaltagcloudsection.php:56
-#, php-format
-msgid "Tags in %s's notices"
-msgstr ""
-
 #: lib/profileaction.php:109 lib/profileaction.php:205 lib/subgroupnav.php:82
 msgid "Subscriptions"
 msgstr "SubscriciÃ³ns"
@@ -4898,10 +4607,6 @@ msgstr "Membro dende"
 msgid "Daily average"
 msgstr ""
 
-#: lib/profileaction.php:264
-msgid "All groups"
-msgstr ""
-
 #: lib/profileformaction.php:123
 msgid "Unimplemented method."
 msgstr ""
@@ -4910,10 +4615,6 @@ msgstr ""
 msgid "Public"
 msgstr "PÃºblico"
 
-#: lib/publicgroupnav.php:82
-msgid "User groups"
-msgstr ""
-
 #: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85
 msgid "Recent tags"
 msgstr "Etiquetas recentes"
@@ -4926,10 +4627,6 @@ msgstr "Destacado"
 msgid "Popular"
 msgstr "Popular"
 
-#: lib/redirectingaction.php:95
-msgid "No return-to arguments."
-msgstr ""
-
 #: lib/repeatform.php:132
 msgid "Yes"
 msgstr "Si"
@@ -4943,18 +4640,12 @@ msgstr ""
 msgid "No single user defined for single-user mode."
 msgstr ""
 
-#: lib/sandboxform.php:78
-msgid "Sandbox this user"
-msgstr ""
-
-#: lib/searchaction.php:126
+#. TRANS: Used as a field label for the field where one or more keywords
+#. TRANS: for searching can be entered.
+#: lib/searchaction.php:129
 msgid "Keyword(s)"
 msgstr ""
 
-#: lib/searchaction.php:127
-msgid "Search"
-msgstr "Buscar"
-
 #: lib/searchgroupnav.php:80
 msgid "People"
 msgstr "Xente"
@@ -4975,12 +4666,9 @@ msgstr ""
 msgid "More..."
 msgstr ""
 
-#: lib/silenceform.php:67
-msgid "Silence"
-msgstr ""
-
-#: lib/silenceform.php:78
-msgid "Silence this user"
+#: lib/subgroupnav.php:99
+#, php-format
+msgid "Groups %s is a member of"
 msgstr ""
 
 #: lib/subgroupnav.php:105
@@ -4997,10 +4685,6 @@ msgstr ""
 msgid "People Tagcloud as tagged"
 msgstr ""
 
-#: lib/tagcloudsection.php:56
-msgid "None"
-msgstr ""
-
 #: lib/themeuploader.php:50
 msgid "This server cannot handle theme uploads without ZIP support."
 msgstr ""
@@ -5049,18 +4733,10 @@ msgstr ""
 msgid "Unsandbox"
 msgstr ""
 
-#: lib/unsandboxform.php:80
-msgid "Unsandbox this user"
-msgstr ""
-
 #: lib/unsilenceform.php:67
 msgid "Unsilence"
 msgstr ""
 
-#: lib/unsilenceform.php:78
-msgid "Unsilence this user"
-msgstr ""
-
 #: lib/unsubscribeform.php:137
 msgid "Unsubscribe"
 msgstr "Eliminar subscriciÃ³n"
@@ -5088,56 +4764,32 @@ msgid "Moderator"
 msgstr ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1102
+#: lib/util.php:1103
 msgid "a few seconds ago"
 msgstr "fai uns segundos"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1105
+#: lib/util.php:1106
 msgid "about a minute ago"
 msgstr "fai un minuto"
 
-#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1109
-#, php-format
-msgid "about %d minutes ago"
-msgstr "fai %d minutos"
-
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 #: lib/util.php:1112
 msgid "about an hour ago"
 msgstr "fai unha hora"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1116
-#, php-format
-msgid "about %d hours ago"
-msgstr "fai %d horas"
-
-#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1119
+#: lib/util.php:1118
 msgid "about a day ago"
 msgstr "fai un dÃa"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1123
-#, php-format
-msgid "about %d days ago"
-msgstr "fai %d dÃas"
-
-#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1126
+#: lib/util.php:1124
 msgid "about a month ago"
 msgstr "fai un mes"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 #: lib/util.php:1130
-#, php-format
-msgid "about %d months ago"
-msgstr "fai %d meses"
-
-#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1133
 msgid "about a year ago"
 msgstr "fai un ano"
 
@@ -5145,3 +4797,8 @@ msgstr "fai un ano"
 #, php-format
 msgid "%s is not a valid color!"
 msgstr "A pÃ¡xina persoal semella que non Ã© unha URL vÃ¡lida."
+
+#: lib/webcolor.php:123
+#, php-format
+msgid "%s is not a valid color! Use 3 or 6 hex chars."
+msgstr ""
diff --git a/locale/gl/LC_MESSAGES/statusnet.po b/locale/gl/LC_MESSAGES/statusnet.po
index 40e6314ee0..44a206e654 100644
--- a/locale/gl/LC_MESSAGES/statusnet.po
+++ b/locale/gl/LC_MESSAGES/statusnet.po
@@ -1,7 +1,8 @@
-# Translation of StatusNet to Galician
+# Translation of StatusNet to Galician (Galego)
+# Expored from translatewiki.net
 #
-# Author@translatewiki.net: Gallaecio
-# Author@translatewiki.net: ToliÃ±o
+# Author: Gallaecio
+# Author: ToliÃ±o
 # --
 # This file is distributed under the same license as the StatusNet package.
 #
@@ -9,20 +10,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-08 22:33+0000\n"
-"PO-Revision-Date: 2010-09-08 22:34:20+0000\n"
-"Language-Team: Galician\n"
+"POT-Creation-Date: 2010-09-14 19:53+0000\n"
+"PO-Revision-Date: 2010-09-14 19:53:58+0000\n"
+"Language-Team: Galician <http://translatewiki.net/wiki/Portal:gl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r72348); Translate extension (2010-08-20)\n"
+"X-Generator: MediaWiki 1.17alpha (r73009); Translate extension (2010-08-20)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: gl\n"
-"X-Message-Group: out-statusnet\n"
+"X-Message-Group: #out-statusnet\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-POT-Import-Date: 1284-49-16 34::+0000\n"
 
 #. TRANS: Page title
 #. TRANS: Menu item for site administration
-#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:376
+#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:363
 msgid "Access"
 msgstr "Acceso"
 
@@ -75,10 +77,10 @@ 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 actions/emailsettings.php:224
-#: actions/imsettings.php:184 actions/smssettings.php:209
-#: lib/applicationeditform.php:361
+#. TRANS: Button label in the "Edit application" form.
+#: actions/accessadminpanel.php:203 actions/emailsettings.php:228
+#: actions/imsettings.php:187 actions/smssettings.php:209
+#: lib/applicationeditform.php:351
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Gardar"
@@ -91,15 +93,15 @@ msgstr "Esa pÃ¡xina non existe."
 
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #: actions/all.php:79 actions/allrss.php:68
-#: actions/apiaccountupdatedeliverydevice.php:114
-#: actions/apiaccountupdateprofile.php:105
-#: actions/apiaccountupdateprofilebackgroundimage.php:116
-#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
-#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
-#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:113
-#: actions/apigroupismember.php:91 actions/apigroupjoin.php:100
-#: actions/apigroupleave.php:100 actions/apigrouplist.php:73
-#: actions/apistatusesupdate.php:229 actions/apisubscriptions.php:87
+#: actions/apiaccountupdatedeliverydevice.php:115
+#: actions/apiaccountupdateprofile.php:106
+#: actions/apiaccountupdateprofilebackgroundimage.php:117
+#: actions/apiaccountupdateprofileimage.php:106 actions/apiblockcreate.php:98
+#: actions/apiblockdestroy.php:97 actions/apidirectmessage.php:77
+#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:114
+#: actions/apigroupismember.php:91 actions/apigroupjoin.php:101
+#: actions/apigroupleave.php:101 actions/apigrouplist.php:73
+#: actions/apistatusesupdate.php:230 actions/apisubscriptions.php:87
 #: actions/apitimelinefavorites.php:72 actions/apitimelinefriends.php:174
 #: actions/apitimelinehome.php:80 actions/apitimelinementions.php:80
 #: actions/apitimelineuser.php:82 actions/avatarbynickname.php:75
@@ -199,16 +201,16 @@ msgid "Updates from %1$s and friends on %2$s!"
 msgstr "ActualizaciÃ³ns de %1$s e amigos en %2$s!"
 
 #: actions/apiaccountratelimitstatus.php:72
-#: actions/apiaccountupdatedeliverydevice.php:94
-#: actions/apiaccountupdateprofile.php:97
-#: actions/apiaccountupdateprofilebackgroundimage.php:94
-#: actions/apiaccountupdateprofilecolors.php:118
+#: actions/apiaccountupdatedeliverydevice.php:95
+#: actions/apiaccountupdateprofile.php:98
+#: actions/apiaccountupdateprofilebackgroundimage.php:95
+#: actions/apiaccountupdateprofilecolors.php:119
 #: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156
-#: actions/apifavoritecreate.php:100 actions/apifavoritedestroy.php:101
-#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100
-#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:139
-#: actions/apigroupismember.php:115 actions/apigroupjoin.php:156
-#: actions/apigroupleave.php:142 actions/apigrouplist.php:137
+#: actions/apifavoritecreate.php:101 actions/apifavoritedestroy.php:102
+#: actions/apifriendshipscreate.php:101 actions/apifriendshipsdestroy.php:101
+#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:140
+#: actions/apigroupismember.php:115 actions/apigroupjoin.php:157
+#: actions/apigroupleave.php:143 actions/apigrouplist.php:137
 #: actions/apigrouplistall.php:122 actions/apigroupmembership.php:107
 #: actions/apigroupshow.php:116 actions/apihelptest.php:88
 #: actions/apistatusesdestroy.php:104 actions/apistatusesretweets.php:112
@@ -223,21 +225,23 @@ msgstr "ActualizaciÃ³ns de %1$s e amigos en %2$s!"
 msgid "API method not found."
 msgstr "Non se atopou o mÃ©todo da API."
 
-#: actions/apiaccountupdatedeliverydevice.php:86
-#: actions/apiaccountupdateprofile.php:89
-#: actions/apiaccountupdateprofilebackgroundimage.php:86
-#: actions/apiaccountupdateprofilecolors.php:110
-#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89
-#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109
-#: actions/apifavoritecreate.php:91 actions/apifavoritedestroy.php:92
-#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
-#: actions/apigroupcreate.php:105 actions/apigroupjoin.php:92
-#: actions/apigroupleave.php:92 actions/apimediaupload.php:67
-#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:198
+#. TRANS: Client error message. POST is a HTTP command. It should not be translated.
+#. TRANS: Client error. POST is a HTTP command. It should not be translated.
+#: actions/apiaccountupdatedeliverydevice.php:87
+#: actions/apiaccountupdateprofile.php:90
+#: actions/apiaccountupdateprofilebackgroundimage.php:87
+#: actions/apiaccountupdateprofilecolors.php:111
+#: actions/apiaccountupdateprofileimage.php:85 actions/apiblockcreate.php:90
+#: actions/apiblockdestroy.php:89 actions/apidirectmessagenew.php:110
+#: actions/apifavoritecreate.php:92 actions/apifavoritedestroy.php:93
+#: actions/apifriendshipscreate.php:92 actions/apifriendshipsdestroy.php:92
+#: actions/apigroupcreate.php:106 actions/apigroupjoin.php:93
+#: actions/apigroupleave.php:93 actions/apimediaupload.php:68
+#: actions/apistatusesretweet.php:66 actions/apistatusesupdate.php:199
 msgid "This method requires a POST."
 msgstr "Este mÃ©todo require un POST."
 
-#: actions/apiaccountupdatedeliverydevice.php:106
+#: actions/apiaccountupdatedeliverydevice.php:107
 msgid ""
 "You must specify a parameter named 'device' with a value of one of: sms, im, "
 "none."
@@ -245,27 +249,27 @@ msgstr ""
 "Ten que especificar un parÃ¡metro chamado \"device\" cun destes valores: sms, "
 "im, none."
 
-#: actions/apiaccountupdatedeliverydevice.php:133
+#: actions/apiaccountupdatedeliverydevice.php:134
 msgid "Could not update user."
 msgstr "Non se puido actualizar o usuario."
 
-#: actions/apiaccountupdateprofile.php:112
-#: actions/apiaccountupdateprofilebackgroundimage.php:194
-#: actions/apiaccountupdateprofilecolors.php:185
-#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/apiaccountupdateprofile.php:113
+#: actions/apiaccountupdateprofilebackgroundimage.php:195
+#: actions/apiaccountupdateprofilecolors.php:186
+#: actions/apiaccountupdateprofileimage.php:131 actions/apiusershow.php:108
 #: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/hcard.php:74
 #: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
 #: lib/profileaction.php:84
 msgid "User has no profile."
 msgstr "O usuario non ten perfil."
 
-#: actions/apiaccountupdateprofile.php:147
+#: actions/apiaccountupdateprofile.php:148
 msgid "Could not save profile."
 msgstr "Non se puido gardar o perfil."
 
-#: actions/apiaccountupdateprofilebackgroundimage.php:108
-#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
-#: actions/apistatusesupdate.php:212 actions/avatarsettings.php:257
+#: actions/apiaccountupdateprofilebackgroundimage.php:109
+#: actions/apiaccountupdateprofileimage.php:98 actions/apimediaupload.php:81
+#: actions/apistatusesupdate.php:213 actions/avatarsettings.php:257
 #: actions/designadminpanel.php:123 actions/editapplication.php:118
 #: actions/newapplication.php:101 actions/newnotice.php:94
 #: lib/designsettings.php:283
@@ -277,30 +281,30 @@ msgstr ""
 "O servidor non puido manexar tantos datos POST (%s bytes) por mor da sÃºa "
 "configuraciÃ³n actual."
 
-#: actions/apiaccountupdateprofilebackgroundimage.php:136
-#: actions/apiaccountupdateprofilebackgroundimage.php:146
-#: actions/apiaccountupdateprofilecolors.php:164
-#: actions/apiaccountupdateprofilecolors.php:174
+#: actions/apiaccountupdateprofilebackgroundimage.php:137
+#: actions/apiaccountupdateprofilebackgroundimage.php:147
+#: actions/apiaccountupdateprofilecolors.php:165
+#: actions/apiaccountupdateprofilecolors.php:175
 #: actions/groupdesignsettings.php:290 actions/groupdesignsettings.php:300
 #: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
 #: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
 msgid "Unable to save your design settings."
 msgstr "Non se puido gardar a sÃºa configuraciÃ³n de deseÃ±o."
 
-#: actions/apiaccountupdateprofilebackgroundimage.php:187
-#: actions/apiaccountupdateprofilecolors.php:142
+#: actions/apiaccountupdateprofilebackgroundimage.php:188
+#: actions/apiaccountupdateprofilecolors.php:143
 msgid "Could not update your design."
 msgstr "Non se puido actualizar o seu deseÃ±o."
 
-#: actions/apiblockcreate.php:105
+#: actions/apiblockcreate.php:106
 msgid "You cannot block yourself!"
 msgstr "Non pode bloquearse a si mesmo!"
 
-#: actions/apiblockcreate.php:126
+#: actions/apiblockcreate.php:127
 msgid "Block user failed."
 msgstr "Non se puido bloquear o usuario."
 
-#: actions/apiblockdestroy.php:114
+#: actions/apiblockdestroy.php:115
 msgid "Unblock user failed."
 msgstr "Non se puido desbloquear o usuario."
 
@@ -324,61 +328,61 @@ msgstr "Mensaxes directas a %s"
 msgid "All the direct messages sent to %s"
 msgstr "Todas as mensaxes directas enviadas a %s"
 
-#: actions/apidirectmessagenew.php:118
+#: actions/apidirectmessagenew.php:119
 msgid "No message text!"
 msgstr "A mensaxe non ten texto!"
 
-#: actions/apidirectmessagenew.php:127 actions/newmessage.php:150
+#: actions/apidirectmessagenew.php:128 actions/newmessage.php:150
 #, php-format
 msgid "That's too long. Max message size is %d chars."
 msgstr ""
 "Iso Ã© longo de mÃ¡is. A lonxitude mÃ¡xima das mensaxes Ã© de %d caracteres."
 
-#: actions/apidirectmessagenew.php:138
+#: actions/apidirectmessagenew.php:139
 msgid "Recipient user not found."
 msgstr "Non se atopou o destinatario."
 
-#: actions/apidirectmessagenew.php:142
+#: actions/apidirectmessagenew.php:143
 msgid "Can't send direct messages to users who aren't your friend."
 msgstr ""
 "Non pode enviar mensaxes directas a usuarios que non sexan amigos seus."
 
-#: actions/apifavoritecreate.php:109 actions/apifavoritedestroy.php:110
+#: actions/apifavoritecreate.php:110 actions/apifavoritedestroy.php:111
 #: actions/apistatusesdestroy.php:121
 msgid "No status found with that ID."
 msgstr "Non se atopou ningÃºn estado con esa ID."
 
-#: actions/apifavoritecreate.php:120
+#: actions/apifavoritecreate.php:121
 msgid "This status is already a favorite."
 msgstr "Este estado xa Ã© dos favoritos."
 
 #. TRANS: Error message text shown when a favorite could not be set.
-#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:296
+#: actions/apifavoritecreate.php:132 actions/favor.php:84 lib/command.php:296
 msgid "Could not create favorite."
 msgstr "Non se puido crear o favorito."
 
-#: actions/apifavoritedestroy.php:123
+#: actions/apifavoritedestroy.php:124
 msgid "That status is not a favorite."
 msgstr "Ese estado non Ã© un dos favoritos."
 
-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
+#: actions/apifavoritedestroy.php:136 actions/disfavor.php:87
 msgid "Could not delete favorite."
 msgstr "Non se puido eliminar o favorito."
 
-#: actions/apifriendshipscreate.php:109
+#: actions/apifriendshipscreate.php:110
 msgid "Could not follow user: profile not found."
 msgstr "Non se puido seguir o usuario: non se atopou."
 
-#: actions/apifriendshipscreate.php:118
+#: actions/apifriendshipscreate.php:119
 #, php-format
 msgid "Could not follow user: %s is already on your list."
 msgstr "Non se puido seguir o usuario: %s xa estÃ¡ na sÃºa lista."
 
-#: actions/apifriendshipsdestroy.php:109
+#: actions/apifriendshipsdestroy.php:110
 msgid "Could not unfollow user: User not found."
 msgstr "Non se puido deixar de seguir o usuario: non se atopou."
 
-#: actions/apifriendshipsdestroy.php:120
+#: actions/apifriendshipsdestroy.php:121
 msgid "You cannot unfollow yourself."
 msgstr "Non pode deixar de seguirse a si mesmo."
 
@@ -394,7 +398,7 @@ msgstr "Non se puido determinar o usuario de orixe."
 msgid "Could not find target user."
 msgstr "Non se puido atopar o usuario de destino."
 
-#: actions/apigroupcreate.php:167 actions/editgroup.php:186
+#: actions/apigroupcreate.php:168 actions/editgroup.php:186
 #: actions/newgroup.php:126 actions/profilesettings.php:215
 #: actions/register.php:212
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
@@ -402,95 +406,95 @@ msgstr ""
 "O alcume debe ter sÃ³ letras en minÃºscula e nÃºmeros, e non pode ter espazos "
 "en branco."
 
-#: actions/apigroupcreate.php:176 actions/editgroup.php:190
+#: actions/apigroupcreate.php:177 actions/editgroup.php:190
 #: actions/newgroup.php:130 actions/profilesettings.php:238
 #: actions/register.php:215
 msgid "Nickname already in use. Try another one."
 msgstr "Ese alcume xa estÃ¡ en uso. Probe con outro."
 
-#: actions/apigroupcreate.php:183 actions/editgroup.php:193
+#: actions/apigroupcreate.php:184 actions/editgroup.php:193
 #: actions/newgroup.php:133 actions/profilesettings.php:218
 #: actions/register.php:217
 msgid "Not a valid nickname."
 msgstr "O formato do alcume non Ã© correcto."
 
-#: actions/apigroupcreate.php:199 actions/editapplication.php:215
+#: actions/apigroupcreate.php:200 actions/editapplication.php:215
 #: actions/editgroup.php:199 actions/newapplication.php:203
 #: actions/newgroup.php:139 actions/profilesettings.php:222
 #: actions/register.php:224
 msgid "Homepage is not a valid URL."
 msgstr "O URL da pÃ¡xina persoal non Ã© correcto."
 
-#: actions/apigroupcreate.php:208 actions/editgroup.php:202
+#: actions/apigroupcreate.php:209 actions/editgroup.php:202
 #: actions/newgroup.php:142 actions/profilesettings.php:225
 #: actions/register.php:227
 msgid "Full name is too long (max 255 chars)."
 msgstr "O nome completo Ã© longo de mÃ¡is (o mÃ¡ximo son 255 caracteres)."
 
-#: actions/apigroupcreate.php:216 actions/editapplication.php:190
+#: actions/apigroupcreate.php:217 actions/editapplication.php:190
 #: actions/newapplication.php:172
 #, php-format
 msgid "Description is too long (max %d chars)."
 msgstr "A descriciÃ³n Ã© longa de mÃ¡is (o mÃ¡ximo son %d caracteres)."
 
-#: actions/apigroupcreate.php:227 actions/editgroup.php:208
+#: actions/apigroupcreate.php:228 actions/editgroup.php:208
 #: actions/newgroup.php:148 actions/profilesettings.php:232
 #: actions/register.php:234
 msgid "Location is too long (max 255 chars)."
 msgstr "A localidade Ã© longa de mÃ¡is (o mÃ¡ximo son 255 caracteres)."
 
-#: actions/apigroupcreate.php:246 actions/editgroup.php:219
+#: actions/apigroupcreate.php:247 actions/editgroup.php:219
 #: actions/newgroup.php:159
 #, php-format
 msgid "Too many aliases! Maximum %d."
 msgstr "Demasiados pseudÃ³nimos! O nÃºmero mÃ¡ximo Ã© %d."
 
-#: actions/apigroupcreate.php:267
+#: actions/apigroupcreate.php:268
 #, php-format
 msgid "Invalid alias: \"%s\"."
 msgstr "PseudÃ³nimo incorrecto: \"%s\"."
 
-#: actions/apigroupcreate.php:276 actions/editgroup.php:232
+#: actions/apigroupcreate.php:277 actions/editgroup.php:232
 #: actions/newgroup.php:172
 #, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr "O pseudÃ³nimo \"%s\" xa se estÃ¡ a usar. Proba con outro."
 
-#: actions/apigroupcreate.php:289 actions/editgroup.php:238
+#: actions/apigroupcreate.php:290 actions/editgroup.php:238
 #: actions/newgroup.php:178
 msgid "Alias can't be the same as nickname."
 msgstr "O pseudÃ³nimo non pode coincidir co alcume."
 
-#: actions/apigroupismember.php:96 actions/apigroupjoin.php:105
-#: actions/apigroupleave.php:105 actions/apigroupmembership.php:92
+#: actions/apigroupismember.php:96 actions/apigroupjoin.php:106
+#: actions/apigroupleave.php:106 actions/apigroupmembership.php:92
 #: actions/apigroupshow.php:83 actions/apitimelinegroup.php:92
 msgid "Group not found."
 msgstr "Non se atopou o grupo."
 
 #. TRANS: Error text shown a user tries to join a group they already are a member of.
-#: actions/apigroupjoin.php:111 actions/joingroup.php:100 lib/command.php:336
+#: actions/apigroupjoin.php:112 actions/joingroup.php:100 lib/command.php:336
 msgid "You are already a member of that group."
 msgstr "Xa forma parte dese grupo."
 
 #. TRANS: Error text shown when a user tries to join a group they are blocked from joining.
-#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:341
+#: actions/apigroupjoin.php:121 actions/joingroup.php:105 lib/command.php:341
 msgid "You have been blocked from that group by the admin."
 msgstr "O administrador bloqueouno nese grupo."
 
 #. 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.
-#: actions/apigroupjoin.php:139 actions/joingroup.php:134 lib/command.php:353
+#: actions/apigroupjoin.php:140 actions/joingroup.php:134 lib/command.php:353
 #, 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."
 
-#: actions/apigroupleave.php:115
+#: actions/apigroupleave.php:116
 msgid "You are not a member of this group."
 msgstr "Vostede non pertence a este grupo."
 
 #. 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.
-#: actions/apigroupleave.php:125 actions/leavegroup.php:129
+#: actions/apigroupleave.php:126 actions/leavegroup.php:129
 #: lib/command.php:401
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
@@ -520,7 +524,7 @@ msgstr "grupos %s"
 msgid "groups on %s"
 msgstr "grupos en %s"
 
-#: actions/apimediaupload.php:99
+#: actions/apimediaupload.php:100
 msgid "Upload failed."
 msgstr "Houbo un erro durante a carga."
 
@@ -534,9 +538,9 @@ msgstr "Pase incorrecto."
 
 #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
 #: actions/deletenotice.php:169 actions/disfavor.php:74
-#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:55
+#: actions/emailsettings.php:271 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:66 actions/imsettings.php:227
+#: actions/groupunblock.php:66 actions/imsettings.php:230
 #: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
@@ -583,8 +587,8 @@ msgstr "Denegouse e revogouse a ficha da solicitude %s."
 #. 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:286 actions/grouplogo.php:322
-#: actions/imsettings.php:242 actions/newapplication.php:121
+#: actions/emailsettings.php:290 actions/grouplogo.php:322
+#: actions/imsettings.php:245 actions/newapplication.php:121
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
 #: actions/smssettings.php:277 lib/designsettings.php:304
 msgid "Unexpected form submission."
@@ -648,18 +652,18 @@ msgstr "Este mÃ©todo require un POST ou un DELETE."
 msgid "You may not delete another user's status."
 msgstr "Non pode borrar o estado doutro usuario."
 
-#: actions/apistatusesretweet.php:75 actions/apistatusesretweets.php:72
+#: actions/apistatusesretweet.php:76 actions/apistatusesretweets.php:72
 #: actions/deletenotice.php:52 actions/shownotice.php:92
 msgid "No such notice."
 msgstr "Non existe tal nota."
 
 #. TRANS: Error text shown when trying to repeat an own notice.
-#: actions/apistatusesretweet.php:83 lib/command.php:538
+#: actions/apistatusesretweet.php:84 lib/command.php:538
 msgid "Cannot repeat your own notice."
 msgstr "Non pode repetir a sÃºa propia nota."
 
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-#: actions/apistatusesretweet.php:91 lib/command.php:544
+#: actions/apistatusesretweet.php:92 lib/command.php:544
 msgid "Already repeated that notice."
 msgstr "Xa repetiu esa nota."
 
@@ -671,21 +675,21 @@ msgstr "Borrouse o estado."
 msgid "No status with that ID found."
 msgstr "Non se atopou ningÃºn estado con esa ID."
 
-#: actions/apistatusesupdate.php:221
+#: actions/apistatusesupdate.php:222
 msgid "Client must provide a 'status' parameter with a value."
 msgstr "O cliente debe proporcionar un parÃ¡metro de \"estado\" cun valor."
 
-#: actions/apistatusesupdate.php:242 actions/newnotice.php:157
+#: actions/apistatusesupdate.php:243 actions/newnotice.php:157
 #: lib/mailhandler.php:60
 #, php-format
 msgid "That's too long. Max notice size is %d chars."
 msgstr "Iso Ã© longo de mÃ¡is. A nota non pode exceder os %d caracteres."
 
-#: actions/apistatusesupdate.php:283 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:284 actions/apiusershow.php:96
 msgid "Not found."
 msgstr "Non se atopou."
 
-#: actions/apistatusesupdate.php:306 actions/newnotice.php:181
+#: actions/apistatusesupdate.php:307 actions/newnotice.php:181
 #, php-format
 msgid "Max notice size is %d chars, including attachment URL."
 msgstr ""
@@ -889,7 +893,9 @@ msgid "Yes"
 msgstr "Si"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
+#. TRANS: Submit button title.
+#. TRANS: Description of the form to block a user.
+#: actions/block.php:164 actions/groupmembers.php:403 lib/blockform.php:82
 msgid "Block this user"
 msgstr "Bloquear este usuario"
 
@@ -931,11 +937,13 @@ msgstr "Unha lista de usuarios bloqueados fronte Ã¡ uniÃ³n a este grupo."
 msgid "Unblock user from group"
 msgstr "Desbloquear o usuario do grupo"
 
-#: actions/blockedfromgroup.php:320 lib/unblockform.php:69
+#. TRANS: Title for the form to unblock a user.
+#: actions/blockedfromgroup.php:320 lib/unblockform.php:70
 msgid "Unblock"
 msgstr "Desbloquear"
 
-#: actions/blockedfromgroup.php:320 lib/unblockform.php:80
+#. TRANS: Description of the form to unblock a user.
+#: actions/blockedfromgroup.php:320 lib/unblockform.php:82
 msgid "Unblock this user"
 msgstr "Desbloquear este usuario"
 
@@ -974,9 +982,9 @@ msgstr "Ese enderezo xa se confirmou."
 #. 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/confirmaddress.php:116 actions/emailsettings.php:331
+#: actions/emailsettings.php:477 actions/imsettings.php:283
+#: actions/imsettings.php:442 actions/othersettings.php:174
 #: actions/profilesettings.php:283 actions/smssettings.php:308
 #: actions/smssettings.php:464
 msgid "Couldn't update user."
@@ -984,7 +992,7 @@ msgstr "Non se puido actualizar o usuario."
 
 #. 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/confirmaddress.php:128 actions/emailsettings.php:437
 #: actions/smssettings.php:422
 msgid "Couldn't delete email confirmation."
 msgstr "Non se puido borrar a confirmaciÃ³n por correo electrÃ³nico."
@@ -1020,9 +1028,10 @@ msgstr "Non se atopou a aplicaciÃ³n."
 msgid "You are not the owner of this application."
 msgstr "Non Ã© o dono desa aplicaciÃ³n."
 
+#. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:127
 #: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1307
+#: lib/action.php:1315
 msgid "There was a problem with your session token."
 msgstr "Houbo un problema co seu pase."
 
@@ -1056,7 +1065,7 @@ msgstr "Borrar a aplicaciÃ³n"
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
 #: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:73 lib/profileformaction.php:64
+#: lib/adminpanelaction.php:71 lib/profileformaction.php:64
 #: lib/settingsaction.php:72
 msgid "Not logged in."
 msgstr "Non iniciou sesiÃ³n."
@@ -1119,7 +1128,6 @@ msgstr "Borrar o usuario"
 #. TRANS: Message used as title for design settings for the site.
 #. TRANS: Link description in user account settings menu.
 #: actions/designadminpanel.php:63 lib/accountsettingsaction.php:139
-#: lib/groupnav.php:119
 msgid "Design"
 msgstr "DeseÃ±o"
 
@@ -1241,13 +1249,13 @@ msgstr "Restaurar o deseÃ±o por defecto"
 msgid "Reset back to default"
 msgstr "Volver ao deseÃ±o por defecto"
 
-#. TRANS: Submit button title
+#. TRANS: Submit button title.
 #: actions/designadminpanel.php:685 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/snapshotadminpanel.php:245
 #: actions/subscriptions.php:226 actions/tagother.php:154
-#: actions/useradminpanel.php:294 lib/applicationeditform.php:363
+#: actions/useradminpanel.php:294 lib/applicationeditform.php:353
 #: lib/designsettings.php:256 lib/groupeditform.php:202
 msgid "Save"
 msgstr "Gardar"
@@ -1403,7 +1411,7 @@ msgstr "Enderezo de correo electrÃ³nico confirmado actualmente."
 #. 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/emailsettings.php:115 actions/emailsettings.php:162
 #: actions/imsettings.php:116 actions/smssettings.php:124
 #: actions/smssettings.php:180
 msgctxt "BUTTON"
@@ -1421,22 +1429,26 @@ msgstr ""
 #. 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
+#. TRANS: Button label in the "Edit application" form.
 #: actions/emailsettings.php:127 actions/imsettings.php:131
-#: actions/smssettings.php:137 lib/applicationeditform.php:357
+#: actions/smssettings.php:137 lib/applicationeditform.php:347
 msgctxt "BUTTON"
 msgid "Cancel"
 msgstr "Cancelar"
 
-#. TRANS: Instructions for e-mail address input form.
-#: actions/emailsettings.php:135
+#. TRANS: Instructions for e-mail address input form. Do not translate
+#. TRANS: "example.org". It is one of the domain names reserved for
+#. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
+#. TRANS: Any other domain may be owned by a legitimate person or
+#. TRANS: organization.
+#: actions/emailsettings.php:139
 msgid "Email address, like \"UserName@example.org\""
 msgstr "Enderezo de correo electrÃ³nico, coma \"nomedeusuario@example.org\""
 
 #. 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/emailsettings.php:143 actions/imsettings.php:151
 #: actions/smssettings.php:162
 msgctxt "BUTTON"
 msgid "Add"
@@ -1444,20 +1456,20 @@ msgstr "Engadir"
 
 #. 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
+#: actions/emailsettings.php:151 actions/smssettings.php:171
 msgid "Incoming email"
 msgstr "Correo entrante"
 
 #. 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
+#: actions/emailsettings.php:159 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."
 
 #. 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
+#: actions/emailsettings.php:168 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 "
@@ -1465,96 +1477,96 @@ msgstr ""
 
 #. 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
+#: actions/emailsettings.php:172 actions/smssettings.php:189
 msgctxt "BUTTON"
 msgid "New"
 msgstr "Novo"
 
 #. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:174
+#: actions/emailsettings.php:178
 msgid "Email preferences"
 msgstr "Preferencias de correo electrÃ³nico"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:180
+#: actions/emailsettings.php:184
 msgid "Send me notices of new subscriptions through email."
 msgstr "Enviarme notas acerca de novas subscriciÃ³ns por correo electrÃ³nico."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:186
+#: actions/emailsettings.php:190
 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."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:193
+#: actions/emailsettings.php:197
 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."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:199
+#: actions/emailsettings.php:203
 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."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:205
+#: actions/emailsettings.php:209
 msgid "Allow friends to nudge me and send me an email."
 msgstr ""
 "Permitirlles aos meus amigos facerme acenos e enviarme correos electrÃ³nicos."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:212
+#: actions/emailsettings.php:216
 msgid "I want to post notices by email."
 msgstr "Quero publicar notas por correo electrÃ³nico."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:219
+#: actions/emailsettings.php:223
 msgid "Publish a MicroID for my email address."
 msgstr "Publicar unha MicroID para o meu enderezo de correo electrÃ³nico."
 
 #. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:334
+#: actions/emailsettings.php:338
 msgid "Email preferences saved."
 msgstr "GardÃ¡ronse as preferencias de correo electrÃ³nico."
 
 #. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:353
+#: actions/emailsettings.php:357
 msgid "No email address."
 msgstr "Non hai enderezo de correo electrÃ³nico."
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:361
+#: actions/emailsettings.php:365
 msgid "Cannot normalize that email address"
 msgstr "Non se pode normalizar ese enderezo de correo electrÃ³nico"
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:208
+#: actions/emailsettings.php:370 actions/register.php:208
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "O enderezo de correo electrÃ³nico Ã© incorrecto."
 
 #. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:370
+#: actions/emailsettings.php:374
 msgid "That is already your email address."
 msgstr "Ese enderezo de correo electrÃ³nico Ã© o que ten agora."
 
 #. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:374
+#: actions/emailsettings.php:378
 msgid "That email address already belongs to another user."
 msgstr "Ese enderezo de correo electrÃ³nico xa pertence a outro usuario."
 
 #. 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/emailsettings.php:395 actions/imsettings.php:351
 #: actions/smssettings.php:373
 msgid "Couldn't insert confirmation code."
 msgstr "Non se puido inserir o cÃ³digo de confirmaciÃ³n."
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:398
+#: actions/emailsettings.php:402
 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."
@@ -1566,50 +1578,50 @@ msgstr ""
 #. 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/emailsettings.php:423 actions/imsettings.php:386
 #: actions/smssettings.php:408
 msgid "No pending confirmation to cancel."
 msgstr "Non hai ningunha confirmaciÃ³n pendente que cancelar."
 
 #. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:424
+#: actions/emailsettings.php:428
 msgid "That is the wrong email address."
 msgstr "Ese enderezo de correo electrÃ³nico Ã© incorrecto."
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:438
+#: actions/emailsettings.php:442
 msgid "Email confirmation cancelled."
 msgstr "Cancelouse a confirmaciÃ³n por correo electrÃ³nico."
 
 #. TRANS: Message given trying to remove an e-mail address that is not
 #. TRANS: registered for the active user.
-#: actions/emailsettings.php:458
+#: actions/emailsettings.php:462
 msgid "That is not your email address."
 msgstr "Ese non Ã© o seu enderezo de correo electrÃ³nico."
 
 #. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:479
+#: actions/emailsettings.php:483
 msgid "The email address was removed."
 msgstr "Borrouse o enderezo de correo electrÃ³nico."
 
-#: actions/emailsettings.php:493 actions/smssettings.php:568
+#: actions/emailsettings.php:497 actions/smssettings.php:568
 msgid "No incoming email address."
 msgstr "Non hai ningÃºn enderezo ao que enviar."
 
 #. 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/emailsettings.php:508 actions/emailsettings.php:532
 #: actions/smssettings.php:578 actions/smssettings.php:602
 msgid "Couldn't update user record."
 msgstr "Non se puido actualizar o rexistro do usuario."
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
-#: actions/emailsettings.php:508 actions/smssettings.php:581
+#: actions/emailsettings.php:512 actions/smssettings.php:581
 msgid "Incoming email address removed."
 msgstr "Borrouse o enderezo de correo electrÃ³nico entrante."
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
-#: actions/emailsettings.php:532 actions/smssettings.php:605
+#: actions/emailsettings.php:536 actions/smssettings.php:605
 msgid "New incoming email address added."
 msgstr "Engadiuse un novo enderezo de correo electrÃ³nico entrante."
 
@@ -1726,7 +1738,7 @@ msgstr "Non se puido converter a ficha da solicitude nun pase."
 msgid "Remote service uses unknown version of OMB protocol."
 msgstr "O servizo remoto utiliza unha versiÃ³n descoÃ±ecida do protocolo OMB."
 
-#: actions/finishremotesubscribe.php:138
+#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306
 msgid "Error updating remote profile."
 msgstr "Houbo un erro ao actualizar o perfil remoto."
 
@@ -1783,7 +1795,7 @@ msgstr "O usuario xa estÃ¡ excluÃdo do grupo."
 msgid "User is not a member of group."
 msgstr "O usuario non pertence ao grupo."
 
-#: actions/groupblock.php:134 actions/groupmembers.php:360
+#: actions/groupblock.php:134 actions/groupmembers.php:364
 msgid "Block user from group"
 msgstr "ExcluÃr do grupo ao usuario"
 
@@ -1865,40 +1877,32 @@ msgstr "Actualizouse o logo."
 msgid "Failed updating logo."
 msgstr "Non se puido actualizar o logo."
 
-#: actions/groupmembers.php:100 lib/groupnav.php:92
+#. TRANS: Title of the page showing group members.
+#. TRANS: %s is the name of the group.
+#: actions/groupmembers.php:102
 #, php-format
 msgid "%s group members"
 msgstr "Membros do grupo %s"
 
-#: actions/groupmembers.php:103
+#. TRANS: Title of the page showing group members.
+#. TRANS: %1$s is the name of the group, %2$d is the page number of the members list.
+#: actions/groupmembers.php:107
 #, php-format
 msgid "%1$s group members, page %2$d"
 msgstr "Membros do grupo %1$s, pÃ¡xina %2$d"
 
-#: actions/groupmembers.php:118
+#: actions/groupmembers.php:122
 msgid "A list of the users in this group."
 msgstr "Unha lista dos usuarios pertencentes a este grupo."
 
-#: actions/groupmembers.php:182 lib/groupnav.php:107
+#: actions/groupmembers.php:186
 msgid "Admin"
 msgstr "Administrador"
 
-#: actions/groupmembers.php:392 lib/blockform.php:69
-msgid "Block"
-msgstr "ExcluÃr"
-
-#: actions/groupmembers.php:487
+#: actions/groupmembers.php:498
 msgid "Make user an admin of the group"
 msgstr "Converter ao usuario en administrador do grupo"
 
-#: actions/groupmembers.php:519
-msgid "Make Admin"
-msgstr "Converter en administrador"
-
-#: actions/groupmembers.php:519
-msgid "Make this user an admin"
-msgstr "Converter a este usuario en administrador"
-
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Title in atom group notice feed. %s is a group name.
 #. TRANS: Title in atom user notice feed. %s is a user name.
@@ -2036,7 +2040,10 @@ msgstr ""
 
 #. TRANS: IM address input field instructions in IM settings form.
 #. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:140
+#. TRANS: Do not translate "example.org". It is one of the domain names reserved for use in examples by
+#. TRANS: http://www.rfc-editor.org/rfc/rfc2606.txt. Any other domain may be owned by a legitimate
+#. TRANS: person or organization.
+#: actions/imsettings.php:143
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -2047,65 +2054,65 @@ msgstr ""
 "instantÃ¡nea ou en GTalk."
 
 #. TRANS: Form legend for IM preferences form.
-#: actions/imsettings.php:155
+#: actions/imsettings.php:158
 msgid "IM preferences"
 msgstr "Preferencias de mensaxerÃa instantÃ¡nea"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:160
+#: actions/imsettings.php:163
 msgid "Send me notices through Jabber/GTalk."
 msgstr "EnviÃ¡deme as notas mediante Jabber ou GTalk."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:166
+#: actions/imsettings.php:169
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr "Publicar unha nota cando cambie o meu estado en Jabber ou GTalk."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:172
+#: actions/imsettings.php:175
 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."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:179
+#: actions/imsettings.php:182
 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "Publicar unha MicroID para o meu enderezo de Jabber ou GTalk."
 
 #. TRANS: Confirmation message for successful IM preferences save.
-#: actions/imsettings.php:287 actions/othersettings.php:180
+#: actions/imsettings.php:290 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
+#: actions/imsettings.php:312
 msgid "No Jabber ID."
 msgstr "Non existe ningunha ID de Jabber."
 
 #. TRANS: Message given saving IM address that cannot be normalised.
-#: actions/imsettings.php:317
+#: actions/imsettings.php:320
 msgid "Cannot normalize that Jabber ID"
 msgstr "Non se pode normalizar esa ID de Jabber"
 
 #. TRANS: Message given saving IM address that not valid.
-#: actions/imsettings.php:322
+#: actions/imsettings.php:325
 msgid "Not a valid Jabber ID"
 msgstr "A ID de Jabber non Ã© correcta"
 
 #. TRANS: Message given saving IM address that is already set.
-#: actions/imsettings.php:326
+#: actions/imsettings.php:329
 msgid "That is already your Jabber ID."
 msgstr "Esa xa Ã© a sÃºa ID de Jabber."
 
 #. TRANS: Message given saving IM address that is already set for another user.
-#: actions/imsettings.php:330
+#: actions/imsettings.php:333
 msgid "Jabber ID already belongs to another user."
 msgstr "Esa ID de Jabber xa corresponde a un usuario."
 
 #. 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
+#: actions/imsettings.php:361
 #, php-format
 msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
@@ -2115,28 +2122,28 @@ msgstr ""
 "engadiu. Ten que aprobar que %s lle envÃe mensaxes."
 
 #. TRANS: Message given canceling IM address confirmation for the wrong IM address.
-#: actions/imsettings.php:388
+#: actions/imsettings.php:391
 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
+#: actions/imsettings.php:400
 msgid "Couldn't delete IM confirmation."
 msgstr "Non se puido borrar a confirmaciÃ³n por mensaxerÃa instantÃ¡nea."
 
 #. TRANS: Message given after successfully canceling IM address confirmation.
-#: actions/imsettings.php:402
+#: actions/imsettings.php:405
 msgid "IM confirmation cancelled."
 msgstr "Cancelouse a confirmaciÃ³n por mensaxerÃa instantÃ¡nea."
 
 #. TRANS: Message given trying to remove an IM address that is not
 #. TRANS: registered for the active user.
-#: actions/imsettings.php:424
+#: actions/imsettings.php:427
 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
+#: actions/imsettings.php:450
 msgid "The IM address was removed."
 msgstr "Borrouse o enderezo de mensaxerÃa instantÃ¡nea."
 
@@ -2609,8 +2616,8 @@ msgid "Only %s URLs over plain HTTP please."
 msgstr "SÃ³ %s enderezos URL sobre HTTP simple."
 
 #. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1215
-#: lib/apiaction.php:1243 lib/apiaction.php:1366
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1206
+#: lib/apiaction.php:1233 lib/apiaction.php:1356
 msgid "Not a supported data format."
 msgstr "Non se soporta ese formato de datos."
 
@@ -2753,7 +2760,7 @@ msgid "Password saved."
 msgstr "Gardouse o contrasinal."
 
 #. TRANS: Menu item for site administration
-#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:384
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:371
 msgid "Paths"
 msgstr "Rutas"
 
@@ -2967,7 +2974,7 @@ msgstr "Nome completo"
 
 #. TRANS: Form input field label.
 #: actions/profilesettings.php:115 actions/register.php:460
-#: lib/applicationeditform.php:244 lib/groupeditform.php:161
+#: lib/applicationeditform.php:235 lib/groupeditform.php:161
 msgid "Homepage"
 msgstr "PÃ¡xina persoal"
 
@@ -3074,7 +3081,7 @@ msgid "Couldn't save tags."
 msgstr "Non se puideron gardar as etiquetas."
 
 #. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:391 lib/adminpanelaction.php:141
+#: actions/profilesettings.php:391 lib/adminpanelaction.php:138
 msgid "Settings saved."
 msgstr "Gardouse a configuraciÃ³n."
 
@@ -3623,7 +3630,7 @@ msgstr "O usuario xa estÃ¡ illado."
 
 #. TRANS: Menu item for site administration
 #: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
-#: lib/adminpanelaction.php:392
+#: lib/adminpanelaction.php:379
 msgid "Sessions"
 msgstr "SesiÃ³ns"
 
@@ -3661,24 +3668,24 @@ msgid "Application profile"
 msgstr "Perfil da aplicaciÃ³n"
 
 #. TRANS: Form input field label for application icon.
-#: actions/showapplication.php:159 lib/applicationeditform.php:182
+#: actions/showapplication.php:159 lib/applicationeditform.php:173
 msgid "Icon"
 msgstr "Icona"
 
 #. TRANS: Form input field label for application name.
 #: actions/showapplication.php:169 actions/version.php:197
-#: lib/applicationeditform.php:199
+#: lib/applicationeditform.php:190
 msgid "Name"
 msgstr "Nome"
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:178 lib/applicationeditform.php:235
+#: actions/showapplication.php:178 lib/applicationeditform.php:226
 msgid "Organization"
 msgstr "OrganizaciÃ³n"
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:216 lib/groupeditform.php:172
+#: lib/applicationeditform.php:207 lib/groupeditform.php:172
 msgid "Description"
 msgstr "DescriciÃ³n"
 
@@ -3794,7 +3801,7 @@ msgstr ""
 msgid "This is a way to share what you like."
 msgstr "Isto Ã© un modo de compartir o que lle gusta."
 
-#: actions/showgroup.php:82 lib/groupnav.php:86
+#: actions/showgroup.php:82
 #, php-format
 msgid "%s group"
 msgstr "Grupo %s"
@@ -3846,7 +3853,7 @@ msgstr "Fonte de novas das notas do grupo %s (Atom)"
 msgid "FOAF for %s group"
 msgstr "Amigo dun amigo para o grupo %s"
 
-#: actions/showgroup.php:393 actions/showgroup.php:445 lib/groupnav.php:91
+#: actions/showgroup.php:393 actions/showgroup.php:445
 msgid "Members"
 msgstr "Membros"
 
@@ -4304,7 +4311,7 @@ msgstr "Non se introduciu ningÃºn cÃ³digo"
 
 #. TRANS: Menu item for site administration
 #: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
-#: lib/adminpanelaction.php:408
+#: lib/adminpanelaction.php:395
 msgid "Snapshots"
 msgstr "InstantÃ¡neas"
 
@@ -5038,7 +5045,7 @@ msgid "Unable to save tag."
 msgstr "Non se puido gardar a nota do sitio."
 
 #. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#: classes/Subscription.php:75 lib/oauthstore.php:465
+#: classes/Subscription.php:75 lib/oauthstore.php:466
 msgid "You have been banned from subscribing."
 msgstr "ProhibÃuselle realizar subscriciÃ³ns de momento."
 
@@ -5186,7 +5193,8 @@ msgid "Change site configuration"
 msgstr "Cambiar a configuraciÃ³n do sitio"
 
 #. TRANS: Main menu option when logged in and site admin for access to site configuration
-#: lib/action.php:474
+#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
+#: lib/action.php:474 lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr "Administrador"
@@ -5263,7 +5271,7 @@ msgstr "Buscar"
 
 #. TRANS: DT element for site notice. String is hidden in default CSS.
 #. TRANS: Menu item for site administration
-#: lib/action.php:538 lib/adminpanelaction.php:400
+#: lib/action.php:538 lib/adminpanelaction.php:387
 msgid "Site notice"
 msgstr "Nota do sitio"
 
@@ -5327,7 +5335,10 @@ msgid "StatusNet software license"
 msgstr "Licenza do software StatusNet"
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
-#: lib/action.php:843
+#. TRANS: Text between [] is a link description, text between () is the link itself.
+#. TRANS: Make sure there is no whitespace between "]" and "(".
+#. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
+#: lib/action.php:846
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -5337,13 +5348,16 @@ msgstr ""
 "site.broughtby%%](%%site.broughtbyurl%%)."
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:846
+#: lib/action.php:849
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** Ã© un servizo de mensaxes de blogue curtas."
 
 #. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.
-#: lib/action.php:850
+#. TRANS: Make sure there is no whitespace between "]" and "(".
+#. TRANS: Text between [] is a link description, text between () is the link itself.
+#. TRANS: %s is the version of StatusNet that is being used.
+#: lib/action.php:856
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -5355,20 +5369,20 @@ msgstr ""
 "GNU](http://www.fsf.org/licensing/licenses/agpl-3.0.html) (en inglÃ©s)."
 
 #. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:866
+#: lib/action.php:872
 msgid "Site content license"
 msgstr "Licenza dos contidos do sitio"
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:873
+#: lib/action.php:879
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr "O contido e os datos de %1$s son privados e confidenciais."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:880
+#: lib/action.php:886
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
@@ -5376,33 +5390,34 @@ msgstr ""
 "todos os dereitos."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:884
+#: lib/action.php:890
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 "Os contidos e datos son propiedade intelectual dos colaboradores. Quedan "
 "reservados todos os dereitos."
 
-#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:897
+#. TRANS: license message in footer.
+#. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
+#: lib/action.php:904
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr ""
 "Todos os contidos e datos de %1$s estÃ¡n dispoÃ±ibles baixo a licenza %2$s."
 
 #. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1236
+#: lib/action.php:1243
 msgid "Pagination"
 msgstr "PaxinaciÃ³n"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1247
+#: lib/action.php:1254
 msgid "After"
 msgstr "Posteriores"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1257
+#: lib/action.php:1264
 msgid "Before"
 msgstr "Anteriores"
 
@@ -5412,208 +5427,227 @@ msgid "Expecting a root feed element but got a whole XML document."
 msgstr ""
 "EsperÃ¡base unha fonte de novas raÃz pero recibiuse un documento XML completo."
 
-#: lib/activityutils.php:208
+#. TRANS: Client exception thrown when there is no source attribute.
+#: lib/activityutils.php:203
 msgid "Can't handle remote content yet."
 msgstr "AÃnda non Ã© posible manexar contidos remotos."
 
-#: lib/activityutils.php:244
+#. TRANS: Client exception thrown when there embedded XML content is found that cannot be processed yet.
+#: lib/activityutils.php:240
 msgid "Can't handle embedded XML content yet."
 msgstr "AÃnda non se poden manexar contidos XML integrados."
 
-#: lib/activityutils.php:248
+#. TRANS: Client exception thrown when base64 encoded content is found that cannot be processed yet.
+#: lib/activityutils.php:245
 msgid "Can't handle embedded Base64 content yet."
 msgstr "AÃnda non se poden manexar contidos Base64."
 
 #. TRANS: Client error message thrown when a user tries to change admin settings but has no access rights.
-#: lib/adminpanelaction.php:98
+#: lib/adminpanelaction.php:96
 msgid "You cannot make changes to this site."
 msgstr "Non pode realizar cambios neste sitio."
 
 #. TRANS: Client error message throw when a certain panel's settings cannot be changed.
-#: lib/adminpanelaction.php:110
+#: lib/adminpanelaction.php:108
 msgid "Changes to that panel are not allowed."
 msgstr "Non se permite realizar cambios nese panel."
 
 #. TRANS: Client error message.
-#: lib/adminpanelaction.php:229
+#: lib/adminpanelaction.php:222
 msgid "showForm() not implemented."
 msgstr "showForm() non estÃ¡ integrado."
 
 #. TRANS: Client error message
-#: lib/adminpanelaction.php:259
+#: lib/adminpanelaction.php:250
 msgid "saveSettings() not implemented."
 msgstr "saveSettings() non estÃ¡ integrado."
 
 #. TRANS: Client error message thrown if design settings could not be deleted in
 #. TRANS: the admin panel Design.
-#: lib/adminpanelaction.php:284
+#: lib/adminpanelaction.php:274
 msgid "Unable to delete design setting."
 msgstr "Non se puido borrar a configuraciÃ³n do deseÃ±o."
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:350
+#: lib/adminpanelaction.php:337
 msgid "Basic site configuration"
 msgstr "ConfiguraciÃ³n bÃ¡sica do sitio"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:352
+#: lib/adminpanelaction.php:339
 msgctxt "MENU"
 msgid "Site"
 msgstr "Sitio"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:358
+#: lib/adminpanelaction.php:345
 msgid "Design configuration"
 msgstr "ConfiguraciÃ³n do deseÃ±o"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:360
+#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
+#: lib/adminpanelaction.php:347 lib/groupnav.php:135
 msgctxt "MENU"
 msgid "Design"
 msgstr "DeseÃ±o"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:366
+#: lib/adminpanelaction.php:353
 msgid "User configuration"
 msgstr "ConfiguraciÃ³n do usuario"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:368 lib/personalgroupnav.php:115
+#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:115
 msgid "User"
 msgstr "Usuario"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:374
+#: lib/adminpanelaction.php:361
 msgid "Access configuration"
 msgstr "ConfiguraciÃ³n de acceso"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:382
+#: lib/adminpanelaction.php:369
 msgid "Paths configuration"
 msgstr "ConfiguraciÃ³n das rutas"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:390
+#: lib/adminpanelaction.php:377
 msgid "Sessions configuration"
 msgstr "ConfiguraciÃ³n das sesiÃ³ns"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:398
+#: lib/adminpanelaction.php:385
 msgid "Edit site notice"
 msgstr "Modificar a nota do sitio"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:406
+#: lib/adminpanelaction.php:393
 msgid "Snapshots configuration"
 msgstr "ConfiguraciÃ³n das instantÃ¡neas"
 
 #. TRANS: Client error 401.
-#: lib/apiauth.php:113
+#: lib/apiauth.php:111
 msgid "API resource requires read-write access, but you only have read access."
 msgstr ""
 "O recurso API precisa permisos de lectura e escritura, pero sÃ³ dispÃ³n de "
 "permisos de lectura."
 
+#. TRANS: OAuth exception thrown when no application is found for a given consumer key.
+#: lib/apiauth.php:175
+msgid "No application for that consumer key."
+msgstr ""
+
+#. TRANS: OAuth exception given when no user was found for a given token (no token was found).
+#: lib/apiauth.php:217
+msgid "No user for that token."
+msgstr ""
+
+#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
+#: lib/apioauthstore.php:178
+msgid "Tried to revoke unknown token"
+msgstr ""
+
 #. TRANS: Form legend.
-#: lib/applicationeditform.php:137
+#: lib/applicationeditform.php:129
 msgid "Edit application"
 msgstr "Modificar a aplicaciÃ³n"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:187
+#: lib/applicationeditform.php:178
 msgid "Icon for this application"
 msgstr "Icona para esta aplicaciÃ³n"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:209
+#: lib/applicationeditform.php:200
 #, php-format
 msgid "Describe your application in %d characters"
 msgstr "Describa a sÃºa aplicaciÃ³n en %d caracteres"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:213
+#: lib/applicationeditform.php:204
 msgid "Describe your application"
 msgstr "Describa a sÃºa aplicaciÃ³n"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:224
+#: lib/applicationeditform.php:215
 msgid "URL of the homepage of this application"
 msgstr "URL do sitio web desta aplicaciÃ³n"
 
 #. TRANS: Form input field label.
-#: lib/applicationeditform.php:226
+#: lib/applicationeditform.php:217
 msgid "Source URL"
 msgstr "URL de orixe"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:233
+#: lib/applicationeditform.php:224
 msgid "Organization responsible for this application"
 msgstr "OrganizaciÃ³n responsable desta aplicaciÃ³n"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:242
+#: lib/applicationeditform.php:233
 msgid "URL for the homepage of the organization"
 msgstr "URL do sitio web da organizaciÃ³n"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:251
+#: lib/applicationeditform.php:242
 msgid "URL to redirect to after authentication"
 msgstr "URL ao que ir tras a autenticaciÃ³n"
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:278
+#: lib/applicationeditform.php:269
 msgid "Browser"
 msgstr "Navegador"
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:295
+#: lib/applicationeditform.php:286
 msgid "Desktop"
 msgstr "Escritorio"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:297
+#: lib/applicationeditform.php:288
 msgid "Type of application, browser or desktop"
 msgstr "Tipo de aplicaciÃ³n, de navegador ou de escritorio"
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:320
+#: lib/applicationeditform.php:311
 msgid "Read-only"
 msgstr "Lectura"
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:339
+#: lib/applicationeditform.php:330
 msgid "Read-write"
 msgstr "Lectura e escritura"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:341
+#: lib/applicationeditform.php:332
 msgid "Default access for this application: read-only, or read-write"
 msgstr ""
 "Permisos por defecto para esta aplicaciÃ³n: lectura ou lectura e escritura"
 
-#. TRANS: Submit button title
-#: lib/applicationeditform.php:359
+#. TRANS: Submit button title.
+#: lib/applicationeditform.php:349
 msgid "Cancel"
 msgstr "Cancelar"
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:136
+#: lib/applicationlist.php:135
 msgid "read-write"
 msgstr "lectura e escritura"
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:138
+#: lib/applicationlist.php:137
 msgid "read-only"
 msgstr "lectura"
 
 #. 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
+#: lib/applicationlist.php:143
 #, php-format
 msgid "Approved %1$s - \"%2$s\" access."
 msgstr "Aprobado o %1$s - permisos de \"%2$s\"."
 
 #. TRANS: Button label
-#: lib/applicationlist.php:159
+#: lib/applicationlist.php:158
 msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "Revogar"
@@ -5633,11 +5667,13 @@ msgstr "Autor"
 msgid "Provider"
 msgstr "Provedor"
 
-#: lib/attachmentnoticesection.php:67
+#. TRANS: Title.
+#: lib/attachmentnoticesection.php:68
 msgid "Notices where this attachment appears"
 msgstr "Notas nas que se anexou este ficheiro"
 
-#: lib/attachmenttagcloudsection.php:48
+#. TRANS: Title.
+#: lib/attachmenttagcloudsection.php:49
 msgid "Tags for this attachment"
 msgstr "Etiquetas para este ficheiro"
 
@@ -5649,6 +5685,11 @@ msgstr "Non se puido cambiar o contrasinal"
 msgid "Password changing is not allowed"
 msgstr "Non se permite cambiar o contrasinal"
 
+#. TRANS: Title for the form to block a user.
+#: lib/blockform.php:70
+msgid "Block"
+msgstr "ExcluÃr"
+
 #: lib/channel.php:157 lib/channel.php:177
 msgid "Command results"
 msgstr "Resultados da orde"
@@ -5900,7 +5941,7 @@ msgid "You are not subscribed to anyone."
 msgstr "Non estÃ¡ subscrito a ninguÃ©n."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to.
-#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.
 #: lib/command.php:836
 msgid "You are subscribed to this person:"
@@ -5915,7 +5956,7 @@ msgid "No one is subscribed to you."
 msgstr "Non hai ninguÃ©n subscrito a vostede."
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
-#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
 #: lib/command.php:863
 msgid "This person is subscribed to you:"
@@ -5930,7 +5971,7 @@ msgid "You are not a member of any groups."
 msgstr "Non forma parte de ningÃºn grupo."
 
 #. TRANS: Text shown after requesting groups a user is subscribed to.
-#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
 #: lib/command.php:890
 msgid "You are a member of this group:"
@@ -5938,6 +5979,7 @@ msgid_plural "You are a member of these groups:"
 msgstr[0] "Vostede pertence a este grupo:"
 msgstr[1] "Vostede pertence a estes grupos:"
 
+#. TRANS: Help text for commands.
 #: lib/command.php:905
 msgid ""
 "Commands:\n"
@@ -6161,38 +6203,6 @@ msgstr ""
 "Alcumes adicionais para o grupo, separados por comas ou espazos, %d como "
 "mÃ¡ximo"
 
-#: lib/groupnav.php:85
-msgid "Group"
-msgstr "Grupo"
-
-#: lib/groupnav.php:101
-msgid "Blocked"
-msgstr "Bloqueado"
-
-#: lib/groupnav.php:102
-#, php-format
-msgid "%s blocked users"
-msgstr "%s usuarios bloqueados"
-
-#: lib/groupnav.php:108
-#, php-format
-msgid "Edit %s group properties"
-msgstr "Modificar as propiedades do grupo %s"
-
-#: lib/groupnav.php:113
-msgid "Logo"
-msgstr "Logotipo"
-
-#: lib/groupnav.php:114
-#, php-format
-msgid "Add or edit %s logo"
-msgstr "Engadir ou modificar o logotipo de %s"
-
-#: lib/groupnav.php:120
-#, php-format
-msgid "Add or edit %s design"
-msgstr "Engadir ou modificar o deseÃ±o de %s"
-
 #: lib/groupsbymemberssection.php:71
 msgid "Groups with most members"
 msgstr "Grupos con mÃ¡is membros"
@@ -6224,7 +6234,8 @@ msgstr "Ese ficheiro Ã© grande de mÃ¡is. O tamaÃ±o mÃ¡ximo por ficheiro son %s."
 msgid "Partial upload."
 msgstr "Carga parcial."
 
-#: lib/imagefile.php:101 lib/mediafile.php:170
+#. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
+#: lib/imagefile.php:101 lib/mediafile.php:179
 msgid "System error uploading file."
 msgstr "Houbo un erro no sistema ao cargar o ficheiro."
 
@@ -6627,16 +6638,19 @@ msgstr "Non se permite recibir correo electrÃ³nico."
 msgid "Unsupported message type: %s"
 msgstr "Non se soporta o tipo de mensaxe: %s"
 
-#: lib/mediafile.php:98 lib/mediafile.php:123
+#. TRANS: Client exception thrown when a database error was thrown during a file upload operation.
+#: lib/mediafile.php:99 lib/mediafile.php:125
 msgid "There was a database error while saving your file. Please try again."
 msgstr ""
 "Houbo un erro na base de datos ao gardar o seu ficheiro. Volva intentalo."
 
-#: lib/mediafile.php:142
+#. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
+#: lib/mediafile.php:145
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
 msgstr "O ficheiro subido supera a directiva upload_max_filesize no php.ini."
 
-#: lib/mediafile.php:147
+#. TRANS: Client exception.
+#: lib/mediafile.php:151
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form."
@@ -6644,44 +6658,43 @@ msgstr ""
 "O ficheiro subido supera a directiva MAX_FILE_SIZE especificada no "
 "formulario HTML."
 
-#: lib/mediafile.php:152
+#. TRANS: Client exception.
+#: lib/mediafile.php:157
 msgid "The uploaded file was only partially uploaded."
 msgstr "O ficheiro sÃ³ se subiu parcialmente."
 
-#: lib/mediafile.php:159
+#. TRANS: Client exception thrown when a temporary folder is not present to store a file upload.
+#: lib/mediafile.php:165
 msgid "Missing a temporary folder."
 msgstr "Falta un cartafol temporal."
 
-#: lib/mediafile.php:162
+#. TRANS: Client exception thrown when writing to disk is not possible during a file upload operation.
+#: lib/mediafile.php:169
 msgid "Failed to write file to disk."
 msgstr "Non se puido escribir o ficheiro no disco."
 
-#: lib/mediafile.php:165
+#. TRANS: Client exception thrown when a file upload operation has been stopped by an extension.
+#: lib/mediafile.php:173
 msgid "File upload stopped by extension."
 msgstr "Interrompeuse a carga do ficheiro por mor da extensiÃ³n."
 
-#: lib/mediafile.php:179 lib/mediafile.php:217
+#. TRANS: Client exception thrown when a file upload operation would cause a user to exceed a set quota.
+#: lib/mediafile.php:189 lib/mediafile.php:232
 msgid "File exceeds user's quota."
 msgstr "O ficheiro supera a cota do usuario."
 
-#: lib/mediafile.php:197 lib/mediafile.php:234
+#. TRANS: Client exception thrown when a file upload operation fails because the file could
+#. TRANS: not be moved from the temporary folder to the permanent file location.
+#: lib/mediafile.php:209 lib/mediafile.php:251
 msgid "File could not be moved to destination directory."
 msgstr "Non se puido mover o ficheiro ao directorio de destino."
 
-#: lib/mediafile.php:202 lib/mediafile.php:238
+#. TRANS: Client exception thrown when a file upload operation has been stopped because the MIME
+#. TRANS: type of the uploaded file could not be determined.
+#: lib/mediafile.php:216 lib/mediafile.php:257
 msgid "Could not determine file's MIME type."
 msgstr "Non se puido determinar o tipo MIME do ficheiro."
 
-#: lib/mediafile.php:318
-#, php-format
-msgid " Try using another %s format."
-msgstr "IntÃ©nteo utilizando outro formato %s."
-
-#: lib/mediafile.php:323
-#, php-format
-msgid "%s is not a supported file type on this server."
-msgstr "Neste servidor non se soporta o tipo de ficheiro %s."
-
 #: lib/messageform.php:120
 msgid "Send a direct notice"
 msgstr "Enviar unha nota directa"
@@ -6797,27 +6810,7 @@ msgstr "Facer un aceno"
 msgid "Send a nudge to this user"
 msgstr "Facerlle un aceno a este usuario"
 
-#: lib/oauthstore.php:283
-msgid "Error inserting new profile"
-msgstr "Houbo un erro ao inserir o novo perfil"
-
-#: lib/oauthstore.php:291
-msgid "Error inserting avatar"
-msgstr "Houbo un erro ao inserir o avatar"
-
-#: lib/oauthstore.php:306
-msgid "Error updating remote profile"
-msgstr "Houbo un erro ao actualizar o perfil remoto"
-
-#: lib/oauthstore.php:311
-msgid "Error inserting remote profile"
-msgstr "Houbo un erro ao inserir o perfil remoto"
-
-#: lib/oauthstore.php:345
-msgid "Duplicate notice"
-msgstr "Nota duplicada"
-
-#: lib/oauthstore.php:490
+#: lib/oauthstore.php:491
 msgid "Couldn't insert new subscription."
 msgstr "Non se puido inserir unha subscriciÃ³n nova."
 
@@ -6854,7 +6847,8 @@ msgstr "As mensaxes enviadas"
 msgid "Tags in %s's notices"
 msgstr "Etiquetas nas notas de %s"
 
-#: lib/plugin.php:115
+#. TRANS: Displayed as version information for a plugin if no version information was found.
+#: lib/plugin.php:116
 msgid "Unknown"
 msgstr "DescoÃ±ecida"
 
@@ -6948,19 +6942,19 @@ msgstr "Illar"
 msgid "Sandbox this user"
 msgstr "Illar a este usuario"
 
-#: lib/searchaction.php:120
+#. TRANS: Fieldset legend for the search form.
+#: lib/searchaction.php:121
 msgid "Search site"
 msgstr "Buscar no sitio"
 
-#: lib/searchaction.php:126
+#. TRANS: Used as a field label for the field where one or more keywords
+#. TRANS: for searching can be entered.
+#: lib/searchaction.php:129
 msgid "Keyword(s)"
 msgstr "Termos de busca"
 
-#: lib/searchaction.php:127
-msgid "Search"
-msgstr "Buscar"
-
-#: lib/searchaction.php:162
+#. TRANS: Definition list item with instructions on how to get (better) search results.
+#: lib/searchaction.php:170
 msgid "Search help"
 msgstr "Buscar na axuda"
 
@@ -7161,56 +7155,32 @@ msgid "Moderator"
 msgstr "Moderador"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1102
+#: lib/util.php:1103
 msgid "a few seconds ago"
 msgstr "hai uns segundos"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1105
+#: lib/util.php:1106
 msgid "about a minute ago"
 msgstr "hai como un minuto"
 
-#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1109
-#, php-format
-msgid "about %d minutes ago"
-msgstr "hai como %d minutos"
-
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 #: lib/util.php:1112
 msgid "about an hour ago"
 msgstr "hai como unha hora"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1116
-#, php-format
-msgid "about %d hours ago"
-msgstr "hai como %d horas"
-
-#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1119
+#: lib/util.php:1118
 msgid "about a day ago"
 msgstr "hai como un dÃa"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1123
-#, php-format
-msgid "about %d days ago"
-msgstr "hai como %d dÃas"
-
-#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1126
+#: lib/util.php:1124
 msgid "about a month ago"
 msgstr "hai como un mes"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 #: lib/util.php:1130
-#, php-format
-msgid "about %d months ago"
-msgstr "hai como %d meses"
-
-#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1133
 msgid "about a year ago"
 msgstr "hai como un ano"
 
diff --git a/locale/he/LC_MESSAGES/statusnet.po b/locale/he/LC_MESSAGES/statusnet.po
index 598dd033a7..3b4dcb6be4 100644
--- a/locale/he/LC_MESSAGES/statusnet.po
+++ b/locale/he/LC_MESSAGES/statusnet.po
@@ -1,4 +1,5 @@
-# Translation of StatusNet to Hebrew
+# Translation of StatusNet to Hebrew (×¢××¨××ª)
+# Expored from translatewiki.net
 #
 # --
 # This file is distributed under the same license as the StatusNet package.
@@ -7,16 +8,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-08 22:33+0000\n"
-"PO-Revision-Date: 2010-09-08 22:34:22+0000\n"
-"Language-Team: Hebrew\n"
+"POT-Creation-Date: 2010-09-14 19:53+0000\n"
+"PO-Revision-Date: 2010-09-14 19:53:59+0000\n"
+"Language-Team: Hebrew <http://translatewiki.net/wiki/Portal:he>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r72348); Translate extension (2010-08-20)\n"
+"X-Generator: MediaWiki 1.17alpha (r73009); Translate extension (2010-08-20)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: he\n"
-"X-Message-Group: out-statusnet\n"
+"X-Message-Group: #out-statusnet\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-POT-Import-Date: 1284-49-16 34::+0000\n"
 
 #. TRANS: Page notice
 #: actions/accessadminpanel.php:67
@@ -43,11 +45,6 @@ msgstr ""
 msgid "Disable new registrations."
 msgstr ""
 
-#. TRANS: Checkbox label for disabling new user registrations.
-#: actions/accessadminpanel.php:185
-msgid "Closed"
-msgstr ""
-
 #. TRANS: Server error when page not found (404)
 #: actions/all.php:68 actions/public.php:98 actions/replies.php:93
 #: actions/showfavorites.php:138 actions/tag.php:52
@@ -56,15 +53,15 @@ msgstr "××× ××©×ª××© ×××."
 
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #: actions/all.php:79 actions/allrss.php:68
-#: actions/apiaccountupdatedeliverydevice.php:114
-#: actions/apiaccountupdateprofile.php:105
-#: actions/apiaccountupdateprofilebackgroundimage.php:116
-#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
-#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
-#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:113
-#: actions/apigroupismember.php:91 actions/apigroupjoin.php:100
-#: actions/apigroupleave.php:100 actions/apigrouplist.php:73
-#: actions/apistatusesupdate.php:229 actions/apisubscriptions.php:87
+#: actions/apiaccountupdatedeliverydevice.php:115
+#: actions/apiaccountupdateprofile.php:106
+#: actions/apiaccountupdateprofilebackgroundimage.php:117
+#: actions/apiaccountupdateprofileimage.php:106 actions/apiblockcreate.php:98
+#: actions/apiblockdestroy.php:97 actions/apidirectmessage.php:77
+#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:114
+#: actions/apigroupismember.php:91 actions/apigroupjoin.php:101
+#: actions/apigroupleave.php:101 actions/apigrouplist.php:73
+#: actions/apistatusesupdate.php:230 actions/apisubscriptions.php:87
 #: actions/apitimelinefavorites.php:72 actions/apitimelinefriends.php:174
 #: actions/apitimelinehome.php:80 actions/apitimelinementions.php:80
 #: actions/apitimelineuser.php:82 actions/avatarbynickname.php:75
@@ -89,18 +86,6 @@ msgstr "××× ××©×ª××© ×××."
 msgid "%s and friends"
 msgstr "%s ××××¨××"
 
-#. TRANS: %1$s is user nickname
-#: actions/all.php:107
-#, php-format
-msgid "Feed for friends of %s (RSS 1.0)"
-msgstr ""
-
-#. TRANS: %1$s is user nickname
-#: actions/all.php:116
-#, php-format
-msgid "Feed for friends of %s (RSS 2.0)"
-msgstr ""
-
 #. TRANS: %1$s is user nickname
 #: actions/all.php:138
 #, php-format
@@ -138,39 +123,41 @@ msgstr ""
 msgid "Updates from %1$s and friends on %2$s!"
 msgstr ""
 
-#: actions/apiaccountupdatedeliverydevice.php:86
-#: actions/apiaccountupdateprofile.php:89
-#: actions/apiaccountupdateprofilebackgroundimage.php:86
-#: actions/apiaccountupdateprofilecolors.php:110
-#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89
-#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109
-#: actions/apifavoritecreate.php:91 actions/apifavoritedestroy.php:92
-#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
-#: actions/apigroupcreate.php:105 actions/apigroupjoin.php:92
-#: actions/apigroupleave.php:92 actions/apimediaupload.php:67
-#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:198
+#. TRANS: Client error message. POST is a HTTP command. It should not be translated.
+#. TRANS: Client error. POST is a HTTP command. It should not be translated.
+#: actions/apiaccountupdatedeliverydevice.php:87
+#: actions/apiaccountupdateprofile.php:90
+#: actions/apiaccountupdateprofilebackgroundimage.php:87
+#: actions/apiaccountupdateprofilecolors.php:111
+#: actions/apiaccountupdateprofileimage.php:85 actions/apiblockcreate.php:90
+#: actions/apiblockdestroy.php:89 actions/apidirectmessagenew.php:110
+#: actions/apifavoritecreate.php:92 actions/apifavoritedestroy.php:93
+#: actions/apifriendshipscreate.php:92 actions/apifriendshipsdestroy.php:92
+#: actions/apigroupcreate.php:106 actions/apigroupjoin.php:93
+#: actions/apigroupleave.php:93 actions/apimediaupload.php:68
+#: actions/apistatusesretweet.php:66 actions/apistatusesupdate.php:199
 msgid "This method requires a POST."
 msgstr ""
 
-#: actions/apiaccountupdatedeliverydevice.php:106
+#: actions/apiaccountupdatedeliverydevice.php:107
 msgid ""
 "You must specify a parameter named 'device' with a value of one of: sms, im, "
 "none."
 msgstr ""
 
-#: actions/apiaccountupdateprofile.php:112
-#: actions/apiaccountupdateprofilebackgroundimage.php:194
-#: actions/apiaccountupdateprofilecolors.php:185
-#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/apiaccountupdateprofile.php:113
+#: actions/apiaccountupdateprofilebackgroundimage.php:195
+#: actions/apiaccountupdateprofilecolors.php:186
+#: actions/apiaccountupdateprofileimage.php:131 actions/apiusershow.php:108
 #: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/hcard.php:74
 #: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
 #: lib/profileaction.php:84
 msgid "User has no profile."
 msgstr "×××©×ª××© ××× ×¤×¨××¤××."
 
-#: actions/apiaccountupdateprofilebackgroundimage.php:108
-#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
-#: actions/apistatusesupdate.php:212 actions/avatarsettings.php:257
+#: actions/apiaccountupdateprofilebackgroundimage.php:109
+#: actions/apiaccountupdateprofileimage.php:98 actions/apimediaupload.php:81
+#: actions/apistatusesupdate.php:213 actions/avatarsettings.php:257
 #: actions/designadminpanel.php:123 actions/editapplication.php:118
 #: actions/newapplication.php:101 actions/newnotice.php:94
 #: lib/designsettings.php:283
@@ -180,25 +167,21 @@ msgid ""
 "current configuration."
 msgstr ""
 
-#: actions/apiaccountupdateprofilebackgroundimage.php:136
-#: actions/apiaccountupdateprofilebackgroundimage.php:146
-#: actions/apiaccountupdateprofilecolors.php:164
-#: actions/apiaccountupdateprofilecolors.php:174
+#: actions/apiaccountupdateprofilebackgroundimage.php:137
+#: actions/apiaccountupdateprofilebackgroundimage.php:147
+#: actions/apiaccountupdateprofilecolors.php:165
+#: actions/apiaccountupdateprofilecolors.php:175
 #: actions/groupdesignsettings.php:290 actions/groupdesignsettings.php:300
 #: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
 #: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
 msgid "Unable to save your design settings."
 msgstr ""
 
-#: actions/apiblockcreate.php:105
-msgid "You cannot block yourself!"
-msgstr ""
-
-#: actions/apiblockcreate.php:126
+#: actions/apiblockcreate.php:127
 msgid "Block user failed."
 msgstr ""
 
-#: actions/apiblockdestroy.php:114
+#: actions/apiblockdestroy.php:115
 msgid "Unblock user failed."
 msgstr ""
 
@@ -222,118 +205,107 @@ msgstr ""
 msgid "All the direct messages sent to %s"
 msgstr ""
 
-#: actions/apidirectmessagenew.php:142
+#: actions/apidirectmessagenew.php:143
 msgid "Can't send direct messages to users who aren't your friend."
 msgstr ""
 
-#: actions/apifavoritecreate.php:109 actions/apifavoritedestroy.php:110
+#: actions/apifavoritecreate.php:110 actions/apifavoritedestroy.php:111
 #: actions/apistatusesdestroy.php:121
 msgid "No status found with that ID."
 msgstr ""
 
-#: actions/apifavoritedestroy.php:123
+#: actions/apifavoritedestroy.php:124
 msgid "That status is not a favorite."
 msgstr ""
 
-#: actions/apifriendshipscreate.php:109
+#: actions/apifriendshipscreate.php:110
 msgid "Could not follow user: profile not found."
 msgstr "×©×××¨×ª ××¤×¨××¤×× × ××©××."
 
-#: actions/apifriendshipsdestroy.php:120
-msgid "You cannot unfollow yourself."
+#: actions/apifriendshipscreate.php:119
+#, php-format
+msgid "Could not follow user: %s is already on your list."
 msgstr ""
 
 #: actions/apifriendshipsexists.php:91
 msgid "Two valid IDs or screen_names must be supplied."
 msgstr ""
 
-#: actions/apigroupcreate.php:167 actions/editgroup.php:186
+#: actions/apigroupcreate.php:168 actions/editgroup.php:186
 #: actions/newgroup.php:126 actions/profilesettings.php:215
 #: actions/register.php:212
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr "××× ×× ×××× ××××× ×¨×§ ×××ª×××ª ×× ×××××ª ×§×× ××ª ×××¡×¤×¨××, ×××× ×¨×××××."
 
-#: actions/apigroupcreate.php:176 actions/editgroup.php:190
+#: actions/apigroupcreate.php:177 actions/editgroup.php:190
 #: actions/newgroup.php:130 actions/profilesettings.php:238
 #: actions/register.php:215
 msgid "Nickname already in use. Try another one."
 msgstr "××× ×× ×× ×××¨ ×ª×¤××¡. × ×¡× ××× ×× ×××¨."
 
-#: actions/apigroupcreate.php:183 actions/editgroup.php:193
+#: actions/apigroupcreate.php:184 actions/editgroup.php:193
 #: actions/newgroup.php:133 actions/profilesettings.php:218
 #: actions/register.php:217
 msgid "Not a valid nickname."
 msgstr "×©× ××©×ª××© ×× ×××§×."
 
-#: actions/apigroupcreate.php:199 actions/editapplication.php:215
+#: actions/apigroupcreate.php:200 actions/editapplication.php:215
 #: actions/editgroup.php:199 actions/newapplication.php:203
 #: actions/newgroup.php:139 actions/profilesettings.php:222
 #: actions/register.php:224
 msgid "Homepage is not a valid URL."
 msgstr "×××ª×¨ ××××ª ××© ××ª×××ª ×× ×××§××ª."
 
-#: actions/apigroupcreate.php:208 actions/editgroup.php:202
+#: actions/apigroupcreate.php:209 actions/editgroup.php:202
 #: actions/newgroup.php:142 actions/profilesettings.php:225
 #: actions/register.php:227
 msgid "Full name is too long (max 255 chars)."
 msgstr "××©× ×××× ××¨×× ×××× (×××ª×¨××ª 255 ×××ª×××ª ××××)"
 
-#: actions/apigroupcreate.php:216 actions/editapplication.php:190
+#: actions/apigroupcreate.php:217 actions/editapplication.php:190
 #: actions/newapplication.php:172
 #, php-format
 msgid "Description is too long (max %d chars)."
 msgstr "×©× ××××§×× ××¨×× ×××× (×××ª×¨ ×¢× %d ×××ª×××ª)."
 
-#: actions/apigroupcreate.php:227 actions/editgroup.php:208
+#: actions/apigroupcreate.php:228 actions/editgroup.php:208
 #: actions/newgroup.php:148 actions/profilesettings.php:232
 #: actions/register.php:234
 msgid "Location is too long (max 255 chars)."
 msgstr "×©× ××××§×× ××¨×× ×××× (×××ª×¨ ×¢× 255 ×××ª×××ª)."
 
-#: actions/apigroupcreate.php:246 actions/editgroup.php:219
+#: actions/apigroupcreate.php:247 actions/editgroup.php:219
 #: actions/newgroup.php:159
 #, php-format
 msgid "Too many aliases! Maximum %d."
 msgstr ""
 
-#: actions/apigroupcreate.php:267
+#: actions/apigroupcreate.php:268
 #, php-format
 msgid "Invalid alias: \"%s\"."
 msgstr "×××× ×× ×××§×."
 
-#: actions/apigroupcreate.php:289 actions/editgroup.php:238
+#: actions/apigroupcreate.php:290 actions/editgroup.php:238
 #: actions/newgroup.php:178
 msgid "Alias can't be the same as nickname."
 msgstr ""
 
-#: actions/apigroupismember.php:96 actions/apigroupjoin.php:105
-#: actions/apigroupleave.php:105 actions/apigroupmembership.php:92
+#: actions/apigroupismember.php:96 actions/apigroupjoin.php:106
+#: actions/apigroupleave.php:106 actions/apigroupmembership.php:92
 #: actions/apigroupshow.php:83 actions/apitimelinegroup.php:92
 msgid "Group not found."
 msgstr "×§×× ××××©××¨ ×× × ××¦×."
 
 #. TRANS: Error text shown a user tries to join a group they already are a member of.
-#: actions/apigroupjoin.php:111 actions/joingroup.php:100 lib/command.php:336
+#: actions/apigroupjoin.php:112 actions/joingroup.php:100 lib/command.php:336
 msgid "You are already a member of that group."
 msgstr "×× ×©××× × ×××× × ××ª ××¤×¨××¤×× ×××"
 
 #. TRANS: Error text shown when a user tries to join a group they are blocked from joining.
-#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:341
+#: actions/apigroupjoin.php:121 actions/joingroup.php:105 lib/command.php:341
 msgid "You have been blocked from that group by the admin."
 msgstr ""
 
-#. TRANS: %s is a user name
-#: actions/apigrouplist.php:98
-#, php-format
-msgid "%s's groups"
-msgstr ""
-
-#. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s
-#: actions/apigrouplist.php:108
-#, php-format
-msgid "%1$s groups %2$s is a member of."
-msgstr ""
-
 #: actions/apigrouplistall.php:96
 #, php-format
 msgid "groups on %s"
@@ -345,9 +317,9 @@ msgstr ""
 
 #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
 #: actions/deletenotice.php:169 actions/disfavor.php:74
-#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:55
+#: actions/emailsettings.php:271 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:66 actions/imsettings.php:227
+#: actions/groupunblock.php:66 actions/imsettings.php:230
 #: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
@@ -378,8 +350,8 @@ msgstr ""
 #. 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:286 actions/grouplogo.php:322
-#: actions/imsettings.php:242 actions/newapplication.php:121
+#: actions/emailsettings.php:290 actions/grouplogo.php:322
+#: actions/imsettings.php:245 actions/newapplication.php:121
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
 #: actions/smssettings.php:277 lib/designsettings.php:304
 msgid "Unexpected form submission."
@@ -435,7 +407,7 @@ msgstr ""
 msgid "You may not delete another user's status."
 msgstr ""
 
-#: actions/apistatusesretweet.php:75 actions/apistatusesretweets.php:72
+#: actions/apistatusesretweet.php:76 actions/apistatusesretweets.php:72
 #: actions/deletenotice.php:52 actions/shownotice.php:92
 msgid "No such notice."
 msgstr "××× ××××¢× ×××."
@@ -444,20 +416,15 @@ msgstr "××× ××××¢× ×××."
 msgid "No status with that ID found."
 msgstr ""
 
-#: actions/apistatusesupdate.php:221
+#: actions/apistatusesupdate.php:222
 msgid "Client must provide a 'status' parameter with a value."
 msgstr ""
 
-#: actions/apistatusesupdate.php:306 actions/newnotice.php:181
+#: actions/apistatusesupdate.php:307 actions/newnotice.php:181
 #, php-format
 msgid "Max notice size is %d chars, including attachment URL."
 msgstr ""
 
-#: actions/apitimelinefavorites.php:119
-#, php-format
-msgid "%1$s updates favorited by %2$s / %2$s."
-msgstr ""
-
 #: actions/apitimelinementions.php:131
 #, php-format
 msgid "%1$s updates that reply to updates from %2$s / %3$s."
@@ -473,11 +440,6 @@ msgstr ""
 msgid "Notices tagged with %s"
 msgstr ""
 
-#: actions/apitimelinetag.php:107 actions/tagrss.php:65
-#, php-format
-msgid "Updates tagged with %1$s on %2$s!"
-msgstr ""
-
 #: actions/attachment.php:73
 msgid "No such attachment."
 msgstr "××× ××××¢× ×××."
@@ -518,11 +480,6 @@ msgstr ""
 msgid "Preview"
 msgstr ""
 
-#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:657
-msgid "Delete"
-msgstr ""
-
 #: actions/avatarsettings.php:166 actions/grouplogo.php:236
 msgid "Upload"
 msgstr "×××¢××"
@@ -554,23 +511,6 @@ msgid ""
 "will not be notified of any @-replies from them."
 msgstr ""
 
-#. 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:153 actions/deleteapplication.php:154
-#: actions/deletenotice.php:147 actions/deleteuser.php:152
-#: actions/groupblock.php:178
-msgctxt "BUTTON"
-msgid "No"
-msgstr ""
-
-#. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
-msgid "Block this user"
-msgstr ""
-
 #: actions/block.php:187
 msgid "Failed to save block information."
 msgstr ""
@@ -591,25 +531,12 @@ msgstr ""
 msgid "No such group."
 msgstr "××× ××©×ª××© ×××."
 
-#: actions/blockedfromgroup.php:97
-#, php-format
-msgid "%s blocked profiles"
-msgstr ""
-
-#: actions/blockedfromgroup.php:100
-#, php-format
-msgid "%1$s blocked profiles, page %2$d"
-msgstr ""
-
 #: actions/blockedfromgroup.php:115
 msgid "A list of the users blocked from joining this group."
 msgstr ""
 
-#: actions/blockedfromgroup.php:288
-msgid "Unblock user from group"
-msgstr ""
-
-#: actions/blockedfromgroup.php:320 lib/unblockform.php:69
+#. TRANS: Title for the form to unblock a user.
+#: actions/blockedfromgroup.php:320 lib/unblockform.php:70
 msgid "Unblock"
 msgstr ""
 
@@ -625,12 +552,6 @@ msgstr "×§×× ××××©××¨ ×× × ××¦×."
 msgid "That confirmation code is not for you!"
 msgstr "×§×× ××××©××¨ ××× ××× × ××××¢× ××!"
 
-#. TRANS: Server error for an unknow address type, which can be 'email', 'jabber', or 'sms'.
-#: actions/confirmaddress.php:91
-#, php-format
-msgid "Unrecognized address type %s."
-msgstr ""
-
 #. TRANS: Client error for an already confirmed email/jabbel/sms address.
 #: actions/confirmaddress.php:96
 msgid "That address has already been confirmed."
@@ -642,9 +563,9 @@ msgstr "××ª×××ª ×× ×××¨ ×××©×¨×."
 #. 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/confirmaddress.php:116 actions/emailsettings.php:331
+#: actions/emailsettings.php:477 actions/imsettings.php:283
+#: actions/imsettings.php:442 actions/othersettings.php:174
 #: actions/profilesettings.php:283 actions/smssettings.php:308
 #: actions/smssettings.php:464
 msgid "Couldn't update user."
@@ -668,9 +589,10 @@ msgstr "××××¢××ª"
 msgid "Application not found."
 msgstr "×§×× ××××©××¨ ×× × ××¦×."
 
+#. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:127
 #: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1307
+#: lib/action.php:1315
 msgid "There was a problem with your session token."
 msgstr ""
 
@@ -687,7 +609,7 @@ msgstr ""
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
 #: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:73 lib/profileformaction.php:64
+#: lib/adminpanelaction.php:71 lib/profileformaction.php:64
 #: lib/settingsaction.php:72
 msgid "Not logged in."
 msgstr "×× ×××××¨."
@@ -706,11 +628,6 @@ msgstr ""
 msgid "Are you sure you want to delete this notice?"
 msgstr ""
 
-#. TRANS: Submit button title for 'No' when deleting a notice.
-#: actions/deletenotice.php:151
-msgid "Do not delete this notice"
-msgstr ""
-
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
 #: actions/deletenotice.php:158 lib/noticelist.php:657
 msgid "Delete this notice"
@@ -725,7 +642,6 @@ msgstr ""
 #. TRANS: Message used as title for design settings for the site.
 #. TRANS: Link description in user account settings menu.
 #: actions/designadminpanel.php:63 lib/accountsettingsaction.php:139
-#: lib/groupnav.php:119
 msgid "Design"
 msgstr ""
 
@@ -733,11 +649,6 @@ msgstr ""
 msgid "Design settings for this StatusNet site."
 msgstr ""
 
-#: actions/designadminpanel.php:322
-#, php-format
-msgid "Theme not available: %s."
-msgstr ""
-
 #: actions/designadminpanel.php:426
 msgid "Change logo"
 msgstr "×©× ×"
@@ -746,10 +657,6 @@ msgstr "×©× ×"
 msgid "Theme for the site."
 msgstr ""
 
-#: actions/designadminpanel.php:467
-msgid "Custom theme"
-msgstr ""
-
 #: actions/designadminpanel.php:471
 msgid "You can upload a custom StatusNet theme as a .ZIP archive."
 msgstr ""
@@ -805,17 +712,21 @@ msgstr ""
 msgid "Reset back to default"
 msgstr ""
 
-#. TRANS: Submit button title
+#. TRANS: Submit button title.
 #: actions/designadminpanel.php:685 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/snapshotadminpanel.php:245
 #: actions/subscriptions.php:226 actions/tagother.php:154
-#: actions/useradminpanel.php:294 lib/applicationeditform.php:363
+#: actions/useradminpanel.php:294 lib/applicationeditform.php:353
 #: lib/designsettings.php:256 lib/groupeditform.php:202
 msgid "Save"
 msgstr "×©×××¨"
 
+#: actions/designadminpanel.php:686 lib/designsettings.php:257
+msgid "Save design"
+msgstr ""
+
 #: actions/disfavor.php:81
 msgid "This notice is not a favorite!"
 msgstr ""
@@ -825,14 +736,18 @@ msgstr ""
 msgid "No such document \"%s\""
 msgstr "××× ××××¢× ×××."
 
-#: actions/editapplication.php:54
-msgid "Edit Application"
+#: actions/editapplication.php:66
+msgid "You must be logged in to edit an application."
 msgstr ""
 
 #: actions/editapplication.php:161
 msgid "Use this form to edit your application."
 msgstr ""
 
+#: actions/editapplication.php:177 actions/newapplication.php:159
+msgid "Name is required."
+msgstr ""
+
 #: actions/editapplication.php:186 actions/newapplication.php:168
 msgid "Description is required."
 msgstr "×××¨×©×× × ×××ª×"
@@ -841,6 +756,14 @@ msgstr "×××¨×©×× × ×××ª×"
 msgid "Source URL is too long."
 msgstr ""
 
+#: actions/editapplication.php:203 actions/newapplication.php:188
+msgid "Organization is required."
+msgstr ""
+
+#: actions/editapplication.php:209 actions/newapplication.php:194
+msgid "Organization homepage is required."
+msgstr ""
+
 #: actions/editapplication.php:218 actions/newapplication.php:206
 msgid "Callback is too long."
 msgstr ""
@@ -854,6 +777,10 @@ msgstr ""
 msgid "Edit %s group"
 msgstr ""
 
+#: actions/editgroup.php:68 actions/grouplogo.php:70 actions/newgroup.php:65
+msgid "You must be logged in to create a group."
+msgstr ""
+
 #: actions/editgroup.php:107 actions/editgroup.php:172
 #: actions/groupdesignsettings.php:107 actions/grouplogo.php:109
 msgid "You must be an admin to edit the group."
@@ -885,86 +812,79 @@ msgstr ""
 #. 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/emailsettings.php:115 actions/emailsettings.php:162
 #: actions/imsettings.php:116 actions/smssettings.php:124
 #: actions/smssettings.php:180
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "×©×××××¨"
 
-#. TRANS: Instructions for e-mail address input form.
-#: actions/emailsettings.php:135
+#. TRANS: Instructions for e-mail address input form. Do not translate
+#. TRANS: "example.org". It is one of the domain names reserved for
+#. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
+#. TRANS: Any other domain may be owned by a legitimate person or
+#. TRANS: organization.
+#: actions/emailsettings.php:139
 msgid "Email address, like \"UserName@example.org\""
 msgstr ""
 
-#. 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 ""
-
 #. 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
+#: actions/emailsettings.php:151 actions/smssettings.php:171
 msgid "Incoming email"
 msgstr ""
 
 #. 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
+#: actions/emailsettings.php:159 actions/smssettings.php:178
 msgid "Send email to this address to post new notices."
 msgstr ""
 
 #. 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
+#: actions/emailsettings.php:168 actions/smssettings.php:186
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr ""
 
-#. 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 ""
-
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:186
+#: actions/emailsettings.php:190
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr ""
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:193
+#: actions/emailsettings.php:197
 msgid "Send me email when someone sends me a private message."
 msgstr ""
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:199
+#: actions/emailsettings.php:203
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr ""
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:205
+#: actions/emailsettings.php:209
 msgid "Allow friends to nudge me and send me an email."
 msgstr ""
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:212
+#: actions/emailsettings.php:216
 msgid "I want to post notices by email."
 msgstr ""
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:219
+#: actions/emailsettings.php:223
 msgid "Publish a MicroID for my email address."
 msgstr ""
 
+#. TRANS: Message given saving e-mail address without having provided one.
+#: actions/emailsettings.php:357
+msgid "No email address."
+msgstr ""
+
 #. 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/emailsettings.php:395 actions/imsettings.php:351
 #: actions/smssettings.php:373
 msgid "Couldn't insert confirmation code."
 msgstr "××× ×¡×ª ×§×× ××××©××¨ × ××©××."
@@ -972,25 +892,35 @@ msgstr "××× ×¡×ª ×§×× ××××©××¨ × ××©××."
 #. 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/emailsettings.php:423 actions/imsettings.php:386
 #: actions/smssettings.php:408
 msgid "No pending confirmation to cancel."
 msgstr "××× ×××©××¨ ×××ª×× ×©× ××ª× ××××."
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:438
+#: actions/emailsettings.php:442
 msgid "Email confirmation cancelled."
 msgstr "××× ×××©××¨ ×××ª×× ×©× ××ª× ××××."
 
 #. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:479
+#: actions/emailsettings.php:483
 msgid "The email address was removed."
 msgstr "××ª×××ª ×× ×××¨ ×××©×¨×."
 
-#: actions/emailsettings.php:493 actions/smssettings.php:568
+#: actions/emailsettings.php:497 actions/smssettings.php:568
 msgid "No incoming email address."
 msgstr ""
 
+#. TRANS: Message given after successfully removing an incoming e-mail address.
+#: actions/emailsettings.php:512 actions/smssettings.php:581
+msgid "Incoming email address removed."
+msgstr ""
+
+#. TRANS: Message given after successfully adding an incoming e-mail address.
+#: actions/emailsettings.php:536 actions/smssettings.php:605
+msgid "New incoming email address added."
+msgstr ""
+
 #: actions/favor.php:79
 msgid "This notice is already a favorite!"
 msgstr ""
@@ -999,11 +929,6 @@ msgstr ""
 msgid "Disfavor favorite"
 msgstr ""
 
-#: actions/favorited.php:67
-#, php-format
-msgid "Popular notices, page %d"
-msgstr ""
-
 #: actions/favorited.php:79
 msgid "The most popular notices on the site right now."
 msgstr ""
@@ -1031,9 +956,9 @@ msgstr ""
 msgid "%s's favorite notices"
 msgstr ""
 
-#: actions/favoritesrss.php:115
-#, php-format
-msgid "Updates favored by %1$s on %2$s!"
+#: actions/featured.php:69 lib/featureduserssection.php:87
+#: lib/publicgroupnav.php:89
+msgid "Featured users"
 msgstr ""
 
 #: actions/featured.php:71
@@ -1058,10 +983,6 @@ msgstr "××× ××××¢× ×××."
 msgid "Not expecting this response!"
 msgstr "×× ×ª×××× ×× ×¦×¤×××!"
 
-#: actions/finishremotesubscribe.php:80
-msgid "User being listened to does not exist."
-msgstr ""
-
 #: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59
 msgid "You can use the local subscription!"
 msgstr "× ××ª× ×××©×ª××© ××× ×× ×××§×××!"
@@ -1074,14 +995,6 @@ msgstr ""
 msgid "You are not authorized."
 msgstr "×××¨×©×× ×××©×¨×"
 
-#: actions/finishremotesubscribe.php:113
-msgid "Could not convert request token to access token."
-msgstr ""
-
-#: actions/finishremotesubscribe.php:118
-msgid "Remote service uses unknown version of OMB protocol."
-msgstr ""
-
 #: actions/getfile.php:83
 msgid "Cannot read file."
 msgstr "×©×××¨×ª ××¤×¨××¤×× × ××©××."
@@ -1090,8 +1003,16 @@ msgstr "×©×××¨×ª ××¤×¨××¤×× × ××©××."
 msgid "This role is reserved and cannot be set."
 msgstr ""
 
-#: actions/grantrole.php:75
-msgid "You cannot grant user roles on this site."
+#: actions/groupblock.php:71 actions/groupunblock.php:71
+#: actions/makeadmin.php:71 actions/subedit.php:46
+#: lib/profileformaction.php:79
+msgid "No profile specified."
+msgstr ""
+
+#: actions/groupblock.php:76 actions/groupunblock.php:76
+#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
+#: actions/unsubscribe.php:84 lib/profileformaction.php:86
+msgid "No profile with that ID."
 msgstr ""
 
 #: actions/groupblock.php:81 actions/groupunblock.php:81
@@ -1103,10 +1024,6 @@ msgstr ""
 msgid "Only an admin can block group members."
 msgstr ""
 
-#: actions/groupblock.php:134 actions/groupmembers.php:360
-msgid "Block user from group"
-msgstr ""
-
 #: actions/groupblock.php:160
 #, php-format
 msgid ""
@@ -1115,16 +1032,6 @@ msgid ""
 "the group in the future."
 msgstr ""
 
-#. 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 ""
-
-#. 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:206
 msgid "Database error blocking user from group."
 msgstr ""
@@ -1147,41 +1054,44 @@ msgstr ""
 msgid "Pick a square area of the image to be the logo."
 msgstr ""
 
-#: actions/groupmembers.php:103
+#. TRANS: Title of the page showing group members.
+#. TRANS: %s is the name of the group.
+#: actions/groupmembers.php:102
+#, php-format
+msgid "%s group members"
+msgstr ""
+
+#. TRANS: Title of the page showing group members.
+#. TRANS: %1$s is the name of the group, %2$d is the page number of the members list.
+#: actions/groupmembers.php:107
 #, php-format
 msgid "%1$s group members, page %2$d"
 msgstr ""
 
-#: actions/groupmembers.php:118
+#: actions/groupmembers.php:122
 msgid "A list of the users in this group."
 msgstr ""
 
-#: actions/groupmembers.php:182 lib/groupnav.php:107
+#: actions/groupmembers.php:186
 msgid "Admin"
 msgstr ""
 
-#: actions/groupmembers.php:392 lib/blockform.php:69
-msgid "Block"
-msgstr ""
-
-#: actions/groupmembers.php:487
+#: actions/groupmembers.php:498
 msgid "Make user an admin of the group"
 msgstr ""
 
-#: actions/groupmembers.php:519
+#. TRANS: Button text for the form that will make a user administrator.
+#: actions/groupmembers.php:533
+msgctxt "BUTTON"
 msgid "Make Admin"
 msgstr ""
 
-#: actions/groupmembers.php:519
+#. TRANS: Submit button title.
+#: actions/groupmembers.php:537
+msgctxt "TOOLTIP"
 msgid "Make this user an admin"
 msgstr ""
 
-#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
-#: actions/grouprss.php:142
-#, php-format
-msgid "Updates from members of %1$s on %2$s!"
-msgstr ""
-
 #: actions/groups.php:62 lib/profileaction.php:223 lib/profileaction.php:249
 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
 msgid "Groups"
@@ -1202,15 +1112,6 @@ msgid ""
 "%%%%)"
 msgstr ""
 
-#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:122
-msgid "Create a new group"
-msgstr ""
-
-#: actions/groupsearch.php:79 actions/noticesearch.php:117
-#: actions/peoplesearch.php:83
-msgid "No results."
-msgstr ""
-
 #: actions/groupsearch.php:82
 #, php-format
 msgid ""
@@ -1229,10 +1130,6 @@ msgstr ""
 msgid "Only an admin can unblock group members."
 msgstr ""
 
-#: actions/groupunblock.php:95
-msgid "User is not blocked from group."
-msgstr ""
-
 #. TRANS: Title for instance messaging settings.
 #: actions/imsettings.php:60
 msgid "IM settings"
@@ -1250,11 +1147,6 @@ msgstr ""
 "××¤×©×¨ ××©××× ×××§×× ××××¢××ª ××¨× Jabber/GTalk [instant messages](%%doc.im%%) ××××¨ "
 "××ª ××ª×××ª× ×××¢××¤××ª×× ××××."
 
-#. 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:113
 msgid "Current confirmed Jabber/GTalk address."
 msgstr "××ª×××ª ××××©×¨×ª × ×××××ª ×©× Jabber/GTalk."
@@ -1272,7 +1164,10 @@ msgstr ""
 
 #. TRANS: IM address input field instructions in IM settings form.
 #. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:140
+#. TRANS: Do not translate "example.org". It is one of the domain names reserved for use in examples by
+#. TRANS: http://www.rfc-editor.org/rfc/rfc2606.txt. Any other domain may be owned by a legitimate
+#. TRANS: person or organization.
+#: actions/imsettings.php:143
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -1282,53 +1177,53 @@ msgstr ""
 "××××¨×× ××ª××× ×ª ××××¡×¨×× ××××××× ×× GTalk ×©××."
 
 #. TRANS: Form legend for IM preferences form.
-#: actions/imsettings.php:155
+#: actions/imsettings.php:158
 msgid "IM preferences"
 msgstr "××¢××¤××ª × ×©××¨×."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:160
+#: actions/imsettings.php:163
 msgid "Send me notices through Jabber/GTalk."
 msgstr "×©×× ×× ××××¢××ª ××¨× Jabber/GTalk."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:166
+#: actions/imsettings.php:169
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr "×¤×¨×¡× ××××¢× ××©×©××¨×ª ××¡××××¡ ×©×× ×-Jabber/GTalk ××ª×¢××× ×ª."
 
 #. TRANS: Confirmation message for successful IM preferences save.
-#: actions/imsettings.php:287 actions/othersettings.php:180
+#: actions/imsettings.php:290 actions/othersettings.php:180
 msgid "Preferences saved."
 msgstr "××¢××¤××ª × ×©××¨×."
 
 #. TRANS: Message given saving IM address without having provided one.
-#: actions/imsettings.php:309
+#: actions/imsettings.php:312
 msgid "No Jabber ID."
 msgstr "××× ××××× Jabber ×××."
 
 #. TRANS: Message given saving IM address that cannot be normalised.
-#: actions/imsettings.php:317
+#: actions/imsettings.php:320
 msgid "Cannot normalize that Jabber ID"
 msgstr "×× × ××ª× ×× ×¨×× ××ª ××××ª ×-Jabber ×××"
 
 #. TRANS: Message given saving IM address that not valid.
-#: actions/imsettings.php:322
+#: actions/imsettings.php:325
 msgid "Not a valid Jabber ID"
 msgstr "×× ×¢××× ×××××× ×××××× Jabber"
 
 #. TRANS: Message given saving IM address that is already set.
-#: actions/imsettings.php:326
+#: actions/imsettings.php:329
 msgid "That is already your Jabber ID."
 msgstr "××× ×××¨ ××××× ×-Jabber ×©××."
 
 #. TRANS: Message given saving IM address that is already set for another user.
-#: actions/imsettings.php:330
+#: actions/imsettings.php:333
 msgid "Jabber ID already belongs to another user."
 msgstr "××××× ×-Jabber ×××¨ ×©××× ×××©×ª××© ×××¨."
 
 #. 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
+#: actions/imsettings.php:361
 #, php-format
 msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
@@ -1338,18 +1233,18 @@ msgstr ""
 "×××××× ××××."
 
 #. TRANS: Message given canceling IM address confirmation for the wrong IM address.
-#: actions/imsettings.php:388
+#: actions/imsettings.php:391
 msgid "That is the wrong IM address."
 msgstr "×××× ××ª×××ª ××¡×¨×× ×××××× ×©××××."
 
 #. TRANS: Message given after successfully canceling IM address confirmation.
-#: actions/imsettings.php:402
+#: actions/imsettings.php:405
 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
+#: actions/imsettings.php:427
 msgid "That is not your Jabber ID."
 msgstr "××× ×× ××××× ×-Jabber ×©××."
 
@@ -1371,15 +1266,19 @@ msgstr ""
 msgid "Invites have been disabled."
 msgstr ""
 
-#: actions/invite.php:41
+#: actions/invite.php:72
 #, php-format
-msgid "You must be logged in to invite other users to use %s."
+msgid "Invalid email address: %s"
 msgstr ""
 
 #: actions/invite.php:110
 msgid "Invitation(s) sent"
 msgstr ""
 
+#: actions/invite.php:112
+msgid "Invite new users"
+msgstr ""
+
 #. 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:430
@@ -1407,6 +1306,10 @@ msgid ""
 "Use this form to invite your friends and colleagues to use this service."
 msgstr ""
 
+#: actions/invite.php:187
+msgid "Email addresses"
+msgstr ""
+
 #: actions/invite.php:189
 msgid "Addresses of friends to invite (one per line)"
 msgstr ""
@@ -1415,12 +1318,6 @@ msgstr ""
 msgid "Optionally add a personal message to the invitation."
 msgstr ""
 
-#. TRANS: Send button for inviting friends
-#: actions/invite.php:198
-msgctxt "BUTTON"
-msgid "Send"
-msgstr ""
-
 #. TRANS: Body text for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English.
 #: actions/invite.php:231
 #, php-format
@@ -1504,37 +1401,12 @@ msgstr "××¦×¨×× ×××××, ××× ×¡ ××××© ××ª ×©× ×××©×ª××© ×××¡×
 msgid "Login with your username and password."
 msgstr "×©× ××©×ª××© ×× ×¡××¡×× ×× × ××× ××."
 
-#: actions/login.php:295
-#, php-format
-msgid ""
-"Don't have a username yet? [Register](%%action.register%%) a new account."
-msgstr ""
-
 #: actions/makeadmin.php:92
 msgid "Only an admin can make another user an admin."
 msgstr ""
 
-#: actions/makeadmin.php:96
-#, php-format
-msgid "%1$s is already an admin for group \"%2$s\"."
-msgstr ""
-
-#: actions/makeadmin.php:133
-#, php-format
-msgid "Can't get membership record for %1$s in group %2$s."
-msgstr ""
-
-#: actions/makeadmin.php:146
-#, php-format
-msgid "Can't make %1$s an admin for group %2$s."
-msgstr ""
-
-#: actions/microsummary.php:69
-msgid "No current status."
-msgstr ""
-
-#: actions/newapplication.php:52
-msgid "New Application"
+#: actions/newapplication.php:64
+msgid "You must be logged in to register an application."
 msgstr ""
 
 #: actions/newapplication.php:143
@@ -1549,6 +1421,10 @@ msgstr ""
 msgid "Could not create application."
 msgstr "×©×××¨×ª ××¤×¨××¤×× × ××©××."
 
+#: actions/newgroup.php:53
+msgid "New group"
+msgstr ""
+
 #: actions/newgroup.php:110
 msgid "Use this form to create a new group."
 msgstr ""
@@ -1574,10 +1450,6 @@ msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
 
-#: actions/newmessage.php:181
-msgid "Message sent"
-msgstr ""
-
 #. TRANS: Message given have sent a direct message to another user.
 #. TRANS: %s is the name of the other user.
 #: actions/newmessage.php:185 lib/command.php:514
@@ -1606,11 +1478,6 @@ msgstr ""
 msgid "Text search"
 msgstr "×××¤××© ××§×¡×"
 
-#: actions/noticesearch.php:91
-#, php-format
-msgid "Search results for \"%1$s\" on %2$s"
-msgstr ""
-
 #: actions/noticesearch.php:121
 #, php-format
 msgid ""
@@ -1625,16 +1492,6 @@ msgid ""
 "[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
 msgstr ""
 
-#: actions/noticesearchrss.php:96
-#, php-format
-msgid "Updates with \"%s\""
-msgstr ""
-
-#: actions/noticesearchrss.php:98
-#, php-format
-msgid "Updates matching search term \"%1$s\" on %2$s!"
-msgstr ""
-
 #: actions/nudge.php:85
 msgid ""
 "This user doesn't allow nudges or hasn't confirmed or set their email yet."
@@ -1660,6 +1517,15 @@ msgstr ""
 msgid "Applications you have registered"
 msgstr ""
 
+#: actions/oauthappssettings.php:135
+#, php-format
+msgid "You have not registered any applications yet."
+msgstr ""
+
+#: actions/oauthconnectionssettings.php:72
+msgid "Connected applications"
+msgstr ""
+
 #: actions/oauthconnectionssettings.php:83
 msgid "You have allowed the following applications to access you account."
 msgstr ""
@@ -1686,12 +1552,6 @@ msgstr "×××©×ª××© ××× ×¤×¨××¤××."
 msgid "%1$s's status on %2$s"
 msgstr "××¡××××¡ ×©× %1$s ×-%2$s "
 
-#. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
-#: actions/oembed.php:159
-#, php-format
-msgid "Content type %s not supported."
-msgstr ""
-
 #. TRANS: Error message displaying attachments. %s is the site's base URL.
 #: actions/oembed.php:163
 #, php-format
@@ -1726,14 +1586,14 @@ msgstr ""
 msgid "Show or hide profile designs."
 msgstr ""
 
-#: actions/otp.php:69
-msgid "No user ID specified."
-msgstr ""
-
 #: actions/otp.php:90
 msgid "No login token requested."
 msgstr "×× ××ª××§×© ×××©××¨!"
 
+#: actions/otp.php:104
+msgid "Login token expired."
+msgstr ""
+
 #: actions/outbox.php:58
 #, php-format
 msgid "Outbox for %1$s - page %2$d"
@@ -1798,7 +1658,7 @@ msgid "Password saved."
 msgstr "××¡××¡×× × ×©××¨×."
 
 #. TRANS: Menu item for site administration
-#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:384
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:371
 msgid "Paths"
 msgstr ""
 
@@ -1806,26 +1666,6 @@ msgstr ""
 msgid "Path and server settings for this StatusNet site."
 msgstr ""
 
-#: actions/pathsadminpanel.php:157
-#, php-format
-msgid "Theme directory not readable: %s."
-msgstr ""
-
-#: actions/pathsadminpanel.php:163
-#, php-format
-msgid "Avatar directory not writable: %s."
-msgstr ""
-
-#: actions/pathsadminpanel.php:169
-#, php-format
-msgid "Background directory not writable: %s."
-msgstr ""
-
-#: actions/pathsadminpanel.php:177
-#, php-format
-msgid "Locales directory not readable: %s."
-msgstr ""
-
 #: actions/pathsadminpanel.php:183
 msgid "Invalid SSL server. The maximum length is 255 characters."
 msgstr ""
@@ -1882,6 +1722,10 @@ msgstr "×ª××× ×"
 msgid "Backgrounds"
 msgstr ""
 
+#: actions/pathsadminpanel.php:305
+msgid "Background server"
+msgstr ""
+
 #: actions/pathsadminpanel.php:309
 msgid "Background path"
 msgstr ""
@@ -1906,10 +1750,6 @@ msgstr ""
 msgid "Server to direct SSL requests to"
 msgstr ""
 
-#: actions/pathsadminpanel.php:352
-msgid "Save paths"
-msgstr ""
-
 #: actions/peoplesearch.php:52
 #, php-format
 msgid ""
@@ -1923,16 +1763,6 @@ msgstr ""
 msgid "People search"
 msgstr "×××¤××© ×¡××¡××"
 
-#: actions/peopletag.php:68
-#, php-format
-msgid "Not a valid people tag: %s."
-msgstr ""
-
-#: actions/peopletag.php:142
-#, php-format
-msgid "Users self-tagged with %1$s - page %2$d"
-msgstr ""
-
 #: actions/postnotice.php:95
 msgid "Invalid notice content."
 msgstr "×××× ×× ×××§×."
@@ -1967,7 +1797,7 @@ msgstr "×©× ×××"
 
 #. TRANS: Form input field label.
 #: actions/profilesettings.php:115 actions/register.php:460
-#: lib/applicationeditform.php:244 lib/groupeditform.php:161
+#: lib/applicationeditform.php:235 lib/groupeditform.php:161
 msgid "Homepage"
 msgstr "××ª×¨ ×××ª"
 
@@ -1975,15 +1805,6 @@ msgstr "××ª×¨ ×××ª"
 msgid "URL of your homepage, blog, or profile on another site"
 msgstr "×××ª×××ª ×©× ××ª×¨ ××××ª ×©××, ××××, ×× ×¤×¨××¤×× ×××ª×¨ ×××¨ "
 
-#: actions/profilesettings.php:122 actions/register.php:468
-#, php-format
-msgid "Describe yourself and your interests in %d chars"
-msgstr ""
-
-#: actions/profilesettings.php:125 actions/register.php:471
-msgid "Describe yourself and your interests"
-msgstr ""
-
 #: actions/profilesettings.php:127 actions/register.php:473
 msgid "Bio"
 msgstr "×××××¨×¤××"
@@ -2054,7 +1875,7 @@ msgid "Couldn't save profile."
 msgstr "×©×××¨×ª ××¤×¨××¤×× × ××©××."
 
 #. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:391 lib/adminpanelaction.php:141
+#: actions/profilesettings.php:391 lib/adminpanelaction.php:138
 msgid "Settings saved."
 msgstr "×××××¨××ª × ×©××¨×."
 
@@ -2067,18 +1888,6 @@ msgstr ""
 msgid "Public timeline"
 msgstr "×§× ××× ×¦××××¨×"
 
-#: actions/public.php:160
-msgid "Public Stream Feed (RSS 1.0)"
-msgstr ""
-
-#: actions/public.php:164
-msgid "Public Stream Feed (RSS 2.0)"
-msgstr ""
-
-#: actions/public.php:168
-msgid "Public Stream Feed (Atom)"
-msgstr ""
-
 #: actions/public.php:188
 #, php-format
 msgid ""
@@ -2113,10 +1922,6 @@ msgid ""
 "tool."
 msgstr ""
 
-#: actions/publictagcloud.php:57
-msgid "Public tag cloud"
-msgstr ""
-
 #: actions/publictagcloud.php:63
 #, php-format
 msgid "These are most popular recent tags on %s "
@@ -2396,18 +2201,10 @@ msgstr "×××¨×©× ××× ××"
 msgid "Invalid profile URL (bad format)"
 msgstr "××ª×××ª ×¤×¨××¤×× ×× ×××§××ª (×¤××¨×× ×× ×ª×§××)"
 
-#: actions/remotesubscribe.php:168
-msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
-msgstr ""
-
 #: actions/remotesubscribe.php:176
 msgid "Thatâs a local profile! Login to subscribe."
 msgstr ""
 
-#: actions/remotesubscribe.php:183
-msgid "Couldnât get a request token."
-msgstr ""
-
 #: actions/repeat.php:57
 msgid "Only logged-in users can repeat notices."
 msgstr ""
@@ -2448,29 +2245,13 @@ msgid ""
 "newnotice%%%%?status_textarea=%3$s)."
 msgstr ""
 
-#: actions/revokerole.php:75
-msgid "You cannot revoke user roles on this site."
-msgstr ""
-
-#: actions/revokerole.php:82
-msgid "User doesn't have this role."
-msgstr ""
-
 #: actions/rsd.php:146 actions/version.php:159
 msgid "StatusNet"
 msgstr "×¡××××¡×××§×"
 
-#: actions/sandbox.php:65 actions/unsandbox.php:65
-msgid "You cannot sandbox users on this site."
-msgstr ""
-
-#: actions/sandbox.php:72
-msgid "User is already sandboxed."
-msgstr ""
-
 #. TRANS: Menu item for site administration
 #: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
-#: lib/adminpanelaction.php:392
+#: lib/adminpanelaction.php:379
 msgid "Sessions"
 msgstr ""
 
@@ -2499,14 +2280,13 @@ msgstr ""
 msgid "Save site settings"
 msgstr "××××¨××ª ××¤×¨××¤××"
 
-#. TRANS: Form input field label for application icon.
-#: actions/showapplication.php:159 lib/applicationeditform.php:182
-msgid "Icon"
+#: actions/showapplication.php:82
+msgid "You must be logged in to view an application."
 msgstr ""
 
-#. TRANS: Form input field label.
-#: actions/showapplication.php:178 lib/applicationeditform.php:235
-msgid "Organization"
+#. TRANS: Form input field label for application icon.
+#: actions/showapplication.php:159 lib/applicationeditform.php:173
+msgid "Icon"
 msgstr ""
 
 #: actions/showapplication.php:192 actions/showgroup.php:436
@@ -2519,10 +2299,18 @@ msgstr "×¡××××¡×××§×"
 msgid "Created by %1$s - %2$s access by default - %3$d users"
 msgstr ""
 
+#: actions/showapplication.php:213
+msgid "Application actions"
+msgstr ""
+
 #: actions/showapplication.php:236
 msgid "Reset key & secret"
 msgstr ""
 
+#: actions/showapplication.php:261
+msgid "Application info"
+msgstr ""
+
 #: actions/showapplication.php:263
 msgid "Consumer key"
 msgstr ""
@@ -2553,21 +2341,6 @@ msgstr ""
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr ""
 
-#: actions/showfavorites.php:79
-#, php-format
-msgid "%1$s's favorite notices, page %2$d"
-msgstr ""
-
-#: actions/showfavorites.php:171
-#, php-format
-msgid "Feed for favorites of %s (RSS 1.0)"
-msgstr ""
-
-#: actions/showfavorites.php:178
-#, php-format
-msgid "Feed for favorites of %s (RSS 2.0)"
-msgstr ""
-
 #: actions/showfavorites.php:206
 msgid ""
 "You haven't chosen any favorite notices yet. Click the fave button on "
@@ -2593,9 +2366,9 @@ msgstr ""
 msgid "This is a way to share what you like."
 msgstr ""
 
-#: actions/showgroup.php:84
+#: actions/showgroup.php:82
 #, php-format
-msgid "%1$s group, page %2$d"
+msgid "%s group"
 msgstr ""
 
 #: actions/showgroup.php:227
@@ -2611,21 +2384,6 @@ msgstr ""
 msgid "Aliases"
 msgstr ""
 
-#: actions/showgroup.php:338
-#, php-format
-msgid "Notice feed for %s group (RSS 1.0)"
-msgstr ""
-
-#: actions/showgroup.php:344
-#, php-format
-msgid "Notice feed for %s group (RSS 2.0)"
-msgstr ""
-
-#: actions/showgroup.php:355
-#, php-format
-msgid "FOAF for %s group"
-msgstr ""
-
 #: actions/showgroup.php:398 lib/profileaction.php:117
 #: lib/profileaction.php:152 lib/profileaction.php:255 lib/section.php:95
 #: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71
@@ -2673,25 +2431,11 @@ msgstr ""
 msgid "Message from %1$s on %2$s"
 msgstr ""
 
-#: actions/shownotice.php:90
-msgid "Notice deleted."
-msgstr ""
-
 #: actions/showstream.php:73
 #, php-format
 msgid " tagged %s"
 msgstr ""
 
-#: actions/showstream.php:79
-#, php-format
-msgid "%1$s, page %2$d"
-msgstr ""
-
-#: actions/showstream.php:122
-#, php-format
-msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
-msgstr ""
-
 #: actions/showstream.php:148
 #, php-format
 msgid "FOAF for %s"
@@ -2736,10 +2480,6 @@ msgstr ""
 msgid "You cannot silence users on this site."
 msgstr ""
 
-#: actions/silence.php:72
-msgid "User is already silenced."
-msgstr ""
-
 #: actions/siteadminpanel.php:69
 msgid "Basic settings for this StatusNet site"
 msgstr ""
@@ -2853,11 +2593,6 @@ msgstr "××××¨××ª ××¤×¨××¤××"
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr ""
 
-#. 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 ""
-
 #. TRANS: Form guide in SMS settings form.
 #: actions/smssettings.php:120
 msgid "Current confirmed SMS-enabled phone number."
@@ -2930,10 +2665,14 @@ msgstr ""
 
 #. TRANS: Menu item for site administration
 #: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
-#: lib/adminpanelaction.php:408
+#: lib/adminpanelaction.php:395
 msgid "Snapshots"
 msgstr ""
 
+#: actions/snapshotadminpanel.php:127
+msgid "Invalid snapshot run value."
+msgstr ""
+
 #: actions/snapshotadminpanel.php:133
 msgid "Snapshot frequency must be a number."
 msgstr ""
@@ -2983,15 +2722,6 @@ msgstr "××× ×¡×ª ×× ×× ×××© × ××©××."
 msgid "This action only accepts POST requests."
 msgstr ""
 
-#: actions/subscribe.php:117
-msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
-msgstr ""
-
-#: actions/subscribers.php:52
-#, php-format
-msgid "%1$s subscribers, page %2$d"
-msgstr ""
-
 #: actions/subscribers.php:63
 msgid "These are the people who listen to your notices."
 msgstr "××× ××× ×©×× ×××××× ×× ×××××¢××ª ×©××."
@@ -3042,25 +2772,6 @@ msgstr ""
 msgid "SMS"
 msgstr "×¡××¡"
 
-#: actions/tag.php:69
-#, php-format
-msgid "Notices tagged with %1$s, page %2$d"
-msgstr ""
-
-#: actions/tag.php:87
-#, php-format
-msgid "Notice feed for tag %s (RSS 1.0)"
-msgstr ""
-
-#: actions/tag.php:93
-#, php-format
-msgid "Notice feed for tag %s (RSS 2.0)"
-msgstr ""
-
-#: actions/tagother.php:39
-msgid "No ID argument."
-msgstr ""
-
 #: actions/tagother.php:65
 #, php-format
 msgid "Tag %s"
@@ -3139,12 +2850,12 @@ msgstr ""
 msgid "New users"
 msgstr "××××¢× ×××©×"
 
-#: actions/useradminpanel.php:236
-msgid "Welcome text for new users (Max 255 chars)."
+#: actions/useradminpanel.php:235
+msgid "New user welcome"
 msgstr ""
 
-#: actions/useradminpanel.php:251
-msgid "Invitations"
+#: actions/useradminpanel.php:236
+msgid "Welcome text for new users (Max 255 chars)."
 msgstr ""
 
 #: actions/useradminpanel.php:256
@@ -3159,13 +2870,6 @@ msgstr ""
 msgid "Authorize subscription"
 msgstr "××©×¨ ×× ××"
 
-#: actions/userauthorization.php:110
-msgid ""
-"Please check these details to make sure that you want to subscribe to this "
-"userâs notices. If you didnât just ask to subscribe to someoneâs notices, "
-"click âRejectâ."
-msgstr ""
-
 #: actions/userauthorization.php:196 actions/version.php:167
 msgid "License"
 msgstr ""
@@ -3195,24 +2899,10 @@ msgstr "×× ××ª××§×© ×××©××¨!"
 msgid "Subscription authorized"
 msgstr "×××¨×©×× ×××©×¨×"
 
-#: actions/userauthorization.php:256
-msgid ""
-"The subscription has been authorized, but no callback URL was passed. Check "
-"with the siteâs instructions for details on how to authorize the "
-"subscription. Your subscription token is:"
-msgstr ""
-
 #: actions/userauthorization.php:266
 msgid "Subscription rejected"
 msgstr "×××¨×©×× × ×××ª×"
 
-#: actions/userauthorization.php:268
-msgid ""
-"The subscription has been rejected, but no callback URL was passed. Check "
-"with the siteâs instructions for details on how to fully reject the "
-"subscription."
-msgstr ""
-
 #: actions/userauthorization.php:303
 #, php-format
 msgid "Listener URI â%sâ not found here."
@@ -3238,16 +2928,6 @@ msgstr ""
 msgid "Avatar URL â%sâ is not valid."
 msgstr ""
 
-#: actions/userauthorization.php:350
-#, php-format
-msgid "Canât read avatar URL â%sâ."
-msgstr ""
-
-#: actions/userauthorization.php:355
-#, php-format
-msgid "Wrong image type for avatar URL â%sâ."
-msgstr ""
-
 #: actions/userdesignsettings.php:87 lib/designsettings.php:76
 msgid ""
 "Customize the way your profile looks with a background image and a colour "
@@ -3258,12 +2938,6 @@ msgstr ""
 msgid "Enjoy your hotdog!"
 msgstr ""
 
-#. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number.
-#: actions/usergroups.php:66
-#, php-format
-msgid "%1$s groups, page %2$d"
-msgstr ""
-
 #: actions/usergroups.php:132
 msgid "Search for more groups"
 msgstr ""
@@ -3434,7 +3108,7 @@ msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
 
 #. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#: classes/Subscription.php:75 lib/oauthstore.php:465
+#: classes/Subscription.php:75 lib/oauthstore.php:466
 msgid "You have been banned from subscribing."
 msgstr ""
 
@@ -3485,6 +3159,11 @@ msgstr "×©×××¨×ª ××¤×¨××¤×× × ××©××."
 msgid "Change email handling"
 msgstr ""
 
+#. TRANS: Link title attribute in user account settings menu.
+#: lib/accountsettingsaction.php:144
+msgid "Other options"
+msgstr ""
+
 #. TRANS: Link description in user account settings menu.
 #: lib/accountsettingsaction.php:146
 msgid "Other"
@@ -3506,25 +3185,14 @@ msgctxt "TOOLTIP"
 msgid "Personal profile and friends timeline"
 msgstr ""
 
-#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:460
-msgctxt "TOOLTIP"
-msgid "Change your email, avatar, password, profile"
-msgstr ""
-
-#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:465
-msgctxt "TOOLTIP"
-msgid "Connect to services"
-msgstr ""
-
 #. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
 #: lib/action.php:468
 msgid "Connect"
 msgstr "××ª×××¨"
 
 #. TRANS: Main menu option when logged in and site admin for access to site configuration
-#: lib/action.php:474
+#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
+#: lib/action.php:474 lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr ""
@@ -3536,24 +3204,12 @@ msgctxt "TOOLTIP"
 msgid "Invite friends and colleagues to join you on %s"
 msgstr ""
 
-#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:481
-msgctxt "MENU"
-msgid "Invite"
-msgstr ""
-
 #. TRANS: Tooltip for main menu option "Logout"
 #: lib/action.php:487
 msgctxt "TOOLTIP"
 msgid "Logout from the site"
 msgstr ""
 
-#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:495
-msgctxt "TOOLTIP"
-msgid "Create an account"
-msgstr ""
-
 #. TRANS: Tooltip for main menu option "Login"
 #: lib/action.php:501
 msgctxt "TOOLTIP"
@@ -3571,11 +3227,6 @@ msgstr ""
 msgid "Local views"
 msgstr ""
 
-#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:778
-msgid "Secondary site navigation"
-msgstr ""
-
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
 #: lib/action.php:784
 msgid "Help"
@@ -3620,22 +3271,17 @@ msgstr ""
 msgid "StatusNet software license"
 msgstr ""
 
-#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
-#: lib/action.php:843
-#, php-format
-msgid ""
-"**%%site.name%%** is a microblogging service brought to you by [%%site."
-"broughtby%%](%%site.broughtbyurl%%)."
-msgstr ""
-
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:846
+#: lib/action.php:849
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** ××× ×©×¨××ª ×××§×¨×××××."
 
 #. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.
-#: lib/action.php:850
+#. TRANS: Make sure there is no whitespace between "]" and "(".
+#. TRANS: Text between [] is a link description, text between () is the link itself.
+#. TRANS: %s is the version of StatusNet that is being used.
+#: lib/action.php:856
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -3648,245 +3294,248 @@ msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:873
+#: lib/action.php:879
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:880
+#: lib/action.php:886
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:884
+#: lib/action.php:890
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 
-#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:897
+#. TRANS: license message in footer.
+#. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
+#: lib/action.php:904
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr ""
 
 #. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1236
+#: lib/action.php:1243
 msgid "Pagination"
 msgstr ""
 
-#. TRANS: Pagination message to go to a page displaying information more in the
-#. TRANS: present than the currently displayed information.
-#: lib/action.php:1247
-msgid "After"
-msgstr ""
-
-#. TRANS: Pagination message to go to a page displaying information more in the
-#. TRANS: past than the currently displayed information.
-#: lib/action.php:1257
-msgid "Before"
-msgstr ""
-
 #. TRANS: Client exception thrown when a feed instance is a DOMDocument.
 #: lib/activity.php:122
 msgid "Expecting a root feed element but got a whole XML document."
 msgstr ""
 
-#: lib/activityutils.php:208
+#. TRANS: Client exception thrown when there is no source attribute.
+#: lib/activityutils.php:203
 msgid "Can't handle remote content yet."
 msgstr ""
 
-#: lib/activityutils.php:244
+#. TRANS: Client exception thrown when there embedded XML content is found that cannot be processed yet.
+#: lib/activityutils.php:240
 msgid "Can't handle embedded XML content yet."
 msgstr ""
 
-#: lib/activityutils.php:248
+#. TRANS: Client exception thrown when base64 encoded content is found that cannot be processed yet.
+#: lib/activityutils.php:245
 msgid "Can't handle embedded Base64 content yet."
 msgstr ""
 
 #. TRANS: Client error message thrown when a user tries to change admin settings but has no access rights.
-#: lib/adminpanelaction.php:98
+#: lib/adminpanelaction.php:96
 msgid "You cannot make changes to this site."
 msgstr ""
 
 #. TRANS: Client error message throw when a certain panel's settings cannot be changed.
-#: lib/adminpanelaction.php:110
+#: lib/adminpanelaction.php:108
 msgid "Changes to that panel are not allowed."
 msgstr ""
 
 #. TRANS: Client error message.
-#: lib/adminpanelaction.php:229
+#: lib/adminpanelaction.php:222
 msgid "showForm() not implemented."
 msgstr ""
 
 #. TRANS: Client error message
-#: lib/adminpanelaction.php:259
+#: lib/adminpanelaction.php:250
 msgid "saveSettings() not implemented."
 msgstr ""
 
 #. TRANS: Client error message thrown if design settings could not be deleted in
 #. TRANS: the admin panel Design.
-#: lib/adminpanelaction.php:284
+#: lib/adminpanelaction.php:274
 msgid "Unable to delete design setting."
 msgstr ""
 
-#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:352
-msgctxt "MENU"
-msgid "Site"
-msgstr ""
-
-#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:360
-msgctxt "MENU"
-msgid "Design"
+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:345
+msgid "Design configuration"
 msgstr ""
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:366
+#: lib/adminpanelaction.php:353
 msgid "User configuration"
 msgstr "××× ×§×× ×××©××¨."
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:368 lib/personalgroupnav.php:115
+#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:115
 msgid "User"
 msgstr "××ª×©××©"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:382
+#: lib/adminpanelaction.php:369
 msgid "Paths configuration"
 msgstr "××× ×§×× ×××©××¨."
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:390
+#: lib/adminpanelaction.php:377
 msgid "Sessions configuration"
 msgstr "××× ×§×× ×××©××¨."
 
 #. TRANS: Client error 401.
-#: lib/apiauth.php:113
+#: lib/apiauth.php:111
 msgid "API resource requires read-write access, but you only have read access."
 msgstr ""
 
-#. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:209
-#, php-format
-msgid "Describe your application in %d characters"
+#. TRANS: OAuth exception thrown when no application is found for a given consumer key.
+#: lib/apiauth.php:175
+msgid "No application for that consumer key."
 msgstr ""
 
-#. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:213
-msgid "Describe your application"
+#. TRANS: OAuth exception given when an incorrect access token was given for a user.
+#: lib/apiauth.php:212
+msgid "Bad access token."
 msgstr ""
 
-#. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:224
-msgid "URL of the homepage of this application"
+#. TRANS: OAuth exception given when no user was found for a given token (no token was found).
+#: lib/apiauth.php:217
+msgid "No user for that token."
 msgstr ""
 
-#. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:233
-msgid "Organization responsible for this application"
+#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
+#: lib/apioauthstore.php:178
+msgid "Tried to revoke unknown token"
+msgstr ""
+
+#. TRANS: Exception thrown when an attempt is made to remove a revoked token.
+#: lib/apioauthstore.php:182
+msgid "Failed to delete revoked token"
+msgstr ""
+
+#. TRANS: Form legend.
+#: lib/applicationeditform.php:129
+msgid "Edit application"
+msgstr ""
+
+#. TRANS: Form guide.
+#: lib/applicationeditform.php:178
+msgid "Icon for this application"
 msgstr ""
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:242
-msgid "URL for the homepage of the organization"
+#: lib/applicationeditform.php:224
+msgid "Organization responsible for this application"
 msgstr ""
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:251
+#: lib/applicationeditform.php:242
 msgid "URL to redirect to after authentication"
 msgstr ""
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:278
+#: lib/applicationeditform.php:269
 msgid "Browser"
 msgstr ""
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:295
+#: lib/applicationeditform.php:286
 msgid "Desktop"
 msgstr ""
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:297
+#: lib/applicationeditform.php:288
 msgid "Type of application, browser or desktop"
 msgstr ""
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:320
+#: lib/applicationeditform.php:311
 msgid "Read-only"
 msgstr ""
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:339
+#: lib/applicationeditform.php:330
 msgid "Read-write"
 msgstr ""
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:341
+#: lib/applicationeditform.php:332
 msgid "Default access for this application: read-only, or read-write"
 msgstr ""
 
-#. TRANS: Submit button title
-#: lib/applicationeditform.php:359
+#. TRANS: Submit button title.
+#: lib/applicationeditform.php:349
 msgid "Cancel"
 msgstr "×××"
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:136
+#: lib/applicationlist.php:135
 msgid "read-write"
 msgstr ""
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:138
+#: lib/applicationlist.php:137
 msgid "read-only"
 msgstr ""
 
 #. 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
+#: lib/applicationlist.php:143
 #, php-format
 msgid "Approved %1$s - \"%2$s\" access."
 msgstr ""
 
 #. TRANS: Button label
-#: lib/applicationlist.php:159
+#: lib/applicationlist.php:158
 msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "×©×××××¨"
 
+#. TRANS: DT element label in attachment list.
+#: lib/attachmentlist.php:88
+msgid "Attachments"
+msgstr ""
+
 #. TRANS: DT element label in attachment list item.
 #: lib/attachmentlist.php:265
 msgid "Author"
 msgstr ""
 
-#: lib/attachmentnoticesection.php:67
+#. TRANS: Title.
+#: lib/attachmentnoticesection.php:68
 msgid "Notices where this attachment appears"
 msgstr ""
 
-#: lib/authenticationplugin.php:236
-msgid "Password changing is not allowed"
+#. TRANS: Title.
+#: lib/attachmenttagcloudsection.php:49
+msgid "Tags for this attachment"
 msgstr ""
 
-#: lib/channel.php:229 lib/mailhandler.php:142
-msgid "Command complete"
+#. TRANS: Title for the form to block a user.
+#: lib/blockform.php:70
+msgid "Block"
 msgstr ""
 
-#: lib/channel.php:240
-msgid "Command failed"
+#: lib/channel.php:157 lib/channel.php:177
+msgid "Command results"
 msgstr ""
 
-#. TRANS: Command exception text shown when a notice ID is requested that does not exist.
-#: lib/command.php:84 lib/command.php:108
-msgid "Notice with that id does not exist."
+#: lib/channel.php:229 lib/mailhandler.php:142
+msgid "Command complete"
 msgstr ""
 
-#. 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:130
-#, php-format
-msgid "Could not find a user with nickname %s."
+#: lib/channel.php:240
+msgid "Command failed"
 msgstr ""
 
 #. TRANS: Message given getting a non-existing user.
@@ -3937,6 +3586,13 @@ msgstr ""
 msgid "%1$s joined group %2$s."
 msgstr ""
 
+#. 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.
+#: lib/command.php:408
+#, php-format
+msgid "%1$s left group %2$s."
+msgstr ""
+
 #. TRANS: Whois output. %s is the bio information of the queried user.
 #: lib/command.php:446
 #, php-format
@@ -3958,13 +3614,6 @@ msgstr ""
 msgid "Message too long - maximum is %1$d characters, you sent %2$d."
 msgstr ""
 
-#. 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:554
-#, php-format
-msgid "Notice from %s repeated."
-msgstr ""
-
 #. TRANS: Error text shown when repeating a notice fails with an unknown reason.
 #: lib/command.php:557
 msgid "Error repeating notice."
@@ -3982,9 +3631,11 @@ msgstr ""
 msgid "Specify the name of the user to subscribe to."
 msgstr ""
 
-#. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
-#: lib/command.php:664
-msgid "Can't subscribe to OMB profiles by command."
+#. TRANS: Text shown after having subscribed to another user successfully.
+#. TRANS: %s is the name of the user the subscription was requested for.
+#: lib/command.php:672
+#, php-format
+msgid "Subscribed to %s."
 msgstr ""
 
 #. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
@@ -3993,6 +3644,13 @@ msgstr ""
 msgid "Specify the name of the user to unsubscribe from."
 msgstr ""
 
+#. TRANS: Text shown after having unsubscribed from another user successfully.
+#. TRANS: %s is the name of the user the unsubscription was requested for.
+#: lib/command.php:705
+#, php-format
+msgid "Unsubscribed from %s."
+msgstr ""
+
 #. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
 #. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
 #: lib/command.php:724 lib/command.php:750
@@ -4021,8 +3679,15 @@ msgstr ""
 msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr ""
 
+#. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
+#. TRANS: %s is the name of the user the unsubscription was requested for.
+#: lib/command.php:813
+#, php-format
+msgid "Unsubscribed %s."
+msgstr ""
+
 #. TRANS: Text shown after requesting other users a user is subscribed to.
-#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.
 #: lib/command.php:836
 msgid "You are subscribed to this person:"
@@ -4031,7 +3696,7 @@ msgstr[0] "×× ×©××× × ×××× × ××ª ××¤×¨××¤×× ×××"
 msgstr[1] "×× ×©××× × ×××× × ××ª ××¤×¨××¤×× ×××"
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
-#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
 #: lib/command.php:863
 msgid "This person is subscribed to you:"
@@ -4040,7 +3705,7 @@ msgstr[0] "××¨×©×× ××¨×××§×ª"
 msgstr[1] "××¨×©×× ××¨×××§×ª"
 
 #. TRANS: Text shown after requesting groups a user is subscribed to.
-#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
 #: lib/command.php:890
 msgid "You are a member of this group:"
@@ -4048,6 +3713,7 @@ msgid_plural "You are a member of these groups:"
 msgstr[0] "×× ×©××× × ×××× × ××ª ××¤×¨××¤×× ×××"
 msgstr[1] "×× ×©××× × ×××× × ××ª ××¤×¨××¤×× ×××"
 
+#. TRANS: Help text for commands.
 #: lib/command.php:905
 msgid ""
 "Commands:\n"
@@ -4114,6 +3780,10 @@ msgstr ""
 msgid "Updates by SMS"
 msgstr ""
 
+#: lib/connectsettingsaction.php:121
+msgid "Authorized connected applications"
+msgstr ""
+
 #: lib/dberroraction.php:60
 msgid "Database error"
 msgstr ""
@@ -4175,45 +3845,32 @@ msgstr ""
 msgid "Grant this user the \"%s\" role"
 msgstr ""
 
-#: lib/groupeditform.php:168
-msgid "Describe the group or topic"
-msgstr ""
-
-#: lib/groupeditform.php:170
-#, php-format
-msgid "Describe the group or topic in %d characters"
-msgstr ""
-
 #: lib/groupeditform.php:187
 #, php-format
 msgid "Extra nicknames for the group, comma- or space- separated, max %d"
 msgstr ""
 
-#: lib/groupnav.php:101
-msgid "Blocked"
-msgstr ""
-
-#: lib/groupnav.php:102
-#, php-format
-msgid "%s blocked users"
-msgstr ""
-
-#: lib/groupnav.php:108
+#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
+#. TRANS: %s is the nickname of the group.
+#: lib/groupnav.php:120
 #, php-format
+msgctxt "TOOLTIP"
 msgid "Edit %s group properties"
 msgstr ""
 
-#: lib/groupnav.php:113
-msgid "Logo"
-msgstr "×××× ×¡"
-
-#: lib/groupnav.php:114
+#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
+#. TRANS: %s is the nickname of the group.
+#: lib/groupnav.php:129
 #, php-format
+msgctxt "TOOLTIP"
 msgid "Add or edit %s logo"
 msgstr ""
 
-#: lib/groupnav.php:120
+#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
+#. TRANS: %s is the nickname of the group.
+#: lib/groupnav.php:138
 #, php-format
+msgctxt "TOOLTIP"
 msgid "Add or edit %s design"
 msgstr ""
 
@@ -4243,7 +3900,8 @@ msgstr "×¤××¨×× ××ª××× × ××× × × ×ª××."
 msgid "Partial upload."
 msgstr "××¢××× ×××§××ª."
 
-#: lib/imagefile.php:101 lib/mediafile.php:170
+#. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
+#: lib/imagefile.php:101 lib/mediafile.php:179
 msgid "System error uploading file."
 msgstr "×©××××ª ××¢×¨××ª ×××¢×××ª ××§×××¥."
 
@@ -4273,10 +3931,6 @@ msgstr ""
 msgid "Unknown inbox source %d."
 msgstr ""
 
-#: lib/logingroupnav.php:86
-msgid "Sign up for a new account"
-msgstr ""
-
 #. TRANS: Body for address confirmation email.
 #: lib/mail.php:177
 #, php-format
@@ -4308,22 +3962,6 @@ msgid ""
 "your subscribers list and report as spam to site administrators at %s"
 msgstr ""
 
-#. TRANS: Main body of new-subscriber notification e-mail
-#: lib/mail.php:254
-#, php-format
-msgid ""
-"%1$s is now listening to your notices on %2$s.\n"
-"\n"
-"\t%3$s\n"
-"\n"
-"%4$s%5$s%6$s\n"
-"Faithfully yours,\n"
-"%7$s.\n"
-"\n"
-"----\n"
-"Change your email address or notification options at %8$s\n"
-msgstr ""
-
 #. TRANS: Subject of notification mail for new posting email address
 #: lib/mail.php:304
 #, php-format
@@ -4399,12 +4037,6 @@ msgid ""
 "%5$s\n"
 msgstr ""
 
-#. TRANS: Subject for favorite notification email
-#: lib/mail.php:589
-#, php-format
-msgid "%s (@%s) added your notice as a favorite"
-msgstr ""
-
 #. TRANS: Body for favorite notification email
 #: lib/mail.php:592
 #, php-format
@@ -4487,56 +4119,69 @@ msgstr ""
 msgid "Sorry, no incoming email allowed."
 msgstr ""
 
-#: lib/mediafile.php:98 lib/mediafile.php:123
+#. TRANS: Client exception thrown when a database error was thrown during a file upload operation.
+#: lib/mediafile.php:99 lib/mediafile.php:125
 msgid "There was a database error while saving your file. Please try again."
 msgstr ""
 
-#: lib/mediafile.php:142
+#. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
+#: lib/mediafile.php:145
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
 msgstr ""
 
-#: lib/mediafile.php:147
+#. TRANS: Client exception.
+#: lib/mediafile.php:151
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form."
 msgstr ""
 
-#: lib/mediafile.php:152
+#. TRANS: Client exception.
+#: lib/mediafile.php:157
 msgid "The uploaded file was only partially uploaded."
 msgstr ""
 
-#: lib/mediafile.php:159
+#. TRANS: Client exception thrown when a temporary folder is not present to store a file upload.
+#: lib/mediafile.php:165
 msgid "Missing a temporary folder."
 msgstr ""
 
-#: lib/mediafile.php:162
+#. TRANS: Client exception thrown when writing to disk is not possible during a file upload operation.
+#: lib/mediafile.php:169
 msgid "Failed to write file to disk."
 msgstr ""
 
-#: lib/mediafile.php:165
+#. TRANS: Client exception thrown when a file upload operation has been stopped by an extension.
+#: lib/mediafile.php:173
 msgid "File upload stopped by extension."
 msgstr ""
 
-#: lib/mediafile.php:179 lib/mediafile.php:217
+#. TRANS: Client exception thrown when a file upload operation would cause a user to exceed a set quota.
+#: lib/mediafile.php:189 lib/mediafile.php:232
 msgid "File exceeds user's quota."
 msgstr ""
 
-#: lib/mediafile.php:197 lib/mediafile.php:234
+#. TRANS: Client exception thrown when a file upload operation fails because the file could
+#. TRANS: not be moved from the temporary folder to the permanent file location.
+#: lib/mediafile.php:209 lib/mediafile.php:251
 msgid "File could not be moved to destination directory."
 msgstr ""
 
-#: lib/mediafile.php:202 lib/mediafile.php:238
-msgid "Could not determine file's MIME type."
-msgstr ""
-
-#: lib/mediafile.php:318
+#. TRANS: Client exception thrown trying to upload a forbidden MIME type.
+#. TRANS: %1$s is the file type that was denied, %2$s is the application part of
+#. TRANS: the MIME type that was denied.
+#: lib/mediafile.php:340
 #, php-format
-msgid " Try using another %s format."
+msgid ""
+"\"%1$s\" is not a supported file type on this server. Try using another %2$s "
+"format."
 msgstr ""
 
-#: lib/mediafile.php:323
+#. TRANS: Client exception thrown trying to upload a forbidden MIME type.
+#. TRANS: %s is the file type that was denied.
+#: lib/mediafile.php:345
 #, php-format
-msgid "%s is not a supported file type on this server."
+msgid "\"%s\" is not a supported file type on this server."
 msgstr ""
 
 #: lib/messageform.php:120
@@ -4547,11 +4192,6 @@ msgstr ""
 msgid "To"
 msgstr "××"
 
-#: lib/messageform.php:178 lib/noticeform.php:237
-msgctxt "Send button for sending notice"
-msgid "Send"
-msgstr ""
-
 #: lib/noticeform.php:174
 #, php-format
 msgid "What's up, %s?"
@@ -4565,21 +4205,12 @@ msgstr ""
 msgid "Attach a file"
 msgstr ""
 
-#: lib/noticeform.php:213
-msgid "Share my location"
-msgstr ""
-
 #: lib/noticeform.php:217
 msgid ""
 "Sorry, retrieving your geo location is taking longer than expected, please "
 "try again later"
 msgstr ""
 
-#. TRANS: Used in coordinates as abbreviation of north
-#: lib/noticelist.php:436
-msgid "N"
-msgstr ""
-
 #. TRANS: Used in coordinates as abbreviation of south
 #: lib/noticelist.php:438
 msgid "S"
@@ -4616,27 +4247,19 @@ msgstr ""
 msgid "Reply"
 msgstr "×ª×××××ª"
 
+#: lib/nudgeform.php:116
+msgid "Nudge this user"
+msgstr ""
+
 #: lib/nudgeform.php:128
 msgid "Nudge"
 msgstr ""
 
-#: lib/oauthstore.php:283
-msgid "Error inserting new profile"
-msgstr "×©×××× ×××× ×¡×ª ××¤×¨××¤××"
-
-#: lib/oauthstore.php:291
-msgid "Error inserting avatar"
-msgstr "×©×××× ×××× ×¡×ª ××ª××× ×."
-
-#: lib/oauthstore.php:306
-msgid "Error updating remote profile"
-msgstr "×©×××× ××¢×××× ×¤×¨××¤×× ××¨×××§"
-
-#: lib/oauthstore.php:311
-msgid "Error inserting remote profile"
-msgstr "×©×××× ×××× ×¡×ª ×¤×¨××¤×× ××¨×××§"
+#: lib/nudgeform.php:128
+msgid "Send a nudge to this user"
+msgstr ""
 
-#: lib/oauthstore.php:490
+#: lib/oauthstore.php:491
 msgid "Couldn't insert new subscription."
 msgstr "××× ×¡×ª ×× ×× ×××© × ××©××."
 
@@ -4669,7 +4292,8 @@ msgstr ""
 msgid "Tags in %s's notices"
 msgstr ""
 
-#: lib/plugin.php:115
+#. TRANS: Displayed as version information for a plugin if no version information was found.
+#: lib/plugin.php:116
 msgid "Unknown"
 msgstr ""
 
@@ -4710,19 +4334,14 @@ msgstr ""
 msgid "Recent tags"
 msgstr ""
 
-#: lib/redirectingaction.php:95
-msgid "No return-to arguments."
+#: lib/publicgroupnav.php:88
+msgid "Featured"
 msgstr ""
 
 #: lib/repeatform.php:132
 msgid "Yes"
 msgstr "××"
 
-#: lib/revokeroleform.php:91
-#, php-format
-msgid "Revoke the \"%s\" role from this user"
-msgstr ""
-
 #: lib/router.php:709
 msgid "No single user defined for single-user mode."
 msgstr ""
@@ -4731,14 +4350,12 @@ msgstr ""
 msgid "Sandbox"
 msgstr ""
 
-#: lib/searchaction.php:126
+#. TRANS: Used as a field label for the field where one or more keywords
+#. TRANS: for searching can be entered.
+#: lib/searchaction.php:129
 msgid "Keyword(s)"
 msgstr ""
 
-#: lib/searchaction.php:127
-msgid "Search"
-msgstr "×××¤××©"
-
 #: lib/searchgroupnav.php:80
 msgid "People"
 msgstr "×× ×©××"
@@ -4763,10 +4380,6 @@ msgstr ""
 msgid "More..."
 msgstr ""
 
-#: lib/silenceform.php:67
-msgid "Silence"
-msgstr ""
-
 #: lib/subgroupnav.php:99
 #, php-format
 msgid "Groups %s is a member of"
@@ -4791,10 +4404,6 @@ msgstr ""
 msgid "People Tagcloud as tagged"
 msgstr ""
 
-#: lib/tagcloudsection.php:56
-msgid "None"
-msgstr ""
-
 #: lib/themeuploader.php:50
 msgid "This server cannot handle theme uploads without ZIP support."
 msgstr ""
@@ -4847,6 +4456,10 @@ msgstr ""
 msgid "Unsubscribe"
 msgstr "××× ×× ××"
 
+#: lib/userprofile.php:234 lib/userprofile.php:248
+msgid "User actions"
+msgstr ""
+
 #: lib/userprofile.php:237
 msgid "User deletion in progress..."
 msgstr ""
@@ -4874,56 +4487,32 @@ msgid "Moderator"
 msgstr ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1102
+#: lib/util.php:1103
 msgid "a few seconds ago"
 msgstr "××¤× × ××¡×¤×¨ ×©× ×××ª"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1105
+#: lib/util.php:1106
 msgid "about a minute ago"
 msgstr "××¤× × ×××§×"
 
-#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1109
-#, php-format
-msgid "about %d minutes ago"
-msgstr "××¤× × ×-%d ××§××ª"
-
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 #: lib/util.php:1112
 msgid "about an hour ago"
 msgstr "××¤× × ××©×¢×"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1116
-#, php-format
-msgid "about %d hours ago"
-msgstr "××¤× × ×-%d ×©×¢××ª"
-
-#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1119
+#: lib/util.php:1118
 msgid "about a day ago"
 msgstr "××¤× × ××××"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1123
-#, php-format
-msgid "about %d days ago"
-msgstr "××¤× × ×-%d ××××"
-
-#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1126
+#: lib/util.php:1124
 msgid "about a month ago"
 msgstr "××¤× × ×××××©"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 #: lib/util.php:1130
-#, php-format
-msgid "about %d months ago"
-msgstr "××¤× × ×-%d ××××©××"
-
-#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1133
 msgid "about a year ago"
 msgstr "××¤× × ××©× ×"
 
diff --git a/locale/hsb/LC_MESSAGES/statusnet.po b/locale/hsb/LC_MESSAGES/statusnet.po
index da63fd6ea7..c1735aad17 100644
--- a/locale/hsb/LC_MESSAGES/statusnet.po
+++ b/locale/hsb/LC_MESSAGES/statusnet.po
@@ -1,8 +1,9 @@
-# Translation of StatusNet to Upper Sorbian
+# Translation of StatusNet to Upper Sorbian (Hornjoserbsce)
+# Expored from translatewiki.net
 #
-# Author@translatewiki.net: Brion
-# Author@translatewiki.net: McDutchie
-# Author@translatewiki.net: Michawiki
+# Author: Brion
+# Author: McDutchie
+# Author: Michawiki
 # --
 # This file is distributed under the same license as the StatusNet package.
 #
@@ -10,21 +11,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-08 22:33+0000\n"
-"PO-Revision-Date: 2010-09-08 22:34:25+0000\n"
-"Language-Team: Dutch\n"
+"POT-Creation-Date: 2010-09-14 19:53+0000\n"
+"PO-Revision-Date: 2010-09-14 19:54:00+0000\n"
+"Language-Team: Upper Sorbian <http://translatewiki.net/wiki/Portal:hsb>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r72348); Translate extension (2010-08-20)\n"
+"X-Generator: MediaWiki 1.17alpha (r73009); Translate extension (2010-08-20)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: hsb\n"
-"X-Message-Group: out-statusnet\n"
+"X-Message-Group: #out-statusnet\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : (n%100==3 || "
 "n%100==4) ? 2 : 3)\n"
+"X-POT-Import-Date: 1284-49-16 34::+0000\n"
 
 #. TRANS: Page title
 #. TRANS: Menu item for site administration
-#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:376
+#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:363
 msgid "Access"
 msgstr "PÅistup"
 
@@ -77,10 +79,10 @@ 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 actions/emailsettings.php:224
-#: actions/imsettings.php:184 actions/smssettings.php:209
-#: lib/applicationeditform.php:361
+#. TRANS: Button label in the "Edit application" form.
+#: actions/accessadminpanel.php:203 actions/emailsettings.php:228
+#: actions/imsettings.php:187 actions/smssettings.php:209
+#: lib/applicationeditform.php:351
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "SkÅadowaÄ"
@@ -93,15 +95,15 @@ msgstr "Strona njeeksistuje."
 
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #: actions/all.php:79 actions/allrss.php:68
-#: actions/apiaccountupdatedeliverydevice.php:114
-#: actions/apiaccountupdateprofile.php:105
-#: actions/apiaccountupdateprofilebackgroundimage.php:116
-#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
-#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
-#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:113
-#: actions/apigroupismember.php:91 actions/apigroupjoin.php:100
-#: actions/apigroupleave.php:100 actions/apigrouplist.php:73
-#: actions/apistatusesupdate.php:229 actions/apisubscriptions.php:87
+#: actions/apiaccountupdatedeliverydevice.php:115
+#: actions/apiaccountupdateprofile.php:106
+#: actions/apiaccountupdateprofilebackgroundimage.php:117
+#: actions/apiaccountupdateprofileimage.php:106 actions/apiblockcreate.php:98
+#: actions/apiblockdestroy.php:97 actions/apidirectmessage.php:77
+#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:114
+#: actions/apigroupismember.php:91 actions/apigroupjoin.php:101
+#: actions/apigroupleave.php:101 actions/apigrouplist.php:73
+#: actions/apistatusesupdate.php:230 actions/apisubscriptions.php:87
 #: actions/apitimelinefavorites.php:72 actions/apitimelinefriends.php:174
 #: actions/apitimelinehome.php:80 actions/apitimelinementions.php:80
 #: actions/apitimelineuser.php:82 actions/avatarbynickname.php:75
@@ -193,16 +195,16 @@ msgid "Updates from %1$s and friends on %2$s!"
 msgstr "Aktualizacije wot %1$s a pÅeÄelow na %2$s!"
 
 #: actions/apiaccountratelimitstatus.php:72
-#: actions/apiaccountupdatedeliverydevice.php:94
-#: actions/apiaccountupdateprofile.php:97
-#: actions/apiaccountupdateprofilebackgroundimage.php:94
-#: actions/apiaccountupdateprofilecolors.php:118
+#: actions/apiaccountupdatedeliverydevice.php:95
+#: actions/apiaccountupdateprofile.php:98
+#: actions/apiaccountupdateprofilebackgroundimage.php:95
+#: actions/apiaccountupdateprofilecolors.php:119
 #: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156
-#: actions/apifavoritecreate.php:100 actions/apifavoritedestroy.php:101
-#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100
-#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:139
-#: actions/apigroupismember.php:115 actions/apigroupjoin.php:156
-#: actions/apigroupleave.php:142 actions/apigrouplist.php:137
+#: actions/apifavoritecreate.php:101 actions/apifavoritedestroy.php:102
+#: actions/apifriendshipscreate.php:101 actions/apifriendshipsdestroy.php:101
+#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:140
+#: actions/apigroupismember.php:115 actions/apigroupjoin.php:157
+#: actions/apigroupleave.php:143 actions/apigrouplist.php:137
 #: actions/apigrouplistall.php:122 actions/apigroupmembership.php:107
 #: actions/apigroupshow.php:116 actions/apihelptest.php:88
 #: actions/apistatusesdestroy.php:104 actions/apistatusesretweets.php:112
@@ -217,47 +219,49 @@ msgstr "Aktualizacije wot %1$s a pÅeÄelow na %2$s!"
 msgid "API method not found."
 msgstr "API-metoda njenamakana."
 
-#: actions/apiaccountupdatedeliverydevice.php:86
-#: actions/apiaccountupdateprofile.php:89
-#: actions/apiaccountupdateprofilebackgroundimage.php:86
-#: actions/apiaccountupdateprofilecolors.php:110
-#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89
-#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109
-#: actions/apifavoritecreate.php:91 actions/apifavoritedestroy.php:92
-#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
-#: actions/apigroupcreate.php:105 actions/apigroupjoin.php:92
-#: actions/apigroupleave.php:92 actions/apimediaupload.php:67
-#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:198
+#. TRANS: Client error message. POST is a HTTP command. It should not be translated.
+#. TRANS: Client error. POST is a HTTP command. It should not be translated.
+#: actions/apiaccountupdatedeliverydevice.php:87
+#: actions/apiaccountupdateprofile.php:90
+#: actions/apiaccountupdateprofilebackgroundimage.php:87
+#: actions/apiaccountupdateprofilecolors.php:111
+#: actions/apiaccountupdateprofileimage.php:85 actions/apiblockcreate.php:90
+#: actions/apiblockdestroy.php:89 actions/apidirectmessagenew.php:110
+#: actions/apifavoritecreate.php:92 actions/apifavoritedestroy.php:93
+#: actions/apifriendshipscreate.php:92 actions/apifriendshipsdestroy.php:92
+#: actions/apigroupcreate.php:106 actions/apigroupjoin.php:93
+#: actions/apigroupleave.php:93 actions/apimediaupload.php:68
+#: actions/apistatusesretweet.php:66 actions/apistatusesupdate.php:199
 msgid "This method requires a POST."
 msgstr "Tuta metoda wuÅ¾aduje sej POST."
 
-#: actions/apiaccountupdatedeliverydevice.php:106
+#: actions/apiaccountupdatedeliverydevice.php:107
 msgid ""
 "You must specify a parameter named 'device' with a value of one of: sms, im, "
 "none."
 msgstr ""
 
-#: actions/apiaccountupdatedeliverydevice.php:133
+#: actions/apiaccountupdatedeliverydevice.php:134
 msgid "Could not update user."
 msgstr "WuÅ¾iwar njeje so daÅ aktualizowaÄ."
 
-#: actions/apiaccountupdateprofile.php:112
-#: actions/apiaccountupdateprofilebackgroundimage.php:194
-#: actions/apiaccountupdateprofilecolors.php:185
-#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/apiaccountupdateprofile.php:113
+#: actions/apiaccountupdateprofilebackgroundimage.php:195
+#: actions/apiaccountupdateprofilecolors.php:186
+#: actions/apiaccountupdateprofileimage.php:131 actions/apiusershow.php:108
 #: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/hcard.php:74
 #: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
 #: lib/profileaction.php:84
 msgid "User has no profile."
 msgstr "WuÅ¾iwar nima profil."
 
-#: actions/apiaccountupdateprofile.php:147
+#: actions/apiaccountupdateprofile.php:148
 msgid "Could not save profile."
 msgstr "Profil njeje so skÅadowaÄ daÅ."
 
-#: actions/apiaccountupdateprofilebackgroundimage.php:108
-#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
-#: actions/apistatusesupdate.php:212 actions/avatarsettings.php:257
+#: actions/apiaccountupdateprofilebackgroundimage.php:109
+#: actions/apiaccountupdateprofileimage.php:98 actions/apimediaupload.php:81
+#: actions/apistatusesupdate.php:213 actions/avatarsettings.php:257
 #: actions/designadminpanel.php:123 actions/editapplication.php:118
 #: actions/newapplication.php:101 actions/newnotice.php:94
 #: lib/designsettings.php:283
@@ -267,20 +271,20 @@ msgid ""
 "current configuration."
 msgstr ""
 
-#: actions/apiaccountupdateprofilebackgroundimage.php:187
-#: actions/apiaccountupdateprofilecolors.php:142
+#: actions/apiaccountupdateprofilebackgroundimage.php:188
+#: actions/apiaccountupdateprofilecolors.php:143
 msgid "Could not update your design."
 msgstr "Design njeda so aktualizowaÄ."
 
-#: actions/apiblockcreate.php:105
+#: actions/apiblockcreate.php:106
 msgid "You cannot block yourself!"
 msgstr "NjemÃ³Å¾eÅ¡ so samoho blokowaÄ."
 
-#: actions/apiblockcreate.php:126
+#: actions/apiblockcreate.php:127
 msgid "Block user failed."
 msgstr "Blokowanje wuÅ¾iwarja je so njeporadÅºiÅo."
 
-#: actions/apiblockdestroy.php:114
+#: actions/apiblockdestroy.php:115
 msgid "Unblock user failed."
 msgstr "Wotblokowanje wuÅ¾iwarja je so njeporadÅºiÅo."
 
@@ -304,52 +308,52 @@ msgstr "Direktne powÄsÄe do %s"
 msgid "All the direct messages sent to %s"
 msgstr "WÅ¡Ä do %s pÃ³sÅane direktne powÄsÄe"
 
-#: actions/apidirectmessagenew.php:118
+#: actions/apidirectmessagenew.php:119
 msgid "No message text!"
 msgstr "Å½adyn powÄsÄowy tekst!"
 
-#: actions/apidirectmessagenew.php:127 actions/newmessage.php:150
+#: actions/apidirectmessagenew.php:128 actions/newmessage.php:150
 #, php-format
 msgid "That's too long. Max message size is %d chars."
 msgstr "To je pÅedoÅho. Maksimalna powÄsÄowa wulkosÄ je %d znamjeÅ¡kow."
 
-#: actions/apidirectmessagenew.php:138
+#: actions/apidirectmessagenew.php:139
 msgid "Recipient user not found."
 msgstr "PÅijimowar njenamakany."
 
-#: actions/apidirectmessagenew.php:142
+#: actions/apidirectmessagenew.php:143
 msgid "Can't send direct messages to users who aren't your friend."
 msgstr ""
 "Njeje mÃ³Å¾no, direktne powÄsÄe wuÅ¾iwarjam pÃ³sÅaÄ, kotÅiÅ¾ twoji pÅeÄeljo "
 "njejsu."
 
-#: actions/apifavoritecreate.php:109 actions/apifavoritedestroy.php:110
+#: actions/apifavoritecreate.php:110 actions/apifavoritedestroy.php:111
 #: actions/apistatusesdestroy.php:121
 msgid "No status found with that ID."
 msgstr "Status z tym ID njenamakany."
 
-#: actions/apifavoritecreate.php:120
+#: actions/apifavoritecreate.php:121
 msgid "This status is already a favorite."
 msgstr "TutÃ³n status je hiÅ¾o faworit."
 
 #. TRANS: Error message text shown when a favorite could not be set.
-#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:296
+#: actions/apifavoritecreate.php:132 actions/favor.php:84 lib/command.php:296
 msgid "Could not create favorite."
 msgstr "Faworit njeda so wutworiÄ."
 
-#: actions/apifavoritedestroy.php:123
+#: actions/apifavoritedestroy.php:124
 msgid "That status is not a favorite."
 msgstr "TÃ³n status faworit njeje."
 
-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
+#: actions/apifavoritedestroy.php:136 actions/disfavor.php:87
 msgid "Could not delete favorite."
 msgstr "Faworit njeda so zhaÅ¡eÄ."
 
-#: actions/apifriendshipscreate.php:109
+#: actions/apifriendshipscreate.php:110
 msgid "Could not follow user: profile not found."
 msgstr "NjebÄ mÃ³Å¾no wuÅ¾iwarja sÅÄdowaÄ: profil njenamakany."
 
-#: actions/apifriendshipsdestroy.php:120
+#: actions/apifriendshipsdestroy.php:121
 msgid "You cannot unfollow yourself."
 msgstr "NjemÃ³Å¾eÅ¡ slÄdowanje swÃ³jskich aktiwitow blokowaÄ."
 
@@ -365,102 +369,102 @@ msgstr "Å½Ã³rÅowy wuÅ¾iwar njeda so postajiÄ."
 msgid "Could not find target user."
 msgstr "Cilowy wuÅ¾iwar njeda so namakaÄ."
 
-#: actions/apigroupcreate.php:167 actions/editgroup.php:186
+#: actions/apigroupcreate.php:168 actions/editgroup.php:186
 #: actions/newgroup.php:126 actions/profilesettings.php:215
 #: actions/register.php:212
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr ""
 "PÅimjeno smÄ jenoÅ¾ maÅe pismiki a cyfry wobsahowaÄ. Mjezery njejsu dowolene."
 
-#: actions/apigroupcreate.php:176 actions/editgroup.php:190
+#: actions/apigroupcreate.php:177 actions/editgroup.php:190
 #: actions/newgroup.php:130 actions/profilesettings.php:238
 #: actions/register.php:215
 msgid "Nickname already in use. Try another one."
 msgstr "PÅimjeno so hiÅ¾o wuÅ¾iwa. Spytaj druhe."
 
-#: actions/apigroupcreate.php:183 actions/editgroup.php:193
+#: actions/apigroupcreate.php:184 actions/editgroup.php:193
 #: actions/newgroup.php:133 actions/profilesettings.php:218
 #: actions/register.php:217
 msgid "Not a valid nickname."
 msgstr "Å½ane pÅaÄiwe pÅimjeno."
 
-#: actions/apigroupcreate.php:199 actions/editapplication.php:215
+#: actions/apigroupcreate.php:200 actions/editapplication.php:215
 #: actions/editgroup.php:199 actions/newapplication.php:203
 #: actions/newgroup.php:139 actions/profilesettings.php:222
 #: actions/register.php:224
 msgid "Homepage is not a valid URL."
 msgstr "Startowa strona njeje pÅaÄiwy URL."
 
-#: actions/apigroupcreate.php:208 actions/editgroup.php:202
+#: actions/apigroupcreate.php:209 actions/editgroup.php:202
 #: actions/newgroup.php:142 actions/profilesettings.php:225
 #: actions/register.php:227
 msgid "Full name is too long (max 255 chars)."
 msgstr "DospoÅne mjeno je pÅedoÅho (maks. 255 znamjeÅ¡kow)."
 
-#: actions/apigroupcreate.php:216 actions/editapplication.php:190
+#: actions/apigroupcreate.php:217 actions/editapplication.php:190
 #: actions/newapplication.php:172
 #, php-format
 msgid "Description is too long (max %d chars)."
 msgstr "Wopisanje je pÅedoÅho (maks. %d znamjeÅ¡kow)."
 
-#: actions/apigroupcreate.php:227 actions/editgroup.php:208
+#: actions/apigroupcreate.php:228 actions/editgroup.php:208
 #: actions/newgroup.php:148 actions/profilesettings.php:232
 #: actions/register.php:234
 msgid "Location is too long (max 255 chars)."
 msgstr "MÄstno je pÅedoÅho (maks. 255 znamjeÅ¡kow)."
 
-#: actions/apigroupcreate.php:246 actions/editgroup.php:219
+#: actions/apigroupcreate.php:247 actions/editgroup.php:219
 #: actions/newgroup.php:159
 #, php-format
 msgid "Too many aliases! Maximum %d."
 msgstr "PÅewjele aliasow! Maksimum: %d."
 
-#: actions/apigroupcreate.php:267
+#: actions/apigroupcreate.php:268
 #, php-format
 msgid "Invalid alias: \"%s\"."
 msgstr "NjepÅaÄiwy alias: \"%s\"."
 
-#: actions/apigroupcreate.php:276 actions/editgroup.php:232
+#: actions/apigroupcreate.php:277 actions/editgroup.php:232
 #: actions/newgroup.php:172
 #, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr "Alias \"%s\" so hiÅ¾o wuÅ¾iwa. Spytaj druhi."
 
-#: actions/apigroupcreate.php:289 actions/editgroup.php:238
+#: actions/apigroupcreate.php:290 actions/editgroup.php:238
 #: actions/newgroup.php:178
 msgid "Alias can't be the same as nickname."
 msgstr "Alias njemÃ³Å¾e samsny kaÅ¾ pÅimjeno byÄ."
 
-#: actions/apigroupismember.php:96 actions/apigroupjoin.php:105
-#: actions/apigroupleave.php:105 actions/apigroupmembership.php:92
+#: actions/apigroupismember.php:96 actions/apigroupjoin.php:106
+#: actions/apigroupleave.php:106 actions/apigroupmembership.php:92
 #: actions/apigroupshow.php:83 actions/apitimelinegroup.php:92
 msgid "Group not found."
 msgstr "Skupina njenamakana."
 
 #. TRANS: Error text shown a user tries to join a group they already are a member of.
-#: actions/apigroupjoin.php:111 actions/joingroup.php:100 lib/command.php:336
+#: actions/apigroupjoin.php:112 actions/joingroup.php:100 lib/command.php:336
 msgid "You are already a member of that group."
 msgstr "Sy hiÅ¾o ÄÅon teje skupiny."
 
 #. TRANS: Error text shown when a user tries to join a group they are blocked from joining.
-#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:341
+#: actions/apigroupjoin.php:121 actions/joingroup.php:105 lib/command.php:341
 msgid "You have been blocked from that group by the admin."
 msgstr "Administratora tuteje skupiny je Äe zablokowaÅ."
 
 #. 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.
-#: actions/apigroupjoin.php:139 actions/joingroup.php:134 lib/command.php:353
+#: actions/apigroupjoin.php:140 actions/joingroup.php:134 lib/command.php:353
 #, 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Ä."
 
-#: actions/apigroupleave.php:115
+#: actions/apigroupleave.php:116
 msgid "You are not a member of this group."
 msgstr "Njejsy ÄÅon tuteje skupiny."
 
 #. 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.
-#: actions/apigroupleave.php:125 actions/leavegroup.php:129
+#: actions/apigroupleave.php:126 actions/leavegroup.php:129
 #: lib/command.php:401
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
@@ -490,7 +494,7 @@ msgstr "%s skupinow"
 msgid "groups on %s"
 msgstr "skupiny na %s"
 
-#: actions/apimediaupload.php:99
+#: actions/apimediaupload.php:100
 msgid "Upload failed."
 msgstr "NahraÄe je so njeporadÅºiÅo."
 
@@ -504,9 +508,9 @@ msgstr "NjepÅaÄiwy token."
 
 #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
 #: actions/deletenotice.php:169 actions/disfavor.php:74
-#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:55
+#: actions/emailsettings.php:271 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:66 actions/imsettings.php:227
+#: actions/groupunblock.php:66 actions/imsettings.php:230
 #: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
@@ -549,8 +553,8 @@ msgstr ""
 #. 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:286 actions/grouplogo.php:322
-#: actions/imsettings.php:242 actions/newapplication.php:121
+#: actions/emailsettings.php:290 actions/grouplogo.php:322
+#: actions/imsettings.php:245 actions/newapplication.php:121
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
 #: actions/smssettings.php:277 lib/designsettings.php:304
 msgid "Unexpected form submission."
@@ -611,18 +615,18 @@ msgstr "Tuta metoda wuÅ¾aduje sej POST abo DELETE."
 msgid "You may not delete another user's status."
 msgstr "NjemÃ³Å¾eÅ¡ status druheho wuÅ¾iwarja zniÄiÄ."
 
-#: actions/apistatusesretweet.php:75 actions/apistatusesretweets.php:72
+#: actions/apistatusesretweet.php:76 actions/apistatusesretweets.php:72
 #: actions/deletenotice.php:52 actions/shownotice.php:92
 msgid "No such notice."
 msgstr "ZdÅºÄlenka njeeksistuje."
 
 #. TRANS: Error text shown when trying to repeat an own notice.
-#: actions/apistatusesretweet.php:83 lib/command.php:538
+#: actions/apistatusesretweet.php:84 lib/command.php:538
 msgid "Cannot repeat your own notice."
 msgstr "NjemÃ³Å¾no twoju zdÅºÄlenku wospjetowaÄ."
 
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-#: actions/apistatusesretweet.php:91 lib/command.php:544
+#: actions/apistatusesretweet.php:92 lib/command.php:544
 msgid "Already repeated that notice."
 msgstr "Tuta zdÅºÄlenka bu hiÅ¾o wospjetowana."
 
@@ -634,21 +638,21 @@ msgstr "Status zniÄeny."
 msgid "No status with that ID found."
 msgstr "Å½adyn status z tym ID namakany."
 
-#: actions/apistatusesupdate.php:221
+#: actions/apistatusesupdate.php:222
 msgid "Client must provide a 'status' parameter with a value."
 msgstr ""
 
-#: actions/apistatusesupdate.php:242 actions/newnotice.php:157
+#: actions/apistatusesupdate.php:243 actions/newnotice.php:157
 #: lib/mailhandler.php:60
 #, php-format
 msgid "That's too long. Max notice size is %d chars."
 msgstr "To je pÅedoÅho. Maksimalna wulkosÄ zdÅºÄlenki je %d znamjeÅ¡kow."
 
-#: actions/apistatusesupdate.php:283 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:284 actions/apiusershow.php:96
 msgid "Not found."
 msgstr "Njenamakany."
 
-#: actions/apistatusesupdate.php:306 actions/newnotice.php:181
+#: actions/apistatusesupdate.php:307 actions/newnotice.php:181
 #, php-format
 msgid "Max notice size is %d chars, including attachment URL."
 msgstr ""
@@ -827,7 +831,9 @@ msgid "Yes"
 msgstr "Haj"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
+#. TRANS: Submit button title.
+#. TRANS: Description of the form to block a user.
+#: actions/block.php:164 actions/groupmembers.php:403 lib/blockform.php:82
 msgid "Block this user"
 msgstr "Tutoho wuÅ¾iwarja blokowaÄ"
 
@@ -861,11 +867,13 @@ msgstr "%1$s zablokowa profile, stronu %2$d"
 msgid "Unblock user from group"
 msgstr "WuÅ¾iwarja za skupinu wotblokowaÄ"
 
-#: actions/blockedfromgroup.php:320 lib/unblockform.php:69
+#. TRANS: Title for the form to unblock a user.
+#: actions/blockedfromgroup.php:320 lib/unblockform.php:70
 msgid "Unblock"
 msgstr "WotblokowaÄ"
 
-#: actions/blockedfromgroup.php:320 lib/unblockform.php:80
+#. TRANS: Description of the form to unblock a user.
+#: actions/blockedfromgroup.php:320 lib/unblockform.php:82
 msgid "Unblock this user"
 msgstr "Tutoho wuÅ¾iwarja wotblokowaÄ"
 
@@ -904,9 +912,9 @@ msgstr "Tuta adresa bu hiÅ¾o wobkruÄena."
 #. 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/confirmaddress.php:116 actions/emailsettings.php:331
+#: actions/emailsettings.php:477 actions/imsettings.php:283
+#: actions/imsettings.php:442 actions/othersettings.php:174
 #: actions/profilesettings.php:283 actions/smssettings.php:308
 #: actions/smssettings.php:464
 msgid "Couldn't update user."
@@ -914,7 +922,7 @@ msgstr "WuÅ¾iwar njeda aktualizowaÄ."
 
 #. 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/confirmaddress.php:128 actions/emailsettings.php:437
 #: actions/smssettings.php:422
 msgid "Couldn't delete email confirmation."
 msgstr "E-mejlowe wobkruÄenje njeda so zhaÅ¡eÄ."
@@ -950,9 +958,10 @@ msgstr "Aplikaciska njenamakana."
 msgid "You are not the owner of this application."
 msgstr "Njejsy wobsedÅºer tuteje aplikacije."
 
+#. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:127
 #: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1307
+#: lib/action.php:1315
 msgid "There was a problem with your session token."
 msgstr ""
 
@@ -983,7 +992,7 @@ msgstr "Tutu aplikaciju zniÄiÄ"
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
 #: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:73 lib/profileformaction.php:64
+#: lib/adminpanelaction.php:71 lib/profileformaction.php:64
 #: lib/settingsaction.php:72
 msgid "Not logged in."
 msgstr "NjepÅizjewjeny."
@@ -1042,7 +1051,6 @@ msgstr "Tutoho wuÅ¾iwarja wuÅ¡mÃ³rnyÄ"
 #. TRANS: Message used as title for design settings for the site.
 #. TRANS: Link description in user account settings menu.
 #: actions/designadminpanel.php:63 lib/accountsettingsaction.php:139
-#: lib/groupnav.php:119
 msgid "Design"
 msgstr "Design"
 
@@ -1154,13 +1162,13 @@ msgstr "Standardne designy wobnowiÄ"
 msgid "Reset back to default"
 msgstr "Na standard wrÃ³Äo stajiÄ"
 
-#. TRANS: Submit button title
+#. TRANS: Submit button title.
 #: actions/designadminpanel.php:685 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/snapshotadminpanel.php:245
 #: actions/subscriptions.php:226 actions/tagother.php:154
-#: actions/useradminpanel.php:294 lib/applicationeditform.php:363
+#: actions/useradminpanel.php:294 lib/applicationeditform.php:353
 #: lib/designsettings.php:256 lib/groupeditform.php:202
 msgid "Save"
 msgstr "SkÅadowaÄ"
@@ -1308,7 +1316,7 @@ msgstr "Aktualna wobkruÄena e-mejlowa adresa."
 #. 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/emailsettings.php:115 actions/emailsettings.php:162
 #: actions/imsettings.php:116 actions/smssettings.php:124
 #: actions/smssettings.php:180
 msgctxt "BUTTON"
@@ -1324,22 +1332,26 @@ msgstr ""
 #. 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
+#. TRANS: Button label in the "Edit application" form.
 #: actions/emailsettings.php:127 actions/imsettings.php:131
-#: actions/smssettings.php:137 lib/applicationeditform.php:357
+#: actions/smssettings.php:137 lib/applicationeditform.php:347
 msgctxt "BUTTON"
 msgid "Cancel"
 msgstr "PÅetorhnyÄ"
 
-#. TRANS: Instructions for e-mail address input form.
-#: actions/emailsettings.php:135
+#. TRANS: Instructions for e-mail address input form. Do not translate
+#. TRANS: "example.org". It is one of the domain names reserved for
+#. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
+#. TRANS: Any other domain may be owned by a legitimate person or
+#. TRANS: organization.
+#: actions/emailsettings.php:139
 msgid "Email address, like \"UserName@example.org\""
 msgstr "E-mejlowa adresa, kaÅ¾ na pÅ. \"WuÅ¾iwarskeMjeno@example.org\""
 
 #. 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/emailsettings.php:143 actions/imsettings.php:151
 #: actions/smssettings.php:162
 msgctxt "BUTTON"
 msgid "Add"
@@ -1347,144 +1359,144 @@ msgstr "PÅidaÄ"
 
 #. 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
+#: actions/emailsettings.php:151 actions/smssettings.php:171
 msgid "Incoming email"
 msgstr "DochadÅºaca e-mejl"
 
 #. 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
+#: actions/emailsettings.php:159 actions/smssettings.php:178
 msgid "Send email to this address to post new notices."
 msgstr ""
 
 #. 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
+#: actions/emailsettings.php:168 actions/smssettings.php:186
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr ""
 
 #. 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
+#: actions/emailsettings.php:172 actions/smssettings.php:189
 msgctxt "BUTTON"
 msgid "New"
 msgstr "Nowy"
 
 #. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:174
+#: actions/emailsettings.php:178
 msgid "Email preferences"
 msgstr "E-mejlowe nastajenja"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:180
+#: actions/emailsettings.php:184
 msgid "Send me notices of new subscriptions through email."
 msgstr ""
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:193
+#: actions/emailsettings.php:197
 msgid "Send me email when someone sends me a private message."
 msgstr "E-mejl pÃ³sÅaÄ, hdyÅ¾ nÄchtÃ³ priwatnu powÄsÄ sÄele."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:205
+#: actions/emailsettings.php:209
 msgid "Allow friends to nudge me and send me an email."
 msgstr ""
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:212
+#: actions/emailsettings.php:216
 msgid "I want to post notices by email."
 msgstr "Chcu zdÅºÄlenki pÅez e-mejl pÃ³sÅaÄ."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:219
+#: actions/emailsettings.php:223
 msgid "Publish a MicroID for my email address."
 msgstr "MicroID za moju e-mejlowu adresu publikowaÄ"
 
 #. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:334
+#: actions/emailsettings.php:338
 msgid "Email preferences saved."
 msgstr "E-mejlowe nastajenja skÅadowane."
 
 #. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:353
+#: actions/emailsettings.php:357
 msgid "No email address."
 msgstr "Å½ana e-mejlowa adresa."
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:361
+#: actions/emailsettings.php:365
 msgid "Cannot normalize that email address"
 msgstr "Tuta e-mejlowa adresa njehodÅºi so normalizowaÄ"
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:208
+#: actions/emailsettings.php:370 actions/register.php:208
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "NjepÅaÄiwa e-mejlowa adresa."
 
 #. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:370
+#: actions/emailsettings.php:374
 msgid "That is already your email address."
 msgstr "To je hiÅ¾o twoja e-mejlowa adresa."
 
 #. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:374
+#: actions/emailsettings.php:378
 msgid "That email address already belongs to another user."
 msgstr "Ta e-mejlowa adresa hiÅ¾o sÅuÅ¡a k druhemu wuÅ¾iwarjej."
 
 #. 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/emailsettings.php:395 actions/imsettings.php:351
 #: actions/smssettings.php:373
 msgid "Couldn't insert confirmation code."
 msgstr "WobkruÄenski kod njehodÅºi so zasunyÄ."
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:398
+#: actions/emailsettings.php:402
 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 ""
 
 #. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:424
+#: actions/emailsettings.php:428
 msgid "That is the wrong email address."
 msgstr "To je wopaÄna e-mejlowa adresa."
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:438
+#: actions/emailsettings.php:442
 msgid "Email confirmation cancelled."
 msgstr "E-mejlowe wobkruÄenje pÅetorhnjene."
 
 #. TRANS: Message given trying to remove an e-mail address that is not
 #. TRANS: registered for the active user.
-#: actions/emailsettings.php:458
+#: actions/emailsettings.php:462
 msgid "That is not your email address."
 msgstr "To njeje twoja e-mejlowa adresa."
 
 #. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:479
+#: actions/emailsettings.php:483
 msgid "The email address was removed."
 msgstr "E-mejlowa adresa bu wotstronjena."
 
-#: actions/emailsettings.php:493 actions/smssettings.php:568
+#: actions/emailsettings.php:497 actions/smssettings.php:568
 msgid "No incoming email address."
 msgstr "Å½ana adresa za dochadÅºace e-mejle."
 
 #. 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/emailsettings.php:508 actions/emailsettings.php:532
 #: actions/smssettings.php:578 actions/smssettings.php:602
 msgid "Couldn't update user record."
 msgstr "Datowa sadÅºba wuÅ¾iwarja njeda so aktualizowaÄ."
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
-#: actions/emailsettings.php:508 actions/smssettings.php:581
+#: actions/emailsettings.php:512 actions/smssettings.php:581
 msgid "Incoming email address removed."
 msgstr "Adresa za dochadÅºaÄe e-mejle wotstronjena."
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
-#: actions/emailsettings.php:532 actions/smssettings.php:605
+#: actions/emailsettings.php:536 actions/smssettings.php:605
 msgid "New incoming email address added."
 msgstr "Nowa adresa za dochadÅºace e-mejle pÅidata."
 
@@ -1558,6 +1570,10 @@ msgstr "Å½ane nahrate pÅiwÄÅ¡ki."
 msgid "Not expecting this response!"
 msgstr "NjewoÄakowana wotmoÅwa!"
 
+#: actions/finishremotesubscribe.php:80
+msgid "User being listened to does not exist."
+msgstr ""
+
 #: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59
 msgid "You can use the local subscription!"
 msgstr "MÃ³Å¾eÅ¡ lokalny abonement wuÅ¾iwaÄ!"
@@ -1578,7 +1594,7 @@ msgstr ""
 msgid "Remote service uses unknown version of OMB protocol."
 msgstr ""
 
-#: actions/finishremotesubscribe.php:138
+#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306
 msgid "Error updating remote profile."
 msgstr "Zmylk pÅi aktualizaciji zdaleneho profila."
 
@@ -1635,7 +1651,7 @@ msgstr "WuÅ¾iwar je hiÅ¾o za skupinu zablokowany."
 msgid "User is not a member of group."
 msgstr "WuÅ¾iwar njeje ÄÅon skupiny."
 
-#: actions/groupblock.php:134 actions/groupmembers.php:360
+#: actions/groupblock.php:134 actions/groupmembers.php:364
 msgid "Block user from group"
 msgstr "WuÅ¾iwarja za skupinu blokowaÄ"
 
@@ -1712,40 +1728,32 @@ msgstr "Logo zaktualizowane."
 msgid "Failed updating logo."
 msgstr "Aktualizowanje loga je so njeporadÅºiÅo."
 
-#: actions/groupmembers.php:100 lib/groupnav.php:92
+#. TRANS: Title of the page showing group members.
+#. TRANS: %s is the name of the group.
+#: actions/groupmembers.php:102
 #, php-format
 msgid "%s group members"
 msgstr "%s skupinskich ÄÅonow"
 
-#: actions/groupmembers.php:103
+#. TRANS: Title of the page showing group members.
+#. TRANS: %1$s is the name of the group, %2$d is the page number of the members list.
+#: actions/groupmembers.php:107
 #, php-format
 msgid "%1$s group members, page %2$d"
 msgstr "%1$s skupinskich ÄÅonow, strona %2$d"
 
-#: actions/groupmembers.php:118
+#: actions/groupmembers.php:122
 msgid "A list of the users in this group."
 msgstr "LisÄina wuÅ¾iwarjow w tutej skupinje."
 
-#: actions/groupmembers.php:182 lib/groupnav.php:107
+#: actions/groupmembers.php:186
 msgid "Admin"
 msgstr "Administrator"
 
-#: actions/groupmembers.php:392 lib/blockform.php:69
-msgid "Block"
-msgstr "BlokowaÄ"
-
-#: actions/groupmembers.php:487
+#: actions/groupmembers.php:498
 msgid "Make user an admin of the group"
 msgstr "WuÅ¾iwarja k administratorej skupiny ÄiniÄ"
 
-#: actions/groupmembers.php:519
-msgid "Make Admin"
-msgstr "Za administratora pomjenowaÄ"
-
-#: actions/groupmembers.php:519
-msgid "Make this user an admin"
-msgstr "Tutoho wuÅ¾iwarja k administratorej ÄiniÄ"
-
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Title in atom group notice feed. %s is a group name.
 #. TRANS: Title in atom user notice feed. %s is a user name.
@@ -1866,7 +1874,10 @@ msgstr ""
 
 #. TRANS: IM address input field instructions in IM settings form.
 #. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:140
+#. TRANS: Do not translate "example.org". It is one of the domain names reserved for use in examples by
+#. TRANS: http://www.rfc-editor.org/rfc/rfc2606.txt. Any other domain may be owned by a legitimate
+#. TRANS: person or organization.
+#: actions/imsettings.php:143
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -1874,48 +1885,48 @@ msgid ""
 msgstr ""
 
 #. TRANS: Form legend for IM preferences form.
-#: actions/imsettings.php:155
+#: actions/imsettings.php:158
 msgid "IM preferences"
 msgstr "IM-nastajenja"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:160
+#: actions/imsettings.php:163
 msgid "Send me notices through Jabber/GTalk."
 msgstr ""
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:166
+#: actions/imsettings.php:169
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr ""
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:172
+#: actions/imsettings.php:175
 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr ""
 
 #. TRANS: Confirmation message for successful IM preferences save.
-#: actions/imsettings.php:287 actions/othersettings.php:180
+#: actions/imsettings.php:290 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
+#: actions/imsettings.php:312
 msgid "No Jabber ID."
 msgstr "Å½adyn ID Jabber."
 
 #. TRANS: Message given saving IM address that not valid.
-#: actions/imsettings.php:322
+#: actions/imsettings.php:325
 msgid "Not a valid Jabber ID"
 msgstr "NjepÅaÄiwy ID Jabber"
 
 #. TRANS: Message given saving IM address that is already set.
-#: actions/imsettings.php:326
+#: actions/imsettings.php:329
 msgid "That is already your Jabber ID."
 msgstr "To je hiÅ¾o twÃ³j ID Jabber."
 
 #. 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
+#: actions/imsettings.php:361
 #, php-format
 msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
@@ -1923,28 +1934,28 @@ msgid ""
 msgstr ""
 
 #. TRANS: Message given canceling IM address confirmation for the wrong IM address.
-#: actions/imsettings.php:388
+#: actions/imsettings.php:391
 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
+#: actions/imsettings.php:400
 msgid "Couldn't delete IM confirmation."
 msgstr "IM-wobkruÄenje njeda so zhaÅ¡eÄ."
 
 #. TRANS: Message given after successfully canceling IM address confirmation.
-#: actions/imsettings.php:402
+#: actions/imsettings.php:405
 msgid "IM confirmation cancelled."
 msgstr "IM-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
+#: actions/imsettings.php:427
 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
+#: actions/imsettings.php:450
 msgid "The IM address was removed."
 msgstr "IM-adresa bu wotstronjena."
 
@@ -2353,8 +2364,8 @@ msgid "Only %s URLs over plain HTTP please."
 msgstr ""
 
 #. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1215
-#: lib/apiaction.php:1243 lib/apiaction.php:1366
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1206
+#: lib/apiaction.php:1233 lib/apiaction.php:1356
 msgid "Not a supported data format."
 msgstr "Njeje podpÄrany datowy format."
 
@@ -2478,7 +2489,7 @@ msgid "Password saved."
 msgstr "HesÅo skÅadowane."
 
 #. TRANS: Menu item for site administration
-#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:384
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:371
 msgid "Paths"
 msgstr "Å ÄeÅ¾ki"
 
@@ -2678,7 +2689,7 @@ msgstr "DospoÅne mjeno"
 
 #. TRANS: Form input field label.
 #: actions/profilesettings.php:115 actions/register.php:460
-#: lib/applicationeditform.php:244 lib/groupeditform.php:161
+#: lib/applicationeditform.php:235 lib/groupeditform.php:161
 msgid "Homepage"
 msgstr "Startowa strona"
 
@@ -2768,7 +2779,7 @@ msgid "Couldn't save profile."
 msgstr "Profil njeda so skÅadowaÄ."
 
 #. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:391 lib/adminpanelaction.php:141
+#: actions/profilesettings.php:391 lib/adminpanelaction.php:138
 msgid "Settings saved."
 msgstr "Nastajenja skÅadowane."
 
@@ -3184,7 +3195,7 @@ msgstr "StatusNet"
 
 #. TRANS: Menu item for site administration
 #: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
-#: lib/adminpanelaction.php:392
+#: lib/adminpanelaction.php:379
 msgid "Sessions"
 msgstr "PosedÅºenja"
 
@@ -3222,24 +3233,24 @@ msgid "Application profile"
 msgstr "Aplikaciski profil"
 
 #. TRANS: Form input field label for application icon.
-#: actions/showapplication.php:159 lib/applicationeditform.php:182
+#: actions/showapplication.php:159 lib/applicationeditform.php:173
 msgid "Icon"
 msgstr "Symbol"
 
 #. TRANS: Form input field label for application name.
 #: actions/showapplication.php:169 actions/version.php:197
-#: lib/applicationeditform.php:199
+#: lib/applicationeditform.php:190
 msgid "Name"
 msgstr "Mjeno"
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:178 lib/applicationeditform.php:235
+#: actions/showapplication.php:178 lib/applicationeditform.php:226
 msgid "Organization"
 msgstr "Organizacija"
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:216 lib/groupeditform.php:172
+#: lib/applicationeditform.php:207 lib/groupeditform.php:172
 msgid "Description"
 msgstr "Wopisanje"
 
@@ -3325,7 +3336,7 @@ msgstr ""
 msgid "This is a way to share what you like."
 msgstr ""
 
-#: actions/showgroup.php:82 lib/groupnav.php:86
+#: actions/showgroup.php:82
 #, php-format
 msgid "%s group"
 msgstr "skupina %s"
@@ -3352,7 +3363,7 @@ msgstr "Aliasy"
 msgid "Group actions"
 msgstr "Skupinske akcije"
 
-#: actions/showgroup.php:393 actions/showgroup.php:445 lib/groupnav.php:91
+#: actions/showgroup.php:393 actions/showgroup.php:445
 msgid "Members"
 msgstr "ÄÅonojo"
 
@@ -3717,7 +3728,7 @@ msgstr "Å½adyn kod zapodaty"
 
 #. TRANS: Menu item for site administration
 #: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
-#: lib/adminpanelaction.php:408
+#: lib/adminpanelaction.php:395
 msgid "Snapshots"
 msgstr ""
 
@@ -4404,7 +4415,8 @@ msgid "Change site configuration"
 msgstr "SydÅowu konfiguraciju zmÄniÄ"
 
 #. TRANS: Main menu option when logged in and site admin for access to site configuration
-#: lib/action.php:474
+#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
+#: lib/action.php:474 lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr "Administrator"
@@ -4524,7 +4536,10 @@ msgid "StatusNet software license"
 msgstr ""
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
-#: lib/action.php:843
+#. TRANS: Text between [] is a link description, text between () is the link itself.
+#. TRANS: Make sure there is no whitespace between "]" and "(".
+#. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
+#: lib/action.php:846
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4532,13 +4547,16 @@ msgid ""
 msgstr ""
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:846
+#: lib/action.php:849
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr ""
 
 #. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.
-#: lib/action.php:850
+#. TRANS: Make sure there is no whitespace between "]" and "(".
+#. TRANS: Text between [] is a link description, text between () is the link itself.
+#. TRANS: %s is the version of StatusNet that is being used.
+#: lib/action.php:856
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4548,38 +4566,39 @@ msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:873
+#: lib/action.php:879
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:880
+#: lib/action.php:886
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:884
+#: lib/action.php:890
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 
-#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:897
+#. TRANS: license message in footer.
+#. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
+#: lib/action.php:904
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr ""
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1247
+#: lib/action.php:1254
 msgid "After"
 msgstr "Po"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1257
+#: lib/action.php:1264
 msgid "Before"
 msgstr "PÅed"
 
@@ -4588,184 +4607,208 @@ msgstr "PÅed"
 msgid "Expecting a root feed element but got a whole XML document."
 msgstr ""
 
-#: lib/activityutils.php:208
+#. TRANS: Client exception thrown when there is no source attribute.
+#: lib/activityutils.php:203
 msgid "Can't handle remote content yet."
 msgstr ""
 
-#: lib/activityutils.php:244
+#. TRANS: Client exception thrown when there embedded XML content is found that cannot be processed yet.
+#: lib/activityutils.php:240
 msgid "Can't handle embedded XML content yet."
 msgstr ""
 
-#: lib/activityutils.php:248
+#. TRANS: Client exception thrown when base64 encoded content is found that cannot be processed yet.
+#: lib/activityutils.php:245
 msgid "Can't handle embedded Base64 content yet."
 msgstr ""
 
 #. TRANS: Client error message thrown when a user tries to change admin settings but has no access rights.
-#: lib/adminpanelaction.php:98
+#: lib/adminpanelaction.php:96
 msgid "You cannot make changes to this site."
 msgstr "NjemÃ³Å¾eÅ¡ tute sydÅo zmÄniÄ."
 
 #. TRANS: Client error message throw when a certain panel's settings cannot be changed.
-#: lib/adminpanelaction.php:110
+#: lib/adminpanelaction.php:108
 msgid "Changes to that panel are not allowed."
 msgstr "ZmÄny na tutym woknje njejsu dowolene."
 
 #. TRANS: Client error message.
-#: lib/adminpanelaction.php:229
+#: lib/adminpanelaction.php:222
 msgid "showForm() not implemented."
 msgstr "showForm() njeimplementowany."
 
 #. TRANS: Client error message
-#: lib/adminpanelaction.php:259
+#: lib/adminpanelaction.php:250
 msgid "saveSettings() not implemented."
 msgstr "saveSettings() njeimplementowany."
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:350
+#: lib/adminpanelaction.php:337
 msgid "Basic site configuration"
 msgstr "ZakÅadna sydÅowa konfiguracija"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:352
+#: lib/adminpanelaction.php:339
 msgctxt "MENU"
 msgid "Site"
 msgstr "SydÅo"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:360
+#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
+#: lib/adminpanelaction.php:347 lib/groupnav.php:135
 msgctxt "MENU"
 msgid "Design"
 msgstr "Design"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:366
+#: lib/adminpanelaction.php:353
 msgid "User configuration"
 msgstr "WuÅ¾iwarska konfiguracija"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:368 lib/personalgroupnav.php:115
+#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:115
 msgid "User"
 msgstr "WuÅ¾iwar"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:374
+#: lib/adminpanelaction.php:361
 msgid "Access configuration"
 msgstr "PÅistupna konfiguracija"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:390
+#: lib/adminpanelaction.php:377
 msgid "Sessions configuration"
 msgstr "Konfiguracija posedÅºenjow"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:398
+#: lib/adminpanelaction.php:385
 msgid "Edit site notice"
 msgstr "SydÅowu zdÅºÄlenku wobdÅºÄÅaÄ"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:406
+#: lib/adminpanelaction.php:393
 msgid "Snapshots configuration"
 msgstr "Konfiguracija wobrazowkowych fotow"
 
 #. TRANS: Client error 401.
-#: lib/apiauth.php:113
+#: lib/apiauth.php:111
 msgid "API resource requires read-write access, but you only have read access."
 msgstr ""
 
+#. TRANS: OAuth exception thrown when no application is found for a given consumer key.
+#: lib/apiauth.php:175
+msgid "No application for that consumer key."
+msgstr ""
+
+#. TRANS: OAuth exception given when an incorrect access token was given for a user.
+#: lib/apiauth.php:212
+msgid "Bad access token."
+msgstr ""
+
+#. TRANS: OAuth exception given when no user was found for a given token (no token was found).
+#: lib/apiauth.php:217
+msgid "No user for that token."
+msgstr ""
+
+#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
+#: lib/apioauthstore.php:178
+msgid "Tried to revoke unknown token"
+msgstr ""
+
 #. TRANS: Form legend.
-#: lib/applicationeditform.php:137
+#: lib/applicationeditform.php:129
 msgid "Edit application"
 msgstr "Aplikaciju wobdÅºÄÅaÄ"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:187
+#: lib/applicationeditform.php:178
 msgid "Icon for this application"
 msgstr "Symbol za tutu aplikaciju"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:209
+#: lib/applicationeditform.php:200
 #, php-format
 msgid "Describe your application in %d characters"
 msgstr "Wopisaj swoju aplikaciju z %d znamjeÅ¡kami"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:213
+#: lib/applicationeditform.php:204
 msgid "Describe your application"
 msgstr "Wopisaj swoju aplikaciju"
 
 #. TRANS: Form input field label.
-#: lib/applicationeditform.php:226
+#: lib/applicationeditform.php:217
 msgid "Source URL"
 msgstr "URL Å¾Ã³rÅa"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:233
+#: lib/applicationeditform.php:224
 msgid "Organization responsible for this application"
 msgstr "Organizacija, kotraÅ¾ je za tutu aplikaciju zamoÅwita"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:242
+#: lib/applicationeditform.php:233
 msgid "URL for the homepage of the organization"
 msgstr "URL za startowu stronu organizacije"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:251
+#: lib/applicationeditform.php:242
 msgid "URL to redirect to after authentication"
 msgstr ""
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:278
+#: lib/applicationeditform.php:269
 msgid "Browser"
 msgstr "Wobhladowak"
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:295
+#: lib/applicationeditform.php:286
 msgid "Desktop"
 msgstr "Desktop"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:297
+#: lib/applicationeditform.php:288
 msgid "Type of application, browser or desktop"
 msgstr ""
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:320
+#: lib/applicationeditform.php:311
 msgid "Read-only"
 msgstr "JenoÅ¾ Äitajomny"
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:339
+#: lib/applicationeditform.php:330
 msgid "Read-write"
 msgstr "Popisujomny"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:341
+#: lib/applicationeditform.php:332
 msgid "Default access for this application: read-only, or read-write"
 msgstr ""
 
-#. TRANS: Submit button title
-#: lib/applicationeditform.php:359
+#. TRANS: Submit button title.
+#: lib/applicationeditform.php:349
 msgid "Cancel"
 msgstr "PÅetorhnyÄ"
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:136
+#: lib/applicationlist.php:135
 msgid "read-write"
 msgstr "popisujomny"
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:138
+#: lib/applicationlist.php:137
 msgid "read-only"
 msgstr "jenoÅ¾ Äitajomny"
 
 #. 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
+#: lib/applicationlist.php:143
 #, php-format
 msgid "Approved %1$s - \"%2$s\" access."
 msgstr ""
 
 #. TRANS: Button label
-#: lib/applicationlist.php:159
+#: lib/applicationlist.php:158
 msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "WotwoÅaÄ"
@@ -4785,7 +4828,8 @@ msgstr "Awtor"
 msgid "Provider"
 msgstr "PoskiÄowar"
 
-#: lib/attachmentnoticesection.php:67
+#. TRANS: Title.
+#: lib/attachmentnoticesection.php:68
 msgid "Notices where this attachment appears"
 msgstr ""
 
@@ -4797,6 +4841,11 @@ msgstr "ZmÄnjenje hesÅa je so njeporadÅºiÅo"
 msgid "Password changing is not allowed"
 msgstr "ZmÄnjenje hesÅa njeje dowolene"
 
+#. TRANS: Title for the form to block a user.
+#: lib/blockform.php:70
+msgid "Block"
+msgstr "BlokowaÄ"
+
 #: lib/channel.php:157 lib/channel.php:177
 msgid "Command results"
 msgstr "PÅikazowe wuslÄdki"
@@ -4820,6 +4869,20 @@ msgstr "ZdÅºÄlenka z tym ID njeeksistuje."
 msgid "User has no last notice."
 msgstr "WuÅ¾iwar nima poslednju powÄsÄ."
 
+#. 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:130
+#, php-format
+msgid "Could not find a user with nickname %s."
+msgstr ""
+
+#. TRANS: Message given getting a non-existing user.
+#. TRANS: %s is the nickname of the user that could not be found.
+#: lib/command.php:150
+#, php-format
+msgid "Could not find a local user with nickname %s."
+msgstr ""
+
 #. TRANS: Error text shown when an unimplemented command is given.
 #: lib/command.php:185
 msgid "Sorry, this command is not yet implemented."
@@ -4849,6 +4912,20 @@ msgid ""
 "Notices: %3$s"
 msgstr ""
 
+#. 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.
+#: lib/command.php:360
+#, php-format
+msgid "%1$s joined group %2$s."
+msgstr ""
+
+#. 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.
+#: lib/command.php:408
+#, php-format
+msgid "%1$s left group %2$s."
+msgstr ""
+
 #. TRANS: Whois output. %s is the full name of the queried user.
 #: lib/command.php:434
 #, php-format
@@ -4909,6 +4986,13 @@ msgstr "PowÄsÄ wot %s wospjetowana."
 msgid "Error repeating notice."
 msgstr "Zmylk pÅi wospjetowanju zdÅºÄlenki"
 
+#. TRANS: Message given if content of a notice for a reply is too long.
+#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
+#: lib/command.php:592
+#, php-format
+msgid "Notice too long - maximum is %1$d characters, you sent %2$d."
+msgstr ""
+
 #. TRANS: Text shown having sent a reply to a notice successfully.
 #. TRANS: %s is the nickname of the user of the notice the reply was sent to.
 #: lib/command.php:603
@@ -4931,12 +5015,26 @@ msgstr ""
 msgid "Can't subscribe to OMB profiles by command."
 msgstr "OMB-profile njedadÅºa so pÅez pÅikaz abonowaÄ."
 
+#. TRANS: Text shown after having subscribed to another user successfully.
+#. TRANS: %s is the name of the user the subscription was requested for.
+#: lib/command.php:672
+#, php-format
+msgid "Subscribed to %s."
+msgstr ""
+
 #. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
 #. TRANS: Error text shown when no username was provided when issuing the command.
 #: lib/command.php:694 lib/command.php:804
 msgid "Specify the name of the user to unsubscribe from."
 msgstr ""
 
+#. TRANS: Text shown after having unsubscribed from another user successfully.
+#. TRANS: %s is the name of the user the unsubscription was requested for.
+#: lib/command.php:705
+#, php-format
+msgid "Unsubscribed from %s."
+msgstr ""
+
 #. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
 #. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
 #: lib/command.php:724 lib/command.php:750
@@ -4975,13 +5073,20 @@ msgstr ""
 msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr ""
 
+#. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
+#. TRANS: %s is the name of the user the unsubscription was requested for.
+#: lib/command.php:813
+#, php-format
+msgid "Unsubscribed %s."
+msgstr ""
+
 #. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
 #: lib/command.php:831
 msgid "You are not subscribed to anyone."
 msgstr "Njejsy nikoho abonowaÅ."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to.
-#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.
 #: lib/command.php:836
 msgid "You are subscribed to this person:"
@@ -4998,7 +5103,7 @@ msgid "No one is subscribed to you."
 msgstr "NichtÃ³ njeje Äe abonowaÅ."
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
-#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
 #: lib/command.php:863
 msgid "This person is subscribed to you:"
@@ -5015,7 +5120,7 @@ msgid "You are not a member of any groups."
 msgstr "Njejsy ÄÅon w Å¾anej skupinje."
 
 #. TRANS: Text shown after requesting groups a user is subscribed to.
-#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
 #: lib/command.php:890
 msgid "You are a member of this group:"
@@ -5025,6 +5130,7 @@ msgstr[1] "Sy ÄÅon tuteju skupinow:"
 msgstr[2] "Sy ÄÅon tutych skupinow:"
 msgstr[3] "Sy ÄÅon tutych skupinow:"
 
+#. TRANS: Help text for commands.
 #: lib/command.php:905
 msgid ""
 "Commands:\n"
@@ -5188,30 +5294,19 @@ msgstr ""
 msgid "Extra nicknames for the group, comma- or space- separated, max %d"
 msgstr ""
 
-#: lib/groupnav.php:85
-msgid "Group"
-msgstr "Skupina"
-
-#: lib/groupnav.php:101
-msgid "Blocked"
-msgstr "Blokowany"
-
-#: lib/groupnav.php:108
-#, php-format
-msgid "Edit %s group properties"
-msgstr "KajkosÄe skupiny %s wobdÅºÄÅaÄ"
-
-#: lib/groupnav.php:113
-msgid "Logo"
-msgstr "Logo"
-
-#: lib/groupnav.php:114
+#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
+#. TRANS: %s is the nickname of the group.
+#: lib/groupnav.php:129
 #, php-format
+msgctxt "TOOLTIP"
 msgid "Add or edit %s logo"
 msgstr ""
 
-#: lib/groupnav.php:120
+#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
+#. TRANS: %s is the nickname of the group.
+#: lib/groupnav.php:138
 #, php-format
+msgctxt "TOOLTIP"
 msgid "Add or edit %s design"
 msgstr ""
 
@@ -5243,7 +5338,8 @@ msgstr "Tuta dataja je pÅewulka. Maksimalna datajowa wulkosÄ je %s."
 msgid "Partial upload."
 msgstr "DÅºÄlne nahraÄe."
 
-#: lib/imagefile.php:101 lib/mediafile.php:170
+#. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
+#: lib/imagefile.php:101 lib/mediafile.php:179
 msgid "System error uploading file."
 msgstr "Systemowy zmylk pÅi nahrawanju dataje."
 
@@ -5534,60 +5630,62 @@ msgstr "Wodaj, dochadÅºaÄe e-mejle njejsu dowolene."
 msgid "Unsupported message type: %s"
 msgstr "NjepodpÄrany powÄsÄowy typ: %s"
 
-#: lib/mediafile.php:98 lib/mediafile.php:123
+#. TRANS: Client exception thrown when a database error was thrown during a file upload operation.
+#: lib/mediafile.php:99 lib/mediafile.php:125
 msgid "There was a database error while saving your file. Please try again."
 msgstr ""
 "PÅi skÅadowanju twojeje dataje je zmylk w datowej bance wustupiÅ. ProÅ¡u "
 "spytaj hiÅ¡Äe raz."
 
-#: lib/mediafile.php:142
+#. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
+#: lib/mediafile.php:145
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
 msgstr ""
 
-#: lib/mediafile.php:147
+#. TRANS: Client exception.
+#: lib/mediafile.php:151
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form."
 msgstr ""
 
-#: lib/mediafile.php:152
+#. TRANS: Client exception.
+#: lib/mediafile.php:157
 msgid "The uploaded file was only partially uploaded."
 msgstr "Nahrata dataja bu jenoÅ¾ zdÅºÄla nahrata."
 
-#: lib/mediafile.php:159
+#. TRANS: Client exception thrown when a temporary folder is not present to store a file upload.
+#: lib/mediafile.php:165
 msgid "Missing a temporary folder."
 msgstr "Temporerny rjadowka faluje."
 
-#: lib/mediafile.php:162
+#. TRANS: Client exception thrown when writing to disk is not possible during a file upload operation.
+#: lib/mediafile.php:169
 msgid "Failed to write file to disk."
 msgstr "Dataju njeda so na taÄel pisaÄ."
 
-#: lib/mediafile.php:165
+#. TRANS: Client exception thrown when a file upload operation has been stopped by an extension.
+#: lib/mediafile.php:173
 msgid "File upload stopped by extension."
 msgstr "Datajowe nahraÄe pÅez rozÅ¡Ärjenje zastajene."
 
-#: lib/mediafile.php:179 lib/mediafile.php:217
+#. TRANS: Client exception thrown when a file upload operation would cause a user to exceed a set quota.
+#: lib/mediafile.php:189 lib/mediafile.php:232
 msgid "File exceeds user's quota."
 msgstr ""
 
-#: lib/mediafile.php:197 lib/mediafile.php:234
+#. TRANS: Client exception thrown when a file upload operation fails because the file could
+#. TRANS: not be moved from the temporary folder to the permanent file location.
+#: lib/mediafile.php:209 lib/mediafile.php:251
 msgid "File could not be moved to destination directory."
 msgstr "Dataja njeda so do ciloweho zapisa pÅesunyÄ."
 
-#: lib/mediafile.php:202 lib/mediafile.php:238
+#. TRANS: Client exception thrown when a file upload operation has been stopped because the MIME
+#. TRANS: type of the uploaded file could not be determined.
+#: lib/mediafile.php:216 lib/mediafile.php:257
 msgid "Could not determine file's MIME type."
 msgstr "MIME-typ dataje njeda so zwÄsÄiÄ."
 
-#: lib/mediafile.php:318
-#, php-format
-msgid " Try using another %s format."
-msgstr "Spytaj druhi format %s."
-
-#: lib/mediafile.php:323
-#, php-format
-msgid "%s is not a supported file type on this server."
-msgstr "%s njeje podpÄrany datajowy typ na tutym serwerje."
-
 #: lib/messageform.php:120
 msgid "Send a direct notice"
 msgstr "Direktnu zdÅºÄlenku pÃ³sÅaÄ"
@@ -5693,27 +5791,7 @@ msgstr "ZdÅºÄlenka wospjetowana"
 msgid "Nudge"
 msgstr ""
 
-#: lib/oauthstore.php:283
-msgid "Error inserting new profile"
-msgstr "Zmylk pÅi zasunjenju noweho profila"
-
-#: lib/oauthstore.php:291
-msgid "Error inserting avatar"
-msgstr "Zmylk pÅi zasunjenju awatara"
-
-#: lib/oauthstore.php:306
-msgid "Error updating remote profile"
-msgstr "Zmylk pÅi aktualizowanju zdaleneho profila"
-
-#: lib/oauthstore.php:311
-msgid "Error inserting remote profile"
-msgstr "Zmylk pÅi zasunjenju zdaleneho profila"
-
-#: lib/oauthstore.php:345
-msgid "Duplicate notice"
-msgstr "DwÃ³jna zdÅºÄlenka"
-
-#: lib/oauthstore.php:490
+#: lib/oauthstore.php:491
 msgid "Couldn't insert new subscription."
 msgstr "Nowy abonement njeda so zasunyÄ."
 
@@ -5745,12 +5823,8 @@ msgstr "Wuchadny pÃ³st"
 msgid "Your sent messages"
 msgstr "Twoje pÃ³sÅane powÄsÄe"
 
-#: lib/personaltagcloudsection.php:56
-#, php-format
-msgid "Tags in %s's notices"
-msgstr ""
-
-#: lib/plugin.php:115
+#. TRANS: Displayed as version information for a plugin if no version information was found.
+#: lib/plugin.php:116
 msgid "Unknown"
 msgstr "Njeznaty"
 
@@ -5832,19 +5906,19 @@ msgstr "RÃ³lu \"%s\" tutoho wuÅ¾iwarja wotwoÅaÄ"
 msgid "No single user defined for single-user mode."
 msgstr "Å½adyn jednotliwy wuÅ¾iwar za modus jednotliweho wuÅ¾iwarja definowany."
 
-#: lib/searchaction.php:120
+#. TRANS: Fieldset legend for the search form.
+#: lib/searchaction.php:121
 msgid "Search site"
 msgstr "Pytanske sydÅo"
 
-#: lib/searchaction.php:126
+#. TRANS: Used as a field label for the field where one or more keywords
+#. TRANS: for searching can be entered.
+#: lib/searchaction.php:129
 msgid "Keyword(s)"
 msgstr "KluÄowe hesÅa"
 
-#: lib/searchaction.php:127
-msgid "Search"
-msgstr "PytaÄ"
-
-#: lib/searchaction.php:162
+#. TRANS: Definition list item with instructions on how to get (better) search results.
+#: lib/searchaction.php:170
 msgid "Search help"
 msgstr "Pytanska pomoc"
 
@@ -6018,56 +6092,32 @@ msgid "Moderator"
 msgstr "Moderator"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1102
+#: lib/util.php:1103
 msgid "a few seconds ago"
 msgstr "pÅed nÄÅ¡to sekundami"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1105
+#: lib/util.php:1106
 msgid "about a minute ago"
 msgstr "pÅed nÄhdÅºe jednej mjeÅÅ¡inu"
 
-#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1109
-#, php-format
-msgid "about %d minutes ago"
-msgstr "pÅed %d mjeÅÅ¡inami"
-
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 #: lib/util.php:1112
 msgid "about an hour ago"
 msgstr "pÅed nÄhdÅºe jednej hodÅºinu"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1116
-#, php-format
-msgid "about %d hours ago"
-msgstr "pÅed nÄhdÅºe %d hodÅºinami"
-
-#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1119
+#: lib/util.php:1118
 msgid "about a day ago"
 msgstr "pÅed nÄhdÅºe jednym dnjom"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1123
-#, php-format
-msgid "about %d days ago"
-msgstr "pÅed nÄhdÅºe %d dnjemi"
-
-#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1126
+#: lib/util.php:1124
 msgid "about a month ago"
 msgstr "pÅed nÄhdÅºe jednym mÄsacom"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 #: lib/util.php:1130
-#, php-format
-msgid "about %d months ago"
-msgstr "pÅed nÄhdÅºe %d mÄsacami"
-
-#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1133
 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 9575fa6036..a8e55d6856 100644
--- a/locale/ia/LC_MESSAGES/statusnet.po
+++ b/locale/ia/LC_MESSAGES/statusnet.po
@@ -1,6 +1,7 @@
-# Translation of StatusNet to Interlingua
+# Translation of StatusNet to Interlingua (Interlingua)
+# Expored from translatewiki.net
 #
-# Author@translatewiki.net: McDutchie
+# Author: McDutchie
 # --
 # This file is distributed under the same license as the StatusNet package.
 #
@@ -8,20 +9,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-08 22:33+0000\n"
-"PO-Revision-Date: 2010-09-08 22:34:33+0000\n"
-"Language-Team: Interlingua\n"
+"POT-Creation-Date: 2010-09-14 19:53+0000\n"
+"PO-Revision-Date: 2010-09-14 19:54:01+0000\n"
+"Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r72348); Translate extension (2010-08-20)\n"
+"X-Generator: MediaWiki 1.17alpha (r73009); Translate extension (2010-08-20)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
-"X-Message-Group: out-statusnet\n"
+"X-Message-Group: #out-statusnet\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-POT-Import-Date: 1284-49-16 34::+0000\n"
 
 #. TRANS: Page title
 #. TRANS: Menu item for site administration
-#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:376
+#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:363
 msgid "Access"
 msgstr "Accesso"
 
@@ -74,10 +76,10 @@ 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 actions/emailsettings.php:224
-#: actions/imsettings.php:184 actions/smssettings.php:209
-#: lib/applicationeditform.php:361
+#. TRANS: Button label in the "Edit application" form.
+#: actions/accessadminpanel.php:203 actions/emailsettings.php:228
+#: actions/imsettings.php:187 actions/smssettings.php:209
+#: lib/applicationeditform.php:351
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Salveguardar"
@@ -90,15 +92,15 @@ msgstr "Pagina non existe."
 
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #: actions/all.php:79 actions/allrss.php:68
-#: actions/apiaccountupdatedeliverydevice.php:114
-#: actions/apiaccountupdateprofile.php:105
-#: actions/apiaccountupdateprofilebackgroundimage.php:116
-#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
-#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
-#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:113
-#: actions/apigroupismember.php:91 actions/apigroupjoin.php:100
-#: actions/apigroupleave.php:100 actions/apigrouplist.php:73
-#: actions/apistatusesupdate.php:229 actions/apisubscriptions.php:87
+#: actions/apiaccountupdatedeliverydevice.php:115
+#: actions/apiaccountupdateprofile.php:106
+#: actions/apiaccountupdateprofilebackgroundimage.php:117
+#: actions/apiaccountupdateprofileimage.php:106 actions/apiblockcreate.php:98
+#: actions/apiblockdestroy.php:97 actions/apidirectmessage.php:77
+#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:114
+#: actions/apigroupismember.php:91 actions/apigroupjoin.php:101
+#: actions/apigroupleave.php:101 actions/apigrouplist.php:73
+#: actions/apistatusesupdate.php:230 actions/apisubscriptions.php:87
 #: actions/apitimelinefavorites.php:72 actions/apitimelinefriends.php:174
 #: actions/apitimelinehome.php:80 actions/apitimelinementions.php:80
 #: actions/apitimelineuser.php:82 actions/avatarbynickname.php:75
@@ -198,16 +200,16 @@ msgid "Updates from %1$s and friends on %2$s!"
 msgstr "Actualisationes de %1$s e su amicos in %2$s!"
 
 #: actions/apiaccountratelimitstatus.php:72
-#: actions/apiaccountupdatedeliverydevice.php:94
-#: actions/apiaccountupdateprofile.php:97
-#: actions/apiaccountupdateprofilebackgroundimage.php:94
-#: actions/apiaccountupdateprofilecolors.php:118
+#: actions/apiaccountupdatedeliverydevice.php:95
+#: actions/apiaccountupdateprofile.php:98
+#: actions/apiaccountupdateprofilebackgroundimage.php:95
+#: actions/apiaccountupdateprofilecolors.php:119
 #: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156
-#: actions/apifavoritecreate.php:100 actions/apifavoritedestroy.php:101
-#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100
-#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:139
-#: actions/apigroupismember.php:115 actions/apigroupjoin.php:156
-#: actions/apigroupleave.php:142 actions/apigrouplist.php:137
+#: actions/apifavoritecreate.php:101 actions/apifavoritedestroy.php:102
+#: actions/apifriendshipscreate.php:101 actions/apifriendshipsdestroy.php:101
+#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:140
+#: actions/apigroupismember.php:115 actions/apigroupjoin.php:157
+#: actions/apigroupleave.php:143 actions/apigrouplist.php:137
 #: actions/apigrouplistall.php:122 actions/apigroupmembership.php:107
 #: actions/apigroupshow.php:116 actions/apihelptest.php:88
 #: actions/apistatusesdestroy.php:104 actions/apistatusesretweets.php:112
@@ -222,21 +224,23 @@ msgstr "Actualisationes de %1$s e su amicos in %2$s!"
 msgid "API method not found."
 msgstr "Methodo API non trovate."
 
-#: actions/apiaccountupdatedeliverydevice.php:86
-#: actions/apiaccountupdateprofile.php:89
-#: actions/apiaccountupdateprofilebackgroundimage.php:86
-#: actions/apiaccountupdateprofilecolors.php:110
-#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89
-#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109
-#: actions/apifavoritecreate.php:91 actions/apifavoritedestroy.php:92
-#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
-#: actions/apigroupcreate.php:105 actions/apigroupjoin.php:92
-#: actions/apigroupleave.php:92 actions/apimediaupload.php:67
-#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:198
+#. TRANS: Client error message. POST is a HTTP command. It should not be translated.
+#. TRANS: Client error. POST is a HTTP command. It should not be translated.
+#: actions/apiaccountupdatedeliverydevice.php:87
+#: actions/apiaccountupdateprofile.php:90
+#: actions/apiaccountupdateprofilebackgroundimage.php:87
+#: actions/apiaccountupdateprofilecolors.php:111
+#: actions/apiaccountupdateprofileimage.php:85 actions/apiblockcreate.php:90
+#: actions/apiblockdestroy.php:89 actions/apidirectmessagenew.php:110
+#: actions/apifavoritecreate.php:92 actions/apifavoritedestroy.php:93
+#: actions/apifriendshipscreate.php:92 actions/apifriendshipsdestroy.php:92
+#: actions/apigroupcreate.php:106 actions/apigroupjoin.php:93
+#: actions/apigroupleave.php:93 actions/apimediaupload.php:68
+#: actions/apistatusesretweet.php:66 actions/apistatusesupdate.php:199
 msgid "This method requires a POST."
 msgstr "Iste methodo require un POST."
 
-#: actions/apiaccountupdatedeliverydevice.php:106
+#: actions/apiaccountupdatedeliverydevice.php:107
 msgid ""
 "You must specify a parameter named 'device' with a value of one of: sms, im, "
 "none."
@@ -244,27 +248,27 @@ msgstr ""
 "Tu debe specificar un parametro nominate 'device' con un del valores: sms, "
 "im, none."
 
-#: actions/apiaccountupdatedeliverydevice.php:133
+#: actions/apiaccountupdatedeliverydevice.php:134
 msgid "Could not update user."
 msgstr "Non poteva actualisar le usator."
 
-#: actions/apiaccountupdateprofile.php:112
-#: actions/apiaccountupdateprofilebackgroundimage.php:194
-#: actions/apiaccountupdateprofilecolors.php:185
-#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/apiaccountupdateprofile.php:113
+#: actions/apiaccountupdateprofilebackgroundimage.php:195
+#: actions/apiaccountupdateprofilecolors.php:186
+#: actions/apiaccountupdateprofileimage.php:131 actions/apiusershow.php:108
 #: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/hcard.php:74
 #: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
 #: lib/profileaction.php:84
 msgid "User has no profile."
 msgstr "Le usator non ha un profilo."
 
-#: actions/apiaccountupdateprofile.php:147
+#: actions/apiaccountupdateprofile.php:148
 msgid "Could not save profile."
 msgstr "Non poteva salveguardar le profilo."
 
-#: actions/apiaccountupdateprofilebackgroundimage.php:108
-#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
-#: actions/apistatusesupdate.php:212 actions/avatarsettings.php:257
+#: actions/apiaccountupdateprofilebackgroundimage.php:109
+#: actions/apiaccountupdateprofileimage.php:98 actions/apimediaupload.php:81
+#: actions/apistatusesupdate.php:213 actions/avatarsettings.php:257
 #: actions/designadminpanel.php:123 actions/editapplication.php:118
 #: actions/newapplication.php:101 actions/newnotice.php:94
 #: lib/designsettings.php:283
@@ -276,30 +280,30 @@ msgstr ""
 "Le servitor non ha potite tractar tante datos POST (%s bytes) a causa de su "
 "configuration actual."
 
-#: actions/apiaccountupdateprofilebackgroundimage.php:136
-#: actions/apiaccountupdateprofilebackgroundimage.php:146
-#: actions/apiaccountupdateprofilecolors.php:164
-#: actions/apiaccountupdateprofilecolors.php:174
+#: actions/apiaccountupdateprofilebackgroundimage.php:137
+#: actions/apiaccountupdateprofilebackgroundimage.php:147
+#: actions/apiaccountupdateprofilecolors.php:165
+#: actions/apiaccountupdateprofilecolors.php:175
 #: actions/groupdesignsettings.php:290 actions/groupdesignsettings.php:300
 #: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
 #: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
 msgid "Unable to save your design settings."
 msgstr "Impossibile salveguardar le configurationes del apparentia."
 
-#: actions/apiaccountupdateprofilebackgroundimage.php:187
-#: actions/apiaccountupdateprofilecolors.php:142
+#: actions/apiaccountupdateprofilebackgroundimage.php:188
+#: actions/apiaccountupdateprofilecolors.php:143
 msgid "Could not update your design."
 msgstr "Non poteva actualisar le apparentia."
 
-#: actions/apiblockcreate.php:105
+#: actions/apiblockcreate.php:106
 msgid "You cannot block yourself!"
 msgstr "Tu non pote blocar te mesme!"
 
-#: actions/apiblockcreate.php:126
+#: actions/apiblockcreate.php:127
 msgid "Block user failed."
 msgstr "Le blocada del usator ha fallite."
 
-#: actions/apiblockdestroy.php:114
+#: actions/apiblockdestroy.php:115
 msgid "Unblock user failed."
 msgstr "Le disblocada del usator ha fallite."
 
@@ -323,59 +327,59 @@ msgstr "Messages directe a %s"
 msgid "All the direct messages sent to %s"
 msgstr "Tote le messages directe inviate a %s"
 
-#: actions/apidirectmessagenew.php:118
+#: actions/apidirectmessagenew.php:119
 msgid "No message text!"
 msgstr "Message sin texto!"
 
-#: actions/apidirectmessagenew.php:127 actions/newmessage.php:150
+#: actions/apidirectmessagenew.php:128 actions/newmessage.php:150
 #, php-format
 msgid "That's too long. Max message size is %d chars."
 msgstr "Isto es troppo longe. Le maximo es %d characteres."
 
-#: actions/apidirectmessagenew.php:138
+#: actions/apidirectmessagenew.php:139
 msgid "Recipient user not found."
 msgstr "Usator destinatario non trovate."
 
-#: actions/apidirectmessagenew.php:142
+#: actions/apidirectmessagenew.php:143
 msgid "Can't send direct messages to users who aren't your friend."
 msgstr "Non pote inviar messages directe a usatores que non es tu amicos."
 
-#: actions/apifavoritecreate.php:109 actions/apifavoritedestroy.php:110
+#: actions/apifavoritecreate.php:110 actions/apifavoritedestroy.php:111
 #: actions/apistatusesdestroy.php:121
 msgid "No status found with that ID."
 msgstr "Nulle stato trovate con iste ID."
 
-#: actions/apifavoritecreate.php:120
+#: actions/apifavoritecreate.php:121
 msgid "This status is already a favorite."
 msgstr "Iste stato es ja favorite."
 
 #. TRANS: Error message text shown when a favorite could not be set.
-#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:296
+#: actions/apifavoritecreate.php:132 actions/favor.php:84 lib/command.php:296
 msgid "Could not create favorite."
 msgstr "Non poteva crear le favorite."
 
-#: actions/apifavoritedestroy.php:123
+#: actions/apifavoritedestroy.php:124
 msgid "That status is not a favorite."
 msgstr "Iste stato non es favorite."
 
-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
+#: actions/apifavoritedestroy.php:136 actions/disfavor.php:87
 msgid "Could not delete favorite."
 msgstr "Non poteva deler le favorite."
 
-#: actions/apifriendshipscreate.php:109
+#: actions/apifriendshipscreate.php:110
 msgid "Could not follow user: profile not found."
 msgstr "Non poteva sequer le usator: profilo non trovate."
 
-#: actions/apifriendshipscreate.php:118
+#: actions/apifriendshipscreate.php:119
 #, php-format
 msgid "Could not follow user: %s is already on your list."
 msgstr "Non poteva sequer le usator: %s es ja in tu lista."
 
-#: actions/apifriendshipsdestroy.php:109
+#: actions/apifriendshipsdestroy.php:110
 msgid "Could not unfollow user: User not found."
 msgstr "Non poteva cessar de sequer le usator: Usator non trovate."
 
-#: actions/apifriendshipsdestroy.php:120
+#: actions/apifriendshipsdestroy.php:121
 msgid "You cannot unfollow yourself."
 msgstr "Tu non pote cessar de sequer te mesme."
 
@@ -391,101 +395,101 @@ msgstr "Non poteva determinar le usator de origine."
 msgid "Could not find target user."
 msgstr "Non poteva trovar le usator de destination."
 
-#: actions/apigroupcreate.php:167 actions/editgroup.php:186
+#: actions/apigroupcreate.php:168 actions/editgroup.php:186
 #: actions/newgroup.php:126 actions/profilesettings.php:215
 #: actions/register.php:212
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr "Le pseudonymo pote solmente haber minusculas e numeros, sin spatios."
 
-#: actions/apigroupcreate.php:176 actions/editgroup.php:190
+#: actions/apigroupcreate.php:177 actions/editgroup.php:190
 #: actions/newgroup.php:130 actions/profilesettings.php:238
 #: actions/register.php:215
 msgid "Nickname already in use. Try another one."
 msgstr "Pseudonymo ja in uso. Proba un altere."
 
-#: actions/apigroupcreate.php:183 actions/editgroup.php:193
+#: actions/apigroupcreate.php:184 actions/editgroup.php:193
 #: actions/newgroup.php:133 actions/profilesettings.php:218
 #: actions/register.php:217
 msgid "Not a valid nickname."
 msgstr "Non un pseudonymo valide."
 
-#: actions/apigroupcreate.php:199 actions/editapplication.php:215
+#: actions/apigroupcreate.php:200 actions/editapplication.php:215
 #: actions/editgroup.php:199 actions/newapplication.php:203
 #: actions/newgroup.php:139 actions/profilesettings.php:222
 #: actions/register.php:224
 msgid "Homepage is not a valid URL."
 msgstr "Le pagina personal non es un URL valide."
 
-#: actions/apigroupcreate.php:208 actions/editgroup.php:202
+#: actions/apigroupcreate.php:209 actions/editgroup.php:202
 #: actions/newgroup.php:142 actions/profilesettings.php:225
 #: actions/register.php:227
 msgid "Full name is too long (max 255 chars)."
 msgstr "Le nomine complete es troppo longe (max. 255 characteres)."
 
-#: actions/apigroupcreate.php:216 actions/editapplication.php:190
+#: actions/apigroupcreate.php:217 actions/editapplication.php:190
 #: actions/newapplication.php:172
 #, php-format
 msgid "Description is too long (max %d chars)."
 msgstr "Description es troppo longe (max %d charachteres)."
 
-#: actions/apigroupcreate.php:227 actions/editgroup.php:208
+#: actions/apigroupcreate.php:228 actions/editgroup.php:208
 #: actions/newgroup.php:148 actions/profilesettings.php:232
 #: actions/register.php:234
 msgid "Location is too long (max 255 chars)."
 msgstr "Loco es troppo longe (max. 255 characteres)."
 
-#: actions/apigroupcreate.php:246 actions/editgroup.php:219
+#: actions/apigroupcreate.php:247 actions/editgroup.php:219
 #: actions/newgroup.php:159
 #, php-format
 msgid "Too many aliases! Maximum %d."
 msgstr "Troppo de aliases! Maximo: %d."
 
-#: actions/apigroupcreate.php:267
+#: actions/apigroupcreate.php:268
 #, php-format
 msgid "Invalid alias: \"%s\"."
 msgstr "Alias invalide: \"%s\"."
 
-#: actions/apigroupcreate.php:276 actions/editgroup.php:232
+#: actions/apigroupcreate.php:277 actions/editgroup.php:232
 #: actions/newgroup.php:172
 #, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr "Le alias \"%s\" es ja in uso. Proba un altere."
 
-#: actions/apigroupcreate.php:289 actions/editgroup.php:238
+#: actions/apigroupcreate.php:290 actions/editgroup.php:238
 #: actions/newgroup.php:178
 msgid "Alias can't be the same as nickname."
 msgstr "Le alias non pote esser identic al pseudonymo."
 
-#: actions/apigroupismember.php:96 actions/apigroupjoin.php:105
-#: actions/apigroupleave.php:105 actions/apigroupmembership.php:92
+#: actions/apigroupismember.php:96 actions/apigroupjoin.php:106
+#: actions/apigroupleave.php:106 actions/apigroupmembership.php:92
 #: actions/apigroupshow.php:83 actions/apitimelinegroup.php:92
 msgid "Group not found."
 msgstr "Gruppo non trovate."
 
 #. TRANS: Error text shown a user tries to join a group they already are a member of.
-#: actions/apigroupjoin.php:111 actions/joingroup.php:100 lib/command.php:336
+#: actions/apigroupjoin.php:112 actions/joingroup.php:100 lib/command.php:336
 msgid "You are already a member of that group."
 msgstr "Tu es ja membro de iste gruppo."
 
 #. TRANS: Error text shown when a user tries to join a group they are blocked from joining.
-#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:341
+#: actions/apigroupjoin.php:121 actions/joingroup.php:105 lib/command.php:341
 msgid "You have been blocked from that group by the admin."
 msgstr "Le administrator te ha blocate de iste gruppo."
 
 #. 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.
-#: actions/apigroupjoin.php:139 actions/joingroup.php:134 lib/command.php:353
+#: actions/apigroupjoin.php:140 actions/joingroup.php:134 lib/command.php:353
 #, 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."
 
-#: actions/apigroupleave.php:115
+#: actions/apigroupleave.php:116
 msgid "You are not a member of this group."
 msgstr "Tu non es membro de iste gruppo."
 
 #. 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.
-#: actions/apigroupleave.php:125 actions/leavegroup.php:129
+#: actions/apigroupleave.php:126 actions/leavegroup.php:129
 #: lib/command.php:401
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
@@ -515,7 +519,7 @@ msgstr "Gruppos de %s"
 msgid "groups on %s"
 msgstr "gruppos in %s"
 
-#: actions/apimediaupload.php:99
+#: actions/apimediaupload.php:100
 msgid "Upload failed."
 msgstr "Le incargamento ha fallite."
 
@@ -529,9 +533,9 @@ msgstr "Indicio invalide."
 
 #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
 #: actions/deletenotice.php:169 actions/disfavor.php:74
-#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:55
+#: actions/emailsettings.php:271 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:66 actions/imsettings.php:227
+#: actions/groupunblock.php:66 actions/imsettings.php:230
 #: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
@@ -579,8 +583,8 @@ msgstr "Le indicio de requesta %s ha essite refusate e revocate."
 #. 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:286 actions/grouplogo.php:322
-#: actions/imsettings.php:242 actions/newapplication.php:121
+#: actions/emailsettings.php:290 actions/grouplogo.php:322
+#: actions/imsettings.php:245 actions/newapplication.php:121
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
 #: actions/smssettings.php:277 lib/designsettings.php:304
 msgid "Unexpected form submission."
@@ -644,18 +648,18 @@ msgstr "Iste methodo require un commando POST o DELETE."
 msgid "You may not delete another user's status."
 msgstr "Tu non pote deler le stato de un altere usator."
 
-#: actions/apistatusesretweet.php:75 actions/apistatusesretweets.php:72
+#: actions/apistatusesretweet.php:76 actions/apistatusesretweets.php:72
 #: actions/deletenotice.php:52 actions/shownotice.php:92
 msgid "No such notice."
 msgstr "Nota non trovate."
 
 #. TRANS: Error text shown when trying to repeat an own notice.
-#: actions/apistatusesretweet.php:83 lib/command.php:538
+#: actions/apistatusesretweet.php:84 lib/command.php:538
 msgid "Cannot repeat your own notice."
 msgstr "Non pote repeter tu proprie nota."
 
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-#: actions/apistatusesretweet.php:91 lib/command.php:544
+#: actions/apistatusesretweet.php:92 lib/command.php:544
 msgid "Already repeated that notice."
 msgstr "Iste nota ha ja essite repetite."
 
@@ -667,22 +671,22 @@ msgstr "Stato delite."
 msgid "No status with that ID found."
 msgstr "Nulle stato trovate con iste ID."
 
-#: actions/apistatusesupdate.php:221
+#: actions/apistatusesupdate.php:222
 msgid "Client must provide a 'status' parameter with a value."
 msgstr "Le cliente debe fornir un parametro 'status' con un valor."
 
-#: actions/apistatusesupdate.php:242 actions/newnotice.php:157
+#: actions/apistatusesupdate.php:243 actions/newnotice.php:157
 #: lib/mailhandler.php:60
 #, php-format
 msgid "That's too long. Max notice size is %d chars."
 msgstr ""
 "Isto es troppo longe. Le longitude maximal del notas es %d characteres."
 
-#: actions/apistatusesupdate.php:283 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:284 actions/apiusershow.php:96
 msgid "Not found."
 msgstr "Non trovate."
 
-#: actions/apistatusesupdate.php:306 actions/newnotice.php:181
+#: actions/apistatusesupdate.php:307 actions/newnotice.php:181
 #, php-format
 msgid "Max notice size is %d chars, including attachment URL."
 msgstr ""
@@ -886,7 +890,9 @@ msgid "Yes"
 msgstr "Si"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
+#. TRANS: Submit button title.
+#. TRANS: Description of the form to block a user.
+#: actions/block.php:164 actions/groupmembers.php:403 lib/blockform.php:82
 msgid "Block this user"
 msgstr "Blocar iste usator"
 
@@ -928,11 +934,13 @@ msgstr "Un lista del usatores excludite del membrato de iste gruppo."
 msgid "Unblock user from group"
 msgstr "Disblocar le usator del gruppo"
 
-#: actions/blockedfromgroup.php:320 lib/unblockform.php:69
+#. TRANS: Title for the form to unblock a user.
+#: actions/blockedfromgroup.php:320 lib/unblockform.php:70
 msgid "Unblock"
 msgstr "Disblocar"
 
-#: actions/blockedfromgroup.php:320 lib/unblockform.php:80
+#. TRANS: Description of the form to unblock a user.
+#: actions/blockedfromgroup.php:320 lib/unblockform.php:82
 msgid "Unblock this user"
 msgstr "Disblocar iste usator"
 
@@ -971,9 +979,9 @@ msgstr "Iste adresse ha ja essite confirmate."
 #. 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/confirmaddress.php:116 actions/emailsettings.php:331
+#: actions/emailsettings.php:477 actions/imsettings.php:283
+#: actions/imsettings.php:442 actions/othersettings.php:174
 #: actions/profilesettings.php:283 actions/smssettings.php:308
 #: actions/smssettings.php:464
 msgid "Couldn't update user."
@@ -981,7 +989,7 @@ msgstr "Non poteva actualisar usator."
 
 #. 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/confirmaddress.php:128 actions/emailsettings.php:437
 #: actions/smssettings.php:422
 msgid "Couldn't delete email confirmation."
 msgstr "Non poteva deler confirmation de e-mail."
@@ -1017,9 +1025,10 @@ msgstr "Application non trovate."
 msgid "You are not the owner of this application."
 msgstr "Tu non es le proprietario de iste application."
 
+#. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:127
 #: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1307
+#: lib/action.php:1315
 msgid "There was a problem with your session token."
 msgstr "Il habeva un problema con tu indicio de session."
 
@@ -1053,7 +1062,7 @@ msgstr "Deler iste application"
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
 #: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:73 lib/profileformaction.php:64
+#: lib/adminpanelaction.php:71 lib/profileformaction.php:64
 #: lib/settingsaction.php:72
 msgid "Not logged in."
 msgstr "Tu non ha aperite un session."
@@ -1116,7 +1125,6 @@ msgstr "Deler iste usator"
 #. TRANS: Message used as title for design settings for the site.
 #. TRANS: Link description in user account settings menu.
 #: actions/designadminpanel.php:63 lib/accountsettingsaction.php:139
-#: lib/groupnav.php:119
 msgid "Design"
 msgstr "Apparentia"
 
@@ -1239,13 +1247,13 @@ msgstr "Restaurar apparentias predefinite"
 msgid "Reset back to default"
 msgstr "Revenir al predefinitiones"
 
-#. TRANS: Submit button title
+#. TRANS: Submit button title.
 #: actions/designadminpanel.php:685 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/snapshotadminpanel.php:245
 #: actions/subscriptions.php:226 actions/tagother.php:154
-#: actions/useradminpanel.php:294 lib/applicationeditform.php:363
+#: actions/useradminpanel.php:294 lib/applicationeditform.php:353
 #: lib/designsettings.php:256 lib/groupeditform.php:202
 msgid "Save"
 msgstr "Salveguardar"
@@ -1401,7 +1409,7 @@ msgstr "Adresse de e-mail actualmente confirmate."
 #. 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/emailsettings.php:115 actions/emailsettings.php:162
 #: actions/imsettings.php:116 actions/smssettings.php:124
 #: actions/smssettings.php:180
 msgctxt "BUTTON"
@@ -1419,22 +1427,26 @@ msgstr ""
 #. 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
+#. TRANS: Button label in the "Edit application" form.
 #: actions/emailsettings.php:127 actions/imsettings.php:131
-#: actions/smssettings.php:137 lib/applicationeditform.php:357
+#: actions/smssettings.php:137 lib/applicationeditform.php:347
 msgctxt "BUTTON"
 msgid "Cancel"
 msgstr "Cancellar"
 
-#. TRANS: Instructions for e-mail address input form.
-#: actions/emailsettings.php:135
+#. TRANS: Instructions for e-mail address input form. Do not translate
+#. TRANS: "example.org". It is one of the domain names reserved for
+#. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
+#. TRANS: Any other domain may be owned by a legitimate person or
+#. TRANS: organization.
+#: actions/emailsettings.php:139
 msgid "Email address, like \"UserName@example.org\""
 msgstr "Le adresse de e-mail, como \"nomine@example.org\""
 
 #. 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/emailsettings.php:143 actions/imsettings.php:151
 #: actions/smssettings.php:162
 msgctxt "BUTTON"
 msgid "Add"
@@ -1442,111 +1454,111 @@ msgstr "Adder"
 
 #. 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
+#: actions/emailsettings.php:151 actions/smssettings.php:171
 msgid "Incoming email"
 msgstr "E-mail entrante"
 
 #. 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
+#: actions/emailsettings.php:159 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."
 
 #. 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
+#: actions/emailsettings.php:168 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."
 
 #. 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
+#: actions/emailsettings.php:172 actions/smssettings.php:189
 msgctxt "BUTTON"
 msgid "New"
 msgstr "Nove"
 
 #. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:174
+#: actions/emailsettings.php:178
 msgid "Email preferences"
 msgstr "Preferentias de e-mail"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:180
+#: actions/emailsettings.php:184
 msgid "Send me notices of new subscriptions through email."
 msgstr "Inviar me notificationes de nove subscriptiones per e-mail."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:186
+#: actions/emailsettings.php:190
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr "Inviar me e-mail quando alcuno adde mi nota al favorites."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:193
+#: actions/emailsettings.php:197
 msgid "Send me email when someone sends me a private message."
 msgstr "Inviar me e-mail quando alcuno me invia un message private."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:199
+#: actions/emailsettings.php:203
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr "Inviar me e-mail quando alcuno me invia un \"responsa @\"."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:205
+#: actions/emailsettings.php:209
 msgid "Allow friends to nudge me and send me an email."
 msgstr "Permitte que amicos me pulsa e me invia e-mail."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:212
+#: actions/emailsettings.php:216
 msgid "I want to post notices by email."
 msgstr "Io vole publicar notas per e-mail."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:219
+#: actions/emailsettings.php:223
 msgid "Publish a MicroID for my email address."
 msgstr "Publicar un MicroID pro mi adresse de e-mail."
 
 #. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:334
+#: actions/emailsettings.php:338
 msgid "Email preferences saved."
 msgstr "Preferentias de e-mail salveguardate."
 
 #. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:353
+#: actions/emailsettings.php:357
 msgid "No email address."
 msgstr "Nulle adresse de e-mail."
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:361
+#: actions/emailsettings.php:365
 msgid "Cannot normalize that email address"
 msgstr "Non pote normalisar iste adresse de e-mail"
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:208
+#: actions/emailsettings.php:370 actions/register.php:208
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "Adresse de e-mail invalide."
 
 #. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:370
+#: actions/emailsettings.php:374
 msgid "That is already your email address."
 msgstr "Isto es ja tu adresse de e-mail."
 
 #. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:374
+#: actions/emailsettings.php:378
 msgid "That email address already belongs to another user."
 msgstr "Iste adresse de e-mail pertine ja a un altere usator."
 
 #. 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/emailsettings.php:395 actions/imsettings.php:351
 #: actions/smssettings.php:373
 msgid "Couldn't insert confirmation code."
 msgstr "Non poteva inserer le codice de confirmation."
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:398
+#: actions/emailsettings.php:402
 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."
@@ -1558,50 +1570,50 @@ msgstr ""
 #. 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/emailsettings.php:423 actions/imsettings.php:386
 #: actions/smssettings.php:408
 msgid "No pending confirmation to cancel."
 msgstr "Nulle confirmation pendente a cancellar."
 
 #. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:424
+#: actions/emailsettings.php:428
 msgid "That is the wrong email address."
 msgstr "Iste adresse de e-mail es erronee."
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:438
+#: actions/emailsettings.php:442
 msgid "Email confirmation cancelled."
 msgstr "Confirmation de e-mail cancellate."
 
 #. TRANS: Message given trying to remove an e-mail address that is not
 #. TRANS: registered for the active user.
-#: actions/emailsettings.php:458
+#: actions/emailsettings.php:462
 msgid "That is not your email address."
 msgstr "Isto non es tu adresse de e-mail."
 
 #. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:479
+#: actions/emailsettings.php:483
 msgid "The email address was removed."
 msgstr "Le adresse de e-mail ha essite removite."
 
-#: actions/emailsettings.php:493 actions/smssettings.php:568
+#: actions/emailsettings.php:497 actions/smssettings.php:568
 msgid "No incoming email address."
 msgstr "Nulle adresse de e-mail entrante."
 
 #. 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/emailsettings.php:508 actions/emailsettings.php:532
 #: actions/smssettings.php:578 actions/smssettings.php:602
 msgid "Couldn't update user record."
 msgstr "Non poteva actualisar le datos del usator."
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
-#: actions/emailsettings.php:508 actions/smssettings.php:581
+#: actions/emailsettings.php:512 actions/smssettings.php:581
 msgid "Incoming email address removed."
 msgstr "Adresse de e-mail entrante removite."
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
-#: actions/emailsettings.php:532 actions/smssettings.php:605
+#: actions/emailsettings.php:536 actions/smssettings.php:605
 msgid "New incoming email address added."
 msgstr "Nove adresse de e-mail entrante addite."
 
@@ -1719,7 +1731,7 @@ msgstr "Non poteva converter le indicio de requesta in un indicio de accesso."
 msgid "Remote service uses unknown version of OMB protocol."
 msgstr "Le servicio remote usa un version incognite del protocollo OMB."
 
-#: actions/finishremotesubscribe.php:138
+#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306
 msgid "Error updating remote profile."
 msgstr "Error durante le actualisation del profilo remote."
 
@@ -1776,7 +1788,7 @@ msgstr "Le usator es ja blocate del gruppo."
 msgid "User is not a member of group."
 msgstr "Le usator non es membro del gruppo."
 
-#: actions/groupblock.php:134 actions/groupmembers.php:360
+#: actions/groupblock.php:134 actions/groupmembers.php:364
 msgid "Block user from group"
 msgstr "Blocar usator del gruppo"
 
@@ -1858,40 +1870,32 @@ msgstr "Logotypo actualisate."
 msgid "Failed updating logo."
 msgstr "Falleva de actualisar le logotypo."
 
-#: actions/groupmembers.php:100 lib/groupnav.php:92
+#. TRANS: Title of the page showing group members.
+#. TRANS: %s is the name of the group.
+#: actions/groupmembers.php:102
 #, php-format
 msgid "%s group members"
 msgstr "Membros del gruppo %s"
 
-#: actions/groupmembers.php:103
+#. TRANS: Title of the page showing group members.
+#. TRANS: %1$s is the name of the group, %2$d is the page number of the members list.
+#: actions/groupmembers.php:107
 #, php-format
 msgid "%1$s group members, page %2$d"
 msgstr "Membros del gruppo %1$s, pagina %2$d"
 
-#: actions/groupmembers.php:118
+#: actions/groupmembers.php:122
 msgid "A list of the users in this group."
 msgstr "Un lista de usatores in iste gruppo."
 
-#: actions/groupmembers.php:182 lib/groupnav.php:107
+#: actions/groupmembers.php:186
 msgid "Admin"
 msgstr "Administrator"
 
-#: actions/groupmembers.php:392 lib/blockform.php:69
-msgid "Block"
-msgstr "Blocar"
-
-#: actions/groupmembers.php:487
+#: actions/groupmembers.php:498
 msgid "Make user an admin of the group"
 msgstr "Facer le usator administrator del gruppo"
 
-#: actions/groupmembers.php:519
-msgid "Make Admin"
-msgstr "Facer administrator"
-
-#: actions/groupmembers.php:519
-msgid "Make this user an admin"
-msgstr "Facer iste usator administrator"
-
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Title in atom group notice feed. %s is a group name.
 #. TRANS: Title in atom user notice feed. %s is a user name.
@@ -2029,7 +2033,10 @@ msgstr ""
 
 #. TRANS: IM address input field instructions in IM settings form.
 #. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:140
+#. TRANS: Do not translate "example.org". It is one of the domain names reserved for use in examples by
+#. TRANS: http://www.rfc-editor.org/rfc/rfc2606.txt. Any other domain may be owned by a legitimate
+#. TRANS: person or organization.
+#: actions/imsettings.php:143
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -2040,65 +2047,65 @@ msgstr ""
 "in GTalk."
 
 #. TRANS: Form legend for IM preferences form.
-#: actions/imsettings.php:155
+#: actions/imsettings.php:158
 msgid "IM preferences"
 msgstr "Preferentias de messageria instantanee"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:160
+#: actions/imsettings.php:163
 msgid "Send me notices through Jabber/GTalk."
 msgstr "Inviar me notas per Jabber/GTalk."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:166
+#: actions/imsettings.php:169
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr "Publicar un nota quando mi stato de Jabber/GTalk cambia."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:172
+#: actions/imsettings.php:175
 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."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:179
+#: actions/imsettings.php:182
 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "Publicar un MicroID pro mi adresse Jabber/GTalk."
 
 #. TRANS: Confirmation message for successful IM preferences save.
-#: actions/imsettings.php:287 actions/othersettings.php:180
+#: actions/imsettings.php:290 actions/othersettings.php:180
 msgid "Preferences saved."
 msgstr "Preferentias confirmate."
 
 #. TRANS: Message given saving IM address without having provided one.
-#: actions/imsettings.php:309
+#: actions/imsettings.php:312
 msgid "No Jabber ID."
 msgstr "Nulle ID de Jabber."
 
 #. TRANS: Message given saving IM address that cannot be normalised.
-#: actions/imsettings.php:317
+#: actions/imsettings.php:320
 msgid "Cannot normalize that Jabber ID"
 msgstr "Non pote normalisar iste ID de Jabber"
 
 #. TRANS: Message given saving IM address that not valid.
-#: actions/imsettings.php:322
+#: actions/imsettings.php:325
 msgid "Not a valid Jabber ID"
 msgstr "ID de Jabber non valide"
 
 #. TRANS: Message given saving IM address that is already set.
-#: actions/imsettings.php:326
+#: actions/imsettings.php:329
 msgid "That is already your Jabber ID."
 msgstr "Isto es ja tu ID de Jabber."
 
 #. TRANS: Message given saving IM address that is already set for another user.
-#: actions/imsettings.php:330
+#: actions/imsettings.php:333
 msgid "Jabber ID already belongs to another user."
 msgstr "Le ID de Jabber pertine ja a un altere usator."
 
 #. 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
+#: actions/imsettings.php:361
 #, php-format
 msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
@@ -2108,28 +2115,28 @@ msgstr ""
 "instantanee specificate. Tu debe approbar que %s invia messages a te."
 
 #. TRANS: Message given canceling IM address confirmation for the wrong IM address.
-#: actions/imsettings.php:388
+#: actions/imsettings.php:391
 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
+#: actions/imsettings.php:400
 msgid "Couldn't delete IM confirmation."
 msgstr "Non poteva deler confirmation de messageria instantanee."
 
 #. TRANS: Message given after successfully canceling IM address confirmation.
-#: actions/imsettings.php:402
+#: actions/imsettings.php:405
 msgid "IM confirmation cancelled."
 msgstr "Confirmation de messageria instantanee cancellate."
 
 #. TRANS: Message given trying to remove an IM address that is not
 #. TRANS: registered for the active user.
-#: actions/imsettings.php:424
+#: actions/imsettings.php:427
 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
+#: actions/imsettings.php:450
 msgid "The IM address was removed."
 msgstr "Le adresse de messageria instantanee ha essite removite."
 
@@ -2604,8 +2611,8 @@ msgid "Only %s URLs over plain HTTP please."
 msgstr "Solmente le URLs %s es permittite super HTTP simple."
 
 #. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1215
-#: lib/apiaction.php:1243 lib/apiaction.php:1366
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1206
+#: lib/apiaction.php:1233 lib/apiaction.php:1356
 msgid "Not a supported data format."
 msgstr "Formato de datos non supportate."
 
@@ -2746,7 +2753,7 @@ msgid "Password saved."
 msgstr "Contrasigno salveguardate."
 
 #. TRANS: Menu item for site administration
-#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:384
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:371
 msgid "Paths"
 msgstr "Camminos"
 
@@ -2959,7 +2966,7 @@ msgstr "Nomine complete"
 
 #. TRANS: Form input field label.
 #: actions/profilesettings.php:115 actions/register.php:460
-#: lib/applicationeditform.php:244 lib/groupeditform.php:161
+#: lib/applicationeditform.php:235 lib/groupeditform.php:161
 msgid "Homepage"
 msgstr "Pagina personal"
 
@@ -3065,7 +3072,7 @@ msgid "Couldn't save tags."
 msgstr "Non poteva salveguardar etiquettas."
 
 #. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:391 lib/adminpanelaction.php:141
+#: actions/profilesettings.php:391 lib/adminpanelaction.php:138
 msgid "Settings saved."
 msgstr "Preferentias confirmate."
 
@@ -3603,7 +3610,7 @@ msgstr "Usator es ja in cassa de sablo."
 
 #. TRANS: Menu item for site administration
 #: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
-#: lib/adminpanelaction.php:392
+#: lib/adminpanelaction.php:379
 msgid "Sessions"
 msgstr "Sessiones"
 
@@ -3641,24 +3648,24 @@ msgid "Application profile"
 msgstr "Profilo del application"
 
 #. TRANS: Form input field label for application icon.
-#: actions/showapplication.php:159 lib/applicationeditform.php:182
+#: actions/showapplication.php:159 lib/applicationeditform.php:173
 msgid "Icon"
 msgstr "Icone"
 
 #. TRANS: Form input field label for application name.
 #: actions/showapplication.php:169 actions/version.php:197
-#: lib/applicationeditform.php:199
+#: lib/applicationeditform.php:190
 msgid "Name"
 msgstr "Nomine"
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:178 lib/applicationeditform.php:235
+#: actions/showapplication.php:178 lib/applicationeditform.php:226
 msgid "Organization"
 msgstr "Organisation"
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:216 lib/groupeditform.php:172
+#: lib/applicationeditform.php:207 lib/groupeditform.php:172
 msgid "Description"
 msgstr "Description"
 
@@ -3773,7 +3780,7 @@ msgstr ""
 msgid "This is a way to share what you like."
 msgstr "Isto es un modo de condivider lo que te place."
 
-#: actions/showgroup.php:82 lib/groupnav.php:86
+#: actions/showgroup.php:82
 #, php-format
 msgid "%s group"
 msgstr "Gruppo %s"
@@ -3825,7 +3832,7 @@ msgstr "Syndication de notas pro le gruppo %s (Atom)"
 msgid "FOAF for %s group"
 msgstr "Amico de un amico pro le gruppo %s"
 
-#: actions/showgroup.php:393 actions/showgroup.php:445 lib/groupnav.php:91
+#: actions/showgroup.php:393 actions/showgroup.php:445
 msgid "Members"
 msgstr "Membros"
 
@@ -4279,7 +4286,7 @@ msgstr "Nulle codice entrate"
 
 #. TRANS: Menu item for site administration
 #: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
-#: lib/adminpanelaction.php:408
+#: lib/adminpanelaction.php:395
 msgid "Snapshots"
 msgstr "Instantaneos"
 
@@ -5012,7 +5019,7 @@ msgid "Unable to save tag."
 msgstr "Impossibile salveguardar le etiquetta."
 
 #. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#: classes/Subscription.php:75 lib/oauthstore.php:465
+#: classes/Subscription.php:75 lib/oauthstore.php:466
 msgid "You have been banned from subscribing."
 msgstr "Tu ha essite blocate del subscription."
 
@@ -5160,7 +5167,8 @@ msgid "Change site configuration"
 msgstr "Modificar le configuration del sito"
 
 #. TRANS: Main menu option when logged in and site admin for access to site configuration
-#: lib/action.php:474
+#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
+#: lib/action.php:474 lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr "Admin"
@@ -5237,7 +5245,7 @@ msgstr "Cercar"
 
 #. TRANS: DT element for site notice. String is hidden in default CSS.
 #. TRANS: Menu item for site administration
-#: lib/action.php:538 lib/adminpanelaction.php:400
+#: lib/action.php:538 lib/adminpanelaction.php:387
 msgid "Site notice"
 msgstr "Aviso del sito"
 
@@ -5301,7 +5309,10 @@ msgid "StatusNet software license"
 msgstr "Licentia del software StatusNet"
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
-#: lib/action.php:843
+#. TRANS: Text between [] is a link description, text between () is the link itself.
+#. TRANS: Make sure there is no whitespace between "]" and "(".
+#. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
+#: lib/action.php:846
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -5311,13 +5322,16 @@ msgstr ""
 "%](%%site.broughtbyurl%%)."
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:846
+#: lib/action.php:849
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** es un servicio de microblog."
 
 #. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.
-#: lib/action.php:850
+#. TRANS: Make sure there is no whitespace between "]" and "(".
+#. TRANS: Text between [] is a link description, text between () is the link itself.
+#. TRANS: %s is the version of StatusNet that is being used.
+#: lib/action.php:856
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -5329,50 +5343,51 @@ msgstr ""
 "(http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
 
 #. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:866
+#: lib/action.php:872
 msgid "Site content license"
 msgstr "Licentia del contento del sito"
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:873
+#: lib/action.php:879
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr "Le contento e datos de %1$s es private e confidential."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:880
+#: lib/action.php:886
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr "Contento e datos sub copyright de %1$s. Tote le derectos reservate."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:884
+#: lib/action.php:890
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 "Contento e datos sub copyright del contributores. Tote le derectos reservate."
 
-#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:897
+#. TRANS: license message in footer.
+#. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
+#: lib/action.php:904
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr "Tote le contento e datos de %1$s es disponibile sub le licentia %2$s."
 
 #. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1236
+#: lib/action.php:1243
 msgid "Pagination"
 msgstr "Pagination"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1247
+#: lib/action.php:1254
 msgid "After"
 msgstr "Post"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1257
+#: lib/action.php:1264
 msgid "Before"
 msgstr "Ante"
 
@@ -5383,209 +5398,228 @@ msgstr ""
 "Expectava le elemento-radice de un syndication, ma recipeva un documento XML "
 "integre."
 
-#: lib/activityutils.php:208
+#. TRANS: Client exception thrown when there is no source attribute.
+#: lib/activityutils.php:203
 msgid "Can't handle remote content yet."
 msgstr "Non pote ancora tractar contento remote."
 
-#: lib/activityutils.php:244
+#. TRANS: Client exception thrown when there embedded XML content is found that cannot be processed yet.
+#: lib/activityutils.php:240
 msgid "Can't handle embedded XML content yet."
 msgstr "Non pote ancora tractar contento XML incastrate."
 
-#: lib/activityutils.php:248
+#. TRANS: Client exception thrown when base64 encoded content is found that cannot be processed yet.
+#: lib/activityutils.php:245
 msgid "Can't handle embedded Base64 content yet."
 msgstr "Non pote ancora tractar contento Base64 incastrate."
 
 #. TRANS: Client error message thrown when a user tries to change admin settings but has no access rights.
-#: lib/adminpanelaction.php:98
+#: lib/adminpanelaction.php:96
 msgid "You cannot make changes to this site."
 msgstr "Tu non pote facer modificationes in iste sito."
 
 #. TRANS: Client error message throw when a certain panel's settings cannot be changed.
-#: lib/adminpanelaction.php:110
+#: lib/adminpanelaction.php:108
 msgid "Changes to that panel are not allowed."
 msgstr "Le modification de iste pannello non es permittite."
 
 #. TRANS: Client error message.
-#: lib/adminpanelaction.php:229
+#: lib/adminpanelaction.php:222
 msgid "showForm() not implemented."
 msgstr "showForm() non implementate."
 
 #. TRANS: Client error message
-#: lib/adminpanelaction.php:259
+#: lib/adminpanelaction.php:250
 msgid "saveSettings() not implemented."
 msgstr "saveSettings() non implementate."
 
 #. TRANS: Client error message thrown if design settings could not be deleted in
 #. TRANS: the admin panel Design.
-#: lib/adminpanelaction.php:284
+#: lib/adminpanelaction.php:274
 msgid "Unable to delete design setting."
 msgstr "Impossibile deler configuration de apparentia."
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:350
+#: lib/adminpanelaction.php:337
 msgid "Basic site configuration"
 msgstr "Configuration basic del sito"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:352
+#: lib/adminpanelaction.php:339
 msgctxt "MENU"
 msgid "Site"
 msgstr "Sito"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:358
+#: lib/adminpanelaction.php:345
 msgid "Design configuration"
 msgstr "Configuration del apparentia"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:360
+#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
+#: lib/adminpanelaction.php:347 lib/groupnav.php:135
 msgctxt "MENU"
 msgid "Design"
 msgstr "Apparentia"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:366
+#: lib/adminpanelaction.php:353
 msgid "User configuration"
 msgstr "Configuration del usator"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:368 lib/personalgroupnav.php:115
+#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:115
 msgid "User"
 msgstr "Usator"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:374
+#: lib/adminpanelaction.php:361
 msgid "Access configuration"
 msgstr "Configuration del accesso"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:382
+#: lib/adminpanelaction.php:369
 msgid "Paths configuration"
 msgstr "Configuration del camminos"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:390
+#: lib/adminpanelaction.php:377
 msgid "Sessions configuration"
 msgstr "Configuration del sessiones"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:398
+#: lib/adminpanelaction.php:385
 msgid "Edit site notice"
 msgstr "Modificar aviso del sito"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:406
+#: lib/adminpanelaction.php:393
 msgid "Snapshots configuration"
 msgstr "Configuration del instantaneos"
 
 #. TRANS: Client error 401.
-#: lib/apiauth.php:113
+#: lib/apiauth.php:111
 msgid "API resource requires read-write access, but you only have read access."
 msgstr ""
 "Le ressource de API require accesso pro lectura e scriptura, ma tu ha "
 "solmente accesso pro lectura."
 
+#. TRANS: OAuth exception thrown when no application is found for a given consumer key.
+#: lib/apiauth.php:175
+msgid "No application for that consumer key."
+msgstr ""
+
+#. TRANS: OAuth exception given when no user was found for a given token (no token was found).
+#: lib/apiauth.php:217
+msgid "No user for that token."
+msgstr ""
+
+#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
+#: lib/apioauthstore.php:178
+msgid "Tried to revoke unknown token"
+msgstr ""
+
 #. TRANS: Form legend.
-#: lib/applicationeditform.php:137
+#: lib/applicationeditform.php:129
 msgid "Edit application"
 msgstr "Modificar application"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:187
+#: lib/applicationeditform.php:178
 msgid "Icon for this application"
 msgstr "Icone pro iste application"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:209
+#: lib/applicationeditform.php:200
 #, php-format
 msgid "Describe your application in %d characters"
 msgstr "Describe tu application in %d characteres"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:213
+#: lib/applicationeditform.php:204
 msgid "Describe your application"
 msgstr "Describe tu application"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:224
+#: lib/applicationeditform.php:215
 msgid "URL of the homepage of this application"
 msgstr "URL del pagina initial de iste application"
 
 #. TRANS: Form input field label.
-#: lib/applicationeditform.php:226
+#: lib/applicationeditform.php:217
 msgid "Source URL"
 msgstr "URL de origine"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:233
+#: lib/applicationeditform.php:224
 msgid "Organization responsible for this application"
 msgstr "Organisation responsabile de iste application"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:242
+#: lib/applicationeditform.php:233
 msgid "URL for the homepage of the organization"
 msgstr "URL del pagina initial del organisation"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:251
+#: lib/applicationeditform.php:242
 msgid "URL to redirect to after authentication"
 msgstr "URL verso le qual rediriger post authentication"
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:278
+#: lib/applicationeditform.php:269
 msgid "Browser"
 msgstr "Navigator"
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:295
+#: lib/applicationeditform.php:286
 msgid "Desktop"
 msgstr "Scriptorio"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:297
+#: lib/applicationeditform.php:288
 msgid "Type of application, browser or desktop"
 msgstr "Typo de application, navigator o scriptorio"
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:320
+#: lib/applicationeditform.php:311
 msgid "Read-only"
 msgstr "Lectura solmente"
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:339
+#: lib/applicationeditform.php:330
 msgid "Read-write"
 msgstr "Lectura e scriptura"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:341
+#: lib/applicationeditform.php:332
 msgid "Default access for this application: read-only, or read-write"
 msgstr ""
 "Accesso predefinite pro iste application: lectura solmente, o lectura e "
 "scriptura"
 
-#. TRANS: Submit button title
-#: lib/applicationeditform.php:359
+#. TRANS: Submit button title.
+#: lib/applicationeditform.php:349
 msgid "Cancel"
 msgstr "Cancellar"
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:136
+#: lib/applicationlist.php:135
 msgid "read-write"
 msgstr "lectura-scriptura"
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:138
+#: lib/applicationlist.php:137
 msgid "read-only"
 msgstr "lectura solmente"
 
 #. 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
+#: lib/applicationlist.php:143
 #, php-format
 msgid "Approved %1$s - \"%2$s\" access."
 msgstr "Accesso \"%2$s\" approbate le %1$s."
 
 #. TRANS: Button label
-#: lib/applicationlist.php:159
+#: lib/applicationlist.php:158
 msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "Revocar"
@@ -5605,11 +5639,13 @@ msgstr "Autor"
 msgid "Provider"
 msgstr "Providitor"
 
-#: lib/attachmentnoticesection.php:67
+#. TRANS: Title.
+#: lib/attachmentnoticesection.php:68
 msgid "Notices where this attachment appears"
 msgstr "Notas ubi iste annexo appare"
 
-#: lib/attachmenttagcloudsection.php:48
+#. TRANS: Title.
+#: lib/attachmenttagcloudsection.php:49
 msgid "Tags for this attachment"
 msgstr "Etiquettas pro iste annexo"
 
@@ -5621,6 +5657,11 @@ msgstr "Cambio del contrasigno fallite"
 msgid "Password changing is not allowed"
 msgstr "Cambio del contrasigno non permittite"
 
+#. TRANS: Title for the form to block a user.
+#: lib/blockform.php:70
+msgid "Block"
+msgstr "Blocar"
+
 #: lib/channel.php:157 lib/channel.php:177
 msgid "Command results"
 msgstr "Resultatos del commando"
@@ -5871,7 +5912,7 @@ msgid "You are not subscribed to anyone."
 msgstr "Tu non es subscribite a alcuno."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to.
-#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.
 #: lib/command.php:836
 msgid "You are subscribed to this person:"
@@ -5886,7 +5927,7 @@ msgid "No one is subscribed to you."
 msgstr "Necuno es subscribite a te."
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
-#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
 #: lib/command.php:863
 msgid "This person is subscribed to you:"
@@ -5901,7 +5942,7 @@ msgid "You are not a member of any groups."
 msgstr "Tu non es membro de alcun gruppo."
 
 #. TRANS: Text shown after requesting groups a user is subscribed to.
-#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
 #: lib/command.php:890
 msgid "You are a member of this group:"
@@ -5909,6 +5950,7 @@ 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:"
 
+#. TRANS: Help text for commands.
 #: lib/command.php:905
 msgid ""
 "Commands:\n"
@@ -6130,38 +6172,6 @@ msgid "Extra nicknames for the group, comma- or space- separated, max %d"
 msgstr ""
 "Pseudonymos additional pro le gruppo, separate per commas o spatios, max %d"
 
-#: lib/groupnav.php:85
-msgid "Group"
-msgstr "Gruppo"
-
-#: lib/groupnav.php:101
-msgid "Blocked"
-msgstr "Blocate"
-
-#: lib/groupnav.php:102
-#, php-format
-msgid "%s blocked users"
-msgstr "%s usatores blocate"
-
-#: lib/groupnav.php:108
-#, php-format
-msgid "Edit %s group properties"
-msgstr "Modificar proprietates del gruppo %s"
-
-#: lib/groupnav.php:113
-msgid "Logo"
-msgstr "Logotypo"
-
-#: lib/groupnav.php:114
-#, php-format
-msgid "Add or edit %s logo"
-msgstr "Adder o modificar logotypo de %s"
-
-#: lib/groupnav.php:120
-#, php-format
-msgid "Add or edit %s design"
-msgstr "Adder o modificar apparentia de %s"
-
 #: lib/groupsbymemberssection.php:71
 msgid "Groups with most members"
 msgstr "Gruppos con le plus membros"
@@ -6193,7 +6203,8 @@ msgstr "Iste file es troppo grande. Le dimension maximal es %s."
 msgid "Partial upload."
 msgstr "Incargamento partial."
 
-#: lib/imagefile.php:101 lib/mediafile.php:170
+#. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
+#: lib/imagefile.php:101 lib/mediafile.php:179
 msgid "System error uploading file."
 msgstr "Error de systema durante le incargamento del file."
 
@@ -6595,17 +6606,20 @@ msgstr "Pardono, le reception de e-mail non es permittite."
 msgid "Unsupported message type: %s"
 msgstr "Typo de message non supportate: %s"
 
-#: lib/mediafile.php:98 lib/mediafile.php:123
+#. TRANS: Client exception thrown when a database error was thrown during a file upload operation.
+#: lib/mediafile.php:99 lib/mediafile.php:125
 msgid "There was a database error while saving your file. Please try again."
 msgstr ""
 "Un error de base de datos occurreva durante le salveguarda de tu file. Per "
 "favor reproba."
 
-#: lib/mediafile.php:142
+#. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
+#: lib/mediafile.php:145
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
 msgstr "Le file incargate excede le directiva upload_max_filesize in php.ini."
 
-#: lib/mediafile.php:147
+#. TRANS: Client exception.
+#: lib/mediafile.php:151
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form."
@@ -6613,44 +6627,43 @@ msgstr ""
 "Le file incargate excede le directiva MAX_FILE_SIZE specificate in le "
 "formulario HTML."
 
-#: lib/mediafile.php:152
+#. TRANS: Client exception.
+#: lib/mediafile.php:157
 msgid "The uploaded file was only partially uploaded."
 msgstr "Le file incargate ha solmente essite incargate partialmente."
 
-#: lib/mediafile.php:159
+#. TRANS: Client exception thrown when a temporary folder is not present to store a file upload.
+#: lib/mediafile.php:165
 msgid "Missing a temporary folder."
 msgstr "Manca un dossier temporari."
 
-#: lib/mediafile.php:162
+#. TRANS: Client exception thrown when writing to disk is not possible during a file upload operation.
+#: lib/mediafile.php:169
 msgid "Failed to write file to disk."
 msgstr "Falleva de scriber le file in disco."
 
-#: lib/mediafile.php:165
+#. TRANS: Client exception thrown when a file upload operation has been stopped by an extension.
+#: lib/mediafile.php:173
 msgid "File upload stopped by extension."
 msgstr "Incargamento de file stoppate per un extension."
 
-#: lib/mediafile.php:179 lib/mediafile.php:217
+#. TRANS: Client exception thrown when a file upload operation would cause a user to exceed a set quota.
+#: lib/mediafile.php:189 lib/mediafile.php:232
 msgid "File exceeds user's quota."
 msgstr "File excede quota del usator."
 
-#: lib/mediafile.php:197 lib/mediafile.php:234
+#. TRANS: Client exception thrown when a file upload operation fails because the file could
+#. TRANS: not be moved from the temporary folder to the permanent file location.
+#: lib/mediafile.php:209 lib/mediafile.php:251
 msgid "File could not be moved to destination directory."
 msgstr "File non poteva esser displaciate in le directorio de destination."
 
-#: lib/mediafile.php:202 lib/mediafile.php:238
+#. TRANS: Client exception thrown when a file upload operation has been stopped because the MIME
+#. TRANS: type of the uploaded file could not be determined.
+#: lib/mediafile.php:216 lib/mediafile.php:257
 msgid "Could not determine file's MIME type."
 msgstr "Non poteva determinar le typo MIME del file."
 
-#: lib/mediafile.php:318
-#, php-format
-msgid " Try using another %s format."
-msgstr "  Tenta usar un altere formato %s."
-
-#: lib/mediafile.php:323
-#, php-format
-msgid "%s is not a supported file type on this server."
-msgstr "%s non es un typo de file supportate in iste servitor."
-
 #: lib/messageform.php:120
 msgid "Send a direct notice"
 msgstr "Inviar un nota directe"
@@ -6766,27 +6779,7 @@ msgstr "Pulsar"
 msgid "Send a nudge to this user"
 msgstr "Inviar un pulsata a iste usator"
 
-#: lib/oauthstore.php:283
-msgid "Error inserting new profile"
-msgstr "Error durante le insertion del nove profilo"
-
-#: lib/oauthstore.php:291
-msgid "Error inserting avatar"
-msgstr "Error durante le insertion del avatar"
-
-#: lib/oauthstore.php:306
-msgid "Error updating remote profile"
-msgstr "Error in actualisar le profilo remote"
-
-#: lib/oauthstore.php:311
-msgid "Error inserting remote profile"
-msgstr "Error durante le insertion del profilo remote"
-
-#: lib/oauthstore.php:345
-msgid "Duplicate notice"
-msgstr "Duplicar nota"
-
-#: lib/oauthstore.php:490
+#: lib/oauthstore.php:491
 msgid "Couldn't insert new subscription."
 msgstr "Non poteva inserer nove subscription."
 
@@ -6823,7 +6816,8 @@ msgstr "Tu messages inviate"
 msgid "Tags in %s's notices"
 msgstr "Etiquettas in le notas de %s"
 
-#: lib/plugin.php:115
+#. TRANS: Displayed as version information for a plugin if no version information was found.
+#: lib/plugin.php:116
 msgid "Unknown"
 msgstr "Incognite"
 
@@ -6917,19 +6911,19 @@ msgstr "Cassa de sablo"
 msgid "Sandbox this user"
 msgstr "Mitter iste usator in le cassa de sablo"
 
-#: lib/searchaction.php:120
+#. TRANS: Fieldset legend for the search form.
+#: lib/searchaction.php:121
 msgid "Search site"
 msgstr "Cercar in sito"
 
-#: lib/searchaction.php:126
+#. TRANS: Used as a field label for the field where one or more keywords
+#. TRANS: for searching can be entered.
+#: lib/searchaction.php:129
 msgid "Keyword(s)"
 msgstr "Parola(s)-clave"
 
-#: lib/searchaction.php:127
-msgid "Search"
-msgstr "Cercar"
-
-#: lib/searchaction.php:162
+#. TRANS: Definition list item with instructions on how to get (better) search results.
+#: lib/searchaction.php:170
 msgid "Search help"
 msgstr "Adjuta super le recerca"
 
@@ -7132,56 +7126,32 @@ msgid "Moderator"
 msgstr "Moderator"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1102
+#: lib/util.php:1103
 msgid "a few seconds ago"
 msgstr "alcun secundas retro"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1105
+#: lib/util.php:1106
 msgid "about a minute ago"
 msgstr "circa un minuta retro"
 
-#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1109
-#, php-format
-msgid "about %d minutes ago"
-msgstr "circa %d minutas retro"
-
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 #: lib/util.php:1112
 msgid "about an hour ago"
 msgstr "circa un hora retro"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1116
-#, php-format
-msgid "about %d hours ago"
-msgstr "circa %d horas retro"
-
-#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1119
+#: lib/util.php:1118
 msgid "about a day ago"
 msgstr "circa un die retro"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1123
-#, php-format
-msgid "about %d days ago"
-msgstr "circa %d dies retro"
-
-#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1126
+#: lib/util.php:1124
 msgid "about a month ago"
 msgstr "circa un mense retro"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 #: lib/util.php:1130
-#, php-format
-msgid "about %d months ago"
-msgstr "circa %d menses retro"
-
-#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1133
 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 6fb275b237..177c00e08a 100644
--- a/locale/is/LC_MESSAGES/statusnet.po
+++ b/locale/is/LC_MESSAGES/statusnet.po
@@ -1,6 +1,7 @@
-# Translation of StatusNet to Icelandic
+# Translation of StatusNet to Icelandic (Ãslenska)
+# Expored from translatewiki.net
 #
-# Author@translatewiki.net: McDutchie
+# Author: McDutchie
 # --
 # This file is distributed under the same license as the StatusNet package.
 #
@@ -8,18 +9,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-08 22:33+0000\n"
-"PO-Revision-Date: 2010-09-08 22:34:34+0000\n"
-"Language-Team: Icelandic\n"
+"POT-Creation-Date: 2010-09-14 19:53+0000\n"
+"PO-Revision-Date: 2010-09-14 19:54:02+0000\n"
+"Language-Team: Icelandic <http://translatewiki.net/wiki/Portal:is>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r72348); Translate extension (2010-08-20)\n"
+"X-Generator: MediaWiki 1.17alpha (r73009); Translate extension (2010-08-20)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: is\n"
-"X-Message-Group: out-statusnet\n"
-"Plural-Forms: nplurals=2; plural=(n % 100 != 1 && n % 100 != 21 && n % 100 !"
-"= 31 && n % 100 != 41 && n % 100 != 51 && n % 100 != 61 && n % 100 != 71 && "
-"n % 100 != 81 && n % 100 != 91);\n"
+"X-Message-Group: #out-statusnet\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-POT-Import-Date: 1284-49-16 34::+0000\n"
 
 #. TRANS: Checkbox instructions for admin setting "Private"
 #: actions/accessadminpanel.php:165
@@ -43,15 +43,15 @@ msgstr ""
 
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #: actions/all.php:79 actions/allrss.php:68
-#: actions/apiaccountupdatedeliverydevice.php:114
-#: actions/apiaccountupdateprofile.php:105
-#: actions/apiaccountupdateprofilebackgroundimage.php:116
-#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
-#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
-#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:113
-#: actions/apigroupismember.php:91 actions/apigroupjoin.php:100
-#: actions/apigroupleave.php:100 actions/apigrouplist.php:73
-#: actions/apistatusesupdate.php:229 actions/apisubscriptions.php:87
+#: actions/apiaccountupdatedeliverydevice.php:115
+#: actions/apiaccountupdateprofile.php:106
+#: actions/apiaccountupdateprofilebackgroundimage.php:117
+#: actions/apiaccountupdateprofileimage.php:106 actions/apiblockcreate.php:98
+#: actions/apiblockdestroy.php:97 actions/apidirectmessage.php:77
+#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:114
+#: actions/apigroupismember.php:91 actions/apigroupjoin.php:101
+#: actions/apigroupleave.php:101 actions/apigrouplist.php:73
+#: actions/apistatusesupdate.php:230 actions/apisubscriptions.php:87
 #: actions/apitimelinefavorites.php:72 actions/apitimelinefriends.php:174
 #: actions/apitimelinehome.php:80 actions/apitimelinementions.php:80
 #: actions/apitimelineuser.php:82 actions/avatarbynickname.php:75
@@ -94,6 +94,12 @@ msgstr ""
 msgid "Feed for friends of %s (RSS 2.0)"
 msgstr ""
 
+#. TRANS: %1$s is user nickname
+#: actions/all.php:125
+#, php-format
+msgid "Feed for friends of %s (Atom)"
+msgstr ""
+
 #. TRANS: %1$s is user nickname
 #: actions/all.php:138
 #, php-format
@@ -131,39 +137,41 @@ msgstr ""
 msgid "Updates from %1$s and friends on %2$s!"
 msgstr "FÃ¦rslur frÃ¡ %1$s og vinum Ã¡ %2$s!"
 
-#: actions/apiaccountupdatedeliverydevice.php:86
-#: actions/apiaccountupdateprofile.php:89
-#: actions/apiaccountupdateprofilebackgroundimage.php:86
-#: actions/apiaccountupdateprofilecolors.php:110
-#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89
-#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109
-#: actions/apifavoritecreate.php:91 actions/apifavoritedestroy.php:92
-#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
-#: actions/apigroupcreate.php:105 actions/apigroupjoin.php:92
-#: actions/apigroupleave.php:92 actions/apimediaupload.php:67
-#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:198
+#. TRANS: Client error message. POST is a HTTP command. It should not be translated.
+#. TRANS: Client error. POST is a HTTP command. It should not be translated.
+#: actions/apiaccountupdatedeliverydevice.php:87
+#: actions/apiaccountupdateprofile.php:90
+#: actions/apiaccountupdateprofilebackgroundimage.php:87
+#: actions/apiaccountupdateprofilecolors.php:111
+#: actions/apiaccountupdateprofileimage.php:85 actions/apiblockcreate.php:90
+#: actions/apiblockdestroy.php:89 actions/apidirectmessagenew.php:110
+#: actions/apifavoritecreate.php:92 actions/apifavoritedestroy.php:93
+#: actions/apifriendshipscreate.php:92 actions/apifriendshipsdestroy.php:92
+#: actions/apigroupcreate.php:106 actions/apigroupjoin.php:93
+#: actions/apigroupleave.php:93 actions/apimediaupload.php:68
+#: actions/apistatusesretweet.php:66 actions/apistatusesupdate.php:199
 msgid "This method requires a POST."
 msgstr "Ãessi aÃ°ferÃ° krefst POST."
 
-#: actions/apiaccountupdatedeliverydevice.php:106
+#: actions/apiaccountupdatedeliverydevice.php:107
 msgid ""
 "You must specify a parameter named 'device' with a value of one of: sms, im, "
 "none."
 msgstr ""
 
-#: actions/apiaccountupdateprofile.php:112
-#: actions/apiaccountupdateprofilebackgroundimage.php:194
-#: actions/apiaccountupdateprofilecolors.php:185
-#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/apiaccountupdateprofile.php:113
+#: actions/apiaccountupdateprofilebackgroundimage.php:195
+#: actions/apiaccountupdateprofilecolors.php:186
+#: actions/apiaccountupdateprofileimage.php:131 actions/apiusershow.php:108
 #: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/hcard.php:74
 #: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
 #: lib/profileaction.php:84
 msgid "User has no profile."
 msgstr "Notandi hefur enga persÃ³nulega sÃÃ°u."
 
-#: actions/apiaccountupdateprofilebackgroundimage.php:108
-#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
-#: actions/apistatusesupdate.php:212 actions/avatarsettings.php:257
+#: actions/apiaccountupdateprofilebackgroundimage.php:109
+#: actions/apiaccountupdateprofileimage.php:98 actions/apimediaupload.php:81
+#: actions/apistatusesupdate.php:213 actions/avatarsettings.php:257
 #: actions/designadminpanel.php:123 actions/editapplication.php:118
 #: actions/newapplication.php:101 actions/newnotice.php:94
 #: lib/designsettings.php:283
@@ -173,11 +181,21 @@ msgid ""
 "current configuration."
 msgstr ""
 
-#: actions/apiblockcreate.php:126
+#: actions/apiaccountupdateprofilebackgroundimage.php:137
+#: actions/apiaccountupdateprofilebackgroundimage.php:147
+#: actions/apiaccountupdateprofilecolors.php:165
+#: actions/apiaccountupdateprofilecolors.php:175
+#: actions/groupdesignsettings.php:290 actions/groupdesignsettings.php:300
+#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
+#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
+msgid "Unable to save your design settings."
+msgstr ""
+
+#: actions/apiblockcreate.php:127
 msgid "Block user failed."
 msgstr "MistÃ³kst aÃ° loka Ã¡ notanda."
 
-#: actions/apiblockdestroy.php:114
+#: actions/apiblockdestroy.php:115
 msgid "Unblock user failed."
 msgstr "MistÃ³kst aÃ° opna fyrir notanda."
 
@@ -196,127 +214,128 @@ msgstr "Bein skilaboÃ° til %s"
 msgid "All the direct messages sent to %s"
 msgstr "Ãll bein skilaboÃ° til %s"
 
-#: actions/apidirectmessagenew.php:118
+#: actions/apidirectmessagenew.php:119
 msgid "No message text!"
 msgstr "Enginn texti Ã skilaboÃ°um!"
 
-#: actions/apidirectmessagenew.php:127 actions/newmessage.php:150
+#: actions/apidirectmessagenew.php:128 actions/newmessage.php:150
 #, php-format
 msgid "That's too long. Max message size is %d chars."
 msgstr "Ãetta er of langt. HÃ¡markslengd babls er %d tÃ¡kn."
 
-#: actions/apidirectmessagenew.php:138
+#: actions/apidirectmessagenew.php:139
 msgid "Recipient user not found."
 msgstr "MÃ³ttakandi fannst ekki."
 
-#: actions/apidirectmessagenew.php:142
+#: actions/apidirectmessagenew.php:143
 msgid "Can't send direct messages to users who aren't your friend."
 msgstr "Gat ekki sent bein skilaboÃ° til notenda sem eru ekki vinir Ã¾Ãnir."
 
-#: actions/apifavoritecreate.php:109 actions/apifavoritedestroy.php:110
+#: actions/apifavoritecreate.php:110 actions/apifavoritedestroy.php:111
 #: actions/apistatusesdestroy.php:121
 msgid "No status found with that ID."
 msgstr "Engin staÃ°a fundin meÃ° Ã¾essu kenni."
 
 #. TRANS: Error message text shown when a favorite could not be set.
-#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:296
+#: actions/apifavoritecreate.php:132 actions/favor.php:84 lib/command.php:296
 msgid "Could not create favorite."
 msgstr "Gat ekki bÃºiÃ° til uppÃ¡hald."
 
-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
+#: actions/apifavoritedestroy.php:136 actions/disfavor.php:87
 msgid "Could not delete favorite."
 msgstr "Gat ekki eytt uppÃ¡haldi."
 
-#: actions/apifriendshipscreate.php:109
+#: actions/apifriendshipscreate.php:110
 msgid "Could not follow user: profile not found."
 msgstr ""
 "Get ekki fylgst meÃ° notanda: %s. Ãessi notandi er nÃº Ã¾egar Ã listanum Ã¾Ãnum."
 
-#: actions/apifriendshipscreate.php:118
+#: actions/apifriendshipscreate.php:119
 #, php-format
 msgid "Could not follow user: %s is already on your list."
 msgstr ""
 "Get ekki fylgst meÃ° notanda: %s. Ãessi notandi er nÃº Ã¾egar Ã listanum Ã¾Ãnum."
 
-#: actions/apifriendshipsdestroy.php:109
+#: actions/apifriendshipsdestroy.php:110
 msgid "Could not unfollow user: User not found."
 msgstr ""
 "Get ekki fylgst meÃ° notanda: %s. Ãessi notandi er nÃº Ã¾egar Ã listanum Ã¾Ãnum."
 
-#: actions/apifriendshipsexists.php:91
-msgid "Two valid IDs or screen_names must be supplied."
-msgstr ""
-
-#: actions/apigroupcreate.php:167 actions/editgroup.php:186
+#: actions/apigroupcreate.php:168 actions/editgroup.php:186
 #: actions/newgroup.php:126 actions/profilesettings.php:215
 #: actions/register.php:212
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr "Stuttnefni geta bara veriÃ° lÃ¡gstafir og tÃ¶lustafir en engin bil."
 
-#: actions/apigroupcreate.php:176 actions/editgroup.php:190
+#: actions/apigroupcreate.php:177 actions/editgroup.php:190
 #: actions/newgroup.php:130 actions/profilesettings.php:238
 #: actions/register.php:215
 msgid "Nickname already in use. Try another one."
 msgstr "Stuttnefni nÃº Ã¾egar Ã notkun. PrÃ³faÃ°u eitthvaÃ° annaÃ°."
 
-#: actions/apigroupcreate.php:183 actions/editgroup.php:193
+#: actions/apigroupcreate.php:184 actions/editgroup.php:193
 #: actions/newgroup.php:133 actions/profilesettings.php:218
 #: actions/register.php:217
 msgid "Not a valid nickname."
 msgstr "Ekki tÃ¦kt stuttnefni."
 
-#: actions/apigroupcreate.php:199 actions/editapplication.php:215
+#: actions/apigroupcreate.php:200 actions/editapplication.php:215
 #: actions/editgroup.php:199 actions/newapplication.php:203
 #: actions/newgroup.php:139 actions/profilesettings.php:222
 #: actions/register.php:224
 msgid "Homepage is not a valid URL."
 msgstr "HeimasÃÃ°a er ekki gild vefslÃ³Ã°."
 
-#: actions/apigroupcreate.php:208 actions/editgroup.php:202
+#: actions/apigroupcreate.php:209 actions/editgroup.php:202
 #: actions/newgroup.php:142 actions/profilesettings.php:225
 #: actions/register.php:227
 msgid "Full name is too long (max 255 chars)."
 msgstr "Fullt nafn er of langt (Ã mesta lagi 255 stafir)."
 
-#: actions/apigroupcreate.php:216 actions/editapplication.php:190
+#: actions/apigroupcreate.php:217 actions/editapplication.php:190
 #: actions/newapplication.php:172
 #, php-format
 msgid "Description is too long (max %d chars)."
 msgstr "StaÃ°setning er of lÃ¶ng (Ã mesta lagi %d stafir)."
 
-#: actions/apigroupcreate.php:227 actions/editgroup.php:208
+#: actions/apigroupcreate.php:228 actions/editgroup.php:208
 #: actions/newgroup.php:148 actions/profilesettings.php:232
 #: actions/register.php:234
 msgid "Location is too long (max 255 chars)."
 msgstr "StaÃ°setning er of lÃ¶ng (Ã mesta lagi 255 stafir)."
 
-#: actions/apigroupcreate.php:246 actions/editgroup.php:219
+#: actions/apigroupcreate.php:247 actions/editgroup.php:219
 #: actions/newgroup.php:159
 #, php-format
 msgid "Too many aliases! Maximum %d."
 msgstr ""
 
-#: actions/apigroupcreate.php:289 actions/editgroup.php:238
+#: actions/apigroupcreate.php:290 actions/editgroup.php:238
 #: actions/newgroup.php:178
 msgid "Alias can't be the same as nickname."
 msgstr ""
 
-#: actions/apigroupismember.php:96 actions/apigroupjoin.php:105
-#: actions/apigroupleave.php:105 actions/apigroupmembership.php:92
+#: actions/apigroupismember.php:96 actions/apigroupjoin.php:106
+#: actions/apigroupleave.php:106 actions/apigroupmembership.php:92
 #: actions/apigroupshow.php:83 actions/apitimelinegroup.php:92
 msgid "Group not found."
 msgstr "Fannst ekki."
 
+#. TRANS: Error text shown when a user tries to join a group they are blocked from joining.
+#: actions/apigroupjoin.php:121 actions/joingroup.php:105 lib/command.php:341
+msgid "You have been blocked from that group by the admin."
+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.
-#: actions/apigroupjoin.php:139 actions/joingroup.php:134 lib/command.php:353
+#: actions/apigroupjoin.php:140 actions/joingroup.php:134 lib/command.php:353
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "Gat ekki skrÃ¡Ã° hÃ³pmeÃ°limi."
 
 #. 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.
-#: actions/apigroupleave.php:125 actions/leavegroup.php:129
+#: actions/apigroupleave.php:126 actions/leavegroup.php:129
 #: lib/command.php:401
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
@@ -335,9 +354,9 @@ msgstr ""
 
 #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
 #: actions/deletenotice.php:169 actions/disfavor.php:74
-#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:55
+#: actions/emailsettings.php:271 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:66 actions/imsettings.php:227
+#: actions/groupunblock.php:66 actions/imsettings.php:230
 #: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
@@ -368,8 +387,8 @@ msgstr ""
 #. 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:286 actions/grouplogo.php:322
-#: actions/imsettings.php:242 actions/newapplication.php:121
+#: actions/emailsettings.php:290 actions/grouplogo.php:322
+#: actions/imsettings.php:245 actions/newapplication.php:121
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
 #: actions/smssettings.php:277 lib/designsettings.php:304
 msgid "Unexpected form submission."
@@ -426,13 +445,13 @@ msgstr "Ãessi aÃ°ferÃ° krefst POST eÃ°a DELETE."
 msgid "You may not delete another user's status."
 msgstr "ÃÃº getur ekki eytt stÃ¶Ã°u annars notanda."
 
-#: actions/apistatusesretweet.php:75 actions/apistatusesretweets.php:72
+#: actions/apistatusesretweet.php:76 actions/apistatusesretweets.php:72
 #: actions/deletenotice.php:52 actions/shownotice.php:92
 msgid "No such notice."
 msgstr "Ekkert svoleiÃ°is babl."
 
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-#: actions/apistatusesretweet.php:91 lib/command.php:544
+#: actions/apistatusesretweet.php:92 lib/command.php:544
 msgid "Already repeated that notice."
 msgstr "Get ekki eytt Ã¾essu babli."
 
@@ -444,15 +463,15 @@ msgstr ""
 msgid "No status with that ID found."
 msgstr "Engin staÃ°a meÃ° Ã¾essu kenni fannst."
 
-#: actions/apistatusesupdate.php:221
+#: actions/apistatusesupdate.php:222
 msgid "Client must provide a 'status' parameter with a value."
 msgstr ""
 
-#: actions/apistatusesupdate.php:283 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:284 actions/apiusershow.php:96
 msgid "Not found."
 msgstr "Fannst ekki."
 
-#: actions/apistatusesupdate.php:306 actions/newnotice.php:181
+#: actions/apistatusesupdate.php:307 actions/newnotice.php:181
 #, php-format
 msgid "Max notice size is %d chars, including attachment URL."
 msgstr ""
@@ -591,7 +610,9 @@ msgid "No"
 msgstr "Athugasemd"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
+#. TRANS: Submit button title.
+#. TRANS: Description of the form to block a user.
+#: actions/block.php:164 actions/groupmembers.php:403 lib/blockform.php:82
 msgid "Block this user"
 msgstr "Loka Ã¡ Ã¾ennan notanda"
 
@@ -615,11 +636,13 @@ msgstr "MistÃ³kst aÃ° vista upplÃ½singar um notendalokun"
 msgid "No such group."
 msgstr "Enginn Ã¾annig hÃ³pur."
 
-#: actions/blockedfromgroup.php:320 lib/unblockform.php:69
+#. TRANS: Title for the form to unblock a user.
+#: actions/blockedfromgroup.php:320 lib/unblockform.php:70
 msgid "Unblock"
 msgstr "Opna"
 
-#: actions/blockedfromgroup.php:320 lib/unblockform.php:80
+#. TRANS: Description of the form to unblock a user.
+#: actions/blockedfromgroup.php:320 lib/unblockform.php:82
 msgid "Unblock this user"
 msgstr "Opna Ã¡ Ã¾ennan notanda"
 
@@ -641,12 +664,6 @@ msgstr "StaÃ°festingarlykill fannst ekki."
 msgid "That confirmation code is not for you!"
 msgstr "Ãessi staÃ°festingarlykill er ekki fyrir Ã¾ig!"
 
-#. TRANS: Server error for an unknow address type, which can be 'email', 'jabber', or 'sms'.
-#: actions/confirmaddress.php:91
-#, php-format
-msgid "Unrecognized address type %s."
-msgstr ""
-
 #. TRANS: Client error for an already confirmed email/jabbel/sms address.
 #: actions/confirmaddress.php:96
 msgid "That address has already been confirmed."
@@ -658,9 +675,9 @@ msgstr "Ãetta tÃ¶lvupÃ³stfang hefur nÃº Ã¾egar veriÃ° staÃ°fest."
 #. 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/confirmaddress.php:116 actions/emailsettings.php:331
+#: actions/emailsettings.php:477 actions/imsettings.php:283
+#: actions/imsettings.php:442 actions/othersettings.php:174
 #: actions/profilesettings.php:283 actions/smssettings.php:308
 #: actions/smssettings.php:464
 msgid "Couldn't update user."
@@ -668,7 +685,7 @@ msgstr "Gat ekki uppfÃ¦rt notanda."
 
 #. 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/confirmaddress.php:128 actions/emailsettings.php:437
 #: actions/smssettings.php:422
 msgid "Couldn't delete email confirmation."
 msgstr "Gat ekki eytt tÃ¶lvupÃ³stsstaÃ°festingu."
@@ -696,9 +713,10 @@ msgstr "ÃÃº verÃ°ur aÃ°a hafa skrÃ¡Ã° Ã¾ig inn til aÃ° ganga Ãºr hÃ³p."
 msgid "Application not found."
 msgstr "StaÃ°festingarlykill fannst ekki."
 
+#. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:127
 #: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1307
+#: lib/action.php:1315
 msgid "There was a problem with your session token."
 msgstr "ÃaÃ° komu upp vandamÃ¡l varÃ°andi setutÃ³kann Ã¾inn."
 
@@ -720,7 +738,7 @@ msgstr "Get ekki eytt Ã¾essu babli."
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
 #: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:73 lib/profileformaction.php:64
+#: lib/adminpanelaction.php:71 lib/profileformaction.php:64
 #: lib/settingsaction.php:72
 msgid "Not logged in."
 msgstr "Ekki innskrÃ¡Ã°(ur)."
@@ -757,7 +775,6 @@ msgstr ""
 #. TRANS: Message used as title for design settings for the site.
 #. TRANS: Link description in user account settings menu.
 #: actions/designadminpanel.php:63 lib/accountsettingsaction.php:139
-#: lib/groupnav.php:119
 msgid "Design"
 msgstr ""
 
@@ -765,19 +782,10 @@ msgstr ""
 msgid "Design settings for this StatusNet site."
 msgstr ""
 
-#: actions/designadminpanel.php:322
-#, php-format
-msgid "Theme not available: %s."
-msgstr ""
-
 #: actions/designadminpanel.php:431
 msgid "Site logo"
 msgstr "Babl vefsÃÃ°unnar"
 
-#: actions/designadminpanel.php:467
-msgid "Custom theme"
-msgstr ""
-
 #: actions/designadminpanel.php:471
 msgid "You can upload a custom StatusNet theme as a .ZIP archive."
 msgstr ""
@@ -833,13 +841,13 @@ msgstr ""
 msgid "Reset back to default"
 msgstr ""
 
-#. TRANS: Submit button title
+#. TRANS: Submit button title.
 #: actions/designadminpanel.php:685 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/snapshotadminpanel.php:245
 #: actions/subscriptions.php:226 actions/tagother.php:154
-#: actions/useradminpanel.php:294 lib/applicationeditform.php:363
+#: actions/useradminpanel.php:294 lib/applicationeditform.php:353
 #: lib/designsettings.php:256 lib/groupeditform.php:202
 msgid "Save"
 msgstr "Vista"
@@ -861,10 +869,6 @@ msgstr "BÃ¦ta viÃ° sem uppÃ¡haldsbabli"
 msgid "No such document \"%s\""
 msgstr "Ekkert svoleiÃ°is babl."
 
-#: actions/editapplication.php:54
-msgid "Edit Application"
-msgstr ""
-
 #: actions/editapplication.php:194
 msgid "Source URL is too long."
 msgstr ""
@@ -938,7 +942,7 @@ msgstr "NÃºverandi staÃ°festa tÃ¶lvupÃ³stfangiÃ°."
 #. 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/emailsettings.php:115 actions/emailsettings.php:162
 #: actions/imsettings.php:116 actions/smssettings.php:124
 #: actions/smssettings.php:180
 msgctxt "BUTTON"
@@ -953,116 +957,104 @@ 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: Instructions for e-mail address input form.
-#: actions/emailsettings.php:135
+#. TRANS: Instructions for e-mail address input form. Do not translate
+#. TRANS: "example.org". It is one of the domain names reserved for
+#. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
+#. TRANS: Any other domain may be owned by a legitimate person or
+#. TRANS: organization.
+#: actions/emailsettings.php:139
 msgid "Email address, like \"UserName@example.org\""
 msgstr "TÃ¶lvupÃ³stfang eins og \"notandi@example.org\""
 
-#. 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 ""
-
 #. 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
+#: actions/emailsettings.php:151 actions/smssettings.php:171
 msgid "Incoming email"
 msgstr "MÃ³ttÃ¶kutÃ¶lvupÃ³stur"
 
 #. 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
+#: actions/emailsettings.php:159 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."
 
 #. 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
+#: actions/emailsettings.php:168 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."
 
-#. 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 ""
-
 #. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:174
+#: actions/emailsettings.php:178
 msgid "Email preferences"
 msgstr "TÃ¶lvupÃ³stfÃ¶ng"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:180
+#: actions/emailsettings.php:184
 msgid "Send me notices of new subscriptions through email."
 msgstr "Sendu mÃ©r tilkynningu varÃ°andi nÃ½jar Ã¡skriftir Ã gegnum tÃ¶lvupÃ³st."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:186
+#: actions/emailsettings.php:190
 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."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:193
+#: actions/emailsettings.php:197
 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Ã°."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:205
+#: actions/emailsettings.php:209
 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."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:212
+#: actions/emailsettings.php:216
 msgid "I want to post notices by email."
 msgstr "Ãg vil babla Ã gegnum tÃ¶lvupÃ³st."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:219
+#: actions/emailsettings.php:223
 msgid "Publish a MicroID for my email address."
 msgstr "Birta MicroID fyrir tÃ¶lvupÃ³stfangiÃ° mitt."
 
 #. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:353
+#: actions/emailsettings.php:357
 msgid "No email address."
 msgstr "Ekkert tÃ¶lvupÃ³stfang."
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:361
+#: actions/emailsettings.php:365
 msgid "Cannot normalize that email address"
 msgstr "Get ekki staÃ°laÃ° Ã¾etta tÃ¶lvupÃ³stfang"
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:208
+#: actions/emailsettings.php:370 actions/register.php:208
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "Ekki tÃ¦kt tÃ¶lvupÃ³stfang."
 
 #. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:370
+#: actions/emailsettings.php:374
 msgid "That is already your email address."
 msgstr "Ãetta er nÃº Ã¾egar tÃ¶lvupÃ³stfangiÃ° Ã¾itt."
 
 #. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:374
+#: actions/emailsettings.php:378
 msgid "That email address already belongs to another user."
 msgstr "Ãetta tÃ¶lvupÃ³stfang tilheyrir Ã¶Ã°rum notanda."
 
 #. 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/emailsettings.php:395 actions/imsettings.php:351
 #: actions/smssettings.php:373
 msgid "Couldn't insert confirmation code."
 msgstr "Gat ekki sett inn staÃ°festingarlykil."
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:398
+#: actions/emailsettings.php:402
 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."
@@ -1074,45 +1066,45 @@ msgstr ""
 #. 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/emailsettings.php:423 actions/imsettings.php:386
 #: actions/smssettings.php:408
 msgid "No pending confirmation to cancel."
 msgstr "Engin staÃ°festing Ã biÃ° sem Ã¾arf aÃ° hÃ¦tta viÃ°."
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:438
+#: actions/emailsettings.php:442
 msgid "Email confirmation cancelled."
 msgstr "Engin staÃ°festing Ã biÃ° sem Ã¾arf aÃ° hÃ¦tta viÃ°."
 
 #. TRANS: Message given trying to remove an e-mail address that is not
 #. TRANS: registered for the active user.
-#: actions/emailsettings.php:458
+#: actions/emailsettings.php:462
 msgid "That is not your email address."
 msgstr "Ãetta er ekki tÃ¶lvupÃ³stfangiÃ° Ã¾itt."
 
 #. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:479
+#: actions/emailsettings.php:483
 msgid "The email address was removed."
 msgstr "MÃ³ttÃ¶kutÃ¶lvupÃ³stfang fjarlÃ¦gt."
 
-#: actions/emailsettings.php:493 actions/smssettings.php:568
+#: actions/emailsettings.php:497 actions/smssettings.php:568
 msgid "No incoming email address."
 msgstr "Ekkert mÃ³ttÃ¶kutÃ¶lvupÃ³stfang."
 
 #. 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/emailsettings.php:508 actions/emailsettings.php:532
 #: actions/smssettings.php:578 actions/smssettings.php:602
 msgid "Couldn't update user record."
 msgstr "Gat ekki uppfÃ¦rt skrÃ¡arfÃ¦rslu notanda."
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
-#: actions/emailsettings.php:508 actions/smssettings.php:581
+#: actions/emailsettings.php:512 actions/smssettings.php:581
 msgid "Incoming email address removed."
 msgstr "MÃ³ttÃ¶kutÃ¶lvupÃ³stfang fjarlÃ¦gt."
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
-#: actions/emailsettings.php:532 actions/smssettings.php:605
+#: actions/emailsettings.php:536 actions/smssettings.php:605
 msgid "New incoming email address added."
 msgstr "NÃ½ju mÃ³ttÃ¶kutÃ¶lvupÃ³stfangi bÃ¦tt viÃ°."
 
@@ -1171,15 +1163,6 @@ msgstr "Notendur Ã sviÃ°sljÃ³sinu"
 msgid "Featured users, page %d"
 msgstr "Notendur Ã sviÃ°sljÃ³sinu, sÃÃ°a %d"
 
-#: actions/featured.php:99
-#, php-format
-msgid "A selection of some great users on %s"
-msgstr ""
-
-#: actions/file.php:42
-msgid "No attachments."
-msgstr ""
-
 #: actions/file.php:51
 msgid "No uploaded attachments."
 msgstr ""
@@ -1188,10 +1171,6 @@ msgstr ""
 msgid "Not expecting this response!"
 msgstr "BjÃ³st ekki viÃ° Ã¾essu svari!"
 
-#: actions/finishremotesubscribe.php:80
-msgid "User being listened to does not exist."
-msgstr ""
-
 #: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59
 msgid "You can use the local subscription!"
 msgstr "ÃÃº getur notaÃ° staÃ°bundna Ã¡skrift!"
@@ -1204,14 +1183,6 @@ msgstr "Ãessi notandi hefur bannaÃ° Ã¾Ã©r aÃ° gerast Ã¡skrifandi"
 msgid "You are not authorized."
 msgstr "ÃÃº ert ekki Ã¡skrifandi."
 
-#: actions/finishremotesubscribe.php:113
-msgid "Could not convert request token to access token."
-msgstr ""
-
-#: actions/finishremotesubscribe.php:118
-msgid "Remote service uses unknown version of OMB protocol."
-msgstr ""
-
 #: actions/grantrole.php:66 actions/revokerole.php:66
 msgid "This role is reserved and cannot be set."
 msgstr ""
@@ -1270,29 +1241,35 @@ msgstr "Einkennismynd uppfÃ¦rÃ°."
 msgid "Failed updating logo."
 msgstr "TÃ³kst ekki aÃ° uppfÃ¦ra einkennismynd"
 
-#: actions/groupmembers.php:100 lib/groupnav.php:92
+#. TRANS: Title of the page showing group members.
+#. TRANS: %s is the name of the group.
+#: actions/groupmembers.php:102
 #, php-format
 msgid "%s group members"
 msgstr "HÃ³pmeÃ°limir %s"
 
-#: actions/groupmembers.php:103
+#. TRANS: Title of the page showing group members.
+#. TRANS: %1$s is the name of the group, %2$d is the page number of the members list.
+#: actions/groupmembers.php:107
 #, php-format
 msgid "%1$s group members, page %2$d"
 msgstr "HÃ³pmeÃ°limir %s"
 
-#: actions/groupmembers.php:118
+#: actions/groupmembers.php:122
 msgid "A list of the users in this group."
 msgstr "Listi yfir notendur Ã Ã¾essum hÃ³p."
 
-#: actions/groupmembers.php:182 lib/groupnav.php:107
+#: actions/groupmembers.php:186
 msgid "Admin"
 msgstr "StjÃ³rnandi"
 
-#: actions/groupmembers.php:392 lib/blockform.php:69
-msgid "Block"
-msgstr "Loka"
+#: actions/groupmembers.php:498
+msgid "Make user an admin of the group"
+msgstr ""
 
-#: actions/groupmembers.php:519
+#. TRANS: Submit button title.
+#: actions/groupmembers.php:537
+msgctxt "TOOLTIP"
 msgid "Make this user an admin"
 msgstr ""
 
@@ -1373,11 +1350,6 @@ msgstr ""
 "[snarskilaboÃ°aÃ¾jÃ³nustuna](%%doc.im%%). Settu upp netfangiÃ° Ã¾itt hÃ©r fyrir "
 "neÃ°an og stilltu notkunina."
 
-#. 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 ""
-
 #. 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
@@ -1402,7 +1374,10 @@ msgstr ""
 
 #. TRANS: IM address input field instructions in IM settings form.
 #. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:140
+#. TRANS: Do not translate "example.org". It is one of the domain names reserved for use in examples by
+#. TRANS: http://www.rfc-editor.org/rfc/rfc2606.txt. Any other domain may be owned by a legitimate
+#. TRANS: person or organization.
+#: actions/imsettings.php:143
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -1413,64 +1388,64 @@ msgstr ""
 "Ã¡ GTalk."
 
 #. TRANS: Form legend for IM preferences form.
-#: actions/imsettings.php:155
+#: actions/imsettings.php:158
 msgid "IM preferences"
 msgstr "Stillingar vistaÃ°ar."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:160
+#: actions/imsettings.php:163
 msgid "Send me notices through Jabber/GTalk."
 msgstr "Sendur mÃ©r babl Ã gegnum Jabber/GTalk."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:166
+#: actions/imsettings.php:169
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr "Senda inn babl Ã¾egar Jabber/GTalk staÃ°an breytist."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:172
+#: actions/imsettings.php:175
 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Ã°."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:179
+#: actions/imsettings.php:182
 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "Birta MicroID fyrir Jabber/GTalk netfangiÃ° mitt."
 
 #. TRANS: Confirmation message for successful IM preferences save.
-#: actions/imsettings.php:287 actions/othersettings.php:180
+#: actions/imsettings.php:290 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
+#: actions/imsettings.php:312
 msgid "No Jabber ID."
 msgstr "Ekkert Jabber-kenni"
 
 #. TRANS: Message given saving IM address that cannot be normalised.
-#: actions/imsettings.php:317
+#: actions/imsettings.php:320
 msgid "Cannot normalize that Jabber ID"
 msgstr "Get ekki staÃ°laÃ° Ã¾etta Jabber kenni"
 
 #. TRANS: Message given saving IM address that not valid.
-#: actions/imsettings.php:322
+#: actions/imsettings.php:325
 msgid "Not a valid Jabber ID"
 msgstr "Ekki tÃ¦kt Jabber-kenni"
 
 #. TRANS: Message given saving IM address that is already set.
-#: actions/imsettings.php:326
+#: actions/imsettings.php:329
 msgid "That is already your Jabber ID."
 msgstr "Ãetta er nÃº Ã¾egar Jabber-kenniÃ° Ã¾itt."
 
 #. TRANS: Message given saving IM address that is already set for another user.
-#: actions/imsettings.php:330
+#: actions/imsettings.php:333
 msgid "Jabber ID already belongs to another user."
 msgstr "Jabber-kenniÃ° tilheyrir Ã¶Ã°rum notanda."
 
 #. 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
+#: actions/imsettings.php:361
 #, php-format
 msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
@@ -1480,23 +1455,23 @@ msgstr ""
 "viÃ°. ÃÃº verÃ°ur aÃ° leyfa %s aÃ° senda snarskilaboÃ° til Ã¾Ãn."
 
 #. TRANS: Message given canceling IM address confirmation for the wrong IM address.
-#: actions/imsettings.php:388
+#: actions/imsettings.php:391
 msgid "That is the wrong IM address."
 msgstr "Ãetta er rangt snarskilaboÃ°afang."
 
 #. TRANS: Message given after successfully canceling IM address confirmation.
-#: actions/imsettings.php:402
+#: actions/imsettings.php:405
 msgid "IM confirmation cancelled."
 msgstr "Enginn staÃ°festingarlykill."
 
 #. TRANS: Message given trying to remove an IM address that is not
 #. TRANS: registered for the active user.
-#: actions/imsettings.php:424
+#: actions/imsettings.php:427
 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
+#: actions/imsettings.php:450
 msgid "The IM address was removed."
 msgstr "MÃ³ttÃ¶kutÃ¶lvupÃ³stfang fjarlÃ¦gt."
 
@@ -1584,12 +1559,6 @@ msgstr "PersÃ³nuleg skilaboÃ°"
 msgid "Optionally add a personal message to the invitation."
 msgstr "BÃ¦ttu persÃ³nulegum skilaboÃ°um viÃ° boÃ°skortiÃ° ef Ã¾Ãº vilt."
 
-#. TRANS: Send button for inviting friends
-#: actions/invite.php:198
-msgctxt "BUTTON"
-msgid "Send"
-msgstr ""
-
 #. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English.
 #: actions/invite.php:228
 #, php-format
@@ -1710,23 +1679,13 @@ msgstr ""
 "Af Ã¶ryggisÃ¡stÃ¦Ã°um, vinsamlegast slÃ¡Ã°u aftur inn notendanafniÃ° Ã¾itt og "
 "lykilorÃ° Ã¡Ã°ur en Ã¾Ãº breytir stillingunum Ã¾Ãnum."
 
-#: actions/login.php:295
-#, php-format
-msgid ""
-"Don't have a username yet? [Register](%%action.register%%) a new account."
-msgstr ""
-
 #: actions/makeadmin.php:92
 msgid "Only an admin can make another user an admin."
 msgstr ""
 
-#: actions/makeadmin.php:133
+#: actions/makeadmin.php:96
 #, php-format
-msgid "Can't get membership record for %1$s in group %2$s."
-msgstr ""
-
-#: actions/microsummary.php:69
-msgid "No current status."
+msgid "%1$s is already an admin for group \"%2$s\"."
 msgstr ""
 
 #: actions/newapplication.php:176
@@ -1818,11 +1777,6 @@ msgstr ""
 msgid "Updates matching search term \"%1$s\" on %2$s!"
 msgstr "FÃ¦rslur frÃ¡ %1$s Ã¡ %2$s!"
 
-#: actions/nudge.php:85
-msgid ""
-"This user doesn't allow nudges or hasn't confirmed or set their email yet."
-msgstr ""
-
 #: actions/nudge.php:94
 msgid "Nudge sent"
 msgstr "Ãtt viÃ° notanda"
@@ -1835,6 +1789,15 @@ msgstr "Ãtt viÃ° notanda!"
 msgid "Applications you have registered"
 msgstr ""
 
+#: actions/oauthappssettings.php:135
+#, php-format
+msgid "You have not registered any applications yet."
+msgstr ""
+
+#: actions/oauthconnectionssettings.php:72
+msgid "Connected applications"
+msgstr ""
+
 #: actions/oauthconnectionssettings.php:83
 msgid "You have allowed the following applications to access you account."
 msgstr ""
@@ -1874,8 +1837,8 @@ msgid "Only %s URLs over plain HTTP please."
 msgstr ""
 
 #. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1215
-#: lib/apiaction.php:1243 lib/apiaction.php:1366
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1206
+#: lib/apiaction.php:1233 lib/apiaction.php:1356
 msgid "Not a supported data format."
 msgstr "Enginn stuÃ°ningur viÃ° gagnasniÃ°."
 
@@ -1992,7 +1955,7 @@ msgid "Password saved."
 msgstr "LykilorÃ° vistaÃ°."
 
 #. TRANS: Menu item for site administration
-#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:384
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:371
 msgid "Paths"
 msgstr ""
 
@@ -2000,26 +1963,6 @@ msgstr ""
 msgid "Path and server settings for this StatusNet site."
 msgstr ""
 
-#: actions/pathsadminpanel.php:157
-#, php-format
-msgid "Theme directory not readable: %s."
-msgstr ""
-
-#: actions/pathsadminpanel.php:163
-#, php-format
-msgid "Avatar directory not writable: %s."
-msgstr ""
-
-#: actions/pathsadminpanel.php:169
-#, php-format
-msgid "Background directory not writable: %s."
-msgstr ""
-
-#: actions/pathsadminpanel.php:177
-#, php-format
-msgid "Locales directory not readable: %s."
-msgstr ""
-
 #: actions/pathsadminpanel.php:183
 msgid "Invalid SSL server. The maximum length is 255 characters."
 msgstr ""
@@ -2096,18 +2039,10 @@ msgstr ""
 msgid "When to use SSL"
 msgstr ""
 
-#: actions/pathsadminpanel.php:335
-msgid "SSL server"
-msgstr ""
-
 #: actions/pathsadminpanel.php:336
 msgid "Server to direct SSL requests to"
 msgstr ""
 
-#: actions/pathsadminpanel.php:352
-msgid "Save paths"
-msgstr ""
-
 #: actions/peoplesearch.php:52
 #, php-format
 msgid ""
@@ -2162,7 +2097,7 @@ msgstr "Fullt nafn"
 
 #. TRANS: Form input field label.
 #: actions/profilesettings.php:115 actions/register.php:460
-#: lib/applicationeditform.php:244 lib/groupeditform.php:161
+#: lib/applicationeditform.php:235 lib/groupeditform.php:161
 msgid "Homepage"
 msgstr "HeimasÃÃ°a"
 
@@ -2172,15 +2107,6 @@ msgstr ""
 "Veffang heimasÃÃ°unnar Ã¾innar, bloggsins Ã¾Ãns eÃ°a persÃ³nulegrar sÃÃ°u Ã¡ Ã¶Ã°ru "
 "vefsvÃ¦Ã°i"
 
-#: actions/profilesettings.php:122 actions/register.php:468
-#, php-format
-msgid "Describe yourself and your interests in %d chars"
-msgstr ""
-
-#: actions/profilesettings.php:125 actions/register.php:471
-msgid "Describe yourself and your interests"
-msgstr ""
-
 #: actions/profilesettings.php:127 actions/register.php:473
 msgid "Bio"
 msgstr "LÃ½sing"
@@ -2267,7 +2193,7 @@ msgid "Couldn't save tags."
 msgstr "Gat ekki vistaÃ° merki."
 
 #. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:391 lib/adminpanelaction.php:141
+#: actions/profilesettings.php:391 lib/adminpanelaction.php:138
 msgid "Settings saved."
 msgstr "Stillingar vistaÃ°ar."
 
@@ -2565,25 +2491,6 @@ msgid ""
 "email address, IM address, and phone number."
 msgstr ""
 
-#: actions/register.php:583
-#, php-format
-msgid ""
-"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
-"want to...\n"
-"\n"
-"* Go to [your profile](%2$s) and post your first message.\n"
-"* Add a [Jabber/GTalk address](%%%%action.imsettings%%%%) so you can send "
-"notices through instant messages.\n"
-"* [Search for people](%%%%action.peoplesearch%%%%) that you may know or that "
-"share your interests. \n"
-"* Update your [profile settings](%%%%action.profilesettings%%%%) to tell "
-"others more about you. \n"
-"* Read over the [online docs](%%%%doc.help%%%%) for features you may have "
-"missed. \n"
-"\n"
-"Thanks for signing up and we hope you enjoy using this service."
-msgstr ""
-
 #: actions/register.php:607
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
@@ -2633,18 +2540,6 @@ msgstr "Gerast Ã¡skrifandi"
 msgid "Invalid profile URL (bad format)"
 msgstr "ÃtÃ¦kt veffang persÃ³nulegrar sÃÃ°u (vitlaust sniÃ°)"
 
-#: actions/remotesubscribe.php:168
-msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
-msgstr ""
-
-#: actions/remotesubscribe.php:176
-msgid "Thatâs a local profile! Login to subscribe."
-msgstr ""
-
-#: actions/remotesubscribe.php:183
-msgid "Couldnât get a request token."
-msgstr ""
-
 #: actions/repeat.php:119
 msgid "Repeated!"
 msgstr ""
@@ -2660,6 +2555,16 @@ msgstr "SvÃ¶r viÃ° %s"
 msgid "Replies to %1$s, page %2$d"
 msgstr "SvÃ¶r viÃ° %s"
 
+#: actions/replies.php:145
+#, php-format
+msgid "Replies feed for %s (RSS 1.0)"
+msgstr ""
+
+#: actions/replies.php:152
+#, php-format
+msgid "Replies feed for %s (RSS 2.0)"
+msgstr ""
+
 #: actions/replies.php:159
 #, php-format
 msgid "Replies feed for %s (Atom)"
@@ -2696,7 +2601,7 @@ msgstr ""
 
 #. TRANS: Menu item for site administration
 #: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
-#: lib/adminpanelaction.php:392
+#: lib/adminpanelaction.php:379
 msgid "Sessions"
 msgstr ""
 
@@ -2721,13 +2626,13 @@ msgid "Turn on debugging output for sessions."
 msgstr ""
 
 #. TRANS: Form input field label for application icon.
-#: actions/showapplication.php:159 lib/applicationeditform.php:182
+#: actions/showapplication.php:159 lib/applicationeditform.php:173
 msgid "Icon"
 msgstr ""
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:216 lib/groupeditform.php:172
+#: lib/applicationeditform.php:207 lib/groupeditform.php:172
 msgid "Description"
 msgstr "LÃ½sing"
 
@@ -2741,10 +2646,18 @@ msgstr "TÃ¶lfrÃ¦Ã°i"
 msgid "Created by %1$s - %2$s access by default - %3$d users"
 msgstr ""
 
+#: actions/showapplication.php:213
+msgid "Application actions"
+msgstr ""
+
 #: actions/showapplication.php:236
 msgid "Reset key & secret"
 msgstr ""
 
+#: actions/showapplication.php:261
+msgid "Application info"
+msgstr ""
+
 #: actions/showapplication.php:263
 msgid "Consumer key"
 msgstr ""
@@ -2775,16 +2688,6 @@ msgstr ""
 msgid "Could not retrieve favorite notices."
 msgstr "Gat ekki sÃ³tt uppÃ¡haldsbabl."
 
-#: actions/showfavorites.php:171
-#, php-format
-msgid "Feed for favorites of %s (RSS 1.0)"
-msgstr ""
-
-#: actions/showfavorites.php:178
-#, php-format
-msgid "Feed for favorites of %s (RSS 2.0)"
-msgstr ""
-
 #: actions/showfavorites.php:206
 msgid ""
 "You haven't chosen any favorite notices yet. Click the fave button on "
@@ -2810,7 +2713,7 @@ msgstr ""
 msgid "This is a way to share what you like."
 msgstr ""
 
-#: actions/showgroup.php:82 lib/groupnav.php:86
+#: actions/showgroup.php:82
 #, php-format
 msgid "%s group"
 msgstr "%s hÃ³purinn"
@@ -2852,7 +2755,12 @@ msgstr ""
 msgid "Notice feed for %s group (RSS 2.0)"
 msgstr ""
 
-#: actions/showgroup.php:393 actions/showgroup.php:445 lib/groupnav.php:91
+#: actions/showgroup.php:350
+#, php-format
+msgid "Notice feed for %s group (Atom)"
+msgstr ""
+
+#: actions/showgroup.php:393 actions/showgroup.php:445
 msgid "Members"
 msgstr "MeÃ°limir"
 
@@ -2908,9 +2816,19 @@ msgstr "SkilaboÃ° frÃ¡ %1$s Ã¡ %2$s"
 msgid "%1$s, page %2$d"
 msgstr "HÃ³par, sÃÃ°a %d"
 
-#: actions/showstream.php:122
+#: actions/showstream.php:129
 #, php-format
-msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
+msgid "Notice feed for %s (RSS 1.0)"
+msgstr ""
+
+#: actions/showstream.php:136
+#, php-format
+msgid "Notice feed for %s (RSS 2.0)"
+msgstr ""
+
+#: actions/showstream.php:143
+#, php-format
+msgid "Notice feed for %s (Atom)"
 msgstr ""
 
 #: actions/showstream.php:200
@@ -3053,11 +2971,6 @@ msgstr "Stillingar fyrir mynd"
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr "ÃÃº getur fengiÃ° SMS Ã gegnum tÃ¶lvupÃ³st frÃ¡ %%site.name%%."
 
-#. 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 ""
-
 #. TRANS: Form legend for SMS settings form.
 #: actions/smssettings.php:111
 msgid "SMS address"
@@ -3172,7 +3085,7 @@ msgstr "Enginn lykill sleginn inn"
 
 #. TRANS: Menu item for site administration
 #: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
-#: lib/adminpanelaction.php:408
+#: lib/adminpanelaction.php:395
 msgid "Snapshots"
 msgstr ""
 
@@ -3180,6 +3093,10 @@ msgstr ""
 msgid "Manage snapshot configuration"
 msgstr "StaÃ°festing tÃ¶lvupÃ³stfangs"
 
+#: actions/snapshotadminpanel.php:127
+msgid "Invalid snapshot run value."
+msgstr ""
+
 #: actions/snapshotadminpanel.php:133
 msgid "Snapshot frequency must be a number."
 msgstr ""
@@ -3321,13 +3238,9 @@ msgstr "Babl merkt meÃ° %s"
 msgid "Notice feed for tag %s (RSS 1.0)"
 msgstr ""
 
-#: actions/tag.php:93
+#: actions/tag.php:99
 #, php-format
-msgid "Notice feed for tag %s (RSS 2.0)"
-msgstr ""
-
-#: actions/tagother.php:39
-msgid "No ID argument."
+msgid "Notice feed for tag %s (Atom)"
 msgstr ""
 
 #: actions/tagother.php:65
@@ -3442,13 +3355,6 @@ msgstr ""
 msgid "Authorize subscription"
 msgstr "Heimila Ã¡skriftir"
 
-#: actions/userauthorization.php:110
-msgid ""
-"Please check these details to make sure that you want to subscribe to this "
-"userâs notices. If you didnât just ask to subscribe to someoneâs notices, "
-"click âRejectâ."
-msgstr ""
-
 #: actions/userauthorization.php:196 actions/version.php:167
 msgid "License"
 msgstr ""
@@ -3474,24 +3380,10 @@ msgstr "Engin heimildarbeiÃ°ni!"
 msgid "Subscription authorized"
 msgstr "Ãskrift heimiluÃ°"
 
-#: actions/userauthorization.php:256
-msgid ""
-"The subscription has been authorized, but no callback URL was passed. Check "
-"with the siteâs instructions for details on how to authorize the "
-"subscription. Your subscription token is:"
-msgstr ""
-
 #: actions/userauthorization.php:266
 msgid "Subscription rejected"
 msgstr "Ãskrift hafnaÃ°"
 
-#: actions/userauthorization.php:268
-msgid ""
-"The subscription has been rejected, but no callback URL was passed. Check "
-"with the siteâs instructions for details on how to fully reject the "
-"subscription."
-msgstr ""
-
 #: actions/userauthorization.php:303
 #, php-format
 msgid "Listener URI â%sâ not found here."
@@ -3517,16 +3409,6 @@ msgstr ""
 msgid "Avatar URL â%sâ is not valid."
 msgstr ""
 
-#: actions/userauthorization.php:350
-#, php-format
-msgid "Canât read avatar URL â%sâ."
-msgstr ""
-
-#: actions/userauthorization.php:355
-#, php-format
-msgid "Wrong image type for avatar URL â%sâ."
-msgstr ""
-
 #: actions/userdesignsettings.php:87 lib/designsettings.php:76
 msgid ""
 "Customize the way your profile looks with a background image and a colour "
@@ -3797,24 +3679,12 @@ msgstr "Ãnafngreind sÃÃ°a"
 msgid "Primary site navigation"
 msgstr "Stikl aÃ°alsÃÃ°u"
 
-#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:455
-msgctxt "TOOLTIP"
-msgid "Personal profile and friends timeline"
-msgstr ""
-
 #. TRANS: Tooltip for main menu option "Account"
 #: lib/action.php:460
 msgctxt "TOOLTIP"
 msgid "Change your email, avatar, password, profile"
 msgstr "Breyta lykilorÃ°inu Ã¾Ãnu"
 
-#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:465
-msgctxt "TOOLTIP"
-msgid "Connect to services"
-msgstr ""
-
 #. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
 #: lib/action.php:468
 msgid "Connect"
@@ -3844,15 +3714,9 @@ msgctxt "TOOLTIP"
 msgid "Help me!"
 msgstr "HjÃ¡lp"
 
-#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:513
-msgctxt "TOOLTIP"
-msgid "Search for people or text"
-msgstr ""
-
 #. TRANS: DT element for site notice. String is hidden in default CSS.
 #. TRANS: Menu item for site administration
-#: lib/action.php:538 lib/adminpanelaction.php:400
+#: lib/action.php:538 lib/adminpanelaction.php:387
 msgid "Site notice"
 msgstr "Babl vefsÃÃ°unnar"
 
@@ -3911,22 +3775,17 @@ msgstr "TengiliÃ°ur"
 msgid "StatusNet software license"
 msgstr "HugbÃºnaÃ°arleyfi StatusNet"
 
-#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
-#: lib/action.php:843
-#, php-format
-msgid ""
-"**%%site.name%%** is a microblogging service brought to you by [%%site."
-"broughtby%%](%%site.broughtbyurl%%)."
-msgstr ""
-
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:846
+#: lib/action.php:849
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** er Ã¶rbloggsÃ¾jÃ³nusta."
 
 #. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.
-#: lib/action.php:850
+#. TRANS: Make sure there is no whitespace between "]" and "(".
+#. TRANS: Text between [] is a link description, text between () is the link itself.
+#. TRANS: %s is the version of StatusNet that is being used.
+#: lib/action.php:856
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -3939,43 +3798,44 @@ msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:873
+#: lib/action.php:879
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:880
+#: lib/action.php:886
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:884
+#: lib/action.php:890
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 
-#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:897
+#. TRANS: license message in footer.
+#. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
+#: lib/action.php:904
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr ""
 
 #. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1236
+#: lib/action.php:1243
 msgid "Pagination"
 msgstr "UpprÃ¶Ã°un"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1247
+#: lib/action.php:1254
 msgid "After"
 msgstr "Eftir"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1257
+#: lib/action.php:1264
 msgid "Before"
 msgstr "ÃÃ°ur"
 
@@ -3984,103 +3844,140 @@ msgstr "ÃÃ°ur"
 msgid "Expecting a root feed element but got a whole XML document."
 msgstr ""
 
-#: lib/activityutils.php:208
+#. TRANS: Client exception thrown when there is no source attribute.
+#: lib/activityutils.php:203
 msgid "Can't handle remote content yet."
 msgstr ""
 
-#: lib/activityutils.php:244
+#. TRANS: Client exception thrown when there embedded XML content is found that cannot be processed yet.
+#: lib/activityutils.php:240
 msgid "Can't handle embedded XML content yet."
 msgstr ""
 
-#: lib/activityutils.php:248
+#. TRANS: Client exception thrown when base64 encoded content is found that cannot be processed yet.
+#: lib/activityutils.php:245
 msgid "Can't handle embedded Base64 content yet."
 msgstr ""
 
 #. TRANS: Client error message thrown if design settings could not be deleted in
 #. TRANS: the admin panel Design.
-#: lib/adminpanelaction.php:284
+#: lib/adminpanelaction.php:274
 msgid "Unable to delete design setting."
 msgstr ""
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:360
-msgctxt "MENU"
-msgid "Design"
-msgstr ""
-
-#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:368 lib/personalgroupnav.php:115
+#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:115
 msgid "User"
 msgstr "Notandi"
 
 #. TRANS: Client error 401.
-#: lib/apiauth.php:113
+#: lib/apiauth.php:111
 msgid "API resource requires read-write access, but you only have read access."
 msgstr ""
 
+#. TRANS: OAuth exception thrown when no application is found for a given consumer key.
+#: lib/apiauth.php:175
+msgid "No application for that consumer key."
+msgstr ""
+
+#. TRANS: OAuth exception given when an incorrect access token was given for a user.
+#: lib/apiauth.php:212
+msgid "Bad access token."
+msgstr ""
+
+#. TRANS: OAuth exception given when no user was found for a given token (no token was found).
+#: lib/apiauth.php:217
+msgid "No user for that token."
+msgstr ""
+
+#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
+#: lib/apioauthstore.php:178
+msgid "Tried to revoke unknown token"
+msgstr ""
+
+#. TRANS: Exception thrown when an attempt is made to remove a revoked token.
+#: lib/apioauthstore.php:182
+msgid "Failed to delete revoked token"
+msgstr ""
+
+#. TRANS: Form legend.
+#: lib/applicationeditform.php:129
+msgid "Edit application"
+msgstr ""
+
+#. TRANS: Form guide.
+#: lib/applicationeditform.php:178
+msgid "Icon for this application"
+msgstr ""
+
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:213
+#: lib/applicationeditform.php:204
 msgid "Describe your application"
 msgstr "LÃ½sing"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:251
+#: lib/applicationeditform.php:224
+msgid "Organization responsible for this application"
+msgstr ""
+
+#. TRANS: Form input field instructions.
+#: lib/applicationeditform.php:242
 msgid "URL to redirect to after authentication"
 msgstr ""
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:278
+#: lib/applicationeditform.php:269
 msgid "Browser"
 msgstr ""
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:295
+#: lib/applicationeditform.php:286
 msgid "Desktop"
 msgstr ""
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:297
+#: lib/applicationeditform.php:288
 msgid "Type of application, browser or desktop"
 msgstr ""
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:320
+#: lib/applicationeditform.php:311
 msgid "Read-only"
 msgstr ""
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:339
+#: lib/applicationeditform.php:330
 msgid "Read-write"
 msgstr ""
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:341
+#: lib/applicationeditform.php:332
 msgid "Default access for this application: read-only, or read-write"
 msgstr ""
 
-#. TRANS: Submit button title
-#: lib/applicationeditform.php:359
+#. TRANS: Submit button title.
+#: lib/applicationeditform.php:349
 msgid "Cancel"
 msgstr "HÃ¦tta viÃ°"
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:136
+#: lib/applicationlist.php:135
 msgid "read-write"
 msgstr ""
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:138
+#: lib/applicationlist.php:137
 msgid "read-only"
 msgstr ""
 
 #. 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
+#: lib/applicationlist.php:143
 #, php-format
 msgid "Approved %1$s - \"%2$s\" access."
 msgstr ""
 
 #. TRANS: Button label
-#: lib/applicationlist.php:159
+#: lib/applicationlist.php:158
 msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "Endurheimta"
@@ -4095,14 +3992,21 @@ msgstr ""
 msgid "Author"
 msgstr ""
 
-#: lib/attachmentnoticesection.php:67
+#. TRANS: Title.
+#: lib/attachmentnoticesection.php:68
 msgid "Notices where this attachment appears"
 msgstr ""
 
-#: lib/attachmenttagcloudsection.php:48
+#. TRANS: Title.
+#: lib/attachmenttagcloudsection.php:49
 msgid "Tags for this attachment"
 msgstr ""
 
+#. TRANS: Title for the form to block a user.
+#: lib/blockform.php:70
+msgid "Block"
+msgstr "Loka"
+
 #: lib/channel.php:157 lib/channel.php:177
 msgid "Command results"
 msgstr "NiÃ°urstÃ¶Ã°ur skipunar"
@@ -4115,6 +4019,13 @@ msgstr "FullklÃ¡ruÃ° skipun"
 msgid "Command failed"
 msgstr "MisheppnuÃ° skipun"
 
+#. TRANS: Message given getting a non-existing user.
+#. TRANS: %s is the nickname of the user that could not be found.
+#: lib/command.php:150
+#, php-format
+msgid "Could not find a local user with nickname %s."
+msgstr ""
+
 #. TRANS: Error text shown when an unimplemented command is given.
 #: lib/command.php:185
 msgid "Sorry, this command is not yet implemented."
@@ -4142,6 +4053,20 @@ msgstr ""
 msgid "Notice marked as fave."
 msgstr "Babl gert aÃ° uppÃ¡haldi."
 
+#. 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.
+#: lib/command.php:360
+#, php-format
+msgid "%1$s joined group %2$s."
+msgstr ""
+
+#. 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.
+#: lib/command.php:408
+#, php-format
+msgid "%1$s left group %2$s."
+msgstr ""
+
 #. TRANS: Whois output. %s is the full name of the queried user.
 #: lib/command.php:434
 #, php-format
@@ -4176,13 +4101,6 @@ msgid ""
 "same server."
 msgstr ""
 
-#. 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:491 lib/xmppmanager.php:403
-#, php-format
-msgid "Message too long - maximum is %1$d characters, you sent %2$d."
-msgstr ""
-
 #. TRANS: Error text shown sending a direct message fails with an unknown reason.
 #: lib/command.php:517
 msgid "Error sending direct message."
@@ -4193,22 +4111,18 @@ msgstr "Villa kom upp viÃ° aÃ° senda bein skilaboÃ°"
 msgid "Error repeating notice."
 msgstr "Villa kom upp Ã stillingu notanda."
 
-#. TRANS: Message given if content of a notice for a reply is too long.
-#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:592
+#. TRANS: Text shown after having subscribed to another user successfully.
+#. TRANS: %s is the name of the user the subscription was requested for.
+#: lib/command.php:672
 #, php-format
-msgid "Notice too long - maximum is %1$d characters, you sent %2$d."
-msgstr ""
-
-#. TRANS: Error text shown when no username was provided when issuing a subscribe command.
-#: lib/command.php:655
-msgid "Specify the name of the user to subscribe to."
+msgid "Subscribed to %s."
 msgstr ""
 
-#. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
-#. TRANS: Error text shown when no username was provided when issuing the command.
-#: lib/command.php:694 lib/command.php:804
-msgid "Specify the name of the user to unsubscribe from."
+#. TRANS: Text shown after having unsubscribed from another user successfully.
+#. TRANS: %s is the name of the user the unsubscription was requested for.
+#: lib/command.php:705
+#, php-format
+msgid "Unsubscribed from %s."
 msgstr ""
 
 #. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
@@ -4249,8 +4163,15 @@ msgstr ""
 msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr ""
 
+#. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
+#. TRANS: %s is the name of the user the unsubscription was requested for.
+#: lib/command.php:813
+#, php-format
+msgid "Unsubscribed %s."
+msgstr ""
+
 #. TRANS: Text shown after requesting other users a user is subscribed to.
-#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.
 #: lib/command.php:836
 msgid "You are subscribed to this person:"
@@ -4259,7 +4180,7 @@ msgstr[0] "ÃÃº ert nÃº Ã¾egar Ã Ã¡skrift aÃ° Ã¾essum notendum:"
 msgstr[1] "ÃÃº ert nÃº Ã¾egar Ã Ã¡skrift aÃ° Ã¾essum notendum:"
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
-#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
 #: lib/command.php:863
 msgid "This person is subscribed to you:"
@@ -4268,7 +4189,7 @@ msgstr[0] "Gat ekki leyft Ã¶Ã°rum aÃ° gerast Ã¡skrifandi aÃ° Ã¾Ã©r."
 msgstr[1] "Gat ekki leyft Ã¶Ã°rum aÃ° gerast Ã¡skrifandi aÃ° Ã¾Ã©r."
 
 #. TRANS: Text shown after requesting groups a user is subscribed to.
-#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
 #: lib/command.php:890
 msgid "You are a member of this group:"
@@ -4276,6 +4197,7 @@ 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."
 
+#. TRANS: Help text for commands.
 #: lib/command.php:905
 msgid ""
 "Commands:\n"
@@ -4326,10 +4248,6 @@ msgstr ""
 msgid "You may wish to run the installer to fix this."
 msgstr ""
 
-#: lib/common.php:139
-msgid "Go to the installer."
-msgstr ""
-
 #: lib/connectsettingsaction.php:110
 msgid "IM"
 msgstr "SnarskilaboÃ°"
@@ -4415,11 +4333,6 @@ msgstr ""
 msgid "URL of the homepage or blog of the group or topic"
 msgstr "VefslÃ³Ã° vefsÃÃ°u hÃ³psins eÃ°a umfjÃ¶llunarefnisins"
 
-#: lib/groupeditform.php:170
-#, php-format
-msgid "Describe the group or topic in %d characters"
-msgstr ""
-
 #: lib/groupeditform.php:179
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\""
@@ -4430,24 +4343,6 @@ msgstr "StaÃ°setning hÃ³psins, ef einhver, eins og \"Borg, landshluti, land\""
 msgid "Extra nicknames for the group, comma- or space- separated, max %d"
 msgstr ""
 
-#: lib/groupnav.php:85
-msgid "Group"
-msgstr "HÃ³pur"
-
-#: lib/groupnav.php:108
-#, php-format
-msgid "Edit %s group properties"
-msgstr "Breyta hÃ³pstillingum %s"
-
-#: lib/groupnav.php:113
-msgid "Logo"
-msgstr "Einkennismerki"
-
-#: lib/groupnav.php:114
-#, php-format
-msgid "Add or edit %s logo"
-msgstr "BÃ¦ta viÃ° eÃ°a breyta einkennismerki %s"
-
 #: lib/groupsbymemberssection.php:71
 msgid "Groups with most members"
 msgstr "HÃ³parnir meÃ° flestu meÃ°limina"
@@ -4475,7 +4370,8 @@ msgstr "SkrÃ¡arsniÃ° myndar ekki stutt."
 msgid "Partial upload."
 msgstr "Upphal aÃ° hluta til."
 
-#: lib/imagefile.php:101 lib/mediafile.php:170
+#. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
+#: lib/imagefile.php:101 lib/mediafile.php:179
 msgid "System error uploading file."
 msgstr "Kerfisvilla kom upp viÃ° upphal skrÃ¡ar."
 
@@ -4708,6 +4604,11 @@ msgid ""
 "\t%s"
 msgstr ""
 
+#: lib/mail.php:657
+#, php-format
+msgid "%s (@%s) sent a notice to your attention"
+msgstr ""
+
 #. TRANS: Body of @-reply notification e-mail.
 #: lib/mail.php:660
 #, php-format
@@ -4746,10 +4647,6 @@ msgid ""
 "users in conversation. People can send you messages for your eyes only."
 msgstr ""
 
-#: lib/mailbox.php:228 lib/noticelist.php:506
-msgid "from"
-msgstr ""
-
 #: lib/mailhandler.php:37
 msgid "Could not parse message."
 msgstr "Gat ekki Ã¾Ã¡ttaÃ° skilaboÃ°in."
@@ -4766,52 +4663,69 @@ msgstr "AfsakiÃ° en Ã¾etta er ekki mÃ³ttÃ¶kutÃ¶lvupÃ³stfangiÃ° Ã¾itt."
 msgid "Sorry, no incoming email allowed."
 msgstr "ÃvÃ miÃ°ur er mÃ³ttÃ¶kutÃ¶lvupÃ³stur ekki leyfÃ°ur."
 
-#: lib/mediafile.php:98 lib/mediafile.php:123
+#. TRANS: Client exception thrown when a database error was thrown during a file upload operation.
+#: lib/mediafile.php:99 lib/mediafile.php:125
 msgid "There was a database error while saving your file. Please try again."
 msgstr ""
 
-#: lib/mediafile.php:142
+#. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
+#: lib/mediafile.php:145
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
 msgstr ""
 
-#: lib/mediafile.php:147
+#. TRANS: Client exception.
+#: lib/mediafile.php:151
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form."
 msgstr ""
 
-#: lib/mediafile.php:152
+#. TRANS: Client exception.
+#: lib/mediafile.php:157
 msgid "The uploaded file was only partially uploaded."
 msgstr ""
 
-#: lib/mediafile.php:159
+#. TRANS: Client exception thrown when a temporary folder is not present to store a file upload.
+#: lib/mediafile.php:165
 msgid "Missing a temporary folder."
 msgstr ""
 
-#: lib/mediafile.php:162
+#. TRANS: Client exception thrown when writing to disk is not possible during a file upload operation.
+#: lib/mediafile.php:169
 msgid "Failed to write file to disk."
 msgstr ""
 
-#: lib/mediafile.php:165
+#. TRANS: Client exception thrown when a file upload operation has been stopped by an extension.
+#: lib/mediafile.php:173
 msgid "File upload stopped by extension."
 msgstr ""
 
-#: lib/mediafile.php:179 lib/mediafile.php:217
+#. TRANS: Client exception thrown when a file upload operation would cause a user to exceed a set quota.
+#: lib/mediafile.php:189 lib/mediafile.php:232
 msgid "File exceeds user's quota."
 msgstr ""
 
-#: lib/mediafile.php:197 lib/mediafile.php:234
+#. TRANS: Client exception thrown when a file upload operation fails because the file could
+#. TRANS: not be moved from the temporary folder to the permanent file location.
+#: lib/mediafile.php:209 lib/mediafile.php:251
 msgid "File could not be moved to destination directory."
 msgstr ""
 
-#: lib/mediafile.php:318
+#. TRANS: Client exception thrown trying to upload a forbidden MIME type.
+#. TRANS: %1$s is the file type that was denied, %2$s is the application part of
+#. TRANS: the MIME type that was denied.
+#: lib/mediafile.php:340
 #, php-format
-msgid " Try using another %s format."
+msgid ""
+"\"%1$s\" is not a supported file type on this server. Try using another %2$s "
+"format."
 msgstr ""
 
-#: lib/mediafile.php:323
+#. TRANS: Client exception thrown trying to upload a forbidden MIME type.
+#. TRANS: %s is the file type that was denied.
+#: lib/mediafile.php:345
 #, php-format
-msgid "%s is not a supported file type on this server."
+msgid "\"%s\" is not a supported file type on this server."
 msgstr ""
 
 #: lib/messageform.php:120
@@ -4826,11 +4740,6 @@ msgstr "Til"
 msgid "Available characters"
 msgstr "Leyfileg tÃ¡kn"
 
-#: lib/messageform.php:178 lib/noticeform.php:237
-msgctxt "Send button for sending notice"
-msgid "Send"
-msgstr ""
-
 #: lib/noticeform.php:160
 msgid "Send a notice"
 msgstr "Senda babl"
@@ -4848,10 +4757,6 @@ msgstr ""
 msgid "Attach a file"
 msgstr ""
 
-#: lib/noticeform.php:213
-msgid "Share my location"
-msgstr ""
-
 #: lib/noticeform.php:217
 msgid ""
 "Sorry, retrieving your geo location is taking longer than expected, please "
@@ -4886,10 +4791,6 @@ msgstr ""
 msgid "web"
 msgstr ""
 
-#: lib/noticelist.php:603
-msgid "Repeated by"
-msgstr ""
-
 #: lib/noticelist.php:630
 msgid "Reply to this notice"
 msgstr "Svara Ã¾essu babli"
@@ -4910,23 +4811,7 @@ msgstr "Pot"
 msgid "Send a nudge to this user"
 msgstr "Ãta viÃ° Ã¾essum notanda"
 
-#: lib/oauthstore.php:283
-msgid "Error inserting new profile"
-msgstr "Villa kom upp viÃ° aÃ° setja inn nÃ½ja persÃ³nulega sÃÃ°u"
-
-#: lib/oauthstore.php:291
-msgid "Error inserting avatar"
-msgstr "Villa kom upp viÃ° aÃ° setja inn mynd"
-
-#: lib/oauthstore.php:306
-msgid "Error updating remote profile"
-msgstr "Villa kom upp Ã uppfÃ¦rslu persÃ³nulegrar fjarsÃÃ°u"
-
-#: lib/oauthstore.php:311
-msgid "Error inserting remote profile"
-msgstr "Villa kom upp viÃ° aÃ° setja inn persÃ³nulega fjarsÃÃ°u"
-
-#: lib/oauthstore.php:490
+#: lib/oauthstore.php:491
 msgid "Couldn't insert new subscription."
 msgstr "Gat ekki sett inn nÃ½ja Ã¡skrift."
 
@@ -5016,10 +4901,6 @@ msgstr "Ã sviÃ°sljÃ³sinu"
 msgid "Popular"
 msgstr "VinsÃ¦lt"
 
-#: lib/redirectingaction.php:95
-msgid "No return-to arguments."
-msgstr ""
-
 #: lib/repeatform.php:132
 msgid "Yes"
 msgstr "JÃ¡"
@@ -5033,14 +4914,12 @@ msgstr ""
 msgid "No single user defined for single-user mode."
 msgstr ""
 
-#: lib/searchaction.php:126
+#. TRANS: Used as a field label for the field where one or more keywords
+#. TRANS: for searching can be entered.
+#: lib/searchaction.php:129
 msgid "Keyword(s)"
 msgstr ""
 
-#: lib/searchaction.php:127
-msgid "Search"
-msgstr "Leita"
-
 #: lib/searchgroupnav.php:80
 msgid "People"
 msgstr "FÃ³lk"
@@ -5198,56 +5077,32 @@ msgid "Moderator"
 msgstr ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1102
+#: lib/util.php:1103
 msgid "a few seconds ago"
 msgstr "fyrir nokkrum sekÃºndum"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1105
+#: lib/util.php:1106
 msgid "about a minute ago"
 msgstr "fyrir um einni mÃnÃºtu sÃÃ°an"
 
-#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1109
-#, php-format
-msgid "about %d minutes ago"
-msgstr "fyrir um %d mÃnÃºtum sÃÃ°an"
-
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 #: lib/util.php:1112
 msgid "about an hour ago"
 msgstr "fyrir um einum klukkutÃma sÃÃ°an"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1116
-#, php-format
-msgid "about %d hours ago"
-msgstr "fyrir um %d klukkutÃmum sÃÃ°an"
-
-#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1119
+#: lib/util.php:1118
 msgid "about a day ago"
 msgstr "fyrir um einum degi sÃÃ°an"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1123
-#, php-format
-msgid "about %d days ago"
-msgstr "fyrir um %d dÃ¶gum sÃÃ°an"
-
-#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1126
+#: lib/util.php:1124
 msgid "about a month ago"
 msgstr "fyrir um einum mÃ¡nuÃ°i sÃÃ°an"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 #: lib/util.php:1130
-#, php-format
-msgid "about %d months ago"
-msgstr "fyrir um %d mÃ¡nuÃ°um sÃÃ°an"
-
-#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1133
 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 db7cb67ceb..35f4b1c1f2 100644
--- a/locale/it/LC_MESSAGES/statusnet.po
+++ b/locale/it/LC_MESSAGES/statusnet.po
@@ -1,8 +1,9 @@
-# Translation of StatusNet to Italian
+# Translation of StatusNet to Italian (Italiano)
+# Expored from translatewiki.net
 #
-# Author@translatewiki.net: HalphaZ
-# Author@translatewiki.net: Milocasagrande
-# Author@translatewiki.net: Nemo bis
+# Author: HalphaZ
+# Author: Milocasagrande
+# Author: Nemo bis
 # --
 # This file is distributed under the same license as the StatusNet package.
 #
@@ -10,20 +11,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-08 22:33+0000\n"
-"PO-Revision-Date: 2010-09-08 22:34:41+0000\n"
-"Language-Team: Italian\n"
+"POT-Creation-Date: 2010-09-14 19:53+0000\n"
+"PO-Revision-Date: 2010-09-14 19:54:04+0000\n"
+"Language-Team: Italian <http://translatewiki.net/wiki/Portal:it>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r72348); Translate extension (2010-08-20)\n"
+"X-Generator: MediaWiki 1.17alpha (r73009); Translate extension (2010-08-20)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: it\n"
-"X-Message-Group: out-statusnet\n"
+"X-Message-Group: #out-statusnet\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-POT-Import-Date: 1284-49-16 34::+0000\n"
 
 #. TRANS: Page title
 #. TRANS: Menu item for site administration
-#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:376
+#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:363
 msgid "Access"
 msgstr "Accesso"
 
@@ -78,10 +80,10 @@ 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 actions/emailsettings.php:224
-#: actions/imsettings.php:184 actions/smssettings.php:209
-#: lib/applicationeditform.php:361
+#. TRANS: Button label in the "Edit application" form.
+#: actions/accessadminpanel.php:203 actions/emailsettings.php:228
+#: actions/imsettings.php:187 actions/smssettings.php:209
+#: lib/applicationeditform.php:351
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Salva"
@@ -94,15 +96,15 @@ msgstr "Pagina inesistente."
 
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #: actions/all.php:79 actions/allrss.php:68
-#: actions/apiaccountupdatedeliverydevice.php:114
-#: actions/apiaccountupdateprofile.php:105
-#: actions/apiaccountupdateprofilebackgroundimage.php:116
-#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
-#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
-#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:113
-#: actions/apigroupismember.php:91 actions/apigroupjoin.php:100
-#: actions/apigroupleave.php:100 actions/apigrouplist.php:73
-#: actions/apistatusesupdate.php:229 actions/apisubscriptions.php:87
+#: actions/apiaccountupdatedeliverydevice.php:115
+#: actions/apiaccountupdateprofile.php:106
+#: actions/apiaccountupdateprofilebackgroundimage.php:117
+#: actions/apiaccountupdateprofileimage.php:106 actions/apiblockcreate.php:98
+#: actions/apiblockdestroy.php:97 actions/apidirectmessage.php:77
+#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:114
+#: actions/apigroupismember.php:91 actions/apigroupjoin.php:101
+#: actions/apigroupleave.php:101 actions/apigrouplist.php:73
+#: actions/apistatusesupdate.php:230 actions/apisubscriptions.php:87
 #: actions/apitimelinefavorites.php:72 actions/apitimelinefriends.php:174
 #: actions/apitimelinehome.php:80 actions/apitimelinementions.php:80
 #: actions/apitimelineuser.php:82 actions/avatarbynickname.php:75
@@ -200,16 +202,16 @@ msgid "Updates from %1$s and friends on %2$s!"
 msgstr "Messaggi da %1$s e amici su %2$s!"
 
 #: actions/apiaccountratelimitstatus.php:72
-#: actions/apiaccountupdatedeliverydevice.php:94
-#: actions/apiaccountupdateprofile.php:97
-#: actions/apiaccountupdateprofilebackgroundimage.php:94
-#: actions/apiaccountupdateprofilecolors.php:118
+#: actions/apiaccountupdatedeliverydevice.php:95
+#: actions/apiaccountupdateprofile.php:98
+#: actions/apiaccountupdateprofilebackgroundimage.php:95
+#: actions/apiaccountupdateprofilecolors.php:119
 #: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156
-#: actions/apifavoritecreate.php:100 actions/apifavoritedestroy.php:101
-#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100
-#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:139
-#: actions/apigroupismember.php:115 actions/apigroupjoin.php:156
-#: actions/apigroupleave.php:142 actions/apigrouplist.php:137
+#: actions/apifavoritecreate.php:101 actions/apifavoritedestroy.php:102
+#: actions/apifriendshipscreate.php:101 actions/apifriendshipsdestroy.php:101
+#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:140
+#: actions/apigroupismember.php:115 actions/apigroupjoin.php:157
+#: actions/apigroupleave.php:143 actions/apigrouplist.php:137
 #: actions/apigrouplistall.php:122 actions/apigroupmembership.php:107
 #: actions/apigroupshow.php:116 actions/apihelptest.php:88
 #: actions/apistatusesdestroy.php:104 actions/apistatusesretweets.php:112
@@ -224,21 +226,23 @@ msgstr "Messaggi da %1$s e amici su %2$s!"
 msgid "API method not found."
 msgstr "Metodo delle API non trovato."
 
-#: actions/apiaccountupdatedeliverydevice.php:86
-#: actions/apiaccountupdateprofile.php:89
-#: actions/apiaccountupdateprofilebackgroundimage.php:86
-#: actions/apiaccountupdateprofilecolors.php:110
-#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89
-#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109
-#: actions/apifavoritecreate.php:91 actions/apifavoritedestroy.php:92
-#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
-#: actions/apigroupcreate.php:105 actions/apigroupjoin.php:92
-#: actions/apigroupleave.php:92 actions/apimediaupload.php:67
-#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:198
+#. TRANS: Client error message. POST is a HTTP command. It should not be translated.
+#. TRANS: Client error. POST is a HTTP command. It should not be translated.
+#: actions/apiaccountupdatedeliverydevice.php:87
+#: actions/apiaccountupdateprofile.php:90
+#: actions/apiaccountupdateprofilebackgroundimage.php:87
+#: actions/apiaccountupdateprofilecolors.php:111
+#: actions/apiaccountupdateprofileimage.php:85 actions/apiblockcreate.php:90
+#: actions/apiblockdestroy.php:89 actions/apidirectmessagenew.php:110
+#: actions/apifavoritecreate.php:92 actions/apifavoritedestroy.php:93
+#: actions/apifriendshipscreate.php:92 actions/apifriendshipsdestroy.php:92
+#: actions/apigroupcreate.php:106 actions/apigroupjoin.php:93
+#: actions/apigroupleave.php:93 actions/apimediaupload.php:68
+#: actions/apistatusesretweet.php:66 actions/apistatusesupdate.php:199
 msgid "This method requires a POST."
 msgstr "Questo metodo richiede POST."
 
-#: actions/apiaccountupdatedeliverydevice.php:106
+#: actions/apiaccountupdatedeliverydevice.php:107
 msgid ""
 "You must specify a parameter named 'device' with a value of one of: sms, im, "
 "none."
@@ -246,27 +250,27 @@ msgstr ""
 "Ã necessario specificare un parametro chiamato \"device\" con un valore tra: "
 "\"sms\", \"im\" o \"none\"."
 
-#: actions/apiaccountupdatedeliverydevice.php:133
+#: actions/apiaccountupdatedeliverydevice.php:134
 msgid "Could not update user."
 msgstr "Impossibile aggiornare l'utente."
 
-#: actions/apiaccountupdateprofile.php:112
-#: actions/apiaccountupdateprofilebackgroundimage.php:194
-#: actions/apiaccountupdateprofilecolors.php:185
-#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/apiaccountupdateprofile.php:113
+#: actions/apiaccountupdateprofilebackgroundimage.php:195
+#: actions/apiaccountupdateprofilecolors.php:186
+#: actions/apiaccountupdateprofileimage.php:131 actions/apiusershow.php:108
 #: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/hcard.php:74
 #: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
 #: lib/profileaction.php:84
 msgid "User has no profile."
 msgstr "L'utente non ha un profilo."
 
-#: actions/apiaccountupdateprofile.php:147
+#: actions/apiaccountupdateprofile.php:148
 msgid "Could not save profile."
 msgstr "Impossibile salvare il profilo."
 
-#: actions/apiaccountupdateprofilebackgroundimage.php:108
-#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
-#: actions/apistatusesupdate.php:212 actions/avatarsettings.php:257
+#: actions/apiaccountupdateprofilebackgroundimage.php:109
+#: actions/apiaccountupdateprofileimage.php:98 actions/apimediaupload.php:81
+#: actions/apistatusesupdate.php:213 actions/avatarsettings.php:257
 #: actions/designadminpanel.php:123 actions/editapplication.php:118
 #: actions/newapplication.php:101 actions/newnotice.php:94
 #: lib/designsettings.php:283
@@ -278,30 +282,30 @@ msgstr ""
 "Il server non Ã¨ in grado di gestire tutti quei dati POST (%s byte) con la "
 "configurazione attuale."
 
-#: actions/apiaccountupdateprofilebackgroundimage.php:136
-#: actions/apiaccountupdateprofilebackgroundimage.php:146
-#: actions/apiaccountupdateprofilecolors.php:164
-#: actions/apiaccountupdateprofilecolors.php:174
+#: actions/apiaccountupdateprofilebackgroundimage.php:137
+#: actions/apiaccountupdateprofilebackgroundimage.php:147
+#: actions/apiaccountupdateprofilecolors.php:165
+#: actions/apiaccountupdateprofilecolors.php:175
 #: actions/groupdesignsettings.php:290 actions/groupdesignsettings.php:300
 #: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
 #: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
 msgid "Unable to save your design settings."
 msgstr "Impossibile salvare la impostazioni dell'aspetto."
 
-#: actions/apiaccountupdateprofilebackgroundimage.php:187
-#: actions/apiaccountupdateprofilecolors.php:142
+#: actions/apiaccountupdateprofilebackgroundimage.php:188
+#: actions/apiaccountupdateprofilecolors.php:143
 msgid "Could not update your design."
 msgstr "Impossibile aggiornare l'aspetto."
 
-#: actions/apiblockcreate.php:105
+#: actions/apiblockcreate.php:106
 msgid "You cannot block yourself!"
 msgstr "Non puoi bloccarti!"
 
-#: actions/apiblockcreate.php:126
+#: actions/apiblockcreate.php:127
 msgid "Block user failed."
 msgstr "Blocco dell'utente non riuscito."
 
-#: actions/apiblockdestroy.php:114
+#: actions/apiblockdestroy.php:115
 msgid "Unblock user failed."
 msgstr "Sblocco dell'utente non riuscito."
 
@@ -325,66 +329,62 @@ msgstr "Messaggi diretti a %s"
 msgid "All the direct messages sent to %s"
 msgstr "Tutti i messaggi diretti inviati a %s"
 
-#: actions/apidirectmessagenew.php:118
+#: actions/apidirectmessagenew.php:119
 msgid "No message text!"
 msgstr "Nessun testo nel messaggio!"
 
-#: actions/apidirectmessagenew.php:127 actions/newmessage.php:150
+#: actions/apidirectmessagenew.php:128 actions/newmessage.php:150
 #, php-format
 msgid "That's too long. Max message size is %d chars."
 msgstr "Troppo lungo. La dimensione massima di un messaggio Ã¨ di %d caratteri."
 
-#: actions/apidirectmessagenew.php:138
+#: actions/apidirectmessagenew.php:139
 msgid "Recipient user not found."
 msgstr "Destinatario non trovato."
 
-#: actions/apidirectmessagenew.php:142
+#: actions/apidirectmessagenew.php:143
 msgid "Can't send direct messages to users who aren't your friend."
 msgstr "Non puoi inviare messaggi diretti a utenti che non sono tuoi amici."
 
-#: actions/apifavoritecreate.php:109 actions/apifavoritedestroy.php:110
+#: actions/apifavoritecreate.php:110 actions/apifavoritedestroy.php:111
 #: actions/apistatusesdestroy.php:121
 msgid "No status found with that ID."
 msgstr "Nessuno messaggio trovato con quel ID."
 
-#: actions/apifavoritecreate.php:120
+#: actions/apifavoritecreate.php:121
 msgid "This status is already a favorite."
 msgstr "Questo messaggio Ã¨ giÃ  un preferito."
 
 #. TRANS: Error message text shown when a favorite could not be set.
-#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:296
+#: actions/apifavoritecreate.php:132 actions/favor.php:84 lib/command.php:296
 msgid "Could not create favorite."
 msgstr "Impossibile creare un preferito."
 
-#: actions/apifavoritedestroy.php:123
+#: actions/apifavoritedestroy.php:124
 msgid "That status is not a favorite."
 msgstr "Questo messaggio non Ã¨ un preferito."
 
-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
+#: actions/apifavoritedestroy.php:136 actions/disfavor.php:87
 msgid "Could not delete favorite."
 msgstr "Impossibile eliminare un preferito."
 
-#: actions/apifriendshipscreate.php:109
+#: actions/apifriendshipscreate.php:110
 msgid "Could not follow user: profile not found."
 msgstr "Impossibile non seguire l'utente: utente non trovato."
 
-#: actions/apifriendshipscreate.php:118
+#: actions/apifriendshipscreate.php:119
 #, php-format
 msgid "Could not follow user: %s is already on your list."
 msgstr "Impossibile seguire l'utente: %s Ã¨ giÃ  nel tuo elenco."
 
-#: actions/apifriendshipsdestroy.php:109
+#: actions/apifriendshipsdestroy.php:110
 msgid "Could not unfollow user: User not found."
 msgstr "Impossibile non seguire l'utente: utente non trovato."
 
-#: actions/apifriendshipsdestroy.php:120
+#: actions/apifriendshipsdestroy.php:121
 msgid "You cannot unfollow yourself."
 msgstr "Non puoi non seguirti."
 
-#: actions/apifriendshipsexists.php:91
-msgid "Two valid IDs or screen_names must be supplied."
-msgstr ""
-
 #: actions/apifriendshipsshow.php:134
 msgid "Could not determine source user."
 msgstr "Impossibile determinare l'utente sorgente."
@@ -393,7 +393,7 @@ msgstr "Impossibile determinare l'utente sorgente."
 msgid "Could not find target user."
 msgstr "Impossibile trovare l'utente destinazione."
 
-#: actions/apigroupcreate.php:167 actions/editgroup.php:186
+#: actions/apigroupcreate.php:168 actions/editgroup.php:186
 #: actions/newgroup.php:126 actions/profilesettings.php:215
 #: actions/register.php:212
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
@@ -401,95 +401,95 @@ msgstr ""
 "Il soprannome deve essere composto solo da lettere minuscole e numeri, senza "
 "spazi."
 
-#: actions/apigroupcreate.php:176 actions/editgroup.php:190
+#: actions/apigroupcreate.php:177 actions/editgroup.php:190
 #: actions/newgroup.php:130 actions/profilesettings.php:238
 #: actions/register.php:215
 msgid "Nickname already in use. Try another one."
 msgstr "Soprannome giÃ  in uso. Prova con un altro."
 
-#: actions/apigroupcreate.php:183 actions/editgroup.php:193
+#: actions/apigroupcreate.php:184 actions/editgroup.php:193
 #: actions/newgroup.php:133 actions/profilesettings.php:218
 #: actions/register.php:217
 msgid "Not a valid nickname."
 msgstr "Non Ã¨ un soprannome valido."
 
-#: actions/apigroupcreate.php:199 actions/editapplication.php:215
+#: actions/apigroupcreate.php:200 actions/editapplication.php:215
 #: actions/editgroup.php:199 actions/newapplication.php:203
 #: actions/newgroup.php:139 actions/profilesettings.php:222
 #: actions/register.php:224
 msgid "Homepage is not a valid URL."
 msgstr "L'indirizzo della pagina web non Ã¨ valido."
 
-#: actions/apigroupcreate.php:208 actions/editgroup.php:202
+#: actions/apigroupcreate.php:209 actions/editgroup.php:202
 #: actions/newgroup.php:142 actions/profilesettings.php:225
 #: actions/register.php:227
 msgid "Full name is too long (max 255 chars)."
 msgstr "Nome troppo lungo (max 255 caratteri)."
 
-#: actions/apigroupcreate.php:216 actions/editapplication.php:190
+#: actions/apigroupcreate.php:217 actions/editapplication.php:190
 #: actions/newapplication.php:172
 #, php-format
 msgid "Description is too long (max %d chars)."
 msgstr "La descrizione Ã¨ troppo lunga (max %d caratteri)."
 
-#: actions/apigroupcreate.php:227 actions/editgroup.php:208
+#: actions/apigroupcreate.php:228 actions/editgroup.php:208
 #: actions/newgroup.php:148 actions/profilesettings.php:232
 #: actions/register.php:234
 msgid "Location is too long (max 255 chars)."
 msgstr "Ubicazione troppo lunga (max 255 caratteri)."
 
-#: actions/apigroupcreate.php:246 actions/editgroup.php:219
+#: actions/apigroupcreate.php:247 actions/editgroup.php:219
 #: actions/newgroup.php:159
 #, php-format
 msgid "Too many aliases! Maximum %d."
 msgstr "Troppi alias! Massimo %d."
 
-#: actions/apigroupcreate.php:267
+#: actions/apigroupcreate.php:268
 #, php-format
 msgid "Invalid alias: \"%s\"."
 msgstr "Alias non valido: \"%s\"."
 
-#: actions/apigroupcreate.php:276 actions/editgroup.php:232
+#: actions/apigroupcreate.php:277 actions/editgroup.php:232
 #: actions/newgroup.php:172
 #, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr "L'alias \"%s\" Ã¨ giÃ  in uso. Prova con un altro."
 
-#: actions/apigroupcreate.php:289 actions/editgroup.php:238
+#: actions/apigroupcreate.php:290 actions/editgroup.php:238
 #: actions/newgroup.php:178
 msgid "Alias can't be the same as nickname."
 msgstr "L'alias non puÃ² essere lo stesso del soprannome."
 
-#: actions/apigroupismember.php:96 actions/apigroupjoin.php:105
-#: actions/apigroupleave.php:105 actions/apigroupmembership.php:92
+#: actions/apigroupismember.php:96 actions/apigroupjoin.php:106
+#: actions/apigroupleave.php:106 actions/apigroupmembership.php:92
 #: actions/apigroupshow.php:83 actions/apitimelinegroup.php:92
 msgid "Group not found."
 msgstr "Gruppo non trovato."
 
 #. TRANS: Error text shown a user tries to join a group they already are a member of.
-#: actions/apigroupjoin.php:111 actions/joingroup.php:100 lib/command.php:336
+#: actions/apigroupjoin.php:112 actions/joingroup.php:100 lib/command.php:336
 msgid "You are already a member of that group."
 msgstr "Fai giÃ  parte di quel gruppo."
 
 #. TRANS: Error text shown when a user tries to join a group they are blocked from joining.
-#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:341
+#: actions/apigroupjoin.php:121 actions/joingroup.php:105 lib/command.php:341
 msgid "You have been blocked from that group by the admin."
 msgstr "L'amministratore ti ha bloccato l'accesso a quel gruppo."
 
 #. 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.
-#: actions/apigroupjoin.php:139 actions/joingroup.php:134 lib/command.php:353
+#: actions/apigroupjoin.php:140 actions/joingroup.php:134 lib/command.php:353
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "Impossibile iscrivere l'utente %1$s al gruppo %2$s."
 
-#: actions/apigroupleave.php:115
+#: actions/apigroupleave.php:116
 msgid "You are not a member of this group."
 msgstr "Non fai parte di questo gruppo."
 
 #. 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.
-#: actions/apigroupleave.php:125 actions/leavegroup.php:129
+#: actions/apigroupleave.php:126 actions/leavegroup.php:129
 #: lib/command.php:401
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
@@ -529,9 +529,9 @@ msgstr "Token non valido."
 
 #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
 #: actions/deletenotice.php:169 actions/disfavor.php:74
-#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:55
+#: actions/emailsettings.php:271 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:66 actions/imsettings.php:227
+#: actions/groupunblock.php:66 actions/imsettings.php:230
 #: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
@@ -577,8 +577,8 @@ msgstr "Il token di richiesta %s Ã¨ stato rifiutato o revocato."
 #. 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:286 actions/grouplogo.php:322
-#: actions/imsettings.php:242 actions/newapplication.php:121
+#: actions/emailsettings.php:290 actions/grouplogo.php:322
+#: actions/imsettings.php:245 actions/newapplication.php:121
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
 #: actions/smssettings.php:277 lib/designsettings.php:304
 msgid "Unexpected form submission."
@@ -642,18 +642,18 @@ msgstr "Questo metodo richiede POST o DELETE."
 msgid "You may not delete another user's status."
 msgstr "Non puoi eliminare il messaggio di un altro utente."
 
-#: actions/apistatusesretweet.php:75 actions/apistatusesretweets.php:72
+#: actions/apistatusesretweet.php:76 actions/apistatusesretweets.php:72
 #: actions/deletenotice.php:52 actions/shownotice.php:92
 msgid "No such notice."
 msgstr "Nessun messaggio."
 
 #. TRANS: Error text shown when trying to repeat an own notice.
-#: actions/apistatusesretweet.php:83 lib/command.php:538
+#: actions/apistatusesretweet.php:84 lib/command.php:538
 msgid "Cannot repeat your own notice."
 msgstr "Non puoi ripetere un tuo messaggio."
 
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-#: actions/apistatusesretweet.php:91 lib/command.php:544
+#: actions/apistatusesretweet.php:92 lib/command.php:544
 msgid "Already repeated that notice."
 msgstr "Hai giÃ  ripetuto quel messaggio."
 
@@ -665,21 +665,21 @@ msgstr "Messaggio eliminato."
 msgid "No status with that ID found."
 msgstr "Nessuno stato trovato con quel ID."
 
-#: actions/apistatusesupdate.php:221
+#: actions/apistatusesupdate.php:222
 msgid "Client must provide a 'status' parameter with a value."
 msgstr ""
 
-#: actions/apistatusesupdate.php:242 actions/newnotice.php:157
+#: actions/apistatusesupdate.php:243 actions/newnotice.php:157
 #: lib/mailhandler.php:60
 #, php-format
 msgid "That's too long. Max notice size is %d chars."
 msgstr "Troppo lungo. Lunghezza massima %d caratteri."
 
-#: actions/apistatusesupdate.php:283 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:284 actions/apiusershow.php:96
 msgid "Not found."
 msgstr "Non trovato."
 
-#: actions/apistatusesupdate.php:306 actions/newnotice.php:181
+#: actions/apistatusesupdate.php:307 actions/newnotice.php:181
 #, php-format
 msgid "Max notice size is %d chars, including attachment URL."
 msgstr ""
@@ -881,7 +881,9 @@ msgid "Yes"
 msgstr "SÃ¬"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
+#. TRANS: Submit button title.
+#. TRANS: Description of the form to block a user.
+#: actions/block.php:164 actions/groupmembers.php:403 lib/blockform.php:82
 msgid "Block this user"
 msgstr "Blocca questo utente"
 
@@ -923,11 +925,13 @@ msgstr "Un elenco degli utenti a cui Ã¨ bloccato l'accesso a questo gruppo."
 msgid "Unblock user from group"
 msgstr "Sblocca l'utente dal gruppo"
 
-#: actions/blockedfromgroup.php:320 lib/unblockform.php:69
+#. TRANS: Title for the form to unblock a user.
+#: actions/blockedfromgroup.php:320 lib/unblockform.php:70
 msgid "Unblock"
 msgstr "Sblocca"
 
-#: actions/blockedfromgroup.php:320 lib/unblockform.php:80
+#. TRANS: Description of the form to unblock a user.
+#: actions/blockedfromgroup.php:320 lib/unblockform.php:82
 msgid "Unblock this user"
 msgstr "Sblocca questo utente"
 
@@ -966,9 +970,9 @@ msgstr "Quell'indirizzo Ã¨ giÃ  stato confermato."
 #. 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/confirmaddress.php:116 actions/emailsettings.php:331
+#: actions/emailsettings.php:477 actions/imsettings.php:283
+#: actions/imsettings.php:442 actions/othersettings.php:174
 #: actions/profilesettings.php:283 actions/smssettings.php:308
 #: actions/smssettings.php:464
 msgid "Couldn't update user."
@@ -976,7 +980,7 @@ msgstr "Impossibile aggiornare l'utente."
 
 #. 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/confirmaddress.php:128 actions/emailsettings.php:437
 #: actions/smssettings.php:422
 msgid "Couldn't delete email confirmation."
 msgstr "Impossibile eliminare l'email di conferma."
@@ -1012,9 +1016,10 @@ msgstr "Applicazione non trovata."
 msgid "You are not the owner of this application."
 msgstr "Questa applicazione non Ã¨ di tua proprietÃ ."
 
+#. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:127
 #: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1307
+#: lib/action.php:1315
 msgid "There was a problem with your session token."
 msgstr "Si Ã¨ verificato un problema con il tuo token di sessione."
 
@@ -1047,7 +1052,7 @@ msgstr "Elimina l'applicazione"
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
 #: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:73 lib/profileformaction.php:64
+#: lib/adminpanelaction.php:71 lib/profileformaction.php:64
 #: lib/settingsaction.php:72
 msgid "Not logged in."
 msgstr "Accesso non effettuato."
@@ -1110,7 +1115,6 @@ msgstr "Elimina questo utente"
 #. TRANS: Message used as title for design settings for the site.
 #. TRANS: Link description in user account settings menu.
 #: actions/designadminpanel.php:63 lib/accountsettingsaction.php:139
-#: lib/groupnav.php:119
 msgid "Design"
 msgstr "Aspetto"
 
@@ -1231,13 +1235,13 @@ msgstr "Ripristina i valori predefiniti"
 msgid "Reset back to default"
 msgstr "Reimposta i valori predefiniti"
 
-#. TRANS: Submit button title
+#. TRANS: Submit button title.
 #: actions/designadminpanel.php:685 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/snapshotadminpanel.php:245
 #: actions/subscriptions.php:226 actions/tagother.php:154
-#: actions/useradminpanel.php:294 lib/applicationeditform.php:363
+#: actions/useradminpanel.php:294 lib/applicationeditform.php:353
 #: lib/designsettings.php:256 lib/groupeditform.php:202
 msgid "Save"
 msgstr "Salva"
@@ -1393,7 +1397,7 @@ msgstr "Indirizzo email attualmente confermato."
 #. 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/emailsettings.php:115 actions/emailsettings.php:162
 #: actions/imsettings.php:116 actions/smssettings.php:124
 #: actions/smssettings.php:180
 msgctxt "BUTTON"
@@ -1412,22 +1416,26 @@ msgstr ""
 #. 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
+#. TRANS: Button label in the "Edit application" form.
 #: actions/emailsettings.php:127 actions/imsettings.php:131
-#: actions/smssettings.php:137 lib/applicationeditform.php:357
+#: actions/smssettings.php:137 lib/applicationeditform.php:347
 msgctxt "BUTTON"
 msgid "Cancel"
 msgstr "Annulla"
 
-#. TRANS: Instructions for e-mail address input form.
-#: actions/emailsettings.php:135
+#. TRANS: Instructions for e-mail address input form. Do not translate
+#. TRANS: "example.org". It is one of the domain names reserved for
+#. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
+#. TRANS: Any other domain may be owned by a legitimate person or
+#. TRANS: organization.
+#: actions/emailsettings.php:139
 msgid "Email address, like \"UserName@example.org\""
 msgstr "Indirizzo email, del tipo \"nomeutente@example.org\""
 
 #. 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/emailsettings.php:143 actions/imsettings.php:151
 #: actions/smssettings.php:162
 msgctxt "BUTTON"
 msgid "Add"
@@ -1435,19 +1443,19 @@ msgstr "Aggiungi"
 
 #. 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
+#: actions/emailsettings.php:151 actions/smssettings.php:171
 msgid "Incoming email"
 msgstr "Email di ricezione"
 
 #. 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
+#: actions/emailsettings.php:159 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."
 
 #. 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
+#: actions/emailsettings.php:168 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 "
@@ -1455,93 +1463,93 @@ msgstr ""
 
 #. 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
+#: actions/emailsettings.php:172 actions/smssettings.php:189
 msgctxt "BUTTON"
 msgid "New"
 msgstr "Nuovo"
 
 #. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:174
+#: actions/emailsettings.php:178
 msgid "Email preferences"
 msgstr "Preferenze dell'email"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:180
+#: actions/emailsettings.php:184
 msgid "Send me notices of new subscriptions through email."
 msgstr "Inviami avvisi di nuovi abbonamenti via email"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:186
+#: actions/emailsettings.php:190
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr ""
 "Inviami un'email quando qualcuno aggiunge un mio messaggio ai preferiti"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:193
+#: actions/emailsettings.php:197
 msgid "Send me email when someone sends me a private message."
 msgstr "Inviami un'email quando qualcuno mi invia un messaggio privato"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:199
+#: actions/emailsettings.php:203
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr "Inviami un'email quando qualcuno mi invia una \"@-risposta\""
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:205
+#: actions/emailsettings.php:209
 msgid "Allow friends to nudge me and send me an email."
 msgstr "Consenti ai miei amici di richiamarmi e inviami un'email"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:212
+#: actions/emailsettings.php:216
 msgid "I want to post notices by email."
 msgstr "Voglio inviare i messaggi via email"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:219
+#: actions/emailsettings.php:223
 msgid "Publish a MicroID for my email address."
 msgstr "Pubblica un MicroID per il mio indirizzo email"
 
 #. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:334
+#: actions/emailsettings.php:338
 msgid "Email preferences saved."
 msgstr "Preferenze dell'email salvate."
 
 #. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:353
+#: actions/emailsettings.php:357
 msgid "No email address."
 msgstr "Nessun indirizzo email."
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:361
+#: actions/emailsettings.php:365
 msgid "Cannot normalize that email address"
 msgstr "Impossibile normalizzare quell'indirizzo email"
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:208
+#: actions/emailsettings.php:370 actions/register.php:208
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "Non Ã¨ un indirizzo email valido."
 
 #. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:370
+#: actions/emailsettings.php:374
 msgid "That is already your email address."
 msgstr "Quello Ã¨ giÃ  il tuo indirizzo email."
 
 #. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:374
+#: actions/emailsettings.php:378
 msgid "That email address already belongs to another user."
 msgstr "Quell'indirizzo email appartiene giÃ  a un altro utente."
 
 #. 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/emailsettings.php:395 actions/imsettings.php:351
 #: actions/smssettings.php:373
 msgid "Couldn't insert confirmation code."
 msgstr "Impossibile inserire il codice di conferma."
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:398
+#: actions/emailsettings.php:402
 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."
@@ -1553,50 +1561,50 @@ msgstr ""
 #. 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/emailsettings.php:423 actions/imsettings.php:386
 #: actions/smssettings.php:408
 msgid "No pending confirmation to cancel."
 msgstr "Nessuna conferma da annullare."
 
 #. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:424
+#: actions/emailsettings.php:428
 msgid "That is the wrong email address."
 msgstr "Quello Ã¨ l'indirizzo email sbagliato."
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:438
+#: actions/emailsettings.php:442
 msgid "Email confirmation cancelled."
 msgstr "Conferma dell'email annullata."
 
 #. TRANS: Message given trying to remove an e-mail address that is not
 #. TRANS: registered for the active user.
-#: actions/emailsettings.php:458
+#: actions/emailsettings.php:462
 msgid "That is not your email address."
 msgstr "Quello non Ã¨ il tuo indirizzo email."
 
 #. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:479
+#: actions/emailsettings.php:483
 msgid "The email address was removed."
 msgstr "L'indirizzo email Ã¨ stato rimosso."
 
-#: actions/emailsettings.php:493 actions/smssettings.php:568
+#: actions/emailsettings.php:497 actions/smssettings.php:568
 msgid "No incoming email address."
 msgstr "Nessun indirizzo email di ricezione."
 
 #. 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/emailsettings.php:508 actions/emailsettings.php:532
 #: actions/smssettings.php:578 actions/smssettings.php:602
 msgid "Couldn't update user record."
 msgstr "Impossibile aggiornare il record dell'utente."
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
-#: actions/emailsettings.php:508 actions/smssettings.php:581
+#: actions/emailsettings.php:512 actions/smssettings.php:581
 msgid "Incoming email address removed."
 msgstr "Indirizzo email di ricezione rimosso."
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
-#: actions/emailsettings.php:532 actions/smssettings.php:605
+#: actions/emailsettings.php:536 actions/smssettings.php:605
 msgid "New incoming email address added."
 msgstr "Nuovo indirizzo email di ricezione aggiunto."
 
@@ -1715,7 +1723,7 @@ msgstr "Impossibile convertire il token di richiesta in uno di accesso."
 msgid "Remote service uses unknown version of OMB protocol."
 msgstr "Il servizio remoto usa una versione del protocollo OMB sconosciuta."
 
-#: actions/finishremotesubscribe.php:138
+#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306
 msgid "Error updating remote profile."
 msgstr "Errore nell'aggiornare il profilo remoto."
 
@@ -1772,7 +1780,7 @@ msgstr "L'utente Ã¨ giÃ  bloccato dal gruppo."
 msgid "User is not a member of group."
 msgstr "L'utente non fa parte del gruppo."
 
-#: actions/groupblock.php:134 actions/groupmembers.php:360
+#: actions/groupblock.php:134 actions/groupmembers.php:364
 msgid "Block user from group"
 msgstr "Blocca l'utente dal gruppo"
 
@@ -1854,40 +1862,32 @@ msgstr "Logo aggiornato."
 msgid "Failed updating logo."
 msgstr "Aggiornamento del logo non riuscito."
 
-#: actions/groupmembers.php:100 lib/groupnav.php:92
+#. TRANS: Title of the page showing group members.
+#. TRANS: %s is the name of the group.
+#: actions/groupmembers.php:102
 #, php-format
 msgid "%s group members"
 msgstr "Membri del gruppo %s"
 
-#: actions/groupmembers.php:103
+#. TRANS: Title of the page showing group members.
+#. TRANS: %1$s is the name of the group, %2$d is the page number of the members list.
+#: actions/groupmembers.php:107
 #, php-format
 msgid "%1$s group members, page %2$d"
 msgstr "Membri del gruppo %1$s, pagina %2$d"
 
-#: actions/groupmembers.php:118
+#: actions/groupmembers.php:122
 msgid "A list of the users in this group."
 msgstr "Un elenco degli utenti in questo gruppo."
 
-#: actions/groupmembers.php:182 lib/groupnav.php:107
+#: actions/groupmembers.php:186
 msgid "Admin"
 msgstr "Amministra"
 
-#: actions/groupmembers.php:392 lib/blockform.php:69
-msgid "Block"
-msgstr "Blocca"
-
-#: actions/groupmembers.php:487
+#: actions/groupmembers.php:498
 msgid "Make user an admin of the group"
 msgstr "Rende l'utente amministratore del gruppo"
 
-#: actions/groupmembers.php:519
-msgid "Make Admin"
-msgstr "Rendi amm."
-
-#: actions/groupmembers.php:519
-msgid "Make this user an admin"
-msgstr "Rende questo utente un amministratore"
-
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Title in atom group notice feed. %s is a group name.
 #. TRANS: Title in atom user notice feed. %s is a user name.
@@ -2027,7 +2027,10 @@ msgstr ""
 
 #. TRANS: IM address input field instructions in IM settings form.
 #. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:140
+#. TRANS: Do not translate "example.org". It is one of the domain names reserved for use in examples by
+#. TRANS: http://www.rfc-editor.org/rfc/rfc2606.txt. Any other domain may be owned by a legitimate
+#. TRANS: person or organization.
+#: actions/imsettings.php:143
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -2038,63 +2041,63 @@ msgstr ""
 "di messaggistica o su GTalk."
 
 #. TRANS: Form legend for IM preferences form.
-#: actions/imsettings.php:155
+#: actions/imsettings.php:158
 msgid "IM preferences"
 msgstr "Preferenze messaggistica"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:160
+#: actions/imsettings.php:163
 msgid "Send me notices through Jabber/GTalk."
 msgstr "Inviami i messaggi via Jabber/GTalk"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:166
+#: actions/imsettings.php:169
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr "Pubblica un messaggio quando il mio stato Jabber/GTalk cambia"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:172
+#: actions/imsettings.php:175
 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"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:179
+#: actions/imsettings.php:182
 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "Pubblica un MicroID per il mio indirizzo Jabber/GTalk"
 
 #. TRANS: Confirmation message for successful IM preferences save.
-#: actions/imsettings.php:287 actions/othersettings.php:180
+#: actions/imsettings.php:290 actions/othersettings.php:180
 msgid "Preferences saved."
 msgstr "Preferenze salvate."
 
 #. TRANS: Message given saving IM address without having provided one.
-#: actions/imsettings.php:309
+#: actions/imsettings.php:312
 msgid "No Jabber ID."
 msgstr "Nessun ID di Jabber."
 
 #. TRANS: Message given saving IM address that cannot be normalised.
-#: actions/imsettings.php:317
+#: actions/imsettings.php:320
 msgid "Cannot normalize that Jabber ID"
 msgstr "Impossibile normalizzare quell'ID Jabber"
 
 #. TRANS: Message given saving IM address that not valid.
-#: actions/imsettings.php:322
+#: actions/imsettings.php:325
 msgid "Not a valid Jabber ID"
 msgstr "Non Ã¨ un ID Jabber valido"
 
 #. TRANS: Message given saving IM address that is already set.
-#: actions/imsettings.php:326
+#: actions/imsettings.php:329
 msgid "That is already your Jabber ID."
 msgstr "Quello Ã¨ giÃ  il tuo ID di Jabber."
 
 #. TRANS: Message given saving IM address that is already set for another user.
-#: actions/imsettings.php:330
+#: actions/imsettings.php:333
 msgid "Jabber ID already belongs to another user."
 msgstr "ID Jabber giÃ  assegnato a un altro utente."
 
 #. 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
+#: actions/imsettings.php:361
 #, php-format
 msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
@@ -2104,28 +2107,28 @@ msgstr ""
 "istantanea che hai aggiunto. Devi approvare %s affinchÃ© ti invii messaggi."
 
 #. TRANS: Message given canceling IM address confirmation for the wrong IM address.
-#: actions/imsettings.php:388
+#: actions/imsettings.php:391
 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
+#: actions/imsettings.php:400
 msgid "Couldn't delete IM confirmation."
 msgstr "Impossibile eliminare la conferma della messaggistica."
 
 #. TRANS: Message given after successfully canceling IM address confirmation.
-#: actions/imsettings.php:402
+#: actions/imsettings.php:405
 msgid "IM confirmation cancelled."
 msgstr "Conferma della messaggistica annullata."
 
 #. TRANS: Message given trying to remove an IM address that is not
 #. TRANS: registered for the active user.
-#: actions/imsettings.php:424
+#: actions/imsettings.php:427
 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
+#: actions/imsettings.php:450
 msgid "The IM address was removed."
 msgstr "L'indirizzo di messaggistica Ã¨ stato rimosso."
 
@@ -2513,11 +2516,6 @@ msgstr "Messaggi con \"%s\""
 msgid "Updates matching search term \"%1$s\" on %2$s!"
 msgstr "Messaggi che corrispondono al termine \"%1$s\" su %2$s!"
 
-#: actions/nudge.php:85
-msgid ""
-"This user doesn't allow nudges or hasn't confirmed or set their email yet."
-msgstr ""
-
 #: actions/nudge.php:94
 msgid "Nudge sent"
 msgstr "Richiamo inviato"
@@ -2592,8 +2590,8 @@ msgid "Only %s URLs over plain HTTP please."
 msgstr "Solo URL %s attraverso HTTP semplice."
 
 #. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1215
-#: lib/apiaction.php:1243 lib/apiaction.php:1366
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1206
+#: lib/apiaction.php:1233 lib/apiaction.php:1356
 msgid "Not a supported data format."
 msgstr "Non Ã¨ un formato di dati supportato."
 
@@ -2735,7 +2733,7 @@ msgid "Password saved."
 msgstr "Password salvata."
 
 #. TRANS: Menu item for site administration
-#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:384
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:371
 msgid "Paths"
 msgstr "Percorsi"
 
@@ -2949,7 +2947,7 @@ msgstr "Nome"
 
 #. TRANS: Form input field label.
 #: actions/profilesettings.php:115 actions/register.php:460
-#: lib/applicationeditform.php:244 lib/groupeditform.php:161
+#: lib/applicationeditform.php:235 lib/groupeditform.php:161
 msgid "Homepage"
 msgstr "Pagina web"
 
@@ -3055,7 +3053,7 @@ msgid "Couldn't save tags."
 msgstr "Impossibile salvare le etichette."
 
 #. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:391 lib/adminpanelaction.php:141
+#: actions/profilesettings.php:391 lib/adminpanelaction.php:138
 msgid "Settings saved."
 msgstr "Impostazioni salvate."
 
@@ -3591,7 +3589,7 @@ msgstr "L'utente Ã¨ giÃ  nella \"sandbox\"."
 
 #. TRANS: Menu item for site administration
 #: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
-#: lib/adminpanelaction.php:392
+#: lib/adminpanelaction.php:379
 msgid "Sessions"
 msgstr "Sessioni"
 
@@ -3629,24 +3627,24 @@ msgid "Application profile"
 msgstr "Profilo applicazione"
 
 #. TRANS: Form input field label for application icon.
-#: actions/showapplication.php:159 lib/applicationeditform.php:182
+#: actions/showapplication.php:159 lib/applicationeditform.php:173
 msgid "Icon"
 msgstr "Icona"
 
 #. TRANS: Form input field label for application name.
 #: actions/showapplication.php:169 actions/version.php:197
-#: lib/applicationeditform.php:199
+#: lib/applicationeditform.php:190
 msgid "Name"
 msgstr "Nome"
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:178 lib/applicationeditform.php:235
+#: actions/showapplication.php:178 lib/applicationeditform.php:226
 msgid "Organization"
 msgstr "Organizzazione"
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:216 lib/groupeditform.php:172
+#: lib/applicationeditform.php:207 lib/groupeditform.php:172
 msgid "Description"
 msgstr "Descrizione"
 
@@ -3750,7 +3748,7 @@ msgstr ""
 msgid "This is a way to share what you like."
 msgstr "Questo Ã¨ un modo per condividere ciÃ² che ti piace."
 
-#: actions/showgroup.php:82 lib/groupnav.php:86
+#: actions/showgroup.php:82
 #, php-format
 msgid "%s group"
 msgstr "Gruppo %s"
@@ -3802,7 +3800,7 @@ msgstr "Feed dei messaggi per il gruppo %s (Atom)"
 msgid "FOAF for %s group"
 msgstr "FOAF per il gruppo %s"
 
-#: actions/showgroup.php:393 actions/showgroup.php:445 lib/groupnav.php:91
+#: actions/showgroup.php:393 actions/showgroup.php:445
 msgid "Members"
 msgstr "Membri"
 
@@ -4254,7 +4252,7 @@ msgstr "Nessun codice inserito"
 
 #. TRANS: Menu item for site administration
 #: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
-#: lib/adminpanelaction.php:408
+#: lib/adminpanelaction.php:395
 msgid "Snapshots"
 msgstr "Snapshot"
 
@@ -4816,15 +4814,6 @@ msgstr ""
 msgid "Robin thinks something is impossible."
 msgstr ""
 
-#. TRANS: Message given if an upload is larger than the configured maximum.
-#. TRANS: %1$d is the byte limit for uploads, %2$d is the byte count for the uploaded file.
-#: classes/File.php:190
-#, php-format
-msgid ""
-"No file may be larger than %1$d bytes and the file you sent was %2$d bytes. "
-"Try to upload a smaller version."
-msgstr ""
-
 #. TRANS: Message given if an upload would exceed user quota.
 #. TRANS: %d (number) is the user quota in bytes.
 #: classes/File.php:202
@@ -4971,7 +4960,7 @@ msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
 
 #. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#: classes/Subscription.php:75 lib/oauthstore.php:465
+#: classes/Subscription.php:75 lib/oauthstore.php:466
 msgid "You have been banned from subscribing."
 msgstr "Non ti Ã¨ possibile abbonarti."
 
@@ -5119,7 +5108,8 @@ msgid "Change site configuration"
 msgstr "Modifica la configurazione del sito"
 
 #. TRANS: Main menu option when logged in and site admin for access to site configuration
-#: lib/action.php:474
+#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
+#: lib/action.php:474 lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr "Amministra"
@@ -5196,7 +5186,7 @@ msgstr "Cerca"
 
 #. TRANS: DT element for site notice. String is hidden in default CSS.
 #. TRANS: Menu item for site administration
-#: lib/action.php:538 lib/adminpanelaction.php:400
+#: lib/action.php:538 lib/adminpanelaction.php:387
 msgid "Site notice"
 msgstr "Messaggio del sito"
 
@@ -5260,7 +5250,10 @@ msgid "StatusNet software license"
 msgstr "Licenza del software StatusNet"
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
-#: lib/action.php:843
+#. TRANS: Text between [] is a link description, text between () is the link itself.
+#. TRANS: Make sure there is no whitespace between "]" and "(".
+#. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
+#: lib/action.php:846
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -5270,13 +5263,16 @@ msgstr ""
 "(%%site.broughtbyurl%%)."
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:846
+#: lib/action.php:849
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** Ã¨ un servizio di microblog."
 
 #. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.
-#: lib/action.php:850
+#. TRANS: Make sure there is no whitespace between "]" and "(".
+#. TRANS: Text between [] is a link description, text between () is the link itself.
+#. TRANS: %s is the version of StatusNet that is being used.
+#: lib/action.php:856
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -5288,34 +5284,35 @@ msgstr ""
 "(http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
 
 #. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:866
+#: lib/action.php:872
 msgid "Site content license"
 msgstr "Licenza del contenuto del sito"
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:873
+#: lib/action.php:879
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr "I contenuti e i dati di %1$s sono privati e confidenziali."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:880
+#: lib/action.php:886
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
 "I contenuti e i dati sono copyright di %1$s. Tutti i diritti riservati."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:884
+#: lib/action.php:890
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 "I contenuti e i dati sono forniti dai collaboratori. Tutti i diritti "
 "riservati."
 
-#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:897
+#. TRANS: license message in footer.
+#. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
+#: lib/action.php:904
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr ""
@@ -5323,19 +5320,19 @@ msgstr ""
 "licenza %2$s."
 
 #. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1236
+#: lib/action.php:1243
 msgid "Pagination"
 msgstr "Paginazione"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1247
+#: lib/action.php:1254
 msgid "After"
 msgstr "Successivi"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1257
+#: lib/action.php:1264
 msgid "Before"
 msgstr "Precedenti"
 
@@ -5344,208 +5341,227 @@ msgstr "Precedenti"
 msgid "Expecting a root feed element but got a whole XML document."
 msgstr "Atteso un elemento root del feed, ma ricevuto un documento XML intero."
 
-#: lib/activityutils.php:208
+#. TRANS: Client exception thrown when there is no source attribute.
+#: lib/activityutils.php:203
 msgid "Can't handle remote content yet."
 msgstr "Impossibile gestire contenuti remoti."
 
-#: lib/activityutils.php:244
+#. TRANS: Client exception thrown when there embedded XML content is found that cannot be processed yet.
+#: lib/activityutils.php:240
 msgid "Can't handle embedded XML content yet."
 msgstr "Impossibile gestire contenuti XML incorporati."
 
-#: lib/activityutils.php:248
+#. TRANS: Client exception thrown when base64 encoded content is found that cannot be processed yet.
+#: lib/activityutils.php:245
 msgid "Can't handle embedded Base64 content yet."
 msgstr "Impossibile gestire contenuti Base64."
 
 #. TRANS: Client error message thrown when a user tries to change admin settings but has no access rights.
-#: lib/adminpanelaction.php:98
+#: lib/adminpanelaction.php:96
 msgid "You cannot make changes to this site."
 msgstr "Non puoi apportare modifiche al sito."
 
 #. TRANS: Client error message throw when a certain panel's settings cannot be changed.
-#: lib/adminpanelaction.php:110
+#: lib/adminpanelaction.php:108
 msgid "Changes to that panel are not allowed."
 msgstr "Le modifiche al pannello non sono consentite."
 
 #. TRANS: Client error message.
-#: lib/adminpanelaction.php:229
+#: lib/adminpanelaction.php:222
 msgid "showForm() not implemented."
 msgstr "showForm() non implementata."
 
 #. TRANS: Client error message
-#: lib/adminpanelaction.php:259
+#: lib/adminpanelaction.php:250
 msgid "saveSettings() not implemented."
 msgstr "saveSettings() non implementata."
 
 #. TRANS: Client error message thrown if design settings could not be deleted in
 #. TRANS: the admin panel Design.
-#: lib/adminpanelaction.php:284
+#: lib/adminpanelaction.php:274
 msgid "Unable to delete design setting."
 msgstr "Impossibile eliminare le impostazioni dell'aspetto."
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:350
+#: lib/adminpanelaction.php:337
 msgid "Basic site configuration"
 msgstr "Configurazione di base"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:352
+#: lib/adminpanelaction.php:339
 msgctxt "MENU"
 msgid "Site"
 msgstr "Sito"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:358
+#: lib/adminpanelaction.php:345
 msgid "Design configuration"
 msgstr "Configurazione aspetto"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:360
+#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
+#: lib/adminpanelaction.php:347 lib/groupnav.php:135
 msgctxt "MENU"
 msgid "Design"
 msgstr "Aspetto"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:366
+#: lib/adminpanelaction.php:353
 msgid "User configuration"
 msgstr "Configurazione utente"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:368 lib/personalgroupnav.php:115
+#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:115
 msgid "User"
 msgstr "Utente"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:374
+#: lib/adminpanelaction.php:361
 msgid "Access configuration"
 msgstr "Configurazione di accesso"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:382
+#: lib/adminpanelaction.php:369
 msgid "Paths configuration"
 msgstr "Configurazione percorsi"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:390
+#: lib/adminpanelaction.php:377
 msgid "Sessions configuration"
 msgstr "Configurazione sessioni"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:398
+#: lib/adminpanelaction.php:385
 msgid "Edit site notice"
 msgstr "Modifica messaggio del sito"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:406
+#: lib/adminpanelaction.php:393
 msgid "Snapshots configuration"
 msgstr "Configurazione snapshot"
 
 #. TRANS: Client error 401.
-#: lib/apiauth.php:113
+#: lib/apiauth.php:111
 msgid "API resource requires read-write access, but you only have read access."
 msgstr ""
 "Le risorse API richiedono accesso lettura-scrittura, ma si dispone del solo "
 "accesso in lettura."
 
+#. TRANS: OAuth exception thrown when no application is found for a given consumer key.
+#: lib/apiauth.php:175
+msgid "No application for that consumer key."
+msgstr ""
+
+#. TRANS: OAuth exception given when no user was found for a given token (no token was found).
+#: lib/apiauth.php:217
+msgid "No user for that token."
+msgstr ""
+
+#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
+#: lib/apioauthstore.php:178
+msgid "Tried to revoke unknown token"
+msgstr ""
+
 #. TRANS: Form legend.
-#: lib/applicationeditform.php:137
+#: lib/applicationeditform.php:129
 msgid "Edit application"
 msgstr "Modifica applicazione"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:187
+#: lib/applicationeditform.php:178
 msgid "Icon for this application"
 msgstr "Icona per questa applicazione"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:209
+#: lib/applicationeditform.php:200
 #, php-format
 msgid "Describe your application in %d characters"
 msgstr "Descrivi l'applicazione in %d caratteri"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:213
+#: lib/applicationeditform.php:204
 msgid "Describe your application"
 msgstr "Descrivi l'applicazione"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:224
+#: lib/applicationeditform.php:215
 msgid "URL of the homepage of this application"
 msgstr "URL della pagina web di questa applicazione"
 
 #. TRANS: Form input field label.
-#: lib/applicationeditform.php:226
+#: lib/applicationeditform.php:217
 msgid "Source URL"
 msgstr "URL sorgente"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:233
+#: lib/applicationeditform.php:224
 msgid "Organization responsible for this application"
 msgstr "Organizzazione responsabile per questa applicazione"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:242
+#: lib/applicationeditform.php:233
 msgid "URL for the homepage of the organization"
 msgstr "URL della pagina web dell'organizzazione"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:251
+#: lib/applicationeditform.php:242
 msgid "URL to redirect to after authentication"
 msgstr "URL verso cui redirigere dopo l'autenticazione"
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:278
+#: lib/applicationeditform.php:269
 msgid "Browser"
 msgstr "Browser"
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:295
+#: lib/applicationeditform.php:286
 msgid "Desktop"
 msgstr "Desktop"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:297
+#: lib/applicationeditform.php:288
 msgid "Type of application, browser or desktop"
 msgstr "Tipo di applicazione, browser o desktop"
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:320
+#: lib/applicationeditform.php:311
 msgid "Read-only"
 msgstr "Sola lettura"
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:339
+#: lib/applicationeditform.php:330
 msgid "Read-write"
 msgstr "Lettura-scrittura"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:341
+#: lib/applicationeditform.php:332
 msgid "Default access for this application: read-only, or read-write"
 msgstr ""
 "Accesso predefinito per questa applicazione, sola lettura o lettura-scrittura"
 
-#. TRANS: Submit button title
-#: lib/applicationeditform.php:359
+#. TRANS: Submit button title.
+#: lib/applicationeditform.php:349
 msgid "Cancel"
 msgstr "Annulla"
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:136
+#: lib/applicationlist.php:135
 msgid "read-write"
 msgstr "Lettura-scrittura"
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:138
+#: lib/applicationlist.php:137
 msgid "read-only"
 msgstr "Sola lettura"
 
 #. 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
+#: lib/applicationlist.php:143
 #, php-format
 msgid "Approved %1$s - \"%2$s\" access."
 msgstr "Approvata %1$s - Accesso \"%2$s\"."
 
 #. TRANS: Button label
-#: lib/applicationlist.php:159
+#: lib/applicationlist.php:158
 msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "Revoca"
@@ -5565,11 +5581,13 @@ msgstr "Autore"
 msgid "Provider"
 msgstr "Provider"
 
-#: lib/attachmentnoticesection.php:67
+#. TRANS: Title.
+#: lib/attachmentnoticesection.php:68
 msgid "Notices where this attachment appears"
 msgstr "Messaggi in cui appare questo allegato"
 
-#: lib/attachmenttagcloudsection.php:48
+#. TRANS: Title.
+#: lib/attachmenttagcloudsection.php:49
 msgid "Tags for this attachment"
 msgstr "Etichette per questo allegato"
 
@@ -5581,6 +5599,11 @@ msgstr "Modifica della password non riuscita"
 msgid "Password changing is not allowed"
 msgstr "La modifica della password non Ã¨ permessa"
 
+#. TRANS: Title for the form to block a user.
+#: lib/blockform.php:70
+msgid "Block"
+msgstr "Blocca"
+
 #: lib/channel.php:157 lib/channel.php:177
 msgid "Command results"
 msgstr "Risultati comando"
@@ -5611,6 +5634,13 @@ msgstr "L'utente non ha un ultimo messaggio."
 msgid "Could not find a user with nickname %s."
 msgstr "Impossibile trovare un utente col soprannome %s."
 
+#. TRANS: Message given getting a non-existing user.
+#. TRANS: %s is the nickname of the user that could not be found.
+#: lib/command.php:150
+#, php-format
+msgid "Could not find a local user with nickname %s."
+msgstr ""
+
 #. TRANS: Error text shown when an unimplemented command is given.
 #: lib/command.php:185
 msgid "Sorry, this command is not yet implemented."
@@ -5648,6 +5678,20 @@ msgstr ""
 msgid "Notice marked as fave."
 msgstr "Messaggio indicato come preferito."
 
+#. 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.
+#: lib/command.php:360
+#, php-format
+msgid "%1$s joined group %2$s."
+msgstr ""
+
+#. 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.
+#: lib/command.php:408
+#, php-format
+msgid "%1$s left group %2$s."
+msgstr ""
+
 #. TRANS: Whois output. %s is the full name of the queried user.
 #: lib/command.php:434
 #, php-format
@@ -5737,12 +5781,26 @@ msgstr "Specifica il nome dell'utente a cui abbonarti."
 msgid "Can't subscribe to OMB profiles by command."
 msgstr "Impossibile abbonarsi ai profili OMB attraverso un comando."
 
+#. TRANS: Text shown after having subscribed to another user successfully.
+#. TRANS: %s is the name of the user the subscription was requested for.
+#: lib/command.php:672
+#, php-format
+msgid "Subscribed to %s."
+msgstr ""
+
 #. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
 #. TRANS: Error text shown when no username was provided when issuing the command.
 #: lib/command.php:694 lib/command.php:804
 msgid "Specify the name of the user to unsubscribe from."
 msgstr "Specifica il nome dell'utente da cui annullare l'abbonamento."
 
+#. TRANS: Text shown after having unsubscribed from another user successfully.
+#. TRANS: %s is the name of the user the unsubscription was requested for.
+#: lib/command.php:705
+#, php-format
+msgid "Unsubscribed from %s."
+msgstr ""
+
 #. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
 #. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
 #: lib/command.php:724 lib/command.php:750
@@ -5781,13 +5839,20 @@ msgstr "Il comando di accesso Ã¨ disabilitato."
 msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr ""
 
+#. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
+#. TRANS: %s is the name of the user the unsubscription was requested for.
+#: lib/command.php:813
+#, php-format
+msgid "Unsubscribed %s."
+msgstr ""
+
 #. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
 #: lib/command.php:831
 msgid "You are not subscribed to anyone."
 msgstr "Il tuo abbonamento Ã¨ stato annullato."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to.
-#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.
 #: lib/command.php:836
 msgid "You are subscribed to this person:"
@@ -5802,7 +5867,7 @@ msgid "No one is subscribed to you."
 msgstr "Nessuno Ã¨ abbonato ai tuoi messaggi."
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
-#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
 #: lib/command.php:863
 msgid "This person is subscribed to you:"
@@ -5817,7 +5882,7 @@ msgid "You are not a member of any groups."
 msgstr "Non fai parte di alcun gruppo."
 
 #. TRANS: Text shown after requesting groups a user is subscribed to.
-#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
 #: lib/command.php:890
 msgid "You are a member of this group:"
@@ -5825,6 +5890,7 @@ 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:"
 
+#. TRANS: Help text for commands.
 #: lib/command.php:905
 msgid ""
 "Commands:\n"
@@ -6049,38 +6115,6 @@ msgid "Extra nicknames for the group, comma- or space- separated, max %d"
 msgstr ""
 "Soprannomi aggiuntivi per il gruppo, separati da virgole o spazi, max %d"
 
-#: lib/groupnav.php:85
-msgid "Group"
-msgstr "Gruppo"
-
-#: lib/groupnav.php:101
-msgid "Blocked"
-msgstr "Bloccato"
-
-#: lib/groupnav.php:102
-#, php-format
-msgid "%s blocked users"
-msgstr "Utenti bloccati di %s"
-
-#: lib/groupnav.php:108
-#, php-format
-msgid "Edit %s group properties"
-msgstr "Modifica le proprietÃ  del gruppo %s"
-
-#: lib/groupnav.php:113
-msgid "Logo"
-msgstr "Logo"
-
-#: lib/groupnav.php:114
-#, php-format
-msgid "Add or edit %s logo"
-msgstr "Aggiungi o modifica il logo di %s"
-
-#: lib/groupnav.php:120
-#, php-format
-msgid "Add or edit %s design"
-msgstr "Aggiungi o modifica l'aspetto di %s"
-
 #: lib/groupsbymemberssection.php:71
 msgid "Groups with most members"
 msgstr "I gruppi piÃ¹ numerosi"
@@ -6112,7 +6146,8 @@ msgstr "Quel file Ã¨ troppo grande. La dimensione massima Ã¨ %s."
 msgid "Partial upload."
 msgstr "Caricamento parziale."
 
-#: lib/imagefile.php:101 lib/mediafile.php:170
+#. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
+#: lib/imagefile.php:101 lib/mediafile.php:179
 msgid "System error uploading file."
 msgstr "Errore di sistema nel caricare il file."
 
@@ -6517,16 +6552,19 @@ msgstr "Email di ricezione non consentita."
 msgid "Unsupported message type: %s"
 msgstr "Tipo di messaggio non supportato: %s"
 
-#: lib/mediafile.php:98 lib/mediafile.php:123
+#. TRANS: Client exception thrown when a database error was thrown during a file upload operation.
+#: lib/mediafile.php:99 lib/mediafile.php:125
 msgid "There was a database error while saving your file. Please try again."
 msgstr ""
 "Si Ã¨ verificato un errore nel database nel salvare il file. Prova di nuovo."
 
-#: lib/mediafile.php:142
+#. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
+#: lib/mediafile.php:145
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
 msgstr "Il file caricato eccede la direttiva upload_max_filesize in php.ini."
 
-#: lib/mediafile.php:147
+#. TRANS: Client exception.
+#: lib/mediafile.php:151
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form."
@@ -6534,44 +6572,43 @@ msgstr ""
 "Il file caricato eccede la direttiva MAX_FILE_SIZE specificata nel modulo "
 "HTML."
 
-#: lib/mediafile.php:152
+#. TRANS: Client exception.
+#: lib/mediafile.php:157
 msgid "The uploaded file was only partially uploaded."
 msgstr "Il file caricato Ã¨ stato caricato solo parzialmente."
 
-#: lib/mediafile.php:159
+#. TRANS: Client exception thrown when a temporary folder is not present to store a file upload.
+#: lib/mediafile.php:165
 msgid "Missing a temporary folder."
 msgstr "Manca una directory temporanea."
 
-#: lib/mediafile.php:162
+#. TRANS: Client exception thrown when writing to disk is not possible during a file upload operation.
+#: lib/mediafile.php:169
 msgid "Failed to write file to disk."
 msgstr "Scrittura del file su disco non riuscita."
 
-#: lib/mediafile.php:165
+#. TRANS: Client exception thrown when a file upload operation has been stopped by an extension.
+#: lib/mediafile.php:173
 msgid "File upload stopped by extension."
 msgstr "Caricamento del file bloccato dall'estensione."
 
-#: lib/mediafile.php:179 lib/mediafile.php:217
+#. TRANS: Client exception thrown when a file upload operation would cause a user to exceed a set quota.
+#: lib/mediafile.php:189 lib/mediafile.php:232
 msgid "File exceeds user's quota."
 msgstr "Il file supera la quota dell'utente."
 
-#: lib/mediafile.php:197 lib/mediafile.php:234
+#. TRANS: Client exception thrown when a file upload operation fails because the file could
+#. TRANS: not be moved from the temporary folder to the permanent file location.
+#: lib/mediafile.php:209 lib/mediafile.php:251
 msgid "File could not be moved to destination directory."
 msgstr "Impossibile spostare il file nella directory di destinazione."
 
-#: lib/mediafile.php:202 lib/mediafile.php:238
+#. TRANS: Client exception thrown when a file upload operation has been stopped because the MIME
+#. TRANS: type of the uploaded file could not be determined.
+#: lib/mediafile.php:216 lib/mediafile.php:257
 msgid "Could not determine file's MIME type."
 msgstr "Impossibile determinare il tipo MIME del file."
 
-#: lib/mediafile.php:318
-#, php-format
-msgid " Try using another %s format."
-msgstr "Prova a usare un altro formato per %s."
-
-#: lib/mediafile.php:323
-#, php-format
-msgid "%s is not a supported file type on this server."
-msgstr "%s non Ã¨ un tipo di file supportato su server."
-
 #: lib/messageform.php:120
 msgid "Send a direct notice"
 msgstr "Invia un messaggio diretto"
@@ -6687,27 +6724,7 @@ msgstr "Richiama"
 msgid "Send a nudge to this user"
 msgstr "Invia un richiamo a questo utente"
 
-#: lib/oauthstore.php:283
-msgid "Error inserting new profile"
-msgstr "Errore nell'inserire il nuovo profilo"
-
-#: lib/oauthstore.php:291
-msgid "Error inserting avatar"
-msgstr "Errore nell'inserire l'immagine"
-
-#: lib/oauthstore.php:306
-msgid "Error updating remote profile"
-msgstr "Errore nell'aggiornare il profilo remoto"
-
-#: lib/oauthstore.php:311
-msgid "Error inserting remote profile"
-msgstr "Errore nell'inserire il profilo remoto"
-
-#: lib/oauthstore.php:345
-msgid "Duplicate notice"
-msgstr "Messaggio duplicato"
-
-#: lib/oauthstore.php:490
+#: lib/oauthstore.php:491
 msgid "Couldn't insert new subscription."
 msgstr "Impossibile inserire un nuovo abbonamento."
 
@@ -6744,7 +6761,8 @@ msgstr "I tuoi messaggi inviati"
 msgid "Tags in %s's notices"
 msgstr "Etichette nei messaggi di %s"
 
-#: lib/plugin.php:115
+#. TRANS: Displayed as version information for a plugin if no version information was found.
+#: lib/plugin.php:116
 msgid "Unknown"
 msgstr "Sconosciuto"
 
@@ -6838,19 +6856,19 @@ msgstr "Sandbox"
 msgid "Sandbox this user"
 msgstr "Metti questo utente nella \"sandbox\""
 
-#: lib/searchaction.php:120
+#. TRANS: Fieldset legend for the search form.
+#: lib/searchaction.php:121
 msgid "Search site"
 msgstr "Cerca nel sito"
 
-#: lib/searchaction.php:126
+#. TRANS: Used as a field label for the field where one or more keywords
+#. TRANS: for searching can be entered.
+#: lib/searchaction.php:129
 msgid "Keyword(s)"
 msgstr "Parole"
 
-#: lib/searchaction.php:127
-msgid "Search"
-msgstr "Cerca"
-
-#: lib/searchaction.php:162
+#. TRANS: Definition list item with instructions on how to get (better) search results.
+#: lib/searchaction.php:170
 msgid "Search help"
 msgstr "Aiuto sulla ricerca"
 
@@ -7049,56 +7067,32 @@ msgid "Moderator"
 msgstr "Moderatore"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1102
+#: lib/util.php:1103
 msgid "a few seconds ago"
 msgstr "pochi secondi fa"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1105
+#: lib/util.php:1106
 msgid "about a minute ago"
 msgstr "circa un minuto fa"
 
-#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1109
-#, php-format
-msgid "about %d minutes ago"
-msgstr "circa %d minuti fa"
-
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 #: lib/util.php:1112
 msgid "about an hour ago"
 msgstr "circa un'ora fa"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1116
-#, php-format
-msgid "about %d hours ago"
-msgstr "circa %d ore fa"
-
-#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1119
+#: lib/util.php:1118
 msgid "about a day ago"
 msgstr "circa un giorno fa"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1123
-#, php-format
-msgid "about %d days ago"
-msgstr "circa %d giorni fa"
-
-#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1126
+#: lib/util.php:1124
 msgid "about a month ago"
 msgstr "circa un mese fa"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 #: lib/util.php:1130
-#, php-format
-msgid "about %d months ago"
-msgstr "circa %d mesi fa"
-
-#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1133
 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 027ea92c21..e555c52d87 100644
--- a/locale/ja/LC_MESSAGES/statusnet.po
+++ b/locale/ja/LC_MESSAGES/statusnet.po
@@ -1,9 +1,10 @@
-# Translation of StatusNet to Japanese
+# Translation of StatusNet to Japanese (æ¥æ¬èª)
+# Expored from translatewiki.net
 #
-# Author@translatewiki.net: Brion
-# Author@translatewiki.net: Fryed-peach
-# Author@translatewiki.net: Sonoda
-# Author@translatewiki.net: Whym
+# Author: Brion
+# Author: Fryed-peach
+# Author: Sonoda
+# Author: Whym
 # --
 # This file is distributed under the same license as the StatusNet package.
 #
@@ -11,20 +12,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-08 22:33+0000\n"
-"PO-Revision-Date: 2010-09-08 22:34:44+0000\n"
-"Language-Team: Japanese\n"
+"POT-Creation-Date: 2010-09-14 19:53+0000\n"
+"PO-Revision-Date: 2010-09-14 19:54:05+0000\n"
+"Language-Team: Japanese <http://translatewiki.net/wiki/Portal:ja>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r72348); Translate extension (2010-08-20)\n"
+"X-Generator: MediaWiki 1.17alpha (r73009); Translate extension (2010-08-20)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ja\n"
-"X-Message-Group: out-statusnet\n"
+"X-Message-Group: #out-statusnet\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
+"X-POT-Import-Date: 1284-49-16 34::+0000\n"
 
 #. TRANS: Page title
 #. TRANS: Menu item for site administration
-#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:376
+#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:363
 msgid "Access"
 msgstr "ã¢ã¯ã»ã¹"
 
@@ -82,15 +84,15 @@ msgstr "ãã®ãããªã¿ã°ã¯ããã¾ããã"
 
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #: actions/all.php:79 actions/allrss.php:68
-#: actions/apiaccountupdatedeliverydevice.php:114
-#: actions/apiaccountupdateprofile.php:105
-#: actions/apiaccountupdateprofilebackgroundimage.php:116
-#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
-#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
-#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:113
-#: actions/apigroupismember.php:91 actions/apigroupjoin.php:100
-#: actions/apigroupleave.php:100 actions/apigrouplist.php:73
-#: actions/apistatusesupdate.php:229 actions/apisubscriptions.php:87
+#: actions/apiaccountupdatedeliverydevice.php:115
+#: actions/apiaccountupdateprofile.php:106
+#: actions/apiaccountupdateprofilebackgroundimage.php:117
+#: actions/apiaccountupdateprofileimage.php:106 actions/apiblockcreate.php:98
+#: actions/apiblockdestroy.php:97 actions/apidirectmessage.php:77
+#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:114
+#: actions/apigroupismember.php:91 actions/apigroupjoin.php:101
+#: actions/apigroupleave.php:101 actions/apigrouplist.php:73
+#: actions/apistatusesupdate.php:230 actions/apisubscriptions.php:87
 #: actions/apitimelinefavorites.php:72 actions/apitimelinefriends.php:174
 #: actions/apitimelinehome.php:80 actions/apitimelinementions.php:80
 #: actions/apitimelineuser.php:82 actions/avatarbynickname.php:75
@@ -188,16 +190,16 @@ msgid "Updates from %1$s and friends on %2$s!"
 msgstr "%2$s ã« %1$s ã¨åäººããã®æ´æ°ãããã¾ãï¼"
 
 #: actions/apiaccountratelimitstatus.php:72
-#: actions/apiaccountupdatedeliverydevice.php:94
-#: actions/apiaccountupdateprofile.php:97
-#: actions/apiaccountupdateprofilebackgroundimage.php:94
-#: actions/apiaccountupdateprofilecolors.php:118
+#: actions/apiaccountupdatedeliverydevice.php:95
+#: actions/apiaccountupdateprofile.php:98
+#: actions/apiaccountupdateprofilebackgroundimage.php:95
+#: actions/apiaccountupdateprofilecolors.php:119
 #: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156
-#: actions/apifavoritecreate.php:100 actions/apifavoritedestroy.php:101
-#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100
-#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:139
-#: actions/apigroupismember.php:115 actions/apigroupjoin.php:156
-#: actions/apigroupleave.php:142 actions/apigrouplist.php:137
+#: actions/apifavoritecreate.php:101 actions/apifavoritedestroy.php:102
+#: actions/apifriendshipscreate.php:101 actions/apifriendshipsdestroy.php:101
+#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:140
+#: actions/apigroupismember.php:115 actions/apigroupjoin.php:157
+#: actions/apigroupleave.php:143 actions/apigrouplist.php:137
 #: actions/apigrouplistall.php:122 actions/apigroupmembership.php:107
 #: actions/apigroupshow.php:116 actions/apihelptest.php:88
 #: actions/apistatusesdestroy.php:104 actions/apistatusesretweets.php:112
@@ -212,47 +214,43 @@ msgstr "%2$s ã« %1$s ã¨åäººããã®æ´æ°ãããã¾ãï¼"
 msgid "API method not found."
 msgstr "API ã¡ã½ãããè¦ã¤ããã¾ããã"
 
-#: actions/apiaccountupdatedeliverydevice.php:86
-#: actions/apiaccountupdateprofile.php:89
-#: actions/apiaccountupdateprofilebackgroundimage.php:86
-#: actions/apiaccountupdateprofilecolors.php:110
-#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89
-#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109
-#: actions/apifavoritecreate.php:91 actions/apifavoritedestroy.php:92
-#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
-#: actions/apigroupcreate.php:105 actions/apigroupjoin.php:92
-#: actions/apigroupleave.php:92 actions/apimediaupload.php:67
-#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:198
+#. TRANS: Client error message. POST is a HTTP command. It should not be translated.
+#. TRANS: Client error. POST is a HTTP command. It should not be translated.
+#: actions/apiaccountupdatedeliverydevice.php:87
+#: actions/apiaccountupdateprofile.php:90
+#: actions/apiaccountupdateprofilebackgroundimage.php:87
+#: actions/apiaccountupdateprofilecolors.php:111
+#: actions/apiaccountupdateprofileimage.php:85 actions/apiblockcreate.php:90
+#: actions/apiblockdestroy.php:89 actions/apidirectmessagenew.php:110
+#: actions/apifavoritecreate.php:92 actions/apifavoritedestroy.php:93
+#: actions/apifriendshipscreate.php:92 actions/apifriendshipsdestroy.php:92
+#: actions/apigroupcreate.php:106 actions/apigroupjoin.php:93
+#: actions/apigroupleave.php:93 actions/apimediaupload.php:68
+#: actions/apistatusesretweet.php:66 actions/apistatusesupdate.php:199
 msgid "This method requires a POST."
 msgstr "ãã®ã¡ã½ããã«ã¯ POST ãå¿è¦ã§ãã"
 
-#: actions/apiaccountupdatedeliverydevice.php:106
-msgid ""
-"You must specify a parameter named 'device' with a value of one of: sms, im, "
-"none."
-msgstr ""
-
-#: actions/apiaccountupdatedeliverydevice.php:133
+#: actions/apiaccountupdatedeliverydevice.php:134
 msgid "Could not update user."
 msgstr "ã¦ã¼ã¶ãæ´æ°ã§ãã¾ããã§ããã"
 
-#: actions/apiaccountupdateprofile.php:112
-#: actions/apiaccountupdateprofilebackgroundimage.php:194
-#: actions/apiaccountupdateprofilecolors.php:185
-#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/apiaccountupdateprofile.php:113
+#: actions/apiaccountupdateprofilebackgroundimage.php:195
+#: actions/apiaccountupdateprofilecolors.php:186
+#: actions/apiaccountupdateprofileimage.php:131 actions/apiusershow.php:108
 #: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/hcard.php:74
 #: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
 #: lib/profileaction.php:84
 msgid "User has no profile."
 msgstr "ã¦ã¼ã¶ã¯ãããã£ã¼ã«ããã£ã¦ãã¾ããã"
 
-#: actions/apiaccountupdateprofile.php:147
+#: actions/apiaccountupdateprofile.php:148
 msgid "Could not save profile."
 msgstr "ãããã£ã¼ã«ãä¿åã§ãã¾ããã§ããã"
 
-#: actions/apiaccountupdateprofilebackgroundimage.php:108
-#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
-#: actions/apistatusesupdate.php:212 actions/avatarsettings.php:257
+#: actions/apiaccountupdateprofilebackgroundimage.php:109
+#: actions/apiaccountupdateprofileimage.php:98 actions/apimediaupload.php:81
+#: actions/apistatusesupdate.php:213 actions/avatarsettings.php:257
 #: actions/designadminpanel.php:123 actions/editapplication.php:118
 #: actions/newapplication.php:101 actions/newnotice.php:94
 #: lib/designsettings.php:283
@@ -264,30 +262,30 @@ msgstr ""
 "ãµã¼ãã¼ã®ç¾å¨ã®æ§æãçç±ã§ãå¤§éã® POST ãã¼ã¿ (%sãã¤ã) ãå¦çãããã¨ã"
 "ã§ãã¾ããã§ããã"
 
-#: actions/apiaccountupdateprofilebackgroundimage.php:136
-#: actions/apiaccountupdateprofilebackgroundimage.php:146
-#: actions/apiaccountupdateprofilecolors.php:164
-#: actions/apiaccountupdateprofilecolors.php:174
+#: actions/apiaccountupdateprofilebackgroundimage.php:137
+#: actions/apiaccountupdateprofilebackgroundimage.php:147
+#: actions/apiaccountupdateprofilecolors.php:165
+#: actions/apiaccountupdateprofilecolors.php:175
 #: actions/groupdesignsettings.php:290 actions/groupdesignsettings.php:300
 #: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
 #: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
 msgid "Unable to save your design settings."
 msgstr "ããªãã®ãã¶ã¤ã³è¨å®ãä¿åã§ãã¾ããã"
 
-#: actions/apiaccountupdateprofilebackgroundimage.php:187
-#: actions/apiaccountupdateprofilecolors.php:142
+#: actions/apiaccountupdateprofilebackgroundimage.php:188
+#: actions/apiaccountupdateprofilecolors.php:143
 msgid "Could not update your design."
 msgstr "ãã¶ã¤ã³ãæ´æ°ã§ãã¾ããã§ããã"
 
-#: actions/apiblockcreate.php:105
+#: actions/apiblockcreate.php:106
 msgid "You cannot block yourself!"
 msgstr "èªåèªèº«ããããã¯ãããã¨ã¯ã§ãã¾ããï¼"
 
-#: actions/apiblockcreate.php:126
+#: actions/apiblockcreate.php:127
 msgid "Block user failed."
 msgstr "ã¦ã¼ã¶ã®ãããã¯ã«å¤±æãã¾ããã"
 
-#: actions/apiblockdestroy.php:114
+#: actions/apiblockdestroy.php:115
 msgid "Unblock user failed."
 msgstr "ã¦ã¼ã¶ã®ãããã¯è§£é¤ã«å¤±æãã¾ããã"
 
@@ -311,67 +309,63 @@ msgstr "%s ã¸ã®ãã¤ã¬ã¯ãã¡ãã»ã¼ã¸"
 msgid "All the direct messages sent to %s"
 msgstr "%s ã¸éã£ãå¨ã¦ã®ãã¤ã¬ã¯ãã¡ãã»ã¼ã¸"
 
-#: actions/apidirectmessagenew.php:118
+#: actions/apidirectmessagenew.php:119
 msgid "No message text!"
 msgstr "ã¡ãã»ã¼ã¸ã®æ¬æãããã¾ããï¼"
 
-#: actions/apidirectmessagenew.php:127 actions/newmessage.php:150
+#: actions/apidirectmessagenew.php:128 actions/newmessage.php:150
 #, php-format
 msgid "That's too long. Max message size is %d chars."
 msgstr "é·ããã¾ããã¡ãã»ã¼ã¸ã¯æå¤§ %d åã¾ã§ã§ãã"
 
-#: actions/apidirectmessagenew.php:138
+#: actions/apidirectmessagenew.php:139
 msgid "Recipient user not found."
 msgstr "åãåãæã®ã¦ã¼ã¶ãè¦ã¤ããã¾ããã"
 
-#: actions/apidirectmessagenew.php:142
+#: actions/apidirectmessagenew.php:143
 msgid "Can't send direct messages to users who aren't your friend."
 msgstr "åäººã§ãªãã¦ã¼ã¶ã«ãã¤ã¬ã¯ãã¡ãã»ã¼ã¸ãéããã¨ã¯ã§ãã¾ããã"
 
-#: actions/apifavoritecreate.php:109 actions/apifavoritedestroy.php:110
+#: actions/apifavoritecreate.php:110 actions/apifavoritedestroy.php:111
 #: actions/apistatusesdestroy.php:121
 msgid "No status found with that ID."
 msgstr "ãã®ï¼©ï¼¤ã®ã¹ãã¼ã¿ã¹ãè¦ã¤ããã¾ããã"
 
-#: actions/apifavoritecreate.php:120
+#: actions/apifavoritecreate.php:121
 msgid "This status is already a favorite."
 msgstr "ãã®ã¹ãã¼ã¿ã¹ã¯ãã§ã«ãæ°ã«å¥ãã§ãã"
 
 #. TRANS: Error message text shown when a favorite could not be set.
-#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:296
+#: actions/apifavoritecreate.php:132 actions/favor.php:84 lib/command.php:296
 msgid "Could not create favorite."
 msgstr "ãæ°ã«å¥ããä½æã§ãã¾ããã"
 
-#: actions/apifavoritedestroy.php:123
+#: actions/apifavoritedestroy.php:124
 msgid "That status is not a favorite."
 msgstr "ãã®ã¹ãã¼ã¿ã¹ã¯ãæ°ã«å¥ãã§ã¯ããã¾ããã"
 
-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
+#: actions/apifavoritedestroy.php:136 actions/disfavor.php:87
 msgid "Could not delete favorite."
 msgstr "ãæ°ã«å¥ããåãæ¶ããã¨ãã§ãã¾ããã"
 
-#: actions/apifriendshipscreate.php:109
+#: actions/apifriendshipscreate.php:110
 msgid "Could not follow user: profile not found."
 msgstr "ã¦ã¼ã¶ã®ãã©ãã¼ãåæ¢ã§ãã¾ããã§ãã: ã¦ã¼ã¶ãè¦ã¤ããã¾ããã"
 
-#: actions/apifriendshipscreate.php:118
+#: actions/apifriendshipscreate.php:119
 #, php-format
 msgid "Could not follow user: %s is already on your list."
 msgstr ""
 "ã¦ã¼ã¶ããã©ãã¼ã§ãã¾ããã§ãã: %s ã¯æ¢ã«ããªãã®ãªã¹ãã«å¥ã£ã¦ãã¾ãã"
 
-#: actions/apifriendshipsdestroy.php:109
+#: actions/apifriendshipsdestroy.php:110
 msgid "Could not unfollow user: User not found."
 msgstr "ã¦ã¼ã¶ã®ãã©ãã¼ãåæ¢ã§ãã¾ããã§ãã: ã¦ã¼ã¶ãè¦ã¤ããã¾ããã"
 
-#: actions/apifriendshipsdestroy.php:120
+#: actions/apifriendshipsdestroy.php:121
 msgid "You cannot unfollow yourself."
 msgstr "èªåèªèº«ããã©ãã¼åæ¢ãããã¨ã¯ã§ãã¾ããã"
 
-#: actions/apifriendshipsexists.php:91
-msgid "Two valid IDs or screen_names must be supplied."
-msgstr ""
-
 #: actions/apifriendshipsshow.php:134
 msgid "Could not determine source user."
 msgstr "ã½ã¼ã¹ã¦ã¼ã¶ã¼ãæ±ºå®ã§ãã¾ããã"
@@ -380,7 +374,7 @@ msgstr "ã½ã¼ã¹ã¦ã¼ã¶ã¼ãæ±ºå®ã§ãã¾ããã"
 msgid "Could not find target user."
 msgstr "ã¿ã¼ã²ããã¦ã¼ã¶ã¼ãè¦ã¤ãããã¾ããã"
 
-#: actions/apigroupcreate.php:167 actions/editgroup.php:186
+#: actions/apigroupcreate.php:168 actions/editgroup.php:186
 #: actions/newgroup.php:126 actions/profilesettings.php:215
 #: actions/register.php:212
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
@@ -388,90 +382,90 @@ msgstr ""
 "ããã¯ãã¼ã ã«ã¯ãå°æåã¢ã«ãã¡ãããã¨æ°åã®ã¿ä½¿ç¨ã§ãã¾ããã¹ãã¼ã¹ã¯ä½¿ç¨"
 "ã§ãã¾ããã"
 
-#: actions/apigroupcreate.php:176 actions/editgroup.php:190
+#: actions/apigroupcreate.php:177 actions/editgroup.php:190
 #: actions/newgroup.php:130 actions/profilesettings.php:238
 #: actions/register.php:215
 msgid "Nickname already in use. Try another one."
 msgstr "ãã®ããã¯ãã¼ã ã¯æ¢ã«ä½¿ç¨ããã¦ãã¾ããä»ã®ãã®ãè©¦ãã¦ã¿ã¦ä¸ããã"
 
-#: actions/apigroupcreate.php:183 actions/editgroup.php:193
+#: actions/apigroupcreate.php:184 actions/editgroup.php:193
 #: actions/newgroup.php:133 actions/profilesettings.php:218
 #: actions/register.php:217
 msgid "Not a valid nickname."
 msgstr "æå¹ãªããã¯ãã¼ã ã§ã¯ããã¾ããã"
 
-#: actions/apigroupcreate.php:199 actions/editapplication.php:215
+#: actions/apigroupcreate.php:200 actions/editapplication.php:215
 #: actions/editgroup.php:199 actions/newapplication.php:203
 #: actions/newgroup.php:139 actions/profilesettings.php:222
 #: actions/register.php:224
 msgid "Homepage is not a valid URL."
 msgstr "ãã¼ã ãã¼ã¸ã®URLãä¸é©åã§ãã"
 
-#: actions/apigroupcreate.php:208 actions/editgroup.php:202
+#: actions/apigroupcreate.php:209 actions/editgroup.php:202
 #: actions/newgroup.php:142 actions/profilesettings.php:225
 #: actions/register.php:227
 msgid "Full name is too long (max 255 chars)."
 msgstr "ãã«ãã¼ã ãé·ããã¾ããï¼255åã¾ã§ï¼"
 
-#: actions/apigroupcreate.php:216 actions/editapplication.php:190
+#: actions/apigroupcreate.php:217 actions/editapplication.php:190
 #: actions/newapplication.php:172
 #, php-format
 msgid "Description is too long (max %d chars)."
 msgstr "è¨è¿°ãé·ããã¾ããï¼æé·%dåï¼"
 
-#: actions/apigroupcreate.php:227 actions/editgroup.php:208
+#: actions/apigroupcreate.php:228 actions/editgroup.php:208
 #: actions/newgroup.php:148 actions/profilesettings.php:232
 #: actions/register.php:234
 msgid "Location is too long (max 255 chars)."
 msgstr "å ´æãé·ããã¾ããï¼255åã¾ã§ï¼"
 
-#: actions/apigroupcreate.php:246 actions/editgroup.php:219
+#: actions/apigroupcreate.php:247 actions/editgroup.php:219
 #: actions/newgroup.php:159
 #, php-format
 msgid "Too many aliases! Maximum %d."
 msgstr "å¥åãå¤ããã¾ã! æå¤§ %dã"
 
-#: actions/apigroupcreate.php:276 actions/editgroup.php:232
+#: actions/apigroupcreate.php:277 actions/editgroup.php:232
 #: actions/newgroup.php:172
 #, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr "å¥å \"%s\" ã¯æ¢ã«ä½¿ç¨ããã¦ãã¾ããä»ã®ãã®ãè©¦ãã¦ã¿ã¦ä¸ããã"
 
-#: actions/apigroupcreate.php:289 actions/editgroup.php:238
+#: actions/apigroupcreate.php:290 actions/editgroup.php:238
 #: actions/newgroup.php:178
 msgid "Alias can't be the same as nickname."
 msgstr "å¥åã¯ããã¯ãã¼ã ã¨åãã§ã¯ããã¾ããã"
 
-#: actions/apigroupismember.php:96 actions/apigroupjoin.php:105
-#: actions/apigroupleave.php:105 actions/apigroupmembership.php:92
+#: actions/apigroupismember.php:96 actions/apigroupjoin.php:106
+#: actions/apigroupleave.php:106 actions/apigroupmembership.php:92
 #: actions/apigroupshow.php:83 actions/apitimelinegroup.php:92
 msgid "Group not found."
 msgstr "è¦ã¤ããã¾ããã"
 
 #. TRANS: Error text shown a user tries to join a group they already are a member of.
-#: actions/apigroupjoin.php:111 actions/joingroup.php:100 lib/command.php:336
+#: actions/apigroupjoin.php:112 actions/joingroup.php:100 lib/command.php:336
 msgid "You are already a member of that group."
 msgstr "ãã§ã«ãã®ã°ã«ã¼ãã®ã¡ã³ãã¼ã§ãã"
 
 #. TRANS: Error text shown when a user tries to join a group they are blocked from joining.
-#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:341
+#: actions/apigroupjoin.php:121 actions/joingroup.php:105 lib/command.php:341
 msgid "You have been blocked from that group by the admin."
 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.
-#: actions/apigroupjoin.php:139 actions/joingroup.php:134 lib/command.php:353
+#: actions/apigroupjoin.php:140 actions/joingroup.php:134 lib/command.php:353
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "ã¦ã¼ã¶ %1$s ã¯ã°ã«ã¼ã %2$s ã«åå ã§ãã¾ããã"
 
-#: actions/apigroupleave.php:115
+#: actions/apigroupleave.php:116
 msgid "You are not a member of this group."
 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.
-#: actions/apigroupleave.php:125 actions/leavegroup.php:129
+#: actions/apigroupleave.php:126 actions/leavegroup.php:129
 #: lib/command.php:401
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
@@ -505,9 +499,9 @@ msgstr "ä¸æ£ãªãã¼ã¯ã³ã"
 
 #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
 #: actions/deletenotice.php:169 actions/disfavor.php:74
-#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:55
+#: actions/emailsettings.php:271 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:66 actions/imsettings.php:227
+#: actions/groupunblock.php:66 actions/imsettings.php:230
 #: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
@@ -552,8 +546,8 @@ msgstr "ãªã¯ã¨ã¹ããã¼ã¯ã³%sã¯ãæå¦ããã¦ãåãæ¶ããã¾
 #. 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:286 actions/grouplogo.php:322
-#: actions/imsettings.php:242 actions/newapplication.php:121
+#: actions/emailsettings.php:290 actions/grouplogo.php:322
+#: actions/imsettings.php:245 actions/newapplication.php:121
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
 #: actions/smssettings.php:277 lib/designsettings.php:304
 msgid "Unexpected form submission."
@@ -614,18 +608,18 @@ msgstr "ãã®ã¡ã½ããã«ã¯ POST ã DELETE ãå¿è¦ã§ãã"
 msgid "You may not delete another user's status."
 msgstr "ä»ã®ã¦ã¼ã¶ã®ã¹ãã¼ã¿ã¹ãæ¶ããã¨ã¯ã§ãã¾ããã"
 
-#: actions/apistatusesretweet.php:75 actions/apistatusesretweets.php:72
+#: actions/apistatusesretweet.php:76 actions/apistatusesretweets.php:72
 #: actions/deletenotice.php:52 actions/shownotice.php:92
 msgid "No such notice."
 msgstr "ãã®ãããªã¤ã¶ããã¯ããã¾ããã"
 
 #. TRANS: Error text shown when trying to repeat an own notice.
-#: actions/apistatusesretweet.php:83 lib/command.php:538
+#: actions/apistatusesretweet.php:84 lib/command.php:538
 msgid "Cannot repeat your own notice."
 msgstr "ããªãã®ã¤ã¶ãããç¹°ãè¿ãã¾ããã"
 
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-#: actions/apistatusesretweet.php:91 lib/command.php:544
+#: actions/apistatusesretweet.php:92 lib/command.php:544
 msgid "Already repeated that notice."
 msgstr "ãã§ã«ã¤ã¶ãããç¹°ãè¿ãã¦ãã¾ãã"
 
@@ -637,21 +631,21 @@ msgstr "ã¹ãã¼ã¿ã¹ãåé¤ãã¾ããã"
 msgid "No status with that ID found."
 msgstr "ãã®ï¼©ï¼¤ã§ã®ã¹ãã¼ã¿ã¹ã¯ããã¾ããã"
 
-#: actions/apistatusesupdate.php:221
+#: actions/apistatusesupdate.php:222
 msgid "Client must provide a 'status' parameter with a value."
 msgstr ""
 
-#: actions/apistatusesupdate.php:242 actions/newnotice.php:157
+#: actions/apistatusesupdate.php:243 actions/newnotice.php:157
 #: lib/mailhandler.php:60
 #, php-format
 msgid "That's too long. Max notice size is %d chars."
 msgstr "é·ããã¾ããã¤ã¶ããã¯æå¤§ %d åã¾ã§ã§ãã"
 
-#: actions/apistatusesupdate.php:283 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:284 actions/apiusershow.php:96
 msgid "Not found."
 msgstr "è¦ã¤ããã¾ããã"
 
-#: actions/apistatusesupdate.php:306 actions/newnotice.php:181
+#: actions/apistatusesupdate.php:307 actions/newnotice.php:181
 #, php-format
 msgid "Max notice size is %d chars, including attachment URL."
 msgstr "ã¤ã¶ããã¯ URL ãå«ãã¦æå¤§ %d åã¾ã§ã§ãã"
@@ -825,7 +819,9 @@ msgid "Do not block this user"
 msgstr "ãã®ã¦ã¼ã¶ãã¢ã³ãããã¯ãã"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
+#. TRANS: Submit button title.
+#. TRANS: Description of the form to block a user.
+#: actions/block.php:164 actions/groupmembers.php:403 lib/blockform.php:82
 msgid "Block this user"
 msgstr "ãã®ã¦ã¼ã¶ããããã¯ãã"
 
@@ -867,11 +863,13 @@ msgstr "ãã®ã°ã«ã¼ãã¸ã®åå ããããã¯ãããã¦ã¼ã¶ã®ãªã¹
 msgid "Unblock user from group"
 msgstr "ã°ã«ã¼ãããã®ã¢ã³ãããã¯ã¦ã¼ã¶"
 
-#: actions/blockedfromgroup.php:320 lib/unblockform.php:69
+#. TRANS: Title for the form to unblock a user.
+#: actions/blockedfromgroup.php:320 lib/unblockform.php:70
 msgid "Unblock"
 msgstr "ã¢ã³ãããã¯"
 
-#: actions/blockedfromgroup.php:320 lib/unblockform.php:80
+#. TRANS: Description of the form to unblock a user.
+#: actions/blockedfromgroup.php:320 lib/unblockform.php:82
 msgid "Unblock this user"
 msgstr "ãã®ã¦ã¼ã¶ãã¢ã³ãããã¯ãã"
 
@@ -893,12 +891,6 @@ msgstr "ç¢ºèªã³ã¼ããè¦ã¤ããã¾ããã"
 msgid "That confirmation code is not for you!"
 msgstr "ãã®ç¢ºèªã³ã¼ãã¯ããªãã®ãã®ã§ã¯ããã¾ããï¼"
 
-#. TRANS: Server error for an unknow address type, which can be 'email', 'jabber', or 'sms'.
-#: actions/confirmaddress.php:91
-#, php-format
-msgid "Unrecognized address type %s."
-msgstr ""
-
 #. TRANS: Client error for an already confirmed email/jabbel/sms address.
 #: actions/confirmaddress.php:96
 msgid "That address has already been confirmed."
@@ -910,9 +902,9 @@ msgstr "ãã®ã¢ãã¬ã¹ã¯æ¢ã«æ¿èªããã¦ãã¾ãã"
 #. 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/confirmaddress.php:116 actions/emailsettings.php:331
+#: actions/emailsettings.php:477 actions/imsettings.php:283
+#: actions/imsettings.php:442 actions/othersettings.php:174
 #: actions/profilesettings.php:283 actions/smssettings.php:308
 #: actions/smssettings.php:464
 msgid "Couldn't update user."
@@ -920,7 +912,7 @@ msgstr "ã¦ã¼ã¶ãæ´æ°ã§ãã¾ãã"
 
 #. 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/confirmaddress.php:128 actions/emailsettings.php:437
 #: actions/smssettings.php:422
 msgid "Couldn't delete email confirmation."
 msgstr "ã¡ã¼ã«æ¿èªãåé¤ã§ãã¾ãã"
@@ -956,9 +948,10 @@ msgstr "ã¢ããªã±ã¼ã·ã§ã³ãè¦ã¤ããã¾ããã"
 msgid "You are not the owner of this application."
 msgstr "ãã®ã¢ããªã±ã¼ã·ã§ã³ã®ãªã¼ãã¼ã§ã¯ããã¾ããã"
 
+#. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:127
 #: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1307
+#: lib/action.php:1315
 msgid "There was a problem with your session token."
 msgstr "ããªãã®ã»ãã·ã§ã³ãã¼ã¯ã³ã«é¢ããåé¡ãããã¾ããã"
 
@@ -982,7 +975,7 @@ msgstr "ãã®ã¢ããªã±ã¼ã·ã§ã³ãåé¤"
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
 #: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:73 lib/profileformaction.php:64
+#: lib/adminpanelaction.php:71 lib/profileformaction.php:64
 #: lib/settingsaction.php:72
 msgid "Not logged in."
 msgstr "ãã°ã¤ã³ãã¦ãã¾ããã"
@@ -1045,7 +1038,6 @@ msgstr "ãã®ã¦ã¼ã¶ãåé¤"
 #. TRANS: Message used as title for design settings for the site.
 #. TRANS: Link description in user account settings menu.
 #: actions/designadminpanel.php:63 lib/accountsettingsaction.php:139
-#: lib/groupnav.php:119
 msgid "Design"
 msgstr "ãã¶ã¤ã³"
 
@@ -1162,13 +1154,13 @@ msgstr "ããã©ã«ããã¶ã¤ã³ã«æ»ãã"
 msgid "Reset back to default"
 msgstr "ããã©ã«ãã¸ãªã»ãããã"
 
-#. TRANS: Submit button title
+#. TRANS: Submit button title.
 #: actions/designadminpanel.php:685 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/snapshotadminpanel.php:245
 #: actions/subscriptions.php:226 actions/tagother.php:154
-#: actions/useradminpanel.php:294 lib/applicationeditform.php:363
+#: actions/useradminpanel.php:294 lib/applicationeditform.php:353
 #: lib/designsettings.php:256 lib/groupeditform.php:202
 msgid "Save"
 msgstr "ä¿å"
@@ -1324,7 +1316,7 @@ msgstr "ç¾å¨ç¢ºèªããã¦ããã¡ã¼ã«ã¢ãã¬ã¹ã"
 #. 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/emailsettings.php:115 actions/emailsettings.php:162
 #: actions/imsettings.php:116 actions/smssettings.php:124
 #: actions/smssettings.php:180
 msgctxt "BUTTON"
@@ -1339,124 +1331,112 @@ msgstr ""
 "ãã®ã¢ãã¬ã¹ã¯æ¿èªå¾ã¡ã§ããåä¿¡ããã¯ã¹ï¼ã¨ã¹ãã ããã¯ã¹ï¼ã«è¿½å ã®æç¤ºãæ¸"
 "ãããã¡ãã»ã¼ã¸ãå±ãã¦ããªããç¢ºèªãã¦ãã ããã"
 
-#. TRANS: Instructions for e-mail address input form.
-#: actions/emailsettings.php:135
+#. TRANS: Instructions for e-mail address input form. Do not translate
+#. TRANS: "example.org". It is one of the domain names reserved for
+#. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
+#. TRANS: Any other domain may be owned by a legitimate person or
+#. TRANS: organization.
+#: actions/emailsettings.php:139
 msgid "Email address, like \"UserName@example.org\""
 msgstr "ã¡ã¼ã«ã¢ãã¬ã¹ã\"UserName@example.org\" ã®ãããª"
 
-#. 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 ""
-
 #. 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
+#: actions/emailsettings.php:151 actions/smssettings.php:171
 msgid "Incoming email"
 msgstr "å¥ã£ã¦ããã¡ã¼ã«"
 
 #. 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
+#: actions/emailsettings.php:159 actions/smssettings.php:178
 msgid "Send email to this address to post new notices."
 msgstr "æ°ããã¤ã¶ããæç¨¿ã«ãã®ã¢ãã¬ã¹ã¸ã¡ã¼ã«ãã"
 
 #. 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
+#: actions/emailsettings.php:168 actions/smssettings.php:186
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr "æç¨¿ã®ããã®æ°ããEã¡ã¼ã«ã¢ãã¬ã¹ãä½ãã¾ã; å¤ãæ¹ãåãæ¶ãã¾ãã"
 
-#. 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 ""
-
 #. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:174
+#: actions/emailsettings.php:178
 msgid "Email preferences"
 msgstr "ã¡ã¼ã«ã¢ãã¬ã¹"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:180
+#: actions/emailsettings.php:184
 msgid "Send me notices of new subscriptions through email."
 msgstr "ã¡ã¼ã«ã§æ°è¦ãã©ãã¼ã®éç¥ãç§ã«éã£ã¦ãã ããã"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:186
+#: actions/emailsettings.php:190
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr ""
 "ã ããããæ°ã«å¥ãã¨ãã¦ç§ã®ã¤ã¶ãããå ããããã¡ã¼ã«ãç§ã«éã£ã¦ãã ããã"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:193
+#: actions/emailsettings.php:197
 msgid "Send me email when someone sends me a private message."
 msgstr ""
 "ã ããããã©ã¤ãã¼ãã»ã¡ãã»ã¼ã¸ãç§ã«éãã¨ãã«ã¯ãã¡ã¼ã«ãç§ã«éã£ã¦ãã ã"
 "ãã"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:199
+#: actions/emailsettings.php:203
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr "ã ããã\"@-è¿ä¿¡\"ãç§ãéãã¨ãã«ã¯ãã¡ã¼ã«ãç§ã«éã£ã¦ãã ããã"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:205
+#: actions/emailsettings.php:209
 msgid "Allow friends to nudge me and send me an email."
 msgstr "åéãç§ã«åå³ã¨ã¡ã¼ã«ãéããã¨ãè¨±å¯ããã"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:212
+#: actions/emailsettings.php:216
 msgid "I want to post notices by email."
 msgstr "ã¡ã¼ã«ã§ã¤ã¶ãããæç¨¿ãããã"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:219
+#: actions/emailsettings.php:223
 msgid "Publish a MicroID for my email address."
 msgstr "ç§ã®ã¡ã¼ã«ã¢ãã¬ã¹ã®ããã«MicroIDãçºè¡ãã¦ãã ããã"
 
 #. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:353
+#: actions/emailsettings.php:357
 msgid "No email address."
 msgstr "ã¡ã¼ã«ã¢ãã¬ã¹ãããã¾ããã"
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:361
+#: actions/emailsettings.php:365
 msgid "Cannot normalize that email address"
 msgstr "ãã®ã¡ã¼ã«ã¢ãã¬ã¹ãæ£è¦åã§ãã¾ãã"
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:208
+#: actions/emailsettings.php:370 actions/register.php:208
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "æå¹ãªã¡ã¼ã«ã¢ãã¬ã¹ã§ã¯ããã¾ããã"
 
 #. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:370
+#: actions/emailsettings.php:374
 msgid "That is already your email address."
 msgstr "ããã¯ãã§ã«ããªãã®ã¡ã¼ã«ã¢ãã¬ã¹ã§ãã"
 
 #. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:374
+#: actions/emailsettings.php:378
 msgid "That email address already belongs to another user."
 msgstr "ãã®ã¡ã¼ã«ã¢ãã¬ã¹ã¯æ¢ã«ä»ã®äººãä½¿ã£ã¦ãã¾ãã"
 
 #. 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/emailsettings.php:395 actions/imsettings.php:351
 #: actions/smssettings.php:373
 msgid "Couldn't insert confirmation code."
 msgstr "æ¿èªã³ã¼ããè¿½å ã§ãã¾ãã"
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:398
+#: actions/emailsettings.php:402
 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."
@@ -1468,45 +1448,45 @@ msgstr ""
 #. 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/emailsettings.php:423 actions/imsettings.php:386
 #: actions/smssettings.php:408
 msgid "No pending confirmation to cancel."
 msgstr "æ¿èªå¾ã¡ã®ãã®ã¯ããã¾ããã"
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:438
+#: actions/emailsettings.php:442
 msgid "Email confirmation cancelled."
 msgstr "æ¿èªå¾ã¡ã®ãã®ã¯ããã¾ããã"
 
 #. TRANS: Message given trying to remove an e-mail address that is not
 #. TRANS: registered for the active user.
-#: actions/emailsettings.php:458
+#: actions/emailsettings.php:462
 msgid "That is not your email address."
 msgstr "ããã¯ããªãã®ã¡ã¼ã«ã¢ãã¬ã¹ã§ã¯ããã¾ããã"
 
 #. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:479
+#: actions/emailsettings.php:483
 msgid "The email address was removed."
 msgstr "å¥ã£ã¦ããã¡ã¼ã«ã¢ãã¬ã¹ã¯åé¤ããã¾ããã"
 
-#: actions/emailsettings.php:493 actions/smssettings.php:568
+#: actions/emailsettings.php:497 actions/smssettings.php:568
 msgid "No incoming email address."
 msgstr "å¥ã£ã¦ããã¡ã¼ã«ã¢ãã¬ã¹ã§ã¯ããã¾ããã"
 
 #. 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/emailsettings.php:508 actions/emailsettings.php:532
 #: actions/smssettings.php:578 actions/smssettings.php:602
 msgid "Couldn't update user record."
 msgstr "ã¦ã¼ã¶ã¬ã³ã¼ããæ´æ°ã§ãã¾ããã"
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
-#: actions/emailsettings.php:508 actions/smssettings.php:581
+#: actions/emailsettings.php:512 actions/smssettings.php:581
 msgid "Incoming email address removed."
 msgstr "å¥ã£ã¦ããã¡ã¼ã«ã¢ãã¬ã¹ã¯åé¤ããã¾ããã"
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
-#: actions/emailsettings.php:532 actions/smssettings.php:605
+#: actions/emailsettings.php:536 actions/smssettings.php:605
 msgid "New incoming email address added."
 msgstr "æ°ããå¥ã£ã¦ããã¡ã¼ã«ã¢ãã¬ã¹ãè¿½å ããã¾ããã"
 
@@ -1667,7 +1647,7 @@ msgstr "ã¦ã¼ã¶ã¯ãã§ã«ã°ã«ã¼ããããããã¯ããã¦ãã¾ãã
 msgid "User is not a member of group."
 msgstr "ã¦ã¼ã¶ã¯ã°ã«ã¼ãã®ã¡ã³ãã¼ã§ã¯ããã¾ããã"
 
-#: actions/groupblock.php:134 actions/groupmembers.php:360
+#: actions/groupblock.php:134 actions/groupmembers.php:364
 msgid "Block user from group"
 msgstr "ã°ã«ã¼ãããã¦ã¼ã¶ããããã¯"
 
@@ -1748,40 +1728,32 @@ msgstr "ãã´ãæ´æ°ããã¾ããã"
 msgid "Failed updating logo."
 msgstr "ãã´ã®æ´æ°ã«å¤±æãã¾ããã"
 
-#: actions/groupmembers.php:100 lib/groupnav.php:92
+#. TRANS: Title of the page showing group members.
+#. TRANS: %s is the name of the group.
+#: actions/groupmembers.php:102
 #, php-format
 msgid "%s group members"
 msgstr "%s ã°ã«ã¼ãã¡ã³ãã¼"
 
-#: actions/groupmembers.php:103
+#. TRANS: Title of the page showing group members.
+#. TRANS: %1$s is the name of the group, %2$d is the page number of the members list.
+#: actions/groupmembers.php:107
 #, php-format
 msgid "%1$s group members, page %2$d"
 msgstr "%1$s ã°ã«ã¼ãã¡ã³ãã¼ããã¼ã¸ %2$d"
 
-#: actions/groupmembers.php:118
+#: actions/groupmembers.php:122
 msgid "A list of the users in this group."
 msgstr "ãã®ã°ã«ã¼ãã®ã¦ã¼ã¶ã®ãªã¹ãã"
 
-#: actions/groupmembers.php:182 lib/groupnav.php:107
+#: actions/groupmembers.php:186
 msgid "Admin"
 msgstr "ç®¡çè"
 
-#: actions/groupmembers.php:392 lib/blockform.php:69
-msgid "Block"
-msgstr "ãããã¯"
-
-#: actions/groupmembers.php:487
+#: actions/groupmembers.php:498
 msgid "Make user an admin of the group"
 msgstr "ã¦ã¼ã¶ãã°ã«ã¼ãã®ç®¡çèã«ãã"
 
-#: actions/groupmembers.php:519
-msgid "Make Admin"
-msgstr "ç®¡çèã«ãã"
-
-#: actions/groupmembers.php:519
-msgid "Make this user an admin"
-msgstr "ãã®ã¦ã¼ã¶ãç®¡çèã«ãã"
-
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Title in atom group notice feed. %s is a group name.
 #. TRANS: Title in atom user notice feed. %s is a user name.
@@ -1919,7 +1891,10 @@ msgstr ""
 
 #. TRANS: IM address input field instructions in IM settings form.
 #. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:140
+#. TRANS: Do not translate "example.org". It is one of the domain names reserved for use in examples by
+#. TRANS: http://www.rfc-editor.org/rfc/rfc2606.txt. Any other domain may be owned by a legitimate
+#. TRANS: person or organization.
+#: actions/imsettings.php:143
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -1929,65 +1904,65 @@ msgstr ""
 "IMã¯ã©ã¤ã¢ã³ããGTalkã«è¿½å ãã¦ä¸ããã"
 
 #. TRANS: Form legend for IM preferences form.
-#: actions/imsettings.php:155
+#: actions/imsettings.php:158
 msgid "IM preferences"
 msgstr "è¨å®ãä¿åããã¾ããã"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:160
+#: actions/imsettings.php:163
 msgid "Send me notices through Jabber/GTalk."
 msgstr "Jabber/GTalk ã§ç§ã«éç¥ãéã£ã¦ä¸ããã"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:166
+#: actions/imsettings.php:169
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr "Jabber/GTalkã®ã¹ãã¼ã¿ã¹ãå¤æ´ãããæã«éç¥ãéãã"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:172
+#: actions/imsettings.php:175
 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr ""
 "Jabber/GTalkãéãã¦åçããç§ããã©ãã¼ããã¦ããªãäººãããç§ã«éã£ã¦ãã ã"
 "ãã"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:179
+#: actions/imsettings.php:182
 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "ç§ã®Jabber/GTalkã¢ãã¬ã¹ã®ããã«MicroIDãçºè¡ãã¦ãã ããã"
 
 #. TRANS: Confirmation message for successful IM preferences save.
-#: actions/imsettings.php:287 actions/othersettings.php:180
+#: actions/imsettings.php:290 actions/othersettings.php:180
 msgid "Preferences saved."
 msgstr "è¨å®ãä¿åããã¾ããã"
 
 #. TRANS: Message given saving IM address without having provided one.
-#: actions/imsettings.php:309
+#: actions/imsettings.php:312
 msgid "No Jabber ID."
 msgstr "Jabbar ID ã¯ããã¾ããã"
 
 #. TRANS: Message given saving IM address that cannot be normalised.
-#: actions/imsettings.php:317
+#: actions/imsettings.php:320
 msgid "Cannot normalize that Jabber ID"
 msgstr "ãã® Jabbar ID ãæ£è¦åã§ãã¾ãã"
 
 #. TRANS: Message given saving IM address that not valid.
-#: actions/imsettings.php:322
+#: actions/imsettings.php:325
 msgid "Not a valid Jabber ID"
 msgstr "æå¹ãª Jabber ID ã§ã¯ããã¾ããã"
 
 #. TRANS: Message given saving IM address that is already set.
-#: actions/imsettings.php:326
+#: actions/imsettings.php:329
 msgid "That is already your Jabber ID."
 msgstr "ãã® Jabber ID ã¯æ¢ã«ããªãã®ãã®ã§ãã"
 
 #. TRANS: Message given saving IM address that is already set for another user.
-#: actions/imsettings.php:330
+#: actions/imsettings.php:333
 msgid "Jabber ID already belongs to another user."
 msgstr "Jabber ID ï½ã¯æ¢ã«å¥ã®ã¦ã¼ã¶ãä½¿ç¨ãã¦ãã¾ãã"
 
 #. 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
+#: actions/imsettings.php:361
 #, php-format
 msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
@@ -1997,23 +1972,23 @@ msgstr ""
 "ããã«ããã«ã¯%sãæ¿èªãã¦ãã ããã"
 
 #. TRANS: Message given canceling IM address confirmation for the wrong IM address.
-#: actions/imsettings.php:388
+#: actions/imsettings.php:391
 msgid "That is the wrong IM address."
 msgstr "ãã® IM ã¢ãã¬ã¹ã¯ä¸æ£ã§ãã"
 
 #. TRANS: Message given after successfully canceling IM address confirmation.
-#: actions/imsettings.php:402
+#: actions/imsettings.php:405
 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
+#: actions/imsettings.php:427
 msgid "That is not your Jabber ID."
 msgstr "ãã® Jabber ID ã¯ããªãã®ãã®ã§ã¯ããã¾ããã"
 
 #. TRANS: Message given after successfully removing a registered IM address.
-#: actions/imsettings.php:447
+#: actions/imsettings.php:450
 msgid "The IM address was removed."
 msgstr "å¥ã£ã¦ããã¡ã¼ã«ã¢ãã¬ã¹ã¯åé¤ããã¾ããã"
 
@@ -2106,12 +2081,6 @@ msgstr "ãã¼ã½ãã«ã¡ãã»ã¼ã¸"
 msgid "Optionally add a personal message to the invitation."
 msgstr "ä»»æã«æå¾ã«ãã¼ã½ãã«ã¡ãã»ã¼ã¸ãå ãã¦ãã ããã"
 
-#. TRANS: Send button for inviting friends
-#: actions/invite.php:198
-msgctxt "BUTTON"
-msgid "Send"
-msgstr ""
-
 #. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English.
 #: actions/invite.php:228
 #, php-format
@@ -2239,12 +2208,6 @@ msgstr ""
 "ã»ãã¥ãªãã£ã¼ä¸ã®çç±ã«ãããè¨å®ãå¤æ´ããåã«ã¦ã¼ã¶åã¨ãã¹ã¯ã¼ããå¥åã"
 "ã¦ä¸ããã"
 
-#: actions/login.php:295
-#, php-format
-msgid ""
-"Don't have a username yet? [Register](%%action.register%%) a new account."
-msgstr ""
-
 #: actions/makeadmin.php:92
 msgid "Only an admin can make another user an admin."
 msgstr "ç®¡çèã ããå¥ã®ã¦ã¼ã¶ãç®¡çèã«ãããã¨ãã§ãã¾ãã"
@@ -2391,11 +2354,6 @@ msgstr "%s ã§æ´æ°"
 msgid "Updates matching search term \"%1$s\" on %2$s!"
 msgstr "\"%2$s\" ä¸ã®æ¤ç´¢èª \"$1$s\" ã«ä¸è´ãããã¹ã¦ã®æ´æ°"
 
-#: actions/nudge.php:85
-msgid ""
-"This user doesn't allow nudges or hasn't confirmed or set their email yet."
-msgstr ""
-
 #: actions/nudge.php:94
 msgid "Nudge sent"
 msgstr "åå³ãéã£ã"
@@ -2433,11 +2391,6 @@ msgstr "ããªãã®ã¢ã«ã¦ã³ãã«ã¢ã¯ã»ã¹ããä»¥ä¸ã®ã¢ããªã±ã¼
 msgid "You are not a user of that application."
 msgstr "ããªãã¯ãã®ã¢ããªã±ã¼ã·ã§ã³ã®ã¦ã¼ã¶ã§ã¯ããã¾ããã"
 
-#: actions/oauthconnectionssettings.php:186
-#, php-format
-msgid "Unable to revoke access for app: %s."
-msgstr ""
-
 #: actions/oauthconnectionssettings.php:198
 msgid "You have not authorized any applications to use your account."
 msgstr ""
@@ -2457,12 +2410,6 @@ msgstr "ã¦ã¼ã¶ã¯ãããã£ã¼ã«ããã£ã¦ãã¾ããã"
 msgid "%1$s's status on %2$s"
 msgstr "%2$s ã«ããã %1$s ã®ã¹ãã¼ã¿ã¹"
 
-#. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
-#: actions/oembed.php:159
-#, php-format
-msgid "Content type %s not supported."
-msgstr ""
-
 #. TRANS: Error message displaying attachments. %s is the site's base URL.
 #: actions/oembed.php:163
 #, php-format
@@ -2470,8 +2417,8 @@ msgid "Only %s URLs over plain HTTP please."
 msgstr ""
 
 #. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1215
-#: lib/apiaction.php:1243 lib/apiaction.php:1366
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1206
+#: lib/apiaction.php:1233 lib/apiaction.php:1356
 msgid "Not a supported data format."
 msgstr "ãµãã¼ãããã¦ããªããã¼ã¿å½¢å¼ã"
 
@@ -2613,7 +2560,7 @@ msgid "Password saved."
 msgstr "ãã¹ã¯ã¼ããä¿åããã¾ããã"
 
 #. TRANS: Menu item for site administration
-#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:384
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:371
 msgid "Paths"
 msgstr "ãã¹"
 
@@ -2820,7 +2767,7 @@ msgstr "ãã«ãã¼ã "
 
 #. TRANS: Form input field label.
 #: actions/profilesettings.php:115 actions/register.php:460
-#: lib/applicationeditform.php:244 lib/groupeditform.php:161
+#: lib/applicationeditform.php:235 lib/groupeditform.php:161
 msgid "Homepage"
 msgstr "ãã¼ã ãã¼ã¸"
 
@@ -2925,15 +2872,10 @@ msgid "Couldn't save tags."
 msgstr "ã¿ã°ãä¿åã§ãã¾ããã"
 
 #. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:391 lib/adminpanelaction.php:141
+#: actions/profilesettings.php:391 lib/adminpanelaction.php:138
 msgid "Settings saved."
 msgstr "è¨å®ãä¿åããã¾ããã"
 
-#: actions/public.php:83
-#, php-format
-msgid "Beyond the page limit (%s)."
-msgstr ""
-
 #: actions/public.php:92
 msgid "Could not retrieve public stream."
 msgstr "ãããªãã¯ã¹ããªã¼ã ãæ¤ç´¢ã§ãã¾ããã"
@@ -3191,12 +3133,6 @@ msgstr "ã¡ã¼ã«ã¢ãã¬ã¹ãæ¢ã«åå¨ãã¾ãã"
 msgid "Invalid username or password."
 msgstr "ä¸æ£ãªã¦ã¼ã¶åã¾ãã¯ãã¹ã¯ã¼ãã"
 
-#: actions/register.php:350
-msgid ""
-"With this form you can create a new account. You can then post notices and "
-"link up to friends and colleagues. "
-msgstr ""
-
 #: actions/register.php:432
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
 msgstr ""
@@ -3245,14 +3181,6 @@ msgstr ""
 msgid "All rights reserved."
 msgstr ""
 
-#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:540
-#, php-format
-msgid ""
-"My text and files are available under %s except this private data: password, "
-"email address, IM address, and phone number."
-msgstr ""
-
 #: actions/register.php:583
 #, php-format
 msgid ""
@@ -3448,7 +3376,7 @@ msgstr "ã¦ã¼ã¶ã¯ãã§ã«ãµã³ãããã¯ã¹ã§ãã"
 
 #. TRANS: Menu item for site administration
 #: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
-#: lib/adminpanelaction.php:392
+#: lib/adminpanelaction.php:379
 msgid "Sessions"
 msgstr "ã»ãã·ã§ã³"
 
@@ -3486,24 +3414,24 @@ msgid "Application profile"
 msgstr "ã¢ããªã±ã¼ã·ã§ã³ãããã¡ã¤ã«"
 
 #. TRANS: Form input field label for application icon.
-#: actions/showapplication.php:159 lib/applicationeditform.php:182
+#: actions/showapplication.php:159 lib/applicationeditform.php:173
 msgid "Icon"
 msgstr "ã¢ã¤ã³ã³"
 
 #. TRANS: Form input field label for application name.
 #: actions/showapplication.php:169 actions/version.php:197
-#: lib/applicationeditform.php:199
+#: lib/applicationeditform.php:190
 msgid "Name"
 msgstr "åå"
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:178 lib/applicationeditform.php:235
+#: actions/showapplication.php:178 lib/applicationeditform.php:226
 msgid "Organization"
 msgstr "çµç¹"
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:216 lib/groupeditform.php:172
+#: lib/applicationeditform.php:207 lib/groupeditform.php:172
 msgid "Description"
 msgstr "æ¦è¦"
 
@@ -3604,7 +3532,7 @@ msgstr ""
 msgid "This is a way to share what you like."
 msgstr "ããã¯ãããªããå¥½ããªãã¨ãå±æããæ¹æ³ã§ãã"
 
-#: actions/showgroup.php:82 lib/groupnav.php:86
+#: actions/showgroup.php:82
 #, php-format
 msgid "%s group"
 msgstr "%s ã°ã«ã¼ã"
@@ -3656,7 +3584,7 @@ msgstr "%s ã°ã«ã¼ãã®ã¤ã¶ãããã£ã¼ã (Atom)"
 msgid "FOAF for %s group"
 msgstr "%s ã°ã«ã¼ãã® FOAF"
 
-#: actions/showgroup.php:393 actions/showgroup.php:445 lib/groupnav.php:91
+#: actions/showgroup.php:393 actions/showgroup.php:445
 msgid "Members"
 msgstr "ã¡ã³ãã¼"
 
@@ -3840,14 +3768,6 @@ msgstr "æå¹ãªé£çµ¡ç¨ã¡ã¼ã«ã¢ãã¬ã¹ããªããã°ãªãã¾ããã
 msgid "Unknown language \"%s\"."
 msgstr "ä¸æãªè¨èª \"%s\""
 
-#: actions/siteadminpanel.php:165
-msgid "Minimum text limit is 0 (unlimited)."
-msgstr ""
-
-#: actions/siteadminpanel.php:171
-msgid "Dupe limit must be one or more seconds."
-msgstr ""
-
 #: actions/siteadminpanel.php:221
 msgid "General"
 msgstr "ä¸è¬"
@@ -4069,7 +3989,7 @@ msgstr "ã³ã¼ããå¥åããã¦ãã¾ãã"
 
 #. TRANS: Menu item for site administration
 #: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
-#: lib/adminpanelaction.php:408
+#: lib/adminpanelaction.php:395
 msgid "Snapshots"
 msgstr "ã¹ãããã·ã§ãã"
 
@@ -4499,10 +4419,6 @@ msgstr ""
 "ããªãã®ãããã£ã¼ã«ãããã¯ã°ã©ã¦ã³ãç»åã¨ããªãã®é¸æã®è²ã®ãã¬ããã§è¦ã"
 "æ¹æ³ãã«ã¹ã¿ãã¤ãºãã¦ãã ããã"
 
-#: actions/userdesignsettings.php:282
-msgid "Enjoy your hotdog!"
-msgstr ""
-
 #. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number.
 #: actions/usergroups.php:66
 #, php-format
@@ -4599,15 +4515,6 @@ msgstr ""
 msgid "Robin thinks something is impossible."
 msgstr ""
 
-#. TRANS: Message given if an upload is larger than the configured maximum.
-#. TRANS: %1$d is the byte limit for uploads, %2$d is the byte count for the uploaded file.
-#: classes/File.php:190
-#, php-format
-msgid ""
-"No file may be larger than %1$d bytes and the file you sent was %2$d bytes. "
-"Try to upload a smaller version."
-msgstr ""
-
 #. TRANS: Message given if an upload would exceed user quota.
 #. TRANS: %d (number) is the user quota in bytes.
 #: classes/File.php:202
@@ -4726,6 +4633,13 @@ msgstr ""
 msgid "Problem saving group inbox."
 msgstr "ã°ã«ã¼ãåä¿¡ç®±ãä¿åããéã«åé¡ãçºçãã¾ããã"
 
+#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
+#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
+#: classes/Notice.php:1759
+#, php-format
+msgid "RT @%1$s %2$s"
+msgstr ""
+
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
 #: classes/Profile.php:737
@@ -4746,7 +4660,7 @@ msgid "Unable to save tag."
 msgstr "ã¿ã°ããä¿åã§ãã¾ããã"
 
 #. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#: classes/Subscription.php:75 lib/oauthstore.php:465
+#: classes/Subscription.php:75 lib/oauthstore.php:466
 msgid "You have been banned from subscribing."
 msgstr "ããªãã¯ãã©ãã¼ãç¦æ¢ããã¾ããã"
 
@@ -4853,12 +4767,6 @@ msgstr "åç§°æªè¨å®ãã¼ã¸"
 msgid "Primary site navigation"
 msgstr "ãã©ã¤ããªãµã¤ãããã²ã¼ã·ã§ã³"
 
-#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:455
-msgctxt "TOOLTIP"
-msgid "Personal profile and friends timeline"
-msgstr ""
-
 #. TRANS: Tooltip for main menu option "Account"
 #: lib/action.php:460
 msgctxt "TOOLTIP"
@@ -4914,7 +4822,7 @@ msgstr "ãã£ã¨ã°ã«ã¼ããæ¤ç´¢"
 
 #. TRANS: DT element for site notice. String is hidden in default CSS.
 #. TRANS: Menu item for site administration
-#: lib/action.php:538 lib/adminpanelaction.php:400
+#: lib/action.php:538 lib/adminpanelaction.php:387
 msgid "Site notice"
 msgstr "ãµã¤ãã¤ã¶ãã"
 
@@ -4977,22 +4885,17 @@ msgstr "ããã¸"
 msgid "StatusNet software license"
 msgstr "StatusNet ã½ããã¦ã§ã¢ã©ã¤ã»ã³ã¹"
 
-#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
-#: lib/action.php:843
-#, php-format
-msgid ""
-"**%%site.name%%** is a microblogging service brought to you by [%%site."
-"broughtby%%](%%site.broughtbyurl%%)."
-msgstr ""
-
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:846
+#: lib/action.php:849
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** ã¯ãã¤ã¯ãããã°ãµã¼ãã¹ã§ãã"
 
 #. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.
-#: lib/action.php:850
+#. TRANS: Make sure there is no whitespace between "]" and "(".
+#. TRANS: Text between [] is a link description, text between () is the link itself.
+#. TRANS: %s is the version of StatusNet that is being used.
+#: lib/action.php:856
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -5004,49 +4907,50 @@ msgstr ""
 "org/licensing/licenses/agpl-3.0.html)ã"
 
 #. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:866
+#: lib/action.php:872
 msgid "Site content license"
 msgstr "ãµã¤ãåå®¹ã©ã¤ã»ã³ã¹"
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:873
+#: lib/action.php:879
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:880
+#: lib/action.php:886
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:884
+#: lib/action.php:890
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 
-#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:897
+#. TRANS: license message in footer.
+#. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
+#: lib/action.php:904
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr ""
 
 #. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1236
+#: lib/action.php:1243
 msgid "Pagination"
 msgstr "ãã¼ã¸å"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1247
+#: lib/action.php:1254
 msgid "After"
 msgstr "<<å¾"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1257
+#: lib/action.php:1264
 msgid "Before"
 msgstr "å>>"
 
@@ -5055,177 +4959,195 @@ msgstr "å>>"
 msgid "Expecting a root feed element but got a whole XML document."
 msgstr ""
 
-#: lib/activityutils.php:208
+#. TRANS: Client exception thrown when there is no source attribute.
+#: lib/activityutils.php:203
 msgid "Can't handle remote content yet."
 msgstr ""
 
-#: lib/activityutils.php:244
+#. TRANS: Client exception thrown when there embedded XML content is found that cannot be processed yet.
+#: lib/activityutils.php:240
 msgid "Can't handle embedded XML content yet."
 msgstr ""
 
-#: lib/activityutils.php:248
+#. TRANS: Client exception thrown when base64 encoded content is found that cannot be processed yet.
+#: lib/activityutils.php:245
 msgid "Can't handle embedded Base64 content yet."
 msgstr ""
 
 #. TRANS: Client error message thrown when a user tries to change admin settings but has no access rights.
-#: lib/adminpanelaction.php:98
+#: lib/adminpanelaction.php:96
 msgid "You cannot make changes to this site."
 msgstr "ããªãã¯ãã®ãµã¤ãã¸ã®å¤æ´ãè¡ããã¨ãã§ãã¾ããã"
 
 #. TRANS: Client error message throw when a certain panel's settings cannot be changed.
-#: lib/adminpanelaction.php:110
+#: lib/adminpanelaction.php:108
 msgid "Changes to that panel are not allowed."
 msgstr "ãã®ããã«ã¸ã®å¤æ´ã¯è¨±å¯ããã¦ãã¾ããã"
 
 #. TRANS: Client error message.
-#: lib/adminpanelaction.php:229
+#: lib/adminpanelaction.php:222
 msgid "showForm() not implemented."
 msgstr "showForm() ã¯å®è£ããã¦ãã¾ããã"
 
 #. TRANS: Client error message
-#: lib/adminpanelaction.php:259
+#: lib/adminpanelaction.php:250
 msgid "saveSettings() not implemented."
 msgstr "saveSettings() ã¯å®è£ããã¦ãã¾ããã"
 
 #. TRANS: Client error message thrown if design settings could not be deleted in
 #. TRANS: the admin panel Design.
-#: lib/adminpanelaction.php:284
+#: lib/adminpanelaction.php:274
 msgid "Unable to delete design setting."
 msgstr "ãã¶ã¤ã³è¨å®ãåé¤ã§ãã¾ããã"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:350
+#: lib/adminpanelaction.php:337
 msgid "Basic site configuration"
 msgstr "åºæ¬ãµã¤ãè¨å®"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:358
+#: lib/adminpanelaction.php:345
 msgid "Design configuration"
 msgstr "ãã¶ã¤ã³è¨å®"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:366
+#: lib/adminpanelaction.php:353
 msgid "User configuration"
 msgstr "ã¦ã¼ã¶è¨å®"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:368 lib/personalgroupnav.php:115
+#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:115
 msgid "User"
 msgstr "ã¦ã¼ã¶"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:374
+#: lib/adminpanelaction.php:361
 msgid "Access configuration"
 msgstr "ã¢ã¯ã»ã¹è¨å®"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:382
+#: lib/adminpanelaction.php:369
 msgid "Paths configuration"
 msgstr "ãã¹è¨å®"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:390
+#: lib/adminpanelaction.php:377
 msgid "Sessions configuration"
 msgstr "ã»ãã·ã§ã³è¨å®"
 
 #. TRANS: Client error 401.
-#: lib/apiauth.php:113
+#: lib/apiauth.php:111
 msgid "API resource requires read-write access, but you only have read access."
 msgstr ""
 "APIãªã½ã¼ã¹ã¯èªã¿æ¸ãã¢ã¯ã»ã¹ãå¿è¦ã§ãããããããªãã¯èªã¿ã¢ã¯ã»ã¹ããæã£ã¦"
 "ãã¾ããã"
 
+#. TRANS: OAuth exception thrown when no application is found for a given consumer key.
+#: lib/apiauth.php:175
+msgid "No application for that consumer key."
+msgstr ""
+
+#. TRANS: OAuth exception given when no user was found for a given token (no token was found).
+#: lib/apiauth.php:217
+msgid "No user for that token."
+msgstr ""
+
+#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
+#: lib/apioauthstore.php:178
+msgid "Tried to revoke unknown token"
+msgstr ""
+
 #. TRANS: Form legend.
-#: lib/applicationeditform.php:137
+#: lib/applicationeditform.php:129
 msgid "Edit application"
 msgstr "ã¢ããªã±ã¼ã·ã§ã³ç·¨é"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:187
+#: lib/applicationeditform.php:178
 msgid "Icon for this application"
 msgstr "ãã®ã¢ããªã±ã¼ã·ã§ã³ã®ã¢ã¤ã³ã³"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:209
+#: lib/applicationeditform.php:200
 #, php-format
 msgid "Describe your application in %d characters"
 msgstr "ããªãã®ã¢ããªã±ã¼ã·ã§ã³ã %d åä»¥åè¨è¿°"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:213
+#: lib/applicationeditform.php:204
 msgid "Describe your application"
 msgstr "ããªãã®ã¢ããªã±ã¼ã·ã§ã³ãè¨è¿°"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:224
+#: lib/applicationeditform.php:215
 msgid "URL of the homepage of this application"
 msgstr "ãã®ã¢ããªã±ã¼ã·ã§ã³ã®ãã¼ã ãã¼ã¸ã® URL"
 
 #. TRANS: Form input field label.
-#: lib/applicationeditform.php:226
+#: lib/applicationeditform.php:217
 msgid "Source URL"
 msgstr "ã½ã¼ã¹ URL"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:233
+#: lib/applicationeditform.php:224
 msgid "Organization responsible for this application"
 msgstr "ãã®ã¢ããªã±ã¼ã·ã§ã³ã«è²¬ä»»ãããçµç¹"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:242
+#: lib/applicationeditform.php:233
 msgid "URL for the homepage of the organization"
 msgstr "çµç¹ã®ãã¼ã ãã¼ã¸ã®URL"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:251
+#: lib/applicationeditform.php:242
 msgid "URL to redirect to after authentication"
 msgstr "èªè¨¼ã®å¾ã«ãªãã¤ã¬ã¯ãããURL"
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:278
+#: lib/applicationeditform.php:269
 msgid "Browser"
 msgstr "ãã©ã¦ã¶"
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:295
+#: lib/applicationeditform.php:286
 msgid "Desktop"
 msgstr "ãã¹ã¯ããã"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:297
+#: lib/applicationeditform.php:288
 msgid "Type of application, browser or desktop"
 msgstr "ã¢ããªã±ã¼ã·ã§ã³ããã©ã¦ã¶ãã¾ãã¯ãã¹ã¯ãããã®ã¿ã¤ã"
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:320
+#: lib/applicationeditform.php:311
 msgid "Read-only"
 msgstr "ãªã¼ããªã³ãªã¼"
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:339
+#: lib/applicationeditform.php:330
 msgid "Read-write"
 msgstr "ãªã¼ãã©ã¤ã"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:341
+#: lib/applicationeditform.php:332
 msgid "Default access for this application: read-only, or read-write"
 msgstr ""
 "ãã®ã¢ããªã±ã¼ã·ã§ã³ã®ããã®ããã©ã«ãã¢ã¯ã»ã¹: ãªã¼ããªã³ãªã¼ãã¾ãã¯ãªã¼ã"
 "ã©ã¤ã"
 
-#. TRANS: Submit button title
-#: lib/applicationeditform.php:359
+#. TRANS: Submit button title.
+#: lib/applicationeditform.php:349
 msgid "Cancel"
 msgstr "ä¸æ¢"
 
 #. 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
+#: lib/applicationlist.php:143
 #, php-format
 msgid "Approved %1$s - \"%2$s\" access."
 msgstr ""
 
 #. TRANS: Button label
-#: lib/applicationlist.php:159
+#: lib/applicationlist.php:158
 msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "åå¾©"
@@ -5245,11 +5167,13 @@ msgstr "ä½è"
 msgid "Provider"
 msgstr "ãããã¤ã"
 
-#: lib/attachmentnoticesection.php:67
+#. TRANS: Title.
+#: lib/attachmentnoticesection.php:68
 msgid "Notices where this attachment appears"
 msgstr "ãã®æ·»ä»ãç¾ããã¤ã¶ãã"
 
-#: lib/attachmenttagcloudsection.php:48
+#. TRANS: Title.
+#: lib/attachmenttagcloudsection.php:49
 msgid "Tags for this attachment"
 msgstr "ãã®æ·»ä»ã®ã¿ã°"
 
@@ -5261,6 +5185,11 @@ msgstr "ãã¹ã¯ã¼ãå¤æ´ã«å¤±æãã¾ãã"
 msgid "Password changing is not allowed"
 msgstr "ãã¹ã¯ã¼ãå¤æ´ã¯è¨±å¯ããã¦ãã¾ãã"
 
+#. TRANS: Title for the form to block a user.
+#: lib/blockform.php:70
+msgid "Block"
+msgstr "ãããã¯"
+
 #: lib/channel.php:157 lib/channel.php:177
 msgid "Command results"
 msgstr "ã³ãã³ãçµæ"
@@ -5273,6 +5202,13 @@ msgstr "ã³ãã³ãå®äº"
 msgid "Command failed"
 msgstr "ã³ãã³ãå¤±æ"
 
+#. TRANS: Message given getting a non-existing user.
+#. TRANS: %s is the nickname of the user that could not be found.
+#: lib/command.php:150
+#, php-format
+msgid "Could not find a local user with nickname %s."
+msgstr ""
+
 #. TRANS: Error text shown when an unimplemented command is given.
 #: lib/command.php:185
 msgid "Sorry, this command is not yet implemented."
@@ -5303,6 +5239,20 @@ msgstr ""
 msgid "Notice marked as fave."
 msgstr "ãæ°ã«å¥ãã«ããã¦ããã¤ã¶ããã"
 
+#. 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.
+#: lib/command.php:360
+#, php-format
+msgid "%1$s joined group %2$s."
+msgstr ""
+
+#. 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.
+#: lib/command.php:408
+#, php-format
+msgid "%1$s left group %2$s."
+msgstr ""
+
 #. TRANS: Whois output. %s is the full name of the queried user.
 #: lib/command.php:434
 #, php-format
@@ -5359,15 +5309,18 @@ msgstr "ã¤ã¶ããç¹°ãè¿ãã¨ã©ã¼"
 msgid "Error saving notice."
 msgstr "ã¤ã¶ããä¿åã¨ã©ã¼ã"
 
-#. TRANS: Error text shown when no username was provided when issuing a subscribe command.
-#: lib/command.php:655
-msgid "Specify the name of the user to subscribe to."
+#. TRANS: Text shown after having subscribed to another user successfully.
+#. TRANS: %s is the name of the user the subscription was requested for.
+#: lib/command.php:672
+#, php-format
+msgid "Subscribed to %s."
 msgstr ""
 
-#. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
-#. TRANS: Error text shown when no username was provided when issuing the command.
-#: lib/command.php:694 lib/command.php:804
-msgid "Specify the name of the user to unsubscribe from."
+#. TRANS: Text shown after having unsubscribed from another user successfully.
+#. TRANS: %s is the name of the user the unsubscription was requested for.
+#: lib/command.php:705
+#, php-format
+msgid "Unsubscribed from %s."
 msgstr ""
 
 #. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
@@ -5396,11 +5349,6 @@ msgstr "éç¥ãªã³ã"
 msgid "Can't turn on notification."
 msgstr "éç¥ããªã³ã§ãã¾ããã"
 
-#. TRANS: Error text shown when issuing the login command while login is disabled.
-#: lib/command.php:771
-msgid "Login command is disabled."
-msgstr ""
-
 #. TRANS: Text shown after issuing the login command successfully.
 #. TRANS: %s is a logon link..
 #: lib/command.php:784
@@ -5408,13 +5356,20 @@ msgstr ""
 msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr ""
 
+#. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
+#. TRANS: %s is the name of the user the unsubscription was requested for.
+#: lib/command.php:813
+#, php-format
+msgid "Unsubscribed %s."
+msgstr ""
+
 #. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
 #: lib/command.php:831
 msgid "You are not subscribed to anyone."
 msgstr "ããªãã¯ã ãã«ããã©ãã¼ããã¦ãã¾ããã"
 
 #. TRANS: Text shown after requesting other users a user is subscribed to.
-#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.
 #: lib/command.php:836
 msgid "You are subscribed to this person:"
@@ -5428,7 +5383,7 @@ msgid "No one is subscribed to you."
 msgstr "èª°ããã©ãã¼ãã¦ãã¾ããã"
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
-#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
 #: lib/command.php:863
 msgid "This person is subscribed to you:"
@@ -5442,13 +5397,14 @@ msgid "You are not a member of any groups."
 msgstr "ããªãã¯ã©ã®ã°ã«ã¼ãã®ã¡ã³ãã¼ã§ãããã¾ããã"
 
 #. TRANS: Text shown after requesting groups a user is subscribed to.
-#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
 #: lib/command.php:890
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "ããªãã¯ãã®ã°ã«ã¼ãã®ã¡ã³ãã¼ã§ã¯ããã¾ãã:"
 
+#. TRANS: Help text for commands.
 #: lib/command.php:905
 msgid ""
 "Commands:\n"
@@ -5632,38 +5588,6 @@ msgstr "ã°ã«ã¼ãã®å ´æ, ä¾ãã° \"é½å¸, é½éåºç (ã¾ãã¯ å°
 msgid "Extra nicknames for the group, comma- or space- separated, max %d"
 msgstr "ã°ã«ã¼ãã®ã¨ã¯ã¹ãã©ããã¯ãã¼ã ãã«ã³ãã¾ãã¯ã¹ãã¼ã¹åºåããæå¤§ %d"
 
-#: lib/groupnav.php:85
-msgid "Group"
-msgstr "ã°ã«ã¼ã"
-
-#: lib/groupnav.php:101
-msgid "Blocked"
-msgstr "ãããã¯"
-
-#: lib/groupnav.php:102
-#, php-format
-msgid "%s blocked users"
-msgstr "%s ãããã¯ã¦ã¼ã¶"
-
-#: lib/groupnav.php:108
-#, php-format
-msgid "Edit %s group properties"
-msgstr "%s ã°ã«ã¼ãããããã£ãç·¨é"
-
-#: lib/groupnav.php:113
-msgid "Logo"
-msgstr "ãã´"
-
-#: lib/groupnav.php:114
-#, php-format
-msgid "Add or edit %s logo"
-msgstr "%s ãã´ã®è¿½å ãç·¨é"
-
-#: lib/groupnav.php:120
-#, php-format
-msgid "Add or edit %s design"
-msgstr "%s ãã¶ã¤ã³ã®è¿½å ãç·¨é"
-
 #: lib/groupsbymemberssection.php:71
 msgid "Groups with most members"
 msgstr "ã¡ã³ãã¼æ°ãå¤ãã°ã«ã¼ã"
@@ -5695,7 +5619,8 @@ msgstr "ãã¡ã¤ã«ãå¤§ãããã¾ããæå¤§ãã¡ã¤ã«ãµã¤ãºã¯ %s 
 msgid "Partial upload."
 msgstr "ä¸å®å¨ãªã¢ãããã¼ãã"
 
-#: lib/imagefile.php:101 lib/mediafile.php:170
+#. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
+#: lib/imagefile.php:101 lib/mediafile.php:179
 msgid "System error uploading file."
 msgstr "ãã¡ã¤ã«ã®ã¢ãããã¼ãã§ã·ã¹ãã ã¨ã©ã¼"
 
@@ -5793,22 +5718,6 @@ msgid ""
 "your subscribers list and report as spam to site administrators at %s"
 msgstr ""
 
-#. TRANS: Main body of new-subscriber notification e-mail
-#: lib/mail.php:254
-#, php-format
-msgid ""
-"%1$s is now listening to your notices on %2$s.\n"
-"\n"
-"\t%3$s\n"
-"\n"
-"%4$s%5$s%6$s\n"
-"Faithfully yours,\n"
-"%7$s.\n"
-"\n"
-"----\n"
-"Change your email address or notification options at %8$s\n"
-msgstr ""
-
 #. TRANS: Profile info line in new-subscriber notification e-mail
 #: lib/mail.php:274
 #, php-format
@@ -5821,20 +5730,6 @@ msgstr "èªå·±ç´¹ä»: %s"
 msgid "New email address for posting to %s"
 msgstr "%s ã¸æç¨¿ã®ããã®æ°ããã¡ã¼ã«ã¢ãã¬ã¹"
 
-#. TRANS: Body of notification mail for new posting email address
-#: lib/mail.php:308
-#, php-format
-msgid ""
-"You have a new posting address on %1$s.\n"
-"\n"
-"Send email to %2$s to post new messages.\n"
-"\n"
-"More email instructions at %3$s.\n"
-"\n"
-"Faithfully yours,\n"
-"%4$s"
-msgstr ""
-
 #. TRANS: Subject line for SMS-by-email notification messages
 #: lib/mail.php:433
 #, php-format
@@ -5852,77 +5747,18 @@ msgstr "SMSç¢ºèª"
 msgid "You've been nudged by %s"
 msgstr "ããªãã¯ %s ã«åå³ããã¦ãã¾ã"
 
-#. TRANS: Body for 'nudge' notification email
-#: lib/mail.php:489
-#, php-format
-msgid ""
-"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
-"to post some news.\n"
-"\n"
-"So let's hear from you :)\n"
-"\n"
-"%3$s\n"
-"\n"
-"Don't reply to this email; it won't get to them.\n"
-"\n"
-"With kind regards,\n"
-"%4$s\n"
-msgstr ""
-
 #. TRANS: Subject for direct-message notification email
 #: lib/mail.php:536
 #, php-format
 msgid "New private message from %s"
 msgstr "%s ããã®æ°ãããã©ã¤ãã¼ãã¡ãã»ã¼ã¸"
 
-#. TRANS: Body for direct-message notification email
-#: lib/mail.php:541
-#, php-format
-msgid ""
-"%1$s (%2$s) sent you a private message:\n"
-"\n"
-"------------------------------------------------------\n"
-"%3$s\n"
-"------------------------------------------------------\n"
-"\n"
-"You can reply to their message here:\n"
-"\n"
-"%4$s\n"
-"\n"
-"Don't reply to this email; it won't get to them.\n"
-"\n"
-"With kind regards,\n"
-"%5$s\n"
-msgstr ""
-
 #. TRANS: Subject for favorite notification email
 #: lib/mail.php:589
 #, php-format
 msgid "%s (@%s) added your notice as a favorite"
 msgstr "%s (@%s) ã¯ãæ°ã«å¥ãã¨ãã¦ããªãã®ã¤ã¶ãããå ãã¾ãã"
 
-#. TRANS: Body for favorite notification email
-#: lib/mail.php:592
-#, php-format
-msgid ""
-"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
-"\n"
-"The URL of your notice is:\n"
-"\n"
-"%3$s\n"
-"\n"
-"The text of your notice is:\n"
-"\n"
-"%4$s\n"
-"\n"
-"You can see the list of %1$s's favorites here:\n"
-"\n"
-"%5$s\n"
-"\n"
-"Faithfully yours,\n"
-"%6$s\n"
-msgstr ""
-
 #. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
 #: lib/mail.php:651
 #, php-format
@@ -6003,19 +5839,22 @@ msgstr "ãã¿ã¾ãããå¥ã£ã¦ããã¡ã¼ã«ã¯è¨±å¯ããã¦ãã¾ãã
 msgid "Unsupported message type: %s"
 msgstr "ãµãã¼ãå¤ã®ã¡ãã»ã¼ã¸ã¿ã¤ã: %s"
 
-#: lib/mediafile.php:98 lib/mediafile.php:123
+#. TRANS: Client exception thrown when a database error was thrown during a file upload operation.
+#: lib/mediafile.php:99 lib/mediafile.php:125
 msgid "There was a database error while saving your file. Please try again."
 msgstr ""
 "ãã¼ã¿ãã¼ã¹ã¨ã©ã¼ãããªãã®ãã¡ã¤ã«ãä¿åãã¦ããã¨ãã«ããã¾ããã åè©¦è¡ã"
 "ã¦ãã ããã"
 
-#: lib/mediafile.php:142
+#. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
+#: lib/mediafile.php:145
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
 msgstr ""
 "ã¢ãããã¼ãããããã¡ã¤ã«ã¯ php.ini ã® upload_max_filesize ãã£ã¬ã¯ãã£ãã"
 "è¶ãã¦ãã¾ãã"
 
-#: lib/mediafile.php:147
+#. TRANS: Client exception.
+#: lib/mediafile.php:151
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form."
@@ -6023,44 +5862,43 @@ msgstr ""
 "ã¢ãããã¼ãããããã¡ã¤ã«ã¯HTMLãã©ã¼ã ã§æå®ããã MAX_FILE_SIZE ãã£ã¬ã¯"
 "ãã£ããè¶ãã¦ãã¾ãã"
 
-#: lib/mediafile.php:152
+#. TRANS: Client exception.
+#: lib/mediafile.php:157
 msgid "The uploaded file was only partially uploaded."
 msgstr "ã¢ãããã¼ãããããã¡ã¤ã«ã¯é¨åçã«ã¢ãããã¼ãããã¦ããã ãã§ãã"
 
-#: lib/mediafile.php:159
+#. TRANS: Client exception thrown when a temporary folder is not present to store a file upload.
+#: lib/mediafile.php:165
 msgid "Missing a temporary folder."
 msgstr "ä¸æãã©ã«ããå¤±ãã¾ããã"
 
-#: lib/mediafile.php:162
+#. TRANS: Client exception thrown when writing to disk is not possible during a file upload operation.
+#: lib/mediafile.php:169
 msgid "Failed to write file to disk."
 msgstr "ãã£ã¹ã¯ã¸ã®ãã¡ã¤ã«æ¸ãè¾¼ã¿ã«å¤±æãã¾ããã"
 
-#: lib/mediafile.php:165
+#. TRANS: Client exception thrown when a file upload operation has been stopped by an extension.
+#: lib/mediafile.php:173
 msgid "File upload stopped by extension."
 msgstr "ã¨ã¯ã¹ãã³ã·ã§ã³ã«ãã£ã¦ãã¡ã¤ã«ã¢ãããã¼ããä¸æ¢ãã¾ããã"
 
-#: lib/mediafile.php:179 lib/mediafile.php:217
+#. TRANS: Client exception thrown when a file upload operation would cause a user to exceed a set quota.
+#: lib/mediafile.php:189 lib/mediafile.php:232
 msgid "File exceeds user's quota."
 msgstr "ãã¡ã¤ã«ã¯ã¦ã¼ã¶ã®å²å½ã¦ãè¶ãã¦ãã¾ãã"
 
-#: lib/mediafile.php:197 lib/mediafile.php:234
+#. TRANS: Client exception thrown when a file upload operation fails because the file could
+#. TRANS: not be moved from the temporary folder to the permanent file location.
+#: lib/mediafile.php:209 lib/mediafile.php:251
 msgid "File could not be moved to destination directory."
 msgstr "ãã¡ã¤ã«ãç®çãã£ã¬ã¯ããªã«åãããã¨ãã§ãã¾ããã§ããã"
 
-#: lib/mediafile.php:202 lib/mediafile.php:238
+#. TRANS: Client exception thrown when a file upload operation has been stopped because the MIME
+#. TRANS: type of the uploaded file could not be determined.
+#: lib/mediafile.php:216 lib/mediafile.php:257
 msgid "Could not determine file's MIME type."
 msgstr "ãã¡ã¤ã«ã®MIMEã¿ã¤ããæ±ºå®ã§ãã¾ããã"
 
-#: lib/mediafile.php:318
-#, php-format
-msgid " Try using another %s format."
-msgstr "å¥ã® %s ãã©ã¼ããããè©¦ãã¦ãã ããã"
-
-#: lib/mediafile.php:323
-#, php-format
-msgid "%s is not a supported file type on this server."
-msgstr "%s ã¯ãã®ãµã¼ãã®ãµãã¼ããã¦ãããã¡ã¤ã«ã¿ã¤ãã§ã¯ããã¾ããã"
-
 #: lib/messageform.php:120
 msgid "Send a direct notice"
 msgstr "ç´æ¥ã¤ã¶ãããéã"
@@ -6073,11 +5911,6 @@ msgstr "To"
 msgid "Available characters"
 msgstr "å©ç¨å¯è½ãªæå"
 
-#: lib/messageform.php:178 lib/noticeform.php:237
-msgctxt "Send button for sending notice"
-msgid "Send"
-msgstr ""
-
 #: lib/noticeform.php:160
 msgid "Send a notice"
 msgstr "ã¤ã¶ãããéã"
@@ -6111,21 +5944,6 @@ msgstr ""
 "ãã¿ã¾ãããããªãã®ä½ç½®ãæ¤ç´¢ããã®ãäºæ³ããé·ãããã£ã¦ãã¾ããå¾ã§ããä¸"
 "åº¦è©¦ã¿ã¦ãã ãã"
 
-#. TRANS: Used in coordinates as abbreviation of south
-#: lib/noticelist.php:438
-msgid "S"
-msgstr ""
-
-#. TRANS: Used in coordinates as abbreviation of east
-#: lib/noticelist.php:440
-msgid "E"
-msgstr ""
-
-#. TRANS: Used in coordinates as abbreviation of west
-#: lib/noticelist.php:442
-msgid "W"
-msgstr ""
-
 #: lib/noticelist.php:444
 #, php-format
 msgid "%1$uÂ°%2$u'%3$u\"%4$s %5$uÂ°%6$u'%7$u\"%8$s"
@@ -6171,27 +5989,7 @@ msgstr "åå³"
 msgid "Send a nudge to this user"
 msgstr "ãã®ã¦ã¼ã¶ã¸åå³ãéã"
 
-#: lib/oauthstore.php:283
-msgid "Error inserting new profile"
-msgstr "ãããã¡ã¤ã«è¿½å ã¨ã©ã¼"
-
-#: lib/oauthstore.php:291
-msgid "Error inserting avatar"
-msgstr "ã¢ãã¿ã¼è¿½å ã¨ã©ã¼"
-
-#: lib/oauthstore.php:306
-msgid "Error updating remote profile"
-msgstr "ãªã¢ã¼ããããã¡ã¤ã«æ´æ°ã¨ã©ã¼"
-
-#: lib/oauthstore.php:311
-msgid "Error inserting remote profile"
-msgstr "ãªã¢ã¼ããããã¡ã¤ã«è¿½å ã¨ã©ã¼"
-
-#: lib/oauthstore.php:345
-msgid "Duplicate notice"
-msgstr "éè¤ããã¤ã¶ãã"
-
-#: lib/oauthstore.php:490
+#: lib/oauthstore.php:491
 msgid "Couldn't insert new subscription."
 msgstr "ãµãã¹ã¯ãªãã·ã§ã³ãè¿½å ã§ãã¾ãã"
 
@@ -6228,7 +6026,8 @@ msgstr "ããªããéã£ãã¡ãã»ã¼ã¸"
 msgid "Tags in %s's notices"
 msgstr "%s ã®ã¤ã¶ããã®ã¿ã°"
 
-#: lib/plugin.php:115
+#. TRANS: Displayed as version information for a plugin if no version information was found.
+#: lib/plugin.php:116
 msgid "Unknown"
 msgstr "ä¸æ"
 
@@ -6317,19 +6116,19 @@ msgstr "ãµã³ãããã¯ã¹"
 msgid "Sandbox this user"
 msgstr "ãã®ã¦ã¼ã¶ããµã³ãããã¯ã¹"
 
-#: lib/searchaction.php:120
+#. TRANS: Fieldset legend for the search form.
+#: lib/searchaction.php:121
 msgid "Search site"
 msgstr "ãµã¤ãæ¤ç´¢"
 
-#: lib/searchaction.php:126
+#. TRANS: Used as a field label for the field where one or more keywords
+#. TRANS: for searching can be entered.
+#: lib/searchaction.php:129
 msgid "Keyword(s)"
 msgstr "ãã¼ã¯ã¼ã"
 
-#: lib/searchaction.php:127
-msgid "Search"
-msgstr "æ¤ç´¢"
-
-#: lib/searchaction.php:162
+#. TRANS: Definition list item with instructions on how to get (better) search results.
+#: lib/searchaction.php:170
 msgid "Search help"
 msgstr "ãã«ãæ¤ç´¢"
 
@@ -6499,66 +6298,33 @@ msgstr "ãã®å©ç¨èã«ãã¤ã¬ã¯ãã¡ãã»ã¼ã¸ãéã"
 msgid "Message"
 msgstr "ã¡ãã»ã¼ã¸"
 
-#: lib/userprofile.php:326
-msgid "Moderate"
-msgstr ""
-
-#: lib/userprofile.php:367
-msgctxt "role"
-msgid "Moderator"
-msgstr ""
-
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1102
+#: lib/util.php:1103
 msgid "a few seconds ago"
 msgstr "æ°ç§å"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1105
+#: lib/util.php:1106
 msgid "about a minute ago"
 msgstr "ç´ 1 åå"
 
-#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1109
-#, php-format
-msgid "about %d minutes ago"
-msgstr "ç´ %d åå"
-
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 #: lib/util.php:1112
 msgid "about an hour ago"
 msgstr "ç´ 1 æéå"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1116
-#, php-format
-msgid "about %d hours ago"
-msgstr "ç´ %d æéå"
-
-#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1119
+#: lib/util.php:1118
 msgid "about a day ago"
 msgstr "ç´ 1 æ¥å"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1123
-#, php-format
-msgid "about %d days ago"
-msgstr "ç´ %d æ¥å"
-
-#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1126
+#: lib/util.php:1124
 msgid "about a month ago"
 msgstr "ç´ 1 ãµæå"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 #: lib/util.php:1130
-#, php-format
-msgid "about %d months ago"
-msgstr "ç´ %d ãµæå"
-
-#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1133
 msgid "about a year ago"
 msgstr "ç´ 1 å¹´å"
 
diff --git a/locale/ka/LC_MESSAGES/statusnet.po b/locale/ka/LC_MESSAGES/statusnet.po
index f51cb3c27d..36eecb2760 100644
--- a/locale/ka/LC_MESSAGES/statusnet.po
+++ b/locale/ka/LC_MESSAGES/statusnet.po
@@ -1,7 +1,7 @@
-# Translation of StatusNet to Georgian
+# Translation of StatusNet to Georgian (á¥áá áá£áá)
+# Expored from translatewiki.net
 #
-# Author@translatewiki.net: Zaal
-# --
+# Author: Zaal
 # --
 # This file is distributed under the same license as the StatusNet package.
 #
@@ -9,19 +9,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-09 18:07+0000\n"
-"PO-Revision-Date: 2010-09-09 18:09:12+0000\n"
+"POT-Creation-Date: 2010-09-14 19:53+0000\n"
+"PO-Revision-Date: 2010-09-14 19:54:06+0000\n"
+"Language-Team: Georgian <http://translatewiki.net/wiki/Portal:ka>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r72348); Translate extension (2010-08-20)\n"
+"X-Generator: MediaWiki 1.17alpha (r73009); Translate extension (2010-08-20)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ka\n"
-"X-Message-Group: out-statusnet\n"
+"X-Message-Group: #out-statusnet\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
+"X-POT-Import-Date: 1284-49-16 34::+0000\n"
 
 #. TRANS: Page title
 #. TRANS: Menu item for site administration
-#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:376
+#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:363
 msgid "Access"
 msgstr "á¨áá¡ááá"
 
@@ -74,10 +76,10 @@ 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 actions/emailsettings.php:224
-#: actions/imsettings.php:184 actions/smssettings.php:209
-#: lib/applicationeditform.php:361
+#. TRANS: Button label in the "Edit application" form.
+#: actions/accessadminpanel.php:203 actions/emailsettings.php:228
+#: actions/imsettings.php:187 actions/smssettings.php:209
+#: lib/applicationeditform.php:351
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "á¨ááááá®á"
@@ -90,15 +92,15 @@ msgstr "áá¡ááá áááá áá áá  áá á¡ááááá¡."
 
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #: actions/all.php:79 actions/allrss.php:68
-#: actions/apiaccountupdatedeliverydevice.php:114
-#: actions/apiaccountupdateprofile.php:105
-#: actions/apiaccountupdateprofilebackgroundimage.php:116
-#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
-#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
-#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:113
-#: actions/apigroupismember.php:91 actions/apigroupjoin.php:100
-#: actions/apigroupleave.php:100 actions/apigrouplist.php:73
-#: actions/apistatusesupdate.php:229 actions/apisubscriptions.php:87
+#: actions/apiaccountupdatedeliverydevice.php:115
+#: actions/apiaccountupdateprofile.php:106
+#: actions/apiaccountupdateprofilebackgroundimage.php:117
+#: actions/apiaccountupdateprofileimage.php:106 actions/apiblockcreate.php:98
+#: actions/apiblockdestroy.php:97 actions/apidirectmessage.php:77
+#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:114
+#: actions/apigroupismember.php:91 actions/apigroupjoin.php:101
+#: actions/apigroupleave.php:101 actions/apigrouplist.php:73
+#: actions/apistatusesupdate.php:230 actions/apisubscriptions.php:87
 #: actions/apitimelinefavorites.php:72 actions/apitimelinefriends.php:174
 #: actions/apitimelinehome.php:80 actions/apitimelinementions.php:80
 #: actions/apitimelineuser.php:82 actions/avatarbynickname.php:75
@@ -129,6 +131,24 @@ msgstr "%1$s áá áááááá ááá, áááá áá %2$d"
 msgid "%s and friends"
 msgstr " %s áá áááááá ááá"
 
+#. TRANS: %1$s is user nickname
+#: actions/all.php:107
+#, php-format
+msgid "Feed for friends of %s (RSS 1.0)"
+msgstr ""
+
+#. TRANS: %1$s is user nickname
+#: actions/all.php:116
+#, php-format
+msgid "Feed for friends of %s (RSS 2.0)"
+msgstr ""
+
+#. TRANS: %1$s is user nickname
+#: actions/all.php:125
+#, php-format
+msgid "Feed for friends of %s (Atom)"
+msgstr ""
+
 #. TRANS: %1$s is user nickname
 #: actions/all.php:138
 #, php-format
@@ -147,6 +167,14 @@ msgstr ""
 " ááá®áá ááá¢á áááá®ááá ááááá¡ áááááááá á, [ááá¬ááá ááááá á¯áá£á¤á¨á](%%action.groups%%) "
 "áá ááááá ááááá¡á¢á á ááá."
 
+#. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@"
+#: actions/all.php:146
+#, php-format
+msgid ""
+"You can try to [nudge %1$s](../%2$s) from their profile or [post something "
+"to them](%%%%action.newnotice%%%%?status_textarea=%3$s)."
+msgstr ""
+
 #: actions/all.php:149 actions/replies.php:210 actions/showstream.php:211
 #, php-format
 msgid ""
@@ -170,16 +198,16 @@ msgid "Updates from %1$s and friends on %2$s!"
 msgstr " %1$s áá áááááá áááá¡ ááááá®áááááá %2$s-áá!"
 
 #: actions/apiaccountratelimitstatus.php:72
-#: actions/apiaccountupdatedeliverydevice.php:94
-#: actions/apiaccountupdateprofile.php:97
-#: actions/apiaccountupdateprofilebackgroundimage.php:94
-#: actions/apiaccountupdateprofilecolors.php:118
+#: actions/apiaccountupdatedeliverydevice.php:95
+#: actions/apiaccountupdateprofile.php:98
+#: actions/apiaccountupdateprofilebackgroundimage.php:95
+#: actions/apiaccountupdateprofilecolors.php:119
 #: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156
-#: actions/apifavoritecreate.php:100 actions/apifavoritedestroy.php:101
-#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100
-#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:139
-#: actions/apigroupismember.php:115 actions/apigroupjoin.php:156
-#: actions/apigroupleave.php:142 actions/apigrouplist.php:137
+#: actions/apifavoritecreate.php:101 actions/apifavoritedestroy.php:102
+#: actions/apifriendshipscreate.php:101 actions/apifriendshipsdestroy.php:101
+#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:140
+#: actions/apigroupismember.php:115 actions/apigroupjoin.php:157
+#: actions/apigroupleave.php:143 actions/apigrouplist.php:137
 #: actions/apigrouplistall.php:122 actions/apigroupmembership.php:107
 #: actions/apigroupshow.php:116 actions/apihelptest.php:88
 #: actions/apistatusesdestroy.php:104 actions/apistatusesretweets.php:112
@@ -194,21 +222,23 @@ msgstr " %1$s áá áááááá áááá¡ ááááá®áááá
 msgid "API method not found."
 msgstr "API áááááá ááá  áááá«áááá."
 
-#: actions/apiaccountupdatedeliverydevice.php:86
-#: actions/apiaccountupdateprofile.php:89
-#: actions/apiaccountupdateprofilebackgroundimage.php:86
-#: actions/apiaccountupdateprofilecolors.php:110
-#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89
-#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109
-#: actions/apifavoritecreate.php:91 actions/apifavoritedestroy.php:92
-#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
-#: actions/apigroupcreate.php:105 actions/apigroupjoin.php:92
-#: actions/apigroupleave.php:92 actions/apimediaupload.php:67
-#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:198
+#. TRANS: Client error message. POST is a HTTP command. It should not be translated.
+#. TRANS: Client error. POST is a HTTP command. It should not be translated.
+#: actions/apiaccountupdatedeliverydevice.php:87
+#: actions/apiaccountupdateprofile.php:90
+#: actions/apiaccountupdateprofilebackgroundimage.php:87
+#: actions/apiaccountupdateprofilecolors.php:111
+#: actions/apiaccountupdateprofileimage.php:85 actions/apiblockcreate.php:90
+#: actions/apiblockdestroy.php:89 actions/apidirectmessagenew.php:110
+#: actions/apifavoritecreate.php:92 actions/apifavoritedestroy.php:93
+#: actions/apifriendshipscreate.php:92 actions/apifriendshipsdestroy.php:92
+#: actions/apigroupcreate.php:106 actions/apigroupjoin.php:93
+#: actions/apigroupleave.php:93 actions/apimediaupload.php:68
+#: actions/apistatusesretweet.php:66 actions/apistatusesupdate.php:199
 msgid "This method requires a POST."
 msgstr "áá¡ áááááá ááááá®ááá¡ POST-á¡."
 
-#: actions/apiaccountupdatedeliverydevice.php:106
+#: actions/apiaccountupdatedeliverydevice.php:107
 msgid ""
 "You must specify a parameter named 'device' with a value of one of: sms, im, "
 "none."
@@ -216,27 +246,27 @@ msgstr ""
 "áá£áªáááááááá ááá áááá¢á  'device'-á¡ ááá£ááááá á¨áááááá áááá¨áááááááááááá áá ááá áá: "
 "sms, im, none."
 
-#: actions/apiaccountupdatedeliverydevice.php:133
+#: actions/apiaccountupdatedeliverydevice.php:134
 msgid "Could not update user."
 msgstr "áááá®ááá ááááá¡ ááááá®áááá ááá  ááá®áá á®áá."
 
-#: actions/apiaccountupdateprofile.php:112
-#: actions/apiaccountupdateprofilebackgroundimage.php:194
-#: actions/apiaccountupdateprofilecolors.php:185
-#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/apiaccountupdateprofile.php:113
+#: actions/apiaccountupdateprofilebackgroundimage.php:195
+#: actions/apiaccountupdateprofilecolors.php:186
+#: actions/apiaccountupdateprofileimage.php:131 actions/apiusershow.php:108
 #: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/hcard.php:74
 #: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
 #: lib/profileaction.php:84
 msgid "User has no profile."
 msgstr "áááá®ááá ááááá¡ áá áá¤ááá áá  áááá©ááá."
 
-#: actions/apiaccountupdateprofile.php:147
+#: actions/apiaccountupdateprofile.php:148
 msgid "Could not save profile."
 msgstr "áá áá¤áááá¡ á¨áááá®áá ááá  ááá®áá á®áá."
 
-#: actions/apiaccountupdateprofilebackgroundimage.php:108
-#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
-#: actions/apistatusesupdate.php:212 actions/avatarsettings.php:257
+#: actions/apiaccountupdateprofilebackgroundimage.php:109
+#: actions/apiaccountupdateprofileimage.php:98 actions/apimediaupload.php:81
+#: actions/apistatusesupdate.php:213 actions/avatarsettings.php:257
 #: actions/designadminpanel.php:123 actions/editapplication.php:118
 #: actions/newapplication.php:101 actions/newnotice.php:94
 #: lib/designsettings.php:283
@@ -248,30 +278,30 @@ msgstr ""
 "á¡ááá¬á£á®áá áá á¡áá ááá áá ááá  ááá£á«áá ááááá POST áááááªááááá¡ (%s áááá¢á) áááááááá á "
 "áááá¤ááá£á ááªááá¡ áááá."
 
-#: actions/apiaccountupdateprofilebackgroundimage.php:136
-#: actions/apiaccountupdateprofilebackgroundimage.php:146
-#: actions/apiaccountupdateprofilecolors.php:164
-#: actions/apiaccountupdateprofilecolors.php:174
+#: actions/apiaccountupdateprofilebackgroundimage.php:137
+#: actions/apiaccountupdateprofilebackgroundimage.php:147
+#: actions/apiaccountupdateprofilecolors.php:165
+#: actions/apiaccountupdateprofilecolors.php:175
 #: actions/groupdesignsettings.php:290 actions/groupdesignsettings.php:300
 #: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
 #: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
 msgid "Unable to save your design settings."
 msgstr "á¡ááá¬á£á®áá áá áá¥áááá áááááááá¡ ááá áááá¢á áááá¡ á¨áááá®áá ááá  ááá®áá á®áá."
 
-#: actions/apiaccountupdateprofilebackgroundimage.php:187
-#: actions/apiaccountupdateprofilecolors.php:142
+#: actions/apiaccountupdateprofilebackgroundimage.php:188
+#: actions/apiaccountupdateprofilecolors.php:143
 msgid "Could not update your design."
 msgstr "áááááááá¡ ááááá®áááá ááá  ááá®áá á®áá."
 
-#: actions/apiblockcreate.php:105
+#: actions/apiblockcreate.php:106
 msgid "You cannot block yourself!"
 msgstr "á¡ááá£ááá á ááááá¡ áááááááá á¨áá£á«ááááááá."
 
-#: actions/apiblockcreate.php:126
+#: actions/apiblockcreate.php:127
 msgid "Block user failed."
 msgstr "áááá®ááá ááááá¡ áááááááá ááá  ááá®áá á®áá."
 
-#: actions/apiblockdestroy.php:114
+#: actions/apiblockdestroy.php:115
 msgid "Unblock user failed."
 msgstr "ááá  ááá®áá á®áá áááá®ááá áááááá áááááá¡ ááá®á¡áá."
 
@@ -295,59 +325,59 @@ msgstr "%s-á¡áááá¡ áááááááááá ááá áááá
 msgid "All the direct messages sent to %s"
 msgstr "%s-á¡áááá¡ áááááááááá á§áááá ááá ááááá á á¨áá¢á§ááááááá"
 
-#: actions/apidirectmessagenew.php:118
+#: actions/apidirectmessagenew.php:119
 msgid "No message text!"
 msgstr "á¨áá¢á§áááááááá¡ á¢áá¥á¡á¢á áá  áá áá¡!"
 
-#: actions/apidirectmessagenew.php:127 actions/newmessage.php:150
+#: actions/apidirectmessagenew.php:128 actions/newmessage.php:150
 #, php-format
 msgid "That's too long. Max message size is %d chars."
 msgstr "áá¡ á«ááááá áá á«áááá. á¨áá¢á§áááááááá¨á ááá¡áá¨ááááá %d á¡áááááá."
 
-#: actions/apidirectmessagenew.php:138
+#: actions/apidirectmessagenew.php:139
 msgid "Recipient user not found."
 msgstr "áááá¦ááá áááá®ááá ááááá ááá  áááá«áááá."
 
-#: actions/apidirectmessagenew.php:142
+#: actions/apidirectmessagenew.php:143
 msgid "Can't send direct messages to users who aren't your friend."
 msgstr "ááá  ááá£áááááá ááá ááááá  á¨áá¢á§áááááááá¡ áááá¡, ááá¡áááááª áá  áááááá áá."
 
-#: actions/apifavoritecreate.php:109 actions/apifavoritedestroy.php:110
+#: actions/apifavoritecreate.php:110 actions/apifavoritedestroy.php:111
 #: actions/apistatusesdestroy.php:121
 msgid "No status found with that ID."
 msgstr "á¡á¢áá¢á£á¡á áá¡ááá ID-á ááá  áááá«áááá."
 
-#: actions/apifavoritecreate.php:120
+#: actions/apifavoritecreate.php:121
 msgid "This status is already a favorite."
 msgstr "áá¡ á¡á¢áá¢á£á¡á á£ááá á¤áááá áá¢áá."
 
 #. TRANS: Error message text shown when a favorite could not be set.
-#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:296
+#: actions/apifavoritecreate.php:132 actions/favor.php:84 lib/command.php:296
 msgid "Could not create favorite."
 msgstr "á¤áááá áá¢áá¡ á¨áá¥ááá ááá  ááá®áá á®áá."
 
-#: actions/apifavoritedestroy.php:123
+#: actions/apifavoritedestroy.php:124
 msgid "That status is not a favorite."
 msgstr "áá¡ á¡á¢áá¢á£á¡á áá á áá áá¡ á¤áááá áá¢á."
 
-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
+#: actions/apifavoritedestroy.php:136 actions/disfavor.php:87
 msgid "Could not delete favorite."
 msgstr "á¤áááá áá¢áá¡ á¬áá¨áá ááá  ááá®áá á®áá."
 
-#: actions/apifriendshipscreate.php:109
+#: actions/apifriendshipscreate.php:110
 msgid "Could not follow user: profile not found."
 msgstr "áá áááá®ááá ááááá¡ áááááááá á ááá  ááá®ááááá, á ááááá áá áá¤ááá ááá  áááá«áááá"
 
-#: actions/apifriendshipscreate.php:118
+#: actions/apifriendshipscreate.php:119
 #, php-format
 msgid "Could not follow user: %s is already on your list."
 msgstr "áá¥ááá á£ááá á®áá á %s-áá¡ áááááááá á."
 
-#: actions/apifriendshipsdestroy.php:109
+#: actions/apifriendshipsdestroy.php:110
 msgid "Could not unfollow user: User not found."
 msgstr "áááá®ááá ááááá¡ á©áááá¨áá ááá ááá  ááá®áá á®áá. áááá®ááá ááááá ááá  áááá«áááá."
 
-#: actions/apifriendshipsdestroy.php:120
+#: actions/apifriendshipsdestroy.php:121
 msgid "You cannot unfollow yourself."
 msgstr "á¡ááá£ááá á ááááá¡ á©áááá¨áá ááá á¨áá£á«ááááááá."
 
@@ -363,90 +393,101 @@ msgstr "ááá¢áá á áááá®ááá ááááá¡ áááá¡á
 msgid "Could not find target user."
 msgstr "á¡áá¡á£á áááá áááá®ááá ááááá ááá  áááá«áááá."
 
-#: actions/apigroupcreate.php:167 actions/editgroup.php:186
+#: actions/apigroupcreate.php:168 actions/editgroup.php:186
 #: actions/newgroup.php:126 actions/profilesettings.php:215
 #: actions/register.php:212
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr "ááá¢á¡áá®ááá¨á ááá¡áá¨ááááá áá®áááá ááá¢áá á áá¡áááá áá áªáá¤á ááá."
 
-#: actions/apigroupcreate.php:176 actions/editgroup.php:190
+#: actions/apigroupcreate.php:177 actions/editgroup.php:190
 #: actions/newgroup.php:130 actions/profilesettings.php:238
 #: actions/register.php:215
 msgid "Nickname already in use. Try another one."
 msgstr "ááá¢á¡áá®ááá á£ááá ááááá§ááááá£ááá. á¡áªááá á¡á®áá."
 
-#: actions/apigroupcreate.php:183 actions/editgroup.php:193
+#: actions/apigroupcreate.php:184 actions/editgroup.php:193
 #: actions/newgroup.php:133 actions/profilesettings.php:218
 #: actions/register.php:217
 msgid "Not a valid nickname."
 msgstr "ááá¢á¡áá®ááá áá áá¡á¬áá áá."
 
-#: actions/apigroupcreate.php:199 actions/editapplication.php:215
+#: actions/apigroupcreate.php:200 actions/editapplication.php:215
 #: actions/editgroup.php:199 actions/newapplication.php:203
 #: actions/newgroup.php:139 actions/profilesettings.php:222
 #: actions/register.php:224
 msgid "Homepage is not a valid URL."
 msgstr "á¡áá¡á¢áá á¢á áááá áá áá áá¡á¬áá á URL-áá."
 
-#: actions/apigroupcreate.php:208 actions/editgroup.php:202
+#: actions/apigroupcreate.php:209 actions/editgroup.php:202
 #: actions/newgroup.php:142 actions/profilesettings.php:225
 #: actions/register.php:227
 msgid "Full name is too long (max 255 chars)."
 msgstr "á¡á á£áá á¡áá®ááá á«ááááá áá á«áááá (áá áá£ááá¢áá¡ 255 á¡áááááá)."
 
-#: actions/apigroupcreate.php:216 actions/editapplication.php:190
+#: actions/apigroupcreate.php:217 actions/editapplication.php:190
 #: actions/newapplication.php:172
 #, php-format
 msgid "Description is too long (max %d chars)."
 msgstr "áá¦á¬áá á á«ááááá áá á«áááá (áá áá£ááá¢áá¡ %d á¡áááááá)."
 
-#: actions/apigroupcreate.php:227 actions/editgroup.php:208
+#: actions/apigroupcreate.php:228 actions/editgroup.php:208
 #: actions/newgroup.php:148 actions/profilesettings.php:232
 #: actions/register.php:234
 msgid "Location is too long (max 255 chars)."
 msgstr "ááááááááááá áááá á«ááááá áá á«áááá (áá áá£ááá¢áá¡ 255 á¡áááááá)."
 
-#: actions/apigroupcreate.php:246 actions/editgroup.php:219
+#: actions/apigroupcreate.php:247 actions/editgroup.php:219
 #: actions/newgroup.php:159
 #, php-format
 msgid "Too many aliases! Maximum %d."
 msgstr ""
 
-#: actions/apigroupcreate.php:289 actions/editgroup.php:238
+#: actions/apigroupcreate.php:268
+#, php-format
+msgid "Invalid alias: \"%s\"."
+msgstr ""
+
+#: actions/apigroupcreate.php:277 actions/editgroup.php:232
+#: actions/newgroup.php:172
+#, php-format
+msgid "Alias \"%s\" already in use. Try another one."
+msgstr ""
+
+#: actions/apigroupcreate.php:290 actions/editgroup.php:238
 #: actions/newgroup.php:178
 msgid "Alias can't be the same as nickname."
 msgstr ""
 
-#: actions/apigroupismember.php:96 actions/apigroupjoin.php:105
-#: actions/apigroupleave.php:105 actions/apigroupmembership.php:92
+#: actions/apigroupismember.php:96 actions/apigroupjoin.php:106
+#: actions/apigroupleave.php:106 actions/apigroupmembership.php:92
 #: actions/apigroupshow.php:83 actions/apitimelinegroup.php:92
 msgid "Group not found."
 msgstr "á¯áá£á¤á ááá  áááá«áááá."
 
 #. TRANS: Error text shown a user tries to join a group they already are a member of.
-#: actions/apigroupjoin.php:111 actions/joingroup.php:100 lib/command.php:336
+#: actions/apigroupjoin.php:112 actions/joingroup.php:100 lib/command.php:336
 msgid "You are already a member of that group."
 msgstr "áá¥ááá á£ááá á®áá á áá á¯áá£á¤áá¡ á¬ááá á."
 
 #. TRANS: Error text shown when a user tries to join a group they are blocked from joining.
-#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:341
+#: actions/apigroupjoin.php:121 actions/joingroup.php:105 lib/command.php:341
 msgid "You have been blocked from that group by the admin."
 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.
-#: actions/apigroupjoin.php:139 actions/joingroup.php:134 lib/command.php:353
+#: actions/apigroupjoin.php:140 actions/joingroup.php:134 lib/command.php:353
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "ááá  ááá®áá á®áá áááá®ááá áááá %1$s-á¡ááá áá ááá á¯áá£á¤ %2$s-á¨á áááá ááááááá."
 
-#: actions/apigroupleave.php:115
+#: actions/apigroupleave.php:116
 msgid "You are not a member of this group."
 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.
-#: actions/apigroupleave.php:125 actions/leavegroup.php:129
+#: actions/apigroupleave.php:126 actions/leavegroup.php:129
 #: lib/command.php:401
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
@@ -476,7 +517,7 @@ msgstr "%s á¯áá£á¤ááá"
 msgid "groups on %s"
 msgstr "á¯áá£á¤ááá %s-áá"
 
-#: actions/apimediaupload.php:99
+#: actions/apimediaupload.php:100
 msgid "Upload failed."
 msgstr "áá¢ááá ááá ááá  ááá®áá á®áá."
 
@@ -484,11 +525,15 @@ msgstr "áá¢ááá ááá ááá  ááá®áá á®áá."
 msgid "No oauth_token parameter provided."
 msgstr "oauth_token ááá áááá¢á á áá  áá áá¡ ááá¬ááááá£áá."
 
+#: actions/apioauthauthorize.php:106
+msgid "Invalid token."
+msgstr ""
+
 #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
 #: actions/deletenotice.php:169 actions/disfavor.php:74
-#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:55
+#: actions/emailsettings.php:271 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:66 actions/imsettings.php:227
+#: actions/groupunblock.php:66 actions/imsettings.php:230
 #: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
@@ -526,6 +571,18 @@ 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:290 actions/grouplogo.php:322
+#: actions/imsettings.php:245 actions/newapplication.php:121
+#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
+#: actions/smssettings.php:277 lib/designsettings.php:304
+msgid "Unexpected form submission."
+msgstr ""
+
 #: actions/apioauthauthorize.php:259
 msgid "An application would like to connect to your account"
 msgstr "áááááááªááá¡ á£ááá á áá ááá£áááá¨áá ááá¡ áá¥áááá¡ ááááá áá¨á¡"
@@ -581,18 +638,18 @@ msgstr "áá¡ áááááá ááááá®ááá¡ POST-á¡ áá DELET
 msgid "You may not delete another user's status."
 msgstr "á¡á®áá áááá®ááá ááááá¡ á¡á¢áá¢á£á¡áá¡ á¬áá¨áá áá  á¨áááá«áááá."
 
-#: actions/apistatusesretweet.php:75 actions/apistatusesretweets.php:72
+#: actions/apistatusesretweet.php:76 actions/apistatusesretweets.php:72
 #: actions/deletenotice.php:52 actions/shownotice.php:92
 msgid "No such notice."
 msgstr "áá¡ááá á¨áá¢á§ááááááá áá  áá á¡ááááá¡."
 
 #. TRANS: Error text shown when trying to repeat an own notice.
-#: actions/apistatusesretweet.php:83 lib/command.php:538
+#: actions/apistatusesretweet.php:84 lib/command.php:538
 msgid "Cannot repeat your own notice."
 msgstr "á¡ááá£ááá á á¨áá¢á§áááááááá¡ áááááá ááá áá  á¨ááá«áááá."
 
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-#: actions/apistatusesretweet.php:91 lib/command.php:544
+#: actions/apistatusesretweet.php:92 lib/command.php:544
 msgid "Already repeated that notice."
 msgstr "áá¡ á¨áá¢á§ááááááá á£ááá áááááá ááá£ááá."
 
@@ -604,21 +661,21 @@ msgstr "á¡á¢áá¢á£á¡á á¬áá¨ááááá."
 msgid "No status with that ID found."
 msgstr "áá¡ááá ID-á¡ á¡á¢áá¢á£á¡á ááá  áááá«áááá."
 
-#: actions/apistatusesupdate.php:221
+#: actions/apistatusesupdate.php:222
 msgid "Client must provide a 'status' parameter with a value."
 msgstr ""
 
-#: actions/apistatusesupdate.php:242 actions/newnotice.php:157
+#: actions/apistatusesupdate.php:243 actions/newnotice.php:157
 #: lib/mailhandler.php:60
 #, php-format
 msgid "That's too long. Max notice size is %d chars."
 msgstr "á¨áá¢á§áááááááá¡ ááá¡áá«áááá ááááá %d á¡áááááá."
 
-#: actions/apistatusesupdate.php:283 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:284 actions/apiusershow.php:96
 msgid "Not found."
 msgstr "ááá  áááá«áááá."
 
-#: actions/apistatusesupdate.php:306 actions/newnotice.php:181
+#: actions/apistatusesupdate.php:307 actions/newnotice.php:181
 #, php-format
 msgid "Max notice size is %d chars, including attachment URL."
 msgstr "á¨áá§áááááááá¡ ááá¡áá¨áááá ááááá %d á¡áááááá áááááá ááá£áá URL-áá¡ á©áááááá."
@@ -627,6 +684,21 @@ msgstr "á¨áá§áááááááá¡ ááá¡áá¨áááá ááá
 msgid "Unsupported format."
 msgstr "á¤áá ááá¢á áá  áá áá¡ áá®áá ááááá ááá."
 
+#: actions/apitimelinefavorites.php:110
+#, php-format
+msgid "%1$s / Favorites from %2$s"
+msgstr ""
+
+#: actions/apitimelinefavorites.php:119
+#, php-format
+msgid "%1$s updates favorited by %2$s / %2$s."
+msgstr ""
+
+#: actions/apitimelinementions.php:118
+#, php-format
+msgid "%1$s / Updates mentioning %2$s"
+msgstr ""
+
 #: actions/apitimelinementions.php:131
 #, php-format
 msgid "%1$s updates that reply to updates from %2$s / %3$s."
@@ -642,6 +714,16 @@ msgstr "%s á¡áá¯áá á áááááá"
 msgid "%s updates from everyone!"
 msgstr "%s ááááá®áááááá á§ááááá¡ááá!"
 
+#: actions/apitimelineretweetedtome.php:111
+#, php-format
+msgid "Repeated to %s"
+msgstr ""
+
+#: actions/apitimelineretweetsofme.php:114
+#, php-format
+msgid "Repeats of %s"
+msgstr ""
+
 #: actions/apitimelinetag.php:105 actions/tag.php:67
 #, php-format
 msgid "Notices tagged with %s"
@@ -729,6 +811,10 @@ msgstr "áá áªáá áá á¤áááá áá  áá¢ááá áá£áá
 msgid "Pick a square area of the image to be your avatar"
 msgstr "ááá á©ááá á¡á£á áááá¡ ááááá áá¢á£áá ááááááááá áá¥áááá áááá¢áá áá¡áááá¡"
 
+#: actions/avatarsettings.php:347 actions/grouplogo.php:380
+msgid "Lost our file data."
+msgstr ""
+
 #: actions/avatarsettings.php:370
 msgid "Avatar updated."
 msgstr "áááá¢áá á ááááá®ááá."
@@ -749,6 +835,13 @@ msgstr "áá¥ááá á£ááá áááááááá áá¡ ááá
 msgid "Block user"
 msgstr "áááá®ááá ááááá¡ áááááááá"
 
+#: actions/block.php:138
+msgid ""
+"Are you sure you want to block this user? Afterwards, they will be "
+"unsubscribed from you, unable to subscribe to you in the future, and you "
+"will not be notified of any @-replies from them."
+msgstr ""
+
 #. TRANS: Button label on the user block form.
 #. TRANS: Button label on the delete application form.
 #. TRANS: Button label on the delete notice form.
@@ -780,7 +873,9 @@ msgid "Yes"
 msgstr "áááá®"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
+#. TRANS: Submit button title.
+#. TRANS: Description of the form to block a user.
+#: actions/block.php:164 actions/groupmembers.php:403 lib/blockform.php:82
 msgid "Block this user"
 msgstr "ááááááá áá¡ áááá®ááá ááááá"
 
@@ -822,11 +917,13 @@ msgstr "áá á¯áá£á¤á¨á ááá¬ááá ááááááá¡áá
 msgid "Unblock user from group"
 msgstr "áááá®ááá ááááá¡ áááááá áááá¡ ááá®á¡áá á¯áá£á¤áááá"
 
-#: actions/blockedfromgroup.php:320 lib/unblockform.php:69
+#. TRANS: Title for the form to unblock a user.
+#: actions/blockedfromgroup.php:320 lib/unblockform.php:70
 msgid "Unblock"
 msgstr "áááááá áááá¡ ááá®á¡áá"
 
-#: actions/blockedfromgroup.php:320 lib/unblockform.php:80
+#. TRANS: Description of the form to unblock a user.
+#: actions/blockedfromgroup.php:320 lib/unblockform.php:82
 msgid "Unblock this user"
 msgstr "áááá®ááá ááááá¡ áááááá áááá¡ ááá®á¡áá"
 
@@ -865,9 +962,9 @@ msgstr "áá¡ ááá¡áááá áá á£ááá ááááá¡á¢á£á 
 #. 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/confirmaddress.php:116 actions/emailsettings.php:331
+#: actions/emailsettings.php:477 actions/imsettings.php:283
+#: actions/imsettings.php:442 actions/othersettings.php:174
 #: actions/profilesettings.php:283 actions/smssettings.php:308
 #: actions/smssettings.php:464
 msgid "Couldn't update user."
@@ -875,7 +972,7 @@ msgstr "áááá®ááá ááááá¡ ááááá®áááá áá
 
 #. 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/confirmaddress.php:128 actions/emailsettings.php:437
 #: actions/smssettings.php:422
 msgid "Couldn't delete email confirmation."
 msgstr "áá. á¤áá¡á¢áá¡ ááááá¡á¢á£á áááá¡ á¬áá¨áá ááá  ááá®áá á®áá."
@@ -911,9 +1008,10 @@ msgstr "áááááááªáá ááá  áááá«áááá."
 msgid "You are not the owner of this application."
 msgstr "áá¥ááá áá  á®áá á áá áááááááªááá¡ áá¤áááááá."
 
+#. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:127
 #: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1307
+#: lib/action.php:1315
 msgid "There was a problem with your session token."
 msgstr ""
 
@@ -946,7 +1044,7 @@ msgstr "áááááááªááá¡ á¬áá¨áá"
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
 #: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:73 lib/profileformaction.php:64
+#: lib/adminpanelaction.php:71 lib/profileformaction.php:64
 #: lib/settingsaction.php:72
 msgid "Not logged in."
 msgstr "ááá¢áá ááááá£áá áá  á®áá á."
@@ -1007,7 +1105,6 @@ msgstr "áá áááá®ááá ááááá¡ á¬áá¨áá"
 #. TRANS: Message used as title for design settings for the site.
 #. TRANS: Link description in user account settings menu.
 #: actions/designadminpanel.php:63 lib/accountsettingsaction.php:139
-#: lib/groupnav.php:119
 msgid "Design"
 msgstr "áá áááá®ááá ááááá¡ á¬áá¨áá"
 
@@ -1129,13 +1226,13 @@ msgstr "ááááá á£áá ááá ááááááá ááááá
 msgid "Reset back to default"
 msgstr "ááá áááááááá¡ ááá áááá¢á áááá¡ áááá á£áááá"
 
-#. TRANS: Submit button title
+#. TRANS: Submit button title.
 #: actions/designadminpanel.php:685 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/snapshotadminpanel.php:245
 #: actions/subscriptions.php:226 actions/tagother.php:154
-#: actions/useradminpanel.php:294 lib/applicationeditform.php:363
+#: actions/useradminpanel.php:294 lib/applicationeditform.php:353
 #: lib/designsettings.php:256 lib/groupeditform.php:202
 msgid "Save"
 msgstr "á¨áááá®áá"
@@ -1210,6 +1307,14 @@ msgstr "áá áááááááªáá á«ááááá áá á«ááá
 msgid "Organization homepage is required."
 msgstr "áá áááááááªááá¡ ááá. áááá áá á¡áááááááá£ááá."
 
+#: actions/editapplication.php:218 actions/newapplication.php:206
+msgid "Callback is too long."
+msgstr ""
+
+#: actions/editapplication.php:225 actions/newapplication.php:215
+msgid "Callback URL is not valid."
+msgstr ""
+
 #: actions/editapplication.php:258
 msgid "Could not update application."
 msgstr "áááááááªááá¡ ááááá®áááá ááá  ááá®áá á®áá."
@@ -1237,10 +1342,20 @@ msgstr "á¯áá£á¤áá¡ á áááá¥á¢áá áááá¡ááááá¡ 
 msgid "description is too long (max %d chars)."
 msgstr "áá¦á¬áá á á«ááááá áá á«áááá (áá áá£ááá¢áá¡ %d á¡áááááá)."
 
+#: actions/editgroup.php:228 actions/newgroup.php:168
+#, php-format
+msgid "Invalid alias: \"%s\""
+msgstr ""
+
 #: actions/editgroup.php:258
 msgid "Could not update group."
 msgstr "á¯áá£á¤áá¡ ááááá®áááá ááá  ááá®áá á®áá."
 
+#. TRANS: Server exception thrown when creating group aliases failed.
+#: actions/editgroup.php:264 classes/User_group.php:514
+msgid "Could not create aliases."
+msgstr ""
+
 #: actions/editgroup.php:280
 msgid "Options saved."
 msgstr "ááá áááá¢á ááá á¨áááá®á£ááá."
@@ -1273,7 +1388,7 @@ msgstr "áááááááá á ááááá¡á¢á£á ááá£áá á
 #. 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/emailsettings.php:115 actions/emailsettings.php:162
 #: actions/imsettings.php:116 actions/smssettings.php:124
 #: actions/smssettings.php:180
 msgctxt "BUTTON"
@@ -1291,22 +1406,26 @@ msgstr ""
 #. 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
+#. TRANS: Button label in the "Edit application" form.
 #: actions/emailsettings.php:127 actions/imsettings.php:131
-#: actions/smssettings.php:137 lib/applicationeditform.php:357
+#: actions/smssettings.php:137 lib/applicationeditform.php:347
 msgctxt "BUTTON"
 msgid "Cancel"
 msgstr "ááá£á¥áááá"
 
-#. TRANS: Instructions for e-mail address input form.
-#: actions/emailsettings.php:135
+#. TRANS: Instructions for e-mail address input form. Do not translate
+#. TRANS: "example.org". It is one of the domain names reserved for
+#. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
+#. TRANS: Any other domain may be owned by a legitimate person or
+#. TRANS: organization.
+#: actions/emailsettings.php:139
 msgid "Email address, like \"UserName@example.org\""
 msgstr "áá. á¤áá¡á¢áá¡ ááá¡áááá áá, á áááá áª \"UserName@example.org\""
 
 #. 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/emailsettings.php:143 actions/imsettings.php:151
 #: actions/smssettings.php:162
 msgctxt "BUTTON"
 msgid "Add"
@@ -1314,101 +1433,112 @@ msgstr "ááááá¢ááá"
 
 #. 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
+#: actions/emailsettings.php:151 actions/smssettings.php:171
 msgid "Incoming email"
 msgstr "á¨ááááááááá áá. á¤áá¡á¢á"
 
 #. 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
+#: actions/emailsettings.php:159 actions/smssettings.php:178
 msgid "Send email to this address to post new notices."
 msgstr "ááááááááá áá. á¤áá¡á¢á áá ááá¡áááá ááá áá®ááá á¨áá¢á§áááááááááá¡ ááá¡áááá¡á¢áá."
 
+#. TRANS: Instructions for incoming e-mail address input form.
+#. TRANS: Instructions for incoming SMS e-mail address input form.
+#: actions/emailsettings.php:168 actions/smssettings.php:186
+msgid "Make a new email address for posting to; cancels the old one."
+msgstr ""
+
 #. 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
+#: actions/emailsettings.php:172 actions/smssettings.php:189
 msgctxt "BUTTON"
 msgid "New"
 msgstr "áá®ááá"
 
 #. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:174
+#: actions/emailsettings.php:178
 msgid "Email preferences"
 msgstr "áá. á¤áá¡á¢áá¡ ááá áááá¢á ááá"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:180
+#: actions/emailsettings.php:184
 msgid "Send me notices of new subscriptions through email."
 msgstr ""
 "áááááááááááá á¨áá¢á§ááááááááá áá®ááá ááááá¬áá áááá¡ á¨áá¡áá®áá áá. á¤áá¡á¢áá¡ á¡áá¨á£áááááá."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:186
+#: actions/emailsettings.php:190
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr ""
 "áááááááááááá áá. á¬áá ááá á áááá¡ááª ááááá á©ááá¡ á¨áá¢á§áááááááá¡ á á©áá£áááá¨á áááááá¢ááá¡."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:193
+#: actions/emailsettings.php:197
 msgid "Send me email when someone sends me a private message."
 msgstr "áááááááááááá áá. á¬áá ááá á áááá¡ááª ááááá ááá áá á¨áá¢á§áááááááá¡ áááá¬áá á¡."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:199
+#: actions/emailsettings.php:203
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr "áááááááááááá á¬áá ááá á áááá¡ááª ááááá ááááááááááááá¡ \"@-ááá¡á£á®á¡\"."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:205
+#: actions/emailsettings.php:209
 msgid "Allow friends to nudge me and send me an email."
 msgstr ""
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:212
+#: actions/emailsettings.php:216
 msgid "I want to post notices by email."
 msgstr "ááááá áááááá¡á¢á á¨áá¢á§ááááááááá áá. á¤áá¡á¢áá."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:219
+#: actions/emailsettings.php:223
 msgid "Publish a MicroID for my email address."
 msgstr "áááááá¥ááá§áá MicroID á©ááá áá. á¤áá¡á¢áá¡ ááá¡áááá ááá¡áááá¡."
 
 #. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:334
+#: actions/emailsettings.php:338
 msgid "Email preferences saved."
 msgstr "áá. á¤áá¡á¢áá¡ ááá áááá¢á ááá á¨áááá®á£ááá."
 
 #. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:353
+#: actions/emailsettings.php:357
 msgid "No email address."
 msgstr " áá. á¤áá¡á¢áá¡ ááá¡áááá áá áááááááá£áá áá  áá áá¡."
 
+#. TRANS: Message given saving e-mail address that cannot be normalised.
+#: actions/emailsettings.php:365
+msgid "Cannot normalize that email address"
+msgstr ""
+
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:208
+#: actions/emailsettings.php:370 actions/register.php:208
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "áá áá¡á¬áá á áá. á¤áá¡á¢áá¡ ááá¡áááá áá."
 
 #. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:370
+#: actions/emailsettings.php:374
 msgid "That is already your email address."
 msgstr "áá¡ á£ááá áá áá¡ áá¥áááá áá. á¤áá¡á¢áá¡ ááá¡áááá áá."
 
 #. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:374
+#: actions/emailsettings.php:378
 msgid "That email address already belongs to another user."
 msgstr "áá¡ áá. á¤áá¡á¢áá¡ ááá¡áááá áá áááááááá£ááá."
 
 #. 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/emailsettings.php:395 actions/imsettings.php:351
 #: actions/smssettings.php:373
 msgid "Couldn't insert confirmation code."
 msgstr "ááá¡á¢á£á áá¡ ááááá¡ á©áá¡áá ááá  ááá®áá á®áá."
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:398
+#: actions/emailsettings.php:402
 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."
@@ -1420,50 +1550,50 @@ msgstr ""
 #. 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/emailsettings.php:423 actions/imsettings.php:386
 #: actions/smssettings.php:408
 msgid "No pending confirmation to cancel."
 msgstr "ááá¡áá£á¥áááááááá áá¤áá áá. áá  áá áá¡ ááááááááá ááá¡á¢á£á á."
 
 #. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:424
+#: actions/emailsettings.php:428
 msgid "That is the wrong email address."
 msgstr "áá¡ áá áá¡á¬áá á áá. á¤áá¡á¢áá¡ ááá¡áááá ááá."
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:438
+#: actions/emailsettings.php:442
 msgid "Email confirmation cancelled."
 msgstr "áá. á¤áá¡á¢áá¡ ááááá¡á¢á£á ááá ááá£á¥áááá£ááá."
 
 #. TRANS: Message given trying to remove an e-mail address that is not
 #. TRANS: registered for the active user.
-#: actions/emailsettings.php:458
+#: actions/emailsettings.php:462
 msgid "That is not your email address."
 msgstr "áá¡ áá  áá áá¡ áá¥áááá áá. á¤áá¡á¢áá¡ ááá¡áááá áá."
 
 #. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:479
+#: actions/emailsettings.php:483
 msgid "The email address was removed."
 msgstr "áá. á¤áá¡á¢áá¡ ááá¡áááá áá ááá¨áá ááá£ááá."
 
-#: actions/emailsettings.php:493 actions/smssettings.php:568
+#: actions/emailsettings.php:497 actions/smssettings.php:568
 msgid "No incoming email address."
 msgstr "á¨ááááááááá áá. á¤áá¡á¢áá¡ ááá¡áááá áá áá  áá áá¡."
 
 #. 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/emailsettings.php:508 actions/emailsettings.php:532
 #: actions/smssettings.php:578 actions/smssettings.php:602
 msgid "Couldn't update user record."
 msgstr "áááá®ááá ááááá¡ á©áááá¬áá áá¡ ááááá®áááá ááá  ááá®áá á®áá."
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
-#: actions/emailsettings.php:508 actions/smssettings.php:581
+#: actions/emailsettings.php:512 actions/smssettings.php:581
 msgid "Incoming email address removed."
 msgstr "á¨ááááááááá áá. á¤áá¡á¢áá¡ ááá¡áááá áá ááá¨áá ááá£ááá."
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
-#: actions/emailsettings.php:532 actions/smssettings.php:605
+#: actions/emailsettings.php:536 actions/smssettings.php:605
 msgid "New incoming email address added."
 msgstr "ááááá¢ááá£ááá áá®ááá á¨ááááááááá áá. á¤áá¡á¢á."
 
@@ -1581,7 +1711,7 @@ msgstr ""
 msgid "Remote service uses unknown version of OMB protocol."
 msgstr "ááá¨áá ááá£áá á¡áá ááá¡á OMB áá áá¢áááááá¡ á£áªááá ááá á¡ááá¡ áá§ááááá¡."
 
-#: actions/finishremotesubscribe.php:138
+#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306
 msgid "Error updating remote profile."
 msgstr "á¨ááªáááá ááá¨áá ááá£áá áá áá¤áááá¡ ááááá®ááááá¡áá¡."
 
@@ -1638,7 +1768,7 @@ msgstr "áááá®ááá ááááá á£ááá ááá ááªá®á£
 msgid "User is not a member of group."
 msgstr "áááá®ááá ááááá áá  áá áá¡ á¯áá£á¤áá¡ á¬ááá á."
 
-#: actions/groupblock.php:134 actions/groupmembers.php:360
+#: actions/groupblock.php:134 actions/groupmembers.php:364
 msgid "Block user from group"
 msgstr "áááá®ááá ááááá¡ ááá ááªá®áá á¯áá£á¤áááá."
 
@@ -1719,40 +1849,32 @@ msgstr "áááá ááááá®ááá."
 msgid "Failed updating logo."
 msgstr "ááááá¡ ááááá®áááá ááá  ááá®áá á®áá."
 
-#: actions/groupmembers.php:100 lib/groupnav.php:92
+#. TRANS: Title of the page showing group members.
+#. TRANS: %s is the name of the group.
+#: actions/groupmembers.php:102
 #, php-format
 msgid "%s group members"
 msgstr "%s á¯áá£á¤áá¡ á¬ááá á"
 
-#: actions/groupmembers.php:103
+#. TRANS: Title of the page showing group members.
+#. TRANS: %1$s is the name of the group, %2$d is the page number of the members list.
+#: actions/groupmembers.php:107
 #, php-format
 msgid "%1$s group members, page %2$d"
 msgstr "%1$s á¯áá£á¤áá¡ á¬ááá á, áááá áá %2$d"
 
-#: actions/groupmembers.php:118
+#: actions/groupmembers.php:122
 msgid "A list of the users in this group."
 msgstr "áá á¯áá£á¤áá¡ á¬ááá áááá¡ á¡áá."
 
-#: actions/groupmembers.php:182 lib/groupnav.php:107
+#: actions/groupmembers.php:186
 msgid "Admin"
 msgstr "áááááá"
 
-#: actions/groupmembers.php:392 lib/blockform.php:69
-msgid "Block"
-msgstr "áááááá ááá"
-
-#: actions/groupmembers.php:487
+#: actions/groupmembers.php:498
 msgid "Make user an admin of the group"
 msgstr "ááááááá áááá®ááá ááááá¡ á¯áá£á¤áá¡ áááááááá"
 
-#: actions/groupmembers.php:519
-msgid "Make Admin"
-msgstr "ááááááá áááááááá"
-
-#: actions/groupmembers.php:519
-msgid "Make this user an admin"
-msgstr "ááááááá áá áááá®ááá ááááá¡ áááááááá"
-
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Title in atom group notice feed. %s is a group name.
 #. TRANS: Title in atom user notice feed. %s is a user name.
@@ -1891,7 +2013,10 @@ msgstr ""
 
 #. TRANS: IM address input field instructions in IM settings form.
 #. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:140
+#. TRANS: Do not translate "example.org". It is one of the domain names reserved for use in examples by
+#. TRANS: http://www.rfc-editor.org/rfc/rfc2606.txt. Any other domain may be owned by a legitimate
+#. TRANS: person or organization.
+#: actions/imsettings.php:143
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -1901,64 +2026,64 @@ msgstr ""
 "ááá á¬áá£áááá, á áá áááááá¢áá %s áááááá áááá¡ á¡ááá¨á áá¥áááá¡ IM áááááá¢á¨á áá GTalk-á¨á."
 
 #. TRANS: Form legend for IM preferences form.
-#: actions/imsettings.php:155
+#: actions/imsettings.php:158
 msgid "IM preferences"
 msgstr "IM ááá áááá¢á ááá"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:160
+#: actions/imsettings.php:163
 msgid "Send me notices through Jabber/GTalk."
 msgstr "áááááááááááá á¨áá¢á§ááááááááá  Jabber/GTalk-áá¡ ááá¨áááááá."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:166
+#: actions/imsettings.php:169
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr "ááááá¡á¢á á¨áá¢á§ááááááá, á áááá¡ááª á©ááá Jabber/GTalk á¡á¢áá¢á£á¡á á¨áááªááááá."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:172
+#: actions/imsettings.php:175
 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr ""
 "áááááááááááá ááá¡á£á®ááá Jabber/GTalk-áá á®ááá®áá¡ááá, á ááááá áááááááá á áá  ááá ."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:179
+#: actions/imsettings.php:182
 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "áááááá¥ááá§áá  MicroID á©ááá Jabber/GTalk ááá¡áááá ááá¡áááá¡."
 
 #. TRANS: Confirmation message for successful IM preferences save.
-#: actions/imsettings.php:287 actions/othersettings.php:180
+#: actions/imsettings.php:290 actions/othersettings.php:180
 msgid "Preferences saved."
 msgstr "ááá áááá¢á ááá á¨áááá®á£ááá."
 
 #. TRANS: Message given saving IM address without having provided one.
-#: actions/imsettings.php:309
+#: actions/imsettings.php:312
 msgid "No Jabber ID."
 msgstr "Jabber ID á£áªááááá."
 
 #. TRANS: Message given saving IM address that cannot be normalised.
-#: actions/imsettings.php:317
+#: actions/imsettings.php:320
 msgid "Cannot normalize that Jabber ID"
 msgstr "Jabber ID-á¡ ááá áááááááªáá ááá  á®áá á®áááá"
 
 #. TRANS: Message given saving IM address that not valid.
-#: actions/imsettings.php:322
+#: actions/imsettings.php:325
 msgid "Not a valid Jabber ID"
 msgstr "áá áá¡á¬áá á Jabber ID"
 
 #. TRANS: Message given saving IM address that is already set.
-#: actions/imsettings.php:326
+#: actions/imsettings.php:329
 msgid "That is already your Jabber ID."
 msgstr "áá¡ á£ááá áá áá¡ áá¥áááá Jabber ID."
 
 #. TRANS: Message given saving IM address that is already set for another user.
-#: actions/imsettings.php:330
+#: actions/imsettings.php:333
 msgid "Jabber ID already belongs to another user."
 msgstr "Jabber ID á£ááá ááá£ááááá¡ á¡á®áá áááá®ááá ááááá¡."
 
 #. 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
+#: actions/imsettings.php:361
 #, php-format
 msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
@@ -1968,28 +2093,28 @@ msgstr ""
 "s-á¡ ááááááááááááá á¨áá¢á§ááááááááá."
 
 #. TRANS: Message given canceling IM address confirmation for the wrong IM address.
-#: actions/imsettings.php:388
+#: actions/imsettings.php:391
 msgid "That is the wrong IM address."
 msgstr "áá¡ áá áá¡á¬áá á IM ááá¡áááá ááá."
 
 #. TRANS: Server error thrown on database error canceling IM address confirmation.
-#: actions/imsettings.php:397
+#: actions/imsettings.php:400
 msgid "Couldn't delete IM confirmation."
 msgstr "IM ááá¡á¢á£á áá¡ á¬áá¨áá ááá  ááá®áá á®áá."
 
 #. TRANS: Message given after successfully canceling IM address confirmation.
-#: actions/imsettings.php:402
+#: actions/imsettings.php:405
 msgid "IM confirmation cancelled."
 msgstr "IM ááá¡á¢á£á á ááá£á¥ááá."
 
 #. TRANS: Message given trying to remove an IM address that is not
 #. TRANS: registered for the active user.
-#: actions/imsettings.php:424
+#: actions/imsettings.php:427
 msgid "That is not your Jabber ID."
 msgstr "áá¡ áá  áá áá¡ áá¥áááá Jabber ID"
 
 #. TRANS: Message given after successfully removing a registered IM address.
-#: actions/imsettings.php:447
+#: actions/imsettings.php:450
 msgid "The IM address was removed."
 msgstr "IM ááá¡áááá áá ááá¨áá ááá£ááá."
 
@@ -2189,6 +2314,10 @@ msgstr "á£ááá ááá¢áá áááá ááá£áá á®áá á."
 msgid "Incorrect username or password."
 msgstr "áá áá¡á¬áá á áááá®ááá ááááá¡ á¡áá®ááá áá ááá ááá."
 
+#: actions/login.php:154 actions/otp.php:120
+msgid "Error setting user. You are probably not authorized."
+msgstr ""
+
 #: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
 msgid "Login"
 msgstr "á¨áá¡ááá"
@@ -2379,6 +2508,14 @@ msgid ""
 "This user doesn't allow nudges or hasn't confirmed or set their email yet."
 msgstr ""
 
+#: actions/nudge.php:94
+msgid "Nudge sent"
+msgstr ""
+
+#: actions/nudge.php:97
+msgid "Nudge sent!"
+msgstr ""
+
 #: actions/oauthappssettings.php:59
 msgid "You must be logged in to list your applications."
 msgstr "áá¥áááá áááááááªááááá¡ á¡ááá¡ á¡áááá®áááá á¡áááá áá ááá áá¢ááááªáá."
@@ -2445,8 +2582,8 @@ msgid "Only %s URLs over plain HTTP please."
 msgstr "ááá®ááá áááááá§áááá áá®áááá %s URLâááá á¬ááááá HTTP ááááááá."
 
 #. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1215
-#: lib/apiaction.php:1243 lib/apiaction.php:1366
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1206
+#: lib/apiaction.php:1233 lib/apiaction.php:1356
 msgid "Not a supported data format."
 msgstr "áááááªáááá á¤áá ááá¢á áá®áá ááááá ááá áá  áá áá¡."
 
@@ -2494,10 +2631,22 @@ msgstr "URLâá¡ á¨ááááááááá¡ á¡áá ááá¡á á«áá
 msgid "No user ID specified."
 msgstr "áááá®ááá ááááá¡ ID áááááááá£áá áá  áá áá¡."
 
+#: actions/otp.php:83
+msgid "No login token specified."
+msgstr ""
+
 #: actions/otp.php:90
 msgid "No login token requested."
 msgstr ""
 
+#: actions/otp.php:95
+msgid "Invalid login token specified."
+msgstr ""
+
+#: actions/otp.php:104
+msgid "Login token expired."
+msgstr ""
+
 #: actions/outbox.php:58
 #, php-format
 msgid "Outbox for %1$s - page %2$d"
@@ -2576,7 +2725,7 @@ msgid "Password saved."
 msgstr "ááá ááá á¨áááá®á£ááá."
 
 #. TRANS: Menu item for site administration
-#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:384
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:371
 msgid "Paths"
 msgstr "ááááá"
 
@@ -2599,6 +2748,11 @@ msgstr "áááá¢áá áá¡ ááá áá¥á¢áá áá áá  áá á
 msgid "Background directory not writable: %s."
 msgstr "á¤áááá¡ ááá áá¥á¢áá áá áá  áá áá¡ á©áá¬áá ááá: %s."
 
+#: actions/pathsadminpanel.php:177
+#, php-format
+msgid "Locales directory not readable: %s."
+msgstr ""
+
 #: actions/pathsadminpanel.php:183
 msgid "Invalid SSL server. The maximum length is 255 characters."
 msgstr "áá áá¡á¬áá á SSL á¡áá ááá á. ááá¥á¡ááááá£á á á¡ááá á«á áá áá¡ 255 á¡áááááá."
@@ -2784,7 +2938,7 @@ msgstr "á¡á á£áá á¡áá®ááá"
 
 #. TRANS: Form input field label.
 #: actions/profilesettings.php:115 actions/register.php:460
-#: lib/applicationeditform.php:244 lib/groupeditform.php:161
+#: lib/applicationeditform.php:235 lib/groupeditform.php:161
 msgid "Homepage"
 msgstr "ááá. áááá á¡á"
 
@@ -2890,7 +3044,7 @@ msgid "Couldn't save tags."
 msgstr "á¡áááá¨áááááá¡ á¨áááá®áá ááá  ááá®áá á®áá."
 
 #. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:391 lib/adminpanelaction.php:141
+#: actions/profilesettings.php:391 lib/adminpanelaction.php:138
 msgid "Settings saved."
 msgstr "ááá áááá¢á ááá á¨áááá®á£ááá."
 
@@ -3356,6 +3510,21 @@ msgstr "ááá¡á£á®ááá %sâá¡"
 msgid "Replies to %1$s, page %2$d"
 msgstr "ááá¡á£á®ááá %1$sâá¡, áááá áá %2$d"
 
+#: actions/replies.php:145
+#, php-format
+msgid "Replies feed for %s (RSS 1.0)"
+msgstr ""
+
+#: actions/replies.php:152
+#, php-format
+msgid "Replies feed for %s (RSS 2.0)"
+msgstr ""
+
+#: actions/replies.php:159
+#, php-format
+msgid "Replies feed for %s (Atom)"
+msgstr ""
+
 #: actions/replies.php:199
 #, php-format
 msgid ""
@@ -3374,6 +3543,13 @@ msgstr ""
 "áá¥ááá á¨áááá«áááá á©ááá ááá á¡áá£ááá á¨á á¡á®áá áááá®ááá áááááááá áá ááá, áááááá¬áá áá ááá¢á "
 "ááá ááááááááá¡ ááááá®áááááá, áá [ááá¬ááá áááááá á¯áá£á¤á¨á](%%action.groups%%)."
 
+#: actions/replies.php:206
+#, php-format
+msgid ""
+"You can try to [nudge %1$s](../%2$s) or [post something to them](%%%%action."
+"newnotice%%%%?status_textarea=%3$s)."
+msgstr ""
+
 #: actions/repliesrss.php:72
 #, php-format
 msgid "Replies to %1$s on %2$s!"
@@ -3401,7 +3577,7 @@ msgstr "áááá®ááá ááááá á£ááá áááááá á
 
 #. TRANS: Menu item for site administration
 #: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
-#: lib/adminpanelaction.php:392
+#: lib/adminpanelaction.php:379
 msgid "Sessions"
 msgstr "á¡áá¡áááá"
 
@@ -3439,24 +3615,24 @@ msgid "Application profile"
 msgstr "áááááááªááá¡ áá áá¤ááá"
 
 #. TRANS: Form input field label for application icon.
-#: actions/showapplication.php:159 lib/applicationeditform.php:182
+#: actions/showapplication.php:159 lib/applicationeditform.php:173
 msgid "Icon"
 msgstr ""
 
 #. TRANS: Form input field label for application name.
 #: actions/showapplication.php:169 actions/version.php:197
-#: lib/applicationeditform.php:199
+#: lib/applicationeditform.php:190
 msgid "Name"
 msgstr "ááá¡áá®ááááá"
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:178 lib/applicationeditform.php:235
+#: actions/showapplication.php:178 lib/applicationeditform.php:226
 msgid "Organization"
 msgstr "áá áááááááªáá"
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:216 lib/groupeditform.php:172
+#: lib/applicationeditform.php:207 lib/groupeditform.php:172
 msgid "Description"
 msgstr "áá¦á¬áá á"
 
@@ -3525,6 +3701,21 @@ msgstr "%1$s-áá¡ á á©áá£áá á¨áá¢á§ááááááááá,
 msgid "Could not retrieve favorite notices."
 msgstr "á á©áá£áá á¨áá¢á§áááááááááá¡ áááááá®áááá ááá  ááá®áá á®áá."
 
+#: actions/showfavorites.php:171
+#, php-format
+msgid "Feed for favorites of %s (RSS 1.0)"
+msgstr ""
+
+#: actions/showfavorites.php:178
+#, php-format
+msgid "Feed for favorites of %s (RSS 2.0)"
+msgstr ""
+
+#: actions/showfavorites.php:185
+#, php-format
+msgid "Feed for favorites of %s (Atom)"
+msgstr ""
+
 #: actions/showfavorites.php:206
 msgid ""
 "You haven't chosen any favorite notices yet. Click the fave button on "
@@ -3540,10 +3731,32 @@ msgid ""
 "would add to their favorites :)"
 msgstr ""
 
+#: actions/showfavorites.php:212
+#, php-format
+msgid ""
+"%s hasn't added any favorite notices yet. Why not [register an account](%%%%"
+"action.register%%%%) and then post something interesting they would add to "
+"their favorites :)"
+msgstr ""
+
 #: actions/showfavorites.php:243
 msgid "This is a way to share what you like."
 msgstr ""
 
+#: actions/showgroup.php:82
+#, php-format
+msgid "%s group"
+msgstr ""
+
+#: actions/showgroup.php:84
+#, php-format
+msgid "%1$s group, page %2$d"
+msgstr ""
+
+#: actions/showgroup.php:227
+msgid "Group profile"
+msgstr ""
+
 #: actions/showgroup.php:272 actions/tagother.php:118
 #: actions/userauthorization.php:175 lib/userprofile.php:178
 msgid "URL"
@@ -3554,7 +3767,35 @@ msgstr ""
 msgid "Note"
 msgstr "á¨áááá¨ááá"
 
-#: actions/showgroup.php:393 actions/showgroup.php:445 lib/groupnav.php:91
+#: actions/showgroup.php:293 lib/groupeditform.php:184
+msgid "Aliases"
+msgstr ""
+
+#: actions/showgroup.php:302
+msgid "Group actions"
+msgstr ""
+
+#: actions/showgroup.php:338
+#, php-format
+msgid "Notice feed for %s group (RSS 1.0)"
+msgstr ""
+
+#: actions/showgroup.php:344
+#, php-format
+msgid "Notice feed for %s group (RSS 2.0)"
+msgstr ""
+
+#: actions/showgroup.php:350
+#, php-format
+msgid "Notice feed for %s group (Atom)"
+msgstr ""
+
+#: actions/showgroup.php:355
+#, php-format
+msgid "FOAF for %s group"
+msgstr ""
+
+#: actions/showgroup.php:393 actions/showgroup.php:445
 msgid "Members"
 msgstr "á¬ááá ááá"
 
@@ -3564,16 +3805,134 @@ msgstr "á¬ááá ááá"
 msgid "(None)"
 msgstr "(áá áªáá áá)"
 
+#: actions/showgroup.php:404
+msgid "All members"
+msgstr ""
+
 #: actions/showgroup.php:439
 msgid "Created"
 msgstr "á¨áá¥áááááá"
 
+#: actions/showgroup.php:455
+#, php-format
+msgid ""
+"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. Its members share short messages about "
+"their life and interests. [Join now](%%%%action.register%%%%) to become part "
+"of this group and many more! ([Read more](%%%%doc.help%%%%))"
+msgstr ""
+
+#: actions/showgroup.php:461
+#, php-format
+msgid ""
+"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. Its members share short messages about "
+"their life and interests. "
+msgstr ""
+
+#: actions/showgroup.php:489
+msgid "Admins"
+msgstr ""
+
+#: actions/showmessage.php:81
+msgid "No such message."
+msgstr ""
+
+#: actions/showmessage.php:98
+msgid "Only the sender and recipient may read this message."
+msgstr ""
+
+#: actions/showmessage.php:108
+#, php-format
+msgid "Message to %1$s on %2$s"
+msgstr ""
+
+#: actions/showmessage.php:113
+#, php-format
+msgid "Message from %1$s on %2$s"
+msgstr ""
+
+#: actions/shownotice.php:90
+msgid "Notice deleted."
+msgstr ""
+
+#: actions/showstream.php:73
+#, php-format
+msgid " tagged %s"
+msgstr ""
+
+#: actions/showstream.php:79
+#, php-format
+msgid "%1$s, page %2$d"
+msgstr ""
+
+#: actions/showstream.php:122
+#, php-format
+msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
+msgstr ""
+
+#: actions/showstream.php:129
+#, php-format
+msgid "Notice feed for %s (RSS 1.0)"
+msgstr ""
+
+#: actions/showstream.php:136
+#, php-format
+msgid "Notice feed for %s (RSS 2.0)"
+msgstr ""
+
+#: actions/showstream.php:143
+#, php-format
+msgid "Notice feed for %s (Atom)"
+msgstr ""
+
+#: actions/showstream.php:148
+#, php-format
+msgid "FOAF for %s"
+msgstr ""
+
+#: actions/showstream.php:200
+#, php-format
+msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet."
+msgstr ""
+
 #: actions/showstream.php:205
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
 msgstr ""
 
+#: actions/showstream.php:207
+#, php-format
+msgid ""
+"You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
+"%?status_textarea=%2$s)."
+msgstr ""
+
+#: actions/showstream.php:243
+#, php-format
+msgid ""
+"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. [Join now](%%%%action.register%%%%) to "
+"follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))"
+msgstr ""
+
+#: actions/showstream.php:248
+#, php-format
+msgid ""
+"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. "
+msgstr ""
+
+#: actions/showstream.php:305
+#, php-format
+msgid "Repeat of %s"
+msgstr ""
+
 #: actions/silence.php:65 actions/unsilence.php:65
 msgid "You cannot silence users on this site."
 msgstr "áá¥ááá ááá  á¨áá«áááá áááá®ááá ááááááá¡ áááá£ááááá¡ áá á¡ááá¢áá."
@@ -3619,6 +3978,10 @@ msgstr "á¡ááá¢áá¡ á¡áá®ááá"
 msgid "The name of your site, like \"Yourcompany Microblog\""
 msgstr "áá¥áááá á¡ááá¢áá¡ á¡áá®ááá, á áááá áª \"áá¥áááá ááááááááá¡ áááá áááááá\""
 
+#: actions/siteadminpanel.php:229
+msgid "Brought by"
+msgstr ""
+
 #: actions/siteadminpanel.php:230
 msgid "Text used for credits link in footer of each page"
 msgstr "á¢áá¥á¡á¢á ááááá§ááááá£áá áááááá£áá áááá ááá¡ ááááá¡ áá áááá¢áááá¡áááá¡"
@@ -3667,6 +4030,10 @@ msgstr "á¢áá¥á¡á¢áá¡ áá¦ááá á"
 msgid "Maximum number of characters for notices."
 msgstr "á¨áá¢á§áááááááá¡ á¡áááááááá ááá¥á¡ááááá£á á á áááááááá."
 
+#: actions/siteadminpanel.php:278
+msgid "Dupe limit"
+msgstr ""
+
 #: actions/siteadminpanel.php:278
 msgid "How long users must wait (in seconds) to post the same thing again."
 msgstr ""
@@ -3859,7 +4226,7 @@ msgstr "áááá áá  áá áá¡ á¨áá§áááááá"
 
 #. TRANS: Menu item for site administration
 #: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
-#: lib/adminpanelaction.php:408
+#: lib/adminpanelaction.php:395
 msgid "Snapshots"
 msgstr "á¬ááá ááá á¡áááá"
 
@@ -3875,6 +4242,10 @@ msgstr "á¬ááá ááá á¡ááá¡ ááá¨ááááá¡ áá áá¡
 msgid "Snapshot frequency must be a number."
 msgstr "á¬ááá ááá á¡ááá¡ á¡áá®á¨áá á áªáá¤á á á£ááá áá§áá¡."
 
+#: actions/snapshotadminpanel.php:144
+msgid "Invalid snapshot report URL."
+msgstr ""
+
 #: actions/snapshotadminpanel.php:200
 msgid "Randomly during web hit"
 msgstr ""
@@ -3883,6 +4254,10 @@ msgstr ""
 msgid "In a scheduled job"
 msgstr ""
 
+#: actions/snapshotadminpanel.php:206
+msgid "Data snapshots"
+msgstr ""
+
 #: actions/snapshotadminpanel.php:208
 msgid "When to send statistical data to status.net servers"
 msgstr "á áááá¡ áááááááááá¡ á¡á¢áá¢áá¡á¢ááá£á á áááááªááááá status.net á¡áá ááá á¡"
@@ -3891,6 +4266,14 @@ msgstr "á áááá¡ áááááááááá¡ á¡á¢áá¢áá¡á¢á
 msgid "Frequency"
 msgstr "á¡áá®á¨áá á"
 
+#: actions/snapshotadminpanel.php:218
+msgid "Snapshots will be sent once every N web hits"
+msgstr ""
+
+#: actions/snapshotadminpanel.php:226
+msgid "Report URL"
+msgstr ""
+
 #: actions/snapshotadminpanel.php:227
 msgid "Snapshots will be sent to this URL"
 msgstr "ááááááá áááá ááááááááááá áá URL-áá"
@@ -4034,6 +4417,10 @@ msgstr "á¨áá¢á§áááááááááá¡ RSS ááááá¨áá£á
 msgid "Notice feed for tag %s (Atom)"
 msgstr "á¨áá¢á§áááááááááá¡ RSS ááááá¨áá£áá %s-á (Atom)"
 
+#: actions/tagother.php:39
+msgid "No ID argument."
+msgstr ""
+
 #: actions/tagother.php:65
 #, php-format
 msgid "Tag %s"
@@ -4052,10 +4439,62 @@ msgstr "á¤áá¢á"
 msgid "Tag user"
 msgstr "ááááá¨áá áááá®ááá ááááá"
 
+#: actions/tagother.php:151
+msgid ""
+"Tags for this user (letters, numbers, -, ., and _), comma- or space- "
+"separated"
+msgstr ""
+"á¡áááá¨ááááá áá áááá®ááá ááááá¡áááá¡ (áá¡áááá, áªáá¤á ááá, -, ., áá _). ááááá§áááá "
+"áá«áááá áá á¡ááá áªáá"
+
 #: actions/tagother.php:193
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
+"ááááááááááá¡ ááááá¨ááá á¨áá¡áá«ááááááá áá®áááá ááá¨áá, á áááá¡ááª áá áá¥ááá ááá¥áá "
+"ááááá¬áá ááá ááá¡á ááááá®áááááá, áá áááá¡."
+
+#: actions/tagother.php:200
+msgid "Could not save tags."
+msgstr "á¡áááá¨áááááá¡ á¨áááá®áá ááá  ááá®áá á®áá."
+
+#: actions/tagother.php:236
+msgid "Use this form to add tags to your subscribers or subscriptions."
+msgstr ""
+"áááááá§áááá áá¡ á¤áá áá, á áá áááááááá á¡áááá¨ááááá áá¥áááá¡ ááááá¬áá ááá¡ áá "
+"áááááá¬áá ááá¡."
+
+#: actions/tagrss.php:35
+msgid "No such tag."
+msgstr "áá¡ááá á¡áááá¨áá áá  áá á¡ááááá¡."
+
+#: actions/unblock.php:59
+msgid "You haven't blocked that user."
+msgstr "áá¥ááá áá  ááááááááááá áá¡ áááá®ááá ááááá."
+
+#: actions/unsandbox.php:72
+msgid "User is not sandboxed."
+msgstr "áááá®ááá ááááá áá  áá áá¡ áááááá ááá£áá."
+
+#: actions/unsilence.php:72
+msgid "User is not silenced."
+msgstr "áááá®ááá ááááá áá  áá áá¡ áááá£áááá£áá."
+
+#: actions/unsubscribe.php:77
+msgid "No profile ID in request."
+msgstr "áá áªáá áá áá áá¤áááá¡ ID áá  áá áá¡ áááá®áááááá."
+
+#: actions/unsubscribe.php:98
+msgid "Unsubscribed"
+msgstr "ááááá¬áá á ááá£á¥áááá£ááá"
+
+#: actions/updateprofile.php:64 actions/userauthorization.php:337
+#, php-format
+msgid ""
+"Listenee stream license â%1$sâ is not compatible with site license â%2$sâ."
+msgstr ""
+"ááááá¡áá¬áá á áááá®ááá ááááá¡ ááááááá¡ áááªááááá â%1$sâ á¨áá£áááá¡áááááá á¡ááá¢áá¡ "
+"áááªáááááá¡ááá â%2$sâ."
 
 #. TRANS: User admin panel title
 #: actions/useradminpanel.php:59
@@ -4063,33 +4502,111 @@ msgctxt "TITLE"
 msgid "User"
 msgstr "áááá®ááá ááááá"
 
+#: actions/useradminpanel.php:70
+msgid "User settings for this StatusNet site."
+msgstr "áááá®ááá ááááá¡ ááá áááá¢á ááá áá á¡ááá¢áá¡ááááá¡."
+
 #: actions/useradminpanel.php:149
 msgid "Invalid bio limit. Must be numeric."
-msgstr ""
+msgstr "ááááá áá¤ááá¡ áá áá¡á¬áá á ááááá¢á. á£ááá áá§áá¡ áªáá¤á á."
+
+#: actions/useradminpanel.php:155
+msgid "Invalid welcome text. Max length is 255 characters."
+msgstr "áá áá¡á¬áá á ááá¡áá¡áááááááá á¢áá¥á¡á¢á. á¡áááááááááá¡ ááá¥á¡. á ááááááááá 255."
 
 #: actions/useradminpanel.php:165
 #, php-format
 msgid "Invalid default subscripton: '%1$s' is not user."
 msgstr ""
 
+#. TRANS: Link description in user account settings menu.
+#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:111
+#: lib/personalgroupnav.php:109
+msgid "Profile"
+msgstr "áá áá¤ááá"
+
+#: actions/useradminpanel.php:222
+msgid "Bio Limit"
+msgstr "ááááá áá¤ááá¡ ááááá¢á"
+
 #: actions/useradminpanel.php:223
 msgid "Maximum length of a profile bio in characters."
-msgstr ""
+msgstr "áá áá¤áááá¡ ááááá áá¤ááá¡ ááá¥á¡ááááá£á á áááá á¡ááááááááá¨á."
+
+#: actions/useradminpanel.php:231
+msgid "New users"
+msgstr "áá®ááá áááá®ááá áááááá"
 
 #: actions/useradminpanel.php:235
 msgid "New user welcome"
+msgstr "áá®ááá áááá®ááá ááááá¡ ááá¡áááááá"
+
+#: actions/useradminpanel.php:236
+msgid "Welcome text for new users (Max 255 chars)."
+msgstr "ááá¡ááááááá¡ á¢áá¥á¡á¢á áá®ááá áááá®ááá ááááááá¡áááá¡ (ááá¥á¡. 255 á¡áááááá)."
+
+#: actions/useradminpanel.php:241
+msgid "Default subscription"
 msgstr ""
 
+#: actions/useradminpanel.php:242
+msgid "Automatically subscribe new users to this user."
+msgstr "ááá¢áááá¢á£á áá áááááá¬áá ááá áá áááá®ááá ááááá¡ áá®ááá áááá®ááá áááááá."
+
+#: actions/useradminpanel.php:251
+msgid "Invitations"
+msgstr "ááá¡áá¬ááááá"
+
+#: actions/useradminpanel.php:256
+msgid "Invitations enabled"
+msgstr "ááá¡áá¬áááááá áááá¥á¢áá£á ááá£ááá"
+
+#: actions/useradminpanel.php:258
+msgid "Whether to allow users to invite new users."
+msgstr "ááááªáá áá£ áá á áááá®ááá áááááá¡ á¡á®ááááá¡ ááá¬ááááá¡ á£á¤áááá."
+
+#: actions/userauthorization.php:105
+msgid "Authorize subscription"
+msgstr "ááááá¬áá áá¡ ááá¢áá ááááªáá"
+
 #: actions/userauthorization.php:110
 msgid ""
 "Please check these details to make sure that you want to subscribe to this "
 "userâs notices. If you didnât just ask to subscribe to someoneâs notices, "
 "click âRejectâ."
 msgstr ""
+"ááá®ááá ááááá®áááá áá ááá¢ááááá¡, á áá ááá á¬áá£áááá á áá áááááá áá áááá®ááá ááááá¡ "
+"ááááá®ááááááá¡ ááááá¬áá á. áá£ áá¥ááá áá  áááááááá ááááá¬áá á, ááá¨áá áááááá áá á¦ááááá¡ "
+"\"á£áá á§áá¤á\"."
+
+#: actions/userauthorization.php:196 actions/version.php:167
+msgid "License"
+msgstr "áááªááááá"
+
+#: actions/userauthorization.php:217
+msgid "Accept"
+msgstr "ááá¦ááá"
+
+#: actions/userauthorization.php:218 lib/subscribeform.php:115
+#: lib/subscribeform.php:139
+msgid "Subscribe to this user"
+msgstr "áááááá¬áá á áá¡ áááá®ááá ááááá"
+
+#: actions/userauthorization.php:219
+msgid "Reject"
+msgstr "á£áá á§áá¤á"
+
+#: actions/userauthorization.php:220
+msgid "Reject this subscription"
+msgstr "áá ááááá¬áá áá¡ á£áá á§áá¤á"
 
 #: actions/userauthorization.php:232
 msgid "No authorization request!"
-msgstr ""
+msgstr "ááá¢áá ááááªááá¡ áááá®áááá áá  áá áá¡!"
+
+#: actions/userauthorization.php:254
+msgid "Subscription authorized"
+msgstr "ááááá¬áá á ááá¢áá áááá ááá£ááá"
 
 #: actions/userauthorization.php:256
 msgid ""
@@ -4097,6 +4614,13 @@ msgid ""
 "with the siteâs instructions for details on how to authorize the "
 "subscription. Your subscription token is:"
 msgstr ""
+"ááááá¬áá á ááá¢áá áááá ááá£ááá, áááá áá á£ááá ááá¡ááá á£áááááá URL áá  ááá¬ááááá£áá. "
+"áááááááá¬ááá á¡ááá¢áá¡ ááá¡á¢á á£á¥áªáááá¨á ááááá¬áá áá¡ ááá¢áá áááá áááá¡ ááá¢ááááá. áá¥áááá "
+"ááááá¬áá áá¡ á¢áááááá:"
+
+#: actions/userauthorization.php:266
+msgid "Subscription rejected"
+msgstr "ááááá¬áá á á£áá á§áá¤áááá"
 
 #: actions/userauthorization.php:268
 msgid ""
@@ -4104,11 +4628,14 @@ msgid ""
 "with the siteâs instructions for details on how to fully reject the "
 "subscription."
 msgstr ""
+"ááááá¬áá á á£áá á§áá¤áááá, áááá áá á£ááá ááá¡ááá á£áááááá URL áá  ááá¬ááááá£áá. "
+"áááááááá¬ááá á¡ááá¢áá¡ ááá¡á¢á á£á¥áªáááá¨á ááááá¬áá áá¡ áááááááá á£áá á§áá¤áá¡ á¨áá¡áá®áá "
+"ááá¢ááááá."
 
 #: actions/userauthorization.php:303
 #, php-format
 msgid "Listener URI â%sâ not found here."
-msgstr ""
+msgstr "áá¡ááááááá¡  URI â%sâ áá¥ ááá  áááá«áááá."
 
 #: actions/userauthorization.php:308
 #, php-format
@@ -4123,26 +4650,74 @@ msgstr ""
 #: actions/userauthorization.php:329
 #, php-format
 msgid "Profile URL â%sâ is for a local user."
-msgstr ""
+msgstr "áá áá¤áááá¡ URL â%sâ áááááá£á á áááá®ááá ááááá¡áááá¡áá ááááá£áááááá."
+
+#: actions/userauthorization.php:345
+#, php-format
+msgid "Avatar URL â%sâ is not valid."
+msgstr "áááá¢áá áá¡ URL â%sâ áá  áá áá¡ á¡á¬áá á."
 
 #: actions/userauthorization.php:350
 #, php-format
 msgid "Canât read avatar URL â%sâ."
-msgstr ""
+msgstr "ááá  ááááá®á£ááá áááá¢áá áá¡ URL â%sâ."
 
 #: actions/userauthorization.php:355
 #, php-format
 msgid "Wrong image type for avatar URL â%sâ."
+msgstr "áááá¢áá áá¡ á¡á£á áááá¡ á¤áá ááá¢á áá áá¡á¬áá áá URL â%sâ."
+
+#: actions/userdesignsettings.php:76 lib/designsettings.php:65
+msgid "Profile design"
+msgstr "áá áá¤áááá¡ ááááááá"
+
+#: actions/userdesignsettings.php:87 lib/designsettings.php:76
+msgid ""
+"Customize the way your profile looks with a background image and a colour "
+"palette of your choice."
 msgstr ""
+"ááá á©ááá, á áááá  ááááááá áááááá§á£á áááááá¡ áá¥áááá áá áá¤ááá á¤ááá£á á á¡á£á áááá¡á áá "
+"á¤áá áá ááááá¢á áá¡ á¨ááªáááá."
 
 #: actions/userdesignsettings.php:282
 msgid "Enjoy your hotdog!"
-msgstr ""
+msgstr "áá¡áááááááá á°áá ááááá!"
+
+#. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number.
+#: actions/usergroups.php:66
+#, php-format
+msgid "%1$s groups, page %2$d"
+msgstr "%1$s á¯áá£á¤á, áááá áá %2$d"
+
+#: actions/usergroups.php:132
+msgid "Search for more groups"
+msgstr "ááá«áááá ááá¢á á¯áá£á¤ááá"
+
+#: actions/usergroups.php:159
+#, php-format
+msgid "%s is not a member of any group."
+msgstr "áááá®ááá ááááá %s áá  áá áá¡ áá áªáá áá á¯áá£á¤áá¡ á¬ááá á."
 
 #: actions/usergroups.php:164
 #, php-format
 msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
-msgstr ""
+msgstr "á¡áªáááá [á¯áá£á¤áááá¡ ááá«áááá](%%action.groupsearch%%) áááá ááááááá áááá¨á."
+
+#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
+#. TRANS: Message is used as a subtitle in atom group notice feed.
+#. TRANS: %1$s is a group name, %2$s is a site name.
+#. TRANS: Message is used as a subtitle in atom user notice feed.
+#. TRANS: %1$s is a user name, %2$s is a site name.
+#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:70
+#: lib/atomusernoticefeed.php:76
+#, php-format
+msgid "Updates from %1$s on %2$s!"
+msgstr "%1$s-á¡ ááááá®áááááá %2$s-áá!"
+
+#: actions/version.php:75
+#, php-format
+msgid "StatusNet %s"
+msgstr "StatusNet %s"
 
 #: actions/version.php:155
 #, php-format
@@ -4150,6 +4725,12 @@ msgid ""
 "This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, "
 "Inc. and contributors."
 msgstr ""
+"áá¡ á¡ááá¢á áá£á¨áááá¡ %1$s-áá¡ %2$s ááá á¡áááá, á§áááá á£á¤áááá áááªá£ááá 2008-2010 "
+"StatusNet, Inc. áá á¬áááááá¡ á¨ááááá¢ááááá."
+
+#: actions/version.php:163
+msgid "Contributors"
+msgstr "á¬áááááá¡ á¨ááááá¢ááááá"
 
 #: actions/version.php:170
 msgid ""
@@ -4158,6 +4739,10 @@ msgid ""
 "Software Foundation, either version 3 of the License, or (at your option) "
 "any later version. "
 msgstr ""
+"StatusNet áá áá¡ á£á¤áá¡á áááá: áá¥ááá á¨áááá«áááá ááá¡á áááá áªááááá áá/áá áááááááááá "
+"GNU Affero á«áá ááááá á¡áá¯áá á áááªáááááá¡ ááá áááááá¡ ááááá®ááá, á áááá áª "
+"ááááá¥ááá§áááá£ááá Free Software Foundation-áá¡ áááá , áá áááªáááááá¡ 3 ááá á¡ááá, áá "
+"ááááá¡áááá á á£á¤á á áá®ááá ááá á¡ááá. "
 
 #: actions/version.php:176
 msgid ""
@@ -4166,6 +4751,10 @@ msgid ""
 "FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License "
 "for more details. "
 msgstr ""
+"áá¡ áá ááá ááá áá áªáááááá áá áááááá, á áá ááááá¡ááááá áá¥áááá, áááá áá áá  áá«áááá "
+"áá ááááá  ááá ááá¢áááá¡; áá áª áá£ááááª ááá¢áá á ááá ááá¢ááá¡ ááá¡ ááá§áááááááááá áá "
+"ááááá áá¢á£áá áááááá¡áááá¡ áááá¡ááááááááá. áá®áááá GNU Affero á«áá ááááá á¡áá¯áá á "
+"áááªááááá ááá¢á ááá¤áá áááªááá¡áááá¡."
 
 #: actions/version.php:182
 #, php-format
@@ -4173,26 +4762,32 @@ msgid ""
 "You should have received a copy of the GNU Affero General Public License "
 "along with this program.  If not, see %s."
 msgstr ""
+"áá¥ááá á£ááá ááááá¦áá GNU Affero á«áá ááááá á¡áá¯áá á áááªáááááá¡ áá¡áá áá áá ááá áááá¡ááá "
+"áá ááá. áá£ áá á, áá®áááá %s."
 
 #: actions/version.php:191
 msgid "Plugins"
-msgstr ""
+msgstr "ááááá¢ááááá"
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
 #: actions/version.php:198 lib/action.php:805
 msgid "Version"
 msgstr "ááá á¡áá"
 
+#: actions/version.php:199
+msgid "Author(s)"
+msgstr "ááá¢áá á(ááá)"
+
 #. TRANS: Server exception thrown when a URL cannot be processed.
 #: classes/File.php:143
 #, php-format
 msgid "Cannot process URL '%s'"
-msgstr ""
+msgstr "ááá  ááááá£á¨áááá URL '%s'"
 
 #. TRANS: Server exception thrown when... Robin thinks something is impossible!
 #: classes/File.php:175
 msgid "Robin thinks something is impossible."
-msgstr ""
+msgstr "á ááááá á¤áá¥á ááá¡ á áá¦ááª á¨áá£á«ááááááá."
 
 #. TRANS: Message given if an upload is larger than the configured maximum.
 #. TRANS: %1$d is the byte limit for uploads, %2$d is the byte count for the uploaded file.
@@ -4202,6 +4797,8 @@ msgid ""
 "No file may be larger than %1$d bytes and the file you sent was %2$d bytes. "
 "Try to upload a smaller version."
 msgstr ""
+"á¤áááá áá  á¨ááá«áááá áá§áá¡ %1$d áááá¢áá ááá¢á, áá¥ááá áááá  áááááááááá áá %2$d áááá¢á "
+"áá§á. á¡áªáááá á£á¤á á ááá¢áá á ááá á¡ááá¡ áá¢ááá ááá."
 
 #. TRANS: Message given if an upload would exceed user quota.
 #. TRANS: %d (number) is the user quota in bytes.
@@ -4209,6 +4806,7 @@ msgstr ""
 #, php-format
 msgid "A file this large would exceed your user quota of %d bytes."
 msgstr ""
+"áá¡ááá ááááá¡ á¤ááááá á¨ááá«áááá áááááááá ááá¡ áá¥ááááááá¡ ááááá§áá¤áá áááá¢áá¡, %d áááá¢á¡."
 
 #. TRANS: Message given id an upload would exceed a user's monthly quota.
 #. TRANS: $d (number) is the monthly user quota in bytes.
@@ -4216,6 +4814,13 @@ msgstr ""
 #, php-format
 msgid "A file this large would exceed your monthly quota of %d bytes."
 msgstr ""
+"áá¡ááá ááááá¡ á¤ááááá á¨ááá«áááá áááááááá ááá¡ áá¥ááááááá¡ ááááá§áá¤áá áááá£á  áááá¢áá¡, %d "
+"áááá¢á¡."
+
+#. TRANS: Client exception thrown if a file upload does not have a valid name.
+#: classes/File.php:248 classes/File.php:263
+msgid "Invalid filename."
+msgstr "á¤ááááá¡ áá áá¡á¬áá á á¡áá®ááá."
 
 #. TRANS: Exception thrown when joining a group fails.
 #: classes/Group_member.php:42
@@ -4237,6 +4842,13 @@ msgstr "á¯áá£á¤áá¡ ááá¢ááááá ááá  ááá®áá á®
 msgid "Could not update local group."
 msgstr "áááááá£á á á¯áá£á¤áá¡ ááááá®áááá ááá  ááá®áá á®áá."
 
+#. TRANS: Exception thrown when trying creating a login token failed.
+#. TRANS: %s is the user nickname for which token creation failed.
+#: classes/Login_token.php:78
+#, php-format
+msgid "Could not create login token for %s"
+msgstr "á¨áá¡áá¡ááááá á¢áááááá¡ á¨áá¥ááá %s-á¡áááá¡ ááá  ááá®áá á®áá."
+
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
 #: classes/Memcached_DataObject.php:533
 msgid "No database name or DSN found anywhere."
@@ -4311,7 +4923,7 @@ msgstr "áá áááááá á¨áá¢á§áááááááá¡ á¨áá
 #. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
 #: classes/Notice.php:899
 msgid "Bad type provided to saveKnownGroups"
-msgstr ""
+msgstr "saveKnownGroups-á¡ááááá¡ áá áá¡á¬áá á á¢áááá ááá¬ááááá£áá"
 
 #. TRANS: Server exception thrown when an update for a group inbox fails.
 #: classes/Notice.php:998
@@ -4353,7 +4965,7 @@ msgid "Unable to save tag."
 msgstr "á¡áááá¨ááá¡ ááááá®á¡ááá ááá ááá  á®áá á®áááá."
 
 #. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#: classes/Subscription.php:75 lib/oauthstore.php:465
+#: classes/Subscription.php:75 lib/oauthstore.php:466
 msgid "You have been banned from subscribing."
 msgstr "áá¥ááá ááááá á«áááá ááááá¬áá á."
 
@@ -4501,7 +5113,8 @@ msgid "Change site configuration"
 msgstr "á¡ááá¢áá¡ áááá¤ááá£á ááªáá"
 
 #. TRANS: Main menu option when logged in and site admin for access to site configuration
-#: lib/action.php:474
+#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
+#: lib/action.php:474 lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr "áááááá"
@@ -4578,7 +5191,7 @@ msgstr "á«áááá"
 
 #. TRANS: DT element for site notice. String is hidden in default CSS.
 #. TRANS: Menu item for site administration
-#: lib/action.php:538 lib/adminpanelaction.php:400
+#: lib/action.php:538 lib/adminpanelaction.php:387
 msgid "Site notice"
 msgstr "á¡ááá¢áá¡ á¨áá¢á§ááááááá"
 
@@ -4642,7 +5255,10 @@ msgid "StatusNet software license"
 msgstr "StatusNet ááááá¡ áááªááááá"
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
-#: lib/action.php:843
+#. TRANS: Text between [] is a link description, text between () is the link itself.
+#. TRANS: Make sure there is no whitespace between "]" and "(".
+#. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
+#: lib/action.php:846
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4652,13 +5268,16 @@ msgstr ""
 "(%%site.broughtbyurl%%)-á¡ áááá ."
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:846
+#: lib/action.php:849
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** áá áá¡ áááá áááááááááá¡ á¡áá ááá¡á."
 
 #. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.
-#: lib/action.php:850
+#. TRANS: Make sure there is no whitespace between "]" and "(".
+#. TRANS: Text between [] is a link description, text between () is the link itself.
+#. TRANS: %s is the version of StatusNet that is being used.
+#: lib/action.php:856
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4670,50 +5289,51 @@ msgstr ""
 "org/licensing/licenses/agpl-3.0.html)."
 
 #. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:866
+#: lib/action.php:872
 msgid "Site content license"
 msgstr "á¡ááá¢áá¡ á¨áááááá¡áá¡ áááªááááá"
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:873
+#: lib/action.php:879
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr "%1$s áá¡ á¨áááááá¡á áá áááááªááááá áá áá¡ ááá ááá£áá áá áááá¤áááááªáááá£á á."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:880
+#: lib/action.php:886
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr "á¨áááááá¡á áá áááááªááááá %1$s-áá¡ á¡ááá£áá áááá. á§áááá á£á¤áááá áááªá£ááá."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:884
+#: lib/action.php:890
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 "á¨áááááá¡á áá áááááªááááá á¬áááááá¡ á¨ááá¢áááááá¡ á¡ááá£áá áááá. á§áááá á£á¤áááá áááªá£ááá."
 
-#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:897
+#. TRANS: license message in footer.
+#. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
+#: lib/action.php:904
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr "%1$s-á¡ ááááááá á¨áááááá¡á áá áááááªááááá á®ááááá¡áá¬áááááá %2$s áááªáááááá."
 
 #. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1236
+#: lib/action.php:1243
 msgid "Pagination"
 msgstr "áááá ááááá ááá§áá¤á"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1247
+#: lib/action.php:1254
 msgid "After"
 msgstr "á¨áááááá"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1257
+#: lib/action.php:1264
 msgid "Before"
 msgstr "á¬ááá"
 
@@ -4722,201 +5342,233 @@ msgstr "á¬ááá"
 msgid "Expecting a root feed element but got a whole XML document."
 msgstr ""
 
-#: lib/activityutils.php:208
+#. TRANS: Client exception thrown when there is no source attribute.
+#: lib/activityutils.php:203
 msgid "Can't handle remote content yet."
 msgstr "á¯áá á¯áá áááá ááá  áááá£á¨áááá ááá¨áá ááá£á á¨áááááá¡á¡."
 
+#. TRANS: Client exception thrown when there embedded XML content is found that cannot be processed yet.
+#: lib/activityutils.php:240
+msgid "Can't handle embedded XML content yet."
+msgstr ""
+
+#. TRANS: Client exception thrown when base64 encoded content is found that cannot be processed yet.
+#: lib/activityutils.php:245
+msgid "Can't handle embedded Base64 content yet."
+msgstr ""
+
 #. TRANS: Client error message thrown when a user tries to change admin settings but has no access rights.
-#: lib/adminpanelaction.php:98
+#: lib/adminpanelaction.php:96
 msgid "You cannot make changes to this site."
 msgstr "áá¥ááá áá  ááá¥áá áá á¡ááá¢áá áªáááááááááá¡ á¨áá¢áááá¡ á£á¤áááá."
 
 #. TRANS: Client error message throw when a certain panel's settings cannot be changed.
-#: lib/adminpanelaction.php:110
+#: lib/adminpanelaction.php:108
 msgid "Changes to that panel are not allowed."
 msgstr "áá ááááááá¡ áªááááááááá áá  áá áá¡ ááá¨áááá£áá."
 
 #. TRANS: Client error message.
-#: lib/adminpanelaction.php:229
+#: lib/adminpanelaction.php:222
 msgid "showForm() not implemented."
 msgstr "showForm() áá  áá áá¡ áááá®áá áªáááááá£áá."
 
 #. TRANS: Client error message
-#: lib/adminpanelaction.php:259
+#: lib/adminpanelaction.php:250
 msgid "saveSettings() not implemented."
 msgstr "saveSettings() áá  áá áá¡ áááá®áá áªáááááá£áá."
 
 #. TRANS: Client error message thrown if design settings could not be deleted in
 #. TRANS: the admin panel Design.
-#: lib/adminpanelaction.php:284
+#: lib/adminpanelaction.php:274
 msgid "Unable to delete design setting."
 msgstr "áááááááá¡ ááá áááá¢á áááá¡ á¬áá¨áá ááá  á®áá á®áááá."
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:350
+#: lib/adminpanelaction.php:337
 msgid "Basic site configuration"
 msgstr "á¡ááá¢áá¡ á«áá ááááá áááá¤ááá£á ááªáá"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:352
+#: lib/adminpanelaction.php:339
 msgctxt "MENU"
 msgid "Site"
 msgstr "á¡ááá¢á"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:358
+#: lib/adminpanelaction.php:345
 msgid "Design configuration"
 msgstr "áááááááá¡ áááá¤ááá£á ááªáá"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:360
+#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
+#: lib/adminpanelaction.php:347 lib/groupnav.php:135
 msgctxt "MENU"
 msgid "Design"
 msgstr "ááááááá"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:366
+#: lib/adminpanelaction.php:353
 msgid "User configuration"
 msgstr "áááá®ááá ááááá¡ áááá¤ááá£á ááªáá"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:368 lib/personalgroupnav.php:115
+#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:115
 msgid "User"
 msgstr "áááá®ááá ááááá"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:374
+#: lib/adminpanelaction.php:361
 msgid "Access configuration"
 msgstr "á¨áá¡áááá¡ áááá¤ááá£á ááªáá"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:382
+#: lib/adminpanelaction.php:369
 msgid "Paths configuration"
 msgstr "áááááá¡ áááá¤ááá£á ááªáá"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:390
+#: lib/adminpanelaction.php:377
 msgid "Sessions configuration"
 msgstr "á¡áá¡ááááá¡ áááá¤ááá£á ááªáá"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:398
+#: lib/adminpanelaction.php:385
 msgid "Edit site notice"
 msgstr "á¡ááá¢áá¡ á¨áá¢á§áááááááá¡ á áááá¥á¢áá ááá"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:406
+#: lib/adminpanelaction.php:393
 msgid "Snapshots configuration"
 msgstr "á¬ááá ááá á¡ááááá¡ áááá¤ááá£á ááªáá"
 
 #. TRANS: Client error 401.
-#: lib/apiauth.php:113
+#: lib/apiauth.php:111
 msgid "API resource requires read-write access, but you only have read access."
 msgstr ""
 "API á áá¡á£á á¡á ááááá®ááá¡ á©áá¬áá á-á¬ááááá®ááá¡ á¬áááááá¡, áááá áá áááá áá®áááá á¬ááááá®ááá¡ "
 "á£á¤áááá ááá¥áá."
 
+#. TRANS: OAuth exception thrown when no application is found for a given consumer key.
+#: lib/apiauth.php:175
+msgid "No application for that consumer key."
+msgstr ""
+
+#. TRANS: OAuth exception given when an incorrect access token was given for a user.
+#: lib/apiauth.php:212
+msgid "Bad access token."
+msgstr ""
+
+#. TRANS: OAuth exception given when no user was found for a given token (no token was found).
+#: lib/apiauth.php:217
+msgid "No user for that token."
+msgstr ""
+
+#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
+#: lib/apioauthstore.php:178
+msgid "Tried to revoke unknown token"
+msgstr ""
+
 #. TRANS: Form legend.
-#: lib/applicationeditform.php:137
+#: lib/applicationeditform.php:129
 msgid "Edit application"
 msgstr "á©ááá¡á¬áá á áááááááªáá"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:187
+#: lib/applicationeditform.php:178
 msgid "Icon for this application"
 msgstr "áá áááááááªááá¡ á®áá¢á£áá"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:209
+#: lib/applicationeditform.php:200
 #, php-format
 msgid "Describe your application in %d characters"
 msgstr "áá¦á¬áá áá áá¥áááá áááááááªáá %d á¡áááááááá"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:213
+#: lib/applicationeditform.php:204
 msgid "Describe your application"
 msgstr "áá¦á¬áá áá áá¥áááá áááááááªáá"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:224
+#: lib/applicationeditform.php:215
 msgid "URL of the homepage of this application"
 msgstr "áááááááªááá¡ á¡áá¬á§áá¡á áááá ááá¡ URL"
 
 #. TRANS: Form input field label.
-#: lib/applicationeditform.php:226
+#: lib/applicationeditform.php:217
 msgid "Source URL"
 msgstr "á¬á§áá áá¡ URL"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:233
+#: lib/applicationeditform.php:224
 msgid "Organization responsible for this application"
 msgstr "áá áááááááªáááá ááá¡á£á®áá¡ááááááá áá áááááááªáá"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:242
+#: lib/applicationeditform.php:233
 msgid "URL for the homepage of the organization"
 msgstr "áá áááááááªááá¡ á¡áá¬á§áá¡á áááá ááá¡ URL"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:251
+#: lib/applicationeditform.php:242
 msgid "URL to redirect to after authentication"
 msgstr "ááá¢áá ááááªááá¡ á¨ááááá ááááá¡áááá¡áááá áááááá URL"
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:278
+#: lib/applicationeditform.php:269
 msgid "Browser"
 msgstr "áá áá£ááá á"
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:295
+#: lib/applicationeditform.php:286
 msgid "Desktop"
 msgstr "ááá¡á¢áááá ááááá"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:297
+#: lib/applicationeditform.php:288
 msgid "Type of application, browser or desktop"
 msgstr "áááááááªááá¡ á¢ááá, áá áá£ááá áá¡áááá¡ áá ááá¡á¢áááá ááááá"
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:320
+#: lib/applicationeditform.php:311
 msgid "Read-only"
 msgstr "áá®áááá á¬ááááá®áááá"
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:339
+#: lib/applicationeditform.php:330
 msgid "Read-write"
 msgstr "ááá¢á®áá-á¬áá ááá"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:341
+#: lib/applicationeditform.php:332
 msgid "Default access for this application: read-only, or read-write"
 msgstr ""
 "á¨áá¡áááá¡ ááá ááááááá ááááááá áááá áá áááááááªááá¡áááá¡: áá®áááá á¬ááááá®áááá, áá "
 "áááá®áá-á¬áá ááá"
 
-#. TRANS: Submit button title
-#: lib/applicationeditform.php:359
+#. TRANS: Submit button title.
+#: lib/applicationeditform.php:349
 msgid "Cancel"
 msgstr "ááá£á¥áááá"
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:136
+#: lib/applicationlist.php:135
 msgid "read-write"
 msgstr "ááá¢á®áá-á¬áá ááá"
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:138
+#: lib/applicationlist.php:137
 msgid "read-only"
 msgstr "áá®áááá á¬ááááá®áááá"
 
 #. 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
+#: lib/applicationlist.php:143
 #, php-format
 msgid "Approved %1$s - \"%2$s\" access."
 msgstr "áááá¢áááªááá£ááá %1$s - \"%2$s\" á¨áá¡ááá"
 
 #. TRANS: Button label
-#: lib/applicationlist.php:159
+#: lib/applicationlist.php:158
 msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "á£áá£áááá"
@@ -4936,11 +5588,13 @@ msgstr "ááá¢áá á"
 msgid "Provider"
 msgstr "áááá¬ááááááá"
 
-#: lib/attachmentnoticesection.php:67
+#. TRANS: Title.
+#: lib/attachmentnoticesection.php:68
 msgid "Notices where this attachment appears"
 msgstr "á¨áá¢á§ááááááááá á¡ááááª áá¡ áááááá ááá ááááá©ááááá"
 
-#: lib/attachmenttagcloudsection.php:48
+#. TRANS: Title.
+#: lib/attachmenttagcloudsection.php:49
 msgid "Tags for this attachment"
 msgstr "áá áááááá áááá¡ á¡áááá¨ááááá"
 
@@ -4952,6 +5606,11 @@ msgstr "ááá áááá¡ áªááááááá á©ááá¨ááá"
 msgid "Password changing is not allowed"
 msgstr "ááá áááá¡ áªááááááá áá  áá áá¡ ááááááá áá£áá"
 
+#. TRANS: Title for the form to block a user.
+#: lib/blockform.php:70
+msgid "Block"
+msgstr "áááááá ááá"
+
 #: lib/channel.php:157 lib/channel.php:177
 msgid "Command results"
 msgstr "áá á«áááááá¡ á¨ááááááá"
@@ -5128,6 +5787,11 @@ msgstr "á¨ááªáááá á¨áá¢á§áááááááá¡ á¨ááá
 msgid "Specify the name of the user to subscribe to."
 msgstr "ááá£ááááá áááá®ááá ááááá¡ á¡áá®ááá, á ááááá¡ááª áááááá á§á£á á ááá£áááá."
 
+#. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
+#: lib/command.php:664
+msgid "Can't subscribe to OMB profiles by command."
+msgstr ""
+
 #. TRANS: Text shown after having subscribed to another user successfully.
 #. TRANS: %s is the name of the user the subscription was requested for.
 #: lib/command.php:672
@@ -5154,11 +5818,26 @@ msgstr "%s-á¡ ááááá¬áá á ááá£á¥ááá."
 msgid "Command not yet implemented."
 msgstr "áá á«ááááá á¯áá  áá  áá áá¡ á¨ááá£á¨ááááá£áá."
 
+#. TRANS: Text shown when issuing the command "off" successfully.
+#: lib/command.php:728
+msgid "Notification off."
+msgstr ""
+
 #. TRANS: Error text shown when the command "off" fails for an unknown reason.
 #: lib/command.php:731
 msgid "Can't turn off notification."
 msgstr ""
 
+#. TRANS: Text shown when issuing the command "on" successfully.
+#: lib/command.php:754
+msgid "Notification on."
+msgstr ""
+
+#. TRANS: Error text shown when the command "on" fails for an unknown reason.
+#: lib/command.php:757
+msgid "Can't turn on notification."
+msgstr ""
+
 #. TRANS: Error text shown when issuing the login command while login is disabled.
 #: lib/command.php:771
 msgid "Login command is disabled."
@@ -5171,14 +5850,55 @@ msgstr ""
 msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr ""
 
+#. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
+#. TRANS: %s is the name of the user the unsubscription was requested for.
+#: lib/command.php:813
+#, php-format
+msgid "Unsubscribed %s."
+msgstr ""
+
+#. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
+#: lib/command.php:831
+msgid "You are not subscribed to anyone."
+msgstr ""
+
+#. TRANS: Text shown after requesting other users a user is subscribed to.
+#. TRANS: This message supports plural forms. This message is followed by a
+#. TRANS: hard coded space and a comma separated list of subscribed users.
+#: lib/command.php:836
+msgid "You are subscribed to this person:"
+msgid_plural "You are subscribed to these people:"
+msgstr[0] ""
+
+#. TRANS: Text shown after requesting other users that are subscribed to a user
+#. TRANS: (followers) without having any subscribers.
+#: lib/command.php:858
+msgid "No one is subscribed to you."
+msgstr ""
+
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
-#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
 #: lib/command.php:863
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] ""
 
+#. TRANS: Text shown after requesting groups a user is subscribed to without having
+#. TRANS: any group subscriptions.
+#: lib/command.php:885
+msgid "You are not a member of any groups."
+msgstr ""
+
+#. TRANS: Text shown after requesting groups a user is subscribed to.
+#. TRANS: This message supports plural forms. This message is followed by a
+#. TRANS: hard coded space and a comma separated list of subscribed groups.
+#: lib/command.php:890
+msgid "You are a member of this group:"
+msgid_plural "You are a member of these groups:"
+msgstr[0] ""
+
+#. TRANS: Help text for commands.
 #: lib/command.php:905
 msgid ""
 "Commands:\n"
@@ -5364,38 +6084,6 @@ msgstr ""
 "á¯áá£á¤áá¡ ááááá¢ááááá ááá¢á¡áá®ááááá. ááááá§áááá áá«áááá áá á¡ááá áªáá. ááá¥á¡ááá£á %d "
 "á¡áááááá"
 
-#: lib/groupnav.php:85
-msgid "Group"
-msgstr "á¯áá£á¤á"
-
-#: lib/groupnav.php:101
-msgid "Blocked"
-msgstr "áááááááááá"
-
-#: lib/groupnav.php:102
-#, php-format
-msgid "%s blocked users"
-msgstr "%s ááááááááá áááá®ááá ááááá"
-
-#: lib/groupnav.php:108
-#, php-format
-msgid "Edit %s group properties"
-msgstr "%s á¯áá£á¤áá¡ ááá áááá¢á áááá¡ á áááá¥á¢áá ááá"
-
-#: lib/groupnav.php:113
-msgid "Logo"
-msgstr "áááá"
-
-#: lib/groupnav.php:114
-#, php-format
-msgid "Add or edit %s logo"
-msgstr "%s-á¡ ááááá¡ ááááá¢ááá áá á©áá¡á¬áá ááá"
-
-#: lib/groupnav.php:120
-#, php-format
-msgid "Add or edit %s design"
-msgstr "%s-á¡ áááááááá¡ ááááá¢ááá áá á©áá¡á¬áá ááá"
-
 #: lib/groupsbymemberssection.php:71
 msgid "Groups with most members"
 msgstr "á¯áá£á¤ááá á£ááá¢áá¡á áááá®ááá ááááááá"
@@ -5427,7 +6115,8 @@ msgstr "áá¡ á¤áááá á«ááááá ááááá. á¤ááá
 msgid "Partial upload."
 msgstr "ááá¬ááááá ááá áá¢ááá ááá."
 
-#: lib/imagefile.php:101 lib/mediafile.php:170
+#. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
+#: lib/imagefile.php:101 lib/mediafile.php:179
 msgid "System error uploading file."
 msgstr "á¡áá¡á¢ááá£á á á¨ááªáááá á¤ááááá¡ áá¢ááá áááá¡áá¡."
 
@@ -5456,6 +6145,11 @@ msgstr "áá"
 msgid "[%s]"
 msgstr "[%s]"
 
+#: lib/jabber.php:567
+#, php-format
+msgid "Unknown inbox source %d."
+msgstr ""
+
 #: lib/joinform.php:114
 msgid "Join"
 msgstr "áááá ááááááá"
@@ -5805,17 +6499,20 @@ msgstr "ááááá¨á, á¨ááááááááá áá. á¤áá¡á¢
 msgid "Unsupported message type: %s"
 msgstr "á¨áá¢á§áááááááá¡ á¢ááá áá  áá áá¡ áá®áá ááááá ááá: %s"
 
-#: lib/mediafile.php:98 lib/mediafile.php:123
+#. TRANS: Client exception thrown when a database error was thrown during a file upload operation.
+#: lib/mediafile.php:99 lib/mediafile.php:125
 msgid "There was a database error while saving your file. Please try again."
 msgstr "á¤ááááá¡ á¨áááá®ááá¡áá¡ ááá®áá áááááªáááá ááááá¡ á¨ááªáááá. ááá®ááá ááááá á¡áªáááá."
 
-#: lib/mediafile.php:142
+#. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
+#: lib/mediafile.php:145
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
 msgstr ""
 "áá¡áá¢ááá áá á¤áááá á¡áªáááá  á¤ááááá¡ ááá¨áááá£á ááááá¡. upload_max_filesize ááá áá¥á¢ááá "
 "php.ini-á¨á."
 
-#: lib/mediafile.php:147
+#. TRANS: Client exception.
+#: lib/mediafile.php:151
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form."
@@ -5823,44 +6520,43 @@ msgstr ""
 "áá¡áá¢ááá áá á¤áááá á¡áªáááá MAX_FILE_SIZE ááá áá¥á¢áááá¡, á ááááááª áááááááá£áá áá§á HTML "
 "á¤áá ááá¨á."
 
-#: lib/mediafile.php:152
+#. TRANS: Client exception.
+#: lib/mediafile.php:157
 msgid "The uploaded file was only partially uploaded."
 msgstr "áá¡áá¢ááá áá á¤áááá áá®áááá ááá¬ááááá áá ááá¢ááá áá."
 
-#: lib/mediafile.php:159
+#. TRANS: Client exception thrown when a temporary folder is not present to store a file upload.
+#: lib/mediafile.php:165
 msgid "Missing a temporary folder."
 msgstr "áá áááááá á¡áá¥áá¦áááá ááá  áááá«áááá."
 
-#: lib/mediafile.php:162
+#. TRANS: Client exception thrown when writing to disk is not possible during a file upload operation.
+#: lib/mediafile.php:169
 msgid "Failed to write file to disk."
 msgstr "á¤ááááá¡ ááá¡ááá á©áá¬áá á ááá  ááá®áá á®áá."
 
-#: lib/mediafile.php:165
+#. TRANS: Client exception thrown when a file upload operation has been stopped by an extension.
+#: lib/mediafile.php:173
 msgid "File upload stopped by extension."
 msgstr "á¤ááááá¡ áá ááá ááá ááá©áá áá ááá¤áá áááááá¡ áááá."
 
-#: lib/mediafile.php:179 lib/mediafile.php:217
+#. TRANS: Client exception thrown when a file upload operation would cause a user to exceed a set quota.
+#: lib/mediafile.php:189 lib/mediafile.php:232
 msgid "File exceeds user's quota."
 msgstr "á¤áááá á¡áªáááá áááá®ááá ááááá¡ áááá¢áá¡."
 
-#: lib/mediafile.php:197 lib/mediafile.php:234
+#. TRANS: Client exception thrown when a file upload operation fails because the file could
+#. TRANS: not be moved from the temporary folder to the permanent file location.
+#: lib/mediafile.php:209 lib/mediafile.php:251
 msgid "File could not be moved to destination directory."
 msgstr "á¤ááááá¡ ááááá¢ááá ááááá¨áá£ááááá¡ ááá áá¥á¢áá ááá¨á ááá  ááá®áá á®áá."
 
-#: lib/mediafile.php:202 lib/mediafile.php:238
+#. TRANS: Client exception thrown when a file upload operation has been stopped because the MIME
+#. TRANS: type of the uploaded file could not be determined.
+#: lib/mediafile.php:216 lib/mediafile.php:257
 msgid "Could not determine file's MIME type."
 msgstr "á¤ááááá¡ MIME á¢ááá ááá  áááááááá."
 
-#: lib/mediafile.php:318
-#, php-format
-msgid " Try using another %s format."
-msgstr "á¡á®áá %s á¤áá ááá¢á á¡áªáááá."
-
-#: lib/mediafile.php:323
-#, php-format
-msgid "%s is not a supported file type on this server."
-msgstr "%s áá  áá áá¡ áá á¡áá ááá áá áá®áá ááááá ááá á¤ááááá¡ á¢ááá."
-
 #: lib/messageform.php:120
 msgid "Send a direct notice"
 msgstr "ááááááááá ááá ááááá á á¨áá¢á§ááááááá"
@@ -5936,10 +6632,22 @@ msgstr "á"
 msgid "%1$uÂ°%2$u'%3$u\"%4$s %5$uÂ°%6$u'%7$u\"%8$s"
 msgstr "%1$uÂ°%2$u'%3$u\"%4$s %5$uÂ°%6$u'%7$u\"%8$s"
 
+#: lib/noticelist.php:453
+msgid "at"
+msgstr ""
+
 #: lib/noticelist.php:502
 msgid "web"
 msgstr ""
 
+#: lib/noticelist.php:568
+msgid "in context"
+msgstr ""
+
+#: lib/noticelist.php:603
+msgid "Repeated by"
+msgstr ""
+
 #: lib/noticelist.php:630
 msgid "Reply to this notice"
 msgstr "á£ááá¡á£á®á áá á¨áá¢á§áááááááá¡"
@@ -5952,23 +6660,19 @@ msgstr "ááá¡á£á®á"
 msgid "Notice repeated"
 msgstr "á¨áá¢á§ááááááá áááááá ááá£ááá"
 
-#: lib/oauthstore.php:283
-msgid "Error inserting new profile"
-msgstr "á¨ááªáááá áá®ááá áá áá¤áááá¡ á©áá¡ááá¡áá¡."
-
-#: lib/oauthstore.php:291
-msgid "Error inserting avatar"
-msgstr "á¨ááªáááá áááá¢áá áá¡ á©áá¡ááá¡áá¡"
+#: lib/nudgeform.php:116
+msgid "Nudge this user"
+msgstr ""
 
-#: lib/oauthstore.php:306
-msgid "Error updating remote profile"
-msgstr "á¨ááªáááá ááá¨áá ááá£áá áá áá¤áááá¡ ááááá®ááááá¡áá¡."
+#: lib/nudgeform.php:128
+msgid "Nudge"
+msgstr ""
 
-#: lib/oauthstore.php:311
-msgid "Error inserting remote profile"
-msgstr "á¨ááªáááá ááá¨áá ááá£áá áá áá¤áááá¡ á©áá¡ááá¡áá¡."
+#: lib/nudgeform.php:128
+msgid "Send a nudge to this user"
+msgstr ""
 
-#: lib/oauthstore.php:490
+#: lib/oauthstore.php:491
 msgid "Couldn't insert new subscription."
 msgstr "áá®ááá ááááá¬áá áá¡ á©áá¡áá ááá  ááá®áá á®áá."
 
@@ -6005,7 +6709,8 @@ msgstr "áá¥áááá áááááááááá á¬áá áááá
 msgid "Tags in %s's notices"
 msgstr "%s-á¡ á¨áá¢á§ááááááááá¨á ááááá§ááááá£áá á¡áááá¨ááááá"
 
-#: lib/plugin.php:115
+#. TRANS: Displayed as version information for a plugin if no version information was found.
+#: lib/plugin.php:116
 msgid "Unknown"
 msgstr "á£áªáááá"
 
@@ -6029,6 +6734,10 @@ msgstr "á§áááá áááááá¬áá á"
 msgid "User ID"
 msgstr "áááá®ááá ááááá¡ áá"
 
+#: lib/profileaction.php:196
+msgid "Member since"
+msgstr ""
+
 #. TRANS: Average count of posts made per day since account registration
 #: lib/profileaction.php:235
 msgid "Daily average"
@@ -6046,14 +6755,26 @@ msgstr "áááááá áááá£á®áá áªááááááááá."
 msgid "Public"
 msgstr "á¡áá¯áá á"
 
+#: lib/publicgroupnav.php:82
+msgid "User groups"
+msgstr ""
+
 #: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85
 msgid "Recent tags"
 msgstr "áááá á¡áááá¨ááááá"
 
+#: lib/publicgroupnav.php:88
+msgid "Featured"
+msgstr ""
+
 #: lib/publicgroupnav.php:92
 msgid "Popular"
 msgstr "áááá£ááá á£áá"
 
+#: lib/redirectingaction.php:95
+msgid "No return-to arguments."
+msgstr ""
+
 #: lib/repeatform.php:107
 msgid "Repeat this notice?"
 msgstr "áááááááá á áá¡ á¨áá¢á§ááááááá?"
@@ -6075,23 +6796,27 @@ msgstr "á©ááááá ááá \"%s\" á ááá áá áááá®á
 msgid "No single user defined for single-user mode."
 msgstr "áá áá áááá®ááá ááááá áá  áááá¡ááá¦áá á£áá áá ááá áááá-áááá®ááá ááááá¡ á áááááá¡áááá¡."
 
+#: lib/sandboxform.php:67
+msgid "Sandbox"
+msgstr ""
+
 #: lib/sandboxform.php:78
 msgid "Sandbox this user"
 msgstr "áá áááá®ááá ááááá¡ áááááá ááá"
 
-#: lib/searchaction.php:120
+#. TRANS: Fieldset legend for the search form.
+#: lib/searchaction.php:121
 msgid "Search site"
 msgstr "á«áááá á¡ááá¢áá"
 
-#: lib/searchaction.php:126
+#. TRANS: Used as a field label for the field where one or more keywords
+#. TRANS: for searching can be entered.
+#: lib/searchaction.php:129
 msgid "Keyword(s)"
 msgstr "á¡áááááá«á á¡áá¢á§áááá"
 
-#: lib/searchaction.php:127
-msgid "Search"
-msgstr "á«áááá"
-
-#: lib/searchaction.php:162
+#. TRANS: Definition list item with instructions on how to get (better) search results.
+#: lib/searchaction.php:170
 msgid "Search help"
 msgstr "á«áááá ááá®ááá áááá¨á"
 
@@ -6127,6 +6852,21 @@ msgstr "áááá£áááá"
 msgid "Silence this user"
 msgstr "áá áááá®ááá ááááá¡ áááá£áááá"
 
+#: lib/subgroupnav.php:83
+#, php-format
+msgid "People %s subscribes to"
+msgstr ""
+
+#: lib/subgroupnav.php:91
+#, php-format
+msgid "People subscribed to %s"
+msgstr ""
+
+#: lib/subgroupnav.php:99
+#, php-format
+msgid "Groups %s is a member of"
+msgstr ""
+
 #: lib/subgroupnav.php:105
 msgid "Invite"
 msgstr "ááá¬áááá"
@@ -6274,56 +7014,32 @@ msgid "Moderator"
 msgstr "ááááá áá¢áá á"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1102
+#: lib/util.php:1103
 msgid "a few seconds ago"
 msgstr "á áááááááá á¬áááá¡ á¬áá"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1105
+#: lib/util.php:1106
 msgid "about a minute ago"
 msgstr "áááá®áááááá 1 á¬á£ááá¡ á¬áá"
 
-#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1109
-#, php-format
-msgid "about %d minutes ago"
-msgstr "áááá®áááááá %d á¬á£ááá¡ á¬áá"
-
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 #: lib/util.php:1112
 msgid "about an hour ago"
 msgstr "áááá®áááááá 1 á¡ááááá¡ á¬áá"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1116
-#, php-format
-msgid "about %d hours ago"
-msgstr "áááá®áááááá %d á¡ááááá¡ á¬áá"
-
-#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1119
+#: lib/util.php:1118
 msgid "about a day ago"
 msgstr "áááá®áááááá 1 áá¦áá¡ á¬áá"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1123
-#, php-format
-msgid "about %d days ago"
-msgstr "áááá®áááááá %d áá¦áá¡ á¬áá"
-
-#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1126
+#: lib/util.php:1124
 msgid "about a month ago"
 msgstr "áááá®áááááá 1 áááá¡ á¬áá"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 #: lib/util.php:1130
-#, php-format
-msgid "about %d months ago"
-msgstr "áááá®áááááá %d áááá¡ á¬áá"
-
-#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1133
 msgid "about a year ago"
 msgstr "áááá®áááááá 1 á¬ááá¡ á¬áá"
 
diff --git a/locale/ko/LC_MESSAGES/statusnet.po b/locale/ko/LC_MESSAGES/statusnet.po
index a82559718a..46c1fb4694 100644
--- a/locale/ko/LC_MESSAGES/statusnet.po
+++ b/locale/ko/LC_MESSAGES/statusnet.po
@@ -1,8 +1,9 @@
-# Translation of StatusNet to Korean
+# Translation of StatusNet to Korean (íêµì´)
+# Expored from translatewiki.net
 #
-# Author@translatewiki.net: Brion
-# Author@translatewiki.net: Changwoo
-# Author@translatewiki.net: Twkang
+# Author: Brion
+# Author: Changwoo
+# Author: Twkang
 # --
 # This file is distributed under the same license as the StatusNet package.
 #
@@ -10,20 +11,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-08 22:33+0000\n"
-"PO-Revision-Date: 2010-09-08 22:34:52+0000\n"
-"Language-Team: Korean\n"
+"POT-Creation-Date: 2010-09-14 19:53+0000\n"
+"PO-Revision-Date: 2010-09-14 19:54:08+0000\n"
+"Language-Team: Korean <http://translatewiki.net/wiki/Portal:ko>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r72348); Translate extension (2010-08-20)\n"
+"X-Generator: MediaWiki 1.17alpha (r73009); Translate extension (2010-08-20)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ko\n"
-"X-Message-Group: out-statusnet\n"
+"X-Message-Group: #out-statusnet\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
+"X-POT-Import-Date: 1284-49-16 34::+0000\n"
 
 #. TRANS: Page title
 #. TRANS: Menu item for site administration
-#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:376
+#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:363
 msgid "Access"
 msgstr "ì ê·¼"
 
@@ -76,10 +78,10 @@ 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 actions/emailsettings.php:224
-#: actions/imsettings.php:184 actions/smssettings.php:209
-#: lib/applicationeditform.php:361
+#. TRANS: Button label in the "Edit application" form.
+#: actions/accessadminpanel.php:203 actions/emailsettings.php:228
+#: actions/imsettings.php:187 actions/smssettings.php:209
+#: lib/applicationeditform.php:351
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "ì ì¥"
@@ -92,15 +94,15 @@ msgstr "í´ë¹íë íì´ì§ ìì"
 
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #: actions/all.php:79 actions/allrss.php:68
-#: actions/apiaccountupdatedeliverydevice.php:114
-#: actions/apiaccountupdateprofile.php:105
-#: actions/apiaccountupdateprofilebackgroundimage.php:116
-#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
-#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
-#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:113
-#: actions/apigroupismember.php:91 actions/apigroupjoin.php:100
-#: actions/apigroupleave.php:100 actions/apigrouplist.php:73
-#: actions/apistatusesupdate.php:229 actions/apisubscriptions.php:87
+#: actions/apiaccountupdatedeliverydevice.php:115
+#: actions/apiaccountupdateprofile.php:106
+#: actions/apiaccountupdateprofilebackgroundimage.php:117
+#: actions/apiaccountupdateprofileimage.php:106 actions/apiblockcreate.php:98
+#: actions/apiblockdestroy.php:97 actions/apidirectmessage.php:77
+#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:114
+#: actions/apigroupismember.php:91 actions/apigroupjoin.php:101
+#: actions/apigroupleave.php:101 actions/apigrouplist.php:73
+#: actions/apistatusesupdate.php:230 actions/apisubscriptions.php:87
 #: actions/apitimelinefavorites.php:72 actions/apitimelinefriends.php:174
 #: actions/apitimelinehome.php:80 actions/apitimelinementions.php:80
 #: actions/apitimelineuser.php:82 actions/avatarbynickname.php:75
@@ -194,16 +196,16 @@ msgid "Updates from %1$s and friends on %2$s!"
 msgstr "%2$sì ìë %1$s ë° ì¹êµ¬ë¤ì ìë°ì´í¸!"
 
 #: actions/apiaccountratelimitstatus.php:72
-#: actions/apiaccountupdatedeliverydevice.php:94
-#: actions/apiaccountupdateprofile.php:97
-#: actions/apiaccountupdateprofilebackgroundimage.php:94
-#: actions/apiaccountupdateprofilecolors.php:118
+#: actions/apiaccountupdatedeliverydevice.php:95
+#: actions/apiaccountupdateprofile.php:98
+#: actions/apiaccountupdateprofilebackgroundimage.php:95
+#: actions/apiaccountupdateprofilecolors.php:119
 #: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156
-#: actions/apifavoritecreate.php:100 actions/apifavoritedestroy.php:101
-#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100
-#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:139
-#: actions/apigroupismember.php:115 actions/apigroupjoin.php:156
-#: actions/apigroupleave.php:142 actions/apigrouplist.php:137
+#: actions/apifavoritecreate.php:101 actions/apifavoritedestroy.php:102
+#: actions/apifriendshipscreate.php:101 actions/apifriendshipsdestroy.php:101
+#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:140
+#: actions/apigroupismember.php:115 actions/apigroupjoin.php:157
+#: actions/apigroupleave.php:143 actions/apigrouplist.php:137
 #: actions/apigrouplistall.php:122 actions/apigroupmembership.php:107
 #: actions/apigroupshow.php:116 actions/apihelptest.php:88
 #: actions/apistatusesdestroy.php:104 actions/apistatusesretweets.php:112
@@ -218,47 +220,49 @@ msgstr "%2$sì ìë %1$s ë° ì¹êµ¬ë¤ì ìë°ì´í¸!"
 msgid "API method not found."
 msgstr "API ë©ìë ë°ê²¬ ì ë¨."
 
-#: actions/apiaccountupdatedeliverydevice.php:86
-#: actions/apiaccountupdateprofile.php:89
-#: actions/apiaccountupdateprofilebackgroundimage.php:86
-#: actions/apiaccountupdateprofilecolors.php:110
-#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89
-#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109
-#: actions/apifavoritecreate.php:91 actions/apifavoritedestroy.php:92
-#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
-#: actions/apigroupcreate.php:105 actions/apigroupjoin.php:92
-#: actions/apigroupleave.php:92 actions/apimediaupload.php:67
-#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:198
+#. TRANS: Client error message. POST is a HTTP command. It should not be translated.
+#. TRANS: Client error. POST is a HTTP command. It should not be translated.
+#: actions/apiaccountupdatedeliverydevice.php:87
+#: actions/apiaccountupdateprofile.php:90
+#: actions/apiaccountupdateprofilebackgroundimage.php:87
+#: actions/apiaccountupdateprofilecolors.php:111
+#: actions/apiaccountupdateprofileimage.php:85 actions/apiblockcreate.php:90
+#: actions/apiblockdestroy.php:89 actions/apidirectmessagenew.php:110
+#: actions/apifavoritecreate.php:92 actions/apifavoritedestroy.php:93
+#: actions/apifriendshipscreate.php:92 actions/apifriendshipsdestroy.php:92
+#: actions/apigroupcreate.php:106 actions/apigroupjoin.php:93
+#: actions/apigroupleave.php:93 actions/apimediaupload.php:68
+#: actions/apistatusesretweet.php:66 actions/apistatusesupdate.php:199
 msgid "This method requires a POST."
 msgstr "ì´ ë©ìëë POSTë¥¼ ìêµ¬í©ëë¤."
 
-#: actions/apiaccountupdatedeliverydevice.php:106
+#: actions/apiaccountupdatedeliverydevice.php:107
 msgid ""
 "You must specify a parameter named 'device' with a value of one of: sms, im, "
 "none."
 msgstr ""
 
-#: actions/apiaccountupdatedeliverydevice.php:133
+#: actions/apiaccountupdatedeliverydevice.php:134
 msgid "Could not update user."
 msgstr "ì´ì©ìë¥¼ ìë°ì´í¸ í  ì ììµëë¤."
 
-#: actions/apiaccountupdateprofile.php:112
-#: actions/apiaccountupdateprofilebackgroundimage.php:194
-#: actions/apiaccountupdateprofilecolors.php:185
-#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/apiaccountupdateprofile.php:113
+#: actions/apiaccountupdateprofilebackgroundimage.php:195
+#: actions/apiaccountupdateprofilecolors.php:186
+#: actions/apiaccountupdateprofileimage.php:131 actions/apiusershow.php:108
 #: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/hcard.php:74
 #: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
 #: lib/profileaction.php:84
 msgid "User has no profile."
 msgstr "ì´ì©ìê° íë¡íì ê°ì§ê³  ìì§ ììµëë¤."
 
-#: actions/apiaccountupdateprofile.php:147
+#: actions/apiaccountupdateprofile.php:148
 msgid "Could not save profile."
 msgstr "íë¡íì ì ì¥ í  ì ììµëë¤."
 
-#: actions/apiaccountupdateprofilebackgroundimage.php:108
-#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
-#: actions/apistatusesupdate.php:212 actions/avatarsettings.php:257
+#: actions/apiaccountupdateprofilebackgroundimage.php:109
+#: actions/apiaccountupdateprofileimage.php:98 actions/apimediaupload.php:81
+#: actions/apistatusesupdate.php:213 actions/avatarsettings.php:257
 #: actions/designadminpanel.php:123 actions/editapplication.php:118
 #: actions/newapplication.php:101 actions/newnotice.php:94
 #: lib/designsettings.php:283
@@ -270,30 +274,30 @@ msgstr ""
 "íì¬ ì¤ì ì¼ë¡ ì¸í´ ëë¬´ ë§ì POST ë°ì´í°(%s ë°ì´í¸)ë ìë²ìì ì²ë¦¬í  ì ììµ"
 "ëë¤."
 
-#: actions/apiaccountupdateprofilebackgroundimage.php:136
-#: actions/apiaccountupdateprofilebackgroundimage.php:146
-#: actions/apiaccountupdateprofilecolors.php:164
-#: actions/apiaccountupdateprofilecolors.php:174
+#: actions/apiaccountupdateprofilebackgroundimage.php:137
+#: actions/apiaccountupdateprofilebackgroundimage.php:147
+#: actions/apiaccountupdateprofilecolors.php:165
+#: actions/apiaccountupdateprofilecolors.php:175
 #: actions/groupdesignsettings.php:290 actions/groupdesignsettings.php:300
 #: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
 #: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
 msgid "Unable to save your design settings."
 msgstr "ëìì¸ ì¤ì ì ì ì¥í  ì ììµëë¤."
 
-#: actions/apiaccountupdateprofilebackgroundimage.php:187
-#: actions/apiaccountupdateprofilecolors.php:142
+#: actions/apiaccountupdateprofilebackgroundimage.php:188
+#: actions/apiaccountupdateprofilecolors.php:143
 msgid "Could not update your design."
 msgstr "ëìì¸ì ìë°ì´í¸ í  ì ììµëë¤."
 
-#: actions/apiblockcreate.php:105
+#: actions/apiblockcreate.php:106
 msgid "You cannot block yourself!"
 msgstr "ìê¸° ìì ì ì°¨ë¨í  ì ììµëë¤."
 
-#: actions/apiblockcreate.php:126
+#: actions/apiblockcreate.php:127
 msgid "Block user failed."
 msgstr "ì´ì©ì ì°¨ë¨ì ì¤í¨íìµëë¤."
 
-#: actions/apiblockdestroy.php:114
+#: actions/apiblockdestroy.php:115
 msgid "Unblock user failed."
 msgstr "ì´ì©ì ì°¨ë¨ í´ì ì ì¤í¨íìµëë¤."
 
@@ -317,66 +321,62 @@ msgstr "%sìê² ì§ì  ë©ìì§"
 msgid "All the direct messages sent to %s"
 msgstr "%sìê² ëª¨ë  ì§ì  ë©ìì§"
 
-#: actions/apidirectmessagenew.php:118
+#: actions/apidirectmessagenew.php:119
 msgid "No message text!"
 msgstr "ë©ìì§ ë´ì©ì´ ììµëë¤!"
 
-#: actions/apidirectmessagenew.php:127 actions/newmessage.php:150
+#: actions/apidirectmessagenew.php:128 actions/newmessage.php:150
 #, php-format
 msgid "That's too long. Max message size is %d chars."
 msgstr "ëë¬´ ê¹ëë¤. ìµë ë©ìì§ ê¸¸ì´ë %dì ê¹ì§ìëë¤."
 
-#: actions/apidirectmessagenew.php:138
+#: actions/apidirectmessagenew.php:139
 msgid "Recipient user not found."
 msgstr "ë°ë ì¬ì©ìê° ììµëë¤."
 
-#: actions/apidirectmessagenew.php:142
+#: actions/apidirectmessagenew.php:143
 msgid "Can't send direct messages to users who aren't your friend."
 msgstr "ë¹ì ì ì¹êµ¬ê° ìë ì¬ì©ììê² ì§ì  ë©ìì§ë¥¼ ë³´ë¼ ì ììµëë¤."
 
-#: actions/apifavoritecreate.php:109 actions/apifavoritedestroy.php:110
+#: actions/apifavoritecreate.php:110 actions/apifavoritedestroy.php:111
 #: actions/apistatusesdestroy.php:121
 msgid "No status found with that ID."
 msgstr "ê·¸ IDë¡ ë°ê²¬ë ìíê° ììµëë¤."
 
-#: actions/apifavoritecreate.php:120
+#: actions/apifavoritecreate.php:121
 msgid "This status is already a favorite."
 msgstr "ì´ ììì ì´ë¯¸ ê´ì¬ììì¼ë¡ ë±ë¡ëì´ ììµëë¤."
 
 #. TRANS: Error message text shown when a favorite could not be set.
-#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:296
+#: actions/apifavoritecreate.php:132 actions/favor.php:84 lib/command.php:296
 msgid "Could not create favorite."
 msgstr "ê´ì¬ììì ìì±í  ì ììµëë¤."
 
-#: actions/apifavoritedestroy.php:123
+#: actions/apifavoritedestroy.php:124
 msgid "That status is not a favorite."
 msgstr "ì´ ììì ê´ì¬ììì´ ìëëë¤."
 
-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
+#: actions/apifavoritedestroy.php:136 actions/disfavor.php:87
 msgid "Could not delete favorite."
 msgstr "ê´ì¬ììì ìì í  ì ììµëë¤."
 
-#: actions/apifriendshipscreate.php:109
+#: actions/apifriendshipscreate.php:110
 msgid "Could not follow user: profile not found."
 msgstr "ì¸íë¡ì°í  ì ììµëë¤: ì´ì©ì ìì."
 
-#: actions/apifriendshipscreate.php:118
+#: actions/apifriendshipscreate.php:119
 #, php-format
 msgid "Could not follow user: %s is already on your list."
 msgstr "íë¡ì°í  ì ììµëë¤ : %s ëì ì´ë¯¸ ë¦¬ì¤í¸ì ììµëë¤."
 
-#: actions/apifriendshipsdestroy.php:109
+#: actions/apifriendshipsdestroy.php:110
 msgid "Could not unfollow user: User not found."
 msgstr "ì¸íë¡ì°í  ì ììµëë¤: ì´ì©ì ìì."
 
-#: actions/apifriendshipsdestroy.php:120
+#: actions/apifriendshipsdestroy.php:121
 msgid "You cannot unfollow yourself."
 msgstr "ìê¸° ìì ì ì¸íë¡ì°í  ì ììµëë¤."
 
-#: actions/apifriendshipsexists.php:91
-msgid "Two valid IDs or screen_names must be supplied."
-msgstr ""
-
 #: actions/apifriendshipsshow.php:134
 msgid "Could not determine source user."
 msgstr "ìì¤ ì´ì©ìë¥¼ íì¸í  ì ììµëë¤."
@@ -385,7 +385,7 @@ msgstr "ìì¤ ì´ì©ìë¥¼ íì¸í  ì ììµëë¤."
 msgid "Could not find target user."
 msgstr "íê² ì´ì©ìë¥¼ ì°¾ì ì ììµëë¤."
 
-#: actions/apigroupcreate.php:167 actions/editgroup.php:186
+#: actions/apigroupcreate.php:168 actions/editgroup.php:186
 #: actions/newgroup.php:126 actions/profilesettings.php:215
 #: actions/register.php:212
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
@@ -393,90 +393,90 @@ msgstr ""
 "ë³ëªì ë°ëì ììë¬¸ìì ì«ìë¡ë§ ì´ë£¨ì´ì ¸ì¼ íë©° ì¤íì´ì¤ì ì¬ì©ì´ ë¶ê° í©ë"
 "ë¤."
 
-#: actions/apigroupcreate.php:176 actions/editgroup.php:190
+#: actions/apigroupcreate.php:177 actions/editgroup.php:190
 #: actions/newgroup.php:130 actions/profilesettings.php:238
 #: actions/register.php:215
 msgid "Nickname already in use. Try another one."
 msgstr "ë³ëªì´ ì´ë¯¸ ì¬ì©ì¤ ìëë¤. ë¤ë¥¸ ë³ëªì ìëí´ ë³´ììì¤."
 
-#: actions/apigroupcreate.php:183 actions/editgroup.php:193
+#: actions/apigroupcreate.php:184 actions/editgroup.php:193
 #: actions/newgroup.php:133 actions/profilesettings.php:218
 #: actions/register.php:217
 msgid "Not a valid nickname."
 msgstr "ì í¨í ë³ëªì´ ìëëë¤"
 
-#: actions/apigroupcreate.php:199 actions/editapplication.php:215
+#: actions/apigroupcreate.php:200 actions/editapplication.php:215
 #: actions/editgroup.php:199 actions/newapplication.php:203
 #: actions/newgroup.php:139 actions/profilesettings.php:222
 #: actions/register.php:224
 msgid "Homepage is not a valid URL."
 msgstr "ííì´ì§ ì£¼ìíìì´ ì¬ë°ë¥´ì§ ììµëë¤."
 
-#: actions/apigroupcreate.php:208 actions/editgroup.php:202
+#: actions/apigroupcreate.php:209 actions/editgroup.php:202
 #: actions/newgroup.php:142 actions/profilesettings.php:225
 #: actions/register.php:227
 msgid "Full name is too long (max 255 chars)."
 msgstr "ì¤ëªì´ ëë¬´ ê¹ëë¤. (ìµë 255ê¸ì)"
 
-#: actions/apigroupcreate.php:216 actions/editapplication.php:190
+#: actions/apigroupcreate.php:217 actions/editapplication.php:190
 #: actions/newapplication.php:172
 #, php-format
 msgid "Description is too long (max %d chars)."
 msgstr "ì¤ëªì´ ëë¬´ ê¹ëë¤. (ìµë %d ê¸ì)"
 
-#: actions/apigroupcreate.php:227 actions/editgroup.php:208
+#: actions/apigroupcreate.php:228 actions/editgroup.php:208
 #: actions/newgroup.php:148 actions/profilesettings.php:232
 #: actions/register.php:234
 msgid "Location is too long (max 255 chars)."
 msgstr "ìì¹ê° ëë¬´ ê¹ëë¤. (ìµë 255ê¸ì)"
 
-#: actions/apigroupcreate.php:246 actions/editgroup.php:219
+#: actions/apigroupcreate.php:247 actions/editgroup.php:219
 #: actions/newgroup.php:159
 #, php-format
 msgid "Too many aliases! Maximum %d."
 msgstr "ë³ëªì´ ëë¬´ ë§ìµëë¤! ìµë %dê°."
 
-#: actions/apigroupcreate.php:276 actions/editgroup.php:232
+#: actions/apigroupcreate.php:277 actions/editgroup.php:232
 #: actions/newgroup.php:172
 #, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr "ë³ëª \"%s\" ì´ ì´ë¯¸ ì¬ì©ì¤ ìëë¤. ë¤ë¥¸ ë³ëªì ìëí´ ë³´ììì¤."
 
-#: actions/apigroupcreate.php:289 actions/editgroup.php:238
+#: actions/apigroupcreate.php:290 actions/editgroup.php:238
 #: actions/newgroup.php:178
 msgid "Alias can't be the same as nickname."
 msgstr ""
 
-#: actions/apigroupismember.php:96 actions/apigroupjoin.php:105
-#: actions/apigroupleave.php:105 actions/apigroupmembership.php:92
+#: actions/apigroupismember.php:96 actions/apigroupjoin.php:106
+#: actions/apigroupleave.php:106 actions/apigroupmembership.php:92
 #: actions/apigroupshow.php:83 actions/apitimelinegroup.php:92
 msgid "Group not found."
 msgstr "ì°¾ì ìê° ììµëë¤."
 
 #. TRANS: Error text shown a user tries to join a group they already are a member of.
-#: actions/apigroupjoin.php:111 actions/joingroup.php:100 lib/command.php:336
+#: actions/apigroupjoin.php:112 actions/joingroup.php:100 lib/command.php:336
 msgid "You are already a member of that group."
 msgstr "ë¹ì ì ì´ë¯¸ ì´ ê·¸ë£¹ì ë©¤ë²ìëë¤."
 
 #. TRANS: Error text shown when a user tries to join a group they are blocked from joining.
-#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:341
+#: actions/apigroupjoin.php:121 actions/joingroup.php:105 lib/command.php:341
 msgid "You have been blocked from that group by the admin."
 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.
-#: actions/apigroupjoin.php:139 actions/joingroup.php:134 lib/command.php:353
+#: actions/apigroupjoin.php:140 actions/joingroup.php:134 lib/command.php:353
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "ì´ì©ì %1$s ì ê·¸ë£¹ %2$s ê°ìì ì¤í¨íìµëë¤."
 
-#: actions/apigroupleave.php:115
+#: actions/apigroupleave.php:116
 msgid "You are not a member of this group."
 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.
-#: actions/apigroupleave.php:125 actions/leavegroup.php:129
+#: actions/apigroupleave.php:126 actions/leavegroup.php:129
 #: lib/command.php:401
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
@@ -506,7 +506,7 @@ msgstr "%s ê·¸ë£¹"
 msgid "groups on %s"
 msgstr "%s ì¬ì´í¸ì ê·¸ë£¹"
 
-#: actions/apimediaupload.php:99
+#: actions/apimediaupload.php:100
 msgid "Upload failed."
 msgstr "ì¤í ì¤í¨"
 
@@ -516,9 +516,9 @@ msgstr ""
 
 #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
 #: actions/deletenotice.php:169 actions/disfavor.php:74
-#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:55
+#: actions/emailsettings.php:271 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:66 actions/imsettings.php:227
+#: actions/groupunblock.php:66 actions/imsettings.php:230
 #: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
@@ -557,8 +557,8 @@ msgstr ""
 #. 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:286 actions/grouplogo.php:322
-#: actions/imsettings.php:242 actions/newapplication.php:121
+#: actions/emailsettings.php:290 actions/grouplogo.php:322
+#: actions/imsettings.php:245 actions/newapplication.php:121
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
 #: actions/smssettings.php:277 lib/designsettings.php:304
 msgid "Unexpected form submission."
@@ -622,18 +622,18 @@ msgstr "ì´ ë©ìëë POST ëë DELETEë¥¼ ìêµ¬í©ëë¤."
 msgid "You may not delete another user's status."
 msgstr "ë¹ì ì ë¤ë¥¸ ì¬ì©ìì ìíë¥¼ ìì íì§ ììë ëë¤."
 
-#: actions/apistatusesretweet.php:75 actions/apistatusesretweets.php:72
+#: actions/apistatusesretweet.php:76 actions/apistatusesretweets.php:72
 #: actions/deletenotice.php:52 actions/shownotice.php:92
 msgid "No such notice."
 msgstr "ê·¸ë¬í íµì§ë ììµëë¤."
 
 #. TRANS: Error text shown when trying to repeat an own notice.
-#: actions/apistatusesretweet.php:83 lib/command.php:538
+#: actions/apistatusesretweet.php:84 lib/command.php:538
 msgid "Cannot repeat your own notice."
 msgstr "ìê¸° ìì ì ììì ì¬ì ì¡í  ì ììµëë¤."
 
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-#: actions/apistatusesretweet.php:91 lib/command.php:544
+#: actions/apistatusesretweet.php:92 lib/command.php:544
 msgid "Already repeated that notice."
 msgstr "ì´ë¯¸ ì¬ì ì¡ë ìììëë¤."
 
@@ -645,21 +645,21 @@ msgstr "ìì ë ìììëë¤."
 msgid "No status with that ID found."
 msgstr "ë°ê²¬ë IDì ìíê° ììµëë¤."
 
-#: actions/apistatusesupdate.php:221
+#: actions/apistatusesupdate.php:222
 msgid "Client must provide a 'status' parameter with a value."
 msgstr ""
 
-#: actions/apistatusesupdate.php:242 actions/newnotice.php:157
+#: actions/apistatusesupdate.php:243 actions/newnotice.php:157
 #: lib/mailhandler.php:60
 #, php-format
 msgid "That's too long. Max notice size is %d chars."
 msgstr "ëë¬´ ê¹ëë¤. íµì§ì ìµë ê¸¸ì´ë %d ê¸ì ìëë¤."
 
-#: actions/apistatusesupdate.php:283 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:284 actions/apiusershow.php:96
 msgid "Not found."
 msgstr "ì°¾ì ìê° ììµëë¤."
 
-#: actions/apistatusesupdate.php:306 actions/newnotice.php:181
+#: actions/apistatusesupdate.php:307 actions/newnotice.php:181
 #, php-format
 msgid "Max notice size is %d chars, including attachment URL."
 msgstr "ììì ìµë ê¸¸ì´ë ì²¨ë¶ URLì í¬í¨íì¬ %d ê¸ììëë¤."
@@ -834,7 +834,9 @@ msgid "Yes"
 msgstr "ì"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
+#. TRANS: Submit button title.
+#. TRANS: Description of the form to block a user.
+#: actions/block.php:164 actions/groupmembers.php:403 lib/blockform.php:82
 msgid "Block this user"
 msgstr "ì´ ì¬ì©ì ì°¨ë¨íê¸°"
 
@@ -872,11 +874,13 @@ msgstr "%1$s ë° ì¹êµ¬ë¤, %2$d íì´ì§"
 msgid "Unblock user from group"
 msgstr "ê·¸ë£¹ ì´ì©ìë ì°¨ë¨í´ì "
 
-#: actions/blockedfromgroup.php:320 lib/unblockform.php:69
+#. TRANS: Title for the form to unblock a user.
+#: actions/blockedfromgroup.php:320 lib/unblockform.php:70
 msgid "Unblock"
 msgstr "ì°¨ë¨í´ì "
 
-#: actions/blockedfromgroup.php:320 lib/unblockform.php:80
+#. TRANS: Description of the form to unblock a user.
+#: actions/blockedfromgroup.php:320 lib/unblockform.php:82
 msgid "Unblock this user"
 msgstr "ì´ ì¬ì©ìë¥¼ ì°¨ë¨í´ì í©ëë¤."
 
@@ -898,12 +902,6 @@ msgstr "ì¸ì¦ ì½ëê° ììµëë¤."
 msgid "That confirmation code is not for you!"
 msgstr "ê·¸ ì¸ì¦ ì½ëë ê·íì ê²ì´ ìëëë¤!"
 
-#. TRANS: Server error for an unknow address type, which can be 'email', 'jabber', or 'sms'.
-#: actions/confirmaddress.php:91
-#, php-format
-msgid "Unrecognized address type %s."
-msgstr ""
-
 #. TRANS: Client error for an already confirmed email/jabbel/sms address.
 #: actions/confirmaddress.php:96
 msgid "That address has already been confirmed."
@@ -915,9 +913,9 @@ msgstr "ê·¸ ì£¼ìë ì´ë¯¸ ì¹ì¸ëììµëë¤."
 #. 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/confirmaddress.php:116 actions/emailsettings.php:331
+#: actions/emailsettings.php:477 actions/imsettings.php:283
+#: actions/imsettings.php:442 actions/othersettings.php:174
 #: actions/profilesettings.php:283 actions/smssettings.php:308
 #: actions/smssettings.php:464
 msgid "Couldn't update user."
@@ -925,7 +923,7 @@ msgstr "ì¬ì©ìë¥¼ ìë°ì´í¸ í  ì ììµëë¤."
 
 #. 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/confirmaddress.php:128 actions/emailsettings.php:437
 #: actions/smssettings.php:422
 msgid "Couldn't delete email confirmation."
 msgstr "ë©ì¼ ì¹ì¸ì ìì  í  ì ììµëë¤."
@@ -961,9 +959,10 @@ msgstr "ì¸ì¦ ì½ëê° ììµëë¤."
 msgid "You are not the owner of this application."
 msgstr "ì´ ìì©íë¡ê·¸ë¨ ìì  ìê¸°"
 
+#. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:127
 #: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1307
+#: lib/action.php:1315
 msgid "There was a problem with your session token."
 msgstr "ë¹ì ì ì¸ìí í°ê´ë ¨ ë¬¸ì ê° ììµëë¤."
 
@@ -994,7 +993,7 @@ msgstr "ì´ ìì©íë¡ê·¸ë¨ ìì "
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
 #: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:73 lib/profileformaction.php:64
+#: lib/adminpanelaction.php:71 lib/profileformaction.php:64
 #: lib/settingsaction.php:72
 msgid "Not logged in."
 msgstr "ë¡ê·¸ì¸íê³  ìì§ ììµëë¤."
@@ -1003,12 +1002,6 @@ msgstr "ë¡ê·¸ì¸íê³  ìì§ ììµëë¤."
 msgid "Can't delete this notice."
 msgstr "ì´ íµì§ë¥¼ ì§ì¸ ì ììµëë¤."
 
-#: actions/deletenotice.php:103
-msgid ""
-"You are about to permanently delete a notice. Once this is done, it cannot "
-"be undone."
-msgstr ""
-
 #: actions/deletenotice.php:109 actions/deletenotice.php:141
 msgid "Delete notice"
 msgstr "íµì§ ìì "
@@ -1048,7 +1041,6 @@ msgstr "ì´ ì¬ì©ì ìì "
 #. TRANS: Message used as title for design settings for the site.
 #. TRANS: Link description in user account settings menu.
 #: actions/designadminpanel.php:63 lib/accountsettingsaction.php:139
-#: lib/groupnav.php:119
 msgid "Design"
 msgstr "ëìì¸"
 
@@ -1168,13 +1160,13 @@ msgstr ""
 msgid "Reset back to default"
 msgstr ""
 
-#. TRANS: Submit button title
+#. TRANS: Submit button title.
 #: actions/designadminpanel.php:685 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/snapshotadminpanel.php:245
 #: actions/subscriptions.php:226 actions/tagother.php:154
-#: actions/useradminpanel.php:294 lib/applicationeditform.php:363
+#: actions/useradminpanel.php:294 lib/applicationeditform.php:353
 #: lib/designsettings.php:256 lib/groupeditform.php:202
 msgid "Save"
 msgstr "ì ì¥"
@@ -1233,6 +1225,14 @@ msgstr "ê¸°ê´ ì´ë¦ì´ ëë¬´ ê¹ëë¤. (ìµë 255ê¸ì)"
 msgid "Organization homepage is required."
 msgstr "ê¸°ê´ ííì´ì§ê° íìí©ëë¤."
 
+#: actions/editapplication.php:218 actions/newapplication.php:206
+msgid "Callback is too long."
+msgstr ""
+
+#: actions/editapplication.php:225 actions/newapplication.php:215
+msgid "Callback URL is not valid."
+msgstr ""
+
 #: actions/editapplication.php:258
 msgid "Could not update application."
 msgstr "ê´ì¬ììì ìì±í  ì ììµëë¤."
@@ -1306,7 +1306,7 @@ msgstr "íì¸ë ìµì ì ë©ì¼ ê³ì "
 #. 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/emailsettings.php:115 actions/emailsettings.php:162
 #: actions/imsettings.php:116 actions/smssettings.php:124
 #: actions/smssettings.php:180
 msgctxt "BUTTON"
@@ -1324,22 +1324,26 @@ msgstr ""
 #. 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
+#. TRANS: Button label in the "Edit application" form.
 #: actions/emailsettings.php:127 actions/imsettings.php:131
-#: actions/smssettings.php:137 lib/applicationeditform.php:357
+#: actions/smssettings.php:137 lib/applicationeditform.php:347
 msgctxt "BUTTON"
 msgid "Cancel"
 msgstr "ì·¨ì"
 
-#. TRANS: Instructions for e-mail address input form.
-#: actions/emailsettings.php:135
+#. TRANS: Instructions for e-mail address input form. Do not translate
+#. TRANS: "example.org". It is one of the domain names reserved for
+#. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
+#. TRANS: Any other domain may be owned by a legitimate person or
+#. TRANS: organization.
+#: actions/emailsettings.php:139
 msgid "Email address, like \"UserName@example.org\""
 msgstr "\"ì¬ì©ìì´ë¦@ìì .org\"ì ê°ì ë©ì¼ ê³ì "
 
 #. 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/emailsettings.php:143 actions/imsettings.php:151
 #: actions/smssettings.php:162
 msgctxt "BUTTON"
 msgid "Add"
@@ -1347,110 +1351,110 @@ msgstr "ì¶ê°"
 
 #. 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
+#: actions/emailsettings.php:151 actions/smssettings.php:171
 msgid "Incoming email"
 msgstr "ë°ì ë©ì¼"
 
 #. 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
+#: actions/emailsettings.php:159 actions/smssettings.php:178
 msgid "Send email to this address to post new notices."
 msgstr "ìë¡ì´ íµì§ë¥¼ ì¬ë¦¬ë ¤ë©´ ì´ ì£¼ìë¡ ë©ì¼ì ë³´ë´ììì¤."
 
 #. 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
+#: actions/emailsettings.php:168 actions/smssettings.php:186
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr "í¬ì¤íì ìí ì ë©ì¼ ê³ì ì ìì±; ì  ë©ì¼ ê³ì ì ì·¨ì."
 
 #. 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
+#: actions/emailsettings.php:172 actions/smssettings.php:189
 msgctxt "BUTTON"
 msgid "New"
 msgstr "ì ê²ì"
 
 #. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:174
+#: actions/emailsettings.php:178
 msgid "Email preferences"
 msgstr "ë©ì¼ ì¤ì "
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:180
+#: actions/emailsettings.php:184
 msgid "Send me notices of new subscriptions through email."
 msgstr "ìë¡ì´ ìì½ êµ¬ëì íµì§ë¥¼ ë©ì¼ë¡ ë³´ë´ì£¼ì¸ì."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:186
+#: actions/emailsettings.php:190
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr "ëêµ°ê° ë´ ê¸ì ì¢ìíë ê²ìê¸ë¡ ì¶ê°íì ë, ë©ì¼ì ë³´ëëë¤."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:193
+#: actions/emailsettings.php:197
 msgid "Send me email when someone sends me a private message."
 msgstr "ëêµ°ê° ë´ê² ë¹ë°ë©ìì§ë¥¼ ë³´ëì ë, ë©ì¼ì ë³´ëëë¤."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:199
+#: actions/emailsettings.php:203
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr "ëêµ°ê° ë´ê² @ ëµì¥ì ë³´ëì ë, ë©ì¼ì ë³´ëëë¤."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:205
+#: actions/emailsettings.php:209
 msgid "Allow friends to nudge me and send me an email."
 msgstr "ì¹êµ¬ë¤ì´ ë´ê² ë©ì¼ì´ë ìª½ì§ë¥¼ ë³´ë¼ ì ìëë¡ íì©í©ëë¤."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:212
+#: actions/emailsettings.php:216
 msgid "I want to post notices by email."
 msgstr "ë©ì¼ë¡ íµë³´ë¥¼ í¬ì¤í¸í©ëë¤."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:219
+#: actions/emailsettings.php:223
 msgid "Publish a MicroID for my email address."
 msgstr "ë©ì¼ ì£¼ìë¥¼ ìí MicroIDì ìì±"
 
 #. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:334
+#: actions/emailsettings.php:338
 msgid "Email preferences saved."
 msgstr "ë©ì¼ ì¤ì ì´ ì ì¥ëììµëë¤."
 
 #. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:353
+#: actions/emailsettings.php:357
 msgid "No email address."
 msgstr "ë©ì¼ ì£¼ìê° ììµëë¤."
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:361
+#: actions/emailsettings.php:365
 msgid "Cannot normalize that email address"
 msgstr "ë©ì¼ ì£¼ìë¥¼ ì ê·í í  ì ììµëë¤."
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:208
+#: actions/emailsettings.php:370 actions/register.php:208
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "ì¬ë°ë¥¸ ë©ì¼ ì£¼ìê° ìëëë¤."
 
 #. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:370
+#: actions/emailsettings.php:374
 msgid "That is already your email address."
 msgstr "ê·¸ ë©ì¼ ì£¼ìë ì´ë¯¸ ê·íì ê²ìëë¤."
 
 #. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:374
+#: actions/emailsettings.php:378
 msgid "That email address already belongs to another user."
 msgstr "ê·¸ ë©ì¼ ì£¼ìë ì´ë¯¸ ë¤ë¥¸ ì¬ì©ìì ìì ìëë¤."
 
 #. 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/emailsettings.php:395 actions/imsettings.php:351
 #: actions/smssettings.php:373
 msgid "Couldn't insert confirmation code."
 msgstr "íì¸ ì½ëë¥¼ ì¶ê° í  ì ììµëë¤."
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:398
+#: actions/emailsettings.php:402
 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."
@@ -1461,45 +1465,45 @@ msgstr ""
 #. 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/emailsettings.php:423 actions/imsettings.php:386
 #: actions/smssettings.php:408
 msgid "No pending confirmation to cancel."
 msgstr "ì·¨ì í  ëê¸°ì¤ì¸ ì¸ì¦ì´ ììµëë¤."
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:438
+#: actions/emailsettings.php:442
 msgid "Email confirmation cancelled."
 msgstr "ì·¨ì í  ëê¸°ì¤ì¸ ì¸ì¦ì´ ììµëë¤."
 
 #. TRANS: Message given trying to remove an e-mail address that is not
 #. TRANS: registered for the active user.
-#: actions/emailsettings.php:458
+#: actions/emailsettings.php:462
 msgid "That is not your email address."
 msgstr "ê·¸ ë©ì¼ ì£¼ìë ê·íì ê²ì´ ìëëë¤."
 
 #. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:479
+#: actions/emailsettings.php:483
 msgid "The email address was removed."
 msgstr "ë©ì¼ ì£¼ìë¥¼ ì§ì ìµëë¤."
 
-#: actions/emailsettings.php:493 actions/smssettings.php:568
+#: actions/emailsettings.php:497 actions/smssettings.php:568
 msgid "No incoming email address."
 msgstr "ë°ë ë©ì¼ ì£¼ìê° ììµëë¤."
 
 #. 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/emailsettings.php:508 actions/emailsettings.php:532
 #: actions/smssettings.php:578 actions/smssettings.php:602
 msgid "Couldn't update user record."
 msgstr "ì¬ì©ì ê¸°ë¡ì ìë°ì´í¸ í  ì ììµëë¤."
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
-#: actions/emailsettings.php:508 actions/smssettings.php:581
+#: actions/emailsettings.php:512 actions/smssettings.php:581
 msgid "Incoming email address removed."
 msgstr "ë°ë ë©ì¼ ì£¼ìë¥¼ ì§ì ìµëë¤."
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
-#: actions/emailsettings.php:532 actions/smssettings.php:605
+#: actions/emailsettings.php:536 actions/smssettings.php:605
 msgid "New incoming email address added."
 msgstr "ìë¡ì´ ë°ë ë©ì¼ ì£¼ìë¥¼ ì¶ê°íìµëë¤."
 
@@ -1558,11 +1562,6 @@ msgstr "ì¸ê¸°ìë íì"
 msgid "Featured users, page %d"
 msgstr "ì¸ê¸°ìë íì, %díì´ì§"
 
-#: actions/featured.php:99
-#, php-format
-msgid "A selection of some great users on %s"
-msgstr ""
-
 #: actions/file.php:34
 msgid "No notice ID."
 msgstr "ê·¸ë¬í íµì§ë ììµëë¤."
@@ -1583,10 +1582,6 @@ msgstr "ì²¨ë¶ë¬¸ì ìì"
 msgid "Not expecting this response!"
 msgstr "ììì¹ ëª»í ë°ì ìëë¤."
 
-#: actions/finishremotesubscribe.php:80
-msgid "User being listened to does not exist."
-msgstr ""
-
 #: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59
 msgid "You can use the local subscription!"
 msgstr "ë¹ì ì ë¡ì»¬ êµ¬ëì ì¬ì©í  ì ììµëë¤."
@@ -1599,14 +1594,6 @@ msgstr "ì´ ì¬ì©ìë ê·íì êµ¬ëì ì°¨ë¨íìµëë¤."
 msgid "You are not authorized."
 msgstr "ë¹ì ì ì´ íë¡íì êµ¬ëëì§ ìê³ ììµëë¤."
 
-#: actions/finishremotesubscribe.php:113
-msgid "Could not convert request token to access token."
-msgstr ""
-
-#: actions/finishremotesubscribe.php:118
-msgid "Remote service uses unknown version of OMB protocol."
-msgstr ""
-
 #: actions/getfile.php:79
 msgid "No such file."
 msgstr "í´ë¹íë íì¼ì´ ììµëë¤."
@@ -1651,7 +1638,7 @@ msgstr "ì¬ì©ìê° ê·íë¥¼ ì°¨ë¨íìµëë¤."
 msgid "User is not a member of group."
 msgstr "ê·¸ë£¹ ì´ì©ìë ì°¨ë¨í´ì "
 
-#: actions/groupblock.php:134 actions/groupmembers.php:360
+#: actions/groupblock.php:134 actions/groupmembers.php:364
 msgid "Block user from group"
 msgstr "ê·¸ë£¹ ì´ì©ìë ì°¨ë¨í´ì "
 
@@ -1711,32 +1698,28 @@ msgstr "ë¡ê³ ë¥¼ ìë°ì´í¸íìµëë¤."
 msgid "Failed updating logo."
 msgstr "ë¡ê³  ìë°ì´í¸ì ì¤í¨íìµëë¤."
 
-#: actions/groupmembers.php:100 lib/groupnav.php:92
+#. TRANS: Title of the page showing group members.
+#. TRANS: %s is the name of the group.
+#: actions/groupmembers.php:102
 #, php-format
 msgid "%s group members"
 msgstr "%s ê·¸ë£¹ íì"
 
-#: actions/groupmembers.php:103
+#. TRANS: Title of the page showing group members.
+#. TRANS: %1$s is the name of the group, %2$d is the page number of the members list.
+#: actions/groupmembers.php:107
 #, php-format
 msgid "%1$s group members, page %2$d"
 msgstr "%s ê·¸ë£¹ íì"
 
-#: actions/groupmembers.php:118
+#: actions/groupmembers.php:122
 msgid "A list of the users in this group."
 msgstr "ì´ ê·¸ë£¹ì íìë¦¬ì¤í¸"
 
-#: actions/groupmembers.php:182 lib/groupnav.php:107
+#: actions/groupmembers.php:186
 msgid "Admin"
 msgstr "ê´ë¦¬ì"
 
-#: actions/groupmembers.php:392 lib/blockform.php:69
-msgid "Block"
-msgstr "ì°¨ë¨íê¸°"
-
-#: actions/groupmembers.php:519
-msgid "Make this user an admin"
-msgstr "ì´ ì´ì©ìë¥¼ ê´ë¦¬ìë¡ ë§ë¦"
-
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Title in atom group notice feed. %s is a group name.
 #. TRANS: Title in atom user notice feed. %s is a user name.
@@ -1859,7 +1842,10 @@ msgstr ""
 
 #. TRANS: IM address input field instructions in IM settings form.
 #. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:140
+#. TRANS: Do not translate "example.org". It is one of the domain names reserved for use in examples by
+#. TRANS: http://www.rfc-editor.org/rfc/rfc2606.txt. Any other domain may be owned by a legitimate
+#. TRANS: person or organization.
+#: actions/imsettings.php:143
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -1869,64 +1855,64 @@ msgstr ""
 "GTalk ì¹êµ¬ëª©ë¡ì ë°ëì %s ì£¼ìë¥¼ ì¶ê°íì¬ ì£¼ììì¤."
 
 #. TRANS: Form legend for IM preferences form.
-#: actions/imsettings.php:155
+#: actions/imsettings.php:158
 msgid "IM preferences"
 msgstr "ë©ì¼ ì¤ì "
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:160
+#: actions/imsettings.php:163
 msgid "Send me notices through Jabber/GTalk."
 msgstr "Jabber/GTalk ë¡ íµì§ë¥¼ ë³´ë´ì£¼ì¸ì."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:166
+#: actions/imsettings.php:169
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr "Jabber/GTalkì ìíê° ë³ê²½ëìì ë íµì§ë¥¼ ë³´ëëë¤."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:172
+#: actions/imsettings.php:175
 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr ""
 "ë´ê° êµ¬ëíì§ ìë ì¬ëì¼ë¡ ë¶í°ì ëµì¥ì  Jabber/GTalkì íµí´ ë³´ë´ì£¼ì¸ì."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:179
+#: actions/imsettings.php:182
 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "Jabber/GTalk ê³ì ì ìí MicroIDì ìì±"
 
 #. TRANS: Confirmation message for successful IM preferences save.
-#: actions/imsettings.php:287 actions/othersettings.php:180
+#: actions/imsettings.php:290 actions/othersettings.php:180
 msgid "Preferences saved."
 msgstr "ì¤ì ì´ ì ì¥ëììµëë¤."
 
 #. TRANS: Message given saving IM address without having provided one.
-#: actions/imsettings.php:309
+#: actions/imsettings.php:312
 msgid "No Jabber ID."
 msgstr "Jabber IDê° ìëëë¤."
 
 #. TRANS: Message given saving IM address that cannot be normalised.
-#: actions/imsettings.php:317
+#: actions/imsettings.php:320
 msgid "Cannot normalize that Jabber ID"
 msgstr "ê·¸ Jabbar IDë¥¼ ì ê·í í  ì ììµëë¤."
 
 #. TRANS: Message given saving IM address that not valid.
-#: actions/imsettings.php:322
+#: actions/imsettings.php:325
 msgid "Not a valid Jabber ID"
 msgstr "ì í¨í Jabber IDê° ìëëë¤."
 
 #. TRANS: Message given saving IM address that is already set.
-#: actions/imsettings.php:326
+#: actions/imsettings.php:329
 msgid "That is already your Jabber ID."
 msgstr "ê·¸ Jabber IDë ì´ë¯¸ ê·íì ê²ìëë¤."
 
 #. TRANS: Message given saving IM address that is already set for another user.
-#: actions/imsettings.php:330
+#: actions/imsettings.php:333
 msgid "Jabber ID already belongs to another user."
 msgstr "Jabber IDê° ì´ë¯¸ ë¤ë¥¸ ì¬ì©ìì ìíì¬ ì¬ì©ëê³  ììµëë¤."
 
 #. 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
+#: actions/imsettings.php:361
 #, php-format
 msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
@@ -1936,28 +1922,28 @@ msgstr ""
 "ë¬í  ì ììµëë¤."
 
 #. TRANS: Message given canceling IM address confirmation for the wrong IM address.
-#: actions/imsettings.php:388
+#: actions/imsettings.php:391
 msgid "That is the wrong IM address."
 msgstr "ì³ì§ ìì ë©ì ì  ê³ì  ìëë¤."
 
 #. TRANS: Server error thrown on database error canceling IM address confirmation.
-#: actions/imsettings.php:397
+#: actions/imsettings.php:400
 msgid "Couldn't delete IM confirmation."
 msgstr "ë©ì ì  ì¹ì¸ì ìì  í  ì ììµëë¤."
 
 #. TRANS: Message given after successfully canceling IM address confirmation.
-#: actions/imsettings.php:402
+#: actions/imsettings.php:405
 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
+#: actions/imsettings.php:427
 msgid "That is not your Jabber ID."
 msgstr "ê·¸ Jabber IDë ê·íì ê²ì´ ìëëë¤."
 
 #. TRANS: Message given after successfully removing a registered IM address.
-#: actions/imsettings.php:447
+#: actions/imsettings.php:450
 msgid "The IM address was removed."
 msgstr "ë©ì¼ ì£¼ìë¥¼ ì§ì ìµëë¤."
 
@@ -2173,12 +2159,6 @@ msgid ""
 msgstr ""
 "ë³´ìì ìí´ ì¸íì ì ì¥íê¸° ì ì ê³ì ê³¼ ë¹ë° ë²í¸ë¥¼ ë¤ì ìë ¥ í´ ì£¼ììì¤."
 
-#: actions/login.php:295
-#, php-format
-msgid ""
-"Don't have a username yet? [Register](%%action.register%%) a new account."
-msgstr ""
-
 #: actions/makeadmin.php:92
 msgid "Only an admin can make another user an admin."
 msgstr ""
@@ -2301,21 +2281,11 @@ msgid ""
 "[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
 msgstr ""
 
-#: actions/noticesearchrss.php:96
-#, php-format
-msgid "Updates with \"%s\""
-msgstr ""
-
 #: actions/noticesearchrss.php:98
 #, php-format
 msgid "Updates matching search term \"%1$s\" on %2$s!"
 msgstr "%2$sì ìë %1$sì ìë°ì´í¸!"
 
-#: actions/nudge.php:85
-msgid ""
-"This user doesn't allow nudges or hasn't confirmed or set their email yet."
-msgstr ""
-
 #: actions/nudge.php:94
 msgid "Nudge sent"
 msgstr "ì°ë¬ ë³´ê¸°ë¥¼ ë³´ëìµëë¤."
@@ -2362,12 +2332,6 @@ msgstr "ì´ì©ìê° íë¡íì ê°ì§ê³  ìì§ ììµëë¤."
 msgid "%1$s's status on %2$s"
 msgstr "%1$sì ìí (%2$sìì)"
 
-#. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
-#: actions/oembed.php:159
-#, php-format
-msgid "Content type %s not supported."
-msgstr ""
-
 #. TRANS: Error message displaying attachments. %s is the site's base URL.
 #: actions/oembed.php:163
 #, php-format
@@ -2375,8 +2339,8 @@ msgid "Only %s URLs over plain HTTP please."
 msgstr ""
 
 #. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1215
-#: lib/apiaction.php:1243 lib/apiaction.php:1366
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1206
+#: lib/apiaction.php:1233 lib/apiaction.php:1356
 msgid "Not a supported data format."
 msgstr "ì§ìíë íìì ë°ì´í°ê° ìëëë¤."
 
@@ -2504,7 +2468,7 @@ msgid "Password saved."
 msgstr "ë¹ë° ë²í¸ ì ì¥"
 
 #. TRANS: Menu item for site administration
-#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:384
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:371
 msgid "Paths"
 msgstr "ê²½ë¡"
 
@@ -2677,7 +2641,7 @@ msgstr "ì¤ëª"
 
 #. TRANS: Form input field label.
 #: actions/profilesettings.php:115 actions/register.php:460
-#: lib/applicationeditform.php:244 lib/groupeditform.php:161
+#: lib/applicationeditform.php:235 lib/groupeditform.php:161
 msgid "Homepage"
 msgstr "ííì´ì§"
 
@@ -2685,10 +2649,6 @@ msgstr "ííì´ì§"
 msgid "URL of your homepage, blog, or profile on another site"
 msgstr "ê·íì ííì´ì§, ë¸ë¡ê·¸ í¹ì ë¤ë¥¸ ì¬ì´í¸ì íë¡í íì´ì§ URL"
 
-#: actions/profilesettings.php:125 actions/register.php:471
-msgid "Describe yourself and your interests"
-msgstr ""
-
 #: actions/profilesettings.php:127 actions/register.php:473
 msgid "Bio"
 msgstr "ìê¸°ìê°"
@@ -2771,7 +2731,7 @@ msgid "Couldn't save tags."
 msgstr "íê·¸ë¥¼ ì ì¥í  ì ììµëë¤."
 
 #. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:391 lib/adminpanelaction.php:141
+#: actions/profilesettings.php:391 lib/adminpanelaction.php:138
 msgid "Settings saved."
 msgstr "ì¤ì  ì ì¥"
 
@@ -2824,14 +2784,6 @@ msgid ""
 "friends, family, and colleagues! ([Read more](%%doc.help%%))"
 msgstr ""
 
-#: actions/public.php:247
-#, php-format
-msgid ""
-"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
-"blogging) service based on the Free Software [StatusNet](http://status.net/) "
-"tool."
-msgstr ""
-
 #: actions/publictagcloud.php:57
 msgid "Public tag cloud"
 msgstr "ê³µê° íê·¸ í´ë¼ì°ë"
@@ -3045,33 +2997,6 @@ msgstr ""
 msgid "All rights reserved."
 msgstr ""
 
-#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:540
-#, php-format
-msgid ""
-"My text and files are available under %s except this private data: password, "
-"email address, IM address, and phone number."
-msgstr ""
-
-#: actions/register.php:583
-#, php-format
-msgid ""
-"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
-"want to...\n"
-"\n"
-"* Go to [your profile](%2$s) and post your first message.\n"
-"* Add a [Jabber/GTalk address](%%%%action.imsettings%%%%) so you can send "
-"notices through instant messages.\n"
-"* [Search for people](%%%%action.peoplesearch%%%%) that you may know or that "
-"share your interests. \n"
-"* Update your [profile settings](%%%%action.profilesettings%%%%) to tell "
-"others more about you. \n"
-"* Read over the [online docs](%%%%doc.help%%%%) for features you may have "
-"missed. \n"
-"\n"
-"Thanks for signing up and we hope you enjoy using this service."
-msgstr ""
-
 #: actions/register.php:607
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
@@ -3120,18 +3045,6 @@ msgstr "êµ¬ë"
 msgid "Invalid profile URL (bad format)"
 msgstr "ì³ì§ ìì íë¡í URL (ëì í¬ë©§)"
 
-#: actions/remotesubscribe.php:168
-msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
-msgstr ""
-
-#: actions/remotesubscribe.php:176
-msgid "Thatâs a local profile! Login to subscribe."
-msgstr ""
-
-#: actions/remotesubscribe.php:183
-msgid "Couldnât get a request token."
-msgstr ""
-
 #: actions/repeat.php:76
 msgid "You can't repeat your own notice."
 msgstr "ìì ì ê¸ì ì¬ì ì¡í  ì ììµëë¤."
@@ -3243,24 +3156,24 @@ msgid "Application profile"
 msgstr "ì ê· ìì© íë¡ê·¸ë¨"
 
 #. TRANS: Form input field label for application icon.
-#: actions/showapplication.php:159 lib/applicationeditform.php:182
+#: actions/showapplication.php:159 lib/applicationeditform.php:173
 msgid "Icon"
 msgstr ""
 
 #. TRANS: Form input field label for application name.
 #: actions/showapplication.php:169 actions/version.php:197
-#: lib/applicationeditform.php:199
+#: lib/applicationeditform.php:190
 msgid "Name"
 msgstr "ì´ë¦"
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:178 lib/applicationeditform.php:235
+#: actions/showapplication.php:178 lib/applicationeditform.php:226
 msgid "Organization"
 msgstr "ê¸°ê´ ì´ë¦ì´ íìí©ëë¤."
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:216 lib/groupeditform.php:172
+#: lib/applicationeditform.php:207 lib/groupeditform.php:172
 msgid "Description"
 msgstr "ì¤ëª"
 
@@ -3357,7 +3270,7 @@ msgstr ""
 msgid "This is a way to share what you like."
 msgstr "ì¢ìíë ê¸ì ì§ì íë©´ ìê¸°ê° ë¬´ìì ì¢ìíëì§ ìë¦´ ì ììµëë¤."
 
-#: actions/showgroup.php:82 lib/groupnav.php:86
+#: actions/showgroup.php:82
 #, php-format
 msgid "%s group"
 msgstr "%s ê·¸ë£¹"
@@ -3409,7 +3322,7 @@ msgstr "%s ê·¸ë£¹ì ìí ê³µì§í¼ë (Atom)"
 msgid "FOAF for %s group"
 msgstr "%sì ë³´ë¸ìª½ì§í¨"
 
-#: actions/showgroup.php:393 actions/showgroup.php:445 lib/groupnav.php:91
+#: actions/showgroup.php:393 actions/showgroup.php:445
 msgid "Members"
 msgstr "íì"
 
@@ -3437,15 +3350,6 @@ msgid ""
 "of this group and many more! ([Read more](%%%%doc.help%%%%))"
 msgstr ""
 
-#: actions/showgroup.php:461
-#, php-format
-msgid ""
-"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
-"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
-"[StatusNet](http://status.net/) tool. Its members share short messages about "
-"their life and interests. "
-msgstr ""
-
 #: actions/showmessage.php:81
 msgid "No such message."
 msgstr "ê·¸ë¬í ë©ìì§ê° ììµëë¤."
@@ -3513,14 +3417,6 @@ msgid ""
 "follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))"
 msgstr ""
 
-#: actions/showstream.php:248
-#, php-format
-msgid ""
-"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
-"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
-"[StatusNet](http://status.net/) tool. "
-msgstr ""
-
 #: actions/silence.php:65 actions/unsilence.php:65
 msgid "You cannot silence users on this site."
 msgstr "ì´ ì¬ì´í¸ì ì´ì©ìì ëí´ ê¶íì ì§ í  ì ììµëë¤."
@@ -3780,7 +3676,7 @@ msgstr "ì½ëê° ìë ¥ ëì§ ìììµëë¤."
 
 #. TRANS: Menu item for site administration
 #: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
-#: lib/adminpanelaction.php:408
+#: lib/adminpanelaction.php:395
 msgid "Snapshots"
 msgstr ""
 
@@ -4063,13 +3959,6 @@ msgstr ""
 msgid "Authorize subscription"
 msgstr "êµ¬ëì íê°"
 
-#: actions/userauthorization.php:110
-msgid ""
-"Please check these details to make sure that you want to subscribe to this "
-"userâs notices. If you didnât just ask to subscribe to someoneâs notices, "
-"click âRejectâ."
-msgstr ""
-
 #: actions/userauthorization.php:196 actions/version.php:167
 msgid "License"
 msgstr "ë¼ì´ì¼ì¤"
@@ -4095,24 +3984,10 @@ msgstr "íì©ëì§ ìë ìì²ìëë¤."
 msgid "Subscription authorized"
 msgstr "êµ¬ë íê°"
 
-#: actions/userauthorization.php:256
-msgid ""
-"The subscription has been authorized, but no callback URL was passed. Check "
-"with the siteâs instructions for details on how to authorize the "
-"subscription. Your subscription token is:"
-msgstr ""
-
 #: actions/userauthorization.php:266
 msgid "Subscription rejected"
 msgstr "êµ¬ë ê±°ë¶"
 
-#: actions/userauthorization.php:268
-msgid ""
-"The subscription has been rejected, but no callback URL was passed. Check "
-"with the siteâs instructions for details on how to fully reject the "
-"subscription."
-msgstr ""
-
 #: actions/userauthorization.php:303
 #, php-format
 msgid "Listener URI â%sâ not found here."
@@ -4133,14 +4008,9 @@ msgstr ""
 msgid "Profile URL â%sâ is for a local user."
 msgstr ""
 
-#: actions/userauthorization.php:350
-#, php-format
-msgid "Canât read avatar URL â%sâ."
-msgstr ""
-
-#: actions/userauthorization.php:355
+#: actions/userauthorization.php:345
 #, php-format
-msgid "Wrong image type for avatar URL â%sâ."
+msgid "Avatar URL â%sâ is not valid."
 msgstr ""
 
 #: actions/userdesignsettings.php:76 lib/designsettings.php:65
@@ -4163,10 +4033,6 @@ msgstr ""
 msgid "%1$s groups, page %2$d"
 msgstr "ê·¸ë£¹, %d íì´ì§"
 
-#: actions/usergroups.php:132
-msgid "Search for more groups"
-msgstr ""
-
 #: actions/usergroups.php:164
 #, php-format
 msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
@@ -4366,7 +4232,7 @@ msgid "Unable to save tag."
 msgstr "íê·¸ë¥¼ ì ì¥í  ì ììµëë¤."
 
 #. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#: classes/Subscription.php:75 lib/oauthstore.php:465
+#: classes/Subscription.php:75 lib/oauthstore.php:466
 msgid "You have been banned from subscribing."
 msgstr "ê·íë êµ¬ëì´ ê¸ì§ëììµëë¤."
 
@@ -4463,12 +4329,6 @@ msgstr "ì ëª©ìë íì´ì§"
 msgid "Primary site navigation"
 msgstr "ì£¼ ì¬ì´í¸ ë¤ë¹ê²ì´ì"
 
-#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:455
-msgctxt "TOOLTIP"
-msgid "Personal profile and friends timeline"
-msgstr ""
-
 #. TRANS: Main menu option when logged in for access to personal profile and friends timeline
 #: lib/action.php:458
 msgctxt "MENU"
@@ -4499,7 +4359,8 @@ msgid "Change site configuration"
 msgstr "ë©ì¼ ì£¼ì íì¸"
 
 #. TRANS: Main menu option when logged in and site admin for access to site configuration
-#: lib/action.php:474
+#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
+#: lib/action.php:474 lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr "ê´ë¦¬"
@@ -4556,12 +4417,6 @@ msgctxt "MENU"
 msgid "Help"
 msgstr "ëìë§"
 
-#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:513
-msgctxt "TOOLTIP"
-msgid "Search for people or text"
-msgstr ""
-
 #: lib/action.php:516
 msgctxt "MENU"
 msgid "Search"
@@ -4569,7 +4424,7 @@ msgstr "ê²ì"
 
 #. TRANS: DT element for site notice. String is hidden in default CSS.
 #. TRANS: Menu item for site administration
-#: lib/action.php:538 lib/adminpanelaction.php:400
+#: lib/action.php:538 lib/adminpanelaction.php:387
 msgid "Site notice"
 msgstr "ì¬ì´í¸ ê³µì§"
 
@@ -4632,22 +4487,17 @@ msgstr "ë°°ì§"
 msgid "StatusNet software license"
 msgstr "StatusNet ìíí¸ì¨ì´ ë¼ì´ì ì¤"
 
-#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
-#: lib/action.php:843
-#, php-format
-msgid ""
-"**%%site.name%%** is a microblogging service brought to you by [%%site."
-"broughtby%%](%%site.broughtbyurl%%)."
-msgstr ""
-
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:846
+#: lib/action.php:849
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** ë ë§ì´í¬ë¡ë¸ë¡ê¹ìë¹ì¤ìëë¤."
 
 #. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.
-#: lib/action.php:850
+#. TRANS: Make sure there is no whitespace between "]" and "(".
+#. TRANS: Text between [] is a link description, text between () is the link itself.
+#. TRANS: %s is the version of StatusNet that is being used.
+#: lib/action.php:856
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4659,50 +4509,51 @@ msgstr ""
 "fsf.org/licensing/licenses/agpl-3.0.html) ë¼ì´ì ì¤ì ë°ë¼ ì¬ì©í  ì ììµëë¤."
 
 #. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:866
+#: lib/action.php:872
 msgid "Site content license"
 msgstr "ì¬ì´í¸ ì»¨íì¸  ë¼ì´ì ì¤"
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:873
+#: lib/action.php:879
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr "%1$sì ì»¨íì¸ ì ë°ì´í°ë ì¸ë¶ ì ì¶ì ê¸ì§í©ëë¤."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:880
+#: lib/action.php:886
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr "ì»¨íì¸ ì ë°ì´í°ì ì ìê¶ì %1$sì ìì ìëë¤. All rights reserved."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:884
+#: lib/action.php:890
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 "ì»¨íì¸ ì ë°ì´í°ì ì ìê¶ì ê° ì´ì©ìì ìì ìëë¤. All rights reserved."
 
-#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:897
+#. TRANS: license message in footer.
+#. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
+#: lib/action.php:904
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr "%1$sì ëª¨ë  ì»¨íì¸ ì ë°ì´í°ë %2$s ë¼ì´ì ì¤ì ë°ë¼ ì´ì©í  ì ììµëë¤."
 
 #. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1236
+#: lib/action.php:1243
 msgid "Pagination"
 msgstr "íì´ì§ì"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1247
+#: lib/action.php:1254
 msgid "After"
 msgstr "ë· íì´ì§"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1257
+#: lib/action.php:1264
 msgid "Before"
 msgstr "ì íì´ì§"
 
@@ -4711,165 +4562,194 @@ msgstr "ì íì´ì§"
 msgid "Expecting a root feed element but got a whole XML document."
 msgstr ""
 
-#: lib/activityutils.php:208
+#. TRANS: Client exception thrown when there is no source attribute.
+#: lib/activityutils.php:203
 msgid "Can't handle remote content yet."
 msgstr ""
 
-#: lib/activityutils.php:244
+#. TRANS: Client exception thrown when there embedded XML content is found that cannot be processed yet.
+#: lib/activityutils.php:240
 msgid "Can't handle embedded XML content yet."
 msgstr ""
 
-#: lib/activityutils.php:248
+#. TRANS: Client exception thrown when base64 encoded content is found that cannot be processed yet.
+#: lib/activityutils.php:245
 msgid "Can't handle embedded Base64 content yet."
 msgstr ""
 
 #. TRANS: Client error message thrown when a user tries to change admin settings but has no access rights.
-#: lib/adminpanelaction.php:98
+#: lib/adminpanelaction.php:96
 msgid "You cannot make changes to this site."
 msgstr "ì´ ì¬ì´í¸ì ì´ì©ìì ëí´ ê¶íì ì§ í  ì ììµëë¤."
 
 #. TRANS: Client error message thrown if design settings could not be deleted in
 #. TRANS: the admin panel Design.
-#: lib/adminpanelaction.php:284
+#: lib/adminpanelaction.php:274
 msgid "Unable to delete design setting."
 msgstr "ëìì¸ ì¤ì ì ì ì¥í  ì ììµëë¤."
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:350
+#: lib/adminpanelaction.php:337
 msgid "Basic site configuration"
 msgstr "ë©ì¼ ì£¼ì íì¸"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:352
+#: lib/adminpanelaction.php:339
 msgctxt "MENU"
 msgid "Site"
 msgstr "ì¬ì´í¸"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:358
+#: lib/adminpanelaction.php:345
 msgid "Design configuration"
 msgstr "ë©ì¼ ì£¼ì íì¸"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:360
+#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
+#: lib/adminpanelaction.php:347 lib/groupnav.php:135
 msgctxt "MENU"
 msgid "Design"
 msgstr "ëìì¸"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:366
+#: lib/adminpanelaction.php:353
 msgid "User configuration"
 msgstr "ë©ì¼ ì£¼ì íì¸"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:368 lib/personalgroupnav.php:115
+#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:115
 msgid "User"
 msgstr "ì¬ì©ì"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:374
+#: lib/adminpanelaction.php:361
 msgid "Access configuration"
 msgstr "ë©ì¼ ì£¼ì íì¸"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:382
+#: lib/adminpanelaction.php:369
 msgid "Paths configuration"
 msgstr "ë©ì¼ ì£¼ì íì¸"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:390
+#: lib/adminpanelaction.php:377
 msgid "Sessions configuration"
 msgstr "ë©ì¼ ì£¼ì íì¸"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:406
+#: lib/adminpanelaction.php:393
 msgid "Snapshots configuration"
 msgstr "ë©ì¼ ì£¼ì íì¸"
 
 #. TRANS: Client error 401.
-#: lib/apiauth.php:113
+#: lib/apiauth.php:111
 msgid "API resource requires read-write access, but you only have read access."
 msgstr ""
 
+#. TRANS: OAuth exception thrown when no application is found for a given consumer key.
+#: lib/apiauth.php:175
+msgid "No application for that consumer key."
+msgstr ""
+
+#. TRANS: OAuth exception given when an incorrect access token was given for a user.
+#: lib/apiauth.php:212
+msgid "Bad access token."
+msgstr ""
+
+#. TRANS: OAuth exception given when no user was found for a given token (no token was found).
+#: lib/apiauth.php:217
+msgid "No user for that token."
+msgstr ""
+
+#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
+#: lib/apioauthstore.php:178
+msgid "Tried to revoke unknown token"
+msgstr ""
+
+#. TRANS: Exception thrown when an attempt is made to remove a revoked token.
+#: lib/apioauthstore.php:182
+msgid "Failed to delete revoked token"
+msgstr ""
+
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:187
+#: lib/applicationeditform.php:178
 msgid "Icon for this application"
 msgstr "ì´ ìì©íë¡ê·¸ë¨ ìì  ìê¸°"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:209
+#: lib/applicationeditform.php:200
 #, php-format
 msgid "Describe your application in %d characters"
 msgstr "ìì©íë¡ê·¸ë¨ ìì "
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:213
+#: lib/applicationeditform.php:204
 msgid "Describe your application"
 msgstr "ìì©íë¡ê·¸ë¨ ìì "
 
 #. TRANS: Form input field label.
-#: lib/applicationeditform.php:226
+#: lib/applicationeditform.php:217
 msgid "Source URL"
 msgstr "ìì¤ ì½ë URL"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:251
+#: lib/applicationeditform.php:242
 msgid "URL to redirect to after authentication"
 msgstr ""
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:278
+#: lib/applicationeditform.php:269
 msgid "Browser"
 msgstr "ë¸ë¼ì°ì "
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:295
+#: lib/applicationeditform.php:286
 msgid "Desktop"
 msgstr "ë°ì¤í¬í±"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:297
+#: lib/applicationeditform.php:288
 msgid "Type of application, browser or desktop"
 msgstr ""
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:320
+#: lib/applicationeditform.php:311
 msgid "Read-only"
 msgstr "ì½ê¸° ì ì©"
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:339
+#: lib/applicationeditform.php:330
 msgid "Read-write"
 msgstr "ì½ê¸° ì°ê¸°"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:341
+#: lib/applicationeditform.php:332
 msgid "Default access for this application: read-only, or read-write"
 msgstr ""
 
-#. TRANS: Submit button title
-#: lib/applicationeditform.php:359
+#. TRANS: Submit button title.
+#: lib/applicationeditform.php:349
 msgid "Cancel"
 msgstr "ì·¨ì"
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:136
+#: lib/applicationlist.php:135
 msgid "read-write"
 msgstr "ì½ê¸° ì°ê¸°"
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:138
+#: lib/applicationlist.php:137
 msgid "read-only"
 msgstr "ì½ê¸° ì ì©"
 
 #. 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
+#: lib/applicationlist.php:143
 #, php-format
 msgid "Approved %1$s - \"%2$s\" access."
 msgstr ""
 
 #. TRANS: Button label
-#: lib/applicationlist.php:159
+#: lib/applicationlist.php:158
 msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "ì ê±°"
@@ -4889,10 +4769,16 @@ msgstr "ìì±ì"
 msgid "Provider"
 msgstr "ë¯¸ë¦¬ë³´ê¸°"
 
-#: lib/attachmentnoticesection.php:67
+#. TRANS: Title.
+#: lib/attachmentnoticesection.php:68
 msgid "Notices where this attachment appears"
 msgstr ""
 
+#. TRANS: Title for the form to block a user.
+#: lib/blockform.php:70
+msgid "Block"
+msgstr "ì°¨ë¨íê¸°"
+
 #: lib/channel.php:157 lib/channel.php:177
 msgid "Command results"
 msgstr "ì¤íê²°ê³¼"
@@ -4905,6 +4791,13 @@ msgstr "ì¤í ìë£"
 msgid "Command failed"
 msgstr "ì¤í ì¤í¨"
 
+#. TRANS: Message given getting a non-existing user.
+#. TRANS: %s is the nickname of the user that could not be found.
+#: lib/command.php:150
+#, php-format
+msgid "Could not find a local user with nickname %s."
+msgstr ""
+
 #. TRANS: Error text shown when an unimplemented command is given.
 #: lib/command.php:185
 msgid "Sorry, this command is not yet implemented."
@@ -4932,6 +4825,20 @@ msgstr ""
 msgid "Notice marked as fave."
 msgstr "ê²ìê¸ì´ ì¢ìíë ê¸ë¡ ì§ì ëììµëë¤."
 
+#. 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.
+#: lib/command.php:360
+#, php-format
+msgid "%1$s joined group %2$s."
+msgstr ""
+
+#. 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.
+#: lib/command.php:408
+#, php-format
+msgid "%1$s left group %2$s."
+msgstr ""
+
 #. TRANS: Whois output. %s is the full name of the queried user.
 #: lib/command.php:434
 #, php-format
@@ -4966,13 +4873,6 @@ msgid ""
 "same server."
 msgstr ""
 
-#. 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:491 lib/xmppmanager.php:403
-#, php-format
-msgid "Message too long - maximum is %1$d characters, you sent %2$d."
-msgstr ""
-
 #. TRANS: Error text shown sending a direct message fails with an unknown reason.
 #: lib/command.php:517
 msgid "Error sending direct message."
@@ -4983,27 +4883,23 @@ msgstr "ì§ì  ë©ìì§ ë³´ë´ê¸° ì¤ë¥."
 msgid "Error repeating notice."
 msgstr "ì¬ì©ì ì¸í ì¤ë¥"
 
-#. TRANS: Message given if content of a notice for a reply is too long.
-#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:592
-#, php-format
-msgid "Notice too long - maximum is %1$d characters, you sent %2$d."
-msgstr ""
-
 #. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
 #: lib/command.php:606
 msgid "Error saving notice."
 msgstr "ì¬ì©ì ì¸í ì¤ë¥"
 
-#. TRANS: Error text shown when no username was provided when issuing a subscribe command.
-#: lib/command.php:655
-msgid "Specify the name of the user to subscribe to."
+#. TRANS: Text shown after having subscribed to another user successfully.
+#. TRANS: %s is the name of the user the subscription was requested for.
+#: lib/command.php:672
+#, php-format
+msgid "Subscribed to %s."
 msgstr ""
 
-#. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
-#. TRANS: Error text shown when no username was provided when issuing the command.
-#: lib/command.php:694 lib/command.php:804
-msgid "Specify the name of the user to unsubscribe from."
+#. TRANS: Text shown after having unsubscribed from another user successfully.
+#. TRANS: %s is the name of the user the unsubscription was requested for.
+#: lib/command.php:705
+#, php-format
+msgid "Unsubscribed from %s."
 msgstr ""
 
 #. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
@@ -5044,8 +4940,15 @@ msgstr ""
 msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr ""
 
+#. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
+#. TRANS: %s is the name of the user the unsubscription was requested for.
+#: lib/command.php:813
+#, php-format
+msgid "Unsubscribed %s."
+msgstr ""
+
 #. TRANS: Text shown after requesting other users a user is subscribed to.
-#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.
 #: lib/command.php:836
 msgid "You are subscribed to this person:"
@@ -5053,7 +4956,7 @@ msgid_plural "You are subscribed to these people:"
 msgstr[0] "ë¹ì ì ë¤ì ì¬ì©ìë¥¼ ì´ë¯¸ êµ¬ëíê³  ììµëë¤."
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
-#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
 #: lib/command.php:863
 msgid "This person is subscribed to you:"
@@ -5061,13 +4964,14 @@ msgid_plural "These people are subscribed to you:"
 msgstr[0] "ë¤ë¥¸ ì¬ëì êµ¬ë íì¤ ì ììµëë¤."
 
 #. TRANS: Text shown after requesting groups a user is subscribed to.
-#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
 #: lib/command.php:890
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "ë¹ì ì í´ë¹ ê·¸ë£¹ì ë©¤ë²ê° ìëëë¤."
 
+#. TRANS: Help text for commands.
 #: lib/command.php:905
 msgid ""
 "Commands:\n"
@@ -5226,33 +5130,6 @@ msgstr "ê·¸ë£¹ì ìì¹, \"ì/êµ°/êµ¬, ë, êµê°\""
 msgid "Extra nicknames for the group, comma- or space- separated, max %d"
 msgstr ""
 
-#: lib/groupnav.php:85
-msgid "Group"
-msgstr "ê·¸ë£¹"
-
-#: lib/groupnav.php:101
-msgid "Blocked"
-msgstr "ì°¨ë¨"
-
-#: lib/groupnav.php:108
-#, php-format
-msgid "Edit %s group properties"
-msgstr "%s ê·¸ë£¹ ìì± í¸ì§"
-
-#: lib/groupnav.php:113
-msgid "Logo"
-msgstr "ë¡ê³ "
-
-#: lib/groupnav.php:114
-#, php-format
-msgid "Add or edit %s logo"
-msgstr "%s ë¡ê³  ì¶ê° í¹ì í¸ì§"
-
-#: lib/groupnav.php:120
-#, php-format
-msgid "Add or edit %s design"
-msgstr "%s ë¡ê³  ì¶ê° í¹ì í¸ì§"
-
 #: lib/groupsbymemberssection.php:71
 msgid "Groups with most members"
 msgstr "ê°ì¥ ë§ì íììë¥¼ ê°ì§ ê·¸ë£¹ë¤"
@@ -5279,7 +5156,8 @@ msgstr "ì§ìíì§ ìë ê·¸ë¦¼ íì¼ íììëë¤."
 msgid "Partial upload."
 msgstr "ë¶ìì í ìë¡ë."
 
-#: lib/imagefile.php:101 lib/mediafile.php:170
+#. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
+#: lib/imagefile.php:101 lib/mediafile.php:179
 msgid "System error uploading file."
 msgstr "íì¼ì ì¬ë¦¬ëë° ìì¤í ì¤ë¥ ë°ì"
 
@@ -5365,22 +5243,6 @@ msgid ""
 "your subscribers list and report as spam to site administrators at %s"
 msgstr ""
 
-#. TRANS: Main body of new-subscriber notification e-mail
-#: lib/mail.php:254
-#, php-format
-msgid ""
-"%1$s is now listening to your notices on %2$s.\n"
-"\n"
-"\t%3$s\n"
-"\n"
-"%4$s%5$s%6$s\n"
-"Faithfully yours,\n"
-"%7$s.\n"
-"\n"
-"----\n"
-"Change your email address or notification options at %8$s\n"
-msgstr ""
-
 #. TRANS: Profile info line in new-subscriber notification e-mail
 #: lib/mail.php:274
 #, php-format
@@ -5564,56 +5426,75 @@ msgstr "ì£ì¡í©ëë¤. ê·íì ì´ë©ì¼ì´ ìëëë¤."
 msgid "Sorry, no incoming email allowed."
 msgstr "ì£ì¡í©ëë¤. ì´ë©ì¼ì´ íì©ëì§ ììµëë¤."
 
-#: lib/mediafile.php:98 lib/mediafile.php:123
+#. TRANS: Client exception thrown when a database error was thrown during a file upload operation.
+#: lib/mediafile.php:99 lib/mediafile.php:125
 msgid "There was a database error while saving your file. Please try again."
 msgstr ""
 
-#: lib/mediafile.php:142
+#. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
+#: lib/mediafile.php:145
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
 msgstr ""
 
-#: lib/mediafile.php:147
+#. TRANS: Client exception.
+#: lib/mediafile.php:151
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form."
 msgstr ""
 
-#: lib/mediafile.php:152
+#. TRANS: Client exception.
+#: lib/mediafile.php:157
 msgid "The uploaded file was only partially uploaded."
 msgstr ""
 
-#: lib/mediafile.php:159
+#. TRANS: Client exception thrown when a temporary folder is not present to store a file upload.
+#: lib/mediafile.php:165
 msgid "Missing a temporary folder."
 msgstr ""
 
-#: lib/mediafile.php:162
+#. TRANS: Client exception thrown when writing to disk is not possible during a file upload operation.
+#: lib/mediafile.php:169
 msgid "Failed to write file to disk."
 msgstr ""
 
-#: lib/mediafile.php:165
+#. TRANS: Client exception thrown when a file upload operation has been stopped by an extension.
+#: lib/mediafile.php:173
 msgid "File upload stopped by extension."
 msgstr ""
 
-#: lib/mediafile.php:179 lib/mediafile.php:217
+#. TRANS: Client exception thrown when a file upload operation would cause a user to exceed a set quota.
+#: lib/mediafile.php:189 lib/mediafile.php:232
 msgid "File exceeds user's quota."
 msgstr ""
 
-#: lib/mediafile.php:197 lib/mediafile.php:234
+#. TRANS: Client exception thrown when a file upload operation fails because the file could
+#. TRANS: not be moved from the temporary folder to the permanent file location.
+#: lib/mediafile.php:209 lib/mediafile.php:251
 msgid "File could not be moved to destination directory."
 msgstr ""
 
-#: lib/mediafile.php:202 lib/mediafile.php:238
+#. TRANS: Client exception thrown when a file upload operation has been stopped because the MIME
+#. TRANS: type of the uploaded file could not be determined.
+#: lib/mediafile.php:216 lib/mediafile.php:257
 msgid "Could not determine file's MIME type."
 msgstr "ìì¤ ì´ì©ìë¥¼ íì¸í  ì ììµëë¤."
 
-#: lib/mediafile.php:318
+#. TRANS: Client exception thrown trying to upload a forbidden MIME type.
+#. TRANS: %1$s is the file type that was denied, %2$s is the application part of
+#. TRANS: the MIME type that was denied.
+#: lib/mediafile.php:340
 #, php-format
-msgid " Try using another %s format."
+msgid ""
+"\"%1$s\" is not a supported file type on this server. Try using another %2$s "
+"format."
 msgstr ""
 
-#: lib/mediafile.php:323
+#. TRANS: Client exception thrown trying to upload a forbidden MIME type.
+#. TRANS: %s is the file type that was denied.
+#: lib/mediafile.php:345
 #, php-format
-msgid "%s is not a supported file type on this server."
+msgid "\"%s\" is not a supported file type on this server."
 msgstr ""
 
 #: lib/messageform.php:120
@@ -5721,23 +5602,7 @@ msgstr "ì°ë¬ ë³´ê¸°"
 msgid "Send a nudge to this user"
 msgstr "ì´ ì¬ì©ììê² ì°ë¬ ë³´ê¸° ë©ìì§ ë³´ë´ê¸°"
 
-#: lib/oauthstore.php:283
-msgid "Error inserting new profile"
-msgstr "ì íë¡í ì¶ê° ì¤ë¥"
-
-#: lib/oauthstore.php:291
-msgid "Error inserting avatar"
-msgstr "ìë°í ì¶ê° ì¤ë¥"
-
-#: lib/oauthstore.php:306
-msgid "Error updating remote profile"
-msgstr "ë¦¬ëª¨í¸ íë¡í ìë°ì´í¸ ì¤ë¥"
-
-#: lib/oauthstore.php:311
-msgid "Error inserting remote profile"
-msgstr "ë¦¬ëª¨í¸ íë¡í ì¶ê° ì¤ë¥"
-
-#: lib/oauthstore.php:490
+#: lib/oauthstore.php:491
 msgid "Couldn't insert new subscription."
 msgstr "ìì½ êµ¬ëì ì¶ê° í  ì ììµëë¤."
 
@@ -5848,19 +5713,19 @@ msgstr "ê·¸ë£¹ ì´ì©ìë ì°¨ë¨í´ì "
 msgid "No single user defined for single-user mode."
 msgstr ""
 
-#: lib/searchaction.php:120
+#. TRANS: Fieldset legend for the search form.
+#: lib/searchaction.php:121
 msgid "Search site"
 msgstr "ê²ì ëìë§"
 
-#: lib/searchaction.php:126
+#. TRANS: Used as a field label for the field where one or more keywords
+#. TRANS: for searching can be entered.
+#: lib/searchaction.php:129
 msgid "Keyword(s)"
 msgstr ""
 
-#: lib/searchaction.php:127
-msgid "Search"
-msgstr "ê²ì"
-
-#: lib/searchaction.php:162
+#. TRANS: Definition list item with instructions on how to get (better) search results.
+#: lib/searchaction.php:170
 msgid "Search help"
 msgstr "ê²ì ëìë§"
 
@@ -5978,6 +5843,10 @@ msgstr "ìì ê²ìê¸ ë±ë¡ì"
 msgid "Unsandbox"
 msgstr ""
 
+#: lib/unsilenceform.php:67
+msgid "Unsilence"
+msgstr ""
+
 #: lib/unsilenceform.php:78
 msgid "Unsilence this user"
 msgstr "ì´ ì¬ì©ì ìì "
@@ -6033,56 +5902,32 @@ msgid "Moderator"
 msgstr ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1102
+#: lib/util.php:1103
 msgid "a few seconds ago"
 msgstr "ëª ì´ ì "
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1105
+#: lib/util.php:1106
 msgid "about a minute ago"
 msgstr "1ë¶ ì "
 
-#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1109
-#, php-format
-msgid "about %d minutes ago"
-msgstr "%dë¶ ì "
-
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 #: lib/util.php:1112
 msgid "about an hour ago"
 msgstr "1ìê° ì "
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1116
-#, php-format
-msgid "about %d hours ago"
-msgstr "%dìê° ì "
-
-#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1119
+#: lib/util.php:1118
 msgid "about a day ago"
 msgstr "íë£¨ ì "
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1123
-#, php-format
-msgid "about %d days ago"
-msgstr "%dì¼ ì "
-
-#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1126
+#: lib/util.php:1124
 msgid "about a month ago"
 msgstr "1ë¬ ì "
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 #: lib/util.php:1130
-#, php-format
-msgid "about %d months ago"
-msgstr "%dë¬ ì "
-
-#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1133
 msgid "about a year ago"
 msgstr "1ë ì "
 
diff --git a/locale/mk/LC_MESSAGES/statusnet.po b/locale/mk/LC_MESSAGES/statusnet.po
index cdabe37a3c..45afa2b711 100644
--- a/locale/mk/LC_MESSAGES/statusnet.po
+++ b/locale/mk/LC_MESSAGES/statusnet.po
@@ -1,7 +1,8 @@
-# Translation of StatusNet to Macedonian
+# Translation of StatusNet to Macedonian (ÐÐ°ÐºÐµÐ´Ð¾Ð½ÑÐºÐ¸)
+# Expored from translatewiki.net
 #
-# Author@translatewiki.net: Bjankuloski06
-# Author@translatewiki.net: Brest
+# Author: Bjankuloski06
+# Author: Brest
 # --
 # This file is distributed under the same license as the StatusNet package.
 #
@@ -9,20 +10,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-08 22:33+0000\n"
-"PO-Revision-Date: 2010-09-08 22:34:59+0000\n"
-"Language-Team: Macedonian\n"
+"POT-Creation-Date: 2010-09-14 19:53+0000\n"
+"PO-Revision-Date: 2010-09-14 19:54:10+0000\n"
+"Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r72348); Translate extension (2010-08-20)\n"
+"X-Generator: MediaWiki 1.17alpha (r73009); Translate extension (2010-08-20)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
-"X-Message-Group: out-statusnet\n"
-"Plural-Forms: nplurals=2; plural= n==1 || n%10==1 ? 0 : 1;\n"
+"X-Message-Group: #out-statusnet\n"
+"Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
+"X-POT-Import-Date: 1284-49-16 34::+0000\n"
 
 #. TRANS: Page title
 #. TRANS: Menu item for site administration
-#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:376
+#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:363
 msgid "Access"
 msgstr "ÐÑÐ¸ÑÑÐ°Ð¿"
 
@@ -77,10 +79,10 @@ 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 actions/emailsettings.php:224
-#: actions/imsettings.php:184 actions/smssettings.php:209
-#: lib/applicationeditform.php:361
+#. TRANS: Button label in the "Edit application" form.
+#: actions/accessadminpanel.php:203 actions/emailsettings.php:228
+#: actions/imsettings.php:187 actions/smssettings.php:209
+#: lib/applicationeditform.php:351
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "ÐÐ°ÑÑÐ²Ð°Ñ"
@@ -93,15 +95,15 @@ msgstr "ÐÐµÐ¼Ð° ÑÐ°ÐºÐ²Ð° ÑÑÑÐ°Ð½Ð¸ÑÐ°."
 
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #: actions/all.php:79 actions/allrss.php:68
-#: actions/apiaccountupdatedeliverydevice.php:114
-#: actions/apiaccountupdateprofile.php:105
-#: actions/apiaccountupdateprofilebackgroundimage.php:116
-#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
-#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
-#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:113
-#: actions/apigroupismember.php:91 actions/apigroupjoin.php:100
-#: actions/apigroupleave.php:100 actions/apigrouplist.php:73
-#: actions/apistatusesupdate.php:229 actions/apisubscriptions.php:87
+#: actions/apiaccountupdatedeliverydevice.php:115
+#: actions/apiaccountupdateprofile.php:106
+#: actions/apiaccountupdateprofilebackgroundimage.php:117
+#: actions/apiaccountupdateprofileimage.php:106 actions/apiblockcreate.php:98
+#: actions/apiblockdestroy.php:97 actions/apidirectmessage.php:77
+#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:114
+#: actions/apigroupismember.php:91 actions/apigroupjoin.php:101
+#: actions/apigroupleave.php:101 actions/apigrouplist.php:73
+#: actions/apistatusesupdate.php:230 actions/apisubscriptions.php:87
 #: actions/apitimelinefavorites.php:72 actions/apitimelinefriends.php:174
 #: actions/apitimelinehome.php:80 actions/apitimelinementions.php:80
 #: actions/apitimelineuser.php:82 actions/avatarbynickname.php:75
@@ -200,16 +202,16 @@ msgid "Updates from %1$s and friends on %2$s!"
 msgstr "ÐÐ¾Ð´Ð½Ð¾Ð²ÑÐ²Ð°ÑÐ° Ð¾Ð´ %1$s Ð¸ Ð¿ÑÐ¸ÑÐ°ÑÐµÐ»Ð¸ Ð½Ð° %2$s!"
 
 #: actions/apiaccountratelimitstatus.php:72
-#: actions/apiaccountupdatedeliverydevice.php:94
-#: actions/apiaccountupdateprofile.php:97
-#: actions/apiaccountupdateprofilebackgroundimage.php:94
-#: actions/apiaccountupdateprofilecolors.php:118
+#: actions/apiaccountupdatedeliverydevice.php:95
+#: actions/apiaccountupdateprofile.php:98
+#: actions/apiaccountupdateprofilebackgroundimage.php:95
+#: actions/apiaccountupdateprofilecolors.php:119
 #: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156
-#: actions/apifavoritecreate.php:100 actions/apifavoritedestroy.php:101
-#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100
-#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:139
-#: actions/apigroupismember.php:115 actions/apigroupjoin.php:156
-#: actions/apigroupleave.php:142 actions/apigrouplist.php:137
+#: actions/apifavoritecreate.php:101 actions/apifavoritedestroy.php:102
+#: actions/apifriendshipscreate.php:101 actions/apifriendshipsdestroy.php:101
+#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:140
+#: actions/apigroupismember.php:115 actions/apigroupjoin.php:157
+#: actions/apigroupleave.php:143 actions/apigrouplist.php:137
 #: actions/apigrouplistall.php:122 actions/apigroupmembership.php:107
 #: actions/apigroupshow.php:116 actions/apihelptest.php:88
 #: actions/apistatusesdestroy.php:104 actions/apistatusesretweets.php:112
@@ -224,21 +226,23 @@ msgstr "ÐÐ¾Ð´Ð½Ð¾Ð²ÑÐ²Ð°ÑÐ° Ð¾Ð´ %1$s Ð¸ Ð¿ÑÐ¸ÑÐ°ÑÐµÐ»Ð¸ Ð½Ð° %2$s!"
 msgid "API method not found."
 msgstr "API Ð¼ÐµÑÐ¾Ð´Ð¾Ñ Ð½Ðµ Ðµ Ð¿ÑÐ¾Ð½Ð°ÑÐ´ÐµÐ½."
 
-#: actions/apiaccountupdatedeliverydevice.php:86
-#: actions/apiaccountupdateprofile.php:89
-#: actions/apiaccountupdateprofilebackgroundimage.php:86
-#: actions/apiaccountupdateprofilecolors.php:110
-#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89
-#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109
-#: actions/apifavoritecreate.php:91 actions/apifavoritedestroy.php:92
-#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
-#: actions/apigroupcreate.php:105 actions/apigroupjoin.php:92
-#: actions/apigroupleave.php:92 actions/apimediaupload.php:67
-#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:198
+#. TRANS: Client error message. POST is a HTTP command. It should not be translated.
+#. TRANS: Client error. POST is a HTTP command. It should not be translated.
+#: actions/apiaccountupdatedeliverydevice.php:87
+#: actions/apiaccountupdateprofile.php:90
+#: actions/apiaccountupdateprofilebackgroundimage.php:87
+#: actions/apiaccountupdateprofilecolors.php:111
+#: actions/apiaccountupdateprofileimage.php:85 actions/apiblockcreate.php:90
+#: actions/apiblockdestroy.php:89 actions/apidirectmessagenew.php:110
+#: actions/apifavoritecreate.php:92 actions/apifavoritedestroy.php:93
+#: actions/apifriendshipscreate.php:92 actions/apifriendshipsdestroy.php:92
+#: actions/apigroupcreate.php:106 actions/apigroupjoin.php:93
+#: actions/apigroupleave.php:93 actions/apimediaupload.php:68
+#: actions/apistatusesretweet.php:66 actions/apistatusesupdate.php:199
 msgid "This method requires a POST."
 msgstr "ÐÐ²Ð¾Ñ Ð¼ÐµÑÐ¾Ð´ Ð±Ð°ÑÐ° POST."
 
-#: actions/apiaccountupdatedeliverydevice.php:106
+#: actions/apiaccountupdatedeliverydevice.php:107
 msgid ""
 "You must specify a parameter named 'device' with a value of one of: sms, im, "
 "none."
@@ -246,27 +250,27 @@ msgstr ""
 "ÐÐ¾ÑÐ° Ð´Ð° Ð½Ð°Ð·Ð½Ð°ÑÐ¸ÑÐµ Ð¿Ð°ÑÐ°Ð¼ÐµÑÐ°Ñ ÑÐ¾ Ð¸Ð¼Ðµ 'device' ÑÐ¾ ÐµÐ´Ð½Ð° Ð¾Ð´ ÑÐ»ÐµÐ´Ð½Ð¸Ð²Ðµ Ð²ÑÐµÐ´Ð½Ð¾ÑÑÐ¸: "
 "sms, im, none."
 
-#: actions/apiaccountupdatedeliverydevice.php:133
+#: actions/apiaccountupdatedeliverydevice.php:134
 msgid "Could not update user."
 msgstr "ÐÐµ Ð¼Ð¾Ð¶ÐµÐ² Ð´Ð° Ð³Ð¾ Ð¿Ð¾Ð´Ð½Ð¾Ð²Ð°Ð¼ ÐºÐ¾ÑÐ¸ÑÐ½Ð¸ÐºÐ¾Ñ."
 
-#: actions/apiaccountupdateprofile.php:112
-#: actions/apiaccountupdateprofilebackgroundimage.php:194
-#: actions/apiaccountupdateprofilecolors.php:185
-#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/apiaccountupdateprofile.php:113
+#: actions/apiaccountupdateprofilebackgroundimage.php:195
+#: actions/apiaccountupdateprofilecolors.php:186
+#: actions/apiaccountupdateprofileimage.php:131 actions/apiusershow.php:108
 #: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/hcard.php:74
 #: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
 #: lib/profileaction.php:84
 msgid "User has no profile."
 msgstr "ÐÐ¾ÑÐ¸ÑÐ½Ð¸ÐºÐ¾Ñ Ð½ÐµÐ¼Ð° Ð¿ÑÐ¾ÑÐ¸Ð»."
 
-#: actions/apiaccountupdateprofile.php:147
+#: actions/apiaccountupdateprofile.php:148
 msgid "Could not save profile."
 msgstr "ÐÐµ Ð¼Ð¾Ð¶Ðµ Ð´Ð° ÑÐµ Ð·Ð°ÑÑÐ²Ð° Ð¿ÑÐ¾ÑÐ¸Ð»."
 
-#: actions/apiaccountupdateprofilebackgroundimage.php:108
-#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
-#: actions/apistatusesupdate.php:212 actions/avatarsettings.php:257
+#: actions/apiaccountupdateprofilebackgroundimage.php:109
+#: actions/apiaccountupdateprofileimage.php:98 actions/apimediaupload.php:81
+#: actions/apistatusesupdate.php:213 actions/avatarsettings.php:257
 #: actions/designadminpanel.php:123 actions/editapplication.php:118
 #: actions/newapplication.php:101 actions/newnotice.php:94
 #: lib/designsettings.php:283
@@ -278,30 +282,30 @@ msgstr ""
 "ÐÐ¿ÑÐ»ÑÐ¶ÑÐ²Ð°ÑÐ¾Ñ Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑÐµ Ð´Ð° Ð¾Ð±ÑÐ°Ð±Ð¾ÑÐ¸ ÑÐ¾Ð»ÐºÑ Ð¼Ð½Ð¾Ð³Ñ POST-Ð¿Ð¾Ð´Ð°ÑÐ¾ÑÐ¸ (%s Ð±Ð°ÑÑÐ¸) "
 "Ð·Ð°ÑÐ°Ð´Ð¸ Ð½ÐµÐ³Ð¾Ð²Ð°ÑÐ° ÑÐµÐºÐ¾Ð²Ð½Ð° Ð¿Ð¾ÑÑÐ°Ð²ÐµÐ½Ð¾ÑÑ."
 
-#: actions/apiaccountupdateprofilebackgroundimage.php:136
-#: actions/apiaccountupdateprofilebackgroundimage.php:146
-#: actions/apiaccountupdateprofilecolors.php:164
-#: actions/apiaccountupdateprofilecolors.php:174
+#: actions/apiaccountupdateprofilebackgroundimage.php:137
+#: actions/apiaccountupdateprofilebackgroundimage.php:147
+#: actions/apiaccountupdateprofilecolors.php:165
+#: actions/apiaccountupdateprofilecolors.php:175
 #: actions/groupdesignsettings.php:290 actions/groupdesignsettings.php:300
 #: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
 #: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
 msgid "Unable to save your design settings."
 msgstr "ÐÐµ Ð¼Ð¾Ð¶Ð°Ð¼ Ð´Ð° Ð³Ð¸ Ð·Ð°ÑÑÐ²Ð°Ð¼ ÐÐ°ÑÐ¸ÑÐµ Ð½Ð°Ð³Ð¾Ð´ÑÐ²Ð°ÑÐ° Ð·Ð° Ð¸Ð·Ð³Ð»ÐµÐ´."
 
-#: actions/apiaccountupdateprofilebackgroundimage.php:187
-#: actions/apiaccountupdateprofilecolors.php:142
+#: actions/apiaccountupdateprofilebackgroundimage.php:188
+#: actions/apiaccountupdateprofilecolors.php:143
 msgid "Could not update your design."
 msgstr "ÐÐµ Ð¼Ð¾Ð¶Ðµ Ð´Ð° ÑÐµ Ð¿Ð¾Ð´Ð½Ð¾Ð²Ð¸ ÐÐ°ÑÐ¸Ð¾Ñ Ð¸Ð·Ð³Ð»ÐµÐ´."
 
-#: actions/apiblockcreate.php:105
+#: actions/apiblockcreate.php:106
 msgid "You cannot block yourself!"
 msgstr "ÐÐµ Ð¼Ð¾Ð¶ÐµÑÐµ Ð´Ð° ÑÐµ Ð±Ð»Ð¾ÐºÐ¸ÑÐ°ÑÐµ ÑÐ°Ð¼Ð¸ÑÐµ ÑÐµÐ±ÐµÑÐ¸!"
 
-#: actions/apiblockcreate.php:126
+#: actions/apiblockcreate.php:127
 msgid "Block user failed."
 msgstr "ÐÐ»Ð¾ÐºÐ¸ÑÐ°ÑÐµÑÐ¾ Ð½Ð° ÐºÐ¾ÑÐ¸ÑÐ½Ð¸ÐºÐ¾Ñ Ð½Ðµ ÑÑÐ¿ÐµÐ°."
 
-#: actions/apiblockdestroy.php:114
+#: actions/apiblockdestroy.php:115
 msgid "Unblock user failed."
 msgstr "ÐÐµ ÑÑÐ¿ÐµÐ° Ð¾Ð´Ð±Ð»Ð¾ÐºÐ¸ÑÐ°ÑÐµÑÐ¾ Ð½Ð° ÐºÐ¾ÑÐ¸ÑÐ½Ð¸ÐºÐ¾Ñ."
 
@@ -325,61 +329,61 @@ msgstr "ÐÐ¸ÑÐµÐºÑÐ½Ð¸ Ð¿Ð¾ÑÐ°ÐºÐ¸ Ð´Ð¾ %s"
 msgid "All the direct messages sent to %s"
 msgstr "Ð¡Ð¸ÑÐµ Ð´Ð¸ÑÐµÐºÑÐ½Ð¸ Ð¿Ð¾ÑÐ°ÐºÐ¸ Ð¸ÑÐ¿ÑÐ°ÑÐµÐ½Ð¸ Ð´Ð¾ %s"
 
-#: actions/apidirectmessagenew.php:118
+#: actions/apidirectmessagenew.php:119
 msgid "No message text!"
 msgstr "ÐÐµÐ¼Ð° ÑÐµÐºÑÑ Ð·Ð° Ð¿Ð¾ÑÐ°ÐºÐ°ÑÐ°!"
 
-#: actions/apidirectmessagenew.php:127 actions/newmessage.php:150
+#: actions/apidirectmessagenew.php:128 actions/newmessage.php:150
 #, php-format
 msgid "That's too long. Max message size is %d chars."
 msgstr "ÐÐ²Ð° Ðµ Ð¿ÑÐµÐ´Ð¾Ð»Ð³Ð¾. ÐÐ°ÐºÑÐ¸Ð¼Ð°Ð»Ð½Ð°ÑÐ° Ð´Ð¾Ð»Ð¶Ð¸Ð½Ð° Ð¸Ð·Ð½ÐµÑÑÐ²Ð° %d Ð·Ð½Ð°ÑÐ¸."
 
-#: actions/apidirectmessagenew.php:138
+#: actions/apidirectmessagenew.php:139
 msgid "Recipient user not found."
 msgstr "ÐÑÐ¸Ð¼Ð°ÑÐ¾Ñ Ð½Ðµ Ðµ Ð¿ÑÐ¾Ð½Ð°ÑÐ´ÐµÐ½."
 
-#: actions/apidirectmessagenew.php:142
+#: actions/apidirectmessagenew.php:143
 msgid "Can't send direct messages to users who aren't your friend."
 msgstr ""
 "ÐÐµÐ¼Ð¾Ð¶ÐµÑÐµ Ð´Ð° Ð¸ÑÐ¿ÑÐ°ÑÐ°ÑÐµ Ð´Ð¸ÑÐµÐºÑÐ½Ð¸ Ð¿Ð¾ÑÐ°ÐºÐ¸ Ð½Ð° ÐºÐ¾ÑÐ¸ÑÐ½Ð¸ÑÐ¸ ÑÑÐ¾ Ð½Ðµ Ð²Ð¸ ÑÐµ Ð¿ÑÐ¸ÑÐ°ÑÐµÐ»Ð¸."
 
-#: actions/apifavoritecreate.php:109 actions/apifavoritedestroy.php:110
+#: actions/apifavoritecreate.php:110 actions/apifavoritedestroy.php:111
 #: actions/apistatusesdestroy.php:121
 msgid "No status found with that ID."
 msgstr "ÐÐµÐ¼Ð° Ð¿ÑÐ¾Ð½Ð°ÑÐ´ÐµÐ½Ð¾ ÑÑÐ°ÑÑÑ ÑÐ¾ ÑÐ°ÐºÐ¾Ð² ID."
 
-#: actions/apifavoritecreate.php:120
+#: actions/apifavoritecreate.php:121
 msgid "This status is already a favorite."
 msgstr "ÐÐ²Ð¾Ñ ÑÑÐ°ÑÑÑ Ð²ÐµÑÐµ ÐÐ¸ Ðµ Ð¾Ð¼Ð¸Ð»ÐµÐ½."
 
 #. TRANS: Error message text shown when a favorite could not be set.
-#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:296
+#: actions/apifavoritecreate.php:132 actions/favor.php:84 lib/command.php:296
 msgid "Could not create favorite."
 msgstr "ÐÐµ Ð¼Ð¾Ð¶Ð°Ð¼ Ð´Ð° ÑÐ¾Ð·Ð´Ð°Ð´Ð°Ð¼ Ð¾Ð¼Ð¸Ð»Ð¸Ð½Ð° Ð·Ð°Ð±ÐµÐ»ÐµÑÐºÐ°."
 
-#: actions/apifavoritedestroy.php:123
+#: actions/apifavoritedestroy.php:124
 msgid "That status is not a favorite."
 msgstr "Ð¢Ð¾Ñ ÑÑÐ°ÑÑÑ Ð½Ðµ ÐÐ¸ Ðµ Ð¾Ð¼Ð¸Ð»ÐµÐ½."
 
-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
+#: actions/apifavoritedestroy.php:136 actions/disfavor.php:87
 msgid "Could not delete favorite."
 msgstr "ÐÐµ Ð¼Ð¾Ð¶Ð°Ð¼ Ð´Ð° ÑÐ° Ð¸Ð·Ð±ÑÐ¸ÑÐ°Ð¼ Ð¾Ð¼Ð¸Ð»ÐµÐ½Ð°ÑÐ° Ð·Ð°Ð±ÐµÐ»ÐµÑÐºÐ°."
 
-#: actions/apifriendshipscreate.php:109
+#: actions/apifriendshipscreate.php:110
 msgid "Could not follow user: profile not found."
 msgstr "ÐÐµ Ð¼Ð¾Ð¶Ð°Ð¼ Ð´Ð° Ð³Ð¾ ÑÐ»ÐµÐ´Ð°Ð¼ ÐºÐ¾ÑÐ¸ÑÐ½Ð¸ÐºÐ¾Ñ: Ð¿ÑÐ¾ÑÐ¸Ð»Ð¾Ñ Ð½Ðµ Ðµ Ð¿ÑÐ¾Ð½Ð°ÑÐ´ÐµÐ½."
 
-#: actions/apifriendshipscreate.php:118
+#: actions/apifriendshipscreate.php:119
 #, php-format
 msgid "Could not follow user: %s is already on your list."
 msgstr "ÐÐµ Ð¼Ð¾Ð¶Ð°Ð¼ Ð´Ð° Ð³Ð¾ ÑÐ»ÐµÐ´Ð°Ð¼ ÐºÐ¾ÑÐ¸ÑÐ½Ð¸ÐºÐ¾Ñ: %s Ð²ÐµÑÐµ Ðµ Ð½Ð° ÐÐ°ÑÐ¸Ð¾Ñ ÑÐ¿Ð¸ÑÐ¾Ðº."
 
-#: actions/apifriendshipsdestroy.php:109
+#: actions/apifriendshipsdestroy.php:110
 msgid "Could not unfollow user: User not found."
 msgstr ""
 "ÐÐµ Ð¼Ð¾Ð¶Ð°Ð¼ Ð´Ð° Ð¿ÑÐµÑÑÐ°Ð½Ð°Ð¼ Ð´Ð° Ð³Ð¾ ÑÐ»ÐµÐ´Ð°Ð¼ ÐºÐ¾ÑÐ¸ÑÐ½Ð¸ÐºÐ¾Ñ: ÐÐ¾ÑÐ¸ÑÐ½Ð¸ÐºÐ¾Ñ Ð½Ðµ Ðµ Ð¿ÑÐ¾Ð½Ð°ÑÐ´ÐµÐ½."
 
-#: actions/apifriendshipsdestroy.php:120
+#: actions/apifriendshipsdestroy.php:121
 msgid "You cannot unfollow yourself."
 msgstr "ÐÐµ Ð¼Ð¾Ð¶ÐµÑÐµ Ð´Ð° Ð¿ÑÐµÑÑÐ°Ð½ÐµÑÐµ Ð´Ð° ÑÐµ ÑÐ»ÐµÐ´Ð¸ÑÐµ ÑÐ°Ð¼Ð¸ÑÐµ ÑÐµÐ±ÐµÑÐ¸."
 
@@ -397,101 +401,101 @@ msgstr "ÐÐµ Ð¼Ð¾Ð¶ÐµÐ² Ð´Ð° Ð³Ð¾ ÑÑÐ²ÑÐ´Ð°Ð¼ ÑÐµÐ»Ð½Ð¸Ð¾Ñ ÐºÐ¾ÑÐ¸ÑÐ½Ð¸Ðº
 msgid "Could not find target user."
 msgstr "ÐÐµ Ð¼Ð¾Ð¶ÐµÐ² Ð´Ð° Ð³Ð¾ Ð¿ÑÐ¾Ð½Ð°ÑÐ´Ð°Ð¼ ÑÐµÐ»Ð½Ð¸Ð¾Ñ ÐºÐ¾ÑÐ¸ÑÐ½Ð¸Ðº."
 
-#: actions/apigroupcreate.php:167 actions/editgroup.php:186
+#: actions/apigroupcreate.php:168 actions/editgroup.php:186
 #: actions/newgroup.php:126 actions/profilesettings.php:215
 #: actions/register.php:212
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr "ÐÑÐµÐºÐ°ÑÐ¾Ñ Ð¼Ð¾ÑÐ° Ð´Ð° Ð¸Ð¼Ð° ÑÐ°Ð¼Ð¾ Ð¼Ð°Ð»Ð¸ Ð±ÑÐºÐ²Ð¸ Ð¸ Ð±ÑÐ¾ÑÐºÐ¸ Ð¸ Ð´Ð° Ð½ÐµÐ¼Ð° Ð¿ÑÐ°Ð·Ð½Ð¸ Ð¼ÐµÑÑÐ°."
 
-#: actions/apigroupcreate.php:176 actions/editgroup.php:190
+#: actions/apigroupcreate.php:177 actions/editgroup.php:190
 #: actions/newgroup.php:130 actions/profilesettings.php:238
 #: actions/register.php:215
 msgid "Nickname already in use. Try another one."
 msgstr "Ð¢Ð¾Ñ Ð¿ÑÐµÐºÐ°Ñ Ðµ Ð²Ð¾ ÑÐ¿Ð¾ÑÑÐµÐ±Ð°. ÐÐ´Ð±ÐµÑÐµÑÐµ Ð´ÑÑÐ³."
 
-#: actions/apigroupcreate.php:183 actions/editgroup.php:193
+#: actions/apigroupcreate.php:184 actions/editgroup.php:193
 #: actions/newgroup.php:133 actions/profilesettings.php:218
 #: actions/register.php:217
 msgid "Not a valid nickname."
 msgstr "ÐÐµÐ¿ÑÐ°Ð²Ð¸Ð»ÐµÐ½ Ð¿ÑÐµÐºÐ°Ñ."
 
-#: actions/apigroupcreate.php:199 actions/editapplication.php:215
+#: actions/apigroupcreate.php:200 actions/editapplication.php:215
 #: actions/editgroup.php:199 actions/newapplication.php:203
 #: actions/newgroup.php:139 actions/profilesettings.php:222
 #: actions/register.php:224
 msgid "Homepage is not a valid URL."
 msgstr "ÐÐ»Ð°Ð²Ð½Ð°ÑÐ° ÑÑÑÐ°Ð½Ð¸ÑÐ° Ð½Ðµ Ðµ Ð²Ð°Ð¶ÐµÑÐºÐ° URL-Ð°Ð´ÑÐµÑÐ°."
 
-#: actions/apigroupcreate.php:208 actions/editgroup.php:202
+#: actions/apigroupcreate.php:209 actions/editgroup.php:202
 #: actions/newgroup.php:142 actions/profilesettings.php:225
 #: actions/register.php:227
 msgid "Full name is too long (max 255 chars)."
 msgstr "Ð¦ÐµÐ»Ð¾ÑÐ¾ Ð¸Ð¼Ðµ Ðµ Ð¿ÑÐµÐ´Ð¾Ð»Ð³Ð¾ (Ð½Ð°ÑÐ²ÐµÑÐµ 255 Ð·Ð½Ð°ÑÐ¸)"
 
-#: actions/apigroupcreate.php:216 actions/editapplication.php:190
+#: actions/apigroupcreate.php:217 actions/editapplication.php:190
 #: actions/newapplication.php:172
 #, php-format
 msgid "Description is too long (max %d chars)."
 msgstr "ÐÐ¿Ð¸ÑÐ¾Ñ Ðµ Ð¿ÑÐµÐ´Ð¾Ð»Ð³ (Ð´Ð¾Ð·Ð²Ð¾Ð»ÐµÐ½Ð¾ Ðµ Ð½Ð°ÑÐ²ÐµÑÐµ %d Ð·Ð½Ð°ÑÐ¸)."
 
-#: actions/apigroupcreate.php:227 actions/editgroup.php:208
+#: actions/apigroupcreate.php:228 actions/editgroup.php:208
 #: actions/newgroup.php:148 actions/profilesettings.php:232
 #: actions/register.php:234
 msgid "Location is too long (max 255 chars)."
 msgstr "ÐÐ¾ÐºÐ°ÑÐ¸ÑÐ°ÑÐ° Ðµ Ð¿ÑÐµÐ´Ð¾Ð»Ð³Ð° (Ð¼Ð°ÐºÑÐ¸Ð¼ÑÐ¼Ð¾Ñ Ðµ 255 Ð·Ð½Ð°ÑÐ¸)."
 
-#: actions/apigroupcreate.php:246 actions/editgroup.php:219
+#: actions/apigroupcreate.php:247 actions/editgroup.php:219
 #: actions/newgroup.php:159
 #, php-format
 msgid "Too many aliases! Maximum %d."
 msgstr "ÐÑÐµÐ¼Ð½Ð¾Ð³Ñ Ð°Ð»Ð¸ÑÐ°ÑÐ¸! ÐÐ¾Ð·Ð²Ð¾Ð»ÐµÐ½Ð¾ Ðµ Ð½Ð°ÑÐ²ÐµÑÐµ %d."
 
-#: actions/apigroupcreate.php:267
+#: actions/apigroupcreate.php:268
 #, php-format
 msgid "Invalid alias: \"%s\"."
 msgstr "ÐÐµÐ²Ð°Ð¶ÐµÑÐºÐ¸ Ð°Ð»Ð¸ÑÐ°Ñ: â%sâ."
 
-#: actions/apigroupcreate.php:276 actions/editgroup.php:232
+#: actions/apigroupcreate.php:277 actions/editgroup.php:232
 #: actions/newgroup.php:172
 #, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr "ÐÐ»Ð¸ÑÐ°ÑÐ¾Ñ â%sâ Ðµ Ð·Ð°ÑÐ°ÑÐµÐ½. ÐÐ´Ð±ÐµÑÐµÑÐµ Ð´ÑÑÐ³."
 
-#: actions/apigroupcreate.php:289 actions/editgroup.php:238
+#: actions/apigroupcreate.php:290 actions/editgroup.php:238
 #: actions/newgroup.php:178
 msgid "Alias can't be the same as nickname."
 msgstr "ÐÐ»Ð¸ÑÐ°ÑÐ¾Ñ Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ð´Ð° Ð±Ð¸Ð´Ðµ Ð¸ÑÑ ÐºÐ°ÐºÐ¾ Ð¿ÑÐµÐºÐ°ÑÐ¾Ñ."
 
-#: actions/apigroupismember.php:96 actions/apigroupjoin.php:105
-#: actions/apigroupleave.php:105 actions/apigroupmembership.php:92
+#: actions/apigroupismember.php:96 actions/apigroupjoin.php:106
+#: actions/apigroupleave.php:106 actions/apigroupmembership.php:92
 #: actions/apigroupshow.php:83 actions/apitimelinegroup.php:92
 msgid "Group not found."
 msgstr "ÐÑÑÐ¿Ð°ÑÐ° Ð½Ðµ Ðµ Ð¿ÑÐ¾Ð½Ð°ÑÐ´ÐµÐ½Ð°."
 
 #. TRANS: Error text shown a user tries to join a group they already are a member of.
-#: actions/apigroupjoin.php:111 actions/joingroup.php:100 lib/command.php:336
+#: actions/apigroupjoin.php:112 actions/joingroup.php:100 lib/command.php:336
 msgid "You are already a member of that group."
 msgstr "ÐÐµÑÐµ ÑÐ»ÐµÐ½ÑÐ²Ð°ÑÐµ Ð²Ð¾ ÑÐ°Ð° Ð³ÑÑÐ¿Ð°."
 
 #. TRANS: Error text shown when a user tries to join a group they are blocked from joining.
-#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:341
+#: actions/apigroupjoin.php:121 actions/joingroup.php:105 lib/command.php:341
 msgid "You have been blocked from that group by the admin."
 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.
-#: actions/apigroupjoin.php:139 actions/joingroup.php:134 lib/command.php:353
+#: actions/apigroupjoin.php:140 actions/joingroup.php:134 lib/command.php:353
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "ÐÐµ Ð¼Ð¾Ð¶Ð°Ð¼ Ð´Ð° Ð³Ð¾ Ð·Ð°ÑÐ»ÐµÐ½Ð°Ð¼ ÐºÐ¾ÑÐ¸ÑÐ½Ð¸ÐºÐ¾Ñ %1$s Ð²Ð¾ Ð³ÑÑÐ¿Ð°ÑÐ° 2$s."
 
-#: actions/apigroupleave.php:115
+#: actions/apigroupleave.php:116
 msgid "You are not a member of this group."
 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.
-#: actions/apigroupleave.php:125 actions/leavegroup.php:129
+#: actions/apigroupleave.php:126 actions/leavegroup.php:129
 #: lib/command.php:401
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
@@ -521,7 +525,7 @@ msgstr "%s Ð³ÑÑÐ¿Ð¸"
 msgid "groups on %s"
 msgstr "Ð³ÑÑÐ¿Ð¸ Ð½Ð° %s"
 
-#: actions/apimediaupload.php:99
+#: actions/apimediaupload.php:100
 msgid "Upload failed."
 msgstr "ÐÐ¾Ð´Ð¸Ð³Ð°ÑÐµÑÐ¾ Ð½Ðµ ÑÑÐ¿ÐµÐ°."
 
@@ -535,9 +539,9 @@ msgstr "ÐÐ¾Ð³ÑÐµÑÐµÐ½ Ð¶ÐµÑÐ¾Ð½."
 
 #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
 #: actions/deletenotice.php:169 actions/disfavor.php:74
-#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:55
+#: actions/emailsettings.php:271 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:66 actions/imsettings.php:227
+#: actions/groupunblock.php:66 actions/imsettings.php:230
 #: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
@@ -582,8 +586,8 @@ msgstr "ÐÐµÑÐ¾Ð½Ð¾Ñ Ð½Ð° Ð±Ð°ÑÐ°ÑÐµÑÐ¾ %s Ðµ Ð¾Ð´Ð±Ð¸ÐµÐ½ Ð¸ Ð¿Ð¾Ð½Ð¸ÑÑ
 #. 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:286 actions/grouplogo.php:322
-#: actions/imsettings.php:242 actions/newapplication.php:121
+#: actions/emailsettings.php:290 actions/grouplogo.php:322
+#: actions/imsettings.php:245 actions/newapplication.php:121
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
 #: actions/smssettings.php:277 lib/designsettings.php:304
 msgid "Unexpected form submission."
@@ -647,18 +651,18 @@ msgstr "ÐÐµÑÐ¾Ð´Ð¾Ñ Ð±Ð°ÑÐ° POST Ð¸Ð»Ð¸ DELETE."
 msgid "You may not delete another user's status."
 msgstr "ÐÐµ Ð¼Ð¾Ð¶ÐµÑÐµ Ð´Ð° Ð¸Ð·Ð±ÑÐ¸ÑÐµÑÐµ ÑÑÐ°ÑÑÑ Ð½Ð° Ð´ÑÑÐ³ ÐºÐ¾ÑÐ¸ÑÐ½Ð¸Ðº."
 
-#: actions/apistatusesretweet.php:75 actions/apistatusesretweets.php:72
+#: actions/apistatusesretweet.php:76 actions/apistatusesretweets.php:72
 #: actions/deletenotice.php:52 actions/shownotice.php:92
 msgid "No such notice."
 msgstr "ÐÐµÐ¼Ð° ÑÐ°ÐºÐ²Ð° Ð·Ð°Ð±ÐµÐ»ÐµÑÐºÐ°."
 
 #. TRANS: Error text shown when trying to repeat an own notice.
-#: actions/apistatusesretweet.php:83 lib/command.php:538
+#: actions/apistatusesretweet.php:84 lib/command.php:538
 msgid "Cannot repeat your own notice."
 msgstr "ÐÐµ Ð¼Ð¾Ð¶ÐµÑÐµ Ð´Ð° ÑÐ° Ð¿Ð¾Ð²ÑÐ¾ÑÑÐ²Ð°ÑÐµ ÑÐ¾Ð¿ÑÑÐ²ÐµÐ½Ð°ÑÐ° Ð·Ð°Ð±ÐµÐ»ÐµÑÐºÐ°."
 
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-#: actions/apistatusesretweet.php:91 lib/command.php:544
+#: actions/apistatusesretweet.php:92 lib/command.php:544
 msgid "Already repeated that notice."
 msgstr "ÐÐ°Ð±ÐµÐ»ÐµÑÐºÐ°ÑÐ° Ðµ Ð²ÐµÑÐµ Ð¿Ð¾Ð²ÑÐ¾ÑÐµÐ½Ð°."
 
@@ -670,21 +674,21 @@ msgstr "Ð¡ÑÐ°ÑÑÑÐ¾Ñ Ðµ Ð¸Ð·Ð±ÑÐ¸ÑÐ°Ð½."
 msgid "No status with that ID found."
 msgstr "ÐÐµÐ¼Ð° Ð¿ÑÐ¾Ð½Ð°ÑÐ´ÐµÐ½Ð¾ ÑÑÐ°ÑÑÑ ÑÐ¾ ÑÐ¾Ñ ID."
 
-#: actions/apistatusesupdate.php:221
+#: actions/apistatusesupdate.php:222
 msgid "Client must provide a 'status' parameter with a value."
 msgstr "ÐÐ»Ð¸ÐµÐ½ÑÐ¾Ñ Ð¼Ð¾ÑÐ° Ð´Ð° ÑÐºÐ°Ð¶Ðµ Ð²ÑÐµÐ´Ð½Ð¾ÑÑ Ð·Ð° Ð¿Ð°ÑÐ°Ð¼ÐµÑÐ°ÑÐ¾Ñ âÑÑÐ°ÑÑÑâ"
 
-#: actions/apistatusesupdate.php:242 actions/newnotice.php:157
+#: actions/apistatusesupdate.php:243 actions/newnotice.php:157
 #: lib/mailhandler.php:60
 #, php-format
 msgid "That's too long. Max notice size is %d chars."
 msgstr "ÐÐ²Ð° Ðµ Ð¿ÑÐµÐ´Ð¾Ð»Ð³Ð¾. ÐÐ°ÐºÑÐ¸Ð¼Ð°Ð»Ð½Ð°ÑÐ° Ð´Ð¾Ð·Ð²Ð¾Ð»ÐµÐ½Ð° Ð´Ð¾Ð»Ð¶Ð¸Ð½Ð° Ð¸Ð·Ð½ÐµÑÑÐ²Ð° %d Ð·Ð½Ð°ÑÐ¸."
 
-#: actions/apistatusesupdate.php:283 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:284 actions/apiusershow.php:96
 msgid "Not found."
 msgstr "ÐÐµ Ðµ Ð¿ÑÐ¾Ð½Ð°ÑÐ´ÐµÐ½Ð¾."
 
-#: actions/apistatusesupdate.php:306 actions/newnotice.php:181
+#: actions/apistatusesupdate.php:307 actions/newnotice.php:181
 #, php-format
 msgid "Max notice size is %d chars, including attachment URL."
 msgstr ""
@@ -889,7 +893,9 @@ msgid "Yes"
 msgstr "ÐÐ°"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
+#. TRANS: Submit button title.
+#. TRANS: Description of the form to block a user.
+#: actions/block.php:164 actions/groupmembers.php:403 lib/blockform.php:82
 msgid "Block this user"
 msgstr "ÐÐ»Ð¾ÐºÐ¸ÑÐ°Ñ Ð³Ð¾ ÐºÐ¾ÑÐ¸ÑÐ½Ð¸ÐºÐ¾Ð²"
 
@@ -931,11 +937,13 @@ msgstr "ÐÐ¸ÑÑÐ°Ð½Ð° ÐºÐ¾ÑÐ¸ÑÐ½Ð¸ÑÐ¸ÑÐµ Ð±Ð»Ð¾ÐºÐ¸ÑÐ°Ð½Ð¸ Ð¾Ð´ Ð¿ÑÐ¸Ð´Ñ
 msgid "Unblock user from group"
 msgstr "ÐÐ´Ð±Ð»Ð¾ÐºÐ¸ÑÐ°Ñ ÐºÐ¾ÑÐ¸ÑÐ½Ð¸Ðº Ð¾Ð´ Ð³ÑÑÐ¿Ð°"
 
-#: actions/blockedfromgroup.php:320 lib/unblockform.php:69
+#. TRANS: Title for the form to unblock a user.
+#: actions/blockedfromgroup.php:320 lib/unblockform.php:70
 msgid "Unblock"
 msgstr "ÐÐ´Ð±Ð»Ð¾ÐºÐ¸ÑÐ°Ñ"
 
-#: actions/blockedfromgroup.php:320 lib/unblockform.php:80
+#. TRANS: Description of the form to unblock a user.
+#: actions/blockedfromgroup.php:320 lib/unblockform.php:82
 msgid "Unblock this user"
 msgstr "ÐÐ´Ð±Ð»Ð¾ÐºÐ¸ÑÐ°Ñ Ð³Ð¾ Ð¾Ð²Ð¾Ñ ÐºÐ¾ÑÑÐ½Ð¸Ðº"
 
@@ -974,9 +982,9 @@ msgstr "ÐÐ²Ð°Ð° Ð°Ð´ÑÐµÑÐ° Ð²ÐµÑÐµ Ðµ Ð¿Ð¾ÑÐ²ÑÐ´ÐµÐ½Ð°."
 #. 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/confirmaddress.php:116 actions/emailsettings.php:331
+#: actions/emailsettings.php:477 actions/imsettings.php:283
+#: actions/imsettings.php:442 actions/othersettings.php:174
 #: actions/profilesettings.php:283 actions/smssettings.php:308
 #: actions/smssettings.php:464
 msgid "Couldn't update user."
@@ -984,7 +992,7 @@ msgstr "ÐÐµ Ð¼Ð¾Ð¶ÐµÐ² Ð´Ð° Ð³Ð¾ Ð¿Ð¾Ð´Ð½Ð¾Ð²Ð°Ð¼ ÐºÐ¾ÑÐ¸ÑÐ½Ð¸ÐºÐ¾Ñ."
 
 #. 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/confirmaddress.php:128 actions/emailsettings.php:437
 #: actions/smssettings.php:422
 msgid "Couldn't delete email confirmation."
 msgstr "ÐÐµ Ð¼Ð¾Ð¶ÐµÐ² Ð´Ð° ÑÐ° Ð¸Ð·Ð±ÑÐ¸ÑÐ°Ð¼ Ð¿Ð¾ÑÐ²ÑÐ´Ð°ÑÐ° Ð¿Ð¾ Ðµ-Ð¿Ð¾ÑÑÐ°."
@@ -1020,9 +1028,10 @@ msgstr "ÐÑÐ¾Ð³ÑÐ°Ð¼Ð¾Ñ Ð½Ðµ Ðµ Ð¿ÑÐ¾Ð½Ð°ÑÐ´ÐµÐ½."
 msgid "You are not the owner of this application."
 msgstr "ÐÐµ ÑÑÐµ ÑÐ¾Ð¿ÑÑÐ²ÐµÐ½Ð¸Ðº Ð½Ð° Ð¾Ð²Ð¾Ñ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼."
 
+#. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:127
 #: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1307
+#: lib/action.php:1315
 msgid "There was a problem with your session token."
 msgstr "Ð¡Ðµ Ð¿Ð¾ÑÐ°Ð²Ð¸ Ð¿ÑÐ¾Ð±Ð»ÐµÐ¼ ÑÐ¾ ÐÐ°ÑÐ¸Ð¾Ñ ÑÐµÑÐ¸ÑÐºÐ¸ Ð¶ÐµÑÐ¾Ð½."
 
@@ -1056,7 +1065,7 @@ msgstr "ÐÐ·Ð±ÑÐ¸ÑÐ¸ Ð³Ð¾ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¾Ð²"
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
 #: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:73 lib/profileformaction.php:64
+#: lib/adminpanelaction.php:71 lib/profileformaction.php:64
 #: lib/settingsaction.php:72
 msgid "Not logged in."
 msgstr "ÐÐµ ÑÑÐµ Ð½Ð°ÑÐ°Ð²ÐµÐ½Ð¸."
@@ -1119,7 +1128,6 @@ msgstr "ÐÐ·Ð±ÑÐ¸ÑÐ¸ Ð¾Ð²Ð¾Ñ ÐºÐ¾ÑÐ¸ÑÐ½Ð¸Ðº"
 #. TRANS: Message used as title for design settings for the site.
 #. TRANS: Link description in user account settings menu.
 #: actions/designadminpanel.php:63 lib/accountsettingsaction.php:139
-#: lib/groupnav.php:119
 msgid "Design"
 msgstr "ÐÐ·Ð³Ð»ÐµÐ´"
 
@@ -1240,13 +1248,13 @@ msgstr "ÐÑÐ°ÑÐ¸ Ð¾ÑÐ½Ð¾Ð²Ð½Ð¾-Ð·Ð°Ð´Ð°Ð´ÐµÐ½Ð¸ Ð½Ð°Ð³Ð¾Ð´ÑÐ²Ð°ÑÐ°"
 msgid "Reset back to default"
 msgstr "ÐÑÐ°ÑÐ¸ Ð¿Ð¾ Ð¾ÑÐ½Ð¾Ð²Ð½Ð¾"
 
-#. TRANS: Submit button title
+#. TRANS: Submit button title.
 #: actions/designadminpanel.php:685 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/snapshotadminpanel.php:245
 #: actions/subscriptions.php:226 actions/tagother.php:154
-#: actions/useradminpanel.php:294 lib/applicationeditform.php:363
+#: actions/useradminpanel.php:294 lib/applicationeditform.php:353
 #: lib/designsettings.php:256 lib/groupeditform.php:202
 msgid "Save"
 msgstr "ÐÐ°ÑÑÐ²Ð°Ñ"
@@ -1402,7 +1410,7 @@ msgstr "Ð¢ÐµÐºÐ¾Ð²Ð½Ð° Ð¿Ð¾ÑÐ²ÑÐ´ÐµÐ½Ð° Ðµ-Ð¿Ð¾ÑÑÐµÐ½ÑÐºÐ° Ð°Ð´ÑÐµÑÐ°."
 #. 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/emailsettings.php:115 actions/emailsettings.php:162
 #: actions/imsettings.php:116 actions/smssettings.php:124
 #: actions/smssettings.php:180
 msgctxt "BUTTON"
@@ -1420,22 +1428,26 @@ msgstr ""
 #. 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
+#. TRANS: Button label in the "Edit application" form.
 #: actions/emailsettings.php:127 actions/imsettings.php:131
-#: actions/smssettings.php:137 lib/applicationeditform.php:357
+#: actions/smssettings.php:137 lib/applicationeditform.php:347
 msgctxt "BUTTON"
 msgid "Cancel"
 msgstr "ÐÑÐºÐ°Ð¶Ð¸"
 
-#. TRANS: Instructions for e-mail address input form.
-#: actions/emailsettings.php:135
+#. TRANS: Instructions for e-mail address input form. Do not translate
+#. TRANS: "example.org". It is one of the domain names reserved for
+#. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
+#. TRANS: Any other domain may be owned by a legitimate person or
+#. TRANS: organization.
+#: actions/emailsettings.php:139
 msgid "Email address, like \"UserName@example.org\""
 msgstr "Ð-Ð¿Ð¾ÑÑÐ°, Ð¾Ð´ Ð¾Ð±Ð»Ð¸ÐºÐ¾Ñ âUserName@example.orgâ"
 
 #. 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/emailsettings.php:143 actions/imsettings.php:151
 #: actions/smssettings.php:162
 msgctxt "BUTTON"
 msgid "Add"
@@ -1443,113 +1455,113 @@ msgstr "ÐÐ¾Ð´Ð°Ñ"
 
 #. 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
+#: actions/emailsettings.php:151 actions/smssettings.php:171
 msgid "Incoming email"
 msgstr "ÐÑÐ¸ÐµÐ¼Ð½Ð° Ð¿Ð¾ÑÑÐ°"
 
 #. 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
+#: actions/emailsettings.php:159 actions/smssettings.php:178
 msgid "Send email to this address to post new notices."
 msgstr "ÐÑÐ¿ÑÐ°ÑÐ°ÑÑÐµ Ðµ-Ð¿Ð¾ÑÑÐ° Ð½Ð° Ð¾Ð²Ð°Ð° Ð°Ð´ÑÐµÑÐ° Ð·Ð° Ð´Ð° Ð¾Ð±ÑÐ°Ð²ÑÐ²Ð°ÑÐµ Ð½Ð¾Ð²Ð¸ Ð·Ð°Ð±ÐµÐ»ÐµÑÐºÐ¸."
 
 #. 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
+#: actions/emailsettings.php:168 actions/smssettings.php:186
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr ""
 "Ð¡Ð¾Ð·Ð´Ð°Ñ Ð½Ð¾Ð²Ð° Ðµ-Ð¿Ð¾ÑÑÐµÐ½ÑÐºÐ° Ð°Ð´ÑÐµÑÐ° Ð·Ð° Ð¿ÑÐ¸Ð¼Ð°ÑÐµ Ð¾Ð±ÑÐ°Ð²Ð¸; ÑÐ° Ð·Ð°Ð¼ÐµÐ½ÑÐ²Ð° ÑÑÐ°ÑÐ°ÑÐ° Ð°Ð´ÑÐµÑÐ°."
 
 #. 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
+#: actions/emailsettings.php:172 actions/smssettings.php:189
 msgctxt "BUTTON"
 msgid "New"
 msgstr "ÐÐ¾Ð²Ð°"
 
 #. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:174
+#: actions/emailsettings.php:178
 msgid "Email preferences"
 msgstr "ÐÐ°Ð³Ð¾Ð´ÑÐ²Ð°ÑÐ° Ð·Ð° Ðµ-Ð¿Ð¾ÑÑÐ°"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:180
+#: actions/emailsettings.php:184
 msgid "Send me notices of new subscriptions through email."
 msgstr "ÐÑÐ¿ÑÐ°ÑÐ°Ñ Ð¼Ð¸ Ð¸Ð·Ð²ÐµÑÑÑÐ²Ð°ÑÐ° Ð·Ð° Ð½Ð¾Ð²Ð¸ Ð¿ÑÐµÑÐ¿Ð»Ð°ÑÐ¸ Ð¿Ð¾ Ðµ-Ð¿Ð¾ÑÑÐ°."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:186
+#: actions/emailsettings.php:190
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr "ÐÑÐ¿ÑÐ°ÑÐ°Ñ Ð¼Ð¸ Ðµ-Ð¿Ð¾ÑÑÐ° ÐºÐ¾Ð³Ð° Ð½ÐµÐºÐ¾Ñ ÑÐµ Ð´Ð¾Ð´Ð°Ð´Ðµ Ð¼Ð¾ÑÐ° Ð·Ð°Ð±ÐµÐ»ÐµÑÐºÐ° ÐºÐ°ÐºÐ¾ Ð¾Ð¼Ð¸Ð»ÐµÐ½Ð°."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:193
+#: actions/emailsettings.php:197
 msgid "Send me email when someone sends me a private message."
 msgstr "ÐÑÐ¿ÑÐ°ÑÐ°Ñ Ð¼Ð¸ Ðµ-Ð¿Ð¾ÑÑÐ° ÐºÐ¾Ð³Ð° Ð½ÐµÐºÐ¾Ñ ÑÐµ Ð¼Ð¸ Ð¸ÑÐ¿ÑÐ°ÑÐ¸ Ð¿ÑÐ¸Ð²Ð°ÑÐ½Ð° Ð¿Ð¾ÑÐ°ÐºÐ°."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:199
+#: actions/emailsettings.php:203
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr "ÐÑÐ¿ÑÐ°ÑÐ°Ñ Ð¼Ð¸ Ðµ-Ð¿Ð¾ÑÑÐ° ÐºÐ¾Ð³Ð° Ð½ÐµÐºÐ¾Ñ ÑÐµ Ð¼Ð¸ Ð¸ÑÐ¿ÑÐ°ÑÐ¸ â@-Ð¾Ð´Ð³Ð¾Ð²Ð¾Ñâ"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:205
+#: actions/emailsettings.php:209
 msgid "Allow friends to nudge me and send me an email."
 msgstr ""
 "ÐÐ¾Ð·Ð²Ð¾Ð»Ð¸ Ð¸Ð¼ Ð½Ð° Ð¿ÑÐ¸ÑÐ°ÑÐµÐ»Ð¸ÑÐµ Ð´Ð° Ð¼Ð¾Ð¶Ð°Ñ Ð´Ð° Ð¼Ðµ Ð¿Ð¾Ð´Ð±ÑÑÐ½ÑÐ²Ð°Ð°Ñ Ð¸ Ð´Ð° Ð¼Ð¸ Ð¸ÑÐ¿ÑÐ°ÑÐ°Ð°Ñ Ðµ-"
 "Ð¿Ð¾ÑÑÐ°."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:212
+#: actions/emailsettings.php:216
 msgid "I want to post notices by email."
 msgstr "Ð¡Ð°ÐºÐ°Ð¼ Ð´Ð° Ð¾Ð±ÑÐ°Ð²ÑÐ²Ð°Ð¼ Ð·Ð°Ð±ÐµÐ»ÐµÑÐºÐ¸ Ð¿Ð¾ Ðµ-Ð¿Ð¾ÑÑÐ°."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:219
+#: actions/emailsettings.php:223
 msgid "Publish a MicroID for my email address."
 msgstr "ÐÐ±ÑÐ°Ð²Ð¸ MicroID Ð·Ð° Ð¼Ð¾ÑÐ°ÑÐ° Ðµ-Ð¿Ð¾ÑÑÐµÐ½ÑÐºÐ° Ð°Ð´ÑÐµÑÐ°."
 
 #. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:334
+#: actions/emailsettings.php:338
 msgid "Email preferences saved."
 msgstr "ÐÐ°Ð³Ð¾Ð´ÑÐ²Ð°ÑÐ°ÑÐ° Ð·Ð° Ðµ-Ð¿Ð¾ÑÑÐ° ÑÐµ Ð·Ð°ÑÑÐ²Ð°Ð½Ð¸."
 
 #. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:353
+#: actions/emailsettings.php:357
 msgid "No email address."
 msgstr "ÐÐµÐ¼Ð° Ðµ-Ð¿Ð¾ÑÑÐµÐ½ÑÐºÐ° Ð°Ð´ÑÐµÑÐ°."
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:361
+#: actions/emailsettings.php:365
 msgid "Cannot normalize that email address"
 msgstr "ÐÐµÐ¼Ð¾Ð¶Ð°Ð¼ Ð´Ð° ÑÐ° Ð½Ð¾ÑÐ¼Ð°Ð»Ð¸Ð·Ð¸ÑÐ°Ð¼ ÑÐ°Ð° Ðµ-Ð¿Ð¾ÑÑÐµÐ½ÑÐºÐ° Ð°Ð´ÑÐµÑÐ°"
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:208
+#: actions/emailsettings.php:370 actions/register.php:208
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "ÐÐµÐ¿ÑÐ°Ð²Ð¸Ð»Ð½Ð° Ð°Ð´ÑÐµÑÐ° Ð·Ð° Ðµ-Ð¿Ð¾ÑÑÐ°."
 
 #. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:370
+#: actions/emailsettings.php:374
 msgid "That is already your email address."
 msgstr "ÐÐ²Ð°Ð° Ðµ-Ð¿Ð¾ÑÑÐµÐ½ÑÐºÐ° Ð°Ð´ÑÐµÑÐ° Ðµ Ð²ÐµÑÐµ ÐÐ°ÑÐ°."
 
 #. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:374
+#: actions/emailsettings.php:378
 msgid "That email address already belongs to another user."
 msgstr "Ð¢Ð°Ð° Ðµ-Ð¿Ð¾ÑÑÐµÐ½ÑÐºÐ° Ð°Ð´ÑÐµÑÐ° Ðµ Ð²ÐµÑÐµ Ð·Ð°ÑÐ°ÑÐµÐ½Ð° Ð¾Ð´ Ð´ÑÑÐ³ ÐºÐ¾ÑÐ¸ÑÐ½Ð¸Ðº."
 
 #. 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/emailsettings.php:395 actions/imsettings.php:351
 #: actions/smssettings.php:373
 msgid "Couldn't insert confirmation code."
 msgstr "ÐÐ¾ÑÐ²ÑÐ´Ð½Ð¸Ð¾Ñ ÐºÐ¾Ð´ Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ð´Ð° ÑÐµ Ð²Ð½ÐµÑÐµ."
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:398
+#: actions/emailsettings.php:402
 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."
@@ -1561,50 +1573,50 @@ msgstr ""
 #. 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/emailsettings.php:423 actions/imsettings.php:386
 #: actions/smssettings.php:408
 msgid "No pending confirmation to cancel."
 msgstr "ÐÐµÐ¼Ð° Ð¿Ð¾ÑÐ²ÑÐ´Ð¸ ÐºÐ¾Ð¸ Ð¼Ð¾Ð¶Ðµ Ð´Ð° ÑÐµ Ð¾ÑÐºÐ°Ð¶Ð°Ñ."
 
 #. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:424
+#: actions/emailsettings.php:428
 msgid "That is the wrong email address."
 msgstr "ÐÐ²Ð° Ðµ Ð¿Ð¾Ð³ÑÐµÑÐ½Ð° Ðµ-Ð¿Ð¾ÑÑÐµÐ½ÑÐºÐ° Ð°Ð´ÑÐµÑÐ°."
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:438
+#: actions/emailsettings.php:442
 msgid "Email confirmation cancelled."
 msgstr "ÐÐ¾ÑÐ²ÑÐ´Ð°ÑÐ° Ð½Ð° Ðµ-Ð¿Ð¾ÑÑÐ° Ðµ Ð¾ÑÐºÐ°Ð¶Ð°Ð½Ð°."
 
 #. TRANS: Message given trying to remove an e-mail address that is not
 #. TRANS: registered for the active user.
-#: actions/emailsettings.php:458
+#: actions/emailsettings.php:462
 msgid "That is not your email address."
 msgstr "ÐÐ²Ð° Ð½Ðµ Ðµ ÐÐ°ÑÐ°ÑÐ° Ðµ-Ð¿Ð¾ÑÑÐµÐ½ÑÐºÐ° Ð°Ð´ÑÐµÑÐ°."
 
 #. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:479
+#: actions/emailsettings.php:483
 msgid "The email address was removed."
 msgstr "Ð-Ð¿Ð¾ÑÑÐµÐ½ÑÐºÐ°ÑÐ° Ð°Ð´ÑÐµÑÐ° Ðµ Ð¾ÑÑÑÑÐ°Ð½ÐµÑÐ°."
 
-#: actions/emailsettings.php:493 actions/smssettings.php:568
+#: actions/emailsettings.php:497 actions/smssettings.php:568
 msgid "No incoming email address."
 msgstr "ÐÐµÐ¼Ð° Ð¿ÑÐ¸ÐµÐ¼Ð½Ð° Ðµ-Ð¿Ð¾ÑÑÐµÐ½ÑÐºÐ° Ð°Ð´ÑÐµÑÐ°."
 
 #. 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/emailsettings.php:508 actions/emailsettings.php:532
 #: actions/smssettings.php:578 actions/smssettings.php:602
 msgid "Couldn't update user record."
 msgstr "ÐÐµ Ð¼Ð¾Ð¶ÐµÐ² Ð´Ð° ÑÐ° Ð¿Ð¾Ð´Ð½Ð¾Ð²Ð°Ð¼ ÐºÐ¾ÑÐ¸ÑÐ½Ð¸ÑÐºÐ°ÑÐ° ÐµÐ²Ð¸Ð´ÐµÐ½ÑÐ¸ÑÐ°."
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
-#: actions/emailsettings.php:508 actions/smssettings.php:581
+#: actions/emailsettings.php:512 actions/smssettings.php:581
 msgid "Incoming email address removed."
 msgstr "ÐÑÐ¸ÐµÐ¼Ð½Ð°ÑÐ° Ðµ-Ð¿Ð¾ÑÑÐµÐ½ÑÐºÐ° Ð°Ð´ÑÐµÑÐ° Ðµ Ð¾ÑÑÑÑÐ°Ð½ÐµÑÐ°."
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
-#: actions/emailsettings.php:532 actions/smssettings.php:605
+#: actions/emailsettings.php:536 actions/smssettings.php:605
 msgid "New incoming email address added."
 msgstr "ÐÐ¾Ð´Ð°Ð´ÐµÐ½Ð° Ðµ Ð½Ð¾Ð²Ð° Ð²Ð»ÐµÐ·Ð½Ð° Ðµ-Ð¿Ð¾ÑÑÐµÐ½ÑÐºÐ° Ð°Ð´ÑÐµÑÐ°."
 
@@ -1723,7 +1735,7 @@ msgstr "ÐÐµ Ð¼Ð¾Ð¶ÐµÐ² Ð´Ð° Ð³Ð¸ Ð¿ÑÐµÑÐ²Ð¾ÑÐ°Ð¼ Ð¶ÐµÑÐ¾Ð½Ð¸ÑÐµ Ð·Ð° Ð±Ð°
 msgid "Remote service uses unknown version of OMB protocol."
 msgstr "ÐÐ°Ð»ÐµÑÐ¸Ð½ÑÐºÐ°ÑÐ° ÑÐ»ÑÐ¶Ð±Ð° ÐºÐ¾ÑÐ¸ÑÑÐ¸ Ð½ÐµÐ¿Ð¾Ð·Ð½Ð°ÑÐ° Ð²ÐµÑÐ·Ð¸ÑÐ° Ð½Ð° OMB Ð¿ÑÐ¾ÑÐ¾ÐºÐ¾Ð»."
 
-#: actions/finishremotesubscribe.php:138
+#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306
 msgid "Error updating remote profile."
 msgstr "ÐÑÐµÑÐºÐ° Ð²Ð¾ Ð¿Ð¾Ð´Ð½Ð¾Ð²ÑÐ²Ð°ÑÐµÑÐ¾ Ð½Ð° Ð´Ð°Ð»ÐµÑÐ¸Ð½ÑÐºÐ¸Ð¾Ñ Ð¿ÑÐ¾ÑÐ¸Ð»."
 
@@ -1780,7 +1792,7 @@ msgstr "ÐÐ¾ÑÐ¸ÑÐ½Ð¸ÐºÐ¾Ñ Ðµ Ð²ÐµÑÐµ Ð±Ð»Ð¾ÐºÐ¸ÑÐ°Ð½ Ð¾Ð´ Ð¾Ð²Ð°Ð° Ð³ÑÑÐ¿
 msgid "User is not a member of group."
 msgstr "ÐÐ¾ÑÐ¸ÑÐ½Ð¸ÐºÐ¾Ñ Ð½Ðµ ÑÐ»ÐµÐ½ÑÐ²Ð° Ð²Ð¾ Ð³ÑÑÐ¿Ð°ÑÐ°."
 
-#: actions/groupblock.php:134 actions/groupmembers.php:360
+#: actions/groupblock.php:134 actions/groupmembers.php:364
 msgid "Block user from group"
 msgstr "ÐÐ»Ð¾ÐºÐ¸ÑÐ°Ñ ÐºÐ¾ÑÐ¸ÑÐ½Ð¸Ðº Ð¾Ð´ Ð³ÑÑÐ¿Ð°"
 
@@ -1864,40 +1876,32 @@ msgstr "ÐÐ¾Ð³Ð¾ÑÐ¾ Ðµ Ð¿Ð¾Ð´Ð½Ð¾Ð²ÐµÐ½Ð¾."
 msgid "Failed updating logo."
 msgstr "ÐÐ¾Ð´Ð½Ð¾Ð²Ð°ÑÐ° Ð½Ð° Ð»Ð¾Ð³Ð¾ÑÐ¾ Ð½Ðµ ÑÑÐ¿ÐµÐ°."
 
-#: actions/groupmembers.php:100 lib/groupnav.php:92
+#. TRANS: Title of the page showing group members.
+#. TRANS: %s is the name of the group.
+#: actions/groupmembers.php:102
 #, php-format
 msgid "%s group members"
 msgstr "Ð§Ð»ÐµÐ½Ð¾Ð²Ð¸ Ð½Ð° Ð³ÑÑÐ¿Ð°ÑÐ° %s"
 
-#: actions/groupmembers.php:103
+#. TRANS: Title of the page showing group members.
+#. TRANS: %1$s is the name of the group, %2$d is the page number of the members list.
+#: actions/groupmembers.php:107
 #, php-format
 msgid "%1$s group members, page %2$d"
 msgstr "Ð§Ð»ÐµÐ½Ð¾Ð²Ð¸ Ð½Ð° Ð³ÑÑÐ¿Ð°ÑÐ° %1$s, ÑÑÑ. %2$d"
 
-#: actions/groupmembers.php:118
+#: actions/groupmembers.php:122
 msgid "A list of the users in this group."
 msgstr "Ð¡Ð¿Ð¸ÑÐ¾Ðº Ð½Ð° ÐºÐ¾ÑÐ¸ÑÐ½Ð¸ÑÐ¸ÑÐµ Ð½Ð° Ð¾Ð²Ð°Ð° Ð³ÑÑÐ¿Ð°."
 
-#: actions/groupmembers.php:182 lib/groupnav.php:107
+#: actions/groupmembers.php:186
 msgid "Admin"
 msgstr "ÐÐ´Ð¼Ð¸Ð½Ð¸ÑÑÑÐ°ÑÐ¾Ñ"
 
-#: actions/groupmembers.php:392 lib/blockform.php:69
-msgid "Block"
-msgstr "ÐÐ»Ð¾ÐºÐ¸ÑÐ°Ñ"
-
-#: actions/groupmembers.php:487
+#: actions/groupmembers.php:498
 msgid "Make user an admin of the group"
 msgstr "ÐÐ°Ð¿ÑÐ°Ð²Ð¸ Ð³Ð¾ ÐºÐ¾ÑÐ¸ÑÐ½Ð¸ÐºÐ¾Ñ Ð°Ð´Ð¼Ð¸Ð½Ð¸ÑÑÑÐ°ÑÐ¾Ñ Ð½Ð° Ð³ÑÑÐ¿Ð°ÑÐ°"
 
-#: actions/groupmembers.php:519
-msgid "Make Admin"
-msgstr "ÐÐ°Ð¿ÑÐ°Ð²Ð¸ Ð³Ð¾/ÑÐ° Ð°Ð´Ð¼Ð¸Ð½Ð¸ÑÑÑÐ°ÑÐ¾Ñ"
-
-#: actions/groupmembers.php:519
-msgid "Make this user an admin"
-msgstr "ÐÐ°Ð¿ÑÐ°Ð²Ð¸ Ð³Ð¾ ÐºÐ¾ÑÐ¸ÑÐ½Ð¸ÐºÐ¾Ñ Ð°Ð´Ð¼Ð¸Ð½Ð¸ÑÑÑÐ°ÑÐ¾Ñ"
-
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Title in atom group notice feed. %s is a group name.
 #. TRANS: Title in atom user notice feed. %s is a user name.
@@ -2037,7 +2041,10 @@ msgstr ""
 
 #. TRANS: IM address input field instructions in IM settings form.
 #. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:140
+#. TRANS: Do not translate "example.org". It is one of the domain names reserved for use in examples by
+#. TRANS: http://www.rfc-editor.org/rfc/rfc2606.txt. Any other domain may be owned by a legitimate
+#. TRANS: person or organization.
+#: actions/imsettings.php:143
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -2047,64 +2054,64 @@ msgstr ""
 "%s Ð²Ð¾ ÐÐ°ÑÐ¸Ð¾Ñ ÐºÐ¾Ð½ÑÐ°ÐºÑÐµÐ½ ÑÐ¿Ð¸ÑÐ¾Ðº Ð²Ð¾ ÐÐ°ÑÐ¸Ð¾Ñ IM ÐºÐ»Ð¸ÐµÐ½Ñ Ð¸Ð»Ð¸ GTalk."
 
 #. TRANS: Form legend for IM preferences form.
-#: actions/imsettings.php:155
+#: actions/imsettings.php:158
 msgid "IM preferences"
 msgstr "IM Ð½Ð°Ð³Ð¾Ð´ÑÐ²Ð°ÑÐ°"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:160
+#: actions/imsettings.php:163
 msgid "Send me notices through Jabber/GTalk."
 msgstr "ÐÑÐ¿ÑÐ°ÑÐ°Ñ Ð¼Ð¸ Ð·Ð°Ð±ÐµÐ»ÐµÑÐºÐ¸ Ð¿ÑÐµÐºÑ Jabber/GTalk."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:166
+#: actions/imsettings.php:169
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr "ÐÐ±ÑÐ°Ð²ÑÐ²Ð°Ñ Ð·Ð°Ð±ÐµÐ»ÐµÑÐºÐ° ÐºÐ¾Ð³Ð° Ð¼Ð¾ÑÐ¾Ñ ÑÑÐ°ÑÑÑ Ð½Ð° Jabber/GTalk ÑÐµ ÑÐµ Ð¿ÑÐ¾Ð¼ÐµÐ½Ð¸."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:172
+#: actions/imsettings.php:175
 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr ""
 "ÐÑÐ¿ÑÐ°ÑÐ°Ñ Ð¼Ð¸ Ð¾Ð´Ð³Ð¾Ð²Ð¾ÑÐ¸ Ð¿ÑÐµÐºÑ Jabber/GTalk Ð¾Ð´ Ð»ÑÑÐµ Ð½Ð° ÐºÐ¾Ð¸ Ð½Ðµ ÑÑÐ¼ Ð¿ÑÐµÑÐ¿Ð»Ð°ÑÐµÐ½."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:179
+#: actions/imsettings.php:182
 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "ÐÐ±ÑÐ°Ð²Ð¸ MicroID Ð·Ð° Ð¼Ð¾ÑÐ°ÑÐ° Ð°Ð´ÑÐµÑÐ° Ð½Ð° Jabber/GTalk."
 
 #. TRANS: Confirmation message for successful IM preferences save.
-#: actions/imsettings.php:287 actions/othersettings.php:180
+#: actions/imsettings.php:290 actions/othersettings.php:180
 msgid "Preferences saved."
 msgstr "ÐÐ°Ð³Ð¾Ð´ÑÐ²Ð°ÑÐ°ÑÐ° ÑÐµ Ð·Ð°ÑÑÐ²Ð°Ð½Ð¸."
 
 #. TRANS: Message given saving IM address without having provided one.
-#: actions/imsettings.php:309
+#: actions/imsettings.php:312
 msgid "No Jabber ID."
 msgstr "ÐÐµÐ¼Ð° JabberID."
 
 #. TRANS: Message given saving IM address that cannot be normalised.
-#: actions/imsettings.php:317
+#: actions/imsettings.php:320
 msgid "Cannot normalize that Jabber ID"
 msgstr "ÐÐ²Ð° JabberID Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ð´Ð° ÑÐµ Ð½Ð¾ÑÐ¼Ð°Ð»Ð¸Ð·Ð¸ÑÐ°."
 
 #. TRANS: Message given saving IM address that not valid.
-#: actions/imsettings.php:322
+#: actions/imsettings.php:325
 msgid "Not a valid Jabber ID"
 msgstr "ÐÐµÐ¿ÑÐ°Ð²Ð¸Ð»ÐµÐ½ JabberID"
 
 #. TRANS: Message given saving IM address that is already set.
-#: actions/imsettings.php:326
+#: actions/imsettings.php:329
 msgid "That is already your Jabber ID."
 msgstr "ÐÐ²Ð° Ð²ÐµÑÐµ Ðµ ÐÐ°ÑÐ¸Ð¾Ñ Jabber ID."
 
 #. TRANS: Message given saving IM address that is already set for another user.
-#: actions/imsettings.php:330
+#: actions/imsettings.php:333
 msgid "Jabber ID already belongs to another user."
 msgstr "ÐÐ²Ð° Jabber ID Ð¼Ñ Ð¿ÑÐ¸Ð¿Ð°ÑÐ° Ð½Ð° Ð´ÑÑÐ³ ÐºÐ¾ÑÐ¸ÑÐ½Ð¸Ðº."
 
 #. 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
+#: actions/imsettings.php:361
 #, php-format
 msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
@@ -2114,28 +2121,28 @@ msgstr ""
 "Ð¾Ð´Ð¾Ð±ÑÐ¸ÑÐµ Ð½Ð° %S Ð´Ð° Ð²Ð¸ Ð¸ÑÐ¿ÑÐ°ÑÐ° Ð¿Ð¾ÑÐ°ÐºÐ¸."
 
 #. TRANS: Message given canceling IM address confirmation for the wrong IM address.
-#: actions/imsettings.php:388
+#: actions/imsettings.php:391
 msgid "That is the wrong IM address."
 msgstr "ÐÐ²Ð° Ðµ Ð¿Ð¾Ð³ÑÐµÑÐ½Ð°ÑÐ° IM Ð°Ð´ÑÐµÑÐ°."
 
 #. TRANS: Server error thrown on database error canceling IM address confirmation.
-#: actions/imsettings.php:397
+#: actions/imsettings.php:400
 msgid "Couldn't delete IM confirmation."
 msgstr "ÐÐµ Ð¼Ð¾Ð¶ÐµÐ² Ð´Ð° ÑÐ° Ð¸Ð·Ð±ÑÐ¸ÑÐ°Ð¼ Ð¿Ð¾ÑÐ²ÑÐ´Ð°ÑÐ° Ð½Ð° IM."
 
 #. TRANS: Message given after successfully canceling IM address confirmation.
-#: actions/imsettings.php:402
+#: actions/imsettings.php:405
 msgid "IM confirmation cancelled."
 msgstr "ÐÐ¾ÑÐ²ÑÐ´Ð°ÑÐ° Ð½Ð° IM Ðµ Ð¾ÑÐºÐ°Ð¶Ð°Ð½Ð°."
 
 #. TRANS: Message given trying to remove an IM address that is not
 #. TRANS: registered for the active user.
-#: actions/imsettings.php:424
+#: actions/imsettings.php:427
 msgid "That is not your Jabber ID."
 msgstr "ÐÐ²Ð° Ð½Ðµ Ðµ ÐÐ°ÑÐ¸Ð¾Ñ Jabber ID."
 
 #. TRANS: Message given after successfully removing a registered IM address.
-#: actions/imsettings.php:447
+#: actions/imsettings.php:450
 msgid "The IM address was removed."
 msgstr "IM-Ð°Ð´ÑÐµÑÐ°ÑÐ° Ðµ Ð¾ÑÑÑÑÐ°Ð½ÐµÑÐ°."
 
@@ -2608,8 +2615,8 @@ msgid "Only %s URLs over plain HTTP please."
 msgstr "ÐÐµ Ð¼Ð¾Ð»Ð¸Ð¼Ðµ ÐºÐ¾ÑÐ¸ÑÑÐµÑÐµ ÑÐ°Ð¼Ð¾ %s URL-Ð°Ð´ÑÐµÑÐ¸ Ð²ÑÐ· Ð¿ÑÐ¾ÑÑ HTTP-ÐºÐ¾Ð´."
 
 #. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1215
-#: lib/apiaction.php:1243 lib/apiaction.php:1366
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1206
+#: lib/apiaction.php:1233 lib/apiaction.php:1356
 msgid "Not a supported data format."
 msgstr "ÐÐ²Ð° Ð½Ðµ Ðµ Ð¿Ð¾Ð´Ð´ÑÐ¶Ð°Ð½ ÑÐ¾ÑÐ¼Ð°Ñ Ð½Ð° Ð¿Ð¾Ð´Ð°ÑÐ¾ÑÐµÐºÐ°."
 
@@ -2751,7 +2758,7 @@ msgid "Password saved."
 msgstr "ÐÐ¾Ð·Ð¸Ð½ÐºÐ°ÑÐ° Ðµ Ð·Ð°ÑÑÐ²Ð°Ð½Ð°."
 
 #. TRANS: Menu item for site administration
-#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:384
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:371
 msgid "Paths"
 msgstr "ÐÐ°ÑÐµÐºÐ¸"
 
@@ -2965,7 +2972,7 @@ msgstr "Ð¦ÐµÐ»Ð¾ Ð¸Ð¼Ðµ"
 
 #. TRANS: Form input field label.
 #: actions/profilesettings.php:115 actions/register.php:460
-#: lib/applicationeditform.php:244 lib/groupeditform.php:161
+#: lib/applicationeditform.php:235 lib/groupeditform.php:161
 msgid "Homepage"
 msgstr "ÐÐ¾Ð¼Ð°ÑÐ½Ð° ÑÑÑÐ°Ð½Ð¸ÑÐ°"
 
@@ -3073,7 +3080,7 @@ msgid "Couldn't save tags."
 msgstr "ÐÐµ Ð¼Ð¾Ð¶ÐµÐ² Ð´Ð° Ð³Ð¸ Ð·Ð°ÑÑÐ²Ð°Ð¼ Ð¾Ð·Ð½Ð°ÐºÐ¸ÑÐµ."
 
 #. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:391 lib/adminpanelaction.php:141
+#: actions/profilesettings.php:391 lib/adminpanelaction.php:138
 msgid "Settings saved."
 msgstr "ÐÐ°Ð³Ð¾Ð´ÑÐ²Ð°ÑÐ°ÑÐ° ÑÐµ Ð·Ð°ÑÑÐ²Ð°Ð½Ð¸"
 
@@ -3615,7 +3622,7 @@ msgstr "ÐÐ¾ÑÐ¸ÑÐ½Ð¸ÐºÐ¾Ñ Ðµ Ð²ÐµÑÐµ Ð²Ð¾ Ð¿ÐµÑÐ¾ÑÐµÐ½ ÑÐµÐ¶Ð¸Ð¼."
 
 #. TRANS: Menu item for site administration
 #: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
-#: lib/adminpanelaction.php:392
+#: lib/adminpanelaction.php:379
 msgid "Sessions"
 msgstr "Ð¡ÐµÑÐ¸Ð¸"
 
@@ -3653,24 +3660,24 @@ msgid "Application profile"
 msgstr "ÐÑÐ¾ÑÐ¸Ð» Ð½Ð° Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¾Ñ"
 
 #. TRANS: Form input field label for application icon.
-#: actions/showapplication.php:159 lib/applicationeditform.php:182
+#: actions/showapplication.php:159 lib/applicationeditform.php:173
 msgid "Icon"
 msgstr "ÐÐºÐ¾Ð½Ð°"
 
 #. TRANS: Form input field label for application name.
 #: actions/showapplication.php:169 actions/version.php:197
-#: lib/applicationeditform.php:199
+#: lib/applicationeditform.php:190
 msgid "Name"
 msgstr "ÐÐ¼Ðµ"
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:178 lib/applicationeditform.php:235
+#: actions/showapplication.php:178 lib/applicationeditform.php:226
 msgid "Organization"
 msgstr "ÐÑÐ³Ð°Ð½Ð¸Ð·Ð°ÑÐ¸ÑÐ°"
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:216 lib/groupeditform.php:172
+#: lib/applicationeditform.php:207 lib/groupeditform.php:172
 msgid "Description"
 msgstr "ÐÐ¿Ð¸Ñ"
 
@@ -3787,7 +3794,7 @@ msgstr ""
 msgid "This is a way to share what you like."
 msgstr "ÐÐ²Ð° Ðµ Ð½Ð°ÑÐ¸Ð½ Ð´Ð° Ð³Ð¾ ÑÐ¿Ð¾Ð´ÐµÐ»Ð¸ÑÐµ Ð¾Ð½Ð° ÑÑÐ¾ ÐÐ¸ ÑÐµ Ð´Ð¾Ð¿Ð°ÑÐ°."
 
-#: actions/showgroup.php:82 lib/groupnav.php:86
+#: actions/showgroup.php:82
 #, php-format
 msgid "%s group"
 msgstr "ÐÑÑÐ¿Ð° %s"
@@ -3839,7 +3846,7 @@ msgstr "ÐÐ°Ð½Ð°Ð» ÑÐ¾ Ð·Ð°Ð±ÐµÐ»ÐµÑÐºÐ¸ Ð·Ð° Ð³ÑÑÐ¿Ð°ÑÐ°%s (Atom)"
 msgid "FOAF for %s group"
 msgstr "FOAF Ð·Ð° Ð³ÑÑÐ¿Ð°ÑÐ° %s"
 
-#: actions/showgroup.php:393 actions/showgroup.php:445 lib/groupnav.php:91
+#: actions/showgroup.php:393 actions/showgroup.php:445
 msgid "Members"
 msgstr "Ð§Ð»ÐµÐ½Ð¾Ð²Ð¸"
 
@@ -4296,7 +4303,7 @@ msgstr "ÐÐµÐ¼Ð° Ð²Ð½ÐµÑÐµÐ½Ð¾ ÐºÐ¾Ð´"
 
 #. TRANS: Menu item for site administration
 #: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
-#: lib/adminpanelaction.php:408
+#: lib/adminpanelaction.php:395
 msgid "Snapshots"
 msgstr "Ð¡Ð½Ð¸Ð¼ÐºÐ¸"
 
@@ -5034,7 +5041,7 @@ msgid "Unable to save tag."
 msgstr "ÐÐµ Ð¼Ð¾Ð¶Ð°Ð¼ Ð´Ð° ÑÐ° Ð·Ð°ÑÑÐ²Ð°Ð¼ Ð¾Ð·Ð½Ð°ÐºÐ°ÑÐ°."
 
 #. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#: classes/Subscription.php:75 lib/oauthstore.php:465
+#: classes/Subscription.php:75 lib/oauthstore.php:466
 msgid "You have been banned from subscribing."
 msgstr "ÐÐ»Ð¾ÐºÐ¸ÑÐ°Ð½Ð¸ ÑÑÐµ Ð¾Ð´ Ð¿ÑÐµÑÐ¿Ð»Ð°ÑÐ°ÑÐµ."
 
@@ -5177,7 +5184,8 @@ msgid "Change site configuration"
 msgstr "ÐÑÐ¾Ð¼ÐµÐ½Ð° Ð½Ð° Ð¿Ð¾ÑÑÐ°Ð²ÐºÐ¸ÑÐµ Ð½Ð° Ð¼ÑÐµÐ¶Ð½Ð¾ÑÐ¾ Ð¼ÐµÑÑÐ¾"
 
 #. TRANS: Main menu option when logged in and site admin for access to site configuration
-#: lib/action.php:474
+#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
+#: lib/action.php:474 lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr "ÐÐ´Ð¼Ð¸Ð½"
@@ -5254,7 +5262,7 @@ msgstr "ÐÐ°ÑÐ°Ñ"
 
 #. TRANS: DT element for site notice. String is hidden in default CSS.
 #. TRANS: Menu item for site administration
-#: lib/action.php:538 lib/adminpanelaction.php:400
+#: lib/action.php:538 lib/adminpanelaction.php:387
 msgid "Site notice"
 msgstr "ÐÐ°Ð¿Ð¾Ð¼ÐµÐ½Ð° Ð·Ð° Ð¼ÑÐµÐ¶Ð½Ð¾ÑÐ¾ Ð¼ÐµÑÑÐ¾"
 
@@ -5318,7 +5326,10 @@ msgid "StatusNet software license"
 msgstr "ÐÐ¸ÑÐµÐ½ÑÐ° Ð½Ð° Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¾Ñ StatusNet"
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
-#: lib/action.php:843
+#. TRANS: Text between [] is a link description, text between () is the link itself.
+#. TRANS: Make sure there is no whitespace between "]" and "(".
+#. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
+#: lib/action.php:846
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -5328,13 +5339,16 @@ msgstr ""
 "%](%%site.broughtbyurl%%)."
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:846
+#: lib/action.php:849
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** Ðµ ÑÐµÑÐ²Ð¸Ñ Ð·Ð° Ð¼Ð¸ÐºÑÐ¾Ð±Ð»Ð¾Ð³Ð¸ÑÐ°ÑÐµ."
 
 #. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.
-#: lib/action.php:850
+#. TRANS: Make sure there is no whitespace between "]" and "(".
+#. TRANS: Text between [] is a link description, text between () is the link itself.
+#. TRANS: %s is the version of StatusNet that is being used.
+#: lib/action.php:856
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -5346,20 +5360,20 @@ msgstr ""
 "(http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
 
 #. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:866
+#: lib/action.php:872
 msgid "Site content license"
 msgstr "ÐÐ¸ÑÐµÐ½ÑÐ° Ð½Ð° ÑÐ¾Ð´ÑÐ¶Ð¸Ð½Ð¸ÑÐµ Ð½Ð° Ð¼ÑÐµÐ¶Ð½Ð¾ÑÐ¾ Ð¼ÐµÑÑÐ¾"
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:873
+#: lib/action.php:879
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr "Ð¡Ð¾Ð´ÑÐ¶Ð¸Ð½Ð°ÑÐ° Ð¸ Ð¿Ð¾Ð´Ð°ÑÐ¾ÑÐ¸ÑÐµ Ð½Ð° %1$s ÑÐµ Ð»Ð¸ÑÐ½Ð¸ Ð¸ Ð´Ð¾Ð²ÐµÑÐ»Ð¸Ð²Ð¸."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:880
+#: lib/action.php:886
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
@@ -5367,32 +5381,33 @@ msgstr ""
 "Ð¿ÑÐ°Ð²Ð° Ð·Ð°Ð´ÑÐ¶Ð°Ð½Ð¸."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:884
+#: lib/action.php:890
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 "ÐÐ²ÑÐ¾ÑÑÐºÐ¸ÑÐµ Ð¿ÑÐ°Ð²Ð° Ð½Ð° ÑÐ¾Ð´ÑÐ¶Ð¸Ð½Ð°ÑÐ° Ð¸ Ð¿Ð¾Ð´Ð°ÑÐ¾ÑÐ¸ÑÐµ Ð¸Ð¼ Ð¿ÑÐ¸Ð¿Ð°ÑÐ°Ð°Ñ Ð½Ð° ÑÑÐµÑÐ½Ð¸ÑÐ¸ÑÐµ. Ð¡Ð¸ÑÐµ "
 "Ð¿ÑÐ°Ð²Ð° Ð·Ð°Ð´ÑÐ¶Ð°Ð½Ð¸."
 
-#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:897
+#. TRANS: license message in footer.
+#. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
+#: lib/action.php:904
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr "Ð¡Ð¸ÑÐµ ÑÐ¾Ð´ÑÐ¶Ð¸Ð½Ð¸ Ð¸ Ð¿Ð¾Ð´Ð°ÑÐ¾ÑÐ¸ Ð½Ð° %1$s ÑÐµ Ð´Ð¾ÑÑÐ°Ð¿Ð½Ð¸ Ð¿Ð¾Ð´ Ð»Ð¸ÑÐµÐ½ÑÐ°ÑÐ° %2$s."
 
 #. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1236
+#: lib/action.php:1243
 msgid "Pagination"
 msgstr "ÐÑÐµÐ»Ð¾Ð¼ Ð½Ð° ÑÑÑÐ°Ð½Ð¸ÑÐ¸"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1247
+#: lib/action.php:1254
 msgid "After"
 msgstr "Ð¡Ð»ÐµÐ´Ð½Ð¾"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1257
+#: lib/action.php:1264
 msgid "Before"
 msgstr "ÐÑÐµÑÑÐ¾Ð´Ð½Ð¾"
 
@@ -5401,208 +5416,227 @@ msgstr "ÐÑÐµÑÑÐ¾Ð´Ð½Ð¾"
 msgid "Expecting a root feed element but got a whole XML document."
 msgstr "Ð¡Ðµ Ð¾ÑÐµÐºÑÐ²Ð° ÐºÐ¾ÑÐµÐ½ÑÐºÐ¸ ÐºÐ°Ð½Ð°Ð»ÑÐºÐ¸ ÐµÐ»ÐµÐ¼ÐµÐ½Ñ, Ð½Ð¾ Ð´Ð¾Ð±Ð¸Ð² ÑÐµÐ» XML Ð´Ð¾ÐºÑÐ¼ÐµÐ½Ñ."
 
-#: lib/activityutils.php:208
+#. TRANS: Client exception thrown when there is no source attribute.
+#: lib/activityutils.php:203
 msgid "Can't handle remote content yet."
 msgstr "Ð¡Ã¨ ÑÑÑÐµ Ð½Ðµ Ðµ Ð¿Ð¾Ð´Ð´ÑÐ¶Ð°Ð½Ð° Ð¾Ð±ÑÐ°Ð±Ð¾ÑÐºÐ°ÑÐ° Ð½Ð° Ð´Ð°Ð»ÐµÑÐ¸Ð½ÑÐºÐ° ÑÐ¾Ð´ÑÐ¶Ð¸Ð½Ð°."
 
-#: lib/activityutils.php:244
+#. TRANS: Client exception thrown when there embedded XML content is found that cannot be processed yet.
+#: lib/activityutils.php:240
 msgid "Can't handle embedded XML content yet."
 msgstr "Ð¡Ã¨ ÑÑÑÐµ Ð½Ðµ Ðµ Ð¿Ð¾Ð´Ð´ÑÐ¶Ð°Ð½Ð° Ð¾Ð±ÑÐ°Ð±Ð¾ÑÐºÐ°ÑÐ° Ð½Ð° XML ÑÐ¾Ð´ÑÐ¶Ð¸Ð½Ð°."
 
-#: lib/activityutils.php:248
+#. TRANS: Client exception thrown when base64 encoded content is found that cannot be processed yet.
+#: lib/activityutils.php:245
 msgid "Can't handle embedded Base64 content yet."
 msgstr "Ð¡Ã¨ ÑÑÑÐµ Ð½Ðµ Ðµ Ð´Ð¾ÑÑÐ°Ð¿Ð½Ð° Ð¾Ð±ÑÐ°Ð±Ð¾ÑÐºÐ°ÑÐ° Ð½Ð° Ð²Ð¼ÐµÑÐ½Ð°ÑÐ° Base64 ÑÐ¾Ð´ÑÐ¶Ð¸Ð½Ð°."
 
 #. TRANS: Client error message thrown when a user tries to change admin settings but has no access rights.
-#: lib/adminpanelaction.php:98
+#: lib/adminpanelaction.php:96
 msgid "You cannot make changes to this site."
 msgstr "ÐÐµ Ð¼Ð¾Ð¶ÐµÑÐµ Ð´Ð° Ð²ÑÑÑÐµ Ð¸Ð·Ð¼ÐµÐ½Ð¸ Ð½Ð° Ð¾Ð²Ð° Ð¼ÑÐµÐ¶Ð½Ð¾ Ð¼ÐµÑÑÐ¾."
 
 #. TRANS: Client error message throw when a certain panel's settings cannot be changed.
-#: lib/adminpanelaction.php:110
+#: lib/adminpanelaction.php:108
 msgid "Changes to that panel are not allowed."
 msgstr "ÐÐµÐ½ÑÐ²Ð°ÑÐµÑÐ¾ Ð½Ð° ÑÐ¾Ñ Ð°Ð»Ð°ÑÐ½Ð¸Ðº Ð½Ðµ Ðµ Ð´Ð¾Ð·Ð²Ð¾Ð»ÐµÐ½Ð¾."
 
 #. TRANS: Client error message.
-#: lib/adminpanelaction.php:229
+#: lib/adminpanelaction.php:222
 msgid "showForm() not implemented."
 msgstr "showForm() Ð½Ðµ Ðµ Ð¸Ð¼Ð¿Ð»ÐµÐ¼ÐµÐ½ÑÐ¸ÑÐ°Ð½Ð¾."
 
 #. TRANS: Client error message
-#: lib/adminpanelaction.php:259
+#: lib/adminpanelaction.php:250
 msgid "saveSettings() not implemented."
 msgstr "saveSettings() Ð½Ðµ Ðµ Ð¸Ð¼Ð¿Ð»ÐµÐ¼ÐµÐ½ÑÐ¸ÑÐ°Ð½Ð¾."
 
 #. TRANS: Client error message thrown if design settings could not be deleted in
 #. TRANS: the admin panel Design.
-#: lib/adminpanelaction.php:284
+#: lib/adminpanelaction.php:274
 msgid "Unable to delete design setting."
 msgstr "ÐÐµ Ð¼Ð¾Ð¶Ð°Ð¼ Ð´Ð° Ð³Ð¸ Ð¸Ð·Ð±ÑÐ¸ÑÐ°Ð¼ Ð½Ð°Ð³Ð¾Ð´ÑÐ²Ð°ÑÐ°ÑÐ° Ð·Ð° Ð¸Ð·Ð³Ð»ÐµÐ´."
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:350
+#: lib/adminpanelaction.php:337
 msgid "Basic site configuration"
 msgstr "ÐÑÐ½Ð¾Ð²Ð½Ð¸ Ð½Ð°Ð³Ð¾Ð´ÑÐ²Ð°ÑÐ° Ð½Ð° Ð¼ÑÐµÐ¶Ð½Ð¾ÑÐ¾ Ð¼ÐµÑÑÐ¾"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:352
+#: lib/adminpanelaction.php:339
 msgctxt "MENU"
 msgid "Site"
 msgstr "ÐÑÐµÐ¶. Ð¼ÐµÑÑÐ¾"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:358
+#: lib/adminpanelaction.php:345
 msgid "Design configuration"
 msgstr "ÐÐ¾ÑÑÐ°Ð²ÐºÐ¸ Ð½Ð° Ð¸Ð·Ð³Ð»ÐµÐ´Ð¾Ñ"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:360
+#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
+#: lib/adminpanelaction.php:347 lib/groupnav.php:135
 msgctxt "MENU"
 msgid "Design"
 msgstr "ÐÐ·Ð³Ð»ÐµÐ´"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:366
+#: lib/adminpanelaction.php:353
 msgid "User configuration"
 msgstr "ÐÐ¾Ð½ÑÐ¸Ð³ÑÑÐ°ÑÐ¸ÑÐ° Ð½Ð° ÐºÐ¾ÑÐ¸ÑÐ½Ð¸Ðº"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:368 lib/personalgroupnav.php:115
+#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:115
 msgid "User"
 msgstr "ÐÐ¾ÑÐ¸ÑÐ½Ð¸Ðº"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:374
+#: lib/adminpanelaction.php:361
 msgid "Access configuration"
 msgstr "ÐÐ¾Ð½ÑÐ¸Ð³ÑÑÐ°ÑÐ¸ÑÐ° Ð½Ð° Ð¿ÑÐ¸ÑÑÐ°Ð¿Ð¾Ñ"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:382
+#: lib/adminpanelaction.php:369
 msgid "Paths configuration"
 msgstr "ÐÐ¾Ð½ÑÐ¸Ð³ÑÑÐ°ÑÐ¸ÑÐ° Ð½Ð° Ð¿Ð°ÑÐµÐºÐ¸"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:390
+#: lib/adminpanelaction.php:377
 msgid "Sessions configuration"
 msgstr "ÐÐ¾Ð½ÑÐ¸Ð³ÑÑÐ°ÑÐ¸ÑÐ° Ð½Ð° ÑÐµÑÐ¸Ð¸ÑÐµ"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:398
+#: lib/adminpanelaction.php:385
 msgid "Edit site notice"
 msgstr "Ð£ÑÐµÐ´Ð¸ Ð¾Ð±ÑÐ°Ð²Ð° Ð·Ð° Ð¼ÑÐµÐ¶Ð½Ð¾ÑÐ¾ Ð¼ÐµÑÑÐ¾"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:406
+#: lib/adminpanelaction.php:393
 msgid "Snapshots configuration"
 msgstr "ÐÐ¾ÑÑÐ°Ð²ÐºÐ¸ Ð·Ð° ÑÐ½Ð¸Ð¼ÐºÐ¸"
 
 #. TRANS: Client error 401.
-#: lib/apiauth.php:113
+#: lib/apiauth.php:111
 msgid "API resource requires read-write access, but you only have read access."
 msgstr ""
 "API-ÑÐµÑÑÑÑÐ¾Ñ Ð±Ð°ÑÐ° Ð´Ð° Ð¼Ð¾Ð¶Ðµ Ð¸ Ð´Ð° ÑÐ¸ÑÐ° Ð¸ Ð´Ð° Ð·Ð°Ð¿Ð¸ÑÑÐ²Ð°, Ð° Ð²Ð¸Ðµ Ð¼Ð¾Ð¶ÐµÑÐµ ÑÐ°Ð¼Ð¾ Ð´Ð° "
 "ÑÐ¸ÑÐ°ÑÐµ."
 
+#. TRANS: OAuth exception thrown when no application is found for a given consumer key.
+#: lib/apiauth.php:175
+msgid "No application for that consumer key."
+msgstr ""
+
+#. TRANS: OAuth exception given when no user was found for a given token (no token was found).
+#: lib/apiauth.php:217
+msgid "No user for that token."
+msgstr ""
+
+#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
+#: lib/apioauthstore.php:178
+msgid "Tried to revoke unknown token"
+msgstr ""
+
 #. TRANS: Form legend.
-#: lib/applicationeditform.php:137
+#: lib/applicationeditform.php:129
 msgid "Edit application"
 msgstr "Ð£ÑÐµÐ´Ð¸ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:187
+#: lib/applicationeditform.php:178
 msgid "Icon for this application"
 msgstr "ÐÐºÐ¾Ð½Ð° Ð·Ð° Ð¾Ð²Ð¾Ñ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:209
+#: lib/applicationeditform.php:200
 #, php-format
 msgid "Describe your application in %d characters"
 msgstr "ÐÐ¿Ð¸ÑÐµÑÐµ Ð³Ð¾ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¾Ñ ÑÐ¾ %d Ð·Ð½Ð°ÑÐ¸"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:213
+#: lib/applicationeditform.php:204
 msgid "Describe your application"
 msgstr "ÐÐ¿Ð¸ÑÐµÑÐµ Ð³Ð¾ ÐÐ°ÑÐ¸Ð¾Ñ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:224
+#: lib/applicationeditform.php:215
 msgid "URL of the homepage of this application"
 msgstr "URL Ð½Ð° ÑÑÑÐ°Ð½Ð¸ÑÐ°ÑÐ° Ð½Ð° Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¾Ñ"
 
 #. TRANS: Form input field label.
-#: lib/applicationeditform.php:226
+#: lib/applicationeditform.php:217
 msgid "Source URL"
 msgstr "ÐÐ·Ð²Ð¾ÑÐ½Ð° URL-Ð°Ð´ÑÐµÑÐ°"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:233
+#: lib/applicationeditform.php:224
 msgid "Organization responsible for this application"
 msgstr "ÐÑÐ³Ð°Ð½Ð¸Ð·Ð°ÑÐ¸ÑÐ°ÑÐ° Ð¾Ð´Ð³Ð¾Ð²Ð¾ÑÐ½Ð° Ð·Ð° Ð¾Ð²Ð¾Ñ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:242
+#: lib/applicationeditform.php:233
 msgid "URL for the homepage of the organization"
 msgstr "URL Ð½Ð° ÑÑÑÐ°Ð½Ð¸ÑÐ°ÑÐ° Ð½Ð° Ð¾ÑÐ³Ð°Ð½Ð¸Ð·Ð°ÑÐ¸ÑÐ°ÑÐ°"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:251
+#: lib/applicationeditform.php:242
 msgid "URL to redirect to after authentication"
 msgstr "URL Ð·Ð° Ð¿ÑÐµÐ½Ð°ÑÐ¾ÑÑÐ²Ð°ÑÐµ Ð¿Ð¾ Ð·Ð°Ð²ÐµÑÐºÐ°ÑÐ°"
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:278
+#: lib/applicationeditform.php:269
 msgid "Browser"
 msgstr "ÐÑÐµÐ»Ð¸ÑÑÑÐ²Ð°Ñ"
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:295
+#: lib/applicationeditform.php:286
 msgid "Desktop"
 msgstr "Ð Ð°Ð±Ð¾ÑÐ½Ð° Ð¿Ð¾Ð²ÑÑÐ¸Ð½Ð°"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:297
+#: lib/applicationeditform.php:288
 msgid "Type of application, browser or desktop"
 msgstr "Ð¢Ð¸Ð¿ Ð½Ð° Ð¿ÑÐ¾Ð³ÑÐ°Ð¼, Ð¿ÑÐµÐ»Ð¸ÑÑÑÐ²Ð°Ñ Ð¸Ð»Ð¸ ÑÐ°Ð±Ð¾ÑÐ½Ð° Ð¿Ð¾Ð²ÑÑÐ¸Ð½Ð°"
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:320
+#: lib/applicationeditform.php:311
 msgid "Read-only"
 msgstr "Ð¡Ð°Ð¼Ð¾ ÑÐ¸ÑÐ°ÑÐµ"
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:339
+#: lib/applicationeditform.php:330
 msgid "Read-write"
 msgstr "Ð§Ð¸ÑÐ°ÑÐµ-Ð¿Ð¸ÑÑÐ²Ð°ÑÐµ"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:341
+#: lib/applicationeditform.php:332
 msgid "Default access for this application: read-only, or read-write"
 msgstr ""
 "ÐÑÐ½Ð¾Ð²Ð½Ð¾-Ð·Ð°Ð´Ð°Ð´ÐµÐ½ Ð¿ÑÐ¸ÑÑÐ°Ð¿ Ð·Ð° Ð¾Ð²Ð¾Ñ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼: ÑÐ°Ð¼Ð¾ ÑÐ¸ÑÐ°ÑÐµ, Ð¸Ð»Ð¸ ÑÐ¸ÑÐ°ÑÐµ-Ð¿Ð¸ÑÑÐ²Ð°ÑÐµ"
 
-#. TRANS: Submit button title
-#: lib/applicationeditform.php:359
+#. TRANS: Submit button title.
+#: lib/applicationeditform.php:349
 msgid "Cancel"
 msgstr "ÐÑÐºÐ°Ð¶Ð¸"
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:136
+#: lib/applicationlist.php:135
 msgid "read-write"
 msgstr "ÑÐ¸ÑÐ°ÑÐµ-Ð¿Ð¸ÑÑÐ²Ð°ÑÐµ"
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:138
+#: lib/applicationlist.php:137
 msgid "read-only"
 msgstr "ÑÐ°Ð¼Ð¾ ÑÐ¸ÑÐ°ÑÐµ"
 
 #. 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
+#: lib/applicationlist.php:143
 #, php-format
 msgid "Approved %1$s - \"%2$s\" access."
 msgstr "ÐÐ´Ð¾Ð±ÑÐµÐ½Ð¾ %1$s - â%2$sâ Ð¿ÑÐ¸ÑÑÐ°Ð¿."
 
 #. TRANS: Button label
-#: lib/applicationlist.php:159
+#: lib/applicationlist.php:158
 msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "ÐÐ´Ð·ÐµÐ¼Ð¸"
@@ -5622,11 +5656,13 @@ msgstr "ÐÐ²ÑÐ¾Ñ"
 msgid "Provider"
 msgstr "ÐÐ±ÐµÐ·Ð±ÐµÐ´ÑÐ²Ð°Ñ"
 
-#: lib/attachmentnoticesection.php:67
+#. TRANS: Title.
+#: lib/attachmentnoticesection.php:68
 msgid "Notices where this attachment appears"
 msgstr "ÐÐ°Ð±ÐµÐ»ÐµÑÐºÐ¸ ÐºÐ°Ð´ÐµÑÑÐ¾ ÑÐµ ÑÐ°Ð²ÑÐ²Ð° Ð¾Ð²Ð¾Ñ Ð¿ÑÐ¸Ð»Ð¾Ð³"
 
-#: lib/attachmenttagcloudsection.php:48
+#. TRANS: Title.
+#: lib/attachmenttagcloudsection.php:49
 msgid "Tags for this attachment"
 msgstr "ÐÐ·Ð½Ð°ÐºÐ¸ Ð·Ð° Ð¾Ð²Ð¾Ñ Ð¿ÑÐ¸Ð»Ð¾Ð³"
 
@@ -5638,6 +5674,11 @@ msgstr "ÐÐµÐ½ÑÐ²Ð°ÑÐµÑÐ¾ Ð½Ð° Ð»Ð¾Ð·Ð¸Ð½ÐºÐ°ÑÐ° Ð½Ðµ ÑÑÐ¿ÐµÐ°"
 msgid "Password changing is not allowed"
 msgstr "ÐÐµÐ½ÑÐ²Ð°ÑÐµÑÐ¾ Ð½Ð° Ð»Ð¾Ð·Ð¸Ð½ÐºÐ° Ð½Ðµ Ðµ Ð´Ð¾Ð·Ð²Ð¾Ð»ÐµÐ½Ð¾"
 
+#. TRANS: Title for the form to block a user.
+#: lib/blockform.php:70
+msgid "Block"
+msgstr "ÐÐ»Ð¾ÐºÐ¸ÑÐ°Ñ"
+
 #: lib/channel.php:157 lib/channel.php:177
 msgid "Command results"
 msgstr "Ð ÐµÐ·ÑÐ»ÑÐ°ÑÐ¸ Ð¾Ð´ Ð½Ð°ÑÐµÐ´Ð±Ð°ÑÐ°"
@@ -5889,7 +5930,7 @@ msgid "You are not subscribed to anyone."
 msgstr "ÐÐµ ÑÑÐµ Ð¿ÑÐµÑÐ¿Ð»Ð°ÑÐµÐ½Ð¸ Ð½Ð¸ÐºÐ¾Ð¼Ñ."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to.
-#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.
 #: lib/command.php:836
 msgid "You are subscribed to this person:"
@@ -5904,7 +5945,7 @@ msgid "No one is subscribed to you."
 msgstr "ÐÐ¸ÐºÐ¾Ñ Ð½Ðµ Ðµ Ð¿ÑÐµÑÐ¿Ð»Ð°ÑÐµÐ½ Ð½Ð° ÐÐ°Ñ."
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
-#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
 #: lib/command.php:863
 msgid "This person is subscribed to you:"
@@ -5919,7 +5960,7 @@ msgid "You are not a member of any groups."
 msgstr "ÐÐµ ÑÐ»ÐµÐ½ÑÐ²Ð°ÑÐµ Ð²Ð¾ Ð½Ð¸ÐµÐ´Ð½Ð° Ð³ÑÑÐ¿Ð°."
 
 #. TRANS: Text shown after requesting groups a user is subscribed to.
-#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
 #: lib/command.php:890
 msgid "You are a member of this group:"
@@ -5927,6 +5968,7 @@ msgid_plural "You are a member of these groups:"
 msgstr[0] "ÐÐµ Ð½Ð¸ Ð³Ð¾ Ð¸ÑÐ¿ÑÐ°ÑÐ¸Ð²ÑÐµ ÑÐ¾Ñ Ð¿ÑÐ¾ÑÐ¸Ð»."
 msgstr[1] "ÐÐµ Ð½Ð¸ Ð³Ð¾ Ð¸ÑÐ¿ÑÐ°ÑÐ¸Ð²ÑÐµ ÑÐ¾Ñ Ð¿ÑÐ¾ÑÐ¸Ð»."
 
+#. TRANS: Help text for commands.
 #: lib/command.php:905
 msgid ""
 "Commands:\n"
@@ -6147,38 +6189,6 @@ msgstr ""
 "ÐÐ¾Ð¿Ð¾Ð»Ð½Ð¸ÑÐµÐ»Ð½Ð¸ Ð¿ÑÐµÐºÐ°ÑÐ¸ Ð·Ð° Ð³ÑÑÐ¿Ð°ÑÐ°, Ð¾Ð´Ð´ÐµÐ»ÐµÐ½Ð¸ ÑÐ¾ Ð·Ð°Ð¿Ð¸ÑÐºÐ° Ð¸Ð»Ð¸ Ð¿ÑÐ°Ð·Ð½Ð¾ Ð¼ÐµÑÑÐ¾, "
 "Ð½Ð°ÑÐ²ÐµÑÐµ Ð´Ð¾ %d"
 
-#: lib/groupnav.php:85
-msgid "Group"
-msgstr "ÐÑÑÐ¿Ð°"
-
-#: lib/groupnav.php:101
-msgid "Blocked"
-msgstr "ÐÐ»Ð¾ÐºÐ¸ÑÐ°Ð½Ð¸"
-
-#: lib/groupnav.php:102
-#, php-format
-msgid "%s blocked users"
-msgstr "%s Ð±Ð»Ð¾ÐºÐ¸ÑÐ°Ð½Ð¸ ÐºÐ¾ÑÐ¸ÑÐ½Ð¸ÑÐ¸"
-
-#: lib/groupnav.php:108
-#, php-format
-msgid "Edit %s group properties"
-msgstr "Ð£ÑÐµÐ´Ð¸ ÑÐ²Ð¾ÑÑÑÐ²Ð° Ð½Ð° Ð³ÑÑÐ¿Ð°ÑÐ° %s"
-
-#: lib/groupnav.php:113
-msgid "Logo"
-msgstr "ÐÐ¾Ð³Ð¾"
-
-#: lib/groupnav.php:114
-#, php-format
-msgid "Add or edit %s logo"
-msgstr "ÐÐ¾Ð´Ð°Ñ Ð¸Ð»Ð¸ ÑÑÐµÐ´Ð¸ Ð»Ð¾Ð³Ð¾ Ð½Ð° %s"
-
-#: lib/groupnav.php:120
-#, php-format
-msgid "Add or edit %s design"
-msgstr "ÐÐ¾Ð´Ð°Ñ Ð¸Ð»Ð¸ ÑÑÐµÐ´Ð¸ Ð¸Ð·Ð³Ð»ÐµÐ´ Ð½Ð° %s"
-
 #: lib/groupsbymemberssection.php:71
 msgid "Groups with most members"
 msgstr "ÐÑÑÐ¿Ð¸ ÑÐ¾ Ð½Ð°ÑÐ²ÐµÑÐµ ÑÐ»ÐµÐ½Ð¾Ð²Ð¸"
@@ -6205,7 +6215,8 @@ msgstr "ÐÐµÐ¿Ð¾Ð´Ð´ÑÐ¶Ð°Ð½ ÑÐ¾Ð¼ÑÐ°Ñ Ð½Ð° ÑÐ»Ð¸ÐºÐ¸."
 msgid "Partial upload."
 msgstr "ÐÐµÐ»ÑÐ¼Ð½Ð¾ Ð¿Ð¾Ð´Ð¸Ð³Ð°ÑÐµ."
 
-#: lib/imagefile.php:101 lib/mediafile.php:170
+#. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
+#: lib/imagefile.php:101 lib/mediafile.php:179
 msgid "System error uploading file."
 msgstr "Ð¡Ð¸ÑÑÐµÐ¼ÑÐºÐ° Ð³ÑÐµÑÐºÐ° Ð¿ÑÐ¸ Ð¿Ð¾Ð´Ð¸Ð³Ð°ÑÐµÑÐ¾ Ð½Ð° Ð¿Ð¾Ð´Ð°ÑÐ¾ÑÐµÐºÐ°ÑÐ°."
 
@@ -6610,19 +6621,22 @@ msgstr "ÐÐ°Ð»Ð¸Ð¼Ðµ, Ð¿ÑÐ¸ÐµÐ¼Ð½Ð°ÑÐ° Ð¿Ð¾ÑÑÐ° Ð½Ðµ Ðµ Ð´Ð¾Ð·Ð²Ð¾Ð»ÐµÐ½Ð°."
 msgid "Unsupported message type: %s"
 msgstr "ÐÐµÐ¿Ð¾Ð´Ð´ÑÐ¶Ð°Ð½ ÑÐ¾ÑÐ¼Ð°Ñ Ð½Ð° Ð¿Ð¾ÑÐ°ÐºÐ°: %s"
 
-#: lib/mediafile.php:98 lib/mediafile.php:123
+#. TRANS: Client exception thrown when a database error was thrown during a file upload operation.
+#: lib/mediafile.php:99 lib/mediafile.php:125
 msgid "There was a database error while saving your file. Please try again."
 msgstr ""
 "Ð¡Ðµ Ð¿Ð¾ÑÐ°Ð²Ð¸ Ð³ÑÐµÑÐºÐ° Ð²Ð¾ Ð±Ð°Ð·Ð°ÑÐ° Ð½Ð° Ð¿Ð¾Ð´Ð°ÑÐ¾ÑÐ¸ Ð¿ÑÐ¸ Ð·Ð°ÑÑÐ²ÑÐ²Ð°ÑÐµÑÐ¾ Ð½Ð° ÐÐ°ÑÐ°ÑÐ° "
 "Ð¿Ð¾Ð´Ð°ÑÐ¾ÑÐµÐºÐ°. ÐÐ±Ð¸Ð´ÐµÑÐµ ÑÐµ Ð¿Ð¾Ð²ÑÐ¾ÑÐ½Ð¾."
 
-#: lib/mediafile.php:142
+#. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
+#: lib/mediafile.php:145
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
 msgstr ""
 "ÐÐ¾Ð´Ð¸Ð³Ð½Ð°ÑÐ°ÑÐ° Ð¿Ð¾Ð´Ð°ÑÐ¾ÑÐµÐºÐ° ÑÐ° Ð½Ð°Ð´Ð¼Ð¸Ð½ÑÐ²Ð° Ð´Ð¸ÑÐµÐºÑÐ¸Ð²Ð°ÑÐ° upload_max_filesize Ð²Ð¾ php."
 "ini."
 
-#: lib/mediafile.php:147
+#. TRANS: Client exception.
+#: lib/mediafile.php:151
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form."
@@ -6630,44 +6644,43 @@ msgstr ""
 "ÐÐ¾Ð´Ð¸Ð³Ð½Ð°ÑÐ°ÑÐ° Ð¿Ð¾Ð´Ð°ÑÐ¾ÑÐµÐºÐ° ÑÐ° Ð½Ð°Ð´Ð¼Ð¸Ð½ÑÐ²Ð° Ð´Ð¸ÑÐµÐºÑÐ¸Ð²Ð°ÑÐ° the MAX_FILE_SIZE Ð½Ð°Ð·Ð½Ð°ÑÐµÐ½Ð° "
 "Ð²Ð¾ HTML-Ð¾Ð±ÑÐ°Ð·ÐµÑÐ¾Ñ."
 
-#: lib/mediafile.php:152
+#. TRANS: Client exception.
+#: lib/mediafile.php:157
 msgid "The uploaded file was only partially uploaded."
 msgstr "ÐÐ¾Ð´Ð¸Ð³Ð½Ð°ÑÐ°ÑÐ° Ð¿Ð¾Ð´Ð°ÑÐ¾ÑÐµÐºÐ° Ðµ ÑÐ°Ð¼Ð¾ Ð´ÐµÐ»ÑÐ¼Ð½Ð¾ Ð¿Ð¾Ð´Ð¸Ð³Ð½Ð°ÑÐ°."
 
-#: lib/mediafile.php:159
+#. TRANS: Client exception thrown when a temporary folder is not present to store a file upload.
+#: lib/mediafile.php:165
 msgid "Missing a temporary folder."
 msgstr "ÐÐµÐ´Ð¾ÑÑÐ°ÑÑÐ²Ð° Ð¿ÑÐ¸Ð²ÑÐµÐ¼ÐµÐ½Ð° Ð¿Ð°Ð¿ÐºÐ°."
 
-#: lib/mediafile.php:162
+#. TRANS: Client exception thrown when writing to disk is not possible during a file upload operation.
+#: lib/mediafile.php:169
 msgid "Failed to write file to disk."
 msgstr "ÐÐ¾Ð´Ð°ÑÐ¾ÑÐµÐºÐ°ÑÐ° Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ð´Ð° ÑÐµ Ð·Ð°Ð¿Ð¸ÑÐµ Ð½Ð° Ð´Ð¸ÑÐºÐ¾Ñ."
 
-#: lib/mediafile.php:165
+#. TRANS: Client exception thrown when a file upload operation has been stopped by an extension.
+#: lib/mediafile.php:173
 msgid "File upload stopped by extension."
 msgstr "ÐÐ¾Ð´Ð¸Ð³Ð°ÑÐµÑÐ¾ Ð½Ð° Ð¿Ð¾Ð´Ð°ÑÐ¾ÑÐµÐºÐ°ÑÐ° Ðµ Ð·Ð°Ð¿ÑÐµÐ½Ð¾ Ð¾Ð´ Ð¿ÑÐ¾ÑÐ¸ÑÑÐ²Ð°ÑÐµÑÐ¾."
 
-#: lib/mediafile.php:179 lib/mediafile.php:217
+#. TRANS: Client exception thrown when a file upload operation would cause a user to exceed a set quota.
+#: lib/mediafile.php:189 lib/mediafile.php:232
 msgid "File exceeds user's quota."
 msgstr "ÐÐ¾Ð´Ð°ÑÐ¾ÑÐµÐºÐ°ÑÐ° ÑÐ° Ð½Ð°Ð´Ð¼Ð¸Ð½ÑÐ²Ð° ÐºÐ²Ð¾ÑÐ°ÑÐ° Ð½Ð° ÐºÐ¾ÑÐ¸ÑÐ½Ð¸ÐºÐ¾Ñ."
 
-#: lib/mediafile.php:197 lib/mediafile.php:234
+#. TRANS: Client exception thrown when a file upload operation fails because the file could
+#. TRANS: not be moved from the temporary folder to the permanent file location.
+#: lib/mediafile.php:209 lib/mediafile.php:251
 msgid "File could not be moved to destination directory."
 msgstr "ÐÐ¾Ð´Ð°ÑÐ¾ÑÐµÐºÐ°ÑÐ° Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ð´Ð° ÑÐµ Ð¿ÑÐµÐ¼ÐµÑÑÐ¸ Ð²Ð¾ ÑÐµÐ»Ð½Ð¸Ð¾Ñ Ð´Ð¸ÑÐµÐºÑÐ¾ÑÐ¸ÑÐ¼."
 
-#: lib/mediafile.php:202 lib/mediafile.php:238
+#. TRANS: Client exception thrown when a file upload operation has been stopped because the MIME
+#. TRANS: type of the uploaded file could not be determined.
+#: lib/mediafile.php:216 lib/mediafile.php:257
 msgid "Could not determine file's MIME type."
 msgstr "ÐÐµ Ð¼Ð¾Ð¶ÐµÐ² Ð´Ð° Ð³Ð¾ ÑÑÐ²ÑÐ´Ð°Ð¼ mime-ÑÐ¸Ð¿Ð¾Ñ Ð½Ð° Ð¿Ð¾Ð´Ð°ÑÐ¾ÑÐµÐºÐ°ÑÐ°."
 
-#: lib/mediafile.php:318
-#, php-format
-msgid " Try using another %s format."
-msgstr "  ÐÐ±Ð¸Ð´ÐµÑÐµ ÑÐµ ÑÐ¾ Ð´ÑÑÐ³ ÑÐ¾ÑÐ¼Ð°Ñ Ð½Ð° %s."
-
-#: lib/mediafile.php:323
-#, php-format
-msgid "%s is not a supported file type on this server."
-msgstr "%s Ð½Ðµ Ðµ Ð¿Ð¾Ð´Ð´ÑÐ¶Ð°Ð½ ÑÐ¸Ð¿ Ð½Ð° Ð¿Ð¾Ð´Ð°ÑÐ¾ÑÐµÐºÐ° Ð½Ð° Ð¾Ð²Ð¾Ñ Ð¾Ð¿ÑÐ»ÑÐ¶ÑÐ²Ð°Ñ."
-
 #: lib/messageform.php:120
 msgid "Send a direct notice"
 msgstr "ÐÑÐ¿ÑÐ°ÑÐ¸ Ð´Ð¸ÑÐµÐºÑÐ½Ð° Ð·Ð°Ð±ÐµÐ»ÐµÑÐºÐ°"
@@ -6783,27 +6796,7 @@ msgstr "ÐÐ¾Ð´Ð±ÑÑÐ½Ð¸"
 msgid "Send a nudge to this user"
 msgstr "ÐÑÐ¿ÑÐ°ÑÐ¸ Ð¿Ð¾Ð´Ð±ÑÑÐ½ÑÐ²Ð°ÑÐµ Ð½Ð° ÐºÐ¾ÑÐ¸ÑÐ½Ð¸ÐºÐ¾Ð²"
 
-#: lib/oauthstore.php:283
-msgid "Error inserting new profile"
-msgstr "ÐÑÐµÑÐºÐ° Ð²Ð¾ Ð²Ð½ÐµÑÑÐ²Ð°ÑÐµÑÐ¾ Ð½Ð° Ð½Ð¾Ð²Ð¸Ð¾Ñ Ð¿ÑÐ¾ÑÐ¸Ð»"
-
-#: lib/oauthstore.php:291
-msgid "Error inserting avatar"
-msgstr "ÐÑÐµÑÐºÐ° Ð²Ð¾ Ð²Ð½ÐµÑÑÐ²Ð°ÑÐµÑÐ¾ Ð½Ð° Ð°Ð²Ð°ÑÐ°ÑÐ¾Ñ"
-
-#: lib/oauthstore.php:306
-msgid "Error updating remote profile"
-msgstr "ÐÑÐµÑÐºÐ° Ð²Ð¾ Ð¿Ð¾Ð´Ð½Ð¾Ð²ÑÐ²Ð°ÑÐµÑÐ¾ Ð½Ð° Ð´Ð°Ð»ÐµÑÐ¸Ð½ÑÐºÐ¸Ð¾Ñ Ð¿ÑÐ¾ÑÐ¸Ð»"
-
-#: lib/oauthstore.php:311
-msgid "Error inserting remote profile"
-msgstr "ÐÑÐµÑÐºÐ° Ð²Ð¾ Ð²Ð½ÐµÑÑÐ²Ð°ÑÐµÑÐ¾ Ð½Ð° Ð´Ð°Ð»ÐµÑÐ¸Ð½ÑÐºÐ¸Ð¾Ñ Ð¿ÑÐ¾ÑÐ¸Ð»"
-
-#: lib/oauthstore.php:345
-msgid "Duplicate notice"
-msgstr "ÐÑÐ¿Ð»Ð¸ÑÐ°Ñ Ð·Ð°Ð±ÐµÐ»ÐµÑÐºÐ°"
-
-#: lib/oauthstore.php:490
+#: lib/oauthstore.php:491
 msgid "Couldn't insert new subscription."
 msgstr "ÐÐµ Ð¼Ð¾Ð¶Ðµ Ð´Ð° ÑÐµ Ð²Ð½ÐµÑÐµ Ð½Ð¾Ð²Ð° Ð¿ÑÐµÑÐ¿Ð»Ð°ÑÐ°."
 
@@ -6840,7 +6833,8 @@ msgstr "ÐÐ°ÑÐ¸ Ð¸ÑÐ¿ÑÐ°ÑÐµÐ½Ð¸ Ð¿Ð¾ÑÐ°ÐºÐ¸"
 msgid "Tags in %s's notices"
 msgstr "ÐÐ·Ð½Ð°ÐºÐ¸ Ð²Ð¾ Ð·Ð°Ð±ÐµÐ»ÐµÑÐºÐ¸ÑÐµ Ð½Ð° %s"
 
-#: lib/plugin.php:115
+#. TRANS: Displayed as version information for a plugin if no version information was found.
+#: lib/plugin.php:116
 msgid "Unknown"
 msgstr "ÐÐµÐ¿Ð¾Ð·Ð½Ð°ÑÐ¾"
 
@@ -6934,19 +6928,19 @@ msgstr "ÐÐµÑÐ¾Ðº"
 msgid "Sandbox this user"
 msgstr "Ð¡ÑÐ°Ð²Ð¸ Ð³Ð¾ ÐºÐ¾ÑÐ¸ÑÐ½Ð¸ÐºÐ¾Ð² Ð²Ð¾ Ð¿ÐµÑÐ¾ÑÐµÐ½ ÑÐµÐ¶Ð¸Ð¼"
 
-#: lib/searchaction.php:120
+#. TRANS: Fieldset legend for the search form.
+#: lib/searchaction.php:121
 msgid "Search site"
 msgstr "ÐÑÐµÐ±Ð°ÑÐ°Ñ Ð¿Ð¾ Ð¼ÑÐµÐ¶Ð½Ð¾ÑÐ¾ Ð¼ÐµÑÑÐ¾"
 
-#: lib/searchaction.php:126
+#. TRANS: Used as a field label for the field where one or more keywords
+#. TRANS: for searching can be entered.
+#: lib/searchaction.php:129
 msgid "Keyword(s)"
 msgstr "ÐÐ»ÑÑÐµÐ½ Ð·Ð±Ð¾Ñ"
 
-#: lib/searchaction.php:127
-msgid "Search"
-msgstr "ÐÐ°ÑÐ°Ñ"
-
-#: lib/searchaction.php:162
+#. TRANS: Definition list item with instructions on how to get (better) search results.
+#: lib/searchaction.php:170
 msgid "Search help"
 msgstr "ÐÐ¾Ð¼Ð¾Ñ ÑÐ¾ Ð¿ÑÐµÐ±Ð°ÑÑÐ²Ð°ÑÐµ"
 
@@ -7145,56 +7139,32 @@ msgid "Moderator"
 msgstr "ÐÐ¾Ð´ÐµÑÐ°ÑÐ¾Ñ"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1102
+#: lib/util.php:1103
 msgid "a few seconds ago"
 msgstr "Ð¿ÑÐµÐ´ Ð½ÐµÐºÐ¾Ð»ÐºÑ ÑÐµÐºÑÐ½Ð´Ð¸"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1105
+#: lib/util.php:1106
 msgid "about a minute ago"
 msgstr "Ð¿ÑÐµÐ´ ÐµÐ´Ð½Ð° Ð¼Ð¸Ð½ÑÑÐ°"
 
-#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1109
-#, php-format
-msgid "about %d minutes ago"
-msgstr "Ð¿ÑÐµÐ´ %d Ð¼Ð¸Ð½ÑÑÐ¸"
-
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 #: lib/util.php:1112
 msgid "about an hour ago"
 msgstr "Ð¿ÑÐµÐ´ ÐµÐ´ÐµÐ½ ÑÐ°Ñ"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1116
-#, php-format
-msgid "about %d hours ago"
-msgstr "Ð¿ÑÐµÐ´ %d ÑÐ°ÑÐ°"
-
-#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1119
+#: lib/util.php:1118
 msgid "about a day ago"
 msgstr "Ð¿ÑÐµÐ´ ÐµÐ´ÐµÐ½ Ð´ÐµÐ½"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1123
-#, php-format
-msgid "about %d days ago"
-msgstr "Ð¿ÑÐµÐ´ %d Ð´ÐµÐ½Ð°"
-
-#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1126
+#: lib/util.php:1124
 msgid "about a month ago"
 msgstr "Ð¿ÑÐµÐ´ ÐµÐ´ÐµÐ½ Ð¼ÐµÑÐµÑ"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 #: lib/util.php:1130
-#, php-format
-msgid "about %d months ago"
-msgstr "Ð¿ÑÐµÐ´ %d Ð¼ÐµÑÐµÑÐ°"
-
-#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1133
 msgid "about a year ago"
 msgstr "Ð¿ÑÐµÐ´ ÐµÐ´Ð½Ð° Ð³Ð¾Ð´Ð¸Ð½Ð°"
 
diff --git a/locale/nb/LC_MESSAGES/statusnet.po b/locale/nb/LC_MESSAGES/statusnet.po
index 4b23489ada..e74afe48fa 100644
--- a/locale/nb/LC_MESSAGES/statusnet.po
+++ b/locale/nb/LC_MESSAGES/statusnet.po
@@ -1,7 +1,8 @@
-# Translation of StatusNet to Norwegian (bokmÃ¥l)â¬
+# Translation of StatusNet to Norwegian (bokmÃ¥l)â¬ (âªNorsk (bokmÃ¥l)â¬)
+# Expored from translatewiki.net
 #
-# Author@translatewiki.net: Laaknor
-# Author@translatewiki.net: Nghtwlkr
+# Author: Laaknor
+# Author: Nghtwlkr
 # --
 # This file is distributed under the same license as the StatusNet package.
 #
@@ -9,20 +10,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-08 22:33+0000\n"
-"PO-Revision-Date: 2010-09-08 22:35:01+0000\n"
-"Language-Team: Norwegian (bokmÃ¥l)â¬\n"
+"POT-Creation-Date: 2010-09-14 19:53+0000\n"
+"PO-Revision-Date: 2010-09-14 19:54:11+0000\n"
+"Language-Team: Norwegian (bokmÃ¥l)â¬ <http://translatewiki.net/wiki/Portal:no>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r72348); Translate extension (2010-08-20)\n"
+"X-Generator: MediaWiki 1.17alpha (r73009); Translate extension (2010-08-20)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: no\n"
-"X-Message-Group: out-statusnet\n"
+"X-Message-Group: #out-statusnet\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-POT-Import-Date: 1284-49-16 34::+0000\n"
 
 #. TRANS: Page title
 #. TRANS: Menu item for site administration
-#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:376
+#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:363
 msgid "Access"
 msgstr "Tilgang"
 
@@ -75,10 +77,10 @@ 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 actions/emailsettings.php:224
-#: actions/imsettings.php:184 actions/smssettings.php:209
-#: lib/applicationeditform.php:361
+#. TRANS: Button label in the "Edit application" form.
+#: actions/accessadminpanel.php:203 actions/emailsettings.php:228
+#: actions/imsettings.php:187 actions/smssettings.php:209
+#: lib/applicationeditform.php:351
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Lagre"
@@ -91,15 +93,15 @@ msgstr "Ingen slik side."
 
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #: actions/all.php:79 actions/allrss.php:68
-#: actions/apiaccountupdatedeliverydevice.php:114
-#: actions/apiaccountupdateprofile.php:105
-#: actions/apiaccountupdateprofilebackgroundimage.php:116
-#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
-#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
-#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:113
-#: actions/apigroupismember.php:91 actions/apigroupjoin.php:100
-#: actions/apigroupleave.php:100 actions/apigrouplist.php:73
-#: actions/apistatusesupdate.php:229 actions/apisubscriptions.php:87
+#: actions/apiaccountupdatedeliverydevice.php:115
+#: actions/apiaccountupdateprofile.php:106
+#: actions/apiaccountupdateprofilebackgroundimage.php:117
+#: actions/apiaccountupdateprofileimage.php:106 actions/apiblockcreate.php:98
+#: actions/apiblockdestroy.php:97 actions/apidirectmessage.php:77
+#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:114
+#: actions/apigroupismember.php:91 actions/apigroupjoin.php:101
+#: actions/apigroupleave.php:101 actions/apigrouplist.php:73
+#: actions/apistatusesupdate.php:230 actions/apisubscriptions.php:87
 #: actions/apitimelinefavorites.php:72 actions/apitimelinefriends.php:174
 #: actions/apitimelinehome.php:80 actions/apitimelinementions.php:80
 #: actions/apitimelineuser.php:82 actions/avatarbynickname.php:75
@@ -196,39 +198,41 @@ msgstr "Du og venner"
 msgid "Updates from %1$s and friends on %2$s!"
 msgstr "Oppdateringer fra %1$s og venner pÃ¥ %2$s!"
 
-#: actions/apiaccountupdatedeliverydevice.php:86
-#: actions/apiaccountupdateprofile.php:89
-#: actions/apiaccountupdateprofilebackgroundimage.php:86
-#: actions/apiaccountupdateprofilecolors.php:110
-#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89
-#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109
-#: actions/apifavoritecreate.php:91 actions/apifavoritedestroy.php:92
-#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
-#: actions/apigroupcreate.php:105 actions/apigroupjoin.php:92
-#: actions/apigroupleave.php:92 actions/apimediaupload.php:67
-#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:198
+#. TRANS: Client error message. POST is a HTTP command. It should not be translated.
+#. TRANS: Client error. POST is a HTTP command. It should not be translated.
+#: actions/apiaccountupdatedeliverydevice.php:87
+#: actions/apiaccountupdateprofile.php:90
+#: actions/apiaccountupdateprofilebackgroundimage.php:87
+#: actions/apiaccountupdateprofilecolors.php:111
+#: actions/apiaccountupdateprofileimage.php:85 actions/apiblockcreate.php:90
+#: actions/apiblockdestroy.php:89 actions/apidirectmessagenew.php:110
+#: actions/apifavoritecreate.php:92 actions/apifavoritedestroy.php:93
+#: actions/apifriendshipscreate.php:92 actions/apifriendshipsdestroy.php:92
+#: actions/apigroupcreate.php:106 actions/apigroupjoin.php:93
+#: actions/apigroupleave.php:93 actions/apimediaupload.php:68
+#: actions/apistatusesretweet.php:66 actions/apistatusesupdate.php:199
 msgid "This method requires a POST."
 msgstr "Denne metoden krever en POST."
 
-#: actions/apiaccountupdatedeliverydevice.php:106
+#: actions/apiaccountupdatedeliverydevice.php:107
 msgid ""
 "You must specify a parameter named 'device' with a value of one of: sms, im, "
 "none."
 msgstr "Du mÃ¥ angi en verdi for parameteren 'device' med en av: sms, im, none."
 
-#: actions/apiaccountupdateprofile.php:112
-#: actions/apiaccountupdateprofilebackgroundimage.php:194
-#: actions/apiaccountupdateprofilecolors.php:185
-#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/apiaccountupdateprofile.php:113
+#: actions/apiaccountupdateprofilebackgroundimage.php:195
+#: actions/apiaccountupdateprofilecolors.php:186
+#: actions/apiaccountupdateprofileimage.php:131 actions/apiusershow.php:108
 #: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/hcard.php:74
 #: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
 #: lib/profileaction.php:84
 msgid "User has no profile."
 msgstr "Brukeren har ingen profil."
 
-#: actions/apiaccountupdateprofilebackgroundimage.php:108
-#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
-#: actions/apistatusesupdate.php:212 actions/avatarsettings.php:257
+#: actions/apiaccountupdateprofilebackgroundimage.php:109
+#: actions/apiaccountupdateprofileimage.php:98 actions/apimediaupload.php:81
+#: actions/apistatusesupdate.php:213 actions/avatarsettings.php:257
 #: actions/designadminpanel.php:123 actions/editapplication.php:118
 #: actions/newapplication.php:101 actions/newnotice.php:94
 #: lib/designsettings.php:283
@@ -240,25 +244,25 @@ msgstr ""
 "Tjeneren kunne ikke hÃ¥ndtere sÃ¥ mye POST-data (%s bytes) pÃ¥ grunn av sitt "
 "nÃ¥vÃ¦rende oppsett."
 
-#: actions/apiaccountupdateprofilebackgroundimage.php:136
-#: actions/apiaccountupdateprofilebackgroundimage.php:146
-#: actions/apiaccountupdateprofilecolors.php:164
-#: actions/apiaccountupdateprofilecolors.php:174
+#: actions/apiaccountupdateprofilebackgroundimage.php:137
+#: actions/apiaccountupdateprofilebackgroundimage.php:147
+#: actions/apiaccountupdateprofilecolors.php:165
+#: actions/apiaccountupdateprofilecolors.php:175
 #: actions/groupdesignsettings.php:290 actions/groupdesignsettings.php:300
 #: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
 #: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
 msgid "Unable to save your design settings."
 msgstr "Kunne ikke lagre dine innstillinger for utseende."
 
-#: actions/apiblockcreate.php:105
+#: actions/apiblockcreate.php:106
 msgid "You cannot block yourself!"
 msgstr "Du kan ikke blokkere deg selv!"
 
-#: actions/apiblockcreate.php:126
+#: actions/apiblockcreate.php:127
 msgid "Block user failed."
 msgstr "Blokkering av bruker mislyktes."
 
-#: actions/apiblockdestroy.php:114
+#: actions/apiblockdestroy.php:115
 msgid "Unblock user failed."
 msgstr "Oppheving av blokkering av bruker mislyktes."
 
@@ -282,59 +286,59 @@ msgstr "Direktemeldinger til %s"
 msgid "All the direct messages sent to %s"
 msgstr "Alle direktemeldinger sendt til %s"
 
-#: actions/apidirectmessagenew.php:118
+#: actions/apidirectmessagenew.php:119
 msgid "No message text!"
 msgstr "Ingen meldingstekst!"
 
-#: actions/apidirectmessagenew.php:127 actions/newmessage.php:150
+#: actions/apidirectmessagenew.php:128 actions/newmessage.php:150
 #, php-format
 msgid "That's too long. Max message size is %d chars."
 msgstr "Dette er for langt. Meldingen kan bare vÃ¦re %d tegn lang."
 
-#: actions/apidirectmessagenew.php:138
+#: actions/apidirectmessagenew.php:139
 msgid "Recipient user not found."
 msgstr "Fant ikke mottakeren."
 
-#: actions/apidirectmessagenew.php:142
+#: actions/apidirectmessagenew.php:143
 msgid "Can't send direct messages to users who aren't your friend."
 msgstr "Kan ikke sende direktemeldinger til brukere du ikke er venn med."
 
-#: actions/apifavoritecreate.php:109 actions/apifavoritedestroy.php:110
+#: actions/apifavoritecreate.php:110 actions/apifavoritedestroy.php:111
 #: actions/apistatusesdestroy.php:121
 msgid "No status found with that ID."
 msgstr "Fant ingen status med den ID-en."
 
-#: actions/apifavoritecreate.php:120
+#: actions/apifavoritecreate.php:121
 msgid "This status is already a favorite."
 msgstr "Denne statusen er allerede en favoritt."
 
 #. TRANS: Error message text shown when a favorite could not be set.
-#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:296
+#: actions/apifavoritecreate.php:132 actions/favor.php:84 lib/command.php:296
 msgid "Could not create favorite."
 msgstr "Kunne ikke opprette favoritt."
 
-#: actions/apifavoritedestroy.php:123
+#: actions/apifavoritedestroy.php:124
 msgid "That status is not a favorite."
 msgstr "Den statusen er ikke en favoritt."
 
-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
+#: actions/apifavoritedestroy.php:136 actions/disfavor.php:87
 msgid "Could not delete favorite."
 msgstr "Kunne ikke slette favoritt."
 
-#: actions/apifriendshipscreate.php:109
+#: actions/apifriendshipscreate.php:110
 msgid "Could not follow user: profile not found."
 msgstr "Kunne ikke fÃ¸lge brukeren: fant ikke profilen."
 
-#: actions/apifriendshipscreate.php:118
+#: actions/apifriendshipscreate.php:119
 #, php-format
 msgid "Could not follow user: %s is already on your list."
 msgstr "Kunne ikke fÃ¸lge brukeren: %s er allerede i listen din."
 
-#: actions/apifriendshipsdestroy.php:109
+#: actions/apifriendshipsdestroy.php:110
 msgid "Could not unfollow user: User not found."
 msgstr "Kunne ikke slutte Ã¥ fÃ¸lge brukeren: Fant ikke brukeren."
 
-#: actions/apifriendshipsdestroy.php:120
+#: actions/apifriendshipsdestroy.php:121
 msgid "You cannot unfollow yourself."
 msgstr "Du kan ikke slutte Ã¥ fÃ¸lge deg selv."
 
@@ -350,101 +354,101 @@ msgstr "Kunne ikke bestemme kildebruker."
 msgid "Could not find target user."
 msgstr "Kunne ikke finne mÃ¥lbruker."
 
-#: actions/apigroupcreate.php:167 actions/editgroup.php:186
+#: actions/apigroupcreate.php:168 actions/editgroup.php:186
 #: actions/newgroup.php:126 actions/profilesettings.php:215
 #: actions/register.php:212
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr "Kallenavn kan kun ha smÃ¥ bokstaver og tall og ingen mellomrom."
 
-#: actions/apigroupcreate.php:176 actions/editgroup.php:190
+#: actions/apigroupcreate.php:177 actions/editgroup.php:190
 #: actions/newgroup.php:130 actions/profilesettings.php:238
 #: actions/register.php:215
 msgid "Nickname already in use. Try another one."
 msgstr "Det nicket er allerede i bruk. PrÃ¸v et annet."
 
-#: actions/apigroupcreate.php:183 actions/editgroup.php:193
+#: actions/apigroupcreate.php:184 actions/editgroup.php:193
 #: actions/newgroup.php:133 actions/profilesettings.php:218
 #: actions/register.php:217
 msgid "Not a valid nickname."
 msgstr "Ugyldig nick."
 
-#: actions/apigroupcreate.php:199 actions/editapplication.php:215
+#: actions/apigroupcreate.php:200 actions/editapplication.php:215
 #: actions/editgroup.php:199 actions/newapplication.php:203
 #: actions/newgroup.php:139 actions/profilesettings.php:222
 #: actions/register.php:224
 msgid "Homepage is not a valid URL."
 msgstr "Hjemmesiden er ikke en gyldig URL."
 
-#: actions/apigroupcreate.php:208 actions/editgroup.php:202
+#: actions/apigroupcreate.php:209 actions/editgroup.php:202
 #: actions/newgroup.php:142 actions/profilesettings.php:225
 #: actions/register.php:227
 msgid "Full name is too long (max 255 chars)."
 msgstr "Beklager, navnet er for langt (max 250 tegn)."
 
-#: actions/apigroupcreate.php:216 actions/editapplication.php:190
+#: actions/apigroupcreate.php:217 actions/editapplication.php:190
 #: actions/newapplication.php:172
 #, php-format
 msgid "Description is too long (max %d chars)."
 msgstr "Beskrivelsen er for lang (maks %d tegn)."
 
-#: actions/apigroupcreate.php:227 actions/editgroup.php:208
+#: actions/apigroupcreate.php:228 actions/editgroup.php:208
 #: actions/newgroup.php:148 actions/profilesettings.php:232
 #: actions/register.php:234
 msgid "Location is too long (max 255 chars)."
 msgstr "Plassering er for lang (maks 255 tegn)."
 
-#: actions/apigroupcreate.php:246 actions/editgroup.php:219
+#: actions/apigroupcreate.php:247 actions/editgroup.php:219
 #: actions/newgroup.php:159
 #, php-format
 msgid "Too many aliases! Maximum %d."
 msgstr "For mange alias! Maksimum %d."
 
-#: actions/apigroupcreate.php:267
+#: actions/apigroupcreate.php:268
 #, php-format
 msgid "Invalid alias: \"%s\"."
 msgstr "Ugyldig alias: Â«%sÂ»."
 
-#: actions/apigroupcreate.php:276 actions/editgroup.php:232
+#: actions/apigroupcreate.php:277 actions/editgroup.php:232
 #: actions/newgroup.php:172
 #, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr "Aliaset Â«%sÂ» er allerede i bruk. PrÃ¸v et annet."
 
-#: actions/apigroupcreate.php:289 actions/editgroup.php:238
+#: actions/apigroupcreate.php:290 actions/editgroup.php:238
 #: actions/newgroup.php:178
 msgid "Alias can't be the same as nickname."
 msgstr "Alias kan ikke vÃ¦re det samme som kallenavn."
 
-#: actions/apigroupismember.php:96 actions/apigroupjoin.php:105
-#: actions/apigroupleave.php:105 actions/apigroupmembership.php:92
+#: actions/apigroupismember.php:96 actions/apigroupjoin.php:106
+#: actions/apigroupleave.php:106 actions/apigroupmembership.php:92
 #: actions/apigroupshow.php:83 actions/apitimelinegroup.php:92
 msgid "Group not found."
 msgstr "Gruppe ikke funnet."
 
 #. TRANS: Error text shown a user tries to join a group they already are a member of.
-#: actions/apigroupjoin.php:111 actions/joingroup.php:100 lib/command.php:336
+#: actions/apigroupjoin.php:112 actions/joingroup.php:100 lib/command.php:336
 msgid "You are already a member of that group."
 msgstr "Du er allerede medlem av den gruppen."
 
 #. TRANS: Error text shown when a user tries to join a group they are blocked from joining.
-#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:341
+#: actions/apigroupjoin.php:121 actions/joingroup.php:105 lib/command.php:341
 msgid "You have been blocked from that group by the admin."
 msgstr "Du har blitt blokkert fra den gruppen av administratoren."
 
 #. 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.
-#: actions/apigroupjoin.php:139 actions/joingroup.php:134 lib/command.php:353
+#: actions/apigroupjoin.php:140 actions/joingroup.php:134 lib/command.php:353
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "Kunne ikke legge bruker %1$s til gruppe %2$s."
 
-#: actions/apigroupleave.php:115
+#: actions/apigroupleave.php:116
 msgid "You are not a member of this group."
 msgstr "Du er ikke et medlem av denne gruppen."
 
 #. 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.
-#: actions/apigroupleave.php:125 actions/leavegroup.php:129
+#: actions/apigroupleave.php:126 actions/leavegroup.php:129
 #: lib/command.php:401
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
@@ -474,7 +478,7 @@ msgstr "%s grupper"
 msgid "groups on %s"
 msgstr "grupper pÃ¥ %s"
 
-#: actions/apimediaupload.php:99
+#: actions/apimediaupload.php:100
 msgid "Upload failed."
 msgstr "Opplasting feilet."
 
@@ -488,9 +492,9 @@ msgstr "Ugyldig symbol."
 
 #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
 #: actions/deletenotice.php:169 actions/disfavor.php:74
-#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:55
+#: actions/emailsettings.php:271 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:66 actions/imsettings.php:227
+#: actions/groupunblock.php:66 actions/imsettings.php:230
 #: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
@@ -533,8 +537,8 @@ msgstr ""
 #. 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:286 actions/grouplogo.php:322
-#: actions/imsettings.php:242 actions/newapplication.php:121
+#: actions/emailsettings.php:290 actions/grouplogo.php:322
+#: actions/imsettings.php:245 actions/newapplication.php:121
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
 #: actions/smssettings.php:277 lib/designsettings.php:304
 msgid "Unexpected form submission."
@@ -598,18 +602,18 @@ msgstr "Denne metoden krever en POST eller DELETE."
 msgid "You may not delete another user's status."
 msgstr "Du kan ikke slette statusen til en annen bruker."
 
-#: actions/apistatusesretweet.php:75 actions/apistatusesretweets.php:72
+#: actions/apistatusesretweet.php:76 actions/apistatusesretweets.php:72
 #: actions/deletenotice.php:52 actions/shownotice.php:92
 msgid "No such notice."
 msgstr "Ingen slik notis."
 
 #. TRANS: Error text shown when trying to repeat an own notice.
-#: actions/apistatusesretweet.php:83 lib/command.php:538
+#: actions/apistatusesretweet.php:84 lib/command.php:538
 msgid "Cannot repeat your own notice."
 msgstr "Kan ikke gjenta din egen notis."
 
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-#: actions/apistatusesretweet.php:91 lib/command.php:544
+#: actions/apistatusesretweet.php:92 lib/command.php:544
 msgid "Already repeated that notice."
 msgstr "Allerede gjentatt den notisen."
 
@@ -621,21 +625,21 @@ msgstr "Status slettet."
 msgid "No status with that ID found."
 msgstr "Ingen status med den ID-en funnet."
 
-#: actions/apistatusesupdate.php:221
+#: actions/apistatusesupdate.php:222
 msgid "Client must provide a 'status' parameter with a value."
 msgstr ""
 
-#: actions/apistatusesupdate.php:242 actions/newnotice.php:157
+#: actions/apistatusesupdate.php:243 actions/newnotice.php:157
 #: lib/mailhandler.php:60
 #, php-format
 msgid "That's too long. Max notice size is %d chars."
 msgstr "Det er for langt. Maks notisstÃ¸rrelse er %d tegn."
 
-#: actions/apistatusesupdate.php:283 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:284 actions/apiusershow.php:96
 msgid "Not found."
 msgstr "Ikke funnet."
 
-#: actions/apistatusesupdate.php:306 actions/newnotice.php:181
+#: actions/apistatusesupdate.php:307 actions/newnotice.php:181
 #, php-format
 msgid "Max notice size is %d chars, including attachment URL."
 msgstr "Maks notisstÃ¸rrelse er %d tegn, inklusive vedleggs-URL."
@@ -835,7 +839,9 @@ msgid "Yes"
 msgstr "Ja"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
+#. TRANS: Submit button title.
+#. TRANS: Description of the form to block a user.
+#: actions/block.php:164 actions/groupmembers.php:403 lib/blockform.php:82
 msgid "Block this user"
 msgstr "Blokker denne brukeren"
 
@@ -877,11 +883,13 @@ msgstr "En liste over brukere som er blokkert fra Ã¥ delta i denne gruppen."
 msgid "Unblock user from group"
 msgstr "Opphev blokkering av bruker fra gruppe"
 
-#: actions/blockedfromgroup.php:320 lib/unblockform.php:69
+#. TRANS: Title for the form to unblock a user.
+#: actions/blockedfromgroup.php:320 lib/unblockform.php:70
 msgid "Unblock"
 msgstr "Opphev blokkering"
 
-#: actions/blockedfromgroup.php:320 lib/unblockform.php:80
+#. TRANS: Description of the form to unblock a user.
+#: actions/blockedfromgroup.php:320 lib/unblockform.php:82
 msgid "Unblock this user"
 msgstr "Opphev blokkering av denne brukeren"
 
@@ -920,9 +928,9 @@ msgstr "Den adressen har allerede blitt bekreftet."
 #. 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/confirmaddress.php:116 actions/emailsettings.php:331
+#: actions/emailsettings.php:477 actions/imsettings.php:283
+#: actions/imsettings.php:442 actions/othersettings.php:174
 #: actions/profilesettings.php:283 actions/smssettings.php:308
 #: actions/smssettings.php:464
 msgid "Couldn't update user."
@@ -930,7 +938,7 @@ msgstr "Klarte ikke Ã¥ oppdatere bruker."
 
 #. 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/confirmaddress.php:128 actions/emailsettings.php:437
 #: actions/smssettings.php:422
 msgid "Couldn't delete email confirmation."
 msgstr "Kunne ikke slette e-postbekreftelse."
@@ -996,7 +1004,7 @@ msgstr "Slett dette programmet"
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
 #: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:73 lib/profileformaction.php:64
+#: lib/adminpanelaction.php:71 lib/profileformaction.php:64
 #: lib/settingsaction.php:72
 msgid "Not logged in."
 msgstr "Ikke logget inn."
@@ -1059,7 +1067,6 @@ msgstr "Slett denne brukeren"
 #. TRANS: Message used as title for design settings for the site.
 #. TRANS: Link description in user account settings menu.
 #: actions/designadminpanel.php:63 lib/accountsettingsaction.php:139
-#: lib/groupnav.php:119
 msgid "Design"
 msgstr "Utseende"
 
@@ -1179,13 +1186,13 @@ msgstr "Gjenopprett standardutseende"
 msgid "Reset back to default"
 msgstr "Tilbakestill til standardverdier"
 
-#. TRANS: Submit button title
+#. TRANS: Submit button title.
 #: actions/designadminpanel.php:685 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/snapshotadminpanel.php:245
 #: actions/subscriptions.php:226 actions/tagother.php:154
-#: actions/useradminpanel.php:294 lib/applicationeditform.php:363
+#: actions/useradminpanel.php:294 lib/applicationeditform.php:353
 #: lib/designsettings.php:256 lib/groupeditform.php:202
 msgid "Save"
 msgstr "Lagre"
@@ -1341,7 +1348,7 @@ msgstr "NÃ¥vÃ¦rende bekreftede e-postadresse"
 #. 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/emailsettings.php:115 actions/emailsettings.php:162
 #: actions/imsettings.php:116 actions/smssettings.php:124
 #: actions/smssettings.php:180
 msgctxt "BUTTON"
@@ -1359,22 +1366,26 @@ msgstr ""
 #. 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
+#. TRANS: Button label in the "Edit application" form.
 #: actions/emailsettings.php:127 actions/imsettings.php:131
-#: actions/smssettings.php:137 lib/applicationeditform.php:357
+#: actions/smssettings.php:137 lib/applicationeditform.php:347
 msgctxt "BUTTON"
 msgid "Cancel"
 msgstr "Avbryt"
 
-#. TRANS: Instructions for e-mail address input form.
-#: actions/emailsettings.php:135
+#. TRANS: Instructions for e-mail address input form. Do not translate
+#. TRANS: "example.org". It is one of the domain names reserved for
+#. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
+#. TRANS: Any other domain may be owned by a legitimate person or
+#. TRANS: organization.
+#: actions/emailsettings.php:139
 msgid "Email address, like \"UserName@example.org\""
 msgstr "E-postadresse (Â«brukernavn@eksempel.orgÂ»)"
 
 #. 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/emailsettings.php:143 actions/imsettings.php:151
 #: actions/smssettings.php:162
 msgctxt "BUTTON"
 msgid "Add"
@@ -1382,110 +1393,110 @@ msgstr "Legg til"
 
 #. 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
+#: actions/emailsettings.php:151 actions/smssettings.php:171
 msgid "Incoming email"
 msgstr "innkommende e-post"
 
 #. 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
+#: actions/emailsettings.php:159 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."
 
 #. 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
+#: actions/emailsettings.php:168 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."
 
 #. 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
+#: actions/emailsettings.php:172 actions/smssettings.php:189
 msgctxt "BUTTON"
 msgid "New"
 msgstr "Ny"
 
 #. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:174
+#: actions/emailsettings.php:178
 msgid "Email preferences"
 msgstr "E-postinnstillinger"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:180
+#: actions/emailsettings.php:184
 msgid "Send me notices of new subscriptions through email."
 msgstr "Send meg varsler om nye abonnementer gjennom e-post."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:186
+#: actions/emailsettings.php:190
 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."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:193
+#: actions/emailsettings.php:197
 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."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:199
+#: actions/emailsettings.php:203
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr "Send meg en e-post nÃ¥r noen sender meg et Â«@-svarÂ»."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:205
+#: actions/emailsettings.php:209
 msgid "Allow friends to nudge me and send me an email."
 msgstr "Tillat venner Ã¥ knuffe meg og sende meg en e-post."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:212
+#: actions/emailsettings.php:216
 msgid "I want to post notices by email."
 msgstr "Jeg vil poste notiser med e-post."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:219
+#: actions/emailsettings.php:223
 msgid "Publish a MicroID for my email address."
 msgstr "Publiser en MicroID for min e-postadresse."
 
 #. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:334
+#: actions/emailsettings.php:338
 msgid "Email preferences saved."
 msgstr "E-postinnstillinger lagret."
 
 #. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:353
+#: actions/emailsettings.php:357
 msgid "No email address."
 msgstr "Ingen e-postadresse."
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:361
+#: actions/emailsettings.php:365
 msgid "Cannot normalize that email address"
 msgstr "Klarer ikke normalisere epostadressen"
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:208
+#: actions/emailsettings.php:370 actions/register.php:208
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "Ugyldig e-postadresse."
 
 #. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:370
+#: actions/emailsettings.php:374
 msgid "That is already your email address."
 msgstr "Det er allerede din e-postadresse."
 
 #. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:374
+#: actions/emailsettings.php:378
 msgid "That email address already belongs to another user."
 msgstr "Den e-postadressen tilhÃ¸rer allerede en annen bruker."
 
 #. 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/emailsettings.php:395 actions/imsettings.php:351
 #: actions/smssettings.php:373
 msgid "Couldn't insert confirmation code."
 msgstr "Kunne ikke sette inn bekreftelseskode."
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:398
+#: actions/emailsettings.php:402
 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."
@@ -1496,50 +1507,50 @@ msgstr ""
 #. 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/emailsettings.php:423 actions/imsettings.php:386
 #: actions/smssettings.php:408
 msgid "No pending confirmation to cancel."
 msgstr "Ingen ventende bekreftelse Ã¥ avbryte."
 
 #. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:424
+#: actions/emailsettings.php:428
 msgid "That is the wrong email address."
 msgstr "Dette er feil e-postadresse."
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:438
+#: actions/emailsettings.php:442
 msgid "Email confirmation cancelled."
 msgstr "E-postbekreftelse avbrutt."
 
 #. TRANS: Message given trying to remove an e-mail address that is not
 #. TRANS: registered for the active user.
-#: actions/emailsettings.php:458
+#: actions/emailsettings.php:462
 msgid "That is not your email address."
 msgstr "Det er ikke din e-postadresse."
 
 #. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:479
+#: actions/emailsettings.php:483
 msgid "The email address was removed."
 msgstr "E-postadressen ble fjernet."
 
-#: actions/emailsettings.php:493 actions/smssettings.php:568
+#: actions/emailsettings.php:497 actions/smssettings.php:568
 msgid "No incoming email address."
 msgstr "Ingen innkommende e-postadresse."
 
 #. 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/emailsettings.php:508 actions/emailsettings.php:532
 #: actions/smssettings.php:578 actions/smssettings.php:602
 msgid "Couldn't update user record."
 msgstr "Kunne ikke oppdatere brukeroppfÃ¸ring."
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
-#: actions/emailsettings.php:508 actions/smssettings.php:581
+#: actions/emailsettings.php:512 actions/smssettings.php:581
 msgid "Incoming email address removed."
 msgstr "Inkommende e-postadresse fjernet."
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
-#: actions/emailsettings.php:532 actions/smssettings.php:605
+#: actions/emailsettings.php:536 actions/smssettings.php:605
 msgid "New incoming email address added."
 msgstr "Ny innkommende e-postadresse lagt til."
 
@@ -1658,7 +1669,7 @@ msgstr ""
 msgid "Remote service uses unknown version of OMB protocol."
 msgstr "Fjerntjeneste bruker ukjent versjon av OMB-protokollen."
 
-#: actions/finishremotesubscribe.php:138
+#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306
 msgid "Error updating remote profile."
 msgstr "Feil ved oppdatering av fjernprofil."
 
@@ -1715,7 +1726,7 @@ msgstr "Bruker er allerede blokkert fra gruppe."
 msgid "User is not a member of group."
 msgstr "Bruker er ikke et medlem av gruppa."
 
-#: actions/groupblock.php:134 actions/groupmembers.php:360
+#: actions/groupblock.php:134 actions/groupmembers.php:364
 msgid "Block user from group"
 msgstr "Blokker bruker fra gruppe"
 
@@ -1795,40 +1806,32 @@ msgstr "Logo oppdatert."
 msgid "Failed updating logo."
 msgstr "Kunne ikke oppdatere logo."
 
-#: actions/groupmembers.php:100 lib/groupnav.php:92
+#. TRANS: Title of the page showing group members.
+#. TRANS: %s is the name of the group.
+#: actions/groupmembers.php:102
 #, php-format
 msgid "%s group members"
 msgstr "%s gruppemedlemmer"
 
-#: actions/groupmembers.php:103
+#. TRANS: Title of the page showing group members.
+#. TRANS: %1$s is the name of the group, %2$d is the page number of the members list.
+#: actions/groupmembers.php:107
 #, php-format
 msgid "%1$s group members, page %2$d"
 msgstr "%1$s gruppemedlemmer, side %2$d"
 
-#: actions/groupmembers.php:118
+#: actions/groupmembers.php:122
 msgid "A list of the users in this group."
 msgstr "En liste over brukerne i denne gruppen."
 
-#: actions/groupmembers.php:182 lib/groupnav.php:107
+#: actions/groupmembers.php:186
 msgid "Admin"
 msgstr "Administrator"
 
-#: actions/groupmembers.php:392 lib/blockform.php:69
-msgid "Block"
-msgstr "BlokkÃ©r"
-
-#: actions/groupmembers.php:487
+#: actions/groupmembers.php:498
 msgid "Make user an admin of the group"
 msgstr "GjÃ¸r brukeren til en administrator for gruppen"
 
-#: actions/groupmembers.php:519
-msgid "Make Admin"
-msgstr "GjÃ¸r til administrator"
-
-#: actions/groupmembers.php:519
-msgid "Make this user an admin"
-msgstr "GjÃ¸r denne brukeren til administrator"
-
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Title in atom group notice feed. %s is a group name.
 #. TRANS: Title in atom user notice feed. %s is a user name.
@@ -1966,7 +1969,10 @@ msgstr ""
 
 #. TRANS: IM address input field instructions in IM settings form.
 #. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:140
+#. TRANS: Do not translate "example.org". It is one of the domain names reserved for use in examples by
+#. TRANS: http://www.rfc-editor.org/rfc/rfc2606.txt. Any other domain may be owned by a legitimate
+#. TRANS: person or organization.
+#: actions/imsettings.php:143
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -1976,63 +1982,63 @@ msgstr ""
 "vennelisten din i direktemeldingsklienten din eller pÃ¥ GTalk."
 
 #. TRANS: Form legend for IM preferences form.
-#: actions/imsettings.php:155
+#: actions/imsettings.php:158
 msgid "IM preferences"
 msgstr "Direktemeldingsinnstillinger"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:160
+#: actions/imsettings.php:163
 msgid "Send me notices through Jabber/GTalk."
 msgstr "Send meg notiser gjennom Jabber/GTalk."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:166
+#: actions/imsettings.php:169
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr "Post en notis nÃ¥r min Jabber/Gtalk-status endres."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:172
+#: actions/imsettings.php:175
 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr "Send meg svar gjennom Jabber/GTalk fra personer jeg ikke abonnerer pÃ¥."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:179
+#: actions/imsettings.php:182
 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "Publiser en MicroID for min Jabber/Gtalk-adresse."
 
 #. TRANS: Confirmation message for successful IM preferences save.
-#: actions/imsettings.php:287 actions/othersettings.php:180
+#: actions/imsettings.php:290 actions/othersettings.php:180
 msgid "Preferences saved."
 msgstr "Innstillinger lagret."
 
 #. TRANS: Message given saving IM address without having provided one.
-#: actions/imsettings.php:309
+#: actions/imsettings.php:312
 msgid "No Jabber ID."
 msgstr "Ingen Jabber ID."
 
 #. TRANS: Message given saving IM address that cannot be normalised.
-#: actions/imsettings.php:317
+#: actions/imsettings.php:320
 msgid "Cannot normalize that Jabber ID"
 msgstr "Klarer ikke normalisere Jabber-IDen"
 
 #. TRANS: Message given saving IM address that not valid.
-#: actions/imsettings.php:322
+#: actions/imsettings.php:325
 msgid "Not a valid Jabber ID"
 msgstr "Ugyldig Jabber ID"
 
 #. TRANS: Message given saving IM address that is already set.
-#: actions/imsettings.php:326
+#: actions/imsettings.php:329
 msgid "That is already your Jabber ID."
 msgstr "Det er allerede din Jabber ID."
 
 #. TRANS: Message given saving IM address that is already set for another user.
-#: actions/imsettings.php:330
+#: actions/imsettings.php:333
 msgid "Jabber ID already belongs to another user."
 msgstr "Jabber-ID tilhÃ¸rer allerede en annen bruker."
 
 #. 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
+#: actions/imsettings.php:361
 #, php-format
 msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
@@ -2042,28 +2048,28 @@ msgstr ""
 "godkjenne %s for Ã¥ sende meldinger til deg."
 
 #. TRANS: Message given canceling IM address confirmation for the wrong IM address.
-#: actions/imsettings.php:388
+#: actions/imsettings.php:391
 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
+#: actions/imsettings.php:400
 msgid "Couldn't delete IM confirmation."
 msgstr "Kunne ikke slette direktemeldingsbekreftelse."
 
 #. TRANS: Message given after successfully canceling IM address confirmation.
-#: actions/imsettings.php:402
+#: actions/imsettings.php:405
 msgid "IM confirmation cancelled."
 msgstr "Direktemeldingsbekreftelse avbrutt."
 
 #. TRANS: Message given trying to remove an IM address that is not
 #. TRANS: registered for the active user.
-#: actions/imsettings.php:424
+#: actions/imsettings.php:427
 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
+#: actions/imsettings.php:450
 msgid "The IM address was removed."
 msgstr "Direktemeldingsadressen ble fjernet."
 
@@ -2527,8 +2533,8 @@ msgid "Only %s URLs over plain HTTP please."
 msgstr "Bare %s-nettadresser over vanlig HTTP."
 
 #. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1215
-#: lib/apiaction.php:1243 lib/apiaction.php:1366
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1206
+#: lib/apiaction.php:1233 lib/apiaction.php:1356
 msgid "Not a supported data format."
 msgstr "Ikke et stÃ¸ttet dataformat."
 
@@ -2580,6 +2586,10 @@ msgstr "Ingen bruker-ID spesifisert."
 msgid "No login token specified."
 msgstr "Ingen notis spesifisert."
 
+#: actions/otp.php:90
+msgid "No login token requested."
+msgstr ""
+
 #: actions/otp.php:95
 msgid "Invalid login token specified."
 msgstr "Ugyldig symbol."
@@ -2660,7 +2670,7 @@ msgid "Password saved."
 msgstr "Passordet ble lagret"
 
 #. TRANS: Menu item for site administration
-#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:384
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:371
 msgid "Paths"
 msgstr "Stier"
 
@@ -2871,7 +2881,7 @@ msgstr "Fullt navn"
 
 #. TRANS: Form input field label.
 #: actions/profilesettings.php:115 actions/register.php:460
-#: lib/applicationeditform.php:244 lib/groupeditform.php:161
+#: lib/applicationeditform.php:235 lib/groupeditform.php:161
 msgid "Homepage"
 msgstr "Hjemmesiden"
 
@@ -2977,7 +2987,7 @@ msgid "Couldn't save tags."
 msgstr "Kunne ikke lagre merkelapper."
 
 #. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:391 lib/adminpanelaction.php:141
+#: actions/profilesettings.php:391 lib/adminpanelaction.php:138
 msgid "Settings saved."
 msgstr "Innstillinger lagret."
 
@@ -3512,7 +3522,7 @@ msgstr "Brukeren er allerede i sandkassen."
 
 #. TRANS: Menu item for site administration
 #: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
-#: lib/adminpanelaction.php:392
+#: lib/adminpanelaction.php:379
 msgid "Sessions"
 msgstr "Ãkter"
 
@@ -3550,24 +3560,24 @@ msgid "Application profile"
 msgstr "Programprofil"
 
 #. TRANS: Form input field label for application icon.
-#: actions/showapplication.php:159 lib/applicationeditform.php:182
+#: actions/showapplication.php:159 lib/applicationeditform.php:173
 msgid "Icon"
 msgstr "Ikon"
 
 #. TRANS: Form input field label for application name.
 #: actions/showapplication.php:169 actions/version.php:197
-#: lib/applicationeditform.php:199
+#: lib/applicationeditform.php:190
 msgid "Name"
 msgstr "Navn"
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:178 lib/applicationeditform.php:235
+#: actions/showapplication.php:178 lib/applicationeditform.php:226
 msgid "Organization"
 msgstr "Organisasjon"
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:216 lib/groupeditform.php:172
+#: lib/applicationeditform.php:207 lib/groupeditform.php:172
 msgid "Description"
 msgstr "Beskrivelse"
 
@@ -3678,7 +3688,7 @@ msgstr ""
 msgid "This is a way to share what you like."
 msgstr "Dette er en mÃ¥te Ã¥ dele det du liker."
 
-#: actions/showgroup.php:82 lib/groupnav.php:86
+#: actions/showgroup.php:82
 #, php-format
 msgid "%s group"
 msgstr "%s gruppe"
@@ -3730,7 +3740,7 @@ msgstr "Notismating for %s gruppe (Atom)"
 msgid "FOAF for %s group"
 msgstr "FOAF for gruppen %s"
 
-#: actions/showgroup.php:393 actions/showgroup.php:445 lib/groupnav.php:91
+#: actions/showgroup.php:393 actions/showgroup.php:445
 msgid "Members"
 msgstr "Medlemmer"
 
@@ -4176,7 +4186,7 @@ msgstr "Ingen kode skrevet inn"
 
 #. TRANS: Menu item for site administration
 #: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
-#: lib/adminpanelaction.php:408
+#: lib/adminpanelaction.php:395
 msgid "Snapshots"
 msgstr ""
 
@@ -4192,6 +4202,10 @@ msgstr ""
 msgid "In a scheduled job"
 msgstr ""
 
+#: actions/snapshotadminpanel.php:206
+msgid "Data snapshots"
+msgstr ""
+
 #: actions/snapshotadminpanel.php:208
 msgid "When to send statistical data to status.net servers"
 msgstr ""
@@ -4461,6 +4475,21 @@ msgid ""
 "subscription."
 msgstr ""
 
+#: actions/userauthorization.php:303
+#, php-format
+msgid "Listener URI â%sâ not found here."
+msgstr ""
+
+#: actions/userauthorization.php:308
+#, php-format
+msgid "Listenee URI â%sâ is too long."
+msgstr ""
+
+#: actions/userauthorization.php:314
+#, php-format
+msgid "Listenee URI â%sâ is a local user."
+msgstr ""
+
 #: actions/userauthorization.php:329
 #, php-format
 msgid "Profile URL â%sâ is for a local user."
@@ -4856,7 +4885,8 @@ msgid "Change site configuration"
 msgstr "Endre nettstedskonfigurasjon"
 
 #. TRANS: Main menu option when logged in and site admin for access to site configuration
-#: lib/action.php:474
+#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
+#: lib/action.php:474 lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr "Administrator"
@@ -4933,7 +4963,7 @@ msgstr "SÃ¸k"
 
 #. TRANS: DT element for site notice. String is hidden in default CSS.
 #. TRANS: Menu item for site administration
-#: lib/action.php:538 lib/adminpanelaction.php:400
+#: lib/action.php:538 lib/adminpanelaction.php:387
 msgid "Site notice"
 msgstr "Nettstedsnotis"
 
@@ -4988,7 +5018,10 @@ msgid "StatusNet software license"
 msgstr "Programvarelisens for StatusNet"
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
-#: lib/action.php:843
+#. TRANS: Text between [] is a link description, text between () is the link itself.
+#. TRANS: Make sure there is no whitespace between "]" and "(".
+#. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
+#: lib/action.php:846
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4998,13 +5031,16 @@ msgstr ""
 "broughtby%%](%%site.broughtbyurl%%)."
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:846
+#: lib/action.php:849
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** er en mikrobloggingtjeneste."
 
 #. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.
-#: lib/action.php:850
+#. TRANS: Make sure there is no whitespace between "]" and "(".
+#. TRANS: Text between [] is a link description, text between () is the link itself.
+#. TRANS: %s is the version of StatusNet that is being used.
+#: lib/action.php:856
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -5014,38 +5050,39 @@ msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:873
+#: lib/action.php:879
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:880
+#: lib/action.php:886
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:884
+#: lib/action.php:890
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 
-#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:897
+#. TRANS: license message in footer.
+#. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
+#: lib/action.php:904
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr ""
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1247
+#: lib/action.php:1254
 msgid "After"
 msgstr "Etter"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1257
+#: lib/action.php:1264
 msgid "Before"
 msgstr "FÃ¸r"
 
@@ -5054,171 +5091,200 @@ msgstr "FÃ¸r"
 msgid "Expecting a root feed element but got a whole XML document."
 msgstr ""
 
-#: lib/activityutils.php:208
+#. TRANS: Client exception thrown when there is no source attribute.
+#: lib/activityutils.php:203
 msgid "Can't handle remote content yet."
 msgstr ""
 
-#: lib/activityutils.php:244
+#. TRANS: Client exception thrown when there embedded XML content is found that cannot be processed yet.
+#: lib/activityutils.php:240
 msgid "Can't handle embedded XML content yet."
 msgstr ""
 
-#: lib/activityutils.php:248
+#. TRANS: Client exception thrown when base64 encoded content is found that cannot be processed yet.
+#: lib/activityutils.php:245
 msgid "Can't handle embedded Base64 content yet."
 msgstr ""
 
 #. TRANS: Client error message thrown when a user tries to change admin settings but has no access rights.
-#: lib/adminpanelaction.php:98
+#: lib/adminpanelaction.php:96
 msgid "You cannot make changes to this site."
 msgstr "Du kan ikke gjÃ¸re endringer pÃ¥ dette nettstedet."
 
 #. TRANS: Client error message.
-#: lib/adminpanelaction.php:229
+#: lib/adminpanelaction.php:222
 msgid "showForm() not implemented."
 msgstr "showForm() ikke implementert."
 
 #. TRANS: Client error message
-#: lib/adminpanelaction.php:259
+#: lib/adminpanelaction.php:250
 msgid "saveSettings() not implemented."
 msgstr "saveSettings() ikke implementert."
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:352
+#: lib/adminpanelaction.php:339
 msgctxt "MENU"
 msgid "Site"
 msgstr "Nettsted"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:360
+#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
+#: lib/adminpanelaction.php:347 lib/groupnav.php:135
 msgctxt "MENU"
 msgid "Design"
 msgstr "Utseende"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:366
+#: lib/adminpanelaction.php:353
 msgid "User configuration"
 msgstr "Brukerkonfigurasjon"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:368 lib/personalgroupnav.php:115
+#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:115
 msgid "User"
 msgstr "Bruker"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:374
+#: lib/adminpanelaction.php:361
 msgid "Access configuration"
 msgstr "Tilgangskonfigurasjon"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:382
+#: lib/adminpanelaction.php:369
 msgid "Paths configuration"
 msgstr "Stikonfigurasjon"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:398
+#: lib/adminpanelaction.php:385
 msgid "Edit site notice"
 msgstr "Rediger nettstedsnotis"
 
 #. TRANS: Client error 401.
-#: lib/apiauth.php:113
+#: lib/apiauth.php:111
 msgid "API resource requires read-write access, but you only have read access."
 msgstr ""
 
+#. TRANS: OAuth exception thrown when no application is found for a given consumer key.
+#: lib/apiauth.php:175
+msgid "No application for that consumer key."
+msgstr ""
+
+#. TRANS: OAuth exception given when an incorrect access token was given for a user.
+#: lib/apiauth.php:212
+msgid "Bad access token."
+msgstr ""
+
+#. TRANS: OAuth exception given when no user was found for a given token (no token was found).
+#: lib/apiauth.php:217
+msgid "No user for that token."
+msgstr ""
+
+#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
+#: lib/apioauthstore.php:178
+msgid "Tried to revoke unknown token"
+msgstr ""
+
+#. TRANS: Exception thrown when an attempt is made to remove a revoked token.
+#: lib/apioauthstore.php:182
+msgid "Failed to delete revoked token"
+msgstr ""
+
 #. TRANS: Form legend.
-#: lib/applicationeditform.php:137
+#: lib/applicationeditform.php:129
 msgid "Edit application"
 msgstr "Rediger program"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:187
+#: lib/applicationeditform.php:178
 msgid "Icon for this application"
 msgstr "Ikon for dette programmet"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:209
+#: lib/applicationeditform.php:200
 #, php-format
 msgid "Describe your application in %d characters"
 msgstr "Beskriv programmet ditt med %d tegn"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:213
+#: lib/applicationeditform.php:204
 msgid "Describe your application"
 msgstr "Beskriv programmet ditt"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:224
+#: lib/applicationeditform.php:215
 msgid "URL of the homepage of this application"
 msgstr "Nettadresse til hjemmesiden for dette programmet"
 
 #. TRANS: Form input field label.
-#: lib/applicationeditform.php:226
+#: lib/applicationeditform.php:217
 msgid "Source URL"
 msgstr "Nettadresse til kilde"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:242
+#: lib/applicationeditform.php:233
 msgid "URL for the homepage of the organization"
 msgstr "URL til organisasjonens hjemmeside"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:251
+#: lib/applicationeditform.php:242
 msgid "URL to redirect to after authentication"
 msgstr ""
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:278
+#: lib/applicationeditform.php:269
 msgid "Browser"
 msgstr "Nettleser"
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:295
+#: lib/applicationeditform.php:286
 msgid "Desktop"
 msgstr "Skrivebord"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:297
+#: lib/applicationeditform.php:288
 msgid "Type of application, browser or desktop"
 msgstr "Type program, nettleser eller skrivebord"
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:320
+#: lib/applicationeditform.php:311
 msgid "Read-only"
 msgstr "Skrivebeskyttet"
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:339
+#: lib/applicationeditform.php:330
 msgid "Read-write"
 msgstr "Les og skriv"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:341
+#: lib/applicationeditform.php:332
 msgid "Default access for this application: read-only, or read-write"
 msgstr ""
 "Standardtilgang for dette programmet: skrivebeskyttet eller lese- og "
 "skrivetilgang"
 
-#. TRANS: Submit button title
-#: lib/applicationeditform.php:359
+#. TRANS: Submit button title.
+#: lib/applicationeditform.php:349
 msgid "Cancel"
 msgstr "Avbryt"
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:136
+#: lib/applicationlist.php:135
 msgid "read-write"
 msgstr "les og skriv"
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:138
+#: lib/applicationlist.php:137
 msgid "read-only"
 msgstr "skrivebeskyttet"
 
 #. 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
+#: lib/applicationlist.php:143
 #, php-format
 msgid "Approved %1$s - \"%2$s\" access."
 msgstr ""
 
 #. TRANS: Button label
-#: lib/applicationlist.php:159
+#: lib/applicationlist.php:158
 msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "Tilbakekall"
@@ -5238,7 +5304,8 @@ msgstr "Forfatter"
 msgid "Provider"
 msgstr "LeverandÃ¸r"
 
-#: lib/attachmentnoticesection.php:67
+#. TRANS: Title.
+#: lib/attachmentnoticesection.php:68
 msgid "Notices where this attachment appears"
 msgstr "Notiser hvor dette vedlegget forekommer"
 
@@ -5250,6 +5317,11 @@ msgstr "Endring av passord mislyktes"
 msgid "Password changing is not allowed"
 msgstr "Endring av passord er ikke tillatt"
 
+#. TRANS: Title for the form to block a user.
+#: lib/blockform.php:70
+msgid "Block"
+msgstr "BlokkÃ©r"
+
 #: lib/channel.php:157 lib/channel.php:177
 msgid "Command results"
 msgstr "Kommandoresultat"
@@ -5262,6 +5334,18 @@ msgstr "Kommando fullfÃ¸rt"
 msgid "Command failed"
 msgstr "Kommando feilet"
 
+#. TRANS: Command exception text shown when a notice ID is requested that does not exist.
+#: lib/command.php:84 lib/command.php:108
+msgid "Notice with that id does not exist."
+msgstr ""
+
+#. TRANS: Message given getting a non-existing user.
+#. TRANS: %s is the nickname of the user that could not be found.
+#: lib/command.php:150
+#, php-format
+msgid "Could not find a local user with nickname %s."
+msgstr ""
+
 #. TRANS: Error text shown when an unimplemented command is given.
 #: lib/command.php:185
 msgid "Sorry, this command is not yet implemented."
@@ -5272,6 +5356,13 @@ msgstr "Beklager, denne kommandoen er ikke implementert ennÃ¥."
 msgid "It does not make a lot of sense to nudge yourself!"
 msgstr "Det gir ikke sÃ¥ mye mening Ã¥ knuffe seg selv."
 
+#. TRANS: Message given having nudged another user.
+#. TRANS: %s is the nickname of the user that was nudged.
+#: lib/command.php:240
+#, php-format
+msgid "Nudge sent to %s."
+msgstr ""
+
 #. TRANS: User statistics text.
 #. TRANS: %1$s is the number of other user the user is subscribed to.
 #. TRANS: %2$s is the number of users that are subscribed to the user.
@@ -5292,6 +5383,20 @@ msgstr ""
 msgid "Notice marked as fave."
 msgstr "Notis markert som favoritt."
 
+#. 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.
+#: lib/command.php:360
+#, php-format
+msgid "%1$s joined group %2$s."
+msgstr ""
+
+#. 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.
+#: lib/command.php:408
+#, php-format
+msgid "%1$s left group %2$s."
+msgstr ""
+
 #. TRANS: Whois output. %s is the full name of the queried user.
 #: lib/command.php:434
 #, php-format
@@ -5343,6 +5448,13 @@ msgstr "Feil ved sending av direktemelding."
 msgid "Error repeating notice."
 msgstr "Feil ved repetering av notis."
 
+#. TRANS: Message given if content of a notice for a reply is too long.
+#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
+#: lib/command.php:592
+#, php-format
+msgid "Notice too long - maximum is %1$d characters, you sent %2$d."
+msgstr ""
+
 #. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
 #: lib/command.php:606
 msgid "Error saving notice."
@@ -5358,12 +5470,26 @@ msgstr ""
 msgid "Can't subscribe to OMB profiles by command."
 msgstr ""
 
+#. TRANS: Text shown after having subscribed to another user successfully.
+#. TRANS: %s is the name of the user the subscription was requested for.
+#: lib/command.php:672
+#, php-format
+msgid "Subscribed to %s."
+msgstr ""
+
 #. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
 #. TRANS: Error text shown when no username was provided when issuing the command.
 #: lib/command.php:694 lib/command.php:804
 msgid "Specify the name of the user to unsubscribe from."
 msgstr ""
 
+#. TRANS: Text shown after having unsubscribed from another user successfully.
+#. TRANS: %s is the name of the user the unsubscription was requested for.
+#: lib/command.php:705
+#, php-format
+msgid "Unsubscribed from %s."
+msgstr ""
+
 #. TRANS: Error text shown when the command "off" fails for an unknown reason.
 #: lib/command.php:731
 msgid "Can't turn off notification."
@@ -5381,8 +5507,15 @@ msgstr ""
 msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr ""
 
+#. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
+#. TRANS: %s is the name of the user the unsubscription was requested for.
+#: lib/command.php:813
+#, php-format
+msgid "Unsubscribed %s."
+msgstr ""
+
 #. TRANS: Text shown after requesting other users a user is subscribed to.
-#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.
 #: lib/command.php:836
 msgid "You are subscribed to this person:"
@@ -5391,7 +5524,7 @@ msgstr[0] "Ikke autorisert."
 msgstr[1] "Ikke autorisert."
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
-#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
 #: lib/command.php:863
 msgid "This person is subscribed to you:"
@@ -5406,7 +5539,7 @@ msgid "You are not a member of any groups."
 msgstr "Du er ikke et medlem av den gruppen."
 
 #. TRANS: Text shown after requesting groups a user is subscribed to.
-#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
 #: lib/command.php:890
 msgid "You are a member of this group:"
@@ -5414,6 +5547,7 @@ msgid_plural "You are a member of these groups:"
 msgstr[0] "Du er allerede logget inn!"
 msgstr[1] "Du er allerede logget inn!"
 
+#. TRANS: Help text for commands.
 #: lib/command.php:905
 msgid ""
 "Commands:\n"
@@ -5512,10 +5646,6 @@ msgstr "Venn av en venn"
 msgid "Export data"
 msgstr "Eksporter data"
 
-#: lib/galleryaction.php:121
-msgid "Filter tags"
-msgstr ""
-
 #: lib/galleryaction.php:131
 msgid "All"
 msgstr "Alle"
@@ -5551,33 +5681,6 @@ msgstr "Beskriv programmet ditt med %d tegn"
 msgid "Extra nicknames for the group, comma- or space- separated, max %d"
 msgstr ""
 
-#: lib/groupnav.php:85
-msgid "Group"
-msgstr "Gruppe"
-
-#: lib/groupnav.php:101
-msgid "Blocked"
-msgstr "Blokkert"
-
-#: lib/groupnav.php:102
-#, php-format
-msgid "%s blocked users"
-msgstr "%s blokkerte brukere"
-
-#: lib/groupnav.php:108
-#, php-format
-msgid "Edit %s group properties"
-msgstr "Rediger %s gruppeegenskaper"
-
-#: lib/groupnav.php:113
-msgid "Logo"
-msgstr "Logo"
-
-#: lib/groupnav.php:114
-#, php-format
-msgid "Add or edit %s logo"
-msgstr "Legg til eller rediger %s logo"
-
 #: lib/groupsbymemberssection.php:71
 msgid "Groups with most members"
 msgstr "Grupper med flest medlemmer"
@@ -5604,7 +5707,8 @@ msgstr "Filen er for stor. Maks filstÃ¸rrelse er %s."
 msgid "Partial upload."
 msgstr "Delvis opplasting."
 
-#: lib/imagefile.php:101 lib/mediafile.php:170
+#. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
+#: lib/imagefile.php:101 lib/mediafile.php:179
 msgid "System error uploading file."
 msgstr "Systemfeil ved opplasting av fil."
 
@@ -5995,54 +6099,60 @@ msgstr "Ikke en registrert bruker."
 msgid "Unsupported message type: %s"
 msgstr "Meldingstypen stÃ¸ttes ikke: %s"
 
-#: lib/mediafile.php:98 lib/mediafile.php:123
+#. TRANS: Client exception thrown when a database error was thrown during a file upload operation.
+#: lib/mediafile.php:99 lib/mediafile.php:125
 msgid "There was a database error while saving your file. Please try again."
 msgstr ""
 
-#: lib/mediafile.php:142
+#. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
+#: lib/mediafile.php:145
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
 msgstr ""
 
-#: lib/mediafile.php:147
+#. TRANS: Client exception.
+#: lib/mediafile.php:151
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form."
 msgstr ""
 
-#: lib/mediafile.php:152
+#. TRANS: Client exception.
+#: lib/mediafile.php:157
 msgid "The uploaded file was only partially uploaded."
 msgstr ""
 
-#: lib/mediafile.php:162
+#. TRANS: Client exception thrown when a temporary folder is not present to store a file upload.
+#: lib/mediafile.php:165
+msgid "Missing a temporary folder."
+msgstr ""
+
+#. TRANS: Client exception thrown when writing to disk is not possible during a file upload operation.
+#: lib/mediafile.php:169
 msgid "Failed to write file to disk."
 msgstr ""
 
-#: lib/mediafile.php:165
+#. TRANS: Client exception thrown when a file upload operation has been stopped by an extension.
+#: lib/mediafile.php:173
 msgid "File upload stopped by extension."
 msgstr "Filopplasting stoppet grunnet filendelse."
 
-#: lib/mediafile.php:179 lib/mediafile.php:217
+#. TRANS: Client exception thrown when a file upload operation would cause a user to exceed a set quota.
+#: lib/mediafile.php:189 lib/mediafile.php:232
 msgid "File exceeds user's quota."
 msgstr "Fil overgÃ¥r brukers kvote."
 
-#: lib/mediafile.php:197 lib/mediafile.php:234
+#. TRANS: Client exception thrown when a file upload operation fails because the file could
+#. TRANS: not be moved from the temporary folder to the permanent file location.
+#: lib/mediafile.php:209 lib/mediafile.php:251
 msgid "File could not be moved to destination directory."
 msgstr "Filen kunne ikke flyttes til mÃ¥lmappen."
 
-#: lib/mediafile.php:202 lib/mediafile.php:238
+#. TRANS: Client exception thrown when a file upload operation has been stopped because the MIME
+#. TRANS: type of the uploaded file could not be determined.
+#: lib/mediafile.php:216 lib/mediafile.php:257
 msgid "Could not determine file's MIME type."
 msgstr "Kunne ikke avgjÃ¸re filens MIME-type."
 
-#: lib/mediafile.php:318
-#, php-format
-msgid " Try using another %s format."
-msgstr "  PrÃ¸v Ã¥ bruke et annet %s-format."
-
-#: lib/mediafile.php:323
-#, php-format
-msgid "%s is not a supported file type on this server."
-msgstr "filtypen %s stÃ¸ttes ikke pÃ¥ denne tjeneren."
-
 #: lib/messageform.php:120
 msgid "Send a direct notice"
 msgstr "Send en direktenotis"
@@ -6154,10 +6264,6 @@ msgstr "Knuff"
 msgid "Send a nudge to this user"
 msgstr "Send et knuff til denne brukeren"
 
-#: lib/oauthstore.php:345
-msgid "Duplicate notice"
-msgstr "Duplikatnotis"
-
 #: lib/personalgroupnav.php:99
 msgid "Personal"
 msgstr "Personlig"
@@ -6186,12 +6292,8 @@ msgstr "Utboks"
 msgid "Your sent messages"
 msgstr "Dine sendte meldinger"
 
-#: lib/personaltagcloudsection.php:56
-#, php-format
-msgid "Tags in %s's notices"
-msgstr ""
-
-#: lib/plugin.php:115
+#. TRANS: Displayed as version information for a plugin if no version information was found.
+#: lib/plugin.php:116
 msgid "Unknown"
 msgstr "Ukjent"
 
@@ -6240,10 +6342,6 @@ msgstr "Offentlig"
 msgid "User groups"
 msgstr "Brukergrupper"
 
-#: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85
-msgid "Recent tags"
-msgstr ""
-
 #: lib/repeatform.php:107
 msgid "Repeat this notice?"
 msgstr "Repeter denne notisen?"
@@ -6264,19 +6362,19 @@ msgstr ""
 msgid "Sandbox this user"
 msgstr "Opphev blokkering av denne brukeren"
 
-#: lib/searchaction.php:120
+#. TRANS: Fieldset legend for the search form.
+#: lib/searchaction.php:121
 msgid "Search site"
 msgstr "SÃ¸k nettsted"
 
-#: lib/searchaction.php:126
+#. TRANS: Used as a field label for the field where one or more keywords
+#. TRANS: for searching can be entered.
+#: lib/searchaction.php:129
 msgid "Keyword(s)"
 msgstr "NÃ¸kkelord"
 
-#: lib/searchaction.php:127
-msgid "Search"
-msgstr "SÃ¸k"
-
-#: lib/searchaction.php:162
+#. TRANS: Definition list item with instructions on how to get (better) search results.
+#: lib/searchaction.php:170
 msgid "Search help"
 msgstr "SÃ¸kehjelp"
 
@@ -6367,10 +6465,18 @@ msgstr ""
 msgid "Top posters"
 msgstr ""
 
+#: lib/unsandboxform.php:69
+msgid "Unsandbox"
+msgstr ""
+
 #: lib/unsandboxform.php:80
 msgid "Unsandbox this user"
 msgstr "Opphev blokkering av denne brukeren"
 
+#: lib/unsilenceform.php:67
+msgid "Unsilence"
+msgstr ""
+
 #: lib/unsilenceform.php:78
 msgid "Unsilence this user"
 msgstr "Opphev blokkering av denne brukeren"
@@ -6414,56 +6520,32 @@ msgid "Moderator"
 msgstr "Moderator"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1102
+#: lib/util.php:1103
 msgid "a few seconds ago"
 msgstr "noen fÃ¥ sekunder siden"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1105
+#: lib/util.php:1106
 msgid "about a minute ago"
 msgstr "omtrent ett minutt siden"
 
-#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1109
-#, php-format
-msgid "about %d minutes ago"
-msgstr "omtrent %d minutter siden"
-
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 #: lib/util.php:1112
 msgid "about an hour ago"
 msgstr "omtrent Ã©n time siden"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1116
-#, php-format
-msgid "about %d hours ago"
-msgstr "omtrent %d timer siden"
-
-#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1119
+#: lib/util.php:1118
 msgid "about a day ago"
 msgstr "omtrent Ã©n dag siden"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1123
-#, php-format
-msgid "about %d days ago"
-msgstr "omtrent %d dager siden"
-
-#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1126
+#: lib/util.php:1124
 msgid "about a month ago"
 msgstr "omtrent Ã©n mÃ¥ned siden"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 #: lib/util.php:1130
-#, php-format
-msgid "about %d months ago"
-msgstr "omtrent %d mÃ¥neder siden"
-
-#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1133
 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 9afcea4bfa..d34cc5e1db 100644
--- a/locale/nl/LC_MESSAGES/statusnet.po
+++ b/locale/nl/LC_MESSAGES/statusnet.po
@@ -1,9 +1,10 @@
-# Translation of StatusNet to Dutch
+# Translation of StatusNet to Dutch (Nederlands)
+# Expored from translatewiki.net
 #
-# Author@translatewiki.net: Brion
-# Author@translatewiki.net: Itavero
-# Author@translatewiki.net: McDutchie
-# Author@translatewiki.net: Siebrand
+# Author: Brion
+# Author: Itavero
+# Author: McDutchie
+# Author: Siebrand
 # --
 # This file is distributed under the same license as the StatusNet package.
 #
@@ -11,20 +12,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-08 22:33+0000\n"
-"PO-Revision-Date: 2010-09-08 22:35:11+0000\n"
-"Language-Team: Dutch\n"
+"POT-Creation-Date: 2010-09-14 19:53+0000\n"
+"PO-Revision-Date: 2010-09-14 19:54:13+0000\n"
+"Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r72348); Translate extension (2010-08-20)\n"
+"X-Generator: MediaWiki 1.17alpha (r73009); Translate extension (2010-08-20)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
-"X-Message-Group: out-statusnet\n"
+"X-Message-Group: #out-statusnet\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-POT-Import-Date: 1284-49-16 34::+0000\n"
 
 #. TRANS: Page title
 #. TRANS: Menu item for site administration
-#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:376
+#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:363
 msgid "Access"
 msgstr "Toegang"
 
@@ -77,10 +79,10 @@ 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 actions/emailsettings.php:224
-#: actions/imsettings.php:184 actions/smssettings.php:209
-#: lib/applicationeditform.php:361
+#. TRANS: Button label in the "Edit application" form.
+#: actions/accessadminpanel.php:203 actions/emailsettings.php:228
+#: actions/imsettings.php:187 actions/smssettings.php:209
+#: lib/applicationeditform.php:351
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Opslaan"
@@ -93,15 +95,15 @@ msgstr "Deze pagina bestaat niet."
 
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #: actions/all.php:79 actions/allrss.php:68
-#: actions/apiaccountupdatedeliverydevice.php:114
-#: actions/apiaccountupdateprofile.php:105
-#: actions/apiaccountupdateprofilebackgroundimage.php:116
-#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
-#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
-#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:113
-#: actions/apigroupismember.php:91 actions/apigroupjoin.php:100
-#: actions/apigroupleave.php:100 actions/apigrouplist.php:73
-#: actions/apistatusesupdate.php:229 actions/apisubscriptions.php:87
+#: actions/apiaccountupdatedeliverydevice.php:115
+#: actions/apiaccountupdateprofile.php:106
+#: actions/apiaccountupdateprofilebackgroundimage.php:117
+#: actions/apiaccountupdateprofileimage.php:106 actions/apiblockcreate.php:98
+#: actions/apiblockdestroy.php:97 actions/apidirectmessage.php:77
+#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:114
+#: actions/apigroupismember.php:91 actions/apigroupjoin.php:101
+#: actions/apigroupleave.php:101 actions/apigrouplist.php:73
+#: actions/apistatusesupdate.php:230 actions/apisubscriptions.php:87
 #: actions/apitimelinefavorites.php:72 actions/apitimelinefriends.php:174
 #: actions/apitimelinehome.php:80 actions/apitimelinementions.php:80
 #: actions/apitimelineuser.php:82 actions/avatarbynickname.php:75
@@ -202,16 +204,16 @@ msgid "Updates from %1$s and friends on %2$s!"
 msgstr "Updates van %1$s en vrienden op %2$s."
 
 #: actions/apiaccountratelimitstatus.php:72
-#: actions/apiaccountupdatedeliverydevice.php:94
-#: actions/apiaccountupdateprofile.php:97
-#: actions/apiaccountupdateprofilebackgroundimage.php:94
-#: actions/apiaccountupdateprofilecolors.php:118
+#: actions/apiaccountupdatedeliverydevice.php:95
+#: actions/apiaccountupdateprofile.php:98
+#: actions/apiaccountupdateprofilebackgroundimage.php:95
+#: actions/apiaccountupdateprofilecolors.php:119
 #: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156
-#: actions/apifavoritecreate.php:100 actions/apifavoritedestroy.php:101
-#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100
-#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:139
-#: actions/apigroupismember.php:115 actions/apigroupjoin.php:156
-#: actions/apigroupleave.php:142 actions/apigrouplist.php:137
+#: actions/apifavoritecreate.php:101 actions/apifavoritedestroy.php:102
+#: actions/apifriendshipscreate.php:101 actions/apifriendshipsdestroy.php:101
+#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:140
+#: actions/apigroupismember.php:115 actions/apigroupjoin.php:157
+#: actions/apigroupleave.php:143 actions/apigrouplist.php:137
 #: actions/apigrouplistall.php:122 actions/apigroupmembership.php:107
 #: actions/apigroupshow.php:116 actions/apihelptest.php:88
 #: actions/apistatusesdestroy.php:104 actions/apistatusesretweets.php:112
@@ -226,21 +228,23 @@ msgstr "Updates van %1$s en vrienden op %2$s."
 msgid "API method not found."
 msgstr "De API-functie is niet aangetroffen."
 
-#: actions/apiaccountupdatedeliverydevice.php:86
-#: actions/apiaccountupdateprofile.php:89
-#: actions/apiaccountupdateprofilebackgroundimage.php:86
-#: actions/apiaccountupdateprofilecolors.php:110
-#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89
-#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109
-#: actions/apifavoritecreate.php:91 actions/apifavoritedestroy.php:92
-#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
-#: actions/apigroupcreate.php:105 actions/apigroupjoin.php:92
-#: actions/apigroupleave.php:92 actions/apimediaupload.php:67
-#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:198
+#. TRANS: Client error message. POST is a HTTP command. It should not be translated.
+#. TRANS: Client error. POST is a HTTP command. It should not be translated.
+#: actions/apiaccountupdatedeliverydevice.php:87
+#: actions/apiaccountupdateprofile.php:90
+#: actions/apiaccountupdateprofilebackgroundimage.php:87
+#: actions/apiaccountupdateprofilecolors.php:111
+#: actions/apiaccountupdateprofileimage.php:85 actions/apiblockcreate.php:90
+#: actions/apiblockdestroy.php:89 actions/apidirectmessagenew.php:110
+#: actions/apifavoritecreate.php:92 actions/apifavoritedestroy.php:93
+#: actions/apifriendshipscreate.php:92 actions/apifriendshipsdestroy.php:92
+#: actions/apigroupcreate.php:106 actions/apigroupjoin.php:93
+#: actions/apigroupleave.php:93 actions/apimediaupload.php:68
+#: actions/apistatusesretweet.php:66 actions/apistatusesupdate.php:199
 msgid "This method requires a POST."
 msgstr "Deze methode vereist een POST."
 
-#: actions/apiaccountupdatedeliverydevice.php:106
+#: actions/apiaccountupdatedeliverydevice.php:107
 msgid ""
 "You must specify a parameter named 'device' with a value of one of: sms, im, "
 "none."
@@ -248,27 +252,27 @@ msgstr ""
 "U moet een parameter met de naam \"device\" opgeven met een van de volgende "
 "waardes: sms, im, none."
 
-#: actions/apiaccountupdatedeliverydevice.php:133
+#: actions/apiaccountupdatedeliverydevice.php:134
 msgid "Could not update user."
 msgstr "Het was niet mogelijk de gebruiker bij te werken."
 
-#: actions/apiaccountupdateprofile.php:112
-#: actions/apiaccountupdateprofilebackgroundimage.php:194
-#: actions/apiaccountupdateprofilecolors.php:185
-#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/apiaccountupdateprofile.php:113
+#: actions/apiaccountupdateprofilebackgroundimage.php:195
+#: actions/apiaccountupdateprofilecolors.php:186
+#: actions/apiaccountupdateprofileimage.php:131 actions/apiusershow.php:108
 #: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/hcard.php:74
 #: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
 #: lib/profileaction.php:84
 msgid "User has no profile."
 msgstr "Deze gebruiker heeft geen profiel."
 
-#: actions/apiaccountupdateprofile.php:147
+#: actions/apiaccountupdateprofile.php:148
 msgid "Could not save profile."
 msgstr "Het was niet mogelijk het profiel op te slaan."
 
-#: actions/apiaccountupdateprofilebackgroundimage.php:108
-#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
-#: actions/apistatusesupdate.php:212 actions/avatarsettings.php:257
+#: actions/apiaccountupdateprofilebackgroundimage.php:109
+#: actions/apiaccountupdateprofileimage.php:98 actions/apimediaupload.php:81
+#: actions/apistatusesupdate.php:213 actions/avatarsettings.php:257
 #: actions/designadminpanel.php:123 actions/editapplication.php:118
 #: actions/newapplication.php:101 actions/newnotice.php:94
 #: lib/designsettings.php:283
@@ -280,30 +284,30 @@ msgstr ""
 "De server was niet in staat zoveel POST-gegevens te verwerken (%s bytes) "
 "vanwege de huidige instellingen."
 
-#: actions/apiaccountupdateprofilebackgroundimage.php:136
-#: actions/apiaccountupdateprofilebackgroundimage.php:146
-#: actions/apiaccountupdateprofilecolors.php:164
-#: actions/apiaccountupdateprofilecolors.php:174
+#: actions/apiaccountupdateprofilebackgroundimage.php:137
+#: actions/apiaccountupdateprofilebackgroundimage.php:147
+#: actions/apiaccountupdateprofilecolors.php:165
+#: actions/apiaccountupdateprofilecolors.php:175
 #: actions/groupdesignsettings.php:290 actions/groupdesignsettings.php:300
 #: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
 #: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
 msgid "Unable to save your design settings."
 msgstr "Het was niet mogelijk om uw ontwerpinstellingen op te slaan."
 
-#: actions/apiaccountupdateprofilebackgroundimage.php:187
-#: actions/apiaccountupdateprofilecolors.php:142
+#: actions/apiaccountupdateprofilebackgroundimage.php:188
+#: actions/apiaccountupdateprofilecolors.php:143
 msgid "Could not update your design."
 msgstr "Het was niet mogelijk uw ontwerp bij te werken."
 
-#: actions/apiblockcreate.php:105
+#: actions/apiblockcreate.php:106
 msgid "You cannot block yourself!"
 msgstr "U kunt zichzelf niet blokkeren!"
 
-#: actions/apiblockcreate.php:126
+#: actions/apiblockcreate.php:127
 msgid "Block user failed."
 msgstr "Het blokkeren van de gebruiker is mislukt."
 
-#: actions/apiblockdestroy.php:114
+#: actions/apiblockdestroy.php:115
 msgid "Unblock user failed."
 msgstr "Het deblokkeren van de gebruiker is mislukt."
 
@@ -327,64 +331,64 @@ msgstr "PrivÃ©berichten aan %s"
 msgid "All the direct messages sent to %s"
 msgstr "Alle privÃ©berichten aan %s"
 
-#: actions/apidirectmessagenew.php:118
+#: actions/apidirectmessagenew.php:119
 msgid "No message text!"
 msgstr "Het bericht is leeg!"
 
-#: actions/apidirectmessagenew.php:127 actions/newmessage.php:150
+#: actions/apidirectmessagenew.php:128 actions/newmessage.php:150
 #, php-format
 msgid "That's too long. Max message size is %d chars."
 msgstr "Dat is te lang. De maximale berichtlengte is %d tekens."
 
-#: actions/apidirectmessagenew.php:138
+#: actions/apidirectmessagenew.php:139
 msgid "Recipient user not found."
 msgstr "De ontvanger is niet aangetroffen."
 
-#: actions/apidirectmessagenew.php:142
+#: actions/apidirectmessagenew.php:143
 msgid "Can't send direct messages to users who aren't your friend."
 msgstr ""
 "U kunt geen privÃ©berichten sturen aan gebruikers die niet op uw "
 "vriendenlijst staan."
 
-#: actions/apifavoritecreate.php:109 actions/apifavoritedestroy.php:110
+#: actions/apifavoritecreate.php:110 actions/apifavoritedestroy.php:111
 #: actions/apistatusesdestroy.php:121
 msgid "No status found with that ID."
 msgstr "Er is geen status gevonden met dit ID."
 
-#: actions/apifavoritecreate.php:120
+#: actions/apifavoritecreate.php:121
 msgid "This status is already a favorite."
 msgstr "Deze mededeling staat al in uw favorietenlijst."
 
 #. TRANS: Error message text shown when a favorite could not be set.
-#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:296
+#: actions/apifavoritecreate.php:132 actions/favor.php:84 lib/command.php:296
 msgid "Could not create favorite."
 msgstr "Het was niet mogelijk een favoriet aan te maken."
 
-#: actions/apifavoritedestroy.php:123
+#: actions/apifavoritedestroy.php:124
 msgid "That status is not a favorite."
 msgstr "Deze mededeling staat niet in uw favorietenlijst."
 
-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
+#: actions/apifavoritedestroy.php:136 actions/disfavor.php:87
 msgid "Could not delete favorite."
 msgstr ""
 "Het was niet mogelijk deze mededeling van uw favorietenlijst te verwijderen."
 
-#: actions/apifriendshipscreate.php:109
+#: actions/apifriendshipscreate.php:110
 msgid "Could not follow user: profile not found."
 msgstr "U kunt deze gebruiker niet volgen, omdat deze niet bestaat."
 
-#: actions/apifriendshipscreate.php:118
+#: actions/apifriendshipscreate.php:119
 #, php-format
 msgid "Could not follow user: %s is already on your list."
 msgstr "U kunt de gebruiker %s niet volgen, omdat deze al op uw lijst staat."
 
-#: actions/apifriendshipsdestroy.php:109
+#: actions/apifriendshipsdestroy.php:110
 msgid "Could not unfollow user: User not found."
 msgstr ""
 "Het is niet mogelijk deze gebruiker niet langer te volgen: de gebruiker is "
 "niet aangetroffen."
 
-#: actions/apifriendshipsdestroy.php:120
+#: actions/apifriendshipsdestroy.php:121
 msgid "You cannot unfollow yourself."
 msgstr "U kunt het abonnement op uzelf niet opzeggen."
 
@@ -401,7 +405,7 @@ msgstr "Het was niet mogelijk de brongebruiker te bepalen."
 msgid "Could not find target user."
 msgstr "Het was niet mogelijk de doelgebruiker te vinden."
 
-#: actions/apigroupcreate.php:167 actions/editgroup.php:186
+#: actions/apigroupcreate.php:168 actions/editgroup.php:186
 #: actions/newgroup.php:126 actions/profilesettings.php:215
 #: actions/register.php:212
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
@@ -409,96 +413,96 @@ msgstr ""
 "De gebruikersnaam mag alleen kleine letters en cijfers bevatten. Spaties "
 "zijn niet toegestaan."
 
-#: actions/apigroupcreate.php:176 actions/editgroup.php:190
+#: actions/apigroupcreate.php:177 actions/editgroup.php:190
 #: actions/newgroup.php:130 actions/profilesettings.php:238
 #: actions/register.php:215
 msgid "Nickname already in use. Try another one."
 msgstr ""
 "De opgegeven gebruikersnaam is al in gebruik. Kies een andere gebruikersnaam."
 
-#: actions/apigroupcreate.php:183 actions/editgroup.php:193
+#: actions/apigroupcreate.php:184 actions/editgroup.php:193
 #: actions/newgroup.php:133 actions/profilesettings.php:218
 #: actions/register.php:217
 msgid "Not a valid nickname."
 msgstr "Ongeldige gebruikersnaam!"
 
-#: actions/apigroupcreate.php:199 actions/editapplication.php:215
+#: actions/apigroupcreate.php:200 actions/editapplication.php:215
 #: actions/editgroup.php:199 actions/newapplication.php:203
 #: actions/newgroup.php:139 actions/profilesettings.php:222
 #: actions/register.php:224
 msgid "Homepage is not a valid URL."
 msgstr "De thuispagina is geen geldige URL."
 
-#: actions/apigroupcreate.php:208 actions/editgroup.php:202
+#: actions/apigroupcreate.php:209 actions/editgroup.php:202
 #: actions/newgroup.php:142 actions/profilesettings.php:225
 #: actions/register.php:227
 msgid "Full name is too long (max 255 chars)."
 msgstr "De volledige naam is te lang (maximaal 255 tekens)."
 
-#: actions/apigroupcreate.php:216 actions/editapplication.php:190
+#: actions/apigroupcreate.php:217 actions/editapplication.php:190
 #: actions/newapplication.php:172
 #, php-format
 msgid "Description is too long (max %d chars)."
 msgstr "De beschrijving is te lang (maximaal %d tekens)."
 
-#: actions/apigroupcreate.php:227 actions/editgroup.php:208
+#: actions/apigroupcreate.php:228 actions/editgroup.php:208
 #: actions/newgroup.php:148 actions/profilesettings.php:232
 #: actions/register.php:234
 msgid "Location is too long (max 255 chars)."
 msgstr "Locatie is te lang (maximaal 255 tekens)."
 
-#: actions/apigroupcreate.php:246 actions/editgroup.php:219
+#: actions/apigroupcreate.php:247 actions/editgroup.php:219
 #: actions/newgroup.php:159
 #, php-format
 msgid "Too many aliases! Maximum %d."
 msgstr "Te veel aliassen! Het maximale aantal is %d."
 
-#: actions/apigroupcreate.php:267
+#: actions/apigroupcreate.php:268
 #, php-format
 msgid "Invalid alias: \"%s\"."
 msgstr "Ongeldige alias: \"%s\"."
 
-#: actions/apigroupcreate.php:276 actions/editgroup.php:232
+#: actions/apigroupcreate.php:277 actions/editgroup.php:232
 #: actions/newgroup.php:172
 #, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr "De alias \"%s\" wordt al gebruikt. Geef een andere alias op."
 
-#: actions/apigroupcreate.php:289 actions/editgroup.php:238
+#: actions/apigroupcreate.php:290 actions/editgroup.php:238
 #: actions/newgroup.php:178
 msgid "Alias can't be the same as nickname."
 msgstr "Een alias kan niet hetzelfde zijn als de gebruikersnaam."
 
-#: actions/apigroupismember.php:96 actions/apigroupjoin.php:105
-#: actions/apigroupleave.php:105 actions/apigroupmembership.php:92
+#: actions/apigroupismember.php:96 actions/apigroupjoin.php:106
+#: actions/apigroupleave.php:106 actions/apigroupmembership.php:92
 #: actions/apigroupshow.php:83 actions/apitimelinegroup.php:92
 msgid "Group not found."
 msgstr "De groep is niet aangetroffen."
 
 #. TRANS: Error text shown a user tries to join a group they already are a member of.
-#: actions/apigroupjoin.php:111 actions/joingroup.php:100 lib/command.php:336
+#: actions/apigroupjoin.php:112 actions/joingroup.php:100 lib/command.php:336
 msgid "You are already a member of that group."
 msgstr "U bent al lid van die groep."
 
 #. TRANS: Error text shown when a user tries to join a group they are blocked from joining.
-#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:341
+#: actions/apigroupjoin.php:121 actions/joingroup.php:105 lib/command.php:341
 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."
 
 #. 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.
-#: actions/apigroupjoin.php:139 actions/joingroup.php:134 lib/command.php:353
+#: actions/apigroupjoin.php:140 actions/joingroup.php:134 lib/command.php:353
 #, 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."
 
-#: actions/apigroupleave.php:115
+#: actions/apigroupleave.php:116
 msgid "You are not a member of this group."
 msgstr "U bent geen lid van deze groep."
 
 #. 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.
-#: actions/apigroupleave.php:125 actions/leavegroup.php:129
+#: actions/apigroupleave.php:126 actions/leavegroup.php:129
 #: lib/command.php:401
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
@@ -528,7 +532,7 @@ msgstr "%s groepen"
 msgid "groups on %s"
 msgstr "groepen op %s"
 
-#: actions/apimediaupload.php:99
+#: actions/apimediaupload.php:100
 msgid "Upload failed."
 msgstr "Uploaden is mislukt."
 
@@ -542,9 +546,9 @@ msgstr "Ongeldig token."
 
 #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
 #: actions/deletenotice.php:169 actions/disfavor.php:74
-#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:55
+#: actions/emailsettings.php:271 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:66 actions/imsettings.php:227
+#: actions/groupunblock.php:66 actions/imsettings.php:230
 #: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
@@ -595,8 +599,8 @@ msgstr "Het verzoektoken %s is geweigerd en ingetrokken."
 #. 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:286 actions/grouplogo.php:322
-#: actions/imsettings.php:242 actions/newapplication.php:121
+#: actions/emailsettings.php:290 actions/grouplogo.php:322
+#: actions/imsettings.php:245 actions/newapplication.php:121
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
 #: actions/smssettings.php:277 lib/designsettings.php:304
 msgid "Unexpected form submission."
@@ -660,18 +664,18 @@ msgstr "Deze methode vereist een POST of DELETE."
 msgid "You may not delete another user's status."
 msgstr "U kunt de status van een andere gebruiker niet verwijderen."
 
-#: actions/apistatusesretweet.php:75 actions/apistatusesretweets.php:72
+#: actions/apistatusesretweet.php:76 actions/apistatusesretweets.php:72
 #: actions/deletenotice.php:52 actions/shownotice.php:92
 msgid "No such notice."
 msgstr "De mededeling bestaat niet."
 
 #. TRANS: Error text shown when trying to repeat an own notice.
-#: actions/apistatusesretweet.php:83 lib/command.php:538
+#: actions/apistatusesretweet.php:84 lib/command.php:538
 msgid "Cannot repeat your own notice."
 msgstr "U kunt uw eigen mededeling niet herhalen."
 
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-#: actions/apistatusesretweet.php:91 lib/command.php:544
+#: actions/apistatusesretweet.php:92 lib/command.php:544
 msgid "Already repeated that notice."
 msgstr "U hebt die mededeling al herhaald."
 
@@ -683,21 +687,21 @@ msgstr "De status is verwijderd."
 msgid "No status with that ID found."
 msgstr "Er is geen status gevonden met dit ID."
 
-#: actions/apistatusesupdate.php:221
+#: actions/apistatusesupdate.php:222
 msgid "Client must provide a 'status' parameter with a value."
 msgstr "De client moet een parameter \"status\" met een waarde opgeven."
 
-#: actions/apistatusesupdate.php:242 actions/newnotice.php:157
+#: actions/apistatusesupdate.php:243 actions/newnotice.php:157
 #: lib/mailhandler.php:60
 #, php-format
 msgid "That's too long. Max notice size is %d chars."
 msgstr "De mededeling is te lang. Gebruik maximaal %d tekens."
 
-#: actions/apistatusesupdate.php:283 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:284 actions/apiusershow.php:96
 msgid "Not found."
 msgstr "Niet aangetroffen."
 
-#: actions/apistatusesupdate.php:306 actions/newnotice.php:181
+#: actions/apistatusesupdate.php:307 actions/newnotice.php:181
 #, php-format
 msgid "Max notice size is %d chars, including attachment URL."
 msgstr ""
@@ -901,7 +905,9 @@ msgid "Yes"
 msgstr "Ja"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
+#. TRANS: Submit button title.
+#. TRANS: Description of the form to block a user.
+#: actions/block.php:164 actions/groupmembers.php:403 lib/blockform.php:82
 msgid "Block this user"
 msgstr "Deze gebruiker blokkeren"
 
@@ -943,11 +949,13 @@ msgstr "Een lijst met voor deze groep geblokkeerde gebruikers."
 msgid "Unblock user from group"
 msgstr "Deze gebruiker weer toegang geven tot de groep"
 
-#: actions/blockedfromgroup.php:320 lib/unblockform.php:69
+#. TRANS: Title for the form to unblock a user.
+#: actions/blockedfromgroup.php:320 lib/unblockform.php:70
 msgid "Unblock"
 msgstr "Deblokkeer"
 
-#: actions/blockedfromgroup.php:320 lib/unblockform.php:80
+#. TRANS: Description of the form to unblock a user.
+#: actions/blockedfromgroup.php:320 lib/unblockform.php:82
 msgid "Unblock this user"
 msgstr "Deblokkeer deze gebruiker."
 
@@ -986,9 +994,9 @@ msgstr "Dit adres is al bevestigd."
 #. 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/confirmaddress.php:116 actions/emailsettings.php:331
+#: actions/emailsettings.php:477 actions/imsettings.php:283
+#: actions/imsettings.php:442 actions/othersettings.php:174
 #: actions/profilesettings.php:283 actions/smssettings.php:308
 #: actions/smssettings.php:464
 msgid "Couldn't update user."
@@ -996,7 +1004,7 @@ msgstr "De gebruiker kon gebruiker niet bijwerkt worden."
 
 #. 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/confirmaddress.php:128 actions/emailsettings.php:437
 #: actions/smssettings.php:422
 msgid "Couldn't delete email confirmation."
 msgstr "De e-mailbevestiging kon niet verwijderd worden."
@@ -1032,9 +1040,10 @@ msgstr "De applicatie is niet gevonden."
 msgid "You are not the owner of this application."
 msgstr "U bent niet de eigenaar van deze applicatie."
 
+#. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:127
 #: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1307
+#: lib/action.php:1315
 msgid "There was a problem with your session token."
 msgstr "Er is een probleem met uw sessietoken."
 
@@ -1068,7 +1077,7 @@ msgstr "Deze applicatie verwijderen"
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
 #: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:73 lib/profileformaction.php:64
+#: lib/adminpanelaction.php:71 lib/profileformaction.php:64
 #: lib/settingsaction.php:72
 msgid "Not logged in."
 msgstr "Niet aangemeld."
@@ -1132,7 +1141,6 @@ msgstr "Gebruiker verwijderen"
 #. TRANS: Message used as title for design settings for the site.
 #. TRANS: Link description in user account settings menu.
 #: actions/designadminpanel.php:63 lib/accountsettingsaction.php:139
-#: lib/groupnav.php:119
 msgid "Design"
 msgstr "Uiterlijk"
 
@@ -1253,13 +1261,13 @@ msgstr "Standaardontwerp toepassen"
 msgid "Reset back to default"
 msgstr "Standaardinstellingen toepassen"
 
-#. TRANS: Submit button title
+#. TRANS: Submit button title.
 #: actions/designadminpanel.php:685 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/snapshotadminpanel.php:245
 #: actions/subscriptions.php:226 actions/tagother.php:154
-#: actions/useradminpanel.php:294 lib/applicationeditform.php:363
+#: actions/useradminpanel.php:294 lib/applicationeditform.php:353
 #: lib/designsettings.php:256 lib/groupeditform.php:202
 msgid "Save"
 msgstr "Opslaan"
@@ -1415,7 +1423,7 @@ msgstr "Huidige bevestigde e-mailadres"
 #. 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/emailsettings.php:115 actions/emailsettings.php:162
 #: actions/imsettings.php:116 actions/smssettings.php:124
 #: actions/smssettings.php:180
 msgctxt "BUTTON"
@@ -1433,22 +1441,26 @@ msgstr ""
 #. 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
+#. TRANS: Button label in the "Edit application" form.
 #: actions/emailsettings.php:127 actions/imsettings.php:131
-#: actions/smssettings.php:137 lib/applicationeditform.php:357
+#: actions/smssettings.php:137 lib/applicationeditform.php:347
 msgctxt "BUTTON"
 msgid "Cancel"
 msgstr "Annuleren"
 
-#. TRANS: Instructions for e-mail address input form.
-#: actions/emailsettings.php:135
+#. TRANS: Instructions for e-mail address input form. Do not translate
+#. TRANS: "example.org". It is one of the domain names reserved for
+#. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
+#. TRANS: Any other domain may be owned by a legitimate person or
+#. TRANS: organization.
+#: actions/emailsettings.php:139
 msgid "Email address, like \"UserName@example.org\""
 msgstr "E-mailadres, zoals \"gebruikersnaam@example.org\""
 
 #. 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/emailsettings.php:143 actions/imsettings.php:151
 #: actions/smssettings.php:162
 msgctxt "BUTTON"
 msgid "Add"
@@ -1456,19 +1468,19 @@ msgstr "Toevoegen"
 
 #. 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
+#: actions/emailsettings.php:151 actions/smssettings.php:171
 msgid "Incoming email"
 msgstr "Inkomende e-mail"
 
 #. 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
+#: actions/emailsettings.php:159 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"
 
 #. 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
+#: actions/emailsettings.php:168 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 "
@@ -1476,92 +1488,92 @@ msgstr ""
 
 #. 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
+#: actions/emailsettings.php:172 actions/smssettings.php:189
 msgctxt "BUTTON"
 msgid "New"
 msgstr "Nieuw"
 
 #. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:174
+#: actions/emailsettings.php:178
 msgid "Email preferences"
 msgstr "E-mailvoorkeuren"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:180
+#: actions/emailsettings.php:184
 msgid "Send me notices of new subscriptions through email."
 msgstr "Mij e-mailen bij nieuwe abonnementen."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:186
+#: actions/emailsettings.php:190
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr "Mij e-mailen als iemand mijn mededeling als favoriet instelt."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:193
+#: actions/emailsettings.php:197
 msgid "Send me email when someone sends me a private message."
 msgstr "Mij e-mailen als iemand mij een privÃ©bericht zendt."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:199
+#: actions/emailsettings.php:203
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr "Mij e-mailen als iemand mij een antwoord met \"@\" erin stuurt."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:205
+#: actions/emailsettings.php:209
 msgid "Allow friends to nudge me and send me an email."
 msgstr "Vrienden mogen me porren en e-mailen."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:212
+#: actions/emailsettings.php:216
 msgid "I want to post notices by email."
 msgstr "Ik wil mededelingen per e-mail plaatsen."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:219
+#: actions/emailsettings.php:223
 msgid "Publish a MicroID for my email address."
 msgstr "Een MicroID voor mijn e-mailadres publiceren."
 
 #. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:334
+#: actions/emailsettings.php:338
 msgid "Email preferences saved."
 msgstr "De e-mailvoorkeuren zijn opgeslagen."
 
 #. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:353
+#: actions/emailsettings.php:357
 msgid "No email address."
 msgstr "Geen e-mailadres"
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:361
+#: actions/emailsettings.php:365
 msgid "Cannot normalize that email address"
 msgstr "Kan het emailadres niet normaliseren"
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:208
+#: actions/emailsettings.php:370 actions/register.php:208
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "Geen geldig e-mailadres."
 
 #. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:370
+#: actions/emailsettings.php:374
 msgid "That is already your email address."
 msgstr "U hebt dit e-mailadres als ingesteld als uw e-mailadres."
 
 #. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:374
+#: actions/emailsettings.php:378
 msgid "That email address already belongs to another user."
 msgstr "Dit e-mailadres is al geregistreerd door een andere gebruiker."
 
 #. 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/emailsettings.php:395 actions/imsettings.php:351
 #: actions/smssettings.php:373
 msgid "Couldn't insert confirmation code."
 msgstr "De bevestigingscode kon niet ingevoegd worden."
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:398
+#: actions/emailsettings.php:402
 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."
@@ -1573,50 +1585,50 @@ msgstr ""
 #. 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/emailsettings.php:423 actions/imsettings.php:386
 #: actions/smssettings.php:408
 msgid "No pending confirmation to cancel."
 msgstr "Er is geen openstaand bevestigingsverzoek om te annuleren."
 
 #. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:424
+#: actions/emailsettings.php:428
 msgid "That is the wrong email address."
 msgstr "Dat is het verkeerde e-mailadres."
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:438
+#: actions/emailsettings.php:442
 msgid "Email confirmation cancelled."
 msgstr "E-mailbevestiging geannuleerd."
 
 #. TRANS: Message given trying to remove an e-mail address that is not
 #. TRANS: registered for the active user.
-#: actions/emailsettings.php:458
+#: actions/emailsettings.php:462
 msgid "That is not your email address."
 msgstr "Dit is niet uw e-mailadres."
 
 #. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:479
+#: actions/emailsettings.php:483
 msgid "The email address was removed."
 msgstr "Het e-mailadres is verwijderd."
 
-#: actions/emailsettings.php:493 actions/smssettings.php:568
+#: actions/emailsettings.php:497 actions/smssettings.php:568
 msgid "No incoming email address."
 msgstr "Geen binnenkomend e-mailadres"
 
 #. 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/emailsettings.php:508 actions/emailsettings.php:532
 #: actions/smssettings.php:578 actions/smssettings.php:602
 msgid "Couldn't update user record."
 msgstr "Kan de gebruikersgegevens niet vernieuwen"
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
-#: actions/emailsettings.php:508 actions/smssettings.php:581
+#: actions/emailsettings.php:512 actions/smssettings.php:581
 msgid "Incoming email address removed."
 msgstr "Het e-mailadres voor inkomende mail is verwijderd."
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
-#: actions/emailsettings.php:532 actions/smssettings.php:605
+#: actions/emailsettings.php:536 actions/smssettings.php:605
 msgid "New incoming email address added."
 msgstr "Het nieuwe binnenkomende e-mailadres is toegevoegd."
 
@@ -1739,7 +1751,7 @@ msgid "Remote service uses unknown version of OMB protocol."
 msgstr ""
 "De diensten op afstand gebruiken een onbekende versie van het OMB-protocol."
 
-#: actions/finishremotesubscribe.php:138
+#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306
 msgid "Error updating remote profile."
 msgstr ""
 "Er is een fout opgetreden tijdens het bijwerken van het profiel op afstand."
@@ -1797,7 +1809,7 @@ msgstr "Deze gebruiker is al de toegang tot de groep ontzegd."
 msgid "User is not a member of group."
 msgstr "De gebruiker is geen lid van de groep."
 
-#: actions/groupblock.php:134 actions/groupmembers.php:360
+#: actions/groupblock.php:134 actions/groupmembers.php:364
 msgid "Block user from group"
 msgstr "Gebruiker toegang tot de groep blokkeren"
 
@@ -1881,40 +1893,32 @@ msgstr "Logo geactualiseerd."
 msgid "Failed updating logo."
 msgstr "Het bijwerken van het logo is mislukt."
 
-#: actions/groupmembers.php:100 lib/groupnav.php:92
+#. TRANS: Title of the page showing group members.
+#. TRANS: %s is the name of the group.
+#: actions/groupmembers.php:102
 #, php-format
 msgid "%s group members"
 msgstr "leden van de groep %s"
 
-#: actions/groupmembers.php:103
+#. TRANS: Title of the page showing group members.
+#. TRANS: %1$s is the name of the group, %2$d is the page number of the members list.
+#: actions/groupmembers.php:107
 #, php-format
 msgid "%1$s group members, page %2$d"
 msgstr "%1$s groeps leden, pagina %2$d"
 
-#: actions/groupmembers.php:118
+#: actions/groupmembers.php:122
 msgid "A list of the users in this group."
 msgstr "Ledenlijst van deze groep"
 
-#: actions/groupmembers.php:182 lib/groupnav.php:107
+#: actions/groupmembers.php:186
 msgid "Admin"
 msgstr "Beheerder"
 
-#: actions/groupmembers.php:392 lib/blockform.php:69
-msgid "Block"
-msgstr "Blokkeren"
-
-#: actions/groupmembers.php:487
+#: actions/groupmembers.php:498
 msgid "Make user an admin of the group"
 msgstr "Deze gebruiker groepsbeheerder maken"
 
-#: actions/groupmembers.php:519
-msgid "Make Admin"
-msgstr "Beheerder maken"
-
-#: actions/groupmembers.php:519
-msgid "Make this user an admin"
-msgstr "Deze gebruiker beheerder maken"
-
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Title in atom group notice feed. %s is a group name.
 #. TRANS: Title in atom user notice feed. %s is a user name.
@@ -2055,7 +2059,10 @@ msgstr ""
 
 #. TRANS: IM address input field instructions in IM settings form.
 #. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:140
+#. TRANS: Do not translate "example.org". It is one of the domain names reserved for use in examples by
+#. TRANS: http://www.rfc-editor.org/rfc/rfc2606.txt. Any other domain may be owned by a legitimate
+#. TRANS: person or organization.
+#: actions/imsettings.php:143
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -2065,65 +2072,65 @@ msgstr ""
 "%s eerst aan uw contactenlijst in uw IM-programma of in GTalk toevoegt."
 
 #. TRANS: Form legend for IM preferences form.
-#: actions/imsettings.php:155
+#: actions/imsettings.php:158
 msgid "IM preferences"
 msgstr "IM-voorkeuren"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:160
+#: actions/imsettings.php:163
 msgid "Send me notices through Jabber/GTalk."
 msgstr "Mij berichten sturen via Jabber/GTalk."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:166
+#: actions/imsettings.php:169
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr "Een mededeling versturen als mijn Jabber/GTalk-status wijzigt."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:172
+#: actions/imsettings.php:175
 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."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:179
+#: actions/imsettings.php:182
 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "Een MicroID voor mijn Jabber/GTalk-adres publiceren."
 
 #. TRANS: Confirmation message for successful IM preferences save.
-#: actions/imsettings.php:287 actions/othersettings.php:180
+#: actions/imsettings.php:290 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
+#: actions/imsettings.php:312
 msgid "No Jabber ID."
 msgstr "Geen Jabber-ID."
 
 #. TRANS: Message given saving IM address that cannot be normalised.
-#: actions/imsettings.php:317
+#: actions/imsettings.php:320
 msgid "Cannot normalize that Jabber ID"
 msgstr "Het was niet mogelijk om het Jabber-ID te normaliseren"
 
 #. TRANS: Message given saving IM address that not valid.
-#: actions/imsettings.php:322
+#: actions/imsettings.php:325
 msgid "Not a valid Jabber ID"
 msgstr "Geen geldige Jabber-ID"
 
 #. TRANS: Message given saving IM address that is already set.
-#: actions/imsettings.php:326
+#: actions/imsettings.php:329
 msgid "That is already your Jabber ID."
 msgstr "U hebt dit al ingesteld als uw Jabber-ID."
 
 #. TRANS: Message given saving IM address that is already set for another user.
-#: actions/imsettings.php:330
+#: actions/imsettings.php:333
 msgid "Jabber ID already belongs to another user."
 msgstr "Het Jabber-ID wordt al gebruikt door een andere gebruiker."
 
 #. 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
+#: actions/imsettings.php:361
 #, php-format
 msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
@@ -2133,28 +2140,28 @@ msgstr ""
 "ermee akkoord gaan dat %s berichten aan u verzendt."
 
 #. TRANS: Message given canceling IM address confirmation for the wrong IM address.
-#: actions/imsettings.php:388
+#: actions/imsettings.php:391
 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
+#: actions/imsettings.php:400
 msgid "Couldn't delete IM confirmation."
 msgstr "De IM-bevestiging kon niet verwijderd worden."
 
 #. TRANS: Message given after successfully canceling IM address confirmation.
-#: actions/imsettings.php:402
+#: actions/imsettings.php:405
 msgid "IM confirmation cancelled."
 msgstr "IM-bevestiging geannuleerd."
 
 #. TRANS: Message given trying to remove an IM address that is not
 #. TRANS: registered for the active user.
-#: actions/imsettings.php:424
+#: actions/imsettings.php:427
 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
+#: actions/imsettings.php:450
 msgid "The IM address was removed."
 msgstr "Het IM-adres is verwijderd."
 
@@ -2633,8 +2640,8 @@ msgid "Only %s URLs over plain HTTP please."
 msgstr "Alleen URL's voor %s via normale HTTP alstublieft."
 
 #. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1215
-#: lib/apiaction.php:1243 lib/apiaction.php:1366
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1206
+#: lib/apiaction.php:1233 lib/apiaction.php:1356
 msgid "Not a supported data format."
 msgstr "Geen ondersteund gegevensformaat."
 
@@ -2774,7 +2781,7 @@ msgid "Password saved."
 msgstr "Het wachtwoord is opgeslagen."
 
 #. TRANS: Menu item for site administration
-#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:384
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:371
 msgid "Paths"
 msgstr "Paden"
 
@@ -2988,7 +2995,7 @@ msgstr "Volledige naam"
 
 #. TRANS: Form input field label.
 #: actions/profilesettings.php:115 actions/register.php:460
-#: lib/applicationeditform.php:244 lib/groupeditform.php:161
+#: lib/applicationeditform.php:235 lib/groupeditform.php:161
 msgid "Homepage"
 msgstr "Thuispagina"
 
@@ -3097,7 +3104,7 @@ msgid "Couldn't save tags."
 msgstr "Het was niet mogelijk de labels op te slaan."
 
 #. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:391 lib/adminpanelaction.php:141
+#: actions/profilesettings.php:391 lib/adminpanelaction.php:138
 msgid "Settings saved."
 msgstr "De instellingen zijn opgeslagen."
 
@@ -3641,7 +3648,7 @@ msgstr "Deze gebruiker is al in de zandbak geplaatst."
 
 #. TRANS: Menu item for site administration
 #: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
-#: lib/adminpanelaction.php:392
+#: lib/adminpanelaction.php:379
 msgid "Sessions"
 msgstr "Sessies"
 
@@ -3679,24 +3686,24 @@ msgid "Application profile"
 msgstr "Applicatieprofiel"
 
 #. TRANS: Form input field label for application icon.
-#: actions/showapplication.php:159 lib/applicationeditform.php:182
+#: actions/showapplication.php:159 lib/applicationeditform.php:173
 msgid "Icon"
 msgstr "Icoon"
 
 #. TRANS: Form input field label for application name.
 #: actions/showapplication.php:169 actions/version.php:197
-#: lib/applicationeditform.php:199
+#: lib/applicationeditform.php:190
 msgid "Name"
 msgstr "Naam"
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:178 lib/applicationeditform.php:235
+#: actions/showapplication.php:178 lib/applicationeditform.php:226
 msgid "Organization"
 msgstr "Organisatie"
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:216 lib/groupeditform.php:172
+#: lib/applicationeditform.php:207 lib/groupeditform.php:172
 msgid "Description"
 msgstr "Beschrijving"
 
@@ -3813,7 +3820,7 @@ msgstr ""
 msgid "This is a way to share what you like."
 msgstr "Dit is de manier om dat te delen wat u wilt."
 
-#: actions/showgroup.php:82 lib/groupnav.php:86
+#: actions/showgroup.php:82
 #, php-format
 msgid "%s group"
 msgstr "%s groep"
@@ -3865,7 +3872,7 @@ msgstr "Mededelingenfeed voor groep %s (Atom)"
 msgid "FOAF for %s group"
 msgstr "Vriend van een vriend voor de groep %s"
 
-#: actions/showgroup.php:393 actions/showgroup.php:445 lib/groupnav.php:91
+#: actions/showgroup.php:393 actions/showgroup.php:445
 msgid "Members"
 msgstr "Leden"
 
@@ -4326,7 +4333,7 @@ msgstr "Er is geen code ingevoerd"
 
 #. TRANS: Menu item for site administration
 #: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
-#: lib/adminpanelaction.php:408
+#: lib/adminpanelaction.php:395
 msgid "Snapshots"
 msgstr "Snapshots"
 
@@ -5076,7 +5083,7 @@ msgid "Unable to save tag."
 msgstr "Het was niet mogelijk om het label op te slaan."
 
 #. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#: classes/Subscription.php:75 lib/oauthstore.php:465
+#: classes/Subscription.php:75 lib/oauthstore.php:466
 msgid "You have been banned from subscribing."
 msgstr "U mag zich niet abonneren."
 
@@ -5225,7 +5232,8 @@ msgid "Change site configuration"
 msgstr "Websiteinstellingen wijzigen"
 
 #. TRANS: Main menu option when logged in and site admin for access to site configuration
-#: lib/action.php:474
+#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
+#: lib/action.php:474 lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr "Beheer"
@@ -5302,7 +5310,7 @@ msgstr "Zoeken"
 
 #. TRANS: DT element for site notice. String is hidden in default CSS.
 #. TRANS: Menu item for site administration
-#: lib/action.php:538 lib/adminpanelaction.php:400
+#: lib/action.php:538 lib/adminpanelaction.php:387
 msgid "Site notice"
 msgstr "Mededeling van de website"
 
@@ -5366,7 +5374,10 @@ msgid "StatusNet software license"
 msgstr "Licentie van de StatusNet-software"
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
-#: lib/action.php:843
+#. TRANS: Text between [] is a link description, text between () is the link itself.
+#. TRANS: Make sure there is no whitespace between "]" and "(".
+#. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
+#: lib/action.php:846
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -5376,13 +5387,16 @@ msgstr ""
 "broughtbyurl%%)."
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:846
+#: lib/action.php:849
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** is een microblogdienst."
 
 #. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.
-#: lib/action.php:850
+#. TRANS: Make sure there is no whitespace between "]" and "(".
+#. TRANS: Text between [] is a link description, text between () is the link itself.
+#. TRANS: %s is the version of StatusNet that is being used.
+#: lib/action.php:856
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -5394,20 +5408,20 @@ msgstr ""
 "www.fsf.org/licensing/licenses/agpl-3.0.html)."
 
 #. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:866
+#: lib/action.php:872
 msgid "Site content license"
 msgstr "Licentie voor siteinhoud"
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:873
+#: lib/action.php:879
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr "Inhoud en gegevens van %1$s zijn persoonlijk en vertrouwelijk."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:880
+#: lib/action.php:886
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
@@ -5415,33 +5429,34 @@ msgstr ""
 "voorbehouden."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:884
+#: lib/action.php:890
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 "Auteursrechten op inhoud en gegevens rusten bij de respectievelijke "
 "gebruikers. Alle rechten voorbehouden."
 
-#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:897
+#. TRANS: license message in footer.
+#. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
+#: lib/action.php:904
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr ""
 "Alle inhoud en gegevens van %1$s zijn beschikbaar onder de licentie %2$s."
 
 #. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1236
+#: lib/action.php:1243
 msgid "Pagination"
 msgstr "Paginering"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1247
+#: lib/action.php:1254
 msgid "After"
 msgstr "Later"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1257
+#: lib/action.php:1264
 msgid "Before"
 msgstr "Eerder"
 
@@ -5450,208 +5465,227 @@ msgstr "Eerder"
 msgid "Expecting a root feed element but got a whole XML document."
 msgstr "Verwachtte een root-feed element maar kreeg een heel XML-document."
 
-#: lib/activityutils.php:208
+#. TRANS: Client exception thrown when there is no source attribute.
+#: lib/activityutils.php:203
 msgid "Can't handle remote content yet."
 msgstr "Het is nog niet mogelijk inhoud uit andere omgevingen te verwerken."
 
-#: lib/activityutils.php:244
+#. TRANS: Client exception thrown when there embedded XML content is found that cannot be processed yet.
+#: lib/activityutils.php:240
 msgid "Can't handle embedded XML content yet."
 msgstr "Het is nog niet mogelijk ingebedde XML-inhoud te verwerken"
 
-#: lib/activityutils.php:248
+#. TRANS: Client exception thrown when base64 encoded content is found that cannot be processed yet.
+#: lib/activityutils.php:245
 msgid "Can't handle embedded Base64 content yet."
 msgstr "Het is nog niet mogelijk ingebedde Base64-inhoud te verwerken"
 
 #. TRANS: Client error message thrown when a user tries to change admin settings but has no access rights.
-#: lib/adminpanelaction.php:98
+#: lib/adminpanelaction.php:96
 msgid "You cannot make changes to this site."
 msgstr "U mag geen wijzigingen maken aan deze website."
 
 #. TRANS: Client error message throw when a certain panel's settings cannot be changed.
-#: lib/adminpanelaction.php:110
+#: lib/adminpanelaction.php:108
 msgid "Changes to that panel are not allowed."
 msgstr "Wijzigingen aan dat venster zijn niet toegestaan."
 
 #. TRANS: Client error message.
-#: lib/adminpanelaction.php:229
+#: lib/adminpanelaction.php:222
 msgid "showForm() not implemented."
 msgstr "showForm() is niet geÃ¯mplementeerd."
 
 #. TRANS: Client error message
-#: lib/adminpanelaction.php:259
+#: lib/adminpanelaction.php:250
 msgid "saveSettings() not implemented."
 msgstr "saveSettings() is nog niet geÃ¯mplementeerd."
 
 #. TRANS: Client error message thrown if design settings could not be deleted in
 #. TRANS: the admin panel Design.
-#: lib/adminpanelaction.php:284
+#: lib/adminpanelaction.php:274
 msgid "Unable to delete design setting."
 msgstr "Het was niet mogelijk om de ontwerpinstellingen te verwijderen."
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:350
+#: lib/adminpanelaction.php:337
 msgid "Basic site configuration"
 msgstr "Basisinstellingen voor de website"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:352
+#: lib/adminpanelaction.php:339
 msgctxt "MENU"
 msgid "Site"
 msgstr "Website"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:358
+#: lib/adminpanelaction.php:345
 msgid "Design configuration"
 msgstr "Instellingen vormgeving"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:360
+#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
+#: lib/adminpanelaction.php:347 lib/groupnav.php:135
 msgctxt "MENU"
 msgid "Design"
 msgstr "Uiterlijk"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:366
+#: lib/adminpanelaction.php:353
 msgid "User configuration"
 msgstr "Gebruikersinstellingen"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:368 lib/personalgroupnav.php:115
+#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:115
 msgid "User"
 msgstr "Gebruiker"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:374
+#: lib/adminpanelaction.php:361
 msgid "Access configuration"
 msgstr "Toegangsinstellingen"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:382
+#: lib/adminpanelaction.php:369
 msgid "Paths configuration"
 msgstr "Padinstellingen"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:390
+#: lib/adminpanelaction.php:377
 msgid "Sessions configuration"
 msgstr "Sessieinstellingen"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:398
+#: lib/adminpanelaction.php:385
 msgid "Edit site notice"
 msgstr "Websitebrede mededeling opslaan"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:406
+#: lib/adminpanelaction.php:393
 msgid "Snapshots configuration"
 msgstr "Snapshotinstellingen"
 
 #. TRANS: Client error 401.
-#: lib/apiauth.php:113
+#: lib/apiauth.php:111
 msgid "API resource requires read-write access, but you only have read access."
 msgstr ""
 "Het API-programma heeft lezen-en-schrijventoegang nodig, maar u hebt alleen "
 "maar leestoegang."
 
+#. TRANS: OAuth exception thrown when no application is found for a given consumer key.
+#: lib/apiauth.php:175
+msgid "No application for that consumer key."
+msgstr ""
+
+#. TRANS: OAuth exception given when no user was found for a given token (no token was found).
+#: lib/apiauth.php:217
+msgid "No user for that token."
+msgstr ""
+
+#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
+#: lib/apioauthstore.php:178
+msgid "Tried to revoke unknown token"
+msgstr ""
+
 #. TRANS: Form legend.
-#: lib/applicationeditform.php:137
+#: lib/applicationeditform.php:129
 msgid "Edit application"
 msgstr "Applicatie bewerken"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:187
+#: lib/applicationeditform.php:178
 msgid "Icon for this application"
 msgstr "Icoon voor deze applicatie"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:209
+#: lib/applicationeditform.php:200
 #, php-format
 msgid "Describe your application in %d characters"
 msgstr "Beschrijf uw applicatie in %d tekens"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:213
+#: lib/applicationeditform.php:204
 msgid "Describe your application"
 msgstr "Beschrijf uw applicatie"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:224
+#: lib/applicationeditform.php:215
 msgid "URL of the homepage of this application"
 msgstr "De URL van de homepage van deze applicatie"
 
 #. TRANS: Form input field label.
-#: lib/applicationeditform.php:226
+#: lib/applicationeditform.php:217
 msgid "Source URL"
 msgstr "Bron-URL"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:233
+#: lib/applicationeditform.php:224
 msgid "Organization responsible for this application"
 msgstr "Organisatie verantwoordelijk voor deze applicatie"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:242
+#: lib/applicationeditform.php:233
 msgid "URL for the homepage of the organization"
 msgstr "De URL van de homepage van de organisatie"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:251
+#: lib/applicationeditform.php:242
 msgid "URL to redirect to after authentication"
 msgstr "URL om naar door te verwijzen na authenticatie"
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:278
+#: lib/applicationeditform.php:269
 msgid "Browser"
 msgstr "Browser"
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:295
+#: lib/applicationeditform.php:286
 msgid "Desktop"
 msgstr "Desktop"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:297
+#: lib/applicationeditform.php:288
 msgid "Type of application, browser or desktop"
 msgstr "Type applicatie; browser of desktop"
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:320
+#: lib/applicationeditform.php:311
 msgid "Read-only"
 msgstr "Alleen-lezen"
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:339
+#: lib/applicationeditform.php:330
 msgid "Read-write"
 msgstr "Lezen en schrijven"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:341
+#: lib/applicationeditform.php:332
 msgid "Default access for this application: read-only, or read-write"
 msgstr ""
 "Standaardtoegang voor deze applicatie: alleen-lezen of lezen en schrijven"
 
-#. TRANS: Submit button title
-#: lib/applicationeditform.php:359
+#. TRANS: Submit button title.
+#: lib/applicationeditform.php:349
 msgid "Cancel"
 msgstr "Annuleren"
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:136
+#: lib/applicationlist.php:135
 msgid "read-write"
 msgstr "lezen en schrijven"
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:138
+#: lib/applicationlist.php:137
 msgid "read-only"
 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
+#: lib/applicationlist.php:143
 #, php-format
 msgid "Approved %1$s - \"%2$s\" access."
 msgstr "Goedgekeurd op %1$s met toegang \"%2$s\"."
 
 #. TRANS: Button label
-#: lib/applicationlist.php:159
+#: lib/applicationlist.php:158
 msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "Intrekken"
@@ -5671,11 +5705,13 @@ msgstr "Auteur"
 msgid "Provider"
 msgstr "Provider"
 
-#: lib/attachmentnoticesection.php:67
+#. TRANS: Title.
+#: lib/attachmentnoticesection.php:68
 msgid "Notices where this attachment appears"
 msgstr "Mededelingen die deze bijlage bevatten"
 
-#: lib/attachmenttagcloudsection.php:48
+#. TRANS: Title.
+#: lib/attachmenttagcloudsection.php:49
 msgid "Tags for this attachment"
 msgstr "Labels voor deze bijlage"
 
@@ -5687,6 +5723,11 @@ msgstr "Wachtwoord wijzigen is mislukt"
 msgid "Password changing is not allowed"
 msgstr "Wachtwoord wijzigen is niet toegestaan"
 
+#. TRANS: Title for the form to block a user.
+#: lib/blockform.php:70
+msgid "Block"
+msgstr "Blokkeren"
+
 #: lib/channel.php:157 lib/channel.php:177
 msgid "Command results"
 msgstr "Commandoresultaten"
@@ -5942,7 +5983,7 @@ msgid "You are not subscribed to anyone."
 msgstr "U bent op geen enkele gebruiker geabonneerd."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to.
-#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.
 #: lib/command.php:836
 msgid "You are subscribed to this person:"
@@ -5957,7 +5998,7 @@ msgid "No one is subscribed to you."
 msgstr "Niemand heeft een abonnenment op u."
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
-#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
 #: lib/command.php:863
 msgid "This person is subscribed to you:"
@@ -5972,7 +6013,7 @@ msgid "You are not a member of any groups."
 msgstr "U bent lid van geen enkele groep."
 
 #. TRANS: Text shown after requesting groups a user is subscribed to.
-#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
 #: lib/command.php:890
 msgid "You are a member of this group:"
@@ -5980,6 +6021,7 @@ 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:"
 
+#. TRANS: Help text for commands.
 #: lib/command.php:905
 msgid ""
 "Commands:\n"
@@ -6204,38 +6246,6 @@ msgid "Extra nicknames for the group, comma- or space- separated, max %d"
 msgstr ""
 "Extra namen voor de groep, gescheiden door komma's of spaties. Maximaal %d."
 
-#: lib/groupnav.php:85
-msgid "Group"
-msgstr "Groep"
-
-#: lib/groupnav.php:101
-msgid "Blocked"
-msgstr "Geblokkeerd"
-
-#: lib/groupnav.php:102
-#, php-format
-msgid "%s blocked users"
-msgstr "%s geblokkeerde gebruikers"
-
-#: lib/groupnav.php:108
-#, php-format
-msgid "Edit %s group properties"
-msgstr "Eigenschappen van de groep %s bewerken"
-
-#: lib/groupnav.php:113
-msgid "Logo"
-msgstr "Logo"
-
-#: lib/groupnav.php:114
-#, php-format
-msgid "Add or edit %s logo"
-msgstr "Logo voor %s toevoegen of verwijderen"
-
-#: lib/groupnav.php:120
-#, php-format
-msgid "Add or edit %s design"
-msgstr "%s-ontwerp toevoegen of bewerken"
-
 #: lib/groupsbymemberssection.php:71
 msgid "Groups with most members"
 msgstr "Groepen met de meeste leden"
@@ -6267,7 +6277,8 @@ msgstr "Dat bestand is te groot. De maximale bestandsgrootte is %s."
 msgid "Partial upload."
 msgstr "Gedeeltelijke upload."
 
-#: lib/imagefile.php:101 lib/mediafile.php:170
+#. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
+#: lib/imagefile.php:101 lib/mediafile.php:179
 msgid "System error uploading file."
 msgstr "Er is een systeemfout opgetreden tijdens het uploaden van het bestand."
 
@@ -6671,19 +6682,22 @@ msgstr "Inkomende e-mail is niet toegestaan."
 msgid "Unsupported message type: %s"
 msgstr "Niet ondersteund berichttype: %s"
 
-#: lib/mediafile.php:98 lib/mediafile.php:123
+#. TRANS: Client exception thrown when a database error was thrown during a file upload operation.
+#: lib/mediafile.php:99 lib/mediafile.php:125
 msgid "There was a database error while saving your file. Please try again."
 msgstr ""
 "Er is een databasefout opgetreden tijdens het opslaan van uw bestand. "
 "Probeer het alstublieft opnieuw."
 
-#: lib/mediafile.php:142
+#. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
+#: lib/mediafile.php:145
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
 msgstr ""
 "Het te uploaden bestand is groter dan de ingestelde upload_max_filesize in "
 "php.ini."
 
-#: lib/mediafile.php:147
+#. TRANS: Client exception.
+#: lib/mediafile.php:151
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form."
@@ -6691,44 +6705,43 @@ msgstr ""
 "Het te uploaden bestand is groter dan de ingestelde MAX_FILE_SIZE in het "
 "HTML-formulier."
 
-#: lib/mediafile.php:152
+#. TRANS: Client exception.
+#: lib/mediafile.php:157
 msgid "The uploaded file was only partially uploaded."
 msgstr "De upload is slechts gedeeltelijk voltooid."
 
-#: lib/mediafile.php:159
+#. TRANS: Client exception thrown when a temporary folder is not present to store a file upload.
+#: lib/mediafile.php:165
 msgid "Missing a temporary folder."
 msgstr "De tijdelijke map is niet aanwezig."
 
-#: lib/mediafile.php:162
+#. TRANS: Client exception thrown when writing to disk is not possible during a file upload operation.
+#: lib/mediafile.php:169
 msgid "Failed to write file to disk."
 msgstr "Het was niet mogelijk naar schijf te schrijven."
 
-#: lib/mediafile.php:165
+#. TRANS: Client exception thrown when a file upload operation has been stopped by an extension.
+#: lib/mediafile.php:173
 msgid "File upload stopped by extension."
 msgstr "Het uploaden van het bestand is tegengehouden door een uitbreiding."
 
-#: lib/mediafile.php:179 lib/mediafile.php:217
+#. TRANS: Client exception thrown when a file upload operation would cause a user to exceed a set quota.
+#: lib/mediafile.php:189 lib/mediafile.php:232
 msgid "File exceeds user's quota."
 msgstr "Met dit bestand wordt het quotum van de gebruiker overschreden."
 
-#: lib/mediafile.php:197 lib/mediafile.php:234
+#. TRANS: Client exception thrown when a file upload operation fails because the file could
+#. TRANS: not be moved from the temporary folder to the permanent file location.
+#: lib/mediafile.php:209 lib/mediafile.php:251
 msgid "File could not be moved to destination directory."
 msgstr "Het bestand kon niet verplaatst worden naar de doelmap."
 
-#: lib/mediafile.php:202 lib/mediafile.php:238
+#. TRANS: Client exception thrown when a file upload operation has been stopped because the MIME
+#. TRANS: type of the uploaded file could not be determined.
+#: lib/mediafile.php:216 lib/mediafile.php:257
 msgid "Could not determine file's MIME type."
 msgstr "Het was niet mogelijk het MIME-type van het bestand te bepalen."
 
-#: lib/mediafile.php:318
-#, php-format
-msgid " Try using another %s format."
-msgstr " Probeer een ander %s-formaat te gebruiken."
-
-#: lib/mediafile.php:323
-#, php-format
-msgid "%s is not a supported file type on this server."
-msgstr "Het bestandstype %s wordt door deze server niet ondersteund."
-
 #: lib/messageform.php:120
 msgid "Send a direct notice"
 msgstr "Directe mededeling verzenden"
@@ -6844,29 +6857,7 @@ msgstr "Porren"
 msgid "Send a nudge to this user"
 msgstr "Deze gebruiker porren"
 
-#: lib/oauthstore.php:283
-msgid "Error inserting new profile"
-msgstr "Er is een fout opgetreden tijdens het invoegen van een nieuw profiel"
-
-#: lib/oauthstore.php:291
-msgid "Error inserting avatar"
-msgstr "Er is een fout opgetreden bij het toevoegen van de avatar"
-
-#: lib/oauthstore.php:306
-msgid "Error updating remote profile"
-msgstr ""
-"Er is een fout opgetreden tijdens het bijwerken van het profiel op afstand."
-
-#: lib/oauthstore.php:311
-msgid "Error inserting remote profile"
-msgstr ""
-"Er is een fout opgetreden tijdens het invoegen in het profiel op afstand."
-
-#: lib/oauthstore.php:345
-msgid "Duplicate notice"
-msgstr "Duplicaatmelding"
-
-#: lib/oauthstore.php:490
+#: lib/oauthstore.php:491
 msgid "Couldn't insert new subscription."
 msgstr "Kon nieuw abonnement niet toevoegen."
 
@@ -6903,7 +6894,8 @@ msgstr "Uw verzonden berichten"
 msgid "Tags in %s's notices"
 msgstr "Labels in de mededelingen van %s"
 
-#: lib/plugin.php:115
+#. TRANS: Displayed as version information for a plugin if no version information was found.
+#: lib/plugin.php:116
 msgid "Unknown"
 msgstr "Onbekend"
 
@@ -6997,19 +6989,19 @@ msgstr "Zandbak"
 msgid "Sandbox this user"
 msgstr "Deze gebruiker in de zandbak plaatsen"
 
-#: lib/searchaction.php:120
+#. TRANS: Fieldset legend for the search form.
+#: lib/searchaction.php:121
 msgid "Search site"
 msgstr "Site doorzoeken"
 
-#: lib/searchaction.php:126
+#. TRANS: Used as a field label for the field where one or more keywords
+#. TRANS: for searching can be entered.
+#: lib/searchaction.php:129
 msgid "Keyword(s)"
 msgstr "Term(en)"
 
-#: lib/searchaction.php:127
-msgid "Search"
-msgstr "Zoeken"
-
-#: lib/searchaction.php:162
+#. TRANS: Definition list item with instructions on how to get (better) search results.
+#: lib/searchaction.php:170
 msgid "Search help"
 msgstr "Hulp bij zoeken"
 
@@ -7214,56 +7206,32 @@ msgid "Moderator"
 msgstr "Moderator"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1102
+#: lib/util.php:1103
 msgid "a few seconds ago"
 msgstr "een paar seconden geleden"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1105
+#: lib/util.php:1106
 msgid "about a minute ago"
 msgstr "ongeveer een minuut geleden"
 
-#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1109
-#, php-format
-msgid "about %d minutes ago"
-msgstr "ongeveer %d minuten geleden"
-
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 #: lib/util.php:1112
 msgid "about an hour ago"
 msgstr "ongeveer een uur geleden"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1116
-#, php-format
-msgid "about %d hours ago"
-msgstr "ongeveer %d uur geleden"
-
-#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1119
+#: lib/util.php:1118
 msgid "about a day ago"
 msgstr "ongeveer een dag geleden"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1123
-#, php-format
-msgid "about %d days ago"
-msgstr "ongeveer %d dagen geleden"
-
-#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1126
+#: lib/util.php:1124
 msgid "about a month ago"
 msgstr "ongeveer een maand geleden"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 #: lib/util.php:1130
-#, php-format
-msgid "about %d months ago"
-msgstr "ongeveer %d maanden geleden"
-
-#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1133
 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 badba4fc2c..743b222c72 100644
--- a/locale/nn/LC_MESSAGES/statusnet.po
+++ b/locale/nn/LC_MESSAGES/statusnet.po
@@ -1,7 +1,8 @@
-# Translation of StatusNet to Norwegian Nynorsk
+# Translation of StatusNet to Norwegian Nynorsk (âªNorsk (nynorsk)â¬)
+# Expored from translatewiki.net
 #
-# Author@translatewiki.net: Nghtwlkr
-# Author@translatewiki.net: Ranveig
+# Author: Nghtwlkr
+# Author: Ranveig
 # --
 # This file is distributed under the same license as the StatusNet package.
 #
@@ -9,16 +10,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-08 22:33+0000\n"
-"PO-Revision-Date: 2010-09-08 22:35:06+0000\n"
-"Language-Team: Norwegian Nynorsk\n"
+"POT-Creation-Date: 2010-09-14 19:53+0000\n"
+"PO-Revision-Date: 2010-09-14 19:54:12+0000\n"
+"Language-Team: Norwegian Nynorsk <http://translatewiki.net/wiki/Portal:nn>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r72348); Translate extension (2010-08-20)\n"
+"X-Generator: MediaWiki 1.17alpha (r73009); Translate extension (2010-08-20)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nn\n"
-"X-Message-Group: out-statusnet\n"
+"X-Message-Group: #out-statusnet\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-POT-Import-Date: 1284-49-16 34::+0000\n"
 
 #. TRANS: Checkbox instructions for admin setting "Private"
 #: actions/accessadminpanel.php:165
@@ -35,22 +37,17 @@ msgstr ""
 msgid "Disable new registrations."
 msgstr ""
 
-#. TRANS: Checkbox label for disabling new user registrations.
-#: actions/accessadminpanel.php:185
-msgid "Closed"
-msgstr ""
-
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #: actions/all.php:79 actions/allrss.php:68
-#: actions/apiaccountupdatedeliverydevice.php:114
-#: actions/apiaccountupdateprofile.php:105
-#: actions/apiaccountupdateprofilebackgroundimage.php:116
-#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
-#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
-#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:113
-#: actions/apigroupismember.php:91 actions/apigroupjoin.php:100
-#: actions/apigroupleave.php:100 actions/apigrouplist.php:73
-#: actions/apistatusesupdate.php:229 actions/apisubscriptions.php:87
+#: actions/apiaccountupdatedeliverydevice.php:115
+#: actions/apiaccountupdateprofile.php:106
+#: actions/apiaccountupdateprofilebackgroundimage.php:117
+#: actions/apiaccountupdateprofileimage.php:106 actions/apiblockcreate.php:98
+#: actions/apiblockdestroy.php:97 actions/apidirectmessage.php:77
+#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:114
+#: actions/apigroupismember.php:91 actions/apigroupjoin.php:101
+#: actions/apigroupleave.php:101 actions/apigrouplist.php:73
+#: actions/apistatusesupdate.php:230 actions/apisubscriptions.php:87
 #: actions/apitimelinefavorites.php:72 actions/apitimelinefriends.php:174
 #: actions/apitimelinehome.php:80 actions/apitimelinementions.php:80
 #: actions/apitimelineuser.php:82 actions/avatarbynickname.php:75
@@ -118,39 +115,41 @@ msgstr ""
 msgid "Updates from %1$s and friends on %2$s!"
 msgstr "Oppdateringar frÃ¥ %1$s og vener pÃ¥ %2$s!"
 
-#: actions/apiaccountupdatedeliverydevice.php:86
-#: actions/apiaccountupdateprofile.php:89
-#: actions/apiaccountupdateprofilebackgroundimage.php:86
-#: actions/apiaccountupdateprofilecolors.php:110
-#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89
-#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109
-#: actions/apifavoritecreate.php:91 actions/apifavoritedestroy.php:92
-#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
-#: actions/apigroupcreate.php:105 actions/apigroupjoin.php:92
-#: actions/apigroupleave.php:92 actions/apimediaupload.php:67
-#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:198
+#. TRANS: Client error message. POST is a HTTP command. It should not be translated.
+#. TRANS: Client error. POST is a HTTP command. It should not be translated.
+#: actions/apiaccountupdatedeliverydevice.php:87
+#: actions/apiaccountupdateprofile.php:90
+#: actions/apiaccountupdateprofilebackgroundimage.php:87
+#: actions/apiaccountupdateprofilecolors.php:111
+#: actions/apiaccountupdateprofileimage.php:85 actions/apiblockcreate.php:90
+#: actions/apiblockdestroy.php:89 actions/apidirectmessagenew.php:110
+#: actions/apifavoritecreate.php:92 actions/apifavoritedestroy.php:93
+#: actions/apifriendshipscreate.php:92 actions/apifriendshipsdestroy.php:92
+#: actions/apigroupcreate.php:106 actions/apigroupjoin.php:93
+#: actions/apigroupleave.php:93 actions/apimediaupload.php:68
+#: actions/apistatusesretweet.php:66 actions/apistatusesupdate.php:199
 msgid "This method requires a POST."
 msgstr "Dette krev ein POST."
 
-#: actions/apiaccountupdatedeliverydevice.php:106
+#: actions/apiaccountupdatedeliverydevice.php:107
 msgid ""
 "You must specify a parameter named 'device' with a value of one of: sms, im, "
 "none."
 msgstr ""
 
-#: actions/apiaccountupdateprofile.php:112
-#: actions/apiaccountupdateprofilebackgroundimage.php:194
-#: actions/apiaccountupdateprofilecolors.php:185
-#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/apiaccountupdateprofile.php:113
+#: actions/apiaccountupdateprofilebackgroundimage.php:195
+#: actions/apiaccountupdateprofilecolors.php:186
+#: actions/apiaccountupdateprofileimage.php:131 actions/apiusershow.php:108
 #: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/hcard.php:74
 #: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
 #: lib/profileaction.php:84
 msgid "User has no profile."
 msgstr "Brukaren har inga profil."
 
-#: actions/apiaccountupdateprofilebackgroundimage.php:108
-#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
-#: actions/apistatusesupdate.php:212 actions/avatarsettings.php:257
+#: actions/apiaccountupdateprofilebackgroundimage.php:109
+#: actions/apiaccountupdateprofileimage.php:98 actions/apimediaupload.php:81
+#: actions/apistatusesupdate.php:213 actions/avatarsettings.php:257
 #: actions/designadminpanel.php:123 actions/editapplication.php:118
 #: actions/newapplication.php:101 actions/newnotice.php:94
 #: lib/designsettings.php:283
@@ -160,11 +159,11 @@ msgid ""
 "current configuration."
 msgstr ""
 
-#: actions/apiblockcreate.php:126
+#: actions/apiblockcreate.php:127
 msgid "Block user failed."
 msgstr "Blokkering av brukar feila."
 
-#: actions/apiblockdestroy.php:114
+#: actions/apiblockdestroy.php:115
 msgid "Unblock user failed."
 msgstr "De-blokkering av brukar feila."
 
@@ -183,49 +182,45 @@ msgstr "Direkte meldingar til %s"
 msgid "All the direct messages sent to %s"
 msgstr "Alle direkte meldingar sendt til %s"
 
-#: actions/apidirectmessagenew.php:118
+#: actions/apidirectmessagenew.php:119
 msgid "No message text!"
 msgstr "Inga meldingstekst!"
 
-#: actions/apidirectmessagenew.php:138
+#: actions/apidirectmessagenew.php:139
 msgid "Recipient user not found."
 msgstr "Kunne ikkje finne mottakar."
 
-#: actions/apidirectmessagenew.php:142
+#: actions/apidirectmessagenew.php:143
 msgid "Can't send direct messages to users who aren't your friend."
 msgstr "Kan ikkje senda direktemeldingar til brukarar som du ikkje er ven med."
 
-#: actions/apifavoritecreate.php:109 actions/apifavoritedestroy.php:110
+#: actions/apifavoritecreate.php:110 actions/apifavoritedestroy.php:111
 #: actions/apistatusesdestroy.php:121
 msgid "No status found with that ID."
 msgstr "Fann ingen status med den ID-en."
 
 #. TRANS: Error message text shown when a favorite could not be set.
-#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:296
+#: actions/apifavoritecreate.php:132 actions/favor.php:84 lib/command.php:296
 msgid "Could not create favorite."
 msgstr "Kunne ikkje lagre favoritt."
 
-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
+#: actions/apifavoritedestroy.php:136 actions/disfavor.php:87
 msgid "Could not delete favorite."
 msgstr "Kunne ikkje slette favoritt."
 
-#: actions/apifriendshipscreate.php:109
+#: actions/apifriendshipscreate.php:110
 msgid "Could not follow user: profile not found."
 msgstr "Kan ikkje fylgja brukar: %s er allereie pÃ¥ lista di."
 
-#: actions/apifriendshipscreate.php:118
+#: actions/apifriendshipscreate.php:119
 #, php-format
 msgid "Could not follow user: %s is already on your list."
 msgstr "Kan ikkje fylgja brukar: %s er allereie pÃ¥ lista di."
 
-#: actions/apifriendshipsdestroy.php:109
+#: actions/apifriendshipsdestroy.php:110
 msgid "Could not unfollow user: User not found."
 msgstr "Kan ikkje fylgja brukar: %s er allereie pÃ¥ lista di."
 
-#: actions/apifriendshipsexists.php:91
-msgid "Two valid IDs or screen_names must be supplied."
-msgstr ""
-
 #: actions/apifriendshipsshow.php:134
 msgid "Could not determine source user."
 msgstr "Kan ikkje oppdatera brukar."
@@ -234,76 +229,81 @@ msgstr "Kan ikkje oppdatera brukar."
 msgid "Could not find target user."
 msgstr "Kan ikkje oppdatera brukar."
 
-#: actions/apigroupcreate.php:167 actions/editgroup.php:186
+#: actions/apigroupcreate.php:168 actions/editgroup.php:186
 #: actions/newgroup.php:126 actions/profilesettings.php:215
 #: actions/register.php:212
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr "Kallenamn mÃ¥ berre ha smÃ¥ bokstavar og nummer, ingen mellomrom."
 
-#: actions/apigroupcreate.php:176 actions/editgroup.php:190
+#: actions/apigroupcreate.php:177 actions/editgroup.php:190
 #: actions/newgroup.php:130 actions/profilesettings.php:238
 #: actions/register.php:215
 msgid "Nickname already in use. Try another one."
 msgstr "Kallenamnet er allereie i bruk. PrÃ¸v eit anna."
 
-#: actions/apigroupcreate.php:183 actions/editgroup.php:193
+#: actions/apigroupcreate.php:184 actions/editgroup.php:193
 #: actions/newgroup.php:133 actions/profilesettings.php:218
 #: actions/register.php:217
 msgid "Not a valid nickname."
 msgstr "Ikkje eit gyldig brukarnamn."
 
-#: actions/apigroupcreate.php:199 actions/editapplication.php:215
+#: actions/apigroupcreate.php:200 actions/editapplication.php:215
 #: actions/editgroup.php:199 actions/newapplication.php:203
 #: actions/newgroup.php:139 actions/profilesettings.php:222
 #: actions/register.php:224
 msgid "Homepage is not a valid URL."
 msgstr "Heimesida er ikkje ei gyldig internettadresse."
 
-#: actions/apigroupcreate.php:208 actions/editgroup.php:202
+#: actions/apigroupcreate.php:209 actions/editgroup.php:202
 #: actions/newgroup.php:142 actions/profilesettings.php:225
 #: actions/register.php:227
 msgid "Full name is too long (max 255 chars)."
 msgstr "Ditt fulle namn er for langt (maksimalt 255 teikn)."
 
-#: actions/apigroupcreate.php:216 actions/editapplication.php:190
+#: actions/apigroupcreate.php:217 actions/editapplication.php:190
 #: actions/newapplication.php:172
 #, php-format
 msgid "Description is too long (max %d chars)."
 msgstr "Plassering er for lang (maksimalt 255 teikn)."
 
-#: actions/apigroupcreate.php:227 actions/editgroup.php:208
+#: actions/apigroupcreate.php:228 actions/editgroup.php:208
 #: actions/newgroup.php:148 actions/profilesettings.php:232
 #: actions/register.php:234
 msgid "Location is too long (max 255 chars)."
 msgstr "Plassering er for lang (maksimalt 255 teikn)."
 
-#: actions/apigroupcreate.php:246 actions/editgroup.php:219
+#: actions/apigroupcreate.php:247 actions/editgroup.php:219
 #: actions/newgroup.php:159
 #, php-format
 msgid "Too many aliases! Maximum %d."
 msgstr ""
 
-#: actions/apigroupcreate.php:289 actions/editgroup.php:238
+#: actions/apigroupcreate.php:290 actions/editgroup.php:238
 #: actions/newgroup.php:178
 msgid "Alias can't be the same as nickname."
 msgstr ""
 
-#: actions/apigroupismember.php:96 actions/apigroupjoin.php:105
-#: actions/apigroupleave.php:105 actions/apigroupmembership.php:92
+#: actions/apigroupismember.php:96 actions/apigroupjoin.php:106
+#: actions/apigroupleave.php:106 actions/apigroupmembership.php:92
 #: actions/apigroupshow.php:83 actions/apitimelinegroup.php:92
 msgid "Group not found."
 msgstr "Finst ikkje."
 
+#. TRANS: Error text shown when a user tries to join a group they are blocked from joining.
+#: actions/apigroupjoin.php:121 actions/joingroup.php:105 lib/command.php:341
+msgid "You have been blocked from that group by the admin."
+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.
-#: actions/apigroupjoin.php:139 actions/joingroup.php:134 lib/command.php:353
+#: actions/apigroupjoin.php:140 actions/joingroup.php:134 lib/command.php:353
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "Kunne ikkje bli med i gruppa."
 
 #. 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.
-#: actions/apigroupleave.php:125 actions/leavegroup.php:129
+#: actions/apigroupleave.php:126 actions/leavegroup.php:129
 #: lib/command.php:401
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
@@ -322,9 +322,9 @@ msgstr ""
 
 #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
 #: actions/deletenotice.php:169 actions/disfavor.php:74
-#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:55
+#: actions/emailsettings.php:271 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:66 actions/imsettings.php:227
+#: actions/groupunblock.php:66 actions/imsettings.php:230
 #: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
@@ -355,8 +355,8 @@ msgstr ""
 #. 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:286 actions/grouplogo.php:322
-#: actions/imsettings.php:242 actions/newapplication.php:121
+#: actions/emailsettings.php:290 actions/grouplogo.php:322
+#: actions/imsettings.php:245 actions/newapplication.php:121
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
 #: actions/smssettings.php:277 lib/designsettings.php:304
 msgid "Unexpected form submission."
@@ -413,13 +413,13 @@ msgstr "Dette krev anten ein POST eller DELETE."
 msgid "You may not delete another user's status."
 msgstr "Du kan ikkje sletta statusen til ein annan brukar."
 
-#: actions/apistatusesretweet.php:75 actions/apistatusesretweets.php:72
+#: actions/apistatusesretweet.php:76 actions/apistatusesretweets.php:72
 #: actions/deletenotice.php:52 actions/shownotice.php:92
 msgid "No such notice."
 msgstr "Denne notisen finst ikkje."
 
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-#: actions/apistatusesretweet.php:91 lib/command.php:544
+#: actions/apistatusesretweet.php:92 lib/command.php:544
 msgid "Already repeated that notice."
 msgstr "Kan ikkje sletta notisen."
 
@@ -427,15 +427,15 @@ msgstr "Kan ikkje sletta notisen."
 msgid "No status with that ID found."
 msgstr "Fann ingen status med den ID-en."
 
-#: actions/apistatusesupdate.php:221
+#: actions/apistatusesupdate.php:222
 msgid "Client must provide a 'status' parameter with a value."
 msgstr ""
 
-#: actions/apistatusesupdate.php:283 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:284 actions/apiusershow.php:96
 msgid "Not found."
 msgstr "Finst ikkje."
 
-#: actions/apistatusesupdate.php:306 actions/newnotice.php:181
+#: actions/apistatusesupdate.php:307 actions/newnotice.php:181
 #, php-format
 msgid "Max notice size is %d chars, including attachment URL."
 msgstr ""
@@ -587,7 +587,9 @@ msgid "No"
 msgstr "Merknad"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
+#. TRANS: Submit button title.
+#. TRANS: Description of the form to block a user.
+#: actions/block.php:164 actions/groupmembers.php:403 lib/blockform.php:82
 msgid "Block this user"
 msgstr "BlokkÃ©r denne brukaren"
 
@@ -611,11 +613,13 @@ msgstr "Lagring av informasjon feila."
 msgid "No such group."
 msgstr "Denne gruppa finst ikkje."
 
-#: actions/blockedfromgroup.php:320 lib/unblockform.php:69
+#. TRANS: Title for the form to unblock a user.
+#: actions/blockedfromgroup.php:320 lib/unblockform.php:70
 msgid "Unblock"
 msgstr "LÃ¥s opp"
 
-#: actions/blockedfromgroup.php:320 lib/unblockform.php:80
+#. TRANS: Description of the form to unblock a user.
+#: actions/blockedfromgroup.php:320 lib/unblockform.php:82
 msgid "Unblock this user"
 msgstr "LÃ¥s opp brukaren"
 
@@ -637,12 +641,6 @@ msgstr "Fann ikkje stadfestingskode."
 msgid "That confirmation code is not for you!"
 msgstr "Den godkjenningskoden er ikkje for deg!"
 
-#. TRANS: Server error for an unknow address type, which can be 'email', 'jabber', or 'sms'.
-#: actions/confirmaddress.php:91
-#, php-format
-msgid "Unrecognized address type %s."
-msgstr ""
-
 #. TRANS: Client error for an already confirmed email/jabbel/sms address.
 #: actions/confirmaddress.php:96
 msgid "That address has already been confirmed."
@@ -654,9 +652,9 @@ msgstr "Den addressa har alt blitt bekrefta."
 #. 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/confirmaddress.php:116 actions/emailsettings.php:331
+#: actions/emailsettings.php:477 actions/imsettings.php:283
+#: actions/imsettings.php:442 actions/othersettings.php:174
 #: actions/profilesettings.php:283 actions/smssettings.php:308
 #: actions/smssettings.php:464
 msgid "Couldn't update user."
@@ -664,7 +662,7 @@ msgstr "Kan ikkje oppdatera brukar."
 
 #. 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/confirmaddress.php:128 actions/emailsettings.php:437
 #: actions/smssettings.php:422
 msgid "Couldn't delete email confirmation."
 msgstr "Kan ikkje sletta e-postgodkjenning."
@@ -691,9 +689,10 @@ msgstr "Du mÃ¥ vÃ¦re innlogga for Ã¥ melde deg ut av ei gruppe."
 msgid "Application not found."
 msgstr "Fann ikkje stadfestingskode."
 
+#. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:127
 #: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1307
+#: lib/action.php:1315
 msgid "There was a problem with your session token."
 msgstr "Det var eit problem med sesjons billetten din."
 
@@ -710,7 +709,7 @@ msgstr ""
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
 #: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:73 lib/profileformaction.php:64
+#: lib/adminpanelaction.php:71 lib/profileformaction.php:64
 #: lib/settingsaction.php:72
 msgid "Not logged in."
 msgstr "Ikkje logga inn"
@@ -719,12 +718,6 @@ msgstr "Ikkje logga inn"
 msgid "Can't delete this notice."
 msgstr "Kan ikkje sletta notisen."
 
-#: actions/deletenotice.php:103
-msgid ""
-"You are about to permanently delete a notice. Once this is done, it cannot "
-"be undone."
-msgstr ""
-
 #: actions/deletenotice.php:109 actions/deletenotice.php:141
 msgid "Delete notice"
 msgstr "Slett notis"
@@ -747,7 +740,6 @@ msgstr ""
 #. TRANS: Message used as title for design settings for the site.
 #. TRANS: Link description in user account settings menu.
 #: actions/designadminpanel.php:63 lib/accountsettingsaction.php:139
-#: lib/groupnav.php:119
 msgid "Design"
 msgstr ""
 
@@ -755,11 +747,6 @@ msgstr ""
 msgid "Design settings for this StatusNet site."
 msgstr ""
 
-#: actions/designadminpanel.php:322
-#, php-format
-msgid "Theme not available: %s."
-msgstr ""
-
 #: actions/designadminpanel.php:426
 msgid "Change logo"
 msgstr "Endra"
@@ -768,10 +755,6 @@ msgstr "Endra"
 msgid "Site logo"
 msgstr "Statusmelding"
 
-#: actions/designadminpanel.php:467
-msgid "Custom theme"
-msgstr ""
-
 #: actions/designadminpanel.php:471
 msgid "You can upload a custom StatusNet theme as a .ZIP archive."
 msgstr ""
@@ -831,13 +814,13 @@ msgstr ""
 msgid "Reset back to default"
 msgstr ""
 
-#. TRANS: Submit button title
+#. TRANS: Submit button title.
 #: actions/designadminpanel.php:685 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/snapshotadminpanel.php:245
 #: actions/subscriptions.php:226 actions/tagother.php:154
-#: actions/useradminpanel.php:294 lib/applicationeditform.php:363
+#: actions/useradminpanel.php:294 lib/applicationeditform.php:353
 #: lib/designsettings.php:256 lib/groupeditform.php:202
 msgid "Save"
 msgstr "Lagra"
@@ -859,10 +842,6 @@ msgstr "Legg til i favorittar"
 msgid "No such document \"%s\""
 msgstr "Denne notisen finst ikkje."
 
-#: actions/editapplication.php:54
-msgid "Edit Application"
-msgstr ""
-
 #: actions/editapplication.php:194
 msgid "Source URL is too long."
 msgstr ""
@@ -936,7 +915,7 @@ msgstr "Godkjent epostadresse."
 #. 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/emailsettings.php:115 actions/emailsettings.php:162
 #: actions/imsettings.php:116 actions/smssettings.php:124
 #: actions/smssettings.php:180
 msgctxt "BUTTON"
@@ -951,122 +930,110 @@ msgstr ""
 "Ventar pÃ¥ godkjenning. Sjekk innboksen (og sÃ¸ppelpostboksen) for ei melding "
 "med instruksjonar."
 
-#. TRANS: Instructions for e-mail address input form.
-#: actions/emailsettings.php:135
+#. TRANS: Instructions for e-mail address input form. Do not translate
+#. TRANS: "example.org". It is one of the domain names reserved for
+#. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
+#. TRANS: Any other domain may be owned by a legitimate person or
+#. TRANS: organization.
+#: actions/emailsettings.php:139
 msgid "Email address, like \"UserName@example.org\""
 msgstr "Epostadresse (Â«brukarnamn@example.orgÂ»)"
 
-#. 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 ""
-
 #. 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
+#: actions/emailsettings.php:151 actions/smssettings.php:171
 msgid "Incoming email"
 msgstr "Innkomande epost"
 
 #. 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
+#: actions/emailsettings.php:159 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."
 
 #. 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
+#: actions/emailsettings.php:168 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."
 
-#. 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 ""
-
 #. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:174
+#: actions/emailsettings.php:178
 msgid "Email preferences"
 msgstr "Epostadresser"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:180
+#: actions/emailsettings.php:184
 msgid "Send me notices of new subscriptions through email."
 msgstr "Send meg ein notis ved nye tingingar pÃ¥ epost."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:186
+#: actions/emailsettings.php:190
 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."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:193
+#: actions/emailsettings.php:197
 msgid "Send me email when someone sends me a private message."
 msgstr "Send meg ein epost nÃ¥r nokon sender meg ei privat melding."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:205
+#: actions/emailsettings.php:209
 msgid "Allow friends to nudge me and send me an email."
 msgstr "Tillat vennar Ã¥ sende meg ein epost."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:212
+#: actions/emailsettings.php:216
 msgid "I want to post notices by email."
 msgstr "Eg vil senda notisar med epost."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:219
+#: actions/emailsettings.php:223
 msgid "Publish a MicroID for my email address."
 msgstr "Publiser ein MicroID for epost addressa mi."
 
 #. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:334
+#: actions/emailsettings.php:338
 msgid "Email preferences saved."
 msgstr "Lagra brukarval."
 
 #. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:353
+#: actions/emailsettings.php:357
 msgid "No email address."
 msgstr "Ingen epostadresse."
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:361
+#: actions/emailsettings.php:365
 msgid "Cannot normalize that email address"
 msgstr "Klarar ikkje normalisera epostadressa"
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:208
+#: actions/emailsettings.php:370 actions/register.php:208
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "Ikkje ei gyldig epostadresse."
 
 #. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:370
+#: actions/emailsettings.php:374
 msgid "That is already your email address."
 msgstr "Det er alt din epost addresse"
 
 #. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:374
+#: actions/emailsettings.php:378
 msgid "That email address already belongs to another user."
 msgstr "Den epost addressa er alt registrert hos ein annan brukar."
 
 #. 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/emailsettings.php:395 actions/imsettings.php:351
 #: actions/smssettings.php:373
 msgid "Couldn't insert confirmation code."
 msgstr "Kan ikkje leggja til godkjenningskode."
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:398
+#: actions/emailsettings.php:402
 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."
@@ -1077,45 +1044,45 @@ msgstr ""
 #. 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/emailsettings.php:423 actions/imsettings.php:386
 #: actions/smssettings.php:408
 msgid "No pending confirmation to cancel."
 msgstr "Ingen ventande stadfesting Ã¥ avbryta."
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:438
+#: actions/emailsettings.php:442
 msgid "Email confirmation cancelled."
 msgstr "Ingen ventande stadfesting Ã¥ avbryta."
 
 #. TRANS: Message given trying to remove an e-mail address that is not
 #. TRANS: registered for the active user.
-#: actions/emailsettings.php:458
+#: actions/emailsettings.php:462
 msgid "That is not your email address."
 msgstr "Det er ikkje din epost addresse."
 
 #. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:479
+#: actions/emailsettings.php:483
 msgid "The email address was removed."
 msgstr "Fjerna innkomande epostadresse."
 
-#: actions/emailsettings.php:493 actions/smssettings.php:568
+#: actions/emailsettings.php:497 actions/smssettings.php:568
 msgid "No incoming email address."
 msgstr "Ingen innkomande epostadresse."
 
 #. 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/emailsettings.php:508 actions/emailsettings.php:532
 #: actions/smssettings.php:578 actions/smssettings.php:602
 msgid "Couldn't update user record."
 msgstr "Kan ikkje oppdatera brukarinformajon."
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
-#: actions/emailsettings.php:508 actions/smssettings.php:581
+#: actions/emailsettings.php:512 actions/smssettings.php:581
 msgid "Incoming email address removed."
 msgstr "Fjerna innkomande epostadresse."
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
-#: actions/emailsettings.php:532 actions/smssettings.php:605
+#: actions/emailsettings.php:536 actions/smssettings.php:605
 msgid "New incoming email address added."
 msgstr "La til ny innkomande epostadresse."
 
@@ -1174,11 +1141,6 @@ msgstr "Profilerte folk"
 msgid "Featured users, page %d"
 msgstr "Profilerte folk, side %d"
 
-#: actions/featured.php:99
-#, php-format
-msgid "A selection of some great users on %s"
-msgstr ""
-
 #: actions/file.php:34
 msgid "No notice ID."
 msgstr "Denne notisen finst ikkje."
@@ -1191,10 +1153,6 @@ msgstr "Denne notisen finst ikkje."
 msgid "Not expecting this response!"
 msgstr "Venta ikkje dette svaret!"
 
-#: actions/finishremotesubscribe.php:80
-msgid "User being listened to does not exist."
-msgstr ""
-
 #: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59
 msgid "You can use the local subscription!"
 msgstr "Du kan nytta det lokale abonnementet!"
@@ -1207,14 +1165,6 @@ msgstr "Brukaren tillet deg ikkje Ã¥ tinga meldingane sine."
 msgid "You are not authorized."
 msgstr "Du tingar ikkje oppdateringar til den profilen."
 
-#: actions/finishremotesubscribe.php:113
-msgid "Could not convert request token to access token."
-msgstr ""
-
-#: actions/finishremotesubscribe.php:118
-msgid "Remote service uses unknown version of OMB protocol."
-msgstr ""
-
 #: actions/grantrole.php:66 actions/revokerole.php:66
 msgid "This role is reserved and cannot be set."
 msgstr ""
@@ -1281,32 +1231,28 @@ msgstr "Logo oppdatert."
 msgid "Failed updating logo."
 msgstr "Feil ved oppdatering av logo."
 
-#: actions/groupmembers.php:100 lib/groupnav.php:92
+#. TRANS: Title of the page showing group members.
+#. TRANS: %s is the name of the group.
+#: actions/groupmembers.php:102
 #, php-format
 msgid "%s group members"
 msgstr "%s medlemmar i gruppa"
 
-#: actions/groupmembers.php:103
+#. TRANS: Title of the page showing group members.
+#. TRANS: %1$s is the name of the group, %2$d is the page number of the members list.
+#: actions/groupmembers.php:107
 #, php-format
 msgid "%1$s group members, page %2$d"
 msgstr "%s medlemmar i gruppa"
 
-#: actions/groupmembers.php:118
+#: actions/groupmembers.php:122
 msgid "A list of the users in this group."
 msgstr "Ei liste over brukarane i denne gruppa."
 
-#: actions/groupmembers.php:182 lib/groupnav.php:107
+#: actions/groupmembers.php:186
 msgid "Admin"
 msgstr "Administrator"
 
-#: actions/groupmembers.php:392 lib/blockform.php:69
-msgid "Block"
-msgstr "BlokkÃ©r"
-
-#: actions/groupmembers.php:519
-msgid "Make this user an admin"
-msgstr ""
-
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Title in atom group notice feed. %s is a group name.
 #. TRANS: Title in atom user notice feed. %s is a user name.
@@ -1388,11 +1334,6 @@ msgstr ""
 "Du kan sende og motta meldingar gjennom Jabber/GTalk [direktemeldingar](%%"
 "doc.im%%).  Set opp adressa og innstillingar under."
 
-#. 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 ""
-
 #. 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
@@ -1416,7 +1357,10 @@ msgstr ""
 
 #. TRANS: IM address input field instructions in IM settings form.
 #. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:140
+#. TRANS: Do not translate "example.org". It is one of the domain names reserved for use in examples by
+#. TRANS: http://www.rfc-editor.org/rfc/rfc2606.txt. Any other domain may be owned by a legitimate
+#. TRANS: person or organization.
+#: actions/imsettings.php:143
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -1426,63 +1370,63 @@ msgstr ""
 "leggja %s til venelista di i ljonmeldingsklienten din."
 
 #. TRANS: Form legend for IM preferences form.
-#: actions/imsettings.php:155
+#: actions/imsettings.php:158
 msgid "IM preferences"
 msgstr "Lagra brukarval."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:160
+#: actions/imsettings.php:163
 msgid "Send me notices through Jabber/GTalk."
 msgstr "Send meg ein notis via Jabber/GTalk."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:166
+#: actions/imsettings.php:169
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr "Legg til ein notis nÃ¥r min Jabber/GTalk status forandrar seg."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:172
+#: actions/imsettings.php:175
 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Ã¥."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:179
+#: actions/imsettings.php:182
 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "Publiser ein MicroID for Jabber/GTalk addressene mine"
 
 #. TRANS: Confirmation message for successful IM preferences save.
-#: actions/imsettings.php:287 actions/othersettings.php:180
+#: actions/imsettings.php:290 actions/othersettings.php:180
 msgid "Preferences saved."
 msgstr "Lagra brukarval."
 
 #. TRANS: Message given saving IM address without having provided one.
-#: actions/imsettings.php:309
+#: actions/imsettings.php:312
 msgid "No Jabber ID."
 msgstr "Nei Jabber-ID"
 
 #. TRANS: Message given saving IM address that cannot be normalised.
-#: actions/imsettings.php:317
+#: actions/imsettings.php:320
 msgid "Cannot normalize that Jabber ID"
 msgstr "Klarar ikkje normalisera Jabber-IDen"
 
 #. TRANS: Message given saving IM address that not valid.
-#: actions/imsettings.php:322
+#: actions/imsettings.php:325
 msgid "Not a valid Jabber ID"
 msgstr "Ikkje ein gyldig Jabber-ID"
 
 #. TRANS: Message given saving IM address that is already set.
-#: actions/imsettings.php:326
+#: actions/imsettings.php:329
 msgid "That is already your Jabber ID."
 msgstr "Det er alt din Jabber ID."
 
 #. TRANS: Message given saving IM address that is already set for another user.
-#: actions/imsettings.php:330
+#: actions/imsettings.php:333
 msgid "Jabber ID already belongs to another user."
 msgstr "Jabber-ID tilhÃ¸yrer allereie ein annan brukar."
 
 #. 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
+#: actions/imsettings.php:361
 #, php-format
 msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
@@ -1492,23 +1436,23 @@ msgstr ""
 "for Ã¥ senda meldinger til deg."
 
 #. TRANS: Message given canceling IM address confirmation for the wrong IM address.
-#: actions/imsettings.php:388
+#: actions/imsettings.php:391
 msgid "That is the wrong IM address."
 msgstr "Det er feil lynmeldings addresse."
 
 #. TRANS: Message given after successfully canceling IM address confirmation.
-#: actions/imsettings.php:402
+#: actions/imsettings.php:405
 msgid "IM confirmation cancelled."
 msgstr "Ingen stadfestingskode."
 
 #. TRANS: Message given trying to remove an IM address that is not
 #. TRANS: registered for the active user.
-#: actions/imsettings.php:424
+#: actions/imsettings.php:427
 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
+#: actions/imsettings.php:450
 msgid "The IM address was removed."
 msgstr "Fjerna innkomande epostadresse."
 
@@ -1595,12 +1539,6 @@ msgstr "Personleg melding"
 msgid "Optionally add a personal message to the invitation."
 msgstr "Eventuelt legg til ei personleg melding til invitasjonen."
 
-#. TRANS: Send button for inviting friends
-#: actions/invite.php:198
-msgctxt "BUTTON"
-msgid "Send"
-msgstr ""
-
 #. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English.
 #: actions/invite.php:228
 #, php-format
@@ -1714,21 +1652,10 @@ msgstr ""
 "Skriv inn brukarnam og passord fÃ¸r du endrar innstillingar (av "
 "tryggleiksomsyn)."
 
-#: actions/login.php:295
-#, php-format
-msgid ""
-"Don't have a username yet? [Register](%%action.register%%) a new account."
-msgstr ""
-
 #: actions/makeadmin.php:92
 msgid "Only an admin can make another user an admin."
 msgstr ""
 
-#: actions/makeadmin.php:133
-#, php-format
-msgid "Can't get membership record for %1$s in group %2$s."
-msgstr ""
-
 #: actions/newapplication.php:176
 msgid "Source URL is required."
 msgstr ""
@@ -1813,21 +1740,11 @@ msgid ""
 "[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
 msgstr ""
 
-#: actions/noticesearchrss.php:96
-#, php-format
-msgid "Updates with \"%s\""
-msgstr ""
-
 #: actions/noticesearchrss.php:98
 #, php-format
 msgid "Updates matching search term \"%1$s\" on %2$s!"
 msgstr "Oppdateringar frÃ¥ %1$s pÃ¥ %2$s!"
 
-#: actions/nudge.php:85
-msgid ""
-"This user doesn't allow nudges or hasn't confirmed or set their email yet."
-msgstr ""
-
 #: actions/nudge.php:94
 msgid "Nudge sent"
 msgstr "Dytta!"
@@ -1844,6 +1761,15 @@ msgstr "Du mÃ¥ vÃ¦re logga inn for Ã¥ bli med i ei gruppe."
 msgid "Applications you have registered"
 msgstr ""
 
+#: actions/oauthappssettings.php:135
+#, php-format
+msgid "You have not registered any applications yet."
+msgstr ""
+
+#: actions/oauthconnectionssettings.php:72
+msgid "Connected applications"
+msgstr ""
+
 #: actions/oauthconnectionssettings.php:83
 msgid "You have allowed the following applications to access you account."
 msgstr ""
@@ -1870,12 +1796,6 @@ msgstr "Brukaren har inga profil."
 msgid "%1$s's status on %2$s"
 msgstr "%1$s sin status pÃ¥ %2$s"
 
-#. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
-#: actions/oembed.php:159
-#, php-format
-msgid "Content type %s not supported."
-msgstr ""
-
 #. TRANS: Error message displaying attachments. %s is the site's base URL.
 #: actions/oembed.php:163
 #, php-format
@@ -1883,8 +1803,8 @@ msgid "Only %s URLs over plain HTTP please."
 msgstr ""
 
 #. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1215
-#: lib/apiaction.php:1243 lib/apiaction.php:1366
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1206
+#: lib/apiaction.php:1233 lib/apiaction.php:1356
 msgid "Not a supported data format."
 msgstr "Ikkje eit stÃ¸tta dataformat."
 
@@ -1999,7 +1919,7 @@ msgid "Password saved."
 msgstr "Lagra passord."
 
 #. TRANS: Menu item for site administration
-#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:384
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:371
 msgid "Paths"
 msgstr ""
 
@@ -2007,26 +1927,6 @@ msgstr ""
 msgid "Path and server settings for this StatusNet site."
 msgstr ""
 
-#: actions/pathsadminpanel.php:157
-#, php-format
-msgid "Theme directory not readable: %s."
-msgstr ""
-
-#: actions/pathsadminpanel.php:163
-#, php-format
-msgid "Avatar directory not writable: %s."
-msgstr ""
-
-#: actions/pathsadminpanel.php:169
-#, php-format
-msgid "Background directory not writable: %s."
-msgstr ""
-
-#: actions/pathsadminpanel.php:177
-#, php-format
-msgid "Locales directory not readable: %s."
-msgstr ""
-
 #: actions/pathsadminpanel.php:183
 msgid "Invalid SSL server. The maximum length is 255 characters."
 msgstr ""
@@ -2063,6 +1963,10 @@ msgstr ""
 msgid "Theme"
 msgstr ""
 
+#: actions/pathsadminpanel.php:264
+msgid "Theme server"
+msgstr ""
+
 #: actions/pathsadminpanel.php:268
 msgid "Theme path"
 msgstr ""
@@ -2071,10 +1975,6 @@ msgstr ""
 msgid "Theme directory"
 msgstr ""
 
-#: actions/pathsadminpanel.php:292
-msgid "Avatar directory"
-msgstr ""
-
 #: actions/pathsadminpanel.php:301
 msgid "Backgrounds"
 msgstr ""
@@ -2115,10 +2015,6 @@ msgstr "Tenar"
 msgid "Server to direct SSL requests to"
 msgstr ""
 
-#: actions/pathsadminpanel.php:352
-msgid "Save paths"
-msgstr ""
-
 #: actions/peoplesearch.php:52
 #, php-format
 msgid ""
@@ -2174,7 +2070,7 @@ msgstr "Fullt namn"
 
 #. TRANS: Form input field label.
 #: actions/profilesettings.php:115 actions/register.php:460
-#: lib/applicationeditform.php:244 lib/groupeditform.php:161
+#: lib/applicationeditform.php:235 lib/groupeditform.php:161
 msgid "Homepage"
 msgstr "Heimeside"
 
@@ -2182,15 +2078,6 @@ msgstr "Heimeside"
 msgid "URL of your homepage, blog, or profile on another site"
 msgstr "URL til heimesida di, bloggen din, eller ein profil pÃ¥ ei anna side."
 
-#: actions/profilesettings.php:122 actions/register.php:468
-#, php-format
-msgid "Describe yourself and your interests in %d chars"
-msgstr ""
-
-#: actions/profilesettings.php:125 actions/register.php:471
-msgid "Describe yourself and your interests"
-msgstr ""
-
 #: actions/profilesettings.php:127 actions/register.php:473
 msgid "Bio"
 msgstr "Om meg"
@@ -2271,7 +2158,7 @@ msgid "Couldn't save tags."
 msgstr "Kan ikkje lagra merkelapp."
 
 #. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:391 lib/adminpanelaction.php:141
+#: actions/profilesettings.php:391 lib/adminpanelaction.php:138
 msgid "Settings saved."
 msgstr "Lagra innstillingar."
 
@@ -2293,10 +2180,6 @@ msgstr "Offentleg tidsline, side %d"
 msgid "Public timeline"
 msgstr "Offentleg tidsline"
 
-#: actions/public.php:168
-msgid "Public Stream Feed (Atom)"
-msgstr ""
-
 #: actions/public.php:188
 #, php-format
 msgid ""
@@ -2323,14 +2206,6 @@ msgid ""
 "friends, family, and colleagues! ([Read more](%%doc.help%%))"
 msgstr ""
 
-#: actions/public.php:247
-#, php-format
-msgid ""
-"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
-"blogging) service based on the Free Software [StatusNet](http://status.net/) "
-"tool."
-msgstr ""
-
 #: actions/publictagcloud.php:57
 msgid "Public tag cloud"
 msgstr "Offentleg emne sky"
@@ -2552,33 +2427,6 @@ msgstr ""
 msgid "All rights reserved."
 msgstr ""
 
-#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:540
-#, php-format
-msgid ""
-"My text and files are available under %s except this private data: password, "
-"email address, IM address, and phone number."
-msgstr ""
-
-#: actions/register.php:583
-#, php-format
-msgid ""
-"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
-"want to...\n"
-"\n"
-"* Go to [your profile](%2$s) and post your first message.\n"
-"* Add a [Jabber/GTalk address](%%%%action.imsettings%%%%) so you can send "
-"notices through instant messages.\n"
-"* [Search for people](%%%%action.peoplesearch%%%%) that you may know or that "
-"share your interests. \n"
-"* Update your [profile settings](%%%%action.profilesettings%%%%) to tell "
-"others more about you. \n"
-"* Read over the [online docs](%%%%doc.help%%%%) for features you may have "
-"missed. \n"
-"\n"
-"Thanks for signing up and we hope you enjoy using this service."
-msgstr ""
-
 #: actions/register.php:607
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
@@ -2628,18 +2476,6 @@ msgstr "Ting"
 msgid "Invalid profile URL (bad format)"
 msgstr "Ugyldig profil-nettadresse (feil format)"
 
-#: actions/remotesubscribe.php:168
-msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
-msgstr ""
-
-#: actions/remotesubscribe.php:176
-msgid "Thatâs a local profile! Login to subscribe."
-msgstr ""
-
-#: actions/remotesubscribe.php:183
-msgid "Couldnât get a request token."
-msgstr ""
-
 #: actions/repeat.php:114 lib/noticelist.php:676
 msgid "Repeated"
 msgstr "Framheva"
@@ -2691,7 +2527,7 @@ msgstr "Statistikk"
 
 #. TRANS: Menu item for site administration
 #: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
-#: lib/adminpanelaction.php:392
+#: lib/adminpanelaction.php:379
 msgid "Sessions"
 msgstr ""
 
@@ -2716,13 +2552,13 @@ msgid "Turn on debugging output for sessions."
 msgstr ""
 
 #. TRANS: Form input field label for application icon.
-#: actions/showapplication.php:159 lib/applicationeditform.php:182
+#: actions/showapplication.php:159 lib/applicationeditform.php:173
 msgid "Icon"
 msgstr ""
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:216 lib/groupeditform.php:172
+#: lib/applicationeditform.php:207 lib/groupeditform.php:172
 msgid "Description"
 msgstr "Beskriving"
 
@@ -2736,10 +2572,18 @@ msgstr "Statistikk"
 msgid "Created by %1$s - %2$s access by default - %3$d users"
 msgstr ""
 
+#: actions/showapplication.php:213
+msgid "Application actions"
+msgstr ""
+
 #: actions/showapplication.php:236
 msgid "Reset key & secret"
 msgstr ""
 
+#: actions/showapplication.php:261
+msgid "Application info"
+msgstr ""
+
 #: actions/showapplication.php:263
 msgid "Consumer key"
 msgstr ""
@@ -2810,7 +2654,7 @@ msgstr ""
 msgid "This is a way to share what you like."
 msgstr ""
 
-#: actions/showgroup.php:82 lib/groupnav.php:86
+#: actions/showgroup.php:82
 #, php-format
 msgid "%s group"
 msgstr "%s gruppe"
@@ -2862,7 +2706,7 @@ msgstr "Notisstraum for %s"
 msgid "FOAF for %s group"
 msgstr "Utboks for %s"
 
-#: actions/showgroup.php:393 actions/showgroup.php:445 lib/groupnav.php:91
+#: actions/showgroup.php:393 actions/showgroup.php:445
 msgid "Members"
 msgstr "Medlemmar"
 
@@ -2890,15 +2734,6 @@ msgid ""
 "of this group and many more! ([Read more](%%%%doc.help%%%%))"
 msgstr ""
 
-#: actions/showgroup.php:461
-#, php-format
-msgid ""
-"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
-"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
-"[StatusNet](http://status.net/) tool. Its members share short messages about "
-"their life and interests. "
-msgstr ""
-
 #: actions/showmessage.php:81
 msgid "No such message."
 msgstr "Kan ikkje finne den meldinga."
@@ -2964,14 +2799,6 @@ msgid ""
 "follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))"
 msgstr ""
 
-#: actions/showstream.php:248
-#, php-format
-msgid ""
-"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
-"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
-"[StatusNet](http://status.net/) tool. "
-msgstr ""
-
 #: actions/siteadminpanel.php:69
 msgid "Basic settings for this StatusNet site"
 msgstr ""
@@ -3073,11 +2900,6 @@ msgstr "Avatar-innstillingar"
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr "Du kan motta SMS-meldingar gjennom e-post frÃ¥ %%site.name%%."
 
-#. 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 ""
-
 #. TRANS: Form legend for SMS settings form.
 #: actions/smssettings.php:111
 msgid "SMS address"
@@ -3200,7 +3022,7 @@ msgstr "Ingen innskriven kode"
 
 #. TRANS: Menu item for site administration
 #: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
-#: lib/adminpanelaction.php:408
+#: lib/adminpanelaction.php:395
 msgid "Snapshots"
 msgstr ""
 
@@ -3208,6 +3030,10 @@ msgstr ""
 msgid "Manage snapshot configuration"
 msgstr "Stadfesting av epostadresse"
 
+#: actions/snapshotadminpanel.php:127
+msgid "Invalid snapshot run value."
+msgstr ""
+
 #: actions/snapshotadminpanel.php:133
 msgid "Snapshot frequency must be a number."
 msgstr ""
@@ -3359,10 +3185,6 @@ msgstr "Straum for vener av %s"
 msgid "Notice feed for tag %s (RSS 2.0)"
 msgstr "Straum for vener av %s"
 
-#: actions/tagother.php:39
-msgid "No ID argument."
-msgstr ""
-
 #: actions/tagother.php:65
 #, php-format
 msgid "Tag %s"
@@ -3479,17 +3301,6 @@ msgstr ""
 msgid "Authorize subscription"
 msgstr "Autoriser tinging"
 
-#: actions/userauthorization.php:110
-msgid ""
-"Please check these details to make sure that you want to subscribe to this "
-"userâs notices. If you didnât just ask to subscribe to someoneâs notices, "
-"click âRejectâ."
-msgstr ""
-
-#: actions/userauthorization.php:196 actions/version.php:167
-msgid "License"
-msgstr ""
-
 #: actions/userauthorization.php:217
 msgid "Accept"
 msgstr "Godta"
@@ -3511,24 +3322,10 @@ msgstr "Ingen autoriserings-spÃ¸rjing!"
 msgid "Subscription authorized"
 msgstr "Tinging autorisert"
 
-#: actions/userauthorization.php:256
-msgid ""
-"The subscription has been authorized, but no callback URL was passed. Check "
-"with the siteâs instructions for details on how to authorize the "
-"subscription. Your subscription token is:"
-msgstr ""
-
 #: actions/userauthorization.php:266
 msgid "Subscription rejected"
 msgstr "Tinging avvist"
 
-#: actions/userauthorization.php:268
-msgid ""
-"The subscription has been rejected, but no callback URL was passed. Check "
-"with the siteâs instructions for details on how to fully reject the "
-"subscription."
-msgstr ""
-
 #: actions/userauthorization.php:303
 #, php-format
 msgid "Listener URI â%sâ not found here."
@@ -3554,16 +3351,6 @@ msgstr ""
 msgid "Avatar URL â%sâ is not valid."
 msgstr ""
 
-#: actions/userauthorization.php:350
-#, php-format
-msgid "Canât read avatar URL â%sâ."
-msgstr ""
-
-#: actions/userauthorization.php:355
-#, php-format
-msgid "Wrong image type for avatar URL â%sâ."
-msgstr ""
-
 #: actions/userdesignsettings.php:87 lib/designsettings.php:76
 msgid ""
 "Customize the way your profile looks with a background image and a colour "
@@ -3580,10 +3367,6 @@ msgstr ""
 msgid "%1$s groups, page %2$d"
 msgstr "Grupper, side %d"
 
-#: actions/usergroups.php:132
-msgid "Search for more groups"
-msgstr ""
-
 #: actions/usergroups.php:164
 #, php-format
 msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
@@ -3838,24 +3621,12 @@ msgstr "Ingen tittel"
 msgid "Primary site navigation"
 msgstr "Navigasjon for hovudsida"
 
-#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:455
-msgctxt "TOOLTIP"
-msgid "Personal profile and friends timeline"
-msgstr ""
-
 #. TRANS: Tooltip for main menu option "Account"
 #: lib/action.php:460
 msgctxt "TOOLTIP"
 msgid "Change your email, avatar, password, profile"
 msgstr "Endra passordet ditt"
 
-#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:465
-msgctxt "TOOLTIP"
-msgid "Connect to services"
-msgstr ""
-
 #. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
 #: lib/action.php:468
 msgid "Connect"
@@ -3891,15 +3662,9 @@ msgctxt "TOOLTIP"
 msgid "Help me!"
 msgstr "Hjelp"
 
-#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:513
-msgctxt "TOOLTIP"
-msgid "Search for people or text"
-msgstr ""
-
 #. TRANS: DT element for site notice. String is hidden in default CSS.
 #. TRANS: Menu item for site administration
-#: lib/action.php:538 lib/adminpanelaction.php:400
+#: lib/action.php:538 lib/adminpanelaction.php:387
 msgid "Site notice"
 msgstr "Statusmelding"
 
@@ -3958,22 +3723,17 @@ msgstr "Kontakt"
 msgid "StatusNet software license"
 msgstr "StatusNets programvarelisens"
 
-#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
-#: lib/action.php:843
-#, php-format
-msgid ""
-"**%%site.name%%** is a microblogging service brought to you by [%%site."
-"broughtby%%](%%site.broughtbyurl%%)."
-msgstr ""
-
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:846
+#: lib/action.php:849
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** er ei mikrobloggingteneste."
 
 #. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.
-#: lib/action.php:850
+#. TRANS: Make sure there is no whitespace between "]" and "(".
+#. TRANS: Text between [] is a link description, text between () is the link itself.
+#. TRANS: %s is the version of StatusNet that is being used.
+#: lib/action.php:856
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -3986,43 +3746,44 @@ msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:873
+#: lib/action.php:879
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:880
+#: lib/action.php:886
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:884
+#: lib/action.php:890
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 
-#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:897
+#. TRANS: license message in footer.
+#. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
+#: lib/action.php:904
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr ""
 
 #. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1236
+#: lib/action.php:1243
 msgid "Pagination"
 msgstr "Paginering"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1247
+#: lib/action.php:1254
 msgid "After"
 msgstr "Â« Etter"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1257
+#: lib/action.php:1264
 msgid "Before"
 msgstr "FÃ¸r Â»"
 
@@ -4031,106 +3792,143 @@ msgstr "FÃ¸r Â»"
 msgid "Expecting a root feed element but got a whole XML document."
 msgstr ""
 
-#: lib/activityutils.php:208
+#. TRANS: Client exception thrown when there is no source attribute.
+#: lib/activityutils.php:203
 msgid "Can't handle remote content yet."
 msgstr ""
 
-#: lib/activityutils.php:244
+#. TRANS: Client exception thrown when there embedded XML content is found that cannot be processed yet.
+#: lib/activityutils.php:240
 msgid "Can't handle embedded XML content yet."
 msgstr ""
 
-#: lib/activityutils.php:248
+#. TRANS: Client exception thrown when base64 encoded content is found that cannot be processed yet.
+#: lib/activityutils.php:245
 msgid "Can't handle embedded Base64 content yet."
 msgstr ""
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:360
-msgctxt "MENU"
-msgid "Design"
-msgstr ""
-
-#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:368 lib/personalgroupnav.php:115
+#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:115
 msgid "User"
 msgstr "Brukar"
 
 #. TRANS: Client error 401.
-#: lib/apiauth.php:113
+#: lib/apiauth.php:111
 msgid "API resource requires read-write access, but you only have read access."
 msgstr ""
 
+#. TRANS: OAuth exception thrown when no application is found for a given consumer key.
+#: lib/apiauth.php:175
+msgid "No application for that consumer key."
+msgstr ""
+
+#. TRANS: OAuth exception given when an incorrect access token was given for a user.
+#: lib/apiauth.php:212
+msgid "Bad access token."
+msgstr ""
+
+#. TRANS: OAuth exception given when no user was found for a given token (no token was found).
+#: lib/apiauth.php:217
+msgid "No user for that token."
+msgstr ""
+
+#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
+#: lib/apioauthstore.php:178
+msgid "Tried to revoke unknown token"
+msgstr ""
+
+#. TRANS: Exception thrown when an attempt is made to remove a revoked token.
+#: lib/apioauthstore.php:182
+msgid "Failed to delete revoked token"
+msgstr ""
+
+#. TRANS: Form legend.
+#: lib/applicationeditform.php:129
+msgid "Edit application"
+msgstr ""
+
+#. TRANS: Form guide.
+#: lib/applicationeditform.php:178
+msgid "Icon for this application"
+msgstr ""
+
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:213
+#: lib/applicationeditform.php:204
 msgid "Describe your application"
 msgstr "Beskriving"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:233
+#: lib/applicationeditform.php:224
 msgid "Organization responsible for this application"
 msgstr ""
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:251
+#: lib/applicationeditform.php:242
 msgid "URL to redirect to after authentication"
 msgstr ""
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:278
+#: lib/applicationeditform.php:269
 msgid "Browser"
 msgstr ""
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:295
+#: lib/applicationeditform.php:286
 msgid "Desktop"
 msgstr ""
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:297
+#: lib/applicationeditform.php:288
 msgid "Type of application, browser or desktop"
 msgstr ""
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:320
+#: lib/applicationeditform.php:311
 msgid "Read-only"
 msgstr ""
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:339
+#: lib/applicationeditform.php:330
 msgid "Read-write"
 msgstr ""
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:341
+#: lib/applicationeditform.php:332
 msgid "Default access for this application: read-only, or read-write"
 msgstr ""
 
-#. TRANS: Submit button title
-#: lib/applicationeditform.php:359
+#. TRANS: Submit button title.
+#: lib/applicationeditform.php:349
 msgid "Cancel"
 msgstr "Avbryt"
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:136
+#: lib/applicationlist.php:135
 msgid "read-write"
 msgstr ""
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:138
+#: lib/applicationlist.php:137
 msgid "read-only"
 msgstr ""
 
 #. 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
+#: lib/applicationlist.php:143
 #, php-format
 msgid "Approved %1$s - \"%2$s\" access."
 msgstr ""
 
 #. TRANS: Button label
-#: lib/applicationlist.php:159
+#: lib/applicationlist.php:158
 msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "Gjenopprett"
 
+#. TRANS: DT element label in attachment list.
+#: lib/attachmentlist.php:88
+msgid "Attachments"
+msgstr ""
+
 #. TRANS: DT element label in attachment list item.
 #: lib/attachmentlist.php:265
 msgid "Author"
@@ -4141,10 +3939,21 @@ msgstr ""
 msgid "Provider"
 msgstr "Forhandsvis"
 
-#: lib/attachmentnoticesection.php:67
+#. TRANS: Title.
+#: lib/attachmentnoticesection.php:68
 msgid "Notices where this attachment appears"
 msgstr ""
 
+#. TRANS: Title.
+#: lib/attachmenttagcloudsection.php:49
+msgid "Tags for this attachment"
+msgstr ""
+
+#. TRANS: Title for the form to block a user.
+#: lib/blockform.php:70
+msgid "Block"
+msgstr "BlokkÃ©r"
+
 #: lib/channel.php:157 lib/channel.php:177
 msgid "Command results"
 msgstr "Resultat frÃ¥ kommandoen"
@@ -4157,6 +3966,13 @@ msgstr "Kommandoen utfÃ¸rd"
 msgid "Command failed"
 msgstr "Kommandoen feila"
 
+#. TRANS: Message given getting a non-existing user.
+#. TRANS: %s is the nickname of the user that could not be found.
+#: lib/command.php:150
+#, php-format
+msgid "Could not find a local user with nickname %s."
+msgstr ""
+
 #. TRANS: Error text shown when an unimplemented command is given.
 #: lib/command.php:185
 msgid "Sorry, this command is not yet implemented."
@@ -4184,6 +4000,20 @@ msgstr ""
 msgid "Notice marked as fave."
 msgstr "Notis markert som favoritt."
 
+#. 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.
+#: lib/command.php:360
+#, php-format
+msgid "%1$s joined group %2$s."
+msgstr ""
+
+#. 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.
+#: lib/command.php:408
+#, php-format
+msgid "%1$s left group %2$s."
+msgstr ""
+
 #. TRANS: Whois output. %s is the full name of the queried user.
 #: lib/command.php:434
 #, php-format
@@ -4218,13 +4048,6 @@ msgid ""
 "same server."
 msgstr ""
 
-#. 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:491 lib/xmppmanager.php:403
-#, php-format
-msgid "Message too long - maximum is %1$d characters, you sent %2$d."
-msgstr ""
-
 #. TRANS: Error text shown sending a direct message fails with an unknown reason.
 #: lib/command.php:517
 msgid "Error sending direct message."
@@ -4235,22 +4058,18 @@ msgstr "Ein feil oppstod ved sending av direkte melding."
 msgid "Error repeating notice."
 msgstr "Feil ved Ã¥ setja brukar."
 
-#. TRANS: Message given if content of a notice for a reply is too long.
-#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:592
+#. TRANS: Text shown after having subscribed to another user successfully.
+#. TRANS: %s is the name of the user the subscription was requested for.
+#: lib/command.php:672
 #, php-format
-msgid "Notice too long - maximum is %1$d characters, you sent %2$d."
+msgid "Subscribed to %s."
 msgstr ""
 
-#. TRANS: Error text shown when no username was provided when issuing a subscribe command.
-#: lib/command.php:655
-msgid "Specify the name of the user to subscribe to."
-msgstr ""
-
-#. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
-#. TRANS: Error text shown when no username was provided when issuing the command.
-#: lib/command.php:694 lib/command.php:804
-msgid "Specify the name of the user to unsubscribe from."
+#. TRANS: Text shown after having unsubscribed from another user successfully.
+#. TRANS: %s is the name of the user the unsubscription was requested for.
+#: lib/command.php:705
+#, php-format
+msgid "Unsubscribed from %s."
 msgstr ""
 
 #. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
@@ -4291,8 +4110,15 @@ msgstr ""
 msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr ""
 
+#. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
+#. TRANS: %s is the name of the user the unsubscription was requested for.
+#: lib/command.php:813
+#, php-format
+msgid "Unsubscribed %s."
+msgstr ""
+
 #. TRANS: Text shown after requesting other users a user is subscribed to.
-#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.
 #: lib/command.php:836
 msgid "You are subscribed to this person:"
@@ -4301,7 +4127,7 @@ msgstr[0] "Du tingar allereie oppdatering frÃ¥ desse brukarane:"
 msgstr[1] "Du tingar allereie oppdatering frÃ¥ desse brukarane:"
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
-#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
 #: lib/command.php:863
 msgid "This person is subscribed to you:"
@@ -4310,7 +4136,7 @@ msgstr[0] "Kan ikkje tinga andre til deg."
 msgstr[1] "Kan ikkje tinga andre til deg."
 
 #. TRANS: Text shown after requesting groups a user is subscribed to.
-#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
 #: lib/command.php:890
 msgid "You are a member of this group:"
@@ -4318,6 +4144,7 @@ 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."
 
+#. TRANS: Help text for commands.
 #: lib/command.php:905
 msgid ""
 "Commands:\n"
@@ -4397,6 +4224,10 @@ msgid ""
 "You can upload your personal background image. The maximum file size is 2MB."
 msgstr "Du kan lasta opp ein logo for gruppa."
 
+#: lib/designsettings.php:418
+msgid "Design defaults restored."
+msgstr ""
+
 #: lib/disfavorform.php:114 lib/disfavorform.php:140
 msgid "Disfavor this notice"
 msgstr "Fjern favoriseringsmerket"
@@ -4458,11 +4289,6 @@ msgstr ""
 msgid "URL of the homepage or blog of the group or topic"
 msgstr "URL til heimesida eller bloggen for gruppa eller emnet"
 
-#: lib/groupeditform.php:170
-#, php-format
-msgid "Describe the group or topic in %d characters"
-msgstr ""
-
 #: lib/groupeditform.php:179
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\""
@@ -4473,24 +4299,6 @@ msgstr "Kvar er du, t.d. Â«Stavanger, Rogaland, NoregÂ»"
 msgid "Extra nicknames for the group, comma- or space- separated, max %d"
 msgstr ""
 
-#: lib/groupnav.php:85
-msgid "Group"
-msgstr "Gruppe"
-
-#: lib/groupnav.php:108
-#, php-format
-msgid "Edit %s group properties"
-msgstr "Rediger %s gruppa sine eigenskapar"
-
-#: lib/groupnav.php:113
-msgid "Logo"
-msgstr "Logo"
-
-#: lib/groupnav.php:114
-#, php-format
-msgid "Add or edit %s logo"
-msgstr "Legg til eller rediger logoen til %s"
-
 #: lib/groupsbymemberssection.php:71
 msgid "Groups with most members"
 msgstr "Grupper med flest medlemmar"
@@ -4517,7 +4325,8 @@ msgstr "StÃ¸ttar ikkje bileteformatet."
 msgid "Partial upload."
 msgstr "Hallvegs opplasta."
 
-#: lib/imagefile.php:101 lib/mediafile.php:170
+#. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
+#: lib/imagefile.php:101 lib/mediafile.php:179
 msgid "System error uploading file."
 msgstr "Systemfeil ved opplasting av fil."
 
@@ -4603,22 +4412,6 @@ msgid ""
 "your subscribers list and report as spam to site administrators at %s"
 msgstr ""
 
-#. TRANS: Main body of new-subscriber notification e-mail
-#: lib/mail.php:254
-#, php-format
-msgid ""
-"%1$s is now listening to your notices on %2$s.\n"
-"\n"
-"\t%3$s\n"
-"\n"
-"%4$s%5$s%6$s\n"
-"Faithfully yours,\n"
-"%7$s.\n"
-"\n"
-"----\n"
-"Change your email address or notification options at %8$s\n"
-msgstr ""
-
 #. TRANS: Profile info line in new-subscriber notification e-mail
 #: lib/mail.php:274
 #, php-format
@@ -4750,6 +4543,11 @@ msgid ""
 "\t%s"
 msgstr ""
 
+#: lib/mail.php:657
+#, php-format
+msgid "%s (@%s) sent a notice to your attention"
+msgstr ""
+
 #. TRANS: Body of @-reply notification e-mail.
 #: lib/mail.php:660
 #, php-format
@@ -4788,10 +4586,6 @@ msgid ""
 "users in conversation. People can send you messages for your eyes only."
 msgstr ""
 
-#: lib/mailbox.php:228 lib/noticelist.php:506
-msgid "from"
-msgstr ""
-
 #: lib/mailhandler.php:37
 msgid "Could not parse message."
 msgstr "Kunne ikkje prosessera melding."
@@ -4808,56 +4602,75 @@ msgstr "Beklager, det er ikkje di inngÃ¥ande epost addresse."
 msgid "Sorry, no incoming email allowed."
 msgstr "Beklager, inngÃ¥ande epost er ikkje tillatt."
 
-#: lib/mediafile.php:98 lib/mediafile.php:123
+#. TRANS: Client exception thrown when a database error was thrown during a file upload operation.
+#: lib/mediafile.php:99 lib/mediafile.php:125
 msgid "There was a database error while saving your file. Please try again."
 msgstr ""
 
-#: lib/mediafile.php:142
+#. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
+#: lib/mediafile.php:145
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
 msgstr ""
 
-#: lib/mediafile.php:147
+#. TRANS: Client exception.
+#: lib/mediafile.php:151
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form."
 msgstr ""
 
-#: lib/mediafile.php:152
+#. TRANS: Client exception.
+#: lib/mediafile.php:157
 msgid "The uploaded file was only partially uploaded."
 msgstr ""
 
-#: lib/mediafile.php:159
+#. TRANS: Client exception thrown when a temporary folder is not present to store a file upload.
+#: lib/mediafile.php:165
 msgid "Missing a temporary folder."
 msgstr ""
 
-#: lib/mediafile.php:162
+#. TRANS: Client exception thrown when writing to disk is not possible during a file upload operation.
+#: lib/mediafile.php:169
 msgid "Failed to write file to disk."
 msgstr ""
 
-#: lib/mediafile.php:165
+#. TRANS: Client exception thrown when a file upload operation has been stopped by an extension.
+#: lib/mediafile.php:173
 msgid "File upload stopped by extension."
 msgstr ""
 
-#: lib/mediafile.php:179 lib/mediafile.php:217
+#. TRANS: Client exception thrown when a file upload operation would cause a user to exceed a set quota.
+#: lib/mediafile.php:189 lib/mediafile.php:232
 msgid "File exceeds user's quota."
 msgstr ""
 
-#: lib/mediafile.php:197 lib/mediafile.php:234
+#. TRANS: Client exception thrown when a file upload operation fails because the file could
+#. TRANS: not be moved from the temporary folder to the permanent file location.
+#: lib/mediafile.php:209 lib/mediafile.php:251
 msgid "File could not be moved to destination directory."
 msgstr ""
 
-#: lib/mediafile.php:202 lib/mediafile.php:238
+#. TRANS: Client exception thrown when a file upload operation has been stopped because the MIME
+#. TRANS: type of the uploaded file could not be determined.
+#: lib/mediafile.php:216 lib/mediafile.php:257
 msgid "Could not determine file's MIME type."
 msgstr "Kunne ikkje slette favoritt."
 
-#: lib/mediafile.php:318
+#. TRANS: Client exception thrown trying to upload a forbidden MIME type.
+#. TRANS: %1$s is the file type that was denied, %2$s is the application part of
+#. TRANS: the MIME type that was denied.
+#: lib/mediafile.php:340
 #, php-format
-msgid " Try using another %s format."
+msgid ""
+"\"%1$s\" is not a supported file type on this server. Try using another %2$s "
+"format."
 msgstr ""
 
-#: lib/mediafile.php:323
+#. TRANS: Client exception thrown trying to upload a forbidden MIME type.
+#. TRANS: %s is the file type that was denied.
+#: lib/mediafile.php:345
 #, php-format
-msgid "%s is not a supported file type on this server."
+msgid "\"%s\" is not a supported file type on this server."
 msgstr ""
 
 #: lib/messageform.php:120
@@ -4872,11 +4685,6 @@ msgstr "Til"
 msgid "Available characters"
 msgstr "Tilgjenglege teikn"
 
-#: lib/messageform.php:178 lib/noticeform.php:237
-msgctxt "Send button for sending notice"
-msgid "Send"
-msgstr ""
-
 #: lib/noticeform.php:160
 msgid "Send a notice"
 msgstr "Send ei melding"
@@ -4894,14 +4702,6 @@ msgstr ""
 msgid "Attach a file"
 msgstr ""
 
-#: lib/noticeform.php:213
-msgid "Share my location"
-msgstr ""
-
-#: lib/noticeform.php:216
-msgid "Do not share my location"
-msgstr ""
-
 #: lib/noticeform.php:217
 msgid ""
 "Sorry, retrieving your geo location is taking longer than expected, please "
@@ -4956,23 +4756,7 @@ msgstr "Dult"
 msgid "Send a nudge to this user"
 msgstr "Send eit dult til denne brukaren"
 
-#: lib/oauthstore.php:283
-msgid "Error inserting new profile"
-msgstr "Feil med Ã¥ henta inn ny profil"
-
-#: lib/oauthstore.php:291
-msgid "Error inserting avatar"
-msgstr "Feil med innhenting av brukarbilete."
-
-#: lib/oauthstore.php:306
-msgid "Error updating remote profile"
-msgstr "Feil ved oppdatering av ekstern profil"
-
-#: lib/oauthstore.php:311
-msgid "Error inserting remote profile"
-msgstr "Feil med Ã¥ henta inn ekstern profil"
-
-#: lib/oauthstore.php:490
+#: lib/oauthstore.php:491
 msgid "Couldn't insert new subscription."
 msgstr "Kan ikkje leggja til ny tinging."
 
@@ -5062,31 +4846,20 @@ msgstr "Framheva"
 msgid "Popular"
 msgstr "PopulÃ¦re"
 
-#: lib/redirectingaction.php:95
-msgid "No return-to arguments."
-msgstr ""
-
 #: lib/repeatform.php:132
 msgid "Yes"
 msgstr "Jau"
 
-#: lib/revokeroleform.php:91
-#, php-format
-msgid "Revoke the \"%s\" role from this user"
-msgstr ""
-
 #: lib/router.php:709
 msgid "No single user defined for single-user mode."
 msgstr ""
 
-#: lib/searchaction.php:126
+#. TRANS: Used as a field label for the field where one or more keywords
+#. TRANS: for searching can be entered.
+#: lib/searchaction.php:129
 msgid "Keyword(s)"
 msgstr ""
 
-#: lib/searchaction.php:127
-msgid "Search"
-msgstr "SÃ¸k"
-
 #: lib/searchgroupnav.php:80
 msgid "People"
 msgstr "Folk"
@@ -5233,67 +5006,38 @@ msgstr "Melding"
 msgid "Moderate"
 msgstr ""
 
-#: lib/userprofile.php:366
-msgctxt "role"
-msgid "Administrator"
-msgstr ""
-
 #: lib/userprofile.php:367
 msgctxt "role"
 msgid "Moderator"
 msgstr ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1102
+#: lib/util.php:1103
 msgid "a few seconds ago"
 msgstr "eit par sekund sidan"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1105
+#: lib/util.php:1106
 msgid "about a minute ago"
 msgstr "omtrent eitt minutt sidan"
 
-#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1109
-#, php-format
-msgid "about %d minutes ago"
-msgstr "~%d minutt sidan"
-
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 #: lib/util.php:1112
 msgid "about an hour ago"
 msgstr "omtrent ein time sidan"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1116
-#, php-format
-msgid "about %d hours ago"
-msgstr "~%d timar sidan"
-
-#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1119
+#: lib/util.php:1118
 msgid "about a day ago"
 msgstr "omtrent ein dag sidan"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1123
-#, php-format
-msgid "about %d days ago"
-msgstr "~%d dagar sidan"
-
-#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1126
+#: lib/util.php:1124
 msgid "about a month ago"
 msgstr "omtrent ein mÃ¥nad sidan"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 #: lib/util.php:1130
-#, php-format
-msgid "about %d months ago"
-msgstr "~%d mÃ¥nadar sidan"
-
-#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1133
 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 d87c2de9ec..884844bc68 100644
--- a/locale/pl/LC_MESSAGES/statusnet.po
+++ b/locale/pl/LC_MESSAGES/statusnet.po
@@ -1,33 +1,34 @@
-# Translation of StatusNet to Polish
+# Translation of StatusNet to Polish (Polski)
+# Expored from translatewiki.net
 #
-# Author@translatewiki.net: McDutchie
-# Author@translatewiki.net: Raven
-# Author@translatewiki.net: Sp5uhe
+# Author: McDutchie
+# Author: Raven
+# Author: Sp5uhe
 # --
-# PaweÅ Wilk <siefca@gnu.org>, 2008.
-# Piotr DrÄg <piotrdrag@gmail.com>, 2009.
+# This file is distributed under the same license as the StatusNet package.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-08 22:33+0000\n"
-"PO-Revision-Date: 2010-09-08 22:35:13+0000\n"
+"POT-Creation-Date: 2010-09-14 19:53+0000\n"
+"PO-Revision-Date: 2010-09-14 19:54:15+0000\n"
 "Last-Translator: Piotr DrÄg <piotrdrag@gmail.com>\n"
-"Language-Team: Polish <pl@li.org>\n"
+"Language-Team: Polish <http://translatewiki.net/wiki/Portal:pl>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "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 (r72348); Translate extension (2010-08-20)\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 (r73009); Translate extension (2010-08-20)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pl\n"
-"X-Message-Group: out-statusnet\n"
+"X-Message-Group: #out-statusnet\n"
+"X-POT-Import-Date: 1284-49-16 34::+0000\n"
 
 #. TRANS: Page title
 #. TRANS: Menu item for site administration
-#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:376
+#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:363
 msgid "Access"
 msgstr "DostÄp"
 
@@ -80,10 +81,10 @@ 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 actions/emailsettings.php:224
-#: actions/imsettings.php:184 actions/smssettings.php:209
-#: lib/applicationeditform.php:361
+#. TRANS: Button label in the "Edit application" form.
+#: actions/accessadminpanel.php:203 actions/emailsettings.php:228
+#: actions/imsettings.php:187 actions/smssettings.php:209
+#: lib/applicationeditform.php:351
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Zapisz"
@@ -96,15 +97,15 @@ msgstr "Nie ma takiej strony."
 
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #: actions/all.php:79 actions/allrss.php:68
-#: actions/apiaccountupdatedeliverydevice.php:114
-#: actions/apiaccountupdateprofile.php:105
-#: actions/apiaccountupdateprofilebackgroundimage.php:116
-#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
-#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
-#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:113
-#: actions/apigroupismember.php:91 actions/apigroupjoin.php:100
-#: actions/apigroupleave.php:100 actions/apigrouplist.php:73
-#: actions/apistatusesupdate.php:229 actions/apisubscriptions.php:87
+#: actions/apiaccountupdatedeliverydevice.php:115
+#: actions/apiaccountupdateprofile.php:106
+#: actions/apiaccountupdateprofilebackgroundimage.php:117
+#: actions/apiaccountupdateprofileimage.php:106 actions/apiblockcreate.php:98
+#: actions/apiblockdestroy.php:97 actions/apidirectmessage.php:77
+#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:114
+#: actions/apigroupismember.php:91 actions/apigroupjoin.php:101
+#: actions/apigroupleave.php:101 actions/apigrouplist.php:73
+#: actions/apistatusesupdate.php:230 actions/apisubscriptions.php:87
 #: actions/apitimelinefavorites.php:72 actions/apitimelinefriends.php:174
 #: actions/apitimelinehome.php:80 actions/apitimelinementions.php:80
 #: actions/apitimelineuser.php:82 actions/avatarbynickname.php:75
@@ -204,16 +205,16 @@ msgid "Updates from %1$s and friends on %2$s!"
 msgstr "Aktualizacje z %1$s i przyjaciÃ³Å na %2$s."
 
 #: actions/apiaccountratelimitstatus.php:72
-#: actions/apiaccountupdatedeliverydevice.php:94
-#: actions/apiaccountupdateprofile.php:97
-#: actions/apiaccountupdateprofilebackgroundimage.php:94
-#: actions/apiaccountupdateprofilecolors.php:118
+#: actions/apiaccountupdatedeliverydevice.php:95
+#: actions/apiaccountupdateprofile.php:98
+#: actions/apiaccountupdateprofilebackgroundimage.php:95
+#: actions/apiaccountupdateprofilecolors.php:119
 #: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156
-#: actions/apifavoritecreate.php:100 actions/apifavoritedestroy.php:101
-#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100
-#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:139
-#: actions/apigroupismember.php:115 actions/apigroupjoin.php:156
-#: actions/apigroupleave.php:142 actions/apigrouplist.php:137
+#: actions/apifavoritecreate.php:101 actions/apifavoritedestroy.php:102
+#: actions/apifriendshipscreate.php:101 actions/apifriendshipsdestroy.php:101
+#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:140
+#: actions/apigroupismember.php:115 actions/apigroupjoin.php:157
+#: actions/apigroupleave.php:143 actions/apigrouplist.php:137
 #: actions/apigrouplistall.php:122 actions/apigroupmembership.php:107
 #: actions/apigroupshow.php:116 actions/apihelptest.php:88
 #: actions/apistatusesdestroy.php:104 actions/apistatusesretweets.php:112
@@ -228,48 +229,50 @@ msgstr "Aktualizacje z %1$s i przyjaciÃ³Å na %2$s."
 msgid "API method not found."
 msgstr "Nie odnaleziono metody API."
 
-#: actions/apiaccountupdatedeliverydevice.php:86
-#: actions/apiaccountupdateprofile.php:89
-#: actions/apiaccountupdateprofilebackgroundimage.php:86
-#: actions/apiaccountupdateprofilecolors.php:110
-#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89
-#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109
-#: actions/apifavoritecreate.php:91 actions/apifavoritedestroy.php:92
-#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
-#: actions/apigroupcreate.php:105 actions/apigroupjoin.php:92
-#: actions/apigroupleave.php:92 actions/apimediaupload.php:67
-#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:198
+#. TRANS: Client error message. POST is a HTTP command. It should not be translated.
+#. TRANS: Client error. POST is a HTTP command. It should not be translated.
+#: actions/apiaccountupdatedeliverydevice.php:87
+#: actions/apiaccountupdateprofile.php:90
+#: actions/apiaccountupdateprofilebackgroundimage.php:87
+#: actions/apiaccountupdateprofilecolors.php:111
+#: actions/apiaccountupdateprofileimage.php:85 actions/apiblockcreate.php:90
+#: actions/apiblockdestroy.php:89 actions/apidirectmessagenew.php:110
+#: actions/apifavoritecreate.php:92 actions/apifavoritedestroy.php:93
+#: actions/apifriendshipscreate.php:92 actions/apifriendshipsdestroy.php:92
+#: actions/apigroupcreate.php:106 actions/apigroupjoin.php:93
+#: actions/apigroupleave.php:93 actions/apimediaupload.php:68
+#: actions/apistatusesretweet.php:66 actions/apistatusesupdate.php:199
 msgid "This method requires a POST."
 msgstr "Ta metoda wymaga POST."
 
-#: actions/apiaccountupdatedeliverydevice.php:106
+#: actions/apiaccountupdatedeliverydevice.php:107
 msgid ""
 "You must specify a parameter named 'device' with a value of one of: sms, im, "
 "none."
 msgstr ""
 "NaleÅ¼y podaÄ parametr o nazwie \"device\" z jednÄ z wartoÅci: sms, im, none."
 
-#: actions/apiaccountupdatedeliverydevice.php:133
+#: actions/apiaccountupdatedeliverydevice.php:134
 msgid "Could not update user."
 msgstr "Nie moÅ¼na zaktualizowaÄ uÅ¼ytkownika."
 
-#: actions/apiaccountupdateprofile.php:112
-#: actions/apiaccountupdateprofilebackgroundimage.php:194
-#: actions/apiaccountupdateprofilecolors.php:185
-#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/apiaccountupdateprofile.php:113
+#: actions/apiaccountupdateprofilebackgroundimage.php:195
+#: actions/apiaccountupdateprofilecolors.php:186
+#: actions/apiaccountupdateprofileimage.php:131 actions/apiusershow.php:108
 #: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/hcard.php:74
 #: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
 #: lib/profileaction.php:84
 msgid "User has no profile."
 msgstr "UÅ¼ytkownik nie posiada profilu."
 
-#: actions/apiaccountupdateprofile.php:147
+#: actions/apiaccountupdateprofile.php:148
 msgid "Could not save profile."
 msgstr "Nie moÅ¼na zapisaÄ profilu."
 
-#: actions/apiaccountupdateprofilebackgroundimage.php:108
-#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
-#: actions/apistatusesupdate.php:212 actions/avatarsettings.php:257
+#: actions/apiaccountupdateprofilebackgroundimage.php:109
+#: actions/apiaccountupdateprofileimage.php:98 actions/apimediaupload.php:81
+#: actions/apistatusesupdate.php:213 actions/avatarsettings.php:257
 #: actions/designadminpanel.php:123 actions/editapplication.php:118
 #: actions/newapplication.php:101 actions/newnotice.php:94
 #: lib/designsettings.php:283
@@ -281,30 +284,30 @@ msgstr ""
 "Serwer nie moÅ¼e obsÅuÅ¼yÄ aÅ¼ tyle danych POST (%s bajty) z powodu bieÅ¼Äcej "
 "konfiguracji."
 
-#: actions/apiaccountupdateprofilebackgroundimage.php:136
-#: actions/apiaccountupdateprofilebackgroundimage.php:146
-#: actions/apiaccountupdateprofilecolors.php:164
-#: actions/apiaccountupdateprofilecolors.php:174
+#: actions/apiaccountupdateprofilebackgroundimage.php:137
+#: actions/apiaccountupdateprofilebackgroundimage.php:147
+#: actions/apiaccountupdateprofilecolors.php:165
+#: actions/apiaccountupdateprofilecolors.php:175
 #: actions/groupdesignsettings.php:290 actions/groupdesignsettings.php:300
 #: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
 #: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
 msgid "Unable to save your design settings."
 msgstr "Nie moÅ¼na zapisaÄ ustawieÅ wyglÄdu."
 
-#: actions/apiaccountupdateprofilebackgroundimage.php:187
-#: actions/apiaccountupdateprofilecolors.php:142
+#: actions/apiaccountupdateprofilebackgroundimage.php:188
+#: actions/apiaccountupdateprofilecolors.php:143
 msgid "Could not update your design."
 msgstr "Nie moÅ¼na zaktualizowaÄ wyglÄdu."
 
-#: actions/apiblockcreate.php:105
+#: actions/apiblockcreate.php:106
 msgid "You cannot block yourself!"
 msgstr "Nie moÅ¼na zablokowaÄ siebie."
 
-#: actions/apiblockcreate.php:126
+#: actions/apiblockcreate.php:127
 msgid "Block user failed."
 msgstr "Zablokowanie uÅ¼ytkownika nie powiodÅo siÄ."
 
-#: actions/apiblockdestroy.php:114
+#: actions/apiblockdestroy.php:115
 msgid "Unblock user failed."
 msgstr "Odblokowanie uÅ¼ytkownika nie powiodÅo siÄ."
 
@@ -328,62 +331,62 @@ msgstr "BezpoÅrednia wiadomoÅÄ do uÅ¼ytkownika %s"
 msgid "All the direct messages sent to %s"
 msgstr "Wszystkie bezpoÅrednie wiadomoÅci wysÅane do uÅ¼ytkownika %s"
 
-#: actions/apidirectmessagenew.php:118
+#: actions/apidirectmessagenew.php:119
 msgid "No message text!"
 msgstr "Brak tekstu wiadomoÅci."
 
-#: actions/apidirectmessagenew.php:127 actions/newmessage.php:150
+#: actions/apidirectmessagenew.php:128 actions/newmessage.php:150
 #, php-format
 msgid "That's too long. Max message size is %d chars."
 msgstr "WiadomoÅÄ jest za dÅuga. Maksymalna dÅugoÅÄ wynosi %d znakÃ³w."
 
-#: actions/apidirectmessagenew.php:138
+#: actions/apidirectmessagenew.php:139
 msgid "Recipient user not found."
 msgstr "Nie odnaleziono odbiorcy."
 
-#: actions/apidirectmessagenew.php:142
+#: actions/apidirectmessagenew.php:143
 msgid "Can't send direct messages to users who aren't your friend."
 msgstr ""
 "Nie moÅ¼na wysÅaÄ bezpoÅredniej wiadomoÅci do uÅ¼ytkownikÃ³w, ktÃ³rzy nie sÄ "
 "twoimi przyjaciÃ³Åmi."
 
-#: actions/apifavoritecreate.php:109 actions/apifavoritedestroy.php:110
+#: actions/apifavoritecreate.php:110 actions/apifavoritedestroy.php:111
 #: actions/apistatusesdestroy.php:121
 msgid "No status found with that ID."
 msgstr "Nie odnaleziono stanÃ³w z tym identyfikatorem."
 
-#: actions/apifavoritecreate.php:120
+#: actions/apifavoritecreate.php:121
 msgid "This status is already a favorite."
 msgstr "Ten stan jest juÅ¼ ulubiony."
 
 #. TRANS: Error message text shown when a favorite could not be set.
-#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:296
+#: actions/apifavoritecreate.php:132 actions/favor.php:84 lib/command.php:296
 msgid "Could not create favorite."
 msgstr "Nie moÅ¼na utworzyÄ ulubionego wpisu."
 
-#: actions/apifavoritedestroy.php:123
+#: actions/apifavoritedestroy.php:124
 msgid "That status is not a favorite."
 msgstr "Ten stan nie jest ulubiony."
 
-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
+#: actions/apifavoritedestroy.php:136 actions/disfavor.php:87
 msgid "Could not delete favorite."
 msgstr "Nie moÅ¼na usunÄÄ ulubionego wpisu."
 
-#: actions/apifriendshipscreate.php:109
+#: actions/apifriendshipscreate.php:110
 msgid "Could not follow user: profile not found."
 msgstr "Nie moÅ¼na obserwowaÄ uÅ¼ytkownika: nie odnaleziono profilu."
 
-#: actions/apifriendshipscreate.php:118
+#: actions/apifriendshipscreate.php:119
 #, php-format
 msgid "Could not follow user: %s is already on your list."
 msgstr "Nie moÅ¼na obserwowaÄ uÅ¼ytkownika: %s jest juÅ¼ na twojej liÅcie."
 
-#: actions/apifriendshipsdestroy.php:109
+#: actions/apifriendshipsdestroy.php:110
 msgid "Could not unfollow user: User not found."
 msgstr ""
 "Nie moÅ¼na zrezygnowaÄ z obserwacji uÅ¼ytkownika: nie odnaleziono uÅ¼ytkownika."
 
-#: actions/apifriendshipsdestroy.php:120
+#: actions/apifriendshipsdestroy.php:121
 msgid "You cannot unfollow yourself."
 msgstr "Nie moÅ¼na zrezygnowaÄ z obserwacji samego siebie."
 
@@ -400,101 +403,101 @@ msgstr "Nie moÅ¼na okreÅliÄ uÅ¼ytkownika ÅºrÃ³dÅowego."
 msgid "Could not find target user."
 msgstr "Nie moÅ¼na odnaleÅºÄ uÅ¼ytkownika docelowego."
 
-#: actions/apigroupcreate.php:167 actions/editgroup.php:186
+#: actions/apigroupcreate.php:168 actions/editgroup.php:186
 #: actions/newgroup.php:126 actions/profilesettings.php:215
 #: actions/register.php:212
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr "Pseudonim moÅ¼e zawieraÄ tylko maÅe litery i cyfry, bez spacji."
 
-#: actions/apigroupcreate.php:176 actions/editgroup.php:190
+#: actions/apigroupcreate.php:177 actions/editgroup.php:190
 #: actions/newgroup.php:130 actions/profilesettings.php:238
 #: actions/register.php:215
 msgid "Nickname already in use. Try another one."
 msgstr "Pseudonim jest juÅ¼ uÅ¼ywany. SprÃ³buj innego."
 
-#: actions/apigroupcreate.php:183 actions/editgroup.php:193
+#: actions/apigroupcreate.php:184 actions/editgroup.php:193
 #: actions/newgroup.php:133 actions/profilesettings.php:218
 #: actions/register.php:217
 msgid "Not a valid nickname."
 msgstr "To nie jest prawidÅowy pseudonim."
 
-#: actions/apigroupcreate.php:199 actions/editapplication.php:215
+#: actions/apigroupcreate.php:200 actions/editapplication.php:215
 #: actions/editgroup.php:199 actions/newapplication.php:203
 #: actions/newgroup.php:139 actions/profilesettings.php:222
 #: actions/register.php:224
 msgid "Homepage is not a valid URL."
 msgstr "Strona domowa nie jest prawidÅowym adresem URL."
 
-#: actions/apigroupcreate.php:208 actions/editgroup.php:202
+#: actions/apigroupcreate.php:209 actions/editgroup.php:202
 #: actions/newgroup.php:142 actions/profilesettings.php:225
 #: actions/register.php:227
 msgid "Full name is too long (max 255 chars)."
 msgstr "ImiÄ i nazwisko jest za dÅugie (maksymalnie 255 znakÃ³w)."
 
-#: actions/apigroupcreate.php:216 actions/editapplication.php:190
+#: actions/apigroupcreate.php:217 actions/editapplication.php:190
 #: actions/newapplication.php:172
 #, php-format
 msgid "Description is too long (max %d chars)."
 msgstr "Opis jest za dÅugi (maksymalnie %d znakÃ³w)."
 
-#: actions/apigroupcreate.php:227 actions/editgroup.php:208
+#: actions/apigroupcreate.php:228 actions/editgroup.php:208
 #: actions/newgroup.php:148 actions/profilesettings.php:232
 #: actions/register.php:234
 msgid "Location is too long (max 255 chars)."
 msgstr "PoÅoÅ¼enie jest za dÅugie (maksymalnie 255 znakÃ³w)."
 
-#: actions/apigroupcreate.php:246 actions/editgroup.php:219
+#: actions/apigroupcreate.php:247 actions/editgroup.php:219
 #: actions/newgroup.php:159
 #, php-format
 msgid "Too many aliases! Maximum %d."
 msgstr "Za duÅ¼o aliasÃ³w. Maksymalnie %d."
 
-#: actions/apigroupcreate.php:267
+#: actions/apigroupcreate.php:268
 #, php-format
 msgid "Invalid alias: \"%s\"."
 msgstr "NieprawidÅowy alias: \"%s\"."
 
-#: actions/apigroupcreate.php:276 actions/editgroup.php:232
+#: actions/apigroupcreate.php:277 actions/editgroup.php:232
 #: actions/newgroup.php:172
 #, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr "Alias \"%s\" jest juÅ¼ uÅ¼ywany. SprÃ³buj innego."
 
-#: actions/apigroupcreate.php:289 actions/editgroup.php:238
+#: actions/apigroupcreate.php:290 actions/editgroup.php:238
 #: actions/newgroup.php:178
 msgid "Alias can't be the same as nickname."
 msgstr "Alias nie moÅ¼e byÄ taki sam jak pseudonim."
 
-#: actions/apigroupismember.php:96 actions/apigroupjoin.php:105
-#: actions/apigroupleave.php:105 actions/apigroupmembership.php:92
+#: actions/apigroupismember.php:96 actions/apigroupjoin.php:106
+#: actions/apigroupleave.php:106 actions/apigroupmembership.php:92
 #: actions/apigroupshow.php:83 actions/apitimelinegroup.php:92
 msgid "Group not found."
 msgstr "Nie odnaleziono grupy."
 
 #. TRANS: Error text shown a user tries to join a group they already are a member of.
-#: actions/apigroupjoin.php:111 actions/joingroup.php:100 lib/command.php:336
+#: actions/apigroupjoin.php:112 actions/joingroup.php:100 lib/command.php:336
 msgid "You are already a member of that group."
 msgstr "JesteÅ juÅ¼ czÅonkiem tej grupy."
 
 #. TRANS: Error text shown when a user tries to join a group they are blocked from joining.
-#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:341
+#: actions/apigroupjoin.php:121 actions/joingroup.php:105 lib/command.php:341
 msgid "You have been blocked from that group by the admin."
 msgstr "ZostaÅeÅ zablokowany w tej grupie przez administratora."
 
 #. 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.
-#: actions/apigroupjoin.php:139 actions/joingroup.php:134 lib/command.php:353
+#: actions/apigroupjoin.php:140 actions/joingroup.php:134 lib/command.php:353
 #, 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."
 
-#: actions/apigroupleave.php:115
+#: actions/apigroupleave.php:116
 msgid "You are not a member of this group."
 msgstr "Nie jesteÅ czÅonkiem tej grupy."
 
 #. 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.
-#: actions/apigroupleave.php:125 actions/leavegroup.php:129
+#: actions/apigroupleave.php:126 actions/leavegroup.php:129
 #: lib/command.php:401
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
@@ -524,7 +527,7 @@ msgstr "Grupy %s"
 msgid "groups on %s"
 msgstr "grupy na %s"
 
-#: actions/apimediaupload.php:99
+#: actions/apimediaupload.php:100
 msgid "Upload failed."
 msgstr "WysÅanie nie powiodÅo siÄ."
 
@@ -538,9 +541,9 @@ msgstr "NieprawidÅowy token."
 
 #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
 #: actions/deletenotice.php:169 actions/disfavor.php:74
-#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:55
+#: actions/emailsettings.php:271 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:66 actions/imsettings.php:227
+#: actions/groupunblock.php:66 actions/imsettings.php:230
 #: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
@@ -584,8 +587,8 @@ msgstr "Token Å¼Ädania %s zostaÅ odrzucony lub uniewaÅ¼niony."
 #. 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:286 actions/grouplogo.php:322
-#: actions/imsettings.php:242 actions/newapplication.php:121
+#: actions/emailsettings.php:290 actions/grouplogo.php:322
+#: actions/imsettings.php:245 actions/newapplication.php:121
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
 #: actions/smssettings.php:277 lib/designsettings.php:304
 msgid "Unexpected form submission."
@@ -649,18 +652,18 @@ msgstr "Ta metoda wymaga POST lub DELETE."
 msgid "You may not delete another user's status."
 msgstr "Nie moÅ¼na usuwaÄ stanÃ³w innych uÅ¼ytkownikÃ³w."
 
-#: actions/apistatusesretweet.php:75 actions/apistatusesretweets.php:72
+#: actions/apistatusesretweet.php:76 actions/apistatusesretweets.php:72
 #: actions/deletenotice.php:52 actions/shownotice.php:92
 msgid "No such notice."
 msgstr "Nie ma takiego wpisu."
 
 #. TRANS: Error text shown when trying to repeat an own notice.
-#: actions/apistatusesretweet.php:83 lib/command.php:538
+#: actions/apistatusesretweet.php:84 lib/command.php:538
 msgid "Cannot repeat your own notice."
 msgstr "Nie moÅ¼na powtÃ³rzyÄ wÅasnego wpisu."
 
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-#: actions/apistatusesretweet.php:91 lib/command.php:544
+#: actions/apistatusesretweet.php:92 lib/command.php:544
 msgid "Already repeated that notice."
 msgstr "JuÅ¼ powtÃ³rzono ten wpis."
 
@@ -672,21 +675,21 @@ msgstr "UsuniÄto stan."
 msgid "No status with that ID found."
 msgstr "Nie odnaleziono stanÃ³w z tym identyfikatorem."
 
-#: actions/apistatusesupdate.php:221
+#: actions/apistatusesupdate.php:222
 msgid "Client must provide a 'status' parameter with a value."
 msgstr "Klient musi dostarczaÄ parametr \"stan\" z wartoÅciÄ."
 
-#: actions/apistatusesupdate.php:242 actions/newnotice.php:157
+#: actions/apistatusesupdate.php:243 actions/newnotice.php:157
 #: lib/mailhandler.php:60
 #, php-format
 msgid "That's too long. Max notice size is %d chars."
 msgstr "Wpis jest za dÅugi. Maksymalna dÅugoÅÄ wynosi %d znakÃ³w."
 
-#: actions/apistatusesupdate.php:283 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:284 actions/apiusershow.php:96
 msgid "Not found."
 msgstr "Nie odnaleziono."
 
-#: actions/apistatusesupdate.php:306 actions/newnotice.php:181
+#: actions/apistatusesupdate.php:307 actions/newnotice.php:181
 #, php-format
 msgid "Max notice size is %d chars, including attachment URL."
 msgstr "Maksymalny rozmiar wpisu wynosi %d znakÃ³w, w tym adres URL zaÅÄcznika."
@@ -886,7 +889,9 @@ msgid "Yes"
 msgstr "Tak"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
+#. TRANS: Submit button title.
+#. TRANS: Description of the form to block a user.
+#: actions/block.php:164 actions/groupmembers.php:403 lib/blockform.php:82
 msgid "Block this user"
 msgstr "Zablokuj tego uÅ¼ytkownika"
 
@@ -928,11 +933,13 @@ msgstr "Lista uÅ¼ytkownikÃ³w zablokowanych w tej grupie."
 msgid "Unblock user from group"
 msgstr "Odblokuj uÅ¼ytkownika w tej grupie"
 
-#: actions/blockedfromgroup.php:320 lib/unblockform.php:69
+#. TRANS: Title for the form to unblock a user.
+#: actions/blockedfromgroup.php:320 lib/unblockform.php:70
 msgid "Unblock"
 msgstr "Odblokuj"
 
-#: actions/blockedfromgroup.php:320 lib/unblockform.php:80
+#. TRANS: Description of the form to unblock a user.
+#: actions/blockedfromgroup.php:320 lib/unblockform.php:82
 msgid "Unblock this user"
 msgstr "Odblokuj tego uÅ¼ytkownika"
 
@@ -971,9 +978,9 @@ msgstr "Ten adres zostaÅ juÅ¼ potwierdzony."
 #. 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/confirmaddress.php:116 actions/emailsettings.php:331
+#: actions/emailsettings.php:477 actions/imsettings.php:283
+#: actions/imsettings.php:442 actions/othersettings.php:174
 #: actions/profilesettings.php:283 actions/smssettings.php:308
 #: actions/smssettings.php:464
 msgid "Couldn't update user."
@@ -981,7 +988,7 @@ msgstr "Nie moÅ¼na zaktualizowaÄ uÅ¼ytkownika."
 
 #. 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/confirmaddress.php:128 actions/emailsettings.php:437
 #: actions/smssettings.php:422
 msgid "Couldn't delete email confirmation."
 msgstr "Nie moÅ¼na usunÄÄ potwierdzenia adresu e-mail."
@@ -1017,9 +1024,10 @@ msgstr "Nie odnaleziono aplikacji."
 msgid "You are not the owner of this application."
 msgstr "Nie jesteÅ wÅaÅcicielem tej aplikacji."
 
+#. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:127
 #: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1307
+#: lib/action.php:1315
 msgid "There was a problem with your session token."
 msgstr "WystÄpiÅ problem z tokenem sesji."
 
@@ -1052,7 +1060,7 @@ msgstr "UsuÅ tÄ aplikacjÄ"
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
 #: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:73 lib/profileformaction.php:64
+#: lib/adminpanelaction.php:71 lib/profileformaction.php:64
 #: lib/settingsaction.php:72
 msgid "Not logged in."
 msgstr "Niezalogowany."
@@ -1115,7 +1123,6 @@ msgstr "UsuÅ tego uÅ¼ytkownika"
 #. TRANS: Message used as title for design settings for the site.
 #. TRANS: Link description in user account settings menu.
 #: actions/designadminpanel.php:63 lib/accountsettingsaction.php:139
-#: lib/groupnav.php:119
 msgid "Design"
 msgstr "WyglÄd"
 
@@ -1234,13 +1241,13 @@ msgstr "PrzywrÃ³Ä domyÅlny wyglÄd"
 msgid "Reset back to default"
 msgstr "PrzywrÃ³Ä domyÅlne ustawienia"
 
-#. TRANS: Submit button title
+#. TRANS: Submit button title.
 #: actions/designadminpanel.php:685 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/snapshotadminpanel.php:245
 #: actions/subscriptions.php:226 actions/tagother.php:154
-#: actions/useradminpanel.php:294 lib/applicationeditform.php:363
+#: actions/useradminpanel.php:294 lib/applicationeditform.php:353
 #: lib/designsettings.php:256 lib/groupeditform.php:202
 msgid "Save"
 msgstr "Zapisz"
@@ -1396,7 +1403,7 @@ msgstr "Obecnie potwierdzone adresy e-mail."
 #. 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/emailsettings.php:115 actions/emailsettings.php:162
 #: actions/imsettings.php:116 actions/smssettings.php:124
 #: actions/smssettings.php:180
 msgctxt "BUTTON"
@@ -1415,22 +1422,26 @@ msgstr ""
 #. 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
+#. TRANS: Button label in the "Edit application" form.
 #: actions/emailsettings.php:127 actions/imsettings.php:131
-#: actions/smssettings.php:137 lib/applicationeditform.php:357
+#: actions/smssettings.php:137 lib/applicationeditform.php:347
 msgctxt "BUTTON"
 msgid "Cancel"
 msgstr "Anuluj"
 
-#. TRANS: Instructions for e-mail address input form.
-#: actions/emailsettings.php:135
+#. TRANS: Instructions for e-mail address input form. Do not translate
+#. TRANS: "example.org". It is one of the domain names reserved for
+#. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
+#. TRANS: Any other domain may be owned by a legitimate person or
+#. TRANS: organization.
+#: actions/emailsettings.php:139
 msgid "Email address, like \"UserName@example.org\""
 msgstr "Adres e-mail, taki jak \"NazwaUÅ¼ytkownika@example.org\""
 
 #. 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/emailsettings.php:143 actions/imsettings.php:151
 #: actions/smssettings.php:162
 msgctxt "BUTTON"
 msgid "Add"
@@ -1438,110 +1449,110 @@ msgstr "Dodaj"
 
 #. 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
+#: actions/emailsettings.php:151 actions/smssettings.php:171
 msgid "Incoming email"
 msgstr "WiadomoÅci przychodzÄce"
 
 #. 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
+#: actions/emailsettings.php:159 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."
 
 #. 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
+#: actions/emailsettings.php:168 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."
 
 #. 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
+#: actions/emailsettings.php:172 actions/smssettings.php:189
 msgctxt "BUTTON"
 msgid "New"
 msgstr "Nowy"
 
 #. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:174
+#: actions/emailsettings.php:178
 msgid "Email preferences"
 msgstr "Preferencje e-mail"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:180
+#: actions/emailsettings.php:184
 msgid "Send me notices of new subscriptions through email."
 msgstr "WyÅlij wpisy nowych subskrypcji przez e-mail."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:186
+#: actions/emailsettings.php:190
 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."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:193
+#: actions/emailsettings.php:197
 msgid "Send me email when someone sends me a private message."
 msgstr "WyÅlij wiadomoÅÄ e-mail, kiedy ktoÅ wyÅle prywatnÄ wiadomoÅÄ."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:199
+#: actions/emailsettings.php:203
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr "WyÅlij wiadomoÅÄ e-mail, kiedy ktoÅ wyÅle odpowiedÅº \"@\"."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:205
+#: actions/emailsettings.php:209
 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."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:212
+#: actions/emailsettings.php:216
 msgid "I want to post notices by email."
 msgstr "ChcÄ wysyÅaÄ wpisy przez wiadomoÅci e-mail."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:219
+#: actions/emailsettings.php:223
 msgid "Publish a MicroID for my email address."
 msgstr "Opublikuj MicroID adresu e-mail."
 
 #. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:334
+#: actions/emailsettings.php:338
 msgid "Email preferences saved."
 msgstr "Zapisano preferencje e-mail."
 
 #. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:353
+#: actions/emailsettings.php:357
 msgid "No email address."
 msgstr "Brak adresu e-mail."
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:361
+#: actions/emailsettings.php:365
 msgid "Cannot normalize that email address"
 msgstr "Nie moÅ¼na znormalizowaÄ tego adresu e-mail"
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:208
+#: actions/emailsettings.php:370 actions/register.php:208
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "To nie jest prawidÅowy adres e-mail."
 
 #. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:370
+#: actions/emailsettings.php:374
 msgid "That is already your email address."
 msgstr "Ten adres e-mail jest juÅ¼ twÃ³j."
 
 #. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:374
+#: actions/emailsettings.php:378
 msgid "That email address already belongs to another user."
 msgstr "Ten adres e-mail naleÅ¼y juÅ¼ do innego uÅ¼ytkownika."
 
 #. 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/emailsettings.php:395 actions/imsettings.php:351
 #: actions/smssettings.php:373
 msgid "Couldn't insert confirmation code."
 msgstr "Nie moÅ¼na wprowadziÄ kodu potwierdzajÄcego."
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:398
+#: actions/emailsettings.php:402
 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."
@@ -1553,50 +1564,50 @@ msgstr ""
 #. 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/emailsettings.php:423 actions/imsettings.php:386
 #: actions/smssettings.php:408
 msgid "No pending confirmation to cancel."
 msgstr "Brak oczekujÄcych potwierdzeÅ do anulowania."
 
 #. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:424
+#: actions/emailsettings.php:428
 msgid "That is the wrong email address."
 msgstr "To jest bÅÄdny adres e-mail."
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:438
+#: actions/emailsettings.php:442
 msgid "Email confirmation cancelled."
 msgstr "Anulowano potwierdzenie e-mail."
 
 #. TRANS: Message given trying to remove an e-mail address that is not
 #. TRANS: registered for the active user.
-#: actions/emailsettings.php:458
+#: actions/emailsettings.php:462
 msgid "That is not your email address."
 msgstr "To nie jest twÃ³j adres e-mail."
 
 #. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:479
+#: actions/emailsettings.php:483
 msgid "The email address was removed."
 msgstr "Adres e-mail zostaÅ usuniÄty."
 
-#: actions/emailsettings.php:493 actions/smssettings.php:568
+#: actions/emailsettings.php:497 actions/smssettings.php:568
 msgid "No incoming email address."
 msgstr "Brak przychodzÄcego adresu e-mail."
 
 #. 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/emailsettings.php:508 actions/emailsettings.php:532
 #: actions/smssettings.php:578 actions/smssettings.php:602
 msgid "Couldn't update user record."
 msgstr "Nie moÅ¼na zaktualizowaÄ wpisu uÅ¼ytkownika."
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
-#: actions/emailsettings.php:508 actions/smssettings.php:581
+#: actions/emailsettings.php:512 actions/smssettings.php:581
 msgid "Incoming email address removed."
 msgstr "UsuniÄto przychodzÄcy adres e-mail."
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
-#: actions/emailsettings.php:532 actions/smssettings.php:605
+#: actions/emailsettings.php:536 actions/smssettings.php:605
 msgid "New incoming email address added."
 msgstr "Dodano nowy przychodzÄcy adres e-mail."
 
@@ -1715,7 +1726,7 @@ msgstr "Nie moÅ¼na przekonwertowaÄ tokenÃ³w Å¼ÄdaÅ na tokeny dostÄpu."
 msgid "Remote service uses unknown version of OMB protocol."
 msgstr "Zdalna usÅuga uÅ¼ywa nieznanej wersji protokoÅu OMB."
 
-#: actions/finishremotesubscribe.php:138
+#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306
 msgid "Error updating remote profile."
 msgstr "BÅÄd podczas aktualizowania zdalnego profilu."
 
@@ -1772,7 +1783,7 @@ msgstr "UÅ¼ytkownik zostaÅ juÅ¼ zablokowaÅ w grupie."
 msgid "User is not a member of group."
 msgstr "UÅ¼ytkownik nie jest czÅonkiem grupy."
 
-#: actions/groupblock.php:134 actions/groupmembers.php:360
+#: actions/groupblock.php:134 actions/groupmembers.php:364
 msgid "Block user from group"
 msgstr "Zablokuj uÅ¼ytkownika w grupie"
 
@@ -1850,40 +1861,32 @@ msgstr "Zaktualizowano logo."
 msgid "Failed updating logo."
 msgstr "Zaktualizowanie logo nie powiodÅo siÄ."
 
-#: actions/groupmembers.php:100 lib/groupnav.php:92
+#. TRANS: Title of the page showing group members.
+#. TRANS: %s is the name of the group.
+#: actions/groupmembers.php:102
 #, php-format
 msgid "%s group members"
 msgstr "CzÅonkowie grupy %s"
 
-#: actions/groupmembers.php:103
+#. TRANS: Title of the page showing group members.
+#. TRANS: %1$s is the name of the group, %2$d is the page number of the members list.
+#: actions/groupmembers.php:107
 #, php-format
 msgid "%1$s group members, page %2$d"
 msgstr "CzÅonkowie grupy %1$s, strona %2$d"
 
-#: actions/groupmembers.php:118
+#: actions/groupmembers.php:122
 msgid "A list of the users in this group."
 msgstr "Lista uÅ¼ytkownikÃ³w znajdujÄcych siÄ w tej grupie."
 
-#: actions/groupmembers.php:182 lib/groupnav.php:107
+#: actions/groupmembers.php:186
 msgid "Admin"
 msgstr "Administrator"
 
-#: actions/groupmembers.php:392 lib/blockform.php:69
-msgid "Block"
-msgstr "Zablokuj"
-
-#: actions/groupmembers.php:487
+#: actions/groupmembers.php:498
 msgid "Make user an admin of the group"
 msgstr "UczyÅ uÅ¼ytkownika administratorem grupy"
 
-#: actions/groupmembers.php:519
-msgid "Make Admin"
-msgstr "UczyÅ administratorem"
-
-#: actions/groupmembers.php:519
-msgid "Make this user an admin"
-msgstr "UczyÅ tego uÅ¼ytkownika administratorem"
-
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Title in atom group notice feed. %s is a group name.
 #. TRANS: Title in atom user notice feed. %s is a user name.
@@ -2022,7 +2025,10 @@ msgstr ""
 
 #. TRANS: IM address input field instructions in IM settings form.
 #. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:140
+#. TRANS: Do not translate "example.org". It is one of the domain names reserved for use in examples by
+#. TRANS: http://www.rfc-editor.org/rfc/rfc2606.txt. Any other domain may be owned by a legitimate
+#. TRANS: person or organization.
+#: actions/imsettings.php:143
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -2032,64 +2038,64 @@ msgstr ""
 "upewnij siÄ, Å¼e dodaÅeÅ %s do listy znajomych w komunikatorze lub na GTalk."
 
 #. TRANS: Form legend for IM preferences form.
-#: actions/imsettings.php:155
+#: actions/imsettings.php:158
 msgid "IM preferences"
 msgstr "Preferencje komunikatora"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:160
+#: actions/imsettings.php:163
 msgid "Send me notices through Jabber/GTalk."
 msgstr "WyÅlij mi wpisy przez Jabber/GTalk."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:166
+#: actions/imsettings.php:169
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr "WyÅlij wpis, kiedy zmieni siÄ mÃ³j stan na Jabber/GTalk."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:172
+#: actions/imsettings.php:175
 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Ä."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:179
+#: actions/imsettings.php:182
 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "Opublikuj MicroID adresu Jabber/GTalk."
 
 #. TRANS: Confirmation message for successful IM preferences save.
-#: actions/imsettings.php:287 actions/othersettings.php:180
+#: actions/imsettings.php:290 actions/othersettings.php:180
 msgid "Preferences saved."
 msgstr "Zapisano preferencje."
 
 #. TRANS: Message given saving IM address without having provided one.
-#: actions/imsettings.php:309
+#: actions/imsettings.php:312
 msgid "No Jabber ID."
 msgstr "Brak identyfikatora Jabbera."
 
 #. TRANS: Message given saving IM address that cannot be normalised.
-#: actions/imsettings.php:317
+#: actions/imsettings.php:320
 msgid "Cannot normalize that Jabber ID"
 msgstr "Nie moÅ¼na znormalizowaÄ tego identyfikatora Jabbera"
 
 #. TRANS: Message given saving IM address that not valid.
-#: actions/imsettings.php:322
+#: actions/imsettings.php:325
 msgid "Not a valid Jabber ID"
 msgstr "To nie jest prawidÅowy identyfikator Jabbera"
 
 #. TRANS: Message given saving IM address that is already set.
-#: actions/imsettings.php:326
+#: actions/imsettings.php:329
 msgid "That is already your Jabber ID."
 msgstr "Ten identyfikator Jabbera jest juÅ¼ twÃ³j."
 
 #. TRANS: Message given saving IM address that is already set for another user.
-#: actions/imsettings.php:330
+#: actions/imsettings.php:333
 msgid "Jabber ID already belongs to another user."
 msgstr "Identyfikator Jabbera naleÅ¼y juÅ¼ do innego uÅ¼ytkownika."
 
 #. 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
+#: actions/imsettings.php:361
 #, php-format
 msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
@@ -2099,28 +2105,28 @@ msgstr ""
 "zaakceptowaÄ otrzymywanie wiadomoÅci od %s."
 
 #. TRANS: Message given canceling IM address confirmation for the wrong IM address.
-#: actions/imsettings.php:388
+#: actions/imsettings.php:391
 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
+#: actions/imsettings.php:400
 msgid "Couldn't delete IM confirmation."
 msgstr "Nie moÅ¼na usunÄÄ potwierdzenia komunikatora."
 
 #. TRANS: Message given after successfully canceling IM address confirmation.
-#: actions/imsettings.php:402
+#: actions/imsettings.php:405
 msgid "IM confirmation cancelled."
 msgstr "Anulowano potwierdzenie komunikatora."
 
 #. TRANS: Message given trying to remove an IM address that is not
 #. TRANS: registered for the active user.
-#: actions/imsettings.php:424
+#: actions/imsettings.php:427
 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
+#: actions/imsettings.php:450
 msgid "The IM address was removed."
 msgstr "Adres komunikatora zostaÅ usuniÄty."
 
@@ -2591,8 +2597,8 @@ msgid "Only %s URLs over plain HTTP please."
 msgstr "Dozwolone sÄ tylko adresy URL %s przez zwykÅy protokÃ³Å HTTP."
 
 #. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1215
-#: lib/apiaction.php:1243 lib/apiaction.php:1366
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1206
+#: lib/apiaction.php:1233 lib/apiaction.php:1356
 msgid "Not a supported data format."
 msgstr "To nie jest obsÅugiwany format danych."
 
@@ -2732,7 +2738,7 @@ msgid "Password saved."
 msgstr "Zapisano hasÅo."
 
 #. TRANS: Menu item for site administration
-#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:384
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:371
 msgid "Paths"
 msgstr "ÅcieÅ¼ki"
 
@@ -2946,7 +2952,7 @@ msgstr "ImiÄ i nazwisko"
 
 #. TRANS: Form input field label.
 #: actions/profilesettings.php:115 actions/register.php:460
-#: lib/applicationeditform.php:244 lib/groupeditform.php:161
+#: lib/applicationeditform.php:235 lib/groupeditform.php:161
 msgid "Homepage"
 msgstr "Strona domowa"
 
@@ -3052,7 +3058,7 @@ msgid "Couldn't save tags."
 msgstr "Nie moÅ¼na zapisaÄ znacznikÃ³w."
 
 #. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:391 lib/adminpanelaction.php:141
+#: actions/profilesettings.php:391 lib/adminpanelaction.php:138
 msgid "Settings saved."
 msgstr "Zapisano ustawienia."
 
@@ -3589,7 +3595,7 @@ msgstr "UÅ¼ytkownik jest juÅ¼ ograniczony."
 
 #. TRANS: Menu item for site administration
 #: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
-#: lib/adminpanelaction.php:392
+#: lib/adminpanelaction.php:379
 msgid "Sessions"
 msgstr "Sesje"
 
@@ -3627,24 +3633,24 @@ msgid "Application profile"
 msgstr "Profil aplikacji"
 
 #. TRANS: Form input field label for application icon.
-#: actions/showapplication.php:159 lib/applicationeditform.php:182
+#: actions/showapplication.php:159 lib/applicationeditform.php:173
 msgid "Icon"
 msgstr "Ikona"
 
 #. TRANS: Form input field label for application name.
 #: actions/showapplication.php:169 actions/version.php:197
-#: lib/applicationeditform.php:199
+#: lib/applicationeditform.php:190
 msgid "Name"
 msgstr "Nazwa"
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:178 lib/applicationeditform.php:235
+#: actions/showapplication.php:178 lib/applicationeditform.php:226
 msgid "Organization"
 msgstr "Organizacja"
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:216 lib/groupeditform.php:172
+#: lib/applicationeditform.php:207 lib/groupeditform.php:172
 msgid "Description"
 msgstr "Opis"
 
@@ -3759,7 +3765,7 @@ msgstr ""
 msgid "This is a way to share what you like."
 msgstr "To jest sposÃ³b na wspÃ³Ådzielenie tego, co chcesz."
 
-#: actions/showgroup.php:82 lib/groupnav.php:86
+#: actions/showgroup.php:82
 #, php-format
 msgid "%s group"
 msgstr "Grupa %s"
@@ -3811,7 +3817,7 @@ msgstr "KanaÅ wpisÃ³w dla grupy %s (Atom)"
 msgid "FOAF for %s group"
 msgstr "FOAF dla grupy %s"
 
-#: actions/showgroup.php:393 actions/showgroup.php:445 lib/groupnav.php:91
+#: actions/showgroup.php:393 actions/showgroup.php:445
 msgid "Members"
 msgstr "CzÅonkowie"
 
@@ -4266,7 +4272,7 @@ msgstr "Nie podano kodu"
 
 #. TRANS: Menu item for site administration
 #: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
-#: lib/adminpanelaction.php:408
+#: lib/adminpanelaction.php:395
 msgid "Snapshots"
 msgstr "Migawki"
 
@@ -5002,7 +5008,7 @@ msgid "Unable to save tag."
 msgstr "Nie moÅ¼na zapisaÄ etykiety."
 
 #. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#: classes/Subscription.php:75 lib/oauthstore.php:465
+#: classes/Subscription.php:75 lib/oauthstore.php:466
 msgid "You have been banned from subscribing."
 msgstr "Zablokowano subskrybowanie."
 
@@ -5150,7 +5156,8 @@ msgid "Change site configuration"
 msgstr "ZmieÅ konfiguracjÄ witryny"
 
 #. TRANS: Main menu option when logged in and site admin for access to site configuration
-#: lib/action.php:474
+#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
+#: lib/action.php:474 lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr "Administrator"
@@ -5227,7 +5234,7 @@ msgstr "Wyszukaj"
 
 #. TRANS: DT element for site notice. String is hidden in default CSS.
 #. TRANS: Menu item for site administration
-#: lib/action.php:538 lib/adminpanelaction.php:400
+#: lib/action.php:538 lib/adminpanelaction.php:387
 msgid "Site notice"
 msgstr "Wpis witryny"
 
@@ -5291,7 +5298,10 @@ msgid "StatusNet software license"
 msgstr "Licencja oprogramowania StatusNet"
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
-#: lib/action.php:843
+#. TRANS: Text between [] is a link description, text between () is the link itself.
+#. TRANS: Make sure there is no whitespace between "]" and "(".
+#. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
+#: lib/action.php:846
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -5301,13 +5311,16 @@ msgstr ""
 "broughtby%%](%%site.broughtbyurl%%)."
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:846
+#: lib/action.php:849
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** jest usÅugÄ mikroblogowania."
 
 #. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.
-#: lib/action.php:850
+#. TRANS: Make sure there is no whitespace between "]" and "(".
+#. TRANS: Text between [] is a link description, text between () is the link itself.
+#. TRANS: %s is the version of StatusNet that is being used.
+#: lib/action.php:856
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -5319,20 +5332,20 @@ msgstr ""
 "Affero](http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
 
 #. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:866
+#: lib/action.php:872
 msgid "Site content license"
 msgstr "Licencja zawartoÅci witryny"
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:873
+#: lib/action.php:879
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr "TreÅÄ i dane %1$s sÄ prywatne i poufne."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:880
+#: lib/action.php:886
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
@@ -5340,14 +5353,15 @@ msgstr ""
 "zastrzeÅ¼one."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:884
+#: lib/action.php:890
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 "Prawa autorskie do treÅci i danych sÄ wÅasnoÅciÄ wspÃ³ÅtwÃ³rcÃ³w. Wszystkie "
 "prawa zastrzeÅ¼one."
 
-#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:897
+#. TRANS: license message in footer.
+#. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
+#: lib/action.php:904
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr ""
@@ -5355,19 +5369,19 @@ msgstr ""
 "$s."
 
 #. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1236
+#: lib/action.php:1243
 msgid "Pagination"
 msgstr "Paginacja"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1247
+#: lib/action.php:1254
 msgid "After"
 msgstr "PÃ³Åºniej"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1257
+#: lib/action.php:1264
 msgid "Before"
 msgstr "WczeÅniej"
 
@@ -5376,208 +5390,227 @@ msgstr "WczeÅniej"
 msgid "Expecting a root feed element but got a whole XML document."
 msgstr "Oczekiwano elementu kanaÅu roota, ale otrzymano caÅy dokument XML."
 
-#: lib/activityutils.php:208
+#. TRANS: Client exception thrown when there is no source attribute.
+#: lib/activityutils.php:203
 msgid "Can't handle remote content yet."
 msgstr "Nie moÅ¼na jeszcze obsÅugiwaÄ zdalnej treÅci."
 
-#: lib/activityutils.php:244
+#. TRANS: Client exception thrown when there embedded XML content is found that cannot be processed yet.
+#: lib/activityutils.php:240
 msgid "Can't handle embedded XML content yet."
 msgstr "Nie moÅ¼na jeszcze obsÅugiwaÄ zagnieÅ¼dÅ¼onej treÅci XML."
 
-#: lib/activityutils.php:248
+#. TRANS: Client exception thrown when base64 encoded content is found that cannot be processed yet.
+#: lib/activityutils.php:245
 msgid "Can't handle embedded Base64 content yet."
 msgstr "Nie moÅ¼na jeszcze obsÅugiwaÄ zagnieÅ¼dÅ¼onej treÅci Base64."
 
 #. TRANS: Client error message thrown when a user tries to change admin settings but has no access rights.
-#: lib/adminpanelaction.php:98
+#: lib/adminpanelaction.php:96
 msgid "You cannot make changes to this site."
 msgstr "Nie moÅ¼na wprowadziÄ zmian witryny."
 
 #. TRANS: Client error message throw when a certain panel's settings cannot be changed.
-#: lib/adminpanelaction.php:110
+#: lib/adminpanelaction.php:108
 msgid "Changes to that panel are not allowed."
 msgstr "Zmiany w tym panelu nie sÄ dozwolone."
 
 #. TRANS: Client error message.
-#: lib/adminpanelaction.php:229
+#: lib/adminpanelaction.php:222
 msgid "showForm() not implemented."
 msgstr "showForm() nie jest zaimplementowane."
 
 #. TRANS: Client error message
-#: lib/adminpanelaction.php:259
+#: lib/adminpanelaction.php:250
 msgid "saveSettings() not implemented."
 msgstr "saveSettings() nie jest zaimplementowane."
 
 #. TRANS: Client error message thrown if design settings could not be deleted in
 #. TRANS: the admin panel Design.
-#: lib/adminpanelaction.php:284
+#: lib/adminpanelaction.php:274
 msgid "Unable to delete design setting."
 msgstr "Nie moÅ¼na usunÄÄ ustawienia wyglÄdu."
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:350
+#: lib/adminpanelaction.php:337
 msgid "Basic site configuration"
 msgstr "Podstawowa konfiguracja witryny"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:352
+#: lib/adminpanelaction.php:339
 msgctxt "MENU"
 msgid "Site"
 msgstr "Witryna"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:358
+#: lib/adminpanelaction.php:345
 msgid "Design configuration"
 msgstr "Konfiguracja wyglÄdu"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:360
+#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
+#: lib/adminpanelaction.php:347 lib/groupnav.php:135
 msgctxt "MENU"
 msgid "Design"
 msgstr "WyglÄd"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:366
+#: lib/adminpanelaction.php:353
 msgid "User configuration"
 msgstr "Konfiguracja uÅ¼ytkownika"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:368 lib/personalgroupnav.php:115
+#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:115
 msgid "User"
 msgstr "UÅ¼ytkownik"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:374
+#: lib/adminpanelaction.php:361
 msgid "Access configuration"
 msgstr "Konfiguracja dostÄpu"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:382
+#: lib/adminpanelaction.php:369
 msgid "Paths configuration"
 msgstr "Konfiguracja ÅcieÅ¼ek"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:390
+#: lib/adminpanelaction.php:377
 msgid "Sessions configuration"
 msgstr "Konfiguracja sesji"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:398
+#: lib/adminpanelaction.php:385
 msgid "Edit site notice"
 msgstr "Zmodyfikuj wpis witryny"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:406
+#: lib/adminpanelaction.php:393
 msgid "Snapshots configuration"
 msgstr "Konfiguracja migawek"
 
 #. TRANS: Client error 401.
-#: lib/apiauth.php:113
+#: lib/apiauth.php:111
 msgid "API resource requires read-write access, but you only have read access."
 msgstr ""
 "ZasÃ³b API wymaga dostÄpu do zapisu i do odczytu, ale powiadasz dostÄp tylko "
 "do odczytu."
 
+#. TRANS: OAuth exception thrown when no application is found for a given consumer key.
+#: lib/apiauth.php:175
+msgid "No application for that consumer key."
+msgstr ""
+
+#. TRANS: OAuth exception given when no user was found for a given token (no token was found).
+#: lib/apiauth.php:217
+msgid "No user for that token."
+msgstr ""
+
+#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
+#: lib/apioauthstore.php:178
+msgid "Tried to revoke unknown token"
+msgstr ""
+
 #. TRANS: Form legend.
-#: lib/applicationeditform.php:137
+#: lib/applicationeditform.php:129
 msgid "Edit application"
 msgstr "Zmodyfikuj aplikacjÄ"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:187
+#: lib/applicationeditform.php:178
 msgid "Icon for this application"
 msgstr "Ikona tej aplikacji"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:209
+#: lib/applicationeditform.php:200
 #, php-format
 msgid "Describe your application in %d characters"
 msgstr "Opisz aplikacjÄ w %d znakach"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:213
+#: lib/applicationeditform.php:204
 msgid "Describe your application"
 msgstr "Opisz aplikacjÄ"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:224
+#: lib/applicationeditform.php:215
 msgid "URL of the homepage of this application"
 msgstr "Adres URL strony domowej tej aplikacji"
 
 #. TRANS: Form input field label.
-#: lib/applicationeditform.php:226
+#: lib/applicationeditform.php:217
 msgid "Source URL"
 msgstr "Å¹rÃ³dÅowy adres URL"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:233
+#: lib/applicationeditform.php:224
 msgid "Organization responsible for this application"
 msgstr "Organizacja odpowiedzialna za tÄ aplikacjÄ"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:242
+#: lib/applicationeditform.php:233
 msgid "URL for the homepage of the organization"
 msgstr "Adres URL strony domowej organizacji"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:251
+#: lib/applicationeditform.php:242
 msgid "URL to redirect to after authentication"
 msgstr "Adres URL do przekierowania po uwierzytelnieniu"
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:278
+#: lib/applicationeditform.php:269
 msgid "Browser"
 msgstr "PrzeglÄdarka"
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:295
+#: lib/applicationeditform.php:286
 msgid "Desktop"
 msgstr "Pulpit"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:297
+#: lib/applicationeditform.php:288
 msgid "Type of application, browser or desktop"
 msgstr "Typ aplikacji, przeglÄdarka lub pulpit"
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:320
+#: lib/applicationeditform.php:311
 msgid "Read-only"
 msgstr "Tylko do odczytu"
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:339
+#: lib/applicationeditform.php:330
 msgid "Read-write"
 msgstr "Odczyt i zapis"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:341
+#: lib/applicationeditform.php:332
 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: Submit button title
-#: lib/applicationeditform.php:359
+#. TRANS: Submit button title.
+#: lib/applicationeditform.php:349
 msgid "Cancel"
 msgstr "Anuluj"
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:136
+#: lib/applicationlist.php:135
 msgid "read-write"
 msgstr "odczyt i zapis"
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:138
+#: lib/applicationlist.php:137
 msgid "read-only"
 msgstr "tylko do odczytu"
 
 #. 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
+#: lib/applicationlist.php:143
 #, php-format
 msgid "Approved %1$s - \"%2$s\" access."
 msgstr "Zaakceptowano %1$s - dostÄp \"%2$s\"."
 
 #. TRANS: Button label
-#: lib/applicationlist.php:159
+#: lib/applicationlist.php:158
 msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "UniewaÅ¼nij"
@@ -5597,11 +5630,13 @@ msgstr "Autor"
 msgid "Provider"
 msgstr "Dostawca"
 
-#: lib/attachmentnoticesection.php:67
+#. TRANS: Title.
+#: lib/attachmentnoticesection.php:68
 msgid "Notices where this attachment appears"
 msgstr "Powiadamia, kiedy pojawia siÄ ten zaÅÄcznik"
 
-#: lib/attachmenttagcloudsection.php:48
+#. TRANS: Title.
+#: lib/attachmenttagcloudsection.php:49
 msgid "Tags for this attachment"
 msgstr "Znaczniki dla tego zaÅÄcznika"
 
@@ -5613,6 +5648,11 @@ msgstr "Zmiana hasÅa nie powiodÅa siÄ"
 msgid "Password changing is not allowed"
 msgstr "Zmiana hasÅa nie jest dozwolona"
 
+#. TRANS: Title for the form to block a user.
+#: lib/blockform.php:70
+msgid "Block"
+msgstr "Zablokuj"
+
 #: lib/channel.php:157 lib/channel.php:177
 msgid "Command results"
 msgstr "Wyniki polecenia"
@@ -5862,7 +5902,7 @@ msgid "You are not subscribed to anyone."
 msgstr "Nie subskrybujesz nikogo."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to.
-#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.
 #: lib/command.php:836
 msgid "You are subscribed to this person:"
@@ -5878,7 +5918,7 @@ msgid "No one is subscribed to you."
 msgstr "Nikt ciÄ nie subskrybuje."
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
-#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
 #: lib/command.php:863
 msgid "This person is subscribed to you:"
@@ -5894,7 +5934,7 @@ msgid "You are not a member of any groups."
 msgstr "Nie jesteÅ czÅonkiem Å¼adnej grupy."
 
 #. TRANS: Text shown after requesting groups a user is subscribed to.
-#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
 #: lib/command.php:890
 msgid "You are a member of this group:"
@@ -5903,6 +5943,7 @@ msgstr[0] "JesteÅ czÅonkiem tej grupy:"
 msgstr[1] "JesteÅ czÅonkiem tych grup:"
 msgstr[2] "JesteÅ czÅonkiem tych grup:"
 
+#. TRANS: Help text for commands.
 #: lib/command.php:905
 msgid ""
 "Commands:\n"
@@ -6126,38 +6167,6 @@ msgstr ""
 "Dodatkowe pseudonimy grupy, oddzielone przecinkami lub spacjami, maksymalnie "
 "%d"
 
-#: lib/groupnav.php:85
-msgid "Group"
-msgstr "Grupa"
-
-#: lib/groupnav.php:101
-msgid "Blocked"
-msgstr "Zablokowano"
-
-#: lib/groupnav.php:102
-#, php-format
-msgid "%s blocked users"
-msgstr "%s zablokowani uÅ¼ytkownicy"
-
-#: lib/groupnav.php:108
-#, php-format
-msgid "Edit %s group properties"
-msgstr "Zmodyfikuj wÅaÅciwoÅci grupy %s"
-
-#: lib/groupnav.php:113
-msgid "Logo"
-msgstr "Logo"
-
-#: lib/groupnav.php:114
-#, php-format
-msgid "Add or edit %s logo"
-msgstr "Dodaj lub zmodyfikuj logo grupy %s"
-
-#: lib/groupnav.php:120
-#, php-format
-msgid "Add or edit %s design"
-msgstr "Dodaj lub zmodyfikuj wyglÄd %s"
-
 #: lib/groupsbymemberssection.php:71
 msgid "Groups with most members"
 msgstr "Grupy z najwiÄkszÄ liczbÄ czÅonkÃ³w"
@@ -6189,7 +6198,8 @@ msgstr "Ten plik jest za duÅ¼y. Maksymalny rozmiar pliku to %s."
 msgid "Partial upload."
 msgstr "CzÄÅciowo wysÅano."
 
-#: lib/imagefile.php:101 lib/mediafile.php:170
+#. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
+#: lib/imagefile.php:101 lib/mediafile.php:179
 msgid "System error uploading file."
 msgstr "BÅÄd systemu podczas wysyÅania pliku."
 
@@ -6593,59 +6603,61 @@ msgstr "PrzychodzÄcy e-mail nie jest dozwolony."
 msgid "Unsupported message type: %s"
 msgstr "NieobsÅugiwany typ wiadomoÅci: %s"
 
-#: lib/mediafile.php:98 lib/mediafile.php:123
+#. TRANS: Client exception thrown when a database error was thrown during a file upload operation.
+#: lib/mediafile.php:99 lib/mediafile.php:125
 msgid "There was a database error while saving your file. Please try again."
 msgstr "WystÄpiÅ bÅÄd bazy danych podczas zapisywania pliku. SprÃ³buj ponownie."
 
-#: lib/mediafile.php:142
+#. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
+#: lib/mediafile.php:145
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
 msgstr "WysÅany plik przekracza dyrektywÄ upload_max_filesize w php.ini."
 
-#: lib/mediafile.php:147
+#. TRANS: Client exception.
+#: lib/mediafile.php:151
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form."
 msgstr ""
 "WysÅany plik przekracza dyrektywÄ MAX_FILE_SIZE podanÄ w formularzu HTML."
 
-#: lib/mediafile.php:152
+#. TRANS: Client exception.
+#: lib/mediafile.php:157
 msgid "The uploaded file was only partially uploaded."
 msgstr "Plik zostaÅ tylko czÄÅciowo wysÅany."
 
-#: lib/mediafile.php:159
+#. TRANS: Client exception thrown when a temporary folder is not present to store a file upload.
+#: lib/mediafile.php:165
 msgid "Missing a temporary folder."
 msgstr "Brak katalogu tymczasowego."
 
-#: lib/mediafile.php:162
+#. TRANS: Client exception thrown when writing to disk is not possible during a file upload operation.
+#: lib/mediafile.php:169
 msgid "Failed to write file to disk."
 msgstr "Zapisanie pliku na dysku nie powiodÅo siÄ."
 
-#: lib/mediafile.php:165
+#. TRANS: Client exception thrown when a file upload operation has been stopped by an extension.
+#: lib/mediafile.php:173
 msgid "File upload stopped by extension."
 msgstr "WysÅanie pliku zostaÅo zatrzymane przez rozszerzenie."
 
-#: lib/mediafile.php:179 lib/mediafile.php:217
+#. TRANS: Client exception thrown when a file upload operation would cause a user to exceed a set quota.
+#: lib/mediafile.php:189 lib/mediafile.php:232
 msgid "File exceeds user's quota."
 msgstr "Plik przekracza przydziaÅ uÅ¼ytkownika."
 
-#: lib/mediafile.php:197 lib/mediafile.php:234
+#. TRANS: Client exception thrown when a file upload operation fails because the file could
+#. TRANS: not be moved from the temporary folder to the permanent file location.
+#: lib/mediafile.php:209 lib/mediafile.php:251
 msgid "File could not be moved to destination directory."
 msgstr "Nie moÅ¼na przenieÅÄ pliku do katalogu docelowego."
 
-#: lib/mediafile.php:202 lib/mediafile.php:238
+#. TRANS: Client exception thrown when a file upload operation has been stopped because the MIME
+#. TRANS: type of the uploaded file could not be determined.
+#: lib/mediafile.php:216 lib/mediafile.php:257
 msgid "Could not determine file's MIME type."
 msgstr "Nie moÅ¼na okreÅliÄ typu MIME pliku."
 
-#: lib/mediafile.php:318
-#, php-format
-msgid " Try using another %s format."
-msgstr " SprÃ³buj innego formatu %s."
-
-#: lib/mediafile.php:323
-#, php-format
-msgid "%s is not a supported file type on this server."
-msgstr "%s nie jest obsÅugiwanym typem pliku na tym serwerze."
-
 #: lib/messageform.php:120
 msgid "Send a direct notice"
 msgstr "WyÅlij bezpoÅredni wpis"
@@ -6761,27 +6773,7 @@ msgstr "Szturchnij"
 msgid "Send a nudge to this user"
 msgstr "WyÅlij szturchniÄcie do tego uÅ¼ytkownika"
 
-#: lib/oauthstore.php:283
-msgid "Error inserting new profile"
-msgstr "BÅÄd podczas wprowadzania nowego profilu"
-
-#: lib/oauthstore.php:291
-msgid "Error inserting avatar"
-msgstr "BÅÄd podczas wprowadzania awatara"
-
-#: lib/oauthstore.php:306
-msgid "Error updating remote profile"
-msgstr "BÅÄd podczas aktualizowania zdalnego profilu"
-
-#: lib/oauthstore.php:311
-msgid "Error inserting remote profile"
-msgstr "BÅÄd podczas wprowadzania zdalnego profilu"
-
-#: lib/oauthstore.php:345
-msgid "Duplicate notice"
-msgstr "Duplikat wpisu"
-
-#: lib/oauthstore.php:490
+#: lib/oauthstore.php:491
 msgid "Couldn't insert new subscription."
 msgstr "Nie moÅ¼na wprowadziÄ nowej subskrypcji."
 
@@ -6818,7 +6810,8 @@ msgstr "WysÅane wiadomoÅci"
 msgid "Tags in %s's notices"
 msgstr "Znaczniki we wpisach uÅ¼ytkownika %s"
 
-#: lib/plugin.php:115
+#. TRANS: Displayed as version information for a plugin if no version information was found.
+#: lib/plugin.php:116
 msgid "Unknown"
 msgstr "Nieznane"
 
@@ -6913,19 +6906,19 @@ msgstr "Ogranicz"
 msgid "Sandbox this user"
 msgstr "Ogranicz tego uÅ¼ytkownika"
 
-#: lib/searchaction.php:120
+#. TRANS: Fieldset legend for the search form.
+#: lib/searchaction.php:121
 msgid "Search site"
 msgstr "Przeszukaj witrynÄ"
 
-#: lib/searchaction.php:126
+#. TRANS: Used as a field label for the field where one or more keywords
+#. TRANS: for searching can be entered.
+#: lib/searchaction.php:129
 msgid "Keyword(s)"
 msgstr "SÅowa kluczowe"
 
-#: lib/searchaction.php:127
-msgid "Search"
-msgstr "Wyszukaj"
-
-#: lib/searchaction.php:162
+#. TRANS: Definition list item with instructions on how to get (better) search results.
+#: lib/searchaction.php:170
 msgid "Search help"
 msgstr "Przeszukaj pomoc"
 
@@ -7127,56 +7120,32 @@ msgid "Moderator"
 msgstr "Moderator"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1102
+#: lib/util.php:1103
 msgid "a few seconds ago"
 msgstr "kilka sekund temu"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1105
+#: lib/util.php:1106
 msgid "about a minute ago"
 msgstr "okoÅo minutÄ temu"
 
-#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1109
-#, php-format
-msgid "about %d minutes ago"
-msgstr "okoÅo %d minut temu"
-
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 #: lib/util.php:1112
 msgid "about an hour ago"
 msgstr "okoÅo godzinÄ temu"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1116
-#, php-format
-msgid "about %d hours ago"
-msgstr "okoÅo %d godzin temu"
-
-#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1119
+#: lib/util.php:1118
 msgid "about a day ago"
 msgstr "blisko dzieÅ temu"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1123
-#, php-format
-msgid "about %d days ago"
-msgstr "okoÅo %d dni temu"
-
-#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1126
+#: lib/util.php:1124
 msgid "about a month ago"
 msgstr "okoÅo miesiÄc temu"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 #: lib/util.php:1130
-#, php-format
-msgid "about %d months ago"
-msgstr "okoÅo %d miesiÄcy temu"
-
-#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1133
 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 44dc05c506..51a2982b70 100644
--- a/locale/pt/LC_MESSAGES/statusnet.po
+++ b/locale/pt/LC_MESSAGES/statusnet.po
@@ -1,10 +1,11 @@
-# Translation of StatusNet to Portuguese
+# Translation of StatusNet to Portuguese (PortuguÃªs)
+# Expored from translatewiki.net
 #
-# Author@translatewiki.net: Gallaecio
-# Author@translatewiki.net: Giro720
-# Author@translatewiki.net: Hamilton Abreu
-# Author@translatewiki.net: Ipublicis
-# Author@translatewiki.net: Waldir
+# Author: Gallaecio
+# Author: Giro720
+# Author: Hamilton Abreu
+# Author: Ipublicis
+# Author: Waldir
 # --
 # This file is distributed under the same license as the StatusNet package.
 #
@@ -12,20 +13,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-08 22:33+0000\n"
-"PO-Revision-Date: 2010-09-08 22:35:15+0000\n"
-"Language-Team: Portuguese\n"
+"POT-Creation-Date: 2010-09-14 19:53+0000\n"
+"PO-Revision-Date: 2010-09-14 19:54:16+0000\n"
+"Language-Team: Portuguese <http://translatewiki.net/wiki/Portal:pt>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r72348); Translate extension (2010-08-20)\n"
+"X-Generator: MediaWiki 1.17alpha (r73009); Translate extension (2010-08-20)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt\n"
-"X-Message-Group: out-statusnet\n"
+"X-Message-Group: #out-statusnet\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-POT-Import-Date: 1284-49-16 34::+0000\n"
 
 #. TRANS: Page title
 #. TRANS: Menu item for site administration
-#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:376
+#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:363
 msgid "Access"
 msgstr "Acesso"
 
@@ -78,10 +80,10 @@ msgstr "Gravar 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 actions/emailsettings.php:224
-#: actions/imsettings.php:184 actions/smssettings.php:209
-#: lib/applicationeditform.php:361
+#. TRANS: Button label in the "Edit application" form.
+#: actions/accessadminpanel.php:203 actions/emailsettings.php:228
+#: actions/imsettings.php:187 actions/smssettings.php:209
+#: lib/applicationeditform.php:351
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Gravar"
@@ -94,15 +96,15 @@ msgstr "PÃ¡gina nÃ£o foi encontrada."
 
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #: actions/all.php:79 actions/allrss.php:68
-#: actions/apiaccountupdatedeliverydevice.php:114
-#: actions/apiaccountupdateprofile.php:105
-#: actions/apiaccountupdateprofilebackgroundimage.php:116
-#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
-#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
-#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:113
-#: actions/apigroupismember.php:91 actions/apigroupjoin.php:100
-#: actions/apigroupleave.php:100 actions/apigrouplist.php:73
-#: actions/apistatusesupdate.php:229 actions/apisubscriptions.php:87
+#: actions/apiaccountupdatedeliverydevice.php:115
+#: actions/apiaccountupdateprofile.php:106
+#: actions/apiaccountupdateprofilebackgroundimage.php:117
+#: actions/apiaccountupdateprofileimage.php:106 actions/apiblockcreate.php:98
+#: actions/apiblockdestroy.php:97 actions/apidirectmessage.php:77
+#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:114
+#: actions/apigroupismember.php:91 actions/apigroupjoin.php:101
+#: actions/apigroupleave.php:101 actions/apigrouplist.php:73
+#: actions/apistatusesupdate.php:230 actions/apisubscriptions.php:87
 #: actions/apitimelinefavorites.php:72 actions/apitimelinefriends.php:174
 #: actions/apitimelinehome.php:80 actions/apitimelinementions.php:80
 #: actions/apitimelineuser.php:82 actions/avatarbynickname.php:75
@@ -201,16 +203,16 @@ msgid "Updates from %1$s and friends on %2$s!"
 msgstr "ActualizaÃ§Ãµes de %1$s e amigos no %2$s!"
 
 #: actions/apiaccountratelimitstatus.php:72
-#: actions/apiaccountupdatedeliverydevice.php:94
-#: actions/apiaccountupdateprofile.php:97
-#: actions/apiaccountupdateprofilebackgroundimage.php:94
-#: actions/apiaccountupdateprofilecolors.php:118
+#: actions/apiaccountupdatedeliverydevice.php:95
+#: actions/apiaccountupdateprofile.php:98
+#: actions/apiaccountupdateprofilebackgroundimage.php:95
+#: actions/apiaccountupdateprofilecolors.php:119
 #: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156
-#: actions/apifavoritecreate.php:100 actions/apifavoritedestroy.php:101
-#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100
-#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:139
-#: actions/apigroupismember.php:115 actions/apigroupjoin.php:156
-#: actions/apigroupleave.php:142 actions/apigrouplist.php:137
+#: actions/apifavoritecreate.php:101 actions/apifavoritedestroy.php:102
+#: actions/apifriendshipscreate.php:101 actions/apifriendshipsdestroy.php:101
+#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:140
+#: actions/apigroupismember.php:115 actions/apigroupjoin.php:157
+#: actions/apigroupleave.php:143 actions/apigrouplist.php:137
 #: actions/apigrouplistall.php:122 actions/apigroupmembership.php:107
 #: actions/apigroupshow.php:116 actions/apihelptest.php:88
 #: actions/apistatusesdestroy.php:104 actions/apistatusesretweets.php:112
@@ -225,48 +227,50 @@ msgstr "ActualizaÃ§Ãµes de %1$s e amigos no %2$s!"
 msgid "API method not found."
 msgstr "MÃ©todo da API nÃ£o encontrado."
 
-#: actions/apiaccountupdatedeliverydevice.php:86
-#: actions/apiaccountupdateprofile.php:89
-#: actions/apiaccountupdateprofilebackgroundimage.php:86
-#: actions/apiaccountupdateprofilecolors.php:110
-#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89
-#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109
-#: actions/apifavoritecreate.php:91 actions/apifavoritedestroy.php:92
-#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
-#: actions/apigroupcreate.php:105 actions/apigroupjoin.php:92
-#: actions/apigroupleave.php:92 actions/apimediaupload.php:67
-#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:198
+#. TRANS: Client error message. POST is a HTTP command. It should not be translated.
+#. TRANS: Client error. POST is a HTTP command. It should not be translated.
+#: actions/apiaccountupdatedeliverydevice.php:87
+#: actions/apiaccountupdateprofile.php:90
+#: actions/apiaccountupdateprofilebackgroundimage.php:87
+#: actions/apiaccountupdateprofilecolors.php:111
+#: actions/apiaccountupdateprofileimage.php:85 actions/apiblockcreate.php:90
+#: actions/apiblockdestroy.php:89 actions/apidirectmessagenew.php:110
+#: actions/apifavoritecreate.php:92 actions/apifavoritedestroy.php:93
+#: actions/apifriendshipscreate.php:92 actions/apifriendshipsdestroy.php:92
+#: actions/apigroupcreate.php:106 actions/apigroupjoin.php:93
+#: actions/apigroupleave.php:93 actions/apimediaupload.php:68
+#: actions/apistatusesretweet.php:66 actions/apistatusesupdate.php:199
 msgid "This method requires a POST."
 msgstr "Este mÃ©todo requer um POST."
 
-#: actions/apiaccountupdatedeliverydevice.php:106
+#: actions/apiaccountupdatedeliverydevice.php:107
 msgid ""
 "You must specify a parameter named 'device' with a value of one of: sms, im, "
 "none."
 msgstr ""
 "Tem de especificar um parÃ¢metro 'aparelho' com um dos valores: sms, im, none."
 
-#: actions/apiaccountupdatedeliverydevice.php:133
+#: actions/apiaccountupdatedeliverydevice.php:134
 msgid "Could not update user."
 msgstr "NÃ£o foi possÃvel actualizar o utilizador."
 
-#: actions/apiaccountupdateprofile.php:112
-#: actions/apiaccountupdateprofilebackgroundimage.php:194
-#: actions/apiaccountupdateprofilecolors.php:185
-#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/apiaccountupdateprofile.php:113
+#: actions/apiaccountupdateprofilebackgroundimage.php:195
+#: actions/apiaccountupdateprofilecolors.php:186
+#: actions/apiaccountupdateprofileimage.php:131 actions/apiusershow.php:108
 #: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/hcard.php:74
 #: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
 #: lib/profileaction.php:84
 msgid "User has no profile."
 msgstr "Utilizador nÃ£o tem perfil."
 
-#: actions/apiaccountupdateprofile.php:147
+#: actions/apiaccountupdateprofile.php:148
 msgid "Could not save profile."
 msgstr "NÃ£o foi possÃvel gravar o perfil."
 
-#: actions/apiaccountupdateprofilebackgroundimage.php:108
-#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
-#: actions/apistatusesupdate.php:212 actions/avatarsettings.php:257
+#: actions/apiaccountupdateprofilebackgroundimage.php:109
+#: actions/apiaccountupdateprofileimage.php:98 actions/apimediaupload.php:81
+#: actions/apistatusesupdate.php:213 actions/avatarsettings.php:257
 #: actions/designadminpanel.php:123 actions/editapplication.php:118
 #: actions/newapplication.php:101 actions/newnotice.php:94
 #: lib/designsettings.php:283
@@ -278,30 +282,30 @@ msgstr ""
 "O servidor nÃ£o conseguiu processar tantos dados POST (%s bytes) devido Ã  sua "
 "configuraÃ§Ã£o actual."
 
-#: actions/apiaccountupdateprofilebackgroundimage.php:136
-#: actions/apiaccountupdateprofilebackgroundimage.php:146
-#: actions/apiaccountupdateprofilecolors.php:164
-#: actions/apiaccountupdateprofilecolors.php:174
+#: actions/apiaccountupdateprofilebackgroundimage.php:137
+#: actions/apiaccountupdateprofilebackgroundimage.php:147
+#: actions/apiaccountupdateprofilecolors.php:165
+#: actions/apiaccountupdateprofilecolors.php:175
 #: actions/groupdesignsettings.php:290 actions/groupdesignsettings.php:300
 #: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
 #: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
 msgid "Unable to save your design settings."
 msgstr "NÃ£o foi possÃvel gravar as configuraÃ§Ãµes do estilo."
 
-#: actions/apiaccountupdateprofilebackgroundimage.php:187
-#: actions/apiaccountupdateprofilecolors.php:142
+#: actions/apiaccountupdateprofilebackgroundimage.php:188
+#: actions/apiaccountupdateprofilecolors.php:143
 msgid "Could not update your design."
 msgstr "NÃ£o foi possÃvel actualizar o seu estilo."
 
-#: actions/apiblockcreate.php:105
+#: actions/apiblockcreate.php:106
 msgid "You cannot block yourself!"
 msgstr "Os utilizadores nÃ£o podem bloquear-se a si prÃ³prios!"
 
-#: actions/apiblockcreate.php:126
+#: actions/apiblockcreate.php:127
 msgid "Block user failed."
 msgstr "Bloqueio do utilizador falhou."
 
-#: actions/apiblockdestroy.php:114
+#: actions/apiblockdestroy.php:115
 msgid "Unblock user failed."
 msgstr "Desbloqueio do utilizador falhou."
 
@@ -325,61 +329,61 @@ msgstr "Mensagens directas para %s"
 msgid "All the direct messages sent to %s"
 msgstr "Todas as mensagens directas enviadas para %s"
 
-#: actions/apidirectmessagenew.php:118
+#: actions/apidirectmessagenew.php:119
 msgid "No message text!"
 msgstr "Mensagem nÃ£o tem texto!"
 
-#: actions/apidirectmessagenew.php:127 actions/newmessage.php:150
+#: actions/apidirectmessagenew.php:128 actions/newmessage.php:150
 #, php-format
 msgid "That's too long. Max message size is %d chars."
 msgstr "Demasiado longo. Tamanho mÃ¡x. das mensagens Ã© %d caracteres."
 
-#: actions/apidirectmessagenew.php:138
+#: actions/apidirectmessagenew.php:139
 msgid "Recipient user not found."
 msgstr "DestinatÃ¡rio nÃ£o encontrado."
 
-#: actions/apidirectmessagenew.php:142
+#: actions/apidirectmessagenew.php:143
 msgid "Can't send direct messages to users who aren't your friend."
 msgstr ""
 "NÃ£o pode enviar mensagens directas a utilizadores que nÃ£o sejam amigos."
 
-#: actions/apifavoritecreate.php:109 actions/apifavoritedestroy.php:110
+#: actions/apifavoritecreate.php:110 actions/apifavoritedestroy.php:111
 #: actions/apistatusesdestroy.php:121
 msgid "No status found with that ID."
 msgstr "Nenhum estado encontrado com esse ID."
 
-#: actions/apifavoritecreate.php:120
+#: actions/apifavoritecreate.php:121
 msgid "This status is already a favorite."
 msgstr "Este estado jÃ¡ Ã© um favorito."
 
 #. TRANS: Error message text shown when a favorite could not be set.
-#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:296
+#: actions/apifavoritecreate.php:132 actions/favor.php:84 lib/command.php:296
 msgid "Could not create favorite."
 msgstr "NÃ£o foi possÃvel criar o favorito."
 
-#: actions/apifavoritedestroy.php:123
+#: actions/apifavoritedestroy.php:124
 msgid "That status is not a favorite."
 msgstr "Esse estado nÃ£o Ã© um favorito."
 
-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
+#: actions/apifavoritedestroy.php:136 actions/disfavor.php:87
 msgid "Could not delete favorite."
 msgstr "NÃ£o foi possÃvel eliminar o favorito."
 
-#: actions/apifriendshipscreate.php:109
+#: actions/apifriendshipscreate.php:110
 msgid "Could not follow user: profile not found."
 msgstr "NÃ£o foi possÃvel seguir o utilizador: o perfil nÃ£o foi encontrado."
 
-#: actions/apifriendshipscreate.php:118
+#: actions/apifriendshipscreate.php:119
 #, php-format
 msgid "Could not follow user: %s is already on your list."
 msgstr "NÃ£o foi possÃvel seguir utilizador: %s jÃ¡ estÃ¡ na sua lista."
 
-#: actions/apifriendshipsdestroy.php:109
+#: actions/apifriendshipsdestroy.php:110
 msgid "Could not unfollow user: User not found."
 msgstr ""
 "NÃ£o foi possÃvel deixar de seguir utilizador: Utilizador nÃ£o encontrado."
 
-#: actions/apifriendshipsdestroy.php:120
+#: actions/apifriendshipsdestroy.php:121
 msgid "You cannot unfollow yourself."
 msgstr "NÃ£o pode deixar de seguir-se a si prÃ³prio."
 
@@ -395,101 +399,101 @@ msgstr "NÃ£o foi possÃvel determinar o utilizador de origem."
 msgid "Could not find target user."
 msgstr "NÃ£o foi possÃvel encontrar o utilizador de destino."
 
-#: actions/apigroupcreate.php:167 actions/editgroup.php:186
+#: actions/apigroupcreate.php:168 actions/editgroup.php:186
 #: actions/newgroup.php:126 actions/profilesettings.php:215
 #: actions/register.php:212
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr "Utilizador sÃ³ deve conter letras minÃºsculas e nÃºmeros. Sem espaÃ§os."
 
-#: actions/apigroupcreate.php:176 actions/editgroup.php:190
+#: actions/apigroupcreate.php:177 actions/editgroup.php:190
 #: actions/newgroup.php:130 actions/profilesettings.php:238
 #: actions/register.php:215
 msgid "Nickname already in use. Try another one."
 msgstr "Utilizador jÃ¡ Ã© usado. Tente outro."
 
-#: actions/apigroupcreate.php:183 actions/editgroup.php:193
+#: actions/apigroupcreate.php:184 actions/editgroup.php:193
 #: actions/newgroup.php:133 actions/profilesettings.php:218
 #: actions/register.php:217
 msgid "Not a valid nickname."
 msgstr "Utilizador nÃ£o Ã© vÃ¡lido."
 
-#: actions/apigroupcreate.php:199 actions/editapplication.php:215
+#: actions/apigroupcreate.php:200 actions/editapplication.php:215
 #: actions/editgroup.php:199 actions/newapplication.php:203
 #: actions/newgroup.php:139 actions/profilesettings.php:222
 #: actions/register.php:224
 msgid "Homepage is not a valid URL."
 msgstr "PÃ¡gina de Ãnicio nÃ£o Ã© uma URL vÃ¡lida."
 
-#: actions/apigroupcreate.php:208 actions/editgroup.php:202
+#: actions/apigroupcreate.php:209 actions/editgroup.php:202
 #: actions/newgroup.php:142 actions/profilesettings.php:225
 #: actions/register.php:227
 msgid "Full name is too long (max 255 chars)."
 msgstr "Nome completo demasiado longo (mÃ¡x. 255 caracteres)."
 
-#: actions/apigroupcreate.php:216 actions/editapplication.php:190
+#: actions/apigroupcreate.php:217 actions/editapplication.php:190
 #: actions/newapplication.php:172
 #, php-format
 msgid "Description is too long (max %d chars)."
 msgstr "DescriÃ§Ã£o demasiado longa (mÃ¡x. %d caracteres)."
 
-#: actions/apigroupcreate.php:227 actions/editgroup.php:208
+#: actions/apigroupcreate.php:228 actions/editgroup.php:208
 #: actions/newgroup.php:148 actions/profilesettings.php:232
 #: actions/register.php:234
 msgid "Location is too long (max 255 chars)."
 msgstr "Localidade demasiado longa (mÃ¡x. 255 caracteres)."
 
-#: actions/apigroupcreate.php:246 actions/editgroup.php:219
+#: actions/apigroupcreate.php:247 actions/editgroup.php:219
 #: actions/newgroup.php:159
 #, php-format
 msgid "Too many aliases! Maximum %d."
 msgstr "Demasiados nomes alternativos! MÃ¡x. %d."
 
-#: actions/apigroupcreate.php:267
+#: actions/apigroupcreate.php:268
 #, php-format
 msgid "Invalid alias: \"%s\"."
 msgstr "Nome alternativo invÃ¡lido: \"%s\""
 
-#: actions/apigroupcreate.php:276 actions/editgroup.php:232
+#: actions/apigroupcreate.php:277 actions/editgroup.php:232
 #: actions/newgroup.php:172
 #, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr "Nome alternativo \"%s\" jÃ¡ em uso. Tente outro."
 
-#: actions/apigroupcreate.php:289 actions/editgroup.php:238
+#: actions/apigroupcreate.php:290 actions/editgroup.php:238
 #: actions/newgroup.php:178
 msgid "Alias can't be the same as nickname."
 msgstr "Um nome alternativo nÃ£o pode ser igual ao nome do utilizador."
 
-#: actions/apigroupismember.php:96 actions/apigroupjoin.php:105
-#: actions/apigroupleave.php:105 actions/apigroupmembership.php:92
+#: actions/apigroupismember.php:96 actions/apigroupjoin.php:106
+#: actions/apigroupleave.php:106 actions/apigroupmembership.php:92
 #: actions/apigroupshow.php:83 actions/apitimelinegroup.php:92
 msgid "Group not found."
 msgstr "Grupo nÃ£o foi encontrado."
 
 #. TRANS: Error text shown a user tries to join a group they already are a member of.
-#: actions/apigroupjoin.php:111 actions/joingroup.php:100 lib/command.php:336
+#: actions/apigroupjoin.php:112 actions/joingroup.php:100 lib/command.php:336
 msgid "You are already a member of that group."
 msgstr "JÃ¡ Ã© membro desse grupo."
 
 #. TRANS: Error text shown when a user tries to join a group they are blocked from joining.
-#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:341
+#: actions/apigroupjoin.php:121 actions/joingroup.php:105 lib/command.php:341
 msgid "You have been blocked from that group by the admin."
 msgstr "Foi bloqueado desse grupo pelo gestor."
 
 #. 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.
-#: actions/apigroupjoin.php:139 actions/joingroup.php:134 lib/command.php:353
+#: actions/apigroupjoin.php:140 actions/joingroup.php:134 lib/command.php:353
 #, 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."
 
-#: actions/apigroupleave.php:115
+#: actions/apigroupleave.php:116
 msgid "You are not a member of this group."
 msgstr "NÃ£o Ã© membro deste grupo."
 
 #. 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.
-#: actions/apigroupleave.php:125 actions/leavegroup.php:129
+#: actions/apigroupleave.php:126 actions/leavegroup.php:129
 #: lib/command.php:401
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
@@ -519,7 +523,7 @@ msgstr "Grupos de %s"
 msgid "groups on %s"
 msgstr "Grupos em %s"
 
-#: actions/apimediaupload.php:99
+#: actions/apimediaupload.php:100
 msgid "Upload failed."
 msgstr "O upload falhou."
 
@@ -533,9 +537,9 @@ msgstr "Chave invÃ¡lida."
 
 #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
 #: actions/deletenotice.php:169 actions/disfavor.php:74
-#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:55
+#: actions/emailsettings.php:271 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:66 actions/imsettings.php:227
+#: actions/groupunblock.php:66 actions/imsettings.php:230
 #: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
@@ -578,8 +582,8 @@ msgstr "A chave de pedido %s foi negada e retirada."
 #. 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:286 actions/grouplogo.php:322
-#: actions/imsettings.php:242 actions/newapplication.php:121
+#: actions/emailsettings.php:290 actions/grouplogo.php:322
+#: actions/imsettings.php:245 actions/newapplication.php:121
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
 #: actions/smssettings.php:277 lib/designsettings.php:304
 msgid "Unexpected form submission."
@@ -643,18 +647,18 @@ msgstr "Este mÃ©todo requer um POST ou DELETE."
 msgid "You may not delete another user's status."
 msgstr "NÃ£o pode apagar o estado de outro utilizador."
 
-#: actions/apistatusesretweet.php:75 actions/apistatusesretweets.php:72
+#: actions/apistatusesretweet.php:76 actions/apistatusesretweets.php:72
 #: actions/deletenotice.php:52 actions/shownotice.php:92
 msgid "No such notice."
 msgstr "Nota nÃ£o foi encontrada."
 
 #. TRANS: Error text shown when trying to repeat an own notice.
-#: actions/apistatusesretweet.php:83 lib/command.php:538
+#: actions/apistatusesretweet.php:84 lib/command.php:538
 msgid "Cannot repeat your own notice."
 msgstr "NÃ£o pode repetir a sua prÃ³pria nota."
 
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-#: actions/apistatusesretweet.php:91 lib/command.php:544
+#: actions/apistatusesretweet.php:92 lib/command.php:544
 msgid "Already repeated that notice."
 msgstr "JÃ¡ repetiu essa nota."
 
@@ -666,21 +670,21 @@ msgstr "Estado apagado."
 msgid "No status with that ID found."
 msgstr "NÃ£o foi encontrado um estado com esse ID."
 
-#: actions/apistatusesupdate.php:221
+#: actions/apistatusesupdate.php:222
 msgid "Client must provide a 'status' parameter with a value."
 msgstr "O cliente tem de fornecer um parÃ¢metro 'status' com um valor."
 
-#: actions/apistatusesupdate.php:242 actions/newnotice.php:157
+#: actions/apistatusesupdate.php:243 actions/newnotice.php:157
 #: lib/mailhandler.php:60
 #, php-format
 msgid "That's too long. Max notice size is %d chars."
 msgstr "Demasiado longo. Tamanho mÃ¡x. das notas Ã© %d caracteres."
 
-#: actions/apistatusesupdate.php:283 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:284 actions/apiusershow.php:96
 msgid "Not found."
 msgstr "NÃ£o encontrado."
 
-#: actions/apistatusesupdate.php:306 actions/newnotice.php:181
+#: actions/apistatusesupdate.php:307 actions/newnotice.php:181
 #, php-format
 msgid "Max notice size is %d chars, including attachment URL."
 msgstr "Tamanho mÃ¡x. das notas Ã© %d caracteres, incluÃndo a URL do anexo."
@@ -880,7 +884,9 @@ msgid "Yes"
 msgstr "Sim"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
+#. TRANS: Submit button title.
+#. TRANS: Description of the form to block a user.
+#: actions/block.php:164 actions/groupmembers.php:403 lib/blockform.php:82
 msgid "Block this user"
 msgstr "Bloquear este utilizador"
 
@@ -922,11 +928,13 @@ msgstr "Uma lista dos utilizadores com entrada bloqueada neste grupo."
 msgid "Unblock user from group"
 msgstr "Desbloquear utilizador do grupo"
 
-#: actions/blockedfromgroup.php:320 lib/unblockform.php:69
+#. TRANS: Title for the form to unblock a user.
+#: actions/blockedfromgroup.php:320 lib/unblockform.php:70
 msgid "Unblock"
 msgstr "Desbloquear"
 
-#: actions/blockedfromgroup.php:320 lib/unblockform.php:80
+#. TRANS: Description of the form to unblock a user.
+#: actions/blockedfromgroup.php:320 lib/unblockform.php:82
 msgid "Unblock this user"
 msgstr "Desbloquear este utilizador"
 
@@ -965,9 +973,9 @@ msgstr "Esse endereÃ§o jÃ¡ tinha sido confirmado."
 #. 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/confirmaddress.php:116 actions/emailsettings.php:331
+#: actions/emailsettings.php:477 actions/imsettings.php:283
+#: actions/imsettings.php:442 actions/othersettings.php:174
 #: actions/profilesettings.php:283 actions/smssettings.php:308
 #: actions/smssettings.php:464
 msgid "Couldn't update user."
@@ -975,7 +983,7 @@ msgstr "NÃ£o foi possÃvel actualizar o utilizador."
 
 #. 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/confirmaddress.php:128 actions/emailsettings.php:437
 #: 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."
@@ -1011,9 +1019,10 @@ msgstr "AplicaÃ§Ã£o nÃ£o foi encontrada."
 msgid "You are not the owner of this application."
 msgstr "NÃ£o Ã© o proprietÃ¡rio desta aplicaÃ§Ã£o."
 
+#. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:127
 #: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1307
+#: lib/action.php:1315
 msgid "There was a problem with your session token."
 msgstr "Ocorreu um problema com a sua sessÃ£o."
 
@@ -1047,7 +1056,7 @@ msgstr "Apagar esta aplicaÃ§Ã£o"
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
 #: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:73 lib/profileformaction.php:64
+#: lib/adminpanelaction.php:71 lib/profileformaction.php:64
 #: lib/settingsaction.php:72
 msgid "Not logged in."
 msgstr "NÃ£o iniciou sessÃ£o."
@@ -1110,7 +1119,6 @@ msgstr "Apagar este utilizador"
 #. TRANS: Message used as title for design settings for the site.
 #. TRANS: Link description in user account settings menu.
 #: actions/designadminpanel.php:63 lib/accountsettingsaction.php:139
-#: lib/groupnav.php:119
 msgid "Design"
 msgstr "Estilo"
 
@@ -1233,13 +1241,13 @@ msgstr "Repor estilos predefinidos"
 msgid "Reset back to default"
 msgstr "Repor predefiniÃ§Ã£o"
 
-#. TRANS: Submit button title
+#. TRANS: Submit button title.
 #: actions/designadminpanel.php:685 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/snapshotadminpanel.php:245
 #: actions/subscriptions.php:226 actions/tagother.php:154
-#: actions/useradminpanel.php:294 lib/applicationeditform.php:363
+#: actions/useradminpanel.php:294 lib/applicationeditform.php:353
 #: lib/designsettings.php:256 lib/groupeditform.php:202
 msgid "Save"
 msgstr "Gravar"
@@ -1395,7 +1403,7 @@ msgstr "EndereÃ§o de correio jÃ¡ confirmado."
 #. 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/emailsettings.php:115 actions/emailsettings.php:162
 #: actions/imsettings.php:116 actions/smssettings.php:124
 #: actions/smssettings.php:180
 msgctxt "BUTTON"
@@ -1413,15 +1421,19 @@ msgstr ""
 #. 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
+#. TRANS: Button label in the "Edit application" form.
 #: actions/emailsettings.php:127 actions/imsettings.php:131
-#: actions/smssettings.php:137 lib/applicationeditform.php:357
+#: actions/smssettings.php:137 lib/applicationeditform.php:347
 msgctxt "BUTTON"
 msgid "Cancel"
 msgstr "Cancelar"
 
-#. TRANS: Instructions for e-mail address input form.
-#: actions/emailsettings.php:135
+#. TRANS: Instructions for e-mail address input form. Do not translate
+#. TRANS: "example.org". It is one of the domain names reserved for
+#. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
+#. TRANS: Any other domain may be owned by a legitimate person or
+#. TRANS: organization.
+#: actions/emailsettings.php:139
 msgid "Email address, like \"UserName@example.org\""
 msgstr ""
 "EndereÃ§o de correio electrÃ³nico, por ex. \"nomedeutilizador@exemplo.pt\""
@@ -1429,7 +1441,7 @@ msgstr ""
 #. 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/emailsettings.php:143 actions/imsettings.php:151
 #: actions/smssettings.php:162
 msgctxt "BUTTON"
 msgid "Add"
@@ -1437,114 +1449,114 @@ msgstr "Adicionar"
 
 #. 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
+#: actions/emailsettings.php:151 actions/smssettings.php:171
 msgid "Incoming email"
 msgstr "Correio recebido"
 
 #. 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
+#: actions/emailsettings.php:159 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."
 
 #. 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
+#: actions/emailsettings.php:168 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."
 
 #. 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
+#: actions/emailsettings.php:172 actions/smssettings.php:189
 msgctxt "BUTTON"
 msgid "New"
 msgstr "Novo"
 
 #. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:174
+#: actions/emailsettings.php:178
 msgid "Email preferences"
 msgstr "PreferÃªncias de correio electrÃ³nico"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:180
+#: actions/emailsettings.php:184
 msgid "Send me notices of new subscriptions through email."
 msgstr "Enviem-me notificaÃ§Ã£o electrÃ³nica das novas subscriÃ§Ãµes."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:186
+#: actions/emailsettings.php:190
 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."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:193
+#: actions/emailsettings.php:197
 msgid "Send me email when someone sends me a private message."
 msgstr ""
 "Enviem-me notificaÃ§Ã£o electrÃ³nica quando me enviarem uma mensagem privada."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:199
+#: actions/emailsettings.php:203
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr ""
 "Enviem-me notificaÃ§Ã£o electrÃ³nica quando me enviarem uma \"resposta-@\"."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:205
+#: actions/emailsettings.php:209
 msgid "Allow friends to nudge me and send me an email."
 msgstr "Permitir que amigos me toquem e enviem mensagens electrÃ³nicas."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:212
+#: actions/emailsettings.php:216
 msgid "I want to post notices by email."
 msgstr "Quero publicar notas por correio electrÃ³nico."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:219
+#: actions/emailsettings.php:223
 msgid "Publish a MicroID for my email address."
 msgstr "Publicar um MicroID para o meu endereÃ§o electrÃ³nico."
 
 #. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:334
+#: actions/emailsettings.php:338
 msgid "Email preferences saved."
 msgstr "PreferÃªncias de correio electrÃ³nico foram gravadas."
 
 #. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:353
+#: actions/emailsettings.php:357
 msgid "No email address."
 msgstr "Sem endereÃ§o de correio electrÃ³nico."
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:361
+#: actions/emailsettings.php:365
 msgid "Cannot normalize that email address"
 msgstr "NÃ£o Ã© possÃvel normalizar esse endereÃ§o electrÃ³nico"
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:208
+#: actions/emailsettings.php:370 actions/register.php:208
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "Correio electrÃ³nico Ã© invÃ¡lido."
 
 #. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:370
+#: actions/emailsettings.php:374
 msgid "That is already your email address."
 msgstr "Esse jÃ¡ Ã© o seu endereÃ§o electrÃ³nico."
 
 #. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:374
+#: actions/emailsettings.php:378
 msgid "That email address already belongs to another user."
 msgstr "Esse endereÃ§o electrÃ³nico jÃ¡ pertence a outro utilizador."
 
 #. 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/emailsettings.php:395 actions/imsettings.php:351
 #: actions/smssettings.php:373
 msgid "Couldn't insert confirmation code."
 msgstr "NÃ£o foi possÃvel inserir o cÃ³digo de confirmaÃ§Ã£o."
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:398
+#: actions/emailsettings.php:402
 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."
@@ -1556,50 +1568,50 @@ msgstr ""
 #. 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/emailsettings.php:423 actions/imsettings.php:386
 #: actions/smssettings.php:408
 msgid "No pending confirmation to cancel."
 msgstr "Nenhuma confirmaÃ§Ã£o pendente para cancelar."
 
 #. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:424
+#: actions/emailsettings.php:428
 msgid "That is the wrong email address."
 msgstr "Esse endereÃ§o de correio electrÃ³nico estÃ¡ errado."
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:438
+#: actions/emailsettings.php:442
 msgid "Email confirmation cancelled."
 msgstr "ConfirmaÃ§Ã£o de correio electrÃ³nico cancelada."
 
 #. TRANS: Message given trying to remove an e-mail address that is not
 #. TRANS: registered for the active user.
-#: actions/emailsettings.php:458
+#: actions/emailsettings.php:462
 msgid "That is not your email address."
 msgstr "Esse nÃ£o Ã© o seu endereÃ§o electrÃ³nico."
 
 #. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:479
+#: actions/emailsettings.php:483
 msgid "The email address was removed."
 msgstr "O endereÃ§o de correio electrÃ³nico foi removido."
 
-#: actions/emailsettings.php:493 actions/smssettings.php:568
+#: actions/emailsettings.php:497 actions/smssettings.php:568
 msgid "No incoming email address."
 msgstr "Sem endereÃ§o electrÃ³nico de entrada."
 
 #. 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/emailsettings.php:508 actions/emailsettings.php:532
 #: 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."
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
-#: actions/emailsettings.php:508 actions/smssettings.php:581
+#: actions/emailsettings.php:512 actions/smssettings.php:581
 msgid "Incoming email address removed."
 msgstr "EndereÃ§o electrÃ³nico de entrada foi removido."
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
-#: actions/emailsettings.php:532 actions/smssettings.php:605
+#: actions/emailsettings.php:536 actions/smssettings.php:605
 msgid "New incoming email address added."
 msgstr "Adicionado endereÃ§o electrÃ³nico de entrada novo."
 
@@ -1717,7 +1729,7 @@ msgstr "NÃ£o foi possÃvel converter a chave de pedido numa chave de acesso."
 msgid "Remote service uses unknown version of OMB protocol."
 msgstr "ServiÃ§o remoto usa uma versÃ£o desconhecida do protocolo OMB."
 
-#: actions/finishremotesubscribe.php:138
+#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306
 msgid "Error updating remote profile."
 msgstr "Erro ao actualizar o perfil remoto."
 
@@ -1774,7 +1786,7 @@ msgstr "Acesso do utilizador ao grupo jÃ¡ foi bloqueado."
 msgid "User is not a member of group."
 msgstr "Utilizador nÃ£o Ã© membro do grupo."
 
-#: actions/groupblock.php:134 actions/groupmembers.php:360
+#: actions/groupblock.php:134 actions/groupmembers.php:364
 msgid "Block user from group"
 msgstr "Bloquear acesso do utilizador ao grupo"
 
@@ -1856,40 +1868,32 @@ msgstr "Logotipo actualizado."
 msgid "Failed updating logo."
 msgstr "NÃ£o foi possÃvel actualizar o logotipo."
 
-#: actions/groupmembers.php:100 lib/groupnav.php:92
+#. TRANS: Title of the page showing group members.
+#. TRANS: %s is the name of the group.
+#: actions/groupmembers.php:102
 #, php-format
 msgid "%s group members"
 msgstr "Membros do grupo %s"
 
-#: actions/groupmembers.php:103
+#. TRANS: Title of the page showing group members.
+#. TRANS: %1$s is the name of the group, %2$d is the page number of the members list.
+#: actions/groupmembers.php:107
 #, php-format
 msgid "%1$s group members, page %2$d"
 msgstr "Membros do grupo %1$s, pÃ¡gina %2$d"
 
-#: actions/groupmembers.php:118
+#: actions/groupmembers.php:122
 msgid "A list of the users in this group."
 msgstr "Uma lista dos utilizadores neste grupo."
 
-#: actions/groupmembers.php:182 lib/groupnav.php:107
+#: actions/groupmembers.php:186
 msgid "Admin"
 msgstr "Gestor"
 
-#: actions/groupmembers.php:392 lib/blockform.php:69
-msgid "Block"
-msgstr "Bloquear"
-
-#: actions/groupmembers.php:487
+#: actions/groupmembers.php:498
 msgid "Make user an admin of the group"
 msgstr "Tornar utilizador o gestor do grupo"
 
-#: actions/groupmembers.php:519
-msgid "Make Admin"
-msgstr "Tornar Gestor"
-
-#: actions/groupmembers.php:519
-msgid "Make this user an admin"
-msgstr "Tornar este utilizador um gestor"
-
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Title in atom group notice feed. %s is a group name.
 #. TRANS: Title in atom user notice feed. %s is a user name.
@@ -2028,7 +2032,10 @@ msgstr ""
 
 #. TRANS: IM address input field instructions in IM settings form.
 #. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:140
+#. TRANS: Do not translate "example.org". It is one of the domain names reserved for use in examples by
+#. TRANS: http://www.rfc-editor.org/rfc/rfc2606.txt. Any other domain may be owned by a legitimate
+#. TRANS: person or organization.
+#: actions/imsettings.php:143
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -2039,63 +2046,63 @@ msgstr ""
 "MI ou no GTalk."
 
 #. TRANS: Form legend for IM preferences form.
-#: actions/imsettings.php:155
+#: actions/imsettings.php:158
 msgid "IM preferences"
 msgstr "PreferÃªncias de MI"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:160
+#: actions/imsettings.php:163
 msgid "Send me notices through Jabber/GTalk."
 msgstr "Enviar-me notas via Jabber/GTalk."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:166
+#: actions/imsettings.php:169
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr "Publicar uma nota quando o meu estado no Jabber/GTalk se altera."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:172
+#: actions/imsettings.php:175
 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."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:179
+#: actions/imsettings.php:182
 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "Publicar um MicroID para o meu endereÃ§o Jabber/GTalk."
 
 #. TRANS: Confirmation message for successful IM preferences save.
-#: actions/imsettings.php:287 actions/othersettings.php:180
+#: actions/imsettings.php:290 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
+#: actions/imsettings.php:312
 msgid "No Jabber ID."
 msgstr "NÃ£o introduziu o Jabber ID."
 
 #. TRANS: Message given saving IM address that cannot be normalised.
-#: actions/imsettings.php:317
+#: actions/imsettings.php:320
 msgid "Cannot normalize that Jabber ID"
 msgstr "NÃ£o Ã© possÃvel normalizar esse Jabber ID"
 
 #. TRANS: Message given saving IM address that not valid.
-#: actions/imsettings.php:322
+#: actions/imsettings.php:325
 msgid "Not a valid Jabber ID"
 msgstr "Jabber ID nÃ£o Ã© vÃ¡lido"
 
 #. TRANS: Message given saving IM address that is already set.
-#: actions/imsettings.php:326
+#: actions/imsettings.php:329
 msgid "That is already your Jabber ID."
 msgstr "Esse jÃ¡ Ã© o seu Jabber ID."
 
 #. TRANS: Message given saving IM address that is already set for another user.
-#: actions/imsettings.php:330
+#: actions/imsettings.php:333
 msgid "Jabber ID already belongs to another user."
 msgstr "O Jabber ID introduzido jÃ¡ pertence a outro utilizador."
 
 #. 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
+#: actions/imsettings.php:361
 #, php-format
 msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
@@ -2105,28 +2112,28 @@ msgstr ""
 "aprovar que %s envie mensagens para si."
 
 #. TRANS: Message given canceling IM address confirmation for the wrong IM address.
-#: actions/imsettings.php:388
+#: actions/imsettings.php:391
 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
+#: actions/imsettings.php:400
 msgid "Couldn't delete IM confirmation."
 msgstr "NÃ£o foi possÃvel apagar a confirmaÃ§Ã£o do mensageiro instantÃ¢neo."
 
 #. TRANS: Message given after successfully canceling IM address confirmation.
-#: actions/imsettings.php:402
+#: actions/imsettings.php:405
 msgid "IM confirmation cancelled."
 msgstr "ConfirmaÃ§Ã£o do mensageiro instantÃ¢neo cancelada."
 
 #. TRANS: Message given trying to remove an IM address that is not
 #. TRANS: registered for the active user.
-#: actions/imsettings.php:424
+#: actions/imsettings.php:427
 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
+#: actions/imsettings.php:450
 msgid "The IM address was removed."
 msgstr "O endereÃ§o do mensageiro instantÃ¢neo foi removido."
 
@@ -2595,8 +2602,8 @@ msgid "Only %s URLs over plain HTTP please."
 msgstr "SÃ³ URLs %s sobre HTTP simples, por favor."
 
 #. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1215
-#: lib/apiaction.php:1243 lib/apiaction.php:1366
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1206
+#: lib/apiaction.php:1233 lib/apiaction.php:1356
 msgid "Not a supported data format."
 msgstr "Formato de dados nÃ£o suportado."
 
@@ -2737,7 +2744,7 @@ msgid "Password saved."
 msgstr "Senha gravada."
 
 #. TRANS: Menu item for site administration
-#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:384
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:371
 msgid "Paths"
 msgstr "LocalizaÃ§Ãµes"
 
@@ -2950,7 +2957,7 @@ msgstr "Nome completo"
 
 #. TRANS: Form input field label.
 #: actions/profilesettings.php:115 actions/register.php:460
-#: lib/applicationeditform.php:244 lib/groupeditform.php:161
+#: lib/applicationeditform.php:235 lib/groupeditform.php:161
 msgid "Homepage"
 msgstr "PÃ¡gina pessoal"
 
@@ -3055,7 +3062,7 @@ msgid "Couldn't save tags."
 msgstr "NÃ£o foi possÃvel gravar as categorias."
 
 #. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:391 lib/adminpanelaction.php:141
+#: actions/profilesettings.php:391 lib/adminpanelaction.php:138
 msgid "Settings saved."
 msgstr "ConfiguraÃ§Ãµes gravadas."
 
@@ -3599,7 +3606,7 @@ msgstr "Utilizador jÃ¡ estÃ¡ impedido de criar notas pÃºblicas."
 
 #. TRANS: Menu item for site administration
 #: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
-#: lib/adminpanelaction.php:392
+#: lib/adminpanelaction.php:379
 msgid "Sessions"
 msgstr "SessÃµes"
 
@@ -3637,24 +3644,24 @@ msgid "Application profile"
 msgstr "Perfil da aplicaÃ§Ã£o"
 
 #. TRANS: Form input field label for application icon.
-#: actions/showapplication.php:159 lib/applicationeditform.php:182
+#: actions/showapplication.php:159 lib/applicationeditform.php:173
 msgid "Icon"
 msgstr "Ãcone"
 
 #. TRANS: Form input field label for application name.
 #: actions/showapplication.php:169 actions/version.php:197
-#: lib/applicationeditform.php:199
+#: lib/applicationeditform.php:190
 msgid "Name"
 msgstr "Nome"
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:178 lib/applicationeditform.php:235
+#: actions/showapplication.php:178 lib/applicationeditform.php:226
 msgid "Organization"
 msgstr "OrganizaÃ§Ã£o"
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:216 lib/groupeditform.php:172
+#: lib/applicationeditform.php:207 lib/groupeditform.php:172
 msgid "Description"
 msgstr "DescriÃ§Ã£o"
 
@@ -3770,7 +3777,7 @@ msgstr ""
 msgid "This is a way to share what you like."
 msgstr "Esta Ã© uma forma de partilhar aquilo de que gosta."
 
-#: actions/showgroup.php:82 lib/groupnav.php:86
+#: actions/showgroup.php:82
 #, php-format
 msgid "%s group"
 msgstr "Grupo %s"
@@ -3822,7 +3829,7 @@ msgstr "Fonte de notas do grupo %s (Atom)"
 msgid "FOAF for %s group"
 msgstr "FOAF do grupo %s"
 
-#: actions/showgroup.php:393 actions/showgroup.php:445 lib/groupnav.php:91
+#: actions/showgroup.php:393 actions/showgroup.php:445
 msgid "Members"
 msgstr "Membros"
 
@@ -4276,7 +4283,7 @@ msgstr "Nenhum cÃ³digo introduzido"
 
 #. TRANS: Menu item for site administration
 #: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
-#: lib/adminpanelaction.php:408
+#: lib/adminpanelaction.php:395
 msgid "Snapshots"
 msgstr "InstantÃ¢neos"
 
@@ -5009,7 +5016,7 @@ msgid "Unable to save tag."
 msgstr "NÃ£o foi possÃvel gravar a categoria."
 
 #. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#: classes/Subscription.php:75 lib/oauthstore.php:465
+#: classes/Subscription.php:75 lib/oauthstore.php:466
 msgid "You have been banned from subscribing."
 msgstr "Foi bloqueado de fazer subscriÃ§Ãµes"
 
@@ -5157,7 +5164,8 @@ msgid "Change site configuration"
 msgstr "Alterar a configuraÃ§Ã£o do site"
 
 #. TRANS: Main menu option when logged in and site admin for access to site configuration
-#: lib/action.php:474
+#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
+#: lib/action.php:474 lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr "Gestor"
@@ -5234,7 +5242,7 @@ msgstr "Pesquisa"
 
 #. TRANS: DT element for site notice. String is hidden in default CSS.
 #. TRANS: Menu item for site administration
-#: lib/action.php:538 lib/adminpanelaction.php:400
+#: lib/action.php:538 lib/adminpanelaction.php:387
 msgid "Site notice"
 msgstr "Aviso do site"
 
@@ -5298,7 +5306,10 @@ msgid "StatusNet software license"
 msgstr "LicenÃ§a de software do StatusNet"
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
-#: lib/action.php:843
+#. TRANS: Text between [] is a link description, text between () is the link itself.
+#. TRANS: Make sure there is no whitespace between "]" and "(".
+#. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
+#: lib/action.php:846
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -5308,13 +5319,16 @@ msgstr ""
 "broughtby%%](%%site.broughtbyurl%%)."
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:846
+#: lib/action.php:849
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** Ã© um serviÃ§o de microblogues."
 
 #. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.
-#: lib/action.php:850
+#. TRANS: Make sure there is no whitespace between "]" and "(".
+#. TRANS: Text between [] is a link description, text between () is the link itself.
+#. TRANS: %s is the version of StatusNet that is being used.
+#: lib/action.php:856
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -5326,20 +5340,20 @@ msgstr ""
 "fsf.org/licensing/licenses/agpl-3.0.html)."
 
 #. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:866
+#: lib/action.php:872
 msgid "Site content license"
 msgstr "LicenÃ§a de conteÃºdos do site"
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:873
+#: lib/action.php:879
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr "O conteÃºdo e dados do site %1$s sÃ£o privados e confidenciais."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:880
+#: lib/action.php:886
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
@@ -5347,14 +5361,15 @@ msgstr ""
 "direitos reservados."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:884
+#: lib/action.php:890
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 "Direitos de autor sobre o conteÃºdo e dados detidos pelos contribuidores. "
 "Todos os direitos reservados."
 
-#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:897
+#. TRANS: license message in footer.
+#. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
+#: lib/action.php:904
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr ""
@@ -5362,19 +5377,19 @@ msgstr ""
 "licenÃ§a %2$s."
 
 #. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1236
+#: lib/action.php:1243
 msgid "Pagination"
 msgstr "PaginaÃ§Ã£o"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1247
+#: lib/action.php:1254
 msgid "After"
 msgstr "Posteriores"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1257
+#: lib/action.php:1264
 msgid "Before"
 msgstr "Anteriores"
 
@@ -5385,205 +5400,224 @@ msgstr ""
 "Era esperado um elemento raiz da fonte, mas foi recebido um documento XML "
 "inteiro."
 
-#: lib/activityutils.php:208
+#. TRANS: Client exception thrown when there is no source attribute.
+#: lib/activityutils.php:203
 msgid "Can't handle remote content yet."
 msgstr "Ainda nÃ£o Ã© possÃvel processar conteÃºdos remotos."
 
-#: lib/activityutils.php:244
+#. TRANS: Client exception thrown when there embedded XML content is found that cannot be processed yet.
+#: lib/activityutils.php:240
 msgid "Can't handle embedded XML content yet."
 msgstr "Ainda nÃ£o Ã© possÃvel processar conteÃºdo XML embutido."
 
-#: lib/activityutils.php:248
+#. TRANS: Client exception thrown when base64 encoded content is found that cannot be processed yet.
+#: lib/activityutils.php:245
 msgid "Can't handle embedded Base64 content yet."
 msgstr "Ainda nÃ£o Ã© possÃvel processar conteÃºdo Base64 embutido."
 
 #. TRANS: Client error message thrown when a user tries to change admin settings but has no access rights.
-#: lib/adminpanelaction.php:98
+#: lib/adminpanelaction.php:96
 msgid "You cannot make changes to this site."
 msgstr "NÃ£o pode fazer alteraÃ§Ãµes a este site."
 
 #. TRANS: Client error message throw when a certain panel's settings cannot be changed.
-#: lib/adminpanelaction.php:110
+#: lib/adminpanelaction.php:108
 msgid "Changes to that panel are not allowed."
 msgstr "NÃ£o sÃ£o permitidas alteraÃ§Ãµes a esse painel."
 
 #. TRANS: Client error message.
-#: lib/adminpanelaction.php:229
+#: lib/adminpanelaction.php:222
 msgid "showForm() not implemented."
 msgstr "showForm() nÃ£o implementado."
 
 #. TRANS: Client error message
-#: lib/adminpanelaction.php:259
+#: lib/adminpanelaction.php:250
 msgid "saveSettings() not implemented."
 msgstr "saveSettings() nÃ£o implementado."
 
 #. TRANS: Client error message thrown if design settings could not be deleted in
 #. TRANS: the admin panel Design.
-#: lib/adminpanelaction.php:284
+#: lib/adminpanelaction.php:274
 msgid "Unable to delete design setting."
 msgstr "NÃ£o foi possÃvel apagar a configuraÃ§Ã£o do estilo."
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:350
+#: lib/adminpanelaction.php:337
 msgid "Basic site configuration"
 msgstr "ConfiguraÃ§Ã£o bÃ¡sica do site"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:352
+#: lib/adminpanelaction.php:339
 msgctxt "MENU"
 msgid "Site"
 msgstr "Site"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:358
+#: lib/adminpanelaction.php:345
 msgid "Design configuration"
 msgstr "ConfiguraÃ§Ã£o do estilo"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:360
+#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
+#: lib/adminpanelaction.php:347 lib/groupnav.php:135
 msgctxt "MENU"
 msgid "Design"
 msgstr "Estilo"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:366
+#: lib/adminpanelaction.php:353
 msgid "User configuration"
 msgstr "ConfiguraÃ§Ã£o do utilizador"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:368 lib/personalgroupnav.php:115
+#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:115
 msgid "User"
 msgstr "Utilizador"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:374
+#: lib/adminpanelaction.php:361
 msgid "Access configuration"
 msgstr "ConfiguraÃ§Ã£o de acesso"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:382
+#: lib/adminpanelaction.php:369
 msgid "Paths configuration"
 msgstr "ConfiguraÃ§Ã£o das localizaÃ§Ãµes"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:390
+#: lib/adminpanelaction.php:377
 msgid "Sessions configuration"
 msgstr "ConfiguraÃ§Ã£o das sessÃµes"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:398
+#: lib/adminpanelaction.php:385
 msgid "Edit site notice"
 msgstr "Editar aviso do site"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:406
+#: lib/adminpanelaction.php:393
 msgid "Snapshots configuration"
 msgstr "ConfiguraÃ§Ã£o dos instÃ¢ntaneos"
 
 #. TRANS: Client error 401.
-#: lib/apiauth.php:113
+#: lib/apiauth.php:111
 msgid "API resource requires read-write access, but you only have read access."
 msgstr "API requer acesso de leitura e escrita, mas sÃ³ tem acesso de leitura."
 
+#. TRANS: OAuth exception thrown when no application is found for a given consumer key.
+#: lib/apiauth.php:175
+msgid "No application for that consumer key."
+msgstr ""
+
+#. TRANS: OAuth exception given when no user was found for a given token (no token was found).
+#: lib/apiauth.php:217
+msgid "No user for that token."
+msgstr ""
+
+#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
+#: lib/apioauthstore.php:178
+msgid "Tried to revoke unknown token"
+msgstr ""
+
 #. TRANS: Form legend.
-#: lib/applicationeditform.php:137
+#: lib/applicationeditform.php:129
 msgid "Edit application"
 msgstr "Editar aplicaÃ§Ã£o"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:187
+#: lib/applicationeditform.php:178
 msgid "Icon for this application"
 msgstr "Ãcone para esta aplicaÃ§Ã£o"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:209
+#: lib/applicationeditform.php:200
 #, php-format
 msgid "Describe your application in %d characters"
 msgstr "Descreva a sua aplicaÃ§Ã£o em %d caracteres"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:213
+#: lib/applicationeditform.php:204
 msgid "Describe your application"
 msgstr "Descreva a sua aplicaÃ§Ã£o"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:224
+#: lib/applicationeditform.php:215
 msgid "URL of the homepage of this application"
 msgstr "URL da pÃ¡gina desta aplicaÃ§Ã£o"
 
 #. TRANS: Form input field label.
-#: lib/applicationeditform.php:226
+#: lib/applicationeditform.php:217
 msgid "Source URL"
 msgstr "URL de origem"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:233
+#: lib/applicationeditform.php:224
 msgid "Organization responsible for this application"
 msgstr "OrganizaÃ§Ã£o responsÃ¡vel por esta aplicaÃ§Ã£o"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:242
+#: lib/applicationeditform.php:233
 msgid "URL for the homepage of the organization"
 msgstr "URL da pÃ¡gina desta organizaÃ§Ã£o"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:251
+#: lib/applicationeditform.php:242
 msgid "URL to redirect to after authentication"
 msgstr "URL para onde reencaminhar apÃ³s autenticaÃ§Ã£o"
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:278
+#: lib/applicationeditform.php:269
 msgid "Browser"
 msgstr "Browser"
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:295
+#: lib/applicationeditform.php:286
 msgid "Desktop"
 msgstr "Desktop"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:297
+#: lib/applicationeditform.php:288
 msgid "Type of application, browser or desktop"
 msgstr "Tipo da aplicaÃ§Ã£o, browser ou desktop"
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:320
+#: lib/applicationeditform.php:311
 msgid "Read-only"
 msgstr "Leitura"
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:339
+#: lib/applicationeditform.php:330
 msgid "Read-write"
 msgstr "Leitura e escrita"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:341
+#: lib/applicationeditform.php:332
 msgid "Default access for this application: read-only, or read-write"
 msgstr "Acesso por omissÃ£o para esta aplicaÃ§Ã£o: leitura ou leitura e escrita"
 
-#. TRANS: Submit button title
-#: lib/applicationeditform.php:359
+#. TRANS: Submit button title.
+#: lib/applicationeditform.php:349
 msgid "Cancel"
 msgstr "Cancelar"
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:136
+#: lib/applicationlist.php:135
 msgid "read-write"
 msgstr "leitura e escrita"
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:138
+#: lib/applicationlist.php:137
 msgid "read-only"
 msgstr "leitura"
 
 #. 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
+#: lib/applicationlist.php:143
 #, php-format
 msgid "Approved %1$s - \"%2$s\" access."
 msgstr "Aprovado a %1$s - acesso \"%2$s\"."
 
 #. TRANS: Button label
-#: lib/applicationlist.php:159
+#: lib/applicationlist.php:158
 msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "Retirar"
@@ -5603,11 +5637,13 @@ msgstr "Autor"
 msgid "Provider"
 msgstr "Fornecedor"
 
-#: lib/attachmentnoticesection.php:67
+#. TRANS: Title.
+#: lib/attachmentnoticesection.php:68
 msgid "Notices where this attachment appears"
 msgstr "Notas em que este anexo aparece"
 
-#: lib/attachmenttagcloudsection.php:48
+#. TRANS: Title.
+#: lib/attachmenttagcloudsection.php:49
 msgid "Tags for this attachment"
 msgstr "Categorias para este anexo"
 
@@ -5619,6 +5655,11 @@ msgstr "NÃ£o foi possÃvel mudar a palavra-chave"
 msgid "Password changing is not allowed"
 msgstr "NÃ£o Ã© permitido mudar a palavra-chave"
 
+#. TRANS: Title for the form to block a user.
+#: lib/blockform.php:70
+msgid "Block"
+msgstr "Bloquear"
+
 #: lib/channel.php:157 lib/channel.php:177
 msgid "Command results"
 msgstr "Resultados do comando"
@@ -5867,7 +5908,7 @@ msgid "You are not subscribed to anyone."
 msgstr "NÃ£o subscreveu ninguÃ©m."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to.
-#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.
 #: lib/command.php:836
 msgid "You are subscribed to this person:"
@@ -5882,7 +5923,7 @@ msgid "No one is subscribed to you."
 msgstr "NinguÃ©m subscreve as suas notas."
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
-#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
 #: lib/command.php:863
 msgid "This person is subscribed to you:"
@@ -5897,7 +5938,7 @@ msgid "You are not a member of any groups."
 msgstr "NÃ£o estÃ¡ em nenhum grupo."
 
 #. TRANS: Text shown after requesting groups a user is subscribed to.
-#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
 #: lib/command.php:890
 msgid "You are a member of this group:"
@@ -5905,6 +5946,7 @@ msgid_plural "You are a member of these groups:"
 msgstr[0] "EstÃ¡ no grupo:"
 msgstr[1] "EstÃ¡ nos grupos:"
 
+#. TRANS: Help text for commands.
 #: lib/command.php:905
 msgid ""
 "Commands:\n"
@@ -6125,38 +6167,6 @@ msgid "Extra nicknames for the group, comma- or space- separated, max %d"
 msgstr ""
 "Nomes adicionais para o grupo, separados por vÃrgulas ou espaÃ§os, mÃ¡x. %d"
 
-#: lib/groupnav.php:85
-msgid "Group"
-msgstr "Grupo"
-
-#: lib/groupnav.php:101
-msgid "Blocked"
-msgstr "Bloqueado"
-
-#: lib/groupnav.php:102
-#, php-format
-msgid "%s blocked users"
-msgstr "%s utilizadores bloqueados"
-
-#: lib/groupnav.php:108
-#, php-format
-msgid "Edit %s group properties"
-msgstr "Editar propriedades do grupo %s"
-
-#: lib/groupnav.php:113
-msgid "Logo"
-msgstr "Logotipo"
-
-#: lib/groupnav.php:114
-#, php-format
-msgid "Add or edit %s logo"
-msgstr "Adicionar ou editar o logotipo de %s"
-
-#: lib/groupnav.php:120
-#, php-format
-msgid "Add or edit %s design"
-msgstr "Adicionar ou editar o design de %s"
-
 #: lib/groupsbymemberssection.php:71
 msgid "Groups with most members"
 msgstr "Grupos com mais membros"
@@ -6188,7 +6198,8 @@ msgstr "Esse ficheiro Ã© demasiado grande. O tamanho mÃ¡ximo de ficheiro Ã© %s."
 msgid "Partial upload."
 msgstr "TransferÃªncia parcial."
 
-#: lib/imagefile.php:101 lib/mediafile.php:170
+#. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
+#: lib/imagefile.php:101 lib/mediafile.php:179
 msgid "System error uploading file."
 msgstr "Ocorreu um erro de sistema ao transferir o ficheiro."
 
@@ -6591,17 +6602,20 @@ msgstr "Desculpe, nÃ£o lhe Ã© permitido receber correio electrÃ³nico."
 msgid "Unsupported message type: %s"
 msgstr "Tipo de mensagem nÃ£o suportado: %s"
 
-#: lib/mediafile.php:98 lib/mediafile.php:123
+#. TRANS: Client exception thrown when a database error was thrown during a file upload operation.
+#: lib/mediafile.php:99 lib/mediafile.php:125
 msgid "There was a database error while saving your file. Please try again."
 msgstr ""
 "Ocorreu um erro na base de dados ao gravar o seu ficheiro. Por favor, tente "
 "novamente."
 
-#: lib/mediafile.php:142
+#. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
+#: lib/mediafile.php:145
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
 msgstr "Ficheiro carregado excede a directiva upload_max_filesize no php.ini."
 
-#: lib/mediafile.php:147
+#. TRANS: Client exception.
+#: lib/mediafile.php:151
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form."
@@ -6609,44 +6623,43 @@ msgstr ""
 "Ficheiro carregado excede a directiva MAX_FILE_SIZE especificada no "
 "formulÃ¡rio HTML."
 
-#: lib/mediafile.php:152
+#. TRANS: Client exception.
+#: lib/mediafile.php:157
 msgid "The uploaded file was only partially uploaded."
 msgstr "Ficheiro sÃ³ foi parcialmente carregado."
 
-#: lib/mediafile.php:159
+#. TRANS: Client exception thrown when a temporary folder is not present to store a file upload.
+#: lib/mediafile.php:165
 msgid "Missing a temporary folder."
 msgstr "Falta um directÃ³rio temporÃ¡rio."
 
-#: lib/mediafile.php:162
+#. TRANS: Client exception thrown when writing to disk is not possible during a file upload operation.
+#: lib/mediafile.php:169
 msgid "Failed to write file to disk."
 msgstr "NÃ£o foi possÃvel gravar o ficheiro no disco."
 
-#: lib/mediafile.php:165
+#. TRANS: Client exception thrown when a file upload operation has been stopped by an extension.
+#: lib/mediafile.php:173
 msgid "File upload stopped by extension."
 msgstr "TransferÃªncia do ficheiro interrompida pela extensÃ£o."
 
-#: lib/mediafile.php:179 lib/mediafile.php:217
+#. TRANS: Client exception thrown when a file upload operation would cause a user to exceed a set quota.
+#: lib/mediafile.php:189 lib/mediafile.php:232
 msgid "File exceeds user's quota."
 msgstr "Ficheiro excede quota do utilizador."
 
-#: lib/mediafile.php:197 lib/mediafile.php:234
+#. TRANS: Client exception thrown when a file upload operation fails because the file could
+#. TRANS: not be moved from the temporary folder to the permanent file location.
+#: lib/mediafile.php:209 lib/mediafile.php:251
 msgid "File could not be moved to destination directory."
 msgstr "NÃ£o foi possÃvel mover o ficheiro para o directÃ³rio de destino."
 
-#: lib/mediafile.php:202 lib/mediafile.php:238
+#. TRANS: Client exception thrown when a file upload operation has been stopped because the MIME
+#. TRANS: type of the uploaded file could not be determined.
+#: lib/mediafile.php:216 lib/mediafile.php:257
 msgid "Could not determine file's MIME type."
 msgstr "NÃ£o foi possÃvel determinar o tipo MIME do ficheiro."
 
-#: lib/mediafile.php:318
-#, php-format
-msgid " Try using another %s format."
-msgstr " Tente usar outro tipo de %s."
-
-#: lib/mediafile.php:323
-#, php-format
-msgid "%s is not a supported file type on this server."
-msgstr "%s nÃ£o Ã© um tipo de ficheiro suportado neste servidor."
-
 #: lib/messageform.php:120
 msgid "Send a direct notice"
 msgstr "Enviar uma nota directa"
@@ -6762,27 +6775,7 @@ msgstr "Tocar"
 msgid "Send a nudge to this user"
 msgstr "Enviar toque a este utilizador"
 
-#: lib/oauthstore.php:283
-msgid "Error inserting new profile"
-msgstr "Erro ao inserir perfil novo"
-
-#: lib/oauthstore.php:291
-msgid "Error inserting avatar"
-msgstr "Erro ao inserir avatar"
-
-#: lib/oauthstore.php:306
-msgid "Error updating remote profile"
-msgstr "Erro ao actualizar o perfil remoto"
-
-#: lib/oauthstore.php:311
-msgid "Error inserting remote profile"
-msgstr "Erro ao inserir perfil remoto"
-
-#: lib/oauthstore.php:345
-msgid "Duplicate notice"
-msgstr "Nota duplicada"
-
-#: lib/oauthstore.php:490
+#: lib/oauthstore.php:491
 msgid "Couldn't insert new subscription."
 msgstr "NÃ£o foi possÃvel inserir nova subscriÃ§Ã£o."
 
@@ -6819,7 +6812,8 @@ msgstr "Mensagens enviadas"
 msgid "Tags in %s's notices"
 msgstr "Categorias nas notas de %s"
 
-#: lib/plugin.php:115
+#. TRANS: Displayed as version information for a plugin if no version information was found.
+#: lib/plugin.php:116
 msgid "Unknown"
 msgstr "Desconhecida"
 
@@ -6913,19 +6907,19 @@ msgstr "Bloquear notas pÃºblicas"
 msgid "Sandbox this user"
 msgstr "Impedir que notas deste utilizador sejam pÃºblicas"
 
-#: lib/searchaction.php:120
+#. TRANS: Fieldset legend for the search form.
+#: lib/searchaction.php:121
 msgid "Search site"
 msgstr "Pesquisar site"
 
-#: lib/searchaction.php:126
+#. TRANS: Used as a field label for the field where one or more keywords
+#. TRANS: for searching can be entered.
+#: lib/searchaction.php:129
 msgid "Keyword(s)"
 msgstr "Categorias"
 
-#: lib/searchaction.php:127
-msgid "Search"
-msgstr "Pesquisa"
-
-#: lib/searchaction.php:162
+#. TRANS: Definition list item with instructions on how to get (better) search results.
+#: lib/searchaction.php:170
 msgid "Search help"
 msgstr "Pesquisar ajuda"
 
@@ -7125,56 +7119,32 @@ msgid "Moderator"
 msgstr "Moderador"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1102
+#: lib/util.php:1103
 msgid "a few seconds ago"
 msgstr "hÃ¡ alguns segundos"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1105
+#: lib/util.php:1106
 msgid "about a minute ago"
 msgstr "hÃ¡ cerca de um minuto"
 
-#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1109
-#, php-format
-msgid "about %d minutes ago"
-msgstr "hÃ¡ cerca de %d minutos"
-
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 #: lib/util.php:1112
 msgid "about an hour ago"
 msgstr "hÃ¡ cerca de uma hora"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1116
-#, php-format
-msgid "about %d hours ago"
-msgstr "hÃ¡ cerca de %d horas"
-
-#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1119
+#: lib/util.php:1118
 msgid "about a day ago"
 msgstr "hÃ¡ cerca de um dia"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1123
-#, php-format
-msgid "about %d days ago"
-msgstr "hÃ¡ cerca de %d dias"
-
-#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1126
+#: lib/util.php:1124
 msgid "about a month ago"
 msgstr "hÃ¡ cerca de um mÃªs"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 #: lib/util.php:1130
-#, php-format
-msgid "about %d months ago"
-msgstr "hÃ¡ cerca de %d meses"
-
-#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1133
 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 259149cc01..56a02e2bbd 100644
--- a/locale/pt_BR/LC_MESSAGES/statusnet.po
+++ b/locale/pt_BR/LC_MESSAGES/statusnet.po
@@ -1,12 +1,13 @@
-# Translation of StatusNet to Brazilian Portuguese
+# Translation of StatusNet to Brazilian Portuguese (PortuguÃªs do Brasil)
+# Expored from translatewiki.net
 #
-# Author@translatewiki.net: Aracnus
-# Author@translatewiki.net: Brion
-# Author@translatewiki.net: Ewout
-# Author@translatewiki.net: Giro720
-# Author@translatewiki.net: Luckas Blade
-# Author@translatewiki.net: McDutchie
-# Author@translatewiki.net: Vuln
+# Author: Aracnus
+# Author: Brion
+# Author: Ewout
+# Author: Giro720
+# Author: Luckas Blade
+# Author: McDutchie
+# Author: Vuln
 # --
 # This file is distributed under the same license as the StatusNet package.
 #
@@ -14,20 +15,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-08 22:33+0000\n"
-"PO-Revision-Date: 2010-09-08 22:35:17+0000\n"
-"Language-Team: Brazilian Portuguese\n"
+"POT-Creation-Date: 2010-09-14 19:53+0000\n"
+"PO-Revision-Date: 2010-09-14 19:54:17+0000\n"
+"Language-Team: Brazilian Portuguese <http://translatewiki.net/wiki/Portal:pt-"
+"br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r72348); Translate extension (2010-08-20)\n"
+"X-Generator: MediaWiki 1.17alpha (r73009); Translate extension (2010-08-20)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt-br\n"
-"X-Message-Group: out-statusnet\n"
+"X-Message-Group: #out-statusnet\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-POT-Import-Date: 1284-49-16 34::+0000\n"
 
 #. TRANS: Page title
 #. TRANS: Menu item for site administration
-#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:376
+#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:363
 msgid "Access"
 msgstr "Acesso"
 
@@ -80,10 +83,10 @@ 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 actions/emailsettings.php:224
-#: actions/imsettings.php:184 actions/smssettings.php:209
-#: lib/applicationeditform.php:361
+#. TRANS: Button label in the "Edit application" form.
+#: actions/accessadminpanel.php:203 actions/emailsettings.php:228
+#: actions/imsettings.php:187 actions/smssettings.php:209
+#: lib/applicationeditform.php:351
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Salvar"
@@ -96,15 +99,15 @@ msgstr "Esta pÃ¡gina nÃ£o existe."
 
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #: actions/all.php:79 actions/allrss.php:68
-#: actions/apiaccountupdatedeliverydevice.php:114
-#: actions/apiaccountupdateprofile.php:105
-#: actions/apiaccountupdateprofilebackgroundimage.php:116
-#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
-#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
-#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:113
-#: actions/apigroupismember.php:91 actions/apigroupjoin.php:100
-#: actions/apigroupleave.php:100 actions/apigrouplist.php:73
-#: actions/apistatusesupdate.php:229 actions/apisubscriptions.php:87
+#: actions/apiaccountupdatedeliverydevice.php:115
+#: actions/apiaccountupdateprofile.php:106
+#: actions/apiaccountupdateprofilebackgroundimage.php:117
+#: actions/apiaccountupdateprofileimage.php:106 actions/apiblockcreate.php:98
+#: actions/apiblockdestroy.php:97 actions/apidirectmessage.php:77
+#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:114
+#: actions/apigroupismember.php:91 actions/apigroupjoin.php:101
+#: actions/apigroupleave.php:101 actions/apigrouplist.php:73
+#: actions/apistatusesupdate.php:230 actions/apisubscriptions.php:87
 #: actions/apitimelinefavorites.php:72 actions/apitimelinefriends.php:174
 #: actions/apitimelinehome.php:80 actions/apitimelinementions.php:80
 #: actions/apitimelineuser.php:82 actions/avatarbynickname.php:75
@@ -204,16 +207,16 @@ msgid "Updates from %1$s and friends on %2$s!"
 msgstr "AtualizaÃ§Ãµes de %1$s e amigos no %2$s!"
 
 #: actions/apiaccountratelimitstatus.php:72
-#: actions/apiaccountupdatedeliverydevice.php:94
-#: actions/apiaccountupdateprofile.php:97
-#: actions/apiaccountupdateprofilebackgroundimage.php:94
-#: actions/apiaccountupdateprofilecolors.php:118
+#: actions/apiaccountupdatedeliverydevice.php:95
+#: actions/apiaccountupdateprofile.php:98
+#: actions/apiaccountupdateprofilebackgroundimage.php:95
+#: actions/apiaccountupdateprofilecolors.php:119
 #: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156
-#: actions/apifavoritecreate.php:100 actions/apifavoritedestroy.php:101
-#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100
-#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:139
-#: actions/apigroupismember.php:115 actions/apigroupjoin.php:156
-#: actions/apigroupleave.php:142 actions/apigrouplist.php:137
+#: actions/apifavoritecreate.php:101 actions/apifavoritedestroy.php:102
+#: actions/apifriendshipscreate.php:101 actions/apifriendshipsdestroy.php:101
+#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:140
+#: actions/apigroupismember.php:115 actions/apigroupjoin.php:157
+#: actions/apigroupleave.php:143 actions/apigrouplist.php:137
 #: actions/apigrouplistall.php:122 actions/apigroupmembership.php:107
 #: actions/apigroupshow.php:116 actions/apihelptest.php:88
 #: actions/apistatusesdestroy.php:104 actions/apistatusesretweets.php:112
@@ -228,21 +231,23 @@ msgstr "AtualizaÃ§Ãµes de %1$s e amigos no %2$s!"
 msgid "API method not found."
 msgstr "O mÃ©todo da API nÃ£o foi encontrado!"
 
-#: actions/apiaccountupdatedeliverydevice.php:86
-#: actions/apiaccountupdateprofile.php:89
-#: actions/apiaccountupdateprofilebackgroundimage.php:86
-#: actions/apiaccountupdateprofilecolors.php:110
-#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89
-#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109
-#: actions/apifavoritecreate.php:91 actions/apifavoritedestroy.php:92
-#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
-#: actions/apigroupcreate.php:105 actions/apigroupjoin.php:92
-#: actions/apigroupleave.php:92 actions/apimediaupload.php:67
-#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:198
+#. TRANS: Client error message. POST is a HTTP command. It should not be translated.
+#. TRANS: Client error. POST is a HTTP command. It should not be translated.
+#: actions/apiaccountupdatedeliverydevice.php:87
+#: actions/apiaccountupdateprofile.php:90
+#: actions/apiaccountupdateprofilebackgroundimage.php:87
+#: actions/apiaccountupdateprofilecolors.php:111
+#: actions/apiaccountupdateprofileimage.php:85 actions/apiblockcreate.php:90
+#: actions/apiblockdestroy.php:89 actions/apidirectmessagenew.php:110
+#: actions/apifavoritecreate.php:92 actions/apifavoritedestroy.php:93
+#: actions/apifriendshipscreate.php:92 actions/apifriendshipsdestroy.php:92
+#: actions/apigroupcreate.php:106 actions/apigroupjoin.php:93
+#: actions/apigroupleave.php:93 actions/apimediaupload.php:68
+#: actions/apistatusesretweet.php:66 actions/apistatusesupdate.php:199
 msgid "This method requires a POST."
 msgstr "Este mÃ©todo requer um POST."
 
-#: actions/apiaccountupdatedeliverydevice.php:106
+#: actions/apiaccountupdatedeliverydevice.php:107
 msgid ""
 "You must specify a parameter named 'device' with a value of one of: sms, im, "
 "none."
@@ -250,27 +255,27 @@ msgstr ""
 "VocÃª tem que especificar um parÃ¢metro denominado 'device', com um desses "
 "valores: sms, im, none"
 
-#: actions/apiaccountupdatedeliverydevice.php:133
+#: actions/apiaccountupdatedeliverydevice.php:134
 msgid "Could not update user."
 msgstr "NÃ£o foi possÃvel atualizar o usuÃ¡rio."
 
-#: actions/apiaccountupdateprofile.php:112
-#: actions/apiaccountupdateprofilebackgroundimage.php:194
-#: actions/apiaccountupdateprofilecolors.php:185
-#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/apiaccountupdateprofile.php:113
+#: actions/apiaccountupdateprofilebackgroundimage.php:195
+#: actions/apiaccountupdateprofilecolors.php:186
+#: actions/apiaccountupdateprofileimage.php:131 actions/apiusershow.php:108
 #: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/hcard.php:74
 #: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
 #: lib/profileaction.php:84
 msgid "User has no profile."
 msgstr "O usuÃ¡rio nÃ£o tem perfil."
 
-#: actions/apiaccountupdateprofile.php:147
+#: actions/apiaccountupdateprofile.php:148
 msgid "Could not save profile."
 msgstr "NÃ£o foi possÃvel salvar o perfil."
 
-#: actions/apiaccountupdateprofilebackgroundimage.php:108
-#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
-#: actions/apistatusesupdate.php:212 actions/avatarsettings.php:257
+#: actions/apiaccountupdateprofilebackgroundimage.php:109
+#: actions/apiaccountupdateprofileimage.php:98 actions/apimediaupload.php:81
+#: actions/apistatusesupdate.php:213 actions/avatarsettings.php:257
 #: actions/designadminpanel.php:123 actions/editapplication.php:118
 #: actions/newapplication.php:101 actions/newnotice.php:94
 #: lib/designsettings.php:283
@@ -282,30 +287,30 @@ msgstr ""
 "O servidor nÃ£o conseguiu manipular a quantidade de dados do POST (%s bytes) "
 "devido Ã  sua configuraÃ§Ã£o atual."
 
-#: actions/apiaccountupdateprofilebackgroundimage.php:136
-#: actions/apiaccountupdateprofilebackgroundimage.php:146
-#: actions/apiaccountupdateprofilecolors.php:164
-#: actions/apiaccountupdateprofilecolors.php:174
+#: actions/apiaccountupdateprofilebackgroundimage.php:137
+#: actions/apiaccountupdateprofilebackgroundimage.php:147
+#: actions/apiaccountupdateprofilecolors.php:165
+#: actions/apiaccountupdateprofilecolors.php:175
 #: actions/groupdesignsettings.php:290 actions/groupdesignsettings.php:300
 #: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
 #: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
 msgid "Unable to save your design settings."
 msgstr "NÃ£o foi possÃvel salvar suas configuraÃ§Ãµes de aparÃªncia."
 
-#: actions/apiaccountupdateprofilebackgroundimage.php:187
-#: actions/apiaccountupdateprofilecolors.php:142
+#: actions/apiaccountupdateprofilebackgroundimage.php:188
+#: actions/apiaccountupdateprofilecolors.php:143
 msgid "Could not update your design."
 msgstr "NÃ£o foi possÃvel atualizar a sua aparÃªncia."
 
-#: actions/apiblockcreate.php:105
+#: actions/apiblockcreate.php:106
 msgid "You cannot block yourself!"
 msgstr "VocÃª nÃ£o pode bloquear a si mesmo!"
 
-#: actions/apiblockcreate.php:126
+#: actions/apiblockcreate.php:127
 msgid "Block user failed."
 msgstr "NÃ£o foi possÃvel bloquear o usuÃ¡rio."
 
-#: actions/apiblockdestroy.php:114
+#: actions/apiblockdestroy.php:115
 msgid "Unblock user failed."
 msgstr "NÃ£o foi possÃvel desbloquear o usuÃ¡rio."
 
@@ -329,61 +334,61 @@ msgstr "Mensagens diretas para %s"
 msgid "All the direct messages sent to %s"
 msgstr "Todas as mensagens diretas enviadas para %s"
 
-#: actions/apidirectmessagenew.php:118
+#: actions/apidirectmessagenew.php:119
 msgid "No message text!"
 msgstr "Nenhuma mensagem de texto!"
 
-#: actions/apidirectmessagenew.php:127 actions/newmessage.php:150
+#: actions/apidirectmessagenew.php:128 actions/newmessage.php:150
 #, php-format
 msgid "That's too long. Max message size is %d chars."
 msgstr "Isso Ã© muito extenso. O tamanho mÃ¡ximo das mensagens Ã© %d caracteres."
 
-#: actions/apidirectmessagenew.php:138
+#: actions/apidirectmessagenew.php:139
 msgid "Recipient user not found."
 msgstr "O usuÃ¡rio destinatÃ¡rio nÃ£o foi encontrado."
 
-#: actions/apidirectmessagenew.php:142
+#: actions/apidirectmessagenew.php:143
 msgid "Can't send direct messages to users who aren't your friend."
 msgstr ""
 "NÃ£o Ã© possÃvel enviar mensagens diretas para usuÃ¡rios que nÃ£o sejam seus "
 "amigos."
 
-#: actions/apifavoritecreate.php:109 actions/apifavoritedestroy.php:110
+#: actions/apifavoritecreate.php:110 actions/apifavoritedestroy.php:111
 #: actions/apistatusesdestroy.php:121
 msgid "No status found with that ID."
 msgstr "NÃ£o foi encontrado nenhum status com esse ID."
 
-#: actions/apifavoritecreate.php:120
+#: actions/apifavoritecreate.php:121
 msgid "This status is already a favorite."
 msgstr "Esta mensagem jÃ¡ Ã© favorita!"
 
 #. TRANS: Error message text shown when a favorite could not be set.
-#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:296
+#: actions/apifavoritecreate.php:132 actions/favor.php:84 lib/command.php:296
 msgid "Could not create favorite."
 msgstr "NÃ£o foi possÃvel criar a favorita."
 
-#: actions/apifavoritedestroy.php:123
+#: actions/apifavoritedestroy.php:124
 msgid "That status is not a favorite."
 msgstr "Essa mensagem nÃ£o Ã© favorita!"
 
-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
+#: actions/apifavoritedestroy.php:136 actions/disfavor.php:87
 msgid "Could not delete favorite."
 msgstr "NÃ£o foi possÃvel excluir a favorita."
 
-#: actions/apifriendshipscreate.php:109
+#: actions/apifriendshipscreate.php:110
 msgid "Could not follow user: profile not found."
 msgstr "NÃ£o Ã© possÃvel deixar de seguir o usuÃ¡rio: UsuÃ¡rio nÃ£o encontrado."
 
-#: actions/apifriendshipscreate.php:118
+#: actions/apifriendshipscreate.php:119
 #, php-format
 msgid "Could not follow user: %s is already on your list."
 msgstr "NÃ£o Ã© possÃvel seguir o usuÃ¡rio: %s jÃ¡ estÃ¡ na sua lista."
 
-#: actions/apifriendshipsdestroy.php:109
+#: actions/apifriendshipsdestroy.php:110
 msgid "Could not unfollow user: User not found."
 msgstr "NÃ£o Ã© possÃvel deixar de seguir o usuÃ¡rio: UsuÃ¡rio nÃ£o encontrado."
 
-#: actions/apifriendshipsdestroy.php:120
+#: actions/apifriendshipsdestroy.php:121
 msgid "You cannot unfollow yourself."
 msgstr "VocÃª nÃ£o pode deixar de seguir vocÃª mesmo!"
 
@@ -399,7 +404,7 @@ msgstr "NÃ£o foi possÃvel determinar o usuÃ¡rio de origem."
 msgid "Could not find target user."
 msgstr "NÃ£o foi possÃvel encontrar usuÃ¡rio de destino."
 
-#: actions/apigroupcreate.php:167 actions/editgroup.php:186
+#: actions/apigroupcreate.php:168 actions/editgroup.php:186
 #: actions/newgroup.php:126 actions/profilesettings.php:215
 #: actions/register.php:212
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
@@ -407,95 +412,95 @@ msgstr ""
 "A identificaÃ§Ã£o deve conter apenas letras minÃºsculas e nÃºmeros e nÃ£o pode "
 "ter e espaÃ§os."
 
-#: actions/apigroupcreate.php:176 actions/editgroup.php:190
+#: actions/apigroupcreate.php:177 actions/editgroup.php:190
 #: actions/newgroup.php:130 actions/profilesettings.php:238
 #: actions/register.php:215
 msgid "Nickname already in use. Try another one."
 msgstr "Esta identificaÃ§Ã£o jÃ¡ estÃ¡ em uso. Tente outro."
 
-#: actions/apigroupcreate.php:183 actions/editgroup.php:193
+#: actions/apigroupcreate.php:184 actions/editgroup.php:193
 #: actions/newgroup.php:133 actions/profilesettings.php:218
 #: actions/register.php:217
 msgid "Not a valid nickname."
 msgstr "NÃ£o Ã© uma identificaÃ§Ã£o vÃ¡lida."
 
-#: actions/apigroupcreate.php:199 actions/editapplication.php:215
+#: actions/apigroupcreate.php:200 actions/editapplication.php:215
 #: actions/editgroup.php:199 actions/newapplication.php:203
 #: actions/newgroup.php:139 actions/profilesettings.php:222
 #: actions/register.php:224
 msgid "Homepage is not a valid URL."
 msgstr "A URL informada nÃ£o Ã© vÃ¡lida."
 
-#: actions/apigroupcreate.php:208 actions/editgroup.php:202
+#: actions/apigroupcreate.php:209 actions/editgroup.php:202
 #: actions/newgroup.php:142 actions/profilesettings.php:225
 #: actions/register.php:227
 msgid "Full name is too long (max 255 chars)."
 msgstr "Nome completo muito extenso (mÃ¡x. 255 caracteres)"
 
-#: actions/apigroupcreate.php:216 actions/editapplication.php:190
+#: actions/apigroupcreate.php:217 actions/editapplication.php:190
 #: actions/newapplication.php:172
 #, php-format
 msgid "Description is too long (max %d chars)."
 msgstr "DescriÃ§Ã£o muito extensa (mÃ¡ximo %d caracteres)."
 
-#: actions/apigroupcreate.php:227 actions/editgroup.php:208
+#: actions/apigroupcreate.php:228 actions/editgroup.php:208
 #: actions/newgroup.php:148 actions/profilesettings.php:232
 #: actions/register.php:234
 msgid "Location is too long (max 255 chars)."
 msgstr "LocalizaÃ§Ã£o muito extensa (mÃ¡x. 255 caracteres)."
 
-#: actions/apigroupcreate.php:246 actions/editgroup.php:219
+#: actions/apigroupcreate.php:247 actions/editgroup.php:219
 #: actions/newgroup.php:159
 #, php-format
 msgid "Too many aliases! Maximum %d."
 msgstr "Muitos apelidos! O mÃ¡ximo sÃ£o %d."
 
-#: actions/apigroupcreate.php:267
+#: actions/apigroupcreate.php:268
 #, php-format
 msgid "Invalid alias: \"%s\"."
 msgstr "Apelido invÃ¡lido: \"%s\"."
 
-#: actions/apigroupcreate.php:276 actions/editgroup.php:232
+#: actions/apigroupcreate.php:277 actions/editgroup.php:232
 #: actions/newgroup.php:172
 #, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr "O apelido \"%s\" jÃ¡ estÃ¡ em uso. Tente outro."
 
-#: actions/apigroupcreate.php:289 actions/editgroup.php:238
+#: actions/apigroupcreate.php:290 actions/editgroup.php:238
 #: actions/newgroup.php:178
 msgid "Alias can't be the same as nickname."
 msgstr "O apelido nÃ£o pode ser igual Ã  identificaÃ§Ã£o."
 
-#: actions/apigroupismember.php:96 actions/apigroupjoin.php:105
-#: actions/apigroupleave.php:105 actions/apigroupmembership.php:92
+#: actions/apigroupismember.php:96 actions/apigroupjoin.php:106
+#: actions/apigroupleave.php:106 actions/apigroupmembership.php:92
 #: actions/apigroupshow.php:83 actions/apitimelinegroup.php:92
 msgid "Group not found."
 msgstr "O grupo nÃ£o foi encontrado."
 
 #. TRANS: Error text shown a user tries to join a group they already are a member of.
-#: actions/apigroupjoin.php:111 actions/joingroup.php:100 lib/command.php:336
+#: actions/apigroupjoin.php:112 actions/joingroup.php:100 lib/command.php:336
 msgid "You are already a member of that group."
 msgstr "VocÃª jÃ¡ Ã© membro desse grupo."
 
 #. TRANS: Error text shown when a user tries to join a group they are blocked from joining.
-#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:341
+#: actions/apigroupjoin.php:121 actions/joingroup.php:105 lib/command.php:341
 msgid "You have been blocked from that group by the admin."
 msgstr "O administrador desse grupo bloqueou sua inscriÃ§Ã£o."
 
 #. 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.
-#: actions/apigroupjoin.php:139 actions/joingroup.php:134 lib/command.php:353
+#: actions/apigroupjoin.php:140 actions/joingroup.php:134 lib/command.php:353
 #, 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."
 
-#: actions/apigroupleave.php:115
+#: actions/apigroupleave.php:116
 msgid "You are not a member of this group."
 msgstr "VocÃª nÃ£o Ã© membro deste grupo."
 
 #. 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.
-#: actions/apigroupleave.php:125 actions/leavegroup.php:129
+#: actions/apigroupleave.php:126 actions/leavegroup.php:129
 #: lib/command.php:401
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
@@ -525,7 +530,7 @@ msgstr "Grupos de %s"
 msgid "groups on %s"
 msgstr "grupos no %s"
 
-#: actions/apimediaupload.php:99
+#: actions/apimediaupload.php:100
 msgid "Upload failed."
 msgstr "O upload falhou."
 
@@ -539,9 +544,9 @@ msgstr "Token invÃ¡lido."
 
 #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
 #: actions/deletenotice.php:169 actions/disfavor.php:74
-#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:55
+#: actions/emailsettings.php:271 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:66 actions/imsettings.php:227
+#: actions/groupunblock.php:66 actions/imsettings.php:230
 #: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
@@ -589,8 +594,8 @@ msgstr "O token %s solicitado foi negado e revogado."
 #. 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:286 actions/grouplogo.php:322
-#: actions/imsettings.php:242 actions/newapplication.php:121
+#: actions/emailsettings.php:290 actions/grouplogo.php:322
+#: actions/imsettings.php:245 actions/newapplication.php:121
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
 #: actions/smssettings.php:277 lib/designsettings.php:304
 msgid "Unexpected form submission."
@@ -655,18 +660,18 @@ msgstr "Esse mÃ©todo requer um POST ou DELETE."
 msgid "You may not delete another user's status."
 msgstr "VocÃª nÃ£o pode excluir uma mensagem de outro usuÃ¡rio."
 
-#: actions/apistatusesretweet.php:75 actions/apistatusesretweets.php:72
+#: actions/apistatusesretweet.php:76 actions/apistatusesretweets.php:72
 #: actions/deletenotice.php:52 actions/shownotice.php:92
 msgid "No such notice."
 msgstr "Essa mensagem nÃ£o existe."
 
 #. TRANS: Error text shown when trying to repeat an own notice.
-#: actions/apistatusesretweet.php:83 lib/command.php:538
+#: actions/apistatusesretweet.php:84 lib/command.php:538
 msgid "Cannot repeat your own notice."
 msgstr "VocÃª nÃ£o pode repetir a sua prÃ³pria mensagem."
 
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-#: actions/apistatusesretweet.php:91 lib/command.php:544
+#: actions/apistatusesretweet.php:92 lib/command.php:544
 msgid "Already repeated that notice."
 msgstr "VocÃª jÃ¡ repetiu essa mensagem."
 
@@ -678,21 +683,21 @@ msgstr "A mensagem foi excluÃda."
 msgid "No status with that ID found."
 msgstr "NÃ£o foi encontrada nenhuma mensagem com esse ID."
 
-#: actions/apistatusesupdate.php:221
+#: actions/apistatusesupdate.php:222
 msgid "Client must provide a 'status' parameter with a value."
 msgstr "O cliente tem de fornecer um parÃ¢metro 'status' com um valor."
 
-#: actions/apistatusesupdate.php:242 actions/newnotice.php:157
+#: actions/apistatusesupdate.php:243 actions/newnotice.php:157
 #: lib/mailhandler.php:60
 #, php-format
 msgid "That's too long. Max notice size is %d chars."
 msgstr "EstÃ¡ muito extenso. O tamanho mÃ¡ximo Ã© de %d caracteres."
 
-#: actions/apistatusesupdate.php:283 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:284 actions/apiusershow.php:96
 msgid "Not found."
 msgstr "NÃ£o encontrado."
 
-#: actions/apistatusesupdate.php:306 actions/newnotice.php:181
+#: actions/apistatusesupdate.php:307 actions/newnotice.php:181
 #, php-format
 msgid "Max notice size is %d chars, including attachment URL."
 msgstr "O tamanho mÃ¡ximo da mensagem Ã© de %d caracteres"
@@ -894,7 +899,9 @@ msgid "Yes"
 msgstr "Sim"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
+#. TRANS: Submit button title.
+#. TRANS: Description of the form to block a user.
+#: actions/block.php:164 actions/groupmembers.php:403 lib/blockform.php:82
 msgid "Block this user"
 msgstr "Bloquear este usuÃ¡rio"
 
@@ -936,11 +943,13 @@ msgstr "Uma lista dos usuÃ¡rios proibidos de se associarem a este grupo."
 msgid "Unblock user from group"
 msgstr "Desbloquear o usuÃ¡rio do grupo"
 
-#: actions/blockedfromgroup.php:320 lib/unblockform.php:69
+#. TRANS: Title for the form to unblock a user.
+#: actions/blockedfromgroup.php:320 lib/unblockform.php:70
 msgid "Unblock"
 msgstr "Desbloquear"
 
-#: actions/blockedfromgroup.php:320 lib/unblockform.php:80
+#. TRANS: Description of the form to unblock a user.
+#: actions/blockedfromgroup.php:320 lib/unblockform.php:82
 msgid "Unblock this user"
 msgstr "Desbloquear este usuÃ¡rio"
 
@@ -979,9 +988,9 @@ msgstr "Esse endereÃ§o jÃ¡ foi confirmado."
 #. 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/confirmaddress.php:116 actions/emailsettings.php:331
+#: actions/emailsettings.php:477 actions/imsettings.php:283
+#: actions/imsettings.php:442 actions/othersettings.php:174
 #: actions/profilesettings.php:283 actions/smssettings.php:308
 #: actions/smssettings.php:464
 msgid "Couldn't update user."
@@ -989,7 +998,7 @@ msgstr "NÃ£o foi possÃvel atualizar o usuÃ¡rio."
 
 #. 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/confirmaddress.php:128 actions/emailsettings.php:437
 #: actions/smssettings.php:422
 msgid "Couldn't delete email confirmation."
 msgstr "NÃ£o foi possÃvel excluir a confirmaÃ§Ã£o de e-mail."
@@ -1025,9 +1034,10 @@ msgstr "A aplicaÃ§Ã£o nÃ£o foi encontrada."
 msgid "You are not the owner of this application."
 msgstr "VocÃª nÃ£o Ã© o dono desta aplicaÃ§Ã£o."
 
+#. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:127
 #: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1307
+#: lib/action.php:1315
 msgid "There was a problem with your session token."
 msgstr "Ocorreu um problema com o seu token de sessÃ£o."
 
@@ -1061,7 +1071,7 @@ msgstr "Excluir esta aplicaÃ§Ã£o"
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
 #: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:73 lib/profileformaction.php:64
+#: lib/adminpanelaction.php:71 lib/profileformaction.php:64
 #: lib/settingsaction.php:72
 msgid "Not logged in."
 msgstr "VocÃª nÃ£o estÃ¡ autenticado."
@@ -1124,7 +1134,6 @@ msgstr "Excluir este usuÃ¡rio"
 #. TRANS: Message used as title for design settings for the site.
 #. TRANS: Link description in user account settings menu.
 #: actions/designadminpanel.php:63 lib/accountsettingsaction.php:139
-#: lib/groupnav.php:119
 msgid "Design"
 msgstr "AparÃªncia"
 
@@ -1247,13 +1256,13 @@ msgstr "Restaura a aparÃªncia padrÃ£o"
 msgid "Reset back to default"
 msgstr "Restaura de volta ao padrÃ£o"
 
-#. TRANS: Submit button title
+#. TRANS: Submit button title.
 #: actions/designadminpanel.php:685 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/snapshotadminpanel.php:245
 #: actions/subscriptions.php:226 actions/tagother.php:154
-#: actions/useradminpanel.php:294 lib/applicationeditform.php:363
+#: actions/useradminpanel.php:294 lib/applicationeditform.php:353
 #: lib/designsettings.php:256 lib/groupeditform.php:202
 msgid "Save"
 msgstr "Salvar"
@@ -1409,7 +1418,7 @@ msgstr "EndereÃ§o de e-mail jÃ¡ confirmado."
 #. 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/emailsettings.php:115 actions/emailsettings.php:162
 #: actions/imsettings.php:116 actions/smssettings.php:124
 #: actions/smssettings.php:180
 msgctxt "BUTTON"
@@ -1427,22 +1436,26 @@ msgstr ""
 #. 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
+#. TRANS: Button label in the "Edit application" form.
 #: actions/emailsettings.php:127 actions/imsettings.php:131
-#: actions/smssettings.php:137 lib/applicationeditform.php:357
+#: actions/smssettings.php:137 lib/applicationeditform.php:347
 msgctxt "BUTTON"
 msgid "Cancel"
 msgstr "Cancelar"
 
-#. TRANS: Instructions for e-mail address input form.
-#: actions/emailsettings.php:135
+#. TRANS: Instructions for e-mail address input form. Do not translate
+#. TRANS: "example.org". It is one of the domain names reserved for
+#. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
+#. TRANS: Any other domain may be owned by a legitimate person or
+#. TRANS: organization.
+#: actions/emailsettings.php:139
 msgid "Email address, like \"UserName@example.org\""
 msgstr "EndereÃ§o de e-mail, ex: \"usuario@exemplo.org\""
 
 #. 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/emailsettings.php:143 actions/imsettings.php:151
 #: actions/smssettings.php:162
 msgctxt "BUTTON"
 msgid "Add"
@@ -1450,114 +1463,114 @@ msgstr "Adicionar"
 
 #. 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
+#: actions/emailsettings.php:151 actions/smssettings.php:171
 msgid "Incoming email"
 msgstr "E-mail de recebimento"
 
 #. 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
+#: actions/emailsettings.php:159 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."
 
 #. 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
+#: actions/emailsettings.php:168 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."
 
 #. 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
+#: actions/emailsettings.php:172 actions/smssettings.php:189
 msgctxt "BUTTON"
 msgid "New"
 msgstr "Novo"
 
 #. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:174
+#: actions/emailsettings.php:178
 msgid "Email preferences"
 msgstr "PreferÃªncias de e-mail"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:180
+#: actions/emailsettings.php:184
 msgid "Send me notices of new subscriptions through email."
 msgstr "Envie-me notificaÃ§Ãµes de novos assinantes por e-mail."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:186
+#: actions/emailsettings.php:190
 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."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:193
+#: actions/emailsettings.php:197
 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."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:199
+#: actions/emailsettings.php:203
 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\")."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:205
+#: actions/emailsettings.php:209
 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."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:212
+#: actions/emailsettings.php:216
 msgid "I want to post notices by email."
 msgstr "Eu quero publicar mensagens por e-mail."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:219
+#: actions/emailsettings.php:223
 msgid "Publish a MicroID for my email address."
 msgstr "Publique um MicroID para meu endereÃ§o de e-mail."
 
 #. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:334
+#: actions/emailsettings.php:338
 msgid "Email preferences saved."
 msgstr "As configuraÃ§Ãµes de e-mail foram salvas."
 
 #. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:353
+#: actions/emailsettings.php:357
 msgid "No email address."
 msgstr "Nenhum endereÃ§o de e-mail."
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:361
+#: actions/emailsettings.php:365
 msgid "Cannot normalize that email address"
 msgstr "NÃ£o foi possÃvel normalizar este endereÃ§o de e-mail"
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:208
+#: actions/emailsettings.php:370 actions/register.php:208
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "NÃ£o Ã© um endereÃ§o de e-mail vÃ¡lido."
 
 #. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:370
+#: actions/emailsettings.php:374
 msgid "That is already your email address."
 msgstr "Esse jÃ¡ Ã© seu endereÃ§o de e-mail."
 
 #. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:374
+#: actions/emailsettings.php:378
 msgid "That email address already belongs to another user."
 msgstr "Esse endereÃ§o de e-mail jÃ¡ pertence Ã  outro usuÃ¡rio."
 
 #. 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/emailsettings.php:395 actions/imsettings.php:351
 #: actions/smssettings.php:373
 msgid "Couldn't insert confirmation code."
 msgstr "NÃ£o foi possÃvel inserir o cÃ³digo de confirmaÃ§Ã£o."
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:398
+#: actions/emailsettings.php:402
 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."
@@ -1569,50 +1582,50 @@ msgstr ""
 #. 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/emailsettings.php:423 actions/imsettings.php:386
 #: actions/smssettings.php:408
 msgid "No pending confirmation to cancel."
 msgstr "Nenhuma confirmaÃ§Ã£o pendente para cancelar."
 
 #. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:424
+#: actions/emailsettings.php:428
 msgid "That is the wrong email address."
 msgstr "Esse Ã© o endereÃ§o de e-mail errado."
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:438
+#: actions/emailsettings.php:442
 msgid "Email confirmation cancelled."
 msgstr "A confirmaÃ§Ã£o por e-mail foi cancelada."
 
 #. TRANS: Message given trying to remove an e-mail address that is not
 #. TRANS: registered for the active user.
-#: actions/emailsettings.php:458
+#: actions/emailsettings.php:462
 msgid "That is not your email address."
 msgstr "Esse nÃ£o Ã© seu endereÃ§o de email."
 
 #. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:479
+#: actions/emailsettings.php:483
 msgid "The email address was removed."
 msgstr "O endereÃ§o de e-mail foi removido."
 
-#: actions/emailsettings.php:493 actions/smssettings.php:568
+#: actions/emailsettings.php:497 actions/smssettings.php:568
 msgid "No incoming email address."
 msgstr "Nenhum endereÃ§o de e-mail para recebimentos."
 
 #. 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/emailsettings.php:508 actions/emailsettings.php:532
 #: 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."
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
-#: actions/emailsettings.php:508 actions/smssettings.php:581
+#: actions/emailsettings.php:512 actions/smssettings.php:581
 msgid "Incoming email address removed."
 msgstr "O endereÃ§o de e-mail de recebimento foi removido."
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
-#: actions/emailsettings.php:532 actions/smssettings.php:605
+#: actions/emailsettings.php:536 actions/smssettings.php:605
 msgid "New incoming email address added."
 msgstr ""
 "Foi adicionado um novo endereÃ§o de e-mail para recebimento de mensagens."
@@ -1732,7 +1745,7 @@ msgstr "NÃ£o foi possÃvel converter o token de requisiÃ§Ã£o para token de acess
 msgid "Remote service uses unknown version of OMB protocol."
 msgstr "O serviÃ§o remoto usa uma versÃ£o desconhecida do protocolo OMB."
 
-#: actions/finishremotesubscribe.php:138
+#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306
 msgid "Error updating remote profile."
 msgstr "Ocorreu um erro durante a atualizaÃ§Ã£o do perfil remoto."
 
@@ -1789,7 +1802,7 @@ msgstr "O usuÃ¡rio jÃ¡ estÃ¡ bloqueado no grupo."
 msgid "User is not a member of group."
 msgstr "O usuÃ¡rio nÃ£o Ã© um membro do grupo"
 
-#: actions/groupblock.php:134 actions/groupmembers.php:360
+#: actions/groupblock.php:134 actions/groupmembers.php:364
 msgid "Block user from group"
 msgstr "Bloquear o usuÃ¡rio no grupo"
 
@@ -1872,40 +1885,32 @@ msgstr "A logo foi atualizada."
 msgid "Failed updating logo."
 msgstr "NÃ£o foi possÃvel atualizar a logo."
 
-#: actions/groupmembers.php:100 lib/groupnav.php:92
+#. TRANS: Title of the page showing group members.
+#. TRANS: %s is the name of the group.
+#: actions/groupmembers.php:102
 #, php-format
 msgid "%s group members"
 msgstr "Membros do grupo %s"
 
-#: actions/groupmembers.php:103
+#. TRANS: Title of the page showing group members.
+#. TRANS: %1$s is the name of the group, %2$d is the page number of the members list.
+#: actions/groupmembers.php:107
 #, php-format
 msgid "%1$s group members, page %2$d"
 msgstr "Membros do grupo %1$s, pÃ¡g. %2$d"
 
-#: actions/groupmembers.php:118
+#: actions/groupmembers.php:122
 msgid "A list of the users in this group."
 msgstr "Uma lista dos usuÃ¡rios deste grupo."
 
-#: actions/groupmembers.php:182 lib/groupnav.php:107
+#: actions/groupmembers.php:186
 msgid "Admin"
 msgstr "Admin"
 
-#: actions/groupmembers.php:392 lib/blockform.php:69
-msgid "Block"
-msgstr "Bloquear"
-
-#: actions/groupmembers.php:487
+#: actions/groupmembers.php:498
 msgid "Make user an admin of the group"
 msgstr "Tornar o usuÃ¡rio um administrador do grupo"
 
-#: actions/groupmembers.php:519
-msgid "Make Admin"
-msgstr "Tornar administrador"
-
-#: actions/groupmembers.php:519
-msgid "Make this user an admin"
-msgstr "Torna este usuÃ¡rio um administrador"
-
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Title in atom group notice feed. %s is a group name.
 #. TRANS: Title in atom user notice feed. %s is a user name.
@@ -2044,7 +2049,10 @@ msgstr ""
 
 #. TRANS: IM address input field instructions in IM settings form.
 #. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:140
+#. TRANS: Do not translate "example.org". It is one of the domain names reserved for use in examples by
+#. TRANS: http://www.rfc-editor.org/rfc/rfc2606.txt. Any other domain may be owned by a legitimate
+#. TRANS: person or organization.
+#: actions/imsettings.php:143
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -2055,65 +2063,65 @@ msgstr ""
 "ou no GTalk."
 
 #. TRANS: Form legend for IM preferences form.
-#: actions/imsettings.php:155
+#: actions/imsettings.php:158
 msgid "IM preferences"
 msgstr "PreferÃªncias do mensageiro instantÃ¢neo"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:160
+#: actions/imsettings.php:163
 msgid "Send me notices through Jabber/GTalk."
 msgstr "Envie-me mensagens via Jabber/GTalk."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:166
+#: actions/imsettings.php:169
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr "Publicar uma mensagem quando eu mudar de status no Jabber/GTalk."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:172
+#: actions/imsettings.php:175
 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."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:179
+#: actions/imsettings.php:182
 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "Publique um MicroID para meu endereÃ§o de Jabber/Gtalk."
 
 #. TRANS: Confirmation message for successful IM preferences save.
-#: actions/imsettings.php:287 actions/othersettings.php:180
+#: actions/imsettings.php:290 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
+#: actions/imsettings.php:312
 msgid "No Jabber ID."
 msgstr "Nenhuma ID de Jabber."
 
 #. TRANS: Message given saving IM address that cannot be normalised.
-#: actions/imsettings.php:317
+#: actions/imsettings.php:320
 msgid "Cannot normalize that Jabber ID"
 msgstr "NÃ£o foi possÃvel normalizar essa ID do Jabber"
 
 #. TRANS: Message given saving IM address that not valid.
-#: actions/imsettings.php:322
+#: actions/imsettings.php:325
 msgid "Not a valid Jabber ID"
 msgstr "NÃ£o Ã© uma ID de Jabber vÃ¡lida"
 
 #. TRANS: Message given saving IM address that is already set.
-#: actions/imsettings.php:326
+#: actions/imsettings.php:329
 msgid "That is already your Jabber ID."
 msgstr "Essa jÃ¡ Ã© sua ID do Jabber."
 
 #. TRANS: Message given saving IM address that is already set for another user.
-#: actions/imsettings.php:330
+#: actions/imsettings.php:333
 msgid "Jabber ID already belongs to another user."
 msgstr "Esta ID do Jabber jÃ¡ pertence Ã  outro usuÃ¡rio."
 
 #. 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
+#: actions/imsettings.php:361
 #, php-format
 msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
@@ -2123,28 +2131,28 @@ msgstr ""
 "informou. VocÃª deve permitir que %s envie mensagens para vocÃª."
 
 #. TRANS: Message given canceling IM address confirmation for the wrong IM address.
-#: actions/imsettings.php:388
+#: actions/imsettings.php:391
 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
+#: actions/imsettings.php:400
 msgid "Couldn't delete IM confirmation."
 msgstr "NÃ£o foi possÃvel excluir a confirmaÃ§Ã£o do mensageiro instantÃ¢neo."
 
 #. TRANS: Message given after successfully canceling IM address confirmation.
-#: actions/imsettings.php:402
+#: actions/imsettings.php:405
 msgid "IM confirmation cancelled."
 msgstr "A confirmaÃ§Ã£o do mensageiro instantÃ¢neo foi cancelada."
 
 #. TRANS: Message given trying to remove an IM address that is not
 #. TRANS: registered for the active user.
-#: actions/imsettings.php:424
+#: actions/imsettings.php:427
 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
+#: actions/imsettings.php:450
 msgid "The IM address was removed."
 msgstr "O endereÃ§o de mensageiro instantÃ¢neo foi removido."
 
@@ -2621,8 +2629,8 @@ msgid "Only %s URLs over plain HTTP please."
 msgstr "Por favor, somente URLs %s sobre HTTP puro."
 
 #. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1215
-#: lib/apiaction.php:1243 lib/apiaction.php:1366
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1206
+#: lib/apiaction.php:1233 lib/apiaction.php:1356
 msgid "Not a supported data format."
 msgstr "NÃ£o Ã© um formato de dados suportado."
 
@@ -2764,7 +2772,7 @@ msgid "Password saved."
 msgstr "A senha foi salva."
 
 #. TRANS: Menu item for site administration
-#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:384
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:371
 msgid "Paths"
 msgstr "Caminhos"
 
@@ -2977,7 +2985,7 @@ msgstr "Nome completo"
 
 #. TRANS: Form input field label.
 #: actions/profilesettings.php:115 actions/register.php:460
-#: lib/applicationeditform.php:244 lib/groupeditform.php:161
+#: lib/applicationeditform.php:235 lib/groupeditform.php:161
 msgid "Homepage"
 msgstr "Site"
 
@@ -3083,7 +3091,7 @@ msgid "Couldn't save tags."
 msgstr "NÃ£o foi possÃvel salvar as etiquetas."
 
 #. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:391 lib/adminpanelaction.php:141
+#: actions/profilesettings.php:391 lib/adminpanelaction.php:138
 msgid "Settings saved."
 msgstr "As configuraÃ§Ãµes foram salvas."
 
@@ -3626,7 +3634,7 @@ msgstr "O usuÃ¡rio jÃ¡ estÃ¡ em isolamento."
 
 #. TRANS: Menu item for site administration
 #: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
-#: lib/adminpanelaction.php:392
+#: lib/adminpanelaction.php:379
 msgid "Sessions"
 msgstr "SessÃµes"
 
@@ -3664,24 +3672,24 @@ msgid "Application profile"
 msgstr "Perfil da aplicaÃ§Ã£o"
 
 #. TRANS: Form input field label for application icon.
-#: actions/showapplication.php:159 lib/applicationeditform.php:182
+#: actions/showapplication.php:159 lib/applicationeditform.php:173
 msgid "Icon"
 msgstr "Ãcone"
 
 #. TRANS: Form input field label for application name.
 #: actions/showapplication.php:169 actions/version.php:197
-#: lib/applicationeditform.php:199
+#: lib/applicationeditform.php:190
 msgid "Name"
 msgstr "Nome"
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:178 lib/applicationeditform.php:235
+#: actions/showapplication.php:178 lib/applicationeditform.php:226
 msgid "Organization"
 msgstr "OrganizaÃ§Ã£o"
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:216 lib/groupeditform.php:172
+#: lib/applicationeditform.php:207 lib/groupeditform.php:172
 msgid "Description"
 msgstr "DescriÃ§Ã£o"
 
@@ -3795,7 +3803,7 @@ msgstr ""
 msgid "This is a way to share what you like."
 msgstr "Esta Ã© uma forma de compartilhar o que vocÃª gosta."
 
-#: actions/showgroup.php:82 lib/groupnav.php:86
+#: actions/showgroup.php:82
 #, php-format
 msgid "%s group"
 msgstr "Grupo %s"
@@ -3847,7 +3855,7 @@ msgstr "Fonte de mensagens do grupo %s (Atom)"
 msgid "FOAF for %s group"
 msgstr "FOAF para o grupo %s"
 
-#: actions/showgroup.php:393 actions/showgroup.php:445 lib/groupnav.php:91
+#: actions/showgroup.php:393 actions/showgroup.php:445
 msgid "Members"
 msgstr "Membros"
 
@@ -4301,7 +4309,7 @@ msgstr "NÃ£o foi digitado nenhum cÃ³digo"
 
 #. TRANS: Menu item for site administration
 #: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
-#: lib/adminpanelaction.php:408
+#: lib/adminpanelaction.php:395
 msgid "Snapshots"
 msgstr "EstatÃsticas"
 
@@ -5036,7 +5044,7 @@ msgid "Unable to save tag."
 msgstr "NÃ£o foi salvar gravar a categoria."
 
 #. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#: classes/Subscription.php:75 lib/oauthstore.php:465
+#: classes/Subscription.php:75 lib/oauthstore.php:466
 msgid "You have been banned from subscribing."
 msgstr "VocÃª estÃ¡ proibido de assinar."
 
@@ -5184,7 +5192,8 @@ msgid "Change site configuration"
 msgstr "Altere as configuraÃ§Ãµes do site"
 
 #. TRANS: Main menu option when logged in and site admin for access to site configuration
-#: lib/action.php:474
+#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
+#: lib/action.php:474 lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr "Administrar"
@@ -5261,9 +5270,9 @@ msgstr "Pesquisar"
 
 #. TRANS: DT element for site notice. String is hidden in default CSS.
 #. TRANS: Menu item for site administration
-#: lib/action.php:538 lib/adminpanelaction.php:400
+#: lib/action.php:538 lib/adminpanelaction.php:387
 msgid "Site notice"
-msgstr "Mensagem do site"
+msgstr "Avisos do site"
 
 #. TRANS: DT element for local views block. String is hidden in default CSS.
 #: lib/action.php:605
@@ -5325,7 +5334,10 @@ msgid "StatusNet software license"
 msgstr "LicenÃ§a do software StatusNet"
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
-#: lib/action.php:843
+#. TRANS: Text between [] is a link description, text between () is the link itself.
+#. TRANS: Make sure there is no whitespace between "]" and "(".
+#. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
+#: lib/action.php:846
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -5335,13 +5347,16 @@ msgstr ""
 "broughtby%%](%%site.broughtbyurl%%). "
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:846
+#: lib/action.php:849
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** Ã© um serviÃ§o de microblog."
 
 #. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.
-#: lib/action.php:850
+#. TRANS: Make sure there is no whitespace between "]" and "(".
+#. TRANS: Text between [] is a link description, text between () is the link itself.
+#. TRANS: %s is the version of StatusNet that is being used.
+#: lib/action.php:856
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -5353,51 +5368,52 @@ msgstr ""
 "fsf.org/licensing/licenses/agpl-3.0.html)."
 
 #. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:866
+#: lib/action.php:872
 msgid "Site content license"
 msgstr "LicenÃ§a do conteÃºdo do site"
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:873
+#: lib/action.php:879
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr "O conteÃºdo e os dados de %1$s sÃ£o privados e confidenciais."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:880
+#: lib/action.php:886
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr "ConteÃºdo e dados licenciados sob %1$s. Todos os direitos reservados."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:884
+#: lib/action.php:890
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 "ConteÃºdo e dados licenciados pelos colaboradores. Todos os direitos "
 "reservados."
 
-#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:897
+#. TRANS: license message in footer.
+#. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
+#: lib/action.php:904
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr "Todo o conteÃºdo e dados de %1$s estÃ£o disponÃveis sob a licenÃ§a %2$s."
 
 #. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1236
+#: lib/action.php:1243
 msgid "Pagination"
 msgstr "PaginaÃ§Ã£o"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1247
+#: lib/action.php:1254
 msgid "After"
 msgstr "PrÃ³ximo"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1257
+#: lib/action.php:1264
 msgid "Before"
 msgstr "Anterior"
 
@@ -5408,208 +5424,227 @@ msgstr ""
 "Era esperado um elemento raiz da fonte, mas foi obtido o documento XML "
 "inteiro."
 
-#: lib/activityutils.php:208
+#. TRANS: Client exception thrown when there is no source attribute.
+#: lib/activityutils.php:203
 msgid "Can't handle remote content yet."
 msgstr "Ainda nÃ£o Ã© possÃvel manipular conteÃºdo remoto."
 
-#: lib/activityutils.php:244
+#. TRANS: Client exception thrown when there embedded XML content is found that cannot be processed yet.
+#: lib/activityutils.php:240
 msgid "Can't handle embedded XML content yet."
 msgstr "Ainda nÃ£o Ã© possÃvel manipular conteÃºdo XML incorporado."
 
-#: lib/activityutils.php:248
+#. TRANS: Client exception thrown when base64 encoded content is found that cannot be processed yet.
+#: lib/activityutils.php:245
 msgid "Can't handle embedded Base64 content yet."
 msgstr "Ainda nÃ£o Ã© possÃvel manipular conteÃºdo Base64."
 
 #. TRANS: Client error message thrown when a user tries to change admin settings but has no access rights.
-#: lib/adminpanelaction.php:98
+#: lib/adminpanelaction.php:96
 msgid "You cannot make changes to this site."
 msgstr "VocÃª nÃ£o pode fazer alteraÃ§Ãµes neste site."
 
 #. TRANS: Client error message throw when a certain panel's settings cannot be changed.
-#: lib/adminpanelaction.php:110
+#: lib/adminpanelaction.php:108
 msgid "Changes to that panel are not allowed."
 msgstr "NÃ£o sÃ£o permitidas alteraÃ§Ãµes a esse painel."
 
 #. TRANS: Client error message.
-#: lib/adminpanelaction.php:229
+#: lib/adminpanelaction.php:222
 msgid "showForm() not implemented."
 msgstr "showForm() nÃ£o implementado."
 
 #. TRANS: Client error message
-#: lib/adminpanelaction.php:259
+#: lib/adminpanelaction.php:250
 msgid "saveSettings() not implemented."
 msgstr "saveSettings() nÃ£o implementado."
 
 #. TRANS: Client error message thrown if design settings could not be deleted in
 #. TRANS: the admin panel Design.
-#: lib/adminpanelaction.php:284
+#: lib/adminpanelaction.php:274
 msgid "Unable to delete design setting."
 msgstr "NÃ£o foi possÃvel excluir as configuraÃ§Ãµes da aparÃªncia."
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:350
+#: lib/adminpanelaction.php:337
 msgid "Basic site configuration"
 msgstr "ConfiguraÃ§Ã£o bÃ¡sica do site"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:352
+#: lib/adminpanelaction.php:339
 msgctxt "MENU"
 msgid "Site"
 msgstr "Site"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:358
+#: lib/adminpanelaction.php:345
 msgid "Design configuration"
 msgstr "ConfiguraÃ§Ã£o da aparÃªncia"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:360
+#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
+#: lib/adminpanelaction.php:347 lib/groupnav.php:135
 msgctxt "MENU"
 msgid "Design"
 msgstr "AparÃªncia"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:366
+#: lib/adminpanelaction.php:353
 msgid "User configuration"
 msgstr "ConfiguraÃ§Ã£o do usuÃ¡rio"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:368 lib/personalgroupnav.php:115
+#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:115
 msgid "User"
 msgstr "UsuÃ¡rio"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:374
+#: lib/adminpanelaction.php:361
 msgid "Access configuration"
 msgstr "ConfiguraÃ§Ã£o do acesso"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:382
+#: lib/adminpanelaction.php:369
 msgid "Paths configuration"
 msgstr "ConfiguraÃ§Ã£o dos caminhos"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:390
+#: lib/adminpanelaction.php:377
 msgid "Sessions configuration"
 msgstr "ConfiguraÃ§Ã£o das sessÃµes"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:398
+#: lib/adminpanelaction.php:385
 msgid "Edit site notice"
 msgstr "Editar os avisos do site"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:406
+#: lib/adminpanelaction.php:393
 msgid "Snapshots configuration"
 msgstr "ConfiguraÃ§Ãµes das estatÃsticas"
 
 #. TRANS: Client error 401.
-#: lib/apiauth.php:113
+#: lib/apiauth.php:111
 msgid "API resource requires read-write access, but you only have read access."
 msgstr ""
 "Os recursos de API exigem acesso de leitura e escrita, mas vocÃª possui "
 "somente acesso de leitura."
 
+#. TRANS: OAuth exception thrown when no application is found for a given consumer key.
+#: lib/apiauth.php:175
+msgid "No application for that consumer key."
+msgstr ""
+
+#. TRANS: OAuth exception given when no user was found for a given token (no token was found).
+#: lib/apiauth.php:217
+msgid "No user for that token."
+msgstr ""
+
+#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
+#: lib/apioauthstore.php:178
+msgid "Tried to revoke unknown token"
+msgstr ""
+
 #. TRANS: Form legend.
-#: lib/applicationeditform.php:137
+#: lib/applicationeditform.php:129
 msgid "Edit application"
 msgstr "Editar a aplicaÃ§Ã£o"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:187
+#: lib/applicationeditform.php:178
 msgid "Icon for this application"
 msgstr "Ãcone para esta aplicaÃ§Ã£o"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:209
+#: lib/applicationeditform.php:200
 #, php-format
 msgid "Describe your application in %d characters"
 msgstr "Descreva a sua aplicaÃ§Ã£o em %d caracteres"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:213
+#: lib/applicationeditform.php:204
 msgid "Describe your application"
 msgstr "Descreva sua aplicaÃ§Ã£o"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:224
+#: lib/applicationeditform.php:215
 msgid "URL of the homepage of this application"
 msgstr "URL do site desta aplicaÃ§Ã£o"
 
 #. TRANS: Form input field label.
-#: lib/applicationeditform.php:226
+#: lib/applicationeditform.php:217
 msgid "Source URL"
 msgstr "URL da fonte"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:233
+#: lib/applicationeditform.php:224
 msgid "Organization responsible for this application"
 msgstr "OrganizaÃ§Ã£o responsÃ¡vel por esta aplicaÃ§Ã£o"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:242
+#: lib/applicationeditform.php:233
 msgid "URL for the homepage of the organization"
 msgstr "URL para o site da organizaÃ§Ã£o"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:251
+#: lib/applicationeditform.php:242
 msgid "URL to redirect to after authentication"
 msgstr "URL para o redirecionamento apÃ³s a autenticaÃ§Ã£o"
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:278
+#: lib/applicationeditform.php:269
 msgid "Browser"
 msgstr "Navegador"
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:295
+#: lib/applicationeditform.php:286
 msgid "Desktop"
 msgstr "Desktop"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:297
+#: lib/applicationeditform.php:288
 msgid "Type of application, browser or desktop"
 msgstr "Tipo de aplicaÃ§Ã£o: navegador ou desktop"
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:320
+#: lib/applicationeditform.php:311
 msgid "Read-only"
 msgstr "Somente leitura"
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:339
+#: lib/applicationeditform.php:330
 msgid "Read-write"
 msgstr "Leitura e escrita"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:341
+#: lib/applicationeditform.php:332
 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: Submit button title
-#: lib/applicationeditform.php:359
+#. TRANS: Submit button title.
+#: lib/applicationeditform.php:349
 msgid "Cancel"
 msgstr "Cancelar"
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:136
+#: lib/applicationlist.php:135
 msgid "read-write"
 msgstr "leitura e escrita"
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:138
+#: lib/applicationlist.php:137
 msgid "read-only"
 msgstr "somente leitura"
 
 #. 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
+#: lib/applicationlist.php:143
 #, php-format
 msgid "Approved %1$s - \"%2$s\" access."
 msgstr "Aprovado em %1$s - acesso \"%2$s\"."
 
 #. TRANS: Button label
-#: lib/applicationlist.php:159
+#: lib/applicationlist.php:158
 msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "Revogar"
@@ -5629,11 +5664,13 @@ msgstr "Autor"
 msgid "Provider"
 msgstr "Operadora"
 
-#: lib/attachmentnoticesection.php:67
+#. TRANS: Title.
+#: lib/attachmentnoticesection.php:68
 msgid "Notices where this attachment appears"
 msgstr "Mensagens onde este anexo aparece"
 
-#: lib/attachmenttagcloudsection.php:48
+#. TRANS: Title.
+#: lib/attachmenttagcloudsection.php:49
 msgid "Tags for this attachment"
 msgstr "Etiquetas para este anexo"
 
@@ -5645,6 +5682,11 @@ msgstr "NÃ£o foi possÃvel alterar a senha"
 msgid "Password changing is not allowed"
 msgstr "NÃ£o Ã© permitido alterar a senha"
 
+#. TRANS: Title for the form to block a user.
+#: lib/blockform.php:70
+msgid "Block"
+msgstr "Bloquear"
+
 #: lib/channel.php:157 lib/channel.php:177
 msgid "Command results"
 msgstr "Resultados do comando"
@@ -5898,7 +5940,7 @@ msgid "You are not subscribed to anyone."
 msgstr "VocÃª nÃ£o estÃ¡ assinando ninguÃ©m."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to.
-#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.
 #: lib/command.php:836
 msgid "You are subscribed to this person:"
@@ -5913,7 +5955,7 @@ msgid "No one is subscribed to you."
 msgstr "NinguÃ©m o assinou ainda."
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
-#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
 #: lib/command.php:863
 msgid "This person is subscribed to you:"
@@ -5928,7 +5970,7 @@ msgid "You are not a member of any groups."
 msgstr "VocÃª nÃ£o Ã© membro de nenhum grupo."
 
 #. TRANS: Text shown after requesting groups a user is subscribed to.
-#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
 #: lib/command.php:890
 msgid "You are a member of this group:"
@@ -5936,6 +5978,7 @@ msgid_plural "You are a member of these groups:"
 msgstr[0] "VocÃª Ã© membro deste grupo:"
 msgstr[1] "VocÃª Ã© membro destes grupos:"
 
+#. TRANS: Help text for commands.
 #: lib/command.php:905
 msgid ""
 "Commands:\n"
@@ -6158,38 +6201,6 @@ msgid "Extra nicknames for the group, comma- or space- separated, max %d"
 msgstr ""
 "Apelidos extras para o grupo, separado por vÃrgulas ou espaÃ§os, no mÃ¡ximo %d"
 
-#: lib/groupnav.php:85
-msgid "Group"
-msgstr "Grupo"
-
-#: lib/groupnav.php:101
-msgid "Blocked"
-msgstr "Bloqueados"
-
-#: lib/groupnav.php:102
-#, php-format
-msgid "%s blocked users"
-msgstr "%s usuÃ¡rios bloqueados"
-
-#: lib/groupnav.php:108
-#, php-format
-msgid "Edit %s group properties"
-msgstr "Editar propriedades do grupo %s"
-
-#: lib/groupnav.php:113
-msgid "Logo"
-msgstr "Logo"
-
-#: lib/groupnav.php:114
-#, php-format
-msgid "Add or edit %s logo"
-msgstr "Adicionar ou editar logo de %s"
-
-#: lib/groupnav.php:120
-#, php-format
-msgid "Add or edit %s design"
-msgstr "Adicionar ou editar a aparÃªncia de %s"
-
 #: lib/groupsbymemberssection.php:71
 msgid "Groups with most members"
 msgstr "Grupos com mais membros"
@@ -6221,7 +6232,8 @@ msgstr "O arquivo Ã© muito grande. O tamanho mÃ¡ximo Ã© de %s."
 msgid "Partial upload."
 msgstr "Envio parcial."
 
-#: lib/imagefile.php:101 lib/mediafile.php:170
+#. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
+#: lib/imagefile.php:101 lib/mediafile.php:179
 msgid "System error uploading file."
 msgstr "Erro no sistema durante o envio do arquivo."
 
@@ -6625,19 +6637,22 @@ msgstr "Desculpe-me, mas nÃ£o Ã© permitido o recebimento de e-mails."
 msgid "Unsupported message type: %s"
 msgstr "Tipo de mensagem nÃ£o suportado: %s"
 
-#: lib/mediafile.php:98 lib/mediafile.php:123
+#. TRANS: Client exception thrown when a database error was thrown during a file upload operation.
+#: lib/mediafile.php:99 lib/mediafile.php:125
 msgid "There was a database error while saving your file. Please try again."
 msgstr ""
 "Ocorreu um erro no banco de dados durante o salvamento do seu arquivo. Por "
 "favor, tente novamente."
 
-#: lib/mediafile.php:142
+#. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
+#: lib/mediafile.php:145
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
 msgstr ""
 "O arquivo a ser enviado Ã© maior do que o limite definido no parÃ¢metro "
 "upload_max_filesize do php.ini."
 
-#: lib/mediafile.php:147
+#. TRANS: Client exception.
+#: lib/mediafile.php:151
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form."
@@ -6645,44 +6660,43 @@ msgstr ""
 "O arquivo a ser enviado Ã© maior do que o limite definido no parÃ¢metro "
 "MAX_FILE_SIZE do formulÃ¡rio HTML."
 
-#: lib/mediafile.php:152
+#. TRANS: Client exception.
+#: lib/mediafile.php:157
 msgid "The uploaded file was only partially uploaded."
 msgstr "O arquivo foi apenas parcialmente enviado."
 
-#: lib/mediafile.php:159
+#. TRANS: Client exception thrown when a temporary folder is not present to store a file upload.
+#: lib/mediafile.php:165
 msgid "Missing a temporary folder."
 msgstr "Falta uma pasta temporÃ¡ria."
 
-#: lib/mediafile.php:162
+#. TRANS: Client exception thrown when writing to disk is not possible during a file upload operation.
+#: lib/mediafile.php:169
 msgid "Failed to write file to disk."
 msgstr "Erro ao salvar o arquivo no disco."
 
-#: lib/mediafile.php:165
+#. TRANS: Client exception thrown when a file upload operation has been stopped by an extension.
+#: lib/mediafile.php:173
 msgid "File upload stopped by extension."
 msgstr "O arquivo a ser enviado foi barrado por causa de sua extensÃ£o."
 
-#: lib/mediafile.php:179 lib/mediafile.php:217
+#. TRANS: Client exception thrown when a file upload operation would cause a user to exceed a set quota.
+#: lib/mediafile.php:189 lib/mediafile.php:232
 msgid "File exceeds user's quota."
 msgstr "O arquivo excede a quota do usuÃ¡rio."
 
-#: lib/mediafile.php:197 lib/mediafile.php:234
+#. TRANS: Client exception thrown when a file upload operation fails because the file could
+#. TRANS: not be moved from the temporary folder to the permanent file location.
+#: lib/mediafile.php:209 lib/mediafile.php:251
 msgid "File could not be moved to destination directory."
 msgstr "NÃ£o foi possÃvel mover o arquivo para o diretÃ³rio de destino."
 
-#: lib/mediafile.php:202 lib/mediafile.php:238
+#. TRANS: Client exception thrown when a file upload operation has been stopped because the MIME
+#. TRANS: type of the uploaded file could not be determined.
+#: lib/mediafile.php:216 lib/mediafile.php:257
 msgid "Could not determine file's MIME type."
 msgstr "NÃ£o foi possÃvel determinar o tipo MIME do arquivo."
 
-#: lib/mediafile.php:318
-#, php-format
-msgid " Try using another %s format."
-msgstr " Tente usar outro formato %s."
-
-#: lib/mediafile.php:323
-#, php-format
-msgid "%s is not a supported file type on this server."
-msgstr "%s nÃ£o Ã© um tipo de arquivo suportado neste servidor."
-
 #: lib/messageform.php:120
 msgid "Send a direct notice"
 msgstr "Enviar uma mensagem direta"
@@ -6798,27 +6812,7 @@ msgstr "Chamar a atenÃ§Ã£o"
 msgid "Send a nudge to this user"
 msgstr "Chame a atenÃ§Ã£o deste usuÃ¡rio"
 
-#: lib/oauthstore.php:283
-msgid "Error inserting new profile"
-msgstr "Erro na inserÃ§Ã£o do novo perfil"
-
-#: lib/oauthstore.php:291
-msgid "Error inserting avatar"
-msgstr "Erro na inserÃ§Ã£o do avatar"
-
-#: lib/oauthstore.php:306
-msgid "Error updating remote profile"
-msgstr "Ocorreu um erro na atualizaÃ§Ã£o do perfil remoto"
-
-#: lib/oauthstore.php:311
-msgid "Error inserting remote profile"
-msgstr "Erro na inserÃ§Ã£o do perfil remoto"
-
-#: lib/oauthstore.php:345
-msgid "Duplicate notice"
-msgstr "Duplicar a mensagem"
-
-#: lib/oauthstore.php:490
+#: lib/oauthstore.php:491
 msgid "Couldn't insert new subscription."
 msgstr "NÃ£o foi possÃvel inserir a nova assinatura."
 
@@ -6855,7 +6849,8 @@ msgstr "Suas mensagens enviadas"
 msgid "Tags in %s's notices"
 msgstr "Etiquetas nas mensagens de %s"
 
-#: lib/plugin.php:115
+#. TRANS: Displayed as version information for a plugin if no version information was found.
+#: lib/plugin.php:116
 msgid "Unknown"
 msgstr "Desconhecido"
 
@@ -6949,19 +6944,19 @@ msgstr "Isolamento"
 msgid "Sandbox this user"
 msgstr "Colocar este usuÃ¡rio em isolamento"
 
-#: lib/searchaction.php:120
+#. TRANS: Fieldset legend for the search form.
+#: lib/searchaction.php:121
 msgid "Search site"
 msgstr "Procurar no site"
 
-#: lib/searchaction.php:126
+#. TRANS: Used as a field label for the field where one or more keywords
+#. TRANS: for searching can be entered.
+#: lib/searchaction.php:129
 msgid "Keyword(s)"
 msgstr "Palavra(s)-chave"
 
-#: lib/searchaction.php:127
-msgid "Search"
-msgstr "Procurar"
-
-#: lib/searchaction.php:162
+#. TRANS: Definition list item with instructions on how to get (better) search results.
+#: lib/searchaction.php:170
 msgid "Search help"
 msgstr "Ajuda da procura"
 
@@ -7160,56 +7155,32 @@ msgid "Moderator"
 msgstr "Moderador"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1102
+#: lib/util.php:1103
 msgid "a few seconds ago"
 msgstr "alguns segundos atrÃ¡s"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1105
+#: lib/util.php:1106
 msgid "about a minute ago"
 msgstr "cerca de 1 minuto atrÃ¡s"
 
-#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1109
-#, php-format
-msgid "about %d minutes ago"
-msgstr "cerca de %d minutos atrÃ¡s"
-
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 #: lib/util.php:1112
 msgid "about an hour ago"
 msgstr "cerca de 1 hora atrÃ¡s"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1116
-#, php-format
-msgid "about %d hours ago"
-msgstr "cerca de %d horas atrÃ¡s"
-
-#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1119
+#: lib/util.php:1118
 msgid "about a day ago"
 msgstr "cerca de 1 dia atrÃ¡s"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1123
-#, php-format
-msgid "about %d days ago"
-msgstr "cerca de %d dias atrÃ¡s"
-
-#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1126
+#: lib/util.php:1124
 msgid "about a month ago"
 msgstr "cerca de 1 mÃªs atrÃ¡s"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 #: lib/util.php:1130
-#, php-format
-msgid "about %d months ago"
-msgstr "cerca de %d meses atrÃ¡s"
-
-#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1133
 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 f219931c7b..6bc2578872 100644
--- a/locale/ru/LC_MESSAGES/statusnet.po
+++ b/locale/ru/LC_MESSAGES/statusnet.po
@@ -1,11 +1,12 @@
-# Translation of StatusNet to Russian
+# Translation of StatusNet to Russian (Ð ÑÑÑÐºÐ¸Ð¹)
+# Expored from translatewiki.net
 #
-# Author@translatewiki.net: Brion
-# Author@translatewiki.net: Eleferen
-# Author@translatewiki.net: Kirill
-# Author@translatewiki.net: Lockal
-# Author@translatewiki.net: Rubin
-# Author@translatewiki.net: ÐÐ»ÐµÐºÑÐ°Ð½Ð´Ñ Ð¡Ð¸Ð³Ð°ÑÑÐ²
+# Author: Brion
+# Author: Eleferen
+# Author: Kirill
+# Author: Lockal
+# Author: Rubin
+# Author: ÐÐ»ÐµÐºÑÐ°Ð½Ð´Ñ Ð¡Ð¸Ð³Ð°ÑÑÐ²
 # --
 # This file is distributed under the same license as the StatusNet package.
 #
@@ -13,21 +14,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-08 22:33+0000\n"
-"PO-Revision-Date: 2010-09-08 22:35:19+0000\n"
-"Language-Team: Russian\n"
+"POT-Creation-Date: 2010-09-14 19:53+0000\n"
+"PO-Revision-Date: 2010-09-14 19:54:18+0000\n"
+"Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r72348); Translate extension (2010-08-20)\n"
+"X-Generator: MediaWiki 1.17alpha (r73009); Translate extension (2010-08-20)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
-"X-Message-Group: out-statusnet\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
-"10< =4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Message-Group: #out-statusnet\n"
+"Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
+"2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
+"X-POT-Import-Date: 1284-49-16 34::+0000\n"
 
 #. TRANS: Page title
 #. TRANS: Menu item for site administration
-#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:376
+#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:363
 msgid "Access"
 msgstr "ÐÐ¾ÑÑÑÐ¿"
 
@@ -81,10 +83,10 @@ 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 actions/emailsettings.php:224
-#: actions/imsettings.php:184 actions/smssettings.php:209
-#: lib/applicationeditform.php:361
+#. TRANS: Button label in the "Edit application" form.
+#: actions/accessadminpanel.php:203 actions/emailsettings.php:228
+#: actions/imsettings.php:187 actions/smssettings.php:209
+#: lib/applicationeditform.php:351
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Ð¡Ð¾ÑÑÐ°Ð½Ð¸ÑÑ"
@@ -97,15 +99,15 @@ msgstr "ÐÐµÑ ÑÐ°ÐºÐ¾Ð¹ ÑÑÑÐ°Ð½Ð¸ÑÑ."
 
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #: actions/all.php:79 actions/allrss.php:68
-#: actions/apiaccountupdatedeliverydevice.php:114
-#: actions/apiaccountupdateprofile.php:105
-#: actions/apiaccountupdateprofilebackgroundimage.php:116
-#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
-#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
-#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:113
-#: actions/apigroupismember.php:91 actions/apigroupjoin.php:100
-#: actions/apigroupleave.php:100 actions/apigrouplist.php:73
-#: actions/apistatusesupdate.php:229 actions/apisubscriptions.php:87
+#: actions/apiaccountupdatedeliverydevice.php:115
+#: actions/apiaccountupdateprofile.php:106
+#: actions/apiaccountupdateprofilebackgroundimage.php:117
+#: actions/apiaccountupdateprofileimage.php:106 actions/apiblockcreate.php:98
+#: actions/apiblockdestroy.php:97 actions/apidirectmessage.php:77
+#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:114
+#: actions/apigroupismember.php:91 actions/apigroupjoin.php:101
+#: actions/apigroupleave.php:101 actions/apigrouplist.php:73
+#: actions/apistatusesupdate.php:230 actions/apisubscriptions.php:87
 #: actions/apitimelinefavorites.php:72 actions/apitimelinefriends.php:174
 #: actions/apitimelinehome.php:80 actions/apitimelinementions.php:80
 #: actions/apitimelineuser.php:82 actions/avatarbynickname.php:75
@@ -203,16 +205,16 @@ msgid "Updates from %1$s and friends on %2$s!"
 msgstr "ÐÐ±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¾ Ð¾Ñ %1$s Ð¸ ÐµÐ³Ð¾ Ð´ÑÑÐ·ÐµÐ¹ Ð½Ð° %2$s!"
 
 #: actions/apiaccountratelimitstatus.php:72
-#: actions/apiaccountupdatedeliverydevice.php:94
-#: actions/apiaccountupdateprofile.php:97
-#: actions/apiaccountupdateprofilebackgroundimage.php:94
-#: actions/apiaccountupdateprofilecolors.php:118
+#: actions/apiaccountupdatedeliverydevice.php:95
+#: actions/apiaccountupdateprofile.php:98
+#: actions/apiaccountupdateprofilebackgroundimage.php:95
+#: actions/apiaccountupdateprofilecolors.php:119
 #: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156
-#: actions/apifavoritecreate.php:100 actions/apifavoritedestroy.php:101
-#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100
-#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:139
-#: actions/apigroupismember.php:115 actions/apigroupjoin.php:156
-#: actions/apigroupleave.php:142 actions/apigrouplist.php:137
+#: actions/apifavoritecreate.php:101 actions/apifavoritedestroy.php:102
+#: actions/apifriendshipscreate.php:101 actions/apifriendshipsdestroy.php:101
+#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:140
+#: actions/apigroupismember.php:115 actions/apigroupjoin.php:157
+#: actions/apigroupleave.php:143 actions/apigrouplist.php:137
 #: actions/apigrouplistall.php:122 actions/apigroupmembership.php:107
 #: actions/apigroupshow.php:116 actions/apihelptest.php:88
 #: actions/apistatusesdestroy.php:104 actions/apistatusesretweets.php:112
@@ -227,21 +229,23 @@ msgstr "ÐÐ±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¾ Ð¾Ñ %1$s Ð¸ ÐµÐ³Ð¾ Ð´ÑÑÐ·ÐµÐ¹ Ð½Ð° %2$s!"
 msgid "API method not found."
 msgstr "ÐÐµÑÐ¾Ð´ API Ð½Ðµ Ð½Ð°Ð¹Ð´ÐµÐ½."
 
-#: actions/apiaccountupdatedeliverydevice.php:86
-#: actions/apiaccountupdateprofile.php:89
-#: actions/apiaccountupdateprofilebackgroundimage.php:86
-#: actions/apiaccountupdateprofilecolors.php:110
-#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89
-#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109
-#: actions/apifavoritecreate.php:91 actions/apifavoritedestroy.php:92
-#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
-#: actions/apigroupcreate.php:105 actions/apigroupjoin.php:92
-#: actions/apigroupleave.php:92 actions/apimediaupload.php:67
-#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:198
+#. TRANS: Client error message. POST is a HTTP command. It should not be translated.
+#. TRANS: Client error. POST is a HTTP command. It should not be translated.
+#: actions/apiaccountupdatedeliverydevice.php:87
+#: actions/apiaccountupdateprofile.php:90
+#: actions/apiaccountupdateprofilebackgroundimage.php:87
+#: actions/apiaccountupdateprofilecolors.php:111
+#: actions/apiaccountupdateprofileimage.php:85 actions/apiblockcreate.php:90
+#: actions/apiblockdestroy.php:89 actions/apidirectmessagenew.php:110
+#: actions/apifavoritecreate.php:92 actions/apifavoritedestroy.php:93
+#: actions/apifriendshipscreate.php:92 actions/apifriendshipsdestroy.php:92
+#: actions/apigroupcreate.php:106 actions/apigroupjoin.php:93
+#: actions/apigroupleave.php:93 actions/apimediaupload.php:68
+#: actions/apistatusesretweet.php:66 actions/apistatusesupdate.php:199
 msgid "This method requires a POST."
 msgstr "ÐÑÐ¾Ñ Ð¼ÐµÑÐ¾Ð´ ÑÑÐµÐ±ÑÐµÑ POST."
 
-#: actions/apiaccountupdatedeliverydevice.php:106
+#: actions/apiaccountupdatedeliverydevice.php:107
 msgid ""
 "You must specify a parameter named 'device' with a value of one of: sms, im, "
 "none."
@@ -249,27 +253,27 @@ msgstr ""
 "ÐÑ Ð´Ð¾Ð»Ð¶Ð½Ñ ÑÐºÐ°Ð·Ð°ÑÑ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑ Ñ Ð¸Ð¼ÐµÐ½ÐµÐ¼ Â«deviceÂ» Ð¸ Ð¾Ð´Ð½Ð¸Ð¼ Ð¸Ð· Ð·Ð½Ð°ÑÐµÐ½Ð¸Ð¹: sms, im, "
 "none."
 
-#: actions/apiaccountupdatedeliverydevice.php:133
+#: actions/apiaccountupdatedeliverydevice.php:134
 msgid "Could not update user."
 msgstr "ÐÐµ ÑÐ´Ð°ÑÑÑÑ Ð¾Ð±Ð½Ð¾Ð²Ð¸ÑÑ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ."
 
-#: actions/apiaccountupdateprofile.php:112
-#: actions/apiaccountupdateprofilebackgroundimage.php:194
-#: actions/apiaccountupdateprofilecolors.php:185
-#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/apiaccountupdateprofile.php:113
+#: actions/apiaccountupdateprofilebackgroundimage.php:195
+#: actions/apiaccountupdateprofilecolors.php:186
+#: actions/apiaccountupdateprofileimage.php:131 actions/apiusershow.php:108
 #: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/hcard.php:74
 #: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
 #: lib/profileaction.php:84
 msgid "User has no profile."
 msgstr "Ð£ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ Ð½ÐµÑ Ð¿ÑÐ¾ÑÐ¸Ð»Ñ."
 
-#: actions/apiaccountupdateprofile.php:147
+#: actions/apiaccountupdateprofile.php:148
 msgid "Could not save profile."
 msgstr "ÐÐµ ÑÐ´Ð°ÑÑÑÑ ÑÐ¾ÑÑÐ°Ð½Ð¸ÑÑ Ð¿ÑÐ¾ÑÐ¸Ð»Ñ."
 
-#: actions/apiaccountupdateprofilebackgroundimage.php:108
-#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
-#: actions/apistatusesupdate.php:212 actions/avatarsettings.php:257
+#: actions/apiaccountupdateprofilebackgroundimage.php:109
+#: actions/apiaccountupdateprofileimage.php:98 actions/apimediaupload.php:81
+#: actions/apistatusesupdate.php:213 actions/avatarsettings.php:257
 #: actions/designadminpanel.php:123 actions/editapplication.php:118
 #: actions/newapplication.php:101 actions/newnotice.php:94
 #: lib/designsettings.php:283
@@ -281,30 +285,30 @@ msgstr ""
 "Ð¡ÐµÑÐ²ÐµÑ Ð½Ðµ ÑÐ¼Ð¾Ð³ Ð¾Ð±ÑÐ°Ð±Ð¾ÑÐ°ÑÑ ÑÑÐ¾Ð»ÑÐºÐ¾ POST-Ð´Ð°Ð½Ð½ÑÑ (%s Ð±Ð°Ð¹Ñ) Ð¸Ð·-Ð·Ð° ÑÐµÐºÑÑÐµÐ¹ "
 "ÐºÐ¾Ð½ÑÐ¸Ð³ÑÑÐ°ÑÐ¸Ð¸."
 
-#: actions/apiaccountupdateprofilebackgroundimage.php:136
-#: actions/apiaccountupdateprofilebackgroundimage.php:146
-#: actions/apiaccountupdateprofilecolors.php:164
-#: actions/apiaccountupdateprofilecolors.php:174
+#: actions/apiaccountupdateprofilebackgroundimage.php:137
+#: actions/apiaccountupdateprofilebackgroundimage.php:147
+#: actions/apiaccountupdateprofilecolors.php:165
+#: actions/apiaccountupdateprofilecolors.php:175
 #: actions/groupdesignsettings.php:290 actions/groupdesignsettings.php:300
 #: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
 #: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
 msgid "Unable to save your design settings."
 msgstr "ÐÐµ ÑÐ´Ð°ÑÑÑÑ ÑÐ¾ÑÑÐ°Ð½Ð¸ÑÑ Ð²Ð°ÑÐ¸ Ð½Ð°ÑÑÑÐ¾Ð¹ÐºÐ¸ Ð¾ÑÐ¾ÑÐ¼Ð»ÐµÐ½Ð¸Ñ!"
 
-#: actions/apiaccountupdateprofilebackgroundimage.php:187
-#: actions/apiaccountupdateprofilecolors.php:142
+#: actions/apiaccountupdateprofilebackgroundimage.php:188
+#: actions/apiaccountupdateprofilecolors.php:143
 msgid "Could not update your design."
 msgstr "ÐÐµ ÑÐ´Ð°ÑÑÑÑ Ð¾Ð±Ð½Ð¾Ð²Ð¸ÑÑ Ð²Ð°ÑÐµ Ð¾ÑÐ¾ÑÐ¼Ð»ÐµÐ½Ð¸Ðµ."
 
-#: actions/apiblockcreate.php:105
+#: actions/apiblockcreate.php:106
 msgid "You cannot block yourself!"
 msgstr "ÐÑ Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑÐµ Ð·Ð°Ð±Ð»Ð¾ÐºÐ¸ÑÐ¾Ð²Ð°ÑÑ ÑÐ°Ð¼Ð¾Ð³Ð¾ ÑÐµÐ±Ñ!"
 
-#: actions/apiblockcreate.php:126
+#: actions/apiblockcreate.php:127
 msgid "Block user failed."
 msgstr "ÐÐµÑÐ´Ð°ÑÐ° Ð¿ÑÐ¸ Ð±Ð»Ð¾ÐºÐ¸ÑÐ¾Ð²ÐºÐµ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ."
 
-#: actions/apiblockdestroy.php:114
+#: actions/apiblockdestroy.php:115
 msgid "Unblock user failed."
 msgstr "ÐÐµÑÐ´Ð°ÑÐ° Ð¿ÑÐ¸ ÑÐ°Ð·Ð±Ð»Ð¾ÐºÐ¸ÑÐ¾Ð²ÐºÐµ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ."
 
@@ -328,63 +332,63 @@ msgstr "ÐÑÑÐ¼ÑÐµ ÑÐ¾Ð¾Ð±ÑÐµÐ½Ð¸Ñ Ð´Ð»Ñ %s"
 msgid "All the direct messages sent to %s"
 msgstr "ÐÑÐµ Ð¿ÑÑÐ¼ÑÐµ ÑÐ¾Ð¾Ð±ÑÐµÐ½Ð¸Ñ Ð¿Ð¾ÑÐ»Ð°Ð½Ð½ÑÐµ Ð´Ð»Ñ %s"
 
-#: actions/apidirectmessagenew.php:118
+#: actions/apidirectmessagenew.php:119
 msgid "No message text!"
 msgstr "ÐÑÑÑÑÑÑÐ²ÑÐµÑ ÑÐµÐºÑÑ ÑÐ¾Ð¾Ð±ÑÐµÐ½Ð¸Ñ!"
 
-#: actions/apidirectmessagenew.php:127 actions/newmessage.php:150
+#: actions/apidirectmessagenew.php:128 actions/newmessage.php:150
 #, php-format
 msgid "That's too long. Max message size is %d chars."
 msgstr "Ð¡Ð»Ð¸ÑÐºÐ¾Ð¼ Ð´Ð»Ð¸Ð½Ð½Ð¾. ÐÐ°ÐºÑÐ¸Ð¼Ð°Ð»ÑÐ½Ð°Ñ Ð´Ð»Ð¸Ð½Ð° ÑÐ¾Ð¾Ð±ÑÐµÐ½Ð¸Ñ â %d Ð·Ð½Ð°ÐºÐ¾Ð²."
 
-#: actions/apidirectmessagenew.php:138
+#: actions/apidirectmessagenew.php:139
 msgid "Recipient user not found."
 msgstr "ÐÐ¾Ð»ÑÑÐ°ÑÐµÐ»Ñ Ð½Ðµ Ð½Ð°Ð¹Ð´ÐµÐ½."
 
-#: actions/apidirectmessagenew.php:142
+#: actions/apidirectmessagenew.php:143
 msgid "Can't send direct messages to users who aren't your friend."
 msgstr ""
 "ÐÐµ ÑÐ´Ð°ÑÑÑÑ Ð¿Ð¾ÑÑÐ»Ð°ÑÑ Ð¿ÑÑÐ¼ÑÐµ ÑÐ¾Ð¾Ð±ÑÐµÐ½Ð¸Ñ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»ÑÐ¼, ÐºÐ¾ÑÐ¾ÑÑÐµ Ð½Ðµ ÑÐ²Ð»ÑÑÑÑÑ "
 "ÐÐ°ÑÐ¸Ð¼Ð¸ Ð´ÑÑÐ·ÑÑÐ¼Ð¸."
 
-#: actions/apifavoritecreate.php:109 actions/apifavoritedestroy.php:110
+#: actions/apifavoritecreate.php:110 actions/apifavoritedestroy.php:111
 #: actions/apistatusesdestroy.php:121
 msgid "No status found with that ID."
 msgstr "ÐÐµÑ ÑÑÐ°ÑÑÑÐ° Ñ ÑÐ°ÐºÐ¸Ð¼ ID."
 
-#: actions/apifavoritecreate.php:120
+#: actions/apifavoritecreate.php:121
 msgid "This status is already a favorite."
 msgstr "ÐÑÐ¾Ñ ÑÑÐ°ÑÑÑ ÑÐ¶Ðµ Ð²ÑÐ¾Ð´Ð¸Ñ Ð² ÑÐ¸ÑÐ»Ð¾ Ð»ÑÐ±Ð¸Ð¼ÑÑ."
 
 #. TRANS: Error message text shown when a favorite could not be set.
-#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:296
+#: actions/apifavoritecreate.php:132 actions/favor.php:84 lib/command.php:296
 msgid "Could not create favorite."
 msgstr "ÐÐµ ÑÐ´Ð°ÑÑÑÑ ÑÐ¾Ð·Ð´Ð°ÑÑ Ð»ÑÐ±Ð¸Ð¼ÑÑ Ð·Ð°Ð¿Ð¸ÑÑ."
 
-#: actions/apifavoritedestroy.php:123
+#: actions/apifavoritedestroy.php:124
 msgid "That status is not a favorite."
 msgstr "ÐÑÐ¾Ñ ÑÑÐ°ÑÑÑ Ð½Ðµ Ð²ÑÐ¾Ð´Ð¸Ñ Ð² ÑÐ¸ÑÐ»Ð¾ Ð²Ð°ÑÐ¸Ñ Ð»ÑÐ±Ð¸Ð¼ÑÑ."
 
-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
+#: actions/apifavoritedestroy.php:136 actions/disfavor.php:87
 msgid "Could not delete favorite."
 msgstr "ÐÐµ ÑÐ´Ð°ÑÑÑÑ ÑÐ´Ð°Ð»Ð¸ÑÑ Ð»ÑÐ±Ð¸Ð¼ÑÑ Ð·Ð°Ð¿Ð¸ÑÑ."
 
-#: actions/apifriendshipscreate.php:109
+#: actions/apifriendshipscreate.php:110
 msgid "Could not follow user: profile not found."
 msgstr "ÐÐµ ÑÐ´Ð°ÑÑÑÑ ÑÐ»ÐµÐ´Ð¾Ð²Ð°ÑÑ Ð·Ð° Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»ÐµÐ¼: Ð¿ÑÐ¾ÑÐ¸Ð»Ñ Ð½Ðµ Ð½Ð°Ð¹Ð´ÐµÐ½."
 
-#: actions/apifriendshipscreate.php:118
+#: actions/apifriendshipscreate.php:119
 #, php-format
 msgid "Could not follow user: %s is already on your list."
 msgstr "ÐÐµ ÑÐ´Ð°ÐµÑÑÑ Ð²ÐºÐ»ÑÑÐ¸ÑÑ %s Ð² ÑÐ¿Ð¸ÑÐ¾Ðº Ð¿Ð¾Ð´Ð´ÐµÑÐ¶ÐºÐ¸, Ð¾Ð½ ÑÐ¶Ðµ Ð² ÐÐ°ÑÐµÐ¼ ÑÐ¿Ð¸ÑÐºÐµ."
 
-#: actions/apifriendshipsdestroy.php:109
+#: actions/apifriendshipsdestroy.php:110
 msgid "Could not unfollow user: User not found."
 msgstr ""
 "ÐÐµ ÑÐ´Ð°ÑÑÑÑ ÑÐ»ÐµÐ´Ð¾Ð²Ð°ÑÑ Ð·Ð° Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»ÐµÐ¼, Ñ. Ðº. ÑÐ°ÐºÐ¾Ð³Ð¾ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ Ð½Ðµ "
 "ÑÑÑÐµÑÑÐ²ÑÐµÑ."
 
-#: actions/apifriendshipsdestroy.php:120
+#: actions/apifriendshipsdestroy.php:121
 msgid "You cannot unfollow yourself."
 msgstr "ÐÑ Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑÐµ Ð¿ÐµÑÐµÑÑÐ°ÑÑ ÑÐ»ÐµÐ´Ð¾Ð²Ð°ÑÑ Ð·Ð° ÑÐ¾Ð±Ð¾Ð¹."
 
@@ -400,102 +404,102 @@ msgstr "ÐÐµ ÑÐ´Ð°ÑÑÑÑ Ð¾Ð¿ÑÐµÐ´ÐµÐ»Ð¸ÑÑ Ð¸ÑÑÐ¾Ð´Ð½Ð¾Ð³Ð¾ Ð¿Ð¾Ð»ÑÐ·Ð¾
 msgid "Could not find target user."
 msgstr "ÐÐµ ÑÐ´Ð°ÑÑÑÑ Ð½Ð°Ð¹ÑÐ¸ ÑÐµÐ»ÐµÐ²Ð¾Ð³Ð¾ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ."
 
-#: actions/apigroupcreate.php:167 actions/editgroup.php:186
+#: actions/apigroupcreate.php:168 actions/editgroup.php:186
 #: actions/newgroup.php:126 actions/profilesettings.php:215
 #: actions/register.php:212
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr ""
 "ÐÐ¼Ñ Ð´Ð¾Ð»Ð¶Ð½Ð¾ ÑÐ¾ÑÑÐ¾ÑÑÑ ÑÐ¾Ð»ÑÐºÐ¾ Ð¸Ð· Ð¿ÑÐ¾Ð¿Ð¸ÑÐ½ÑÑ Ð±ÑÐºÐ² Ð¸ ÑÐ¸ÑÑ Ð¸ Ð½Ðµ Ð¸Ð¼ÐµÑÑ Ð¿ÑÐ¾Ð±ÐµÐ»Ð¾Ð²."
 
-#: actions/apigroupcreate.php:176 actions/editgroup.php:190
+#: actions/apigroupcreate.php:177 actions/editgroup.php:190
 #: actions/newgroup.php:130 actions/profilesettings.php:238
 #: actions/register.php:215
 msgid "Nickname already in use. Try another one."
 msgstr "Ð¢Ð°ÐºÐ¾Ðµ Ð¸Ð¼Ñ ÑÐ¶Ðµ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·ÑÐµÑÑÑ. ÐÐ¾Ð¿ÑÐ¾Ð±ÑÐ¹ÑÐµ ÐºÐ°ÐºÐ¾Ðµ-Ð½Ð¸Ð±ÑÐ´Ñ Ð´ÑÑÐ³Ð¾Ðµ."
 
-#: actions/apigroupcreate.php:183 actions/editgroup.php:193
+#: actions/apigroupcreate.php:184 actions/editgroup.php:193
 #: actions/newgroup.php:133 actions/profilesettings.php:218
 #: actions/register.php:217
 msgid "Not a valid nickname."
 msgstr "ÐÐµÐ²ÐµÑÐ½Ð¾Ðµ Ð¸Ð¼Ñ."
 
-#: actions/apigroupcreate.php:199 actions/editapplication.php:215
+#: actions/apigroupcreate.php:200 actions/editapplication.php:215
 #: actions/editgroup.php:199 actions/newapplication.php:203
 #: actions/newgroup.php:139 actions/profilesettings.php:222
 #: actions/register.php:224
 msgid "Homepage is not a valid URL."
 msgstr "URL ÐÐ»Ð°Ð²Ð½Ð¾Ð¹ ÑÑÑÐ°Ð½Ð¸ÑÑ Ð½ÐµÐ²ÐµÑÐµÐ½."
 
-#: actions/apigroupcreate.php:208 actions/editgroup.php:202
+#: actions/apigroupcreate.php:209 actions/editgroup.php:202
 #: actions/newgroup.php:142 actions/profilesettings.php:225
 #: actions/register.php:227
 msgid "Full name is too long (max 255 chars)."
 msgstr "ÐÐ¾Ð»Ð½Ð¾Ðµ Ð¸Ð¼Ñ ÑÐ»Ð¸ÑÐºÐ¾Ð¼ Ð´Ð»Ð¸Ð½Ð½Ð¾Ðµ (Ð½Ðµ Ð±Ð¾Ð»ÑÑÐµ 255 Ð·Ð½Ð°ÐºÐ¾Ð²)."
 
-#: actions/apigroupcreate.php:216 actions/editapplication.php:190
+#: actions/apigroupcreate.php:217 actions/editapplication.php:190
 #: actions/newapplication.php:172
 #, php-format
 msgid "Description is too long (max %d chars)."
 msgstr "Ð¡Ð»Ð¸ÑÐºÐ¾Ð¼ Ð´Ð»Ð¸Ð½Ð½Ð¾Ðµ Ð¾Ð¿Ð¸ÑÐ°Ð½Ð¸Ðµ (Ð¼Ð°ÐºÑÐ¸Ð¼ÑÐ¼ %d ÑÐ¸Ð¼Ð²Ð¾Ð»Ð¾Ð²)"
 
-#: actions/apigroupcreate.php:227 actions/editgroup.php:208
+#: actions/apigroupcreate.php:228 actions/editgroup.php:208
 #: actions/newgroup.php:148 actions/profilesettings.php:232
 #: actions/register.php:234
 msgid "Location is too long (max 255 chars)."
 msgstr "Ð¡Ð»Ð¸ÑÐºÐ¾Ð¼ Ð´Ð»Ð¸Ð½Ð½Ð¾Ðµ Ð¼ÐµÑÑÐ¾ÑÐ°ÑÐ¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ (Ð¼Ð°ÐºÑÐ¸Ð¼ÑÐ¼ 255 Ð·Ð½Ð°ÐºÐ¾Ð²)."
 
-#: actions/apigroupcreate.php:246 actions/editgroup.php:219
+#: actions/apigroupcreate.php:247 actions/editgroup.php:219
 #: actions/newgroup.php:159
 #, php-format
 msgid "Too many aliases! Maximum %d."
 msgstr "Ð¡Ð»Ð¸ÑÐºÐ¾Ð¼ Ð¼Ð½Ð¾Ð³Ð¾ Ð°Ð»Ð¸Ð°ÑÐ¾Ð²! ÐÐ°ÐºÑÐ¸Ð¼Ð°Ð»ÑÐ½Ð¾Ðµ ÑÐ¸ÑÐ»Ð¾ â %d."
 
-#: actions/apigroupcreate.php:267
+#: actions/apigroupcreate.php:268
 #, php-format
 msgid "Invalid alias: \"%s\"."
 msgstr "ÐÑÐ¸Ð±Ð¾ÑÐ½ÑÐ¹ Ð¿ÑÐµÐ²Ð´Ð¾Ð½Ð¸Ð¼: Â«%sÂ»."
 
-#: actions/apigroupcreate.php:276 actions/editgroup.php:232
+#: actions/apigroupcreate.php:277 actions/editgroup.php:232
 #: actions/newgroup.php:172
 #, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr "ÐÐ»Ð¸Ð°Ñ Â«%sÂ» ÑÐ¶Ðµ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·ÑÐµÑÑÑ. ÐÐ¾Ð¿ÑÐ¾Ð±ÑÐ¹ÑÐµ ÐºÐ°ÐºÐ¾Ð¹-Ð½Ð¸Ð±ÑÐ´Ñ Ð´ÑÑÐ³Ð¾Ð¹."
 
-#: actions/apigroupcreate.php:289 actions/editgroup.php:238
+#: actions/apigroupcreate.php:290 actions/editgroup.php:238
 #: actions/newgroup.php:178
 msgid "Alias can't be the same as nickname."
 msgstr "ÐÐ»Ð¸Ð°Ñ Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ ÑÐ¾Ð²Ð¿Ð°Ð´Ð°ÑÑ Ñ Ð¸Ð¼ÐµÐ½ÐµÐ¼."
 
-#: actions/apigroupismember.php:96 actions/apigroupjoin.php:105
-#: actions/apigroupleave.php:105 actions/apigroupmembership.php:92
+#: actions/apigroupismember.php:96 actions/apigroupjoin.php:106
+#: actions/apigroupleave.php:106 actions/apigroupmembership.php:92
 #: actions/apigroupshow.php:83 actions/apitimelinegroup.php:92
 msgid "Group not found."
 msgstr "ÐÑÑÐ¿Ð¿Ð° Ð½Ðµ Ð½Ð°Ð¹Ð´ÐµÐ½Ð°."
 
 #. TRANS: Error text shown a user tries to join a group they already are a member of.
-#: actions/apigroupjoin.php:111 actions/joingroup.php:100 lib/command.php:336
+#: actions/apigroupjoin.php:112 actions/joingroup.php:100 lib/command.php:336
 msgid "You are already a member of that group."
 msgstr "ÐÑ ÑÐ¶Ðµ ÑÐ²Ð»ÑÐµÑÐµÑÑ ÑÐ»ÐµÐ½Ð¾Ð¼ ÑÑÐ¾Ð¹ Ð³ÑÑÐ¿Ð¿Ñ."
 
 #. TRANS: Error text shown when a user tries to join a group they are blocked from joining.
-#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:341
+#: actions/apigroupjoin.php:121 actions/joingroup.php:105 lib/command.php:341
 msgid "You have been blocked from that group by the admin."
 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.
-#: actions/apigroupjoin.php:139 actions/joingroup.php:134 lib/command.php:353
+#: actions/apigroupjoin.php:140 actions/joingroup.php:134 lib/command.php:353
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "ÐÐµ ÑÐ´Ð°ÑÑÑÑ Ð¿ÑÐ¸ÑÐ¾ÐµÐ´Ð¸Ð½Ð¸ÑÑ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ %1$s Ðº Ð³ÑÑÐ¿Ð¿Ðµ %2$s."
 
-#: actions/apigroupleave.php:115
+#: actions/apigroupleave.php:116
 msgid "You are not a member of this group."
 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.
-#: actions/apigroupleave.php:125 actions/leavegroup.php:129
+#: actions/apigroupleave.php:126 actions/leavegroup.php:129
 #: lib/command.php:401
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
@@ -525,7 +529,7 @@ msgstr "ÐÑÑÐ¿Ð¿Ñ %s"
 msgid "groups on %s"
 msgstr "Ð³ÑÑÐ¿Ð¿Ñ Ð½Ð° %s"
 
-#: actions/apimediaupload.php:99
+#: actions/apimediaupload.php:100
 msgid "Upload failed."
 msgstr "ÐÐ°Ð³ÑÑÐ·ÐºÐ° Ð½Ðµ ÑÐ´Ð°Ð»Ð°ÑÑ."
 
@@ -539,9 +543,9 @@ msgstr "ÐÐµÐ¿ÑÐ°Ð²Ð¸Ð»ÑÐ½ÑÐ¹ ÑÐ¾ÐºÐµÐ½"
 
 #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
 #: actions/deletenotice.php:169 actions/disfavor.php:74
-#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:55
+#: actions/emailsettings.php:271 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:66 actions/imsettings.php:227
+#: actions/groupunblock.php:66 actions/imsettings.php:230
 #: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
@@ -585,8 +589,8 @@ msgstr "ÐÐ°Ð¿ÑÐ¾Ñ ÑÐ¾ÐºÐµÐ½Ð° %s Ð±ÑÐ» Ð·Ð°Ð¿ÑÐµÑÐµÐ½ Ð¸ Ð°Ð½Ð½ÑÐ»Ð¸ÑÐ¾
 #. 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:286 actions/grouplogo.php:322
-#: actions/imsettings.php:242 actions/newapplication.php:121
+#: actions/emailsettings.php:290 actions/grouplogo.php:322
+#: actions/imsettings.php:245 actions/newapplication.php:121
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
 #: actions/smssettings.php:277 lib/designsettings.php:304
 msgid "Unexpected form submission."
@@ -651,18 +655,18 @@ msgstr "ÐÑÐ¾Ñ Ð¼ÐµÑÐ¾Ð´ ÑÑÐµÐ±ÑÐµÑ POST Ð¸Ð»Ð¸ DELETE."
 msgid "You may not delete another user's status."
 msgstr "ÐÑ Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑÐµ ÑÐ´Ð°Ð»ÑÑÑ ÑÑÐ°ÑÑÑ Ð´ÑÑÐ³Ð¸Ñ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»ÐµÐ¹."
 
-#: actions/apistatusesretweet.php:75 actions/apistatusesretweets.php:72
+#: actions/apistatusesretweet.php:76 actions/apistatusesretweets.php:72
 #: actions/deletenotice.php:52 actions/shownotice.php:92
 msgid "No such notice."
 msgstr "ÐÐµÑ ÑÐ°ÐºÐ¾Ð¹ Ð·Ð°Ð¿Ð¸ÑÐ¸."
 
 #. TRANS: Error text shown when trying to repeat an own notice.
-#: actions/apistatusesretweet.php:83 lib/command.php:538
+#: actions/apistatusesretweet.php:84 lib/command.php:538
 msgid "Cannot repeat your own notice."
 msgstr "ÐÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð¿Ð¾Ð²ÑÐ¾ÑÐ¸ÑÑ ÑÐ¾Ð±ÑÑÐ²ÐµÐ½Ð½ÑÑ Ð·Ð°Ð¿Ð¸ÑÑ."
 
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-#: actions/apistatusesretweet.php:91 lib/command.php:544
+#: actions/apistatusesretweet.php:92 lib/command.php:544
 msgid "Already repeated that notice."
 msgstr "ÐÐ°Ð¿Ð¸ÑÑ ÑÐ¶Ðµ Ð¿Ð¾Ð²ÑÐ¾ÑÐµÐ½Ð°."
 
@@ -674,21 +678,21 @@ msgstr "Ð¡ÑÐ°ÑÑÑ ÑÐ´Ð°Ð»ÑÐ½."
 msgid "No status with that ID found."
 msgstr "ÐÐµ Ð½Ð°Ð¹Ð´ÐµÐ½Ð¾ ÑÑÐ°ÑÑÑÐ° Ñ ÑÐ°ÐºÐ¸Ð¼ ID."
 
-#: actions/apistatusesupdate.php:221
+#: actions/apistatusesupdate.php:222
 msgid "Client must provide a 'status' parameter with a value."
 msgstr "ÐÐ»Ð¸ÐµÐ½Ñ Ð´Ð¾Ð»Ð¶ÐµÐ½ Ð¿ÑÐµÐ´Ð¾ÑÑÐ°Ð²Ð¸ÑÑ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑ Â«statusÂ» ÑÐ¾ Ð·Ð½Ð°ÑÐµÐ½Ð¸ÐµÐ¼."
 
-#: actions/apistatusesupdate.php:242 actions/newnotice.php:157
+#: actions/apistatusesupdate.php:243 actions/newnotice.php:157
 #: lib/mailhandler.php:60
 #, php-format
 msgid "That's too long. Max notice size is %d chars."
 msgstr "Ð¡Ð»Ð¸ÑÐºÐ¾Ð¼ Ð´Ð»Ð¸Ð½Ð½Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑ. ÐÐ°ÐºÑÐ¸Ð¼Ð°Ð»ÑÐ½Ð°Ñ Ð´Ð»Ð¸Ð½Ð° â %d Ð·Ð½Ð°ÐºÐ¾Ð²."
 
-#: actions/apistatusesupdate.php:283 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:284 actions/apiusershow.php:96
 msgid "Not found."
 msgstr "ÐÐµ Ð½Ð°Ð¹Ð´ÐµÐ½Ð¾."
 
-#: actions/apistatusesupdate.php:306 actions/newnotice.php:181
+#: actions/apistatusesupdate.php:307 actions/newnotice.php:181
 #, php-format
 msgid "Max notice size is %d chars, including attachment URL."
 msgstr "ÐÐ°ÐºÑÐ¸Ð¼Ð°Ð»ÑÐ½Ð°Ñ Ð´Ð»Ð¸Ð½Ð° Ð·Ð°Ð¿Ð¸ÑÐ¸ â %d ÑÐ¸Ð¼Ð²Ð¾Ð»Ð¾Ð², Ð²ÐºÐ»ÑÑÐ°Ñ URL Ð²Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ."
@@ -889,7 +893,9 @@ msgid "Yes"
 msgstr "ÐÐ°"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
+#. TRANS: Submit button title.
+#. TRANS: Description of the form to block a user.
+#: actions/block.php:164 actions/groupmembers.php:403 lib/blockform.php:82
 msgid "Block this user"
 msgstr "ÐÐ°Ð±Ð»Ð¾ÐºÐ¸ÑÐ¾Ð²Ð°ÑÑ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ."
 
@@ -931,11 +937,13 @@ msgstr "Ð¡Ð¿Ð¸ÑÐ¾Ðº Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»ÐµÐ¹, Ð·Ð°Ð±Ð»Ð¾ÐºÐ¸ÑÐ¾Ð²Ð°Ð½Ð½ÑÑ
 msgid "Unblock user from group"
 msgstr "Ð Ð°Ð·Ð±Ð»Ð¾ÐºÐ¸ÑÐ¾Ð²Ð°ÑÑ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ Ð² Ð³ÑÑÐ¿Ð¿Ðµ."
 
-#: actions/blockedfromgroup.php:320 lib/unblockform.php:69
+#. TRANS: Title for the form to unblock a user.
+#: actions/blockedfromgroup.php:320 lib/unblockform.php:70
 msgid "Unblock"
 msgstr "Ð Ð°Ð·Ð±Ð»Ð¾ÐºÐ¸ÑÐ¾Ð²Ð°ÑÑ"
 
-#: actions/blockedfromgroup.php:320 lib/unblockform.php:80
+#. TRANS: Description of the form to unblock a user.
+#: actions/blockedfromgroup.php:320 lib/unblockform.php:82
 msgid "Unblock this user"
 msgstr "Ð Ð°Ð·Ð±Ð»Ð¾ÐºÐ¸ÑÐ¾Ð²Ð°ÑÑ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ."
 
@@ -974,9 +982,9 @@ msgstr "ÐÑÐ¾Ñ Ð°Ð´ÑÐµÑ ÑÐ¶Ðµ Ð¿Ð¾Ð´ÑÐ²ÐµÑÐ¶Ð´ÑÐ½."
 #. 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/confirmaddress.php:116 actions/emailsettings.php:331
+#: actions/emailsettings.php:477 actions/imsettings.php:283
+#: actions/imsettings.php:442 actions/othersettings.php:174
 #: actions/profilesettings.php:283 actions/smssettings.php:308
 #: actions/smssettings.php:464
 msgid "Couldn't update user."
@@ -984,7 +992,7 @@ msgstr "ÐÐµ ÑÐ´Ð°ÑÑÑÑ Ð¾Ð±Ð½Ð¾Ð²Ð¸ÑÑ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ."
 
 #. 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/confirmaddress.php:128 actions/emailsettings.php:437
 #: actions/smssettings.php:422
 msgid "Couldn't delete email confirmation."
 msgstr "ÐÐµ ÑÐ´Ð°ÑÑÑÑ ÑÐ´Ð°Ð»Ð¸ÑÑ Ð¿Ð¾Ð´Ð²ÐµÑÐ¶Ð´ÐµÐ½Ð¸Ðµ Ð¿Ð¾ ÑÐ»ÐµÐºÑÑÐ¾Ð½Ð½Ð¾Ð¼Ñ Ð°Ð´ÑÐµÑÑ."
@@ -1020,9 +1028,10 @@ msgstr "ÐÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ Ð½Ðµ Ð½Ð°Ð¹Ð´ÐµÐ½Ð¾."
 msgid "You are not the owner of this application."
 msgstr "ÐÑ Ð½Ðµ ÑÐ²Ð»ÑÐµÑÐµÑÑ Ð²Ð»Ð°Ð´ÐµÐ»ÑÑÐµÐ¼ ÑÑÐ¾Ð³Ð¾ Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ."
 
+#. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:127
 #: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1307
+#: lib/action.php:1315
 msgid "There was a problem with your session token."
 msgstr "ÐÑÐ¾Ð±Ð»ÐµÐ¼Ð° Ñ ÐÐ°ÑÐµÐ¹ ÑÐµÑÑÐ¸ÐµÐ¹. ÐÐ¾Ð¿ÑÐ¾Ð±ÑÐ¹ÑÐµ ÐµÑÑ ÑÐ°Ð·, Ð¿Ð¾Ð¶Ð°Ð»ÑÐ¹ÑÑÐ°."
 
@@ -1056,7 +1065,7 @@ msgstr "Ð£Ð´Ð°Ð»Ð¸ÑÑ ÑÑÐ¾ Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ"
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
 #: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:73 lib/profileformaction.php:64
+#: lib/adminpanelaction.php:71 lib/profileformaction.php:64
 #: lib/settingsaction.php:72
 msgid "Not logged in."
 msgstr "ÐÐµ Ð°Ð²ÑÐ¾ÑÐ¸Ð·Ð¾Ð²Ð°Ð½."
@@ -1119,7 +1128,6 @@ msgstr "Ð£Ð´Ð°Ð»Ð¸ÑÑ ÑÑÐ¾Ð³Ð¾ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ"
 #. TRANS: Message used as title for design settings for the site.
 #. TRANS: Link description in user account settings menu.
 #: actions/designadminpanel.php:63 lib/accountsettingsaction.php:139
-#: lib/groupnav.php:119
 msgid "Design"
 msgstr "ÐÑÐ¾ÑÐ¼Ð»ÐµÐ½Ð¸Ðµ"
 
@@ -1240,13 +1248,13 @@ msgstr "ÐÐ¾ÑÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÑ Ð¾ÑÐ¾ÑÐ¼Ð»ÐµÐ½Ð¸Ðµ Ð¿Ð¾ ÑÐ¼Ð¾Ð»ÑÐ°Ð½Ð¸Ñ"
 msgid "Reset back to default"
 msgstr "ÐÐ¾ÑÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÑ Ð·Ð½Ð°ÑÐµÐ½Ð¸Ñ Ð¿Ð¾ ÑÐ¼Ð¾Ð»ÑÐ°Ð½Ð¸Ñ"
 
-#. TRANS: Submit button title
+#. TRANS: Submit button title.
 #: actions/designadminpanel.php:685 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/snapshotadminpanel.php:245
 #: actions/subscriptions.php:226 actions/tagother.php:154
-#: actions/useradminpanel.php:294 lib/applicationeditform.php:363
+#: actions/useradminpanel.php:294 lib/applicationeditform.php:353
 #: lib/designsettings.php:256 lib/groupeditform.php:202
 msgid "Save"
 msgstr "Ð¡Ð¾ÑÑÐ°Ð½Ð¸ÑÑ"
@@ -1402,7 +1410,7 @@ msgstr "ÐÐ¾Ð´ÑÐ²ÐµÑÐ¶Ð´ÑÐ½Ð½ÑÐ¹ Ð² Ð½Ð°ÑÑÐ¾ÑÑÐµÐµ Ð²ÑÐµÐ¼Ñ ÑÐ»ÐµÐºÑ
 #. 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/emailsettings.php:115 actions/emailsettings.php:162
 #: actions/imsettings.php:116 actions/smssettings.php:124
 #: actions/smssettings.php:180
 msgctxt "BUTTON"
@@ -1420,22 +1428,26 @@ msgstr ""
 #. 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
+#. TRANS: Button label in the "Edit application" form.
 #: actions/emailsettings.php:127 actions/imsettings.php:131
-#: actions/smssettings.php:137 lib/applicationeditform.php:357
+#: actions/smssettings.php:137 lib/applicationeditform.php:347
 msgctxt "BUTTON"
 msgid "Cancel"
 msgstr "ÐÑÐ¼ÐµÐ½Ð°"
 
-#. TRANS: Instructions for e-mail address input form.
-#: actions/emailsettings.php:135
+#. TRANS: Instructions for e-mail address input form. Do not translate
+#. TRANS: "example.org". It is one of the domain names reserved for
+#. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
+#. TRANS: Any other domain may be owned by a legitimate person or
+#. TRANS: organization.
+#: actions/emailsettings.php:139
 msgid "Email address, like \"UserName@example.org\""
 msgstr "ÐÐ»ÐµÐºÑÑÐ¾Ð½Ð½ÑÐ¹ Ð°Ð´ÑÐµÑ Ð²Ð¸Ð´Ð° \"UserName@example.org\""
 
 #. 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/emailsettings.php:143 actions/imsettings.php:151
 #: actions/smssettings.php:162
 msgctxt "BUTTON"
 msgid "Add"
@@ -1443,20 +1455,20 @@ msgstr "ÐÐ¾Ð±Ð°Ð²Ð¸ÑÑ"
 
 #. 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
+#: actions/emailsettings.php:151 actions/smssettings.php:171
 msgid "Incoming email"
 msgstr "ÐÑÐ¾Ð´ÑÑÐ¸Ð¹ ÑÐ»ÐµÐºÑÑÐ¾Ð½Ð½ÑÐ¹ Ð°Ð´ÑÐµÑ"
 
 #. 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
+#: actions/emailsettings.php:159 actions/smssettings.php:178
 msgid "Send email to this address to post new notices."
 msgstr ""
 "ÐÑÐ¿ÑÐ°Ð²Ð»ÑÐ¹ÑÐµ ÑÐ»ÐµÐºÑÑÐ¾Ð½Ð½ÑÐµ Ð¿Ð¸ÑÑÐ¼Ð° Ð½Ð° ÑÑÐ¾Ñ Ð°Ð´ÑÐµÑ Ð´Ð»Ñ Ð¾ÑÑÑÐ»ÐºÐ¸ Ð½Ð¾Ð²ÑÑ Ð·Ð°Ð¿Ð¸ÑÐµÐ¹."
 
 #. 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
+#: actions/emailsettings.php:168 actions/smssettings.php:186
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr ""
 "Ð¡Ð¾Ð·Ð´Ð°ÑÑ Ð½Ð¾Ð²ÑÐ¹ Ð°Ð´ÑÐµÑ ÑÐ»ÐµÐºÑÑÐ¾Ð½Ð½Ð¾Ð¹ Ð¿Ð¾ÑÑÑ Ð´Ð»Ñ Ð¾ÑÑÑÐ»ÐºÐ¸ ÑÐ¾Ð¾Ð±ÑÐµÐ½Ð¸Ð¹; Ð¾ÑÐ¼ÐµÐ½ÑÐµÑ ÑÑÐ°ÑÑÐ¹ "
@@ -1464,99 +1476,99 @@ msgstr ""
 
 #. 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
+#: actions/emailsettings.php:172 actions/smssettings.php:189
 msgctxt "BUTTON"
 msgid "New"
 msgstr "ÐÐ¾Ð²ÑÐ¹"
 
 #. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:174
+#: actions/emailsettings.php:178
 msgid "Email preferences"
 msgstr "ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ¸ ÑÐ». Ð¿Ð¾ÑÑÑ"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:180
+#: actions/emailsettings.php:184
 msgid "Send me notices of new subscriptions through email."
 msgstr "Ð£Ð²ÐµÐ´Ð¾Ð¼Ð»ÑÑÑ Ð¼ÐµÐ½Ñ Ð¾ Ð½Ð¾Ð²ÑÑ Ð¿Ð¾Ð´Ð¿Ð¸ÑÑÐ¸ÐºÐ°Ñ Ð¿Ð¾ Ð¿Ð¾ÑÑÐµ."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:186
+#: actions/emailsettings.php:190
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr ""
 "ÐÐ¾ÑÑÐ»Ð°ÑÑ Ð¼Ð½Ðµ ÑÐ¾Ð¾Ð±ÑÐµÐ½Ð¸Ðµ Ð¿Ð¾ ÑÐ»ÐµÐºÑÑÐ¾Ð½Ð½Ð¾Ð¹ Ð¿Ð¾ÑÑÐµ, ÐµÑÐ»Ð¸ ÐºÑÐ¾-Ð½Ð¸Ð±ÑÐ´Ñ Ð´Ð¾Ð±Ð°Ð²Ð¸Ñ Ð¼Ð¾Ñ "
 "Ð·Ð°Ð¿Ð¸ÑÑ Ð² ÑÐ¸ÑÐ»Ð¾ Ð»ÑÐ±Ð¸Ð¼ÑÑ."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:193
+#: actions/emailsettings.php:197
 msgid "Send me email when someone sends me a private message."
 msgstr ""
 "ÐÐ¾ÑÑÐ»Ð°ÑÑ Ð¼Ð½Ðµ ÑÐ¾Ð¾Ð±ÑÐµÐ½Ð¸Ðµ Ð¿Ð¾ ÑÐ»ÐµÐºÑÑÐ¾Ð½Ð½Ð¾Ð¹ Ð¿Ð¾ÑÑÐµ, ÐµÑÐ»Ð¸ ÐºÑÐ¾-Ð½Ð¸Ð±ÑÐ´Ñ Ð¿Ð¾ÑÐ»ÑÑ Ð¼Ð½Ðµ "
 "Ð¿ÑÐ¸Ð²Ð°ÑÐ½Ð¾Ðµ ÑÐ¾Ð¾Ð±ÑÐµÐ½Ð¸Ðµ."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:199
+#: actions/emailsettings.php:203
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr ""
 "ÐÐ¾ÑÑÐ»Ð°ÑÑ Ð¼Ð½Ðµ ÑÐ¾Ð¾Ð±ÑÐµÐ½Ð¸Ðµ Ð¿Ð¾ ÑÐ»ÐµÐºÑÑÐ¾Ð½Ð½Ð¾Ð¹ Ð¿Ð¾ÑÑÐµ, ÐµÑÐ»Ð¸ ÐºÑÐ¾-Ð½Ð¸Ð±ÑÐ´Ñ Ð¿Ð¾ÑÐ»ÑÑ Ð¼Ð½Ðµ Â«@-"
 "Ð¾ÑÐ²ÐµÑÂ»."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:205
+#: actions/emailsettings.php:209
 msgid "Allow friends to nudge me and send me an email."
 msgstr ""
 "Ð Ð°Ð·ÑÐµÑÐ¸ÑÑ Ð´ÑÑÐ·ÑÑÐ¼ Â«Ð¿Ð¾Ð´ÑÐ°Ð»ÐºÐ¸Ð²Ð°ÑÑÂ» Ð¼ÐµÐ½Ñ Ð¸ Ð¿Ð¾ÑÑÐ»Ð°ÑÑ Ð¼Ð½Ðµ ÑÐ»ÐµÐºÑÑÐ¾Ð½Ð½ÑÐµ ÑÐ¾Ð¾Ð±ÑÐµÐ½Ð¸Ñ."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:212
+#: actions/emailsettings.php:216
 msgid "I want to post notices by email."
 msgstr "Ð¯ ÑÐ¾ÑÑ Ð¾ÑÐ¿ÑÐ°Ð²Ð»ÑÑÑ Ð·Ð°Ð¿Ð¸ÑÐ¸ Ð¿Ð¾ ÑÐ»ÐµÐºÑÑÐ¾Ð½Ð½Ð¾Ð¹ Ð¿Ð¾ÑÑÐµ."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:219
+#: actions/emailsettings.php:223
 msgid "Publish a MicroID for my email address."
 msgstr "ÐÐ¿ÑÐ±Ð»Ð¸ÐºÐ¾Ð²Ð°ÑÑ MicroID Ð´Ð»Ñ Ð¼Ð¾ÐµÐ³Ð¾ ÑÐ»ÐµÐºÑÑÐ¾Ð½Ð½Ð¾Ð³Ð¾ Ð°Ð´ÑÐµÑÐ°."
 
 #. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:334
+#: actions/emailsettings.php:338
 msgid "Email preferences saved."
 msgstr "ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ¸ ÑÐ». Ð¿Ð¾ÑÑÑ ÑÐ¾ÑÑÐ°Ð½ÐµÐ½Ñ."
 
 #. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:353
+#: actions/emailsettings.php:357
 msgid "No email address."
 msgstr "ÐÐµÑ ÑÐ»ÐµÐºÑÑÐ¾Ð½Ð½Ð¾Ð³Ð¾ Ð°Ð´ÑÐµÑÐ°."
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:361
+#: actions/emailsettings.php:365
 msgid "Cannot normalize that email address"
 msgstr "ÐÐµ ÑÐ´Ð°ÑÑÑÑ ÑÑÐ°Ð½Ð´Ð°ÑÑÐ¸Ð·Ð¸ÑÐ¾Ð²Ð°ÑÑ ÑÑÐ¾Ñ ÑÐ»ÐµÐºÑÑÐ¾Ð½Ð½ÑÐ¹ Ð°Ð´ÑÐµÑ"
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:208
+#: actions/emailsettings.php:370 actions/register.php:208
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "ÐÐµÐ²ÐµÑÐ½ÑÐ¹ ÑÐ»ÐµÐºÑÑÐ¾Ð½Ð½ÑÐ¹ Ð°Ð´ÑÐµÑ."
 
 #. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:370
+#: actions/emailsettings.php:374
 msgid "That is already your email address."
 msgstr "ÐÑÐ¾ ÑÐ¶Ðµ ÐÐ°Ñ ÑÐ»ÐµÐºÑÑÐ¾Ð½Ð½ÑÐ¹ Ð°Ð´ÑÐµÑ."
 
 #. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:374
+#: actions/emailsettings.php:378
 msgid "That email address already belongs to another user."
 msgstr "ÐÑÐ¾Ñ ÑÐ»ÐµÐºÑÑÐ¾Ð½Ð½ÑÐ¹ Ð°Ð´ÑÐµÑ ÑÐ¶Ðµ Ð·Ð°Ð´ÐµÐ¹ÑÑÐ²Ð¾Ð²Ð°Ð½ Ð´ÑÑÐ³Ð¸Ð¼ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»ÐµÐ¼."
 
 #. 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/emailsettings.php:395 actions/imsettings.php:351
 #: actions/smssettings.php:373
 msgid "Couldn't insert confirmation code."
 msgstr "ÐÐµ ÑÐ´Ð°ÑÑÑÑ Ð²ÑÑÐ°Ð²Ð¸ÑÑ ÐºÐ¾Ð´ Ð¿Ð¾Ð´ÑÐ²ÐµÑÐ¶Ð´ÐµÐ½Ð¸Ñ."
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:398
+#: actions/emailsettings.php:402
 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."
@@ -1568,50 +1580,50 @@ msgstr ""
 #. 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/emailsettings.php:423 actions/imsettings.php:386
 #: actions/smssettings.php:408
 msgid "No pending confirmation to cancel."
 msgstr "ÐÐµÑ Ð¿Ð¾Ð´ÑÐ²ÐµÑÐ¶Ð´ÐµÐ½Ð¸Ñ Ð¾ÑÐºÐ°Ð·Ð°."
 
 #. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:424
+#: actions/emailsettings.php:428
 msgid "That is the wrong email address."
 msgstr "ÐÑÐ¾ Ð½ÐµÐ²ÐµÑÐ½ÑÐ¹ Ð°Ð´ÑÐµÑ ÑÐ». Ð¿Ð¾ÑÑÑ."
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:438
+#: actions/emailsettings.php:442
 msgid "Email confirmation cancelled."
 msgstr "ÐÐ¾Ð´ÑÐ²ÐµÑÐ¶Ð´ÐµÐ½Ð¸Ðµ ÑÐ». Ð¿Ð¾ÑÑÑ Ð¾ÑÐ¼ÐµÐ½ÐµÐ½Ð¾."
 
 #. TRANS: Message given trying to remove an e-mail address that is not
 #. TRANS: registered for the active user.
-#: actions/emailsettings.php:458
+#: actions/emailsettings.php:462
 msgid "That is not your email address."
 msgstr "ÐÑÐ¾ Ð½Ðµ ÐÐ°Ñ ÑÐ»ÐµÐºÑÑÐ¾Ð½Ð½ÑÐ¹ Ð°Ð´ÑÐµÑ."
 
 #. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:479
+#: actions/emailsettings.php:483
 msgid "The email address was removed."
 msgstr "ÐÐ´ÑÐµÑ ÑÐ». Ð¿Ð¾ÑÑÑ ÑÐ´Ð°Ð»ÑÐ½."
 
-#: actions/emailsettings.php:493 actions/smssettings.php:568
+#: actions/emailsettings.php:497 actions/smssettings.php:568
 msgid "No incoming email address."
 msgstr "ÐÐµÑ Ð²ÑÐ¾Ð´ÑÑÐµÐ³Ð¾ ÑÐ»ÐµÐºÑÑÐ¾Ð½Ð½Ð¾Ð³Ð¾ Ð°Ð´ÑÐµÑÐ°."
 
 #. 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/emailsettings.php:508 actions/emailsettings.php:532
 #: actions/smssettings.php:578 actions/smssettings.php:602
 msgid "Couldn't update user record."
 msgstr "ÐÐµ ÑÐ´Ð°ÑÑÑÑ Ð¾Ð±Ð½Ð¾Ð²Ð¸ÑÑ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»ÑÑÐºÑÑ Ð·Ð°Ð¿Ð¸ÑÑ."
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
-#: actions/emailsettings.php:508 actions/smssettings.php:581
+#: actions/emailsettings.php:512 actions/smssettings.php:581
 msgid "Incoming email address removed."
 msgstr "ÐÑÐ¾Ð´ÑÑÐ¸Ð¹ ÑÐ»ÐµÐºÑÑÐ¾Ð½Ð½ÑÐ¹ Ð°Ð´ÑÐµÑ ÑÐ´Ð°Ð»ÑÐ½."
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
-#: actions/emailsettings.php:532 actions/smssettings.php:605
+#: actions/emailsettings.php:536 actions/smssettings.php:605
 msgid "New incoming email address added."
 msgstr "ÐÐ¾Ð²ÑÐ¹ Ð²ÑÐ¾Ð´ÑÑÐ¸Ð¹ ÑÐ»ÐµÐºÑÑÐ¾Ð½Ð½ÑÐ¹ Ð°Ð´ÑÐµÑ Ð´Ð¾Ð±Ð°Ð²Ð»ÐµÐ½."
 
@@ -1730,7 +1742,7 @@ msgstr "ÐÐµ ÑÐ´Ð°ÑÑÑÑ Ð¿ÑÐµÐ¾Ð±ÑÐ°Ð·Ð¾Ð²Ð°ÑÑ ÐºÐ»ÑÑ Ð·Ð°Ð¿ÑÐ¾ÑÐ° 
 msgid "Remote service uses unknown version of OMB protocol."
 msgstr "Ð£Ð´Ð°Ð»ÑÐ½Ð½ÑÐ¹ ÑÐµÑÐ²Ð¸Ñ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·ÑÐµÑ Ð½ÐµÐ¸Ð·Ð²ÐµÑÑÐ½ÑÑ Ð²ÐµÑÑÐ¸Ñ Ð¿ÑÐ¾ÑÐ¾ÐºÐ¾Ð»Ð° OMB."
 
-#: actions/finishremotesubscribe.php:138
+#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306
 msgid "Error updating remote profile."
 msgstr "ÐÑÐ¸Ð±ÐºÐ° Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ ÑÐ´Ð°Ð»ÑÐ½Ð½Ð¾Ð³Ð¾ Ð¿ÑÐ¾ÑÐ¸Ð»Ñ."
 
@@ -1787,7 +1799,7 @@ msgstr "ÐÐ¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ ÑÐ¶Ðµ Ð·Ð°Ð±Ð»Ð¾ÐºÐ¸ÑÐ¾Ð²Ð°Ð½ Ð¸Ð· Ð³ÑÑÐ¿Ð¿
 msgid "User is not a member of group."
 msgstr "ÐÐ¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ Ð½Ðµ ÑÐ²Ð»ÑÐµÑÑÑ ÑÐ»ÐµÐ½Ð¾Ð¼ ÑÑÐ¾Ð¹ Ð³ÑÑÐ¿Ð¿Ñ."
 
-#: actions/groupblock.php:134 actions/groupmembers.php:360
+#: actions/groupblock.php:134 actions/groupmembers.php:364
 msgid "Block user from group"
 msgstr "ÐÐ°Ð±Ð»Ð¾ÐºÐ¸ÑÐ¾Ð²Ð°ÑÑ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ Ð¸Ð· Ð³ÑÑÐ¿Ð¿Ñ."
 
@@ -1869,40 +1881,32 @@ msgstr "ÐÐ¾Ð³Ð¾ÑÐ¸Ð¿ Ð¾Ð±Ð½Ð¾Ð²Ð»ÑÐ½."
 msgid "Failed updating logo."
 msgstr "ÐÐµÑÐ´Ð°ÑÐ° Ð¿ÑÐ¸ Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ð¸ Ð»Ð¾Ð³Ð¾ÑÐ¸Ð¿Ð°."
 
-#: actions/groupmembers.php:100 lib/groupnav.php:92
+#. TRANS: Title of the page showing group members.
+#. TRANS: %s is the name of the group.
+#: actions/groupmembers.php:102
 #, php-format
 msgid "%s group members"
 msgstr "Ð£ÑÐ°ÑÑÐ½Ð¸ÐºÐ¸ Ð³ÑÑÐ¿Ð¿Ñ %s"
 
-#: actions/groupmembers.php:103
+#. TRANS: Title of the page showing group members.
+#. TRANS: %1$s is the name of the group, %2$d is the page number of the members list.
+#: actions/groupmembers.php:107
 #, php-format
 msgid "%1$s group members, page %2$d"
 msgstr "Ð£ÑÐ°ÑÑÐ½Ð¸ÐºÐ¸ Ð³ÑÑÐ¿Ð¿Ñ %1$s, ÑÑÑÐ°Ð½Ð¸ÑÐ° %2$d"
 
-#: actions/groupmembers.php:118
+#: actions/groupmembers.php:122
 msgid "A list of the users in this group."
 msgstr "Ð¡Ð¿Ð¸ÑÐ¾Ðº Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»ÐµÐ¹, ÑÐ²Ð»ÑÑÑÐ¸ÑÑÑ ÑÐ»ÐµÐ½Ð°Ð¼Ð¸ ÑÑÐ¾Ð¹ Ð³ÑÑÐ¿Ð¿Ñ."
 
-#: actions/groupmembers.php:182 lib/groupnav.php:107
+#: actions/groupmembers.php:186
 msgid "Admin"
 msgstr "ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ¸"
 
-#: actions/groupmembers.php:392 lib/blockform.php:69
-msgid "Block"
-msgstr "ÐÐ»Ð¾ÐºÐ¸ÑÐ¾Ð²Ð°ÑÑ"
-
-#: actions/groupmembers.php:487
+#: actions/groupmembers.php:498
 msgid "Make user an admin of the group"
 msgstr "Ð¡Ð´ÐµÐ»Ð°ÑÑ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ Ð°Ð´Ð¼Ð¸Ð½Ð¸ÑÑÑÐ°ÑÐ¾ÑÐ¾Ð¼ Ð³ÑÑÐ¿Ð¿Ñ"
 
-#: actions/groupmembers.php:519
-msgid "Make Admin"
-msgstr "Ð¡Ð´ÐµÐ»Ð°ÑÑ Ð°Ð´Ð¼Ð¸Ð½Ð¸ÑÑÑÐ°ÑÐ¾ÑÐ¾Ð¼"
-
-#: actions/groupmembers.php:519
-msgid "Make this user an admin"
-msgstr "Ð¡Ð´ÐµÐ»Ð°ÑÑ ÑÑÐ¾Ð³Ð¾ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ Ð°Ð´Ð¼Ð¸Ð½Ð¸ÑÑÑÐ°ÑÐ¾ÑÐ¾Ð¼"
-
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Title in atom group notice feed. %s is a group name.
 #. TRANS: Title in atom user notice feed. %s is a user name.
@@ -2041,7 +2045,10 @@ msgstr ""
 
 #. TRANS: IM address input field instructions in IM settings form.
 #. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:140
+#. TRANS: Do not translate "example.org". It is one of the domain names reserved for use in examples by
+#. TRANS: http://www.rfc-editor.org/rfc/rfc2606.txt. Any other domain may be owned by a legitimate
+#. TRANS: person or organization.
+#: actions/imsettings.php:143
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -2052,64 +2059,64 @@ msgstr ""
 "Ð¼ÐµÑÑÐµÐ½Ð´Ð¶ÐµÑÐµ Ð¸Ð»Ð¸ Ð² GTalk."
 
 #. TRANS: Form legend for IM preferences form.
-#: actions/imsettings.php:155
+#: actions/imsettings.php:158
 msgid "IM preferences"
 msgstr "ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ¸ IM"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:160
+#: actions/imsettings.php:163
 msgid "Send me notices through Jabber/GTalk."
 msgstr "ÐÐ¾ÑÑÐ»Ð°ÑÑ Ð¼Ð½Ðµ Ð·Ð°Ð¿Ð¸ÑÐ¸ ÑÐµÑÐµÐ· Jabber/GTalk."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:166
+#: actions/imsettings.php:169
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr "ÐÑÐ±Ð»Ð¸ÐºÐ¾Ð²Ð°ÑÑ Ð·Ð°Ð¿Ð¸ÑÑ, ÐºÐ¾Ð³Ð´Ð° Ð¼Ð¾Ð¹ Jabber/GTalk - ÑÑÐ°ÑÑÑ Ð¸Ð·Ð¼ÐµÐ½ÑÐµÑÑÑ."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:172
+#: actions/imsettings.php:175
 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr ""
 "ÐÐ¾ÑÑÐ»Ð°ÑÑ Ð¼Ð½Ðµ ÑÐµÐ¿Ð»Ð¸ÐºÐ¸ ÑÐµÑÐµÐ· Jabber/GTalk Ð¾Ñ Ð»ÑÐ´ÐµÐ¹, Ð½Ð° ÐºÐ¾ÑÐ¾ÑÑÑ Ñ Ð½Ðµ Ð¿Ð¾Ð´Ð¿Ð¸ÑÐ°Ð½."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:179
+#: actions/imsettings.php:182
 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "ÐÐ¿ÑÐ±Ð»Ð¸ÐºÐ¾Ð²Ð°ÑÑ MicroID Ð´Ð»Ñ Ð¼Ð¾ÐµÐ³Ð¾ Jabber/GTalk - Ð°Ð´ÑÐµÑÐ°."
 
 #. TRANS: Confirmation message for successful IM preferences save.
-#: actions/imsettings.php:287 actions/othersettings.php:180
+#: actions/imsettings.php:290 actions/othersettings.php:180
 msgid "Preferences saved."
 msgstr "ÐÑÐµÐ´Ð¿Ð¾ÑÑÐµÐ½Ð¸Ñ ÑÐ¾ÑÑÐ°Ð½ÐµÐ½Ñ."
 
 #. TRANS: Message given saving IM address without having provided one.
-#: actions/imsettings.php:309
+#: actions/imsettings.php:312
 msgid "No Jabber ID."
 msgstr "ÐÐµ Jabber ID."
 
 #. TRANS: Message given saving IM address that cannot be normalised.
-#: actions/imsettings.php:317
+#: actions/imsettings.php:320
 msgid "Cannot normalize that Jabber ID"
 msgstr "ÐÐµ ÑÐ´Ð°ÑÑÑÑ ÑÑÐ°Ð½Ð´Ð°ÑÑÐ¸Ð·Ð¸ÑÐ¾Ð²Ð°ÑÑ ÑÑÐ¾Ñ Jabber ID"
 
 #. TRANS: Message given saving IM address that not valid.
-#: actions/imsettings.php:322
+#: actions/imsettings.php:325
 msgid "Not a valid Jabber ID"
 msgstr "ÐÐµÐ²ÐµÑÐ½ÑÐ¹ ÐºÐ¾Ð´ Jabber ID"
 
 #. TRANS: Message given saving IM address that is already set.
-#: actions/imsettings.php:326
+#: actions/imsettings.php:329
 msgid "That is already your Jabber ID."
 msgstr "ÐÑÐ¾ ÑÐ¶Ðµ ÐÐ°Ñ Jabber ID."
 
 #. TRANS: Message given saving IM address that is already set for another user.
-#: actions/imsettings.php:330
+#: actions/imsettings.php:333
 msgid "Jabber ID already belongs to another user."
 msgstr "ÐÑÐ¾Ñ Jabber ID ÑÐ¶Ðµ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·ÑÐµÑÑÑ Ð´ÑÑÐ³Ð¸Ð¼ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»ÐµÐ¼."
 
 #. 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
+#: actions/imsettings.php:361
 #, php-format
 msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
@@ -2119,28 +2126,28 @@ msgstr ""
 "%s Ð´Ð»Ñ Ð¾ÑÐ¿ÑÐ°Ð²ÐºÐ¸ Ð²Ð°Ð¼ ÑÐ¾Ð¾Ð±ÑÐµÐ½Ð¸Ð¹."
 
 #. TRANS: Message given canceling IM address confirmation for the wrong IM address.
-#: actions/imsettings.php:388
+#: actions/imsettings.php:391
 msgid "That is the wrong IM address."
 msgstr "ÐÑÐ¾ Ð½ÐµÐ²ÐµÑÐ½ÑÐ¹ IM-Ð°Ð´ÑÐµÑ."
 
 #. TRANS: Server error thrown on database error canceling IM address confirmation.
-#: actions/imsettings.php:397
+#: actions/imsettings.php:400
 msgid "Couldn't delete IM confirmation."
 msgstr "ÐÐµ ÑÐ´Ð°ÑÑÑÑ ÑÐ´Ð°Ð»Ð¸ÑÑ Ð¿Ð¾Ð´Ð²ÐµÑÐ¶Ð´ÐµÐ½Ð¸Ðµ IM."
 
 #. TRANS: Message given after successfully canceling IM address confirmation.
-#: actions/imsettings.php:402
+#: actions/imsettings.php:405
 msgid "IM confirmation cancelled."
 msgstr "ÐÐ¾Ð´ÑÐ²ÐµÑÐ¶Ð´ÐµÐ½Ð¸Ðµ IM Ð¾ÑÐ¼ÐµÐ½ÐµÐ½Ð¾."
 
 #. TRANS: Message given trying to remove an IM address that is not
 #. TRANS: registered for the active user.
-#: actions/imsettings.php:424
+#: actions/imsettings.php:427
 msgid "That is not your Jabber ID."
 msgstr "ÐÑÐ¾ Ð½Ðµ ÐÐ°Ñ Jabber ID."
 
 #. TRANS: Message given after successfully removing a registered IM address.
-#: actions/imsettings.php:447
+#: actions/imsettings.php:450
 msgid "The IM address was removed."
 msgstr "ÐÐ´ÑÐµÑ IM ÑÐ´Ð°Ð»ÑÐ½."
 
@@ -2610,8 +2617,8 @@ msgid "Only %s URLs over plain HTTP please."
 msgstr "Ð¢Ð¾Ð»ÑÐºÐ¾ %s URL Ð² Ð¿ÑÐ¾ÑÑÐ¾Ð¼ HTTP, Ð¿Ð¾Ð¶Ð°Ð»ÑÐ¹ÑÑÐ°."
 
 #. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1215
-#: lib/apiaction.php:1243 lib/apiaction.php:1366
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1206
+#: lib/apiaction.php:1233 lib/apiaction.php:1356
 msgid "Not a supported data format."
 msgstr "ÐÐµÐ¿Ð¾Ð´Ð´ÐµÑÐ¶Ð¸Ð²Ð°ÐµÐ¼ÑÐ¹ ÑÐ¾ÑÐ¼Ð°Ñ Ð´Ð°Ð½Ð½ÑÑ."
 
@@ -2753,7 +2760,7 @@ msgid "Password saved."
 msgstr "ÐÐ°ÑÐ¾Ð»Ñ ÑÐ¾ÑÑÐ°Ð½ÑÐ½."
 
 #. TRANS: Menu item for site administration
-#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:384
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:371
 msgid "Paths"
 msgstr "ÐÑÑÐ¸"
 
@@ -2964,7 +2971,7 @@ msgstr "ÐÐ¾Ð»Ð½Ð¾Ðµ Ð¸Ð¼Ñ"
 
 #. TRANS: Form input field label.
 #: actions/profilesettings.php:115 actions/register.php:460
-#: lib/applicationeditform.php:244 lib/groupeditform.php:161
+#: lib/applicationeditform.php:235 lib/groupeditform.php:161
 msgid "Homepage"
 msgstr "ÐÐ»Ð°Ð²Ð½Ð°Ñ"
 
@@ -3069,7 +3076,7 @@ msgid "Couldn't save tags."
 msgstr "ÐÐµ ÑÐ´Ð°ÑÑÑÑ ÑÐ¾ÑÑÐ°Ð½Ð¸ÑÑ ÑÐµÐ³Ð¸."
 
 #. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:391 lib/adminpanelaction.php:141
+#: actions/profilesettings.php:391 lib/adminpanelaction.php:138
 msgid "Settings saved."
 msgstr "ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ¸ ÑÐ¾ÑÑÐ°Ð½ÐµÐ½Ñ."
 
@@ -3607,7 +3614,7 @@ msgstr "ÐÐ¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ ÑÐ¶Ðµ Ð² ÑÐµÐ¶Ð¸Ð¼Ðµ Ð¿ÐµÑÐ¾ÑÐ½Ð¸ÑÑ."
 
 #. TRANS: Menu item for site administration
 #: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
-#: lib/adminpanelaction.php:392
+#: lib/adminpanelaction.php:379
 msgid "Sessions"
 msgstr "Ð¡ÐµÑÑÐ¸Ð¸"
 
@@ -3645,24 +3652,24 @@ msgid "Application profile"
 msgstr "ÐÑÐ¾ÑÐ¸Ð»Ñ Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ"
 
 #. TRANS: Form input field label for application icon.
-#: actions/showapplication.php:159 lib/applicationeditform.php:182
+#: actions/showapplication.php:159 lib/applicationeditform.php:173
 msgid "Icon"
 msgstr "ÐÐºÐ¾Ð½ÐºÐ°"
 
 #. TRANS: Form input field label for application name.
 #: actions/showapplication.php:169 actions/version.php:197
-#: lib/applicationeditform.php:199
+#: lib/applicationeditform.php:190
 msgid "Name"
 msgstr "ÐÐ¼Ñ"
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:178 lib/applicationeditform.php:235
+#: actions/showapplication.php:178 lib/applicationeditform.php:226
 msgid "Organization"
 msgstr "ÐÑÐ³Ð°Ð½Ð¸Ð·Ð°ÑÐ¸Ñ"
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:216 lib/groupeditform.php:172
+#: lib/applicationeditform.php:207 lib/groupeditform.php:172
 msgid "Description"
 msgstr "ÐÐ¿Ð¸ÑÐ°Ð½Ð¸Ðµ"
 
@@ -3777,7 +3784,7 @@ msgstr ""
 msgid "This is a way to share what you like."
 msgstr "ÐÑÐ¾ ÑÐ¿Ð¾ÑÐ¾Ð± Ð¿Ð¾Ð´ÐµÐ»Ð¸ÑÑÑÑ ÑÐµÐ¼, ÑÑÐ¾ Ð²Ð°Ð¼ Ð½ÑÐ°Ð²Ð¸ÑÑÑ."
 
-#: actions/showgroup.php:82 lib/groupnav.php:86
+#: actions/showgroup.php:82
 #, php-format
 msgid "%s group"
 msgstr "ÐÑÑÐ¿Ð¿Ð° %s"
@@ -3829,7 +3836,7 @@ msgstr "ÐÐµÐ½ÑÐ° Ð·Ð°Ð¿Ð¸ÑÐµÐ¹ Ð³ÑÑÐ¿Ð¿Ñ %s (Atom)"
 msgid "FOAF for %s group"
 msgstr "FOAF Ð´Ð»Ñ Ð³ÑÑÐ¿Ð¿Ñ %s"
 
-#: actions/showgroup.php:393 actions/showgroup.php:445 lib/groupnav.php:91
+#: actions/showgroup.php:393 actions/showgroup.php:445
 msgid "Members"
 msgstr "Ð£ÑÐ°ÑÑÐ½Ð¸ÐºÐ¸"
 
@@ -4286,7 +4293,7 @@ msgstr "ÐÐ¾Ð´ Ð½Ðµ Ð²Ð²ÐµÐ´ÑÐ½"
 
 #. TRANS: Menu item for site administration
 #: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
-#: lib/adminpanelaction.php:408
+#: lib/adminpanelaction.php:395
 msgid "Snapshots"
 msgstr "Ð¡Ð½Ð¸Ð¼ÐºÐ¸"
 
@@ -5021,7 +5028,7 @@ msgid "Unable to save tag."
 msgstr "ÐÐµ ÑÐ´Ð°ÑÑÑÑ ÑÐ¾ÑÑÐ°Ð½Ð¸ÑÑ ÑÐµÐ³."
 
 #. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#: classes/Subscription.php:75 lib/oauthstore.php:465
+#: classes/Subscription.php:75 lib/oauthstore.php:466
 msgid "You have been banned from subscribing."
 msgstr "ÐÑ Ð·Ð°Ð±Ð»Ð¾ÐºÐ¸ÑÐ¾Ð²Ð°Ð½Ñ Ð¾Ñ Ð¿Ð¾Ð´Ð¿Ð¸ÑÐºÐ¸."
 
@@ -5169,7 +5176,8 @@ msgid "Change site configuration"
 msgstr "ÐÐ·Ð¼ÐµÐ½Ð¸ÑÑ ÐºÐ¾Ð½ÑÐ¸Ð³ÑÑÐ°ÑÐ¸Ñ ÑÐ°Ð¹ÑÐ°"
 
 #. TRANS: Main menu option when logged in and site admin for access to site configuration
-#: lib/action.php:474
+#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
+#: lib/action.php:474 lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr "ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ¸"
@@ -5246,7 +5254,7 @@ msgstr "ÐÐ¾Ð¸ÑÐº"
 
 #. TRANS: DT element for site notice. String is hidden in default CSS.
 #. TRANS: Menu item for site administration
-#: lib/action.php:538 lib/adminpanelaction.php:400
+#: lib/action.php:538 lib/adminpanelaction.php:387
 msgid "Site notice"
 msgstr "Ð£Ð²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸Ðµ ÑÐ°Ð¹ÑÐ°"
 
@@ -5310,7 +5318,10 @@ msgid "StatusNet software license"
 msgstr "StatusNet Ð»Ð¸ÑÐµÐ½Ð·Ð¸Ñ"
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
-#: lib/action.php:843
+#. TRANS: Text between [] is a link description, text between () is the link itself.
+#. TRANS: Make sure there is no whitespace between "]" and "(".
+#. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
+#: lib/action.php:846
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -5320,13 +5331,16 @@ msgstr ""
 "broughtby%%](%%site.broughtbyurl%%)."
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:846
+#: lib/action.php:849
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** â ÑÐµÑÐ²Ð¸Ñ Ð¼Ð¸ÐºÑÐ¾Ð±Ð»Ð¾Ð³Ð¸Ð½Ð³Ð°."
 
 #. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.
-#: lib/action.php:850
+#. TRANS: Make sure there is no whitespace between "]" and "(".
+#. TRANS: Text between [] is a link description, text between () is the link itself.
+#. TRANS: %s is the version of StatusNet that is being used.
+#: lib/action.php:856
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -5339,52 +5353,53 @@ msgstr ""
 "licenses/agpl-3.0.html)."
 
 #. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:866
+#: lib/action.php:872
 msgid "Site content license"
 msgstr "ÐÐ¸ÑÐµÐ½Ð·Ð¸Ñ ÑÐ¾Ð´ÐµÑÐ¶Ð¸Ð¼Ð¾Ð³Ð¾ ÑÐ°Ð¹ÑÐ°"
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:873
+#: lib/action.php:879
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr "Ð¡Ð¾Ð´ÐµÑÐ¶Ð°Ð½Ð¸Ðµ Ð¸ Ð´Ð°Ð½Ð½ÑÐµ %1$s ÑÐ²Ð»ÑÑÑÑÑ Ð»Ð¸ÑÐ½ÑÐ¼Ð¸ Ð¸ ÐºÐ¾Ð½ÑÐ¸Ð´ÐµÐ½ÑÐ¸Ð°Ð»ÑÐ½ÑÐ¼Ð¸."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:880
+#: lib/action.php:886
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
 "ÐÐ²ÑÐ¾ÑÑÐºÐ¸Ðµ Ð¿ÑÐ°Ð²Ð° Ð½Ð° ÑÐ¾Ð´ÐµÑÐ¶Ð°Ð½Ð¸Ðµ Ð¸ Ð´Ð°Ð½Ð½ÑÐµ Ð¿ÑÐ¸Ð½Ð°Ð´Ð»ÐµÐ¶Ð°Ñ %1$s. ÐÑÐµ Ð¿ÑÐ°Ð²Ð° Ð·Ð°ÑÐ¸ÑÐµÐ½Ñ."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:884
+#: lib/action.php:890
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 "ÐÐ²ÑÐ¾ÑÑÐºÐ¸Ðµ Ð¿ÑÐ°Ð²Ð° Ð½Ð° ÑÐ¾Ð´ÐµÑÐ¶Ð°Ð½Ð¸Ðµ Ð¸ Ð´Ð°Ð½Ð½ÑÐµ Ð¿ÑÐ¸Ð½Ð°Ð´Ð»ÐµÐ¶Ð°Ñ ÑÐ°Ð·ÑÐ°Ð±Ð¾ÑÑÐ¸ÐºÐ°Ð¼. ÐÑÐµ Ð¿ÑÐ°Ð²Ð° "
 "Ð·Ð°ÑÐ¸ÑÐµÐ½Ñ."
 
-#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:897
+#. TRANS: license message in footer.
+#. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
+#: lib/action.php:904
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr "ÐÑÐµ Ð¼Ð°ÑÐµÑÐ¸Ð°Ð»Ñ Ð¸ Ð´Ð°Ð½Ð½ÑÐµ %1$s Ð´Ð¾ÑÑÑÐ¿Ð½Ñ Ð½Ð° ÑÑÐ»Ð¾Ð²Ð¸ÑÑ Ð»Ð¸ÑÐµÐ½Ð·Ð¸Ð¸ %2$s."
 
 #. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1236
+#: lib/action.php:1243
 msgid "Pagination"
 msgstr "Ð Ð°Ð·Ð±Ð¸ÐµÐ½Ð¸Ðµ Ð½Ð° ÑÑÑÐ°Ð½Ð¸ÑÑ"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1247
+#: lib/action.php:1254
 msgid "After"
 msgstr "Ð¡ÑÐ´Ð°"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1257
+#: lib/action.php:1264
 msgid "Before"
 msgstr "Ð¢ÑÐ´Ð°"
 
@@ -5393,208 +5408,227 @@ msgstr "Ð¢ÑÐ´Ð°"
 msgid "Expecting a root feed element but got a whole XML document."
 msgstr "ÐÐ¶Ð¸Ð´Ð°Ð»ÑÑ ÐºÐ¾ÑÐ½ÐµÐ²Ð¾Ð¹ ÑÐ»ÐµÐ¼ÐµÐ½Ñ Ð¿Ð¾ÑÐ¾ÐºÐ°, Ð° Ð¿Ð¾Ð»ÑÑÐµÐ½ XML-Ð´Ð¾ÐºÑÐ¼ÐµÐ½Ñ ÑÐµÐ»Ð¸ÐºÐ¾Ð¼."
 
-#: lib/activityutils.php:208
+#. TRANS: Client exception thrown when there is no source attribute.
+#: lib/activityutils.php:203
 msgid "Can't handle remote content yet."
 msgstr "ÐÐ¾ÐºÐ° ÐµÑÑ Ð½ÐµÐ»ÑÐ·Ñ Ð¾Ð±ÑÐ°Ð±Ð°ÑÑÐ²Ð°ÑÑ ÑÐ´Ð°Ð»ÑÐ½Ð½Ð¾Ðµ ÑÐ¾Ð´ÐµÑÐ¶Ð¸Ð¼Ð¾Ðµ."
 
-#: lib/activityutils.php:244
+#. TRANS: Client exception thrown when there embedded XML content is found that cannot be processed yet.
+#: lib/activityutils.php:240
 msgid "Can't handle embedded XML content yet."
 msgstr "ÐÐ¾ÐºÐ° ÐµÑÑ Ð½ÐµÐ»ÑÐ·Ñ Ð¾Ð±ÑÐ°Ð±Ð°ÑÑÐ²Ð°ÑÑ Ð²ÑÑÑÐ¾ÐµÐ½Ð½ÑÐ¹ XML."
 
-#: lib/activityutils.php:248
+#. TRANS: Client exception thrown when base64 encoded content is found that cannot be processed yet.
+#: lib/activityutils.php:245
 msgid "Can't handle embedded Base64 content yet."
 msgstr "ÐÐ¾ÐºÐ° ÐµÑÑ Ð½ÐµÐ»ÑÐ·Ñ Ð¾Ð±ÑÐ°Ð±Ð°ÑÑÐ²Ð°ÑÑ Ð²ÑÑÑÐ¾ÐµÐ½Ð½Ð¾Ðµ ÑÐ¾Ð´ÐµÑÐ¶Ð°Ð½Ð¸Ðµ Base64."
 
 #. TRANS: Client error message thrown when a user tries to change admin settings but has no access rights.
-#: lib/adminpanelaction.php:98
+#: lib/adminpanelaction.php:96
 msgid "You cannot make changes to this site."
 msgstr "ÐÑ Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑÐµ Ð¸Ð·Ð¼ÐµÐ½ÑÑÑ ÑÑÐ¾Ñ ÑÐ°Ð¹Ñ."
 
 #. TRANS: Client error message throw when a certain panel's settings cannot be changed.
-#: lib/adminpanelaction.php:110
+#: lib/adminpanelaction.php:108
 msgid "Changes to that panel are not allowed."
 msgstr "ÐÐ·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð´Ð»Ñ ÑÑÐ¾Ð¹ Ð¿Ð°Ð½ÐµÐ»Ð¸ Ð½ÐµÐ´Ð¾Ð¿ÑÑÑÐ¸Ð¼Ñ."
 
 #. TRANS: Client error message.
-#: lib/adminpanelaction.php:229
+#: lib/adminpanelaction.php:222
 msgid "showForm() not implemented."
 msgstr "showForm() Ð½Ðµ ÑÐµÐ°Ð»Ð¸Ð·Ð¾Ð²Ð°Ð½Ð°."
 
 #. TRANS: Client error message
-#: lib/adminpanelaction.php:259
+#: lib/adminpanelaction.php:250
 msgid "saveSettings() not implemented."
 msgstr "saveSettings() Ð½Ðµ ÑÐµÐ°Ð»Ð¸Ð·Ð¾Ð²Ð°Ð½Ð°."
 
 #. TRANS: Client error message thrown if design settings could not be deleted in
 #. TRANS: the admin panel Design.
-#: lib/adminpanelaction.php:284
+#: lib/adminpanelaction.php:274
 msgid "Unable to delete design setting."
 msgstr "ÐÐµ ÑÐ´Ð°ÑÑÑÑ ÑÐ´Ð°Ð»Ð¸ÑÑ Ð½Ð°ÑÑÑÐ¾Ð¹ÐºÐ¸ Ð¾ÑÐ¾ÑÐ¼Ð»ÐµÐ½Ð¸Ñ."
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:350
+#: lib/adminpanelaction.php:337
 msgid "Basic site configuration"
 msgstr "ÐÑÐ½Ð¾Ð²Ð½Ð°Ñ ÐºÐ¾Ð½ÑÐ¸Ð³ÑÑÐ°ÑÐ¸Ñ ÑÐ°Ð¹ÑÐ°"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:352
+#: lib/adminpanelaction.php:339
 msgctxt "MENU"
 msgid "Site"
 msgstr "Ð¡Ð°Ð¹Ñ"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:358
+#: lib/adminpanelaction.php:345
 msgid "Design configuration"
 msgstr "ÐÐ¾Ð½ÑÐ¸Ð³ÑÑÐ°ÑÐ¸Ñ Ð¾ÑÐ¾ÑÐ¼Ð»ÐµÐ½Ð¸Ñ"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:360
+#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
+#: lib/adminpanelaction.php:347 lib/groupnav.php:135
 msgctxt "MENU"
 msgid "Design"
 msgstr "ÐÑÐ¾ÑÐ¼Ð»ÐµÐ½Ð¸Ðµ"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:366
+#: lib/adminpanelaction.php:353
 msgid "User configuration"
 msgstr "ÐÐ¾Ð½ÑÐ¸Ð³ÑÑÐ°ÑÐ¸Ñ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:368 lib/personalgroupnav.php:115
+#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:115
 msgid "User"
 msgstr "ÐÐ¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:374
+#: lib/adminpanelaction.php:361
 msgid "Access configuration"
 msgstr "ÐÐ¾Ð½ÑÐ¸Ð³ÑÑÐ°ÑÐ¸Ñ Ð´Ð¾ÑÑÑÐ¿Ð°"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:382
+#: lib/adminpanelaction.php:369
 msgid "Paths configuration"
 msgstr "ÐÐ¾Ð½ÑÐ¸Ð³ÑÑÐ°ÑÐ¸Ñ Ð¿ÑÑÐµÐ¹"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:390
+#: lib/adminpanelaction.php:377
 msgid "Sessions configuration"
 msgstr "ÐÐ¾Ð½ÑÐ¸Ð³ÑÑÐ°ÑÐ¸Ñ ÑÐµÑÑÐ¸Ð¹"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:398
+#: lib/adminpanelaction.php:385
 msgid "Edit site notice"
 msgstr "ÐÐ·Ð¼ÐµÐ½Ð¸ÑÑ ÑÐ²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸Ðµ ÑÐ°Ð¹ÑÐ°"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:406
+#: lib/adminpanelaction.php:393
 msgid "Snapshots configuration"
 msgstr "ÐÐ¾Ð½ÑÐ¸Ð³ÑÑÐ°ÑÐ¸Ñ ÑÐ½Ð¸Ð¼ÐºÐ¾Ð²"
 
 #. TRANS: Client error 401.
-#: lib/apiauth.php:113
+#: lib/apiauth.php:111
 msgid "API resource requires read-write access, but you only have read access."
 msgstr ""
 "API ÑÐµÑÑÑÑÐ° ÑÑÐµÐ±ÑÐµÑ Ð´Ð¾ÑÑÑÐ¿ Ð´Ð»Ñ ÑÑÐµÐ½Ð¸Ñ Ð¸ Ð·Ð°Ð¿Ð¸ÑÐ¸, Ð½Ð¾ Ñ Ð²Ð°Ñ ÐµÑÑÑ ÑÐ¾Ð»ÑÐºÐ¾ Ð´Ð¾ÑÑÑÐ¿ "
 "Ð´Ð»Ñ ÑÑÐµÐ½Ð¸Ñ."
 
+#. TRANS: OAuth exception thrown when no application is found for a given consumer key.
+#: lib/apiauth.php:175
+msgid "No application for that consumer key."
+msgstr ""
+
+#. TRANS: OAuth exception given when no user was found for a given token (no token was found).
+#: lib/apiauth.php:217
+msgid "No user for that token."
+msgstr ""
+
+#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
+#: lib/apioauthstore.php:178
+msgid "Tried to revoke unknown token"
+msgstr ""
+
 #. TRANS: Form legend.
-#: lib/applicationeditform.php:137
+#: lib/applicationeditform.php:129
 msgid "Edit application"
 msgstr "ÐÐ·Ð¼ÐµÐ½Ð¸ÑÑ Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:187
+#: lib/applicationeditform.php:178
 msgid "Icon for this application"
 msgstr "ÐÐºÐ¾Ð½ÐºÐ° Ð´Ð»Ñ ÑÑÐ¾Ð³Ð¾ Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:209
+#: lib/applicationeditform.php:200
 #, php-format
 msgid "Describe your application in %d characters"
 msgstr "ÐÐ¿Ð¸ÑÐ¸ÑÐµ Ð²Ð°ÑÐµ Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ Ð¿ÑÐ¸ Ð¿Ð¾Ð¼Ð¾ÑÐ¸ %d ÑÐ¸Ð¼Ð²Ð¾Ð»Ð¾Ð²"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:213
+#: lib/applicationeditform.php:204
 msgid "Describe your application"
 msgstr "ÐÐ¿Ð¸ÑÐ¸ÑÐµ Ð²Ð°ÑÐµ Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:224
+#: lib/applicationeditform.php:215
 msgid "URL of the homepage of this application"
 msgstr "URL-Ð°Ð´ÑÐµÑ Ð´Ð¾Ð¼Ð°ÑÐ½ÐµÐ¹ ÑÑÑÐ°Ð½Ð¸ÑÑ ÑÑÐ¾Ð³Ð¾ Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ"
 
 #. TRANS: Form input field label.
-#: lib/applicationeditform.php:226
+#: lib/applicationeditform.php:217
 msgid "Source URL"
 msgstr "URL Ð¸ÑÑÐ¾ÑÐ½Ð¸ÐºÐ°"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:233
+#: lib/applicationeditform.php:224
 msgid "Organization responsible for this application"
 msgstr "ÐÑÐ³Ð°Ð½Ð¸Ð·Ð°ÑÐ¸Ñ, Ð¾ÑÐ²ÐµÑÑÑÐ²ÐµÐ½Ð½Ð°Ñ Ð·Ð° ÑÑÐ¾ Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:242
+#: lib/applicationeditform.php:233
 msgid "URL for the homepage of the organization"
 msgstr "URL-Ð°Ð´ÑÐµÑ Ð´Ð¾Ð¼Ð°ÑÐ½ÐµÐ¹ ÑÑÑÐ°Ð½Ð¸ÑÑ Ð¾ÑÐ³Ð°Ð½Ð¸Ð·Ð°ÑÐ¸Ð¸"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:251
+#: lib/applicationeditform.php:242
 msgid "URL to redirect to after authentication"
 msgstr "URL Ð´Ð»Ñ Ð¿ÐµÑÐµÐ½Ð°Ð¿ÑÐ°Ð²Ð»ÐµÐ½Ð¸Ñ Ð¿Ð¾ÑÐ»Ðµ Ð¿ÑÐ¾Ð²ÐµÑÐºÐ¸ Ð¿Ð¾Ð´Ð»Ð¸Ð½Ð½Ð¾ÑÑÐ¸"
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:278
+#: lib/applicationeditform.php:269
 msgid "Browser"
 msgstr "ÐÑÐ°ÑÐ·ÐµÑ"
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:295
+#: lib/applicationeditform.php:286
 msgid "Desktop"
 msgstr "ÐÐ¿ÐµÑÐ°ÑÐ¸Ð¾Ð½Ð½Ð°Ñ ÑÐ¸ÑÑÐµÐ¼Ð°"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:297
+#: lib/applicationeditform.php:288
 msgid "Type of application, browser or desktop"
 msgstr "Ð¡ÑÐµÐ´Ð° Ð²ÑÐ¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ: Ð±ÑÐ°ÑÐ·ÐµÑ Ð¸Ð»Ð¸ Ð¾Ð¿ÐµÑÐ°ÑÐ¸Ð¾Ð½Ð½Ð°Ñ ÑÐ¸ÑÑÐµÐ¼Ð°"
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:320
+#: lib/applicationeditform.php:311
 msgid "Read-only"
 msgstr "Ð¢Ð¾Ð»ÑÐºÐ¾ ÑÑÐµÐ½Ð¸Ðµ"
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:339
+#: lib/applicationeditform.php:330
 msgid "Read-write"
 msgstr "Ð§ÑÐµÐ½Ð¸Ðµ Ð¸ Ð·Ð°Ð¿Ð¸ÑÑ"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:341
+#: lib/applicationeditform.php:332
 msgid "Default access for this application: read-only, or read-write"
 msgstr ""
 "ÐÐ¾ÑÑÑÐ¿ Ð¿Ð¾ ÑÐ¼Ð¾Ð»ÑÐ°Ð½Ð¸Ñ Ð´Ð»Ñ ÑÑÐ¾Ð³Ð¾ Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ: ÑÐ¾Ð»ÑÐºÐ¾ ÑÑÐµÐ½Ð¸Ðµ Ð¸Ð»Ð¸ ÑÑÐµÐ½Ð¸Ðµ Ð¸ Ð·Ð°Ð¿Ð¸ÑÑ"
 
-#. TRANS: Submit button title
-#: lib/applicationeditform.php:359
+#. TRANS: Submit button title.
+#: lib/applicationeditform.php:349
 msgid "Cancel"
 msgstr "ÐÑÐ¼ÐµÐ½Ð¸ÑÑ"
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:136
+#: lib/applicationlist.php:135
 msgid "read-write"
 msgstr "ÑÑÐµÐ½Ð¸Ðµ/Ð·Ð°Ð¿Ð¸ÑÑ"
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:138
+#: lib/applicationlist.php:137
 msgid "read-only"
 msgstr "ÑÐ¾Ð»ÑÐºÐ¾ ÑÑÐµÐ½Ð¸Ðµ"
 
 #. 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
+#: lib/applicationlist.php:143
 #, php-format
 msgid "Approved %1$s - \"%2$s\" access."
 msgstr "ÐÐ¾Ð´ÑÐ²ÐµÑÐ¶Ð´ÑÐ½ Ð´Ð¾ÑÑÑÐ¿ %1$s â Â«%2$sÂ»."
 
 #. TRANS: Button label
-#: lib/applicationlist.php:159
+#: lib/applicationlist.php:158
 msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "ÐÑÐ¾Ð·Ð²Ð°ÑÑ"
@@ -5614,11 +5648,13 @@ msgstr "ÐÐ²ÑÐ¾Ñ"
 msgid "Provider"
 msgstr "Ð¡ÐµÑÐ²Ð¸Ñ"
 
-#: lib/attachmentnoticesection.php:67
+#. TRANS: Title.
+#: lib/attachmentnoticesection.php:68
 msgid "Notices where this attachment appears"
 msgstr "Ð¡Ð¾Ð¾Ð±ÑÐ°ÐµÑ, Ð³Ð´Ðµ Ð¿Ð¾ÑÐ²Ð»ÑÐµÑÑÑ ÑÑÐ¾ Ð²Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ"
 
-#: lib/attachmenttagcloudsection.php:48
+#. TRANS: Title.
+#: lib/attachmenttagcloudsection.php:49
 msgid "Tags for this attachment"
 msgstr "Ð¢ÐµÐ³Ð¸ Ð´Ð»Ñ ÑÑÐ¾Ð³Ð¾ Ð²Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ"
 
@@ -5630,6 +5666,11 @@ msgstr "ÐÐ·Ð¼ÐµÐ½ÐµÐ½Ð¸Ðµ Ð¿Ð°ÑÐ¾Ð»Ñ Ð½Ðµ ÑÐ´Ð°Ð»Ð¾ÑÑ"
 msgid "Password changing is not allowed"
 msgstr "Ð¡Ð¼ÐµÐ½Ð° Ð¿Ð°ÑÐ¾Ð»Ñ Ð½Ðµ ÑÐ°Ð·ÑÐµÑÐµÐ½Ð°"
 
+#. TRANS: Title for the form to block a user.
+#: lib/blockform.php:70
+msgid "Block"
+msgstr "ÐÐ»Ð¾ÐºÐ¸ÑÐ¾Ð²Ð°ÑÑ"
+
 #: lib/channel.php:157 lib/channel.php:177
 msgid "Command results"
 msgstr "ÐÐ¾Ð¼Ð°Ð½Ð´Ð° Ð¸ÑÐ¿Ð¾Ð»Ð½ÐµÐ½Ð°"
@@ -5881,7 +5922,7 @@ msgid "You are not subscribed to anyone."
 msgstr "ÐÑ Ð½Ð¸ Ð½Ð° ÐºÐ¾Ð³Ð¾ Ð½Ðµ Ð¿Ð¾Ð´Ð¿Ð¸ÑÐ°Ð½Ñ."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to.
-#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.
 #: lib/command.php:836
 msgid "You are subscribed to this person:"
@@ -5897,7 +5938,7 @@ msgid "No one is subscribed to you."
 msgstr "ÐÐ¸ÐºÑÐ¾ Ð½Ðµ Ð¿Ð¾Ð´Ð¿Ð¸ÑÐ°Ð½ Ð½Ð° Ð²Ð°Ñ."
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
-#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
 #: lib/command.php:863
 msgid "This person is subscribed to you:"
@@ -5913,7 +5954,7 @@ msgid "You are not a member of any groups."
 msgstr "ÐÑ Ð½Ðµ ÑÐ¾ÑÑÐ¾Ð¸ÑÐµ Ð½Ð¸ Ð² Ð¾Ð´Ð½Ð¾Ð¹ Ð³ÑÑÐ¿Ð¿Ðµ."
 
 #. TRANS: Text shown after requesting groups a user is subscribed to.
-#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
 #: lib/command.php:890
 msgid "You are a member of this group:"
@@ -5922,6 +5963,7 @@ msgstr[0] "ÐÑ ÑÐ²Ð»ÑÐµÑÐµÑÑ ÑÑÐ°ÑÑÐ½Ð¸ÐºÐ¾Ð¼ ÑÐ»ÐµÐ´ÑÑÑÐ¸Ñ Ð³Ñ
 msgstr[1] "ÐÑ ÑÐ²Ð»ÑÐµÑÐµÑÑ ÑÑÐ°ÑÑÐ½Ð¸ÐºÐ¾Ð¼ ÑÐ»ÐµÐ´ÑÑÑÐ¸Ñ Ð³ÑÑÐ¿Ð¿:"
 msgstr[2] "ÐÑ ÑÐ²Ð»ÑÐµÑÐµÑÑ ÑÑÐ°ÑÑÐ½Ð¸ÐºÐ¾Ð¼ ÑÐ»ÐµÐ´ÑÑÑÐ¸Ñ Ð³ÑÑÐ¿Ð¿:"
 
+#. TRANS: Help text for commands.
 #: lib/command.php:905
 msgid ""
 "Commands:\n"
@@ -6143,38 +6185,6 @@ msgstr ""
 "ÐÐ¾Ð¿Ð¾Ð»Ð½Ð¸ÑÐµÐ»ÑÐ½ÑÐµ Ð¸Ð¼ÐµÐ½Ð° Ð´Ð»Ñ Ð³ÑÑÐ¿Ð¿Ñ, ÑÐ°Ð·Ð´ÐµÐ»ÑÐ½Ð½ÑÐµ Ð·Ð°Ð¿ÑÑÐ¾Ð¹ Ð¸Ð»Ð¸ Ð¿ÑÐ¾Ð±ÐµÐ»Ð¾Ð¼, Ð¼Ð°ÐºÑÐ¸Ð¼ÑÐ¼ %"
 "d Ð¸Ð¼ÑÐ½"
 
-#: lib/groupnav.php:85
-msgid "Group"
-msgstr "ÐÑÑÐ¿Ð¿Ð°"
-
-#: lib/groupnav.php:101
-msgid "Blocked"
-msgstr "ÐÐ°Ð±Ð»Ð¾ÐºÐ¸ÑÐ¾Ð²Ð°Ð½Ð½ÑÐµ"
-
-#: lib/groupnav.php:102
-#, php-format
-msgid "%s blocked users"
-msgstr "%s Ð·Ð°Ð±Ð»Ð¾ÐºÐ¸ÑÐ¾Ð²Ð°Ð½Ð½ÑÑ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»ÐµÐ¹"
-
-#: lib/groupnav.php:108
-#, php-format
-msgid "Edit %s group properties"
-msgstr "Ð ÐµÐ´Ð°ÐºÑÐ¸ÑÐ¾Ð²Ð°ÑÑ Ð¸Ð½ÑÐ¾ÑÐ¼Ð°ÑÐ¸Ñ Ð¾ Ð³ÑÑÐ¿Ð¿Ðµ %s"
-
-#: lib/groupnav.php:113
-msgid "Logo"
-msgstr "ÐÐ¾Ð³Ð¾ÑÐ¸Ð¿"
-
-#: lib/groupnav.php:114
-#, php-format
-msgid "Add or edit %s logo"
-msgstr "ÐÐ¾Ð±Ð°Ð²Ð¸ÑÑ Ð¸Ð»Ð¸ Ð¸Ð·Ð¼ÐµÐ½Ð¸ÑÑ Ð»Ð¾Ð³Ð¾ÑÐ¸Ð¿ Ð³ÑÑÐ¿Ð¿Ñ %s"
-
-#: lib/groupnav.php:120
-#, php-format
-msgid "Add or edit %s design"
-msgstr "ÐÐ¾Ð±Ð°Ð²Ð¸ÑÑ Ð¸Ð»Ð¸ Ð¸Ð·Ð¼ÐµÐ½Ð¸ÑÑ Ð¾ÑÐ¾ÑÐ¼Ð»ÐµÐ½Ð¸Ðµ %s"
-
 #: lib/groupsbymemberssection.php:71
 msgid "Groups with most members"
 msgstr "ÐÑÑÐ¿Ð¿Ñ Ñ Ð½Ð°Ð¸Ð±Ð¾Ð»ÑÑÐ¸Ð¼ ÐºÐ¾Ð»Ð¸ÑÐµÑÑÐ²Ð¾Ð¼ ÑÑÐ°ÑÑÐ½Ð¸ÐºÐ¾Ð²"
@@ -6206,7 +6216,8 @@ msgstr "ÐÑÐ¾Ñ ÑÐ°Ð¹Ð» ÑÐ»Ð¸ÑÐºÐ¾Ð¼ Ð±Ð¾Ð»ÑÑÐ¾Ð¹. ÐÐ°ÐºÑÐ¸Ð¼Ð°Ð»ÑÐ½Ñ
 msgid "Partial upload."
 msgstr "Ð§Ð°ÑÑÐ¸ÑÐ½Ð°Ñ Ð·Ð°Ð³ÑÑÐ·ÐºÐ°."
 
-#: lib/imagefile.php:101 lib/mediafile.php:170
+#. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
+#: lib/imagefile.php:101 lib/mediafile.php:179
 msgid "System error uploading file."
 msgstr "Ð¡Ð¸ÑÑÐµÐ¼Ð½Ð°Ñ Ð¾ÑÐ¸Ð±ÐºÐ° Ð¿ÑÐ¸ Ð·Ð°Ð³ÑÑÐ·ÐºÐµ ÑÐ°Ð¹Ð»Ð°."
 
@@ -6608,61 +6619,63 @@ msgstr "ÐÑÐ¾ÑÑÐ¸ÑÐµ, Ð²ÑÐ¾Ð´ÑÑÐ¸Ñ Ð¿Ð¸ÑÐµÐ¼ Ð½ÐµÑ."
 msgid "Unsupported message type: %s"
 msgstr "ÐÐµÐ¿Ð¾Ð´Ð´ÐµÑÐ¶Ð¸Ð²Ð°ÐµÐ¼ÑÐ¹ ÑÐ¾ÑÐ¼Ð°Ñ ÑÐ°Ð¹Ð»Ð° Ð¸Ð·Ð¾Ð±ÑÐ°Ð¶ÐµÐ½Ð¸Ñ: %s"
 
-#: lib/mediafile.php:98 lib/mediafile.php:123
+#. TRANS: Client exception thrown when a database error was thrown during a file upload operation.
+#: lib/mediafile.php:99 lib/mediafile.php:125
 msgid "There was a database error while saving your file. Please try again."
 msgstr ""
 "ÐÑÐ¸ ÑÐ¾ÑÑÐ°Ð½ÐµÐ½Ð¸Ð¸ Ð²Ð°ÑÐµÐ³Ð¾ ÑÐ°Ð¹Ð»Ð° Ð²Ð¾Ð·Ð½Ð¸ÐºÐ»Ð° Ð¾ÑÐ¸Ð±ÐºÐ° Ð±Ð°Ð·Ñ Ð´Ð°Ð½Ð½ÑÑ. ÐÐ¾Ð¶Ð°Ð»ÑÐ¹ÑÑÐ°, "
 "Ð¿Ð¾Ð¿ÑÐ¾Ð±ÑÐ¹ÑÐµ ÐµÑÑ ÑÐ°Ð·."
 
-#: lib/mediafile.php:142
+#. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
+#: lib/mediafile.php:145
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
 msgstr "ÐÐ°Ð³ÑÑÐ¶Ð°ÐµÐ¼ÑÐ¹ ÑÐ°Ð¹Ð» Ð¿ÑÐµÐ²ÑÑÐ°ÐµÑ Ð´Ð¸ÑÐµÐºÑÐ¸Ð²Ñ upload_max_filesize Ð² php.ini."
 
-#: lib/mediafile.php:147
+#. TRANS: Client exception.
+#: lib/mediafile.php:151
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form."
 msgstr ""
 "ÐÐ°Ð³ÑÑÐ¶Ð°ÐµÐ¼ÑÐ¹ ÑÐ°Ð¹Ð» Ð¿ÑÐµÐ²ÑÑÐ°ÐµÑ Ð´Ð¸ÑÐµÐºÑÐ¸Ð²Ñ MAX_FILE_SIZE, ÑÐºÐ°Ð·Ð°Ð½Ð½ÑÑ Ð² HTML-ÑÐ¾ÑÐ¼Ðµ."
 
-#: lib/mediafile.php:152
+#. TRANS: Client exception.
+#: lib/mediafile.php:157
 msgid "The uploaded file was only partially uploaded."
 msgstr "ÐÐ°Ð³ÑÑÐ¶Ð°ÐµÐ¼ÑÐ¹ ÑÐ°Ð¹Ð» Ð·Ð°Ð³ÑÑÐ¶ÐµÐ½ ÑÐ¾Ð»ÑÐºÐ¾ ÑÐ°ÑÑÐ¸ÑÐ½Ð¾."
 
-#: lib/mediafile.php:159
+#. TRANS: Client exception thrown when a temporary folder is not present to store a file upload.
+#: lib/mediafile.php:165
 msgid "Missing a temporary folder."
 msgstr "ÐÑÑÑÑÑÑÐ²ÑÐµÑ Ð²ÑÐµÐ¼ÐµÐ½Ð½Ð¾Ð¹ ÐºÐ°ÑÐ°Ð»Ð¾Ð³."
 
-#: lib/mediafile.php:162
+#. TRANS: Client exception thrown when writing to disk is not possible during a file upload operation.
+#: lib/mediafile.php:169
 msgid "Failed to write file to disk."
 msgstr "ÐÐµ ÑÐ´Ð°ÑÑÑÑ Ð·Ð°Ð¿Ð¸ÑÐ°ÑÑ ÑÐ°Ð¹Ð» Ð½Ð° Ð´Ð¸ÑÐº."
 
-#: lib/mediafile.php:165
+#. TRANS: Client exception thrown when a file upload operation has been stopped by an extension.
+#: lib/mediafile.php:173
 msgid "File upload stopped by extension."
 msgstr "ÐÐ°Ð³ÑÑÐ·ÐºÐ° ÑÐ°Ð¹Ð»Ð° Ð¾ÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð° Ð¿Ð¾ ÑÐ°ÑÑÐ¸ÑÐµÐ½Ð¸Ñ."
 
-#: lib/mediafile.php:179 lib/mediafile.php:217
+#. TRANS: Client exception thrown when a file upload operation would cause a user to exceed a set quota.
+#: lib/mediafile.php:189 lib/mediafile.php:232
 msgid "File exceeds user's quota."
 msgstr "Ð¤Ð°Ð¹Ð» Ð¿ÑÐµÐ²ÑÑÐ°ÐµÑ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»ÑÑÐºÑÑ ÐºÐ²Ð¾ÑÑ."
 
-#: lib/mediafile.php:197 lib/mediafile.php:234
+#. TRANS: Client exception thrown when a file upload operation fails because the file could
+#. TRANS: not be moved from the temporary folder to the permanent file location.
+#: lib/mediafile.php:209 lib/mediafile.php:251
 msgid "File could not be moved to destination directory."
 msgstr "Ð¤Ð°Ð¹Ð» Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ Ð±ÑÑÑ Ð¿ÐµÑÐµÐ¼ÐµÑÑÐ½ Ð² ÑÐµÐ»ÐµÐ²ÑÑ Ð´Ð¸ÑÐµÐºÑÐ¾ÑÐ¸Ñ."
 
-#: lib/mediafile.php:202 lib/mediafile.php:238
+#. TRANS: Client exception thrown when a file upload operation has been stopped because the MIME
+#. TRANS: type of the uploaded file could not be determined.
+#: lib/mediafile.php:216 lib/mediafile.php:257
 msgid "Could not determine file's MIME type."
 msgstr "ÐÐµ ÑÐ´Ð°ÑÑÑÑ Ð¾Ð¿ÑÐµÐ´ÐµÐ»Ð¸ÑÑ mime-ÑÐ¸Ð¿ ÑÐ°Ð¹Ð»Ð°."
 
-#: lib/mediafile.php:318
-#, php-format
-msgid " Try using another %s format."
-msgstr " ÐÐ¾Ð¿ÑÐ¾Ð±ÑÐ¹ÑÐµ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÑ Ð´ÑÑÐ³Ð¾Ð¹ ÑÐ¾ÑÐ¼Ð°Ñ %s."
-
-#: lib/mediafile.php:323
-#, php-format
-msgid "%s is not a supported file type on this server."
-msgstr "Ð¢Ð¸Ð¿ ÑÐ°Ð¹Ð»Ð° %s Ð½Ðµ Ð¿Ð¾Ð´Ð´ÐµÑÐ¶Ð¸Ð²Ð°ÐµÑÑÑ Ð½Ðµ ÑÑÐ¾Ð¼ ÑÐµÑÐ²ÐµÑÐµ."
-
 #: lib/messageform.php:120
 msgid "Send a direct notice"
 msgstr "ÐÐ¾ÑÐ»Ð°ÑÑ Ð¿ÑÑÐ¼ÑÑ Ð·Ð°Ð¿Ð¸ÑÑ"
@@ -6778,27 +6791,7 @@ msgstr "Â«ÐÐ¾Ð´ÑÐ¾Ð»ÐºÐ½ÑÑÑÂ»"
 msgid "Send a nudge to this user"
 msgstr "Â«ÐÐ¾Ð´ÑÐ¾Ð»ÐºÐ½ÑÑÑÂ» ÑÑÐ¾Ð³Ð¾ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ"
 
-#: lib/oauthstore.php:283
-msgid "Error inserting new profile"
-msgstr "ÐÑÐ¸Ð±ÐºÐ° Ð¿ÑÐ¸ Ð²ÑÑÐ°Ð²ÐºÐµ Ð½Ð¾Ð²Ð¾Ð³Ð¾ Ð¿ÑÐ¾ÑÐ¸Ð»Ñ"
-
-#: lib/oauthstore.php:291
-msgid "Error inserting avatar"
-msgstr "ÐÑÐ¸Ð±ÐºÐ° Ð¿ÑÐ¸ Ð²ÑÑÐ°Ð²ÐºÐµ Ð°Ð²Ð°ÑÐ°ÑÑ"
-
-#: lib/oauthstore.php:306
-msgid "Error updating remote profile"
-msgstr "ÐÑÐ¸Ð±ÐºÐ° Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ ÑÐ´Ð°Ð»ÑÐ½Ð½Ð¾Ð³Ð¾ Ð¿ÑÐ¾ÑÐ¸Ð»Ñ"
-
-#: lib/oauthstore.php:311
-msgid "Error inserting remote profile"
-msgstr "ÐÑÐ¸Ð±ÐºÐ° Ð²ÑÑÐ°Ð²ÐºÐ¸ ÑÐ´Ð°Ð»ÑÐ½Ð½Ð¾Ð³Ð¾ Ð¿ÑÐ¾ÑÐ¸Ð»Ñ"
-
-#: lib/oauthstore.php:345
-msgid "Duplicate notice"
-msgstr "ÐÑÐ±Ð»Ð¸ÑÐ¾Ð²Ð°ÑÑ Ð·Ð°Ð¿Ð¸ÑÑ"
-
-#: lib/oauthstore.php:490
+#: lib/oauthstore.php:491
 msgid "Couldn't insert new subscription."
 msgstr "ÐÐµ ÑÐ´Ð°ÑÑÑÑ Ð²ÑÑÐ°Ð²Ð¸ÑÑ Ð½Ð¾Ð²ÑÑ Ð¿Ð¾Ð´Ð¿Ð¸ÑÐºÑ."
 
@@ -6835,7 +6828,8 @@ msgstr "ÐÐ°ÑÐ¸ Ð¸ÑÑÐ¾Ð´ÑÑÐ¸Ðµ ÑÐ¾Ð¾Ð±ÑÐµÐ½Ð¸Ñ"
 msgid "Tags in %s's notices"
 msgstr "Ð¢ÐµÐ³Ð¸ Ð·Ð°Ð¿Ð¸ÑÐµÐ¹ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ %s"
 
-#: lib/plugin.php:115
+#. TRANS: Displayed as version information for a plugin if no version information was found.
+#: lib/plugin.php:116
 msgid "Unknown"
 msgstr "ÐÐµÐ¸Ð·Ð²ÐµÑÑÐ½Ð¾"
 
@@ -6929,19 +6923,19 @@ msgstr "ÐÐµÑÐ¾ÑÐ½Ð¸ÑÐ°"
 msgid "Sandbox this user"
 msgstr "Ð£ÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÑ ÑÐµÐ¶Ð¸Ð¼ Ð¿ÐµÑÐ¾ÑÐ½Ð¸ÑÑ Ð´Ð»Ñ ÑÑÐ¾Ð³Ð¾ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ"
 
-#: lib/searchaction.php:120
+#. TRANS: Fieldset legend for the search form.
+#: lib/searchaction.php:121
 msgid "Search site"
 msgstr "ÐÐ¾Ð¸ÑÐº Ð¿Ð¾ ÑÐ°Ð¹ÑÑ"
 
-#: lib/searchaction.php:126
+#. TRANS: Used as a field label for the field where one or more keywords
+#. TRANS: for searching can be entered.
+#: lib/searchaction.php:129
 msgid "Keyword(s)"
 msgstr "ÐÐ»ÑÑÐµÐ²ÑÐµ ÑÐ»Ð¾Ð²Ð°"
 
-#: lib/searchaction.php:127
-msgid "Search"
-msgstr "ÐÐ¾Ð¸ÑÐº"
-
-#: lib/searchaction.php:162
+#. TRANS: Definition list item with instructions on how to get (better) search results.
+#: lib/searchaction.php:170
 msgid "Search help"
 msgstr "Ð¡Ð¿ÑÐ°Ð²ÐºÐ° Ð¿Ð¾ Ð¿Ð¾Ð¸ÑÐºÑ"
 
@@ -7140,56 +7134,32 @@ msgid "Moderator"
 msgstr "ÐÐ¾Ð´ÐµÑÐ°ÑÐ¾Ñ"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1102
+#: lib/util.php:1103
 msgid "a few seconds ago"
 msgstr "Ð¿Ð°ÑÑ ÑÐµÐºÑÐ½Ð´ Ð½Ð°Ð·Ð°Ð´"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1105
+#: lib/util.php:1106
 msgid "about a minute ago"
 msgstr "Ð¾ÐºÐ¾Ð»Ð¾ Ð¼Ð¸Ð½ÑÑÑ Ð½Ð°Ð·Ð°Ð´"
 
-#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1109
-#, php-format
-msgid "about %d minutes ago"
-msgstr "Ð¾ÐºÐ¾Ð»Ð¾ %d Ð¼Ð¸Ð½ÑÑ(Ñ) Ð½Ð°Ð·Ð°Ð´"
-
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 #: lib/util.php:1112
 msgid "about an hour ago"
 msgstr "Ð¾ÐºÐ¾Ð»Ð¾ ÑÐ°ÑÐ° Ð½Ð°Ð·Ð°Ð´"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1116
-#, php-format
-msgid "about %d hours ago"
-msgstr "Ð¾ÐºÐ¾Ð»Ð¾ %d ÑÐ°ÑÐ°(Ð¾Ð²) Ð½Ð°Ð·Ð°Ð´"
-
-#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1119
+#: lib/util.php:1118
 msgid "about a day ago"
 msgstr "Ð¾ÐºÐ¾Ð»Ð¾ Ð´Ð½Ñ Ð½Ð°Ð·Ð°Ð´"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1123
-#, php-format
-msgid "about %d days ago"
-msgstr "Ð¾ÐºÐ¾Ð»Ð¾ %d Ð´Ð½Ñ(ÐµÐ¹) Ð½Ð°Ð·Ð°Ð´"
-
-#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1126
+#: lib/util.php:1124
 msgid "about a month ago"
 msgstr "Ð¾ÐºÐ¾Ð»Ð¾ Ð¼ÐµÑÑÑÐ° Ð½Ð°Ð·Ð°Ð´"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 #: lib/util.php:1130
-#, php-format
-msgid "about %d months ago"
-msgstr "Ð¾ÐºÐ¾Ð»Ð¾ %d Ð¼ÐµÑÑÑÐ°(ÐµÐ²) Ð½Ð°Ð·Ð°Ð´"
-
-#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1133
 msgid "about a year ago"
 msgstr "Ð¾ÐºÐ¾Ð»Ð¾ Ð³Ð¾Ð´Ð° Ð½Ð°Ð·Ð°Ð´"
 
diff --git a/locale/statusnet.pot b/locale/statusnet.pot
index 4656cdd1fc..0289924243 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-09-09 18:07+0000\n"
+"POT-Creation-Date: 2010-09-14 19:53+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"
@@ -19,7 +19,7 @@ msgstr ""
 
 #. TRANS: Page title
 #. TRANS: Menu item for site administration
-#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:376
+#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:363
 msgid "Access"
 msgstr ""
 
@@ -72,10 +72,10 @@ 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 actions/emailsettings.php:224
-#: actions/imsettings.php:184 actions/smssettings.php:209
-#: lib/applicationeditform.php:361
+#. TRANS: Button label in the "Edit application" form.
+#: actions/accessadminpanel.php:203 actions/emailsettings.php:228
+#: actions/imsettings.php:187 actions/smssettings.php:209
+#: lib/applicationeditform.php:351
 msgctxt "BUTTON"
 msgid "Save"
 msgstr ""
@@ -88,15 +88,15 @@ msgstr ""
 
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #: actions/all.php:79 actions/allrss.php:68
-#: actions/apiaccountupdatedeliverydevice.php:114
-#: actions/apiaccountupdateprofile.php:105
-#: actions/apiaccountupdateprofilebackgroundimage.php:116
-#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
-#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
-#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:113
-#: actions/apigroupismember.php:91 actions/apigroupjoin.php:100
-#: actions/apigroupleave.php:100 actions/apigrouplist.php:73
-#: actions/apistatusesupdate.php:229 actions/apisubscriptions.php:87
+#: actions/apiaccountupdatedeliverydevice.php:115
+#: actions/apiaccountupdateprofile.php:106
+#: actions/apiaccountupdateprofilebackgroundimage.php:117
+#: actions/apiaccountupdateprofileimage.php:106 actions/apiblockcreate.php:98
+#: actions/apiblockdestroy.php:97 actions/apidirectmessage.php:77
+#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:114
+#: actions/apigroupismember.php:91 actions/apigroupjoin.php:101
+#: actions/apigroupleave.php:101 actions/apigrouplist.php:73
+#: actions/apistatusesupdate.php:230 actions/apisubscriptions.php:87
 #: actions/apitimelinefavorites.php:72 actions/apitimelinefriends.php:174
 #: actions/apitimelinehome.php:80 actions/apitimelinementions.php:80
 #: actions/apitimelineuser.php:82 actions/avatarbynickname.php:75
@@ -188,16 +188,16 @@ msgid "Updates from %1$s and friends on %2$s!"
 msgstr ""
 
 #: actions/apiaccountratelimitstatus.php:72
-#: actions/apiaccountupdatedeliverydevice.php:94
-#: actions/apiaccountupdateprofile.php:97
-#: actions/apiaccountupdateprofilebackgroundimage.php:94
-#: actions/apiaccountupdateprofilecolors.php:118
+#: actions/apiaccountupdatedeliverydevice.php:95
+#: actions/apiaccountupdateprofile.php:98
+#: actions/apiaccountupdateprofilebackgroundimage.php:95
+#: actions/apiaccountupdateprofilecolors.php:119
 #: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156
-#: actions/apifavoritecreate.php:100 actions/apifavoritedestroy.php:101
-#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100
-#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:139
-#: actions/apigroupismember.php:115 actions/apigroupjoin.php:156
-#: actions/apigroupleave.php:142 actions/apigrouplist.php:137
+#: actions/apifavoritecreate.php:101 actions/apifavoritedestroy.php:102
+#: actions/apifriendshipscreate.php:101 actions/apifriendshipsdestroy.php:101
+#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:140
+#: actions/apigroupismember.php:115 actions/apigroupjoin.php:157
+#: actions/apigroupleave.php:143 actions/apigrouplist.php:137
 #: actions/apigrouplistall.php:122 actions/apigroupmembership.php:107
 #: actions/apigroupshow.php:116 actions/apihelptest.php:88
 #: actions/apistatusesdestroy.php:104 actions/apistatusesretweets.php:112
@@ -212,47 +212,49 @@ msgstr ""
 msgid "API method not found."
 msgstr ""
 
-#: actions/apiaccountupdatedeliverydevice.php:86
-#: actions/apiaccountupdateprofile.php:89
-#: actions/apiaccountupdateprofilebackgroundimage.php:86
-#: actions/apiaccountupdateprofilecolors.php:110
-#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89
-#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109
-#: actions/apifavoritecreate.php:91 actions/apifavoritedestroy.php:92
-#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
-#: actions/apigroupcreate.php:105 actions/apigroupjoin.php:92
-#: actions/apigroupleave.php:92 actions/apimediaupload.php:67
-#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:198
+#. TRANS: Client error message. POST is a HTTP command. It should not be translated.
+#. TRANS: Client error. POST is a HTTP command. It should not be translated.
+#: actions/apiaccountupdatedeliverydevice.php:87
+#: actions/apiaccountupdateprofile.php:90
+#: actions/apiaccountupdateprofilebackgroundimage.php:87
+#: actions/apiaccountupdateprofilecolors.php:111
+#: actions/apiaccountupdateprofileimage.php:85 actions/apiblockcreate.php:90
+#: actions/apiblockdestroy.php:89 actions/apidirectmessagenew.php:110
+#: actions/apifavoritecreate.php:92 actions/apifavoritedestroy.php:93
+#: actions/apifriendshipscreate.php:92 actions/apifriendshipsdestroy.php:92
+#: actions/apigroupcreate.php:106 actions/apigroupjoin.php:93
+#: actions/apigroupleave.php:93 actions/apimediaupload.php:68
+#: actions/apistatusesretweet.php:66 actions/apistatusesupdate.php:199
 msgid "This method requires a POST."
 msgstr ""
 
-#: actions/apiaccountupdatedeliverydevice.php:106
+#: actions/apiaccountupdatedeliverydevice.php:107
 msgid ""
 "You must specify a parameter named 'device' with a value of one of: sms, im, "
 "none."
 msgstr ""
 
-#: actions/apiaccountupdatedeliverydevice.php:133
+#: actions/apiaccountupdatedeliverydevice.php:134
 msgid "Could not update user."
 msgstr ""
 
-#: actions/apiaccountupdateprofile.php:112
-#: actions/apiaccountupdateprofilebackgroundimage.php:194
-#: actions/apiaccountupdateprofilecolors.php:185
-#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/apiaccountupdateprofile.php:113
+#: actions/apiaccountupdateprofilebackgroundimage.php:195
+#: actions/apiaccountupdateprofilecolors.php:186
+#: actions/apiaccountupdateprofileimage.php:131 actions/apiusershow.php:108
 #: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/hcard.php:74
 #: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
 #: lib/profileaction.php:84
 msgid "User has no profile."
 msgstr ""
 
-#: actions/apiaccountupdateprofile.php:147
+#: actions/apiaccountupdateprofile.php:148
 msgid "Could not save profile."
 msgstr ""
 
-#: actions/apiaccountupdateprofilebackgroundimage.php:108
-#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
-#: actions/apistatusesupdate.php:212 actions/avatarsettings.php:257
+#: actions/apiaccountupdateprofilebackgroundimage.php:109
+#: actions/apiaccountupdateprofileimage.php:98 actions/apimediaupload.php:81
+#: actions/apistatusesupdate.php:213 actions/avatarsettings.php:257
 #: actions/designadminpanel.php:123 actions/editapplication.php:118
 #: actions/newapplication.php:101 actions/newnotice.php:94
 #: lib/designsettings.php:283
@@ -262,30 +264,30 @@ msgid ""
 "current configuration."
 msgstr ""
 
-#: actions/apiaccountupdateprofilebackgroundimage.php:136
-#: actions/apiaccountupdateprofilebackgroundimage.php:146
-#: actions/apiaccountupdateprofilecolors.php:164
-#: actions/apiaccountupdateprofilecolors.php:174
+#: actions/apiaccountupdateprofilebackgroundimage.php:137
+#: actions/apiaccountupdateprofilebackgroundimage.php:147
+#: actions/apiaccountupdateprofilecolors.php:165
+#: actions/apiaccountupdateprofilecolors.php:175
 #: actions/groupdesignsettings.php:290 actions/groupdesignsettings.php:300
 #: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
 #: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
 msgid "Unable to save your design settings."
 msgstr ""
 
-#: actions/apiaccountupdateprofilebackgroundimage.php:187
-#: actions/apiaccountupdateprofilecolors.php:142
+#: actions/apiaccountupdateprofilebackgroundimage.php:188
+#: actions/apiaccountupdateprofilecolors.php:143
 msgid "Could not update your design."
 msgstr ""
 
-#: actions/apiblockcreate.php:105
+#: actions/apiblockcreate.php:106
 msgid "You cannot block yourself!"
 msgstr ""
 
-#: actions/apiblockcreate.php:126
+#: actions/apiblockcreate.php:127
 msgid "Block user failed."
 msgstr ""
 
-#: actions/apiblockdestroy.php:114
+#: actions/apiblockdestroy.php:115
 msgid "Unblock user failed."
 msgstr ""
 
@@ -309,59 +311,59 @@ msgstr ""
 msgid "All the direct messages sent to %s"
 msgstr ""
 
-#: actions/apidirectmessagenew.php:118
+#: actions/apidirectmessagenew.php:119
 msgid "No message text!"
 msgstr ""
 
-#: actions/apidirectmessagenew.php:127 actions/newmessage.php:150
+#: actions/apidirectmessagenew.php:128 actions/newmessage.php:150
 #, php-format
 msgid "That's too long. Max message size is %d chars."
 msgstr ""
 
-#: actions/apidirectmessagenew.php:138
+#: actions/apidirectmessagenew.php:139
 msgid "Recipient user not found."
 msgstr ""
 
-#: actions/apidirectmessagenew.php:142
+#: actions/apidirectmessagenew.php:143
 msgid "Can't send direct messages to users who aren't your friend."
 msgstr ""
 
-#: actions/apifavoritecreate.php:109 actions/apifavoritedestroy.php:110
+#: actions/apifavoritecreate.php:110 actions/apifavoritedestroy.php:111
 #: actions/apistatusesdestroy.php:121
 msgid "No status found with that ID."
 msgstr ""
 
-#: actions/apifavoritecreate.php:120
+#: actions/apifavoritecreate.php:121
 msgid "This status is already a favorite."
 msgstr ""
 
 #. TRANS: Error message text shown when a favorite could not be set.
-#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:296
+#: actions/apifavoritecreate.php:132 actions/favor.php:84 lib/command.php:296
 msgid "Could not create favorite."
 msgstr ""
 
-#: actions/apifavoritedestroy.php:123
+#: actions/apifavoritedestroy.php:124
 msgid "That status is not a favorite."
 msgstr ""
 
-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
+#: actions/apifavoritedestroy.php:136 actions/disfavor.php:87
 msgid "Could not delete favorite."
 msgstr ""
 
-#: actions/apifriendshipscreate.php:109
+#: actions/apifriendshipscreate.php:110
 msgid "Could not follow user: profile not found."
 msgstr ""
 
-#: actions/apifriendshipscreate.php:118
+#: actions/apifriendshipscreate.php:119
 #, php-format
 msgid "Could not follow user: %s is already on your list."
 msgstr ""
 
-#: actions/apifriendshipsdestroy.php:109
+#: actions/apifriendshipsdestroy.php:110
 msgid "Could not unfollow user: User not found."
 msgstr ""
 
-#: actions/apifriendshipsdestroy.php:120
+#: actions/apifriendshipsdestroy.php:121
 msgid "You cannot unfollow yourself."
 msgstr ""
 
@@ -377,101 +379,101 @@ msgstr ""
 msgid "Could not find target user."
 msgstr ""
 
-#: actions/apigroupcreate.php:167 actions/editgroup.php:186
+#: actions/apigroupcreate.php:168 actions/editgroup.php:186
 #: actions/newgroup.php:126 actions/profilesettings.php:215
 #: actions/register.php:212
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr ""
 
-#: actions/apigroupcreate.php:176 actions/editgroup.php:190
+#: actions/apigroupcreate.php:177 actions/editgroup.php:190
 #: actions/newgroup.php:130 actions/profilesettings.php:238
 #: actions/register.php:215
 msgid "Nickname already in use. Try another one."
 msgstr ""
 
-#: actions/apigroupcreate.php:183 actions/editgroup.php:193
+#: actions/apigroupcreate.php:184 actions/editgroup.php:193
 #: actions/newgroup.php:133 actions/profilesettings.php:218
 #: actions/register.php:217
 msgid "Not a valid nickname."
 msgstr ""
 
-#: actions/apigroupcreate.php:199 actions/editapplication.php:215
+#: actions/apigroupcreate.php:200 actions/editapplication.php:215
 #: actions/editgroup.php:199 actions/newapplication.php:203
 #: actions/newgroup.php:139 actions/profilesettings.php:222
 #: actions/register.php:224
 msgid "Homepage is not a valid URL."
 msgstr ""
 
-#: actions/apigroupcreate.php:208 actions/editgroup.php:202
+#: actions/apigroupcreate.php:209 actions/editgroup.php:202
 #: actions/newgroup.php:142 actions/profilesettings.php:225
 #: actions/register.php:227
 msgid "Full name is too long (max 255 chars)."
 msgstr ""
 
-#: actions/apigroupcreate.php:216 actions/editapplication.php:190
+#: actions/apigroupcreate.php:217 actions/editapplication.php:190
 #: actions/newapplication.php:172
 #, php-format
 msgid "Description is too long (max %d chars)."
 msgstr ""
 
-#: actions/apigroupcreate.php:227 actions/editgroup.php:208
+#: actions/apigroupcreate.php:228 actions/editgroup.php:208
 #: actions/newgroup.php:148 actions/profilesettings.php:232
 #: actions/register.php:234
 msgid "Location is too long (max 255 chars)."
 msgstr ""
 
-#: actions/apigroupcreate.php:246 actions/editgroup.php:219
+#: actions/apigroupcreate.php:247 actions/editgroup.php:219
 #: actions/newgroup.php:159
 #, php-format
 msgid "Too many aliases! Maximum %d."
 msgstr ""
 
-#: actions/apigroupcreate.php:267
+#: actions/apigroupcreate.php:268
 #, php-format
 msgid "Invalid alias: \"%s\"."
 msgstr ""
 
-#: actions/apigroupcreate.php:276 actions/editgroup.php:232
+#: actions/apigroupcreate.php:277 actions/editgroup.php:232
 #: actions/newgroup.php:172
 #, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr ""
 
-#: actions/apigroupcreate.php:289 actions/editgroup.php:238
+#: actions/apigroupcreate.php:290 actions/editgroup.php:238
 #: actions/newgroup.php:178
 msgid "Alias can't be the same as nickname."
 msgstr ""
 
-#: actions/apigroupismember.php:96 actions/apigroupjoin.php:105
-#: actions/apigroupleave.php:105 actions/apigroupmembership.php:92
+#: actions/apigroupismember.php:96 actions/apigroupjoin.php:106
+#: actions/apigroupleave.php:106 actions/apigroupmembership.php:92
 #: actions/apigroupshow.php:83 actions/apitimelinegroup.php:92
 msgid "Group not found."
 msgstr ""
 
 #. TRANS: Error text shown a user tries to join a group they already are a member of.
-#: actions/apigroupjoin.php:111 actions/joingroup.php:100 lib/command.php:336
+#: actions/apigroupjoin.php:112 actions/joingroup.php:100 lib/command.php:336
 msgid "You are already a member of that group."
 msgstr ""
 
 #. TRANS: Error text shown when a user tries to join a group they are blocked from joining.
-#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:341
+#: actions/apigroupjoin.php:121 actions/joingroup.php:105 lib/command.php:341
 msgid "You have been blocked from that group by the admin."
 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.
-#: actions/apigroupjoin.php:139 actions/joingroup.php:134 lib/command.php:353
+#: actions/apigroupjoin.php:140 actions/joingroup.php:134 lib/command.php:353
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr ""
 
-#: actions/apigroupleave.php:115
+#: actions/apigroupleave.php:116
 msgid "You are not a member of this group."
 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.
-#: actions/apigroupleave.php:125 actions/leavegroup.php:129
+#: actions/apigroupleave.php:126 actions/leavegroup.php:129
 #: lib/command.php:401
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
@@ -501,7 +503,7 @@ msgstr ""
 msgid "groups on %s"
 msgstr ""
 
-#: actions/apimediaupload.php:99
+#: actions/apimediaupload.php:100
 msgid "Upload failed."
 msgstr ""
 
@@ -515,9 +517,9 @@ msgstr ""
 
 #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
 #: actions/deletenotice.php:169 actions/disfavor.php:74
-#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:55
+#: actions/emailsettings.php:271 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:66 actions/imsettings.php:227
+#: actions/groupunblock.php:66 actions/imsettings.php:230
 #: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
@@ -560,8 +562,8 @@ msgstr ""
 #. 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:286 actions/grouplogo.php:322
-#: actions/imsettings.php:242 actions/newapplication.php:121
+#: actions/emailsettings.php:290 actions/grouplogo.php:322
+#: actions/imsettings.php:245 actions/newapplication.php:121
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
 #: actions/smssettings.php:277 lib/designsettings.php:304
 msgid "Unexpected form submission."
@@ -622,18 +624,18 @@ msgstr ""
 msgid "You may not delete another user's status."
 msgstr ""
 
-#: actions/apistatusesretweet.php:75 actions/apistatusesretweets.php:72
+#: actions/apistatusesretweet.php:76 actions/apistatusesretweets.php:72
 #: actions/deletenotice.php:52 actions/shownotice.php:92
 msgid "No such notice."
 msgstr ""
 
 #. TRANS: Error text shown when trying to repeat an own notice.
-#: actions/apistatusesretweet.php:83 lib/command.php:538
+#: actions/apistatusesretweet.php:84 lib/command.php:538
 msgid "Cannot repeat your own notice."
 msgstr ""
 
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-#: actions/apistatusesretweet.php:91 lib/command.php:544
+#: actions/apistatusesretweet.php:92 lib/command.php:544
 msgid "Already repeated that notice."
 msgstr ""
 
@@ -645,21 +647,21 @@ msgstr ""
 msgid "No status with that ID found."
 msgstr ""
 
-#: actions/apistatusesupdate.php:221
+#: actions/apistatusesupdate.php:222
 msgid "Client must provide a 'status' parameter with a value."
 msgstr ""
 
-#: actions/apistatusesupdate.php:242 actions/newnotice.php:157
+#: actions/apistatusesupdate.php:243 actions/newnotice.php:157
 #: lib/mailhandler.php:60
 #, php-format
 msgid "That's too long. Max notice size is %d chars."
 msgstr ""
 
-#: actions/apistatusesupdate.php:283 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:284 actions/apiusershow.php:96
 msgid "Not found."
 msgstr ""
 
-#: actions/apistatusesupdate.php:306 actions/newnotice.php:181
+#: actions/apistatusesupdate.php:307 actions/newnotice.php:181
 #, php-format
 msgid "Max notice size is %d chars, including attachment URL."
 msgstr ""
@@ -856,7 +858,9 @@ msgid "Yes"
 msgstr ""
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
+#. TRANS: Submit button title.
+#. TRANS: Description of the form to block a user.
+#: actions/block.php:164 actions/groupmembers.php:403 lib/blockform.php:82
 msgid "Block this user"
 msgstr ""
 
@@ -898,11 +902,13 @@ msgstr ""
 msgid "Unblock user from group"
 msgstr ""
 
-#: actions/blockedfromgroup.php:320 lib/unblockform.php:69
+#. TRANS: Title for the form to unblock a user.
+#: actions/blockedfromgroup.php:320 lib/unblockform.php:70
 msgid "Unblock"
 msgstr ""
 
-#: actions/blockedfromgroup.php:320 lib/unblockform.php:80
+#. TRANS: Description of the form to unblock a user.
+#: actions/blockedfromgroup.php:320 lib/unblockform.php:82
 msgid "Unblock this user"
 msgstr ""
 
@@ -941,9 +947,9 @@ msgstr ""
 #. 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/confirmaddress.php:116 actions/emailsettings.php:331
+#: actions/emailsettings.php:477 actions/imsettings.php:283
+#: actions/imsettings.php:442 actions/othersettings.php:174
 #: actions/profilesettings.php:283 actions/smssettings.php:308
 #: actions/smssettings.php:464
 msgid "Couldn't update user."
@@ -951,7 +957,7 @@ msgstr ""
 
 #. 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/confirmaddress.php:128 actions/emailsettings.php:437
 #: actions/smssettings.php:422
 msgid "Couldn't delete email confirmation."
 msgstr ""
@@ -987,9 +993,10 @@ msgstr ""
 msgid "You are not the owner of this application."
 msgstr ""
 
+#. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:127
 #: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1307
+#: lib/action.php:1315
 msgid "There was a problem with your session token."
 msgstr ""
 
@@ -1020,7 +1027,7 @@ msgstr ""
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
 #: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:73 lib/profileformaction.php:64
+#: lib/adminpanelaction.php:71 lib/profileformaction.php:64
 #: lib/settingsaction.php:72
 msgid "Not logged in."
 msgstr ""
@@ -1079,7 +1086,6 @@ msgstr ""
 #. TRANS: Message used as title for design settings for the site.
 #. TRANS: Link description in user account settings menu.
 #: actions/designadminpanel.php:63 lib/accountsettingsaction.php:139
-#: lib/groupnav.php:119
 msgid "Design"
 msgstr ""
 
@@ -1198,13 +1204,13 @@ msgstr ""
 msgid "Reset back to default"
 msgstr ""
 
-#. TRANS: Submit button title
+#. TRANS: Submit button title.
 #: actions/designadminpanel.php:685 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/snapshotadminpanel.php:245
 #: actions/subscriptions.php:226 actions/tagother.php:154
-#: actions/useradminpanel.php:294 lib/applicationeditform.php:363
+#: actions/useradminpanel.php:294 lib/applicationeditform.php:353
 #: lib/designsettings.php:256 lib/groupeditform.php:202
 msgid "Save"
 msgstr ""
@@ -1360,7 +1366,7 @@ msgstr ""
 #. 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/emailsettings.php:115 actions/emailsettings.php:162
 #: actions/imsettings.php:116 actions/smssettings.php:124
 #: actions/smssettings.php:180
 msgctxt "BUTTON"
@@ -1376,22 +1382,26 @@ msgstr ""
 #. 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
+#. TRANS: Button label in the "Edit application" form.
 #: actions/emailsettings.php:127 actions/imsettings.php:131
-#: actions/smssettings.php:137 lib/applicationeditform.php:357
+#: actions/smssettings.php:137 lib/applicationeditform.php:347
 msgctxt "BUTTON"
 msgid "Cancel"
 msgstr ""
 
-#. TRANS: Instructions for e-mail address input form.
-#: actions/emailsettings.php:135
+#. TRANS: Instructions for e-mail address input form. Do not translate
+#. TRANS: "example.org". It is one of the domain names reserved for
+#. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
+#. TRANS: Any other domain may be owned by a legitimate person or
+#. TRANS: organization.
+#: actions/emailsettings.php:139
 msgid "Email address, like \"UserName@example.org\""
 msgstr ""
 
 #. 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/emailsettings.php:143 actions/imsettings.php:151
 #: actions/smssettings.php:162
 msgctxt "BUTTON"
 msgid "Add"
@@ -1399,110 +1409,110 @@ msgstr ""
 
 #. 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
+#: actions/emailsettings.php:151 actions/smssettings.php:171
 msgid "Incoming email"
 msgstr ""
 
 #. 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
+#: actions/emailsettings.php:159 actions/smssettings.php:178
 msgid "Send email to this address to post new notices."
 msgstr ""
 
 #. 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
+#: actions/emailsettings.php:168 actions/smssettings.php:186
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr ""
 
 #. 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
+#: actions/emailsettings.php:172 actions/smssettings.php:189
 msgctxt "BUTTON"
 msgid "New"
 msgstr ""
 
 #. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:174
+#: actions/emailsettings.php:178
 msgid "Email preferences"
 msgstr ""
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:180
+#: actions/emailsettings.php:184
 msgid "Send me notices of new subscriptions through email."
 msgstr ""
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:186
+#: actions/emailsettings.php:190
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr ""
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:193
+#: actions/emailsettings.php:197
 msgid "Send me email when someone sends me a private message."
 msgstr ""
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:199
+#: actions/emailsettings.php:203
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr ""
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:205
+#: actions/emailsettings.php:209
 msgid "Allow friends to nudge me and send me an email."
 msgstr ""
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:212
+#: actions/emailsettings.php:216
 msgid "I want to post notices by email."
 msgstr ""
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:219
+#: actions/emailsettings.php:223
 msgid "Publish a MicroID for my email address."
 msgstr ""
 
 #. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:334
+#: actions/emailsettings.php:338
 msgid "Email preferences saved."
 msgstr ""
 
 #. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:353
+#: actions/emailsettings.php:357
 msgid "No email address."
 msgstr ""
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:361
+#: actions/emailsettings.php:365
 msgid "Cannot normalize that email address"
 msgstr ""
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:208
+#: actions/emailsettings.php:370 actions/register.php:208
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr ""
 
 #. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:370
+#: actions/emailsettings.php:374
 msgid "That is already your email address."
 msgstr ""
 
 #. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:374
+#: actions/emailsettings.php:378
 msgid "That email address already belongs to another user."
 msgstr ""
 
 #. 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/emailsettings.php:395 actions/imsettings.php:351
 #: actions/smssettings.php:373
 msgid "Couldn't insert confirmation code."
 msgstr ""
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:398
+#: actions/emailsettings.php:402
 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."
@@ -1511,50 +1521,50 @@ msgstr ""
 #. 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/emailsettings.php:423 actions/imsettings.php:386
 #: actions/smssettings.php:408
 msgid "No pending confirmation to cancel."
 msgstr ""
 
 #. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:424
+#: actions/emailsettings.php:428
 msgid "That is the wrong email address."
 msgstr ""
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:438
+#: actions/emailsettings.php:442
 msgid "Email confirmation cancelled."
 msgstr ""
 
 #. TRANS: Message given trying to remove an e-mail address that is not
 #. TRANS: registered for the active user.
-#: actions/emailsettings.php:458
+#: actions/emailsettings.php:462
 msgid "That is not your email address."
 msgstr ""
 
 #. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:479
+#: actions/emailsettings.php:483
 msgid "The email address was removed."
 msgstr ""
 
-#: actions/emailsettings.php:493 actions/smssettings.php:568
+#: actions/emailsettings.php:497 actions/smssettings.php:568
 msgid "No incoming email address."
 msgstr ""
 
 #. 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/emailsettings.php:508 actions/emailsettings.php:532
 #: actions/smssettings.php:578 actions/smssettings.php:602
 msgid "Couldn't update user record."
 msgstr ""
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
-#: actions/emailsettings.php:508 actions/smssettings.php:581
+#: actions/emailsettings.php:512 actions/smssettings.php:581
 msgid "Incoming email address removed."
 msgstr ""
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
-#: actions/emailsettings.php:532 actions/smssettings.php:605
+#: actions/emailsettings.php:536 actions/smssettings.php:605
 msgid "New incoming email address added."
 msgstr ""
 
@@ -1667,7 +1677,7 @@ msgstr ""
 msgid "Remote service uses unknown version of OMB protocol."
 msgstr ""
 
-#: actions/finishremotesubscribe.php:138
+#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306
 msgid "Error updating remote profile."
 msgstr ""
 
@@ -1724,7 +1734,7 @@ msgstr ""
 msgid "User is not a member of group."
 msgstr ""
 
-#: actions/groupblock.php:134 actions/groupmembers.php:360
+#: actions/groupblock.php:134 actions/groupmembers.php:364
 msgid "Block user from group"
 msgstr ""
 
@@ -1799,37 +1809,47 @@ msgstr ""
 msgid "Failed updating logo."
 msgstr ""
 
-#: actions/groupmembers.php:100 lib/groupnav.php:92
+#. TRANS: Title of the page showing group members.
+#. TRANS: %s is the name of the group.
+#: actions/groupmembers.php:102
 #, php-format
 msgid "%s group members"
 msgstr ""
 
-#: actions/groupmembers.php:103
+#. TRANS: Title of the page showing group members.
+#. TRANS: %1$s is the name of the group, %2$d is the page number of the members list.
+#: actions/groupmembers.php:107
 #, php-format
 msgid "%1$s group members, page %2$d"
 msgstr ""
 
-#: actions/groupmembers.php:118
+#: actions/groupmembers.php:122
 msgid "A list of the users in this group."
 msgstr ""
 
-#: actions/groupmembers.php:182 lib/groupnav.php:107
+#: actions/groupmembers.php:186
 msgid "Admin"
 msgstr ""
 
-#: actions/groupmembers.php:392 lib/blockform.php:69
+#. TRANS: Button text for the form that will block a user from a group.
+#: actions/groupmembers.php:399
+msgctxt "BUTTON"
 msgid "Block"
 msgstr ""
 
-#: actions/groupmembers.php:487
+#: actions/groupmembers.php:498
 msgid "Make user an admin of the group"
 msgstr ""
 
-#: actions/groupmembers.php:519
+#. TRANS: Button text for the form that will make a user administrator.
+#: actions/groupmembers.php:533
+msgctxt "BUTTON"
 msgid "Make Admin"
 msgstr ""
 
-#: actions/groupmembers.php:519
+#. TRANS: Submit button title.
+#: actions/groupmembers.php:537
+msgctxt "TOOLTIP"
 msgid "Make this user an admin"
 msgstr ""
 
@@ -1955,7 +1975,10 @@ msgstr ""
 
 #. TRANS: IM address input field instructions in IM settings form.
 #. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:140
+#. TRANS: Do not translate "example.org". It is one of the domain names reserved for use in examples by
+#. TRANS: http://www.rfc-editor.org/rfc/rfc2606.txt. Any other domain may be owned by a legitimate
+#. TRANS: person or organization.
+#: actions/imsettings.php:143
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -1963,63 +1986,63 @@ msgid ""
 msgstr ""
 
 #. TRANS: Form legend for IM preferences form.
-#: actions/imsettings.php:155
+#: actions/imsettings.php:158
 msgid "IM preferences"
 msgstr ""
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:160
+#: actions/imsettings.php:163
 msgid "Send me notices through Jabber/GTalk."
 msgstr ""
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:166
+#: actions/imsettings.php:169
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr ""
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:172
+#: actions/imsettings.php:175
 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr ""
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:179
+#: actions/imsettings.php:182
 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr ""
 
 #. TRANS: Confirmation message for successful IM preferences save.
-#: actions/imsettings.php:287 actions/othersettings.php:180
+#: actions/imsettings.php:290 actions/othersettings.php:180
 msgid "Preferences saved."
 msgstr ""
 
 #. TRANS: Message given saving IM address without having provided one.
-#: actions/imsettings.php:309
+#: actions/imsettings.php:312
 msgid "No Jabber ID."
 msgstr ""
 
 #. TRANS: Message given saving IM address that cannot be normalised.
-#: actions/imsettings.php:317
+#: actions/imsettings.php:320
 msgid "Cannot normalize that Jabber ID"
 msgstr ""
 
 #. TRANS: Message given saving IM address that not valid.
-#: actions/imsettings.php:322
+#: actions/imsettings.php:325
 msgid "Not a valid Jabber ID"
 msgstr ""
 
 #. TRANS: Message given saving IM address that is already set.
-#: actions/imsettings.php:326
+#: actions/imsettings.php:329
 msgid "That is already your Jabber ID."
 msgstr ""
 
 #. TRANS: Message given saving IM address that is already set for another user.
-#: actions/imsettings.php:330
+#: actions/imsettings.php:333
 msgid "Jabber ID already belongs to another user."
 msgstr ""
 
 #. 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
+#: actions/imsettings.php:361
 #, php-format
 msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
@@ -2027,28 +2050,28 @@ msgid ""
 msgstr ""
 
 #. TRANS: Message given canceling IM address confirmation for the wrong IM address.
-#: actions/imsettings.php:388
+#: actions/imsettings.php:391
 msgid "That is the wrong IM address."
 msgstr ""
 
 #. TRANS: Server error thrown on database error canceling IM address confirmation.
-#: actions/imsettings.php:397
+#: actions/imsettings.php:400
 msgid "Couldn't delete IM confirmation."
 msgstr ""
 
 #. TRANS: Message given after successfully canceling IM address confirmation.
-#: actions/imsettings.php:402
+#: actions/imsettings.php:405
 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
+#: actions/imsettings.php:427
 msgid "That is not your Jabber ID."
 msgstr ""
 
 #. TRANS: Message given after successfully removing a registered IM address.
-#: actions/imsettings.php:447
+#: actions/imsettings.php:450
 msgid "The IM address was removed."
 msgstr ""
 
@@ -2471,8 +2494,8 @@ msgid "Only %s URLs over plain HTTP please."
 msgstr ""
 
 #. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1215
-#: lib/apiaction.php:1243 lib/apiaction.php:1366
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1206
+#: lib/apiaction.php:1233 lib/apiaction.php:1356
 msgid "Not a supported data format."
 msgstr ""
 
@@ -2612,7 +2635,7 @@ msgid "Password saved."
 msgstr ""
 
 #. TRANS: Menu item for site administration
-#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:384
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:371
 msgid "Paths"
 msgstr ""
 
@@ -2819,7 +2842,7 @@ msgstr ""
 
 #. TRANS: Form input field label.
 #: actions/profilesettings.php:115 actions/register.php:460
-#: lib/applicationeditform.php:244 lib/groupeditform.php:161
+#: lib/applicationeditform.php:235 lib/groupeditform.php:161
 msgid "Homepage"
 msgstr ""
 
@@ -2922,7 +2945,7 @@ msgid "Couldn't save tags."
 msgstr ""
 
 #. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:391 lib/adminpanelaction.php:141
+#: actions/profilesettings.php:391 lib/adminpanelaction.php:138
 msgid "Settings saved."
 msgstr ""
 
@@ -3408,7 +3431,7 @@ msgstr ""
 
 #. TRANS: Menu item for site administration
 #: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
-#: lib/adminpanelaction.php:392
+#: lib/adminpanelaction.php:379
 msgid "Sessions"
 msgstr ""
 
@@ -3446,24 +3469,24 @@ msgid "Application profile"
 msgstr ""
 
 #. TRANS: Form input field label for application icon.
-#: actions/showapplication.php:159 lib/applicationeditform.php:182
+#: actions/showapplication.php:159 lib/applicationeditform.php:173
 msgid "Icon"
 msgstr ""
 
 #. TRANS: Form input field label for application name.
 #: actions/showapplication.php:169 actions/version.php:197
-#: lib/applicationeditform.php:199
+#: lib/applicationeditform.php:190
 msgid "Name"
 msgstr ""
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:178 lib/applicationeditform.php:235
+#: actions/showapplication.php:178 lib/applicationeditform.php:226
 msgid "Organization"
 msgstr ""
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:216 lib/groupeditform.php:172
+#: lib/applicationeditform.php:207 lib/groupeditform.php:172
 msgid "Description"
 msgstr ""
 
@@ -3568,7 +3591,7 @@ msgstr ""
 msgid "This is a way to share what you like."
 msgstr ""
 
-#: actions/showgroup.php:82 lib/groupnav.php:86
+#: actions/showgroup.php:82
 #, php-format
 msgid "%s group"
 msgstr ""
@@ -3620,7 +3643,7 @@ msgstr ""
 msgid "FOAF for %s group"
 msgstr ""
 
-#: actions/showgroup.php:393 actions/showgroup.php:445 lib/groupnav.php:91
+#: actions/showgroup.php:393 actions/showgroup.php:445
 msgid "Members"
 msgstr ""
 
@@ -4040,7 +4063,7 @@ msgstr ""
 
 #. TRANS: Menu item for site administration
 #: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
-#: lib/adminpanelaction.php:408
+#: lib/adminpanelaction.php:395
 msgid "Snapshots"
 msgstr ""
 
@@ -4725,7 +4748,7 @@ msgid "Unable to save tag."
 msgstr ""
 
 #. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#: classes/Subscription.php:75 lib/oauthstore.php:465
+#: classes/Subscription.php:75 lib/oauthstore.php:466
 msgid "You have been banned from subscribing."
 msgstr ""
 
@@ -4873,7 +4896,8 @@ msgid "Change site configuration"
 msgstr ""
 
 #. TRANS: Main menu option when logged in and site admin for access to site configuration
-#: lib/action.php:474
+#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
+#: lib/action.php:474 lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr ""
@@ -4950,7 +4974,7 @@ msgstr ""
 
 #. TRANS: DT element for site notice. String is hidden in default CSS.
 #. TRANS: Menu item for site administration
-#: lib/action.php:538 lib/adminpanelaction.php:400
+#: lib/action.php:538 lib/adminpanelaction.php:387
 msgid "Site notice"
 msgstr ""
 
@@ -5014,7 +5038,10 @@ msgid "StatusNet software license"
 msgstr ""
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
-#: lib/action.php:843
+#. TRANS: Text between [] is a link description, text between () is the link itself.
+#. TRANS: Make sure there is no whitespace between "]" and "(".
+#. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
+#: lib/action.php:846
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -5022,13 +5049,16 @@ msgid ""
 msgstr ""
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:846
+#: lib/action.php:849
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr ""
 
 #. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.
-#: lib/action.php:850
+#. TRANS: Make sure there is no whitespace between "]" and "(".
+#. TRANS: Text between [] is a link description, text between () is the link itself.
+#. TRANS: %s is the version of StatusNet that is being used.
+#: lib/action.php:856
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -5037,49 +5067,50 @@ msgid ""
 msgstr ""
 
 #. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:866
+#: lib/action.php:872
 msgid "Site content license"
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:873
+#: lib/action.php:879
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:880
+#: lib/action.php:886
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:884
+#: lib/action.php:890
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 
-#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:897
+#. TRANS: license message in footer.
+#. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
+#: lib/action.php:904
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr ""
 
 #. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1236
+#: lib/action.php:1243
 msgid "Pagination"
 msgstr ""
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1247
+#: lib/action.php:1254
 msgid "After"
 msgstr ""
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1257
+#: lib/action.php:1264
 msgid "Before"
 msgstr ""
 
@@ -5088,205 +5119,240 @@ msgstr ""
 msgid "Expecting a root feed element but got a whole XML document."
 msgstr ""
 
-#: lib/activityutils.php:208
+#. TRANS: Client exception thrown when there is no source attribute.
+#: lib/activityutils.php:203
 msgid "Can't handle remote content yet."
 msgstr ""
 
-#: lib/activityutils.php:244
+#. TRANS: Client exception thrown when there embedded XML content is found that cannot be processed yet.
+#: lib/activityutils.php:240
 msgid "Can't handle embedded XML content yet."
 msgstr ""
 
-#: lib/activityutils.php:248
+#. TRANS: Client exception thrown when base64 encoded content is found that cannot be processed yet.
+#: lib/activityutils.php:245
 msgid "Can't handle embedded Base64 content yet."
 msgstr ""
 
 #. TRANS: Client error message thrown when a user tries to change admin settings but has no access rights.
-#: lib/adminpanelaction.php:98
+#: lib/adminpanelaction.php:96
 msgid "You cannot make changes to this site."
 msgstr ""
 
 #. TRANS: Client error message throw when a certain panel's settings cannot be changed.
-#: lib/adminpanelaction.php:110
+#: lib/adminpanelaction.php:108
 msgid "Changes to that panel are not allowed."
 msgstr ""
 
 #. TRANS: Client error message.
-#: lib/adminpanelaction.php:229
+#: lib/adminpanelaction.php:222
 msgid "showForm() not implemented."
 msgstr ""
 
 #. TRANS: Client error message
-#: lib/adminpanelaction.php:259
+#: lib/adminpanelaction.php:250
 msgid "saveSettings() not implemented."
 msgstr ""
 
 #. TRANS: Client error message thrown if design settings could not be deleted in
 #. TRANS: the admin panel Design.
-#: lib/adminpanelaction.php:284
+#: lib/adminpanelaction.php:274
 msgid "Unable to delete design setting."
 msgstr ""
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:350
+#: lib/adminpanelaction.php:337
 msgid "Basic site configuration"
 msgstr ""
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:352
+#: lib/adminpanelaction.php:339
 msgctxt "MENU"
 msgid "Site"
 msgstr ""
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:358
+#: lib/adminpanelaction.php:345
 msgid "Design configuration"
 msgstr ""
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:360
+#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
+#: lib/adminpanelaction.php:347 lib/groupnav.php:135
 msgctxt "MENU"
 msgid "Design"
 msgstr ""
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:366
+#: lib/adminpanelaction.php:353
 msgid "User configuration"
 msgstr ""
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:368 lib/personalgroupnav.php:115
+#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:115
 msgid "User"
 msgstr ""
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:374
+#: lib/adminpanelaction.php:361
 msgid "Access configuration"
 msgstr ""
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:382
+#: lib/adminpanelaction.php:369
 msgid "Paths configuration"
 msgstr ""
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:390
+#: lib/adminpanelaction.php:377
 msgid "Sessions configuration"
 msgstr ""
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:398
+#: lib/adminpanelaction.php:385
 msgid "Edit site notice"
 msgstr ""
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:406
+#: lib/adminpanelaction.php:393
 msgid "Snapshots configuration"
 msgstr ""
 
 #. TRANS: Client error 401.
-#: lib/apiauth.php:113
+#: lib/apiauth.php:111
 msgid "API resource requires read-write access, but you only have read access."
 msgstr ""
 
+#. TRANS: OAuth exception thrown when no application is found for a given consumer key.
+#: lib/apiauth.php:175
+msgid "No application for that consumer key."
+msgstr ""
+
+#. TRANS: OAuth exception given when an incorrect access token was given for a user.
+#: lib/apiauth.php:212
+msgid "Bad access token."
+msgstr ""
+
+#. TRANS: OAuth exception given when no user was found for a given token (no token was found).
+#: lib/apiauth.php:217
+msgid "No user for that token."
+msgstr ""
+
+#. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel".
+#. TRANS: Client error thrown when authentication fails.
+#: lib/apiauth.php:258 lib/apiauth.php:290
+msgid "Could not authenticate you."
+msgstr ""
+
+#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
+#: lib/apioauthstore.php:178
+msgid "Tried to revoke unknown token"
+msgstr ""
+
+#. TRANS: Exception thrown when an attempt is made to remove a revoked token.
+#: lib/apioauthstore.php:182
+msgid "Failed to delete revoked token"
+msgstr ""
+
 #. TRANS: Form legend.
-#: lib/applicationeditform.php:137
+#: lib/applicationeditform.php:129
 msgid "Edit application"
 msgstr ""
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:187
+#: lib/applicationeditform.php:178
 msgid "Icon for this application"
 msgstr ""
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:209
+#: lib/applicationeditform.php:200
 #, php-format
 msgid "Describe your application in %d characters"
 msgstr ""
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:213
+#: lib/applicationeditform.php:204
 msgid "Describe your application"
 msgstr ""
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:224
+#: lib/applicationeditform.php:215
 msgid "URL of the homepage of this application"
 msgstr ""
 
 #. TRANS: Form input field label.
-#: lib/applicationeditform.php:226
+#: lib/applicationeditform.php:217
 msgid "Source URL"
 msgstr ""
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:233
+#: lib/applicationeditform.php:224
 msgid "Organization responsible for this application"
 msgstr ""
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:242
+#: lib/applicationeditform.php:233
 msgid "URL for the homepage of the organization"
 msgstr ""
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:251
+#: lib/applicationeditform.php:242
 msgid "URL to redirect to after authentication"
 msgstr ""
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:278
+#: lib/applicationeditform.php:269
 msgid "Browser"
 msgstr ""
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:295
+#: lib/applicationeditform.php:286
 msgid "Desktop"
 msgstr ""
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:297
+#: lib/applicationeditform.php:288
 msgid "Type of application, browser or desktop"
 msgstr ""
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:320
+#: lib/applicationeditform.php:311
 msgid "Read-only"
 msgstr ""
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:339
+#: lib/applicationeditform.php:330
 msgid "Read-write"
 msgstr ""
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:341
+#: lib/applicationeditform.php:332
 msgid "Default access for this application: read-only, or read-write"
 msgstr ""
 
-#. TRANS: Submit button title
-#: lib/applicationeditform.php:359
+#. TRANS: Submit button title.
+#: lib/applicationeditform.php:349
 msgid "Cancel"
 msgstr ""
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:136
+#: lib/applicationlist.php:135
 msgid "read-write"
 msgstr ""
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:138
+#: lib/applicationlist.php:137
 msgid "read-only"
 msgstr ""
 
 #. 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
+#: lib/applicationlist.php:143
 #, php-format
 msgid "Approved %1$s - \"%2$s\" access."
 msgstr ""
 
 #. TRANS: Button label
-#: lib/applicationlist.php:159
+#: lib/applicationlist.php:158
 msgctxt "BUTTON"
 msgid "Revoke"
 msgstr ""
@@ -5306,11 +5372,13 @@ msgstr ""
 msgid "Provider"
 msgstr ""
 
-#: lib/attachmentnoticesection.php:67
+#. TRANS: Title.
+#: lib/attachmentnoticesection.php:68
 msgid "Notices where this attachment appears"
 msgstr ""
 
-#: lib/attachmenttagcloudsection.php:48
+#. TRANS: Title.
+#: lib/attachmenttagcloudsection.php:49
 msgid "Tags for this attachment"
 msgstr ""
 
@@ -5322,6 +5390,11 @@ msgstr ""
 msgid "Password changing is not allowed"
 msgstr ""
 
+#. TRANS: Title for the form to block a user.
+#: lib/blockform.php:70
+msgid "Block"
+msgstr ""
+
 #: lib/channel.php:157 lib/channel.php:177
 msgid "Command results"
 msgstr ""
@@ -5565,7 +5638,7 @@ msgid "You are not subscribed to anyone."
 msgstr ""
 
 #. TRANS: Text shown after requesting other users a user is subscribed to.
-#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.
 #: lib/command.php:836
 msgid "You are subscribed to this person:"
@@ -5580,7 +5653,7 @@ msgid "No one is subscribed to you."
 msgstr ""
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
-#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
 #: lib/command.php:863
 msgid "This person is subscribed to you:"
@@ -5595,7 +5668,7 @@ msgid "You are not a member of any groups."
 msgstr ""
 
 #. TRANS: Text shown after requesting groups a user is subscribed to.
-#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
 #: lib/command.php:890
 msgid "You are a member of this group:"
@@ -5603,6 +5676,7 @@ msgid_plural "You are a member of these groups:"
 msgstr[0] ""
 msgstr[1] ""
 
+#. TRANS: Help text for commands.
 #: lib/command.php:905
 msgid ""
 "Commands:\n"
@@ -5782,35 +5856,75 @@ msgstr ""
 msgid "Extra nicknames for the group, comma- or space- separated, max %d"
 msgstr ""
 
-#: lib/groupnav.php:85
+#. TRANS: Menu item in the group navigation page.
+#: lib/groupnav.php:86
+msgctxt "MENU"
 msgid "Group"
 msgstr ""
 
-#: lib/groupnav.php:101
+#. TRANS: Tooltip for menu item in the group navigation page.
+#. TRANS: %s is the nickname of the group.
+#: lib/groupnav.php:89
+#, php-format
+msgctxt "TOOLTIP"
+msgid "%s group"
+msgstr ""
+
+#. TRANS: Menu item in the group navigation page.
+#: lib/groupnav.php:95
+msgctxt "MENU"
+msgid "Members"
+msgstr ""
+
+#. TRANS: Tooltip for menu item in the group navigation page.
+#. TRANS: %s is the nickname of the group.
+#: lib/groupnav.php:98
+#, php-format
+msgctxt "TOOLTIP"
+msgid "%s group members"
+msgstr ""
+
+#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
+#: lib/groupnav.php:108
+msgctxt "MENU"
 msgid "Blocked"
 msgstr ""
 
-#: lib/groupnav.php:102
+#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
+#. TRANS: %s is the nickname of the group.
+#: lib/groupnav.php:111
 #, php-format
+msgctxt "TOOLTIP"
 msgid "%s blocked users"
 msgstr ""
 
-#: lib/groupnav.php:108
+#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
+#. TRANS: %s is the nickname of the group.
+#: lib/groupnav.php:120
 #, php-format
+msgctxt "TOOLTIP"
 msgid "Edit %s group properties"
 msgstr ""
 
-#: lib/groupnav.php:113
+#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
+#: lib/groupnav.php:126
+msgctxt "MENU"
 msgid "Logo"
 msgstr ""
 
-#: lib/groupnav.php:114
+#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
+#. TRANS: %s is the nickname of the group.
+#: lib/groupnav.php:129
 #, php-format
+msgctxt "TOOLTIP"
 msgid "Add or edit %s logo"
 msgstr ""
 
-#: lib/groupnav.php:120
+#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
+#. TRANS: %s is the nickname of the group.
+#: lib/groupnav.php:138
 #, php-format
+msgctxt "TOOLTIP"
 msgid "Add or edit %s design"
 msgstr ""
 
@@ -5845,7 +5959,8 @@ msgstr ""
 msgid "Partial upload."
 msgstr ""
 
-#: lib/imagefile.php:101 lib/mediafile.php:170
+#. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
+#: lib/imagefile.php:101 lib/mediafile.php:179
 msgid "System error uploading file."
 msgstr ""
 
@@ -6144,56 +6259,75 @@ msgstr ""
 msgid "Unsupported message type: %s"
 msgstr ""
 
-#: lib/mediafile.php:98 lib/mediafile.php:123
+#. TRANS: Client exception thrown when a database error was thrown during a file upload operation.
+#: lib/mediafile.php:99 lib/mediafile.php:125
 msgid "There was a database error while saving your file. Please try again."
 msgstr ""
 
-#: lib/mediafile.php:142
+#. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
+#: lib/mediafile.php:145
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
 msgstr ""
 
-#: lib/mediafile.php:147
+#. TRANS: Client exception.
+#: lib/mediafile.php:151
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form."
 msgstr ""
 
-#: lib/mediafile.php:152
+#. TRANS: Client exception.
+#: lib/mediafile.php:157
 msgid "The uploaded file was only partially uploaded."
 msgstr ""
 
-#: lib/mediafile.php:159
+#. TRANS: Client exception thrown when a temporary folder is not present to store a file upload.
+#: lib/mediafile.php:165
 msgid "Missing a temporary folder."
 msgstr ""
 
-#: lib/mediafile.php:162
+#. TRANS: Client exception thrown when writing to disk is not possible during a file upload operation.
+#: lib/mediafile.php:169
 msgid "Failed to write file to disk."
 msgstr ""
 
-#: lib/mediafile.php:165
+#. TRANS: Client exception thrown when a file upload operation has been stopped by an extension.
+#: lib/mediafile.php:173
 msgid "File upload stopped by extension."
 msgstr ""
 
-#: lib/mediafile.php:179 lib/mediafile.php:217
+#. TRANS: Client exception thrown when a file upload operation would cause a user to exceed a set quota.
+#: lib/mediafile.php:189 lib/mediafile.php:232
 msgid "File exceeds user's quota."
 msgstr ""
 
-#: lib/mediafile.php:197 lib/mediafile.php:234
+#. TRANS: Client exception thrown when a file upload operation fails because the file could
+#. TRANS: not be moved from the temporary folder to the permanent file location.
+#: lib/mediafile.php:209 lib/mediafile.php:251
 msgid "File could not be moved to destination directory."
 msgstr ""
 
-#: lib/mediafile.php:202 lib/mediafile.php:238
+#. TRANS: Client exception thrown when a file upload operation has been stopped because the MIME
+#. TRANS: type of the uploaded file could not be determined.
+#: lib/mediafile.php:216 lib/mediafile.php:257
 msgid "Could not determine file's MIME type."
 msgstr ""
 
-#: lib/mediafile.php:318
+#. TRANS: Client exception thrown trying to upload a forbidden MIME type.
+#. TRANS: %1$s is the file type that was denied, %2$s is the application part of
+#. TRANS: the MIME type that was denied.
+#: lib/mediafile.php:340
 #, php-format
-msgid " Try using another %s format."
+msgid ""
+"\"%1$s\" is not a supported file type on this server. Try using another %2$s "
+"format."
 msgstr ""
 
-#: lib/mediafile.php:323
+#. TRANS: Client exception thrown trying to upload a forbidden MIME type.
+#. TRANS: %s is the file type that was denied.
+#: lib/mediafile.php:345
 #, php-format
-msgid "%s is not a supported file type on this server."
+msgid "\"%s\" is not a supported file type on this server."
 msgstr ""
 
 #: lib/messageform.php:120
@@ -6310,26 +6444,23 @@ msgid "Send a nudge to this user"
 msgstr ""
 
 #: lib/oauthstore.php:283
-msgid "Error inserting new profile"
+msgid "Error inserting new profile."
 msgstr ""
 
 #: lib/oauthstore.php:291
-msgid "Error inserting avatar"
-msgstr ""
-
-#: lib/oauthstore.php:306
-msgid "Error updating remote profile"
+msgid "Error inserting avatar."
 msgstr ""
 
 #: lib/oauthstore.php:311
-msgid "Error inserting remote profile"
+msgid "Error inserting remote profile."
 msgstr ""
 
-#: lib/oauthstore.php:345
-msgid "Duplicate notice"
+#. TRANS: Exception thrown when a notice is denied because it has been sent before.
+#: lib/oauthstore.php:346
+msgid "Duplicate notice."
 msgstr ""
 
-#: lib/oauthstore.php:490
+#: lib/oauthstore.php:491
 msgid "Couldn't insert new subscription."
 msgstr ""
 
@@ -6366,7 +6497,8 @@ msgstr ""
 msgid "Tags in %s's notices"
 msgstr ""
 
-#: lib/plugin.php:115
+#. TRANS: Displayed as version information for a plugin if no version information was found.
+#: lib/plugin.php:116
 msgid "Unknown"
 msgstr ""
 
@@ -6460,19 +6592,24 @@ msgstr ""
 msgid "Sandbox this user"
 msgstr ""
 
-#: lib/searchaction.php:120
+#. TRANS: Fieldset legend for the search form.
+#: lib/searchaction.php:121
 msgid "Search site"
 msgstr ""
 
-#: lib/searchaction.php:126
+#. TRANS: Used as a field label for the field where one or more keywords
+#. TRANS: for searching can be entered.
+#: lib/searchaction.php:129
 msgid "Keyword(s)"
 msgstr ""
 
-#: lib/searchaction.php:127
+#: lib/searchaction.php:130
+msgctxt "BUTTON"
 msgid "Search"
 msgstr ""
 
-#: lib/searchaction.php:162
+#. TRANS: Definition list item with instructions on how to get (better) search results.
+#: lib/searchaction.php:170
 msgid "Search help"
 msgstr ""
 
@@ -6667,20 +6804,22 @@ msgid "Moderator"
 msgstr ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1102
+#: lib/util.php:1103
 msgid "a few seconds ago"
 msgstr ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1105
+#: lib/util.php:1106
 msgid "about a minute ago"
 msgstr ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 #: lib/util.php:1109
 #, php-format
-msgid "about %d minutes ago"
-msgstr ""
+msgid "about one minute ago"
+msgid_plural "about %d minutes ago"
+msgstr[0] ""
+msgstr[1] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 #: lib/util.php:1112
@@ -6688,35 +6827,41 @@ msgid "about an hour ago"
 msgstr ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1116
+#: lib/util.php:1115
 #, php-format
-msgid "about %d hours ago"
-msgstr ""
+msgid "about one hour ago"
+msgid_plural "about %d hours ago"
+msgstr[0] ""
+msgstr[1] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1119
+#: lib/util.php:1118
 msgid "about a day ago"
 msgstr ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1123
+#: lib/util.php:1121
 #, php-format
-msgid "about %d days ago"
-msgstr ""
+msgid "about one day ago"
+msgid_plural "about %d days ago"
+msgstr[0] ""
+msgstr[1] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1126
+#: lib/util.php:1124
 msgid "about a month ago"
 msgstr ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1130
+#: lib/util.php:1127
 #, php-format
-msgid "about %d months ago"
-msgstr ""
+msgid "about one month ago"
+msgid_plural "about %d months ago"
+msgstr[0] ""
+msgstr[1] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1133
+#: lib/util.php:1130
 msgid "about a year ago"
 msgstr ""
 
diff --git a/locale/sv/LC_MESSAGES/statusnet.po b/locale/sv/LC_MESSAGES/statusnet.po
index ceb7de7362..f02e50ac44 100644
--- a/locale/sv/LC_MESSAGES/statusnet.po
+++ b/locale/sv/LC_MESSAGES/statusnet.po
@@ -1,8 +1,9 @@
-# Translation of StatusNet to Swedish
+# Translation of StatusNet to Swedish (Svenska)
+# Expored from translatewiki.net
 #
-# Author@translatewiki.net: Jamminjohn
-# Author@translatewiki.net: Kjell
-# Author@translatewiki.net: McDutchie
+# Author: Jamminjohn
+# Author: Kjell
+# Author: McDutchie
 # --
 # This file is distributed under the same license as the StatusNet package.
 #
@@ -10,20 +11,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-08 22:33+0000\n"
-"PO-Revision-Date: 2010-09-08 22:35:26+0000\n"
-"Language-Team: Swedish\n"
+"POT-Creation-Date: 2010-09-14 19:53+0000\n"
+"PO-Revision-Date: 2010-09-14 19:54:20+0000\n"
+"Language-Team: Swedish <http://translatewiki.net/wiki/Portal:sv>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r72348); Translate extension (2010-08-20)\n"
+"X-Generator: MediaWiki 1.17alpha (r73009); Translate extension (2010-08-20)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: sv\n"
-"X-Message-Group: out-statusnet\n"
+"X-Message-Group: #out-statusnet\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-POT-Import-Date: 1284-49-16 34::+0000\n"
 
 #. TRANS: Page title
 #. TRANS: Menu item for site administration
-#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:376
+#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:363
 msgid "Access"
 msgstr "Ãtkomst"
 
@@ -77,10 +79,10 @@ 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 actions/emailsettings.php:224
-#: actions/imsettings.php:184 actions/smssettings.php:209
-#: lib/applicationeditform.php:361
+#. TRANS: Button label in the "Edit application" form.
+#: actions/accessadminpanel.php:203 actions/emailsettings.php:228
+#: actions/imsettings.php:187 actions/smssettings.php:209
+#: lib/applicationeditform.php:351
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Spara"
@@ -93,15 +95,15 @@ msgstr "Ingen sÃ¥dan sida"
 
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #: actions/all.php:79 actions/allrss.php:68
-#: actions/apiaccountupdatedeliverydevice.php:114
-#: actions/apiaccountupdateprofile.php:105
-#: actions/apiaccountupdateprofilebackgroundimage.php:116
-#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
-#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
-#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:113
-#: actions/apigroupismember.php:91 actions/apigroupjoin.php:100
-#: actions/apigroupleave.php:100 actions/apigrouplist.php:73
-#: actions/apistatusesupdate.php:229 actions/apisubscriptions.php:87
+#: actions/apiaccountupdatedeliverydevice.php:115
+#: actions/apiaccountupdateprofile.php:106
+#: actions/apiaccountupdateprofilebackgroundimage.php:117
+#: actions/apiaccountupdateprofileimage.php:106 actions/apiblockcreate.php:98
+#: actions/apiblockdestroy.php:97 actions/apidirectmessage.php:77
+#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:114
+#: actions/apigroupismember.php:91 actions/apigroupjoin.php:101
+#: actions/apigroupleave.php:101 actions/apigrouplist.php:73
+#: actions/apistatusesupdate.php:230 actions/apisubscriptions.php:87
 #: actions/apitimelinefavorites.php:72 actions/apitimelinefriends.php:174
 #: actions/apitimelinehome.php:80 actions/apitimelinementions.php:80
 #: actions/apitimelineuser.php:82 actions/avatarbynickname.php:75
@@ -199,16 +201,16 @@ msgid "Updates from %1$s and friends on %2$s!"
 msgstr "Uppdateringar frÃ¥n %1$s och vÃ¤nner pÃ¥ %2$s!"
 
 #: actions/apiaccountratelimitstatus.php:72
-#: actions/apiaccountupdatedeliverydevice.php:94
-#: actions/apiaccountupdateprofile.php:97
-#: actions/apiaccountupdateprofilebackgroundimage.php:94
-#: actions/apiaccountupdateprofilecolors.php:118
+#: actions/apiaccountupdatedeliverydevice.php:95
+#: actions/apiaccountupdateprofile.php:98
+#: actions/apiaccountupdateprofilebackgroundimage.php:95
+#: actions/apiaccountupdateprofilecolors.php:119
 #: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156
-#: actions/apifavoritecreate.php:100 actions/apifavoritedestroy.php:101
-#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100
-#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:139
-#: actions/apigroupismember.php:115 actions/apigroupjoin.php:156
-#: actions/apigroupleave.php:142 actions/apigrouplist.php:137
+#: actions/apifavoritecreate.php:101 actions/apifavoritedestroy.php:102
+#: actions/apifriendshipscreate.php:101 actions/apifriendshipsdestroy.php:101
+#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:140
+#: actions/apigroupismember.php:115 actions/apigroupjoin.php:157
+#: actions/apigroupleave.php:143 actions/apigrouplist.php:137
 #: actions/apigrouplistall.php:122 actions/apigroupmembership.php:107
 #: actions/apigroupshow.php:116 actions/apihelptest.php:88
 #: actions/apistatusesdestroy.php:104 actions/apistatusesretweets.php:112
@@ -223,47 +225,49 @@ msgstr "Uppdateringar frÃ¥n %1$s och vÃ¤nner pÃ¥ %2$s!"
 msgid "API method not found."
 msgstr "API-metod hittades inte."
 
-#: actions/apiaccountupdatedeliverydevice.php:86
-#: actions/apiaccountupdateprofile.php:89
-#: actions/apiaccountupdateprofilebackgroundimage.php:86
-#: actions/apiaccountupdateprofilecolors.php:110
-#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89
-#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109
-#: actions/apifavoritecreate.php:91 actions/apifavoritedestroy.php:92
-#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
-#: actions/apigroupcreate.php:105 actions/apigroupjoin.php:92
-#: actions/apigroupleave.php:92 actions/apimediaupload.php:67
-#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:198
+#. TRANS: Client error message. POST is a HTTP command. It should not be translated.
+#. TRANS: Client error. POST is a HTTP command. It should not be translated.
+#: actions/apiaccountupdatedeliverydevice.php:87
+#: actions/apiaccountupdateprofile.php:90
+#: actions/apiaccountupdateprofilebackgroundimage.php:87
+#: actions/apiaccountupdateprofilecolors.php:111
+#: actions/apiaccountupdateprofileimage.php:85 actions/apiblockcreate.php:90
+#: actions/apiblockdestroy.php:89 actions/apidirectmessagenew.php:110
+#: actions/apifavoritecreate.php:92 actions/apifavoritedestroy.php:93
+#: actions/apifriendshipscreate.php:92 actions/apifriendshipsdestroy.php:92
+#: actions/apigroupcreate.php:106 actions/apigroupjoin.php:93
+#: actions/apigroupleave.php:93 actions/apimediaupload.php:68
+#: actions/apistatusesretweet.php:66 actions/apistatusesupdate.php:199
 msgid "This method requires a POST."
 msgstr "Denna metod krÃ¤ver en POST."
 
-#: actions/apiaccountupdatedeliverydevice.php:106
+#: actions/apiaccountupdatedeliverydevice.php:107
 msgid ""
 "You must specify a parameter named 'device' with a value of one of: sms, im, "
 "none."
 msgstr "Du mÃ¥ste ange ett vÃ¤rdet pÃ¥ parametern 'device': sms, im, none"
 
-#: actions/apiaccountupdatedeliverydevice.php:133
+#: actions/apiaccountupdatedeliverydevice.php:134
 msgid "Could not update user."
 msgstr "Kunde inte uppdatera anvÃ¤ndare."
 
-#: actions/apiaccountupdateprofile.php:112
-#: actions/apiaccountupdateprofilebackgroundimage.php:194
-#: actions/apiaccountupdateprofilecolors.php:185
-#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/apiaccountupdateprofile.php:113
+#: actions/apiaccountupdateprofilebackgroundimage.php:195
+#: actions/apiaccountupdateprofilecolors.php:186
+#: actions/apiaccountupdateprofileimage.php:131 actions/apiusershow.php:108
 #: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/hcard.php:74
 #: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
 #: lib/profileaction.php:84
 msgid "User has no profile."
 msgstr "AnvÃ¤ndaren har ingen profil."
 
-#: actions/apiaccountupdateprofile.php:147
+#: actions/apiaccountupdateprofile.php:148
 msgid "Could not save profile."
 msgstr "Kunde inte spara profil."
 
-#: actions/apiaccountupdateprofilebackgroundimage.php:108
-#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
-#: actions/apistatusesupdate.php:212 actions/avatarsettings.php:257
+#: actions/apiaccountupdateprofilebackgroundimage.php:109
+#: actions/apiaccountupdateprofileimage.php:98 actions/apimediaupload.php:81
+#: actions/apistatusesupdate.php:213 actions/avatarsettings.php:257
 #: actions/designadminpanel.php:123 actions/editapplication.php:118
 #: actions/newapplication.php:101 actions/newnotice.php:94
 #: lib/designsettings.php:283
@@ -275,30 +279,30 @@ msgstr ""
 "Servern kunde inte hantera sÃ¥ mycket POST-data (%s byte) pÃ¥ grund av sin "
 "nuvarande konfiguration."
 
-#: actions/apiaccountupdateprofilebackgroundimage.php:136
-#: actions/apiaccountupdateprofilebackgroundimage.php:146
-#: actions/apiaccountupdateprofilecolors.php:164
-#: actions/apiaccountupdateprofilecolors.php:174
+#: actions/apiaccountupdateprofilebackgroundimage.php:137
+#: actions/apiaccountupdateprofilebackgroundimage.php:147
+#: actions/apiaccountupdateprofilecolors.php:165
+#: actions/apiaccountupdateprofilecolors.php:175
 #: actions/groupdesignsettings.php:290 actions/groupdesignsettings.php:300
 #: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
 #: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
 msgid "Unable to save your design settings."
 msgstr "Kunde inte spara dina utseendeinstÃ¤llningar."
 
-#: actions/apiaccountupdateprofilebackgroundimage.php:187
-#: actions/apiaccountupdateprofilecolors.php:142
+#: actions/apiaccountupdateprofilebackgroundimage.php:188
+#: actions/apiaccountupdateprofilecolors.php:143
 msgid "Could not update your design."
 msgstr "Kunde inte uppdatera din profils utseende."
 
-#: actions/apiblockcreate.php:105
+#: actions/apiblockcreate.php:106
 msgid "You cannot block yourself!"
 msgstr "Du kan inte blockera dig sjÃ¤lv!"
 
-#: actions/apiblockcreate.php:126
+#: actions/apiblockcreate.php:127
 msgid "Block user failed."
 msgstr "Blockering av anvÃ¤ndare misslyckades."
 
-#: actions/apiblockdestroy.php:114
+#: actions/apiblockdestroy.php:115
 msgid "Unblock user failed."
 msgstr "HÃ¤vning av blockering av anvÃ¤ndare misslyckades."
 
@@ -322,65 +326,65 @@ msgstr "Direktmeddelande till %s"
 msgid "All the direct messages sent to %s"
 msgstr "Alla direktmeddelanden skickade till %s"
 
-#: actions/apidirectmessagenew.php:118
+#: actions/apidirectmessagenew.php:119
 msgid "No message text!"
 msgstr "Ingen meddelandetext!"
 
-#: actions/apidirectmessagenew.php:127 actions/newmessage.php:150
+#: actions/apidirectmessagenew.php:128 actions/newmessage.php:150
 #, php-format
 msgid "That's too long. Max message size is %d chars."
 msgstr "Detta Ã¤r fÃ¶r lÃ¥ngt. Maximal meddelandestorlek Ã¤r %d tecken."
 
-#: actions/apidirectmessagenew.php:138
+#: actions/apidirectmessagenew.php:139
 msgid "Recipient user not found."
 msgstr "Mottagare hittades inte."
 
-#: actions/apidirectmessagenew.php:142
+#: actions/apidirectmessagenew.php:143
 msgid "Can't send direct messages to users who aren't your friend."
 msgstr "Kan inte skicka direktmeddelanden till anvÃ¤ndare som inte Ã¤r din vÃ¤n."
 
-#: actions/apifavoritecreate.php:109 actions/apifavoritedestroy.php:110
+#: actions/apifavoritecreate.php:110 actions/apifavoritedestroy.php:111
 #: actions/apistatusesdestroy.php:121
 msgid "No status found with that ID."
 msgstr "Ingen status hittad med det ID:t."
 
-#: actions/apifavoritecreate.php:120
+#: actions/apifavoritecreate.php:121
 msgid "This status is already a favorite."
 msgstr "Denna status Ã¤r redan en favorit."
 
 #. TRANS: Error message text shown when a favorite could not be set.
-#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:296
+#: actions/apifavoritecreate.php:132 actions/favor.php:84 lib/command.php:296
 msgid "Could not create favorite."
 msgstr "Kunde inte skapa favorit."
 
-#: actions/apifavoritedestroy.php:123
+#: actions/apifavoritedestroy.php:124
 msgid "That status is not a favorite."
 msgstr "Denna status Ã¤r inte en favorit."
 
-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
+#: actions/apifavoritedestroy.php:136 actions/disfavor.php:87
 msgid "Could not delete favorite."
 msgstr "Kunde inte ta bort favoriten."
 
-#: actions/apifriendshipscreate.php:109
+#: actions/apifriendshipscreate.php:110
 msgid "Could not follow user: profile not found."
 msgstr "Kunde inte sluta fÃ¶lja anvÃ¤ndaren: anvÃ¤ndaren hittades inte."
 
-#: actions/apifriendshipscreate.php:118
+#: actions/apifriendshipscreate.php:119
 #, php-format
 msgid "Could not follow user: %s is already on your list."
 msgstr "Kunde inte fÃ¶lja anvÃ¤ndare: %s finns redan i din lista."
 
-#: actions/apifriendshipsdestroy.php:109
+#: actions/apifriendshipsdestroy.php:110
 msgid "Could not unfollow user: User not found."
 msgstr "Kunde inte sluta fÃ¶lja anvÃ¤ndaren: anvÃ¤ndaren hittades inte."
 
-#: actions/apifriendshipsdestroy.php:120
+#: actions/apifriendshipsdestroy.php:121
 msgid "You cannot unfollow yourself."
 msgstr "Du kan inte sluta fÃ¶lja dig sjÃ¤lv."
 
 #: actions/apifriendshipsexists.php:91
 msgid "Two valid IDs or screen_names must be supplied."
-msgstr ""
+msgstr "TvÃ¥ giltiga anvÃ¤ndar-ID:n eller screen_names mÃ¥ste tillhandahÃ¥llas."
 
 #: actions/apifriendshipsshow.php:134
 msgid "Could not determine source user."
@@ -390,102 +394,102 @@ msgstr "Kunde inte faststÃ¤lla anvÃ¤ndare hos kÃ¤llan."
 msgid "Could not find target user."
 msgstr "Kunde inte hitta mÃ¥lanvÃ¤ndare."
 
-#: actions/apigroupcreate.php:167 actions/editgroup.php:186
+#: actions/apigroupcreate.php:168 actions/editgroup.php:186
 #: actions/newgroup.php:126 actions/profilesettings.php:215
 #: actions/register.php:212
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr ""
 "Smeknamnet fÃ¥r endast innehÃ¥lla smÃ¥ bokstÃ¤ver eller siffror, inga mellanslag."
 
-#: actions/apigroupcreate.php:176 actions/editgroup.php:190
+#: actions/apigroupcreate.php:177 actions/editgroup.php:190
 #: actions/newgroup.php:130 actions/profilesettings.php:238
 #: actions/register.php:215
 msgid "Nickname already in use. Try another one."
 msgstr "Smeknamnet anvÃ¤nds redan. FÃ¶rsÃ¶k med ett annat."
 
-#: actions/apigroupcreate.php:183 actions/editgroup.php:193
+#: actions/apigroupcreate.php:184 actions/editgroup.php:193
 #: actions/newgroup.php:133 actions/profilesettings.php:218
 #: actions/register.php:217
 msgid "Not a valid nickname."
 msgstr "Inte ett giltigt smeknamn."
 
-#: actions/apigroupcreate.php:199 actions/editapplication.php:215
+#: actions/apigroupcreate.php:200 actions/editapplication.php:215
 #: actions/editgroup.php:199 actions/newapplication.php:203
 #: actions/newgroup.php:139 actions/profilesettings.php:222
 #: actions/register.php:224
 msgid "Homepage is not a valid URL."
 msgstr "Hemsida Ã¤r inte en giltig webbadress."
 
-#: actions/apigroupcreate.php:208 actions/editgroup.php:202
+#: actions/apigroupcreate.php:209 actions/editgroup.php:202
 #: actions/newgroup.php:142 actions/profilesettings.php:225
 #: actions/register.php:227
 msgid "Full name is too long (max 255 chars)."
 msgstr "FullstÃ¤ndigt namn Ã¤r fÃ¶r lÃ¥ngt (max 255 tecken)."
 
-#: actions/apigroupcreate.php:216 actions/editapplication.php:190
+#: actions/apigroupcreate.php:217 actions/editapplication.php:190
 #: actions/newapplication.php:172
 #, php-format
 msgid "Description is too long (max %d chars)."
 msgstr "Beskrivning Ã¤r fÃ¶r lÃ¥ng (max %d tecken)."
 
-#: actions/apigroupcreate.php:227 actions/editgroup.php:208
+#: actions/apigroupcreate.php:228 actions/editgroup.php:208
 #: actions/newgroup.php:148 actions/profilesettings.php:232
 #: actions/register.php:234
 msgid "Location is too long (max 255 chars)."
 msgstr "Beskrivning av plats Ã¤r fÃ¶r lÃ¥ng (max 255 tecken)."
 
-#: actions/apigroupcreate.php:246 actions/editgroup.php:219
+#: actions/apigroupcreate.php:247 actions/editgroup.php:219
 #: actions/newgroup.php:159
 #, php-format
 msgid "Too many aliases! Maximum %d."
 msgstr "FÃ¶r mÃ¥nga alias! Maximum %d."
 
-#: actions/apigroupcreate.php:267
+#: actions/apigroupcreate.php:268
 #, php-format
 msgid "Invalid alias: \"%s\"."
 msgstr "Ogiltigt alias: \"%s\"."
 
-#: actions/apigroupcreate.php:276 actions/editgroup.php:232
+#: actions/apigroupcreate.php:277 actions/editgroup.php:232
 #: actions/newgroup.php:172
 #, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr "Alias \"%s\" anvÃ¤nds redan. FÃ¶rsÃ¶k med ett annat."
 
-#: actions/apigroupcreate.php:289 actions/editgroup.php:238
+#: actions/apigroupcreate.php:290 actions/editgroup.php:238
 #: actions/newgroup.php:178
 msgid "Alias can't be the same as nickname."
 msgstr "Alias kan inte vara samma som smeknamn."
 
-#: actions/apigroupismember.php:96 actions/apigroupjoin.php:105
-#: actions/apigroupleave.php:105 actions/apigroupmembership.php:92
+#: actions/apigroupismember.php:96 actions/apigroupjoin.php:106
+#: actions/apigroupleave.php:106 actions/apigroupmembership.php:92
 #: actions/apigroupshow.php:83 actions/apitimelinegroup.php:92
 msgid "Group not found."
 msgstr "Grupp hittades inte."
 
 #. TRANS: Error text shown a user tries to join a group they already are a member of.
-#: actions/apigroupjoin.php:111 actions/joingroup.php:100 lib/command.php:336
+#: actions/apigroupjoin.php:112 actions/joingroup.php:100 lib/command.php:336
 msgid "You are already a member of that group."
 msgstr "Du Ã¤r redan en medlem i denna grupp."
 
 #. TRANS: Error text shown when a user tries to join a group they are blocked from joining.
-#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:341
+#: actions/apigroupjoin.php:121 actions/joingroup.php:105 lib/command.php:341
 msgid "You have been blocked from that group by the admin."
 msgstr "Du har blivit blockerad frÃ¥n denna grupp av administratÃ¶ren."
 
 #. 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.
-#: actions/apigroupjoin.php:139 actions/joingroup.php:134 lib/command.php:353
+#: actions/apigroupjoin.php:140 actions/joingroup.php:134 lib/command.php:353
 #, 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."
 
-#: actions/apigroupleave.php:115
+#: actions/apigroupleave.php:116
 msgid "You are not a member of this group."
 msgstr "Du Ã¤r inte en medlem i denna grupp."
 
 #. 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.
-#: actions/apigroupleave.php:125 actions/leavegroup.php:129
+#: actions/apigroupleave.php:126 actions/leavegroup.php:129
 #: lib/command.php:401
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
@@ -515,6 +519,10 @@ msgstr "%s grupper"
 msgid "groups on %s"
 msgstr "grupper pÃ¥ %s"
 
+#: actions/apimediaupload.php:100
+msgid "Upload failed."
+msgstr "Uppladdning misslyckades."
+
 #: actions/apioauthauthorize.php:101
 msgid "No oauth_token parameter provided."
 msgstr "Ingen oauth_token-parameter angiven."
@@ -525,9 +533,9 @@ msgstr "Ogiltig token."
 
 #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
 #: actions/deletenotice.php:169 actions/disfavor.php:74
-#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:55
+#: actions/emailsettings.php:271 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:66 actions/imsettings.php:227
+#: actions/groupunblock.php:66 actions/imsettings.php:230
 #: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
@@ -570,8 +578,8 @@ msgstr "BegÃ¤ran-token %s har nekats och Ã¥terkallats."
 #. 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:286 actions/grouplogo.php:322
-#: actions/imsettings.php:242 actions/newapplication.php:121
+#: actions/emailsettings.php:290 actions/grouplogo.php:322
+#: actions/imsettings.php:245 actions/newapplication.php:121
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
 #: actions/smssettings.php:277 lib/designsettings.php:304
 msgid "Unexpected form submission."
@@ -635,18 +643,18 @@ msgstr "Denna metod krÃ¤ver en POST eller en DELETE."
 msgid "You may not delete another user's status."
 msgstr "Du kan inte ta bort en annan anvÃ¤ndares status."
 
-#: actions/apistatusesretweet.php:75 actions/apistatusesretweets.php:72
+#: actions/apistatusesretweet.php:76 actions/apistatusesretweets.php:72
 #: actions/deletenotice.php:52 actions/shownotice.php:92
 msgid "No such notice."
 msgstr "Ingen sÃ¥dan notis."
 
 #. TRANS: Error text shown when trying to repeat an own notice.
-#: actions/apistatusesretweet.php:83 lib/command.php:538
+#: actions/apistatusesretweet.php:84 lib/command.php:538
 msgid "Cannot repeat your own notice."
 msgstr "Kan inte upprepa din egen notis."
 
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-#: actions/apistatusesretweet.php:91 lib/command.php:544
+#: actions/apistatusesretweet.php:92 lib/command.php:544
 msgid "Already repeated that notice."
 msgstr "Redan upprepat denna notis."
 
@@ -658,21 +666,21 @@ msgstr "Status borttagen."
 msgid "No status with that ID found."
 msgstr "Ingen status med det ID:t hittades."
 
-#: actions/apistatusesupdate.php:221
+#: actions/apistatusesupdate.php:222
 msgid "Client must provide a 'status' parameter with a value."
-msgstr ""
+msgstr "Klient mÃ¥ste tillhandahÃ¥lla en 'status'-parameter med ett vÃ¤rde."
 
-#: actions/apistatusesupdate.php:242 actions/newnotice.php:157
+#: actions/apistatusesupdate.php:243 actions/newnotice.php:157
 #: lib/mailhandler.php:60
 #, php-format
 msgid "That's too long. Max notice size is %d chars."
 msgstr "Det Ã¤r fÃ¶r lÃ¥ngt. Maximal notisstorlek Ã¤r %d tecken."
 
-#: actions/apistatusesupdate.php:283 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:284 actions/apiusershow.php:96
 msgid "Not found."
 msgstr "Hittades inte."
 
-#: actions/apistatusesupdate.php:306 actions/newnotice.php:181
+#: actions/apistatusesupdate.php:307 actions/newnotice.php:181
 #, php-format
 msgid "Max notice size is %d chars, including attachment URL."
 msgstr "Maximal notisstorlek Ã¤r %d tecken, inklusive webbadress fÃ¶r bilaga."
@@ -873,7 +881,9 @@ msgid "Yes"
 msgstr "Ja"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
+#. TRANS: Submit button title.
+#. TRANS: Description of the form to block a user.
+#: actions/block.php:164 actions/groupmembers.php:403 lib/blockform.php:82
 msgid "Block this user"
 msgstr "Blockera denna anvÃ¤ndare"
 
@@ -916,11 +926,13 @@ msgstr ""
 msgid "Unblock user from group"
 msgstr "HÃ¤v blockering av anvÃ¤ndare frÃ¥n grupp"
 
-#: actions/blockedfromgroup.php:320 lib/unblockform.php:69
+#. TRANS: Title for the form to unblock a user.
+#: actions/blockedfromgroup.php:320 lib/unblockform.php:70
 msgid "Unblock"
 msgstr "HÃ¤v blockering"
 
-#: actions/blockedfromgroup.php:320 lib/unblockform.php:80
+#. TRANS: Description of the form to unblock a user.
+#: actions/blockedfromgroup.php:320 lib/unblockform.php:82
 msgid "Unblock this user"
 msgstr "HÃ¤v blockering av denna anvÃ¤ndare"
 
@@ -959,9 +971,9 @@ msgstr "Denna adress har redan blivit bekrÃ¤ftad."
 #. 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/confirmaddress.php:116 actions/emailsettings.php:331
+#: actions/emailsettings.php:477 actions/imsettings.php:283
+#: actions/imsettings.php:442 actions/othersettings.php:174
 #: actions/profilesettings.php:283 actions/smssettings.php:308
 #: actions/smssettings.php:464
 msgid "Couldn't update user."
@@ -969,7 +981,7 @@ msgstr "Kunde inte uppdatera anvÃ¤ndare."
 
 #. 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/confirmaddress.php:128 actions/emailsettings.php:437
 #: actions/smssettings.php:422
 msgid "Couldn't delete email confirmation."
 msgstr "Kunde inte ta bort e-postbekrÃ¤ftelse."
@@ -1005,9 +1017,10 @@ msgstr "Applikation hittades inte."
 msgid "You are not the owner of this application."
 msgstr "Du Ã¤r inte Ã¤garen av denna applikation."
 
+#. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:127
 #: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1307
+#: lib/action.php:1315
 msgid "There was a problem with your session token."
 msgstr "Det var ett problem med din sessions-token."
 
@@ -1041,7 +1054,7 @@ msgstr "Ta bort denna applikation"
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
 #: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:73 lib/profileformaction.php:64
+#: lib/adminpanelaction.php:71 lib/profileformaction.php:64
 #: lib/settingsaction.php:72
 msgid "Not logged in."
 msgstr "Inte inloggad."
@@ -1104,7 +1117,6 @@ msgstr "Ta bort denna anvÃ¤ndare"
 #. TRANS: Message used as title for design settings for the site.
 #. TRANS: Link description in user account settings menu.
 #: actions/designadminpanel.php:63 lib/accountsettingsaction.php:139
-#: lib/groupnav.php:119
 msgid "Design"
 msgstr "Utseende"
 
@@ -1225,13 +1237,13 @@ msgstr "ÃterstÃ¤ll standardutseende"
 msgid "Reset back to default"
 msgstr "ÃterstÃ¤ll till standardvÃ¤rde"
 
-#. TRANS: Submit button title
+#. TRANS: Submit button title.
 #: actions/designadminpanel.php:685 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/snapshotadminpanel.php:245
 #: actions/subscriptions.php:226 actions/tagother.php:154
-#: actions/useradminpanel.php:294 lib/applicationeditform.php:363
+#: actions/useradminpanel.php:294 lib/applicationeditform.php:353
 #: lib/designsettings.php:256 lib/groupeditform.php:202
 msgid "Save"
 msgstr "Spara"
@@ -1387,7 +1399,7 @@ msgstr "Aktuell, bekrÃ¤ftad e-postadress."
 #. 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/emailsettings.php:115 actions/emailsettings.php:162
 #: actions/imsettings.php:116 actions/smssettings.php:124
 #: actions/smssettings.php:180
 msgctxt "BUTTON"
@@ -1405,22 +1417,26 @@ msgstr ""
 #. 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
+#. TRANS: Button label in the "Edit application" form.
 #: actions/emailsettings.php:127 actions/imsettings.php:131
-#: actions/smssettings.php:137 lib/applicationeditform.php:357
+#: actions/smssettings.php:137 lib/applicationeditform.php:347
 msgctxt "BUTTON"
 msgid "Cancel"
 msgstr "Avbryt"
 
-#. TRANS: Instructions for e-mail address input form.
-#: actions/emailsettings.php:135
+#. TRANS: Instructions for e-mail address input form. Do not translate
+#. TRANS: "example.org". It is one of the domain names reserved for
+#. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
+#. TRANS: Any other domain may be owned by a legitimate person or
+#. TRANS: organization.
+#: actions/emailsettings.php:139
 msgid "Email address, like \"UserName@example.org\""
 msgstr "E-postadress, sÃ¥som \"anvÃ¤ndarnamn@example.org\""
 
 #. 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/emailsettings.php:143 actions/imsettings.php:151
 #: actions/smssettings.php:162
 msgctxt "BUTTON"
 msgid "Add"
@@ -1428,111 +1444,111 @@ msgstr "LÃ¤gg till"
 
 #. 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
+#: actions/emailsettings.php:151 actions/smssettings.php:171
 msgid "Incoming email"
 msgstr "Inkommande e-post"
 
 #. 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
+#: actions/emailsettings.php:159 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."
 
 #. 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
+#: actions/emailsettings.php:168 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."
 
 #. 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
+#: actions/emailsettings.php:172 actions/smssettings.php:189
 msgctxt "BUTTON"
 msgid "New"
 msgstr "Ny"
 
 #. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:174
+#: actions/emailsettings.php:178
 msgid "Email preferences"
 msgstr "E-postinstÃ¤llningar"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:180
+#: actions/emailsettings.php:184
 msgid "Send me notices of new subscriptions through email."
 msgstr "Skicka notiser om nya prenumerationer till mig genom e-post."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:186
+#: actions/emailsettings.php:190
 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."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:193
+#: actions/emailsettings.php:197
 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."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:199
+#: actions/emailsettings.php:203
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr "Skicka mig e-post nÃ¤r nÃ¥gon skickar ett \"@-svar\"."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:205
+#: actions/emailsettings.php:209
 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."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:212
+#: actions/emailsettings.php:216
 msgid "I want to post notices by email."
 msgstr "Jag vill posta notiser genom min e-post."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:219
+#: actions/emailsettings.php:223
 msgid "Publish a MicroID for my email address."
 msgstr "Publicera ett MicroID fÃ¶r min e-postadress."
 
 #. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:334
+#: actions/emailsettings.php:338
 msgid "Email preferences saved."
 msgstr "E-postinstÃ¤llningar sparade."
 
 #. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:353
+#: actions/emailsettings.php:357
 msgid "No email address."
 msgstr "Ingen e-postadress."
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:361
+#: actions/emailsettings.php:365
 msgid "Cannot normalize that email address"
 msgstr "Kan inte normalisera den e-postadressen"
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:208
+#: actions/emailsettings.php:370 actions/register.php:208
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "Inte en giltig e-postadress."
 
 #. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:370
+#: actions/emailsettings.php:374
 msgid "That is already your email address."
 msgstr "Det Ã¤r redan din e-postadress."
 
 #. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:374
+#: actions/emailsettings.php:378
 msgid "That email address already belongs to another user."
 msgstr "Den e-postadressen tillhÃ¶r redan en annan anvÃ¤ndare."
 
 #. 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/emailsettings.php:395 actions/imsettings.php:351
 #: actions/smssettings.php:373
 msgid "Couldn't insert confirmation code."
 msgstr "Kunde inte infoga bekrÃ¤ftelsekod."
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:398
+#: actions/emailsettings.php:402
 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."
@@ -1544,50 +1560,50 @@ msgstr ""
 #. 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/emailsettings.php:423 actions/imsettings.php:386
 #: actions/smssettings.php:408
 msgid "No pending confirmation to cancel."
 msgstr "Ingen vÃ¤ntande bekrÃ¤ftelse att avbryta."
 
 #. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:424
+#: actions/emailsettings.php:428
 msgid "That is the wrong email address."
 msgstr "Detta Ã¤r fel e-postadress."
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:438
+#: actions/emailsettings.php:442
 msgid "Email confirmation cancelled."
 msgstr "E-postbekrÃ¤ftelse avbruten."
 
 #. TRANS: Message given trying to remove an e-mail address that is not
 #. TRANS: registered for the active user.
-#: actions/emailsettings.php:458
+#: actions/emailsettings.php:462
 msgid "That is not your email address."
 msgstr "Det Ã¤r inte din e-postadress."
 
 #. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:479
+#: actions/emailsettings.php:483
 msgid "The email address was removed."
 msgstr "E-postadressen togs bort."
 
-#: actions/emailsettings.php:493 actions/smssettings.php:568
+#: actions/emailsettings.php:497 actions/smssettings.php:568
 msgid "No incoming email address."
 msgstr "Ingen inkommande e-postadress."
 
 #. 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/emailsettings.php:508 actions/emailsettings.php:532
 #: actions/smssettings.php:578 actions/smssettings.php:602
 msgid "Couldn't update user record."
 msgstr "Kunde inte uppdatera anvÃ¤ndaruppgift."
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
-#: actions/emailsettings.php:508 actions/smssettings.php:581
+#: actions/emailsettings.php:512 actions/smssettings.php:581
 msgid "Incoming email address removed."
 msgstr "Inkommande e-postadress borttagen."
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
-#: actions/emailsettings.php:532 actions/smssettings.php:605
+#: actions/emailsettings.php:536 actions/smssettings.php:605
 msgid "New incoming email address added."
 msgstr "Ny inkommande e-postadress tillagd."
 
@@ -1706,7 +1722,7 @@ msgstr "Kunde inte konvertera token fÃ¶r begÃ¤ran till token fÃ¶r Ã¥tkomst."
 msgid "Remote service uses unknown version of OMB protocol."
 msgstr "FjÃ¤rrtjÃ¤nsten anvÃ¤nder en okÃ¤nd version av OMB-protokollet."
 
-#: actions/finishremotesubscribe.php:138
+#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306
 msgid "Error updating remote profile."
 msgstr "Fel vid uppdatering av fjÃ¤rrprofil."
 
@@ -1763,7 +1779,7 @@ msgstr "AnvÃ¤ndaren Ã¤r redan blockerad frÃ¥n grupp."
 msgid "User is not a member of group."
 msgstr "AnvÃ¤ndare Ã¤r inte en gruppmedlem."
 
-#: actions/groupblock.php:134 actions/groupmembers.php:360
+#: actions/groupblock.php:134 actions/groupmembers.php:364
 msgid "Block user from group"
 msgstr "Blockera anvÃ¤ndare frÃ¥n grupp"
 
@@ -1844,40 +1860,32 @@ msgstr "Logtyp uppdaterad."
 msgid "Failed updating logo."
 msgstr "Misslyckades uppdatera logtyp."
 
-#: actions/groupmembers.php:100 lib/groupnav.php:92
+#. TRANS: Title of the page showing group members.
+#. TRANS: %s is the name of the group.
+#: actions/groupmembers.php:102
 #, php-format
 msgid "%s group members"
 msgstr "%s gruppmedlemmar"
 
-#: actions/groupmembers.php:103
+#. TRANS: Title of the page showing group members.
+#. TRANS: %1$s is the name of the group, %2$d is the page number of the members list.
+#: actions/groupmembers.php:107
 #, php-format
 msgid "%1$s group members, page %2$d"
 msgstr "%1$s gruppmedlemmar, sida %2$d"
 
-#: actions/groupmembers.php:118
+#: actions/groupmembers.php:122
 msgid "A list of the users in this group."
 msgstr "En lista av anvÃ¤ndarna i denna grupp."
 
-#: actions/groupmembers.php:182 lib/groupnav.php:107
+#: actions/groupmembers.php:186
 msgid "Admin"
 msgstr "AdministratÃ¶r"
 
-#: actions/groupmembers.php:392 lib/blockform.php:69
-msgid "Block"
-msgstr "Blockera"
-
-#: actions/groupmembers.php:487
+#: actions/groupmembers.php:498
 msgid "Make user an admin of the group"
 msgstr "GÃ¶r anvÃ¤ndare till en administratÃ¶r fÃ¶r gruppen"
 
-#: actions/groupmembers.php:519
-msgid "Make Admin"
-msgstr "GÃ¶r till administratÃ¶r"
-
-#: actions/groupmembers.php:519
-msgid "Make this user an admin"
-msgstr "GÃ¶r denna anvÃ¤ndare till administratÃ¶r"
-
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Title in atom group notice feed. %s is a group name.
 #. TRANS: Title in atom user notice feed. %s is a user name.
@@ -2016,7 +2024,10 @@ msgstr ""
 
 #. TRANS: IM address input field instructions in IM settings form.
 #. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:140
+#. TRANS: Do not translate "example.org". It is one of the domain names reserved for use in examples by
+#. TRANS: http://www.rfc-editor.org/rfc/rfc2606.txt. Any other domain may be owned by a legitimate
+#. TRANS: person or organization.
+#: actions/imsettings.php:143
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -2026,65 +2037,65 @@ msgstr ""
 "att lÃ¤gga till %s i din kompislista i din IM-klient eller hos GTalk."
 
 #. TRANS: Form legend for IM preferences form.
-#: actions/imsettings.php:155
+#: actions/imsettings.php:158
 msgid "IM preferences"
 msgstr "InstÃ¤llningar fÃ¶r snabbmeddelanden"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:160
+#: actions/imsettings.php:163
 msgid "Send me notices through Jabber/GTalk."
 msgstr "Skicka notiser till mig genom Jabber/GTalk."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:166
+#: actions/imsettings.php:169
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr "Posta en notis nÃ¤r min Jabber/GTalk-status Ã¤ndras."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:172
+#: actions/imsettings.php:175
 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Ã¥."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:179
+#: actions/imsettings.php:182
 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "Publicera ett MicroID fÃ¶r min Jabber/GTalk-adress."
 
 #. TRANS: Confirmation message for successful IM preferences save.
-#: actions/imsettings.php:287 actions/othersettings.php:180
+#: actions/imsettings.php:290 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
+#: actions/imsettings.php:312
 msgid "No Jabber ID."
 msgstr "Inget Jabber-ID."
 
 #. TRANS: Message given saving IM address that cannot be normalised.
-#: actions/imsettings.php:317
+#: actions/imsettings.php:320
 msgid "Cannot normalize that Jabber ID"
 msgstr "Kan inte normalisera detta Jabber-ID"
 
 #. TRANS: Message given saving IM address that not valid.
-#: actions/imsettings.php:322
+#: actions/imsettings.php:325
 msgid "Not a valid Jabber ID"
 msgstr "Inte ett giltigt Jabber-ID"
 
 #. TRANS: Message given saving IM address that is already set.
-#: actions/imsettings.php:326
+#: actions/imsettings.php:329
 msgid "That is already your Jabber ID."
 msgstr "Detta Ã¤r redan ditt Jabber-ID"
 
 #. TRANS: Message given saving IM address that is already set for another user.
-#: actions/imsettings.php:330
+#: actions/imsettings.php:333
 msgid "Jabber ID already belongs to another user."
 msgstr "Jabber-ID:t tillhÃ¶r redan en annan anvÃ¤ndare."
 
 #. 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
+#: actions/imsettings.php:361
 #, php-format
 msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
@@ -2094,28 +2105,28 @@ msgstr ""
 "att %s fÃ¥r skicka meddelanden till dig."
 
 #. TRANS: Message given canceling IM address confirmation for the wrong IM address.
-#: actions/imsettings.php:388
+#: actions/imsettings.php:391
 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
+#: actions/imsettings.php:400
 msgid "Couldn't delete IM confirmation."
 msgstr "Kunde inte ta bort bekrÃ¤ftelse fÃ¶r snabbmeddelanden."
 
 #. TRANS: Message given after successfully canceling IM address confirmation.
-#: actions/imsettings.php:402
+#: actions/imsettings.php:405
 msgid "IM confirmation cancelled."
 msgstr "BekrÃ¤ftelse fÃ¶r snabbmeddelanden avbruten."
 
 #. TRANS: Message given trying to remove an IM address that is not
 #. TRANS: registered for the active user.
-#: actions/imsettings.php:424
+#: actions/imsettings.php:427
 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
+#: actions/imsettings.php:450
 msgid "The IM address was removed."
 msgstr "Adressen fÃ¶r snabbmeddelanden togs bort."
 
@@ -2510,6 +2521,8 @@ msgstr "Uppdateringar som matchar sÃ¶kstrÃ¤ngen \"%1$s\" pÃ¥ %2$s!"
 msgid ""
 "This user doesn't allow nudges or hasn't confirmed or set their email yet."
 msgstr ""
+"Denna anvÃ¤ndare tillÃ¥ter inte knuffar eller har inte bekrÃ¤ftat eller angett "
+"sin e-post Ã¤n."
 
 #: actions/nudge.php:94
 msgid "Nudge sent"
@@ -2584,8 +2597,8 @@ msgid "Only %s URLs over plain HTTP please."
 msgstr "Endast %s-webbadresser Ã¶ver vanlig HTTP."
 
 #. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1215
-#: lib/apiaction.php:1243 lib/apiaction.php:1366
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1206
+#: lib/apiaction.php:1233 lib/apiaction.php:1356
 msgid "Not a supported data format."
 msgstr "Ett dataformat som inte stÃ¶djs"
 
@@ -2725,7 +2738,7 @@ msgid "Password saved."
 msgstr "LÃ¶senord sparat."
 
 #. TRANS: Menu item for site administration
-#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:384
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:371
 msgid "Paths"
 msgstr "SÃ¶kvÃ¤gar"
 
@@ -2937,7 +2950,7 @@ msgstr "FullstÃ¤ndigt namn"
 
 #. TRANS: Form input field label.
 #: actions/profilesettings.php:115 actions/register.php:460
-#: lib/applicationeditform.php:244 lib/groupeditform.php:161
+#: lib/applicationeditform.php:235 lib/groupeditform.php:161
 msgid "Homepage"
 msgstr "Hemsida"
 
@@ -3044,7 +3057,7 @@ msgid "Couldn't save tags."
 msgstr "Kunde inte spara taggar."
 
 #. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:391 lib/adminpanelaction.php:141
+#: actions/profilesettings.php:391 lib/adminpanelaction.php:138
 msgid "Settings saved."
 msgstr "InstÃ¤llningar sparade."
 
@@ -3583,7 +3596,7 @@ msgstr "AnvÃ¤ndare Ã¤r redan flyttad till sandlÃ¥dan."
 
 #. TRANS: Menu item for site administration
 #: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
-#: lib/adminpanelaction.php:392
+#: lib/adminpanelaction.php:379
 msgid "Sessions"
 msgstr "Sessioner"
 
@@ -3621,24 +3634,24 @@ msgid "Application profile"
 msgstr "Applikationsprofil"
 
 #. TRANS: Form input field label for application icon.
-#: actions/showapplication.php:159 lib/applicationeditform.php:182
+#: actions/showapplication.php:159 lib/applicationeditform.php:173
 msgid "Icon"
 msgstr "Ikon"
 
 #. TRANS: Form input field label for application name.
 #: actions/showapplication.php:169 actions/version.php:197
-#: lib/applicationeditform.php:199
+#: lib/applicationeditform.php:190
 msgid "Name"
 msgstr "Namn"
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:178 lib/applicationeditform.php:235
+#: actions/showapplication.php:178 lib/applicationeditform.php:226
 msgid "Organization"
 msgstr "Organisation"
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:216 lib/groupeditform.php:172
+#: lib/applicationeditform.php:207 lib/groupeditform.php:172
 msgid "Description"
 msgstr "Beskrivning"
 
@@ -3730,6 +3743,15 @@ msgstr ""
 "bredvid nÃ¥gon notis du skulle vilja bokmÃ¤rka fÃ¶r senare tillfÃ¤lle eller fÃ¶r "
 "att sÃ¤tta strÃ¥lkastarljuset pÃ¥."
 
+#: actions/showfavorites.php:208
+#, php-format
+msgid ""
+"%s hasn't added any favorite notices yet. Post something interesting they "
+"would add to their favorites :)"
+msgstr ""
+"%s har inte lagt till nÃ¥gra favoritnotiser Ã¤nnu. Posta nÃ¥got intressant de "
+"skulle lÃ¤gga till sina favoriter :)"
+
 #: actions/showfavorites.php:212
 #, php-format
 msgid ""
@@ -3744,7 +3766,7 @@ msgstr ""
 msgid "This is a way to share what you like."
 msgstr "Detta Ã¤r ett sÃ¤tt att dela med av det du gillar."
 
-#: actions/showgroup.php:82 lib/groupnav.php:86
+#: actions/showgroup.php:82
 #, php-format
 msgid "%s group"
 msgstr "%s grupp"
@@ -3796,7 +3818,7 @@ msgstr "FlÃ¶de av notiser fÃ¶r %s grupp (Atom)"
 msgid "FOAF for %s group"
 msgstr "FOAF fÃ¶r %s grupp"
 
-#: actions/showgroup.php:393 actions/showgroup.php:445 lib/groupnav.php:91
+#: actions/showgroup.php:393 actions/showgroup.php:445
 msgid "Members"
 msgstr "Medlemmar"
 
@@ -4246,7 +4268,7 @@ msgstr "Ingen kod ifylld"
 
 #. TRANS: Menu item for site administration
 #: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
-#: lib/adminpanelaction.php:408
+#: lib/adminpanelaction.php:395
 msgid "Snapshots"
 msgstr "Ãgonblicksbilder"
 
@@ -4817,6 +4839,8 @@ msgid ""
 "No file may be larger than %1$d bytes and the file you sent was %2$d bytes. "
 "Try to upload a smaller version."
 msgstr ""
+"Ingen fil fÃ¥r vara stÃ¶rre Ã¤n %1$d byte och filen du skickade var %2$d byte. "
+"Prova att ladda upp en mindre version."
 
 #. TRANS: Message given if an upload would exceed user quota.
 #. TRANS: %d (number) is the user quota in bytes.
@@ -4832,6 +4856,11 @@ msgstr "En sÃ¥ hÃ¤r stor fil skulle Ã¶verskrida din anvÃ¤ndarkvot pÃ¥ %d byte."
 msgid "A file this large would exceed your monthly quota of %d bytes."
 msgstr "En sÃ¥dan hÃ¤r stor fil skulle Ã¶verskrida din mÃ¥natliga kvot pÃ¥ %d byte."
 
+#. TRANS: Client exception thrown if a file upload does not have a valid name.
+#: classes/File.php:248 classes/File.php:263
+msgid "Invalid filename."
+msgstr "Ogiltigt filnamn."
+
 #. TRANS: Exception thrown when joining a group fails.
 #: classes/Group_member.php:42
 msgid "Group join failed."
@@ -4862,7 +4891,7 @@ msgstr "Kunde inte skapa inloggnings-token fÃ¶r %s"
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
 #: classes/Memcached_DataObject.php:533
 msgid "No database name or DSN found anywhere."
-msgstr ""
+msgstr "Inget databasnamn eller DSN funnen nÃ¥gonstans."
 
 #. TRANS: Client exception thrown when a user tries to send a direct message while being banned from sending them.
 #: classes/Message.php:46
@@ -4884,7 +4913,7 @@ msgstr "Kunde inte uppdatera meddelande med ny URI."
 #: classes/Notice.php:98
 #, php-format
 msgid "No such profile (%1$d) for notice (%2$d)."
-msgstr ""
+msgstr "Ingen sÃ¥dan profil (%1$d) fÃ¶r notis (%2$d)."
 
 #. TRANS: Server exception. %s are the error details.
 #: classes/Notice.php:193
@@ -4933,7 +4962,7 @@ msgstr "Problem med att spara notis."
 #. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
 #: classes/Notice.php:899
 msgid "Bad type provided to saveKnownGroups"
-msgstr ""
+msgstr "DÃ¥lig typ tillhandahÃ¥llen saveKnownGroups"
 
 #. TRANS: Server exception thrown when an update for a group inbox fails.
 #: classes/Notice.php:998
@@ -4952,17 +4981,27 @@ msgstr "RT @%1$s %2$s"
 #: classes/Profile.php:737
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
-msgstr ""
+msgstr "Kan inte Ã¥terkalla roll \"%1$s\" fÃ¶r anvÃ¤ndare #%2$d; finns inte."
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
 #: classes/Profile.php:746
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
-msgstr ""
+msgstr "Kan inte Ã¥terkalla roll \"%1$s\" fÃ¶r anvÃ¤ndare #%2$d; databasfel."
+
+#. TRANS: Exception thrown when a right for a non-existing user profile is checked.
+#: classes/Remote_profile.php:54
+msgid "Missing profile."
+msgstr "Saknar profil."
+
+#. TRANS: Exception thrown when a tag cannot be saved.
+#: classes/Status_network.php:339
+msgid "Unable to save tag."
+msgstr "Kunde inte spara tagg."
 
 #. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#: classes/Subscription.php:75 lib/oauthstore.php:465
+#: classes/Subscription.php:75 lib/oauthstore.php:466
 msgid "You have been banned from subscribing."
 msgstr "Du har blivit utestÃ¤ngd frÃ¥n att prenumerera."
 
@@ -5110,7 +5149,8 @@ msgid "Change site configuration"
 msgstr "Ãndra webbplatskonfiguration"
 
 #. TRANS: Main menu option when logged in and site admin for access to site configuration
-#: lib/action.php:474
+#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
+#: lib/action.php:474 lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr "AdministratÃ¶r"
@@ -5187,7 +5227,7 @@ msgstr "SÃ¶k"
 
 #. TRANS: DT element for site notice. String is hidden in default CSS.
 #. TRANS: Menu item for site administration
-#: lib/action.php:538 lib/adminpanelaction.php:400
+#: lib/action.php:538 lib/adminpanelaction.php:387
 msgid "Site notice"
 msgstr "Webbplatsnotis"
 
@@ -5251,7 +5291,10 @@ msgid "StatusNet software license"
 msgstr "Programvarulicens fÃ¶r StatusNet"
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
-#: lib/action.php:843
+#. TRANS: Text between [] is a link description, text between () is the link itself.
+#. TRANS: Make sure there is no whitespace between "]" and "(".
+#. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
+#: lib/action.php:846
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -5261,13 +5304,16 @@ msgstr ""
 "%%](%%site.broughtbyurl%%)."
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:846
+#: lib/action.php:849
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** Ã¤r en mikrobloggtjÃ¤nst."
 
 #. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.
-#: lib/action.php:850
+#. TRANS: Make sure there is no whitespace between "]" and "(".
+#. TRANS: Text between [] is a link description, text between () is the link itself.
+#. TRANS: %s is the version of StatusNet that is being used.
+#: lib/action.php:856
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -5279,50 +5325,51 @@ msgstr ""
 "fsf.org/licensing/licenses/agpl-3.0.html)."
 
 #. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:866
+#: lib/action.php:872
 msgid "Site content license"
 msgstr "Licens fÃ¶r webbplatsinnehÃ¥ll"
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:873
+#: lib/action.php:879
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr "InnehÃ¥ll och data av %1$s Ã¤r privat och konfidensiell."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:880
+#: lib/action.php:886
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr "InnehÃ¥ll och data copyright av %1$s. Alla rÃ¤ttigheter reserverade."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:884
+#: lib/action.php:890
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 "InnehÃ¥ll och data copyright av medarbetare. Alla rÃ¤ttigheter reserverade."
 
-#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:897
+#. TRANS: license message in footer.
+#. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
+#: lib/action.php:904
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr "InnehÃ¥ll och data pÃ¥ %1$s Ã¤r tillgÃ¤nglig under licensen %2$s."
 
 #. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1236
+#: lib/action.php:1243
 msgid "Pagination"
 msgstr "Numrering av sidor"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1247
+#: lib/action.php:1254
 msgid "After"
 msgstr "Senare"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1257
+#: lib/action.php:1264
 msgid "Before"
 msgstr "Tidigare"
 
@@ -5331,207 +5378,226 @@ msgstr "Tidigare"
 msgid "Expecting a root feed element but got a whole XML document."
 msgstr "FÃ¶rvÃ¤ntade ett flÃ¶des rotelement, men fick ett helt XML-dokument."
 
-#: lib/activityutils.php:208
+#. TRANS: Client exception thrown when there is no source attribute.
+#: lib/activityutils.php:203
 msgid "Can't handle remote content yet."
 msgstr "Kan inte hantera fjÃ¤rrinnehÃ¥ll Ã¤nnu."
 
-#: lib/activityutils.php:244
+#. TRANS: Client exception thrown when there embedded XML content is found that cannot be processed yet.
+#: lib/activityutils.php:240
 msgid "Can't handle embedded XML content yet."
 msgstr "Kan inte hantera inbÃ¤ddat XML-innehÃ¥ll Ã¤nnu."
 
-#: lib/activityutils.php:248
+#. TRANS: Client exception thrown when base64 encoded content is found that cannot be processed yet.
+#: lib/activityutils.php:245
 msgid "Can't handle embedded Base64 content yet."
 msgstr "Kan inte hantera inbÃ¤ddat Base64-innehÃ¥ll Ã¤nnu."
 
 #. TRANS: Client error message thrown when a user tries to change admin settings but has no access rights.
-#: lib/adminpanelaction.php:98
+#: lib/adminpanelaction.php:96
 msgid "You cannot make changes to this site."
 msgstr "Du kan inte gÃ¶ra fÃ¶rÃ¤ndringar av denna webbplats."
 
 #. TRANS: Client error message throw when a certain panel's settings cannot be changed.
-#: lib/adminpanelaction.php:110
+#: lib/adminpanelaction.php:108
 msgid "Changes to that panel are not allowed."
 msgstr "Ãndringar av den panelen tillÃ¥ts inte."
 
 #. TRANS: Client error message.
-#: lib/adminpanelaction.php:229
+#: lib/adminpanelaction.php:222
 msgid "showForm() not implemented."
 msgstr "showForm() Ã¤r inte implementerat."
 
 #. TRANS: Client error message
-#: lib/adminpanelaction.php:259
+#: lib/adminpanelaction.php:250
 msgid "saveSettings() not implemented."
 msgstr "saveSetting() Ã¤r inte implementerat."
 
 #. TRANS: Client error message thrown if design settings could not be deleted in
 #. TRANS: the admin panel Design.
-#: lib/adminpanelaction.php:284
+#: lib/adminpanelaction.php:274
 msgid "Unable to delete design setting."
 msgstr "Kunde inte ta bort utseendeinstÃ¤llning."
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:350
+#: lib/adminpanelaction.php:337
 msgid "Basic site configuration"
 msgstr "GrundlÃ¤ggande webbplatskonfiguration"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:352
+#: lib/adminpanelaction.php:339
 msgctxt "MENU"
 msgid "Site"
 msgstr "Webbplats"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:358
+#: lib/adminpanelaction.php:345
 msgid "Design configuration"
 msgstr "Konfiguration av utseende"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:360
+#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
+#: lib/adminpanelaction.php:347 lib/groupnav.php:135
 msgctxt "MENU"
 msgid "Design"
 msgstr "Utseende"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:366
+#: lib/adminpanelaction.php:353
 msgid "User configuration"
 msgstr "Konfiguration av anvÃ¤ndare"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:368 lib/personalgroupnav.php:115
+#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:115
 msgid "User"
 msgstr "AnvÃ¤ndare"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:374
+#: lib/adminpanelaction.php:361
 msgid "Access configuration"
 msgstr "Konfiguration av Ã¥tkomst"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:382
+#: lib/adminpanelaction.php:369
 msgid "Paths configuration"
 msgstr "Konfiguration av sÃ¶kvÃ¤gar"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:390
+#: lib/adminpanelaction.php:377
 msgid "Sessions configuration"
 msgstr "Konfiguration av sessioner"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:398
+#: lib/adminpanelaction.php:385
 msgid "Edit site notice"
 msgstr "Redigera webbplatsnotis"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:406
+#: lib/adminpanelaction.php:393
 msgid "Snapshots configuration"
 msgstr "Konfiguration av Ã¶gonblicksbilder"
 
 #. TRANS: Client error 401.
-#: lib/apiauth.php:113
+#: lib/apiauth.php:111
 msgid "API resource requires read-write access, but you only have read access."
 msgstr ""
 "API-resursen krÃ¤ver lÃ¤s- och skrivrÃ¤ttigheter, men du har bara lÃ¤srÃ¤ttighet."
 
+#. TRANS: OAuth exception thrown when no application is found for a given consumer key.
+#: lib/apiauth.php:175
+msgid "No application for that consumer key."
+msgstr ""
+
+#. TRANS: OAuth exception given when no user was found for a given token (no token was found).
+#: lib/apiauth.php:217
+msgid "No user for that token."
+msgstr ""
+
+#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
+#: lib/apioauthstore.php:178
+msgid "Tried to revoke unknown token"
+msgstr ""
+
 #. TRANS: Form legend.
-#: lib/applicationeditform.php:137
+#: lib/applicationeditform.php:129
 msgid "Edit application"
 msgstr "Redigera applikation"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:187
+#: lib/applicationeditform.php:178
 msgid "Icon for this application"
 msgstr "Ikon fÃ¶r denna applikation"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:209
+#: lib/applicationeditform.php:200
 #, php-format
 msgid "Describe your application in %d characters"
 msgstr "Beskriv din applikation med hÃ¶gst %d tecken"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:213
+#: lib/applicationeditform.php:204
 msgid "Describe your application"
 msgstr "Beskriv din applikation"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:224
+#: lib/applicationeditform.php:215
 msgid "URL of the homepage of this application"
 msgstr "URL till hemsidan fÃ¶r denna applikation"
 
 #. TRANS: Form input field label.
-#: lib/applicationeditform.php:226
+#: lib/applicationeditform.php:217
 msgid "Source URL"
 msgstr "URL fÃ¶r kÃ¤lla"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:233
+#: lib/applicationeditform.php:224
 msgid "Organization responsible for this application"
 msgstr "Organisation som ansvarar fÃ¶r denna applikation"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:242
+#: lib/applicationeditform.php:233
 msgid "URL for the homepage of the organization"
 msgstr "URL till organisationens hemsidan"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:251
+#: lib/applicationeditform.php:242
 msgid "URL to redirect to after authentication"
 msgstr "URL att omdirigera till efter autentisering"
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:278
+#: lib/applicationeditform.php:269
 msgid "Browser"
 msgstr "WebblÃ¤sare"
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:295
+#: lib/applicationeditform.php:286
 msgid "Desktop"
 msgstr "Skrivbord"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:297
+#: lib/applicationeditform.php:288
 msgid "Type of application, browser or desktop"
 msgstr "Typ av applikation, webblÃ¤sare eller skrivbord"
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:320
+#: lib/applicationeditform.php:311
 msgid "Read-only"
 msgstr "Skrivskyddad"
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:339
+#: lib/applicationeditform.php:330
 msgid "Read-write"
 msgstr "LÃ¤s och skriv"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:341
+#: lib/applicationeditform.php:332
 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: Submit button title
-#: lib/applicationeditform.php:359
+#. TRANS: Submit button title.
+#: lib/applicationeditform.php:349
 msgid "Cancel"
 msgstr "Avbryt"
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:136
+#: lib/applicationlist.php:135
 msgid "read-write"
 msgstr "lÃ¤s och skriv"
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:138
+#: lib/applicationlist.php:137
 msgid "read-only"
 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
+#: lib/applicationlist.php:143
 #, php-format
 msgid "Approved %1$s - \"%2$s\" access."
 msgstr "GodkÃ¤nd %1$s - \"%2$s\" Ã¥tkomst."
 
 #. TRANS: Button label
-#: lib/applicationlist.php:159
+#: lib/applicationlist.php:158
 msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "Ãterkalla"
@@ -5551,11 +5617,13 @@ msgstr "FÃ¶rfattare"
 msgid "Provider"
 msgstr "TillhandahÃ¥llare"
 
-#: lib/attachmentnoticesection.php:67
+#. TRANS: Title.
+#: lib/attachmentnoticesection.php:68
 msgid "Notices where this attachment appears"
 msgstr "Notiser dÃ¤r denna bilaga fÃ¶rekommer"
 
-#: lib/attachmenttagcloudsection.php:48
+#. TRANS: Title.
+#: lib/attachmenttagcloudsection.php:49
 msgid "Tags for this attachment"
 msgstr "Taggar fÃ¶r denna billaga"
 
@@ -5567,6 +5635,11 @@ msgstr "Byte av lÃ¶senord misslyckades"
 msgid "Password changing is not allowed"
 msgstr "Byte av lÃ¶senord Ã¤r inte tillÃ¥tet"
 
+#. TRANS: Title for the form to block a user.
+#: lib/blockform.php:70
+msgid "Block"
+msgstr "Blockera"
+
 #: lib/channel.php:157 lib/channel.php:177
 msgid "Command results"
 msgstr "Resultat av kommando"
@@ -5579,6 +5652,31 @@ msgstr "Kommando komplett"
 msgid "Command failed"
 msgstr "Kommando misslyckades"
 
+#. TRANS: Command exception text shown when a notice ID is requested that does not exist.
+#: lib/command.php:84 lib/command.php:108
+msgid "Notice with that id does not exist."
+msgstr "Notis med den ID:n finns inte."
+
+#. TRANS: Command exception text shown when a last user notice is requested and it does not exist.
+#. TRANS: Error text shown when a last user notice is requested and it does not exist.
+#: lib/command.php:101 lib/command.php:630
+msgid "User has no last notice."
+msgstr "AnvÃ¤ndare har ingen sista notis."
+
+#. 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:130
+#, php-format
+msgid "Could not find a user with nickname %s."
+msgstr "Kunde inte hitta en anvÃ¤ndare med smeknamnet %s."
+
+#. TRANS: Message given getting a non-existing user.
+#. TRANS: %s is the nickname of the user that could not be found.
+#: lib/command.php:150
+#, php-format
+msgid "Could not find a local user with nickname %s."
+msgstr "Kunde inte hitta en lokal anvÃ¤ndare med smeknamnet %s."
+
 #. TRANS: Error text shown when an unimplemented command is given.
 #: lib/command.php:185
 msgid "Sorry, this command is not yet implemented."
@@ -5589,6 +5687,13 @@ msgstr "TyvÃ¤rr, detta kommando Ã¤r inte implementerat Ã¤n."
 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!"
 
+#. TRANS: Message given having nudged another user.
+#. TRANS: %s is the nickname of the user that was nudged.
+#: lib/command.php:240
+#, php-format
+msgid "Nudge sent to %s."
+msgstr "Knuff skickad till %s."
+
 #. TRANS: User statistics text.
 #. TRANS: %1$s is the number of other user the user is subscribed to.
 #. TRANS: %2$s is the number of users that are subscribed to the user.
@@ -5609,6 +5714,20 @@ msgstr ""
 msgid "Notice marked as fave."
 msgstr "Notis markerad som favorit."
 
+#. 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.
+#: lib/command.php:360
+#, php-format
+msgid "%1$s joined group %2$s."
+msgstr "%1$s gick med i grupp %2$s."
+
+#. 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.
+#: lib/command.php:408
+#, php-format
+msgid "%1$s left group %2$s."
+msgstr "%1$s lÃ¤mnade grupp %2$s."
+
 #. TRANS: Whois output. %s is the full name of the queried user.
 #: lib/command.php:434
 #, php-format
@@ -5657,11 +5776,32 @@ msgstr "Meddelande fÃ¶r lÃ¥ngt - maximum Ã¤r %1$d tecken, du skickade %2$d."
 msgid "Error sending direct message."
 msgstr "Fel vid sÃ¤ndning av direktmeddelande."
 
+#. 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:554
+#, php-format
+msgid "Notice from %s repeated."
+msgstr "Notis frÃ¥n %s upprepad."
+
 #. TRANS: Error text shown when repeating a notice fails with an unknown reason.
 #: lib/command.php:557
 msgid "Error repeating notice."
 msgstr "Fel vid upprepning av notis."
 
+#. TRANS: Message given if content of a notice for a reply is too long.
+#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
+#: lib/command.php:592
+#, php-format
+msgid "Notice too long - maximum is %1$d characters, you sent %2$d."
+msgstr "Notis fÃ¶r lÃ¥ngt - maximum Ã¤r %1$d tecken, du skickade %2$d."
+
+#. TRANS: Text shown having sent a reply to a notice successfully.
+#. TRANS: %s is the nickname of the user of the notice the reply was sent to.
+#: lib/command.php:603
+#, php-format
+msgid "Reply to %s sent."
+msgstr "Svar pÃ¥ %s skickat."
+
 #. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
 #: lib/command.php:606
 msgid "Error saving notice."
@@ -5670,18 +5810,32 @@ msgstr "Fel vid sparande av notis."
 #. TRANS: Error text shown when no username was provided when issuing a subscribe command.
 #: lib/command.php:655
 msgid "Specify the name of the user to subscribe to."
-msgstr ""
+msgstr "Ange namnet pÃ¥ anvÃ¤ndaren att prenumerara pÃ¥."
 
 #. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
 #: lib/command.php:664
 msgid "Can't subscribe to OMB profiles by command."
 msgstr "Kan inte prenumera pÃ¥ OMB-profiler via kommando."
 
+#. TRANS: Text shown after having subscribed to another user successfully.
+#. TRANS: %s is the name of the user the subscription was requested for.
+#: lib/command.php:672
+#, php-format
+msgid "Subscribed to %s."
+msgstr "Prenumererar pÃ¥ %s."
+
 #. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
 #. TRANS: Error text shown when no username was provided when issuing the command.
 #: lib/command.php:694 lib/command.php:804
 msgid "Specify the name of the user to unsubscribe from."
-msgstr ""
+msgstr "Ange namnet pÃ¥ anvÃ¤ndaren att avsluta prenumeration pÃ¥."
+
+#. TRANS: Text shown after having unsubscribed from another user successfully.
+#. TRANS: %s is the name of the user the unsubscription was requested for.
+#: lib/command.php:705
+#, php-format
+msgid "Unsubscribed from %s."
+msgstr "Prenumeration pÃ¥ %s avslutad."
 
 #. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
 #. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
@@ -5712,7 +5866,7 @@ msgstr "Kan inte stÃ¤nga av notifikation."
 #. TRANS: Error text shown when issuing the login command while login is disabled.
 #: lib/command.php:771
 msgid "Login command is disabled."
-msgstr ""
+msgstr "Inloggningskommando Ã¤r inaktiverat."
 
 #. TRANS: Text shown after issuing the login command successfully.
 #. TRANS: %s is a logon link..
@@ -5720,6 +5874,14 @@ msgstr ""
 #, php-format
 msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr ""
+"Denna lÃ¤nk Ã¤r bara anvÃ¤ndbar en gÃ¥ng och Ã¤r bara giltig i 2 minuter: %s. "
+
+#. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
+#. TRANS: %s is the name of the user the unsubscription was requested for.
+#: lib/command.php:813
+#, php-format
+msgid "Unsubscribed %s."
+msgstr "%ss prenumeration avslutad."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
 #: lib/command.php:831
@@ -5727,7 +5889,7 @@ msgid "You are not subscribed to anyone."
 msgstr "Du prenumererar inte pÃ¥ nÃ¥gon."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to.
-#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.
 #: lib/command.php:836
 msgid "You are subscribed to this person:"
@@ -5742,7 +5904,7 @@ msgid "No one is subscribed to you."
 msgstr "Ingen prenumerar pÃ¥ dig."
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
-#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
 #: lib/command.php:863
 msgid "This person is subscribed to you:"
@@ -5757,7 +5919,7 @@ msgid "You are not a member of any groups."
 msgstr "Du Ã¤r inte medlem i nÃ¥gra grupper."
 
 #. TRANS: Text shown after requesting groups a user is subscribed to.
-#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
 #: lib/command.php:890
 msgid "You are a member of this group:"
@@ -5765,6 +5927,7 @@ 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:"
 
+#. TRANS: Help text for commands.
 #: lib/command.php:905
 msgid ""
 "Commands:\n"
@@ -5984,38 +6147,6 @@ msgstr "Plats fÃ¶r gruppen, om den finns, sÃ¥som \"Stad, LÃ¤n, Land\""
 msgid "Extra nicknames for the group, comma- or space- separated, max %d"
 msgstr "Extra smeknamn fÃ¶r gruppen, komma- eller mellanslagsseparerade, max &d"
 
-#: lib/groupnav.php:85
-msgid "Group"
-msgstr "Grupp"
-
-#: lib/groupnav.php:101
-msgid "Blocked"
-msgstr "Blockerad"
-
-#: lib/groupnav.php:102
-#, php-format
-msgid "%s blocked users"
-msgstr "%s blockerade anvÃ¤ndare"
-
-#: lib/groupnav.php:108
-#, php-format
-msgid "Edit %s group properties"
-msgstr "Redigera %s gruppegenskaper"
-
-#: lib/groupnav.php:113
-msgid "Logo"
-msgstr "Logotyp"
-
-#: lib/groupnav.php:114
-#, php-format
-msgid "Add or edit %s logo"
-msgstr "LÃ¤gg till eller redigera %s logotyp"
-
-#: lib/groupnav.php:120
-#, php-format
-msgid "Add or edit %s design"
-msgstr "LÃ¤gg till eller redigera %s utseende"
-
 #: lib/groupsbymemberssection.php:71
 msgid "Groups with most members"
 msgstr "Grupper med flest medlemmar"
@@ -6047,7 +6178,8 @@ msgstr "Denna fil Ã¤r fÃ¶r stor. Den maximala filstorleken Ã¤r %s."
 msgid "Partial upload."
 msgstr "Bitvis uppladdad."
 
-#: lib/imagefile.php:101 lib/mediafile.php:170
+#. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
+#: lib/imagefile.php:101 lib/mediafile.php:179
 msgid "System error uploading file."
 msgstr "Systemfel vid uppladdning av fil."
 
@@ -6448,17 +6580,20 @@ msgstr "TyvÃ¤rr, ingen inkommande e-post tillÃ¥ts."
 msgid "Unsupported message type: %s"
 msgstr "Formatet %s fÃ¶r meddelande stÃ¶djs inte."
 
-#: lib/mediafile.php:98 lib/mediafile.php:123
+#. TRANS: Client exception thrown when a database error was thrown during a file upload operation.
+#: lib/mediafile.php:99 lib/mediafile.php:125
 msgid "There was a database error while saving your file. Please try again."
 msgstr ""
 "Det var ett databasfel vid sparandet av din profil. Var vÃ¤nlig fÃ¶rsÃ¶k igen."
 
-#: lib/mediafile.php:142
+#. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
+#: lib/mediafile.php:145
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
 msgstr ""
 "Den uppladdade filen Ã¶verstiger upload_max_filesize-direktivet i php.ini."
 
-#: lib/mediafile.php:147
+#. TRANS: Client exception.
+#: lib/mediafile.php:151
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form."
@@ -6466,44 +6601,43 @@ msgstr ""
 "Den uppladdade filen Ã¶verstiger MAX_FILE_SIZE-direktivet som var angivet i "
 "HTML-formulÃ¤ret."
 
-#: lib/mediafile.php:152
+#. TRANS: Client exception.
+#: lib/mediafile.php:157
 msgid "The uploaded file was only partially uploaded."
 msgstr "Den uppladdade filen var bara delvis uppladdad."
 
-#: lib/mediafile.php:159
+#. TRANS: Client exception thrown when a temporary folder is not present to store a file upload.
+#: lib/mediafile.php:165
 msgid "Missing a temporary folder."
 msgstr "Saknar en tillfÃ¤llig mapp."
 
-#: lib/mediafile.php:162
+#. TRANS: Client exception thrown when writing to disk is not possible during a file upload operation.
+#: lib/mediafile.php:169
 msgid "Failed to write file to disk."
 msgstr "Misslyckades att skriva fil till disk."
 
-#: lib/mediafile.php:165
+#. TRANS: Client exception thrown when a file upload operation has been stopped by an extension.
+#: lib/mediafile.php:173
 msgid "File upload stopped by extension."
 msgstr "Filuppladdningen stoppad pga filÃ¤ndelse"
 
-#: lib/mediafile.php:179 lib/mediafile.php:217
+#. TRANS: Client exception thrown when a file upload operation would cause a user to exceed a set quota.
+#: lib/mediafile.php:189 lib/mediafile.php:232
 msgid "File exceeds user's quota."
 msgstr "Fil Ã¶verstiger anvÃ¤ndaren kvot."
 
-#: lib/mediafile.php:197 lib/mediafile.php:234
+#. TRANS: Client exception thrown when a file upload operation fails because the file could
+#. TRANS: not be moved from the temporary folder to the permanent file location.
+#: lib/mediafile.php:209 lib/mediafile.php:251
 msgid "File could not be moved to destination directory."
 msgstr "Fil kunde inte flyttas till destinationskatalog."
 
-#: lib/mediafile.php:202 lib/mediafile.php:238
+#. TRANS: Client exception thrown when a file upload operation has been stopped because the MIME
+#. TRANS: type of the uploaded file could not be determined.
+#: lib/mediafile.php:216 lib/mediafile.php:257
 msgid "Could not determine file's MIME type."
 msgstr "Kunde inte faststÃ¤lla filens MIME-typ."
 
-#: lib/mediafile.php:318
-#, php-format
-msgid " Try using another %s format."
-msgstr "FÃ¶rsÃ¶k anvÃ¤nda ett annat %s-format."
-
-#: lib/mediafile.php:323
-#, php-format
-msgid "%s is not a supported file type on this server."
-msgstr "%s Ã¤r en filtyp som saknar stÃ¶d pÃ¥ denna server."
-
 #: lib/messageform.php:120
 msgid "Send a direct notice"
 msgstr "Skicka en direktnotis"
@@ -6585,7 +6719,7 @@ msgstr "pÃ¥"
 
 #: lib/noticelist.php:502
 msgid "web"
-msgstr ""
+msgstr "webb"
 
 #: lib/noticelist.php:568
 msgid "in context"
@@ -6619,27 +6753,7 @@ msgstr "Knuffa"
 msgid "Send a nudge to this user"
 msgstr "Skicka en knuff till denna anvÃ¤ndare"
 
-#: lib/oauthstore.php:283
-msgid "Error inserting new profile"
-msgstr "Fel vid infogning av ny profil"
-
-#: lib/oauthstore.php:291
-msgid "Error inserting avatar"
-msgstr "Fel vid infogning av avatar"
-
-#: lib/oauthstore.php:306
-msgid "Error updating remote profile"
-msgstr "Fel vid uppdatering av fjÃ¤rrprofil"
-
-#: lib/oauthstore.php:311
-msgid "Error inserting remote profile"
-msgstr "Fel vid infogning av fjÃ¤rrprofilen"
-
-#: lib/oauthstore.php:345
-msgid "Duplicate notice"
-msgstr "Duplicerad notis"
-
-#: lib/oauthstore.php:490
+#: lib/oauthstore.php:491
 msgid "Couldn't insert new subscription."
 msgstr "Kunde inte infoga ny prenumeration."
 
@@ -6676,7 +6790,8 @@ msgstr "Dina skickade meddelanden"
 msgid "Tags in %s's notices"
 msgstr "Taggar i %ss notiser"
 
-#: lib/plugin.php:115
+#. TRANS: Displayed as version information for a plugin if no version information was found.
+#: lib/plugin.php:116
 msgid "Unknown"
 msgstr "OkÃ¤nd"
 
@@ -6770,19 +6885,19 @@ msgstr "Flytta till sandlÃ¥dan"
 msgid "Sandbox this user"
 msgstr "Flytta denna anvÃ¤ndare till sandlÃ¥dan"
 
-#: lib/searchaction.php:120
+#. TRANS: Fieldset legend for the search form.
+#: lib/searchaction.php:121
 msgid "Search site"
 msgstr "SÃ¶k webbplats"
 
-#: lib/searchaction.php:126
+#. TRANS: Used as a field label for the field where one or more keywords
+#. TRANS: for searching can be entered.
+#: lib/searchaction.php:129
 msgid "Keyword(s)"
 msgstr "Nyckelord"
 
-#: lib/searchaction.php:127
-msgid "Search"
-msgstr "SÃ¶k"
-
-#: lib/searchaction.php:162
+#. TRANS: Definition list item with instructions on how to get (better) search results.
+#: lib/searchaction.php:170
 msgid "Search help"
 msgstr "SÃ¶k hjÃ¤lp"
 
@@ -6894,7 +7009,7 @@ msgstr ""
 
 #: lib/themeuploader.php:224
 msgid "Theme contains unsafe file extension names; may be unsafe."
-msgstr ""
+msgstr "Tema innehÃ¥ller osÃ¤kra filtillÃ¤ggsnamn; kan vara osÃ¤kert."
 
 #: lib/themeuploader.php:241
 #, php-format
@@ -6980,56 +7095,32 @@ msgid "Moderator"
 msgstr "Moderator"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1102
+#: lib/util.php:1103
 msgid "a few seconds ago"
 msgstr "ett par sekunder sedan"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1105
+#: lib/util.php:1106
 msgid "about a minute ago"
 msgstr "fÃ¶r nÃ¥n minut sedan"
 
-#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1109
-#, php-format
-msgid "about %d minutes ago"
-msgstr "fÃ¶r %d minuter sedan"
-
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 #: lib/util.php:1112
 msgid "about an hour ago"
 msgstr "fÃ¶r en timma sedan"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1116
-#, php-format
-msgid "about %d hours ago"
-msgstr "fÃ¶r %d timmar sedan"
-
-#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1119
+#: lib/util.php:1118
 msgid "about a day ago"
 msgstr "fÃ¶r en dag sedan"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1123
-#, php-format
-msgid "about %d days ago"
-msgstr "fÃ¶r %d dagar sedan"
-
-#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1126
+#: lib/util.php:1124
 msgid "about a month ago"
 msgstr "fÃ¶r en mÃ¥nad sedan"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 #: lib/util.php:1130
-#, php-format
-msgid "about %d months ago"
-msgstr "fÃ¶r %d mÃ¥nader sedan"
-
-#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1133
 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 e1390e1140..5fe86483d6 100644
--- a/locale/te/LC_MESSAGES/statusnet.po
+++ b/locale/te/LC_MESSAGES/statusnet.po
@@ -1,7 +1,8 @@
-# Translation of StatusNet to Telugu
+# Translation of StatusNet to Telugu (à°¤à±à°²à±à°à±)
+# Expored from translatewiki.net
 #
-# Author@translatewiki.net: Brion
-# Author@translatewiki.net: Veeven
+# Author: Brion
+# Author: Veeven
 # --
 # This file is distributed under the same license as the StatusNet package.
 #
@@ -9,20 +10,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-09 17:35+0000\n"
-"PO-Revision-Date: 2010-09-09 17:38:05+0000\n"
-"Language-Team: Telugu\n"
+"POT-Creation-Date: 2010-09-14 19:53+0000\n"
+"PO-Revision-Date: 2010-09-14 19:54:21+0000\n"
+"Language-Team: Telugu <http://translatewiki.net/wiki/Portal:te>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r72348); Translate extension (2010-08-20)\n"
+"X-Generator: MediaWiki 1.17alpha (r73009); Translate extension (2010-08-20)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: te\n"
-"X-Message-Group: out-statusnet\n"
+"X-Message-Group: #out-statusnet\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-POT-Import-Date: 1284-49-16 34::+0000\n"
 
 #. TRANS: Page title
 #. TRANS: Menu item for site administration
-#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:376
+#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:363
 msgid "Access"
 msgstr "à°à°à°¦à±à°¬à°¾à°à±"
 
@@ -75,10 +77,10 @@ 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 actions/emailsettings.php:224
-#: actions/imsettings.php:184 actions/smssettings.php:209
-#: lib/applicationeditform.php:361
+#. TRANS: Button label in the "Edit application" form.
+#: actions/accessadminpanel.php:203 actions/emailsettings.php:228
+#: actions/imsettings.php:187 actions/smssettings.php:209
+#: lib/applicationeditform.php:351
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "à°à°¦à±à°°à°ªà°°à°à±"
@@ -91,15 +93,15 @@ msgstr "à°à°à±à°µà°à°à°¿ à°ªà±à°à± à°²à±à°¦à±."
 
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #: actions/all.php:79 actions/allrss.php:68
-#: actions/apiaccountupdatedeliverydevice.php:114
-#: actions/apiaccountupdateprofile.php:105
-#: actions/apiaccountupdateprofilebackgroundimage.php:116
-#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
-#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
-#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:113
-#: actions/apigroupismember.php:91 actions/apigroupjoin.php:100
-#: actions/apigroupleave.php:100 actions/apigrouplist.php:73
-#: actions/apistatusesupdate.php:229 actions/apisubscriptions.php:87
+#: actions/apiaccountupdatedeliverydevice.php:115
+#: actions/apiaccountupdateprofile.php:106
+#: actions/apiaccountupdateprofilebackgroundimage.php:117
+#: actions/apiaccountupdateprofileimage.php:106 actions/apiblockcreate.php:98
+#: actions/apiblockdestroy.php:97 actions/apidirectmessage.php:77
+#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:114
+#: actions/apigroupismember.php:91 actions/apigroupjoin.php:101
+#: actions/apigroupleave.php:101 actions/apigrouplist.php:73
+#: actions/apistatusesupdate.php:230 actions/apisubscriptions.php:87
 #: actions/apitimelinefavorites.php:72 actions/apitimelinefriends.php:174
 #: actions/apitimelinehome.php:80 actions/apitimelinementions.php:80
 #: actions/apitimelineuser.php:82 actions/avatarbynickname.php:75
@@ -175,39 +177,41 @@ msgstr "à°®à±à°°à± à°®à°°à°¿à°¯à± à°®à± à°¸à±à°¨à±à°¹à°¿à°¤à±à°²à±"
 msgid "Updates from %1$s and friends on %2$s!"
 msgstr "%2$sà°²à± %1$s à°®à°°à°¿à°¯à± à°¸à±à°¨à±à°¹à°¿à°¤à±à°² à°¨à±à°à°¡à°¿ à°¤à°¾à°à°¾à°à°°à°£à°²à±!"
 
-#: actions/apiaccountupdatedeliverydevice.php:86
-#: actions/apiaccountupdateprofile.php:89
-#: actions/apiaccountupdateprofilebackgroundimage.php:86
-#: actions/apiaccountupdateprofilecolors.php:110
-#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89
-#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109
-#: actions/apifavoritecreate.php:91 actions/apifavoritedestroy.php:92
-#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
-#: actions/apigroupcreate.php:105 actions/apigroupjoin.php:92
-#: actions/apigroupleave.php:92 actions/apimediaupload.php:67
-#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:198
+#. TRANS: Client error message. POST is a HTTP command. It should not be translated.
+#. TRANS: Client error. POST is a HTTP command. It should not be translated.
+#: actions/apiaccountupdatedeliverydevice.php:87
+#: actions/apiaccountupdateprofile.php:90
+#: actions/apiaccountupdateprofilebackgroundimage.php:87
+#: actions/apiaccountupdateprofilecolors.php:111
+#: actions/apiaccountupdateprofileimage.php:85 actions/apiblockcreate.php:90
+#: actions/apiblockdestroy.php:89 actions/apidirectmessagenew.php:110
+#: actions/apifavoritecreate.php:92 actions/apifavoritedestroy.php:93
+#: actions/apifriendshipscreate.php:92 actions/apifriendshipsdestroy.php:92
+#: actions/apigroupcreate.php:106 actions/apigroupjoin.php:93
+#: actions/apigroupleave.php:93 actions/apimediaupload.php:68
+#: actions/apistatusesretweet.php:66 actions/apistatusesupdate.php:199
 msgid "This method requires a POST."
 msgstr ""
 
-#: actions/apiaccountupdatedeliverydevice.php:106
+#: actions/apiaccountupdatedeliverydevice.php:107
 msgid ""
 "You must specify a parameter named 'device' with a value of one of: sms, im, "
 "none."
 msgstr ""
 
-#: actions/apiaccountupdateprofile.php:112
-#: actions/apiaccountupdateprofilebackgroundimage.php:194
-#: actions/apiaccountupdateprofilecolors.php:185
-#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/apiaccountupdateprofile.php:113
+#: actions/apiaccountupdateprofilebackgroundimage.php:195
+#: actions/apiaccountupdateprofilecolors.php:186
+#: actions/apiaccountupdateprofileimage.php:131 actions/apiusershow.php:108
 #: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/hcard.php:74
 #: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
 #: lib/profileaction.php:84
 msgid "User has no profile."
 msgstr "à°µà°¾à°¡à±à°à°°à°¿à°à°¿ à°ªà±à°°à±à°«à±à°²à± à°²à±à°¦à±."
 
-#: actions/apiaccountupdateprofilebackgroundimage.php:108
-#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
-#: actions/apistatusesupdate.php:212 actions/avatarsettings.php:257
+#: actions/apiaccountupdateprofilebackgroundimage.php:109
+#: actions/apiaccountupdateprofileimage.php:98 actions/apimediaupload.php:81
+#: actions/apistatusesupdate.php:213 actions/avatarsettings.php:257
 #: actions/designadminpanel.php:123 actions/editapplication.php:118
 #: actions/newapplication.php:101 actions/newnotice.php:94
 #: lib/designsettings.php:283
@@ -217,21 +221,21 @@ msgid ""
 "current configuration."
 msgstr ""
 
-#: actions/apiaccountupdateprofilebackgroundimage.php:136
-#: actions/apiaccountupdateprofilebackgroundimage.php:146
-#: actions/apiaccountupdateprofilecolors.php:164
-#: actions/apiaccountupdateprofilecolors.php:174
+#: actions/apiaccountupdateprofilebackgroundimage.php:137
+#: actions/apiaccountupdateprofilebackgroundimage.php:147
+#: actions/apiaccountupdateprofilecolors.php:165
+#: actions/apiaccountupdateprofilecolors.php:175
 #: actions/groupdesignsettings.php:290 actions/groupdesignsettings.php:300
 #: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
 #: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
 msgid "Unable to save your design settings."
 msgstr "à°®à± à°°à±à°ªà±à°°à±à°à°² à°à°®à°°à°¿à°à°²à°¨à°¿ à°à°¦à±à°°à°ªà°°à°à°²à±à°à±à°¨à±à°¨à°¾à°."
 
-#: actions/apiblockcreate.php:105
+#: actions/apiblockcreate.php:106
 msgid "You cannot block yourself!"
 msgstr "à°®à°¿à°®à±à°®à°²à±à°¨à°¿ à°®à±à°°à± à°¨à°¿à°°à±à°§à°¿à°à°à±à°à±à°²à±à°°à±!"
 
-#: actions/apiblockcreate.php:126
+#: actions/apiblockcreate.php:127
 msgid "Block user failed."
 msgstr "à°µà°¾à°¡à±à°à°°à°¿ à°¨à°¿à°°à±à°§à° à°µà°¿à°«à°²à°®à±à°à°¦à°¿."
 
@@ -255,59 +259,59 @@ msgstr "%s à°à°¿ à°¨à±à°°à± à°¸à°à°¦à±à°¶à°¾à°²à±"
 msgid "All the direct messages sent to %s"
 msgstr "%sà°à°¿ à°ªà°à°ªà°¿à°¨ à°à°¨à±à°¨à°¿ à°¨à±à°°à± à°¸à°à°¦à±à°¶à°¾à°²à±"
 
-#: actions/apidirectmessagenew.php:118
+#: actions/apidirectmessagenew.php:119
 msgid "No message text!"
 msgstr "à°¸à°à°¦à±à°¶à°ªà± à°ªà°¾à° à±à°¯à° à°²à±à°¦à±!"
 
-#: actions/apidirectmessagenew.php:127 actions/newmessage.php:150
+#: actions/apidirectmessagenew.php:128 actions/newmessage.php:150
 #, php-format
 msgid "That's too long. Max message size is %d chars."
 msgstr "à°à°¾à°²à°¾ à°ªà±à°¡à°µà±à°à°¦à°¿. à°à°°à°¿à°·à±à°  à°¸à°à°¦à±à°¶ à°ªà°°à°¿à°®à°¾à°£à° %d à°à°à±à°·à°°à°¾à°²à±."
 
-#: actions/apidirectmessagenew.php:138
+#: actions/apidirectmessagenew.php:139
 msgid "Recipient user not found."
 msgstr "à°à°à°¦à±à°à±à°µà°¾à°²à±à°¸à°¿à°¨ à°µà°¾à°¡à±à°à°°à°¿ à°à°¨à°¬à°¡à°²à±à°¦à±."
 
-#: actions/apidirectmessagenew.php:142
+#: actions/apidirectmessagenew.php:143
 msgid "Can't send direct messages to users who aren't your friend."
 msgstr "à°®à± à°¸à±à°¨à±à°¹à°¿à°¤à±à°²à± à°à°¾à°¨à°¿ à°µà°¾à°¡à±à°à°°à±à°²à°à°¿ à°¨à±à°°à± à°¸à°à°¦à±à°¶à°¾à°²à± à°ªà°à°ªà°¿à°à°à°²à±à°°à±."
 
-#: actions/apifavoritecreate.php:109 actions/apifavoritedestroy.php:110
+#: actions/apifavoritecreate.php:110 actions/apifavoritedestroy.php:111
 #: actions/apistatusesdestroy.php:121
 msgid "No status found with that ID."
 msgstr "à° IDà°¤à± à° à°¨à±à°à±à°¸à± à°à°¨à°¬à°¡à°²à±à°¦à±."
 
-#: actions/apifavoritecreate.php:120
+#: actions/apifavoritecreate.php:121
 msgid "This status is already a favorite."
 msgstr "à° à°¨à±à°à±à°¸à± à°à°ªà±à°ªà°à°¿à°à± à°®à± à°à°·à±à°à°¾à°à°¶à°."
 
 #. TRANS: Error message text shown when a favorite could not be set.
-#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:296
+#: actions/apifavoritecreate.php:132 actions/favor.php:84 lib/command.php:296
 msgid "Could not create favorite."
 msgstr "à°à°·à±à°à°¾à°à°¶à°¾à°¨à±à°¨à°¿ à°¸à±à°·à±à°à°¿à°à°à°²à±à°à°ªà±à°¯à°¾à°."
 
-#: actions/apifavoritedestroy.php:123
+#: actions/apifavoritedestroy.php:124
 msgid "That status is not a favorite."
 msgstr "à° à°¨à±à°à±à°¸à± à°à°·à±à°à°¾à°à°¶à° à°à°¾à°¦à±."
 
-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
+#: actions/apifavoritedestroy.php:136 actions/disfavor.php:87
 msgid "Could not delete favorite."
 msgstr "à°à°·à±à°à°¾à°à°¶à°¾à°¨à±à°¨à°¿ à°¤à±à°²à°à°¿à°à°à°²à±à°à°ªà±à°¯à°¾à°."
 
-#: actions/apifriendshipscreate.php:109
+#: actions/apifriendshipscreate.php:110
 msgid "Could not follow user: profile not found."
 msgstr "à°µà°¾à°¡à±à°à°°à°¿à°¨à°¿ à°à°¨à±à°¸à°°à°¿à°à°à°²à±à°à°ªà±à°¯à°¾à°: %s à°à°ªà±à°ªà°à°¿à°à± à°®à± à°à°¾à°¬à°¿à°¤à°¾à°²à± à°à°¨à±à°¨à°¾à°°à±."
 
-#: actions/apifriendshipscreate.php:118
+#: actions/apifriendshipscreate.php:119
 #, php-format
 msgid "Could not follow user: %s is already on your list."
 msgstr "à°µà°¾à°¡à±à°à°°à°¿à°¨à°¿ à°à°¨à±à°¸à°°à°¿à°à°à°²à±à°à°ªà±à°¯à°¾à°: %s à°à°ªà±à°ªà°à°¿à°à± à°®à± à°à°¾à°¬à°¿à°¤à°¾à°²à± à°à°¨à±à°¨à°¾à°°à±."
 
-#: actions/apifriendshipsdestroy.php:109
+#: actions/apifriendshipsdestroy.php:110
 msgid "Could not unfollow user: User not found."
 msgstr "à°µà°¾à°¡à±à°à°°à°¿à°¨à°¿ à°à°¨à±à°¸à°°à°¿à°à°à°²à±à°à°ªà±à°¯à°¾à°: %s à°à°ªà±à°ªà°à°¿à°à± à°®à± à°à°¾à°¬à°¿à°¤à°¾à°²à± à°à°¨à±à°¨à°¾à°°à±."
 
-#: actions/apifriendshipsdestroy.php:120
+#: actions/apifriendshipsdestroy.php:121
 msgid "You cannot unfollow yourself."
 msgstr "à°®à°¿à°®à±à°®à°²à±à°¨à°¿ à°®à±à°°à± à°à°¨à°¨à±à°¸à°°à°¿à°à°à°²à±à°°à±."
 
@@ -323,101 +327,101 @@ msgstr "à°²à°à±à°·à±à°¯à°¿à°¤ à°µà°¾à°¡à±à°à°°à°¿à°¨à°¿ à°à°¨à±à°à±à°¨
 msgid "Could not find target user."
 msgstr "à°²à°à±à°·à±à°¯à°¿à°¤ à°µà°¾à°¡à±à°à°°à°¿à°¨à°¿ à°à°¨à±à°à±à°¨à°²à±à°à°ªà±à°¯à°¾à°."
 
-#: actions/apigroupcreate.php:167 actions/editgroup.php:186
+#: actions/apigroupcreate.php:168 actions/editgroup.php:186
 #: actions/newgroup.php:126 actions/profilesettings.php:215
 #: actions/register.php:212
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr "à°ªà±à°°à±à°²à± à°à°¿à°¨à±à°¨à°¬à°¡à°¿ à°à°à±à°·à°°à°¾à°²à± à°®à°°à°¿à°¯à± à°à°à°à±à°²à± à°®à°¾à°¤à±à°°à°®à± à°à°¾à°³à±à°²à± à°²à±à°à±à°à°¡à°¾ à°à°à°¡à°¾à°²à°¿."
 
-#: actions/apigroupcreate.php:176 actions/editgroup.php:190
+#: actions/apigroupcreate.php:177 actions/editgroup.php:190
 #: actions/newgroup.php:130 actions/profilesettings.php:238
 #: actions/register.php:215
 msgid "Nickname already in use. Try another one."
 msgstr "à° à°ªà±à°°à±à°¨à°¿ à°à°ªà±à°ªà°à°¿à°à± à°µà°¾à°¡à±à°¤à±à°¨à±à°¨à°¾à°°à±. à°®à°°à±à°à°¿ à°ªà±à°°à°¯à°¤à±à°¨à°¿à°à°à°à°¡à°¿."
 
-#: actions/apigroupcreate.php:183 actions/editgroup.php:193
+#: actions/apigroupcreate.php:184 actions/editgroup.php:193
 #: actions/newgroup.php:133 actions/profilesettings.php:218
 #: actions/register.php:217
 msgid "Not a valid nickname."
 msgstr "à°¸à°°à±à°¨ à°ªà±à°°à± à°à°¾à°¦à±."
 
-#: actions/apigroupcreate.php:199 actions/editapplication.php:215
+#: actions/apigroupcreate.php:200 actions/editapplication.php:215
 #: actions/editgroup.php:199 actions/newapplication.php:203
 #: actions/newgroup.php:139 actions/profilesettings.php:222
 #: actions/register.php:224
 msgid "Homepage is not a valid URL."
 msgstr "à°¹à±à°®à± à°ªà±à°à± URL à°¸à°°à±à°¨à°¦à°¿ à°à°¾à°¦à±."
 
-#: actions/apigroupcreate.php:208 actions/editgroup.php:202
+#: actions/apigroupcreate.php:209 actions/editgroup.php:202
 #: actions/newgroup.php:142 actions/profilesettings.php:225
 #: actions/register.php:227
 msgid "Full name is too long (max 255 chars)."
 msgstr "à°ªà±à°°à±à°¤à°¿ à°ªà±à°°à± à°à°¾à°²à°¾ à°ªà±à°¦à±à°¦à°à°¾ à°à°à°¦à°¿ (à°à°°à°¿à°·à±à° à°à°à°¾ 255 à°à°à±à°·à°°à°¾à°²à±)."
 
-#: actions/apigroupcreate.php:216 actions/editapplication.php:190
+#: actions/apigroupcreate.php:217 actions/editapplication.php:190
 #: actions/newapplication.php:172
 #, php-format
 msgid "Description is too long (max %d chars)."
 msgstr "à°µà°¿à°µà°°à°£ à°à°¾à°²à°¾ à°ªà±à°¦à±à°¦à°à°¾ à°à°à°¦à°¿ (%d à°à°à±à°·à°°à°¾à°²à± à°à°°à°¿à°·à±à° à°)."
 
-#: actions/apigroupcreate.php:227 actions/editgroup.php:208
+#: actions/apigroupcreate.php:228 actions/editgroup.php:208
 #: actions/newgroup.php:148 actions/profilesettings.php:232
 #: actions/register.php:234
 msgid "Location is too long (max 255 chars)."
 msgstr "à°ªà±à°°à°¾à°à°¤à° à°ªà±à°°à± à°®à°°à± à°ªà±à°¦à±à°¦à°à°¾ à°à°à°¦à°¿ (255 à°à°à±à°·à°°à°¾à°²à± à°à°°à°¿à°·à±à° à°)."
 
-#: actions/apigroupcreate.php:246 actions/editgroup.php:219
+#: actions/apigroupcreate.php:247 actions/editgroup.php:219
 #: actions/newgroup.php:159
 #, php-format
 msgid "Too many aliases! Maximum %d."
 msgstr "à°à°¾à°²à°¾ à°®à°¾à°°à±à°ªà±à°°à±à°²à±! %d à°à°°à°¿à°·à±à° à°."
 
-#: actions/apigroupcreate.php:267
+#: actions/apigroupcreate.php:268
 #, php-format
 msgid "Invalid alias: \"%s\"."
 msgstr "à°¤à°ªà±à°ªà±à°¡à± à°®à°¾à°°à±à°ªà±à°°à±: \"%s\"."
 
-#: actions/apigroupcreate.php:276 actions/editgroup.php:232
+#: actions/apigroupcreate.php:277 actions/editgroup.php:232
 #: actions/newgroup.php:172
 #, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr "\"%s\" à°à°¨à±à°¨ à°®à°¾à°°à±à°ªà±à°°à±à°¨à°¿ à°à°ªà±à°ªà°à°¿à°à± à°µà°¾à°¡à±à°¤à±à°¨à±à°¨à°¾à°°à±. à°®à°°à±à°à°à°¿ à°ªà±à°°à°¯à°¤à±à°¨à°¿à°à°à°à°¡à°¿."
 
-#: actions/apigroupcreate.php:289 actions/editgroup.php:238
+#: actions/apigroupcreate.php:290 actions/editgroup.php:238
 #: actions/newgroup.php:178
 msgid "Alias can't be the same as nickname."
 msgstr "à°®à°¾à°°à±à°ªà±à°°à± à°ªà±à°°à±à°¤à± à°¸à°®à°¾à°¨à°à°à°¾ à°à°à°¡à°à±à°¡à°¦à±."
 
-#: actions/apigroupismember.php:96 actions/apigroupjoin.php:105
-#: actions/apigroupleave.php:105 actions/apigroupmembership.php:92
+#: actions/apigroupismember.php:96 actions/apigroupjoin.php:106
+#: actions/apigroupleave.php:106 actions/apigroupmembership.php:92
 #: actions/apigroupshow.php:83 actions/apitimelinegroup.php:92
 msgid "Group not found."
 msgstr "à°à±à°à°ªà± à°¦à±à°°à°à°²à±à°¦à±."
 
 #. TRANS: Error text shown a user tries to join a group they already are a member of.
-#: actions/apigroupjoin.php:111 actions/joingroup.php:100 lib/command.php:336
+#: actions/apigroupjoin.php:112 actions/joingroup.php:100 lib/command.php:336
 msgid "You are already a member of that group."
 msgstr "à°®à±à°°à± à°à°ªà±à°ªà°à°¿à°à± à° à°à±à°à°ªà±à°²à± à°¸à°à±à°¯à±à°²à±."
 
 #. TRANS: Error text shown when a user tries to join a group they are blocked from joining.
-#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:341
+#: actions/apigroupjoin.php:121 actions/joingroup.php:105 lib/command.php:341
 msgid "You have been blocked from that group by the admin."
 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.
-#: actions/apigroupjoin.php:139 actions/joingroup.php:134 lib/command.php:353
+#: actions/apigroupjoin.php:140 actions/joingroup.php:134 lib/command.php:353
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "à°µà°¾à°¡à±à°à°°à°¿ %1$sà°¨à°¿ %2$s à°à±à°à°ªà±à°²à± à°à±à°°à±à°à°²à±à°à°ªà±à°¯à°¾à°"
 
-#: actions/apigroupleave.php:115
+#: actions/apigroupleave.php:116
 msgid "You are not a member of this group."
 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.
-#: actions/apigroupleave.php:125 actions/leavegroup.php:129
+#: actions/apigroupleave.php:126 actions/leavegroup.php:129
 #: lib/command.php:401
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
@@ -447,7 +451,7 @@ msgstr "%s à°à±à°à°ªà±à°²à±"
 msgid "groups on %s"
 msgstr "%s à°ªà± à°à±à°à°ªà±à°²à±"
 
-#: actions/apimediaupload.php:99
+#: actions/apimediaupload.php:100
 msgid "Upload failed."
 msgstr "à°à°à±à°à°¿à°à°ªà± à°µà°¿à°«à°²à°®à±à°à°¦à°¿."
 
@@ -461,9 +465,9 @@ msgstr "à°¤à°ªà±à°ªà±à°¡à± à°ªà°¾à°¤à±à°°."
 
 #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
 #: actions/deletenotice.php:169 actions/disfavor.php:74
-#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:55
+#: actions/emailsettings.php:271 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:66 actions/imsettings.php:227
+#: actions/groupunblock.php:66 actions/imsettings.php:230
 #: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
@@ -502,8 +506,8 @@ msgstr ""
 #. 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:286 actions/grouplogo.php:322
-#: actions/imsettings.php:242 actions/newapplication.php:121
+#: actions/emailsettings.php:290 actions/grouplogo.php:322
+#: actions/imsettings.php:245 actions/newapplication.php:121
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
 #: actions/smssettings.php:277 lib/designsettings.php:304
 msgid "Unexpected form submission."
@@ -564,18 +568,18 @@ msgstr ""
 msgid "You may not delete another user's status."
 msgstr "à°à°¤à°° à°µà°¾à°¡à±à°à°°à±à°² à°¸à±à°¥à°¿à°¤à°¿à°¨à°¿ à°®à±à°°à± à°¤à±à°²à°à°¿à°à°à°²à±à°°à±."
 
-#: actions/apistatusesretweet.php:75 actions/apistatusesretweets.php:72
+#: actions/apistatusesretweet.php:76 actions/apistatusesretweets.php:72
 #: actions/deletenotice.php:52 actions/shownotice.php:92
 msgid "No such notice."
 msgstr "à°à°à±à°µà°à°à°¿ à°¸à°à°¦à±à°¶à°®à±à°®à± à°²à±à°¦à±."
 
 #. TRANS: Error text shown when trying to repeat an own notice.
-#: actions/apistatusesretweet.php:83 lib/command.php:538
+#: actions/apistatusesretweet.php:84 lib/command.php:538
 msgid "Cannot repeat your own notice."
 msgstr "à°®à± à°¨à±à°à±à°¸à±à°¨à°¿ à°®à±à°°à± à°ªà±à°¨à°°à°¾à°µà±à°¤à°¿à°à°à°²à±à°°à±."
 
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-#: actions/apistatusesretweet.php:91 lib/command.php:544
+#: actions/apistatusesretweet.php:92 lib/command.php:544
 msgid "Already repeated that notice."
 msgstr "à°à°ªà±à°ªà°à°¿à°à± à° à°¨à±à°à±à°¸à±à°¨à°¿ à°ªà±à°¨à°°à°¾à°µà±à°¤à°¿à°à°à°¾à°°à±."
 
@@ -587,21 +591,21 @@ msgstr "à°¸à±à°¥à°¿à°¤à°¿à°¨à°¿ à°¤à±à°²à°à°¿à°à°à°¾à°."
 msgid "No status with that ID found."
 msgstr "à° IDà°¤à± à° à°¨à±à°à±à°¸à± à°à°¨à°¬à°¡à°²à±à°¦à±."
 
-#: actions/apistatusesupdate.php:221
+#: actions/apistatusesupdate.php:222
 msgid "Client must provide a 'status' parameter with a value."
 msgstr ""
 
-#: actions/apistatusesupdate.php:242 actions/newnotice.php:157
+#: actions/apistatusesupdate.php:243 actions/newnotice.php:157
 #: lib/mailhandler.php:60
 #, php-format
 msgid "That's too long. Max notice size is %d chars."
 msgstr "à°à°¦à°¿ à°à°¾à°²à°¾ à°ªà±à°¡à°µà±à°à°¦à°¿. à°à°°à°¿à°·à±à°  à°¨à±à°à±à°¸à± à°ªà°°à°¿à°®à°¾à°£à° %d à°à°à±à°·à°°à°¾à°²à±."
 
-#: actions/apistatusesupdate.php:283 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:284 actions/apiusershow.php:96
 msgid "Not found."
 msgstr "à°à°¨à°¬à°¡à°²à±à°¦à±."
 
-#: actions/apistatusesupdate.php:306 actions/newnotice.php:181
+#: actions/apistatusesupdate.php:307 actions/newnotice.php:181
 #, php-format
 msgid "Max notice size is %d chars, including attachment URL."
 msgstr "à°à°°à°¿à°·à±à°  à°¨à±à°à±à°¸à± à°ªà±à°¡à°µà± %d à°à°à±à°·à°°à°¾à°²à±, à°à±à°¡à°¿à°à°ªà± URLà°¨à°¿ à°à°²à±à°ªà±à°à±à°¨à°¿."
@@ -711,6 +715,10 @@ msgstr "à° à°¦à°¸à±à°¤à±à°°à°®à± à°à°à±à°à°¿à°à°ªà°¬à°¡à°²à±à°¦à±."
 msgid "Pick a square area of the image to be your avatar"
 msgstr "à°®à± à°à°µà°¤à°¾à°°à°¾à°¨à°¿à°à°¿ à°à°¾à°¨à± à° à°à°¿à°¤à±à°°à° à°¨à±à°à°¡à°¿ à°à° à°à°¤à±à°°à°¸à±à°°à°ªà± à°ªà±à°°à°¦à±à°¶à°¾à°¨à±à°¨à°¿ à°à°à°à±à°à±à°à°¡à°¿"
 
+#: actions/avatarsettings.php:347 actions/grouplogo.php:380
+msgid "Lost our file data."
+msgstr ""
+
 #: actions/avatarsettings.php:370
 msgid "Avatar updated."
 msgstr "à°à°µà°¤à°¾à°°à°¾à°¨à±à°¨à°¿ à°¤à°¾à°à°¾à°à°°à°¿à°à°à°¾à°."
@@ -771,7 +779,9 @@ msgid "Yes"
 msgstr "à°à°µà±à°¨à±"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
+#. TRANS: Submit button title.
+#. TRANS: Description of the form to block a user.
+#: actions/block.php:164 actions/groupmembers.php:403 lib/blockform.php:82
 msgid "Block this user"
 msgstr "à° à°µà°¾à°¡à±à°à°°à°¿à°¨à°¿ à°¨à°¿à°°à±à°§à°¿à°à°à±"
 
@@ -813,11 +823,13 @@ msgstr "à° à°à±à°à°ªà± à°²à±à°¨à°¿à°à°¿ à°à±à°°à°à±à°à°¡à°¾ à°¨à°¿
 msgid "Unblock user from group"
 msgstr "à°µà°¾à°¡à±à°à°°à°¿à°¨à°¿ à°à±à°à°ªà± à°¨à±à°à°¡à°¿ à°¨à°¿à°°à±à°§à°¿à°à°à±"
 
-#: actions/blockedfromgroup.php:320 lib/unblockform.php:69
+#. TRANS: Title for the form to unblock a user.
+#: actions/blockedfromgroup.php:320 lib/unblockform.php:70
 msgid "Unblock"
 msgstr "à°¨à°¿à°°à±à°§à°¾à°¨à±à°¨à°¿ à°à°¤à±à°¤à°¿à°µà±à°¯à°¿"
 
-#: actions/blockedfromgroup.php:320 lib/unblockform.php:80
+#. TRANS: Description of the form to unblock a user.
+#: actions/blockedfromgroup.php:320 lib/unblockform.php:82
 msgid "Unblock this user"
 msgstr "à° à°µà°¾à°¡à±à°à°°à°¿à°¨à°¿ à°¨à°¿à°°à±à°§à°¿à°à°à±"
 
@@ -856,9 +868,9 @@ msgstr "à° à°à°¿à°°à±à°¨à°¾à°®à°¾ à°à°ªà±à°ªà°à°¿à°à± à°¨à°¿à°°à±à°§à°¾
 #. 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/confirmaddress.php:116 actions/emailsettings.php:331
+#: actions/emailsettings.php:477 actions/imsettings.php:283
+#: actions/imsettings.php:442 actions/othersettings.php:174
 #: actions/profilesettings.php:283 actions/smssettings.php:308
 #: actions/smssettings.php:464
 msgid "Couldn't update user."
@@ -866,7 +878,7 @@ msgstr "à°µà°¾à°¡à±à°à°°à°¿à°¨à°¿ à°¤à°¾à°à°¾à°à°°à°¿à°à°à°²à±à°à±à°¨
 
 #. 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/confirmaddress.php:128 actions/emailsettings.php:437
 #: actions/smssettings.php:422
 msgid "Couldn't delete email confirmation."
 msgstr "à°à°®à±à°¯à°¿à°²à± à°¨à°¿à°°à±à°§à°¾à°°à°£à°¨à°¿ à°¤à±à°²à°à°¿à°à°à°²à±à°à±à°¨à±à°¨à°¾à°."
@@ -902,9 +914,10 @@ msgstr "à°à°ªà°à°°à°£à° à°à°¨à°¬à°¡à°²à±à°¦à±."
 msgid "You are not the owner of this application."
 msgstr "à°®à±à°°à± à° à°à°ªà°à°°à°£à° à°¯à±à°à±à° à°¯à°à°®à°¾à°¨à°¿ à°à°¾à°¦à±."
 
+#. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:127
 #: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1307
+#: lib/action.php:1315
 msgid "There was a problem with your session token."
 msgstr ""
 
@@ -937,7 +950,7 @@ msgstr "à° à°à°ªà°à°°à°£à°¾à°¨à±à°¨à°¿ à°¤à±à°²à°à°¿à°à°à±"
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
 #: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:73 lib/profileformaction.php:64
+#: lib/adminpanelaction.php:71 lib/profileformaction.php:64
 #: lib/settingsaction.php:72
 msgid "Not logged in."
 msgstr "à°²à±à°¨à°¿à°à°¿ à°ªà±à°°à°µà±à°¶à°¿à°à°à°²à±à°¦à±."
@@ -998,7 +1011,6 @@ msgstr "à° à°µà°¾à°¡à±à°à°°à°¿à°¨à°¿ à°¤à±à°²à°à°¿à°à°à±"
 #. TRANS: Message used as title for design settings for the site.
 #. TRANS: Link description in user account settings menu.
 #: actions/designadminpanel.php:63 lib/accountsettingsaction.php:139
-#: lib/groupnav.php:119
 msgid "Design"
 msgstr "à°°à±à°ªà±à°°à±à°à°²à±"
 
@@ -1097,13 +1109,13 @@ msgstr "à°ªà±à°°à°¤à±à°¯à±à° CSS"
 msgid "Use defaults"
 msgstr "à°à°ªà±à°°à°®à±à°¯à°¾à°²à°¨à°¿ à°à°ªà°¯à±à°à°¿à°à°à±"
 
-#. TRANS: Submit button title
+#. TRANS: Submit button title.
 #: actions/designadminpanel.php:685 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/snapshotadminpanel.php:245
 #: actions/subscriptions.php:226 actions/tagother.php:154
-#: actions/useradminpanel.php:294 lib/applicationeditform.php:363
+#: actions/useradminpanel.php:294 lib/applicationeditform.php:353
 #: lib/designsettings.php:256 lib/groupeditform.php:202
 msgid "Save"
 msgstr "à°à°¦à±à°°à°ªà°°à°à±"
@@ -1251,7 +1263,7 @@ msgstr "à°ªà±à°°à°¸à±à°¤à±à°¤ à°¨à°¿à°°à±à°§à°¾à°°à°¿à°¤ à°à°®à±à°¯à°¿à°²
 #. 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/emailsettings.php:115 actions/emailsettings.php:162
 #: actions/imsettings.php:116 actions/smssettings.php:124
 #: actions/smssettings.php:180
 msgctxt "BUTTON"
@@ -1269,22 +1281,26 @@ msgstr ""
 #. 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
+#. TRANS: Button label in the "Edit application" form.
 #: actions/emailsettings.php:127 actions/imsettings.php:131
-#: actions/smssettings.php:137 lib/applicationeditform.php:357
+#: actions/smssettings.php:137 lib/applicationeditform.php:347
 msgctxt "BUTTON"
 msgid "Cancel"
 msgstr "à°°à°¦à±à°¦à±à°à±à°¯à°¿"
 
-#. TRANS: Instructions for e-mail address input form.
-#: actions/emailsettings.php:135
+#. TRANS: Instructions for e-mail address input form. Do not translate
+#. TRANS: "example.org". It is one of the domain names reserved for
+#. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
+#. TRANS: Any other domain may be owned by a legitimate person or
+#. TRANS: organization.
+#: actions/emailsettings.php:139
 msgid "Email address, like \"UserName@example.org\""
 msgstr "à°à°®à±à°¯à°¿à°²à± à°à°¿à°°à±à°¨à°¾à°®à°¾, \"username@example.org\" à°µà°²à±"
 
 #. 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/emailsettings.php:143 actions/imsettings.php:151
 #: actions/smssettings.php:162
 msgctxt "BUTTON"
 msgid "Add"
@@ -1292,77 +1308,77 @@ msgstr "à°à±à°°à±à°à±"
 
 #. 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
+#: actions/emailsettings.php:151 actions/smssettings.php:171
 msgid "Incoming email"
 msgstr ""
 
 #. 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
+#: actions/emailsettings.php:172 actions/smssettings.php:189
 msgctxt "BUTTON"
 msgid "New"
 msgstr "à°à±à°¤à±à°¤à°¦à°¿"
 
 #. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:174
+#: actions/emailsettings.php:178
 msgid "Email preferences"
 msgstr "à°à°®à±à°¯à°¿à°²à± à°à°à°¿à°°à±à°à±à°²à±"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:180
+#: actions/emailsettings.php:184
 msgid "Send me notices of new subscriptions through email."
 msgstr ""
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:193
+#: actions/emailsettings.php:197
 msgid "Send me email when someone sends me a private message."
 msgstr ""
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:199
+#: actions/emailsettings.php:203
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr ""
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:205
+#: actions/emailsettings.php:209
 msgid "Allow friends to nudge me and send me an email."
 msgstr ""
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:212
+#: actions/emailsettings.php:216
 msgid "I want to post notices by email."
 msgstr "à°¨à±à°¨à± à°à°®à±à°¯à°¿à°²à± à°¦à±à°µà°¾à°°à°¾ à°¨à±à°à±à°¸à±à°²à± à°ªà°à°ªà°¾à°²à°¨à±à°à±à°à°à±à°¨à±à°¨à°¾à°¨à±."
 
 #. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:334
+#: actions/emailsettings.php:338
 msgid "Email preferences saved."
 msgstr "à°à°®à±à°¯à°¿à°²à± à°à°à°¿à°°à±à°à±à°²à± à°à°¦à±à°°à°®à°¯à±à°¯à°¾à°¯à°¿."
 
 #. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:353
+#: actions/emailsettings.php:357
 msgid "No email address."
 msgstr "à°à°®à±à°¯à°¿à°²à± à°à°¿à°°à±à°¨à°¾à°®à°¾ à°²à±à°¦à±."
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:208
+#: actions/emailsettings.php:370 actions/register.php:208
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "à°¸à°°à±à°¨ à°à°®à±à°¯à°¿à°²à± à°à°¿à°°à±à°¨à°¾à°®à°¾ à°à°¾à°¦à±:"
 
 #. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:370
+#: actions/emailsettings.php:374
 msgid "That is already your email address."
 msgstr "à°à°¦à°¿ à°à°ªà±à°ªà°à°¿à°à± à°®à± à°à°®à±à°¯à°¿à°²à± à°à°¿à°°à±à°¨à°¾à°®à°¾."
 
 #. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:374
+#: actions/emailsettings.php:378
 msgid "That email address already belongs to another user."
 msgstr "à° à°à°®à±à°¯à°¿à°²à± à°à°¿à°°à±à°¨à°¾à°®à°¾ à°à°ªà±à°ªà°à±à°à± à°à°¤à°° à°µà°¾à°¡à±à°à°°à°¿à°à°¿ à°¸à°à°¬à°à°§à°¿à°à°à°¿à°¨à°¦à°¿."
 
 #. 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/emailsettings.php:395 actions/imsettings.php:351
 #: actions/smssettings.php:373
 msgid "Couldn't insert confirmation code."
 msgstr "à°¨à°¿à°°à±à°§à°¾à°°à°£ à°¸à°à°à±à°¤à°¾à°¨à±à°¨à°¿ à°à±à°°à±à°à°²à±à°à°ªà±à°¯à°¾à°."
@@ -1370,29 +1386,29 @@ msgstr "à°¨à°¿à°°à±à°§à°¾à°°à°£ à°¸à°à°à±à°¤à°¾à°¨à±à°¨à°¿ à°à±à°°à±à°
 #. 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/emailsettings.php:423 actions/imsettings.php:386
 #: actions/smssettings.php:408
 msgid "No pending confirmation to cancel."
 msgstr "à°°à°¦à±à°¦à±à°à±à°¯à°¡à°¾à°¨à°¿à°à°¿ à°µà±à°à°¿à°µà±à°¨à±à°¨ à°¨à°¿à°°à±à°§à°¾à°°à°£à°²à±à°®à± à°²à±à°µà±."
 
 #. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:424
+#: actions/emailsettings.php:428
 msgid "That is the wrong email address."
 msgstr "à° à°à°®à±à°¯à°¿à°²à± à°à°¿à°°à±à°¨à°¾à°®à°¾ à°¸à°°à±à°¨à°¦à°¿ à°à°¾à°¦à±."
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:438
+#: actions/emailsettings.php:442
 msgid "Email confirmation cancelled."
 msgstr "à°à°®à±à°¯à°¿à°²à± à°¨à°¿à°°à±à°§à°¾à°°à°£ à°°à°¦à±à°¦à°¯à°¿à°à°¦à°¿."
 
 #. TRANS: Message given trying to remove an e-mail address that is not
 #. TRANS: registered for the active user.
-#: actions/emailsettings.php:458
+#: actions/emailsettings.php:462
 msgid "That is not your email address."
 msgstr "à°à°¦à°¿ à°®à± à°à°®à±à°¯à°¿à°²à± à°à°¿à°°à±à°¨à°¾à°®à°¾ à°à°¾à°¦à±."
 
 #. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:479
+#: actions/emailsettings.php:483
 msgid "The email address was removed."
 msgstr "à° à°à°®à±à°¯à°¿à°²à± à°à°¿à°°à±à°¨à°¾à°®à°¾à°¨à°¿ à°¤à±à°²à°à°¿à°à°à°¾à°."
 
@@ -1535,7 +1551,7 @@ msgstr "à°µà°¾à°¡à±à°à°°à°¿à°¨à°¿ à°à°ªà±à°ªà°à°¿à°à± à°à±à°à°ªà±à°¨
 msgid "User is not a member of group."
 msgstr "à°µà°¾à°¡à±à°à°°à°¿ à° à°à±à°à°ªà±à°²à± à°¸à°à±à°¯à±à°²à± à°à°¾à°¦à±."
 
-#: actions/groupblock.php:134 actions/groupmembers.php:360
+#: actions/groupblock.php:134 actions/groupmembers.php:364
 msgid "Block user from group"
 msgstr "à°µà°¾à°¡à±à°à°°à°¿à°¨à°¿ à°à±à°à°ªà± à°¨à±à°à°¡à°¿ à°¨à°¿à°°à±à°§à°¿à°à°à±"
 
@@ -1608,40 +1624,32 @@ msgstr "à°à°¿à°¹à±à°¨à°¾à°¨à±à°¨à°¿ à°¤à°¾à°à°¾à°à°°à°¿à°à°à°¾à°."
 msgid "Failed updating logo."
 msgstr "à°à°¿à°¹à±à°¨à°ªà± à°¤à°¾à°à°¾à°à°°à°£ à°µà°¿à°«à°²à°®à±à°à°¦à°¿."
 
-#: actions/groupmembers.php:100 lib/groupnav.php:92
+#. TRANS: Title of the page showing group members.
+#. TRANS: %s is the name of the group.
+#: actions/groupmembers.php:102
 #, php-format
 msgid "%s group members"
 msgstr "%s à°à±à°à°ªà± à°¸à°à±à°¯à±à°²à±"
 
-#: actions/groupmembers.php:103
+#. TRANS: Title of the page showing group members.
+#. TRANS: %1$s is the name of the group, %2$d is the page number of the members list.
+#: actions/groupmembers.php:107
 #, php-format
 msgid "%1$s group members, page %2$d"
 msgstr "%1$s à°à±à°à°ªà± à°¸à°à±à°¯à±à°²à±, à°ªà±à°à± %2$d"
 
-#: actions/groupmembers.php:118
+#: actions/groupmembers.php:122
 msgid "A list of the users in this group."
 msgstr "à° à°à±à°à°ªà±à°²à± à°µà°¾à°¡à±à°à°°à±à°²à± à°à°¾à°¬à°¿à°¤à°¾."
 
-#: actions/groupmembers.php:182 lib/groupnav.php:107
+#: actions/groupmembers.php:186
 msgid "Admin"
 msgstr "à°¨à°¿à°°à±à°µà°¾à°¹à°à±à°²à±"
 
-#: actions/groupmembers.php:392 lib/blockform.php:69
-msgid "Block"
-msgstr "à°¨à°¿à°°à±à°§à°¿à°à°à±"
-
-#: actions/groupmembers.php:487
+#: actions/groupmembers.php:498
 msgid "Make user an admin of the group"
 msgstr "à°µà°¾à°¡à±à°à°°à°¿à°¨à°¿ à°à±à°à°ªà±à°à°¿ à°à° à°¨à°¿à°°à±à°µà°¾à°¹à°à±à°¨à°¿à°à°¾ à°à±à°¯à°¿"
 
-#: actions/groupmembers.php:519
-msgid "Make Admin"
-msgstr "à°¨à°¿à°°à±à°µà°¾à°¹à°à±à°¨à±à°¨à°¿ à°à±à°¯à°¿"
-
-#: actions/groupmembers.php:519
-msgid "Make this user an admin"
-msgstr "à° à°µà°¾à°¡à±à°à°°à°¿à°¨à°¿ à°¨à°¿à°°à±à°µà°¾à°¹à°à±à°¨à±à°¨à°¿ à°à±à°¯à°¿"
-
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Title in atom group notice feed. %s is a group name.
 #. TRANS: Title in atom user notice feed. %s is a user name.
@@ -1764,7 +1772,10 @@ msgstr "à°ªà±à°°à°¸à±à°¤à±à°¤à° à°¨à°¿à°°à±à°§à°¾à°°à°¿à°à°à°¿à°¨ Jabber/
 
 #. TRANS: IM address input field instructions in IM settings form.
 #. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:140
+#. TRANS: Do not translate "example.org". It is one of the domain names reserved for use in examples by
+#. TRANS: http://www.rfc-editor.org/rfc/rfc2606.txt. Any other domain may be owned by a legitimate
+#. TRANS: person or organization.
+#: actions/imsettings.php:143
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -1772,53 +1783,53 @@ msgid ""
 msgstr ""
 
 #. TRANS: Form legend for IM preferences form.
-#: actions/imsettings.php:155
+#: actions/imsettings.php:158
 msgid "IM preferences"
 msgstr "IM à°à°à°¿à°°à±à°à±à°²à±"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:160
+#: actions/imsettings.php:163
 msgid "Send me notices through Jabber/GTalk."
 msgstr ""
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:166
+#: actions/imsettings.php:169
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr ""
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:172
+#: actions/imsettings.php:175
 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr ""
 
 #. TRANS: Confirmation message for successful IM preferences save.
-#: actions/imsettings.php:287 actions/othersettings.php:180
+#: actions/imsettings.php:290 actions/othersettings.php:180
 msgid "Preferences saved."
 msgstr "à°à°à°¿à°°à±à°à±à°²à± à°à°¦à±à°°à°®à°¯à±à°¯à°¾à°¯à°¿."
 
 #. TRANS: Message given saving IM address without having provided one.
-#: actions/imsettings.php:309
+#: actions/imsettings.php:312
 msgid "No Jabber ID."
 msgstr "Jabber ID à°²à±à°¦à±."
 
 #. TRANS: Message given saving IM address that not valid.
-#: actions/imsettings.php:322
+#: actions/imsettings.php:325
 msgid "Not a valid Jabber ID"
 msgstr "à°¸à°°à±à°¨ Jabber à°à°¡à± à°à°¾à°¦à±"
 
 #. TRANS: Message given saving IM address that is already set.
-#: actions/imsettings.php:326
+#: actions/imsettings.php:329
 msgid "That is already your Jabber ID."
 msgstr "à° Jabber ID à°®à±à°à± à°à°ªà±à°ªà°à°¿à°à± à°à°à°¦à°¿"
 
 #. TRANS: Message given saving IM address that is already set for another user.
-#: actions/imsettings.php:330
+#: actions/imsettings.php:333
 msgid "Jabber ID already belongs to another user."
 msgstr "Jabber ID à°à°ªà±à°ªà°à°¿à°à± à°µà±à°°à±à°à°°à°¿à°à°¿ à°à°à°¦à°¿."
 
 #. 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
+#: actions/imsettings.php:361
 #, php-format
 msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
@@ -1826,23 +1837,23 @@ msgid ""
 msgstr ""
 
 #. TRANS: Message given canceling IM address confirmation for the wrong IM address.
-#: actions/imsettings.php:388
+#: actions/imsettings.php:391
 msgid "That is the wrong IM address."
 msgstr "à° IM à°à°¿à°°à±à°¨à°¾à°®à°¾ à°¸à°°à±à°¨à°¦à°¿ à°à°¾à°¦à±."
 
 #. TRANS: Message given after successfully canceling IM address confirmation.
-#: actions/imsettings.php:402
+#: actions/imsettings.php:405
 msgid "IM confirmation cancelled."
 msgstr "IM à°¨à°¿à°°à±à°§à°¾à°°à°£ à°°à°¦à±à°¦à°¯à°¿à°à°¦à°¿."
 
 #. TRANS: Message given trying to remove an IM address that is not
 #. TRANS: registered for the active user.
-#: actions/imsettings.php:424
+#: actions/imsettings.php:427
 msgid "That is not your Jabber ID."
 msgstr "à°à°¦à°¿ à°®à± Jabber ID à°à°¾à°¦à±"
 
 #. TRANS: Message given after successfully removing a registered IM address.
-#: actions/imsettings.php:447
+#: actions/imsettings.php:450
 msgid "The IM address was removed."
 msgstr "à° IM à°à°¿à°°à±à°¨à°¾à°®à°¾à°¨à°¿ à°¤à±à°²à°à°¿à°à°à°¾à°."
 
@@ -2271,12 +2282,6 @@ msgstr "à°¨à±à°à±à°¸à±à°à°¿ à°ªà±à°°à±à°«à±à°²à± à°²à±à°¦à±."
 msgid "%1$s's status on %2$s"
 msgstr "%2$sà°²à± %1$s à°¯à±à°à±à° à°¸à±à°¥à°¿à°¤à°¿"
 
-#. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
-#: actions/oembed.php:159
-#, php-format
-msgid "Content type %s not supported."
-msgstr ""
-
 #. TRANS: Error message displaying attachments. %s is the site's base URL.
 #: actions/oembed.php:163
 #, php-format
@@ -2284,8 +2289,8 @@ msgid "Only %s URLs over plain HTTP please."
 msgstr ""
 
 #. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1215
-#: lib/apiaction.php:1243 lib/apiaction.php:1366
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1206
+#: lib/apiaction.php:1233 lib/apiaction.php:1356
 msgid "Not a supported data format."
 msgstr ""
 
@@ -2399,7 +2404,7 @@ msgid "Password saved."
 msgstr "à°¸à°à°à±à°¤à°ªà°¦à° à°à°¦à±à°°à°®à°¯à±à°¯à°¿à°à°¦à°¿."
 
 #. TRANS: Menu item for site administration
-#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:384
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:371
 msgid "Paths"
 msgstr "à°¤à±à°°à±à°µà°²à±"
 
@@ -2567,7 +2572,7 @@ msgstr "à°ªà±à°°à±à°¤à°¿ à°ªà±à°°à±"
 
 #. TRANS: Form input field label.
 #: actions/profilesettings.php:115 actions/register.php:460
-#: lib/applicationeditform.php:244 lib/groupeditform.php:161
+#: lib/applicationeditform.php:235 lib/groupeditform.php:161
 msgid "Homepage"
 msgstr "à°¹à±à°®à± à°ªà±à°à±"
 
@@ -2662,7 +2667,7 @@ msgid "Couldn't save tags."
 msgstr "à°à±à°¯à°¾à°à±à°²à°¨à°¿ à°à°¦à±à°°à°ªà°°à°à°²à±à°à±à°¨à±à°¨à°¾à°."
 
 #. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:391 lib/adminpanelaction.php:141
+#: actions/profilesettings.php:391 lib/adminpanelaction.php:138
 msgid "Settings saved."
 msgstr "à°à°®à°°à°¿à°à°²à± à°à°¦à±à°°à°®à°¯à±à°¯à°¾à°¯à°¿."
 
@@ -3129,24 +3134,24 @@ msgid "Application profile"
 msgstr "à°à°ªà°à°°à°£ à°ªà±à°°à°µà°°"
 
 #. TRANS: Form input field label for application icon.
-#: actions/showapplication.php:159 lib/applicationeditform.php:182
+#: actions/showapplication.php:159 lib/applicationeditform.php:173
 msgid "Icon"
 msgstr "à°ªà±à°°à°¤à±à°à°"
 
 #. TRANS: Form input field label for application name.
 #: actions/showapplication.php:169 actions/version.php:197
-#: lib/applicationeditform.php:199
+#: lib/applicationeditform.php:190
 msgid "Name"
 msgstr "à°ªà±à°°à±"
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:178 lib/applicationeditform.php:235
+#: actions/showapplication.php:178 lib/applicationeditform.php:226
 msgid "Organization"
 msgstr "à°¸à°à°¸à±à°§"
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:216 lib/groupeditform.php:172
+#: lib/applicationeditform.php:207 lib/groupeditform.php:172
 msgid "Description"
 msgstr "à°µà°¿à°µà°°à°£"
 
@@ -3231,7 +3236,7 @@ msgstr ""
 msgid "This is a way to share what you like."
 msgstr "à°®à±à°à± à°¨à°à±à°à°¿à°¨à°µà°¿ à°ªà°à°à±à°à±à°¡à°¾à°¨à°¿à°à°¿ à°à°¦à±à° à°®à°¾à°°à±à°à°."
 
-#: actions/showgroup.php:82 lib/groupnav.php:86
+#: actions/showgroup.php:82
 #, php-format
 msgid "%s group"
 msgstr "%s à°à±à°à°ªà±"
@@ -3283,7 +3288,7 @@ msgstr "%s à°à±à°°à°à± à°¸à±à°ªà°à°¦à°¨à°² à°«à±à°¡à± (à°à°à°®à±)"
 msgid "FOAF for %s group"
 msgstr "%s à°à±à°à°ªà±"
 
-#: actions/showgroup.php:393 actions/showgroup.php:445 lib/groupnav.php:91
+#: actions/showgroup.php:393 actions/showgroup.php:445
 msgid "Members"
 msgstr "à°¸à°à±à°¯à±à°²à±"
 
@@ -3560,13 +3565,6 @@ msgstr "à°à°¦à°¿ à°à°ªà±à°ªà°à°¿à°à± à°®à± à°«à±à°¨à± à°¨à±à°à°¬à°°
 msgid "That phone number already belongs to another user."
 msgstr "à° à°«à±à°¨à± à°¨à°à°¬à°°à± à°à°ªà±à°ªà°à°¿à°à± à°µà±à°°à± à°µà°¾à°¡à±à°à°°à°¿à°à°¿ à°à±à°à°¦à°¿à°¨à°¦à°¿."
 
-#. 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 ""
-
 #. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
 #: actions/smssettings.php:413
 msgid "That is the wrong confirmation number."
@@ -3609,7 +3607,7 @@ msgstr ""
 
 #. TRANS: Menu item for site administration
 #: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
-#: lib/adminpanelaction.php:408
+#: lib/adminpanelaction.php:395
 msgid "Snapshots"
 msgstr ""
 
@@ -3970,16 +3968,6 @@ msgstr ""
 msgid "Avatar URL â%sâ is not valid."
 msgstr ""
 
-#: actions/userauthorization.php:350
-#, php-format
-msgid "Canât read avatar URL â%sâ."
-msgstr ""
-
-#: actions/userauthorization.php:355
-#, php-format
-msgid "Wrong image type for avatar URL â%sâ."
-msgstr ""
-
 #: actions/userdesignsettings.php:76 lib/designsettings.php:65
 msgid "Profile design"
 msgstr "à°«à±à°°à±à°«à±à°²à± à°°à±à°ªà±à°°à±à°à°²à±"
@@ -4191,7 +4179,7 @@ msgid "Unable to save tag."
 msgstr "à°à±à°¯à°¾à°à±à°²à°¨à°¿ à°à°¦à±à°°à°ªà°°à°à°²à±à°à°ªà±à°¯à°¾à°."
 
 #. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#: classes/Subscription.php:75 lib/oauthstore.php:465
+#: classes/Subscription.php:75 lib/oauthstore.php:466
 msgid "You have been banned from subscribing."
 msgstr "à°à°à°¦à°¾à°à±à°°à°¡à° à°¨à±à°à°¡à°¿ à°®à°¿à°®à±à°®à°²à±à°¨à°¿ à°¨à°¿à°·à±à°§à°¿à°à°à°¾à°°à±."
 
@@ -4323,7 +4311,8 @@ msgid "Change site configuration"
 msgstr "à°¸à±à°à± à°¸à±à°µà°°à±à°ªà°£à°¾à°¨à±à°¨à°¿ à°®à°¾à°°à±à°à°à°¡à°¿"
 
 #. TRANS: Main menu option when logged in and site admin for access to site configuration
-#: lib/action.php:474
+#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
+#: lib/action.php:474 lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr "à°¨à°¿à°°à±à°µà°¾à°¹à°à±à°²à±"
@@ -4400,7 +4389,7 @@ msgstr "à°µà±à°¤à±à°à±"
 
 #. TRANS: DT element for site notice. String is hidden in default CSS.
 #. TRANS: Menu item for site administration
-#: lib/action.php:538 lib/adminpanelaction.php:400
+#: lib/action.php:538 lib/adminpanelaction.php:387
 msgid "Site notice"
 msgstr "à°¸à±à°à± à°à°®à°¨à°¿à°"
 
@@ -4464,7 +4453,10 @@ msgid "StatusNet software license"
 msgstr "à°¸à±à°à±à°à°¸à±âà°¨à±à°à± à°®à±à°¦à±à°ªà°à°°à°£ à°²à±à°¸à±à°¨à±à°¸à±"
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
-#: lib/action.php:843
+#. TRANS: Text between [] is a link description, text between () is the link itself.
+#. TRANS: Make sure there is no whitespace between "]" and "(".
+#. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
+#: lib/action.php:846
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4474,13 +4466,16 @@ msgstr ""
 "à°à°à°¦à°¿à°¸à±à°¤à±à°¨à±à°¨ à°¸à±à°à±à°·à±à°® à°¬à±à°²à°¾à°à°¿à°à°à± à°¸à±à°µ."
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:846
+#: lib/action.php:849
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** à°à°¨à±à°¦à°¿ à°®à±à°à±à°°à± à°¬à±à°²à°¾à°à°¿à°à°à± à°¸à°¦à±à°ªà°¾à°¯à°."
 
 #. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.
-#: lib/action.php:850
+#. TRANS: Make sure there is no whitespace between "]" and "(".
+#. TRANS: Text between [] is a link description, text between () is the link itself.
+#. TRANS: %s is the version of StatusNet that is being used.
+#: lib/action.php:856
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4492,49 +4487,50 @@ msgstr ""
 "à°ªà± à°¨à°¡à±à°¸à±à°¤à±à°à°¦à°¿."
 
 #. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:866
+#: lib/action.php:872
 msgid "Site content license"
 msgstr "à°¸à±à°à±à°à°¸à±âà°¨à±à°à± à°®à±à°¦à±à°ªà°à°°à°£ à°²à±à°¸à±à°¨à±à°¸à±"
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:873
+#: lib/action.php:879
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:880
+#: lib/action.php:886
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:884
+#: lib/action.php:890
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 
-#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:897
+#. TRANS: license message in footer.
+#. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
+#: lib/action.php:904
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr ""
 
 #. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1236
+#: lib/action.php:1243
 msgid "Pagination"
 msgstr "à°ªà±à°à±à°à°°à°£"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1247
+#: lib/action.php:1254
 msgid "After"
 msgstr "à°¤à°°à±à°µà°¾à°¤"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1257
+#: lib/action.php:1264
 msgid "Before"
 msgstr "à°à°à°¤à°à±à°°à°¿à°¤à°"
 
@@ -4543,178 +4539,207 @@ msgstr "à°à°à°¤à°à±à°°à°¿à°¤à°"
 msgid "Expecting a root feed element but got a whole XML document."
 msgstr ""
 
-#: lib/activityutils.php:208
+#. TRANS: Client exception thrown when there is no source attribute.
+#: lib/activityutils.php:203
 msgid "Can't handle remote content yet."
 msgstr ""
 
-#: lib/activityutils.php:244
+#. TRANS: Client exception thrown when there embedded XML content is found that cannot be processed yet.
+#: lib/activityutils.php:240
 msgid "Can't handle embedded XML content yet."
 msgstr ""
 
-#: lib/activityutils.php:248
+#. TRANS: Client exception thrown when base64 encoded content is found that cannot be processed yet.
+#: lib/activityutils.php:245
 msgid "Can't handle embedded Base64 content yet."
 msgstr ""
 
 #. TRANS: Client error message thrown when a user tries to change admin settings but has no access rights.
-#: lib/adminpanelaction.php:98
+#: lib/adminpanelaction.php:96
 msgid "You cannot make changes to this site."
 msgstr "à° à°¸à±à°à±à°à°¿ à°®à±à°°à± à°®à°¾à°°à±à°ªà±à°²à± à°à±à°¯à°²à±à°°à±."
 
 #. TRANS: Client error message.
-#: lib/adminpanelaction.php:229
+#: lib/adminpanelaction.php:222
 msgid "showForm() not implemented."
 msgstr ""
 
 #. TRANS: Client error message
-#: lib/adminpanelaction.php:259
+#: lib/adminpanelaction.php:250
 msgid "saveSettings() not implemented."
 msgstr ""
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:350
+#: lib/adminpanelaction.php:337
 msgid "Basic site configuration"
 msgstr "à°ªà±à°°à°¾à°¥à°®à°¿à° à°¸à±à°à± à°¸à±à°µà°°à±à°ªà°£à°"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:352
+#: lib/adminpanelaction.php:339
 msgctxt "MENU"
 msgid "Site"
 msgstr "à°¸à±à°à±"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:358
+#: lib/adminpanelaction.php:345
 msgid "Design configuration"
 msgstr "à°°à±à°ªà°à°²à±à°ªà°¨ à°¸à±à°µà°°à±à°ªà°£à°"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:360
+#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
+#: lib/adminpanelaction.php:347 lib/groupnav.php:135
 msgctxt "MENU"
 msgid "Design"
 msgstr "à°°à±à°ªà±à°°à±à°à°²à±"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:366
+#: lib/adminpanelaction.php:353
 msgid "User configuration"
 msgstr "à°µà°¾à°¡à±à°à°°à°¿ à°¸à±à°µà°°à±à°ªà°£à°"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:368 lib/personalgroupnav.php:115
+#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:115
 msgid "User"
 msgstr "à°µà°¾à°¡à±à°à°°à°¿"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:374
+#: lib/adminpanelaction.php:361
 msgid "Access configuration"
 msgstr "à°°à±à°ªà°à°²à±à°ªà°¨ à°¸à±à°µà°°à±à°ªà°£à°"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:382
+#: lib/adminpanelaction.php:369
 msgid "Paths configuration"
 msgstr "à°µà°¾à°¡à±à°à°°à°¿ à°¸à±à°µà°°à±à°ªà°£à°"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:398
+#: lib/adminpanelaction.php:385
 msgid "Edit site notice"
 msgstr "à°¸à±à°à± à°à°®à°¨à°¿à°à°¨à°¿ à°à°¦à±à°°à°ªà°°à°à±"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:406
+#: lib/adminpanelaction.php:393
 msgid "Snapshots configuration"
 msgstr "à°µà°¾à°¡à±à°à°°à°¿ à°¸à±à°µà°°à±à°ªà°£à°"
 
 #. TRANS: Client error 401.
-#: lib/apiauth.php:113
+#: lib/apiauth.php:111
 msgid "API resource requires read-write access, but you only have read access."
 msgstr ""
 
+#. TRANS: OAuth exception thrown when no application is found for a given consumer key.
+#: lib/apiauth.php:175
+msgid "No application for that consumer key."
+msgstr ""
+
+#. TRANS: OAuth exception given when an incorrect access token was given for a user.
+#: lib/apiauth.php:212
+msgid "Bad access token."
+msgstr ""
+
+#. TRANS: OAuth exception given when no user was found for a given token (no token was found).
+#: lib/apiauth.php:217
+msgid "No user for that token."
+msgstr ""
+
+#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
+#: lib/apioauthstore.php:178
+msgid "Tried to revoke unknown token"
+msgstr ""
+
+#. TRANS: Exception thrown when an attempt is made to remove a revoked token.
+#: lib/apioauthstore.php:182
+msgid "Failed to delete revoked token"
+msgstr ""
+
 #. TRANS: Form legend.
-#: lib/applicationeditform.php:137
+#: lib/applicationeditform.php:129
 msgid "Edit application"
 msgstr "à°à°ªà°à°°à°£à°¾à°¨à±à°¨à°¿ à°®à°¾à°°à±à°à±"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:187
+#: lib/applicationeditform.php:178
 msgid "Icon for this application"
 msgstr "à° à°à°ªà°à°°à°£à°¾à°¨à°¿à°à°¿ à°ªà±à°°à°¤à±à°à°"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:209
+#: lib/applicationeditform.php:200
 #, php-format
 msgid "Describe your application in %d characters"
 msgstr "à°®à± à°à°ªà°à°°à°£à° à°à±à°°à°¿à°à°à°¿ %d à°à°à±à°·à°°à°¾à°²à±à°²à± à°µà°¿à°µà°°à°¿à°à°à°à°¡à°¿"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:213
+#: lib/applicationeditform.php:204
 msgid "Describe your application"
 msgstr "à°®à± à°à°ªà°à°°à°£à°¾à°¨à±à°¨à°¿ à°µà°¿à°µà°°à°¿à°à°à°à°¡à°¿"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:224
+#: lib/applicationeditform.php:215
 msgid "URL of the homepage of this application"
 msgstr "à° à°à°ªà°à°°à°£à° à°¯à±à°à±à° à°¹à±à°®à±&zwnj;à°ªà±à°à± à°à°¿à°°à±à°¨à°¾à°®à°¾"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:233
+#: lib/applicationeditform.php:224
 msgid "Organization responsible for this application"
 msgstr "à° à°à°ªà°à°°à°£à°¾à°¨à°¿à°à°¿ à°¬à°¾à°§à±à°¯à°¤à°¾à°¯à±à°¤à°®à±à°¨ à°¸à°à°¸à±à°¥"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:242
+#: lib/applicationeditform.php:233
 msgid "URL for the homepage of the organization"
 msgstr "à° à°à°ªà°à°°à°£à° à°¯à±à°à±à° à°¹à±à°®à±&zwnj;à°ªà±à°à± à°à°¿à°°à±à°¨à°¾à°®à°¾"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:251
+#: lib/applicationeditform.php:242
 msgid "URL to redirect to after authentication"
 msgstr ""
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:278
+#: lib/applicationeditform.php:269
 msgid "Browser"
 msgstr "à°µà°¿à°¹à°¾à°°à°¿à°£à°¿"
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:295
+#: lib/applicationeditform.php:286
 msgid "Desktop"
 msgstr "à°®à±à°à±à°ªà°°à°¿"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:297
+#: lib/applicationeditform.php:288
 msgid "Type of application, browser or desktop"
 msgstr "à°à°ªà°à°°à°£ à°°à°à°, à°µà°¿à°¹à°¾à°°à°¿à°£à°¿ à°²à±à°¦à°¾ à°®à±à°à±à°ªà°°à°¿"
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:320
+#: lib/applicationeditform.php:311
 msgid "Read-only"
 msgstr "à°à°¦à°µà°¡à°-à°®à°¾à°¤à±à°°à°®à±"
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:339
+#: lib/applicationeditform.php:330
 msgid "Read-write"
 msgstr "à°à°¦à°µà°¡à°-à°µà±à°°à°¾à°¯à°¡à°"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:341
+#: lib/applicationeditform.php:332
 msgid "Default access for this application: read-only, or read-write"
 msgstr ""
 
-#. TRANS: Submit button title
-#: lib/applicationeditform.php:359
+#. TRANS: Submit button title.
+#: lib/applicationeditform.php:349
 msgid "Cancel"
 msgstr "à°°à°¦à±à°¦à±à°à±à°¯à°¿"
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:136
+#: lib/applicationlist.php:135
 msgid "read-write"
 msgstr "à°à°¦à°µà°¡à°-à°µà±à°°à°¾à°¯à°¡à°"
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:138
+#: lib/applicationlist.php:137
 msgid "read-only"
 msgstr "à°à°¦à°µà°¡à°-à°®à°¾à°¤à±à°°à°®à±"
 
 #. 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
+#: lib/applicationlist.php:143
 #, php-format
 msgid "Approved %1$s - \"%2$s\" access."
 msgstr ""
@@ -4734,7 +4759,8 @@ msgstr "à°°à°à°¯à°¿à°¤"
 msgid "Provider"
 msgstr "à°®à±à°¨à±à°à±à°ªà±"
 
-#: lib/attachmentnoticesection.php:67
+#. TRANS: Title.
+#: lib/attachmentnoticesection.php:68
 msgid "Notices where this attachment appears"
 msgstr ""
 
@@ -4742,6 +4768,11 @@ msgstr ""
 msgid "Password changing failed"
 msgstr "à°¸à°à°à±à°¤à°ªà°¦à° à°®à°¾à°°à±à°ªà± à°µà°¿à°«à°²à°®à±à°à°¦à°¿"
 
+#. TRANS: Title for the form to block a user.
+#: lib/blockform.php:70
+msgid "Block"
+msgstr "à°¨à°¿à°°à±à°§à°¿à°à°à±"
+
 #: lib/channel.php:157 lib/channel.php:177
 msgid "Command results"
 msgstr "à°à°¦à±à°¶ à°«à°²à°¿à°¤à°¾à°²à±"
@@ -4754,6 +4785,13 @@ msgstr "à°à°¦à±à°¶à° à°ªà±à°°à±à°¤à°¯à±à°¯à°¿à°à°¦à°¿"
 msgid "Command failed"
 msgstr "à°à°¦à±à°¶à° à°µà°¿à°«à°²à°®à±à°à°¦à°¿"
 
+#. TRANS: Message given getting a non-existing user.
+#. TRANS: %s is the nickname of the user that could not be found.
+#: lib/command.php:150
+#, php-format
+msgid "Could not find a local user with nickname %s."
+msgstr ""
+
 #. TRANS: Error text shown when an unimplemented command is given.
 #: lib/command.php:185
 msgid "Sorry, this command is not yet implemented."
@@ -4791,6 +4829,20 @@ msgstr ""
 msgid "Notice marked as fave."
 msgstr "à°¨à±à°à±à°¸à±à°¨à°¿ à°à°·à±à°à°¾à°à°¶à°à°à°¾ à°à±à°°à±à°¤à°¿à°à°à°¾à°."
 
+#. 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.
+#: lib/command.php:360
+#, php-format
+msgid "%1$s joined group %2$s."
+msgstr ""
+
+#. 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.
+#: lib/command.php:408
+#, php-format
+msgid "%1$s left group %2$s."
+msgstr ""
+
 #. TRANS: Whois output. %s is the full name of the queried user.
 #: lib/command.php:434
 #, php-format
@@ -4865,6 +4917,13 @@ msgstr "%sà°à°¿ à°à°à°¦à°¾ à°à±à°°à°¾à°°à±."
 msgid "Specify the name of the user to unsubscribe from."
 msgstr "à°à°µà°°à°¿à°¨à±à°à°¡à±à°¤à± à°à°à°¦à°¾à°µà°¿à°°à°®à°¿à°à°à°¾à°²à°¨à±à°à±à°à°à±à°¨à±à°¨à°¾à°°à± à° à°µà°¾à°¡à±à°à°°à°¿ à°ªà±à°°à±à°¨à°¿ à°à°µà±à°µà°à°¡à°¿."
 
+#. TRANS: Text shown after having unsubscribed from another user successfully.
+#. TRANS: %s is the name of the user the unsubscription was requested for.
+#: lib/command.php:705
+#, php-format
+msgid "Unsubscribed from %s."
+msgstr ""
+
 #. TRANS: Error text shown when the command "off" fails for an unknown reason.
 #: lib/command.php:731
 msgid "Can't turn off notification."
@@ -4882,13 +4941,20 @@ msgstr ""
 msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr ""
 
+#. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
+#. TRANS: %s is the name of the user the unsubscription was requested for.
+#: lib/command.php:813
+#, php-format
+msgid "Unsubscribed %s."
+msgstr ""
+
 #. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
 #: lib/command.php:831
 msgid "You are not subscribed to anyone."
 msgstr "à°®à±à°°à± à°à°µà°°à°¿à°à± à°à°à°¦à°¾à°à±à°°à°²à±à°¦à±."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to.
-#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.
 #: lib/command.php:836
 msgid "You are subscribed to this person:"
@@ -4903,7 +4969,7 @@ msgid "No one is subscribed to you."
 msgstr "à°®à±à°à± à°à°à°¦à°¾à°¦à°¾à°°à±à°²à± à°à°µà°°à± à°²à±à°°à±."
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
-#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
 #: lib/command.php:863
 msgid "This person is subscribed to you:"
@@ -4918,7 +4984,7 @@ msgid "You are not a member of any groups."
 msgstr "à°®à±à°°à± à° à°à±à°à°ªà±à°²à±à°¨à± à°¸à°à±à°¯à±à°²à± à°à°¾à°¦à±."
 
 #. TRANS: Text shown after requesting groups a user is subscribed to.
-#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
 #: lib/command.php:890
 msgid "You are a member of this group:"
@@ -4926,6 +4992,7 @@ msgid_plural "You are a member of these groups:"
 msgstr[0] "à°®à±à°°à± à°à°ªà±à°ªà°à°¿à°à± à°²à±à°¨à°¿à°à°¿ à°ªà±à°°à°µà±à°¶à°¿à°à°à°¾à°°à±!"
 msgstr[1] "à°®à±à°°à± à°à°ªà±à°ªà°à°¿à°à± à°²à±à°¨à°¿à°à°¿ à°ªà±à°°à°µà±à°¶à°¿à°à°à°¾à°°à±!"
 
+#. TRANS: Help text for commands.
 #: lib/command.php:905
 msgid ""
 "Commands:\n"
@@ -5013,6 +5080,10 @@ msgid ""
 "You can upload your personal background image. The maximum file size is 2MB."
 msgstr "à°®à± à°µà±à°¯à°à±à°¤à°¿à°à°¤ à°¨à±à°ªà°¥à±à°¯à°ªà± à°à°¿à°¤à±à°°à°¾à°¨à±à°¨à°¿ à°®à±à°°à± à°à°à±à°à°¿à°à°à°µà°à±à°à±. à°à°°à°¿à°·à±à°  à°«à±à°²à± à°ªà°°à°¿à°®à°¾à°£à° 2à°®à±à°¬à±."
 
+#: lib/designsettings.php:418
+msgid "Design defaults restored."
+msgstr ""
+
 #: lib/favorform.php:114 lib/favorform.php:140
 msgid "Favor this notice"
 msgstr "à° à°¨à±à°à±à°¸à±à°¨à°¿ à°ªà±à°¨à°°à°¾à°µà±à°¤à°¿à°à°à±"
@@ -5089,35 +5160,19 @@ msgstr "à°à±à°à°ªà± à°¯à±à°à±à° à°ªà±à°°à°¾à°à°¤à°, à°à°à°à±, \"
 msgid "Extra nicknames for the group, comma- or space- separated, max %d"
 msgstr ""
 
-#: lib/groupnav.php:85
-msgid "Group"
-msgstr "à°à±à°à°ªà±"
-
-#: lib/groupnav.php:101
-msgid "Blocked"
-msgstr "à°¨à°¿à°°à±à°§à°¿à°à°à°¾à°°à±"
-
-#: lib/groupnav.php:102
-#, php-format
-msgid "%s blocked users"
-msgstr "%s à°¨à°¿à°°à±à°§à°¿à°¤ à°µà°¾à°¡à±à°à°°à±à°²à±"
-
-#: lib/groupnav.php:108
-#, php-format
-msgid "Edit %s group properties"
-msgstr "%s à°à±à°à°ªà± à°²à°à±à°·à°£à°¾à°²à°¨à± à°®à°¾à°°à±à°à±"
-
-#: lib/groupnav.php:113
-msgid "Logo"
-msgstr "à°à°¿à°¹à±à°¨à°"
-
-#: lib/groupnav.php:114
+#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
+#. TRANS: %s is the nickname of the group.
+#: lib/groupnav.php:129
 #, php-format
+msgctxt "TOOLTIP"
 msgid "Add or edit %s logo"
 msgstr ""
 
-#: lib/groupnav.php:120
+#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
+#. TRANS: %s is the nickname of the group.
+#: lib/groupnav.php:138
 #, php-format
+msgctxt "TOOLTIP"
 msgid "Add or edit %s design"
 msgstr ""
 
@@ -5142,7 +5197,8 @@ msgstr ""
 msgid "Partial upload."
 msgstr "à°ªà°¾à°à±à°·à°¿à° à°à°à±à°®à°¤à°¿."
 
-#: lib/imagefile.php:101 lib/mediafile.php:170
+#. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
+#: lib/imagefile.php:101 lib/mediafile.php:179
 msgid "System error uploading file."
 msgstr ""
 
@@ -5512,56 +5568,75 @@ msgstr "à°¨à°®à±à°¦à±à°¨ à°µà°¾à°¡à±à°à°°à°¿ à°à°¾à°¦à±."
 msgid "Sorry, that is not your incoming email address."
 msgstr "à°à±à°·à°®à°¿à°à°à°à°¡à°¿, à°à°¦à°¿ à°®à± à°²à±à°¨à°¿à°à°¿à°µà°à±à°à± à°à°®à±à°¯à°¿à°²à± à°à°¿à°°à±à°¨à°¾à°®à°¾ à°à°¾à°¦à±."
 
-#: lib/mediafile.php:98 lib/mediafile.php:123
+#. TRANS: Client exception thrown when a database error was thrown during a file upload operation.
+#: lib/mediafile.php:99 lib/mediafile.php:125
 msgid "There was a database error while saving your file. Please try again."
 msgstr ""
 
-#: lib/mediafile.php:142
+#. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
+#: lib/mediafile.php:145
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
 msgstr ""
 
-#: lib/mediafile.php:147
+#. TRANS: Client exception.
+#: lib/mediafile.php:151
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form."
 msgstr ""
 
-#: lib/mediafile.php:152
+#. TRANS: Client exception.
+#: lib/mediafile.php:157
 msgid "The uploaded file was only partially uploaded."
 msgstr "à°à°à±à°à°¿à°à°à°¿à°¨ à°«à±à°²à± à°à±à°µà°²à° à°ªà°¾à°à±à°·à°¿à°à°à°à°¾ à°®à°¾à°¤à±à°°à°®à± à°à°à±à°à°¿à°à°¦à°¿."
 
-#: lib/mediafile.php:159
+#. TRANS: Client exception thrown when a temporary folder is not present to store a file upload.
+#: lib/mediafile.php:165
 msgid "Missing a temporary folder."
 msgstr "à°¤à°¾à°¤à±à°à°¾à°²à°¿à° à°¸à°à°à°¯à° à°à°¨à°¬à°¡à°à°à°²à±à°¦à±."
 
-#: lib/mediafile.php:162
+#. TRANS: Client exception thrown when writing to disk is not possible during a file upload operation.
+#: lib/mediafile.php:169
 msgid "Failed to write file to disk."
 msgstr ""
 
-#: lib/mediafile.php:165
+#. TRANS: Client exception thrown when a file upload operation has been stopped by an extension.
+#: lib/mediafile.php:173
 msgid "File upload stopped by extension."
 msgstr ""
 
-#: lib/mediafile.php:179 lib/mediafile.php:217
+#. TRANS: Client exception thrown when a file upload operation would cause a user to exceed a set quota.
+#: lib/mediafile.php:189 lib/mediafile.php:232
 msgid "File exceeds user's quota."
 msgstr ""
 
-#: lib/mediafile.php:197 lib/mediafile.php:234
+#. TRANS: Client exception thrown when a file upload operation fails because the file could
+#. TRANS: not be moved from the temporary folder to the permanent file location.
+#: lib/mediafile.php:209 lib/mediafile.php:251
 msgid "File could not be moved to destination directory."
 msgstr ""
 
-#: lib/mediafile.php:202 lib/mediafile.php:238
+#. TRANS: Client exception thrown when a file upload operation has been stopped because the MIME
+#. TRANS: type of the uploaded file could not be determined.
+#: lib/mediafile.php:216 lib/mediafile.php:257
 msgid "Could not determine file's MIME type."
 msgstr "à°à°·à±à°à°¾à°à°¶à°¾à°¨à±à°¨à°¿ à°¤à±à°²à°à°¿à°à°à°²à±à°à°ªà±à°¯à°¾à°."
 
-#: lib/mediafile.php:318
+#. TRANS: Client exception thrown trying to upload a forbidden MIME type.
+#. TRANS: %1$s is the file type that was denied, %2$s is the application part of
+#. TRANS: the MIME type that was denied.
+#: lib/mediafile.php:340
 #, php-format
-msgid " Try using another %s format."
+msgid ""
+"\"%1$s\" is not a supported file type on this server. Try using another %2$s "
+"format."
 msgstr ""
 
-#: lib/mediafile.php:323
+#. TRANS: Client exception thrown trying to upload a forbidden MIME type.
+#. TRANS: %s is the file type that was denied.
+#: lib/mediafile.php:345
 #, php-format
-msgid "%s is not a supported file type on this server."
+msgid "\"%s\" is not a supported file type on this server."
 msgstr ""
 
 #: lib/messageform.php:146
@@ -5663,27 +5738,7 @@ msgstr "à°¸à±à°ªà°à°¦à°¿à°à°à°à°¡à°¿"
 msgid "Notice repeated"
 msgstr "à°¨à±à°à±à°¸à±à°¨à°¿ à°ªà±à°¨à°°à°¾à°µà±à°¤à°¿à°à°à°¾à°°à±"
 
-#: lib/oauthstore.php:283
-msgid "Error inserting new profile"
-msgstr "à°à±à°¤à±à°¤ à°ªà±à°°à±à°ªà±à°²à±à°¨à°¿ à°à±à°°à±à°à°à°à°²à± à°ªà±à°°à°ªà°¾à°à±"
-
-#: lib/oauthstore.php:291
-msgid "Error inserting avatar"
-msgstr "à°à±à°¤à±à°¤ à°ªà±à°°à±à°ªà±à°²à±à°¨à°¿ à°à±à°°à±à°à°à°à°²à± à°ªà±à°°à°ªà°¾à°à±"
-
-#: lib/oauthstore.php:306
-msgid "Error updating remote profile"
-msgstr "à°¦à±à°°à°ªà± à°ªà±à°°à±à°ªà±à°²à±à°¨à°¿ à°¤à°¾à°à°¾à°à°°à°¿à°à°à°à°à°²à± à°ªà±à°°à°ªà°¾à°à±"
-
-#: lib/oauthstore.php:311
-msgid "Error inserting remote profile"
-msgstr "à°¦à±à°°à°ªà± à°ªà±à°°à±à°ªà±à°²à±à°¨à°¿ à°à±à°°à±à°à°à°à°²à± à°ªà±à°°à°ªà°¾à°à±"
-
-#: lib/oauthstore.php:345
-msgid "Duplicate notice"
-msgstr "à°¨à±à°à±à°¸à±à°¨à°¿ à°¤à±à°²à°à°¿à°à°à±"
-
-#: lib/oauthstore.php:490
+#: lib/oauthstore.php:491
 msgid "Couldn't insert new subscription."
 msgstr "à°à±à°¤à±à°¤ à°à°à°¦à°¾à°¨à°¿ à°à±à°°à±à°à°²à±à°à°ªà±à°¯à°¾à°."
 
@@ -5801,19 +5856,19 @@ msgstr ""
 msgid "Sandbox this user"
 msgstr "à° à°µà°¾à°¡à±à°à°°à°¿à°¨à°¿ à°¨à°¿à°°à±à°§à°¿à°à°à±"
 
-#: lib/searchaction.php:120
+#. TRANS: Fieldset legend for the search form.
+#: lib/searchaction.php:121
 msgid "Search site"
 msgstr "à°¸à±à°à±à°¨à°¿ à°µà±à°¤à±à°à±"
 
-#: lib/searchaction.php:126
+#. TRANS: Used as a field label for the field where one or more keywords
+#. TRANS: for searching can be entered.
+#: lib/searchaction.php:129
 msgid "Keyword(s)"
 msgstr "à°à±à°ªà°¦à°®à±(à°²à±)"
 
-#: lib/searchaction.php:127
-msgid "Search"
-msgstr "à°µà±à°¤à±à°à±"
-
-#: lib/searchaction.php:162
+#. TRANS: Definition list item with instructions on how to get (better) search results.
+#: lib/searchaction.php:170
 msgid "Search help"
 msgstr "à°¸à°¹à°¾à°¯à°à°²à± à°µà±à°¤à±à°à±"
 
@@ -5825,6 +5880,10 @@ msgstr "à°ªà±à°°à°à°²à±"
 msgid "Find people on this site"
 msgstr "à° à°¸à±à°à±à°²à±à°¨à°¿ à°µà±à°¯à°à±à°¤à±à°²à°¨à°¿ à°à°¨à±à°à±à°¨à°à°¡à°¿"
 
+#: lib/searchgroupnav.php:83
+msgid "Find content of notices"
+msgstr ""
+
 #: lib/searchgroupnav.php:85
 msgid "Find groups on this site"
 msgstr "à° à°¸à±à°à±à°²à±à°¨à°¿ à°à±à°à°ªà±à°²à°¨à°¿ à°à°¨à±à°à±à°¨à°à°¡à°¿"
@@ -5927,10 +5986,18 @@ msgstr "à°¨à°¿à°°à±à°§à°¾à°¨à±à°¨à°¿ à°¤à±à°²à°à°¿à°à°à°¡à°à°²à± à°ªà±
 msgid "Top posters"
 msgstr ""
 
+#: lib/unsandboxform.php:69
+msgid "Unsandbox"
+msgstr ""
+
 #: lib/unsandboxform.php:80
 msgid "Unsandbox this user"
 msgstr "à° à°µà°¾à°¡à±à°à°°à°¿ à°¨à±à°à°¡à°¿ à°à°à°¦à°¾à°®à°¾à°¨à±"
 
+#: lib/unsilenceform.php:67
+msgid "Unsilence"
+msgstr ""
+
 #: lib/unsilenceform.php:78
 msgid "Unsilence this user"
 msgstr "à° à°µà°¾à°¡à±à°à°°à°¿à°¨à°¿ à°¤à±à°²à°à°¿à°à°à±"
@@ -5986,56 +6053,32 @@ msgid "Moderator"
 msgstr "à°¸à°®à°¨à±à°µà°¯à°à°°à±à°¤"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1102
+#: lib/util.php:1103
 msgid "a few seconds ago"
 msgstr "à°à±à°¨à±à°¨à°¿ à°à±à°·à°£à°¾à°² à°à±à°°à°¿à°¤à°"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1105
+#: lib/util.php:1106
 msgid "about a minute ago"
 msgstr "à° à°¨à°¿à°®à°¿à°·à° à°à±à°°à°¿à°¤à°"
 
-#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1109
-#, php-format
-msgid "about %d minutes ago"
-msgstr "%d à°¨à°¿à°®à°¿à°·à°¾à°² à°à±à°°à°¿à°¤à°"
-
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 #: lib/util.php:1112
 msgid "about an hour ago"
 msgstr "à°à° à°à°à° à°à±à°°à°¿à°¤à°"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1116
-#, php-format
-msgid "about %d hours ago"
-msgstr "%d à°à°à°à°² à°à±à°°à°¿à°¤à°"
-
-#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1119
+#: lib/util.php:1118
 msgid "about a day ago"
 msgstr "à° à°°à±à°à± à°à±à°°à°¿à°¤à°"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1123
-#, php-format
-msgid "about %d days ago"
-msgstr "%d à°°à±à°à±à°² à°à±à°°à°¿à°¤à°"
-
-#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1126
+#: lib/util.php:1124
 msgid "about a month ago"
 msgstr "à° à°¨à±à°² à°à±à°°à°¿à°¤à°"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 #: lib/util.php:1130
-#, php-format
-msgid "about %d months ago"
-msgstr "%d à°¨à±à°²à°² à°à±à°°à°¿à°¤à°"
-
-#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1133
 msgid "about a year ago"
 msgstr "à°à° à°¸à°à°µà°¤à±à°¸à°°à° à°à±à°°à°¿à°¤à°"
 
diff --git a/locale/tr/LC_MESSAGES/statusnet.po b/locale/tr/LC_MESSAGES/statusnet.po
index b1ce8405e6..56f93209eb 100644
--- a/locale/tr/LC_MESSAGES/statusnet.po
+++ b/locale/tr/LC_MESSAGES/statusnet.po
@@ -1,7 +1,8 @@
-# Translation of StatusNet to Turkish
+# Translation of StatusNet to Turkish (TÃ¼rkÃ§e)
+# Expored from translatewiki.net
 #
-# Author@translatewiki.net: Joseph
-# Author@translatewiki.net: McDutchie
+# Author: Joseph
+# Author: McDutchie
 # --
 # This file is distributed under the same license as the StatusNet package.
 #
@@ -9,16 +10,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-08 22:33+0000\n"
-"PO-Revision-Date: 2010-09-08 22:35:34+0000\n"
-"Language-Team: Turkish\n"
+"POT-Creation-Date: 2010-09-14 19:53+0000\n"
+"PO-Revision-Date: 2010-09-14 19:54:22+0000\n"
+"Language-Team: Turkish <http://translatewiki.net/wiki/Portal:tr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r72348); Translate extension (2010-08-20)\n"
+"X-Generator: MediaWiki 1.17alpha (r73009); Translate extension (2010-08-20)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tr\n"
-"X-Message-Group: out-statusnet\n"
+"X-Message-Group: #out-statusnet\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
+"X-POT-Import-Date: 1284-49-16 34::+0000\n"
 
 #. TRANS: Page notice
 #: actions/accessadminpanel.php:67
@@ -45,11 +47,6 @@ msgstr ""
 msgid "Disable new registrations."
 msgstr ""
 
-#. TRANS: Checkbox label for disabling new user registrations.
-#: actions/accessadminpanel.php:185
-msgid "Closed"
-msgstr ""
-
 #. TRANS: Server error when page not found (404)
 #: actions/all.php:68 actions/public.php:98 actions/replies.php:93
 #: actions/showfavorites.php:138 actions/tag.php:52
@@ -58,15 +55,15 @@ msgstr "BÃ¶yle bir kullanÄ±cÄ± yok."
 
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #: actions/all.php:79 actions/allrss.php:68
-#: actions/apiaccountupdatedeliverydevice.php:114
-#: actions/apiaccountupdateprofile.php:105
-#: actions/apiaccountupdateprofilebackgroundimage.php:116
-#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
-#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
-#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:113
-#: actions/apigroupismember.php:91 actions/apigroupjoin.php:100
-#: actions/apigroupleave.php:100 actions/apigrouplist.php:73
-#: actions/apistatusesupdate.php:229 actions/apisubscriptions.php:87
+#: actions/apiaccountupdatedeliverydevice.php:115
+#: actions/apiaccountupdateprofile.php:106
+#: actions/apiaccountupdateprofilebackgroundimage.php:117
+#: actions/apiaccountupdateprofileimage.php:106 actions/apiblockcreate.php:98
+#: actions/apiblockdestroy.php:97 actions/apidirectmessage.php:77
+#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:114
+#: actions/apigroupismember.php:91 actions/apigroupjoin.php:101
+#: actions/apigroupleave.php:101 actions/apigrouplist.php:73
+#: actions/apistatusesupdate.php:230 actions/apisubscriptions.php:87
 #: actions/apitimelinefavorites.php:72 actions/apitimelinefriends.php:174
 #: actions/apitimelinehome.php:80 actions/apitimelinementions.php:80
 #: actions/apitimelineuser.php:82 actions/avatarbynickname.php:75
@@ -91,18 +88,6 @@ msgstr "BÃ¶yle bir kullanÄ±cÄ± yok."
 msgid "%s and friends"
 msgstr "%s ve arkadaÅlarÄ±"
 
-#. TRANS: %1$s is user nickname
-#: actions/all.php:107
-#, php-format
-msgid "Feed for friends of %s (RSS 1.0)"
-msgstr ""
-
-#. TRANS: %1$s is user nickname
-#: actions/all.php:116
-#, php-format
-msgid "Feed for friends of %s (RSS 2.0)"
-msgstr ""
-
 #. TRANS: %1$s is user nickname
 #: actions/all.php:138
 #, php-format
@@ -140,39 +125,41 @@ msgstr ""
 msgid "Updates from %1$s and friends on %2$s!"
 msgstr ""
 
-#: actions/apiaccountupdatedeliverydevice.php:86
-#: actions/apiaccountupdateprofile.php:89
-#: actions/apiaccountupdateprofilebackgroundimage.php:86
-#: actions/apiaccountupdateprofilecolors.php:110
-#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89
-#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109
-#: actions/apifavoritecreate.php:91 actions/apifavoritedestroy.php:92
-#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
-#: actions/apigroupcreate.php:105 actions/apigroupjoin.php:92
-#: actions/apigroupleave.php:92 actions/apimediaupload.php:67
-#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:198
+#. TRANS: Client error message. POST is a HTTP command. It should not be translated.
+#. TRANS: Client error. POST is a HTTP command. It should not be translated.
+#: actions/apiaccountupdatedeliverydevice.php:87
+#: actions/apiaccountupdateprofile.php:90
+#: actions/apiaccountupdateprofilebackgroundimage.php:87
+#: actions/apiaccountupdateprofilecolors.php:111
+#: actions/apiaccountupdateprofileimage.php:85 actions/apiblockcreate.php:90
+#: actions/apiblockdestroy.php:89 actions/apidirectmessagenew.php:110
+#: actions/apifavoritecreate.php:92 actions/apifavoritedestroy.php:93
+#: actions/apifriendshipscreate.php:92 actions/apifriendshipsdestroy.php:92
+#: actions/apigroupcreate.php:106 actions/apigroupjoin.php:93
+#: actions/apigroupleave.php:93 actions/apimediaupload.php:68
+#: actions/apistatusesretweet.php:66 actions/apistatusesupdate.php:199
 msgid "This method requires a POST."
 msgstr ""
 
-#: actions/apiaccountupdatedeliverydevice.php:106
+#: actions/apiaccountupdatedeliverydevice.php:107
 msgid ""
 "You must specify a parameter named 'device' with a value of one of: sms, im, "
 "none."
 msgstr ""
 
-#: actions/apiaccountupdateprofile.php:112
-#: actions/apiaccountupdateprofilebackgroundimage.php:194
-#: actions/apiaccountupdateprofilecolors.php:185
-#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/apiaccountupdateprofile.php:113
+#: actions/apiaccountupdateprofilebackgroundimage.php:195
+#: actions/apiaccountupdateprofilecolors.php:186
+#: actions/apiaccountupdateprofileimage.php:131 actions/apiusershow.php:108
 #: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/hcard.php:74
 #: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
 #: lib/profileaction.php:84
 msgid "User has no profile."
 msgstr "KullanÄ±cÄ±nÄ±n profili yok."
 
-#: actions/apiaccountupdateprofilebackgroundimage.php:108
-#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
-#: actions/apistatusesupdate.php:212 actions/avatarsettings.php:257
+#: actions/apiaccountupdateprofilebackgroundimage.php:109
+#: actions/apiaccountupdateprofileimage.php:98 actions/apimediaupload.php:81
+#: actions/apistatusesupdate.php:213 actions/avatarsettings.php:257
 #: actions/designadminpanel.php:123 actions/editapplication.php:118
 #: actions/newapplication.php:101 actions/newnotice.php:94
 #: lib/designsettings.php:283
@@ -182,25 +169,21 @@ msgid ""
 "current configuration."
 msgstr ""
 
-#: actions/apiaccountupdateprofilebackgroundimage.php:136
-#: actions/apiaccountupdateprofilebackgroundimage.php:146
-#: actions/apiaccountupdateprofilecolors.php:164
-#: actions/apiaccountupdateprofilecolors.php:174
+#: actions/apiaccountupdateprofilebackgroundimage.php:137
+#: actions/apiaccountupdateprofilebackgroundimage.php:147
+#: actions/apiaccountupdateprofilecolors.php:165
+#: actions/apiaccountupdateprofilecolors.php:175
 #: actions/groupdesignsettings.php:290 actions/groupdesignsettings.php:300
 #: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
 #: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
 msgid "Unable to save your design settings."
 msgstr ""
 
-#: actions/apiblockcreate.php:105
-msgid "You cannot block yourself!"
-msgstr ""
-
-#: actions/apiblockcreate.php:126
+#: actions/apiblockcreate.php:127
 msgid "Block user failed."
 msgstr ""
 
-#: actions/apiblockdestroy.php:114
+#: actions/apiblockdestroy.php:115
 msgid "Unblock user failed."
 msgstr ""
 
@@ -224,36 +207,37 @@ msgstr ""
 msgid "All the direct messages sent to %s"
 msgstr ""
 
-#: actions/apidirectmessagenew.php:118
+#: actions/apidirectmessagenew.php:119
 msgid "No message text!"
 msgstr ""
 
-#: actions/apidirectmessagenew.php:142
+#: actions/apidirectmessagenew.php:143
 msgid "Can't send direct messages to users who aren't your friend."
 msgstr ""
 
-#: actions/apifavoritecreate.php:109 actions/apifavoritedestroy.php:110
+#: actions/apifavoritecreate.php:110 actions/apifavoritedestroy.php:111
 #: actions/apistatusesdestroy.php:121
 msgid "No status found with that ID."
 msgstr ""
 
-#: actions/apifavoritedestroy.php:123
+#: actions/apifavoritedestroy.php:124
 msgid "That status is not a favorite."
 msgstr ""
 
-#: actions/apifriendshipscreate.php:109
+#: actions/apifriendshipscreate.php:110
 msgid "Could not follow user: profile not found."
 msgstr "Profil kaydedilemedi."
 
-#: actions/apifriendshipsdestroy.php:120
-msgid "You cannot unfollow yourself."
+#: actions/apifriendshipscreate.php:119
+#, php-format
+msgid "Could not follow user: %s is already on your list."
 msgstr ""
 
 #: actions/apifriendshipsexists.php:91
 msgid "Two valid IDs or screen_names must be supplied."
 msgstr ""
 
-#: actions/apigroupcreate.php:167 actions/editgroup.php:186
+#: actions/apigroupcreate.php:168 actions/editgroup.php:186
 #: actions/newgroup.php:126 actions/profilesettings.php:215
 #: actions/register.php:212
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
@@ -261,85 +245,80 @@ msgstr ""
 "Takma ad sadece kÃ¼Ã§Ã¼k harflerden ve rakamlardan oluÅabilir, boÅluk "
 "kullanÄ±lamaz. "
 
-#: actions/apigroupcreate.php:176 actions/editgroup.php:190
+#: actions/apigroupcreate.php:177 actions/editgroup.php:190
 #: actions/newgroup.php:130 actions/profilesettings.php:238
 #: actions/register.php:215
 msgid "Nickname already in use. Try another one."
 msgstr "Takma ad kullanÄ±mda. BaÅka bir tane deneyin."
 
-#: actions/apigroupcreate.php:183 actions/editgroup.php:193
+#: actions/apigroupcreate.php:184 actions/editgroup.php:193
 #: actions/newgroup.php:133 actions/profilesettings.php:218
 #: actions/register.php:217
 msgid "Not a valid nickname."
 msgstr "GeÃ§ersiz bir takma ad."
 
-#: actions/apigroupcreate.php:199 actions/editapplication.php:215
+#: actions/apigroupcreate.php:200 actions/editapplication.php:215
 #: actions/editgroup.php:199 actions/newapplication.php:203
 #: actions/newgroup.php:139 actions/profilesettings.php:222
 #: actions/register.php:224
 msgid "Homepage is not a valid URL."
 msgstr "BaÅlangÄ±Ã§ sayfasÄ± adresi geÃ§erli bir URL deÄil."
 
-#: actions/apigroupcreate.php:208 actions/editgroup.php:202
+#: actions/apigroupcreate.php:209 actions/editgroup.php:202
 #: actions/newgroup.php:142 actions/profilesettings.php:225
 #: actions/register.php:227
 msgid "Full name is too long (max 255 chars)."
 msgstr "Tam isim Ã§ok uzun (azm: 255 karakter)."
 
-#: actions/apigroupcreate.php:216 actions/editapplication.php:190
+#: actions/apigroupcreate.php:217 actions/editapplication.php:190
 #: actions/newapplication.php:172
 #, php-format
 msgid "Description is too long (max %d chars)."
 msgstr "Yer bilgisi Ã§ok uzun (azm: %d karakter)."
 
-#: actions/apigroupcreate.php:227 actions/editgroup.php:208
+#: actions/apigroupcreate.php:228 actions/editgroup.php:208
 #: actions/newgroup.php:148 actions/profilesettings.php:232
 #: actions/register.php:234
 msgid "Location is too long (max 255 chars)."
 msgstr "Yer bilgisi Ã§ok uzun (azm: 255 karakter)."
 
-#: actions/apigroupcreate.php:246 actions/editgroup.php:219
+#: actions/apigroupcreate.php:247 actions/editgroup.php:219
 #: actions/newgroup.php:159
 #, php-format
 msgid "Too many aliases! Maximum %d."
 msgstr ""
 
-#: actions/apigroupcreate.php:267
+#: actions/apigroupcreate.php:268
 #, php-format
 msgid "Invalid alias: \"%s\"."
 msgstr "GeÃ§ersiz bÃ¼yÃ¼klÃ¼k."
 
-#: actions/apigroupcreate.php:289 actions/editgroup.php:238
+#: actions/apigroupcreate.php:290 actions/editgroup.php:238
 #: actions/newgroup.php:178
 msgid "Alias can't be the same as nickname."
 msgstr ""
 
-#: actions/apigroupismember.php:96 actions/apigroupjoin.php:105
-#: actions/apigroupleave.php:105 actions/apigroupmembership.php:92
+#: actions/apigroupismember.php:96 actions/apigroupjoin.php:106
+#: actions/apigroupleave.php:106 actions/apigroupmembership.php:92
 #: actions/apigroupshow.php:83 actions/apitimelinegroup.php:92
 msgid "Group not found."
 msgstr "Onay kodu bulunamadÄ±."
 
 #. TRANS: Error text shown a user tries to join a group they already are a member of.
-#: actions/apigroupjoin.php:111 actions/joingroup.php:100 lib/command.php:336
+#: actions/apigroupjoin.php:112 actions/joingroup.php:100 lib/command.php:336
 msgid "You are already a member of that group."
 msgstr "Bize o profili yollamadÄ±nÄ±z"
 
 #. TRANS: Error text shown when a user tries to join a group they are blocked from joining.
-#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:341
+#: actions/apigroupjoin.php:121 actions/joingroup.php:105 lib/command.php:341
 msgid "You have been blocked from that group by the admin."
 msgstr ""
 
-#. TRANS: %s is a user name
-#: actions/apigrouplist.php:98
+#. TRANS: Message is used as a title. %s is a site name.
+#. TRANS: Message is used as a page title. %s is a nick name.
+#: actions/apigrouplistall.php:92 actions/usergroups.php:63
 #, php-format
-msgid "%s's groups"
-msgstr ""
-
-#. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s
-#: actions/apigrouplist.php:108
-#, php-format
-msgid "%1$s groups %2$s is a member of."
+msgid "%s groups"
 msgstr ""
 
 #: actions/apigrouplistall.php:96
@@ -353,9 +332,9 @@ msgstr ""
 
 #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
 #: actions/deletenotice.php:169 actions/disfavor.php:74
-#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:55
+#: actions/emailsettings.php:271 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:66 actions/imsettings.php:227
+#: actions/groupunblock.php:66 actions/imsettings.php:230
 #: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
@@ -386,8 +365,8 @@ msgstr ""
 #. 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:286 actions/grouplogo.php:322
-#: actions/imsettings.php:242 actions/newapplication.php:121
+#: actions/emailsettings.php:290 actions/grouplogo.php:322
+#: actions/imsettings.php:245 actions/newapplication.php:121
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
 #: actions/smssettings.php:277 lib/designsettings.php:304
 msgid "Unexpected form submission."
@@ -443,7 +422,7 @@ msgstr ""
 msgid "You may not delete another user's status."
 msgstr ""
 
-#: actions/apistatusesretweet.php:75 actions/apistatusesretweets.php:72
+#: actions/apistatusesretweet.php:76 actions/apistatusesretweets.php:72
 #: actions/deletenotice.php:52 actions/shownotice.php:92
 msgid "No such notice."
 msgstr "BÃ¶yle bir durum mesajÄ± yok."
@@ -452,20 +431,15 @@ msgstr "BÃ¶yle bir durum mesajÄ± yok."
 msgid "No status with that ID found."
 msgstr ""
 
-#: actions/apistatusesupdate.php:221
+#: actions/apistatusesupdate.php:222
 msgid "Client must provide a 'status' parameter with a value."
 msgstr ""
 
-#: actions/apistatusesupdate.php:306 actions/newnotice.php:181
+#: actions/apistatusesupdate.php:307 actions/newnotice.php:181
 #, php-format
 msgid "Max notice size is %d chars, including attachment URL."
 msgstr ""
 
-#: actions/apitimelinefavorites.php:119
-#, php-format
-msgid "%1$s updates favorited by %2$s / %2$s."
-msgstr ""
-
 #: actions/apitimelinementions.php:131
 #, php-format
 msgid "%1$s updates that reply to updates from %2$s / %3$s."
@@ -481,11 +455,6 @@ msgstr ""
 msgid "Notices tagged with %s"
 msgstr ""
 
-#: actions/apitimelinetag.php:107 actions/tagrss.php:65
-#, php-format
-msgid "Updates tagged with %1$s on %2$s!"
-msgstr ""
-
 #: actions/attachment.php:73
 msgid "No such attachment."
 msgstr "BÃ¶yle bir durum mesajÄ± yok."
@@ -562,18 +531,6 @@ msgid ""
 "will not be notified of any @-replies from them."
 msgstr ""
 
-#. 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:153 actions/deleteapplication.php:154
-#: actions/deletenotice.php:147 actions/deleteuser.php:152
-#: actions/groupblock.php:178
-msgctxt "BUTTON"
-msgid "No"
-msgstr ""
-
 #. TRANS: Button label on the user block form.
 #. TRANS: Button label on the delete application form.
 #. TRANS: Button label on the delete notice form.
@@ -586,11 +543,6 @@ msgctxt "BUTTON"
 msgid "Yes"
 msgstr ""
 
-#. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
-msgid "Block this user"
-msgstr ""
-
 #: actions/block.php:187
 msgid "Failed to save block information."
 msgstr ""
@@ -611,25 +563,12 @@ msgstr ""
 msgid "No such group."
 msgstr "BÃ¶yle bir kullanÄ±cÄ± yok."
 
-#: actions/blockedfromgroup.php:97
-#, php-format
-msgid "%s blocked profiles"
-msgstr ""
-
-#: actions/blockedfromgroup.php:100
-#, php-format
-msgid "%1$s blocked profiles, page %2$d"
-msgstr ""
-
 #: actions/blockedfromgroup.php:115
 msgid "A list of the users blocked from joining this group."
 msgstr ""
 
-#: actions/blockedfromgroup.php:288
-msgid "Unblock user from group"
-msgstr ""
-
-#: actions/blockedfromgroup.php:320 lib/unblockform.php:69
+#. TRANS: Title for the form to unblock a user.
+#: actions/blockedfromgroup.php:320 lib/unblockform.php:70
 msgid "Unblock"
 msgstr ""
 
@@ -645,12 +584,6 @@ msgstr "Onay kodu bulunamadÄ±."
 msgid "That confirmation code is not for you!"
 msgstr "O onay kodu sizin iÃ§in deÄil!"
 
-#. TRANS: Server error for an unknow address type, which can be 'email', 'jabber', or 'sms'.
-#: actions/confirmaddress.php:91
-#, php-format
-msgid "Unrecognized address type %s."
-msgstr ""
-
 #. TRANS: Client error for an already confirmed email/jabbel/sms address.
 #: actions/confirmaddress.php:96
 msgid "That address has already been confirmed."
@@ -662,9 +595,9 @@ msgstr "O adres daha Ã¶nce onaylanmÄ±Å."
 #. 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/confirmaddress.php:116 actions/emailsettings.php:331
+#: actions/emailsettings.php:477 actions/imsettings.php:283
+#: actions/imsettings.php:442 actions/othersettings.php:174
 #: actions/profilesettings.php:283 actions/smssettings.php:308
 #: actions/smssettings.php:464
 msgid "Couldn't update user."
@@ -672,7 +605,7 @@ msgstr "KullanÄ±cÄ± gÃ¼ncellenemedi."
 
 #. 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/confirmaddress.php:128 actions/emailsettings.php:437
 #: actions/smssettings.php:422
 msgid "Couldn't delete email confirmation."
 msgstr "Eposta onayÄ± silinemedi."
@@ -695,9 +628,10 @@ msgstr "Durum mesajlarÄ±"
 msgid "Application not found."
 msgstr "Onay kodu bulunamadÄ±."
 
+#. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:127
 #: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1307
+#: lib/action.php:1315
 msgid "There was a problem with your session token."
 msgstr ""
 
@@ -714,7 +648,7 @@ msgstr ""
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
 #: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:73 lib/profileformaction.php:64
+#: lib/adminpanelaction.php:71 lib/profileformaction.php:64
 #: lib/settingsaction.php:72
 msgid "Not logged in."
 msgstr "GiriÅ yapÄ±lmadÄ±."
@@ -729,11 +663,6 @@ msgstr ""
 msgid "Are you sure you want to delete this notice?"
 msgstr ""
 
-#. TRANS: Submit button title for 'No' when deleting a notice.
-#: actions/deletenotice.php:151
-msgid "Do not delete this notice"
-msgstr ""
-
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
 #: actions/deletenotice.php:158 lib/noticelist.php:657
 msgid "Delete this notice"
@@ -752,7 +681,6 @@ msgstr ""
 #. TRANS: Message used as title for design settings for the site.
 #. TRANS: Link description in user account settings menu.
 #: actions/designadminpanel.php:63 lib/accountsettingsaction.php:139
-#: lib/groupnav.php:119
 msgid "Design"
 msgstr ""
 
@@ -760,11 +688,6 @@ msgstr ""
 msgid "Design settings for this StatusNet site."
 msgstr ""
 
-#: actions/designadminpanel.php:322
-#, php-format
-msgid "Theme not available: %s."
-msgstr ""
-
 #: actions/designadminpanel.php:426
 msgid "Change logo"
 msgstr "DeÄiÅtir"
@@ -773,10 +696,6 @@ msgstr "DeÄiÅtir"
 msgid "Theme for the site."
 msgstr ""
 
-#: actions/designadminpanel.php:467
-msgid "Custom theme"
-msgstr ""
-
 #: actions/designadminpanel.php:471
 msgid "You can upload a custom StatusNet theme as a .ZIP archive."
 msgstr ""
@@ -832,17 +751,21 @@ msgstr ""
 msgid "Reset back to default"
 msgstr ""
 
-#. TRANS: Submit button title
+#. TRANS: Submit button title.
 #: actions/designadminpanel.php:685 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/snapshotadminpanel.php:245
 #: actions/subscriptions.php:226 actions/tagother.php:154
-#: actions/useradminpanel.php:294 lib/applicationeditform.php:363
+#: actions/useradminpanel.php:294 lib/applicationeditform.php:353
 #: lib/designsettings.php:256 lib/groupeditform.php:202
 msgid "Save"
 msgstr "Kaydet"
 
+#: actions/designadminpanel.php:686 lib/designsettings.php:257
+msgid "Save design"
+msgstr ""
+
 #: actions/disfavor.php:81
 msgid "This notice is not a favorite!"
 msgstr ""
@@ -856,14 +779,18 @@ msgstr ""
 msgid "No such document \"%s\""
 msgstr "BÃ¶yle bir durum mesajÄ± yok."
 
-#: actions/editapplication.php:54
-msgid "Edit Application"
+#: actions/editapplication.php:66
+msgid "You must be logged in to edit an application."
 msgstr ""
 
 #: actions/editapplication.php:161
 msgid "Use this form to edit your application."
 msgstr ""
 
+#: actions/editapplication.php:177 actions/newapplication.php:159
+msgid "Name is required."
+msgstr ""
+
 #: actions/editapplication.php:186 actions/newapplication.php:168
 msgid "Description is required."
 msgstr "Abonelik reddedildi."
@@ -872,6 +799,14 @@ msgstr "Abonelik reddedildi."
 msgid "Source URL is too long."
 msgstr ""
 
+#: actions/editapplication.php:203 actions/newapplication.php:188
+msgid "Organization is required."
+msgstr ""
+
+#: actions/editapplication.php:209 actions/newapplication.php:194
+msgid "Organization homepage is required."
+msgstr ""
+
 #: actions/editapplication.php:218 actions/newapplication.php:206
 msgid "Callback is too long."
 msgstr ""
@@ -885,6 +820,10 @@ msgstr ""
 msgid "Edit %s group"
 msgstr ""
 
+#: actions/editgroup.php:68 actions/grouplogo.php:70 actions/newgroup.php:65
+msgid "You must be logged in to create a group."
+msgstr ""
+
 #: actions/editgroup.php:107 actions/editgroup.php:172
 #: actions/groupdesignsettings.php:107 actions/grouplogo.php:109
 msgid "You must be an admin to edit the group."
@@ -916,79 +855,74 @@ msgstr ""
 #. 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/emailsettings.php:115 actions/emailsettings.php:162
 #: actions/imsettings.php:116 actions/smssettings.php:124
 #: actions/smssettings.php:180
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "Geri al"
 
-#. TRANS: Instructions for e-mail address input form.
-#: actions/emailsettings.php:135
+#. TRANS: Instructions for e-mail address input form. Do not translate
+#. TRANS: "example.org". It is one of the domain names reserved for
+#. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
+#. TRANS: Any other domain may be owned by a legitimate person or
+#. TRANS: organization.
+#: actions/emailsettings.php:139
 msgid "Email address, like \"UserName@example.org\""
 msgstr ""
 
-#. 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 ""
-
 #. 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
+#: actions/emailsettings.php:151 actions/smssettings.php:171
 msgid "Incoming email"
 msgstr ""
 
 #. 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
+#: actions/emailsettings.php:159 actions/smssettings.php:178
 msgid "Send email to this address to post new notices."
 msgstr ""
 
 #. 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
+#: actions/emailsettings.php:168 actions/smssettings.php:186
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr ""
 
 #. 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
+#: actions/emailsettings.php:172 actions/smssettings.php:189
 msgctxt "BUTTON"
 msgid "New"
 msgstr ""
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:186
+#: actions/emailsettings.php:190
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr ""
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:193
+#: actions/emailsettings.php:197
 msgid "Send me email when someone sends me a private message."
 msgstr ""
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:199
+#: actions/emailsettings.php:203
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr ""
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:205
+#: actions/emailsettings.php:209
 msgid "Allow friends to nudge me and send me an email."
 msgstr ""
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:212
+#: actions/emailsettings.php:216
 msgid "I want to post notices by email."
 msgstr ""
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:208
+#: actions/emailsettings.php:370 actions/register.php:208
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "GeÃ§ersiz bir eposta adresi."
@@ -996,7 +930,7 @@ msgstr "GeÃ§ersiz bir eposta adresi."
 #. 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/emailsettings.php:395 actions/imsettings.php:351
 #: actions/smssettings.php:373
 msgid "Couldn't insert confirmation code."
 msgstr "Onay kodu eklenemedi."
@@ -1004,21 +938,26 @@ msgstr "Onay kodu eklenemedi."
 #. 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/emailsettings.php:423 actions/imsettings.php:386
 #: actions/smssettings.php:408
 msgid "No pending confirmation to cancel."
 msgstr "Ä°ptal etmek iÃ§in beklenen onay yok."
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:438
+#: actions/emailsettings.php:442
 msgid "Email confirmation cancelled."
 msgstr "Ä°ptal etmek iÃ§in beklenen onay yok."
 
 #. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:479
+#: actions/emailsettings.php:483
 msgid "The email address was removed."
 msgstr "Eposta adresi zaten var."
 
+#. TRANS: Message given after successfully removing an incoming e-mail address.
+#: actions/emailsettings.php:512 actions/smssettings.php:581
+msgid "Incoming email address removed."
+msgstr ""
+
 #: actions/favor.php:79
 msgid "This notice is already a favorite!"
 msgstr ""
@@ -1027,11 +966,6 @@ msgstr ""
 msgid "Disfavor favorite"
 msgstr ""
 
-#: actions/favorited.php:67
-#, php-format
-msgid "Popular notices, page %d"
-msgstr ""
-
 #: actions/favorited.php:79
 msgid "The most popular notices on the site right now."
 msgstr ""
@@ -1059,11 +993,6 @@ msgstr ""
 msgid "%s's favorite notices"
 msgstr ""
 
-#: actions/favoritesrss.php:115
-#, php-format
-msgid "Updates favored by %1$s on %2$s!"
-msgstr ""
-
 #: actions/featured.php:69 lib/featureduserssection.php:87
 #: lib/publicgroupnav.php:89
 msgid "Featured users"
@@ -1111,10 +1040,6 @@ msgstr "Takip talebine izin verildi"
 msgid "Could not convert request token to access token."
 msgstr ""
 
-#: actions/finishremotesubscribe.php:118
-msgid "Remote service uses unknown version of OMB protocol."
-msgstr ""
-
 #: actions/getfile.php:83
 msgid "Cannot read file."
 msgstr "Profil kaydedilemedi."
@@ -1123,10 +1048,6 @@ msgstr "Profil kaydedilemedi."
 msgid "This role is reserved and cannot be set."
 msgstr ""
 
-#: actions/grantrole.php:75
-msgid "You cannot grant user roles on this site."
-msgstr ""
-
 #: actions/groupblock.php:71 actions/groupunblock.php:71
 #: actions/makeadmin.php:71 actions/subedit.php:46
 #: lib/profileformaction.php:79
@@ -1148,10 +1069,6 @@ msgstr ""
 msgid "Only an admin can block group members."
 msgstr ""
 
-#: actions/groupblock.php:134 actions/groupmembers.php:360
-msgid "Block user from group"
-msgstr ""
-
 #: actions/groupblock.php:160
 #, php-format
 msgid ""
@@ -1160,16 +1077,6 @@ msgid ""
 "the group in the future."
 msgstr ""
 
-#. 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 ""
-
-#. 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:206
 msgid "Database error blocking user from group."
 msgstr ""
@@ -1192,45 +1099,52 @@ msgid ""
 "palette of your choice."
 msgstr ""
 
+#: actions/grouplogo.php:142 actions/grouplogo.php:195
+msgid "Group logo"
+msgstr ""
+
 #: actions/grouplogo.php:365
 msgid "Pick a square area of the image to be the logo."
 msgstr ""
 
-#: actions/groupmembers.php:103
+#. TRANS: Title of the page showing group members.
+#. TRANS: %s is the name of the group.
+#: actions/groupmembers.php:102
+#, php-format
+msgid "%s group members"
+msgstr ""
+
+#. TRANS: Title of the page showing group members.
+#. TRANS: %1$s is the name of the group, %2$d is the page number of the members list.
+#: actions/groupmembers.php:107
 #, php-format
 msgid "%1$s group members, page %2$d"
 msgstr ""
 
-#: actions/groupmembers.php:118
+#: actions/groupmembers.php:122
 msgid "A list of the users in this group."
 msgstr ""
 
-#: actions/groupmembers.php:182 lib/groupnav.php:107
+#: actions/groupmembers.php:186
 msgid "Admin"
 msgstr ""
 
-#: actions/groupmembers.php:392 lib/blockform.php:69
-msgid "Block"
-msgstr ""
-
-#: actions/groupmembers.php:487
+#: actions/groupmembers.php:498
 msgid "Make user an admin of the group"
 msgstr ""
 
-#: actions/groupmembers.php:519
+#. TRANS: Button text for the form that will make a user administrator.
+#: actions/groupmembers.php:533
+msgctxt "BUTTON"
 msgid "Make Admin"
 msgstr ""
 
-#: actions/groupmembers.php:519
+#. TRANS: Submit button title.
+#: actions/groupmembers.php:537
+msgctxt "TOOLTIP"
 msgid "Make this user an admin"
 msgstr ""
 
-#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
-#: actions/grouprss.php:142
-#, php-format
-msgid "Updates from members of %1$s on %2$s!"
-msgstr ""
-
 #: actions/groups.php:62 lib/profileaction.php:223 lib/profileaction.php:249
 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
 msgid "Groups"
@@ -1251,15 +1165,6 @@ msgid ""
 "%%%%)"
 msgstr ""
 
-#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:122
-msgid "Create a new group"
-msgstr ""
-
-#: actions/groupsearch.php:79 actions/noticesearch.php:117
-#: actions/peoplesearch.php:83
-msgid "No results."
-msgstr ""
-
 #: actions/groupsearch.php:82
 #, php-format
 msgid ""
@@ -1278,10 +1183,6 @@ msgstr ""
 msgid "Only an admin can unblock group members."
 msgstr ""
 
-#: actions/groupunblock.php:95
-msgid "User is not blocked from group."
-msgstr ""
-
 #. TRANS: Title for instance messaging settings.
 #: actions/imsettings.php:60
 msgid "IM settings"
@@ -1299,11 +1200,6 @@ msgstr ""
 "Jabber/GTalk kullanarak durum mesaji gÃnderip alabilirsiniz. IM adres "
 "ayarlarinizi aÅaÄÄ±da yapÄ±n."
 
-#. 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:113
 msgid "Current confirmed Jabber/GTalk address."
 msgstr "OnaylanmÄ±Å Jabber/Gtalk adresi."
@@ -1321,7 +1217,10 @@ msgstr ""
 
 #. TRANS: IM address input field instructions in IM settings form.
 #. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:140
+#. TRANS: Do not translate "example.org". It is one of the domain names reserved for use in examples by
+#. TRANS: http://www.rfc-editor.org/rfc/rfc2606.txt. Any other domain may be owned by a legitimate
+#. TRANS: person or organization.
+#: actions/imsettings.php:143
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -1331,54 +1230,54 @@ msgstr ""
 "IM istemcisi veya Gtalk arkadaÅlar listenize eklenmiÅ olmalÄ±dÄ±r."
 
 #. TRANS: Form legend for IM preferences form.
-#: actions/imsettings.php:155
+#: actions/imsettings.php:158
 msgid "IM preferences"
 msgstr "Tercihler kaydedildi."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:160
+#: actions/imsettings.php:163
 msgid "Send me notices through Jabber/GTalk."
 msgstr "Durum mesajlarÄ±nÄ± Jabber/GTalk Ã¼zerinden gÃ¶nder."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:166
+#: actions/imsettings.php:169
 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"
 
 #. TRANS: Confirmation message for successful IM preferences save.
-#: actions/imsettings.php:287 actions/othersettings.php:180
+#: actions/imsettings.php:290 actions/othersettings.php:180
 msgid "Preferences saved."
 msgstr "Tercihler kaydedildi."
 
 #. TRANS: Message given saving IM address without having provided one.
-#: actions/imsettings.php:309
+#: actions/imsettings.php:312
 msgid "No Jabber ID."
 msgstr "JabberID yok."
 
 #. TRANS: Message given saving IM address that cannot be normalised.
-#: actions/imsettings.php:317
+#: actions/imsettings.php:320
 msgid "Cannot normalize that Jabber ID"
 msgstr "Jabber iÅlemlerinde bir hata oluÅtu."
 
 #. TRANS: Message given saving IM address that not valid.
-#: actions/imsettings.php:322
+#: actions/imsettings.php:325
 msgid "Not a valid Jabber ID"
 msgstr "GeÃ§ersiz bir Jabber ID"
 
 #. TRANS: Message given saving IM address that is already set.
-#: actions/imsettings.php:326
+#: actions/imsettings.php:329
 msgid "That is already your Jabber ID."
 msgstr "Bu zaten sizin Jabber ID'niz."
 
 #. TRANS: Message given saving IM address that is already set for another user.
-#: actions/imsettings.php:330
+#: actions/imsettings.php:333
 msgid "Jabber ID already belongs to another user."
 msgstr "Jabber ID baÅka bir kullanÄ±cÄ±ya ait."
 
 #. 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
+#: actions/imsettings.php:361
 #, php-format
 msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
@@ -1388,18 +1287,18 @@ msgstr ""
 "mesaj yollanabilmesi iÃ§in onaylamanÄ±z gerekmektedir."
 
 #. TRANS: Message given canceling IM address confirmation for the wrong IM address.
-#: actions/imsettings.php:388
+#: actions/imsettings.php:391
 msgid "That is the wrong IM address."
 msgstr "YanlÄ±Å IM adresi."
 
 #. TRANS: Message given after successfully canceling IM address confirmation.
-#: actions/imsettings.php:402
+#: actions/imsettings.php:405
 msgid "IM confirmation cancelled."
 msgstr "Onay kodu yok."
 
 #. TRANS: Message given trying to remove an IM address that is not
 #. TRANS: registered for the active user.
-#: actions/imsettings.php:424
+#: actions/imsettings.php:427
 msgid "That is not your Jabber ID."
 msgstr "Bu sizin Jabber ID'niz deÄil."
 
@@ -1421,11 +1320,6 @@ msgstr ""
 msgid "Invites have been disabled."
 msgstr ""
 
-#: actions/invite.php:41
-#, php-format
-msgid "You must be logged in to invite other users to use %s."
-msgstr ""
-
 #: actions/invite.php:110
 msgid "Invitation(s) sent"
 msgstr ""
@@ -1469,12 +1363,6 @@ msgstr ""
 msgid "Optionally add a personal message to the invitation."
 msgstr ""
 
-#. TRANS: Send button for inviting friends
-#: actions/invite.php:198
-msgctxt "BUTTON"
-msgid "Send"
-msgstr ""
-
 #. TRANS: Body text for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English.
 #: actions/invite.php:231
 #, php-format
@@ -1561,37 +1449,12 @@ msgstr ""
 msgid "Login with your username and password."
 msgstr "YanlÄ±Å kullanÄ±cÄ± adÄ± veya parola."
 
-#: actions/login.php:295
-#, php-format
-msgid ""
-"Don't have a username yet? [Register](%%action.register%%) a new account."
-msgstr ""
-
 #: actions/makeadmin.php:92
 msgid "Only an admin can make another user an admin."
 msgstr ""
 
-#: actions/makeadmin.php:96
-#, php-format
-msgid "%1$s is already an admin for group \"%2$s\"."
-msgstr ""
-
-#: actions/makeadmin.php:133
-#, php-format
-msgid "Can't get membership record for %1$s in group %2$s."
-msgstr ""
-
-#: actions/makeadmin.php:146
-#, php-format
-msgid "Can't make %1$s an admin for group %2$s."
-msgstr ""
-
-#: actions/microsummary.php:69
-msgid "No current status."
-msgstr ""
-
-#: actions/newapplication.php:52
-msgid "New Application"
+#: actions/newapplication.php:64
+msgid "You must be logged in to register an application."
 msgstr ""
 
 #: actions/newapplication.php:143
@@ -1606,6 +1469,10 @@ msgstr ""
 msgid "Could not create application."
 msgstr "Eposta onayÄ± silinemedi."
 
+#: actions/newgroup.php:53
+msgid "New group"
+msgstr ""
+
 #: actions/newgroup.php:110
 msgid "Use this form to create a new group."
 msgstr ""
@@ -1663,11 +1530,6 @@ msgstr ""
 msgid "Text search"
 msgstr "Metin arama"
 
-#: actions/noticesearch.php:91
-#, php-format
-msgid "Search results for \"%1$s\" on %2$s"
-msgstr ""
-
 #: actions/noticesearch.php:121
 #, php-format
 msgid ""
@@ -1682,16 +1544,6 @@ msgid ""
 "[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
 msgstr ""
 
-#: actions/noticesearchrss.php:96
-#, php-format
-msgid "Updates with \"%s\""
-msgstr ""
-
-#: actions/noticesearchrss.php:98
-#, php-format
-msgid "Updates matching search term \"%1$s\" on %2$s!"
-msgstr ""
-
 #: actions/nudge.php:85
 msgid ""
 "This user doesn't allow nudges or hasn't confirmed or set their email yet."
@@ -1717,6 +1569,15 @@ msgstr ""
 msgid "Applications you have registered"
 msgstr ""
 
+#: actions/oauthappssettings.php:135
+#, php-format
+msgid "You have not registered any applications yet."
+msgstr ""
+
+#: actions/oauthconnectionssettings.php:72
+msgid "Connected applications"
+msgstr ""
+
 #: actions/oauthconnectionssettings.php:83
 msgid "You have allowed the following applications to access you account."
 msgstr ""
@@ -1743,12 +1604,6 @@ msgstr "KullanÄ±cÄ±nÄ±n profili yok."
 msgid "%1$s's status on %2$s"
 msgstr "%1$s'in %2$s'deki durum mesajlarÄ± "
 
-#. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
-#: actions/oembed.php:159
-#, php-format
-msgid "Content type %s not supported."
-msgstr ""
-
 #. TRANS: Error message displaying attachments. %s is the site's base URL.
 #: actions/oembed.php:163
 #, php-format
@@ -1779,18 +1634,6 @@ msgstr ""
 msgid "Show or hide profile designs."
 msgstr ""
 
-#: actions/otp.php:69
-msgid "No user ID specified."
-msgstr ""
-
-#: actions/otp.php:83
-msgid "No login token specified."
-msgstr ""
-
-#: actions/otp.php:95
-msgid "Invalid login token specified."
-msgstr ""
-
 #: actions/otp.php:104
 msgid "Login token expired."
 msgstr ""
@@ -1859,7 +1702,7 @@ msgid "Password saved."
 msgstr "Parola kaydedildi."
 
 #. TRANS: Menu item for site administration
-#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:384
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:371
 msgid "Paths"
 msgstr ""
 
@@ -1867,26 +1710,6 @@ msgstr ""
 msgid "Path and server settings for this StatusNet site."
 msgstr ""
 
-#: actions/pathsadminpanel.php:157
-#, php-format
-msgid "Theme directory not readable: %s."
-msgstr ""
-
-#: actions/pathsadminpanel.php:163
-#, php-format
-msgid "Avatar directory not writable: %s."
-msgstr ""
-
-#: actions/pathsadminpanel.php:169
-#, php-format
-msgid "Background directory not writable: %s."
-msgstr ""
-
-#: actions/pathsadminpanel.php:177
-#, php-format
-msgid "Locales directory not readable: %s."
-msgstr ""
-
 #: actions/pathsadminpanel.php:183
 msgid "Invalid SSL server. The maximum length is 255 characters."
 msgstr ""
@@ -1927,6 +1750,10 @@ msgstr ""
 msgid "Theme"
 msgstr ""
 
+#: actions/pathsadminpanel.php:264
+msgid "Theme server"
+msgstr ""
+
 #: actions/pathsadminpanel.php:268
 msgid "Theme path"
 msgstr ""
@@ -1943,6 +1770,10 @@ msgstr "Avatar"
 msgid "Backgrounds"
 msgstr ""
 
+#: actions/pathsadminpanel.php:305
+msgid "Background server"
+msgstr ""
+
 #: actions/pathsadminpanel.php:309
 msgid "Background path"
 msgstr ""
@@ -1979,10 +1810,6 @@ msgstr "Sunucu"
 msgid "Server to direct SSL requests to"
 msgstr ""
 
-#: actions/pathsadminpanel.php:352
-msgid "Save paths"
-msgstr ""
-
 #: actions/peoplesearch.php:52
 #, php-format
 msgid ""
@@ -1997,11 +1824,6 @@ msgstr ""
 msgid "People search"
 msgstr "KiÅi Arama"
 
-#: actions/peopletag.php:142
-#, php-format
-msgid "Users self-tagged with %1$s - page %2$d"
-msgstr ""
-
 #: actions/postnotice.php:95
 msgid "Invalid notice content."
 msgstr "GeÃ§ersiz bÃ¼yÃ¼klÃ¼k."
@@ -2040,7 +1862,7 @@ msgstr "Tam Ä°sim"
 
 #. TRANS: Form input field label.
 #: actions/profilesettings.php:115 actions/register.php:460
-#: lib/applicationeditform.php:244 lib/groupeditform.php:161
+#: lib/applicationeditform.php:235 lib/groupeditform.php:161
 msgid "Homepage"
 msgstr "BaÅlangÄ±Ã§ SayfasÄ±"
 
@@ -2049,15 +1871,6 @@ msgid "URL of your homepage, blog, or profile on another site"
 msgstr ""
 "Web Sitenizin, blogunuzun ya da varsa baÅka bir sitedeki profilinizin adresi"
 
-#: actions/profilesettings.php:122 actions/register.php:468
-#, php-format
-msgid "Describe yourself and your interests in %d chars"
-msgstr ""
-
-#: actions/profilesettings.php:125 actions/register.php:471
-msgid "Describe yourself and your interests"
-msgstr ""
-
 #: actions/profilesettings.php:127 actions/register.php:473
 msgid "Bio"
 msgstr "HakkÄ±nda"
@@ -2128,7 +1941,7 @@ msgid "Couldn't save profile."
 msgstr "Profil kaydedilemedi."
 
 #. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:391 lib/adminpanelaction.php:141
+#: actions/profilesettings.php:391 lib/adminpanelaction.php:138
 msgid "Settings saved."
 msgstr "Ayarlar kaydedildi."
 
@@ -2141,18 +1954,6 @@ msgstr ""
 msgid "Public timeline"
 msgstr "Genel zaman Ã§izgisi"
 
-#: actions/public.php:160
-msgid "Public Stream Feed (RSS 1.0)"
-msgstr ""
-
-#: actions/public.php:164
-msgid "Public Stream Feed (RSS 2.0)"
-msgstr ""
-
-#: actions/public.php:168
-msgid "Public Stream Feed (Atom)"
-msgstr ""
-
 #: actions/public.php:188
 #, php-format
 msgid ""
@@ -2187,10 +1988,6 @@ msgid ""
 "tool."
 msgstr ""
 
-#: actions/publictagcloud.php:57
-msgid "Public tag cloud"
-msgstr ""
-
 #: actions/publictagcloud.php:63
 #, php-format
 msgid "These are most popular recent tags on %s "
@@ -2386,14 +2183,6 @@ msgstr ""
 msgid "All rights reserved."
 msgstr ""
 
-#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:540
-#, php-format
-msgid ""
-"My text and files are available under %s except this private data: password, "
-"email address, IM address, and phone number."
-msgstr ""
-
 #: actions/register.php:583
 #, php-format
 msgid ""
@@ -2456,10 +2245,6 @@ msgstr "Abone ol"
 msgid "Invalid profile URL (bad format)"
 msgstr ""
 
-#: actions/remotesubscribe.php:168
-msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
-msgstr ""
-
 #: actions/remotesubscribe.php:176
 msgid "Thatâs a local profile! Login to subscribe."
 msgstr ""
@@ -2508,29 +2293,13 @@ msgid ""
 "newnotice%%%%?status_textarea=%3$s)."
 msgstr ""
 
-#: actions/revokerole.php:75
-msgid "You cannot revoke user roles on this site."
-msgstr ""
-
-#: actions/revokerole.php:82
-msgid "User doesn't have this role."
-msgstr ""
-
 #: actions/rsd.php:146 actions/version.php:159
 msgid "StatusNet"
 msgstr "Ä°statistikler"
 
-#: actions/sandbox.php:65 actions/unsandbox.php:65
-msgid "You cannot sandbox users on this site."
-msgstr ""
-
-#: actions/sandbox.php:72
-msgid "User is already sandboxed."
-msgstr ""
-
 #. TRANS: Menu item for site administration
 #: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
-#: lib/adminpanelaction.php:392
+#: lib/adminpanelaction.php:379
 msgid "Sessions"
 msgstr ""
 
@@ -2559,14 +2328,13 @@ msgstr ""
 msgid "Save site settings"
 msgstr "Profil ayarlarÄ±"
 
-#. TRANS: Form input field label for application icon.
-#: actions/showapplication.php:159 lib/applicationeditform.php:182
-msgid "Icon"
+#: actions/showapplication.php:82
+msgid "You must be logged in to view an application."
 msgstr ""
 
-#. TRANS: Form input field label.
-#: actions/showapplication.php:178 lib/applicationeditform.php:235
-msgid "Organization"
+#. TRANS: Form input field label for application icon.
+#: actions/showapplication.php:159 lib/applicationeditform.php:173
+msgid "Icon"
 msgstr ""
 
 #: actions/showapplication.php:192 actions/showgroup.php:436
@@ -2579,10 +2347,18 @@ msgstr "Ä°statistikler"
 msgid "Created by %1$s - %2$s access by default - %3$d users"
 msgstr ""
 
+#: actions/showapplication.php:213
+msgid "Application actions"
+msgstr ""
+
 #: actions/showapplication.php:236
 msgid "Reset key & secret"
 msgstr ""
 
+#: actions/showapplication.php:261
+msgid "Application info"
+msgstr ""
+
 #: actions/showapplication.php:263
 msgid "Consumer key"
 msgstr ""
@@ -2613,21 +2389,6 @@ msgstr ""
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr ""
 
-#: actions/showfavorites.php:79
-#, php-format
-msgid "%1$s's favorite notices, page %2$d"
-msgstr ""
-
-#: actions/showfavorites.php:171
-#, php-format
-msgid "Feed for favorites of %s (RSS 1.0)"
-msgstr ""
-
-#: actions/showfavorites.php:178
-#, php-format
-msgid "Feed for favorites of %s (RSS 2.0)"
-msgstr ""
-
 #: actions/showfavorites.php:206
 msgid ""
 "You haven't chosen any favorite notices yet. Click the fave button on "
@@ -2653,9 +2414,9 @@ msgstr ""
 msgid "This is a way to share what you like."
 msgstr ""
 
-#: actions/showgroup.php:84
+#: actions/showgroup.php:82
 #, php-format
-msgid "%1$s group, page %2$d"
+msgid "%s group"
 msgstr ""
 
 #: actions/showgroup.php:227
@@ -2671,19 +2432,8 @@ msgstr ""
 msgid "Aliases"
 msgstr ""
 
-#: actions/showgroup.php:338
-#, php-format
-msgid "Notice feed for %s group (RSS 1.0)"
-msgstr ""
-
-#: actions/showgroup.php:344
-#, php-format
-msgid "Notice feed for %s group (RSS 2.0)"
-msgstr ""
-
-#: actions/showgroup.php:355
-#, php-format
-msgid "FOAF for %s group"
+#: actions/showgroup.php:302
+msgid "Group actions"
 msgstr ""
 
 #: actions/showgroup.php:398 lib/profileaction.php:117
@@ -2733,25 +2483,11 @@ msgstr ""
 msgid "Message from %1$s on %2$s"
 msgstr ""
 
-#: actions/shownotice.php:90
-msgid "Notice deleted."
-msgstr ""
-
 #: actions/showstream.php:73
 #, php-format
 msgid " tagged %s"
 msgstr ""
 
-#: actions/showstream.php:79
-#, php-format
-msgid "%1$s, page %2$d"
-msgstr ""
-
-#: actions/showstream.php:122
-#, php-format
-msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
-msgstr ""
-
 #: actions/showstream.php:148
 #, php-format
 msgid "FOAF for %s"
@@ -2796,10 +2532,6 @@ msgstr ""
 msgid "You cannot silence users on this site."
 msgstr ""
 
-#: actions/silence.php:72
-msgid "User is already silenced."
-msgstr ""
-
 #: actions/siteadminpanel.php:69
 msgid "Basic settings for this StatusNet site"
 msgstr ""
@@ -2909,11 +2641,6 @@ msgstr "Profil ayarlarÄ±"
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr ""
 
-#. 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 ""
-
 #. TRANS: Form guide in SMS settings form.
 #: actions/smssettings.php:120
 msgid "Current confirmed SMS-enabled phone number."
@@ -2986,7 +2713,7 @@ msgstr ""
 
 #. TRANS: Menu item for site administration
 #: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
-#: lib/adminpanelaction.php:408
+#: lib/adminpanelaction.php:395
 msgid "Snapshots"
 msgstr ""
 
@@ -2994,6 +2721,10 @@ msgstr ""
 msgid "Manage snapshot configuration"
 msgstr "Eposta adresi onayÄ±"
 
+#: actions/snapshotadminpanel.php:127
+msgid "Invalid snapshot run value."
+msgstr ""
+
 #: actions/snapshotadminpanel.php:133
 msgid "Snapshot frequency must be a number."
 msgstr ""
@@ -3043,15 +2774,6 @@ msgstr "Yeni abonelik eklenemedi."
 msgid "This action only accepts POST requests."
 msgstr ""
 
-#: actions/subscribe.php:117
-msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
-msgstr ""
-
-#: actions/subscribers.php:52
-#, php-format
-msgid "%1$s subscribers, page %2$d"
-msgstr ""
-
 #: actions/subscribers.php:63
 msgid "These are the people who listen to your notices."
 msgstr "Sizin durumunuzu takip edenler"
@@ -3102,25 +2824,6 @@ msgstr ""
 msgid "SMS"
 msgstr ""
 
-#: actions/tag.php:69
-#, php-format
-msgid "Notices tagged with %1$s, page %2$d"
-msgstr ""
-
-#: actions/tag.php:87
-#, php-format
-msgid "Notice feed for tag %s (RSS 1.0)"
-msgstr ""
-
-#: actions/tag.php:93
-#, php-format
-msgid "Notice feed for tag %s (RSS 2.0)"
-msgstr ""
-
-#: actions/tagother.php:39
-msgid "No ID argument."
-msgstr ""
-
 #: actions/tagother.php:65
 #, php-format
 msgid "Tag %s"
@@ -3209,10 +2912,6 @@ msgstr ""
 msgid "Welcome text for new users (Max 255 chars)."
 msgstr ""
 
-#: actions/useradminpanel.php:251
-msgid "Invitations"
-msgstr ""
-
 #: actions/useradminpanel.php:256
 msgid "Invitations enabled"
 msgstr ""
@@ -3225,13 +2924,6 @@ msgstr ""
 msgid "Authorize subscription"
 msgstr "Takip isteÄini onayla"
 
-#: actions/userauthorization.php:110
-msgid ""
-"Please check these details to make sure that you want to subscribe to this "
-"userâs notices. If you didnât just ask to subscribe to someoneâs notices, "
-"click âRejectâ."
-msgstr ""
-
 #: actions/userauthorization.php:196 actions/version.php:167
 msgid "License"
 msgstr ""
@@ -3304,16 +2996,6 @@ msgstr ""
 msgid "Avatar URL â%sâ is not valid."
 msgstr ""
 
-#: actions/userauthorization.php:350
-#, php-format
-msgid "Canât read avatar URL â%sâ."
-msgstr ""
-
-#: actions/userauthorization.php:355
-#, php-format
-msgid "Wrong image type for avatar URL â%sâ."
-msgstr ""
-
 #: actions/userdesignsettings.php:87 lib/designsettings.php:76
 msgid ""
 "Customize the way your profile looks with a background image and a colour "
@@ -3324,12 +3006,6 @@ msgstr ""
 msgid "Enjoy your hotdog!"
 msgstr ""
 
-#. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number.
-#: actions/usergroups.php:66
-#, php-format
-msgid "%1$s groups, page %2$d"
-msgstr ""
-
 #: actions/usergroups.php:132
 msgid "Search for more groups"
 msgstr ""
@@ -3500,7 +3176,7 @@ msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
 
 #. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#: classes/Subscription.php:75 lib/oauthstore.php:465
+#: classes/Subscription.php:75 lib/oauthstore.php:466
 msgid "You have been banned from subscribing."
 msgstr ""
 
@@ -3551,6 +3227,11 @@ msgstr "Profil kaydedilemedi."
 msgid "Change email handling"
 msgstr ""
 
+#. TRANS: Link title attribute in user account settings menu.
+#: lib/accountsettingsaction.php:144
+msgid "Other options"
+msgstr ""
+
 #. TRANS: Link description in user account settings menu.
 #: lib/accountsettingsaction.php:146
 msgid "Other"
@@ -3572,25 +3253,14 @@ msgctxt "TOOLTIP"
 msgid "Personal profile and friends timeline"
 msgstr ""
 
-#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:460
-msgctxt "TOOLTIP"
-msgid "Change your email, avatar, password, profile"
-msgstr ""
-
-#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:465
-msgctxt "TOOLTIP"
-msgid "Connect to services"
-msgstr ""
-
 #. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
 #: lib/action.php:468
 msgid "Connect"
 msgstr "BaÄlan"
 
 #. TRANS: Main menu option when logged in and site admin for access to site configuration
-#: lib/action.php:474
+#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
+#: lib/action.php:474 lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr ""
@@ -3602,24 +3272,12 @@ msgctxt "TOOLTIP"
 msgid "Invite friends and colleagues to join you on %s"
 msgstr ""
 
-#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:481
-msgctxt "MENU"
-msgid "Invite"
-msgstr ""
-
 #. TRANS: Tooltip for main menu option "Logout"
 #: lib/action.php:487
 msgctxt "TOOLTIP"
 msgid "Logout from the site"
 msgstr ""
 
-#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:495
-msgctxt "TOOLTIP"
-msgid "Create an account"
-msgstr ""
-
 #. TRANS: Tooltip for main menu option "Login"
 #: lib/action.php:501
 msgctxt "TOOLTIP"
@@ -3637,11 +3295,6 @@ msgstr ""
 msgid "Local views"
 msgstr ""
 
-#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:778
-msgid "Secondary site navigation"
-msgstr ""
-
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
 #: lib/action.php:784
 msgid "Help"
@@ -3686,22 +3339,17 @@ msgstr ""
 msgid "StatusNet software license"
 msgstr ""
 
-#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
-#: lib/action.php:843
-#, php-format
-msgid ""
-"**%%site.name%%** is a microblogging service brought to you by [%%site."
-"broughtby%%](%%site.broughtbyurl%%)."
-msgstr ""
-
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:846
+#: lib/action.php:849
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** bir aninda mesajlaÅma sosyal aÄÄ±dÄ±r."
 
 #. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.
-#: lib/action.php:850
+#. TRANS: Make sure there is no whitespace between "]" and "(".
+#. TRANS: Text between [] is a link description, text between () is the link itself.
+#. TRANS: %s is the version of StatusNet that is being used.
+#: lib/action.php:856
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -3714,215 +3362,225 @@ msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:873
+#: lib/action.php:879
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:880
+#: lib/action.php:886
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:884
+#: lib/action.php:890
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 
-#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:897
+#. TRANS: license message in footer.
+#. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
+#: lib/action.php:904
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr ""
 
 #. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1236
+#: lib/action.php:1243
 msgid "Pagination"
 msgstr ""
 
-#. TRANS: Pagination message to go to a page displaying information more in the
-#. TRANS: present than the currently displayed information.
-#: lib/action.php:1247
-msgid "After"
-msgstr ""
-
-#. TRANS: Pagination message to go to a page displaying information more in the
-#. TRANS: past than the currently displayed information.
-#: lib/action.php:1257
-msgid "Before"
-msgstr ""
-
 #. TRANS: Client exception thrown when a feed instance is a DOMDocument.
 #: lib/activity.php:122
 msgid "Expecting a root feed element but got a whole XML document."
 msgstr ""
 
-#: lib/activityutils.php:208
+#. TRANS: Client exception thrown when there is no source attribute.
+#: lib/activityutils.php:203
 msgid "Can't handle remote content yet."
 msgstr ""
 
-#: lib/activityutils.php:244
+#. TRANS: Client exception thrown when there embedded XML content is found that cannot be processed yet.
+#: lib/activityutils.php:240
 msgid "Can't handle embedded XML content yet."
 msgstr ""
 
-#: lib/activityutils.php:248
+#. TRANS: Client exception thrown when base64 encoded content is found that cannot be processed yet.
+#: lib/activityutils.php:245
 msgid "Can't handle embedded Base64 content yet."
 msgstr ""
 
 #. TRANS: Client error message thrown when a user tries to change admin settings but has no access rights.
-#: lib/adminpanelaction.php:98
+#: lib/adminpanelaction.php:96
 msgid "You cannot make changes to this site."
 msgstr ""
 
 #. TRANS: Client error message throw when a certain panel's settings cannot be changed.
-#: lib/adminpanelaction.php:110
+#: lib/adminpanelaction.php:108
 msgid "Changes to that panel are not allowed."
 msgstr ""
 
 #. TRANS: Client error message.
-#: lib/adminpanelaction.php:229
+#: lib/adminpanelaction.php:222
 msgid "showForm() not implemented."
 msgstr ""
 
 #. TRANS: Client error message
-#: lib/adminpanelaction.php:259
+#: lib/adminpanelaction.php:250
 msgid "saveSettings() not implemented."
 msgstr ""
 
 #. TRANS: Client error message thrown if design settings could not be deleted in
 #. TRANS: the admin panel Design.
-#: lib/adminpanelaction.php:284
+#: lib/adminpanelaction.php:274
 msgid "Unable to delete design setting."
 msgstr ""
 
-#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:352
-msgctxt "MENU"
-msgid "Site"
-msgstr ""
-
-#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:360
-msgctxt "MENU"
-msgid "Design"
-msgstr ""
-
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:366
+#: lib/adminpanelaction.php:353
 msgid "User configuration"
 msgstr "Onay kodu yok."
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:368 lib/personalgroupnav.php:115
+#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:115
 msgid "User"
 msgstr ""
 
 #. TRANS: Client error 401.
-#: lib/apiauth.php:113
+#: lib/apiauth.php:111
 msgid "API resource requires read-write access, but you only have read access."
 msgstr ""
 
-#. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:209
-#, php-format
-msgid "Describe your application in %d characters"
+#. TRANS: OAuth exception thrown when no application is found for a given consumer key.
+#: lib/apiauth.php:175
+msgid "No application for that consumer key."
 msgstr ""
 
-#. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:213
-msgid "Describe your application"
+#. TRANS: OAuth exception given when an incorrect access token was given for a user.
+#: lib/apiauth.php:212
+msgid "Bad access token."
 msgstr ""
 
-#. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:224
-msgid "URL of the homepage of this application"
+#. TRANS: OAuth exception given when no user was found for a given token (no token was found).
+#: lib/apiauth.php:217
+msgid "No user for that token."
 msgstr ""
 
-#. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:233
-msgid "Organization responsible for this application"
+#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
+#: lib/apioauthstore.php:178
+msgid "Tried to revoke unknown token"
+msgstr ""
+
+#. TRANS: Exception thrown when an attempt is made to remove a revoked token.
+#: lib/apioauthstore.php:182
+msgid "Failed to delete revoked token"
+msgstr ""
+
+#. TRANS: Form legend.
+#: lib/applicationeditform.php:129
+msgid "Edit application"
+msgstr ""
+
+#. TRANS: Form guide.
+#: lib/applicationeditform.php:178
+msgid "Icon for this application"
 msgstr ""
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:242
-msgid "URL for the homepage of the organization"
+#: lib/applicationeditform.php:224
+msgid "Organization responsible for this application"
 msgstr ""
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:251
+#: lib/applicationeditform.php:242
 msgid "URL to redirect to after authentication"
 msgstr ""
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:278
+#: lib/applicationeditform.php:269
 msgid "Browser"
 msgstr ""
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:295
+#: lib/applicationeditform.php:286
 msgid "Desktop"
 msgstr ""
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:297
+#: lib/applicationeditform.php:288
 msgid "Type of application, browser or desktop"
 msgstr ""
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:320
+#: lib/applicationeditform.php:311
 msgid "Read-only"
 msgstr ""
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:339
+#: lib/applicationeditform.php:330
 msgid "Read-write"
 msgstr ""
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:341
+#: lib/applicationeditform.php:332
 msgid "Default access for this application: read-only, or read-write"
 msgstr ""
 
-#. TRANS: Submit button title
-#: lib/applicationeditform.php:359
+#. TRANS: Submit button title.
+#: lib/applicationeditform.php:349
 msgid "Cancel"
 msgstr "Ä°ptal et"
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:136
+#: lib/applicationlist.php:135
 msgid "read-write"
 msgstr ""
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:138
+#: lib/applicationlist.php:137
 msgid "read-only"
 msgstr ""
 
 #. 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
+#: lib/applicationlist.php:143
 #, php-format
 msgid "Approved %1$s - \"%2$s\" access."
 msgstr ""
 
 #. TRANS: Button label
-#: lib/applicationlist.php:159
+#: lib/applicationlist.php:158
 msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "Geri al"
 
+#. TRANS: DT element label in attachment list.
+#: lib/attachmentlist.php:88
+msgid "Attachments"
+msgstr ""
+
 #. TRANS: DT element label in attachment list item.
 #: lib/attachmentlist.php:265
 msgid "Author"
 msgstr ""
 
-#: lib/attachmentnoticesection.php:67
+#. TRANS: Title.
+#: lib/attachmentnoticesection.php:68
 msgid "Notices where this attachment appears"
 msgstr ""
 
-#: lib/authenticationplugin.php:236
-msgid "Password changing is not allowed"
+#. TRANS: Title.
+#: lib/attachmenttagcloudsection.php:49
+msgid "Tags for this attachment"
+msgstr ""
+
+#. TRANS: Title for the form to block a user.
+#: lib/blockform.php:70
+msgid "Block"
+msgstr ""
+
+#: lib/channel.php:157 lib/channel.php:177
+msgid "Command results"
 msgstr ""
 
 #: lib/channel.php:229 lib/mailhandler.php:142
@@ -3938,13 +3596,6 @@ msgstr ""
 msgid "Notice with that id does not exist."
 msgstr ""
 
-#. 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:130
-#, php-format
-msgid "Could not find a user with nickname %s."
-msgstr ""
-
 #. TRANS: Message given getting a non-existing user.
 #. TRANS: %s is the nickname of the user that could not be found.
 #: lib/command.php:150
@@ -3993,6 +3644,13 @@ msgstr ""
 msgid "%1$s joined group %2$s."
 msgstr ""
 
+#. 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.
+#: lib/command.php:408
+#, php-format
+msgid "%1$s left group %2$s."
+msgstr ""
+
 #. TRANS: Command exception text shown when trying to send a direct message to a remote user (a user not registered at the current server).
 #: lib/command.php:474
 #, php-format
@@ -4008,13 +3666,6 @@ msgstr ""
 msgid "Message too long - maximum is %1$d characters, you sent %2$d."
 msgstr ""
 
-#. 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:554
-#, php-format
-msgid "Notice from %s repeated."
-msgstr ""
-
 #. TRANS: Error text shown when repeating a notice fails with an unknown reason.
 #: lib/command.php:557
 msgid "Error repeating notice."
@@ -4032,9 +3683,11 @@ msgstr ""
 msgid "Specify the name of the user to subscribe to."
 msgstr ""
 
-#. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
-#: lib/command.php:664
-msgid "Can't subscribe to OMB profiles by command."
+#. TRANS: Text shown after having subscribed to another user successfully.
+#. TRANS: %s is the name of the user the subscription was requested for.
+#: lib/command.php:672
+#, php-format
+msgid "Subscribed to %s."
 msgstr ""
 
 #. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
@@ -4043,6 +3696,13 @@ msgstr ""
 msgid "Specify the name of the user to unsubscribe from."
 msgstr ""
 
+#. TRANS: Text shown after having unsubscribed from another user successfully.
+#. TRANS: %s is the name of the user the unsubscription was requested for.
+#: lib/command.php:705
+#, php-format
+msgid "Unsubscribed from %s."
+msgstr ""
+
 #. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
 #. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
 #: lib/command.php:724 lib/command.php:750
@@ -4071,8 +3731,15 @@ msgstr ""
 msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr ""
 
+#. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
+#. TRANS: %s is the name of the user the unsubscription was requested for.
+#: lib/command.php:813
+#, php-format
+msgid "Unsubscribed %s."
+msgstr ""
+
 #. TRANS: Text shown after requesting other users a user is subscribed to.
-#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.
 #: lib/command.php:836
 msgid "You are subscribed to this person:"
@@ -4080,7 +3747,7 @@ msgid_plural "You are subscribed to these people:"
 msgstr[0] "Bize o profili yollamadÄ±nÄ±z"
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
-#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
 #: lib/command.php:863
 msgid "This person is subscribed to you:"
@@ -4088,13 +3755,14 @@ msgid_plural "These people are subscribed to you:"
 msgstr[0] "Uzaktan abonelik"
 
 #. TRANS: Text shown after requesting groups a user is subscribed to.
-#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
 #: lib/command.php:890
 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"
 
+#. TRANS: Help text for commands.
 #: lib/command.php:905
 msgid ""
 "Commands:\n"
@@ -4161,6 +3829,10 @@ msgstr ""
 msgid "Updates by SMS"
 msgstr ""
 
+#: lib/connectsettingsaction.php:121
+msgid "Authorized connected applications"
+msgstr ""
+
 #: lib/dberroraction.php:60
 msgid "Database error"
 msgstr ""
@@ -4226,49 +3898,38 @@ msgstr ""
 msgid "Grant this user the \"%s\" role"
 msgstr ""
 
-#: lib/groupeditform.php:168
-msgid "Describe the group or topic"
-msgstr ""
-
-#: lib/groupeditform.php:170
-#, php-format
-msgid "Describe the group or topic in %d characters"
-msgstr ""
-
 #: lib/groupeditform.php:187
 #, php-format
 msgid "Extra nicknames for the group, comma- or space- separated, max %d"
 msgstr ""
 
-#: lib/groupnav.php:85
+#. TRANS: Menu item in the group navigation page.
+#: lib/groupnav.php:86
+msgctxt "MENU"
 msgid "Group"
 msgstr ""
 
-#: lib/groupnav.php:101
-msgid "Blocked"
-msgstr ""
-
-#: lib/groupnav.php:102
-#, php-format
-msgid "%s blocked users"
-msgstr ""
-
-#: lib/groupnav.php:108
+#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
+#. TRANS: %s is the nickname of the group.
+#: lib/groupnav.php:120
 #, php-format
+msgctxt "TOOLTIP"
 msgid "Edit %s group properties"
 msgstr ""
 
-#: lib/groupnav.php:113
-msgid "Logo"
-msgstr "GiriÅ"
-
-#: lib/groupnav.php:114
+#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
+#. TRANS: %s is the nickname of the group.
+#: lib/groupnav.php:129
 #, php-format
+msgctxt "TOOLTIP"
 msgid "Add or edit %s logo"
 msgstr ""
 
-#: lib/groupnav.php:120
+#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
+#. TRANS: %s is the nickname of the group.
+#: lib/groupnav.php:138
 #, php-format
+msgctxt "TOOLTIP"
 msgid "Add or edit %s design"
 msgstr ""
 
@@ -4298,7 +3959,8 @@ msgstr "Desteklenmeyen gÃ¶rÃ¼ntÃ¼ dosyasÄ± biÃ§emi."
 msgid "Partial upload."
 msgstr "KÄ±smi yÃ¼kleme."
 
-#: lib/imagefile.php:101 lib/mediafile.php:170
+#. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
+#: lib/imagefile.php:101 lib/mediafile.php:179
 msgid "System error uploading file."
 msgstr "Dosya yÃ¼klemede sistem hatasÄ±."
 
@@ -4328,10 +3990,6 @@ msgstr ""
 msgid "Unknown inbox source %d."
 msgstr ""
 
-#: lib/logingroupnav.php:86
-msgid "Sign up for a new account"
-msgstr ""
-
 #. TRANS: Subject for address confirmation email
 #: lib/mail.php:174
 msgid "Email address confirmation"
@@ -4368,22 +4026,6 @@ msgid ""
 "your subscribers list and report as spam to site administrators at %s"
 msgstr ""
 
-#. TRANS: Main body of new-subscriber notification e-mail
-#: lib/mail.php:254
-#, php-format
-msgid ""
-"%1$s is now listening to your notices on %2$s.\n"
-"\n"
-"\t%3$s\n"
-"\n"
-"%4$s%5$s%6$s\n"
-"Faithfully yours,\n"
-"%7$s.\n"
-"\n"
-"----\n"
-"Change your email address or notification options at %8$s\n"
-msgstr ""
-
 #. TRANS: Body of notification mail for new posting email address
 #: lib/mail.php:308
 #, php-format
@@ -4459,12 +4101,6 @@ msgid ""
 "%5$s\n"
 msgstr ""
 
-#. TRANS: Subject for favorite notification email
-#: lib/mail.php:589
-#, php-format
-msgid "%s (@%s) added your notice as a favorite"
-msgstr ""
-
 #. TRANS: Body for favorite notification email
 #: lib/mail.php:592
 #, php-format
@@ -4547,56 +4183,69 @@ msgstr ""
 msgid "Sorry, no incoming email allowed."
 msgstr ""
 
-#: lib/mediafile.php:98 lib/mediafile.php:123
+#. TRANS: Client exception thrown when a database error was thrown during a file upload operation.
+#: lib/mediafile.php:99 lib/mediafile.php:125
 msgid "There was a database error while saving your file. Please try again."
 msgstr ""
 
-#: lib/mediafile.php:142
+#. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
+#: lib/mediafile.php:145
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
 msgstr ""
 
-#: lib/mediafile.php:147
+#. TRANS: Client exception.
+#: lib/mediafile.php:151
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form."
 msgstr ""
 
-#: lib/mediafile.php:152
+#. TRANS: Client exception.
+#: lib/mediafile.php:157
 msgid "The uploaded file was only partially uploaded."
 msgstr ""
 
-#: lib/mediafile.php:159
+#. TRANS: Client exception thrown when a temporary folder is not present to store a file upload.
+#: lib/mediafile.php:165
 msgid "Missing a temporary folder."
 msgstr ""
 
-#: lib/mediafile.php:162
+#. TRANS: Client exception thrown when writing to disk is not possible during a file upload operation.
+#: lib/mediafile.php:169
 msgid "Failed to write file to disk."
 msgstr ""
 
-#: lib/mediafile.php:165
+#. TRANS: Client exception thrown when a file upload operation has been stopped by an extension.
+#: lib/mediafile.php:173
 msgid "File upload stopped by extension."
 msgstr ""
 
-#: lib/mediafile.php:179 lib/mediafile.php:217
+#. TRANS: Client exception thrown when a file upload operation would cause a user to exceed a set quota.
+#: lib/mediafile.php:189 lib/mediafile.php:232
 msgid "File exceeds user's quota."
 msgstr ""
 
-#: lib/mediafile.php:197 lib/mediafile.php:234
+#. TRANS: Client exception thrown when a file upload operation fails because the file could
+#. TRANS: not be moved from the temporary folder to the permanent file location.
+#: lib/mediafile.php:209 lib/mediafile.php:251
 msgid "File could not be moved to destination directory."
 msgstr ""
 
-#: lib/mediafile.php:202 lib/mediafile.php:238
-msgid "Could not determine file's MIME type."
-msgstr ""
-
-#: lib/mediafile.php:318
+#. TRANS: Client exception thrown trying to upload a forbidden MIME type.
+#. TRANS: %1$s is the file type that was denied, %2$s is the application part of
+#. TRANS: the MIME type that was denied.
+#: lib/mediafile.php:340
 #, php-format
-msgid " Try using another %s format."
+msgid ""
+"\"%1$s\" is not a supported file type on this server. Try using another %2$s "
+"format."
 msgstr ""
 
-#: lib/mediafile.php:323
+#. TRANS: Client exception thrown trying to upload a forbidden MIME type.
+#. TRANS: %s is the file type that was denied.
+#: lib/mediafile.php:345
 #, php-format
-msgid "%s is not a supported file type on this server."
+msgid "\"%s\" is not a supported file type on this server."
 msgstr ""
 
 #: lib/messageform.php:120
@@ -4607,11 +4256,6 @@ msgstr ""
 msgid "To"
 msgstr ""
 
-#: lib/messageform.php:178 lib/noticeform.php:237
-msgctxt "Send button for sending notice"
-msgid "Send"
-msgstr ""
-
 #: lib/noticeform.php:174
 #, php-format
 msgid "What's up, %s?"
@@ -4625,10 +4269,6 @@ msgstr ""
 msgid "Attach a file"
 msgstr ""
 
-#: lib/noticeform.php:213
-msgid "Share my location"
-msgstr ""
-
 #: lib/noticeform.php:217
 msgid ""
 "Sorry, retrieving your geo location is taking longer than expected, please "
@@ -4676,27 +4316,19 @@ msgstr ""
 msgid "Reply"
 msgstr "Cevaplar"
 
+#: lib/nudgeform.php:116
+msgid "Nudge this user"
+msgstr ""
+
 #: lib/nudgeform.php:128
 msgid "Nudge"
 msgstr ""
 
-#: lib/oauthstore.php:283
-msgid "Error inserting new profile"
-msgstr "Yeni profil eklemede hata oluÅtu"
-
-#: lib/oauthstore.php:291
-msgid "Error inserting avatar"
-msgstr "Avatar eklemede hata oluÅtu"
-
-#: lib/oauthstore.php:306
-msgid "Error updating remote profile"
-msgstr "Uzaktaki profili gÃ¼ncellemede hata oluÅtu"
-
-#: lib/oauthstore.php:311
-msgid "Error inserting remote profile"
-msgstr "Uzak profil eklemede hata oluÅtu"
+#: lib/nudgeform.php:128
+msgid "Send a nudge to this user"
+msgstr ""
 
-#: lib/oauthstore.php:490
+#: lib/oauthstore.php:491
 msgid "Couldn't insert new subscription."
 msgstr "Yeni abonelik eklenemedi."
 
@@ -4733,7 +4365,8 @@ msgstr ""
 msgid "Tags in %s's notices"
 msgstr ""
 
-#: lib/plugin.php:115
+#. TRANS: Displayed as version information for a plugin if no version information was found.
+#: lib/plugin.php:116
 msgid "Unknown"
 msgstr ""
 
@@ -4782,19 +4415,14 @@ msgstr ""
 msgid "Recent tags"
 msgstr ""
 
-#: lib/redirectingaction.php:95
-msgid "No return-to arguments."
+#: lib/publicgroupnav.php:88
+msgid "Featured"
 msgstr ""
 
 #: lib/repeatform.php:132
 msgid "Yes"
 msgstr ""
 
-#: lib/revokeroleform.php:91
-#, php-format
-msgid "Revoke the \"%s\" role from this user"
-msgstr ""
-
 #: lib/router.php:709
 msgid "No single user defined for single-user mode."
 msgstr ""
@@ -4803,14 +4431,12 @@ msgstr ""
 msgid "Sandbox"
 msgstr ""
 
-#: lib/searchaction.php:126
+#. TRANS: Used as a field label for the field where one or more keywords
+#. TRANS: for searching can be entered.
+#: lib/searchaction.php:129
 msgid "Keyword(s)"
 msgstr ""
 
-#: lib/searchaction.php:127
-msgid "Search"
-msgstr "Ara"
-
 #: lib/searchgroupnav.php:81
 msgid "Find people on this site"
 msgstr ""
@@ -4831,10 +4457,6 @@ msgstr ""
 msgid "More..."
 msgstr ""
 
-#: lib/silenceform.php:67
-msgid "Silence"
-msgstr ""
-
 #: lib/subgroupnav.php:99
 #, php-format
 msgid "Groups %s is a member of"
@@ -4915,6 +4537,10 @@ msgstr ""
 msgid "Unsubscribe"
 msgstr "AboneliÄi sonlandÄ±r"
 
+#: lib/userprofile.php:234 lib/userprofile.php:248
+msgid "User actions"
+msgstr ""
+
 #: lib/userprofile.php:237
 msgid "User deletion in progress..."
 msgstr ""
@@ -4946,56 +4572,32 @@ msgid "Moderator"
 msgstr ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1102
+#: lib/util.php:1103
 msgid "a few seconds ago"
 msgstr "birkaÃ§ saniye Ã¶nce"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1105
+#: lib/util.php:1106
 msgid "about a minute ago"
 msgstr "yaklaÅÄ±k bir dakika Ã¶nce"
 
-#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1109
-#, php-format
-msgid "about %d minutes ago"
-msgstr "yaklaÅÄ±k %d dakika Ã¶nce"
-
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 #: lib/util.php:1112
 msgid "about an hour ago"
 msgstr "yaklaÅÄ±k bir saat Ã¶nce"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1116
-#, php-format
-msgid "about %d hours ago"
-msgstr "yaklaÅÄ±k %d saat Ã¶nce"
-
-#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1119
+#: lib/util.php:1118
 msgid "about a day ago"
 msgstr "yaklaÅÄ±k bir gÃ¼n Ã¶nce"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1123
-#, php-format
-msgid "about %d days ago"
-msgstr "yaklaÅÄ±k %d gÃ¼n Ã¶nce"
-
-#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1126
+#: lib/util.php:1124
 msgid "about a month ago"
 msgstr "yaklaÅÄ±k bir ay Ã¶nce"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 #: lib/util.php:1130
-#, php-format
-msgid "about %d months ago"
-msgstr "yaklaÅÄ±k %d ay Ã¶nce"
-
-#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1133
 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 de3b519668..2a3d54b7a2 100644
--- a/locale/uk/LC_MESSAGES/statusnet.po
+++ b/locale/uk/LC_MESSAGES/statusnet.po
@@ -1,9 +1,10 @@
-# Translation of StatusNet to Ukrainian
+# Translation of StatusNet to Ukrainian (Ð£ÐºÑÐ°ÑÐ½ÑÑÐºÐ°)
+# Expored from translatewiki.net
 #
-# Author@translatewiki.net: AS
-# Author@translatewiki.net: Boogie
-# Author@translatewiki.net: Prima klasy4na
-# Author@translatewiki.net: Ð¢ÐµÑÑ
+# Author: AS
+# Author: Boogie
+# Author: Prima klasy4na
+# Author: Ð¢ÐµÑÑ
 # --
 # This file is distributed under the same license as the StatusNet package.
 #
@@ -11,21 +12,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-08 22:33+0000\n"
-"PO-Revision-Date: 2010-09-08 22:35:39+0000\n"
-"Language-Team: Ukrainian\n"
+"POT-Creation-Date: 2010-09-14 19:53+0000\n"
+"PO-Revision-Date: 2010-09-14 19:54:23+0000\n"
+"Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r72348); Translate extension (2010-08-20)\n"
+"X-Generator: MediaWiki 1.17alpha (r73009); Translate extension (2010-08-20)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
-"X-Message-Group: out-statusnet\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
-"10< =4 && (n%100<10 or n%100>=20) ? 1 : 2);\n"
+"X-Message-Group: #out-statusnet\n"
+"Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
+"2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
+"X-POT-Import-Date: 1284-49-16 34::+0000\n"
 
 #. TRANS: Page title
 #. TRANS: Menu item for site administration
-#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:376
+#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:363
 msgid "Access"
 msgstr "ÐÐ¾Ð³Ð¾Ð´Ð¸ÑÐ¸ÑÑ"
 
@@ -80,10 +82,10 @@ 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 actions/emailsettings.php:224
-#: actions/imsettings.php:184 actions/smssettings.php:209
-#: lib/applicationeditform.php:361
+#. TRANS: Button label in the "Edit application" form.
+#: actions/accessadminpanel.php:203 actions/emailsettings.php:228
+#: actions/imsettings.php:187 actions/smssettings.php:209
+#: lib/applicationeditform.php:351
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "ÐÐ±ÐµÑÐµÐ³ÑÐ¸"
@@ -96,15 +98,15 @@ msgstr "ÐÐµÐ¼Ð°Ñ ÑÐ°ÐºÐ¾Ñ ÑÑÐ¾ÑÑÐ½ÐºÐ¸."
 
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #: actions/all.php:79 actions/allrss.php:68
-#: actions/apiaccountupdatedeliverydevice.php:114
-#: actions/apiaccountupdateprofile.php:105
-#: actions/apiaccountupdateprofilebackgroundimage.php:116
-#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
-#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
-#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:113
-#: actions/apigroupismember.php:91 actions/apigroupjoin.php:100
-#: actions/apigroupleave.php:100 actions/apigrouplist.php:73
-#: actions/apistatusesupdate.php:229 actions/apisubscriptions.php:87
+#: actions/apiaccountupdatedeliverydevice.php:115
+#: actions/apiaccountupdateprofile.php:106
+#: actions/apiaccountupdateprofilebackgroundimage.php:117
+#: actions/apiaccountupdateprofileimage.php:106 actions/apiblockcreate.php:98
+#: actions/apiblockdestroy.php:97 actions/apidirectmessage.php:77
+#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:114
+#: actions/apigroupismember.php:91 actions/apigroupjoin.php:101
+#: actions/apigroupleave.php:101 actions/apigrouplist.php:73
+#: actions/apistatusesupdate.php:230 actions/apisubscriptions.php:87
 #: actions/apitimelinefavorites.php:72 actions/apitimelinefriends.php:174
 #: actions/apitimelinehome.php:80 actions/apitimelinementions.php:80
 #: actions/apitimelineuser.php:82 actions/avatarbynickname.php:75
@@ -202,16 +204,16 @@ msgid "Updates from %1$s and friends on %2$s!"
 msgstr "ÐÐ½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð²ÑÐ´ %1$s ÑÐ° Ð´ÑÑÐ·ÑÐ² Ð½Ð° %2$s!"
 
 #: actions/apiaccountratelimitstatus.php:72
-#: actions/apiaccountupdatedeliverydevice.php:94
-#: actions/apiaccountupdateprofile.php:97
-#: actions/apiaccountupdateprofilebackgroundimage.php:94
-#: actions/apiaccountupdateprofilecolors.php:118
+#: actions/apiaccountupdatedeliverydevice.php:95
+#: actions/apiaccountupdateprofile.php:98
+#: actions/apiaccountupdateprofilebackgroundimage.php:95
+#: actions/apiaccountupdateprofilecolors.php:119
 #: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156
-#: actions/apifavoritecreate.php:100 actions/apifavoritedestroy.php:101
-#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100
-#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:139
-#: actions/apigroupismember.php:115 actions/apigroupjoin.php:156
-#: actions/apigroupleave.php:142 actions/apigrouplist.php:137
+#: actions/apifavoritecreate.php:101 actions/apifavoritedestroy.php:102
+#: actions/apifriendshipscreate.php:101 actions/apifriendshipsdestroy.php:101
+#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:140
+#: actions/apigroupismember.php:115 actions/apigroupjoin.php:157
+#: actions/apigroupleave.php:143 actions/apigrouplist.php:137
 #: actions/apigrouplistall.php:122 actions/apigroupmembership.php:107
 #: actions/apigroupshow.php:116 actions/apihelptest.php:88
 #: actions/apistatusesdestroy.php:104 actions/apistatusesretweets.php:112
@@ -226,48 +228,50 @@ msgstr "ÐÐ½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð²ÑÐ´ %1$s ÑÐ° Ð´ÑÑÐ·ÑÐ² Ð½Ð° %2$s!"
 msgid "API method not found."
 msgstr "API Ð¼ÐµÑÐ¾Ð´ Ð½Ðµ Ð·Ð½Ð°Ð¹Ð´ÐµÐ½Ð¾."
 
-#: actions/apiaccountupdatedeliverydevice.php:86
-#: actions/apiaccountupdateprofile.php:89
-#: actions/apiaccountupdateprofilebackgroundimage.php:86
-#: actions/apiaccountupdateprofilecolors.php:110
-#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89
-#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109
-#: actions/apifavoritecreate.php:91 actions/apifavoritedestroy.php:92
-#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
-#: actions/apigroupcreate.php:105 actions/apigroupjoin.php:92
-#: actions/apigroupleave.php:92 actions/apimediaupload.php:67
-#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:198
+#. TRANS: Client error message. POST is a HTTP command. It should not be translated.
+#. TRANS: Client error. POST is a HTTP command. It should not be translated.
+#: actions/apiaccountupdatedeliverydevice.php:87
+#: actions/apiaccountupdateprofile.php:90
+#: actions/apiaccountupdateprofilebackgroundimage.php:87
+#: actions/apiaccountupdateprofilecolors.php:111
+#: actions/apiaccountupdateprofileimage.php:85 actions/apiblockcreate.php:90
+#: actions/apiblockdestroy.php:89 actions/apidirectmessagenew.php:110
+#: actions/apifavoritecreate.php:92 actions/apifavoritedestroy.php:93
+#: actions/apifriendshipscreate.php:92 actions/apifriendshipsdestroy.php:92
+#: actions/apigroupcreate.php:106 actions/apigroupjoin.php:93
+#: actions/apigroupleave.php:93 actions/apimediaupload.php:68
+#: actions/apistatusesretweet.php:66 actions/apistatusesupdate.php:199
 msgid "This method requires a POST."
 msgstr "Ð¦ÐµÐ¹ Ð¼ÐµÑÐ¾Ð´ Ð¿Ð¾ÑÑÐµÐ±ÑÑ POST."
 
-#: actions/apiaccountupdatedeliverydevice.php:106
+#: actions/apiaccountupdatedeliverydevice.php:107
 msgid ""
 "You must specify a parameter named 'device' with a value of one of: sms, im, "
 "none."
 msgstr ""
 "ÐÐ¸ Ð¼ÑÑÐ¸ÑÐµ Ð²ÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÐ¸ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑ Â«deviceÂ» Ð· Ð¾Ð´Ð½Ð¸Ð¼ Ð·Ñ Ð·Ð½Ð°ÑÐµÐ½Ñ: sms, im, none."
 
-#: actions/apiaccountupdatedeliverydevice.php:133
+#: actions/apiaccountupdatedeliverydevice.php:134
 msgid "Could not update user."
 msgstr "ÐÐµ Ð²Ð´Ð°Ð»Ð¾ÑÑ Ð¾Ð½Ð¾Ð²Ð¸ÑÐ¸ ÐºÐ¾ÑÐ¸ÑÑÑÐ²Ð°ÑÐ°."
 
-#: actions/apiaccountupdateprofile.php:112
-#: actions/apiaccountupdateprofilebackgroundimage.php:194
-#: actions/apiaccountupdateprofilecolors.php:185
-#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/apiaccountupdateprofile.php:113
+#: actions/apiaccountupdateprofilebackgroundimage.php:195
+#: actions/apiaccountupdateprofilecolors.php:186
+#: actions/apiaccountupdateprofileimage.php:131 actions/apiusershow.php:108
 #: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/hcard.php:74
 #: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
 #: lib/profileaction.php:84
 msgid "User has no profile."
 msgstr "ÐÐ¾ÑÐ¸ÑÑÑÐ²Ð°Ñ Ð½Ðµ Ð¼Ð°Ñ Ð¿ÑÐ¾ÑÑÐ»Ñ."
 
-#: actions/apiaccountupdateprofile.php:147
+#: actions/apiaccountupdateprofile.php:148
 msgid "Could not save profile."
 msgstr "ÐÐµ Ð²Ð´Ð°Ð»Ð¾ÑÑ Ð·Ð±ÐµÑÐµÐ³ÑÐ¸ Ð¿ÑÐ¾ÑÑÐ»Ñ."
 
-#: actions/apiaccountupdateprofilebackgroundimage.php:108
-#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
-#: actions/apistatusesupdate.php:212 actions/avatarsettings.php:257
+#: actions/apiaccountupdateprofilebackgroundimage.php:109
+#: actions/apiaccountupdateprofileimage.php:98 actions/apimediaupload.php:81
+#: actions/apistatusesupdate.php:213 actions/avatarsettings.php:257
 #: actions/designadminpanel.php:123 actions/editapplication.php:118
 #: actions/newapplication.php:101 actions/newnotice.php:94
 #: lib/designsettings.php:283
@@ -279,30 +283,30 @@ msgstr ""
 "Ð¡ÐµÑÐ²ÐµÑ Ð½ÐµÐ·Ð´Ð°ÑÐµÐ½ Ð¾Ð±ÑÐ¾Ð±Ð¸ÑÐ¸ ÑÐ°ÐºÑ ÐºÑÐ»ÑÐºÑÑÑÑ Ð´Ð°Ð½Ð¸Ñ (%s Ð±Ð°Ð¹ÑÑÐ²) Ð·Ð° Ð¿Ð¾ÑÐ¾ÑÐ½Ð¾Ñ "
 "ÐºÐ¾Ð½ÑÑÐ³ÑÑÐ°ÑÑÑ."
 
-#: actions/apiaccountupdateprofilebackgroundimage.php:136
-#: actions/apiaccountupdateprofilebackgroundimage.php:146
-#: actions/apiaccountupdateprofilecolors.php:164
-#: actions/apiaccountupdateprofilecolors.php:174
+#: actions/apiaccountupdateprofilebackgroundimage.php:137
+#: actions/apiaccountupdateprofilebackgroundimage.php:147
+#: actions/apiaccountupdateprofilecolors.php:165
+#: actions/apiaccountupdateprofilecolors.php:175
 #: actions/groupdesignsettings.php:290 actions/groupdesignsettings.php:300
 #: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
 #: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
 msgid "Unable to save your design settings."
 msgstr "ÐÐµ Ð¼Ð°Ñ Ð¼Ð¾Ð¶Ð»Ð¸Ð²Ð¾ÑÑÑ Ð·Ð±ÐµÑÐµÐ³ÑÐ¸ Ð½Ð°Ð»Ð°ÑÑÑÐ²Ð°Ð½Ð½Ñ Ð´Ð¸Ð·Ð°Ð¹Ð½Ñ."
 
-#: actions/apiaccountupdateprofilebackgroundimage.php:187
-#: actions/apiaccountupdateprofilecolors.php:142
+#: actions/apiaccountupdateprofilebackgroundimage.php:188
+#: actions/apiaccountupdateprofilecolors.php:143
 msgid "Could not update your design."
 msgstr "ÐÐµ Ð²Ð´Ð°Ð»Ð¾ÑÑ Ð¾Ð½Ð¾Ð²Ð¸ÑÐ¸ ÐÐ°Ñ Ð´Ð¸Ð·Ð°Ð¹Ð½."
 
-#: actions/apiblockcreate.php:105
+#: actions/apiblockcreate.php:106
 msgid "You cannot block yourself!"
 msgstr "ÐÐ¸ Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑÐµ Ð±Ð»Ð¾ÐºÑÐ²Ð°ÑÐ¸ ÑÐ°Ð¼Ð¾Ð³Ð¾ ÑÐµÐ±Ðµ!"
 
-#: actions/apiblockcreate.php:126
+#: actions/apiblockcreate.php:127
 msgid "Block user failed."
 msgstr "Ð¡Ð¿ÑÐ¾Ð±Ð° Ð·Ð°Ð±Ð»Ð¾ÐºÑÐ²Ð°ÑÐ¸ ÐºÐ¾ÑÐ¸ÑÑÑÐ²Ð°ÑÐ° Ð½ÐµÐ²Ð´Ð°Ð»Ð°."
 
-#: actions/apiblockdestroy.php:114
+#: actions/apiblockdestroy.php:115
 msgid "Unblock user failed."
 msgstr "Ð¡Ð¿ÑÐ¾Ð±Ð° ÑÐ¾Ð·Ð±Ð»Ð¾ÐºÑÐ²Ð°ÑÐ¸ ÐºÐ¾ÑÐ¸ÑÑÑÐ²Ð°ÑÐ° Ð½ÐµÐ²Ð´Ð°Ð»Ð°."
 
@@ -326,60 +330,60 @@ msgstr "ÐÑÑÐ¼Ðµ Ð¿Ð¾Ð²ÑÐ´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð´Ð¾ %s"
 msgid "All the direct messages sent to %s"
 msgstr "ÐÑÑ Ð¿ÑÑÐ¼Ñ Ð¿Ð¾Ð²ÑÐ´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð½Ð°Ð´ÑÑÐ»Ð°Ð½Ñ Ð´Ð¾ %s"
 
-#: actions/apidirectmessagenew.php:118
+#: actions/apidirectmessagenew.php:119
 msgid "No message text!"
 msgstr "ÐÐ¾Ð²ÑÐ´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð±ÐµÐ· ÑÐµÐºÑÑÑ!"
 
-#: actions/apidirectmessagenew.php:127 actions/newmessage.php:150
+#: actions/apidirectmessagenew.php:128 actions/newmessage.php:150
 #, php-format
 msgid "That's too long. Max message size is %d chars."
 msgstr "ÐÐ°Ð´ÑÐ¾ Ð´Ð¾Ð²Ð³Ð¾. ÐÐ°ÐºÑÐ¸Ð¼Ð°Ð»ÑÐ½Ð¸Ð¹ ÑÐ¾Ð·Ð¼ÑÑ %d Ð·Ð½Ð°ÐºÑÐ²."
 
-#: actions/apidirectmessagenew.php:138
+#: actions/apidirectmessagenew.php:139
 msgid "Recipient user not found."
 msgstr "ÐÑÑÐ¸Ð¼ÑÐ²Ð°ÑÐ° Ð½Ðµ Ð·Ð½Ð°Ð¹Ð´ÐµÐ½Ð¾."
 
-#: actions/apidirectmessagenew.php:142
+#: actions/apidirectmessagenew.php:143
 msgid "Can't send direct messages to users who aren't your friend."
 msgstr ""
 "ÐÐµ Ð¼Ð¾Ð¶Ð½Ð° Ð½Ð°Ð´ÑÑÐ»Ð°ÑÐ¸ Ð¿ÑÑÐ¼Ðµ Ð¿Ð¾Ð²ÑÐ´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ ÐºÐ¾ÑÐ¸ÑÑÑÐ²Ð°ÑÐµÐ²Ñ, ÑÐºÐ¸Ð¹ Ð½Ðµ Ñ ÐÐ°ÑÐ¸Ð¼ Ð´ÑÑÐ³Ð¾Ð¼."
 
-#: actions/apifavoritecreate.php:109 actions/apifavoritedestroy.php:110
+#: actions/apifavoritecreate.php:110 actions/apifavoritedestroy.php:111
 #: actions/apistatusesdestroy.php:121
 msgid "No status found with that ID."
 msgstr "ÐÐ¾Ð´Ð½Ð¸Ñ ÑÑÐ°ÑÑÑÑÐ² Ð· ÑÐ°ÐºÐ¸Ð¼ ID."
 
-#: actions/apifavoritecreate.php:120
+#: actions/apifavoritecreate.php:121
 msgid "This status is already a favorite."
 msgstr "Ð¦ÐµÐ¹ ÑÑÐ°ÑÑÑ Ð²Ð¶Ðµ Ñ Ð¾Ð±ÑÐ°Ð½Ð¸Ð¼."
 
 #. TRANS: Error message text shown when a favorite could not be set.
-#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:296
+#: actions/apifavoritecreate.php:132 actions/favor.php:84 lib/command.php:296
 msgid "Could not create favorite."
 msgstr "ÐÐµ Ð¼Ð¾Ð¶Ð½Ð° Ð¿Ð¾Ð·Ð½Ð°ÑÐ¸ÑÐ¸ ÑÐº Ð¾Ð±ÑÐ°Ð½Ðµ."
 
-#: actions/apifavoritedestroy.php:123
+#: actions/apifavoritedestroy.php:124
 msgid "That status is not a favorite."
 msgstr "Ð¦ÐµÐ¹ ÑÑÐ°ÑÑÑ Ð½Ðµ Ñ Ð¾Ð±ÑÐ°Ð½Ð¸Ð¼."
 
-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
+#: actions/apifavoritedestroy.php:136 actions/disfavor.php:87
 msgid "Could not delete favorite."
 msgstr "ÐÐµ Ð¼Ð¾Ð¶Ð½Ð° Ð²Ð¸Ð´Ð°Ð»Ð¸ÑÐ¸ Ð·Ñ ÑÐ¿Ð¸ÑÐºÑ Ð¾Ð±ÑÐ°Ð½Ð¸Ñ."
 
-#: actions/apifriendshipscreate.php:109
+#: actions/apifriendshipscreate.php:110
 msgid "Could not follow user: profile not found."
 msgstr "ÐÐµ Ð²Ð´Ð°Ð»Ð¾ÑÑ Ð´Ð¾Ð´Ð°ÑÐ¸ ÐºÐ¾ÑÐ¸ÑÑÑÐ²Ð°ÑÐ°: ÐºÐ¾ÑÐ¸ÑÑÑÐ²Ð°ÑÐ° Ð½Ðµ Ð·Ð½Ð°Ð¹Ð´ÐµÐ½Ð¾."
 
-#: actions/apifriendshipscreate.php:118
+#: actions/apifriendshipscreate.php:119
 #, php-format
 msgid "Could not follow user: %s is already on your list."
 msgstr "ÐÐµ Ð²Ð´Ð°Ð»Ð¾ÑÑ Ð´Ð¾Ð´Ð°ÑÐ¸ ÐºÐ¾ÑÐ¸ÑÑÑÐ²Ð°ÑÐ°: %s Ð²Ð¶Ðµ Ð¿ÑÐ¸ÑÑÑÐ½ÑÐ¹ Ñ ÐÐ°ÑÐ¾Ð¼Ñ ÑÐ¿Ð¸ÑÐºÑ."
 
-#: actions/apifriendshipsdestroy.php:109
+#: actions/apifriendshipsdestroy.php:110
 msgid "Could not unfollow user: User not found."
 msgstr "ÐÐµ Ð²Ð´Ð°Ð»Ð¾ÑÑ Ð²ÑÐ´Ð¼ÑÐ½Ð¸ÑÐ¸ Ð¿ÑÐ´Ð¿Ð¸ÑÐºÑ: ÐºÐ¾ÑÐ¸ÑÑÑÐ²Ð°ÑÐ° Ð½Ðµ Ð·Ð½Ð°Ð¹Ð´ÐµÐ½Ð¾."
 
-#: actions/apifriendshipsdestroy.php:120
+#: actions/apifriendshipsdestroy.php:121
 msgid "You cannot unfollow yourself."
 msgstr "ÐÐ¸ Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑÐµ Ð²ÑÐ´Ð¿Ð¸ÑÐ°ÑÐ¸ÑÑ Ð²ÑÐ´ ÑÐ°Ð¼Ð¾Ð³Ð¾ ÑÐµÐ±Ðµ."
 
@@ -395,7 +399,7 @@ msgstr "ÐÐµ Ð²Ð´Ð°Ð»Ð¾ÑÑ Ð²ÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÐ¸ Ð´Ð¶ÐµÑÐµÐ»Ð¾ ÐºÐ¾ÑÐ¸ÑÑÑÐ²
 msgid "Could not find target user."
 msgstr "ÐÐµ Ð²Ð´Ð°Ð»Ð¾ÑÑ Ð·Ð½Ð°Ð¹ÑÐ¸ ÑÑÐ»ÑÐ¾Ð²Ð¾Ð³Ð¾ ÐºÐ¾ÑÐ¸ÑÑÑÐ²Ð°ÑÐ°."
 
-#: actions/apigroupcreate.php:167 actions/editgroup.php:186
+#: actions/apigroupcreate.php:168 actions/editgroup.php:186
 #: actions/newgroup.php:126 actions/profilesettings.php:215
 #: actions/register.php:212
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
@@ -403,95 +407,95 @@ msgstr ""
 "ÐÐ¼âÑ ÐºÐ¾ÑÐ¸ÑÑÑÐ²Ð°ÑÐ° Ð¿Ð¾Ð²Ð¸Ð½Ð½Ð¾ ÑÐºÐ»Ð°Ð´Ð°ÑÐ¸ÑÑ Ð· Ð»ÑÑÐµÑ Ð½Ð¸Ð¶Ð½ÑÐ¾Ð³Ð¾ ÑÐµÐ³ÑÑÑÑÑ Ñ ÑÐ¸ÑÑ, Ð½ÑÑÐºÐ¸Ñ "
 "ÑÐ½ÑÐµÑÐ²Ð°Ð»ÑÐ²."
 
-#: actions/apigroupcreate.php:176 actions/editgroup.php:190
+#: actions/apigroupcreate.php:177 actions/editgroup.php:190
 #: actions/newgroup.php:130 actions/profilesettings.php:238
 #: actions/register.php:215
 msgid "Nickname already in use. Try another one."
 msgstr "Ð¦Ðµ ÑÐ¼âÑ Ð²Ð¶Ðµ Ð²Ð¸ÐºÐ¾ÑÐ¸ÑÑÐ¾Ð²ÑÑÑÑÑÑ. Ð¡Ð¿ÑÐ¾Ð±ÑÐ¹ÑÐµ ÑÐ½ÑÐµ."
 
-#: actions/apigroupcreate.php:183 actions/editgroup.php:193
+#: actions/apigroupcreate.php:184 actions/editgroup.php:193
 #: actions/newgroup.php:133 actions/profilesettings.php:218
 #: actions/register.php:217
 msgid "Not a valid nickname."
 msgstr "Ð¦Ðµ Ð½ÐµÐ´ÑÐ¹ÑÐ½Ðµ ÑÐ¼âÑ ÐºÐ¾ÑÐ¸ÑÑÑÐ²Ð°ÑÐ°."
 
-#: actions/apigroupcreate.php:199 actions/editapplication.php:215
+#: actions/apigroupcreate.php:200 actions/editapplication.php:215
 #: actions/editgroup.php:199 actions/newapplication.php:203
 #: actions/newgroup.php:139 actions/profilesettings.php:222
 #: actions/register.php:224
 msgid "Homepage is not a valid URL."
 msgstr "ÐÐµÐ±-ÑÑÐ¾ÑÑÐ½ÐºÐ° Ð¼Ð°Ñ Ð½ÐµÐ´ÑÐ¹ÑÐ½Ñ URL-Ð°Ð´ÑÐµÑÑ."
 
-#: actions/apigroupcreate.php:208 actions/editgroup.php:202
+#: actions/apigroupcreate.php:209 actions/editgroup.php:202
 #: actions/newgroup.php:142 actions/profilesettings.php:225
 #: actions/register.php:227
 msgid "Full name is too long (max 255 chars)."
 msgstr "ÐÐ¾Ð²Ð½Ðµ ÑÐ¼âÑ Ð·Ð°Ð´Ð¾Ð²Ð³Ðµ (255 Ð·Ð½Ð°ÐºÑÐ² Ð¼Ð°ÐºÑÐ¸Ð¼ÑÐ¼)"
 
-#: actions/apigroupcreate.php:216 actions/editapplication.php:190
+#: actions/apigroupcreate.php:217 actions/editapplication.php:190
 #: actions/newapplication.php:172
 #, php-format
 msgid "Description is too long (max %d chars)."
 msgstr "ÐÐ¿Ð¸Ñ Ð½Ð°Ð´ÑÐ¾ Ð´Ð¾Ð²Ð³Ð¸Ð¹ (%d Ð·Ð½Ð°ÐºÑÐ² Ð¼Ð°ÐºÑÐ¸Ð¼ÑÐ¼)."
 
-#: actions/apigroupcreate.php:227 actions/editgroup.php:208
+#: actions/apigroupcreate.php:228 actions/editgroup.php:208
 #: actions/newgroup.php:148 actions/profilesettings.php:232
 #: actions/register.php:234
 msgid "Location is too long (max 255 chars)."
 msgstr "Ð Ð¾Ð·ÑÐ°ÑÑÐ²Ð°Ð½Ð½Ñ Ð½Ð°Ð´ÑÐ¾ Ð´Ð¾Ð²Ð³Ðµ (255 Ð·Ð½Ð°ÐºÑÐ² Ð¼Ð°ÐºÑÐ¸Ð¼ÑÐ¼)."
 
-#: actions/apigroupcreate.php:246 actions/editgroup.php:219
+#: actions/apigroupcreate.php:247 actions/editgroup.php:219
 #: actions/newgroup.php:159
 #, php-format
 msgid "Too many aliases! Maximum %d."
 msgstr "ÐÐ°Ð±Ð°Ð³Ð°ÑÐ¾ Ð´Ð¾Ð´Ð°ÑÐºÐ¾Ð²Ð¸Ñ ÑÐ¼ÐµÐ½! ÐÐ°ÐºÑÐ¸Ð¼ÑÐ¼ ÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÑ %d."
 
-#: actions/apigroupcreate.php:267
+#: actions/apigroupcreate.php:268
 #, php-format
 msgid "Invalid alias: \"%s\"."
 msgstr "ÐÐ¾Ð¼Ð¸Ð»ÐºÐ¾Ð²Ðµ Ð´Ð¾Ð´Ð°ÑÐºÐ¾Ð²Ðµ ÑÐ¼âÑ: Â«%sÂ»."
 
-#: actions/apigroupcreate.php:276 actions/editgroup.php:232
+#: actions/apigroupcreate.php:277 actions/editgroup.php:232
 #: actions/newgroup.php:172
 #, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr "ÐÐ¾Ð´Ð°ÑÐºÐ¾Ð²Ðµ ÑÐ¼âÑ Â«%sÂ» Ð²Ð¶Ðµ Ð²Ð¸ÐºÐ¾ÑÐ¸ÑÑÐ¾Ð²ÑÑÑÑÑÑ. Ð¡Ð¿ÑÐ¾Ð±ÑÐ¹ÑÐµ ÑÐ½ÑÐµ."
 
-#: actions/apigroupcreate.php:289 actions/editgroup.php:238
+#: actions/apigroupcreate.php:290 actions/editgroup.php:238
 #: actions/newgroup.php:178
 msgid "Alias can't be the same as nickname."
 msgstr "ÐÐ¾Ð´Ð°ÑÐºÐ¾Ð²Ðµ ÑÐ¼âÑ Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ð±ÑÑÐ¸ ÑÐ°ÐºÐ¸Ð¼ ÑÐ°Ð¼Ð¸Ð¼ ÑÐ¾ Ð¹ Ð¾ÑÐ½Ð¾Ð²Ð½Ðµ."
 
-#: actions/apigroupismember.php:96 actions/apigroupjoin.php:105
-#: actions/apigroupleave.php:105 actions/apigroupmembership.php:92
+#: actions/apigroupismember.php:96 actions/apigroupjoin.php:106
+#: actions/apigroupleave.php:106 actions/apigroupmembership.php:92
 #: actions/apigroupshow.php:83 actions/apitimelinegroup.php:92
 msgid "Group not found."
 msgstr "ÐÑÑÐ¿Ñ Ð½Ðµ Ð·Ð½Ð°Ð¹Ð´ÐµÐ½Ð¾."
 
 #. TRANS: Error text shown a user tries to join a group they already are a member of.
-#: actions/apigroupjoin.php:111 actions/joingroup.php:100 lib/command.php:336
+#: actions/apigroupjoin.php:112 actions/joingroup.php:100 lib/command.php:336
 msgid "You are already a member of that group."
 msgstr "ÐÐ¸ Ð²Ð¶Ðµ Ñ ÑÑÐ°ÑÐ½Ð¸ÐºÐ¾Ð¼ ÑÑÑÑ Ð³ÑÑÐ¿Ð¸."
 
 #. TRANS: Error text shown when a user tries to join a group they are blocked from joining.
-#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:341
+#: actions/apigroupjoin.php:121 actions/joingroup.php:105 lib/command.php:341
 msgid "You have been blocked from that group by the admin."
 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.
-#: actions/apigroupjoin.php:139 actions/joingroup.php:134 lib/command.php:353
+#: actions/apigroupjoin.php:140 actions/joingroup.php:134 lib/command.php:353
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "ÐÐµ Ð²Ð´Ð°Ð»Ð¾ÑÑ Ð´Ð¾Ð»ÑÑÐ¸ÑÐ¸ ÐºÐ¾ÑÐ¸ÑÑÑÐ²Ð°ÑÐ° %1$s Ð´Ð¾ Ð³ÑÑÐ¿Ð¸ %2$s."
 
-#: actions/apigroupleave.php:115
+#: actions/apigroupleave.php:116
 msgid "You are not a member of this group."
 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.
-#: actions/apigroupleave.php:125 actions/leavegroup.php:129
+#: actions/apigroupleave.php:126 actions/leavegroup.php:129
 #: lib/command.php:401
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
@@ -521,7 +525,7 @@ msgstr "%s Ð³ÑÑÐ¿Ð¸"
 msgid "groups on %s"
 msgstr "Ð³ÑÑÐ¿Ð¸ Ð½Ð° %s"
 
-#: actions/apimediaupload.php:99
+#: actions/apimediaupload.php:100
 msgid "Upload failed."
 msgstr "ÐÐ±ÑÐ¹ Ð¿ÑÐ¸ Ð·Ð°Ð²Ð°Ð½ÑÐ°Ð¶ÐµÐ½Ð½Ñ."
 
@@ -535,9 +539,9 @@ msgstr "ÐÐµÐ²ÑÑÐ½Ð¸Ð¹ ÑÐ¾ÐºÐµÐ½."
 
 #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
 #: actions/deletenotice.php:169 actions/disfavor.php:74
-#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:55
+#: actions/emailsettings.php:271 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:66 actions/imsettings.php:227
+#: actions/groupunblock.php:66 actions/imsettings.php:230
 #: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
@@ -583,8 +587,8 @@ msgstr "Ð¢Ð¾ÐºÐµÐ½ Ð·Ð°Ð¿Ð¸ÑÑ %s Ð±ÑÐ»Ð¾ ÑÐºÐ°ÑÐ¾Ð²Ð°Ð½Ð¾ Ñ Ð²ÑÐ´ÑÐ¸Ð»Ðµ
 #. 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:286 actions/grouplogo.php:322
-#: actions/imsettings.php:242 actions/newapplication.php:121
+#: actions/emailsettings.php:290 actions/grouplogo.php:322
+#: actions/imsettings.php:245 actions/newapplication.php:121
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
 #: actions/smssettings.php:277 lib/designsettings.php:304
 msgid "Unexpected form submission."
@@ -649,18 +653,18 @@ msgstr "Ð¦ÐµÐ¹ Ð¼ÐµÑÐ¾Ð´ Ð¿Ð¾ÑÑÐµÐ±ÑÑ Ð°Ð±Ð¾ ÐÐÐÐÐ¡ÐÐ¢Ð, Ð°Ð±Ð¾ ÐÐ
 msgid "You may not delete another user's status."
 msgstr "ÐÐ¸ Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑÐµ Ð²Ð¸Ð´Ð°Ð»Ð¸ÑÐ¸ ÑÑÐ°ÑÑÑ ÑÐ½ÑÐ¾Ð³Ð¾ ÐºÐ¾ÑÐ¸ÑÑÑÐ²Ð°ÑÐ°."
 
-#: actions/apistatusesretweet.php:75 actions/apistatusesretweets.php:72
+#: actions/apistatusesretweet.php:76 actions/apistatusesretweets.php:72
 #: actions/deletenotice.php:52 actions/shownotice.php:92
 msgid "No such notice."
 msgstr "Ð¢Ð°ÐºÐ¾Ð³Ð¾ Ð´Ð¾Ð¿Ð¸ÑÑ Ð½ÐµÐ¼Ð°Ñ."
 
 #. TRANS: Error text shown when trying to repeat an own notice.
-#: actions/apistatusesretweet.php:83 lib/command.php:538
+#: actions/apistatusesretweet.php:84 lib/command.php:538
 msgid "Cannot repeat your own notice."
 msgstr "ÐÐµ Ð¼Ð¾Ð¶Ñ Ð¿Ð¾Ð²ÑÐ¾ÑÐ¸ÑÐ¸ ÐÐ°Ñ Ð²Ð»Ð°ÑÐ½Ð¸Ð¹ Ð´Ð¾Ð¿Ð¸Ñ."
 
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-#: actions/apistatusesretweet.php:91 lib/command.php:544
+#: actions/apistatusesretweet.php:92 lib/command.php:544
 msgid "Already repeated that notice."
 msgstr "Ð¦ÐµÐ¹ Ð´Ð¾Ð¿Ð¸Ñ Ð²Ð¶Ðµ Ð¿Ð¾Ð²ÑÐ¾ÑÐµÐ½Ð¾."
 
@@ -672,21 +676,21 @@ msgstr "Ð¡ÑÐ°ÑÑÑ Ð²Ð¸Ð´Ð°Ð»ÐµÐ½Ð¾."
 msgid "No status with that ID found."
 msgstr "ÐÐµ Ð·Ð½Ð°Ð¹Ð´ÐµÐ½Ð¾ Ð¶Ð¾Ð´Ð½Ð¸Ñ ÑÑÐ°ÑÑÑÑÐ² Ð· ÑÐ°ÐºÐ¸Ð¼ ID."
 
-#: actions/apistatusesupdate.php:221
+#: actions/apistatusesupdate.php:222
 msgid "Client must provide a 'status' parameter with a value."
 msgstr "ÐÐ»ÑÑÐ½Ñ Ð¼ÑÑÐ¸ÑÑ Ð½Ð°Ð´Ð°ÑÐ¸ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑ Â«ÑÑÐ°ÑÑÑÂ» Ð·Ñ Ð·Ð½Ð°ÑÐµÐ½Ð½ÑÐ¼."
 
-#: actions/apistatusesupdate.php:242 actions/newnotice.php:157
+#: actions/apistatusesupdate.php:243 actions/newnotice.php:157
 #: lib/mailhandler.php:60
 #, php-format
 msgid "That's too long. Max notice size is %d chars."
 msgstr "ÐÐ°Ð´ÑÐ¾ Ð´Ð¾Ð²Ð³Ð¾. ÐÐ°ÐºÑÐ¸Ð¼Ð°Ð»ÑÐ½Ð¸Ð¹ ÑÐ¾Ð·Ð¼ÑÑ Ð´Ð¾Ð¿Ð¸ÑÑ â %d Ð·Ð½Ð°ÐºÑÐ²."
 
-#: actions/apistatusesupdate.php:283 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:284 actions/apiusershow.php:96
 msgid "Not found."
 msgstr "ÐÐµ Ð·Ð½Ð°Ð¹Ð´ÐµÐ½Ð¾."
 
-#: actions/apistatusesupdate.php:306 actions/newnotice.php:181
+#: actions/apistatusesupdate.php:307 actions/newnotice.php:181
 #, php-format
 msgid "Max notice size is %d chars, including attachment URL."
 msgstr ""
@@ -888,7 +892,9 @@ msgid "Yes"
 msgstr "Ð¢Ð°Ðº"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
+#. TRANS: Submit button title.
+#. TRANS: Description of the form to block a user.
+#: actions/block.php:164 actions/groupmembers.php:403 lib/blockform.php:82
 msgid "Block this user"
 msgstr "ÐÐ»Ð¾ÐºÑÐ²Ð°ÑÐ¸ ÐºÐ¾ÑÐ¸ÑÑÑÐ²Ð°ÑÐ°"
 
@@ -930,11 +936,13 @@ msgstr "Ð¡Ð¿Ð¸ÑÐ¾Ðº ÐºÐ¾ÑÐ¸ÑÑÑÐ²Ð°ÑÑÐ² Ð±Ð»Ð¾ÐºÐ¾Ð²Ð°Ð½Ð¸Ñ Ð² ÑÑÐ¹ Ð³
 msgid "Unblock user from group"
 msgstr "Ð Ð¾Ð·Ð±Ð»Ð¾ÐºÑÐ²Ð°ÑÐ¸ ÐºÐ¾ÑÐ¸ÑÑÑÐ²Ð°ÑÐ°"
 
-#: actions/blockedfromgroup.php:320 lib/unblockform.php:69
+#. TRANS: Title for the form to unblock a user.
+#: actions/blockedfromgroup.php:320 lib/unblockform.php:70
 msgid "Unblock"
 msgstr "Ð Ð¾Ð·Ð±Ð»Ð¾ÐºÑÐ²Ð°ÑÐ¸"
 
-#: actions/blockedfromgroup.php:320 lib/unblockform.php:80
+#. TRANS: Description of the form to unblock a user.
+#: actions/blockedfromgroup.php:320 lib/unblockform.php:82
 msgid "Unblock this user"
 msgstr "Ð Ð¾Ð·Ð±Ð»Ð¾ÐºÑÐ²Ð°ÑÐ¸ ÑÑÐ¾Ð³Ð¾ ÐºÐ¾ÑÐ¸ÑÑÑÐ²Ð°ÑÐ°"
 
@@ -973,9 +981,9 @@ msgstr "Ð¦Ñ Ð°Ð´ÑÐµÑÑ Ð²Ð¶Ðµ Ð¿ÑÐ´ÑÐ²ÐµÑÐ´Ð¶ÐµÐ½Ð¾."
 #. 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/confirmaddress.php:116 actions/emailsettings.php:331
+#: actions/emailsettings.php:477 actions/imsettings.php:283
+#: actions/imsettings.php:442 actions/othersettings.php:174
 #: actions/profilesettings.php:283 actions/smssettings.php:308
 #: actions/smssettings.php:464
 msgid "Couldn't update user."
@@ -983,7 +991,7 @@ msgstr "ÐÐµ Ð²Ð´Ð°Ð»Ð¾ÑÑ Ð¾Ð½Ð¾Ð²Ð¸ÑÐ¸ ÐºÐ¾ÑÐ¸ÑÑÑÐ²Ð°ÑÐ°."
 
 #. 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/confirmaddress.php:128 actions/emailsettings.php:437
 #: actions/smssettings.php:422
 msgid "Couldn't delete email confirmation."
 msgstr "ÐÐµ Ð²Ð´Ð°Ð»Ð¾ÑÑ Ð²Ð¸Ð´Ð°Ð»Ð¸ÑÐ¸ Ð¿ÑÐ´ÑÐ²ÐµÑÐ´Ð¶ÐµÐ½Ð½Ñ Ð¿Ð¾ÑÑÐ¾Ð²Ð¾Ñ Ð°Ð´ÑÐµÑÐ¸."
@@ -1019,9 +1027,10 @@ msgstr "ÐÐ¾Ð´Ð°ÑÐ¾Ðº Ð½Ðµ Ð²Ð¸ÑÐ²Ð»ÐµÐ½Ð¾."
 msgid "You are not the owner of this application."
 msgstr "ÐÐ¸ Ð½Ðµ Ñ Ð²Ð»Ð°ÑÐ½Ð¸ÐºÐ¾Ð¼ ÑÑÐ¾Ð³Ð¾ Ð´Ð¾Ð´Ð°ÑÐºÑ."
 
+#. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:127
 #: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1307
+#: lib/action.php:1315
 msgid "There was a problem with your session token."
 msgstr "ÐÐ¸Ð½Ð¸ÐºÐ»Ð¸ Ð¿ÐµÐ²Ð½Ñ Ð¿ÑÐ¾Ð±Ð»ÐµÐ¼Ð¸ Ð· ÑÐ¾ÐºÐµÐ½Ð¾Ð¼ Ð¿Ð¾ÑÐ¾ÑÐ½Ð¾Ñ ÑÐµÑÑÑ."
 
@@ -1055,7 +1064,7 @@ msgstr "ÐÐ¸Ð´Ð°Ð»Ð¸ÑÐ¸ Ð´Ð¾Ð´Ð°ÑÐ¾Ðº"
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
 #: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:73 lib/profileformaction.php:64
+#: lib/adminpanelaction.php:71 lib/profileformaction.php:64
 #: lib/settingsaction.php:72
 msgid "Not logged in."
 msgstr "ÐÐµ ÑÐ²ÑÐ¹ÑÐ»Ð¸."
@@ -1116,7 +1125,6 @@ msgstr "ÐÐ¸Ð´Ð°Ð»Ð¸ÑÐ¸ ÑÑÐ¾Ð³Ð¾ ÐºÐ¾ÑÐ¸ÑÑÑÐ²Ð°ÑÐ°"
 #. TRANS: Message used as title for design settings for the site.
 #. TRANS: Link description in user account settings menu.
 #: actions/designadminpanel.php:63 lib/accountsettingsaction.php:139
-#: lib/groupnav.php:119
 msgid "Design"
 msgstr "ÐÐ¸Ð·Ð°Ð¹Ð½"
 
@@ -1237,13 +1245,13 @@ msgstr "ÐÐ½Ð¾Ð²Ð¸ÑÐ¸ Ð½Ð°Ð»Ð°ÑÑÑÐ²Ð°Ð½Ð½Ñ Ð·Ð° Ð·Ð°Ð¼Ð¾Ð²ÑÑÐ²Ð°Ð½Ð½ÑÐ¼"
 msgid "Reset back to default"
 msgstr "ÐÐ¾Ð²ÐµÑÐ½ÑÑÐ¸ÑÑ Ð´Ð¾ Ð¿Ð¾ÑÐ°ÑÐºÐ¾Ð²Ð¸Ñ Ð½Ð°Ð»Ð°ÑÑÑÐ²Ð°Ð½Ñ"
 
-#. TRANS: Submit button title
+#. TRANS: Submit button title.
 #: actions/designadminpanel.php:685 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/snapshotadminpanel.php:245
 #: actions/subscriptions.php:226 actions/tagother.php:154
-#: actions/useradminpanel.php:294 lib/applicationeditform.php:363
+#: actions/useradminpanel.php:294 lib/applicationeditform.php:353
 #: lib/designsettings.php:256 lib/groupeditform.php:202
 msgid "Save"
 msgstr "ÐÐ±ÐµÑÐµÐ³ÑÐ¸"
@@ -1399,7 +1407,7 @@ msgstr "ÐÐ¾ÑÐ¾ÑÐ½Ð° Ð¿ÑÐ´ÑÐ²ÐµÑÐ´Ð¶ÐµÐ½Ð° Ð¿Ð¾ÑÑÐ¾Ð²Ð° Ð°Ð´ÑÐµÑÐ°."
 #. 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/emailsettings.php:115 actions/emailsettings.php:162
 #: actions/imsettings.php:116 actions/smssettings.php:124
 #: actions/smssettings.php:180
 msgctxt "BUTTON"
@@ -1417,22 +1425,26 @@ msgstr ""
 #. 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
+#. TRANS: Button label in the "Edit application" form.
 #: actions/emailsettings.php:127 actions/imsettings.php:131
-#: actions/smssettings.php:137 lib/applicationeditform.php:357
+#: actions/smssettings.php:137 lib/applicationeditform.php:347
 msgctxt "BUTTON"
 msgid "Cancel"
 msgstr "Ð¡ÐºÐ°ÑÑÐ²Ð°ÑÐ¸"
 
-#. TRANS: Instructions for e-mail address input form.
-#: actions/emailsettings.php:135
+#. TRANS: Instructions for e-mail address input form. Do not translate
+#. TRANS: "example.org". It is one of the domain names reserved for
+#. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
+#. TRANS: Any other domain may be owned by a legitimate person or
+#. TRANS: organization.
+#: actions/emailsettings.php:139
 msgid "Email address, like \"UserName@example.org\""
 msgstr "ÐÐ»ÐµÐºÑÑÐ¾Ð½Ð½Ð° Ð°Ð´ÑÐµÑÐ°, Ð½Ð° Ð·ÑÐ°Ð·Ð¾Ðº Â«UserName@example.orgÂ»"
 
 #. 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/emailsettings.php:143 actions/imsettings.php:151
 #: actions/smssettings.php:162
 msgctxt "BUTTON"
 msgid "Add"
@@ -1440,110 +1452,110 @@ msgstr "ÐÐ¾Ð´Ð°ÑÐ¸"
 
 #. 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
+#: actions/emailsettings.php:151 actions/smssettings.php:171
 msgid "Incoming email"
 msgstr "ÐÑÑÐ´Ð½Ð° Ð¿Ð¾ÑÑÐ°"
 
 #. 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
+#: actions/emailsettings.php:159 actions/smssettings.php:178
 msgid "Send email to this address to post new notices."
 msgstr "ÐÐ°Ð´ÑÐ¸Ð»Ð°Ð¹ÑÐµ Ð´Ð¾Ð¿Ð¸ÑÐ¸ Ð½Ð° ÑÑ Ð°Ð´ÑÐµÑÑ Ñ ÑÑ Ð±ÑÐ´Ðµ Ð¾Ð¿ÑÐ±Ð»ÑÐºÐ¾Ð²Ð°Ð½Ð¾ Ð½Ð° ÑÐ°Ð¹ÑÑ."
 
 #. 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
+#: actions/emailsettings.php:168 actions/smssettings.php:186
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr "Ð¡ÑÐ²Ð¾ÑÐ¸ÑÐ¸ Ð½Ð¾Ð²Ñ Ð°Ð´ÑÐµÑÑ Ð´Ð»Ñ Ð½Ð°Ð´ÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð¿Ð¾Ð²ÑÐ´Ð¾Ð¼Ð»ÐµÐ½Ñ; Ð²Ð¸Ð´Ð°Ð»Ð¸ÑÐ¸ ÑÑÐ°ÑÑ."
 
 #. 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
+#: actions/emailsettings.php:172 actions/smssettings.php:189
 msgctxt "BUTTON"
 msgid "New"
 msgstr "ÐÐ¾Ð²Ðµ"
 
 #. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:174
+#: actions/emailsettings.php:178
 msgid "Email preferences"
 msgstr "ÐÑÐµÑÐµÑÐµÐ½ÑÑÑ ÐµÐ». Ð¿Ð¾ÑÑÐ¸"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:180
+#: actions/emailsettings.php:184
 msgid "Send me notices of new subscriptions through email."
 msgstr "ÐÐ¾ÑÐ²Ð´Ð¾Ð¼Ð»ÑÑÐ¸ Ð¼ÐµÐ½Ðµ Ð¿Ð¾ÑÑÐ¾Ñ Ð¿ÑÐ¾ Ð½Ð¾Ð²Ñ Ð¿ÑÐ´Ð¿Ð¸ÑÐºÐ¸."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:186
+#: actions/emailsettings.php:190
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr "ÐÐ°Ð´ÑÐ¸Ð»Ð°ÑÐ¸ Ð¼ÐµÐ½Ñ Ð»Ð¸ÑÑÐ°, ÐºÐ¾Ð»Ð¸ ÑÑÐ¾ÑÑ Ð´Ð¾Ð´Ð°Ñ Ð¼ÑÐ¹ Ð´Ð¾Ð¿Ð¸Ñ Ð´Ð¾ ÑÐ¿Ð¸ÑÐºÑ Ð¾Ð±ÑÐ°Ð½Ð¸Ñ."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:193
+#: actions/emailsettings.php:197
 msgid "Send me email when someone sends me a private message."
 msgstr "ÐÐ°Ð´ÑÐ¸Ð»Ð°ÑÐ¸ Ð¼ÐµÐ½Ñ Ð»Ð¸ÑÑÐ°, ÐºÐ¾Ð»Ð¸ ÑÑÐ¾ÑÑ Ð¼Ð°Ñ Ð¿ÑÐ¸Ð²Ð°ÑÐ½Ðµ Ð¿Ð¾Ð²ÑÐ´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð´Ð»Ñ Ð¼ÐµÐ½Ðµ."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:199
+#: actions/emailsettings.php:203
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr "ÐÐ°Ð´ÑÐ¸Ð»Ð°ÑÐ¸ Ð¼ÐµÐ½Ñ Ð»Ð¸ÑÑÐ°, ÐºÐ¾Ð»Ð¸ Ð½Ð° Ð¼ÑÐ¹ Ð´Ð¾Ð¿Ð¸Ñ Ð·âÑÐ²Ð»ÑÑÑÑÑÑ Â«@-Ð²ÑÐ´Ð¿Ð¾Ð²ÑÐ´ÑÂ»."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:205
+#: actions/emailsettings.php:209
 msgid "Allow friends to nudge me and send me an email."
 msgstr "ÐÐ¾Ð·Ð²Ð¾Ð»Ð¸ÑÐ¸ Ð´ÑÑÐ·ÑÐ¼ Â«ÑÐ¾Ð·ÑÑÐ¾Ð²ÑÐ°ÑÐ¸Â» Ð¼ÐµÐ½Ðµ, Ð½Ð°Ð´ÑÑÐ»Ð°Ð²ÑÐ¸ Ð¼ÐµÐ½Ñ Ð»Ð¸ÑÑÐ°."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:212
+#: actions/emailsettings.php:216
 msgid "I want to post notices by email."
 msgstr "Ð¯ ÑÐ¾ÑÑ Ð½Ð°Ð´ÑÐ¸Ð»Ð°ÑÐ¸ Ð´Ð¾Ð¿Ð¸ÑÐ¸ Ð¿Ð¾ÑÑÐ¾Ñ."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:219
+#: actions/emailsettings.php:223
 msgid "Publish a MicroID for my email address."
 msgstr "ÐÐ¾Ð·Ð½Ð°ÑÐ°ÑÐ¸ Ð¼ÑÑÐºÐ¾Ñ MicroID Ð¼Ð¾Ñ ÐµÐ»ÐµÐºÑÑÐ¾Ð½Ð½Ñ Ð°Ð´ÑÐµÑÑ."
 
 #. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:334
+#: actions/emailsettings.php:338
 msgid "Email preferences saved."
 msgstr "ÐÑÐµÑÐµÑÐµÐ½ÑÑÑ Ð¿Ð¾ÑÑÐ¸ Ð·Ð±ÐµÑÐµÐ¶Ð½Ð¾."
 
 #. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:353
+#: actions/emailsettings.php:357
 msgid "No email address."
 msgstr "ÐÐµÐ¼Ð°Ñ ÐµÐ»ÐµÐºÑÑÐ¾Ð½Ð½Ð¾Ñ Ð°Ð´ÑÐµÑÐ¸."
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:361
+#: actions/emailsettings.php:365
 msgid "Cannot normalize that email address"
 msgstr "ÐÐµ Ð¼Ð¾Ð¶Ð½Ð° Ð¿Ð¾Ð»Ð°Ð³Ð¾Ð´Ð¸ÑÐ¸ ÑÑ Ð¿Ð¾ÑÑÐ¾Ð²Ñ Ð°Ð´ÑÐµÑÑ"
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:208
+#: actions/emailsettings.php:370 actions/register.php:208
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "Ð¦Ðµ Ð½ÐµÐ´ÑÐ¹ÑÐ½Ð° ÐµÐ»ÐµÐºÑÑÐ¾Ð½Ð½Ð° Ð°Ð´ÑÐµÑÐ°."
 
 #. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:370
+#: actions/emailsettings.php:374
 msgid "That is already your email address."
 msgstr "Ð¦Ðµ Ñ Ñ ÐÐ°ÑÐ¾Ñ Ð°Ð´ÑÐµÑÐ¾Ñ."
 
 #. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:374
+#: actions/emailsettings.php:378
 msgid "That email address already belongs to another user."
 msgstr "Ð¦Ñ ÐµÐ»ÐµÐºÑÑÐ¾Ð½Ð½Ð° Ð°Ð´ÑÐµÑÐ° Ð½Ð°Ð»ÐµÐ¶Ð¸ÑÑ ÑÐ½ÑÐ¾Ð¼Ñ ÐºÐ¾ÑÐ¸ÑÑÑÐ²Ð°ÑÑ."
 
 #. 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/emailsettings.php:395 actions/imsettings.php:351
 #: actions/smssettings.php:373
 msgid "Couldn't insert confirmation code."
 msgstr "ÐÐµ Ð²Ð´Ð°Ð»Ð¾ÑÑ Ð´Ð¾Ð´Ð°ÑÐ¸ ÐºÐ¾Ð´ Ð¿ÑÐ´ÑÐ²ÐµÑÐ´Ð¶ÐµÐ½Ð½Ñ."
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:398
+#: actions/emailsettings.php:402
 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."
@@ -1555,50 +1567,50 @@ msgstr ""
 #. 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/emailsettings.php:423 actions/imsettings.php:386
 #: actions/smssettings.php:408
 msgid "No pending confirmation to cancel."
 msgstr "ÐÐµ Ð¾ÑÑÐºÑÑÑÑÑÑ Ð¿ÑÐ´ÑÐ²ÐµÑÐ´Ð¶ÐµÐ½Ð½Ñ Ð´Ð»Ñ ÑÐºÐ°ÑÑÐ²Ð°Ð½Ð½Ñ."
 
 #. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:424
+#: actions/emailsettings.php:428
 msgid "That is the wrong email address."
 msgstr "Ð¦Ðµ Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ¾Ð²Ð° Ð°Ð´ÑÐµÑÐ° ÐµÐ»ÐµÐºÑÑÐ¾Ð½Ð½Ð¾Ñ Ð¿Ð¾ÑÑÐ¸."
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:438
+#: actions/emailsettings.php:442
 msgid "Email confirmation cancelled."
 msgstr "ÐÑÐ´ÑÐ²ÐµÑÐ´Ð¶ÐµÐ½Ð½Ñ ÐµÐ»ÐµÐºÑÑÐ¾Ð½Ð½Ð¾Ñ Ð¿Ð¾ÑÑÐ¸ ÑÐºÐ°ÑÐ¾Ð²Ð°Ð½Ð¾."
 
 #. TRANS: Message given trying to remove an e-mail address that is not
 #. TRANS: registered for the active user.
-#: actions/emailsettings.php:458
+#: actions/emailsettings.php:462
 msgid "That is not your email address."
 msgstr "Ð¦Ðµ Ð½Ðµ Ñ ÐÐ°ÑÐ¾Ñ Ð°Ð´ÑÐµÑÐ¾Ñ."
 
 #. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:479
+#: actions/emailsettings.php:483
 msgid "The email address was removed."
 msgstr "ÐÐ´ÑÐµÑÐ° Ð±ÑÐ»Ð° Ð²Ð¸Ð´Ð°Ð»ÐµÐ½Ð°."
 
-#: actions/emailsettings.php:493 actions/smssettings.php:568
+#: actions/emailsettings.php:497 actions/smssettings.php:568
 msgid "No incoming email address."
 msgstr "ÐÐµÐ¼Ð°Ñ Ð°Ð´ÑÐµÑÐ¸ Ð´Ð»Ñ Ð²ÑÑÐ´Ð½Ð¾Ñ Ð¿Ð¾ÑÑÐ¸."
 
 #. 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/emailsettings.php:508 actions/emailsettings.php:532
 #: actions/smssettings.php:578 actions/smssettings.php:602
 msgid "Couldn't update user record."
 msgstr "ÐÐµ Ð²Ð´Ð°Ð»Ð¾ÑÑ Ð¾Ð½Ð¾Ð²Ð¸ÑÐ¸ Ð·Ð°Ð¿Ð¸Ñ ÐºÐ¾ÑÐ¸ÑÑÑÐ²Ð°ÑÐ°."
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
-#: actions/emailsettings.php:508 actions/smssettings.php:581
+#: actions/emailsettings.php:512 actions/smssettings.php:581
 msgid "Incoming email address removed."
 msgstr "ÐÐ´ÑÐµÑÑ Ð²ÑÑÐ´Ð½Ð¾Ñ Ð¿Ð¾ÑÑÐ¸ Ð²Ð¸Ð´Ð°Ð»ÐµÐ½Ð¾."
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
-#: actions/emailsettings.php:532 actions/smssettings.php:605
+#: actions/emailsettings.php:536 actions/smssettings.php:605
 msgid "New incoming email address added."
 msgstr "ÐÐ¾Ð²Ñ Ð°Ð´ÑÐµÑÑ Ð´Ð»Ñ Ð²ÑÑÐ´Ð½Ð¸Ñ Ð¿Ð¾Ð²ÑÐ´Ð¾Ð¼Ð»ÐµÐ½Ñ Ð´Ð¾Ð´Ð°Ð½Ð¾."
 
@@ -1715,7 +1727,7 @@ msgstr "ÐÐµ Ð²Ð´Ð°Ð»Ð¾ÑÑ Ð¿ÐµÑÐµÑÐ²Ð¾ÑÐ¸ÑÐ¸ ÑÐ¾ÐºÐµÐ½Ð¸ Ð·Ð°Ð¿Ð¸ÑÑ Ð½
 msgid "Remote service uses unknown version of OMB protocol."
 msgstr "ÐÐµÐ²ÑÐ´Ð¾Ð¼Ð° Ð²ÐµÑÑÑÑ Ð¿ÑÐ¾ÑÐ¾ÐºÐ¾Ð»Ñ OMB."
 
-#: actions/finishremotesubscribe.php:138
+#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306
 msgid "Error updating remote profile."
 msgstr "ÐÐ¾Ð¼Ð¸Ð»ÐºÐ° Ð¿ÑÐ¸ Ð¾Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð²ÑÐ´Ð´Ð°Ð»ÐµÐ½Ð¾Ð³Ð¾ Ð¿ÑÐ¾ÑÑÐ»Ñ."
 
@@ -1772,7 +1784,7 @@ msgstr "ÐÐ¾ÑÐ¸ÑÑÑÐ²Ð°ÑÐ° Ð·Ð°Ð±Ð»Ð¾ÐºÐ¾Ð²Ð°Ð½Ð¾ Ð² ÑÑÐ¹ Ð³ÑÑÐ¿Ñ."
 msgid "User is not a member of group."
 msgstr "ÐÐ¾ÑÐ¸ÑÑÑÐ²Ð°Ñ Ð½Ðµ Ñ ÑÑÐ°ÑÐ½Ð¸ÐºÐ¾Ð¼ Ð³ÑÑÐ¿Ð¸."
 
-#: actions/groupblock.php:134 actions/groupmembers.php:360
+#: actions/groupblock.php:134 actions/groupmembers.php:364
 msgid "Block user from group"
 msgstr "ÐÐ»Ð¾ÐºÑÐ²Ð°ÑÐ¸ ÐºÐ¾ÑÐ¸ÑÑÑÐ²Ð°ÑÐ° Ð² Ð³ÑÑÐ¿Ñ"
 
@@ -1854,40 +1866,32 @@ msgstr "ÐÐ¾Ð³Ð¾ÑÐ¸Ð¿ Ð¾Ð½Ð¾Ð²Ð»ÐµÐ½Ð¾."
 msgid "Failed updating logo."
 msgstr "ÐÐ½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð»Ð¾Ð³Ð¾ÑÐ¸Ð¿Ñ Ð·Ð°Ð²ÐµÑÑÐ¸Ð»Ð¾ÑÑ Ð½ÐµÐ²Ð´Ð°ÑÐµÑ."
 
-#: actions/groupmembers.php:100 lib/groupnav.php:92
+#. TRANS: Title of the page showing group members.
+#. TRANS: %s is the name of the group.
+#: actions/groupmembers.php:102
 #, php-format
 msgid "%s group members"
 msgstr "Ð£ÑÐ°ÑÐ½Ð¸ÐºÐ¸ Ð³ÑÑÐ¿Ð¸ %s"
 
-#: actions/groupmembers.php:103
+#. TRANS: Title of the page showing group members.
+#. TRANS: %1$s is the name of the group, %2$d is the page number of the members list.
+#: actions/groupmembers.php:107
 #, php-format
 msgid "%1$s group members, page %2$d"
 msgstr "Ð£ÑÐ°ÑÐ½Ð¸ÐºÐ¸ Ð³ÑÑÐ¿Ð¸ %1$s, ÑÑÐ¾ÑÑÐ½ÐºÐ° %2$d"
 
-#: actions/groupmembers.php:118
+#: actions/groupmembers.php:122
 msgid "A list of the users in this group."
 msgstr "Ð¡Ð¿Ð¸ÑÐ¾Ðº ÑÑÐ°ÑÐ½Ð¸ÐºÑÐ² ÑÑÑÑ Ð³ÑÑÐ¿Ð¸."
 
-#: actions/groupmembers.php:182 lib/groupnav.php:107
+#: actions/groupmembers.php:186
 msgid "Admin"
 msgstr "ÐÐ´Ð¼ÑÐ½"
 
-#: actions/groupmembers.php:392 lib/blockform.php:69
-msgid "Block"
-msgstr "ÐÐ»Ð¾Ðº"
-
-#: actions/groupmembers.php:487
+#: actions/groupmembers.php:498
 msgid "Make user an admin of the group"
 msgstr "ÐÐ°Ð´Ð°ÑÐ¸ ÐºÐ¾ÑÐ¸ÑÑÑÐ²Ð°ÑÐµÐ²Ñ Ð¿ÑÐ°Ð²Ð° Ð°Ð´Ð¼ÑÐ½ÑÑÑÑÐ°ÑÐ¾ÑÐ°"
 
-#: actions/groupmembers.php:519
-msgid "Make Admin"
-msgstr "ÐÑÐ¾Ð±Ð¸ÑÐ¸ Ð°Ð´Ð¼ÑÐ½Ð¾Ð¼"
-
-#: actions/groupmembers.php:519
-msgid "Make this user an admin"
-msgstr "ÐÐ°Ð´Ð°ÑÐ¸ ÑÑÐ¾Ð¼Ñ ÐºÐ¾ÑÐ¸ÑÑÑÐ²Ð°ÑÐµÐ²Ñ Ð¿ÑÐ°Ð²Ð° Ð°Ð´Ð¼ÑÐ½ÑÑÑÑÐ°ÑÐ¾ÑÐ°"
-
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Title in atom group notice feed. %s is a group name.
 #. TRANS: Title in atom user notice feed. %s is a user name.
@@ -2027,7 +2031,10 @@ msgstr ""
 
 #. TRANS: IM address input field instructions in IM settings form.
 #. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:140
+#. TRANS: Do not translate "example.org". It is one of the domain names reserved for use in examples by
+#. TRANS: http://www.rfc-editor.org/rfc/rfc2606.txt. Any other domain may be owned by a legitimate
+#. TRANS: person or organization.
+#: actions/imsettings.php:143
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -2038,65 +2045,65 @@ msgstr ""
 "GTalk."
 
 #. TRANS: Form legend for IM preferences form.
-#: actions/imsettings.php:155
+#: actions/imsettings.php:158
 msgid "IM preferences"
 msgstr "ÐÑÐµÑÐµÑÐµÐ½ÑÑÑ ÐÐ"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:160
+#: actions/imsettings.php:163
 msgid "Send me notices through Jabber/GTalk."
 msgstr "ÐÐ¾Ð²ÑÐ´Ð¾Ð¼Ð»ÑÑÐ¸ Ð¼ÐµÐ½Ðµ ÑÐµÑÐµÐ· Jabber/GTalk."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:166
+#: actions/imsettings.php:169
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr "ÐÐ°Ð´ÑÐ¸Ð»Ð°ÑÐ¸ Ð´Ð¾Ð¿Ð¸ÑÐ¸ Ð½Ð° ÑÐ°Ð¹Ñ, ÐºÐ¾Ð»Ð¸ Ð¼ÑÐ¹ ÑÑÐ°ÑÑÑ Jabber/GTalk Ð·Ð¼ÑÐ½ÑÑÑÑÑÑ."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:172
+#: actions/imsettings.php:175
 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr ""
 "ÐÐ°Ð´ÑÐ¸Ð»Ð°ÑÐ¸ ÑÐ°ÐºÐ¾Ð¶ Ð¼ÐµÐ½Ñ Ð²ÑÐ´Ð¿Ð¾Ð²ÑÐ´Ñ ÑÐµÑÐµÐ· Jabber/GTalk Ð²ÑÐ´ Ð»ÑÐ´ÐµÐ¹, Ð´Ð¾ ÑÐºÐ¸Ñ Ñ Ð½Ðµ "
 "Ð¿ÑÐ´Ð¿Ð¸ÑÐ°Ð½Ð¸Ð¹."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:179
+#: actions/imsettings.php:182
 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "ÐÐ¾Ð·Ð½Ð°ÑÐ°ÑÐ¸ Ð¼ÑÑÐºÐ¾Ñ MicroID Ð¼Ð¾Ñ Ð°Ð´ÑÐµÑÑ Jabber/GTalk."
 
 #. TRANS: Confirmation message for successful IM preferences save.
-#: actions/imsettings.php:287 actions/othersettings.php:180
+#: actions/imsettings.php:290 actions/othersettings.php:180
 msgid "Preferences saved."
 msgstr "ÐÑÐµÑÐµÑÐµÐ½ÑÑÑ Ð·Ð±ÐµÑÐµÐ¶Ð½Ð¾."
 
 #. TRANS: Message given saving IM address without having provided one.
-#: actions/imsettings.php:309
+#: actions/imsettings.php:312
 msgid "No Jabber ID."
 msgstr "ÐÐµÐ¼Ð°Ñ Jabber ID."
 
 #. TRANS: Message given saving IM address that cannot be normalised.
-#: actions/imsettings.php:317
+#: actions/imsettings.php:320
 msgid "Cannot normalize that Jabber ID"
 msgstr "ÐÐµ Ð¼Ð¾Ð¶Ð½Ð° Ð¿Ð¾Ð»Ð°Ð³Ð¾Ð´Ð¸ÑÐ¸ ÑÐµÐ¹ Jabber ID"
 
 #. TRANS: Message given saving IM address that not valid.
-#: actions/imsettings.php:322
+#: actions/imsettings.php:325
 msgid "Not a valid Jabber ID"
 msgstr "Ð¦Ðµ Ð½ÐµÐ´ÑÐ¹ÑÐ½Ð¸Ð¹ Jabber ID"
 
 #. TRANS: Message given saving IM address that is already set.
-#: actions/imsettings.php:326
+#: actions/imsettings.php:329
 msgid "That is already your Jabber ID."
 msgstr "Ð¦Ðµ Ñ Ñ ÐÐ°Ñ Jabber ID."
 
 #. TRANS: Message given saving IM address that is already set for another user.
-#: actions/imsettings.php:330
+#: actions/imsettings.php:333
 msgid "Jabber ID already belongs to another user."
 msgstr "Jabber ID Ð²Ð¶Ðµ Ð½Ð°Ð»ÐµÐ¶Ð¸ÑÑ ÑÐ½ÑÐ¾Ð¼Ñ ÐºÐ¾ÑÐ¸ÑÑÑÐ²Ð°ÑÑ."
 
 #. 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
+#: actions/imsettings.php:361
 #, php-format
 msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
@@ -2106,28 +2113,28 @@ msgstr ""
 "Ð·Ð°ÑÐ²ÐµÐ´Ð¸ÑÐ¸ %s Ð´Ð»Ñ Ð²ÑÐ´Ð¿ÑÐ°Ð²Ð»ÐµÐ½Ð½Ñ Ð²Ð°Ð¼ Ð¿Ð¾Ð²ÑÐ´Ð¾Ð¼Ð»ÐµÐ½Ñ."
 
 #. TRANS: Message given canceling IM address confirmation for the wrong IM address.
-#: actions/imsettings.php:388
+#: actions/imsettings.php:391
 msgid "That is the wrong IM address."
 msgstr "Ð¦Ðµ Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ¾Ð²Ð° Ð°Ð´ÑÐµÑÐ° IM."
 
 #. TRANS: Server error thrown on database error canceling IM address confirmation.
-#: actions/imsettings.php:397
+#: actions/imsettings.php:400
 msgid "Couldn't delete IM confirmation."
 msgstr "ÐÐµ Ð²Ð´Ð°Ð»Ð¾ÑÑ Ð²Ð¸Ð´Ð°Ð»Ð¸ÑÐ¸ Ð¿ÑÐ´ÑÐ²ÐµÑÐ´Ð¶ÐµÐ½Ð½Ñ ÐÐ."
 
 #. TRANS: Message given after successfully canceling IM address confirmation.
-#: actions/imsettings.php:402
+#: actions/imsettings.php:405
 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
+#: actions/imsettings.php:427
 msgid "That is not your Jabber ID."
 msgstr "Ð¦Ðµ Ð½Ðµ ÐÐ°Ñ Jabber ID."
 
 #. TRANS: Message given after successfully removing a registered IM address.
-#: actions/imsettings.php:447
+#: actions/imsettings.php:450
 msgid "The IM address was removed."
 msgstr "ÐÐ´ÑÐµÑÐ° ÐÐ Ð±ÑÐ»Ð° Ð²Ð¸Ð´Ð°Ð»ÐµÐ½Ð°."
 
@@ -2600,8 +2607,8 @@ msgid "Only %s URLs over plain HTTP please."
 msgstr "URL-Ð°Ð´ÑÐµÑÐ° %s Ð»Ð¸ÑÐµ Ð² Ð¿ÑÐ¾ÑÑÐ¾Ð¼Ñ HTTP, Ð±ÑÐ´Ñ Ð»Ð°ÑÐºÐ°."
 
 #. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1215
-#: lib/apiaction.php:1243 lib/apiaction.php:1366
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1206
+#: lib/apiaction.php:1233 lib/apiaction.php:1356
 msgid "Not a supported data format."
 msgstr "Ð¢Ð°ÐºÐ¸Ð¹ ÑÐ¾ÑÐ¼Ð°Ñ Ð´Ð°Ð½Ð¸Ñ Ð½Ðµ Ð¿ÑÐ´ÑÑÐ¸Ð¼ÑÑÑÑÑÑ."
 
@@ -2743,7 +2750,7 @@ msgid "Password saved."
 msgstr "ÐÐ°ÑÐ¾Ð»Ñ Ð·Ð±ÐµÑÐµÐ¶ÐµÐ½Ð¾."
 
 #. TRANS: Menu item for site administration
-#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:384
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:371
 msgid "Paths"
 msgstr "Ð¨Ð»ÑÑ"
 
@@ -2955,7 +2962,7 @@ msgstr "ÐÐ¾Ð²Ð½Ðµ ÑÐ¼âÑ"
 
 #. TRANS: Form input field label.
 #: actions/profilesettings.php:115 actions/register.php:460
-#: lib/applicationeditform.php:244 lib/groupeditform.php:161
+#: lib/applicationeditform.php:235 lib/groupeditform.php:161
 msgid "Homepage"
 msgstr "ÐÐµÐ±-ÑÑÐ¾ÑÑÐ½ÐºÐ°"
 
@@ -3061,7 +3068,7 @@ msgid "Couldn't save tags."
 msgstr "ÐÐµ Ð²Ð´Ð°Ð»Ð¾ÑÑ Ð·Ð±ÐµÑÐµÐ³ÑÐ¸ ÑÐµÒÐ¸."
 
 #. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:391 lib/adminpanelaction.php:141
+#: actions/profilesettings.php:391 lib/adminpanelaction.php:138
 msgid "Settings saved."
 msgstr "ÐÐ°Ð»Ð°ÑÑÑÐ²Ð°Ð½Ð½Ñ Ð·Ð±ÐµÑÐµÐ¶ÐµÐ½Ð¾."
 
@@ -3598,7 +3605,7 @@ msgstr "ÐÐ¾ÑÐ¸ÑÑÑÐ²Ð°ÑÐ° ÑÐ·Ð¾Ð»ÑÐ¾Ð²Ð°Ð½Ð¾ Ð´Ð¾ÐºÐ¸ Ð½Ð°Ð±ÐµÑÐµÑÑÑ
 
 #. TRANS: Menu item for site administration
 #: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
-#: lib/adminpanelaction.php:392
+#: lib/adminpanelaction.php:379
 msgid "Sessions"
 msgstr "Ð¡ÐµÑÑÑ"
 
@@ -3636,24 +3643,24 @@ msgid "Application profile"
 msgstr "ÐÑÐ¾ÑÑÐ»Ñ Ð´Ð¾Ð´Ð°ÑÐºÑ"
 
 #. TRANS: Form input field label for application icon.
-#: actions/showapplication.php:159 lib/applicationeditform.php:182
+#: actions/showapplication.php:159 lib/applicationeditform.php:173
 msgid "Icon"
 msgstr "ÐÐºÐ¾Ð½ÐºÐ°"
 
 #. TRANS: Form input field label for application name.
 #: actions/showapplication.php:169 actions/version.php:197
-#: lib/applicationeditform.php:199
+#: lib/applicationeditform.php:190
 msgid "Name"
 msgstr "ÐÐ¼âÑ"
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:178 lib/applicationeditform.php:235
+#: actions/showapplication.php:178 lib/applicationeditform.php:226
 msgid "Organization"
 msgstr "ÐÑÐ³Ð°Ð½ÑÐ·Ð°ÑÑÑ"
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:216 lib/groupeditform.php:172
+#: lib/applicationeditform.php:207 lib/groupeditform.php:172
 msgid "Description"
 msgstr "ÐÐ¿Ð¸Ñ"
 
@@ -3768,7 +3775,7 @@ msgstr ""
 msgid "This is a way to share what you like."
 msgstr "Ð¦Ðµ ÑÐ¿Ð¾ÑÑÐ± Ð¿Ð¾Ð´ÑÐ»Ð¸ÑÐ¸ÑÑ Ð· ÑÑÑÐ¼Ð° ÑÐ¸Ð¼, ÑÐ¾ Ð²Ð°Ð¼ Ð¿Ð¾Ð´Ð¾Ð±Ð°ÑÑÑÑÑ."
 
-#: actions/showgroup.php:82 lib/groupnav.php:86
+#: actions/showgroup.php:82
 #, php-format
 msgid "%s group"
 msgstr "ÐÑÑÐ¿Ð° %s"
@@ -3820,7 +3827,7 @@ msgstr "Ð¡ÑÑÑÑÐºÐ° Ð´Ð¾Ð¿Ð¸ÑÑÐ² Ð³ÑÑÐ¿Ð¸ %s (Atom)"
 msgid "FOAF for %s group"
 msgstr "FOAF Ð´Ð»Ñ Ð³ÑÑÐ¿Ð¸ %s"
 
-#: actions/showgroup.php:393 actions/showgroup.php:445 lib/groupnav.php:91
+#: actions/showgroup.php:393 actions/showgroup.php:445
 msgid "Members"
 msgstr "Ð£ÑÐ°ÑÐ½Ð¸ÐºÐ¸"
 
@@ -4276,7 +4283,7 @@ msgstr "ÐÐ¾Ð´ Ð½Ðµ Ð²Ð²ÐµÐ´ÐµÐ½Ð¾"
 
 #. TRANS: Menu item for site administration
 #: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
-#: lib/adminpanelaction.php:408
+#: lib/adminpanelaction.php:395
 msgid "Snapshots"
 msgstr "Ð¡Ð½ÐµÐ¿ÑÐ¾ÑÐ¸"
 
@@ -5007,7 +5014,7 @@ msgid "Unable to save tag."
 msgstr "ÐÐµ Ð²Ð´Ð°ÑÑÑÑÑ Ð·Ð±ÐµÑÐµÐ³ÑÐ¸ ÑÐµÒ."
 
 #. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#: classes/Subscription.php:75 lib/oauthstore.php:465
+#: classes/Subscription.php:75 lib/oauthstore.php:466
 msgid "You have been banned from subscribing."
 msgstr "ÐÐ°Ñ Ð¿Ð¾Ð·Ð±Ð°Ð²Ð»ÐµÐ½Ð¾ Ð¼Ð¾Ð¶Ð»Ð¸Ð²Ð¾ÑÑÑ Ð¿ÑÐ´Ð¿Ð¸ÑÐ°ÑÐ¸ÑÑ."
 
@@ -5155,7 +5162,8 @@ msgid "Change site configuration"
 msgstr "ÐÐ¼ÑÐ½Ð¸ÑÐ¸ ÐºÐ¾Ð½ÑÑÐ³ÑÑÐ°ÑÑÑ ÑÐ°Ð¹ÑÑ"
 
 #. TRANS: Main menu option when logged in and site admin for access to site configuration
-#: lib/action.php:474
+#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
+#: lib/action.php:474 lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr "ÐÐ´Ð¼ÑÐ½"
@@ -5232,7 +5240,7 @@ msgstr "ÐÐ¾ÑÑÐº"
 
 #. TRANS: DT element for site notice. String is hidden in default CSS.
 #. TRANS: Menu item for site administration
-#: lib/action.php:538 lib/adminpanelaction.php:400
+#: lib/action.php:538 lib/adminpanelaction.php:387
 msgid "Site notice"
 msgstr "ÐÐ±âÑÐ²Ð¸ Ð½Ð° ÑÐ°Ð¹ÑÑ"
 
@@ -5296,7 +5304,10 @@ msgid "StatusNet software license"
 msgstr "ÐÑÑÐµÐ½Ð·ÑÑ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð½Ð¾Ð³Ð¾ Ð·Ð°Ð±ÐµÐ·Ð¿ÐµÑÐµÐ½Ð½Ñ StatusNet"
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
-#: lib/action.php:843
+#. TRANS: Text between [] is a link description, text between () is the link itself.
+#. TRANS: Make sure there is no whitespace between "]" and "(".
+#. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
+#: lib/action.php:846
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -5306,13 +5317,16 @@ msgstr ""
 "site.broughtbyurl%%)."
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:846
+#: lib/action.php:849
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** â ÑÐµ ÑÐµÑÐ²ÑÑ Ð¼ÑÐºÑÐ¾Ð±Ð»Ð¾ÒÑÐ²."
 
 #. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.
-#: lib/action.php:850
+#. TRANS: Make sure there is no whitespace between "]" and "(".
+#. TRANS: Text between [] is a link description, text between () is the link itself.
+#. TRANS: %s is the version of StatusNet that is being used.
+#: lib/action.php:856
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -5324,50 +5338,51 @@ msgstr ""
 "License](http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
 
 #. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:866
+#: lib/action.php:872
 msgid "Site content license"
 msgstr "ÐÑÑÐµÐ½Ð·ÑÑ Ð·Ð¼ÑÑÑÑ ÑÐ°Ð¹ÑÑ"
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:873
+#: lib/action.php:879
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr "ÐÐ¼ÑÑÑ Ñ Ð´Ð°Ð½Ñ %1$s Ñ Ð¿ÑÐ¸Ð²Ð°ÑÐ½Ð¸Ð¼Ð¸ Ñ ÐºÐ¾Ð½ÑÑÐ´ÐµÐ½ÑÑÐ¹Ð½Ð¸Ð¼Ð¸."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:880
+#: lib/action.php:886
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr "ÐÐ²ÑÐ¾ÑÑÑÐºÑ Ð¿ÑÐ°Ð²Ð° Ð½Ð° Ð·Ð¼ÑÑÑ Ñ Ð´Ð°Ð½Ñ Ð½Ð°Ð»ÐµÐ¶Ð°ÑÑ %1$s. ÐÑÑ Ð¿ÑÐ°Ð²Ð° Ð·Ð°ÑÐ¸ÑÐµÐ½Ð¾."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:884
+#: lib/action.php:890
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 "ÐÐ²ÑÐ¾ÑÑÑÐºÑ Ð¿ÑÐ°Ð²Ð° Ð½Ð° Ð·Ð¼ÑÑÑ Ñ Ð´Ð°Ð½Ñ Ð½Ð°Ð»ÐµÐ¶Ð°ÑÑ ÑÐ¾Ð·ÑÐ¾Ð±Ð½Ð¸ÐºÐ°Ð¼. ÐÑÑ Ð¿ÑÐ°Ð²Ð° Ð·Ð°ÑÐ¸ÑÐµÐ½Ð¾."
 
-#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:897
+#. TRANS: license message in footer.
+#. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
+#: lib/action.php:904
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr "ÐÐµÑÑ Ð·Ð¼ÑÑÑ Ñ Ð´Ð°Ð½Ñ %1$s Ð´Ð¾ÑÑÑÐ¿Ð½Ñ Ð½Ð° ÑÐ¼Ð¾Ð²Ð°Ñ Ð»ÑÑÐµÐ½Ð·ÑÑ %2$s."
 
 #. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1236
+#: lib/action.php:1243
 msgid "Pagination"
 msgstr "ÐÑÐ¼ÐµÑÐ°ÑÑÑ ÑÑÐ¾ÑÑÐ½Ð¾Ðº"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1247
+#: lib/action.php:1254
 msgid "After"
 msgstr "ÐÐ¿ÐµÑÐµÐ´"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1257
+#: lib/action.php:1264
 msgid "Before"
 msgstr "ÐÐ°Ð·Ð°Ð´"
 
@@ -5377,208 +5392,227 @@ msgid "Expecting a root feed element but got a whole XML document."
 msgstr ""
 "Ð Ð¾ÑÑÐºÑÐ²Ð°Ð½Ð½Ñ ÐºÐ¾ÑÐµÐ½ÐµÐ²Ð¾Ð³Ð¾ ÐµÐ»ÐµÐ¼ÐµÐ½ÑÑ Ð²ÐµÐ±-ÑÑÑÑÑÐºÐ¸, Ð¾ÑÑÐ¸Ð¼Ð°Ð»Ð¸ ÑÑÐ»Ð¸Ð¹ Ð´Ð¾ÐºÑÐ¼ÐµÐ½Ñ XML."
 
-#: lib/activityutils.php:208
+#. TRANS: Client exception thrown when there is no source attribute.
+#: lib/activityutils.php:203
 msgid "Can't handle remote content yet."
 msgstr "ÐÐ¾ÐºÐ¸ ÑÐ¾ Ð½Ðµ Ð¼Ð¾Ð¶Ñ Ð¾Ð±ÑÐ¾Ð±Ð¸ÑÐ¸ Ð²ÑÐ´Ð´Ð°Ð»ÐµÐ½Ð¸Ð¹ ÐºÐ¾Ð½ÑÐµÐ½Ñ."
 
-#: lib/activityutils.php:244
+#. TRANS: Client exception thrown when there embedded XML content is found that cannot be processed yet.
+#: lib/activityutils.php:240
 msgid "Can't handle embedded XML content yet."
 msgstr "ÐÐ¾ÐºÐ¸ ÑÐ¾ Ð½Ðµ Ð¼Ð¾Ð¶Ñ Ð¾Ð±ÑÐ¾Ð±Ð¸ÑÐ¸ Ð²Ð±ÑÐ´Ð¾Ð²Ð°Ð½Ð¸Ð¹ XML ÐºÐ¾Ð½ÑÐµÐ½Ñ."
 
-#: lib/activityutils.php:248
+#. TRANS: Client exception thrown when base64 encoded content is found that cannot be processed yet.
+#: lib/activityutils.php:245
 msgid "Can't handle embedded Base64 content yet."
 msgstr "ÐÐ¾ÐºÐ¸ ÑÐ¾ Ð½Ðµ Ð¼Ð¾Ð¶Ñ Ð¾Ð±ÑÐ¾Ð±Ð¸ÑÐ¸ Ð²Ð±ÑÐ´Ð¾Ð²Ð°Ð½Ð¸Ð¹ ÐºÐ¾Ð½ÑÐµÐ½Ñ Base64."
 
 #. TRANS: Client error message thrown when a user tries to change admin settings but has no access rights.
-#: lib/adminpanelaction.php:98
+#: lib/adminpanelaction.php:96
 msgid "You cannot make changes to this site."
 msgstr "ÐÐ¸ Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑÐµ ÑÐ¾ÑÑ Ð·Ð¼ÑÐ½ÑÐ²Ð°ÑÐ¸ Ð½Ð° ÑÑÐ¾Ð¼Ñ ÑÐ°Ð¹ÑÑ."
 
 #. TRANS: Client error message throw when a certain panel's settings cannot be changed.
-#: lib/adminpanelaction.php:110
+#: lib/adminpanelaction.php:108
 msgid "Changes to that panel are not allowed."
 msgstr "ÐÐ»Ñ ÑÑÑÑ Ð¿Ð°Ð½ÐµÐ»Ñ Ð·Ð¼ÑÐ½Ð¸ Ð½Ðµ Ð¿ÑÐ¸Ð¿ÑÑÑÐ¸Ð¼Ñ."
 
 #. TRANS: Client error message.
-#: lib/adminpanelaction.php:229
+#: lib/adminpanelaction.php:222
 msgid "showForm() not implemented."
 msgstr "showForm() Ð½Ðµ Ð²Ð¸ÐºÐ¾Ð½Ð°Ð½Ð¾."
 
 #. TRANS: Client error message
-#: lib/adminpanelaction.php:259
+#: lib/adminpanelaction.php:250
 msgid "saveSettings() not implemented."
 msgstr "saveSettings() Ð½Ðµ Ð²Ð¸ÐºÐ¾Ð½Ð°Ð½Ð¾."
 
 #. TRANS: Client error message thrown if design settings could not be deleted in
 #. TRANS: the admin panel Design.
-#: lib/adminpanelaction.php:284
+#: lib/adminpanelaction.php:274
 msgid "Unable to delete design setting."
 msgstr "ÐÐµÐ¼Ð°Ñ Ð¼Ð¾Ð¶Ð»Ð¸Ð²Ð¾ÑÑÑ Ð²Ð¸Ð´Ð°Ð»Ð¸ÑÐ¸ Ð½Ð°Ð»Ð°ÑÑÑÐ²Ð°Ð½Ð½Ñ Ð´Ð¸Ð·Ð°Ð¹Ð½Ñ."
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:350
+#: lib/adminpanelaction.php:337
 msgid "Basic site configuration"
 msgstr "ÐÑÐ½Ð¾Ð²Ð½Ð° ÐºÐ¾Ð½ÑÑÐ³ÑÑÐ°ÑÑÑ ÑÐ°Ð¹ÑÑ"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:352
+#: lib/adminpanelaction.php:339
 msgctxt "MENU"
 msgid "Site"
 msgstr "Ð¡Ð°Ð¹Ñ"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:358
+#: lib/adminpanelaction.php:345
 msgid "Design configuration"
 msgstr "ÐÐ¾Ð½ÑÑÐ³ÑÑÐ°ÑÑÑ Ð´Ð¸Ð·Ð°Ð¹Ð½Ñ"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:360
+#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
+#: lib/adminpanelaction.php:347 lib/groupnav.php:135
 msgctxt "MENU"
 msgid "Design"
 msgstr "ÐÐ¸Ð·Ð°Ð¹Ð½"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:366
+#: lib/adminpanelaction.php:353
 msgid "User configuration"
 msgstr "ÐÐ¾Ð½ÑÑÐ³ÑÑÐ°ÑÑÑ ÐºÐ¾ÑÐ¸ÑÑÑÐ²Ð°ÑÐ°"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:368 lib/personalgroupnav.php:115
+#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:115
 msgid "User"
 msgstr "ÐÐ¾ÑÐ¸ÑÑÑÐ²Ð°Ñ"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:374
+#: lib/adminpanelaction.php:361
 msgid "Access configuration"
 msgstr "ÐÑÐ¸Ð¹Ð½ÑÑÐ¸ ÐºÐ¾Ð½ÑÑÐ³ÑÑÐ°ÑÑÑ"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:382
+#: lib/adminpanelaction.php:369
 msgid "Paths configuration"
 msgstr "ÐÐ¾Ð½ÑÑÐ³ÑÑÐ°ÑÑÑ ÑÐ»ÑÑÑ"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:390
+#: lib/adminpanelaction.php:377
 msgid "Sessions configuration"
 msgstr "ÐÐ¾Ð½ÑÑÐ³ÑÑÐ°ÑÑÑ ÑÐµÑÑÐ¹"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:398
+#: lib/adminpanelaction.php:385
 msgid "Edit site notice"
 msgstr "Ð ÐµÐ´Ð°Ð³ÑÐ²Ð°ÑÐ¸ Ð¿Ð¾Ð²ÑÐ´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ ÑÐ°Ð¹ÑÑ"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:406
+#: lib/adminpanelaction.php:393
 msgid "Snapshots configuration"
 msgstr "ÐÐ¾Ð½ÑÑÐ³ÑÑÐ°ÑÑÑ Ð·Ð½ÑÐ¼ÐºÑÐ²"
 
 #. TRANS: Client error 401.
-#: lib/apiauth.php:113
+#: lib/apiauth.php:111
 msgid "API resource requires read-write access, but you only have read access."
 msgstr ""
 "API-ÑÐµÑÑÑÑ Ð²Ð¸Ð¼Ð°Ð³Ð°Ñ Ð´Ð¾Ð·Ð²ÑÐ» ÑÐ¸Ð¿Ñ Â«ÑÐ¸ÑÐ°Ð½Ð½Ñ-Ð·Ð°Ð¿Ð¸ÑÂ», Ð°Ð»Ðµ Ñ Ð²Ð°Ñ Ñ Ð»Ð¸ÑÐµ Ð´Ð¾ÑÑÑÐ¿ Ð´Ð»Ñ "
 "ÑÐ¸ÑÐ°Ð½Ð½Ñ."
 
+#. TRANS: OAuth exception thrown when no application is found for a given consumer key.
+#: lib/apiauth.php:175
+msgid "No application for that consumer key."
+msgstr ""
+
+#. TRANS: OAuth exception given when no user was found for a given token (no token was found).
+#: lib/apiauth.php:217
+msgid "No user for that token."
+msgstr ""
+
+#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
+#: lib/apioauthstore.php:178
+msgid "Tried to revoke unknown token"
+msgstr ""
+
 #. TRANS: Form legend.
-#: lib/applicationeditform.php:137
+#: lib/applicationeditform.php:129
 msgid "Edit application"
 msgstr "ÐÐµÑÑÐ²Ð°ÑÐ¸ Ð´Ð¾Ð´Ð°ÑÐºÐ°Ð¼Ð¸"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:187
+#: lib/applicationeditform.php:178
 msgid "Icon for this application"
 msgstr "ÐÐºÐ¾Ð½ÐºÐ° Ð´Ð»Ñ ÑÑÐ¾Ð³Ð¾ Ð´Ð¾Ð´Ð°ÑÐºÑ"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:209
+#: lib/applicationeditform.php:200
 #, php-format
 msgid "Describe your application in %d characters"
 msgstr "ÐÐ¿Ð¸ÑÑÑÑ Ð´Ð¾Ð´Ð°ÑÐ¾Ðº, Ð²ÐºÐ»Ð°Ð´Ð°ÑÑÐ¸ÑÑ Ñ %d Ð·Ð½Ð°ÐºÑÐ²"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:213
+#: lib/applicationeditform.php:204
 msgid "Describe your application"
 msgstr "ÐÐ¿Ð¸ÑÑÑÑ ÐÐ°Ñ Ð´Ð¾Ð´Ð°ÑÐ¾Ðº"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:224
+#: lib/applicationeditform.php:215
 msgid "URL of the homepage of this application"
 msgstr "URL-Ð°Ð´ÑÐµÑÐ° Ð²ÐµÐ±-ÑÑÐ¾ÑÑÐ½ÐºÐ¸ ÑÑÐ¾Ð³Ð¾ Ð´Ð¾Ð´Ð°ÑÐºÑ"
 
 #. TRANS: Form input field label.
-#: lib/applicationeditform.php:226
+#: lib/applicationeditform.php:217
 msgid "Source URL"
 msgstr "URL-Ð°Ð´ÑÐµÑÐ°"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:233
+#: lib/applicationeditform.php:224
 msgid "Organization responsible for this application"
 msgstr "ÐÑÐ³Ð°Ð½ÑÐ·Ð°ÑÑÑ, Ð²ÑÐ´Ð¿Ð¾Ð²ÑÐ´Ð°Ð»ÑÐ½Ð° Ð·Ð° ÑÐµÐ¹ Ð´Ð¾Ð´Ð°ÑÐ¾Ðº"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:242
+#: lib/applicationeditform.php:233
 msgid "URL for the homepage of the organization"
 msgstr "URL-Ð°Ð´ÑÐµÑÐ° Ð²ÐµÐ±-ÑÑÐ¾ÑÑÐ½ÐºÐ¸ Ð¾ÑÐ³Ð°Ð½ÑÐ·Ð°ÑÑÑ"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:251
+#: lib/applicationeditform.php:242
 msgid "URL to redirect to after authentication"
 msgstr "URL-Ð°Ð´ÑÐµÑÐ°, Ð½Ð° ÑÐºÑ Ð¿ÐµÑÐµÐ½Ð°Ð¿ÑÐ°Ð²Ð»ÑÑÐ¸ Ð¿ÑÑÐ»Ñ Ð°Ð²ÑÐµÐ½ÑÐ¸ÑÑÐºÐ°ÑÑÑ"
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:278
+#: lib/applicationeditform.php:269
 msgid "Browser"
 msgstr "ÐÑÐ°ÑÐ·ÐµÑ"
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:295
+#: lib/applicationeditform.php:286
 msgid "Desktop"
 msgstr "ÐÐµÑÐºÑÐ¾Ð¿"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:297
+#: lib/applicationeditform.php:288
 msgid "Type of application, browser or desktop"
 msgstr "Ð¢Ð¸Ð¿ Ð´Ð¾Ð´Ð°ÑÐºÑ, Ð±ÑÐ°ÑÐ·ÐµÑ Ð°Ð±Ð¾ Ð´ÐµÑÐºÑÐ¾Ð¿"
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:320
+#: lib/applicationeditform.php:311
 msgid "Read-only"
 msgstr "ÐÐ¸ÑÐµ ÑÐ¸ÑÐ°Ð½Ð½Ñ"
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:339
+#: lib/applicationeditform.php:330
 msgid "Read-write"
 msgstr "Ð§Ð¸ÑÐ°ÑÐ¸-Ð¿Ð¸ÑÐ°ÑÐ¸"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:341
+#: lib/applicationeditform.php:332
 msgid "Default access for this application: read-only, or read-write"
 msgstr ""
 "ÐÐ¾Ð·Ð²ÑÐ» Ð·Ð° Ð·Ð°Ð¼Ð¾Ð²ÑÑÐ²Ð°Ð½Ð½ÑÐ¼ Ð´Ð»Ñ ÑÑÐ¾Ð³Ð¾ Ð´Ð¾Ð´Ð°ÑÐºÑ: Ð»Ð¸ÑÐµ ÑÐ¸ÑÐ°Ð½Ð½Ñ Ð°Ð±Ð¾ ÑÐ¸ÑÐ°ÑÐ¸-Ð¿Ð¸ÑÐ°ÑÐ¸"
 
-#. TRANS: Submit button title
-#: lib/applicationeditform.php:359
+#. TRANS: Submit button title.
+#: lib/applicationeditform.php:349
 msgid "Cancel"
 msgstr "Ð¡ÐºÐ°ÑÑÐ²Ð°ÑÐ¸"
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:136
+#: lib/applicationlist.php:135
 msgid "read-write"
 msgstr "ÑÐ¸ÑÐ°Ð½Ð½Ñ/Ð·Ð°Ð¿Ð¸Ñ"
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:138
+#: lib/applicationlist.php:137
 msgid "read-only"
 msgstr "Ð»Ð¸ÑÐµ ÑÐ¸ÑÐ°Ð½Ð½Ñ"
 
 #. 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
+#: lib/applicationlist.php:143
 #, php-format
 msgid "Approved %1$s - \"%2$s\" access."
 msgstr "ÐÑÐ´ÑÐ²ÐµÑÐ´Ð¶ÐµÐ½Ð¾ Ð´Ð¾ÑÑÑÐ¿ %1$s â Â«%2$sÂ»."
 
 #. TRANS: Button label
-#: lib/applicationlist.php:159
+#: lib/applicationlist.php:158
 msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "ÐÑÐ´ÐºÐ»Ð¸ÐºÐ°ÑÐ¸"
@@ -5598,11 +5632,13 @@ msgstr "ÐÐ²ÑÐ¾Ñ"
 msgid "Provider"
 msgstr "ÐÑÐ¾Ð²Ð°Ð¹Ð´ÐµÑ"
 
-#: lib/attachmentnoticesection.php:67
+#. TRANS: Title.
+#: lib/attachmentnoticesection.php:68
 msgid "Notices where this attachment appears"
 msgstr "ÐÐ¾Ð¿Ð¸ÑÐ¸, Ð´Ð¾ ÑÐºÐ¸Ñ Ð¿ÑÐ¸ÐºÑÑÐ¿Ð»ÐµÐ½Ð¾ ÑÐµ Ð²ÐºÐ»Ð°Ð´ÐµÐ½Ð½Ñ"
 
-#: lib/attachmenttagcloudsection.php:48
+#. TRANS: Title.
+#: lib/attachmenttagcloudsection.php:49
 msgid "Tags for this attachment"
 msgstr "Ð¢ÐµÒÐ¸ Ð´Ð»Ñ ÑÑÐ¾Ð³Ð¾ Ð²ÐºÐ»Ð°Ð´ÐµÐ½Ð½Ñ"
 
@@ -5614,6 +5650,11 @@ msgstr "ÐÐµ Ð²Ð´Ð°Ð»Ð¾ÑÑ Ð·Ð¼ÑÐ½Ð¸ÑÐ¸ Ð¿Ð°ÑÐ¾Ð»Ñ"
 msgid "Password changing is not allowed"
 msgstr "ÐÐ¼ÑÐ½ÑÐ²Ð°ÑÐ¸ Ð¿Ð°ÑÐ¾Ð»Ñ Ð½Ðµ Ð´Ð¾Ð·Ð²Ð¾Ð»ÐµÐ½Ð¾"
 
+#. TRANS: Title for the form to block a user.
+#: lib/blockform.php:70
+msgid "Block"
+msgstr "ÐÐ»Ð¾Ðº"
+
 #: lib/channel.php:157 lib/channel.php:177
 msgid "Command results"
 msgstr "Ð ÐµÐ·ÑÐ»ÑÑÐ°ÑÐ¸ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð¸"
@@ -5864,7 +5905,7 @@ msgid "You are not subscribed to anyone."
 msgstr "ÐÐ¸ Ð½Ðµ Ð¼Ð°ÑÑÐµ Ð¶Ð¾Ð´Ð½Ð¸Ñ Ð¿ÑÐ´Ð¿Ð¸ÑÐ¾Ðº."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to.
-#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.
 #: lib/command.php:836
 msgid "You are subscribed to this person:"
@@ -5880,7 +5921,7 @@ msgid "No one is subscribed to you."
 msgstr "ÐÐ¾ ÐÐ°Ñ Ð½ÑÑÑÐ¾ Ð½Ðµ Ð¿ÑÐ´Ð¿Ð¸ÑÐ°Ð½Ð¸Ð¹."
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
-#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
 #: lib/command.php:863
 msgid "This person is subscribed to you:"
@@ -5896,7 +5937,7 @@ msgid "You are not a member of any groups."
 msgstr "ÐÐ¸ Ð½Ðµ Ñ ÑÑÐ°ÑÐ½Ð¸ÐºÐ¾Ð¼ Ð¶Ð¾Ð´Ð½Ð¾Ñ Ð³ÑÑÐ¿Ð¸."
 
 #. TRANS: Text shown after requesting groups a user is subscribed to.
-#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
 #: lib/command.php:890
 msgid "You are a member of this group:"
@@ -5905,6 +5946,7 @@ msgstr[0] "ÐÐ¸ Ñ ÑÑÐ°ÑÐ½Ð¸ÐºÐ¾Ð¼ Ð³ÑÑÐ¿Ð¸:"
 msgstr[1] "ÐÐ¸ Ñ ÑÑÐ°ÑÐ½Ð¸ÐºÐ¾Ð¼ ÑÐ°ÐºÐ¸Ñ Ð³ÑÑÐ¿:"
 msgstr[2] "ÐÐ¸ Ñ ÑÑÐ°ÑÐ½Ð¸ÐºÐ¾Ð¼ ÑÐ°ÐºÐ¸Ñ Ð³ÑÑÐ¿:"
 
+#. TRANS: Help text for commands.
 #: lib/command.php:905
 msgid ""
 "Commands:\n"
@@ -6122,38 +6164,6 @@ msgid "Extra nicknames for the group, comma- or space- separated, max %d"
 msgstr ""
 "ÐÐ¾Ð´Ð°ÑÐºÐ¾Ð²Ñ ÑÐ¼ÐµÐ½Ð° Ð´Ð»Ñ Ð³ÑÑÐ¿Ð¸, Ð²ÑÐ´Ð¾ÐºÑÐµÐ¼Ð»ÑÐ²Ð°ÑÐ¸ ÐºÐ¾Ð¼Ð°Ð¼Ð¸ Ð°Ð±Ð¾ Ð¿ÑÐ¾Ð±ÑÐ»Ð°Ð¼Ð¸, Ð¼Ð°ÐºÑÐ¸Ð¼ÑÐ¼ %d"
 
-#: lib/groupnav.php:85
-msgid "Group"
-msgstr "ÐÑÑÐ¿Ð°"
-
-#: lib/groupnav.php:101
-msgid "Blocked"
-msgstr "ÐÐ»Ð¾Ðº"
-
-#: lib/groupnav.php:102
-#, php-format
-msgid "%s blocked users"
-msgstr "%s Ð·Ð°Ð±Ð»Ð¾ÐºÑÐ²Ð°Ð½Ñ ÐºÐ¾ÑÐ¸ÑÑÑÐ²Ð°ÑÑ"
-
-#: lib/groupnav.php:108
-#, php-format
-msgid "Edit %s group properties"
-msgstr "Ð ÐµÐ´Ð°Ð³ÑÐ²Ð°ÑÐ¸ Ð²Ð»Ð°ÑÑÐ¸Ð²Ð¾ÑÑÑ Ð³ÑÑÐ¿Ð¸ %s"
-
-#: lib/groupnav.php:113
-msgid "Logo"
-msgstr "ÐÐ¾Ð³Ð¾"
-
-#: lib/groupnav.php:114
-#, php-format
-msgid "Add or edit %s logo"
-msgstr "ÐÐ¾Ð´Ð°ÑÐ¸ Ð°Ð±Ð¾ ÑÐµÐ´Ð°Ð³ÑÐ²Ð°ÑÐ¸ Ð»Ð¾Ð³Ð¾ÑÐ¸Ð¿ %s"
-
-#: lib/groupnav.php:120
-#, php-format
-msgid "Add or edit %s design"
-msgstr "ÐÐ¾Ð´Ð°ÑÐ¸ Ð°Ð±Ð¾ ÑÐµÐ´Ð°Ð³ÑÐ²Ð°ÑÐ¸ Ð´Ð¸Ð·Ð°Ð¹Ð½ %s"
-
 #: lib/groupsbymemberssection.php:71
 msgid "Groups with most members"
 msgstr "ÐÑÑÐ¿Ð¸ Ð· Ð½Ð°Ð¹Ð±ÑÐ»ÑÑÐ¾Ñ ÐºÑÐ»ÑÐºÑÑÑÑ ÑÑÐ°ÑÐ½Ð¸ÐºÑÐ²"
@@ -6185,7 +6195,8 @@ msgstr "Ð¦ÐµÐ¹ ÑÐ°Ð¹Ð» Ð·Ð°Ð²ÐµÐ»Ð¸ÐºÐ¸Ð¹. ÐÐ°ÐºÑÐ¸Ð¼Ð°Ð»ÑÐ½Ð¸Ð¹ ÑÐ¾Ð·Ð¼Ñ
 msgid "Partial upload."
 msgstr "Ð§Ð°ÑÑÐºÐ¾Ð²Ðµ Ð·Ð°Ð²Ð°Ð½ÑÐ°Ð¶ÐµÐ½Ð½Ñ."
 
-#: lib/imagefile.php:101 lib/mediafile.php:170
+#. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
+#: lib/imagefile.php:101 lib/mediafile.php:179
 msgid "System error uploading file."
 msgstr "Ð¡Ð¸ÑÑÐµÐ¼Ð° Ð²ÑÐ´Ð¿Ð¾Ð²ÑÐ»Ð° Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ¾Ñ Ð¿ÑÐ¸ Ð·Ð°Ð²Ð°Ð½ÑÐ°Ð¶ÐµÐ½Ð½Ñ ÑÑÐ¾Ð³Ð¾ ÑÐ°Ð¹Ð»Ð°."
 
@@ -6590,15 +6601,18 @@ msgstr ""
 msgid "Unsupported message type: %s"
 msgstr "Ð¤Ð¾ÑÐ¼Ð°Ñ Ð¿Ð¾Ð²ÑÐ´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð½Ðµ Ð¿ÑÐ´ÑÑÐ¸Ð¼ÑÑÑÑÑÑ: %s"
 
-#: lib/mediafile.php:98 lib/mediafile.php:123
+#. TRANS: Client exception thrown when a database error was thrown during a file upload operation.
+#: lib/mediafile.php:99 lib/mediafile.php:125
 msgid "There was a database error while saving your file. Please try again."
 msgstr "ÐÐ¸Ð½Ð¸ÐºÐ»Ð° Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ° Ð¿ÑÐ´ ÑÐ°Ñ Ð·Ð°Ð²Ð°Ð½ÑÐ°Ð¶ÐµÐ½Ð½Ñ ÐÐ°ÑÐ¾Ð³Ð¾ ÑÐ°Ð¹Ð»Ñ. Ð¡Ð¿ÑÐ¾Ð±ÑÐ¹ÑÐµ ÑÐµ."
 
-#: lib/mediafile.php:142
+#. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
+#: lib/mediafile.php:145
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
 msgstr "ÐÐ°Ð²Ð°Ð½ÑÐ°Ð¶ÐµÐ½Ð¸Ð¹ ÑÐ°Ð¹Ð» Ð¿ÐµÑÐµÐ²Ð¸ÑÐ¸Ð² UPLOAD_MAX_FILESIZE Ð²ÐºÐ°Ð·Ð°Ð½Ð¸Ð¹ Ñ php.ini."
 
-#: lib/mediafile.php:147
+#. TRANS: Client exception.
+#: lib/mediafile.php:151
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form."
@@ -6606,44 +6620,43 @@ msgstr ""
 "ÐÐ°Ð²Ð°Ð½ÑÐ°Ð¶ÐµÐ½Ð¸Ð¹ ÑÐ°Ð¹Ð» Ð¿ÐµÑÐµÐ²Ð¸ÑÐ¸Ð² MAX_FILE_SIZE ÐºÐ¾ÑÑÐ¸Ð¹ Ð±ÑÐ»Ð¾ Ð²ÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¾ Ð´Ð»Ñ ÑÐ¾ÑÐ¼Ð¸ "
 "HTML."
 
-#: lib/mediafile.php:152
+#. TRANS: Client exception.
+#: lib/mediafile.php:157
 msgid "The uploaded file was only partially uploaded."
 msgstr "Ð¤Ð°Ð¹Ð» Ð±ÑÐ»Ð¾ Ð·Ð°Ð²Ð°Ð½ÑÐ°Ð¶ÐµÐ½Ð¾ ÑÐ°ÑÑÐºÐ¾Ð²Ð¾."
 
-#: lib/mediafile.php:159
+#. TRANS: Client exception thrown when a temporary folder is not present to store a file upload.
+#: lib/mediafile.php:165
 msgid "Missing a temporary folder."
 msgstr "ÐÐ°Ð³ÑÐ±Ð»ÐµÐ½Ð¾ ÑÐ¸Ð¼ÑÐ°ÑÐ¾Ð²Ñ ÑÐµÐºÑ."
 
-#: lib/mediafile.php:162
+#. TRANS: Client exception thrown when writing to disk is not possible during a file upload operation.
+#: lib/mediafile.php:169
 msgid "Failed to write file to disk."
 msgstr "ÐÐ°Ð¿Ð¸Ñ ÑÐ°Ð¹Ð»Ñ Ð½Ð° Ð´Ð¸ÑÐº ÑÐºÐ°ÑÐ¾Ð²Ð°Ð½Ð¾."
 
-#: lib/mediafile.php:165
+#. TRANS: Client exception thrown when a file upload operation has been stopped by an extension.
+#: lib/mediafile.php:173
 msgid "File upload stopped by extension."
 msgstr "ÐÐ°Ð²Ð°Ð½ÑÐ°Ð¶ÐµÐ½Ð½Ñ ÑÐ°Ð¹Ð»Ñ Ð·ÑÐ¿Ð¸Ð½ÐµÐ½Ð¾ ÑÐ¾Ð·ÑÐ¸ÑÐµÐ½Ð½ÑÐ¼."
 
-#: lib/mediafile.php:179 lib/mediafile.php:217
+#. TRANS: Client exception thrown when a file upload operation would cause a user to exceed a set quota.
+#: lib/mediafile.php:189 lib/mediafile.php:232
 msgid "File exceeds user's quota."
 msgstr "Ð¤Ð°Ð¹Ð» Ð¿ÐµÑÐµÐ²Ð¸ÑÐ¸Ð² ÐºÐ²Ð¾ÑÑ ÐºÐ¾ÑÐ¸ÑÑÑÐ²Ð°ÑÐ°."
 
-#: lib/mediafile.php:197 lib/mediafile.php:234
+#. TRANS: Client exception thrown when a file upload operation fails because the file could
+#. TRANS: not be moved from the temporary folder to the permanent file location.
+#: lib/mediafile.php:209 lib/mediafile.php:251
 msgid "File could not be moved to destination directory."
 msgstr "Ð¤Ð°Ð¹Ð» Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ð±ÑÑÐ¸ Ð¿ÐµÑÐµÐ¼ÑÑÐµÐ½Ð¸Ð¹ Ñ Ð´Ð¸ÑÐµÐºÑÐ¾ÑÑÑ Ð¿ÑÐ¸Ð·Ð½Ð°ÑÐµÐ½Ð½Ñ."
 
-#: lib/mediafile.php:202 lib/mediafile.php:238
+#. TRANS: Client exception thrown when a file upload operation has been stopped because the MIME
+#. TRANS: type of the uploaded file could not be determined.
+#: lib/mediafile.php:216 lib/mediafile.php:257
 msgid "Could not determine file's MIME type."
 msgstr "ÐÐµ Ð²Ð´Ð°ÑÑÑÑÑ Ð²Ð¸Ð·Ð½Ð°ÑÐ¸ÑÐ¸ MIME-ÑÐ¸Ð¿ ÑÐ°Ð¹Ð»Ñ."
 
-#: lib/mediafile.php:318
-#, php-format
-msgid " Try using another %s format."
-msgstr " Ð¡Ð¿ÑÐ¾Ð±ÑÐ¹ÑÐµ Ð²Ð¸ÐºÐ¾ÑÐ¸ÑÑÐ°ÑÐ¸ ÑÐ½ÑÐ¸Ð¹ %s ÑÐ¾ÑÐ¼Ð°Ñ."
-
-#: lib/mediafile.php:323
-#, php-format
-msgid "%s is not a supported file type on this server."
-msgstr "%s Ð½Ðµ Ð¿ÑÐ´ÑÑÐ¸Ð¼ÑÑÑÑÑÑ ÑÐº ÑÐ¸Ð¿ ÑÐ°Ð¹Ð»ÑÐ² Ð½Ð° ÑÑÐ¾Ð¼Ñ ÑÐµÑÐ²ÐµÑÑ."
-
 #: lib/messageform.php:120
 msgid "Send a direct notice"
 msgstr "ÐÐ°Ð´ÑÑÐ»Ð°ÑÐ¸ Ð¿ÑÑÐ¼Ð¸Ð¹ Ð´Ð¾Ð¿Ð¸Ñ"
@@ -6759,27 +6772,7 @@ msgstr "Â«Ð Ð¾Ð·ÑÑÐ¾Ð²ÑÐ°ÑÐ¸Â»"
 msgid "Send a nudge to this user"
 msgstr "Ð¡Ð¿ÑÐ¾Ð±ÑÐ²Ð°ÑÐ¸ Â«ÑÐ¾Ð·ÑÑÐ¾Ð²ÑÐ°ÑÐ¸Â» ÑÑÐ¾Ð³Ð¾ ÐºÐ¾ÑÐ¸ÑÑÑÐ²Ð°ÑÐ°"
 
-#: lib/oauthstore.php:283
-msgid "Error inserting new profile"
-msgstr "ÐÐ¾Ð¼Ð¸Ð»ÐºÐ° Ð¿ÑÐ¸ Ð´Ð¾Ð´Ð°Ð²Ð°Ð½Ð½Ñ Ð½Ð¾Ð²Ð¾Ð³Ð¾ Ð¿ÑÐ¾ÑÑÐ»Ñ"
-
-#: lib/oauthstore.php:291
-msgid "Error inserting avatar"
-msgstr "ÐÐ¾Ð¼Ð¸Ð»ÐºÐ° Ð¿ÑÐ¸ Ð´Ð¾Ð´Ð°Ð²Ð°Ð½Ð½Ñ Ð°Ð²Ð°ÑÐ°ÑÐ¸"
-
-#: lib/oauthstore.php:306
-msgid "Error updating remote profile"
-msgstr "ÐÐ¾Ð¼Ð¸Ð»ÐºÐ° Ð¿ÑÐ¸ Ð¾Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð²ÑÐ´Ð´Ð°Ð»ÐµÐ½Ð¾Ð³Ð¾ Ð¿ÑÐ¾ÑÑÐ»Ñ"
-
-#: lib/oauthstore.php:311
-msgid "Error inserting remote profile"
-msgstr "ÐÐ¾Ð¼Ð¸Ð»ÐºÐ° Ð¿ÑÐ¸ Ð´Ð¾Ð´Ð°Ð²Ð°Ð½Ð½Ñ Ð²ÑÐ´Ð´Ð°Ð»ÐµÐ½Ð¾Ð³Ð¾ Ð¿ÑÐ¾ÑÑÐ»Ñ"
-
-#: lib/oauthstore.php:345
-msgid "Duplicate notice"
-msgstr "ÐÑÐ±Ð»ÑÐºÐ°Ñ Ð´Ð¾Ð¿Ð¸ÑÑ"
-
-#: lib/oauthstore.php:490
+#: lib/oauthstore.php:491
 msgid "Couldn't insert new subscription."
 msgstr "ÐÐµ Ð²Ð´Ð°Ð»Ð¾ÑÑ Ð´Ð¾Ð´Ð°ÑÐ¸ Ð½Ð¾Ð²Ñ Ð¿ÑÐ´Ð¿Ð¸ÑÐºÑ."
 
@@ -6816,7 +6809,8 @@ msgstr "ÐÐ°Ð´ÑÑÐ»Ð°Ð½Ñ Ð²Ð°Ð¼Ð¸ Ð¿Ð¾Ð²ÑÐ´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ"
 msgid "Tags in %s's notices"
 msgstr "Ð¢ÐµÒÐ¸ Ñ Ð´Ð¾Ð¿Ð¸ÑÐ°Ñ %s"
 
-#: lib/plugin.php:115
+#. TRANS: Displayed as version information for a plugin if no version information was found.
+#: lib/plugin.php:116
 msgid "Unknown"
 msgstr "ÐÐµÐ²ÑÐ´Ð¾Ð¼Ð¾"
 
@@ -6910,19 +6904,19 @@ msgstr "ÐÑÑÐ¾ÑÐ½Ð¸ÑÑ"
 msgid "Sandbox this user"
 msgstr "ÐÐ·Ð¾Ð»ÑÐ²Ð°ÑÐ¸, Ð²ÑÐ´ÑÑÐ»Ð°ÑÐ¸ ÐºÐ¾ÑÐ¸ÑÑÑÐ²Ð°ÑÐ° Ð³ÑÐ°ÑÐ¸ÑÑ Ñ Ð¿ÑÑÐ¾ÑÐ½Ð¸ÑÑ"
 
-#: lib/searchaction.php:120
+#. TRANS: Fieldset legend for the search form.
+#: lib/searchaction.php:121
 msgid "Search site"
 msgstr "ÐÐ¾ÑÑÐº"
 
-#: lib/searchaction.php:126
+#. TRANS: Used as a field label for the field where one or more keywords
+#. TRANS: for searching can be entered.
+#: lib/searchaction.php:129
 msgid "Keyword(s)"
 msgstr "ÐÐ»ÑÑÐ¾Ð²Ñ ÑÐ»Ð¾Ð²Ð°"
 
-#: lib/searchaction.php:127
-msgid "Search"
-msgstr "ÐÐ¾ÑÑÐº"
-
-#: lib/searchaction.php:162
+#. TRANS: Definition list item with instructions on how to get (better) search results.
+#: lib/searchaction.php:170
 msgid "Search help"
 msgstr "ÐÐ¾ÑÑÐº"
 
@@ -7123,56 +7117,32 @@ msgid "Moderator"
 msgstr "ÐÐ¾Ð´ÐµÑÐ°ÑÐ¾Ñ"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1102
+#: lib/util.php:1103
 msgid "a few seconds ago"
 msgstr "Ð¼Ð¸ÑÑ ÑÐ¾Ð¼Ñ"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1105
+#: lib/util.php:1106
 msgid "about a minute ago"
 msgstr "ÑÐ²Ð¸Ð»Ð¸Ð½Ñ ÑÐ¾Ð¼Ñ"
 
-#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1109
-#, php-format
-msgid "about %d minutes ago"
-msgstr "Ð±Ð»Ð¸Ð·ÑÐºÐ¾ %d ÑÐ²Ð¸Ð»Ð¸Ð½ ÑÐ¾Ð¼Ñ"
-
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 #: lib/util.php:1112
 msgid "about an hour ago"
 msgstr "Ð³Ð¾Ð´Ð¸Ð½Ñ ÑÐ¾Ð¼Ñ"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1116
-#, php-format
-msgid "about %d hours ago"
-msgstr "Ð±Ð»Ð¸Ð·ÑÐºÐ¾ %d Ð³Ð¾Ð´Ð¸Ð½ ÑÐ¾Ð¼Ñ"
-
-#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1119
+#: lib/util.php:1118
 msgid "about a day ago"
 msgstr "Ð´ÐµÐ½Ñ ÑÐ¾Ð¼Ñ"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1123
-#, php-format
-msgid "about %d days ago"
-msgstr "Ð±Ð»Ð¸Ð·ÑÐºÐ¾ %d Ð´Ð½ÑÐ² ÑÐ¾Ð¼Ñ"
-
-#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1126
+#: lib/util.php:1124
 msgid "about a month ago"
 msgstr "Ð¼ÑÑÑÑÑ ÑÐ¾Ð¼Ñ"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 #: lib/util.php:1130
-#, php-format
-msgid "about %d months ago"
-msgstr "Ð±Ð»Ð¸Ð·ÑÐºÐ¾ %d Ð¼ÑÑÑÑÑÐ² ÑÐ¾Ð¼Ñ"
-
-#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1133
 msgid "about a year ago"
 msgstr "ÑÑÐº ÑÐ¾Ð¼Ñ"
 
diff --git a/locale/vi/LC_MESSAGES/statusnet.po b/locale/vi/LC_MESSAGES/statusnet.po
index bd15203297..4759a8edc4 100644
--- a/locale/vi/LC_MESSAGES/statusnet.po
+++ b/locale/vi/LC_MESSAGES/statusnet.po
@@ -1,6 +1,7 @@
-# Translation of StatusNet to Vietnamese
+# Translation of StatusNet to Vietnamese (Tiáº¿ng Viá»t)
+# Expored from translatewiki.net
 #
-# Author@translatewiki.net: Minh Nguyen
+# Author: Minh Nguyen
 # --
 # This file is distributed under the same license as the StatusNet package.
 #
@@ -8,20 +9,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-08 22:33+0000\n"
-"PO-Revision-Date: 2010-09-08 22:35:41+0000\n"
-"Language-Team: Vietnamese\n"
+"POT-Creation-Date: 2010-09-14 19:53+0000\n"
+"PO-Revision-Date: 2010-09-14 19:54:24+0000\n"
+"Language-Team: Vietnamese <http://translatewiki.net/wiki/Portal:vi>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r72348); Translate extension (2010-08-20)\n"
+"X-Generator: MediaWiki 1.17alpha (r73009); Translate extension (2010-08-20)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: vi\n"
-"X-Message-Group: out-statusnet\n"
+"X-Message-Group: #out-statusnet\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
+"X-POT-Import-Date: 1284-49-16 34::+0000\n"
 
 #. TRANS: Page title
 #. TRANS: Menu item for site administration
-#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:376
+#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:363
 msgid "Access"
 msgstr "Truy cáºp"
 
@@ -59,25 +61,25 @@ msgstr "ÄÃ³ng"
 #. 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 actions/emailsettings.php:224
-#: actions/imsettings.php:184 actions/smssettings.php:209
-#: lib/applicationeditform.php:361
+#. TRANS: Button label in the "Edit application" form.
+#: actions/accessadminpanel.php:203 actions/emailsettings.php:228
+#: actions/imsettings.php:187 actions/smssettings.php:209
+#: lib/applicationeditform.php:351
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "LÆ°u"
 
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #: actions/all.php:79 actions/allrss.php:68
-#: actions/apiaccountupdatedeliverydevice.php:114
-#: actions/apiaccountupdateprofile.php:105
-#: actions/apiaccountupdateprofilebackgroundimage.php:116
-#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
-#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
-#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:113
-#: actions/apigroupismember.php:91 actions/apigroupjoin.php:100
-#: actions/apigroupleave.php:100 actions/apigrouplist.php:73
-#: actions/apistatusesupdate.php:229 actions/apisubscriptions.php:87
+#: actions/apiaccountupdatedeliverydevice.php:115
+#: actions/apiaccountupdateprofile.php:106
+#: actions/apiaccountupdateprofilebackgroundimage.php:117
+#: actions/apiaccountupdateprofileimage.php:106 actions/apiblockcreate.php:98
+#: actions/apiblockdestroy.php:97 actions/apidirectmessage.php:77
+#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:114
+#: actions/apigroupismember.php:91 actions/apigroupjoin.php:101
+#: actions/apigroupleave.php:101 actions/apigrouplist.php:73
+#: actions/apistatusesupdate.php:230 actions/apisubscriptions.php:87
 #: actions/apitimelinefavorites.php:72 actions/apitimelinefriends.php:174
 #: actions/apitimelinehome.php:80 actions/apitimelinementions.php:80
 #: actions/apitimelineuser.php:82 actions/avatarbynickname.php:75
@@ -136,39 +138,41 @@ msgstr ""
 msgid "You and friends"
 msgstr "Báº¡n vÃ  báº¡n bÃ¨"
 
-#: actions/apiaccountupdatedeliverydevice.php:86
-#: actions/apiaccountupdateprofile.php:89
-#: actions/apiaccountupdateprofilebackgroundimage.php:86
-#: actions/apiaccountupdateprofilecolors.php:110
-#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89
-#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109
-#: actions/apifavoritecreate.php:91 actions/apifavoritedestroy.php:92
-#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
-#: actions/apigroupcreate.php:105 actions/apigroupjoin.php:92
-#: actions/apigroupleave.php:92 actions/apimediaupload.php:67
-#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:198
+#. TRANS: Client error message. POST is a HTTP command. It should not be translated.
+#. TRANS: Client error. POST is a HTTP command. It should not be translated.
+#: actions/apiaccountupdatedeliverydevice.php:87
+#: actions/apiaccountupdateprofile.php:90
+#: actions/apiaccountupdateprofilebackgroundimage.php:87
+#: actions/apiaccountupdateprofilecolors.php:111
+#: actions/apiaccountupdateprofileimage.php:85 actions/apiblockcreate.php:90
+#: actions/apiblockdestroy.php:89 actions/apidirectmessagenew.php:110
+#: actions/apifavoritecreate.php:92 actions/apifavoritedestroy.php:93
+#: actions/apifriendshipscreate.php:92 actions/apifriendshipsdestroy.php:92
+#: actions/apigroupcreate.php:106 actions/apigroupjoin.php:93
+#: actions/apigroupleave.php:93 actions/apimediaupload.php:68
+#: actions/apistatusesretweet.php:66 actions/apistatusesupdate.php:199
 msgid "This method requires a POST."
 msgstr "PhÆ°Æ¡ng thá»©c nÃ y yÃªu cáº§u lÃ  POST."
 
-#: actions/apiaccountupdatedeliverydevice.php:106
+#: actions/apiaccountupdatedeliverydevice.php:107
 msgid ""
 "You must specify a parameter named 'device' with a value of one of: sms, im, "
 "none."
 msgstr ""
 
-#: actions/apiaccountupdateprofile.php:112
-#: actions/apiaccountupdateprofilebackgroundimage.php:194
-#: actions/apiaccountupdateprofilecolors.php:185
-#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/apiaccountupdateprofile.php:113
+#: actions/apiaccountupdateprofilebackgroundimage.php:195
+#: actions/apiaccountupdateprofilecolors.php:186
+#: actions/apiaccountupdateprofileimage.php:131 actions/apiusershow.php:108
 #: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/hcard.php:74
 #: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
 #: lib/profileaction.php:84
 msgid "User has no profile."
 msgstr "NgÆ°á»i dÃ¹ng khÃ´ng cÃ³ thÃ´ng tin."
 
-#: actions/apiaccountupdateprofilebackgroundimage.php:108
-#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
-#: actions/apistatusesupdate.php:212 actions/avatarsettings.php:257
+#: actions/apiaccountupdateprofilebackgroundimage.php:109
+#: actions/apiaccountupdateprofileimage.php:98 actions/apimediaupload.php:81
+#: actions/apistatusesupdate.php:213 actions/avatarsettings.php:257
 #: actions/designadminpanel.php:123 actions/editapplication.php:118
 #: actions/newapplication.php:101 actions/newnotice.php:94
 #: lib/designsettings.php:283
@@ -178,10 +182,6 @@ msgid ""
 "current configuration."
 msgstr ""
 
-#: actions/apiblockcreate.php:105
-msgid "You cannot block yourself!"
-msgstr ""
-
 #: actions/apidirectmessage.php:89
 #, php-format
 msgid "Direct messages from %s"
@@ -192,44 +192,45 @@ msgstr "Báº¡n cÃ³ tin nháº¯n riÃªng tá»« %s"
 msgid "Direct messages to %s"
 msgstr "Báº¡n cÃ³ tin nháº¯n riÃªng tá»« %s"
 
-#: actions/apidirectmessagenew.php:127 actions/newmessage.php:150
+#: actions/apidirectmessage.php:105
+#, php-format
+msgid "All the direct messages sent to %s"
+msgstr ""
+
+#: actions/apidirectmessagenew.php:128 actions/newmessage.php:150
 #, php-format
 msgid "That's too long. Max message size is %d chars."
 msgstr ""
 "Báº¡n cÃ³ thá» cáºp nháºt há» sÆ¡ cÃ¡ nhÃ¢n táº¡i ÄÃ¢y Äá» má»i ngÆ°á»i cÃ³ thá» biáº¿t thÃ´ng tin "
 "vá» báº¡n."
 
-#: actions/apidirectmessagenew.php:138
+#: actions/apidirectmessagenew.php:139
 msgid "Recipient user not found."
 msgstr "KhÃ´ng tÃ¬m tháº¥y mÃ£ xÃ¡c nháºn."
 
-#: actions/apidirectmessagenew.php:142
+#: actions/apidirectmessagenew.php:143
 msgid "Can't send direct messages to users who aren't your friend."
 msgstr ""
 
-#: actions/apifavoritecreate.php:109 actions/apifavoritedestroy.php:110
+#: actions/apifavoritecreate.php:110 actions/apifavoritedestroy.php:111
 #: actions/apistatusesdestroy.php:121
 msgid "No status found with that ID."
 msgstr "KhÃ´ng tÃ¬m tháº¥y tráº¡ng thÃ¡i nÃ o tÆ°Æ¡ng á»©ng vá»i ID ÄÃ³."
 
 #. TRANS: Error message text shown when a favorite could not be set.
-#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:296
+#: actions/apifavoritecreate.php:132 actions/favor.php:84 lib/command.php:296
 msgid "Could not create favorite."
 msgstr "KhÃ´ng thá» táº¡o favorite."
 
-#: actions/apifavoritedestroy.php:123
+#: actions/apifavoritedestroy.php:124
 msgid "That status is not a favorite."
 msgstr "KhÃ´ng thá» táº¡o favorite."
 
-#: actions/apifriendshipscreate.php:118
+#: actions/apifriendshipscreate.php:119
 #, php-format
 msgid "Could not follow user: %s is already on your list."
 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/apifriendshipsdestroy.php:120
-msgid "You cannot unfollow yourself."
-msgstr ""
-
 #: actions/apifriendshipsexists.php:91
 msgid "Two valid IDs or screen_names must be supplied."
 msgstr ""
@@ -242,87 +243,81 @@ msgstr "KhÃ´ng thá» cáºp nháºt thÃ nh viÃªn."
 msgid "Could not find target user."
 msgstr "KhÃ´ng thá» cáºp nháºt thÃ nh viÃªn."
 
-#: actions/apigroupcreate.php:167 actions/editgroup.php:186
+#: actions/apigroupcreate.php:168 actions/editgroup.php:186
 #: actions/newgroup.php:126 actions/profilesettings.php:215
 #: actions/register.php:212
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr "Biá»t hiá»u pháº£i lÃ  chá»¯ viáº¿t thÆ°á»ng hoáº·c sá» vÃ  khÃ´ng cÃ³ khoáº£ng tráº¯ng."
 
-#: actions/apigroupcreate.php:176 actions/editgroup.php:190
+#: actions/apigroupcreate.php:177 actions/editgroup.php:190
 #: actions/newgroup.php:130 actions/profilesettings.php:238
 #: actions/register.php:215
 msgid "Nickname already in use. Try another one."
 msgstr "Biá»t hiá»u nÃ y ÄÃ£ dÃ¹ng rá»i. HÃ£y nháºp biá»t hiá»u khÃ¡c."
 
-#: actions/apigroupcreate.php:183 actions/editgroup.php:193
+#: actions/apigroupcreate.php:184 actions/editgroup.php:193
 #: actions/newgroup.php:133 actions/profilesettings.php:218
 #: actions/register.php:217
 msgid "Not a valid nickname."
 msgstr "Biá»t hiá»u khÃ´ng há»£p lá»."
 
-#: actions/apigroupcreate.php:199 actions/editapplication.php:215
+#: actions/apigroupcreate.php:200 actions/editapplication.php:215
 #: actions/editgroup.php:199 actions/newapplication.php:203
 #: actions/newgroup.php:139 actions/profilesettings.php:222
 #: actions/register.php:224
 msgid "Homepage is not a valid URL."
 msgstr "Trang chá»§ khÃ´ng pháº£i lÃ  URL"
 
-#: actions/apigroupcreate.php:208 actions/editgroup.php:202
+#: actions/apigroupcreate.php:209 actions/editgroup.php:202
 #: actions/newgroup.php:142 actions/profilesettings.php:225
 #: actions/register.php:227
 msgid "Full name is too long (max 255 chars)."
 msgstr "TÃªn Äáº§y Äá»§ quÃ¡ dÃ i (tá»i Äa lÃ  255 kÃ½ tá»±)."
 
-#: actions/apigroupcreate.php:216 actions/editapplication.php:190
+#: actions/apigroupcreate.php:217 actions/editapplication.php:190
 #: actions/newapplication.php:172
 #, php-format
 msgid "Description is too long (max %d chars)."
 msgstr "TÃªn khu vá»±c quÃ¡ dÃ i (khÃ´ng quÃ¡ %d kÃ½ tá»±)."
 
-#: actions/apigroupcreate.php:227 actions/editgroup.php:208
+#: actions/apigroupcreate.php:228 actions/editgroup.php:208
 #: actions/newgroup.php:148 actions/profilesettings.php:232
 #: actions/register.php:234
 msgid "Location is too long (max 255 chars)."
 msgstr "TÃªn khu vá»±c quÃ¡ dÃ i (khÃ´ng quÃ¡ 255 kÃ½ tá»±)."
 
-#: actions/apigroupcreate.php:246 actions/editgroup.php:219
+#: actions/apigroupcreate.php:247 actions/editgroup.php:219
 #: actions/newgroup.php:159
 #, php-format
 msgid "Too many aliases! Maximum %d."
 msgstr ""
 
-#: actions/apigroupcreate.php:267
+#: actions/apigroupcreate.php:268
 #, php-format
 msgid "Invalid alias: \"%s\"."
 msgstr "Äá»a chá» email khÃ´ng ÄÃºng:%s"
 
-#: actions/apigroupcreate.php:289 actions/editgroup.php:238
+#: actions/apigroupcreate.php:290 actions/editgroup.php:238
 #: actions/newgroup.php:178
 msgid "Alias can't be the same as nickname."
 msgstr ""
 
-#: actions/apigroupismember.php:96 actions/apigroupjoin.php:105
-#: actions/apigroupleave.php:105 actions/apigroupmembership.php:92
+#: actions/apigroupismember.php:96 actions/apigroupjoin.php:106
+#: actions/apigroupleave.php:106 actions/apigroupmembership.php:92
 #: actions/apigroupshow.php:83 actions/apitimelinegroup.php:92
 msgid "Group not found."
 msgstr "KhÃ´ng tÃ¬m tháº¥y nhÃ³m."
 
 #. TRANS: Error text shown a user tries to join a group they already are a member of.
-#: actions/apigroupjoin.php:111 actions/joingroup.php:100 lib/command.php:336
+#: actions/apigroupjoin.php:112 actions/joingroup.php:100 lib/command.php:336
 msgid "You are already a member of that group."
 msgstr "Báº¡n chÆ°a cáºp nháºt thÃ´ng tin riÃªng"
 
 #. TRANS: Error text shown when a user tries to join a group they are blocked from joining.
-#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:341
+#: actions/apigroupjoin.php:121 actions/joingroup.php:105 lib/command.php:341
 msgid "You have been blocked from that group by the admin."
 msgstr ""
 
-#. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s
-#: actions/apigrouplist.php:108
-#, php-format
-msgid "%1$s groups %2$s is a member of."
-msgstr ""
-
 #. TRANS: Message is used as a title. %s is a site name.
 #. TRANS: Message is used as a page title. %s is a nick name.
 #: actions/apigrouplistall.php:92 actions/usergroups.php:63
@@ -336,9 +331,9 @@ msgstr ""
 
 #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
 #: actions/deletenotice.php:169 actions/disfavor.php:74
-#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:55
+#: actions/emailsettings.php:271 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:66 actions/imsettings.php:227
+#: actions/groupunblock.php:66 actions/imsettings.php:230
 #: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
@@ -369,8 +364,8 @@ msgstr ""
 #. 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:286 actions/grouplogo.php:322
-#: actions/imsettings.php:242 actions/newapplication.php:121
+#: actions/emailsettings.php:290 actions/grouplogo.php:322
+#: actions/imsettings.php:245 actions/newapplication.php:121
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
 #: actions/smssettings.php:277 lib/designsettings.php:304
 msgid "Unexpected form submission."
@@ -431,18 +426,18 @@ msgstr "PhÆ°Æ¡ng thá»©c nÃ y yÃªu cáº§u lÃ  POST hoáº·c DELETE"
 msgid "You may not delete another user's status."
 msgstr "Báº¡n ÄÃ£ khÃ´ng xÃ³a tráº¡ng thÃ¡i cá»§a nhá»¯ng ngÆ°á»i khÃ¡c."
 
-#: actions/apistatusesretweet.php:75 actions/apistatusesretweets.php:72
+#: actions/apistatusesretweet.php:76 actions/apistatusesretweets.php:72
 #: actions/deletenotice.php:52 actions/shownotice.php:92
 msgid "No such notice."
 msgstr "KhÃ´ng cÃ³ tin nháº¯n nÃ o."
 
 #. TRANS: Error text shown when trying to repeat an own notice.
-#: actions/apistatusesretweet.php:83 lib/command.php:538
+#: actions/apistatusesretweet.php:84 lib/command.php:538
 msgid "Cannot repeat your own notice."
 msgstr "KhÃ´ng thá» xÃ³a tin nháº¯n nÃ y."
 
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-#: actions/apistatusesretweet.php:91 lib/command.php:544
+#: actions/apistatusesretweet.php:92 lib/command.php:544
 msgid "Already repeated that notice."
 msgstr "KhÃ´ng thá» xÃ³a tin nháº¯n nÃ y."
 
@@ -450,15 +445,15 @@ msgstr "KhÃ´ng thá» xÃ³a tin nháº¯n nÃ y."
 msgid "No status with that ID found."
 msgstr "KhÃ´ng tÃ¬m tháº¥y tráº¡ng thÃ¡i nÃ o tÆ°Æ¡ng á»©ng vá»i ID ÄÃ³."
 
-#: actions/apistatusesupdate.php:221
+#: actions/apistatusesupdate.php:222
 msgid "Client must provide a 'status' parameter with a value."
 msgstr ""
 
-#: actions/apistatusesupdate.php:283 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:284 actions/apiusershow.php:96
 msgid "Not found."
 msgstr "KhÃ´ng tÃ¬m tháº¥y."
 
-#: actions/apistatusesupdate.php:306 actions/newnotice.php:181
+#: actions/apistatusesupdate.php:307 actions/newnotice.php:181
 #, php-format
 msgid "Max notice size is %d chars, including attachment URL."
 msgstr ""
@@ -478,6 +473,11 @@ msgstr "DÃ²ng tin nháº¯n cho %s"
 msgid "%1$s / Updates mentioning %2$s"
 msgstr "Tráº¡ng thÃ¡i cá»§a %1$s vÃ o %2$s"
 
+#: actions/apitimelinementions.php:131
+#, php-format
+msgid "%1$s updates that reply to updates from %2$s / %3$s."
+msgstr ""
+
 #: actions/apitimelinepublic.php:202 actions/publicrss.php:105
 #, php-format
 msgid "%s updates from everyone!"
@@ -574,20 +574,10 @@ msgid ""
 "will not be notified of any @-replies from them."
 msgstr ""
 
-#. 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:153 actions/deleteapplication.php:154
-#: actions/deletenotice.php:147 actions/deleteuser.php:152
-#: actions/groupblock.php:178
-msgctxt "BUTTON"
-msgid "No"
-msgstr ""
-
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
+#. TRANS: Submit button title.
+#. TRANS: Description of the form to block a user.
+#: actions/block.php:164 actions/groupmembers.php:403 lib/blockform.php:82
 msgid "Block this user"
 msgstr "Bá» cháº·n ngÆ°á»i dÃ¹ng nÃ y"
 
@@ -611,20 +601,17 @@ msgstr ""
 msgid "No such group."
 msgstr "KhÃ´ng cÃ³ user nÃ o."
 
-#: actions/blockedfromgroup.php:100
-#, php-format
-msgid "%1$s blocked profiles, page %2$d"
-msgstr ""
-
 #: actions/blockedfromgroup.php:115
 msgid "A list of the users blocked from joining this group."
 msgstr ""
 
-#: actions/blockedfromgroup.php:320 lib/unblockform.php:69
+#. TRANS: Title for the form to unblock a user.
+#: actions/blockedfromgroup.php:320 lib/unblockform.php:70
 msgid "Unblock"
 msgstr "Bá» cháº·n"
 
-#: actions/blockedfromgroup.php:320 lib/unblockform.php:80
+#. TRANS: Description of the form to unblock a user.
+#: actions/blockedfromgroup.php:320 lib/unblockform.php:82
 msgid "Unblock this user"
 msgstr "Bá» cháº·n ngÆ°á»i dÃ¹ng nÃ y"
 
@@ -646,12 +633,6 @@ msgstr "KhÃ´ng tÃ¬m tháº¥y mÃ£ xÃ¡c nháºn."
 msgid "That confirmation code is not for you!"
 msgstr "MÃ£ xÃ¡c nháºn nÃ y khÃ´ng pháº£i cá»§a báº¡n!"
 
-#. TRANS: Server error for an unknow address type, which can be 'email', 'jabber', or 'sms'.
-#: actions/confirmaddress.php:91
-#, php-format
-msgid "Unrecognized address type %s."
-msgstr ""
-
 #. TRANS: Client error for an already confirmed email/jabbel/sms address.
 #: actions/confirmaddress.php:96
 msgid "That address has already been confirmed."
@@ -663,9 +644,9 @@ msgstr "Äá»a chá» ÄÃ³ ÄÃ£ ÄÆ°á»£c xÃ¡c nháºn rá»i."
 #. 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/confirmaddress.php:116 actions/emailsettings.php:331
+#: actions/emailsettings.php:477 actions/imsettings.php:283
+#: actions/imsettings.php:442 actions/othersettings.php:174
 #: actions/profilesettings.php:283 actions/smssettings.php:308
 #: actions/smssettings.php:464
 msgid "Couldn't update user."
@@ -673,7 +654,7 @@ msgstr "KhÃ´ng thá» cáºp nháºt thÃ nh viÃªn."
 
 #. 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/confirmaddress.php:128 actions/emailsettings.php:437
 #: actions/smssettings.php:422
 msgid "Couldn't delete email confirmation."
 msgstr "KhÃ´ng thá» xÃ³a email xÃ¡c nháºn."
@@ -713,7 +694,7 @@ msgstr ""
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
 #: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:73 lib/profileformaction.php:64
+#: lib/adminpanelaction.php:71 lib/profileformaction.php:64
 #: lib/settingsaction.php:72
 msgid "Not logged in."
 msgstr "ChÆ°a ÄÄng nháºp."
@@ -722,12 +703,6 @@ msgstr "ChÆ°a ÄÄng nháºp."
 msgid "Can't delete this notice."
 msgstr "KhÃ´ng thá» xÃ³a tin nháº¯n nÃ y."
 
-#: actions/deletenotice.php:103
-msgid ""
-"You are about to permanently delete a notice. Once this is done, it cannot "
-"be undone."
-msgstr ""
-
 #: actions/deletenotice.php:109 actions/deletenotice.php:141
 msgid "Delete notice"
 msgstr "XÃ³a tin nháº¯n"
@@ -749,7 +724,6 @@ msgstr ""
 #. TRANS: Message used as title for design settings for the site.
 #. TRANS: Link description in user account settings menu.
 #: actions/designadminpanel.php:63 lib/accountsettingsaction.php:139
-#: lib/groupnav.php:119
 msgid "Design"
 msgstr ""
 
@@ -757,11 +731,6 @@ msgstr ""
 msgid "Design settings for this StatusNet site."
 msgstr ""
 
-#: actions/designadminpanel.php:322
-#, php-format
-msgid "Theme not available: %s."
-msgstr ""
-
 #: actions/designadminpanel.php:426
 msgid "Change logo"
 msgstr "Thay Äá»i"
@@ -770,23 +739,10 @@ msgstr "Thay Äá»i"
 msgid "Theme for the site."
 msgstr ""
 
-#: actions/designadminpanel.php:467
-msgid "Custom theme"
-msgstr ""
-
 #: actions/designadminpanel.php:471
 msgid "You can upload a custom StatusNet theme as a .ZIP archive."
 msgstr ""
 
-#: actions/designadminpanel.php:486 lib/designsettings.php:101
-msgid "Change background image"
-msgstr ""
-
-#: actions/designadminpanel.php:491 actions/designadminpanel.php:574
-#: lib/designsettings.php:178
-msgid "Background"
-msgstr ""
-
 #. TRANS: Used as radio button label to add a background image.
 #: actions/designadminpanel.php:527 lib/designsettings.php:139
 msgid "On"
@@ -801,10 +757,6 @@ msgstr ""
 msgid "Turn background image on or off."
 msgstr ""
 
-#: actions/designadminpanel.php:550 lib/designsettings.php:161
-msgid "Tile background image"
-msgstr ""
-
 #: actions/designadminpanel.php:613 lib/designsettings.php:217
 msgid "Text"
 msgstr "Chuá»i báº¥t ká»³"
@@ -829,21 +781,17 @@ msgstr ""
 msgid "Reset back to default"
 msgstr ""
 
-#. TRANS: Submit button title
+#. TRANS: Submit button title.
 #: actions/designadminpanel.php:685 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/snapshotadminpanel.php:245
 #: actions/subscriptions.php:226 actions/tagother.php:154
-#: actions/useradminpanel.php:294 lib/applicationeditform.php:363
+#: actions/useradminpanel.php:294 lib/applicationeditform.php:353
 #: lib/designsettings.php:256 lib/groupeditform.php:202
 msgid "Save"
 msgstr "LÆ°u"
 
-#: actions/designadminpanel.php:686 lib/designsettings.php:257
-msgid "Save design"
-msgstr ""
-
 #: actions/disfavor.php:94
 msgid "Add to favorites"
 msgstr "Æ¯a thÃch"
@@ -853,8 +801,8 @@ msgstr "Æ¯a thÃch"
 msgid "No such document \"%s\""
 msgstr "KhÃ´ng cÃ³ tin nháº¯n nÃ o."
 
-#: actions/editapplication.php:54
-msgid "Edit Application"
+#: actions/editapplication.php:161
+msgid "Use this form to edit your application."
 msgstr ""
 
 #: actions/editapplication.php:194
@@ -918,7 +866,7 @@ msgstr "ÄÃ£ xÃ¡c nháºn Äá»a chá» nÃ y."
 #. 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/emailsettings.php:115 actions/emailsettings.php:162
 #: actions/imsettings.php:116 actions/smssettings.php:124
 #: actions/smssettings.php:180
 msgctxt "BUTTON"
@@ -933,112 +881,97 @@ 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: Instructions for e-mail address input form.
-#: actions/emailsettings.php:135
-msgid "Email address, like \"UserName@example.org\""
-msgstr ""
-
-#. 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"
+#. TRANS: Form legend for incoming e-mail settings form.
+#. TRANS: Form legend for incoming SMS settings form.
+#: actions/emailsettings.php:151 actions/smssettings.php:171
+msgid "Incoming email"
 msgstr ""
 
 #. 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
+#: actions/emailsettings.php:159 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."
 
 #. 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
+#: actions/emailsettings.php:168 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 "
 
-#. 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 ""
-
 #. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:174
+#: actions/emailsettings.php:178
 msgid "Email preferences"
 msgstr "Äá»a chá» email"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:180
+#: actions/emailsettings.php:184
 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."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:186
+#: actions/emailsettings.php:190
 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á»."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:193
+#: actions/emailsettings.php:197
 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."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:205
+#: actions/emailsettings.php:209
 msgid "Allow friends to nudge me and send me an email."
 msgstr ""
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:212
+#: actions/emailsettings.php:216
 msgid "I want to post notices by email."
 msgstr "TÃ´i muá»n ÄÆ°a tin nháº¯n lÃªn báº±ng email."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:219
+#: actions/emailsettings.php:223
 msgid "Publish a MicroID for my email address."
 msgstr "Xuáº¥t báº£n má»t MicroID Äáº¿n Äá»a chá» email cá»§a tÃ´i."
 
 #. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:353
+#: actions/emailsettings.php:357
 msgid "No email address."
 msgstr "KhÃ´ng cÃ³ Äá»a chá» email."
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:361
+#: actions/emailsettings.php:365
 msgid "Cannot normalize that email address"
 msgstr "KhÃ´ng thá» bÃ¬nh thÆ°á»ng hÃ³a Jabber ID"
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:208
+#: actions/emailsettings.php:370 actions/register.php:208
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "Äá»a chá» email khÃ´ng há»£p lá»."
 
 #. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:370
+#: actions/emailsettings.php:374
 msgid "That is already your email address."
 msgstr "TÃ i khoáº£n ÄÃ³ ÄÃ£ lÃ  tÃªn tÃ i khoáº£n Jabber cá»§a báº¡n rá»i."
 
 #. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:374
+#: actions/emailsettings.php:378
 msgid "That email address already belongs to another user."
 msgstr "Jabber ID nÃ y ÄÃ£ thuá»c vá» ngÆ°á»i khÃ¡c rá»i."
 
 #. 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/emailsettings.php:395 actions/imsettings.php:351
 #: actions/smssettings.php:373
 msgid "Couldn't insert confirmation code."
 msgstr "KhÃ´ng thá»  chÃ¨n mÃ£ xÃ¡c nháºn."
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:398
+#: actions/emailsettings.php:402
 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."
@@ -1049,32 +982,32 @@ msgstr ""
 #. 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/emailsettings.php:423 actions/imsettings.php:386
 #: actions/smssettings.php:408
 msgid "No pending confirmation to cancel."
 msgstr "Sá»± xÃ¡c nháºn chÆ°a ÄÆ°á»£c há»§y bá»."
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:438
+#: actions/emailsettings.php:442
 msgid "Email confirmation cancelled."
 msgstr "Sá»± xÃ¡c nháºn chÆ°a ÄÆ°á»£c há»§y bá»."
 
 #. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:479
+#: actions/emailsettings.php:483
 msgid "The email address was removed."
 msgstr "KhÃ´ng cÃ³ Äá»a chá» email."
 
-#: actions/emailsettings.php:493 actions/smssettings.php:568
+#: actions/emailsettings.php:497 actions/smssettings.php:568
 msgid "No incoming email address."
 msgstr "KhÃ´ng cÃ³ Äá»a chá» email."
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
-#: actions/emailsettings.php:508 actions/smssettings.php:581
+#: actions/emailsettings.php:512 actions/smssettings.php:581
 msgid "Incoming email address removed."
 msgstr "KhÃ´ng cÃ³ Äá»a chá» email."
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
-#: actions/emailsettings.php:532 actions/smssettings.php:605
+#: actions/emailsettings.php:536 actions/smssettings.php:605
 msgid "New incoming email address added."
 msgstr "KhÃ´ng cÃ³ Äá»a chá» email."
 
@@ -1087,10 +1020,6 @@ msgstr "Tin nháº¯n nÃ y ÄÃ£ cÃ³ trong danh sÃ¡ch tin nháº¯n Æ°a thÃch cá»§a b
 msgid "Popular notices"
 msgstr "KhÃ´ng cÃ³ tin nháº¯n nÃ o."
 
-#: actions/favorited.php:79
-msgid "The most popular notices on the site right now."
-msgstr ""
-
 #: actions/favorited.php:150
 msgid "Favorite notices appear on this page but no one has favorited one yet."
 msgstr ""
@@ -1119,6 +1048,11 @@ msgstr "Nhá»¯ng tin nháº¯n Æ°a thÃch cá»§a %s"
 msgid "Updates favored by %1$s on %2$s!"
 msgstr "DÃ²ng tin nháº¯n cho %s"
 
+#: actions/featured.php:69 lib/featureduserssection.php:87
+#: lib/publicgroupnav.php:89
+msgid "Featured users"
+msgstr ""
+
 #: actions/featured.php:71
 #, php-format
 msgid "Featured users, page %d"
@@ -1141,10 +1075,6 @@ msgstr "KhÃ´ng cÃ³ tin nháº¯n nÃ o."
 msgid "Not expecting this response!"
 msgstr "KhÃ´ng mong Äá»£i tráº£ lá»i láº¡i!"
 
-#: actions/finishremotesubscribe.php:80
-msgid "User being listened to does not exist."
-msgstr ""
-
 #: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59
 msgid "You can use the local subscription!"
 msgstr "Báº¡n cÃ³ thá» ÄÄng kÃ½ táº¡i nÆ¡i báº¡n á»!"
@@ -1157,14 +1087,6 @@ msgstr ""
 msgid "You are not authorized."
 msgstr "ÄÄng nháºn ÄÆ°á»£c phÃ©p"
 
-#: actions/finishremotesubscribe.php:113
-msgid "Could not convert request token to access token."
-msgstr ""
-
-#: actions/finishremotesubscribe.php:118
-msgid "Remote service uses unknown version of OMB protocol."
-msgstr ""
-
 #: actions/getfile.php:83
 msgid "Cannot read file."
 msgstr "KhÃ´ng thá» táº¡o favorite."
@@ -1173,6 +1095,12 @@ msgstr "KhÃ´ng thá» táº¡o favorite."
 msgid "This role is reserved and cannot be set."
 msgstr ""
 
+#: actions/groupblock.php:71 actions/groupunblock.php:71
+#: actions/makeadmin.php:71 actions/subedit.php:46
+#: lib/profileformaction.php:79
+msgid "No profile specified."
+msgstr ""
+
 #: actions/groupblock.php:81 actions/groupunblock.php:81
 #: actions/makeadmin.php:81
 msgid "No group specified."
@@ -1182,11 +1110,7 @@ msgstr ""
 msgid "Only an admin can block group members."
 msgstr ""
 
-#: actions/groupblock.php:95
-msgid "User is already blocked from group."
-msgstr ""
-
-#: actions/groupblock.php:134 actions/groupmembers.php:360
+#: actions/groupblock.php:134 actions/groupmembers.php:364
 msgid "Block user from group"
 msgstr "Cháº·n ngÆ°á»i dÃ¹ng"
 
@@ -1198,6 +1122,10 @@ msgid ""
 "the group in the future."
 msgstr ""
 
+#: actions/groupblock.php:206
+msgid "Database error blocking user from group."
+msgstr ""
+
 #: actions/groupbyid.php:74 actions/userbyid.php:70
 msgid "No ID."
 msgstr "KhÃ´ng cÃ³ Jabber ID."
@@ -1216,31 +1144,20 @@ msgstr "NhÃ³m"
 msgid "Pick a square area of the image to be the logo."
 msgstr ""
 
-#: actions/groupmembers.php:103
-#, php-format
-msgid "%1$s group members, page %2$d"
-msgstr ""
-
-#: actions/groupmembers.php:118
+#: actions/groupmembers.php:122
 msgid "A list of the users in this group."
 msgstr ""
 
-#: actions/groupmembers.php:182 lib/groupnav.php:107
+#: actions/groupmembers.php:186
 msgid "Admin"
 msgstr ""
 
-#: actions/groupmembers.php:487
-msgid "Make user an admin of the group"
-msgstr ""
-
-#: actions/groupmembers.php:519
+#. TRANS: Button text for the form that will make a user administrator.
+#: actions/groupmembers.php:533
+msgctxt "BUTTON"
 msgid "Make Admin"
 msgstr ""
 
-#: actions/groupmembers.php:519
-msgid "Make this user an admin"
-msgstr ""
-
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Title in atom group notice feed. %s is a group name.
 #. TRANS: Title in atom user notice feed. %s is a user name.
@@ -1250,11 +1167,6 @@ msgstr ""
 msgid "%s timeline"
 msgstr "DÃ²ng tin cÃ´ng cá»ng"
 
-#: actions/groups.php:64
-#, php-format
-msgid "Groups, page %d"
-msgstr ""
-
 #: actions/groups.php:90
 #, php-format
 msgid ""
@@ -1265,15 +1177,6 @@ msgid ""
 "%%%%)"
 msgstr ""
 
-#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:122
-msgid "Create a new group"
-msgstr ""
-
-#: actions/groupsearch.php:79 actions/noticesearch.php:117
-#: actions/peoplesearch.php:83
-msgid "No results."
-msgstr ""
-
 #: actions/groupsearch.php:82
 #, php-format
 msgid ""
@@ -1309,11 +1212,6 @@ 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."
 
-#. 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 ""
-
 #. 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
@@ -1337,7 +1235,10 @@ msgstr ""
 
 #. TRANS: IM address input field instructions in IM settings form.
 #. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:140
+#. TRANS: Do not translate "example.org". It is one of the domain names reserved for use in examples by
+#. TRANS: http://www.rfc-editor.org/rfc/rfc2606.txt. Any other domain may be owned by a legitimate
+#. TRANS: person or organization.
+#: actions/imsettings.php:143
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -1347,65 +1248,65 @@ msgstr ""
 "táº¡o thÃªm %s vÃ o danh sÃ¡ch buddy trÃªn IM client hoáº·c GTalk cá»§a báº¡n."
 
 #. TRANS: Form legend for IM preferences form.
-#: actions/imsettings.php:155
+#: actions/imsettings.php:158
 msgid "IM preferences"
 msgstr "CÃ¡c tÃnh nÄng ÄÃ£ ÄÆ°á»£c lÆ°u."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:160
+#: actions/imsettings.php:163
 msgid "Send me notices through Jabber/GTalk."
 msgstr "HÃ£y gá»i tin nháº¯n Äáº¿n tÃ´i qua Jabber hay GTalk"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:166
+#: actions/imsettings.php:169
 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 "
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:172
+#: actions/imsettings.php:175
 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."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:179
+#: actions/imsettings.php:182
 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "Gá»i MicroID Äáº¿n Äá»a chá» Jabber/GTalk cá»§a tÃ´i. "
 
 #. TRANS: Confirmation message for successful IM preferences save.
-#: actions/imsettings.php:287 actions/othersettings.php:180
+#: actions/imsettings.php:290 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
+#: actions/imsettings.php:312
 msgid "No Jabber ID."
 msgstr "KhÃ´ng cÃ³ Jabber ID."
 
 #. TRANS: Message given saving IM address that cannot be normalised.
-#: actions/imsettings.php:317
+#: actions/imsettings.php:320
 msgid "Cannot normalize that Jabber ID"
 msgstr "KhÃ´ng thá» bÃ¬nh thÆ°á»ng hÃ³a Jabber ID"
 
 #. TRANS: Message given saving IM address that not valid.
-#: actions/imsettings.php:322
+#: actions/imsettings.php:325
 msgid "Not a valid Jabber ID"
 msgstr "Jabber ID khÃ´ng há»£p lá»"
 
 #. TRANS: Message given saving IM address that is already set.
-#: actions/imsettings.php:326
+#: actions/imsettings.php:329
 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."
 
 #. TRANS: Message given saving IM address that is already set for another user.
-#: actions/imsettings.php:330
+#: actions/imsettings.php:333
 msgid "Jabber ID already belongs to another user."
 msgstr "Jabber ID nÃ y ÄÃ£ thuá»c vá» ngÆ°á»i khÃ¡c rá»i."
 
 #. 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
+#: actions/imsettings.php:361
 #, php-format
 msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
@@ -1415,18 +1316,18 @@ msgstr ""
 "tin nháº¯n Äáº¿n báº¡n."
 
 #. TRANS: Message given canceling IM address confirmation for the wrong IM address.
-#: actions/imsettings.php:388
+#: actions/imsettings.php:391
 msgid "That is the wrong IM address."
 msgstr "Sai IM."
 
 #. TRANS: Message given after successfully canceling IM address confirmation.
-#: actions/imsettings.php:402
+#: actions/imsettings.php:405
 msgid "IM confirmation cancelled."
 msgstr "KhÃ´ng cÃ³ mÃ£ sá» xÃ¡c nháºn."
 
 #. TRANS: Message given trying to remove an IM address that is not
 #. TRANS: registered for the active user.
-#: actions/imsettings.php:424
+#: actions/imsettings.php:427
 msgid "That is not your Jabber ID."
 msgstr "ÄÃ¢y khÃ´ng pháº£i Jabber ID cá»§a báº¡n."
 
@@ -1515,12 +1416,6 @@ msgstr "Tin nháº¯n cÃ¡ nhÃ¢n"
 msgid "Optionally add a personal message to the invitation."
 msgstr "KhÃ´ng báº¯t buá»c pháº£i thÃªm thÃ´ng Äiá»p vÃ o thÆ° má»i."
 
-#. TRANS: Send button for inviting friends
-#: actions/invite.php:198
-msgctxt "BUTTON"
-msgid "Send"
-msgstr ""
-
 #. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English.
 #: actions/invite.php:228
 #, php-format
@@ -1626,30 +1521,10 @@ msgstr ""
 "VÃ¬ lÃ½ do báº£o máºt, báº¡n hÃ£y nháºp láº¡i tÃªn ÄÄng nháºp vÃ  máºt kháº©u trÆ°á»c khi thay "
 "Äá»i trong Äiá»u chá»nh."
 
-#: actions/login.php:295
-#, php-format
-msgid ""
-"Don't have a username yet? [Register](%%action.register%%) a new account."
-msgstr ""
-
 #: actions/makeadmin.php:92
 msgid "Only an admin can make another user an admin."
 msgstr ""
 
-#: actions/makeadmin.php:133
-#, php-format
-msgid "Can't get membership record for %1$s in group %2$s."
-msgstr ""
-
-#: actions/makeadmin.php:146
-#, php-format
-msgid "Can't make %1$s an admin for group %2$s."
-msgstr ""
-
-#: actions/microsummary.php:69
-msgid "No current status."
-msgstr ""
-
 #: actions/newapplication.php:143
 msgid "Use this form to register a new application."
 msgstr ""
@@ -1688,14 +1563,6 @@ msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
 
-#: actions/newmessage.php:181
-msgid "Message sent"
-msgstr ""
-
-#: actions/newmessage.php:210 actions/newnotice.php:261 lib/channel.php:189
-msgid "Ajax Error"
-msgstr ""
-
 #: actions/newnotice.php:69
 msgid "New notice"
 msgstr "ThÃ´ng bÃ¡o má»i"
@@ -1736,11 +1603,6 @@ msgid ""
 "[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
 msgstr ""
 
-#: actions/noticesearchrss.php:96
-#, php-format
-msgid "Updates with \"%s\""
-msgstr ""
-
 #: actions/noticesearchrss.php:98
 #, php-format
 msgid "Updates matching search term \"%1$s\" on %2$s!"
@@ -1751,6 +1613,10 @@ msgid ""
 "This user doesn't allow nudges or hasn't confirmed or set their email yet."
 msgstr ""
 
+#: actions/oauthappssettings.php:74
+msgid "OAuth applications"
+msgstr ""
+
 #: actions/oauthappssettings.php:85
 msgid "Applications you have registered"
 msgstr ""
@@ -1760,6 +1626,10 @@ msgstr ""
 msgid "You have not registered any applications yet."
 msgstr ""
 
+#: actions/oauthconnectionssettings.php:72
+msgid "Connected applications"
+msgstr ""
+
 #: actions/oauthconnectionssettings.php:83
 msgid "You have allowed the following applications to access you account."
 msgstr ""
@@ -1786,12 +1656,6 @@ msgstr "NgÆ°á»i dÃ¹ng khÃ´ng cÃ³ thÃ´ng tin."
 msgid "%1$s's status on %2$s"
 msgstr "Tráº¡ng thÃ¡i cá»§a %1$s vÃ o %2$s"
 
-#. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
-#: actions/oembed.php:159
-#, php-format
-msgid "Content type %s not supported."
-msgstr ""
-
 #. TRANS: Error message displaying attachments. %s is the site's base URL.
 #: actions/oembed.php:163
 #, php-format
@@ -1799,8 +1663,8 @@ msgid "Only %s URLs over plain HTTP please."
 msgstr ""
 
 #. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1215
-#: lib/apiaction.php:1243 lib/apiaction.php:1366
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1206
+#: lib/apiaction.php:1233 lib/apiaction.php:1356
 msgid "Not a supported data format."
 msgstr "KhÃ´ng há» trá»£ Äá»nh dáº¡ng dá»¯ liá»u nÃ y."
 
@@ -1832,14 +1696,14 @@ msgstr ""
 msgid "Show or hide profile designs."
 msgstr ""
 
-#: actions/otp.php:69
-msgid "No user ID specified."
-msgstr ""
-
 #: actions/otp.php:90
 msgid "No login token requested."
 msgstr "KhÃ´ng cÃ³ yÃªu cáº§u!"
 
+#: actions/otp.php:104
+msgid "Login token expired."
+msgstr ""
+
 #: actions/outbox.php:61
 #, php-format
 msgid "Outbox for %s"
@@ -1901,7 +1765,7 @@ msgid "Password saved."
 msgstr "ÄÃ£ lÆ°u máºt kháº©u."
 
 #. TRANS: Menu item for site administration
-#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:384
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:371
 msgid "Paths"
 msgstr ""
 
@@ -1909,26 +1773,6 @@ msgstr ""
 msgid "Path and server settings for this StatusNet site."
 msgstr ""
 
-#: actions/pathsadminpanel.php:157
-#, php-format
-msgid "Theme directory not readable: %s."
-msgstr ""
-
-#: actions/pathsadminpanel.php:163
-#, php-format
-msgid "Avatar directory not writable: %s."
-msgstr ""
-
-#: actions/pathsadminpanel.php:169
-#, php-format
-msgid "Background directory not writable: %s."
-msgstr ""
-
-#: actions/pathsadminpanel.php:177
-#, php-format
-msgid "Locales directory not readable: %s."
-msgstr ""
-
 #: actions/pathsadminpanel.php:183
 msgid "Invalid SSL server. The maximum length is 255 characters."
 msgstr ""
@@ -1973,26 +1817,6 @@ msgstr ""
 msgid "Theme directory"
 msgstr ""
 
-#: actions/pathsadminpanel.php:292
-msgid "Avatar directory"
-msgstr ""
-
-#: actions/pathsadminpanel.php:301
-msgid "Backgrounds"
-msgstr ""
-
-#: actions/pathsadminpanel.php:305
-msgid "Background server"
-msgstr ""
-
-#: actions/pathsadminpanel.php:309
-msgid "Background path"
-msgstr ""
-
-#: actions/pathsadminpanel.php:313
-msgid "Background directory"
-msgstr ""
-
 #: actions/pathsadminpanel.php:325
 msgid "Always"
 msgstr ""
@@ -2005,18 +1829,10 @@ msgstr ""
 msgid "When to use SSL"
 msgstr ""
 
-#: actions/pathsadminpanel.php:335
-msgid "SSL server"
-msgstr ""
-
 #: actions/pathsadminpanel.php:336
 msgid "Server to direct SSL requests to"
 msgstr ""
 
-#: actions/pathsadminpanel.php:352
-msgid "Save paths"
-msgstr ""
-
 #: actions/peoplesearch.php:52
 #, php-format
 msgid ""
@@ -2066,7 +1882,7 @@ msgstr "TÃªn Äáº§y Äá»§"
 
 #. TRANS: Form input field label.
 #: actions/profilesettings.php:115 actions/register.php:460
-#: lib/applicationeditform.php:244 lib/groupeditform.php:161
+#: lib/applicationeditform.php:235 lib/groupeditform.php:161
 msgid "Homepage"
 msgstr "Trang chá»§ hoáº·c Blog"
 
@@ -2074,15 +1890,6 @@ msgstr "Trang chá»§ hoáº·c Blog"
 msgid "URL of your homepage, blog, or profile on another site"
 msgstr "URL vá» Trang chÃnh, Blog, hoáº·c há» sÆ¡ cÃ¡ nhÃ¢n cá»§a báº¡n trÃªn "
 
-#: actions/profilesettings.php:122 actions/register.php:468
-#, php-format
-msgid "Describe yourself and your interests in %d chars"
-msgstr ""
-
-#: actions/profilesettings.php:125 actions/register.php:471
-msgid "Describe yourself and your interests"
-msgstr ""
-
 #: actions/profilesettings.php:127 actions/register.php:473
 msgid "Bio"
 msgstr "LÃ½ lá»ch"
@@ -2157,7 +1964,7 @@ msgid "Couldn't save profile."
 msgstr "KhÃ´ng thá» lÆ°u há» sÆ¡ cÃ¡ nhÃ¢n."
 
 #. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:391 lib/adminpanelaction.php:141
+#: actions/profilesettings.php:391 lib/adminpanelaction.php:138
 msgid "Settings saved."
 msgstr "ÄÃ£ lÆ°u cÃ¡c Äiá»u chá»nh."
 
@@ -2170,10 +1977,6 @@ msgstr ""
 msgid "Public timeline"
 msgstr "DÃ²ng tin cÃ´ng cá»ng"
 
-#: actions/public.php:168
-msgid "Public Stream Feed (Atom)"
-msgstr ""
-
 #: actions/public.php:188
 #, php-format
 msgid ""
@@ -2208,10 +2011,6 @@ msgid ""
 "tool."
 msgstr ""
 
-#: actions/publictagcloud.php:57
-msgid "Public tag cloud"
-msgstr ""
-
 #: actions/publictagcloud.php:63
 #, php-format
 msgid "These are most popular recent tags on %s "
@@ -2429,33 +2228,6 @@ msgstr ""
 msgid "All rights reserved."
 msgstr ""
 
-#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:540
-#, php-format
-msgid ""
-"My text and files are available under %s except this private data: password, "
-"email address, IM address, and phone number."
-msgstr ""
-
-#: actions/register.php:583
-#, php-format
-msgid ""
-"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
-"want to...\n"
-"\n"
-"* Go to [your profile](%2$s) and post your first message.\n"
-"* Add a [Jabber/GTalk address](%%%%action.imsettings%%%%) so you can send "
-"notices through instant messages.\n"
-"* [Search for people](%%%%action.peoplesearch%%%%) that you may know or that "
-"share your interests. \n"
-"* Update your [profile settings](%%%%action.profilesettings%%%%) to tell "
-"others more about you. \n"
-"* Read over the [online docs](%%%%doc.help%%%%) for features you may have "
-"missed. \n"
-"\n"
-"Thanks for signing up and we hope you enjoy using this service."
-msgstr ""
-
 #: actions/register.php:607
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
@@ -2509,18 +2281,10 @@ msgstr "Theo báº¡n nÃ y"
 msgid "Invalid profile URL (bad format)"
 msgstr "URL há» sÆ¡ cÃ¡ nhÃ¢n khÃ´ng ÄÃºng Äá»nh dáº¡ng."
 
-#: actions/remotesubscribe.php:168
-msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
-msgstr ""
-
 #: actions/remotesubscribe.php:176
 msgid "Thatâs a local profile! Login to subscribe."
 msgstr ""
 
-#: actions/remotesubscribe.php:183
-msgid "Couldnât get a request token."
-msgstr ""
-
 #: actions/repeat.php:57
 msgid "Only logged-in users can repeat notices."
 msgstr ""
@@ -2580,13 +2344,9 @@ msgstr "%s chÃ o má»«ng báº¡n "
 msgid "StatusNet"
 msgstr "Sá» liá»u thá»ng kÃª"
 
-#: actions/sandbox.php:72
-msgid "User is already sandboxed."
-msgstr ""
-
 #. TRANS: Menu item for site administration
 #: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
-#: lib/adminpanelaction.php:392
+#: lib/adminpanelaction.php:379
 msgid "Sessions"
 msgstr ""
 
@@ -2611,18 +2371,13 @@ msgid "Turn on debugging output for sessions."
 msgstr ""
 
 #. TRANS: Form input field label for application icon.
-#: actions/showapplication.php:159 lib/applicationeditform.php:182
+#: actions/showapplication.php:159 lib/applicationeditform.php:173
 msgid "Icon"
 msgstr ""
 
-#. TRANS: Form input field label.
-#: actions/showapplication.php:178 lib/applicationeditform.php:235
-msgid "Organization"
-msgstr ""
-
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:216 lib/groupeditform.php:172
+#: lib/applicationeditform.php:207 lib/groupeditform.php:172
 msgid "Description"
 msgstr "MÃ´ táº£"
 
@@ -2636,10 +2391,18 @@ msgstr "Sá» liá»u thá»ng kÃª"
 msgid "Created by %1$s - %2$s access by default - %3$d users"
 msgstr ""
 
+#: actions/showapplication.php:213
+msgid "Application actions"
+msgstr ""
+
 #: actions/showapplication.php:236
 msgid "Reset key & secret"
 msgstr ""
 
+#: actions/showapplication.php:261
+msgid "Application info"
+msgstr ""
+
 #: actions/showapplication.php:263
 msgid "Consumer key"
 msgstr ""
@@ -2710,7 +2473,7 @@ msgstr ""
 msgid "This is a way to share what you like."
 msgstr ""
 
-#: actions/showgroup.php:82 lib/groupnav.php:86
+#: actions/showgroup.php:82
 #, php-format
 msgid "%s group"
 msgstr "Há»p thÆ° Äi cá»§a %s"
@@ -2747,7 +2510,7 @@ msgstr "Chá»n nhá»¯ng ngÆ°á»i báº¡n cá»§a %s"
 msgid "FOAF for %s group"
 msgstr "Há»p thÆ° Äi cá»§a %s"
 
-#: actions/showgroup.php:393 actions/showgroup.php:445 lib/groupnav.php:91
+#: actions/showgroup.php:393 actions/showgroup.php:445
 msgid "Members"
 msgstr "ThÃ nh viÃªn"
 
@@ -2784,10 +2547,6 @@ msgstr ""
 msgid "No such message."
 msgstr "KhÃ´ng cÃ³ tin nháº¯n nÃ o."
 
-#: actions/showmessage.php:98
-msgid "Only the sender and recipient may read this message."
-msgstr ""
-
 #: actions/shownotice.php:90
 msgid "Notice deleted."
 msgstr "KhÃ´ng cÃ³ mÃ£ nÃ o ÄÆ°á»£c nháºp"
@@ -2847,10 +2606,6 @@ msgid ""
 "[StatusNet](http://status.net/) tool. "
 msgstr ""
 
-#: actions/silence.php:72
-msgid "User is already silenced."
-msgstr ""
-
 #: actions/siteadminpanel.php:69
 msgid "Basic settings for this StatusNet site"
 msgstr ""
@@ -2960,11 +2715,6 @@ msgstr "Thay Äá»i hÃ¬nh Äáº¡i diá»n"
 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%%."
 
-#. 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 ""
-
 #. TRANS: Form legend for SMS settings form.
 #: actions/smssettings.php:111
 msgid "SMS address"
@@ -3049,7 +2799,7 @@ msgstr "KhÃ´ng cÃ³ mÃ£ nÃ o ÄÆ°á»£c nháºp"
 
 #. TRANS: Menu item for site administration
 #: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
-#: lib/adminpanelaction.php:408
+#: lib/adminpanelaction.php:395
 msgid "Snapshots"
 msgstr ""
 
@@ -3057,6 +2807,10 @@ msgstr ""
 msgid "Manage snapshot configuration"
 msgstr "Xac nhan dia chi email"
 
+#: actions/snapshotadminpanel.php:127
+msgid "Invalid snapshot run value."
+msgstr ""
+
 #: actions/snapshotadminpanel.php:133
 msgid "Snapshot frequency must be a number."
 msgstr ""
@@ -3110,11 +2864,6 @@ msgstr "KhÃ´ng thá» chÃ¨n thÃªm vÃ o ÄÄng nháºn."
 msgid "This action only accepts POST requests."
 msgstr ""
 
-#: actions/subscribers.php:52
-#, php-format
-msgid "%1$s subscribers, page %2$d"
-msgstr ""
-
 #: actions/subscribers.php:63
 msgid "These are the people who listen to your notices."
 msgstr "CÃ³ nhiá»u ngÆ°á»i nghe theo lá»i nháº¯n cá»§a báº¡n."
@@ -3190,10 +2939,6 @@ msgstr "Chá»n nhá»¯ng ngÆ°á»i báº¡n cá»§a %s"
 msgid "Notice feed for tag %s (Atom)"
 msgstr "Chá»n nhá»¯ng ngÆ°á»i báº¡n cá»§a %s"
 
-#: actions/tagother.php:39
-msgid "No ID argument."
-msgstr ""
-
 #: actions/tagother.php:77 lib/userprofile.php:76
 msgid "User profile"
 msgstr "NgÆ°á»i dÃ¹ng khÃ´ng cÃ³ thÃ´ng tin."
@@ -3228,6 +2973,12 @@ msgid ""
 "Listenee stream license â%1$sâ is not compatible with site license â%2$sâ."
 msgstr ""
 
+#. TRANS: User admin panel title
+#: actions/useradminpanel.php:59
+msgctxt "TITLE"
+msgid "User"
+msgstr ""
+
 #: actions/useradminpanel.php:70
 msgid "User settings for this StatusNet site."
 msgstr ""
@@ -3275,13 +3026,6 @@ msgstr ""
 msgid "Authorize subscription"
 msgstr "ÄÄng nháºn cho phÃ©p"
 
-#: actions/userauthorization.php:110
-msgid ""
-"Please check these details to make sure that you want to subscribe to this "
-"userâs notices. If you didnât just ask to subscribe to someoneâs notices, "
-"click âRejectâ."
-msgstr ""
-
 #: actions/userauthorization.php:196 actions/version.php:167
 msgid "License"
 msgstr ""
@@ -3311,24 +3055,10 @@ msgstr "KhÃ´ng cÃ³ yÃªu cáº§u!"
 msgid "Subscription authorized"
 msgstr "ÄÄng nháºn ÄÆ°á»£c phÃ©p"
 
-#: actions/userauthorization.php:256
-msgid ""
-"The subscription has been authorized, but no callback URL was passed. Check "
-"with the siteâs instructions for details on how to authorize the "
-"subscription. Your subscription token is:"
-msgstr ""
-
 #: actions/userauthorization.php:266
 msgid "Subscription rejected"
 msgstr "ÄÄng nháºn tá»« chá»i"
 
-#: actions/userauthorization.php:268
-msgid ""
-"The subscription has been rejected, but no callback URL was passed. Check "
-"with the siteâs instructions for details on how to fully reject the "
-"subscription."
-msgstr ""
-
 #: actions/userauthorization.php:303
 #, php-format
 msgid "Listener URI â%sâ not found here."
@@ -3354,16 +3084,6 @@ msgstr ""
 msgid "Avatar URL â%sâ is not valid."
 msgstr ""
 
-#: actions/userauthorization.php:350
-#, php-format
-msgid "Canât read avatar URL â%sâ."
-msgstr ""
-
-#: actions/userauthorization.php:355
-#, php-format
-msgid "Wrong image type for avatar URL â%sâ."
-msgstr ""
-
 #: actions/userdesignsettings.php:87 lib/designsettings.php:76
 msgid ""
 "Customize the way your profile looks with a background image and a colour "
@@ -3505,6 +3225,11 @@ msgid ""
 "few minutes."
 msgstr ""
 
+#. TRANS: Client exception thrown when a user tries to post while being banned.
+#: classes/Notice.php:291
+msgid "You are banned from posting notices on this site."
+msgstr ""
+
 #. TRANS: Server exception thrown when a notice cannot be saved.
 #. TRANS: Server exception thrown when a notice cannot be updated.
 #: classes/Notice.php:358 classes/Notice.php:385
@@ -3538,7 +3263,7 @@ msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
 
 #. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#: classes/Subscription.php:75 lib/oauthstore.php:465
+#: classes/Subscription.php:75 lib/oauthstore.php:466
 msgid "You have been banned from subscribing."
 msgstr ""
 
@@ -3592,9 +3317,9 @@ msgstr "Äang thá»±c hiá»n viá»c thay Äá»i email"
 msgid "Design your profile"
 msgstr "NgÆ°á»i dÃ¹ng khÃ´ng cÃ³ thÃ´ng tin."
 
-#. TRANS: Link description in user account settings menu.
-#: lib/accountsettingsaction.php:146
-msgid "Other"
+#. TRANS: Link title attribute in user account settings menu.
+#: lib/accountsettingsaction.php:144
+msgid "Other options"
 msgstr ""
 
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
@@ -3619,19 +3344,14 @@ msgctxt "TOOLTIP"
 msgid "Personal profile and friends timeline"
 msgstr ""
 
-#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:465
-msgctxt "TOOLTIP"
-msgid "Connect to services"
-msgstr ""
-
 #. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
 #: lib/action.php:468
 msgid "Connect"
 msgstr "Káº¿t ná»i"
 
 #. TRANS: Main menu option when logged in and site admin for access to site configuration
-#: lib/action.php:474
+#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
+#: lib/action.php:474 lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr ""
@@ -3642,12 +3362,6 @@ msgctxt "TOOLTIP"
 msgid "Logout from the site"
 msgstr ""
 
-#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:495
-msgctxt "TOOLTIP"
-msgid "Create an account"
-msgstr ""
-
 #. TRANS: Tooltip for main menu option "Login"
 #: lib/action.php:501
 msgctxt "TOOLTIP"
@@ -3665,11 +3379,6 @@ msgstr ""
 msgid "Local views"
 msgstr ""
 
-#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:778
-msgid "Secondary site navigation"
-msgstr ""
-
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
 #: lib/action.php:784
 msgid "Help"
@@ -3705,200 +3414,200 @@ msgstr "Nguá»n"
 msgid "Contact"
 msgstr "LiÃªn há»"
 
-#: lib/action.php:810
-msgid "Badge"
-msgstr ""
-
 #. TRANS: DT element for StatusNet software license.
 #: lib/action.php:839
 msgid "StatusNet software license"
 msgstr ""
 
-#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
-#: lib/action.php:843
-#, php-format
-msgid ""
-"**%%site.name%%** is a microblogging service brought to you by [%%site."
-"broughtby%%](%%site.broughtbyurl%%)."
-msgstr ""
-
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:846
+#: lib/action.php:849
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** lÃ  dá»ch vá»¥ gá»i tin nháº¯n."
 
-#. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.
-#: lib/action.php:850
-#, php-format
-msgid ""
-"It runs the [StatusNet](http://status.net/) microblogging software, version %"
-"s, available under the [GNU Affero General Public License](http://www.fsf."
-"org/licensing/licenses/agpl-3.0.html)."
-msgstr ""
-
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:873
+#: lib/action.php:879
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:880
+#: lib/action.php:886
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:884
+#: lib/action.php:890
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 
-#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:897
+#. TRANS: license message in footer.
+#. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
+#: lib/action.php:904
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr ""
 
-#. TRANS: Pagination message to go to a page displaying information more in the
-#. TRANS: present than the currently displayed information.
-#: lib/action.php:1247
-msgid "After"
-msgstr ""
-
-#. TRANS: Pagination message to go to a page displaying information more in the
-#. TRANS: past than the currently displayed information.
-#: lib/action.php:1257
-msgid "Before"
-msgstr ""
-
 #. TRANS: Client exception thrown when a feed instance is a DOMDocument.
 #: lib/activity.php:122
 msgid "Expecting a root feed element but got a whole XML document."
 msgstr ""
 
-#: lib/activityutils.php:208
+#. TRANS: Client exception thrown when there is no source attribute.
+#: lib/activityutils.php:203
 msgid "Can't handle remote content yet."
 msgstr ""
 
-#: lib/activityutils.php:244
+#. TRANS: Client exception thrown when there embedded XML content is found that cannot be processed yet.
+#: lib/activityutils.php:240
 msgid "Can't handle embedded XML content yet."
 msgstr ""
 
-#: lib/activityutils.php:248
+#. TRANS: Client exception thrown when base64 encoded content is found that cannot be processed yet.
+#: lib/activityutils.php:245
 msgid "Can't handle embedded Base64 content yet."
 msgstr ""
 
 #. TRANS: Client error message.
-#: lib/adminpanelaction.php:229
+#: lib/adminpanelaction.php:222
 msgid "showForm() not implemented."
 msgstr ""
 
 #. TRANS: Client error message
-#: lib/adminpanelaction.php:259
+#: lib/adminpanelaction.php:250
 msgid "saveSettings() not implemented."
 msgstr ""
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:360
-msgctxt "MENU"
-msgid "Design"
+#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:115
+msgid "User"
 msgstr ""
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:398
+#: lib/adminpanelaction.php:385
 msgid "Edit site notice"
 msgstr "XÃ³a tin nháº¯n"
 
 #. TRANS: Client error 401.
-#: lib/apiauth.php:113
+#: lib/apiauth.php:111
 msgid "API resource requires read-write access, but you only have read access."
 msgstr ""
 
+#. TRANS: OAuth exception thrown when no application is found for a given consumer key.
+#: lib/apiauth.php:175
+msgid "No application for that consumer key."
+msgstr ""
+
+#. TRANS: OAuth exception given when an incorrect access token was given for a user.
+#: lib/apiauth.php:212
+msgid "Bad access token."
+msgstr ""
+
+#. TRANS: OAuth exception given when no user was found for a given token (no token was found).
+#: lib/apiauth.php:217
+msgid "No user for that token."
+msgstr ""
+
+#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
+#: lib/apioauthstore.php:178
+msgid "Tried to revoke unknown token"
+msgstr ""
+
+#. TRANS: Exception thrown when an attempt is made to remove a revoked token.
+#: lib/apioauthstore.php:182
+msgid "Failed to delete revoked token"
+msgstr ""
+
+#. TRANS: Form legend.
+#: lib/applicationeditform.php:129
+msgid "Edit application"
+msgstr ""
+
+#. TRANS: Form guide.
+#: lib/applicationeditform.php:178
+msgid "Icon for this application"
+msgstr ""
+
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:213
+#: lib/applicationeditform.php:204
 msgid "Describe your application"
 msgstr "MÃ´ táº£"
 
 #. TRANS: Form input field instructions.
 #: lib/applicationeditform.php:224
-msgid "URL of the homepage of this application"
-msgstr ""
-
-#. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:233
 msgid "Organization responsible for this application"
 msgstr ""
 
 #. TRANS: Form input field instructions.
 #: lib/applicationeditform.php:242
-msgid "URL for the homepage of the organization"
-msgstr ""
-
-#. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:251
 msgid "URL to redirect to after authentication"
 msgstr ""
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:278
+#: lib/applicationeditform.php:269
 msgid "Browser"
 msgstr ""
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:295
+#: lib/applicationeditform.php:286
 msgid "Desktop"
 msgstr ""
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:297
+#: lib/applicationeditform.php:288
 msgid "Type of application, browser or desktop"
 msgstr ""
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:320
+#: lib/applicationeditform.php:311
 msgid "Read-only"
 msgstr ""
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:339
+#: lib/applicationeditform.php:330
 msgid "Read-write"
 msgstr ""
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:341
+#: lib/applicationeditform.php:332
 msgid "Default access for this application: read-only, or read-write"
 msgstr ""
 
-#. TRANS: Submit button title
-#: lib/applicationeditform.php:359
+#. TRANS: Submit button title.
+#: lib/applicationeditform.php:349
 msgid "Cancel"
 msgstr "Há»§y"
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:136
+#: lib/applicationlist.php:135
 msgid "read-write"
 msgstr ""
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:138
+#: lib/applicationlist.php:137
 msgid "read-only"
 msgstr ""
 
 #. 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
+#: lib/applicationlist.php:143
 #, php-format
 msgid "Approved %1$s - \"%2$s\" access."
 msgstr ""
 
 #. TRANS: Button label
-#: lib/applicationlist.php:159
+#: lib/applicationlist.php:158
 msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "KhÃ´i phá»¥c"
 
+#. TRANS: DT element label in attachment list.
+#: lib/attachmentlist.php:88
+msgid "Attachments"
+msgstr ""
+
 #. TRANS: DT element label in attachment list item.
 #: lib/attachmentlist.php:265
 msgid "Author"
@@ -3909,18 +3618,31 @@ msgstr ""
 msgid "Provider"
 msgstr "Xem trÆ°á»c"
 
-#: lib/attachmentnoticesection.php:67
+#. TRANS: Title.
+#: lib/attachmentnoticesection.php:68
 msgid "Notices where this attachment appears"
 msgstr ""
 
-#: lib/authenticationplugin.php:236
-msgid "Password changing is not allowed"
+#. TRANS: Title.
+#: lib/attachmenttagcloudsection.php:49
+msgid "Tags for this attachment"
+msgstr ""
+
+#: lib/channel.php:229 lib/mailhandler.php:142
+msgid "Command complete"
 msgstr ""
 
 #: lib/channel.php:240
 msgid "Command failed"
 msgstr "Báº¡n vÃ  báº¡n bÃ¨"
 
+#. TRANS: Message given getting a non-existing user.
+#. TRANS: %s is the nickname of the user that could not be found.
+#: lib/command.php:150
+#, php-format
+msgid "Could not find a local user with nickname %s."
+msgstr ""
+
 #. TRANS: Error text shown when an unimplemented command is given.
 #: lib/command.php:185
 msgid "Sorry, this command is not yet implemented."
@@ -3931,13 +3653,6 @@ msgstr ""
 msgid "It does not make a lot of sense to nudge yourself!"
 msgstr ""
 
-#. TRANS: Message given having nudged another user.
-#. TRANS: %s is the nickname of the user that was nudged.
-#: lib/command.php:240
-#, php-format
-msgid "Nudge sent to %s."
-msgstr ""
-
 #. TRANS: User statistics text.
 #. TRANS: %1$s is the number of other user the user is subscribed to.
 #. TRANS: %2$s is the number of users that are subscribed to the user.
@@ -3950,6 +3665,20 @@ msgid ""
 "Notices: %3$s"
 msgstr ""
 
+#. 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.
+#: lib/command.php:360
+#, php-format
+msgid "%1$s joined group %2$s."
+msgstr ""
+
+#. 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.
+#: lib/command.php:408
+#, php-format
+msgid "%1$s left group %2$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:438 lib/mail.php:268
@@ -3996,12 +3725,26 @@ msgstr ""
 msgid "Specify the name of the user to subscribe to."
 msgstr ""
 
+#. TRANS: Text shown after having subscribed to another user successfully.
+#. TRANS: %s is the name of the user the subscription was requested for.
+#: lib/command.php:672
+#, php-format
+msgid "Subscribed to %s."
+msgstr ""
+
 #. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
 #. TRANS: Error text shown when no username was provided when issuing the command.
 #: lib/command.php:694 lib/command.php:804
 msgid "Specify the name of the user to unsubscribe from."
 msgstr ""
 
+#. TRANS: Text shown after having unsubscribed from another user successfully.
+#. TRANS: %s is the name of the user the unsubscription was requested for.
+#: lib/command.php:705
+#, php-format
+msgid "Unsubscribed from %s."
+msgstr ""
+
 #. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
 #. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
 #: lib/command.php:724 lib/command.php:750
@@ -4013,6 +3756,11 @@ msgstr ""
 msgid "Can't turn off notification."
 msgstr ""
 
+#. TRANS: Error text shown when the command "on" fails for an unknown reason.
+#: lib/command.php:757
+msgid "Can't turn on notification."
+msgstr ""
+
 #. TRANS: Error text shown when issuing the login command while login is disabled.
 #: lib/command.php:771
 msgid "Login command is disabled."
@@ -4025,13 +3773,20 @@ msgstr ""
 msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr ""
 
+#. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
+#. TRANS: %s is the name of the user the unsubscription was requested for.
+#: lib/command.php:813
+#, php-format
+msgid "Unsubscribed %s."
+msgstr ""
+
 #. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
 #: lib/command.php:831
 msgid "You are not subscribed to anyone."
 msgstr "Báº¡n ÄÃ£ theo nhá»¯ng ngÆ°á»i nÃ y:"
 
 #. TRANS: Text shown after requesting other users a user is subscribed to.
-#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.
 #: lib/command.php:836
 msgid "You are subscribed to this person:"
@@ -4039,7 +3794,7 @@ msgid_plural "You are subscribed to these people:"
 msgstr[0] "Báº¡n ÄÃ£ theo nhá»¯ng ngÆ°á»i nÃ y:"
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
-#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
 #: lib/command.php:863
 msgid "This person is subscribed to you:"
@@ -4047,13 +3802,14 @@ msgid_plural "These people are subscribed to you:"
 msgstr[0] "KhÃ´ng thá» táº¡o favorite."
 
 #. TRANS: Text shown after requesting groups a user is subscribed to.
-#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
 #: lib/command.php:890
 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"
 
+#. TRANS: Help text for commands.
 #: lib/command.php:905
 msgid ""
 "Commands:\n"
@@ -4181,47 +3937,27 @@ msgstr ""
 msgid "Grant this user the \"%s\" role"
 msgstr ""
 
-#: lib/groupeditform.php:170
-#, php-format
-msgid "Describe the group or topic in %d characters"
-msgstr ""
-
 #: lib/groupeditform.php:187
 #, php-format
 msgid "Extra nicknames for the group, comma- or space- separated, max %d"
 msgstr ""
 
-#: lib/groupnav.php:85
-msgid "Group"
-msgstr "NhÃ³m"
-
-#: lib/groupnav.php:101
-msgid "Blocked"
-msgstr "Cháº·n ngÆ°á»i dÃ¹ng"
-
-#: lib/groupnav.php:102
-#, php-format
-msgid "%s blocked users"
-msgstr "Cháº·n ngÆ°á»i dÃ¹ng"
-
-#: lib/groupnav.php:113
-msgid "Logo"
-msgstr "ÄÄng nháºp"
-
-#: lib/groupnav.php:114
+#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
+#. TRANS: %s is the nickname of the group.
+#: lib/groupnav.php:129
 #, php-format
+msgctxt "TOOLTIP"
 msgid "Add or edit %s logo"
 msgstr ""
 
-#: lib/groupnav.php:120
+#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
+#. TRANS: %s is the nickname of the group.
+#: lib/groupnav.php:138
 #, php-format
+msgctxt "TOOLTIP"
 msgid "Add or edit %s design"
 msgstr ""
 
-#: lib/groupsbymemberssection.php:71
-msgid "Groups with most members"
-msgstr ""
-
 #: lib/groupsbypostssection.php:71
 msgid "Groups with most posts"
 msgstr ""
@@ -4244,7 +3980,8 @@ msgstr "KhÃ´ng há» trá»£ kiá»u file áº£nh nÃ y."
 msgid "Partial upload."
 msgstr "Upload tá»«ng pháº§n."
 
-#: lib/imagefile.php:101 lib/mediafile.php:170
+#. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
+#: lib/imagefile.php:101 lib/mediafile.php:179
 msgid "System error uploading file."
 msgstr "Há» thá»ng xáº£y ra lá»i trong khi táº£i file."
 
@@ -4252,10 +3989,6 @@ msgstr "Há» thá»ng xáº£y ra lá»i trong khi táº£i file."
 msgid "Not an image or corrupt file."
 msgstr "File há»ng hoáº·c khÃ´ng pháº£i lÃ  file áº£nh."
 
-#: lib/imagefile.php:163 lib/imagefile.php:224
-msgid "Unknown file type"
-msgstr ""
-
 #: lib/imagefile.php:244
 msgid "MB"
 msgstr ""
@@ -4278,33 +4011,11 @@ msgstr ""
 msgid "Login with a username and password"
 msgstr "TÃªn ÄÄng nháºp hoáº·c máºt kháº©u khÃ´ng há»£p lá»."
 
-#: lib/logingroupnav.php:86
-msgid "Sign up for a new account"
-msgstr ""
-
 #. TRANS: Subject for address confirmation email
 #: lib/mail.php:174
 msgid "Email address confirmation"
 msgstr "Xac nhan dia chi email"
 
-#. TRANS: Body for address confirmation email.
-#: lib/mail.php:177
-#, php-format
-msgid ""
-"Hey, %s.\n"
-"\n"
-"Someone just entered this email address on %s.\n"
-"\n"
-"If it was you, and you want to confirm your entry, use the URL below:\n"
-"\n"
-"\t%s\n"
-"\n"
-"If not, just ignore this message.\n"
-"\n"
-"Thanks for your time, \n"
-"%s\n"
-msgstr ""
-
 #. TRANS: Subject of new-subscriber notification e-mail
 #: lib/mail.php:243
 #, php-format
@@ -4318,22 +4029,6 @@ msgid ""
 "your subscribers list and report as spam to site administrators at %s"
 msgstr ""
 
-#. TRANS: Main body of new-subscriber notification e-mail
-#: lib/mail.php:254
-#, php-format
-msgid ""
-"%1$s is now listening to your notices on %2$s.\n"
-"\n"
-"\t%3$s\n"
-"\n"
-"%4$s%5$s%6$s\n"
-"Faithfully yours,\n"
-"%7$s.\n"
-"\n"
-"----\n"
-"Change your email address or notification options at %8$s\n"
-msgstr ""
-
 #. TRANS: Profile info line in new-subscriber notification e-mail
 #: lib/mail.php:274
 #, php-format
@@ -4373,12 +4068,6 @@ msgstr ""
 msgid "SMS confirmation"
 msgstr "XÃ¡c nháºn SMS"
 
-#. TRANS: Main body heading for SMS-by-email address confirmation message
-#: lib/mail.php:463
-#, php-format
-msgid "%s: confirm you own this phone number with this code:"
-msgstr ""
-
 #. TRANS: Subject for 'nudge' notification email
 #: lib/mail.php:484
 #, php-format
@@ -4450,28 +4139,6 @@ 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á»."
 
-#. TRANS: Body for favorite notification email
-#: lib/mail.php:592
-#, php-format
-msgid ""
-"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
-"\n"
-"The URL of your notice is:\n"
-"\n"
-"%3$s\n"
-"\n"
-"The text of your notice is:\n"
-"\n"
-"%4$s\n"
-"\n"
-"You can see the list of %1$s's favorites here:\n"
-"\n"
-"%5$s\n"
-"\n"
-"Faithfully yours,\n"
-"%6$s\n"
-msgstr ""
-
 #. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
 #: lib/mail.php:651
 #, php-format
@@ -4481,6 +4148,11 @@ msgid ""
 "\t%s"
 msgstr ""
 
+#: lib/mail.php:657
+#, php-format
+msgid "%s (@%s) sent a notice to your attention"
+msgstr ""
+
 #. TRANS: Body of @-reply notification e-mail.
 #: lib/mail.php:660
 #, php-format
@@ -4519,10 +4191,6 @@ msgid ""
 "users in conversation. People can send you messages for your eyes only."
 msgstr ""
 
-#: lib/mailbox.php:228 lib/noticelist.php:506
-msgid "from"
-msgstr ""
-
 #: lib/mailhandler.php:42
 msgid "Not a registered user."
 msgstr "KhÃ´ng cÃ³ ngÆ°á»i dÃ¹ng nÃ o ÄÄng kÃ½"
@@ -4535,63 +4203,75 @@ msgstr "Xin lá»i, ÄÃ³ khÃ´ng pháº£i lÃ  Äá»a chá» email mÃ  báº¡n nháºp v
 msgid "Sorry, no incoming email allowed."
 msgstr "Xin lá»i, khÃ´ng cÃ³ Äá»a chá» email cho phÃ©p."
 
-#: lib/mediafile.php:98 lib/mediafile.php:123
+#. TRANS: Client exception thrown when a database error was thrown during a file upload operation.
+#: lib/mediafile.php:99 lib/mediafile.php:125
 msgid "There was a database error while saving your file. Please try again."
 msgstr ""
 
-#: lib/mediafile.php:142
+#. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
+#: lib/mediafile.php:145
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
 msgstr ""
 
-#: lib/mediafile.php:147
+#. TRANS: Client exception.
+#: lib/mediafile.php:151
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form."
 msgstr ""
 
-#: lib/mediafile.php:152
+#. TRANS: Client exception.
+#: lib/mediafile.php:157
 msgid "The uploaded file was only partially uploaded."
 msgstr ""
 
-#: lib/mediafile.php:159
+#. TRANS: Client exception thrown when a temporary folder is not present to store a file upload.
+#: lib/mediafile.php:165
 msgid "Missing a temporary folder."
 msgstr ""
 
-#: lib/mediafile.php:162
+#. TRANS: Client exception thrown when writing to disk is not possible during a file upload operation.
+#: lib/mediafile.php:169
 msgid "Failed to write file to disk."
 msgstr ""
 
-#: lib/mediafile.php:165
+#. TRANS: Client exception thrown when a file upload operation has been stopped by an extension.
+#: lib/mediafile.php:173
 msgid "File upload stopped by extension."
 msgstr ""
 
-#: lib/mediafile.php:179 lib/mediafile.php:217
+#. TRANS: Client exception thrown when a file upload operation would cause a user to exceed a set quota.
+#: lib/mediafile.php:189 lib/mediafile.php:232
 msgid "File exceeds user's quota."
 msgstr ""
 
-#: lib/mediafile.php:197 lib/mediafile.php:234
+#. TRANS: Client exception thrown when a file upload operation fails because the file could
+#. TRANS: not be moved from the temporary folder to the permanent file location.
+#: lib/mediafile.php:209 lib/mediafile.php:251
 msgid "File could not be moved to destination directory."
 msgstr ""
 
-#: lib/mediafile.php:318
+#. TRANS: Client exception thrown trying to upload a forbidden MIME type.
+#. TRANS: %1$s is the file type that was denied, %2$s is the application part of
+#. TRANS: the MIME type that was denied.
+#: lib/mediafile.php:340
 #, php-format
-msgid " Try using another %s format."
+msgid ""
+"\"%1$s\" is not a supported file type on this server. Try using another %2$s "
+"format."
 msgstr ""
 
-#: lib/mediafile.php:323
+#. TRANS: Client exception thrown trying to upload a forbidden MIME type.
+#. TRANS: %s is the file type that was denied.
+#: lib/mediafile.php:345
 #, php-format
-msgid "%s is not a supported file type on this server."
+msgid "\"%s\" is not a supported file type on this server."
 msgstr ""
 
 #: lib/messageform.php:146
 msgid "To"
 msgstr ""
 
-#: lib/messageform.php:178 lib/noticeform.php:237
-msgctxt "Send button for sending notice"
-msgid "Send"
-msgstr ""
-
 #: lib/noticeform.php:174
 #, php-format
 msgid "What's up, %s?"
@@ -4605,25 +4285,12 @@ msgstr ""
 msgid "Attach a file"
 msgstr ""
 
-#: lib/noticeform.php:213
-msgid "Share my location"
-msgstr ""
-
-#: lib/noticeform.php:216
-msgid "Do not share my location"
-msgstr ""
-
 #: lib/noticeform.php:217
 msgid ""
 "Sorry, retrieving your geo location is taking longer than expected, please "
 "try again later"
 msgstr ""
 
-#. TRANS: Used in coordinates as abbreviation of north
-#: lib/noticelist.php:436
-msgid "N"
-msgstr ""
-
 #. TRANS: Used in coordinates as abbreviation of south
 #: lib/noticelist.php:438
 msgid "S"
@@ -4668,27 +4335,7 @@ msgstr "TÃ¬m kiáº¿m thÃ´ng bÃ¡o"
 msgid "Nudge this user"
 msgstr "Bá» cháº·n ngÆ°á»i dÃ¹ng nÃ y"
 
-#: lib/nudgeform.php:128
-msgid "Nudge"
-msgstr ""
-
-#: lib/oauthstore.php:283
-msgid "Error inserting new profile"
-msgstr "Lá»i xáº£y ra khi thÃªm má»i há» sÆ¡ cÃ¡ nhÃ¢n"
-
-#: lib/oauthstore.php:291
-msgid "Error inserting avatar"
-msgstr "Lá»i xáº£y ra khi thÃªm má»i hÃ¬nh Äáº¡i diá»n"
-
-#: lib/oauthstore.php:306
-msgid "Error updating remote profile"
-msgstr "Lá»i xáº£y ra khi cáºp nháºt há» sÆ¡ cÃ¡ nhÃ¢n"
-
-#: lib/oauthstore.php:311
-msgid "Error inserting remote profile"
-msgstr "Lá»i xáº£y ra khi thÃªm má»i há» sÆ¡ cÃ¡ nhÃ¢n"
-
-#: lib/oauthstore.php:490
+#: lib/oauthstore.php:491
 msgid "Couldn't insert new subscription."
 msgstr "KhÃ´ng thá» chÃ¨n thÃªm vÃ o ÄÄng nháºn."
 
@@ -4720,11 +4367,6 @@ msgstr "Há»p thÆ° Äi"
 msgid "Your sent messages"
 msgstr "ThÆ° báº¡n ÄÃ£ gá»i"
 
-#: lib/personaltagcloudsection.php:56
-#, php-format
-msgid "Tags in %s's notices"
-msgstr ""
-
 #: lib/profileaction.php:109 lib/profileaction.php:205 lib/subgroupnav.php:82
 msgid "Subscriptions"
 msgstr "TÃ´i theo báº¡n nÃ y"
@@ -4737,6 +4379,10 @@ msgstr "Táº¥t cáº£ ÄÄng nháºn"
 msgid "Subscribers"
 msgstr "Báº¡n nÃ y theo tÃ´i"
 
+#: lib/profileaction.php:191
+msgid "User ID"
+msgstr ""
+
 #: lib/profileaction.php:196
 msgid "Member since"
 msgstr "Gia nháºp tá»«"
@@ -4754,12 +4400,8 @@ msgstr ""
 msgid "Public"
 msgstr "CÃ´ng cá»ng"
 
-#: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85
-msgid "Recent tags"
-msgstr ""
-
-#: lib/redirectingaction.php:95
-msgid "No return-to arguments."
+#: lib/publicgroupnav.php:88
+msgid "Featured"
 msgstr ""
 
 #: lib/repeatform.php:107
@@ -4774,23 +4416,16 @@ msgstr "CÃ³"
 msgid "Repeat this notice"
 msgstr "KhÃ´ng thá» xÃ³a tin nháº¯n nÃ y."
 
-#: lib/revokeroleform.php:91
-#, php-format
-msgid "Revoke the \"%s\" role from this user"
-msgstr ""
-
 #: lib/router.php:709
 msgid "No single user defined for single-user mode."
 msgstr ""
 
-#: lib/searchaction.php:126
+#. TRANS: Used as a field label for the field where one or more keywords
+#. TRANS: for searching can be entered.
+#: lib/searchaction.php:129
 msgid "Keyword(s)"
 msgstr ""
 
-#: lib/searchaction.php:127
-msgid "Search"
-msgstr "TÃ¬m kiáº¿m"
-
 #: lib/searchgroupnav.php:80
 msgid "People"
 msgstr "TÃªn tÃ i khoáº£n"
@@ -4811,10 +4446,6 @@ msgstr ""
 msgid "More..."
 msgstr ""
 
-#: lib/silenceform.php:67
-msgid "Silence"
-msgstr ""
-
 #: lib/silenceform.php:78
 msgid "Silence this user"
 msgstr "Bá» cháº·n ngÆ°á»i dÃ¹ng nÃ y"
@@ -4843,10 +4474,6 @@ msgstr ""
 msgid "People Tagcloud as tagged"
 msgstr ""
 
-#: lib/tagcloudsection.php:56
-msgid "None"
-msgstr ""
-
 #: lib/themeuploader.php:50
 msgid "This server cannot handle theme uploads without ZIP support."
 msgstr ""
@@ -4883,10 +4510,6 @@ msgstr ""
 msgid "Theme contains file of type '.%s', which is not allowed."
 msgstr ""
 
-#: lib/topposterssection.php:74
-msgid "Top posters"
-msgstr ""
-
 #: lib/unsandboxform.php:69
 msgid "Unsandbox"
 msgstr ""
@@ -4930,56 +4553,32 @@ msgid "Moderator"
 msgstr ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1102
+#: lib/util.php:1103
 msgid "a few seconds ago"
 msgstr "vÃ i giÃ¢y trÆ°á»c"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1105
+#: lib/util.php:1106
 msgid "about a minute ago"
 msgstr "1 phÃºt trÆ°á»c"
 
-#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1109
-#, php-format
-msgid "about %d minutes ago"
-msgstr "%d phÃºt trÆ°á»c"
-
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 #: lib/util.php:1112
 msgid "about an hour ago"
 msgstr "1 giá» trÆ°á»c"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1116
-#, php-format
-msgid "about %d hours ago"
-msgstr "%d giá» trÆ°á»c"
-
-#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1119
+#: lib/util.php:1118
 msgid "about a day ago"
 msgstr "1 ngÃ y trÆ°á»c"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1123
-#, php-format
-msgid "about %d days ago"
-msgstr "%d ngÃ y trÆ°á»c"
-
-#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1126
+#: lib/util.php:1124
 msgid "about a month ago"
 msgstr "1 thÃ¡ng trÆ°á»c"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 #: lib/util.php:1130
-#, php-format
-msgid "about %d months ago"
-msgstr "%d thÃ¡ng trÆ°á»c"
-
-#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1133
 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 12a240ef68..eec5bb093e 100644
--- a/locale/zh_CN/LC_MESSAGES/statusnet.po
+++ b/locale/zh_CN/LC_MESSAGES/statusnet.po
@@ -1,33 +1,34 @@
-# Translation of StatusNet to Simplified Chinese
+# Translation of StatusNet to Simplified Chinese (âªä¸æ(ç®ä½)â¬)
+# Expored from translatewiki.net
 #
-# Author@translatewiki.net: Chenxiaoqino
-# Author@translatewiki.net: Shizhao
-# Author@translatewiki.net: Sweeite012f
-# Author@translatewiki.net: Tommyang
-# Author@translatewiki.net: ZhengYiFeng
+# Author: Chenxiaoqino
+# Author: Shizhao
+# Author: Sweeite012f
+# Author: Tommyang
+# Author: ZhengYiFeng
 # --
-# Messages of identi.ca
-# Copyright (C) 2008 Gouki <gouki@goukihq.org>
 # This file is distributed under the same license as the StatusNet package.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-08 22:33+0000\n"
-"PO-Revision-Date: 2010-09-09 17:38:22+0000\n"
-"Language-Team: Simplified Chinese\n"
+"POT-Creation-Date: 2010-09-14 19:53+0000\n"
+"PO-Revision-Date: 2010-09-14 19:54:26+0000\n"
+"Language-Team: Simplified Chinese <http://translatewiki.net/wiki/Portal:zh-"
+"hans>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r72348); Translate extension (2010-08-20)\n"
+"X-Generator: MediaWiki 1.17alpha (r73009); Translate extension (2010-08-20)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: zh-hans\n"
-"X-Message-Group: out-statusnet\n"
+"X-Message-Group: #out-statusnet\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
+"X-POT-Import-Date: 1284-49-16 34::+0000\n"
 
 #. TRANS: Page title
 #. TRANS: Menu item for site administration
-#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:376
+#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:363
 msgid "Access"
 msgstr "è®¿é®"
 
@@ -80,10 +81,10 @@ 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 actions/emailsettings.php:224
-#: actions/imsettings.php:184 actions/smssettings.php:209
-#: lib/applicationeditform.php:361
+#. TRANS: Button label in the "Edit application" form.
+#: actions/accessadminpanel.php:203 actions/emailsettings.php:228
+#: actions/imsettings.php:187 actions/smssettings.php:209
+#: lib/applicationeditform.php:351
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "ä¿å"
@@ -96,15 +97,15 @@ msgstr "æ²¡æè¿ä¸ªé¡µé¢ã"
 
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #: actions/all.php:79 actions/allrss.php:68
-#: actions/apiaccountupdatedeliverydevice.php:114
-#: actions/apiaccountupdateprofile.php:105
-#: actions/apiaccountupdateprofilebackgroundimage.php:116
-#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
-#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
-#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:113
-#: actions/apigroupismember.php:91 actions/apigroupjoin.php:100
-#: actions/apigroupleave.php:100 actions/apigrouplist.php:73
-#: actions/apistatusesupdate.php:229 actions/apisubscriptions.php:87
+#: actions/apiaccountupdatedeliverydevice.php:115
+#: actions/apiaccountupdateprofile.php:106
+#: actions/apiaccountupdateprofilebackgroundimage.php:117
+#: actions/apiaccountupdateprofileimage.php:106 actions/apiblockcreate.php:98
+#: actions/apiblockdestroy.php:97 actions/apidirectmessage.php:77
+#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:114
+#: actions/apigroupismember.php:91 actions/apigroupjoin.php:101
+#: actions/apigroupleave.php:101 actions/apigrouplist.php:73
+#: actions/apistatusesupdate.php:230 actions/apisubscriptions.php:87
 #: actions/apitimelinefavorites.php:72 actions/apitimelinefriends.php:174
 #: actions/apitimelinehome.php:80 actions/apitimelinementions.php:80
 #: actions/apitimelineuser.php:82 actions/avatarbynickname.php:75
@@ -200,16 +201,16 @@ msgid "Updates from %1$s and friends on %2$s!"
 msgstr "%2$sä¸%1$såå¥½åä»¬çæ´æ°ï¼"
 
 #: actions/apiaccountratelimitstatus.php:72
-#: actions/apiaccountupdatedeliverydevice.php:94
-#: actions/apiaccountupdateprofile.php:97
-#: actions/apiaccountupdateprofilebackgroundimage.php:94
-#: actions/apiaccountupdateprofilecolors.php:118
+#: actions/apiaccountupdatedeliverydevice.php:95
+#: actions/apiaccountupdateprofile.php:98
+#: actions/apiaccountupdateprofilebackgroundimage.php:95
+#: actions/apiaccountupdateprofilecolors.php:119
 #: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156
-#: actions/apifavoritecreate.php:100 actions/apifavoritedestroy.php:101
-#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100
-#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:139
-#: actions/apigroupismember.php:115 actions/apigroupjoin.php:156
-#: actions/apigroupleave.php:142 actions/apigrouplist.php:137
+#: actions/apifavoritecreate.php:101 actions/apifavoritedestroy.php:102
+#: actions/apifriendshipscreate.php:101 actions/apifriendshipsdestroy.php:101
+#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:140
+#: actions/apigroupismember.php:115 actions/apigroupjoin.php:157
+#: actions/apigroupleave.php:143 actions/apigrouplist.php:137
 #: actions/apigrouplistall.php:122 actions/apigroupmembership.php:107
 #: actions/apigroupshow.php:116 actions/apihelptest.php:88
 #: actions/apistatusesdestroy.php:104 actions/apistatusesretweets.php:112
@@ -224,48 +225,50 @@ msgstr "%2$sä¸%1$såå¥½åä»¬çæ´æ°ï¼"
 msgid "API method not found."
 msgstr "APIæ¹æ³æ²¡ææ¾å°ã"
 
-#: actions/apiaccountupdatedeliverydevice.php:86
-#: actions/apiaccountupdateprofile.php:89
-#: actions/apiaccountupdateprofilebackgroundimage.php:86
-#: actions/apiaccountupdateprofilecolors.php:110
-#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89
-#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109
-#: actions/apifavoritecreate.php:91 actions/apifavoritedestroy.php:92
-#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
-#: actions/apigroupcreate.php:105 actions/apigroupjoin.php:92
-#: actions/apigroupleave.php:92 actions/apimediaupload.php:67
-#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:198
+#. TRANS: Client error message. POST is a HTTP command. It should not be translated.
+#. TRANS: Client error. POST is a HTTP command. It should not be translated.
+#: actions/apiaccountupdatedeliverydevice.php:87
+#: actions/apiaccountupdateprofile.php:90
+#: actions/apiaccountupdateprofilebackgroundimage.php:87
+#: actions/apiaccountupdateprofilecolors.php:111
+#: actions/apiaccountupdateprofileimage.php:85 actions/apiblockcreate.php:90
+#: actions/apiblockdestroy.php:89 actions/apidirectmessagenew.php:110
+#: actions/apifavoritecreate.php:92 actions/apifavoritedestroy.php:93
+#: actions/apifriendshipscreate.php:92 actions/apifriendshipsdestroy.php:92
+#: actions/apigroupcreate.php:106 actions/apigroupjoin.php:93
+#: actions/apigroupleave.php:93 actions/apimediaupload.php:68
+#: actions/apistatusesretweet.php:66 actions/apistatusesupdate.php:199
 msgid "This method requires a POST."
 msgstr "æ¤æ¹æ³æ¥åPOSTè¯·æ±ã"
 
-#: actions/apiaccountupdatedeliverydevice.php:106
+#: actions/apiaccountupdatedeliverydevice.php:107
 msgid ""
 "You must specify a parameter named 'device' with a value of one of: sms, im, "
 "none."
 msgstr ""
 "ä½ å¿é¡»æå®ä¸ä¸ªåä¸º'device'çåæ°ï¼å¼å¯ä»¥æ¯ä»¥ä¸ä¸çä¸ä¸ªï¼sms, im, noneã"
 
-#: actions/apiaccountupdatedeliverydevice.php:133
+#: actions/apiaccountupdatedeliverydevice.php:134
 msgid "Could not update user."
 msgstr "æ æ³æ´æ°ç¨æ·ã"
 
-#: actions/apiaccountupdateprofile.php:112
-#: actions/apiaccountupdateprofilebackgroundimage.php:194
-#: actions/apiaccountupdateprofilecolors.php:185
-#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/apiaccountupdateprofile.php:113
+#: actions/apiaccountupdateprofilebackgroundimage.php:195
+#: actions/apiaccountupdateprofilecolors.php:186
+#: actions/apiaccountupdateprofileimage.php:131 actions/apiusershow.php:108
 #: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/hcard.php:74
 #: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
 #: lib/profileaction.php:84
 msgid "User has no profile."
 msgstr "ç¨æ·æ²¡æä¸ªäººä¿¡æ¯ã"
 
-#: actions/apiaccountupdateprofile.php:147
+#: actions/apiaccountupdateprofile.php:148
 msgid "Could not save profile."
 msgstr "æ æ³ä¿åä¸ªäººä¿¡æ¯ã"
 
-#: actions/apiaccountupdateprofilebackgroundimage.php:108
-#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
-#: actions/apistatusesupdate.php:212 actions/avatarsettings.php:257
+#: actions/apiaccountupdateprofilebackgroundimage.php:109
+#: actions/apiaccountupdateprofileimage.php:98 actions/apimediaupload.php:81
+#: actions/apistatusesupdate.php:213 actions/avatarsettings.php:257
 #: actions/designadminpanel.php:123 actions/editapplication.php:118
 #: actions/newapplication.php:101 actions/newnotice.php:94
 #: lib/designsettings.php:283
@@ -275,30 +278,30 @@ msgid ""
 "current configuration."
 msgstr "æå¡å¨å½åçè®¾ç½®æ æ³å¤çè¿ä¹å¤ç POST æ°æ®ï¼%s bytesï¼ã"
 
-#: actions/apiaccountupdateprofilebackgroundimage.php:136
-#: actions/apiaccountupdateprofilebackgroundimage.php:146
-#: actions/apiaccountupdateprofilecolors.php:164
-#: actions/apiaccountupdateprofilecolors.php:174
+#: actions/apiaccountupdateprofilebackgroundimage.php:137
+#: actions/apiaccountupdateprofilebackgroundimage.php:147
+#: actions/apiaccountupdateprofilecolors.php:165
+#: actions/apiaccountupdateprofilecolors.php:175
 #: actions/groupdesignsettings.php:290 actions/groupdesignsettings.php:300
 #: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
 #: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
 msgid "Unable to save your design settings."
 msgstr "æ æ³ä¿åä½ çå¤è§è®¾ç½®ã"
 
-#: actions/apiaccountupdateprofilebackgroundimage.php:187
-#: actions/apiaccountupdateprofilecolors.php:142
+#: actions/apiaccountupdateprofilebackgroundimage.php:188
+#: actions/apiaccountupdateprofilecolors.php:143
 msgid "Could not update your design."
 msgstr "æ æ³æ´æ°ä½ çå¤è§ã"
 
-#: actions/apiblockcreate.php:105
+#: actions/apiblockcreate.php:106
 msgid "You cannot block yourself!"
 msgstr "ä½ ä¸è½å±è½èªå·±ï¼"
 
-#: actions/apiblockcreate.php:126
+#: actions/apiblockcreate.php:127
 msgid "Block user failed."
 msgstr "å±è½ç¨æ·å¤±è´¥ã"
 
-#: actions/apiblockdestroy.php:114
+#: actions/apiblockdestroy.php:115
 msgid "Unblock user failed."
 msgstr "åæ¶å±è½ç¨æ·å¤±è´¥ã"
 
@@ -322,59 +325,59 @@ msgstr "åç»%sçç§ä¿¡"
 msgid "All the direct messages sent to %s"
 msgstr "ææåç»%sçç§ä¿¡"
 
-#: actions/apidirectmessagenew.php:118
+#: actions/apidirectmessagenew.php:119
 msgid "No message text!"
 msgstr "æ¶æ¯æ²¡ææ£æï¼"
 
-#: actions/apidirectmessagenew.php:127 actions/newmessage.php:150
+#: actions/apidirectmessagenew.php:128 actions/newmessage.php:150
 #, php-format
 msgid "That's too long. Max message size is %d chars."
 msgstr "å¤ªé¿äºãæé¿çä¿¡æ¯é¿åº¦æ¯%dä¸ªåç¬¦ã"
 
-#: actions/apidirectmessagenew.php:138
+#: actions/apidirectmessagenew.php:139
 msgid "Recipient user not found."
 msgstr "æªæ¾å°æ¶ä»¶äººã"
 
-#: actions/apidirectmessagenew.php:142
+#: actions/apidirectmessagenew.php:143
 msgid "Can't send direct messages to users who aren't your friend."
 msgstr "ä¸è½ç»æªæä¸ºå¥½åçç¨æ·åéç§ä¿¡ã"
 
-#: actions/apifavoritecreate.php:109 actions/apifavoritedestroy.php:110
+#: actions/apifavoritecreate.php:110 actions/apifavoritedestroy.php:111
 #: actions/apistatusesdestroy.php:121
 msgid "No status found with that ID."
 msgstr "æ²¡ææ¾å°æ¤ ID çæ¶æ¯ã"
 
-#: actions/apifavoritecreate.php:120
+#: actions/apifavoritecreate.php:121
 msgid "This status is already a favorite."
 msgstr "å·²æ¶èæ¤ç¶æã"
 
 #. TRANS: Error message text shown when a favorite could not be set.
-#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:296
+#: actions/apifavoritecreate.php:132 actions/favor.php:84 lib/command.php:296
 msgid "Could not create favorite."
 msgstr "æ æ³åå»ºæ¶èã"
 
-#: actions/apifavoritedestroy.php:123
+#: actions/apifavoritedestroy.php:124
 msgid "That status is not a favorite."
 msgstr "æ¤ç¶ææªè¢«æ¶èã"
 
-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
+#: actions/apifavoritedestroy.php:136 actions/disfavor.php:87
 msgid "Could not delete favorite."
 msgstr "æ æ³å é¤æ¶èã"
 
-#: actions/apifriendshipscreate.php:109
+#: actions/apifriendshipscreate.php:110
 msgid "Could not follow user: profile not found."
 msgstr "æ æ³å³æ³¨ç¨æ·ï¼æªæ¾å°ç¨æ·ã"
 
-#: actions/apifriendshipscreate.php:118
+#: actions/apifriendshipscreate.php:119
 #, php-format
 msgid "Could not follow user: %s is already on your list."
 msgstr "æ æ³å³æ³¨ç¨æ·ï¼ä½ å·²ç»å³æ³¨äº%sã"
 
-#: actions/apifriendshipsdestroy.php:109
+#: actions/apifriendshipsdestroy.php:110
 msgid "Could not unfollow user: User not found."
 msgstr "æ æ³åæ¶å³æ³¨ç¨æ·ï¼æªæ¾å°ç¨æ·ã"
 
-#: actions/apifriendshipsdestroy.php:120
+#: actions/apifriendshipsdestroy.php:121
 msgid "You cannot unfollow yourself."
 msgstr "ä½ ä¸è½åæ¶å³æ³¨èªå·±ã"
 
@@ -390,101 +393,101 @@ msgstr "æ æ³ç¡®å®æºç¨æ·ã"
 msgid "Could not find target user."
 msgstr "æ æ³æ¾å°ç®æ ç¨æ·ã"
 
-#: actions/apigroupcreate.php:167 actions/editgroup.php:186
+#: actions/apigroupcreate.php:168 actions/editgroup.php:186
 #: actions/newgroup.php:126 actions/profilesettings.php:215
 #: actions/register.php:212
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr "æµç§°åªè½ä½¿ç¨å°ååæ¯åæ°åä¸ä¸è½ä½¿ç¨ç©ºæ ¼ã"
 
-#: actions/apigroupcreate.php:176 actions/editgroup.php:190
+#: actions/apigroupcreate.php:177 actions/editgroup.php:190
 #: actions/newgroup.php:130 actions/profilesettings.php:238
 #: actions/register.php:215
 msgid "Nickname already in use. Try another one."
 msgstr "æµç§°å·²è¢«ä½¿ç¨ï¼æ¢ä¸ä¸ªå§ã"
 
-#: actions/apigroupcreate.php:183 actions/editgroup.php:193
+#: actions/apigroupcreate.php:184 actions/editgroup.php:193
 #: actions/newgroup.php:133 actions/profilesettings.php:218
 #: actions/register.php:217
 msgid "Not a valid nickname."
 msgstr "ä¸æ¯ææçæµç§°ã"
 
-#: actions/apigroupcreate.php:199 actions/editapplication.php:215
+#: actions/apigroupcreate.php:200 actions/editapplication.php:215
 #: actions/editgroup.php:199 actions/newapplication.php:203
 #: actions/newgroup.php:139 actions/profilesettings.php:222
 #: actions/register.php:224
 msgid "Homepage is not a valid URL."
 msgstr "ä¸»é¡µçURLä¸æ£ç¡®ã"
 
-#: actions/apigroupcreate.php:208 actions/editgroup.php:202
+#: actions/apigroupcreate.php:209 actions/editgroup.php:202
 #: actions/newgroup.php:142 actions/profilesettings.php:225
 #: actions/register.php:227
 msgid "Full name is too long (max 255 chars)."
 msgstr "å¨åè¿é¿(ä¸è½è¶è¿ 255 ä¸ªåç¬¦)ã"
 
-#: actions/apigroupcreate.php:216 actions/editapplication.php:190
+#: actions/apigroupcreate.php:217 actions/editapplication.php:190
 #: actions/newapplication.php:172
 #, php-format
 msgid "Description is too long (max %d chars)."
 msgstr "æè¿°è¿é¿(ä¸è½è¶è¿%d ä¸ªåç¬¦)ã"
 
-#: actions/apigroupcreate.php:227 actions/editgroup.php:208
+#: actions/apigroupcreate.php:228 actions/editgroup.php:208
 #: actions/newgroup.php:148 actions/profilesettings.php:232
 #: actions/register.php:234
 msgid "Location is too long (max 255 chars)."
 msgstr "ä½ç½®è¿é¿(ä¸è½è¶è¿255ä¸ªåç¬¦)ã"
 
-#: actions/apigroupcreate.php:246 actions/editgroup.php:219
+#: actions/apigroupcreate.php:247 actions/editgroup.php:219
 #: actions/newgroup.php:159
 #, php-format
 msgid "Too many aliases! Maximum %d."
 msgstr "å¤ªå¤å«åäºï¼æå¤%d ä¸ªã"
 
-#: actions/apigroupcreate.php:267
+#: actions/apigroupcreate.php:268
 #, php-format
 msgid "Invalid alias: \"%s\"."
 msgstr "æ æçå«åï¼â%sâã"
 
-#: actions/apigroupcreate.php:276 actions/editgroup.php:232
+#: actions/apigroupcreate.php:277 actions/editgroup.php:232
 #: actions/newgroup.php:172
 #, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr "%sè¿ä¸ªå«åå·²è¢«ä½¿ç¨ï¼æ¢ä¸ä¸ªå§ã"
 
-#: actions/apigroupcreate.php:289 actions/editgroup.php:238
+#: actions/apigroupcreate.php:290 actions/editgroup.php:238
 #: actions/newgroup.php:178
 msgid "Alias can't be the same as nickname."
 msgstr "å«åä¸è½åæµç§°ç¸åã"
 
-#: actions/apigroupismember.php:96 actions/apigroupjoin.php:105
-#: actions/apigroupleave.php:105 actions/apigroupmembership.php:92
+#: actions/apigroupismember.php:96 actions/apigroupjoin.php:106
+#: actions/apigroupleave.php:106 actions/apigroupmembership.php:92
 #: actions/apigroupshow.php:83 actions/apitimelinegroup.php:92
 msgid "Group not found."
 msgstr "å°ç»æªæ¾å°ã"
 
 #. TRANS: Error text shown a user tries to join a group they already are a member of.
-#: actions/apigroupjoin.php:111 actions/joingroup.php:100 lib/command.php:336
+#: actions/apigroupjoin.php:112 actions/joingroup.php:100 lib/command.php:336
 msgid "You are already a member of that group."
 msgstr "ä½ å·²ç»æ¯è¯¥å°ç»æåã"
 
 #. TRANS: Error text shown when a user tries to join a group they are blocked from joining.
-#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:341
+#: actions/apigroupjoin.php:121 actions/joingroup.php:105 lib/command.php:341
 msgid "You have been blocked from that group by the admin."
 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.
-#: actions/apigroupjoin.php:139 actions/joingroup.php:134 lib/command.php:353
+#: actions/apigroupjoin.php:140 actions/joingroup.php:134 lib/command.php:353
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "æ æ³æç¨æ·%1$sæ·»å å°%2$så°ç»"
 
-#: actions/apigroupleave.php:115
+#: actions/apigroupleave.php:116
 msgid "You are not a member of this group."
 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.
-#: actions/apigroupleave.php:125 actions/leavegroup.php:129
+#: actions/apigroupleave.php:126 actions/leavegroup.php:129
 #: lib/command.php:401
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
@@ -514,7 +517,7 @@ msgstr "%s çå°ç»"
 msgid "groups on %s"
 msgstr "å¨%sä¸çå°ç»"
 
-#: actions/apimediaupload.php:99
+#: actions/apimediaupload.php:100
 msgid "Upload failed."
 msgstr "ä¸ä¼ å¤±è´¥"
 
@@ -528,9 +531,9 @@ msgstr "æ æç tokenã"
 
 #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
 #: actions/deletenotice.php:169 actions/disfavor.php:74
-#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:55
+#: actions/emailsettings.php:271 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:66 actions/imsettings.php:227
+#: actions/groupunblock.php:66 actions/imsettings.php:230
 #: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
@@ -573,8 +576,8 @@ msgstr "%sç request token è¢«æç»å¹¶è¢«åæ¶ã"
 #. 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:286 actions/grouplogo.php:322
-#: actions/imsettings.php:242 actions/newapplication.php:121
+#: actions/emailsettings.php:290 actions/grouplogo.php:322
+#: actions/imsettings.php:245 actions/newapplication.php:121
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
 #: actions/smssettings.php:277 lib/designsettings.php:304
 msgid "Unexpected form submission."
@@ -637,18 +640,18 @@ msgstr "æ¤æ¹æ³æ¥åPOSTæDELETEè¯·æ±ã"
 msgid "You may not delete another user's status."
 msgstr "ä½ ä¸è½å é¤å¶ä»ç¨æ·çæ¶æ¯ã"
 
-#: actions/apistatusesretweet.php:75 actions/apistatusesretweets.php:72
+#: actions/apistatusesretweet.php:76 actions/apistatusesretweets.php:72
 #: actions/deletenotice.php:52 actions/shownotice.php:92
 msgid "No such notice."
 msgstr "æ²¡æè¿æ¡æ¶æ¯ã"
 
 #. TRANS: Error text shown when trying to repeat an own notice.
-#: actions/apistatusesretweet.php:83 lib/command.php:538
+#: actions/apistatusesretweet.php:84 lib/command.php:538
 msgid "Cannot repeat your own notice."
 msgstr "ä¸è½è½¬åä½ èªå·±çæ¶æ¯ã"
 
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-#: actions/apistatusesretweet.php:91 lib/command.php:544
+#: actions/apistatusesretweet.php:92 lib/command.php:544
 msgid "Already repeated that notice."
 msgstr "å·²è½¬åäºè¯¥æ¶æ¯ã"
 
@@ -660,21 +663,21 @@ msgstr "æ¶æ¯å·²å é¤ã"
 msgid "No status with that ID found."
 msgstr "æ²¡ææ¾å°æ¤ ID çæ¶æ¯ã"
 
-#: actions/apistatusesupdate.php:221
+#: actions/apistatusesupdate.php:222
 msgid "Client must provide a 'status' parameter with a value."
 msgstr "å®¢æ·ç«¯å¿é¡»æä¾ä¸ä¸ªåå«åå®¹çâç¶æâåæ°ã"
 
-#: actions/apistatusesupdate.php:242 actions/newnotice.php:157
+#: actions/apistatusesupdate.php:243 actions/newnotice.php:157
 #: lib/mailhandler.php:60
 #, php-format
 msgid "That's too long. Max notice size is %d chars."
 msgstr "å¤ªé¿äºãæé¿çæ¶æ¯é¿åº¦æ¯%dä¸ªåç¬¦ã"
 
-#: actions/apistatusesupdate.php:283 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:284 actions/apiusershow.php:96
 msgid "Not found."
 msgstr "æªæ¾å°ã"
 
-#: actions/apistatusesupdate.php:306 actions/newnotice.php:181
+#: actions/apistatusesupdate.php:307 actions/newnotice.php:181
 #, php-format
 msgid "Max notice size is %d chars, including attachment URL."
 msgstr "æ¯æ¡æ¶æ¯æé¿%dåç¬¦ï¼åæ¬éä»¶çé¾æ¥ URLã"
@@ -873,7 +876,9 @@ msgid "Yes"
 msgstr "æ¯"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
+#. TRANS: Submit button title.
+#. TRANS: Description of the form to block a user.
+#: actions/block.php:164 actions/groupmembers.php:403 lib/blockform.php:82
 msgid "Block this user"
 msgstr "å±è½è¿ä¸ªç¨æ·"
 
@@ -915,11 +920,13 @@ msgstr "è¢«å±è½å å¥æ¤å°ç»çç¨æ·åè¡¨ã"
 msgid "Unblock user from group"
 msgstr "åæ¶å°ç»å¯¹ç¨æ·çå±è½ã"
 
-#: actions/blockedfromgroup.php:320 lib/unblockform.php:69
+#. TRANS: Title for the form to unblock a user.
+#: actions/blockedfromgroup.php:320 lib/unblockform.php:70
 msgid "Unblock"
 msgstr "åæ¶å±è½"
 
-#: actions/blockedfromgroup.php:320 lib/unblockform.php:80
+#. TRANS: Description of the form to unblock a user.
+#: actions/blockedfromgroup.php:320 lib/unblockform.php:82
 msgid "Unblock this user"
 msgstr "åæ¶å±è½è¿ä¸ªç¨æ·ã"
 
@@ -958,9 +965,9 @@ msgstr "æ¤å°åå·²è¢«ç¡®è®¤è¿äºã"
 #. 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/confirmaddress.php:116 actions/emailsettings.php:331
+#: actions/emailsettings.php:477 actions/imsettings.php:283
+#: actions/imsettings.php:442 actions/othersettings.php:174
 #: actions/profilesettings.php:283 actions/smssettings.php:308
 #: actions/smssettings.php:464
 msgid "Couldn't update user."
@@ -968,7 +975,7 @@ msgstr "æ æ³æ´æ°ç¨æ·ã"
 
 #. 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/confirmaddress.php:128 actions/emailsettings.php:437
 #: actions/smssettings.php:422
 msgid "Couldn't delete email confirmation."
 msgstr "æ æ³å é¤çµåé®ä»¶ç¡®è®¤ã"
@@ -1004,9 +1011,10 @@ msgstr "æªæ¾å°åºç¨ã"
 msgid "You are not the owner of this application."
 msgstr "ä½ ä¸æ¯è¯¥åºç¨çæ¥æèã"
 
+#. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:127
 #: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1307
+#: lib/action.php:1315
 msgid "There was a problem with your session token."
 msgstr "ä½ ç session token åºç°äºé®é¢ã"
 
@@ -1039,7 +1047,7 @@ msgstr "å é¤è¿ä¸ªåºç¨"
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
 #: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:73 lib/profileformaction.php:64
+#: lib/adminpanelaction.php:71 lib/profileformaction.php:64
 #: lib/settingsaction.php:72
 msgid "Not logged in."
 msgstr "æªç»å½ã"
@@ -1099,7 +1107,6 @@ msgstr "å é¤è¿ä¸ªç¨æ·"
 #. TRANS: Message used as title for design settings for the site.
 #. TRANS: Link description in user account settings menu.
 #: actions/designadminpanel.php:63 lib/accountsettingsaction.php:139
-#: lib/groupnav.php:119
 msgid "Design"
 msgstr "å¤è§"
 
@@ -1218,13 +1225,13 @@ msgstr "æ¢å¤é»è®¤å¤è§"
 msgid "Reset back to default"
 msgstr "éç½®å°é»è®¤"
 
-#. TRANS: Submit button title
+#. TRANS: Submit button title.
 #: actions/designadminpanel.php:685 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/snapshotadminpanel.php:245
 #: actions/subscriptions.php:226 actions/tagother.php:154
-#: actions/useradminpanel.php:294 lib/applicationeditform.php:363
+#: actions/useradminpanel.php:294 lib/applicationeditform.php:353
 #: lib/designsettings.php:256 lib/groupeditform.php:202
 msgid "Save"
 msgstr "ä¿å"
@@ -1380,7 +1387,7 @@ msgstr "å½åç¡®è®¤ççµåé®ä»¶ã"
 #. 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/emailsettings.php:115 actions/emailsettings.php:162
 #: actions/imsettings.php:116 actions/smssettings.php:124
 #: actions/smssettings.php:180
 msgctxt "BUTTON"
@@ -1398,22 +1405,26 @@ msgstr ""
 #. 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
+#. TRANS: Button label in the "Edit application" form.
 #: actions/emailsettings.php:127 actions/imsettings.php:131
-#: actions/smssettings.php:137 lib/applicationeditform.php:357
+#: actions/smssettings.php:137 lib/applicationeditform.php:347
 msgctxt "BUTTON"
 msgid "Cancel"
 msgstr "åæ¶"
 
-#. TRANS: Instructions for e-mail address input form.
-#: actions/emailsettings.php:135
+#. TRANS: Instructions for e-mail address input form. Do not translate
+#. TRANS: "example.org". It is one of the domain names reserved for
+#. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
+#. TRANS: Any other domain may be owned by a legitimate person or
+#. TRANS: organization.
+#: actions/emailsettings.php:139
 msgid "Email address, like \"UserName@example.org\""
 msgstr "çµåé®ä»¶ï¼ç±»ä¼¼ \"UserName@example.org\""
 
 #. 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/emailsettings.php:143 actions/imsettings.php:151
 #: actions/smssettings.php:162
 msgctxt "BUTTON"
 msgid "Add"
@@ -1421,110 +1432,110 @@ msgstr "æ·»å "
 
 #. 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
+#: actions/emailsettings.php:151 actions/smssettings.php:171
 msgid "Incoming email"
 msgstr "æ¥æ¶ç¨ email"
 
 #. 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
+#: actions/emailsettings.php:159 actions/smssettings.php:178
 msgid "Send email to this address to post new notices."
 msgstr "éè¿åéçµåé®ä»¶å°è¿ä¸ªå°åæ¥åå¸æ°çæ¶æ¯ã"
 
 #. 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
+#: actions/emailsettings.php:168 actions/smssettings.php:186
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr "çææ°ççµåé®ä»¶å°åç¨äºåå¸æ¶æ¯ï¼åæ¶æ§çã"
 
 #. 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
+#: actions/emailsettings.php:172 actions/smssettings.php:189
 msgctxt "BUTTON"
 msgid "New"
 msgstr "æ°å¢"
 
 #. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:174
+#: actions/emailsettings.php:178
 msgid "Email preferences"
 msgstr "Email åå¥½"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:180
+#: actions/emailsettings.php:184
 msgid "Send me notices of new subscriptions through email."
 msgstr "å°æ°çå³æ³¨éè¿çµåé®ä»¶åéç»æã"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:186
+#: actions/emailsettings.php:190
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr "æäººæ¶èæçæ¶æ¯æ¶ï¼åé®ä»¶éç¥æã"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:193
+#: actions/emailsettings.php:197
 msgid "Send me email when someone sends me a private message."
 msgstr "æäººç»æåéç§ä¿¡æ¶ï¼åé®ä»¶éç¥æã"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:199
+#: actions/emailsettings.php:203
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr "æäººç»æåé @ æ¶æ¯æ¶ï¼åé®ä»¶éç¥æã"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:205
+#: actions/emailsettings.php:209
 msgid "Allow friends to nudge me and send me an email."
 msgstr "åè®¸æåä»¬å¼å«æå¹¶ç»æåéé®ä»¶ã"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:212
+#: actions/emailsettings.php:216
 msgid "I want to post notices by email."
 msgstr "æå¸æéè¿é®ä»¶åå¸ä¿¡æ¯ã"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:219
+#: actions/emailsettings.php:223
 msgid "Publish a MicroID for my email address."
 msgstr "å¬å¼çµåé®ä»¶ç MicroIDã"
 
 #. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:334
+#: actions/emailsettings.php:338
 msgid "Email preferences saved."
 msgstr "Email åå¥½å·²ä¿åã"
 
 #. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:353
+#: actions/emailsettings.php:357
 msgid "No email address."
 msgstr "æ²¡æçµåé®ä»¶å°åã"
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:361
+#: actions/emailsettings.php:365
 msgid "Cannot normalize that email address"
 msgstr "æ æ³è¯å«æ¤çµåé®ä»¶"
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:208
+#: actions/emailsettings.php:370 actions/register.php:208
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "ä¸æ¯ææççµåé®ä»¶ã"
 
 #. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:370
+#: actions/emailsettings.php:374
 msgid "That is already your email address."
 msgstr "ä½ å·²ç»è®°æ¤çµåé®ä»¶ã"
 
 #. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:374
+#: actions/emailsettings.php:378
 msgid "That email address already belongs to another user."
 msgstr "æ¤çµåé®ä»¶å±äºå¶ä»ç¨æ·ã"
 
 #. 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/emailsettings.php:395 actions/imsettings.php:351
 #: actions/smssettings.php:373
 msgid "Couldn't insert confirmation code."
 msgstr "æ æ³æå¥ç¡®è®¤ç ã"
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:398
+#: actions/emailsettings.php:402
 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."
@@ -1535,50 +1546,50 @@ msgstr ""
 #. 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/emailsettings.php:423 actions/imsettings.php:386
 #: actions/smssettings.php:408
 msgid "No pending confirmation to cancel."
 msgstr "æ²¡æå¯ä»¥åæ¶çç¡®è®¤ã"
 
 #. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:424
+#: actions/emailsettings.php:428
 msgid "That is the wrong email address."
 msgstr "è¿æ¯éè¯¯ççµåé®ä»¶å°åã"
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:438
+#: actions/emailsettings.php:442
 msgid "Email confirmation cancelled."
 msgstr "Email ç¡®è®¤å·²åæ¶ã"
 
 #. TRANS: Message given trying to remove an e-mail address that is not
 #. TRANS: registered for the active user.
-#: actions/emailsettings.php:458
+#: actions/emailsettings.php:462
 msgid "That is not your email address."
 msgstr "è¿ä¸ªä¸æ¯ä½ ççµåé®ä»¶å°åã"
 
 #. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:479
+#: actions/emailsettings.php:483
 msgid "The email address was removed."
 msgstr "çµåé®ä»¶å°åå·²è¢«å é¤ã"
 
-#: actions/emailsettings.php:493 actions/smssettings.php:568
+#: actions/emailsettings.php:497 actions/smssettings.php:568
 msgid "No incoming email address."
 msgstr "æ²¡æåå¸ç¨ççµåé®ä»¶å°åã"
 
 #. 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/emailsettings.php:508 actions/emailsettings.php:532
 #: actions/smssettings.php:578 actions/smssettings.php:602
 msgid "Couldn't update user record."
 msgstr "æ æ³æ´æ°ç¨æ·è®°å½ã"
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
-#: actions/emailsettings.php:508 actions/smssettings.php:581
+#: actions/emailsettings.php:512 actions/smssettings.php:581
 msgid "Incoming email address removed."
 msgstr "åå¸ç¨ççµåé®ä»¶è¢«å é¤ã"
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
-#: actions/emailsettings.php:532 actions/smssettings.php:605
+#: actions/emailsettings.php:536 actions/smssettings.php:605
 msgid "New incoming email address added."
 msgstr "å·²æ·»å æ°çåå¸ç¨ççµåé®ä»¶å°åã"
 
@@ -1691,7 +1702,7 @@ msgstr "æ æ³å° request token è½¬æ¢ä¸º access tokenã"
 msgid "Remote service uses unknown version of OMB protocol."
 msgstr "è¿ç¨æå¡ä½¿ç¨äºæªç¥çæ¬ç OMB åè®®ã"
 
-#: actions/finishremotesubscribe.php:138
+#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306
 msgid "Error updating remote profile."
 msgstr "æ´æ°è¿ç¨çä¸ªäººä¿¡æ¯æ¶åºéã"
 
@@ -1748,7 +1759,7 @@ msgstr "ç¨æ·å·²ç»è¢«å°ç»å±è½ã"
 msgid "User is not a member of group."
 msgstr "ç¨æ·ä¸æ¯å°ç»æåã"
 
-#: actions/groupblock.php:134 actions/groupmembers.php:360
+#: actions/groupblock.php:134 actions/groupmembers.php:364
 msgid "Block user from group"
 msgstr "ä»å°ç»ä¸å±è½ç¨æ·"
 
@@ -1825,40 +1836,32 @@ msgstr "logoå·²æ´æ°ã"
 msgid "Failed updating logo."
 msgstr "æ´æ° logo å¤±è´¥ã"
 
-#: actions/groupmembers.php:100 lib/groupnav.php:92
+#. TRANS: Title of the page showing group members.
+#. TRANS: %s is the name of the group.
+#: actions/groupmembers.php:102
 #, php-format
 msgid "%s group members"
 msgstr "%s çå°ç»æå"
 
-#: actions/groupmembers.php:103
+#. TRANS: Title of the page showing group members.
+#. TRANS: %1$s is the name of the group, %2$d is the page number of the members list.
+#: actions/groupmembers.php:107
 #, php-format
 msgid "%1$s group members, page %2$d"
 msgstr "%s çå°ç»æåï¼ç¬¬%2$dé¡µ"
 
-#: actions/groupmembers.php:118
+#: actions/groupmembers.php:122
 msgid "A list of the users in this group."
 msgstr "è¯¥å°ç»çæååè¡¨ã"
 
-#: actions/groupmembers.php:182 lib/groupnav.php:107
+#: actions/groupmembers.php:186
 msgid "Admin"
 msgstr "ç®¡ç"
 
-#: actions/groupmembers.php:392 lib/blockform.php:69
-msgid "Block"
-msgstr "å±è½"
-
-#: actions/groupmembers.php:487
+#: actions/groupmembers.php:498
 msgid "Make user an admin of the group"
 msgstr "ä½¿ç¨æ·æä¸ºå°ç»çç®¡çå"
 
-#: actions/groupmembers.php:519
-msgid "Make Admin"
-msgstr "è®¾ç½®ç®¡çå"
-
-#: actions/groupmembers.php:519
-msgid "Make this user an admin"
-msgstr "ä½¿è¿ä¸ªç¨æ·æä¸ºç®¡çå"
-
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Title in atom group notice feed. %s is a group name.
 #. TRANS: Title in atom user notice feed. %s is a user name.
@@ -1993,7 +1996,10 @@ msgstr ""
 
 #. TRANS: IM address input field instructions in IM settings form.
 #. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:140
+#. TRANS: Do not translate "example.org". It is one of the domain names reserved for use in examples by
+#. TRANS: http://www.rfc-editor.org/rfc/rfc2606.txt. Any other domain may be owned by a legitimate
+#. TRANS: person or organization.
+#: actions/imsettings.php:143
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -2003,63 +2009,63 @@ msgstr ""
 "æ GTalk ä¸å° %s å ä¸ºå¥½åã"
 
 #. TRANS: Form legend for IM preferences form.
-#: actions/imsettings.php:155
+#: actions/imsettings.php:158
 msgid "IM preferences"
 msgstr "IM é¦éé¡¹å·²ä¿åã"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:160
+#: actions/imsettings.php:163
 msgid "Send me notices through Jabber/GTalk."
 msgstr "éè¿ Jabber/GTalk åééåã"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:166
+#: actions/imsettings.php:169
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr "å½æç Jabber/GTalk ç¶ææ¹åæ¶èªå¨åå¸æ¶æ¯ã"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:172
+#: actions/imsettings.php:175
 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr "å°ææ²¡æå³æ³¨çç¨æ·ç»æçåå¤éè¿ Jabber/GTalk åéç»æã"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:179
+#: actions/imsettings.php:182
 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "å¬å¼ Jabber/GTalk å¸å·ç MicroIDã"
 
 #. TRANS: Confirmation message for successful IM preferences save.
-#: actions/imsettings.php:287 actions/othersettings.php:180
+#: actions/imsettings.php:290 actions/othersettings.php:180
 msgid "Preferences saved."
 msgstr "é¦éé¡¹å·²ä¿åã"
 
 #. TRANS: Message given saving IM address without having provided one.
-#: actions/imsettings.php:309
+#: actions/imsettings.php:312
 msgid "No Jabber ID."
 msgstr "æ²¡æ Jabber IDã"
 
 #. TRANS: Message given saving IM address that cannot be normalised.
-#: actions/imsettings.php:317
+#: actions/imsettings.php:320
 msgid "Cannot normalize that Jabber ID"
 msgstr "æ æ³è¯å«æ¤ Jabber ID"
 
 #. TRANS: Message given saving IM address that not valid.
-#: actions/imsettings.php:322
+#: actions/imsettings.php:325
 msgid "Not a valid Jabber ID"
 msgstr "ä¸æ¯ææç Jabber ID"
 
 #. TRANS: Message given saving IM address that is already set.
-#: actions/imsettings.php:326
+#: actions/imsettings.php:329
 msgid "That is already your Jabber ID."
 msgstr "è¿ä¸ªå·²ç»æ¯ä½ ç Jabber å¸å·äºã"
 
 #. TRANS: Message given saving IM address that is already set for another user.
-#: actions/imsettings.php:330
+#: actions/imsettings.php:333
 msgid "Jabber ID already belongs to another user."
 msgstr "Jabber ID å±äºå¦ä¸ç¨æ·ã"
 
 #. 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
+#: actions/imsettings.php:361
 #, php-format
 msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
@@ -2067,28 +2073,28 @@ msgid ""
 msgstr "éªè¯ç å·²è¢«åéå°ä½ æ°å¢ç IM å°åãä½ å¿é¡»åè®¸ %s åä½ åéä¿¡æ¯ã"
 
 #. TRANS: Message given canceling IM address confirmation for the wrong IM address.
-#: actions/imsettings.php:388
+#: actions/imsettings.php:391
 msgid "That is the wrong IM address."
 msgstr "IM å°åéè¯¯ã"
 
 #. TRANS: Server error thrown on database error canceling IM address confirmation.
-#: actions/imsettings.php:397
+#: actions/imsettings.php:400
 msgid "Couldn't delete IM confirmation."
 msgstr "æ æ³å é¤ IM ç¡®è®¤ã"
 
 #. TRANS: Message given after successfully canceling IM address confirmation.
-#: actions/imsettings.php:402
+#: actions/imsettings.php:405
 msgid "IM confirmation cancelled."
 msgstr "IM ç¡®è®¤å·²åæ¶ã"
 
 #. TRANS: Message given trying to remove an IM address that is not
 #. TRANS: registered for the active user.
-#: actions/imsettings.php:424
+#: actions/imsettings.php:427
 msgid "That is not your Jabber ID."
 msgstr "è¿ä¸æ¯ä½ ç Jabber IDã"
 
 #. TRANS: Message given after successfully removing a registered IM address.
-#: actions/imsettings.php:447
+#: actions/imsettings.php:450
 msgid "The IM address was removed."
 msgstr "IM å°åå·²å é¤ã"
 
@@ -2524,7 +2530,7 @@ msgstr "æ¶æ¯æ²¡æå¯¹åºç¨æ·ã"
 #: actions/oembed.php:87 actions/shownotice.php:175
 #, php-format
 msgid "%1$s's status on %2$s"
-msgstr "%1$så¨ç%2$sä¸çæ¶æ¯"
+msgstr "%1$så¨%2$sæ¶åçæ¶æ¯"
 
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
 #: actions/oembed.php:159
@@ -2539,8 +2545,8 @@ msgid "Only %s URLs over plain HTTP please."
 msgstr "è¯·åªç¨HTTPææç%sURLsçå°åã"
 
 #. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1215
-#: lib/apiaction.php:1243 lib/apiaction.php:1366
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1206
+#: lib/apiaction.php:1233 lib/apiaction.php:1356
 msgid "Not a supported data format."
 msgstr "ä¸æ¯æçæ°æ®æ ¼å¼ã"
 
@@ -2680,7 +2686,7 @@ msgid "Password saved."
 msgstr "å¯ç å·²ä¿åã"
 
 #. TRANS: Menu item for site administration
-#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:384
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:371
 msgid "Paths"
 msgstr "è·¯å¾"
 
@@ -2889,7 +2895,7 @@ msgstr "å¨å"
 
 #. TRANS: Form input field label.
 #: actions/profilesettings.php:115 actions/register.php:460
-#: lib/applicationeditform.php:244 lib/groupeditform.php:161
+#: lib/applicationeditform.php:235 lib/groupeditform.php:161
 msgid "Homepage"
 msgstr "ä¸»é¡µ"
 
@@ -2992,7 +2998,7 @@ msgid "Couldn't save tags."
 msgstr "æ æ³ä¿åæ ç¾ã"
 
 #. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:391 lib/adminpanelaction.php:141
+#: actions/profilesettings.php:391 lib/adminpanelaction.php:138
 msgid "Settings saved."
 msgstr "è®¾ç½®å·²ä¿åã"
 
@@ -3505,7 +3511,7 @@ msgstr "ç¨äºå·²ç»å¨æ²çä¸äºã"
 
 #. TRANS: Menu item for site administration
 #: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
-#: lib/adminpanelaction.php:392
+#: lib/adminpanelaction.php:379
 msgid "Sessions"
 msgstr "Sessions"
 
@@ -3543,24 +3549,24 @@ msgid "Application profile"
 msgstr "æªæ¾å°åºç¨ã"
 
 #. TRANS: Form input field label for application icon.
-#: actions/showapplication.php:159 lib/applicationeditform.php:182
+#: actions/showapplication.php:159 lib/applicationeditform.php:173
 msgid "Icon"
 msgstr "å¾æ "
 
 #. TRANS: Form input field label for application name.
 #: actions/showapplication.php:169 actions/version.php:197
-#: lib/applicationeditform.php:199
+#: lib/applicationeditform.php:190
 msgid "Name"
 msgstr "åç§°"
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:178 lib/applicationeditform.php:235
+#: actions/showapplication.php:178 lib/applicationeditform.php:226
 msgid "Organization"
 msgstr "ç»ç»åç§°å¿å¡«ã"
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:216 lib/groupeditform.php:172
+#: lib/applicationeditform.php:207 lib/groupeditform.php:172
 msgid "Description"
 msgstr "æè¿°"
 
@@ -3669,7 +3675,7 @@ msgstr ""
 msgid "This is a way to share what you like."
 msgstr "è¿æ¯ä¸ç§åäº«ä½ åæ¬¢çåå®¹çæ¹å¼ã"
 
-#: actions/showgroup.php:82 lib/groupnav.php:86
+#: actions/showgroup.php:82
 #, php-format
 msgid "%s group"
 msgstr "%s å°ç»"
@@ -3721,7 +3727,7 @@ msgstr "%så°ç»çæ¶æ¯èå (Atom)"
 msgid "FOAF for %s group"
 msgstr "%s çåä»¶ç®±"
 
-#: actions/showgroup.php:393 actions/showgroup.php:445 lib/groupnav.php:91
+#: actions/showgroup.php:393 actions/showgroup.php:445
 msgid "Members"
 msgstr "å°ç»æå"
 
@@ -4162,7 +4168,7 @@ msgstr "æ²¡æè¾å¥éªè¯ç "
 
 #. TRANS: Menu item for site administration
 #: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
-#: lib/adminpanelaction.php:408
+#: lib/adminpanelaction.php:395
 msgid "Snapshots"
 msgstr "å¿«ç§"
 
@@ -4864,7 +4870,7 @@ msgid "Unable to save tag."
 msgstr "æ æ³ä¿åæ ç¾ã"
 
 #. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#: classes/Subscription.php:75 lib/oauthstore.php:465
+#: classes/Subscription.php:75 lib/oauthstore.php:466
 msgid "You have been banned from subscribing."
 msgstr "ä½ è¢«ç¦æ¢æ·»å å³æ³¨ã"
 
@@ -5012,7 +5018,8 @@ msgid "Change site configuration"
 msgstr "æ´æ¹ç½ç«éç½®"
 
 #. TRANS: Main menu option when logged in and site admin for access to site configuration
-#: lib/action.php:474
+#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
+#: lib/action.php:474 lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr "ç®¡ç"
@@ -5089,7 +5096,7 @@ msgstr "æç´¢"
 
 #. TRANS: DT element for site notice. String is hidden in default CSS.
 #. TRANS: Menu item for site administration
-#: lib/action.php:538 lib/adminpanelaction.php:400
+#: lib/action.php:538 lib/adminpanelaction.php:387
 msgid "Site notice"
 msgstr "ç½ç«æ¶æ¯"
 
@@ -5153,7 +5160,10 @@ msgid "StatusNet software license"
 msgstr "StatusNet è½¯ä»¶è®¸å¯è¯"
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
-#: lib/action.php:843
+#. TRANS: Text between [] is a link description, text between () is the link itself.
+#. TRANS: Make sure there is no whitespace between "]" and "(".
+#. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
+#: lib/action.php:846
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -5163,13 +5173,16 @@ msgstr ""
 "broughtbyurl%%)ã"
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:846
+#: lib/action.php:849
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** æ¯ä¸ä¸ªå¾®åå®¢æå¡ã"
 
 #. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.
-#: lib/action.php:850
+#. TRANS: Make sure there is no whitespace between "]" and "(".
+#. TRANS: Text between [] is a link description, text between () is the link itself.
+#. TRANS: %s is the version of StatusNet that is being used.
+#: lib/action.php:856
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -5180,49 +5193,50 @@ msgstr ""
 "(http://www.fsf.org/licensing/licenses/agpl-3.0.html)ææã"
 
 #. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:866
+#: lib/action.php:872
 msgid "Site content license"
 msgstr "ç½ç«åå®¹è®¸å¯åè®®"
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:873
+#: lib/action.php:879
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr "%1$sçåå®¹åæ°æ®æ¯ç§äººä¸ä¿å¯çã"
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:880
+#: lib/action.php:886
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr "åå®¹åæ°æ®%1$sçæææå¹¶ä¿çæææå©ã"
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:884
+#: lib/action.php:890
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr "åå®¹åæ°æ®è´¡ç®èçæææå¹¶ä¿çæææå©ã"
 
-#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:897
+#. TRANS: license message in footer.
+#. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
+#: lib/action.php:904
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr "ææ%1$sçåå®¹åæ°æ®å¨%2$sè®¸å¯ä¸ææã"
 
 #. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1236
+#: lib/action.php:1243
 msgid "Pagination"
 msgstr "åé¡µ"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1247
+#: lib/action.php:1254
 msgid "After"
 msgstr "ä¹å"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1257
+#: lib/action.php:1264
 msgid "Before"
 msgstr "ä¹å"
 
@@ -5231,205 +5245,224 @@ msgstr "ä¹å"
 msgid "Expecting a root feed element but got a whole XML document."
 msgstr "åªæå¾ä¸ä¸ª root feed åç´ ä½æ¶å°äºæ´ä¸ªç XML ææ¡£ã"
 
-#: lib/activityutils.php:208
+#. TRANS: Client exception thrown when there is no source attribute.
+#: lib/activityutils.php:203
 msgid "Can't handle remote content yet."
 msgstr "è¿ä¸è½å¤çè¿ç¨åå®¹ã"
 
-#: lib/activityutils.php:244
+#. TRANS: Client exception thrown when there embedded XML content is found that cannot be processed yet.
+#: lib/activityutils.php:240
 msgid "Can't handle embedded XML content yet."
 msgstr "è¿ä¸è½å¤çåµå¥å¼ XML åå®¹ã"
 
-#: lib/activityutils.php:248
+#. TRANS: Client exception thrown when base64 encoded content is found that cannot be processed yet.
+#: lib/activityutils.php:245
 msgid "Can't handle embedded Base64 content yet."
 msgstr "è¿ä¸è½å¤çåµå¥å¼ Base64 åå®¹ã"
 
 #. TRANS: Client error message thrown when a user tries to change admin settings but has no access rights.
-#: lib/adminpanelaction.php:98
+#: lib/adminpanelaction.php:96
 msgid "You cannot make changes to this site."
 msgstr "ä½ ä¸è½å¨è¿ä¸ªç«ç¹ä¸ä¿®æ¹ã"
 
 #. TRANS: Client error message throw when a certain panel's settings cannot be changed.
-#: lib/adminpanelaction.php:110
+#: lib/adminpanelaction.php:108
 msgid "Changes to that panel are not allowed."
 msgstr "ä¸åè®¸å¯¹è¯¥é¢æ¿è¿è¡ä¿®æ¹ã"
 
 #. TRANS: Client error message.
-#: lib/adminpanelaction.php:229
+#: lib/adminpanelaction.php:222
 msgid "showForm() not implemented."
 msgstr "showForm() å°æªå®ç°ã"
 
 #. TRANS: Client error message
-#: lib/adminpanelaction.php:259
+#: lib/adminpanelaction.php:250
 msgid "saveSettings() not implemented."
 msgstr "saveSettings() å°æªå®ç°ã"
 
 #. TRANS: Client error message thrown if design settings could not be deleted in
 #. TRANS: the admin panel Design.
-#: lib/adminpanelaction.php:284
+#: lib/adminpanelaction.php:274
 msgid "Unable to delete design setting."
 msgstr "æ æ³å é¤å¤è§è®¾ç½®ã"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:350
+#: lib/adminpanelaction.php:337
 msgid "Basic site configuration"
 msgstr "åºæ¬ç½ç«éç½®"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:352
+#: lib/adminpanelaction.php:339
 msgctxt "MENU"
 msgid "Site"
 msgstr "ç½ç«"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:358
+#: lib/adminpanelaction.php:345
 msgid "Design configuration"
 msgstr "å¤è§éç½®"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:360
+#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
+#: lib/adminpanelaction.php:347 lib/groupnav.php:135
 msgctxt "MENU"
 msgid "Design"
 msgstr "å¤è§"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:366
+#: lib/adminpanelaction.php:353
 msgid "User configuration"
 msgstr "ç¨æ·éç½®"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:368 lib/personalgroupnav.php:115
+#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:115
 msgid "User"
 msgstr "ç¨æ·"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:374
+#: lib/adminpanelaction.php:361
 msgid "Access configuration"
 msgstr "è®¿é®éç½®"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:382
+#: lib/adminpanelaction.php:369
 msgid "Paths configuration"
 msgstr "è·¯å¾éç½®"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:390
+#: lib/adminpanelaction.php:377
 msgid "Sessions configuration"
 msgstr "ä¼è¯éç½®"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:398
+#: lib/adminpanelaction.php:385
 msgid "Edit site notice"
 msgstr "ç¼è¾ç½ç«æ¶æ¯"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:406
+#: lib/adminpanelaction.php:393
 msgid "Snapshots configuration"
 msgstr "æ´æ¹ç«ç¹éç½®"
 
 #. TRANS: Client error 401.
-#: lib/apiauth.php:113
+#: lib/apiauth.php:111
 msgid "API resource requires read-write access, but you only have read access."
 msgstr "API èµæºéè¦è¯»åçè®¿é®æéï¼ä½æ¯ä½ åªæåªè¯»çæéã"
 
+#. TRANS: OAuth exception thrown when no application is found for a given consumer key.
+#: lib/apiauth.php:175
+msgid "No application for that consumer key."
+msgstr ""
+
+#. TRANS: OAuth exception given when no user was found for a given token (no token was found).
+#: lib/apiauth.php:217
+msgid "No user for that token."
+msgstr ""
+
+#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
+#: lib/apioauthstore.php:178
+msgid "Tried to revoke unknown token"
+msgstr ""
+
 #. TRANS: Form legend.
-#: lib/applicationeditform.php:137
+#: lib/applicationeditform.php:129
 msgid "Edit application"
 msgstr "ç¼è¾åºç¨"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:187
+#: lib/applicationeditform.php:178
 msgid "Icon for this application"
 msgstr "è¯¥åºç¨çå¾æ "
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:209
+#: lib/applicationeditform.php:200
 #, php-format
 msgid "Describe your application in %d characters"
 msgstr "ç¨ä¸è¶è¿%dä¸ªåç¬¦æè¿°ä½ çåºç¨"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:213
+#: lib/applicationeditform.php:204
 msgid "Describe your application"
 msgstr "æè¿°ä½ çåºç¨"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:224
+#: lib/applicationeditform.php:215
 msgid "URL of the homepage of this application"
 msgstr "è¿ä¸ªåºç¨çä¸»é¡µ URL"
 
 #. TRANS: Form input field label.
-#: lib/applicationeditform.php:226
+#: lib/applicationeditform.php:217
 msgid "Source URL"
 msgstr "æ¥æºç½å"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:233
+#: lib/applicationeditform.php:224
 msgid "Organization responsible for this application"
 msgstr "è¯¥åºç¨çè´è´£ç»ç»"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:242
+#: lib/applicationeditform.php:233
 msgid "URL for the homepage of the organization"
 msgstr "è¿ä¸ªç»ç»çä¸»é¡µ URL"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:251
+#: lib/applicationeditform.php:242
 msgid "URL to redirect to after authentication"
 msgstr "éè¿ææåè½¬åç URL"
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:278
+#: lib/applicationeditform.php:269
 msgid "Browser"
 msgstr "æµè§å¨"
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:295
+#: lib/applicationeditform.php:286
 msgid "Desktop"
 msgstr "æ¡é¢"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:297
+#: lib/applicationeditform.php:288
 msgid "Type of application, browser or desktop"
 msgstr "åºç¨çç±»åï¼æµè§å¨ææ¡é¢"
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:320
+#: lib/applicationeditform.php:311
 msgid "Read-only"
 msgstr "åªè¯»"
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:339
+#: lib/applicationeditform.php:330
 msgid "Read-write"
 msgstr "è¯»å"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:341
+#: lib/applicationeditform.php:332
 msgid "Default access for this application: read-only, or read-write"
 msgstr "è¯¥åºç¨é»è®¤çè®¿é®æéï¼åªè¯»æè¯»å"
 
-#. TRANS: Submit button title
-#: lib/applicationeditform.php:359
+#. TRANS: Submit button title.
+#: lib/applicationeditform.php:349
 msgid "Cancel"
 msgstr "åæ¶"
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:136
+#: lib/applicationlist.php:135
 msgid "read-write"
 msgstr "è¯»å"
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:138
+#: lib/applicationlist.php:137
 msgid "read-only"
 msgstr "åªè¯»"
 
 #. 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
+#: lib/applicationlist.php:143
 #, php-format
 msgid "Approved %1$s - \"%2$s\" access."
 msgstr "éè¿äº%1$s - \"%2$s\"çè®¿é®æéã"
 
 #. TRANS: Button label
-#: lib/applicationlist.php:159
+#: lib/applicationlist.php:158
 msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "åæ¶"
@@ -5449,11 +5482,13 @@ msgstr "ä½è"
 msgid "Provider"
 msgstr "æä¾è"
 
-#: lib/attachmentnoticesection.php:67
+#. TRANS: Title.
+#: lib/attachmentnoticesection.php:68
 msgid "Notices where this attachment appears"
 msgstr "åºç°è¿ä¸ªéä»¶çæ¶æ¯"
 
-#: lib/attachmenttagcloudsection.php:48
+#. TRANS: Title.
+#: lib/attachmenttagcloudsection.php:49
 msgid "Tags for this attachment"
 msgstr "æ¤éä»¶çæ ç¾"
 
@@ -5465,6 +5500,11 @@ msgstr "ä¸åè®¸æ´æ¹å¯ç "
 msgid "Password changing is not allowed"
 msgstr "ä¸åè®¸æ´æ¹å¯ç "
 
+#. TRANS: Title for the form to block a user.
+#: lib/blockform.php:70
+msgid "Block"
+msgstr "å±è½"
+
 #: lib/channel.php:157 lib/channel.php:177
 msgid "Command results"
 msgstr "æ§è¡ç»æ"
@@ -5711,7 +5751,7 @@ msgid "You are not subscribed to anyone."
 msgstr "ä½ æ²¡æå³æ³¨ä»»ä½äººã"
 
 #. TRANS: Text shown after requesting other users a user is subscribed to.
-#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.
 #: lib/command.php:836
 msgid "You are subscribed to this person:"
@@ -5725,7 +5765,7 @@ msgid "No one is subscribed to you."
 msgstr "æ²¡æäººå³æ³¨ä½ ã"
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
-#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
 #: lib/command.php:863
 msgid "This person is subscribed to you:"
@@ -5739,13 +5779,14 @@ msgid "You are not a member of any groups."
 msgstr "ä½ è¿æªæä¸ºä»»ä½ä¸ä¸ªå°ç»çæåã"
 
 #. TRANS: Text shown after requesting groups a user is subscribed to.
-#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
 #: lib/command.php:890
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "ä½ æ¯è¯¥å°ç»æåï¼"
 
+#. TRANS: Help text for commands.
 #: lib/command.php:905
 msgid ""
 "Commands:\n"
@@ -5963,38 +6004,6 @@ msgstr "å°ç»çå°çä½ç½®ï¼ä¾å¦âå½å®¶ãçä»½ãåå¸â"
 msgid "Extra nicknames for the group, comma- or space- separated, max %d"
 msgstr "è¯¥å°ç»é¢å¤çæµç§°ï¼ç¨éå·æèç©ºæ ¼åéå¼ï¼æé¿%d"
 
-#: lib/groupnav.php:85
-msgid "Group"
-msgstr "å°ç»"
-
-#: lib/groupnav.php:101
-msgid "Blocked"
-msgstr "å±è½ç¨æ·"
-
-#: lib/groupnav.php:102
-#, php-format
-msgid "%s blocked users"
-msgstr "%så±è½çç¨æ·"
-
-#: lib/groupnav.php:108
-#, php-format
-msgid "Edit %s group properties"
-msgstr "ç¼è¾ %sç¾¤éé¡¹"
-
-#: lib/groupnav.php:113
-msgid "Logo"
-msgstr "Logo"
-
-#: lib/groupnav.php:114
-#, php-format
-msgid "Add or edit %s logo"
-msgstr "æ·»å æç¼è¾ %s å¾æ "
-
-#: lib/groupnav.php:120
-#, php-format
-msgid "Add or edit %s design"
-msgstr "æ·»å æç¼è¾%så¤è§"
-
 #: lib/groupsbymemberssection.php:71
 msgid "Groups with most members"
 msgstr "äººæ°ææºçå°ç»"
@@ -6026,7 +6035,8 @@ msgstr "æä»¶å¤ªå¤§ãæä»¶å¤§å°éå¶å¨%sä»¥ä¸ã"
 msgid "Partial upload."
 msgstr "é¨åä¸ä¼ ã"
 
-#: lib/imagefile.php:101 lib/mediafile.php:170
+#. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
+#: lib/imagefile.php:101 lib/mediafile.php:179
 msgid "System error uploading file."
 msgstr "ä¸ä¼ æä»¶æ¶åºéã"
 
@@ -6402,7 +6412,7 @@ msgstr ""
 
 #: lib/mailbox.php:228 lib/noticelist.php:506
 msgid "from"
-msgstr "æ¥èª"
+msgstr "éè¿"
 
 #: lib/mailhandler.php:37
 msgid "Could not parse message."
@@ -6425,58 +6435,60 @@ msgstr "æ±æï¼ç°å¨ä¸åè®¸çµåé®ä»¶åå¸ã"
 msgid "Unsupported message type: %s"
 msgstr "ä¸æ¯æçä¿¡æ¯æ ¼å¼ï¼%s"
 
-#: lib/mediafile.php:98 lib/mediafile.php:123
+#. TRANS: Client exception thrown when a database error was thrown during a file upload operation.
+#: lib/mediafile.php:99 lib/mediafile.php:125
 msgid "There was a database error while saving your file. Please try again."
 msgstr "ä¿åä½ çæä»¶æ¶æ°æ®åºåºç°äºä¸ä¸ªéè¯¯ãè¯·éè¯ã"
 
-#: lib/mediafile.php:142
+#. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
+#: lib/mediafile.php:145
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
 msgstr "ä¸ä¼ æä»¶å¤§å°è¶è¿äº php.ini ä¸ upload_max_filesize çè®¾ç½®éå¶ã"
 
-#: lib/mediafile.php:147
+#. TRANS: Client exception.
+#: lib/mediafile.php:151
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form."
 msgstr "ä¸ä¼ æä»¶å¤§å°è¶è¿äº HTML è¡¨åä¸ MAX_FILE_SIZE çè®¾ç½®éå¶ã"
 
-#: lib/mediafile.php:152
+#. TRANS: Client exception.
+#: lib/mediafile.php:157
 msgid "The uploaded file was only partially uploaded."
 msgstr "ä¸ä¼ çæä»¶åªæé¨åè¢«ä¸ä¼ ã"
 
-#: lib/mediafile.php:159
+#. TRANS: Client exception thrown when a temporary folder is not present to store a file upload.
+#: lib/mediafile.php:165
 msgid "Missing a temporary folder."
 msgstr "ç¼ºå°ä¸ä¸ªä¸´æ¶æä»¶å¤¹ã"
 
-#: lib/mediafile.php:162
+#. TRANS: Client exception thrown when writing to disk is not possible during a file upload operation.
+#: lib/mediafile.php:169
 msgid "Failed to write file to disk."
 msgstr "åå¥ç£çå¤±è´¥ã"
 
-#: lib/mediafile.php:165
+#. TRANS: Client exception thrown when a file upload operation has been stopped by an extension.
+#: lib/mediafile.php:173
 msgid "File upload stopped by extension."
 msgstr "æä»¶ä¸ä¼ è¢«æ©å±åæ¢äºã"
 
-#: lib/mediafile.php:179 lib/mediafile.php:217
+#. TRANS: Client exception thrown when a file upload operation would cause a user to exceed a set quota.
+#: lib/mediafile.php:189 lib/mediafile.php:232
 msgid "File exceeds user's quota."
 msgstr "æä»¶è¶è¿äºç¨æ·çéé¢ã"
 
-#: lib/mediafile.php:197 lib/mediafile.php:234
+#. TRANS: Client exception thrown when a file upload operation fails because the file could
+#. TRANS: not be moved from the temporary folder to the permanent file location.
+#: lib/mediafile.php:209 lib/mediafile.php:251
 msgid "File could not be moved to destination directory."
 msgstr "æä»¶ä¸è½è¢«ç§»å¨å°ç®æ ç®å½ã"
 
-#: lib/mediafile.php:202 lib/mediafile.php:238
+#. TRANS: Client exception thrown when a file upload operation has been stopped because the MIME
+#. TRANS: type of the uploaded file could not be determined.
+#: lib/mediafile.php:216 lib/mediafile.php:257
 msgid "Could not determine file's MIME type."
 msgstr "æ æ³å¤ææä»¶ç MIME ç±»åã"
 
-#: lib/mediafile.php:318
-#, php-format
-msgid " Try using another %s format."
-msgstr "è¯ä¸ä¸å¶ä»ç%sæ ¼å¼ã"
-
-#: lib/mediafile.php:323
-#, php-format
-msgid "%s is not a supported file type on this server."
-msgstr "è¿ä¸ªæå¡å¨ä¸æ¯æ%sçæä»¶æ ¼å¼ã"
-
 #: lib/messageform.php:120
 msgid "Send a direct notice"
 msgstr "åéä¸æ¡ç§ä¿¡"
@@ -6590,27 +6602,7 @@ msgstr "å¼å«"
 msgid "Send a nudge to this user"
 msgstr "å¼å«è¿ä¸ªç¨æ·"
 
-#: lib/oauthstore.php:283
-msgid "Error inserting new profile"
-msgstr "æ·»å ä¸ªäººä¿¡æ¯åºé"
-
-#: lib/oauthstore.php:291
-msgid "Error inserting avatar"
-msgstr "æ·»å å¤´ååºé"
-
-#: lib/oauthstore.php:306
-msgid "Error updating remote profile"
-msgstr "æ´æ°è¿ç¨çä¸ªäººä¿¡æ¯æ¶åºé"
-
-#: lib/oauthstore.php:311
-msgid "Error inserting remote profile"
-msgstr "æ·»å è¿ç¨çä¸ªäººä¿¡æ¯åºé"
-
-#: lib/oauthstore.php:345
-msgid "Duplicate notice"
-msgstr "è½¬åæ¶æ¯"
-
-#: lib/oauthstore.php:490
+#: lib/oauthstore.php:491
 msgid "Couldn't insert new subscription."
 msgstr "æ æ³æ·»å æ°çå³æ³¨ã"
 
@@ -6647,7 +6639,8 @@ msgstr "ä½ åéçç§ä¿¡"
 msgid "Tags in %s's notices"
 msgstr "%sçæ¶æ¯ä¸çæ ç¾"
 
-#: lib/plugin.php:115
+#. TRANS: Displayed as version information for a plugin if no version information was found.
+#: lib/plugin.php:116
 msgid "Unknown"
 msgstr "æªç¥ç"
 
@@ -6741,19 +6734,19 @@ msgstr "æ²ç"
 msgid "Sandbox this user"
 msgstr "å°è¿ä¸ªç¨æ·æ¾å¥æ²çã"
 
-#: lib/searchaction.php:120
+#. TRANS: Fieldset legend for the search form.
+#: lib/searchaction.php:121
 msgid "Search site"
 msgstr "æç´¢å¸®å©"
 
-#: lib/searchaction.php:126
+#. TRANS: Used as a field label for the field where one or more keywords
+#. TRANS: for searching can be entered.
+#: lib/searchaction.php:129
 msgid "Keyword(s)"
 msgstr "å³é®è¯"
 
-#: lib/searchaction.php:127
-msgid "Search"
-msgstr "æç´¢"
-
-#: lib/searchaction.php:162
+#. TRANS: Definition list item with instructions on how to get (better) search results.
+#: lib/searchaction.php:170
 msgid "Search help"
 msgstr "æç´¢å¸®å©"
 
@@ -6949,56 +6942,32 @@ msgid "Moderator"
 msgstr "å®¡æ ¸å"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1102
+#: lib/util.php:1103
 msgid "a few seconds ago"
 msgstr "å ç§å"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1105
+#: lib/util.php:1106
 msgid "about a minute ago"
 msgstr "çº¦1åéå"
 
-#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1109
-#, php-format
-msgid "about %d minutes ago"
-msgstr "çº¦%dåéå"
-
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 #: lib/util.php:1112
 msgid "about an hour ago"
 msgstr "çº¦1å°æ¶å"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1116
-#, php-format
-msgid "about %d hours ago"
-msgstr "çº¦%då°æ¶å"
-
-#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1119
+#: lib/util.php:1118
 msgid "about a day ago"
 msgstr "çº¦1å¤©å"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1123
-#, php-format
-msgid "about %d days ago"
-msgstr "çº¦%då¤©å"
-
-#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1126
+#: lib/util.php:1124
 msgid "about a month ago"
 msgstr "çº¦1ä¸ªæå"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 #: lib/util.php:1130
-#, php-format
-msgid "about %d months ago"
-msgstr "çº¦%dä¸ªæå"
-
-#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1133
 msgid "about a year ago"
 msgstr "çº¦1å¹´å"
 
diff --git a/locale/zh_TW/LC_MESSAGES/statusnet.po b/locale/zh_TW/LC_MESSAGES/statusnet.po
index 8e8217901e..ab5d0466ad 100644
--- a/locale/zh_TW/LC_MESSAGES/statusnet.po
+++ b/locale/zh_TW/LC_MESSAGES/statusnet.po
@@ -1,4 +1,5 @@
-# Translation of StatusNet to Traditional Chinese
+# Translation of StatusNet to Traditional Chinese (âªä¸æ(ç¹é«)â¬)
+# Expored from translatewiki.net
 #
 # --
 # This file is distributed under the same license as the StatusNet package.
@@ -7,27 +8,24 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-08 22:33+0000\n"
-"PO-Revision-Date: 2010-09-08 22:35:48+0000\n"
-"Language-Team: Traditional Chinese\n"
+"POT-Creation-Date: 2010-09-14 19:53+0000\n"
+"PO-Revision-Date: 2010-09-14 19:54:27+0000\n"
+"Language-Team: Traditional Chinese <http://translatewiki.net/wiki/Portal:zh-"
+"hant>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r72348); Translate extension (2010-08-20)\n"
+"X-Generator: MediaWiki 1.17alpha (r73009); Translate extension (2010-08-20)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: zh-hant\n"
-"X-Message-Group: out-statusnet\n"
+"X-Message-Group: #out-statusnet\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
+"X-POT-Import-Date: 1284-49-16 34::+0000\n"
 
 #. TRANS: Page notice
 #: actions/accessadminpanel.php:67
 msgid "Site access settings"
 msgstr "ä½¿ç¨èè¨å®ç¼çé¯èª¤"
 
-#. TRANS: Form legend for registration form.
-#: actions/accessadminpanel.php:161
-msgid "Registration"
-msgstr ""
-
 #. TRANS: Checkbox instructions for admin setting "Private"
 #: actions/accessadminpanel.php:165
 msgid "Prohibit anonymous users (not logged in) from viewing site?"
@@ -54,18 +52,13 @@ msgstr ""
 msgid "Disable new registrations."
 msgstr ""
 
-#. TRANS: Checkbox label for disabling new user registrations.
-#: actions/accessadminpanel.php:185
-msgid "Closed"
-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 actions/emailsettings.php:224
-#: actions/imsettings.php:184 actions/smssettings.php:209
-#: lib/applicationeditform.php:361
+#. TRANS: Button label in the "Edit application" form.
+#: actions/accessadminpanel.php:203 actions/emailsettings.php:228
+#: actions/imsettings.php:187 actions/smssettings.php:209
+#: lib/applicationeditform.php:351
 msgctxt "BUTTON"
 msgid "Save"
 msgstr ""
@@ -78,15 +71,15 @@ msgstr "ç¡æ¤ä½¿ç¨è"
 
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #: actions/all.php:79 actions/allrss.php:68
-#: actions/apiaccountupdatedeliverydevice.php:114
-#: actions/apiaccountupdateprofile.php:105
-#: actions/apiaccountupdateprofilebackgroundimage.php:116
-#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
-#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
-#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:113
-#: actions/apigroupismember.php:91 actions/apigroupjoin.php:100
-#: actions/apigroupleave.php:100 actions/apigrouplist.php:73
-#: actions/apistatusesupdate.php:229 actions/apisubscriptions.php:87
+#: actions/apiaccountupdatedeliverydevice.php:115
+#: actions/apiaccountupdateprofile.php:106
+#: actions/apiaccountupdateprofilebackgroundimage.php:117
+#: actions/apiaccountupdateprofileimage.php:106 actions/apiblockcreate.php:98
+#: actions/apiblockdestroy.php:97 actions/apidirectmessage.php:77
+#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:114
+#: actions/apigroupismember.php:91 actions/apigroupjoin.php:101
+#: actions/apigroupleave.php:101 actions/apigrouplist.php:73
+#: actions/apistatusesupdate.php:230 actions/apisubscriptions.php:87
 #: actions/apitimelinefavorites.php:72 actions/apitimelinefriends.php:174
 #: actions/apitimelinehome.php:80 actions/apitimelinementions.php:80
 #: actions/apitimelineuser.php:82 actions/avatarbynickname.php:75
@@ -111,24 +104,6 @@ msgstr "ç¡æ¤ä½¿ç¨è"
 msgid "%s and friends"
 msgstr "%sèå¥½å"
 
-#. TRANS: %1$s is user nickname
-#: actions/all.php:107
-#, php-format
-msgid "Feed for friends of %s (RSS 1.0)"
-msgstr ""
-
-#. TRANS: %1$s is user nickname
-#: actions/all.php:116
-#, php-format
-msgid "Feed for friends of %s (RSS 2.0)"
-msgstr ""
-
-#. TRANS: %1$s is user nickname
-#: actions/all.php:125
-#, php-format
-msgid "Feed for friends of %s (Atom)"
-msgstr ""
-
 #. TRANS: %1$s is user nickname
 #: actions/all.php:138
 #, php-format
@@ -166,29 +141,31 @@ msgstr ""
 msgid "Updates from %1$s and friends on %2$s!"
 msgstr ""
 
-#: actions/apiaccountupdatedeliverydevice.php:86
-#: actions/apiaccountupdateprofile.php:89
-#: actions/apiaccountupdateprofilebackgroundimage.php:86
-#: actions/apiaccountupdateprofilecolors.php:110
-#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89
-#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109
-#: actions/apifavoritecreate.php:91 actions/apifavoritedestroy.php:92
-#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
-#: actions/apigroupcreate.php:105 actions/apigroupjoin.php:92
-#: actions/apigroupleave.php:92 actions/apimediaupload.php:67
-#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:198
+#. TRANS: Client error message. POST is a HTTP command. It should not be translated.
+#. TRANS: Client error. POST is a HTTP command. It should not be translated.
+#: actions/apiaccountupdatedeliverydevice.php:87
+#: actions/apiaccountupdateprofile.php:90
+#: actions/apiaccountupdateprofilebackgroundimage.php:87
+#: actions/apiaccountupdateprofilecolors.php:111
+#: actions/apiaccountupdateprofileimage.php:85 actions/apiblockcreate.php:90
+#: actions/apiblockdestroy.php:89 actions/apidirectmessagenew.php:110
+#: actions/apifavoritecreate.php:92 actions/apifavoritedestroy.php:93
+#: actions/apifriendshipscreate.php:92 actions/apifriendshipsdestroy.php:92
+#: actions/apigroupcreate.php:106 actions/apigroupjoin.php:93
+#: actions/apigroupleave.php:93 actions/apimediaupload.php:68
+#: actions/apistatusesretweet.php:66 actions/apistatusesupdate.php:199
 msgid "This method requires a POST."
 msgstr ""
 
-#: actions/apiaccountupdatedeliverydevice.php:106
+#: actions/apiaccountupdatedeliverydevice.php:107
 msgid ""
 "You must specify a parameter named 'device' with a value of one of: sms, im, "
 "none."
 msgstr ""
 
-#: actions/apiaccountupdateprofilebackgroundimage.php:108
-#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
-#: actions/apistatusesupdate.php:212 actions/avatarsettings.php:257
+#: actions/apiaccountupdateprofilebackgroundimage.php:109
+#: actions/apiaccountupdateprofileimage.php:98 actions/apimediaupload.php:81
+#: actions/apistatusesupdate.php:213 actions/avatarsettings.php:257
 #: actions/designadminpanel.php:123 actions/editapplication.php:118
 #: actions/newapplication.php:101 actions/newnotice.php:94
 #: lib/designsettings.php:283
@@ -198,7 +175,21 @@ msgid ""
 "current configuration."
 msgstr ""
 
-#: actions/apiblockdestroy.php:114
+#: actions/apiaccountupdateprofilebackgroundimage.php:137
+#: actions/apiaccountupdateprofilebackgroundimage.php:147
+#: actions/apiaccountupdateprofilecolors.php:165
+#: actions/apiaccountupdateprofilecolors.php:175
+#: actions/groupdesignsettings.php:290 actions/groupdesignsettings.php:300
+#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
+#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
+msgid "Unable to save your design settings."
+msgstr ""
+
+#: actions/apiblockcreate.php:127
+msgid "Block user failed."
+msgstr ""
+
+#: actions/apiblockdestroy.php:115
 msgid "Unblock user failed."
 msgstr ""
 
@@ -222,42 +213,46 @@ msgstr ""
 msgid "All the direct messages sent to %s"
 msgstr ""
 
-#: actions/apidirectmessagenew.php:118
+#: actions/apidirectmessagenew.php:119
 msgid "No message text!"
 msgstr ""
 
-#: actions/apidirectmessagenew.php:127 actions/newmessage.php:150
+#: actions/apidirectmessagenew.php:128 actions/newmessage.php:150
 #, php-format
 msgid "That's too long. Max message size is %d chars."
 msgstr ""
 
-#: actions/apidirectmessagenew.php:142
+#: actions/apidirectmessagenew.php:143
 msgid "Can't send direct messages to users who aren't your friend."
 msgstr ""
 
-#: actions/apifavoritecreate.php:109 actions/apifavoritedestroy.php:110
+#: actions/apifavoritecreate.php:110 actions/apifavoritedestroy.php:111
 #: actions/apistatusesdestroy.php:121
 msgid "No status found with that ID."
 msgstr ""
 
-#: actions/apifavoritecreate.php:120
+#: actions/apifavoritecreate.php:121
 msgid "This status is already a favorite."
 msgstr ""
 
 #. TRANS: Error message text shown when a favorite could not be set.
-#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:296
+#: actions/apifavoritecreate.php:132 actions/favor.php:84 lib/command.php:296
 msgid "Could not create favorite."
 msgstr "ç¡æ³æ´æ°ä½¿ç¨è"
 
-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
+#: actions/apifavoritedestroy.php:124
+msgid "That status is not a favorite."
+msgstr ""
+
+#: actions/apifavoritedestroy.php:136 actions/disfavor.php:87
 msgid "Could not delete favorite."
 msgstr "ç¡æ³æ°å¢è¨é±"
 
-#: actions/apifriendshipscreate.php:109
+#: actions/apifriendshipscreate.php:110
 msgid "Could not follow user: profile not found."
 msgstr "ç¡æ³å²ååäººè³æ"
 
-#: actions/apifriendshipsdestroy.php:109
+#: actions/apifriendshipsdestroy.php:110
 msgid "Could not unfollow user: User not found."
 msgstr "ç¡æ³å²ååäººè³æ"
 
@@ -265,87 +260,80 @@ msgstr "ç¡æ³å²ååäººè³æ"
 msgid "Two valid IDs or screen_names must be supplied."
 msgstr ""
 
-#: actions/apigroupcreate.php:167 actions/editgroup.php:186
+#: actions/apigroupcreate.php:168 actions/editgroup.php:186
 #: actions/newgroup.php:126 actions/profilesettings.php:215
 #: actions/register.php:212
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr "æ±ç¨±è«ç¨å°å¯«åæ¯ææ¸åï¼å¿å ç©ºæ ¼ã"
 
-#: actions/apigroupcreate.php:176 actions/editgroup.php:190
+#: actions/apigroupcreate.php:177 actions/editgroup.php:190
 #: actions/newgroup.php:130 actions/profilesettings.php:238
 #: actions/register.php:215
 msgid "Nickname already in use. Try another one."
 msgstr "æ¤æ±ç¨±å·²æäººä½¿ç¨ãåè©¦è©¦çå¥çå§ã"
 
-#: actions/apigroupcreate.php:199 actions/editapplication.php:215
+#: actions/apigroupcreate.php:200 actions/editapplication.php:215
 #: actions/editgroup.php:199 actions/newapplication.php:203
 #: actions/newgroup.php:139 actions/profilesettings.php:222
 #: actions/register.php:224
 msgid "Homepage is not a valid URL."
 msgstr "åäººé¦é ä½åé¯èª¤"
 
-#: actions/apigroupcreate.php:208 actions/editgroup.php:202
+#: actions/apigroupcreate.php:209 actions/editgroup.php:202
 #: actions/newgroup.php:142 actions/profilesettings.php:225
 #: actions/register.php:227
 msgid "Full name is too long (max 255 chars)."
 msgstr "å¨åéé·ï¼æå¤255ååï¼"
 
-#: actions/apigroupcreate.php:216 actions/editapplication.php:190
+#: actions/apigroupcreate.php:217 actions/editapplication.php:190
 #: actions/newapplication.php:172
 #, php-format
 msgid "Description is too long (max %d chars)."
 msgstr "å°é»éé·ï¼å±%dååï¼"
 
-#: actions/apigroupcreate.php:227 actions/editgroup.php:208
+#: actions/apigroupcreate.php:228 actions/editgroup.php:208
 #: actions/newgroup.php:148 actions/profilesettings.php:232
 #: actions/register.php:234
 msgid "Location is too long (max 255 chars)."
 msgstr "å°é»éé·ï¼å±255ååï¼"
 
-#: actions/apigroupcreate.php:246 actions/editgroup.php:219
+#: actions/apigroupcreate.php:247 actions/editgroup.php:219
 #: actions/newgroup.php:159
 #, php-format
 msgid "Too many aliases! Maximum %d."
 msgstr ""
 
-#: actions/apigroupcreate.php:289 actions/editgroup.php:238
+#: actions/apigroupcreate.php:290 actions/editgroup.php:238
 #: actions/newgroup.php:178
 msgid "Alias can't be the same as nickname."
 msgstr ""
 
-#: actions/apigroupismember.php:96 actions/apigroupjoin.php:105
-#: actions/apigroupleave.php:105 actions/apigroupmembership.php:92
+#: actions/apigroupismember.php:96 actions/apigroupjoin.php:106
+#: actions/apigroupleave.php:106 actions/apigroupmembership.php:92
 #: actions/apigroupshow.php:83 actions/apitimelinegroup.php:92
 msgid "Group not found."
 msgstr "ç¢ºèªç¢¼éºå¤±"
 
+#. TRANS: Error text shown when a user tries to join a group they are blocked from joining.
+#: actions/apigroupjoin.php:121 actions/joingroup.php:105 lib/command.php:341
+msgid "You have been blocked from that group by the admin."
+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.
-#: actions/apigroupjoin.php:139 actions/joingroup.php:134 lib/command.php:353
+#: actions/apigroupjoin.php:140 actions/joingroup.php:134 lib/command.php:353
 #, php-format
 msgid "Could not join user %1$s to group %2$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.
-#: actions/apigroupleave.php:125 actions/leavegroup.php:129
+#: actions/apigroupleave.php:126 actions/leavegroup.php:129
 #: lib/command.php:401
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
 msgstr "ç¡æ³æ´æ°ä½¿ç¨è"
 
-#. TRANS: %s is a user name
-#: actions/apigrouplist.php:98
-#, php-format
-msgid "%s's groups"
-msgstr ""
-
-#. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s
-#: actions/apigrouplist.php:108
-#, php-format
-msgid "%1$s groups %2$s is a member of."
-msgstr ""
-
 #: actions/apigrouplistall.php:96
 #, php-format
 msgid "groups on %s"
@@ -357,9 +345,9 @@ msgstr ""
 
 #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
 #: actions/deletenotice.php:169 actions/disfavor.php:74
-#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:55
+#: actions/emailsettings.php:271 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:66 actions/imsettings.php:227
+#: actions/groupunblock.php:66 actions/imsettings.php:230
 #: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
@@ -398,8 +386,8 @@ msgstr ""
 #. 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:286 actions/grouplogo.php:322
-#: actions/imsettings.php:242 actions/newapplication.php:121
+#: actions/emailsettings.php:290 actions/grouplogo.php:322
+#: actions/imsettings.php:245 actions/newapplication.php:121
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
 #: actions/smssettings.php:277 lib/designsettings.php:304
 msgid "Unexpected form submission."
@@ -449,33 +437,24 @@ msgstr ""
 msgid "You may not delete another user's status."
 msgstr ""
 
-#: actions/apistatusesretweet.php:75 actions/apistatusesretweets.php:72
+#: actions/apistatusesretweet.php:76 actions/apistatusesretweets.php:72
 #: actions/deletenotice.php:52 actions/shownotice.php:92
 msgid "No such notice."
 msgstr "ç¡æ¤éç¥"
 
-#. TRANS: Error text shown when trying to repeat an own notice.
-#: actions/apistatusesretweet.php:83 lib/command.php:538
-msgid "Cannot repeat your own notice."
-msgstr ""
-
-#: actions/apistatusesshow.php:139
-msgid "Status deleted."
-msgstr ""
-
 #: actions/apistatusesshow.php:145
 msgid "No status with that ID found."
 msgstr ""
 
-#: actions/apistatusesupdate.php:221
+#: actions/apistatusesupdate.php:222
 msgid "Client must provide a 'status' parameter with a value."
 msgstr ""
 
-#: actions/apistatusesupdate.php:283 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:284 actions/apiusershow.php:96
 msgid "Not found."
 msgstr "ç¢ºèªç¢¼éºå¤±"
 
-#: actions/apistatusesupdate.php:306 actions/newnotice.php:181
+#: actions/apistatusesupdate.php:307 actions/newnotice.php:181
 #, php-format
 msgid "Max notice size is %d chars, including attachment URL."
 msgstr ""
@@ -484,11 +463,6 @@ msgstr ""
 msgid "Unsupported format."
 msgstr ""
 
-#: actions/apitimelinefavorites.php:119
-#, php-format
-msgid "%1$s updates favorited by %2$s / %2$s."
-msgstr ""
-
 #: actions/apitimelinementions.php:131
 #, php-format
 msgid "%1$s updates that reply to updates from %2$s / %3$s."
@@ -519,11 +493,6 @@ msgstr ""
 msgid "Notices tagged with %s"
 msgstr ""
 
-#: actions/apitimelinetag.php:107 actions/tagrss.php:65
-#, php-format
-msgid "Updates tagged with %1$s on %2$s!"
-msgstr ""
-
 #: actions/attachment.php:73
 msgid "No such attachment."
 msgstr "ç¡æ¤éç¥"
@@ -596,6 +565,10 @@ msgstr ""
 msgid "Pick a square area of the image to be your avatar"
 msgstr ""
 
+#: actions/avatarsettings.php:347 actions/grouplogo.php:380
+msgid "Lost our file data."
+msgstr ""
+
 #: actions/avatarsettings.php:370
 msgid "Avatar updated."
 msgstr "æ´æ°åäººåå"
@@ -665,20 +638,12 @@ msgstr ""
 msgid "No such group."
 msgstr "ç¡æ¤ä½¿ç¨è"
 
-#: actions/blockedfromgroup.php:100
-#, php-format
-msgid "%1$s blocked profiles, page %2$d"
-msgstr ""
-
 #: actions/blockedfromgroup.php:115
 msgid "A list of the users blocked from joining this group."
 msgstr ""
 
-#: actions/blockedfromgroup.php:288
-msgid "Unblock user from group"
-msgstr ""
-
-#: actions/blockedfromgroup.php:320 lib/unblockform.php:69
+#. TRANS: Title for the form to unblock a user.
+#: actions/blockedfromgroup.php:320 lib/unblockform.php:70
 msgid "Unblock"
 msgstr ""
 
@@ -708,9 +673,9 @@ msgstr ""
 #. 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/confirmaddress.php:116 actions/emailsettings.php:331
+#: actions/emailsettings.php:477 actions/imsettings.php:283
+#: actions/imsettings.php:442 actions/othersettings.php:174
 #: actions/profilesettings.php:283 actions/smssettings.php:308
 #: actions/smssettings.php:464
 msgid "Couldn't update user."
@@ -718,7 +683,7 @@ msgstr "ç¡æ³æ´æ°ä½¿ç¨è"
 
 #. 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/confirmaddress.php:128 actions/emailsettings.php:437
 #: actions/smssettings.php:422
 msgid "Couldn't delete email confirmation."
 msgstr "ç¡æ³åæ¶ä¿¡ç®±ç¢ºèª"
@@ -746,9 +711,10 @@ msgstr "ç¡æ³åæ¶ä¿¡ç®±ç¢ºèª"
 msgid "You are not the owner of this application."
 msgstr "ç¡æ³åæ¶ä¿¡ç®±ç¢ºèª"
 
+#. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:127
 #: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1307
+#: lib/action.php:1315
 msgid "There was a problem with your session token."
 msgstr ""
 
@@ -783,8 +749,13 @@ msgstr ""
 msgid "Are you sure you want to delete this notice?"
 msgstr ""
 
-#: actions/deleteuser.php:74
-msgid "You can only delete local users."
+#. TRANS: Submit button title for 'Yes' when deleting a notice.
+#: actions/deletenotice.php:158 lib/noticelist.php:657
+msgid "Delete this notice"
+msgstr ""
+
+#: actions/deleteuser.php:110 actions/deleteuser.php:133
+msgid "Delete user"
 msgstr ""
 
 #: actions/deleteuser.php:136
@@ -801,7 +772,6 @@ msgstr "è¨»åç¢ºèª"
 #. TRANS: Message used as title for design settings for the site.
 #. TRANS: Link description in user account settings menu.
 #: actions/designadminpanel.php:63 lib/accountsettingsaction.php:139
-#: lib/groupnav.php:119
 msgid "Design"
 msgstr ""
 
@@ -809,11 +779,6 @@ msgstr ""
 msgid "Design settings for this StatusNet site."
 msgstr ""
 
-#: actions/designadminpanel.php:322
-#, php-format
-msgid "Theme not available: %s."
-msgstr ""
-
 #: actions/designadminpanel.php:426
 msgid "Change logo"
 msgstr "æ´æ¹"
@@ -822,18 +787,10 @@ msgstr "æ´æ¹"
 msgid "Site logo"
 msgstr "æ´æ¹"
 
-#: actions/designadminpanel.php:460
-msgid "Site theme"
-msgstr ""
-
 #: actions/designadminpanel.php:461
 msgid "Theme for the site."
 msgstr ""
 
-#: actions/designadminpanel.php:467
-msgid "Custom theme"
-msgstr ""
-
 #: actions/designadminpanel.php:471
 msgid "You can upload a custom StatusNet theme as a .ZIP archive."
 msgstr ""
@@ -904,17 +861,21 @@ msgstr ""
 msgid "Reset back to default"
 msgstr ""
 
-#. TRANS: Submit button title
+#. TRANS: Submit button title.
 #: actions/designadminpanel.php:685 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/snapshotadminpanel.php:245
 #: actions/subscriptions.php:226 actions/tagother.php:154
-#: actions/useradminpanel.php:294 lib/applicationeditform.php:363
+#: actions/useradminpanel.php:294 lib/applicationeditform.php:353
 #: lib/designsettings.php:256 lib/groupeditform.php:202
 msgid "Save"
 msgstr ""
 
+#: actions/designadminpanel.php:686 lib/designsettings.php:257
+msgid "Save design"
+msgstr ""
+
 #: actions/disfavor.php:81
 msgid "This notice is not a favorite!"
 msgstr ""
@@ -941,10 +902,6 @@ msgstr ""
 msgid "Name is required."
 msgstr ""
 
-#: actions/editapplication.php:186 actions/newapplication.php:168
-msgid "Description is required."
-msgstr ""
-
 #: actions/editapplication.php:194
 msgid "Source URL is too long."
 msgstr ""
@@ -1019,94 +976,84 @@ msgstr ""
 #. 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/emailsettings.php:115 actions/emailsettings.php:162
 #: actions/imsettings.php:116 actions/smssettings.php:124
 #: actions/smssettings.php:180
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr ""
 
-#. TRANS: Instructions for e-mail address input form.
-#: actions/emailsettings.php:135
+#. TRANS: Instructions for e-mail address input form. Do not translate
+#. TRANS: "example.org". It is one of the domain names reserved for
+#. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
+#. TRANS: Any other domain may be owned by a legitimate person or
+#. TRANS: organization.
+#: actions/emailsettings.php:139
 msgid "Email address, like \"UserName@example.org\""
 msgstr ""
 
-#. 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 ""
-
 #. 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
+#: actions/emailsettings.php:151 actions/smssettings.php:171
 msgid "Incoming email"
 msgstr ""
 
 #. 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
+#: actions/emailsettings.php:159 actions/smssettings.php:178
 msgid "Send email to this address to post new notices."
 msgstr ""
 
 #. 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
+#: actions/emailsettings.php:168 actions/smssettings.php:186
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr ""
 
 #. 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
+#: actions/emailsettings.php:172 actions/smssettings.php:189
 msgctxt "BUTTON"
 msgid "New"
 msgstr ""
 
-#. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:174
-msgid "Email preferences"
-msgstr ""
-
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:180
+#: actions/emailsettings.php:184
 msgid "Send me notices of new subscriptions through email."
 msgstr ""
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:186
+#: actions/emailsettings.php:190
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr ""
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:193
+#: actions/emailsettings.php:197
 msgid "Send me email when someone sends me a private message."
 msgstr ""
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:199
+#: actions/emailsettings.php:203
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr ""
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:205
+#: actions/emailsettings.php:209
 msgid "Allow friends to nudge me and send me an email."
 msgstr ""
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:212
+#: actions/emailsettings.php:216
 msgid "I want to post notices by email."
 msgstr ""
 
 #. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:334
+#: actions/emailsettings.php:338
 msgid "Email preferences saved."
 msgstr ""
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:208
+#: actions/emailsettings.php:370 actions/register.php:208
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "æ¤ä¿¡ç®±ç¡æ"
@@ -1114,18 +1061,18 @@ msgstr "æ¤ä¿¡ç®±ç¡æ"
 #. 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/emailsettings.php:395 actions/imsettings.php:351
 #: actions/smssettings.php:373
 msgid "Couldn't insert confirmation code."
 msgstr "ç¡æ³è¼¸å¥ç¢ºèªç¢¼"
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:438
+#: actions/emailsettings.php:442
 msgid "Email confirmation cancelled."
 msgstr "ç¡ç¢ºèªç¢¼"
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
-#: actions/emailsettings.php:508 actions/smssettings.php:581
+#: actions/emailsettings.php:512 actions/smssettings.php:581
 msgid "Incoming email address removed."
 msgstr ""
 
@@ -1137,11 +1084,6 @@ msgstr ""
 msgid "Disfavor favorite"
 msgstr ""
 
-#: actions/favorited.php:67
-#, php-format
-msgid "Popular notices, page %d"
-msgstr ""
-
 #: actions/favorited.php:79
 msgid "The most popular notices on the site right now."
 msgstr ""
@@ -1169,11 +1111,6 @@ msgstr ""
 msgid "%s's favorite notices"
 msgstr ""
 
-#: actions/favoritesrss.php:115
-#, php-format
-msgid "Updates favored by %1$s on %2$s!"
-msgstr ""
-
 #: actions/featured.php:69 lib/featureduserssection.php:87
 #: lib/publicgroupnav.php:89
 msgid "Featured users"
@@ -1221,10 +1158,6 @@ msgstr ""
 msgid "You are not authorized."
 msgstr ""
 
-#: actions/finishremotesubscribe.php:113
-msgid "Could not convert request token to access token."
-msgstr ""
-
 #: actions/finishremotesubscribe.php:118
 msgid "Remote service uses unknown version of OMB protocol."
 msgstr ""
@@ -1241,18 +1174,25 @@ msgstr ""
 msgid "User already has this role."
 msgstr ""
 
+#: actions/groupblock.php:71 actions/groupunblock.php:71
+#: actions/makeadmin.php:71 actions/subedit.php:46
+#: lib/profileformaction.php:79
+msgid "No profile specified."
+msgstr ""
+
 #: actions/groupblock.php:76 actions/groupunblock.php:76
 #: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
 #: actions/unsubscribe.php:84 lib/profileformaction.php:86
 msgid "No profile with that ID."
 msgstr ""
 
-#: actions/groupblock.php:91
-msgid "Only an admin can block group members."
+#: actions/groupblock.php:81 actions/groupunblock.php:81
+#: actions/makeadmin.php:81
+msgid "No group specified."
 msgstr ""
 
-#: actions/groupblock.php:134 actions/groupmembers.php:360
-msgid "Block user from group"
+#: actions/groupblock.php:91
+msgid "Only an admin can block group members."
 msgstr ""
 
 #: actions/groupblock.php:160
@@ -1263,11 +1203,6 @@ msgid ""
 "the group in the future."
 msgstr ""
 
-#. 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:206
 msgid "Database error blocking user from group."
 msgstr ""
@@ -1276,6 +1211,10 @@ msgstr ""
 msgid "No ID."
 msgstr "ç¡æ¤éç¥"
 
+#: actions/groupdesignsettings.php:68
+msgid "You must be logged in to edit a group."
+msgstr ""
+
 #: actions/groupdesignsettings.php:144
 msgid "Group design"
 msgstr ""
@@ -1300,32 +1239,34 @@ msgstr ""
 msgid "Pick a square area of the image to be the logo."
 msgstr ""
 
-#: actions/groupmembers.php:103
+#. TRANS: Title of the page showing group members.
+#. TRANS: %1$s is the name of the group, %2$d is the page number of the members list.
+#: actions/groupmembers.php:107
 #, php-format
 msgid "%1$s group members, page %2$d"
 msgstr ""
 
-#: actions/groupmembers.php:118
+#: actions/groupmembers.php:122
 msgid "A list of the users in this group."
 msgstr ""
 
-#: actions/groupmembers.php:182 lib/groupnav.php:107
+#: actions/groupmembers.php:186
 msgid "Admin"
 msgstr ""
 
-#: actions/groupmembers.php:392 lib/blockform.php:69
-msgid "Block"
-msgstr ""
-
-#: actions/groupmembers.php:487
+#: actions/groupmembers.php:498
 msgid "Make user an admin of the group"
 msgstr ""
 
-#: actions/groupmembers.php:519
+#. TRANS: Button text for the form that will make a user administrator.
+#: actions/groupmembers.php:533
+msgctxt "BUTTON"
 msgid "Make Admin"
 msgstr ""
 
-#: actions/groupmembers.php:519
+#. TRANS: Submit button title.
+#: actions/groupmembers.php:537
+msgctxt "TOOLTIP"
 msgid "Make this user an admin"
 msgstr ""
 
@@ -1338,12 +1279,6 @@ msgstr ""
 msgid "%s timeline"
 msgstr ""
 
-#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
-#: actions/grouprss.php:142
-#, php-format
-msgid "Updates from members of %1$s on %2$s!"
-msgstr ""
-
 #: actions/groups.php:62 lib/profileaction.php:223 lib/profileaction.php:249
 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
 msgid "Groups"
@@ -1364,10 +1299,6 @@ msgid ""
 "%%%%)"
 msgstr ""
 
-#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:122
-msgid "Create a new group"
-msgstr ""
-
 #: actions/groupsearch.php:52
 #, php-format
 msgid ""
@@ -1416,11 +1347,6 @@ msgid ""
 "doc.im%%). Configure your address and settings below."
 msgstr ""
 
-#. 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 ""
-
 #. 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
@@ -1444,7 +1370,10 @@ msgstr ""
 
 #. TRANS: IM address input field instructions in IM settings form.
 #. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:140
+#. TRANS: Do not translate "example.org". It is one of the domain names reserved for use in examples by
+#. TRANS: http://www.rfc-editor.org/rfc/rfc2606.txt. Any other domain may be owned by a legitimate
+#. TRANS: person or organization.
+#: actions/imsettings.php:143
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -1452,53 +1381,53 @@ msgid ""
 msgstr ""
 
 #. TRANS: Form legend for IM preferences form.
-#: actions/imsettings.php:155
+#: actions/imsettings.php:158
 msgid "IM preferences"
 msgstr ""
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:160
+#: actions/imsettings.php:163
 msgid "Send me notices through Jabber/GTalk."
 msgstr ""
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:166
+#: actions/imsettings.php:169
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr ""
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:172
+#: actions/imsettings.php:175
 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr ""
 
 #. TRANS: Confirmation message for successful IM preferences save.
-#: actions/imsettings.php:287 actions/othersettings.php:180
+#: actions/imsettings.php:290 actions/othersettings.php:180
 msgid "Preferences saved."
 msgstr ""
 
 #. TRANS: Message given saving IM address without having provided one.
-#: actions/imsettings.php:309
+#: actions/imsettings.php:312
 msgid "No Jabber ID."
 msgstr "æ¥ç¡æ¤Jabber ID"
 
 #. TRANS: Message given saving IM address that cannot be normalised.
-#: actions/imsettings.php:317
+#: actions/imsettings.php:320
 msgid "Cannot normalize that Jabber ID"
 msgstr "æ¤JabberIDé¯èª¤"
 
 #. TRANS: Message given saving IM address that not valid.
-#: actions/imsettings.php:322
+#: actions/imsettings.php:325
 msgid "Not a valid Jabber ID"
 msgstr "æ¤JabberIDç¡æ"
 
 #. TRANS: Message given saving IM address that is already set for another user.
-#: actions/imsettings.php:330
+#: actions/imsettings.php:333
 msgid "Jabber ID already belongs to another user."
 msgstr "æ¤Jabber IDå·²æäººä½¿ç¨"
 
 #. 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
+#: actions/imsettings.php:361
 #, php-format
 msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
@@ -1506,17 +1435,17 @@ msgid ""
 msgstr "ç¢ºèªä¿¡å·²å¯å°ä½ çç·ä¸å³æéä¿¡ç®±ã%séçµ¦ä½ å¾è¨æ¯è¦åç¶éä½ çèªå¯ã"
 
 #. TRANS: Message given canceling IM address confirmation for the wrong IM address.
-#: actions/imsettings.php:388
+#: actions/imsettings.php:391
 msgid "That is the wrong IM address."
 msgstr ""
 
 #. TRANS: Message given after successfully canceling IM address confirmation.
-#: actions/imsettings.php:402
+#: actions/imsettings.php:405
 msgid "IM confirmation cancelled."
 msgstr "ç¡ç¢ºèªç¢¼"
 
 #. TRANS: Message given after successfully removing a registered IM address.
-#: actions/imsettings.php:447
+#: actions/imsettings.php:450
 msgid "The IM address was removed."
 msgstr ""
 
@@ -1623,11 +1552,19 @@ msgid ""
 "Sincerely, %2$s\n"
 msgstr ""
 
+#: actions/joingroup.php:60
+msgid "You must be logged in to join a group."
+msgstr ""
+
 #: actions/joingroup.php:141
 #, php-format
 msgid "%1$s joined group %2$s"
 msgstr ""
 
+#: actions/leavegroup.php:60
+msgid "You must be logged in to leave a group."
+msgstr ""
+
 #: actions/login.php:102 actions/otp.php:62 actions/register.php:144
 msgid "Already logged in."
 msgstr "å·²ç»å¥"
@@ -1681,15 +1618,6 @@ msgstr ""
 msgid "%1$s is already an admin for group \"%2$s\"."
 msgstr ""
 
-#: actions/makeadmin.php:133
-#, php-format
-msgid "Can't get membership record for %1$s in group %2$s."
-msgstr ""
-
-#: actions/microsummary.php:69
-msgid "No current status."
-msgstr ""
-
 #: actions/newapplication.php:143
 msgid "Use this form to register a new application."
 msgstr ""
@@ -1717,6 +1645,10 @@ msgstr ""
 msgid "No content!"
 msgstr "ç¡å§å®¹"
 
+#: actions/newmessage.php:158
+msgid "No recipient specified."
+msgstr ""
+
 #. TRANS: Error text shown when trying to send a direct message to self.
 #: actions/newmessage.php:164 lib/command.php:506
 msgid ""
@@ -1742,6 +1674,10 @@ msgstr ""
 msgid "New notice"
 msgstr "æ°è¨æ¯"
 
+#: actions/newnotice.php:227
+msgid "Notice posted"
+msgstr ""
+
 #: actions/noticesearch.php:68
 #, php-format
 msgid ""
@@ -1753,11 +1689,6 @@ msgstr ""
 msgid "Text search"
 msgstr ""
 
-#: actions/noticesearch.php:91
-#, php-format
-msgid "Search results for \"%1$s\" on %2$s"
-msgstr ""
-
 #: actions/noticesearch.php:121
 #, php-format
 msgid ""
@@ -1772,16 +1703,6 @@ msgid ""
 "[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
 msgstr ""
 
-#: actions/noticesearchrss.php:96
-#, php-format
-msgid "Updates with \"%s\""
-msgstr ""
-
-#: actions/noticesearchrss.php:98
-#, php-format
-msgid "Updates matching search term \"%1$s\" on %2$s!"
-msgstr ""
-
 #: actions/nudge.php:85
 msgid ""
 "This user doesn't allow nudges or hasn't confirmed or set their email yet."
@@ -1795,6 +1716,14 @@ msgstr ""
 msgid "Nudge sent!"
 msgstr ""
 
+#: actions/oauthappssettings.php:59
+msgid "You must be logged in to list your applications."
+msgstr ""
+
+#: actions/oauthappssettings.php:74
+msgid "OAuth applications"
+msgstr ""
+
 #: actions/oauthappssettings.php:85
 msgid "Applications you have registered"
 msgstr ""
@@ -1829,12 +1758,6 @@ msgstr "æ°çæ´äººè³æè¼¸å¥é¯èª¤"
 msgid "%1$s's status on %2$s"
 msgstr "%1$sççææ¯%2$s"
 
-#. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
-#: actions/oembed.php:159
-#, php-format
-msgid "Content type %s not supported."
-msgstr ""
-
 #. TRANS: Error message displaying attachments. %s is the site's base URL.
 #: actions/oembed.php:163
 #, php-format
@@ -1842,8 +1765,8 @@ msgid "Only %s URLs over plain HTTP please."
 msgstr ""
 
 #. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1215
-#: lib/apiaction.php:1243 lib/apiaction.php:1366
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1206
+#: lib/apiaction.php:1233 lib/apiaction.php:1356
 msgid "Not a supported data format."
 msgstr ""
 
@@ -1851,6 +1774,10 @@ msgstr ""
 msgid "People Search"
 msgstr ""
 
+#: actions/opensearch.php:67
+msgid "Notice Search"
+msgstr ""
+
 #: actions/othersettings.php:60
 msgid "Other settings"
 msgstr "ä½¿ç¨èè¨å®ç¼çé¯èª¤"
@@ -1943,7 +1870,7 @@ msgid "Password saved."
 msgstr ""
 
 #. TRANS: Menu item for site administration
-#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:384
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:371
 msgid "Paths"
 msgstr ""
 
@@ -1951,23 +1878,16 @@ msgstr ""
 msgid "Path and server settings for this StatusNet site."
 msgstr ""
 
-#: actions/pathsadminpanel.php:157
-#, php-format
-msgid "Theme directory not readable: %s."
-msgstr ""
-
-#: actions/pathsadminpanel.php:169
-#, php-format
-msgid "Background directory not writable: %s."
+#: actions/pathsadminpanel.php:183
+msgid "Invalid SSL server. The maximum length is 255 characters."
 msgstr ""
 
-#: actions/pathsadminpanel.php:177
-#, php-format
-msgid "Locales directory not readable: %s."
+#: actions/pathsadminpanel.php:234 actions/siteadminpanel.php:58
+msgid "Site"
 msgstr ""
 
-#: actions/pathsadminpanel.php:183
-msgid "Invalid SSL server. The maximum length is 255 characters."
+#: actions/pathsadminpanel.php:238
+msgid "Server"
 msgstr ""
 
 #: actions/pathsadminpanel.php:238
@@ -1978,10 +1898,6 @@ msgstr ""
 msgid "Path"
 msgstr ""
 
-#: actions/pathsadminpanel.php:242
-msgid "Site path"
-msgstr ""
-
 #: actions/pathsadminpanel.php:246
 msgid "Path to locales"
 msgstr ""
@@ -2002,10 +1918,18 @@ msgstr ""
 msgid "Theme"
 msgstr ""
 
+#: actions/pathsadminpanel.php:264
+msgid "Theme server"
+msgstr ""
+
 #: actions/pathsadminpanel.php:268
 msgid "Theme path"
 msgstr ""
 
+#: actions/pathsadminpanel.php:272
+msgid "Theme directory"
+msgstr ""
+
 #: actions/pathsadminpanel.php:284
 msgid "Avatar server"
 msgstr "åäººåå"
@@ -2022,6 +1946,10 @@ msgstr ""
 msgid "Background path"
 msgstr ""
 
+#: actions/pathsadminpanel.php:313
+msgid "Background directory"
+msgstr ""
+
 #: actions/pathsadminpanel.php:320
 msgid "SSL"
 msgstr ""
@@ -2030,6 +1958,10 @@ msgstr ""
 msgid "Never"
 msgstr ""
 
+#: actions/pathsadminpanel.php:324
+msgid "Sometimes"
+msgstr ""
+
 #: actions/pathsadminpanel.php:325
 msgid "Always"
 msgstr ""
@@ -2050,10 +1982,6 @@ msgstr "åäººåå"
 msgid "Server to direct SSL requests to"
 msgstr ""
 
-#: actions/pathsadminpanel.php:352
-msgid "Save paths"
-msgstr ""
-
 #: actions/peoplesearch.php:52
 #, php-format
 msgid ""
@@ -2065,11 +1993,6 @@ msgstr ""
 msgid "People search"
 msgstr ""
 
-#: actions/peopletag.php:142
-#, php-format
-msgid "Users self-tagged with %1$s - page %2$d"
-msgstr ""
-
 #: actions/postnotice.php:101
 #, php-format
 msgid "Notice license â%1$sâ is not compatible with site license â%2$sâ."
@@ -2096,7 +2019,7 @@ msgstr "å¨å"
 
 #. TRANS: Form input field label.
 #: actions/profilesettings.php:115 actions/register.php:460
-#: lib/applicationeditform.php:244 lib/groupeditform.php:161
+#: lib/applicationeditform.php:235 lib/groupeditform.php:161
 msgid "Homepage"
 msgstr "åäººé¦é "
 
@@ -2104,15 +2027,6 @@ msgstr "åäººé¦é "
 msgid "URL of your homepage, blog, or profile on another site"
 msgstr ""
 
-#: actions/profilesettings.php:122 actions/register.php:468
-#, php-format
-msgid "Describe yourself and your interests in %d chars"
-msgstr ""
-
-#: actions/profilesettings.php:125 actions/register.php:471
-msgid "Describe yourself and your interests"
-msgstr ""
-
 #: actions/profilesettings.php:127 actions/register.php:473
 msgid "Bio"
 msgstr "èªæä»ç´¹"
@@ -2183,7 +2097,7 @@ msgid "Couldn't save profile."
 msgstr "ç¡æ³å²ååäººè³æ"
 
 #. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:391 lib/adminpanelaction.php:141
+#: actions/profilesettings.php:391 lib/adminpanelaction.php:138
 msgid "Settings saved."
 msgstr ""
 
@@ -2209,10 +2123,6 @@ msgstr ""
 msgid "Public Stream Feed (RSS 2.0)"
 msgstr ""
 
-#: actions/public.php:168
-msgid "Public Stream Feed (Atom)"
-msgstr ""
-
 #: actions/public.php:188
 #, php-format
 msgid ""
@@ -2272,6 +2182,10 @@ msgid ""
 "one!"
 msgstr ""
 
+#: actions/publictagcloud.php:134
+msgid "Tag cloud"
+msgstr ""
+
 #: actions/recoverpassword.php:62
 msgid "No such recovery code."
 msgstr "ç¡æ¤æ¢å¾©ç¢¼"
@@ -2435,14 +2349,6 @@ msgstr ""
 msgid "All rights reserved."
 msgstr ""
 
-#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:540
-#, php-format
-msgid ""
-"My text and files are available under %s except this private data: password, "
-"email address, IM address, and phone number."
-msgstr ""
-
 #: actions/register.php:583
 #, php-format
 msgid ""
@@ -2504,10 +2410,6 @@ msgstr ""
 msgid "Thatâs a local profile! Login to subscribe."
 msgstr ""
 
-#: actions/remotesubscribe.php:183
-msgid "Couldnât get a request token."
-msgstr ""
-
 #: actions/repeat.php:57
 msgid "Only logged-in users can repeat notices."
 msgstr ""
@@ -2516,44 +2418,20 @@ msgstr ""
 msgid "No notice specified."
 msgstr "ç¡æ¤éç¥"
 
+#: actions/repeat.php:76
+msgid "You can't repeat your own notice."
+msgstr ""
+
 #: actions/repeat.php:90
 msgid "You already repeated that notice."
 msgstr "æ¤Jabber IDå·²æäººä½¿ç¨"
 
-#: actions/repeat.php:114 lib/noticelist.php:676
-msgid "Repeated"
-msgstr ""
-
-#: actions/repeat.php:119
-msgid "Repeated!"
-msgstr ""
-
 #: actions/replies.php:126 actions/repliesrss.php:68
 #: lib/personalgroupnav.php:105
 #, php-format
 msgid "Replies to %s"
 msgstr ""
 
-#: actions/replies.php:128
-#, php-format
-msgid "Replies to %1$s, page %2$d"
-msgstr ""
-
-#: actions/replies.php:145
-#, php-format
-msgid "Replies feed for %s (RSS 1.0)"
-msgstr ""
-
-#: actions/replies.php:152
-#, php-format
-msgid "Replies feed for %s (RSS 2.0)"
-msgstr ""
-
-#: actions/replies.php:159
-#, php-format
-msgid "Replies feed for %s (Atom)"
-msgstr ""
-
 #: actions/replies.php:199
 #, php-format
 msgid ""
@@ -2575,30 +2453,17 @@ msgid ""
 "newnotice%%%%?status_textarea=%3$s)."
 msgstr ""
 
-#: actions/repliesrss.php:72
-#, php-format
-msgid "Replies to %1$s on %2$s!"
-msgstr ""
-
-#: actions/revokerole.php:75
-msgid "You cannot revoke user roles on this site."
-msgstr ""
-
 #: actions/revokerole.php:82
 msgid "User doesn't have this role."
 msgstr ""
 
-#: actions/rsd.php:146 actions/version.php:159
-msgid "StatusNet"
-msgstr ""
-
 #: actions/sandbox.php:72
 msgid "User is already sandboxed."
 msgstr ""
 
 #. TRANS: Menu item for site administration
 #: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
-#: lib/adminpanelaction.php:392
+#: lib/adminpanelaction.php:379
 msgid "Sessions"
 msgstr ""
 
@@ -2628,15 +2493,10 @@ msgid "Save site settings"
 msgstr "ä½¿ç¨èè¨å®ç¼çé¯èª¤"
 
 #. TRANS: Form input field label for application icon.
-#: actions/showapplication.php:159 lib/applicationeditform.php:182
+#: actions/showapplication.php:159 lib/applicationeditform.php:173
 msgid "Icon"
 msgstr ""
 
-#. TRANS: Form input field label.
-#: actions/showapplication.php:178 lib/applicationeditform.php:235
-msgid "Organization"
-msgstr ""
-
 #: actions/showapplication.php:192 actions/showgroup.php:436
 #: lib/profileaction.php:187
 msgid "Statistics"
@@ -2689,30 +2549,10 @@ msgstr ""
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr ""
 
-#: actions/showfavorites.php:79
-#, php-format
-msgid "%1$s's favorite notices, page %2$d"
-msgstr ""
-
 #: actions/showfavorites.php:132
 msgid "Could not retrieve favorite notices."
 msgstr "ç¡æ³æ´æ°ä½¿ç¨è"
 
-#: actions/showfavorites.php:171
-#, php-format
-msgid "Feed for favorites of %s (RSS 1.0)"
-msgstr ""
-
-#: actions/showfavorites.php:178
-#, php-format
-msgid "Feed for favorites of %s (RSS 2.0)"
-msgstr ""
-
-#: actions/showfavorites.php:185
-#, php-format
-msgid "Feed for favorites of %s (Atom)"
-msgstr ""
-
 #: actions/showfavorites.php:206
 msgid ""
 "You haven't chosen any favorite notices yet. Click the fave button on "
@@ -2738,16 +2578,16 @@ msgstr ""
 msgid "This is a way to share what you like."
 msgstr ""
 
-#: actions/showgroup.php:84
-#, php-format
-msgid "%1$s group, page %2$d"
-msgstr ""
-
 #: actions/showgroup.php:272 actions/tagother.php:118
 #: actions/userauthorization.php:175 lib/userprofile.php:178
 msgid "URL"
 msgstr ""
 
+#: actions/showgroup.php:283 actions/tagother.php:128
+#: actions/userauthorization.php:187 lib/userprofile.php:195
+msgid "Note"
+msgstr ""
+
 #: actions/showgroup.php:293 lib/groupeditform.php:184
 msgid "Aliases"
 msgstr ""
@@ -2767,11 +2607,6 @@ msgstr ""
 msgid "Notice feed for %s group (Atom)"
 msgstr ""
 
-#: actions/showgroup.php:355
-#, php-format
-msgid "FOAF for %s group"
-msgstr ""
-
 #: actions/showgroup.php:398 lib/profileaction.php:117
 #: lib/profileaction.php:152 lib/profileaction.php:255 lib/section.php:95
 #: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71
@@ -2782,10 +2617,6 @@ msgstr ""
 msgid "All members"
 msgstr ""
 
-#: actions/showgroup.php:439
-msgid "Created"
-msgstr ""
-
 #: actions/showgroup.php:455
 #, php-format
 msgid ""
@@ -2828,16 +2659,6 @@ msgstr ""
 msgid " tagged %s"
 msgstr ""
 
-#: actions/showstream.php:79
-#, php-format
-msgid "%1$s, page %2$d"
-msgstr ""
-
-#: actions/showstream.php:122
-#, php-format
-msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
-msgstr ""
-
 #: actions/showstream.php:129
 #, php-format
 msgid "Notice feed for %s (RSS 1.0)"
@@ -2898,6 +2719,10 @@ msgstr ""
 msgid "Repeat of %s"
 msgstr ""
 
+#: actions/silence.php:65 actions/unsilence.php:65
+msgid "You cannot silence users on this site."
+msgstr ""
+
 #: actions/silence.php:72
 msgid "User is already silenced."
 msgstr ""
@@ -2927,10 +2752,6 @@ msgstr ""
 msgid "General"
 msgstr ""
 
-#: actions/siteadminpanel.php:224
-msgid "Site name"
-msgstr ""
-
 #: actions/siteadminpanel.php:225
 msgid "The name of your site, like \"Yourcompany Microblog\""
 msgstr ""
@@ -3011,11 +2832,6 @@ msgstr "ä½¿ç¨èè¨å®ç¼çé¯èª¤"
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr ""
 
-#. 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 ""
-
 #. TRANS: Form legend for SMS settings form.
 #: actions/smssettings.php:111
 msgid "SMS address"
@@ -3058,6 +2874,11 @@ msgstr ""
 msgid "SMS preferences saved."
 msgstr ""
 
+#. TRANS: Message given saving SMS phone number without having selected a carrier.
+#: actions/smssettings.php:344
+msgid "No carrier selected."
+msgstr ""
+
 #. TRANS: Message given saving SMS phone number that is already set.
 #: actions/smssettings.php:352
 msgid "That is already your phone number."
@@ -3100,7 +2921,7 @@ msgstr ""
 
 #. TRANS: Menu item for site administration
 #: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
-#: lib/adminpanelaction.php:408
+#: lib/adminpanelaction.php:395
 msgid "Snapshots"
 msgstr ""
 
@@ -3165,11 +2986,6 @@ msgstr ""
 msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
 msgstr ""
 
-#: actions/subscribers.php:52
-#, php-format
-msgid "%1$s subscribers, page %2$d"
-msgstr ""
-
 #: actions/subscribers.php:67
 #, php-format
 msgid "These are the people who listen to %s's notices."
@@ -3216,21 +3032,11 @@ msgstr ""
 msgid "SMS"
 msgstr ""
 
-#: actions/tag.php:69
-#, php-format
-msgid "Notices tagged with %1$s, page %2$d"
-msgstr ""
-
 #: actions/tag.php:87
 #, php-format
 msgid "Notice feed for tag %s (RSS 1.0)"
 msgstr ""
 
-#: actions/tag.php:93
-#, php-format
-msgid "Notice feed for tag %s (RSS 2.0)"
-msgstr ""
-
 #: actions/tag.php:99
 #, php-format
 msgid "Notice feed for tag %s (Atom)"
@@ -3318,6 +3124,12 @@ msgstr ""
 msgid "Invalid default subscripton: '%1$s' is not user."
 msgstr ""
 
+#. TRANS: Link description in user account settings menu.
+#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:111
+#: lib/personalgroupnav.php:109
+msgid "Profile"
+msgstr ""
+
 #: actions/useradminpanel.php:222
 msgid "Bio Limit"
 msgstr ""
@@ -3342,10 +3154,6 @@ msgstr ""
 msgid "Automatically subscribe new users to this user."
 msgstr ""
 
-#: actions/useradminpanel.php:251
-msgid "Invitations"
-msgstr ""
-
 #: actions/useradminpanel.php:256
 msgid "Invitations enabled"
 msgstr ""
@@ -3432,11 +3240,6 @@ msgstr ""
 msgid "Avatar URL â%sâ is not valid."
 msgstr ""
 
-#: actions/userauthorization.php:350
-#, php-format
-msgid "Canât read avatar URL â%sâ."
-msgstr ""
-
 #: actions/userauthorization.php:355
 #, php-format
 msgid "Wrong image type for avatar URL â%sâ."
@@ -3456,12 +3259,6 @@ msgstr ""
 msgid "Enjoy your hotdog!"
 msgstr ""
 
-#. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number.
-#: actions/usergroups.php:66
-#, php-format
-msgid "%1$s groups, page %2$d"
-msgstr ""
-
 #: actions/usergroups.php:132
 msgid "Search for more groups"
 msgstr ""
@@ -3525,11 +3322,6 @@ msgstr ""
 msgid "Plugins"
 msgstr ""
 
-#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:805
-msgid "Version"
-msgstr ""
-
 #: actions/version.php:199
 msgid "Author(s)"
 msgstr ""
@@ -3641,11 +3433,6 @@ msgstr ""
 msgid "Bad type provided to saveKnownGroups"
 msgstr ""
 
-#. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:998
-msgid "Problem saving group inbox."
-msgstr ""
-
 #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
 #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
 #: classes/Notice.php:1759
@@ -3678,7 +3465,7 @@ msgid "Unable to save tag."
 msgstr "ç¡æ³å²ååäººè³æ"
 
 #. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#: classes/Subscription.php:75 lib/oauthstore.php:465
+#: classes/Subscription.php:75 lib/oauthstore.php:466
 msgid "You have been banned from subscribing."
 msgstr ""
 
@@ -3749,30 +3536,17 @@ msgstr ""
 msgid "Untitled page"
 msgstr ""
 
+#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
+#: lib/action.php:449
+msgid "Primary site navigation"
+msgstr ""
+
 #. TRANS: Tooltip for main menu option "Personal"
 #: lib/action.php:455
 msgctxt "TOOLTIP"
 msgid "Personal profile and friends timeline"
 msgstr ""
 
-#. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:458
-msgctxt "MENU"
-msgid "Personal"
-msgstr ""
-
-#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:460
-msgctxt "TOOLTIP"
-msgid "Change your email, avatar, password, profile"
-msgstr ""
-
-#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:465
-msgctxt "TOOLTIP"
-msgid "Connect to services"
-msgstr ""
-
 #. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
 #: lib/action.php:468
 msgid "Connect"
@@ -3785,7 +3559,8 @@ msgid "Change site configuration"
 msgstr "ç¡ç¢ºèªç¢¼"
 
 #. TRANS: Main menu option when logged in and site admin for access to site configuration
-#: lib/action.php:474
+#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
+#: lib/action.php:474 lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr ""
@@ -3797,12 +3572,6 @@ msgctxt "TOOLTIP"
 msgid "Invite friends and colleagues to join you on %s"
 msgstr ""
 
-#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:481
-msgctxt "MENU"
-msgid "Invite"
-msgstr ""
-
 #. TRANS: Tooltip for main menu option "Logout"
 #: lib/action.php:487
 msgctxt "TOOLTIP"
@@ -3815,18 +3584,6 @@ msgctxt "MENU"
 msgid "Logout"
 msgstr "ç»å¥"
 
-#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:495
-msgctxt "TOOLTIP"
-msgid "Create an account"
-msgstr ""
-
-#. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:498
-msgctxt "MENU"
-msgid "Register"
-msgstr ""
-
 #. TRANS: Tooltip for main menu option "Login"
 #: lib/action.php:501
 msgctxt "TOOLTIP"
@@ -3849,6 +3606,11 @@ msgstr ""
 msgid "Local views"
 msgstr ""
 
+#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
+#: lib/action.php:778
+msgid "Secondary site navigation"
+msgstr ""
+
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
 #: lib/action.php:784
 msgid "Help"
@@ -3893,22 +3655,17 @@ msgstr ""
 msgid "StatusNet software license"
 msgstr ""
 
-#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
-#: lib/action.php:843
-#, php-format
-msgid ""
-"**%%site.name%%** is a microblogging service brought to you by [%%site."
-"broughtby%%](%%site.broughtbyurl%%)."
-msgstr ""
-
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:846
+#: lib/action.php:849
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%**æ¯åå¾®åé¨è½æ ¼"
 
 #. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.
-#: lib/action.php:850
+#. TRANS: Make sure there is no whitespace between "]" and "(".
+#. TRANS: Text between [] is a link description, text between () is the link itself.
+#. TRANS: %s is the version of StatusNet that is being used.
+#: lib/action.php:856
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -3916,216 +3673,237 @@ msgid ""
 "org/licensing/licenses/agpl-3.0.html)."
 msgstr ""
 
-#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:866
-msgid "Site content license"
-msgstr ""
-
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:873
+#: lib/action.php:879
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:880
+#: lib/action.php:886
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:884
+#: lib/action.php:890
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 
-#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:897
+#. TRANS: license message in footer.
+#. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
+#: lib/action.php:904
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr ""
 
 #. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1236
+#: lib/action.php:1243
 msgid "Pagination"
 msgstr ""
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1247
+#: lib/action.php:1254
 msgid "After"
 msgstr ""
 
-#. TRANS: Pagination message to go to a page displaying information more in the
-#. TRANS: past than the currently displayed information.
-#: lib/action.php:1257
-msgid "Before"
-msgstr ""
-
 #. TRANS: Client exception thrown when a feed instance is a DOMDocument.
 #: lib/activity.php:122
 msgid "Expecting a root feed element but got a whole XML document."
 msgstr ""
 
-#: lib/activityutils.php:208
+#. TRANS: Client exception thrown when there is no source attribute.
+#: lib/activityutils.php:203
 msgid "Can't handle remote content yet."
 msgstr ""
 
-#: lib/activityutils.php:244
+#. TRANS: Client exception thrown when there embedded XML content is found that cannot be processed yet.
+#: lib/activityutils.php:240
 msgid "Can't handle embedded XML content yet."
 msgstr ""
 
-#: lib/activityutils.php:248
+#. TRANS: Client exception thrown when base64 encoded content is found that cannot be processed yet.
+#: lib/activityutils.php:245
 msgid "Can't handle embedded Base64 content yet."
 msgstr ""
 
+#. TRANS: Client error message thrown when a user tries to change admin settings but has no access rights.
+#: lib/adminpanelaction.php:96
+msgid "You cannot make changes to this site."
+msgstr ""
+
 #. TRANS: Client error message throw when a certain panel's settings cannot be changed.
-#: lib/adminpanelaction.php:110
+#: lib/adminpanelaction.php:108
 msgid "Changes to that panel are not allowed."
 msgstr ""
 
 #. TRANS: Client error message.
-#: lib/adminpanelaction.php:229
+#: lib/adminpanelaction.php:222
 msgid "showForm() not implemented."
 msgstr ""
 
 #. TRANS: Client error message
-#: lib/adminpanelaction.php:259
+#: lib/adminpanelaction.php:250
 msgid "saveSettings() not implemented."
 msgstr ""
 
 #. TRANS: Client error message thrown if design settings could not be deleted in
 #. TRANS: the admin panel Design.
-#: lib/adminpanelaction.php:284
+#: lib/adminpanelaction.php:274
 msgid "Unable to delete design setting."
 msgstr ""
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:350
+#: lib/adminpanelaction.php:337
 msgid "Basic site configuration"
 msgstr "ç¡ç¢ºèªç¢¼"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:358
+#: lib/adminpanelaction.php:345
 msgid "Design configuration"
 msgstr "ç¡ç¢ºèªç¢¼"
 
-#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:360
-msgctxt "MENU"
-msgid "Design"
-msgstr ""
-
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:366
+#: lib/adminpanelaction.php:353
 msgid "User configuration"
 msgstr "ç¡ç¢ºèªç¢¼"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:368 lib/personalgroupnav.php:115
+#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:115
 msgid "User"
 msgstr ""
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:374
+#: lib/adminpanelaction.php:361
 msgid "Access configuration"
 msgstr "ç¡ç¢ºèªç¢¼"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:382
+#: lib/adminpanelaction.php:369
 msgid "Paths configuration"
 msgstr "ç¡ç¢ºèªç¢¼"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:390
+#: lib/adminpanelaction.php:377
 msgid "Sessions configuration"
 msgstr "ç¡ç¢ºèªç¢¼"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:406
+#: lib/adminpanelaction.php:393
 msgid "Snapshots configuration"
 msgstr "ç¡ç¢ºèªç¢¼"
 
 #. TRANS: Client error 401.
-#: lib/apiauth.php:113
+#: lib/apiauth.php:111
 msgid "API resource requires read-write access, but you only have read access."
 msgstr ""
 
+#. TRANS: OAuth exception thrown when no application is found for a given consumer key.
+#: lib/apiauth.php:175
+msgid "No application for that consumer key."
+msgstr ""
+
+#. TRANS: OAuth exception given when an incorrect access token was given for a user.
+#: lib/apiauth.php:212
+msgid "Bad access token."
+msgstr ""
+
+#. TRANS: OAuth exception given when no user was found for a given token (no token was found).
+#: lib/apiauth.php:217
+msgid "No user for that token."
+msgstr ""
+
+#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
+#: lib/apioauthstore.php:178
+msgid "Tried to revoke unknown token"
+msgstr ""
+
+#. TRANS: Exception thrown when an attempt is made to remove a revoked token.
+#: lib/apioauthstore.php:182
+msgid "Failed to delete revoked token"
+msgstr ""
+
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:209
-#, php-format
-msgid "Describe your application in %d characters"
+#: lib/applicationeditform.php:215
+msgid "URL of the homepage of this application"
 msgstr ""
 
 #. TRANS: Form input field label.
-#: lib/applicationeditform.php:226
+#: lib/applicationeditform.php:217
 msgid "Source URL"
 msgstr ""
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:242
+#: lib/applicationeditform.php:224
+msgid "Organization responsible for this application"
+msgstr ""
+
+#. TRANS: Form input field instructions.
+#: lib/applicationeditform.php:233
 msgid "URL for the homepage of the organization"
 msgstr ""
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:251
+#: lib/applicationeditform.php:242
 msgid "URL to redirect to after authentication"
 msgstr ""
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:278
+#: lib/applicationeditform.php:269
 msgid "Browser"
 msgstr ""
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:295
+#: lib/applicationeditform.php:286
 msgid "Desktop"
 msgstr ""
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:297
+#: lib/applicationeditform.php:288
 msgid "Type of application, browser or desktop"
 msgstr ""
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:320
+#: lib/applicationeditform.php:311
 msgid "Read-only"
 msgstr ""
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:339
+#: lib/applicationeditform.php:330
 msgid "Read-write"
 msgstr ""
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:341
+#: lib/applicationeditform.php:332
 msgid "Default access for this application: read-only, or read-write"
 msgstr ""
 
-#. TRANS: Submit button title
-#: lib/applicationeditform.php:359
+#. TRANS: Submit button title.
+#: lib/applicationeditform.php:349
 msgid "Cancel"
 msgstr "åæ¶"
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:136
+#: lib/applicationlist.php:135
 msgid "read-write"
 msgstr ""
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:138
+#: lib/applicationlist.php:137
 msgid "read-only"
 msgstr ""
 
 #. 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
+#: lib/applicationlist.php:143
 #, php-format
 msgid "Approved %1$s - \"%2$s\" access."
 msgstr ""
 
 #. TRANS: Button label
-#: lib/applicationlist.php:159
+#: lib/applicationlist.php:158
 msgctxt "BUTTON"
 msgid "Revoke"
 msgstr ""
@@ -4140,7 +3918,8 @@ msgstr ""
 msgid "Provider"
 msgstr ""
 
-#: lib/attachmentnoticesection.php:67
+#. TRANS: Title.
+#: lib/attachmentnoticesection.php:68
 msgid "Notices where this attachment appears"
 msgstr ""
 
@@ -4152,6 +3931,11 @@ msgstr ""
 msgid "Password changing is not allowed"
 msgstr ""
 
+#. TRANS: Title for the form to block a user.
+#: lib/blockform.php:70
+msgid "Block"
+msgstr ""
+
 #: lib/channel.php:229 lib/mailhandler.php:142
 msgid "Command complete"
 msgstr ""
@@ -4171,6 +3955,13 @@ msgstr ""
 msgid "User has no last notice."
 msgstr ""
 
+#. TRANS: Message given getting a non-existing user.
+#. TRANS: %s is the nickname of the user that could not be found.
+#: lib/command.php:150
+#, php-format
+msgid "Could not find a local user with nickname %s."
+msgstr ""
+
 #. TRANS: Error text shown when an unimplemented command is given.
 #: lib/command.php:185
 msgid "Sorry, this command is not yet implemented."
@@ -4212,6 +4003,13 @@ msgstr ""
 msgid "%1$s joined group %2$s."
 msgstr ""
 
+#. 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.
+#: lib/command.php:408
+#, php-format
+msgid "%1$s left group %2$s."
+msgstr ""
+
 #. TRANS: Command exception text shown when trying to send a direct message to a remote user (a user not registered at the current server).
 #: lib/command.php:474
 #, php-format
@@ -4227,13 +4025,6 @@ msgstr ""
 msgid "Message too long - maximum is %1$d characters, you sent %2$d."
 msgstr ""
 
-#. 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:554
-#, php-format
-msgid "Notice from %s repeated."
-msgstr ""
-
 #. TRANS: Message given if content of a notice for a reply is too long.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
 #: lib/command.php:592
@@ -4311,8 +4102,15 @@ msgstr ""
 msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr ""
 
+#. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
+#. TRANS: %s is the name of the user the unsubscription was requested for.
+#: lib/command.php:813
+#, php-format
+msgid "Unsubscribed %s."
+msgstr ""
+
 #. TRANS: Text shown after requesting other users a user is subscribed to.
-#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.
 #: lib/command.php:836
 msgid "You are subscribed to this person:"
@@ -4320,7 +4118,7 @@ msgid_plural "You are subscribed to these people:"
 msgstr[0] "æ¤å¸³èå·²è¨»å"
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
-#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
 #: lib/command.php:863
 msgid "This person is subscribed to you:"
@@ -4328,13 +4126,14 @@ msgid_plural "These people are subscribed to you:"
 msgstr[0] "ç¡æ¤è¨é±"
 
 #. TRANS: Text shown after requesting groups a user is subscribed to.
-#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
 #: lib/command.php:890
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "ç¡æ³é£çµå°ä¼ºæå¨:%s"
 
+#. TRANS: Help text for commands.
 #: lib/command.php:905
 msgid ""
 "Commands:\n"
@@ -4475,15 +4274,6 @@ msgstr ""
 msgid "URL of the homepage or blog of the group or topic"
 msgstr ""
 
-#: lib/groupeditform.php:168
-msgid "Describe the group or topic"
-msgstr ""
-
-#: lib/groupeditform.php:170
-#, php-format
-msgid "Describe the group or topic in %d characters"
-msgstr ""
-
 #: lib/groupeditform.php:179
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\""
@@ -4494,35 +4284,19 @@ msgstr ""
 msgid "Extra nicknames for the group, comma- or space- separated, max %d"
 msgstr ""
 
-#: lib/groupnav.php:85
-msgid "Group"
-msgstr ""
-
-#: lib/groupnav.php:101
-msgid "Blocked"
-msgstr ""
-
-#: lib/groupnav.php:102
-#, php-format
-msgid "%s blocked users"
-msgstr ""
-
-#: lib/groupnav.php:108
-#, php-format
-msgid "Edit %s group properties"
-msgstr ""
-
-#: lib/groupnav.php:113
-msgid "Logo"
-msgstr "ç»å¥"
-
-#: lib/groupnav.php:114
+#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
+#. TRANS: %s is the nickname of the group.
+#: lib/groupnav.php:129
 #, php-format
+msgctxt "TOOLTIP"
 msgid "Add or edit %s logo"
 msgstr ""
 
-#: lib/groupnav.php:120
+#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
+#. TRANS: %s is the nickname of the group.
+#: lib/groupnav.php:138
 #, php-format
+msgctxt "TOOLTIP"
 msgid "Add or edit %s design"
 msgstr ""
 
@@ -4553,7 +4327,8 @@ msgstr ""
 msgid "That file is too big. The maximum file size is %s."
 msgstr ""
 
-#: lib/imagefile.php:101 lib/mediafile.php:170
+#. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
+#: lib/imagefile.php:101 lib/mediafile.php:179
 msgid "System error uploading file."
 msgstr ""
 
@@ -4595,10 +4370,6 @@ msgstr ""
 msgid "Login with a username and password"
 msgstr "ä½¿ç¨èåç¨±æå¯ç¢¼é¯èª¤"
 
-#: lib/logingroupnav.php:86
-msgid "Sign up for a new account"
-msgstr ""
-
 #. TRANS: Subject for address confirmation email
 #: lib/mail.php:174
 msgid "Email address confirmation"
@@ -4635,22 +4406,6 @@ msgid ""
 "your subscribers list and report as spam to site administrators at %s"
 msgstr ""
 
-#. TRANS: Main body of new-subscriber notification e-mail
-#: lib/mail.php:254
-#, php-format
-msgid ""
-"%1$s is now listening to your notices on %2$s.\n"
-"\n"
-"\t%3$s\n"
-"\n"
-"%4$s%5$s%6$s\n"
-"Faithfully yours,\n"
-"%7$s.\n"
-"\n"
-"----\n"
-"Change your email address or notification options at %8$s\n"
-msgstr ""
-
 #. TRANS: Body of notification mail for new posting email address
 #: lib/mail.php:308
 #, php-format
@@ -4720,12 +4475,6 @@ msgid ""
 "%5$s\n"
 msgstr ""
 
-#. TRANS: Subject for favorite notification email
-#: lib/mail.php:589
-#, php-format
-msgid "%s (@%s) added your notice as a favorite"
-msgstr ""
-
 #. TRANS: Body for favorite notification email
 #: lib/mail.php:592
 #, php-format
@@ -4817,48 +4566,64 @@ msgstr ""
 msgid "Unsupported message type: %s"
 msgstr ""
 
-#: lib/mediafile.php:98 lib/mediafile.php:123
+#. TRANS: Client exception thrown when a database error was thrown during a file upload operation.
+#: lib/mediafile.php:99 lib/mediafile.php:125
 msgid "There was a database error while saving your file. Please try again."
 msgstr ""
 
-#: lib/mediafile.php:142
+#. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
+#: lib/mediafile.php:145
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
 msgstr ""
 
-#: lib/mediafile.php:147
+#. TRANS: Client exception.
+#: lib/mediafile.php:151
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form."
 msgstr ""
 
-#: lib/mediafile.php:152
+#. TRANS: Client exception.
+#: lib/mediafile.php:157
 msgid "The uploaded file was only partially uploaded."
 msgstr ""
 
-#: lib/mediafile.php:162
+#. TRANS: Client exception thrown when writing to disk is not possible during a file upload operation.
+#: lib/mediafile.php:169
 msgid "Failed to write file to disk."
 msgstr ""
 
-#: lib/mediafile.php:165
+#. TRANS: Client exception thrown when a file upload operation has been stopped by an extension.
+#: lib/mediafile.php:173
 msgid "File upload stopped by extension."
 msgstr ""
 
-#: lib/mediafile.php:179 lib/mediafile.php:217
+#. TRANS: Client exception thrown when a file upload operation would cause a user to exceed a set quota.
+#: lib/mediafile.php:189 lib/mediafile.php:232
 msgid "File exceeds user's quota."
 msgstr ""
 
-#: lib/mediafile.php:197 lib/mediafile.php:234
+#. TRANS: Client exception thrown when a file upload operation fails because the file could
+#. TRANS: not be moved from the temporary folder to the permanent file location.
+#: lib/mediafile.php:209 lib/mediafile.php:251
 msgid "File could not be moved to destination directory."
 msgstr ""
 
-#: lib/mediafile.php:318
+#. TRANS: Client exception thrown trying to upload a forbidden MIME type.
+#. TRANS: %1$s is the file type that was denied, %2$s is the application part of
+#. TRANS: the MIME type that was denied.
+#: lib/mediafile.php:340
 #, php-format
-msgid " Try using another %s format."
+msgid ""
+"\"%1$s\" is not a supported file type on this server. Try using another %2$s "
+"format."
 msgstr ""
 
-#: lib/mediafile.php:323
+#. TRANS: Client exception thrown trying to upload a forbidden MIME type.
+#. TRANS: %s is the file type that was denied.
+#: lib/mediafile.php:345
 #, php-format
-msgid "%s is not a supported file type on this server."
+msgid "\"%s\" is not a supported file type on this server."
 msgstr ""
 
 #: lib/messageform.php:120
@@ -4930,10 +4695,6 @@ msgstr ""
 msgid "web"
 msgstr ""
 
-#: lib/noticelist.php:603
-msgid "Repeated by"
-msgstr ""
-
 #: lib/noticelist.php:630
 msgid "Reply to this notice"
 msgstr ""
@@ -4942,27 +4703,19 @@ msgstr ""
 msgid "Reply"
 msgstr ""
 
+#: lib/nudgeform.php:116
+msgid "Nudge this user"
+msgstr ""
+
 #: lib/nudgeform.php:128
 msgid "Nudge"
 msgstr ""
 
-#: lib/oauthstore.php:283
-msgid "Error inserting new profile"
-msgstr "æ°çæ´äººè³æè¼¸å¥é¯èª¤"
-
-#: lib/oauthstore.php:291
-msgid "Error inserting avatar"
-msgstr "åäººååæå¥é¯èª¤"
-
-#: lib/oauthstore.php:306
-msgid "Error updating remote profile"
-msgstr "æ´æ°é ç«¯åäººè³æç¼çé¯èª¤"
-
-#: lib/oauthstore.php:311
-msgid "Error inserting remote profile"
-msgstr "æ°å¢å¤é¨åäººè³æç¼çé¯èª¤(Error inserting remote profile)"
+#: lib/nudgeform.php:128
+msgid "Send a nudge to this user"
+msgstr ""
 
-#: lib/oauthstore.php:490
+#: lib/oauthstore.php:491
 msgid "Couldn't insert new subscription."
 msgstr "ç¡æ³æ°å¢è¨é±"
 
@@ -4982,16 +4735,25 @@ msgstr ""
 msgid "Inbox"
 msgstr ""
 
+#: lib/personalgroupnav.php:126
+msgid "Your incoming messages"
+msgstr ""
+
 #: lib/personalgroupnav.php:130
 msgid "Outbox"
 msgstr ""
 
+#: lib/personalgroupnav.php:131
+msgid "Your sent messages"
+msgstr ""
+
 #: lib/personaltagcloudsection.php:56
 #, php-format
 msgid "Tags in %s's notices"
 msgstr ""
 
-#: lib/plugin.php:115
+#. TRANS: Displayed as version information for a plugin if no version information was found.
+#: lib/plugin.php:116
 msgid "Unknown"
 msgstr ""
 
@@ -5024,6 +4786,10 @@ msgstr ""
 msgid "Public"
 msgstr ""
 
+#: lib/publicgroupnav.php:82
+msgid "User groups"
+msgstr ""
+
 #: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85
 msgid "Recent tags"
 msgstr ""
@@ -5036,23 +4802,10 @@ msgstr ""
 msgid "Popular"
 msgstr ""
 
-#: lib/repeatform.php:107
-msgid "Repeat this notice?"
-msgstr ""
-
 #: lib/repeatform.php:132
 msgid "Yes"
 msgstr ""
 
-#: lib/repeatform.php:132
-msgid "Repeat this notice"
-msgstr ""
-
-#: lib/revokeroleform.php:91
-#, php-format
-msgid "Revoke the \"%s\" role from this user"
-msgstr ""
-
 #: lib/router.php:709
 msgid "No single user defined for single-user mode."
 msgstr ""
@@ -5061,19 +4814,24 @@ msgstr ""
 msgid "Sandbox"
 msgstr ""
 
-#: lib/searchaction.php:120
+#. TRANS: Fieldset legend for the search form.
+#: lib/searchaction.php:121
 msgid "Search site"
 msgstr ""
 
-#: lib/searchaction.php:126
+#. TRANS: Used as a field label for the field where one or more keywords
+#. TRANS: for searching can be entered.
+#: lib/searchaction.php:129
 msgid "Keyword(s)"
 msgstr ""
 
-#: lib/searchaction.php:127
+#: lib/searchaction.php:130
+msgctxt "BUTTON"
 msgid "Search"
 msgstr ""
 
-#: lib/searchaction.php:162
+#. TRANS: Definition list item with instructions on how to get (better) search results.
+#: lib/searchaction.php:170
 msgid "Search help"
 msgstr ""
 
@@ -5101,10 +4859,6 @@ msgstr ""
 msgid "More..."
 msgstr ""
 
-#: lib/silenceform.php:67
-msgid "Silence"
-msgstr ""
-
 #: lib/subgroupnav.php:99
 #, php-format
 msgid "Groups %s is a member of"
@@ -5216,20 +4970,21 @@ msgid "Moderator"
 msgstr ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1102
+#: lib/util.php:1103
 msgid "a few seconds ago"
 msgstr ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1105
+#: lib/util.php:1106
 msgid "about a minute ago"
 msgstr ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 #: lib/util.php:1109
 #, php-format
-msgid "about %d minutes ago"
-msgstr ""
+msgid "about one minute ago"
+msgid_plural "about %d minutes ago"
+msgstr[0] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 #: lib/util.php:1112
@@ -5237,35 +4992,38 @@ msgid "about an hour ago"
 msgstr ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1116
+#: lib/util.php:1115
 #, php-format
-msgid "about %d hours ago"
-msgstr ""
+msgid "about one hour ago"
+msgid_plural "about %d hours ago"
+msgstr[0] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1119
+#: lib/util.php:1118
 msgid "about a day ago"
 msgstr ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1123
+#: lib/util.php:1121
 #, php-format
-msgid "about %d days ago"
-msgstr ""
+msgid "about one day ago"
+msgid_plural "about %d days ago"
+msgstr[0] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1126
+#: lib/util.php:1124
 msgid "about a month ago"
 msgstr ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1130
+#: lib/util.php:1127
 #, php-format
-msgid "about %d months ago"
-msgstr ""
+msgid "about one month ago"
+msgid_plural "about %d months ago"
+msgstr[0] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1133
+#: lib/util.php:1130
 msgid "about a year ago"
 msgstr ""