Merge branch 'testing' of gitorious.org:statusnet/mainline into testing

[quix0rs-gnu-social.git] / locale / ga / LC_MESSAGES / statusnet.po

diff --git a/locale/ga/LC_MESSAGES/statusnet.po b/locale/ga/LC_MESSAGES/statusnet.po
index 852fc62353a873e13cc773bd6d0da48b55545caf..e91f62d9019880edd0b7e14b33b061237655a8aa 100644 (file)
--- a/locale/ga/LC_MESSAGES/statusnet.po
+++ b/locale/ga/LC_MESSAGES/statusnet.po
@@ -9,18 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2010-10-27 23:43+0000\n"
-"PO-Revision-Date: 2010-10-28 23:09:00+0000\n"
+"POT-Creation-Date: 2011-01-14 23:32+0000\n"
+"PO-Revision-Date: 2011-01-14 23:34:48+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"
 "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 (r75629); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80343); Translate extension (2010-09-17)\n"

 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ga\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=5; plural=(n == 1) ? 0 : ( (n == 2) ? 1 : ( (n < 7) ? "
 "2 : ( (n < 11) ? 3 : 4 ) ) );\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ga\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=5; plural=(n == 1) ? 0 : ( (n == 2) ? 1 : ( (n < 7) ? "
 "2 : ( (n < 11) ? 3 : 4 ) ) );\n"

-"X-POT-Import-Date: 2010-10-28 00:13:15+0000\n"
+"X-POT-Import-Date: 2011-01-14 13:22:39+0000\n"

 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration


@@ -83,15 +83,22 @@ msgstr "Configuracións de Twitter"
 #. TRANS: Tooltip for button to save access settings in site admin panel.
 #. TRANS: Button label to save e-mail preferences.
 #. TRANS: Button label to save IM preferences.
 #. TRANS: Tooltip for button to save access settings in site admin panel.
 #. TRANS: Button label to save e-mail preferences.
 #. TRANS: Button label to save IM preferences.

+#. TRANS: Button text for saving "Other settings" in profile.

 #. TRANS: Button text to store form data in the Paths admin panel.
 #. TRANS: Button to save input in profile settings.
 #. TRANS: Button text to store form data in the Paths admin panel.
 #. TRANS: Button to save input in profile settings.

+#. TRANS: Button text for saving site notice in admin panel.

 #. TRANS: Button label to save SMS preferences.
 #. TRANS: Save button for settings for a profile in a subscriptions list.
 #. TRANS: Button label to save SMS preferences.
 #. TRANS: Save button for settings for a profile in a subscriptions list.

+#. TRANS: Button text to save user settings in user admin panel.

 #. TRANS: Button label in the "Edit application" form.
 #. TRANS: Button label in the "Edit application" form.

-#: actions/accessadminpanel.php:193 actions/emailsettings.php:228
-#: actions/imsettings.php:187 actions/pathsadminpanel.php:512
-#: actions/profilesettings.php:201 actions/smssettings.php:209
-#: actions/subscriptions.php:246 lib/applicationeditform.php:355
+#. TRANS: Button text on profile design page to save settings.
+#: actions/accessadminpanel.php:193 actions/emailsettings.php:254
+#: actions/imsettings.php:187 actions/othersettings.php:134
+#: actions/pathsadminpanel.php:512 actions/profilesettings.php:201
+#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:209
+#: actions/subscriptions.php:262 actions/useradminpanel.php:298
+#: lib/applicationeditform.php:355 lib/designsettings.php:270
+#: lib/groupeditform.php:207

 #, fuzzy
 msgctxt "BUTTON"
 msgid "Save"
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Save"


@@ -106,6 +113,7 @@ msgid "No such page."
 msgstr "Non existe a etiqueta."
 
 #. TRANS: Client error when user not found for an action.
 msgstr "Non existe a etiqueta."
 
 #. TRANS: Client error when user not found for an action.

+#. TRANS: Client error when user not found for an rss related action.

 #. TRANS: Client error displayed when no existing user is provided for a user's delivery device setting.
 #. TRANS: Client error displayed if a user could not be found.
 #. TRANS: Client error when user not found updating a profile background image.
 #. TRANS: Client error displayed when no existing user is provided for a user's delivery device setting.
 #. TRANS: Client error displayed if a user could not be found.
 #. TRANS: Client error when user not found updating a profile background image.


@@ -124,26 +132,29 @@ msgstr "Non existe a etiqueta."
 #. TRANS: Client error displayed when requesting most recent dents by user and friends for a non-existing user.
 #. TRANS: Client error displayed when requesting most recent mentions for a non-existing user.
 #. TRANS: Client error displayed requesting most recent notices for a non-existing user.
 #. TRANS: Client error displayed when requesting most recent dents by user and friends for a non-existing user.
 #. TRANS: Client error displayed when requesting most recent mentions for a non-existing user.
 #. TRANS: Client error displayed requesting most recent notices for a non-existing user.

+#. TRANS: Client error displayed trying to get an avatar for a non-existing user.

 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.

-#: actions/all.php:80 actions/apiaccountupdatedeliverydevice.php:110
+#: actions/all.php:80 actions/allrss.php:69
+#: actions/apiaccountupdatedeliverydevice.php:110

 #: actions/apiaccountupdateprofile.php:103
 #: actions/apiaccountupdateprofilebackgroundimage.php:118
 #: actions/apiaccountupdateprofile.php:103
 #: actions/apiaccountupdateprofilebackgroundimage.php:118

-#: actions/apiaccountupdateprofileimage.php:104 actions/apiblockcreate.php:95
-#: actions/apiblockdestroy.php:94 actions/apidirectmessage.php:75
-#: actions/apidirectmessagenew.php:72 actions/apigroupcreate.php:111
-#: actions/apigroupismember.php:89 actions/apigroupjoin.php:98
-#: actions/apigroupleave.php:98 actions/apigrouplist.php:70
-#: actions/apistatusesupdate.php:230 actions/apisubscriptions.php:85
-#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:173
-#: actions/apitimelinehome.php:78 actions/apitimelinementions.php:77
-#: actions/apitimelineuser.php:79 actions/avatarbynickname.php:75
-#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
-#: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116
-#: actions/otp.php:76 actions/remotesubscribe.php:145
-#: actions/remotesubscribe.php:154 actions/replies.php:73
-#: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
-#: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:495 lib/galleryaction.php:59
+#: actions/apiaccountupdateprofileimage.php:104 actions/apiatomservice.php:60
+#: actions/apiblockcreate.php:95 actions/apiblockdestroy.php:94
+#: actions/apidirectmessage.php:75 actions/apidirectmessagenew.php:72
+#: actions/apigroupcreate.php:111 actions/apigroupismember.php:89
+#: actions/apigroupjoin.php:98 actions/apigroupleave.php:98
+#: actions/apigrouplist.php:70 actions/apistatusesupdate.php:230
+#: actions/apisubscriptions.php:85 actions/apitimelinefavorites.php:70
+#: actions/apitimelinefriends.php:173 actions/apitimelinehome.php:78
+#: actions/apitimelinementions.php:77 actions/apitimelineuser.php:79
+#: actions/avatarbynickname.php:79 actions/favoritesrss.php:74
+#: actions/foaf.php:40 actions/foaf.php:58 actions/hcard.php:67
+#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
+#: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154
+#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
+#: actions/showfavorites.php:105 actions/userbyid.php:74
+#: actions/usergroups.php:93 actions/userrss.php:40 actions/userxrd.php:59
+#: actions/xrds.php:71 lib/command.php:497 lib/galleryaction.php:59

 #: lib/mailbox.php:82 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Ningún usuario."
 #: lib/mailbox.php:82 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Ningún usuario."


@@ -158,9 +169,9 @@ msgstr "%s e amigos"
 #. TRANS: H1 text for page. %s is a user nickname.
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Timeline title for user and friends. %s is a user nickname.
 #. TRANS: H1 text for page. %s is a user nickname.
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Timeline title for user and friends. %s is a user nickname.

-#: actions/all.php:94 actions/all.php:191 actions/allrss.php:115
+#: actions/all.php:94 actions/all.php:191 actions/allrss.php:117

 #: actions/apitimelinefriends.php:207 actions/apitimelinehome.php:113
 #: actions/apitimelinefriends.php:207 actions/apitimelinehome.php:113

-#: lib/personalgroupnav.php:100
+#: lib/personalgroupnav.php:103

 #, php-format
 msgid "%s and friends"
 msgstr "%s e amigos"
 #, php-format
 msgid "%s and friends"
 msgstr "%s e amigos"


@@ -210,7 +221,9 @@ msgstr ""
 
 #. TRANS: Encoutagement displayed on empty timeline user pages for anonymous users.
 #. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
 
 #. TRANS: Encoutagement displayed on empty timeline user pages for anonymous users.
 #. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.

-#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:208
+#. TRANS: Second sentence of empty message for anonymous users. %s is a user nickname.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:227

 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "


@@ -225,7 +238,7 @@ msgstr "%s e amigos"
 
 #. 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.
 
 #. 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.

-#: actions/allrss.php:120 actions/apitimelinefriends.php:213
+#: actions/allrss.php:122 actions/apitimelinefriends.php:213

 #: actions/apitimelinehome.php:119
 #, php-format
 msgid "Updates from %1$s and friends on %2$s!"
 #: actions/apitimelinehome.php:119
 #, php-format
 msgid "Updates from %1$s and friends on %2$s!"


@@ -266,11 +279,11 @@ msgstr "Actualizacións dende %1$s e amigos en %2$s!"
 #: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:138
 #: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
 #: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:268
 #: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:138
 #: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
 #: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:268

-#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:173
+#: actions/apitimelinegroup.php:147 actions/apitimelinehome.php:173

 #: actions/apitimelinementions.php:174 actions/apitimelinepublic.php:239
 #: actions/apitimelineretweetedtome.php:118
 #: actions/apitimelineretweetsofme.php:150 actions/apitimelinetag.php:159
 #: actions/apitimelinementions.php:174 actions/apitimelinepublic.php:239
 #: actions/apitimelineretweetedtome.php:118
 #: actions/apitimelineretweetsofme.php:150 actions/apitimelinetag.php:159

-#: actions/apitimelineuser.php:158 actions/apiusershow.php:100
+#: actions/apitimelineuser.php:206 actions/apiusershow.php:100

 #, fuzzy
 msgid "API method not found."
 msgstr "Método da API non atopado"
 #, fuzzy
 msgid "API method not found."
 msgstr "Método da API non atopado"


@@ -309,11 +322,13 @@ msgstr "Non se puido actualizar o usuario."
 #. TRANS: Client error displayed a user has no profile updating profile colours.
 #. TRANS: Client error displayed if a user profile could not be found updating a profile image.
 #. TRANS: Client error displayed when requesting user information for a user without a profile.
 #. TRANS: Client error displayed a user has no profile updating profile colours.
 #. TRANS: Client error displayed if a user profile could not be found updating a profile image.
 #. TRANS: Client error displayed when requesting user information for a user without a profile.

+#. TRANS: Client error displayed trying to get an avatar for a user without a profile.

 #: actions/apiaccountupdateprofile.php:111
 #: actions/apiaccountupdateprofilebackgroundimage.php:199
 #: actions/apiaccountupdateprofilecolors.php:183
 #: actions/apiaccountupdateprofile.php:111
 #: actions/apiaccountupdateprofilebackgroundimage.php:199
 #: actions/apiaccountupdateprofilecolors.php:183

-#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
-#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/hcard.php:74
+#: actions/apiaccountupdateprofileimage.php:130
+#: actions/apiuserprofileimage.php:88 actions/apiusershow.php:108
+#: actions/avatarbynickname.php:85 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."
 #: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
 #: lib/profileaction.php:84
 msgid "User has no profile."


@@ -327,11 +342,13 @@ msgstr "Non se puido gardar o perfil."
 
 #. TRANS: Client error displayed when the number of bytes in a POST request exceeds a limit.
 #. TRANS: %s is the number of bytes of the CONTENT_LENGTH.
 
 #. TRANS: Client error displayed when the number of bytes in a POST request exceeds a limit.
 #. TRANS: %s is the number of bytes of the CONTENT_LENGTH.

+#. TRANS: Form validation error in design settings form. POST should remain untranslated.

 #: actions/apiaccountupdateprofilebackgroundimage.php:108
 #: actions/apiaccountupdateprofileimage.php:95 actions/apimediaupload.php:81
 #: actions/apiaccountupdateprofilebackgroundimage.php:108
 #: actions/apiaccountupdateprofileimage.php:95 actions/apimediaupload.php:81

-#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:259
+#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269

 #: actions/designadminpanel.php:125 actions/editapplication.php:121
 #: actions/newapplication.php:104 actions/newnotice.php:95
 #: actions/designadminpanel.php:125 actions/editapplication.php:121
 #: actions/newapplication.php:104 actions/newnotice.php:95

+#: lib/designsettings.php:298

 #, php-format
 msgid ""
 "The server was unable to handle that much POST data (%s byte) due to its "
 #, php-format
 msgid ""
 "The server was unable to handle that much POST data (%s byte) due to its "


@@ -368,6 +385,38 @@ msgstr "Non se puideron gardar os teus axustes de Twitter!"
 msgid "Could not update your design."
 msgstr "Non se puido actualizar o usuario."
 
 msgid "Could not update your design."
 msgstr "Non se puido actualizar o usuario."
 

+#: actions/apiatomservice.php:86
+msgid "Main"
+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.
+#: actions/apiatomservice.php:93 actions/grouprss.php:139
+#: actions/userrss.php:94 lib/atomgroupnoticefeed.php:63
+#: lib/atomusernoticefeed.php:68
+#, php-format
+msgid "%s timeline"
+msgstr "Liña de tempo de %s"
+
+#. TRANS: Header for subscriptions overview for a user (first page).
+#. TRANS: %s is a user nickname.
+#: actions/apiatomservice.php:103 actions/atompubsubscriptionfeed.php:147
+#: actions/subscriptions.php:51
+#, fuzzy, php-format
+msgid "%s subscriptions"
+msgstr "Tódalas subscricións"
+
+#: actions/apiatomservice.php:113 actions/atompubfavoritefeed.php:142
+#, fuzzy, php-format
+msgid "%s favorites"
+msgstr "Favoritos"
+
+#: actions/apiatomservice.php:123
+#, php-format
+msgid "%s memberships"
+msgstr ""
+

 #. TRANS: Client error displayed when users try to block themselves.
 #: actions/apiblockcreate.php:104
 #, fuzzy
 #. TRANS: Client error displayed when users try to block themselves.
 #: actions/apiblockcreate.php:104
 #, fuzzy


@@ -504,7 +553,7 @@ msgstr "Non se puido actualizar o usuario."
 #. TRANS: Client error displayed when supplying invalid parameters to an API call checking if a friendship exists.
 #: actions/apifriendshipsexists.php:88
 #, fuzzy
 #. TRANS: Client error displayed when supplying invalid parameters to an API call checking if a friendship exists.
 #: actions/apifriendshipsexists.php:88
 #, fuzzy

-msgid "Two valid IDs or screen_names must be supplied."
+msgid "Two valid IDs or nick names must be supplied."

 msgstr ""
 "Dous identificadores de usuario ou nomes_en_pantalla deben ser "
 "proporcionados."
 msgstr ""
 "Dous identificadores de usuario ou nomes_en_pantalla deben ser "
 "proporcionados."


@@ -519,44 +568,45 @@ msgstr "Non se puido actualizar o usuario."
 msgid "Could not find target user."
 msgstr "Non se puido actualizar o usuario."
 
 msgid "Could not find target user."
 msgstr "Non se puido actualizar o usuario."
 

-#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:165 actions/editgroup.php:186
-#: actions/newgroup.php:126 actions/profilesettings.php:243
-#: 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."
-

 #. TRANS: Client error trying to create a group with a nickname this is already in use.
 #. TRANS: Client error trying to create a group with a nickname this is already in use.

+#. TRANS: Group edit form validation error.
+#. TRANS: Group create form validation error.

 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Validation error in form for profile settings.

-#: actions/apigroupcreate.php:175 actions/editgroup.php:190
-#: actions/newgroup.php:130 actions/profilesettings.php:277
-#: actions/register.php:215
+#: actions/apigroupcreate.php:156 actions/editgroup.php:189
+#: actions/newgroup.php:136 actions/profilesettings.php:277
+#: actions/register.php:214

 msgid "Nickname already in use. Try another one."
 msgstr "O alcume xa está sendo empregado por outro usuario. Tenta con outro."
 
 #. TRANS: Client error in form for group creation.
 msgid "Nickname already in use. Try another one."
 msgstr "O alcume xa está sendo empregado por outro usuario. Tenta con outro."
 
 #. TRANS: Client error in form for group creation.

+#. TRANS: Group edit form validation error.
+#. TRANS: Group create form validation error.

 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Validation error in form for profile settings.

-#: actions/apigroupcreate.php:183 actions/editgroup.php:193
-#: actions/newgroup.php:133 actions/profilesettings.php:247
-#: actions/register.php:217
+#: actions/apigroupcreate.php:164 actions/editgroup.php:193
+#: actions/newgroup.php:140 actions/profilesettings.php:247
+#: actions/register.php:216

 msgid "Not a valid nickname."
 msgstr "Non é un alcume válido."
 
 #. TRANS: Client error in form for group creation.
 #. TRANS: Validation error shown when providing an invalid homepage URL in the "Edit application" form.
 msgid "Not a valid nickname."
 msgstr "Non é un alcume válido."
 
 #. TRANS: Client error in form for group creation.
 #. TRANS: Validation error shown when providing an invalid homepage URL in the "Edit application" form.

+#. TRANS: Group edit form validation error.
+#. TRANS: Group create form validation error.

 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Validation error in form for profile settings.

-#: actions/apigroupcreate.php:200 actions/editapplication.php:233
-#: actions/editgroup.php:199 actions/newapplication.php:211
-#: actions/newgroup.php:139 actions/profilesettings.php:252
-#: actions/register.php:224
+#: actions/apigroupcreate.php:181 actions/editapplication.php:233
+#: actions/editgroup.php:200 actions/newapplication.php:211
+#: actions/newgroup.php:147 actions/profilesettings.php:252
+#: actions/register.php:223

 msgid "Homepage is not a valid URL."
 msgstr "A páxina persoal semella que non é unha URL válida."
 
 #. TRANS: Client error in form for group creation.
 msgid "Homepage is not a valid URL."
 msgstr "A páxina persoal semella que non é unha URL válida."
 
 #. TRANS: Client error in form for group creation.

+#. TRANS: Group edit form validation error.
+#. TRANS: Group create form validation error.

 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Validation error in form for profile settings.

-#: actions/apigroupcreate.php:210 actions/editgroup.php:202
-#: actions/newgroup.php:142 actions/profilesettings.php:256
-#: actions/register.php:227
+#: actions/apigroupcreate.php:191 actions/editgroup.php:204
+#: actions/newgroup.php:151 actions/profilesettings.php:256
+#: actions/register.php:226

 #, fuzzy
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "O nome completo é demasiado longo (max 255 car)."
 #, fuzzy
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "O nome completo é demasiado longo (max 255 car)."


@@ -564,10 +614,14 @@ msgstr "O nome completo é demasiado longo (max 255 car)."
 #. TRANS: Client error shown when providing too long a description during group creation.
 #. TRANS: %d is the maximum number of allowed characters.
 #. TRANS: Validation error shown when providing too long a description in the "Edit application" form.
 #. TRANS: Client error shown when providing too long a description during group creation.
 #. TRANS: %d is the maximum number of allowed characters.
 #. TRANS: Validation error shown when providing too long a description in the "Edit application" form.

+#. TRANS: Group edit form validation error.

 #. TRANS: Form validation error in New application form.
 #. TRANS: %d is the maximum number of characters for the description.
 #. TRANS: Form validation error in New application form.
 #. TRANS: %d is the maximum number of characters for the description.

-#: actions/apigroupcreate.php:220 actions/editapplication.php:201
-#: actions/newapplication.php:178
+#. TRANS: Group create form validation error.
+#. TRANS: %d is the maximum number of allowed characters.
+#: actions/apigroupcreate.php:201 actions/editapplication.php:201
+#: actions/editgroup.php:209 actions/newapplication.php:178
+#: actions/newgroup.php:156

 #, fuzzy, php-format
 msgid "Description is too long (maximum %d character)."
 msgid_plural "Description is too long (maximum %d characters)."
 #, fuzzy, php-format
 msgid "Description is too long (maximum %d character)."
 msgid_plural "Description is too long (maximum %d characters)."


@@ -578,17 +632,24 @@ msgstr[3] "O teu Bio é demasiado longo (max %d car.)."
 msgstr[4] "O teu Bio é demasiado longo (max %d car.)."
 
 #. TRANS: Client error shown when providing too long a location during group creation.
 msgstr[4] "O teu Bio é demasiado longo (max %d car.)."
 
 #. TRANS: Client error shown when providing too long a location during group creation.

+#. TRANS: Group edit form validation error.
+#. TRANS: Group create form validation error.

 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Validation error in form for profile settings.

-#: actions/apigroupcreate.php:234 actions/editgroup.php:208
-#: actions/newgroup.php:153 actions/profilesettings.php:269
-#: actions/register.php:236
+#: actions/apigroupcreate.php:215 actions/editgroup.php:216
+#: actions/newgroup.php:163 actions/profilesettings.php:269
+#: actions/register.php:235

 #, fuzzy
 msgid "Location is too long (maximum 255 characters)."
 msgstr "A localización é demasiado longa (max 255 car.)."
 
 #. TRANS: Client error shown when providing too many aliases during group creation.
 #. TRANS: %d is the maximum number of allowed aliases.
 #, fuzzy
 msgid "Location is too long (maximum 255 characters)."
 msgstr "A localización é demasiado longa (max 255 car.)."
 
 #. TRANS: Client error shown when providing too many aliases during group creation.
 #. TRANS: %d is the maximum number of allowed aliases.

-#: actions/apigroupcreate.php:255 actions/newgroup.php:166
+#. TRANS: Group edit form validation error.
+#. TRANS: %d is the maximum number of allowed aliases.
+#. TRANS: Group create form validation error.
+#. TRANS: %d is the maximum number of allowed aliases.
+#: actions/apigroupcreate.php:236 actions/editgroup.php:229
+#: actions/newgroup.php:176

 #, php-format
 msgid "Too many aliases! Maximum %d allowed."
 msgid_plural "Too many aliases! Maximum %d allowed."
 #, php-format
 msgid "Too many aliases! Maximum %d allowed."
 msgid_plural "Too many aliases! Maximum %d allowed."


@@ -600,22 +661,26 @@ msgstr[4] ""
 
 #. TRANS: Client error shown when providing an invalid alias during group creation.
 #. TRANS: %s is the invalid alias.
 
 #. TRANS: Client error shown when providing an invalid alias during group creation.
 #. TRANS: %s is the invalid alias.

-#: actions/apigroupcreate.php:280
+#: actions/apigroupcreate.php:253

 #, fuzzy, php-format
 msgid "Invalid alias: \"%s\"."
 msgstr "Etiqueta inválida: '%s'"
 
 #. TRANS: Client error displayed when trying to use an alias during group creation that is already in use.
 #. TRANS: %s is the alias that is already in use.
 #, fuzzy, php-format
 msgid "Invalid alias: \"%s\"."
 msgstr "Etiqueta inválida: '%s'"
 
 #. TRANS: Client error displayed when trying to use an alias during group creation that is already in use.
 #. TRANS: %s is the alias that is already in use.

-#: actions/apigroupcreate.php:291 actions/editgroup.php:232
-#: actions/newgroup.php:181
+#. TRANS: Group edit form validation error.
+#. TRANS: Group create form validation error.
+#: actions/apigroupcreate.php:264 actions/editgroup.php:244
+#: actions/newgroup.php:191

 #, fuzzy, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr "O alcume xa está sendo empregado por outro usuario. Tenta con outro."
 
 #. TRANS: Client error displayed when trying to use an alias during group creation that is the same as the group's nickname.
 #, fuzzy, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr "O alcume xa está sendo empregado por outro usuario. Tenta con outro."
 
 #. TRANS: Client error displayed when trying to use an alias during group creation that is the same as the group's nickname.

-#: actions/apigroupcreate.php:305 actions/editgroup.php:238
-#: actions/newgroup.php:187
+#. TRANS: Group edit form validation error.
+#. TRANS: Group create form validation error.
+#: actions/apigroupcreate.php:278 actions/editgroup.php:251
+#: actions/newgroup.php:198

 msgid "Alias can't be the same as nickname."
 msgstr ""
 
 msgid "Alias can't be the same as nickname."
 msgstr ""
 


@@ -721,21 +786,21 @@ msgid "Request token already authorized."
 msgstr "Non estás suscrito a ese perfil"
 
 #. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
 msgstr "Non estás suscrito a ese perfil"
 
 #. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.

-#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:270
-#: actions/deletenotice.php:172 actions/disfavor.php:74
-#: actions/emailsettings.php:271 actions/favor.php:75 actions/geocode.php:55
+#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
+#: actions/deletenotice.php:177 actions/disfavor.php:74
+#: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55

 #: actions/groupblock.php:66 actions/grouplogo.php:312
 #: actions/groupblock.php:66 actions/grouplogo.php:312

-#: actions/groupunblock.php:66 actions/imsettings.php:230
+#: actions/groupunblock.php:65 actions/imsettings.php:230

 #: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
 #: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
 #: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
 #: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138

-#: actions/othersettings.php:145 actions/passwordsettings.php:138
+#: actions/othersettings.php:153 actions/passwordsettings.php:138

 #: actions/profilesettings.php:221 actions/recoverpassword.php:350
 #: actions/register.php:172 actions/remotesubscribe.php:77
 #: actions/profilesettings.php:221 actions/recoverpassword.php:350
 #: actions/register.php:172 actions/remotesubscribe.php:77

-#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38
+#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:40

 #: actions/subscribe.php:86 actions/tagother.php:166
 #: actions/unsubscribe.php:69 actions/userauthorization.php:52
 #: actions/subscribe.php:86 actions/tagother.php:166
 #: actions/unsubscribe.php:69 actions/userauthorization.php:52

-#: lib/designsettings.php:294
+#: lib/designsettings.php:310

 msgid "There was a problem with your session token. Try again, please."
 msgstr "Houbo un problema co teu token de sesión. Tentao de novo, anda..."
 
 msgid "There was a problem with your session token. Try again, please."
 msgstr "Houbo un problema co teu token de sesión. Tentao de novo, anda..."
 


@@ -752,17 +817,19 @@ msgid "Database error inserting oauth_token_association."
 msgstr "Erro ó inserir o hashtag na BD: %s"
 
 #. TRANS: Client error given on when invalid data was passed through a form in the OAuth API.
 msgstr "Erro ó inserir o hashtag na BD: %s"
 
 #. TRANS: Client error given on when invalid data was passed through a form in the OAuth API.

+#. TRANS: Unexpected validation error on avatar upload form.

 #. TRANS: Client error displayed submitting invalid form data for edit application.
 #. 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: Client error when submitting a form with unexpected information.
 #. TRANS: Message given submitting a form with an unknown action in SMS settings.
 #. TRANS: Client error displayed submitting invalid form data for edit application.
 #. 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: Client error when submitting a form with unexpected information.
 #. TRANS: Message given submitting a form with an unknown action in SMS settings.

-#: actions/apioauthauthorize.php:294 actions/avatarsettings.php:283
+#. TRANS: Unknown form validation error in design settings form.
+#: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294

 #: actions/designadminpanel.php:104 actions/editapplication.php:144
 #: actions/designadminpanel.php:104 actions/editapplication.php:144

-#: actions/emailsettings.php:290 actions/grouplogo.php:322
+#: actions/emailsettings.php:316 actions/grouplogo.php:322

 #: actions/imsettings.php:245 actions/newapplication.php:125
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
 #: actions/imsettings.php:245 actions/newapplication.php:125
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44

-#: actions/smssettings.php:277 lib/designsettings.php:304
+#: actions/smssettings.php:277 lib/designsettings.php:321

 msgid "Unexpected form submission."
 msgstr "Envio de formulario non esperada."
 
 msgid "Unexpected form submission."
 msgstr "Envio de formulario non esperada."
 


@@ -777,7 +844,7 @@ msgid "Allow or deny access"
 msgstr ""
 
 #. TRANS: User notification of external application requesting account access.
 msgstr ""
 
 #. TRANS: User notification of external application requesting account access.

-#. TRANS: %3$s is the access type requested, %4$s is the StatusNet sitename.
+#. TRANS: %3$s is the access type requested (read-write or read-only), %4$s is the StatusNet sitename.

 #: actions/apioauthauthorize.php:425
 #, php-format
 msgid ""
 #: actions/apioauthauthorize.php:425
 #, php-format
 msgid ""


@@ -806,18 +873,19 @@ msgstr "Sobre"
 
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Field label in form for profile settings.
 
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Field label in form for profile settings.

+#. TRANS: Label for group nickname (dt). Text hidden by default.

 #: actions/apioauthauthorize.php:459 actions/login.php:252
 #: actions/apioauthauthorize.php:459 actions/login.php:252

-#: actions/profilesettings.php:110 actions/register.php:433
-#: actions/showgroup.php:245 actions/tagother.php:94
+#: actions/profilesettings.php:110 actions/register.php:432
+#: actions/showgroup.php:240 actions/tagother.php:94

 #: actions/userauthorization.php:145 lib/groupeditform.php:152
 #: actions/userauthorization.php:145 lib/groupeditform.php:152

-#: lib/userprofile.php:132
+#: lib/userprofile.php:134

 msgid "Nickname"
 msgstr "Alcume"
 
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Link description in user account settings menu.
 #: actions/apioauthauthorize.php:463 actions/login.php:255
 msgid "Nickname"
 msgstr "Alcume"
 
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Link description in user account settings menu.
 #: actions/apioauthauthorize.php:463 actions/login.php:255

-#: actions/register.php:438 lib/accountsettingsaction.php:120
+#: actions/register.php:437 lib/accountsettingsaction.php:120

 msgid "Password"
 msgstr "Contrasinal"
 
 msgid "Password"
 msgstr "Contrasinal"
 


@@ -827,7 +895,7 @@ msgstr "Contrasinal"
 #. TRANS: Button label to cancel an IM address confirmation procedure.
 #. TRANS: Button label to cancel a SMS address confirmation procedure.
 #. TRANS: Button label in the "Edit application" form.
 #. TRANS: Button label to cancel an IM address confirmation procedure.
 #. TRANS: Button label to cancel a SMS address confirmation procedure.
 #. TRANS: Button label in the "Edit application" form.

-#: actions/apioauthauthorize.php:478 actions/emailsettings.php:127
+#: actions/apioauthauthorize.php:478 actions/emailsettings.php:128

 #: actions/imsettings.php:131 actions/smssettings.php:137
 #: lib/applicationeditform.php:351
 #, fuzzy
 #: actions/imsettings.php:131 actions/smssettings.php:137
 #: lib/applicationeditform.php:351
 #, fuzzy


@@ -902,35 +970,65 @@ msgstr "Non deberías eliminar o estado de outro usuario"
 
 #. TRANS: Client error displayed trying to repeat a non-existing notice through the API.
 #. TRANS: Client error displayed trying to display redents of a non-exiting notice.
 
 #. TRANS: Client error displayed trying to repeat a non-existing notice through the API.
 #. TRANS: Client error displayed trying to display redents of a non-exiting notice.

+#. TRANS: Error message displayed trying to delete a non-existing notice.

 #: actions/apistatusesretweet.php:74 actions/apistatusesretweets.php:70
 #: actions/apistatusesretweet.php:74 actions/apistatusesretweets.php:70

-#: actions/deletenotice.php:58 actions/shownotice.php:92
+#: actions/atompubshowfavorite.php:82 actions/deletenotice.php:61
+#: actions/shownotice.php:92

 msgid "No such notice."
 msgstr "Ningún chío."
 
 #. TRANS: Client error displayed trying to repeat an own notice through the API.
 #. TRANS: Error text shown when trying to repeat an own notice.
 msgid "No such notice."
 msgstr "Ningún chío."
 
 #. TRANS: Client error displayed trying to repeat an own notice through the API.
 #. TRANS: Error text shown when trying to repeat an own notice.

-#: actions/apistatusesretweet.php:83 lib/command.php:535
+#: actions/apistatusesretweet.php:83 lib/command.php:537

 #, fuzzy
 msgid "Cannot repeat your own notice."
 msgstr "Non se pode activar a notificación."
 
 #. TRANS: Client error displayed trying to re-repeat a notice through the API.
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
 #, fuzzy
 msgid "Cannot repeat your own notice."
 msgstr "Non se pode activar a notificación."
 
 #. TRANS: Client error displayed trying to re-repeat a notice through the API.
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.

-#: actions/apistatusesretweet.php:92 lib/command.php:541
+#: actions/apistatusesretweet.php:92 lib/command.php:543

 msgid "Already repeated that notice."
 msgstr "Non se pode eliminar este chíos."
 
 msgid "Already repeated that notice."
 msgstr "Non se pode eliminar este chíos."
 

+#. TRANS: Client error shown when using a non-supported HTTP method.
+#: actions/apistatusesshow.php:117 actions/atompubfavoritefeed.php:104
+#: actions/atompubmembershipfeed.php:106 actions/atompubshowfavorite.php:116
+#: actions/atompubshowsubscription.php:122
+#: actions/atompubsubscriptionfeed.php:109
+#, fuzzy
+msgid "HTTP method not supported."
+msgstr "Método da API non atopado"
+
+#: actions/apistatusesshow.php:141
+#, fuzzy, php-format
+msgid "Unsupported format: %s"
+msgstr "Formato de ficheiro de imaxe non soportado."
+

 #. TRANS: Client error displayed requesting a deleted status.
 #. TRANS: Client error displayed requesting a deleted status.

-#: actions/apistatusesshow.php:134
+#: actions/apistatusesshow.php:152

 #, fuzzy
 msgid "Status deleted."
 msgstr "Avatar actualizado."
 
 #. TRANS: Client error displayed requesting a status with an invalid ID.
 #, fuzzy
 msgid "Status deleted."
 msgstr "Avatar actualizado."
 
 #. TRANS: Client error displayed requesting a status with an invalid ID.

-#: actions/apistatusesshow.php:141
+#: actions/apistatusesshow.php:159

 msgid "No status with that ID found."
 msgstr "Non existe ningún estado con esa ID atopada."
 
 msgid "No status with that ID found."
 msgstr "Non existe ningún estado con esa ID atopada."
 

+#: actions/apistatusesshow.php:223
+msgid "Can only delete using the Atom format."
+msgstr ""
+
+#. TRANS: Error message displayed trying to delete a notice that was not made by the current user.
+#: actions/apistatusesshow.php:230 actions/deletenotice.php:78
+msgid "Can't delete this notice."
+msgstr "Non se pode eliminar este chíos."
+
+#: actions/apistatusesshow.php:243
+#, fuzzy, php-format
+msgid "Deleted notice %d"
+msgstr "Eliminar chío"
+

 #. TRANS: Client error displayed when the parameter "status" is missing.
 #: actions/apistatusesupdate.php:221
 msgid "Client must provide a 'status' parameter with a value."
 #. TRANS: Client error displayed when the parameter "status" is missing.
 #: actions/apistatusesupdate.php:221
 msgid "Client must provide a 'status' parameter with a value."


@@ -938,7 +1036,8 @@ msgstr ""
 
 #. TRANS: Client error displayed when the parameter "status" is missing.
 #. TRANS: %d is the maximum number of character for a notice.
 
 #. TRANS: Client error displayed when the parameter "status" is missing.
 #. TRANS: %d is the maximum number of character for a notice.

-#: actions/apistatusesupdate.php:244
+#: actions/apistatusesupdate.php:244 actions/newnotice.php:161
+#: lib/mailhandler.php:60

 #, fuzzy, php-format
 msgid "That's too long. Maximum notice size is %d character."
 msgid_plural "That's too long. Maximum notice size is %d characters."
 #, fuzzy, php-format
 msgid "That's too long. Maximum notice size is %d character."
 msgid_plural "That's too long. Maximum notice size is %d characters."


@@ -956,7 +1055,7 @@ msgstr "Método da API non atopado"
 
 #. TRANS: Client error displayed exceeding the maximum notice length.
 #. TRANS: %d is the maximum lenth for a notice.
 
 #. TRANS: Client error displayed exceeding the maximum notice length.
 #. TRANS: %d is the maximum lenth for a notice.

-#: actions/apistatusesupdate.php:308
+#: actions/apistatusesupdate.php:308 actions/newnotice.php:184

 #, php-format
 msgid "Maximum notice size is %d character, including attachment URL."
 msgid_plural "Maximum notice size is %d characters, including attachment URL."
 #, php-format
 msgid "Maximum notice size is %d character, including attachment URL."
 msgid_plural "Maximum notice size is %d characters, including attachment URL."


@@ -990,7 +1089,7 @@ msgstr "Hai %1$s chíos en resposta a chíos dende %2$s / %3$s."
 
 #. TRANS: Server error displayed when generating an Atom feed fails.
 #. TRANS: %s is the error.
 
 #. TRANS: Server error displayed when generating an Atom feed fails.
 #. TRANS: %s is the error.

-#: actions/apitimelinegroup.php:138
+#: actions/apitimelinegroup.php:134

 #, fuzzy, php-format
 msgid "Could not generate feed for group - %s"
 msgstr "Non se puido actualizar o usuario."
 #, fuzzy, php-format
 msgid "Could not generate feed for group - %s"
 msgstr "Non se puido actualizar o usuario."


@@ -1055,116 +1154,383 @@ msgstr "Chíos tagueados con %s"
 msgid "Updates tagged with %1$s on %2$s!"
 msgstr "Actualizacións dende %1$s en %2$s!"
 
 msgid "Updates tagged with %1$s on %2$s!"
 msgstr "Actualizacións dende %1$s en %2$s!"
 

+#. TRANS: Client error displayed trying to add a notice to another user's timeline.
+#: actions/apitimelineuser.php:297
+#, fuzzy
+msgid "Only the user can add to their own timeline."
+msgstr "Só o usuario pode ler os seus propios buzóns."
+
+#. TRANS: Client error displayed when using another format than AtomPub.
+#: actions/apitimelineuser.php:304
+msgid "Only accept AtomPub for Atom feeds."
+msgstr ""
+
+#: actions/apitimelineuser.php:310
+msgid "Atom post must not be empty."
+msgstr ""
+
+#: actions/apitimelineuser.php:315
+msgid "Atom post must be well-formed XML."
+msgstr ""
+
+#. TRANS: Client error displayed when not using an Atom entry.
+#: actions/apitimelineuser.php:321 actions/atompubfavoritefeed.php:226
+#: actions/atompubmembershipfeed.php:228
+#: actions/atompubsubscriptionfeed.php:233
+msgid "Atom post must be an Atom entry."
+msgstr ""
+
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/apitimelineuser.php:334
+msgid "Can only handle POST activities."
+msgstr ""
+
+#. TRANS: Client error displayed when using an unsupported activity object type.
+#. TRANS: %s is the unsupported activity object type.
+#: actions/apitimelineuser.php:345
+#, php-format
+msgid "Cannot handle activity object type \"%s\"."
+msgstr ""
+
+#. TRANS: Client error displayed when posting a notice without content through the API.
+#: actions/apitimelineuser.php:378
+#, fuzzy, php-format
+msgid "No content for notice %d."
+msgstr "Atopar no contido dos chíos"
+
+#. TRANS: Client error displayed when using another format than AtomPub.
+#: actions/apitimelineuser.php:406
+#, fuzzy, php-format
+msgid "Notice with URI \"%s\" already exists."
+msgstr "Non se atopou un perfil con ese ID."
+
+#: actions/apitimelineuser.php:437
+#, php-format
+msgid "AtomPub post with unknown attention URI %s"
+msgstr ""
+

 #. TRANS: Server error for unfinished API method showTrends.
 #: actions/apitrends.php:85
 msgid "API method under construction."
 msgstr "Método da API en contrución."
 
 #. TRANS: Client error displayed when requesting user information for a non-existing user.
 #. TRANS: Server error for unfinished API method showTrends.
 #: actions/apitrends.php:85
 msgid "API method under construction."
 msgstr "Método da API en contrución."
 
 #. TRANS: Client error displayed when requesting user information for a non-existing user.

-#: actions/apiusershow.php:94
+#: actions/apiuserprofileimage.php:80 actions/apiusershow.php:94

 msgid "User not found."
 msgstr "Método da API non atopado"
 
 msgid "User not found."
 msgstr "Método da API non atopado"
 

+#: actions/atompubfavoritefeed.php:70
+#, fuzzy
+msgid "No such profile"
+msgstr "Ningún chío."
+
+#: actions/atompubfavoritefeed.php:145
+#, php-format
+msgid "Notices %s has favorited to on %s"
+msgstr ""
+
+#: actions/atompubfavoritefeed.php:215 actions/atompubsubscriptionfeed.php:222
+#, fuzzy
+msgid "Can't add someone else's subscription"
+msgstr "Non se puido inserir a nova subscrición."
+
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/atompubfavoritefeed.php:239
+msgid "Can only handle Favorite activities."
+msgstr ""
+
+#: actions/atompubfavoritefeed.php:248 actions/atompubmembershipfeed.php:248
+#, fuzzy
+msgid "Can only fave notices."
+msgstr "Atopar no contido dos chíos"
+
+#: actions/atompubfavoritefeed.php:256
+#, fuzzy
+msgid "Unknown note."
+msgstr "Acción descoñecida"
+
+#: actions/atompubfavoritefeed.php:263
+#, fuzzy
+msgid "Already a favorite."
+msgstr "Engadir a favoritos"
+
+#: actions/atompubmembershipfeed.php:72 actions/atompubshowfavorite.php:76
+#: actions/atompubshowmembership.php:73 actions/subscribe.php:107
+#, fuzzy
+msgid "No such profile."
+msgstr "Ningún chío."
+
+#: actions/atompubmembershipfeed.php:144
+#, fuzzy, php-format
+msgid "%s group memberships"
+msgstr "Non se pode gardar a subscrición."
+
+#: actions/atompubmembershipfeed.php:147
+#, fuzzy, php-format
+msgid "Groups %s is a member of on %s"
+msgstr "%1s non é unha orixe fiable."
+
+#: actions/atompubmembershipfeed.php:217
+msgid "Can't add someone else's membership"
+msgstr ""
+
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/atompubmembershipfeed.php:241
+msgid "Can only handle Join activities."
+msgstr ""
+
+#: actions/atompubmembershipfeed.php:256
+#, fuzzy
+msgid "Unknown group."
+msgstr "Acción descoñecida"
+
+#: actions/atompubmembershipfeed.php:263
+msgid "Already a member."
+msgstr ""
+
+#: actions/atompubmembershipfeed.php:270
+msgid "Blocked by admin."
+msgstr ""
+
+#: actions/atompubshowfavorite.php:89
+#, fuzzy
+msgid "No such favorite."
+msgstr "Ningún chío."
+
+#: actions/atompubshowfavorite.php:151
+#, fuzzy
+msgid "Can't delete someone else's favorite"
+msgstr "Non se puido eliminar o favorito."
+
+#: actions/atompubshowmembership.php:81
+msgid "No such group"
+msgstr "Non existe a etiqueta."
+
+#: actions/atompubshowmembership.php:90
+msgid "Not a member"
+msgstr ""
+
+#: actions/atompubshowmembership.php:115
+#, fuzzy
+msgid "Method not supported"
+msgstr "Método da API non atopado"
+
+#: actions/atompubshowmembership.php:150
+msgid "Can't delete someone else's membership"
+msgstr ""
+
+#. TRANS: Client exception thrown when trying to display a subscription for a non-existing profile ID.
+#. TRANS: %d is the non-existing profile ID number.
+#: actions/atompubshowsubscription.php:72
+#: actions/atompubshowsubscription.php:83
+#: actions/atompubsubscriptionfeed.php:74
+#, fuzzy, php-format
+msgid "No such profile id: %d"
+msgstr "Ningún chío."
+
+#. TRANS: Client exception thrown when trying to display a subscription for a non-subscribed profile ID.
+#. TRANS: %1$d is the non-existing subscriber ID number, $2$d is the ID of the profile that was not subscribed to.
+#: actions/atompubshowsubscription.php:94
+#, fuzzy, php-format
+msgid "Profile %1$d not subscribed to profile %2$d"
+msgstr "Non estás suscrito a ese perfil"
+
+#. TRANS: Client exception thrown when trying to delete a subscription of another user.
+#: actions/atompubshowsubscription.php:157
+#, fuzzy
+msgid "Cannot delete someone else's subscription"
+msgstr "Non se pode gardar a subscrición."
+
+#: actions/atompubsubscriptionfeed.php:150
+#, fuzzy, php-format
+msgid "People %s has subscribed to on %s"
+msgstr "Suscrito a %s"
+
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/atompubsubscriptionfeed.php:246
+msgid "Can only handle Follow activities."
+msgstr ""
+
+#: actions/atompubsubscriptionfeed.php:253
+msgid "Can only follow people."
+msgstr ""
+
+#: actions/atompubsubscriptionfeed.php:262
+#, fuzzy, php-format
+msgid "Unknown profile %s"
+msgstr "tipo de ficheiro non soportado"
+
+#. TRANS: Client error displayed trying to get a non-existing attachment.

 #: actions/attachment.php:73
 msgid "No such attachment."
 msgstr "Non existe a etiqueta."
 
 #: actions/attachment.php:73
 msgid "No such attachment."
 msgstr "Non existe a etiqueta."
 

-#: actions/avatarbynickname.php:59 actions/blockedfromgroup.php:73
-#: actions/editgroup.php:84 actions/groupdesignsettings.php:84
+#. TRANS: Client error displayed trying to get an avatar without providing a nickname.
+#. TRANS: Client error displayed when requesting a list of blocked users for a group without providing a group nickname.
+#. TRANS: Client error displayed trying to edit a group while not proving a nickname for the group to edit.
+#. TRANS: Client error displayed if no nickname argument was given requesting a group page.
+#: actions/avatarbynickname.php:60 actions/blockedfromgroup.php:73
+#: actions/editgroup.php:85 actions/groupdesignsettings.php:84

 #: actions/grouplogo.php:86 actions/groupmembers.php:76
 #: actions/grouplogo.php:86 actions/groupmembers.php:76

-#: actions/grouprss.php:91 actions/showgroup.php:121
+#: actions/grouprss.php:91 actions/showgroup.php:116

 msgid "No nickname."
 msgstr "Sen alcume."
 
 msgid "No nickname."
 msgstr "Sen alcume."
 

-#: actions/avatarbynickname.php:64
+#. TRANS: Client error displayed trying to get an avatar without providing an avatar size.
+#: actions/avatarbynickname.php:66

 msgid "No size."
 msgstr "Sen tamaño."
 
 msgid "No size."
 msgstr "Sen tamaño."
 

-#: actions/avatarbynickname.php:69
+#. TRANS: Client error displayed trying to get an avatar providing an invalid avatar size.
+#: actions/avatarbynickname.php:72

 msgid "Invalid size."
 msgstr "Tamaño inválido."
 
 msgid "Invalid size."
 msgstr "Tamaño inválido."
 

+#. TRANS: Title for avatar upload page.
+#. TRANS: Label for group avatar (dt). Text hidden by default.

 #. TRANS: Link description in user account settings menu.
 #. TRANS: Link description in user account settings menu.

-#: actions/avatarsettings.php:67 actions/showgroup.php:230
+#: actions/avatarsettings.php:66 actions/showgroup.php:224

 #: lib/accountsettingsaction.php:113
 msgid "Avatar"
 msgstr "Avatar"
 
 #: lib/accountsettingsaction.php:113
 msgid "Avatar"
 msgstr "Avatar"
 

+#. TRANS: Instruction for avatar upload page.
+#. TRANS: %s is the maximum file size, for example "500b", "10kB" or "2MB".

 #: actions/avatarsettings.php:78
 #, fuzzy, php-format
 msgid "You can upload your personal avatar. The maximum file size is %s."
 msgstr "Podes actualizar a túa información do perfil persoal aquí"
 
 #: actions/avatarsettings.php:78
 #, fuzzy, php-format
 msgid "You can upload your personal avatar. The maximum file size is %s."
 msgstr "Podes actualizar a túa información do perfil persoal aquí"
 

-#: actions/avatarsettings.php:106 actions/avatarsettings.php:185
+#. TRANS: Server error displayed in avatar upload page when no matching profile can be found for a user.
+#: actions/avatarsettings.php:108 actions/avatarsettings.php:192

 #: actions/grouplogo.php:181 actions/remotesubscribe.php:191
 #: actions/userauthorization.php:72 actions/userrss.php:108
 msgid "User without matching profile."
 msgstr "O usuario non ten perfil."
 
 #: actions/grouplogo.php:181 actions/remotesubscribe.php:191
 #: actions/userauthorization.php:72 actions/userrss.php:108
 msgid "User without matching profile."
 msgstr "O usuario non ten perfil."
 

-#: actions/avatarsettings.php:119 actions/avatarsettings.php:197
+#. TRANS: Avatar upload page form legend.
+#. TRANS: Avatar upload page crop form legend.
+#: actions/avatarsettings.php:122 actions/avatarsettings.php:205

 #: actions/grouplogo.php:254
 msgid "Avatar settings"
 msgstr "Configuración de perfil"
 
 #: actions/grouplogo.php:254
 msgid "Avatar settings"
 msgstr "Configuración de perfil"
 

-#: actions/avatarsettings.php:127 actions/avatarsettings.php:205
+#. TRANS: Header on avatar upload page for thumbnail of originally uploaded avatar (h2).
+#. TRANS: Header on avatar upload crop form for thumbnail of originally uploaded avatar (h2).
+#: actions/avatarsettings.php:131 actions/avatarsettings.php:214

 #: actions/grouplogo.php:202 actions/grouplogo.php:262
 msgid "Original"
 msgstr ""
 
 #: actions/grouplogo.php:202 actions/grouplogo.php:262
 msgid "Original"
 msgstr ""
 

-#: actions/avatarsettings.php:142 actions/avatarsettings.php:217
+#. TRANS: Header on avatar upload page for thumbnail of to be used rendition of uploaded avatar (h2).
+#. TRANS: Header on avatar upload crop form for thumbnail of to be used rendition of uploaded avatar (h2).
+#: actions/avatarsettings.php:147 actions/avatarsettings.php:227

 #: actions/grouplogo.php:213 actions/grouplogo.php:274
 msgid "Preview"
 msgstr ""
 
 #: actions/grouplogo.php:213 actions/grouplogo.php:274
 msgid "Preview"
 msgstr ""
 

-#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deletegroupform.php:121 lib/deleteuserform.php:66
-#: lib/noticelist.php:667
+#. TRANS: Button on avatar upload page to delete current avatar.
+#. TRANS: Button text for user account deletion.
+#: actions/avatarsettings.php:155 actions/deleteaccount.php:319
+#, fuzzy
+msgctxt "BUTTON"

 msgid "Delete"
 msgstr "Eliminar chío"
 
 msgid "Delete"
 msgstr "Eliminar chío"
 

-#: actions/avatarsettings.php:166 actions/grouplogo.php:236
+#. TRANS: Button on avatar upload page to upload an avatar.
+#. TRANS: Submit button to confirm upload of a user backup file for account restore.
+#: actions/avatarsettings.php:173 actions/restoreaccount.php:369
+#, fuzzy
+msgctxt "BUTTON"

 msgid "Upload"
 msgstr "Subir"
 
 msgid "Upload"
 msgstr "Subir"
 

-#: actions/avatarsettings.php:231 actions/grouplogo.php:289
+#. TRANS: Button on avatar upload crop form to confirm a selected crop as avatar.
+#: actions/avatarsettings.php:243
+msgctxt "BUTTON"

 msgid "Crop"
 msgstr ""
 
 msgid "Crop"
 msgstr ""
 

-#: actions/avatarsettings.php:307
+#. TRANS: Validation error on avatar upload form when no file was uploaded.
+#: actions/avatarsettings.php:318

 #, fuzzy
 msgid "No file uploaded."
 msgstr "Non se especificou ningún perfil."
 
 #, fuzzy
 msgid "No file uploaded."
 msgstr "Non se especificou ningún perfil."
 

-#: actions/avatarsettings.php:334
+#. TRANS: Avatar upload form unstruction after uploading a file.
+#: actions/avatarsettings.php:346

 msgid "Pick a square area of the image to be your avatar"
 msgstr ""
 
 msgid "Pick a square area of the image to be your avatar"
 msgstr ""
 

-#: actions/avatarsettings.php:349 actions/grouplogo.php:380
+#. TRANS: Server error displayed if an avatar upload went wrong somehow server side.
+#: actions/avatarsettings.php:361 actions/grouplogo.php:380

 msgid "Lost our file data."
 msgstr ""
 
 msgid "Lost our file data."
 msgstr ""
 

-#: actions/avatarsettings.php:372
+#. TRANS: Success message for having updated a user avatar.
+#: actions/avatarsettings.php:385

 msgid "Avatar updated."
 msgstr "Avatar actualizado."
 
 msgid "Avatar updated."
 msgstr "Avatar actualizado."
 

-#: actions/avatarsettings.php:375
+#. TRANS: Error displayed on the avatar upload page if the avatar could not be updated for an unknown reason.
+#: actions/avatarsettings.php:389

 msgid "Failed updating avatar."
 msgstr "Acounteceu un fallo ó actualizar o avatar."
 
 msgid "Failed updating avatar."
 msgstr "Acounteceu un fallo ó actualizar o avatar."
 

-#: actions/avatarsettings.php:399
+#. TRANS: Success message for deleting a user avatar.
+#: actions/avatarsettings.php:413

 #, fuzzy
 msgid "Avatar deleted."
 msgstr "Avatar actualizado."
 
 #, fuzzy
 msgid "Avatar deleted."
 msgstr "Avatar actualizado."
 

-#: actions/block.php:69
+#: actions/backupaccount.php:62 actions/profilesettings.php:467
+msgid "Backup account"
+msgstr ""
+
+#: actions/backupaccount.php:80
+#, fuzzy
+msgid "Only logged-in users can backup their account."
+msgstr "Só o usuario pode ler os seus propios buzóns."
+
+#: actions/backupaccount.php:84
+msgid "You may not backup your account."
+msgstr ""
+
+#: actions/backupaccount.php:232
+msgid ""
+"You can backup your account data in <a href=\"http://activitystrea.ms/"
+"\">Activity Streams</a> format.  This is an experimental feature and "
+"provides an incomplete backup; private account information like email and IM "
+"addresses is not backed up. Additionally, uploaded files and direct messages "
+"are not backed up."
+msgstr ""
+
+#: actions/backupaccount.php:255
+msgctxt "BUTTON"
+msgid "Backup"
+msgstr ""
+
+#: actions/backupaccount.php:258
+msgid "Backup your account"
+msgstr ""
+
+#. TRANS: Client error displayed when blocking a user that has already been blocked.
+#: actions/block.php:68

 msgid "You already blocked that user."
 msgstr "Xa estas suscrito a estes usuarios:"
 
 msgid "You already blocked that user."
 msgstr "Xa estas suscrito a estes usuarios:"
 

-#: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158
+#. TRANS: Title for block user page.
+#. TRANS: Legend for block user form.
+#: actions/block.php:106 actions/block.php:136 actions/groupblock.php:158

 msgid "Block user"
 msgstr "Bloquear usuario"
 
 msgid "Block user"
 msgstr "Bloquear usuario"
 

-#: actions/block.php:138
+#. TRANS: Explanation of consequences when blocking a user on the block user page.
+#: actions/block.php:139

 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 "
 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 "


@@ -1180,8 +1546,8 @@ msgstr ""
 #. 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.
 #. 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/deletegroup.php:220 actions/deletenotice.php:150
+#: actions/block.php:154 actions/deleteapplication.php:157
+#: actions/deletegroup.php:220 actions/deletenotice.php:155

 #: actions/deleteuser.php:152 actions/groupblock.php:178
 #, fuzzy
 msgctxt "BUTTON"
 #: actions/deleteuser.php:152 actions/groupblock.php:178
 #, fuzzy
 msgctxt "BUTTON"


@@ -1190,7 +1556,7 @@ msgstr "No"
 
 #. TRANS: Submit button title for 'No' when blocking a user.
 #. TRANS: Submit button title for 'No' when deleting a user.
 
 #. TRANS: Submit button title for 'No' when blocking a user.
 #. TRANS: Submit button title for 'No' when deleting a user.

-#: actions/block.php:157 actions/deleteuser.php:156
+#: actions/block.php:158 actions/deleteuser.php:156

 #, fuzzy
 msgid "Do not block this user"
 msgstr "Bloquear usuario"
 #, fuzzy
 msgid "Do not block this user"
 msgstr "Bloquear usuario"


@@ -1201,8 +1567,8 @@ msgstr "Bloquear usuario"
 #. 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.
 #. 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:160 actions/deleteapplication.php:161
-#: actions/deletegroup.php:227 actions/deletenotice.php:157
+#: actions/block.php:161 actions/deleteapplication.php:164
+#: actions/deletegroup.php:227 actions/deletenotice.php:162

 #: actions/deleteuser.php:159 actions/groupblock.php:185
 #, fuzzy
 msgctxt "BUTTON"
 #: actions/deleteuser.php:159 actions/groupblock.php:185
 #, fuzzy
 msgctxt "BUTTON"


@@ -1211,146 +1577,247 @@ msgstr "Si"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
 #. TRANS: Description of the form to block a user.
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
 #. TRANS: Description of the form to block a user.

-#: actions/block.php:164 lib/blockform.php:79
+#: actions/block.php:165 lib/blockform.php:79

 #, fuzzy
 msgid "Block this user"
 msgstr "Bloquear usuario"
 
 #, fuzzy
 msgid "Block this user"
 msgstr "Bloquear usuario"
 

-#: actions/block.php:187
+#. TRANS: Server error displayed when blocking a user fails.
+#: actions/block.php:189

 msgid "Failed to save block information."
 msgstr "Erro ao gardar información de bloqueo."
 
 msgid "Failed to save block information."
 msgstr "Erro ao gardar información de bloqueo."
 

+#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.

 #. TRANS: Client error when trying to delete a non-local group.
 #. TRANS: Client error when trying to delete a non-existing group.
 #. TRANS: Client error when trying to delete a non-local group.
 #. TRANS: Client error when trying to delete a non-existing group.

+#. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
+#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
+#. TRANS: Client error displayed if no local group with a given name was found requesting group page.

 #. TRANS: Command exception text shown when a group is requested that does not exist.
 #. TRANS: Error text shown when trying to leave a group that does not exist.
 #. TRANS: Command exception text shown when a group is requested that does not exist.
 #. TRANS: Error text shown when trying to leave a group that does not exist.

-#: actions/blockedfromgroup.php:80 actions/blockedfromgroup.php:87
+#: actions/blockedfromgroup.php:81 actions/blockedfromgroup.php:89

 #: actions/deletegroup.php:87 actions/deletegroup.php:100
 #: actions/deletegroup.php:87 actions/deletegroup.php:100

-#: actions/editgroup.php:100 actions/foafgroup.php:44 actions/foafgroup.php:62
+#: actions/editgroup.php:102 actions/foafgroup.php:44 actions/foafgroup.php:62

 #: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
 #: actions/groupdesignsettings.php:100 actions/grouplogo.php:102
 #: actions/groupmembers.php:83 actions/groupmembers.php:90
 #: actions/grouprss.php:98 actions/grouprss.php:105
 #: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
 #: actions/groupdesignsettings.php:100 actions/grouplogo.php:102
 #: actions/groupmembers.php:83 actions/groupmembers.php:90
 #: actions/grouprss.php:98 actions/grouprss.php:105

-#: actions/groupunblock.php:86 actions/joingroup.php:82
+#: actions/groupunblock.php:88 actions/joingroup.php:82

 #: actions/joingroup.php:93 actions/leavegroup.php:82
 #: actions/leavegroup.php:93 actions/makeadmin.php:86
 #: actions/joingroup.php:93 actions/leavegroup.php:82
 #: actions/leavegroup.php:93 actions/makeadmin.php:86

-#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:168
+#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168

 #: lib/command.php:380
 #, fuzzy
 msgid "No such group."
 msgstr "Non existe a etiqueta."
 
 #: lib/command.php:380
 #, fuzzy
 msgid "No such group."
 msgstr "Non existe a etiqueta."
 

-#: actions/blockedfromgroup.php:97
+#. TRANS: Title for first page with list of users blocked from a group.
+#. TRANS: %s is a group nickname.
+#: actions/blockedfromgroup.php:101

 #, php-format
 msgid "%s blocked profiles"
 msgstr ""
 
 #, php-format
 msgid "%s blocked profiles"
 msgstr ""
 

-#: actions/blockedfromgroup.php:100
+#. TRANS: Title for any but the first page with list of users blocked from a group.
+#. TRANS: %1$s is a group nickname, %2$d is a page number.
+#: actions/blockedfromgroup.php:106

 #, fuzzy, php-format
 msgid "%1$s blocked profiles, page %2$d"
 msgstr "%s e amigos"
 
 #, fuzzy, php-format
 msgid "%1$s blocked profiles, page %2$d"
 msgstr "%s e amigos"
 

-#: actions/blockedfromgroup.php:115
+#. TRANS: Instructions for list of users blocked from a group.
+#: actions/blockedfromgroup.php:122

 msgid "A list of the users blocked from joining this group."
 msgstr ""
 
 msgid "A list of the users blocked from joining this group."
 msgstr ""
 

-#: actions/blockedfromgroup.php:288
+#. TRANS: Form legend for unblocking a user from a group.
+#: actions/blockedfromgroup.php:291

 #, fuzzy
 msgid "Unblock user from group"
 msgstr "Desbloqueo de usuario fallido."
 
 #, fuzzy
 msgid "Unblock user from group"
 msgstr "Desbloqueo de usuario fallido."
 

-#. TRANS: Title for the form to unblock a user.
-#: actions/blockedfromgroup.php:320 lib/unblockform.php:70
+#. TRANS: Button text for unblocking a user from a group.
+#: actions/blockedfromgroup.php:323
+#, fuzzy
+msgctxt "BUTTON"

 msgid "Unblock"
 msgstr "Desbloquear"
 
 msgid "Unblock"
 msgstr "Desbloquear"
 

+#. TRANS: Tooltip for button for unblocking a user from a group.

 #. TRANS: Description of the form to unblock a user.
 #. TRANS: Description of the form to unblock a user.

-#: actions/blockedfromgroup.php:320 lib/unblockform.php:82
+#: actions/blockedfromgroup.php:327 lib/unblockform.php:78

 #, fuzzy
 msgid "Unblock this user"
 msgstr "Bloquear usuario"
 
 #. TRANS: Title for mini-posting window loaded from bookmarklet.
 #, fuzzy
 msgid "Unblock this user"
 msgstr "Bloquear usuario"
 
 #. TRANS: Title for mini-posting window loaded from bookmarklet.

+#. TRANS: %s is the StatusNet site name.

 #: actions/bookmarklet.php:51
 #, php-format
 msgid "Post to %s"
 msgstr "Replies to %s"
 
 #: actions/bookmarklet.php:51
 #, php-format
 msgid "Post to %s"
 msgstr "Replies to %s"
 

-#: actions/confirmaddress.php:75
+#. TRANS: Client error displayed when not providing a confirmation code in the contact address confirmation action.
+#: actions/confirmaddress.php:74

 msgid "No confirmation code."
 msgstr "Sen código de confirmación."
 
 msgid "No confirmation code."
 msgstr "Sen código de confirmación."
 

+#. TRANS: Client error displayed when providing a non-existing confirmation code in the contact address confirmation action.

 #: actions/confirmaddress.php:80
 msgid "Confirmation code not found."
 msgstr "Confirmation code not found."
 
 #: actions/confirmaddress.php:80
 msgid "Confirmation code not found."
 msgstr "Confirmation code not found."
 

-#: actions/confirmaddress.php:85
+#. TRANS: Client error displayed when not providing a confirmation code for another user in the contact address confirmation action.
+#: actions/confirmaddress.php:86

 msgid "That confirmation code is not for you!"
 msgstr "¡Ese código de confirmación non é para ti!"
 
 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
+#. TRANS: Server error for a unknow address type %s, which can be 'email', 'jabber', or 'sms'.
+#: actions/confirmaddress.php:92

 #, fuzzy, php-format
 msgid "Unrecognized address type %s."
 msgstr "Tipo de enderezo %s non recoñecido"
 
 #, fuzzy, php-format
 msgid "Unrecognized address type %s."
 msgstr "Tipo de enderezo %s non recoñecido"
 

-#. TRANS: Client error for an already confirmed email/jabbel/sms address.
-#: actions/confirmaddress.php:96
+#. TRANS: Client error for an already confirmed email/jabber/sms address.
+#: actions/confirmaddress.php:97

 msgid "That address has already been confirmed."
 msgstr "Esa dirección xa foi confirmada."
 
 msgid "That address has already been confirmed."
 msgstr "Esa dirección xa foi confirmada."
 

+#. TRANS: Server error displayed when a user update to the database fails in the contact address confirmation action.

 #. TRANS: Server error thrown on database error updating e-mail preferences.
 #. TRANS: Server error thrown on database error removing a registered e-mail address.
 #. TRANS: Server error thrown on database error updating IM preferences.
 #. TRANS: Server error thrown on database error removing a registered IM address.
 #. TRANS: Server error thrown on database error updating e-mail preferences.
 #. TRANS: Server error thrown on database error removing a registered e-mail address.
 #. TRANS: Server error thrown on database error updating IM preferences.
 #. TRANS: Server error thrown on database error removing a registered IM address.

+#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.

 #. TRANS: Server error thrown when user profile settings could not be updated.
 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.
 #. TRANS: Server error thrown when user profile settings could not be updated.
 #. 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:331
-#: actions/emailsettings.php:477 actions/imsettings.php:283
-#: actions/imsettings.php:442 actions/othersettings.php:174
+#: actions/confirmaddress.php:118 actions/emailsettings.php:359
+#: actions/emailsettings.php:508 actions/imsettings.php:283
+#: actions/imsettings.php:442 actions/othersettings.php:184

 #: actions/profilesettings.php:326 actions/smssettings.php:308
 #: actions/smssettings.php:464
 msgid "Couldn't update user."
 msgstr "Non se puido actualizar o usuario."
 
 #: actions/profilesettings.php:326 actions/smssettings.php:308
 #: actions/smssettings.php:464
 msgid "Couldn't update user."
 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:437
-#: actions/smssettings.php:422
-msgid "Couldn't delete email confirmation."
+#. TRANS: Server error displayed when an address confirmation code deletion from the
+#. TRANS: database fails in the contact address confirmation action.
+#: actions/confirmaddress.php:132
+#, fuzzy
+msgid "Could not delete address confirmation."

 msgstr "Non se pode eliminar a confirmación de email."
 
 msgstr "Non se pode eliminar a confirmación de email."
 

-#: actions/confirmaddress.php:146
+#. TRANS: Title for the contact address confirmation action.
+#: actions/confirmaddress.php:150

 msgid "Confirm address"
 msgstr "Direccións de correo confirmadas actualmente."
 
 msgid "Confirm address"
 msgstr "Direccións de correo confirmadas actualmente."
 

-#: actions/confirmaddress.php:161
+#. TRANS: Success message for the contact address confirmation action.
+#. TRANS: %s can be 'email', 'jabber', or 'sms'.
+#: actions/confirmaddress.php:166

 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr "A dirección \"%s\" xa foi confirmada para a túa conta."
 
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr "A dirección \"%s\" xa foi confirmada para a túa conta."
 

-#: actions/conversation.php:99
+#. TRANS: Title for page with a conversion (multiple notices in context).
+#: actions/conversation.php:96

 #, fuzzy
 msgid "Conversation"
 msgstr "Código de confirmación."
 
 #, fuzzy
 msgid "Conversation"
 msgstr "Código de confirmación."
 

-#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
+#. TRANS: Header on conversation page. Hidden by default (h2).
+#: actions/conversation.php:149 lib/mailbox.php:116 lib/noticelist.php:87

 #: lib/profileaction.php:229 lib/searchgroupnav.php:82
 msgid "Notices"
 msgstr "Chíos"
 
 #: lib/profileaction.php:229 lib/searchgroupnav.php:82
 msgid "Notices"
 msgstr "Chíos"
 

-#: actions/deleteapplication.php:63
+#. TRANS: Client exception displayed trying to delete a user account while not logged in.
+#: actions/deleteaccount.php:71
+#, fuzzy
+msgid "Only logged-in users can delete their account."
+msgstr "Só o usuario pode ler os seus propios buzóns."
+
+#. TRANS: Client exception displayed trying to delete a user account without have the rights to do that.
+#: actions/deleteaccount.php:77
+#, fuzzy
+msgid "You cannot delete your account."
+msgstr "Non se puido actualizar o usuario."
+
+#. TRANS: Confirmation text for user deletion. The user has to type this exactly the same, including punctuation.
+#: actions/deleteaccount.php:160 actions/deleteaccount.php:297
+msgid "I am sure."
+msgstr ""
+
+#. TRANS: Notification for user about the text that must be input to be able to delete a user account.
+#. TRANS: %s is the text that needs to be input.
+#: actions/deleteaccount.php:164
+#, php-format
+msgid "You must write  \"%s\" exactly in the box."
+msgstr ""
+
+#. TRANS: Confirmation that a user account has been deleted.
+#: actions/deleteaccount.php:206
+#, fuzzy
+msgid "Account deleted."
+msgstr "Avatar actualizado."
+
+#. TRANS: Page title for page on which a user account can be deleted.
+#: actions/deleteaccount.php:228 actions/profilesettings.php:474
+#, fuzzy
+msgid "Delete account"
+msgstr "Crear nova conta"
+
+#. TRANS: Form text for user deletion form.
+#: actions/deleteaccount.php:279
+msgid ""
+"This will <strong>permanently delete</strong> your account data from this "
+"server."
+msgstr ""
+
+#. TRANS: Additional form text for user deletion form shown if a user has account backup rights.
+#. TRANS: %s is a URL to the backup page.
+#: actions/deleteaccount.php:285
+#, php-format
+msgid ""
+"You are strongly advised to <a href=\"%s\">back up your data</a> before "
+"deletion."
+msgstr ""
+
+#. TRANS: Field label for delete account confirmation entry.
+#: actions/deleteaccount.php:300 actions/passwordsettings.php:112
+#: actions/recoverpassword.php:239 actions/register.php:441
+msgid "Confirm"
+msgstr "Confirmar"
+
+#. TRANS: Input title for the delete account field.
+#. TRANS: %s is the text that needs to be input.
+#: actions/deleteaccount.php:304
+#, fuzzy, php-format
+msgid "Enter \"%s\" to confirm that you want to delete your account."
+msgstr "Non se puido actualizar o usuario."
+
+#. TRANS: Button title for user account deletion.
+#: actions/deleteaccount.php:323
+#, fuzzy
+msgid "Permanently delete your account"
+msgstr "Non se puido actualizar o usuario."
+
+#. TRANS: Client error displayed trying to delete an application while not logged in.
+#: actions/deleteapplication.php:62

 #, fuzzy
 msgid "You must be logged in to delete an application."
 msgstr "Debes estar logueado para invitar a outros usuarios a empregar %s"
 
 #, fuzzy
 msgid "You must be logged in to delete an application."
 msgstr "Debes estar logueado para invitar a outros usuarios a empregar %s"
 

+#. TRANS: Client error displayed trying to delete an application that does not exist.

 #: actions/deleteapplication.php:71
 msgid "Application not found."
 msgstr "Confirmation code not found."
 
 #: actions/deleteapplication.php:71
 msgid "Application not found."
 msgstr "Confirmation code not found."
 

+#. TRANS: Client error displayed trying to delete an application the current user does not own.

 #. TRANS: Client error displayed trying to edit an application while not being its owner.
 #. TRANS: Client error displayed trying to edit an application while not being its owner.

-#: actions/deleteapplication.php:78 actions/editapplication.php:78
+#: actions/deleteapplication.php:79 actions/editapplication.php:78

 #: actions/showapplication.php:94
 #, fuzzy
 msgid "You are not the owner of this application."
 #: actions/showapplication.php:94
 #, fuzzy
 msgid "You are not the owner of this application."


@@ -1359,17 +1826,20 @@ msgstr "Non estás suscrito a ese perfil"
 #. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:131
 #: actions/newapplication.php:114 actions/showapplication.php:118
 #. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:131
 #: actions/newapplication.php:114 actions/showapplication.php:118

-#: lib/action.php:1354
+#: lib/action.php:1409

 #, fuzzy
 msgid "There was a problem with your session token."
 msgstr "Houbo un problema co teu token de sesión. Tentao de novo, anda..."
 
 #, fuzzy
 msgid "There was a problem with your session token."
 msgstr "Houbo un problema co teu token de sesión. Tentao de novo, anda..."
 

-#: actions/deleteapplication.php:123 actions/deleteapplication.php:147
+#. TRANS: Title for delete application page.
+#. TRANS: Fieldset legend on delete application page.
+#: actions/deleteapplication.php:124 actions/deleteapplication.php:149

 #, fuzzy
 msgid "Delete application"
 msgstr "Ningún chío."
 
 #, fuzzy
 msgid "Delete application"
 msgstr "Ningún chío."
 

-#: actions/deleteapplication.php:149
+#. TRANS: Confirmation text on delete application page.
+#: actions/deleteapplication.php:152

 msgid ""
 "Are you sure you want to delete this application? This will clear all data "
 "about the application from the database, including all existing user "
 msgid ""
 "Are you sure you want to delete this application? This will clear all data "
 "about the application from the database, including all existing user "


@@ -1377,13 +1847,13 @@ msgid ""
 msgstr ""
 
 #. TRANS: Submit button title for 'No' when deleting an application.
 msgstr ""
 
 #. TRANS: Submit button title for 'No' when deleting an application.

-#: actions/deleteapplication.php:158
+#: actions/deleteapplication.php:161

 #, fuzzy
 msgid "Do not delete this application"
 msgstr "Non se pode eliminar este chíos."
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
 #, fuzzy
 msgid "Do not delete this application"
 msgstr "Non se pode eliminar este chíos."
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.

-#: actions/deleteapplication.php:164
+#: actions/deleteapplication.php:167

 #, fuzzy
 msgid "Delete this application"
 msgstr "Eliminar chío"
 #, fuzzy
 msgid "Delete this application"
 msgstr "Eliminar chío"


@@ -1421,13 +1891,14 @@ msgstr "Non se puido actualizar o usuario."
 msgid "Deleted group %s"
 msgstr "Estado de %1$s en  %2$s"
 
 msgid "Deleted group %s"
 msgstr "Estado de %1$s en  %2$s"
 

-#. TRANS: Title.
+#. TRANS: Title of delete group page.

 #. TRANS: Form legend for deleting a group.
 #: actions/deletegroup.php:176 actions/deletegroup.php:202
 #, fuzzy
 msgid "Delete group"
 msgstr "Eliminar chío"
 
 #. TRANS: Form legend for deleting a group.
 #: actions/deletegroup.php:176 actions/deletegroup.php:202
 #, fuzzy
 msgid "Delete group"
 msgstr "Eliminar chío"
 

+#. TRANS: Warning in form for deleleting a group.

 #: actions/deletegroup.php:206
 msgid ""
 "Are you sure you want to delete this group? This will clear all data about "
 #: actions/deletegroup.php:206
 msgid ""
 "Are you sure you want to delete this group? This will clear all data about "


@@ -1447,22 +1918,22 @@ msgstr "Non se pode eliminar este chíos."
 msgid "Delete this group"
 msgstr "Eliminar chío"
 
 msgid "Delete this group"
 msgstr "Eliminar chío"
 

+#. TRANS: Error message displayed trying to delete a notice while not logged in.
+#. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
+#. TRANS: Client error displayed trying a change a subscription while not logged in.

 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.

-#: actions/deletenotice.php:50 actions/disfavor.php:61 actions/favor.php:62
-#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
+#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
+#: actions/groupblock.php:61 actions/groupunblock.php:60 actions/logout.php:69

 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88

-#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
+#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96

 #: actions/tagother.php:33 actions/unsubscribe.php:52
 #: lib/adminpanelaction.php:71 lib/profileformaction.php:64
 #: lib/settingsaction.php:72
 msgid "Not logged in."
 msgstr "Non está logueado."
 
 #: actions/tagother.php:33 actions/unsubscribe.php:52
 #: lib/adminpanelaction.php:71 lib/profileformaction.php:64
 #: lib/settingsaction.php:72
 msgid "Not logged in."
 msgstr "Non está logueado."
 

-#: actions/deletenotice.php:74
-msgid "Can't delete this notice."
-msgstr "Non se pode eliminar este chíos."
-
-#: actions/deletenotice.php:106
+#. TRANS: Instructions for deleting a notice.
+#: actions/deletenotice.php:110

 #, fuzzy
 msgid ""
 "You are about to permanently delete a notice. Once this is done, it cannot "
 #, fuzzy
 msgid ""
 "You are about to permanently delete a notice. Once this is done, it cannot "


@@ -1471,22 +1942,25 @@ msgstr ""
 "Vas a eliminar permanentemente este chío. Unha vez feito, xa non hai volta "
 "atrás... Quedas avisado!"
 
 "Vas a eliminar permanentemente este chío. Unha vez feito, xa non hai volta "
 "atrás... Quedas avisado!"
 

-#: actions/deletenotice.php:112 actions/deletenotice.php:144
+#. TRANS: Page title when deleting a notice.
+#. TRANS: Fieldset legend for the delete notice form.
+#: actions/deletenotice.php:117 actions/deletenotice.php:148

 msgid "Delete notice"
 msgstr "Eliminar chío"
 
 msgid "Delete notice"
 msgstr "Eliminar chío"
 

-#: actions/deletenotice.php:147
+#. TRANS: Message for the delete notice form.
+#: actions/deletenotice.php:152

 msgid "Are you sure you want to delete this notice?"
 msgstr "Estas seguro que queres eliminar este chío?"
 
 #. TRANS: Submit button title for 'No' when deleting a notice.
 msgid "Are you sure you want to delete this notice?"
 msgstr "Estas seguro que queres eliminar este chío?"
 
 #. TRANS: Submit button title for 'No' when deleting a notice.

-#: actions/deletenotice.php:154
+#: actions/deletenotice.php:159

 #, fuzzy
 msgid "Do not delete this notice"
 msgstr "Non se pode eliminar este chíos."
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
 #, fuzzy
 msgid "Do not delete this notice"
 msgstr "Non se pode eliminar este chíos."
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.

-#: actions/deletenotice.php:161 lib/noticelist.php:667
+#: actions/deletenotice.php:166 lib/noticelist.php:673

 #, fuzzy
 msgid "Delete this notice"
 msgstr "Eliminar chío"
 #, fuzzy
 msgid "Delete this notice"
 msgstr "Eliminar chío"


@@ -1579,12 +2053,14 @@ msgstr "Novo chío"
 msgid "You can upload a custom StatusNet theme as a .ZIP archive."
 msgstr ""
 
 msgid "You can upload a custom StatusNet theme as a .ZIP archive."
 msgstr ""
 

-#: actions/designadminpanel.php:512 lib/designsettings.php:101
+#. TRANS: Fieldset legend on profile design page.
+#: actions/designadminpanel.php:512 lib/designsettings.php:98

 msgid "Change background image"
 msgstr ""
 
 msgid "Change background image"
 msgstr ""
 

+#. TRANS: Label on profile design page for setting a profile page background colour.

 #: actions/designadminpanel.php:517 actions/designadminpanel.php:600
 #: actions/designadminpanel.php:517 actions/designadminpanel.php:600

-#: lib/designsettings.php:178
+#: lib/designsettings.php:183

 msgid "Background"
 msgstr ""
 
 msgid "Background"
 msgstr ""
 


@@ -1596,43 +2072,51 @@ msgid ""
 msgstr "Podes actualizar a túa información do perfil persoal aquí"
 
 #. TRANS: Used as radio button label to add a background image.
 msgstr "Podes actualizar a túa información do perfil persoal aquí"
 
 #. TRANS: Used as radio button label to add a background image.

-#: actions/designadminpanel.php:553 lib/designsettings.php:139
+#: actions/designadminpanel.php:553

 msgid "On"
 msgstr ""
 
 #. TRANS: Used as radio button label to not add a background image.
 msgid "On"
 msgstr ""
 
 #. TRANS: Used as radio button label to not add a background image.

-#: actions/designadminpanel.php:570 lib/designsettings.php:155
+#: actions/designadminpanel.php:570

 msgid "Off"
 msgstr ""
 
 msgid "Off"
 msgstr ""
 

-#: actions/designadminpanel.php:571 lib/designsettings.php:156
+#. TRANS: Form guide for a set of radio buttons on the profile design page that will enable or disable
+#. TRANS: use of the uploaded profile image.
+#: actions/designadminpanel.php:571 lib/designsettings.php:159

 msgid "Turn background image on or off."
 msgstr ""
 
 msgid "Turn background image on or off."
 msgstr ""
 

-#: actions/designadminpanel.php:576 lib/designsettings.php:161
+#. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
+#: actions/designadminpanel.php:576 lib/designsettings.php:165

 msgid "Tile background image"
 msgstr ""
 
 msgid "Tile background image"
 msgstr ""
 

-#: actions/designadminpanel.php:590 lib/designsettings.php:170
+#. TRANS: Fieldset legend on profile design page to change profile page colours.
+#: actions/designadminpanel.php:590 lib/designsettings.php:175

 #, fuzzy
 msgid "Change colours"
 msgstr "Cambiar contrasinal"
 
 #, fuzzy
 msgid "Change colours"
 msgstr "Cambiar contrasinal"
 

-#: actions/designadminpanel.php:613 lib/designsettings.php:191
+#. TRANS: Label on profile design page for setting a profile page content colour.
+#: actions/designadminpanel.php:613 lib/designsettings.php:197

 #, fuzzy
 msgid "Content"
 msgstr "Conectar"
 
 #, fuzzy
 msgid "Content"
 msgstr "Conectar"
 

-#: actions/designadminpanel.php:626 lib/designsettings.php:204
+#. TRANS: Label on profile design page for setting a profile page sidebar colour.
+#: actions/designadminpanel.php:626 lib/designsettings.php:211

 #, fuzzy
 msgid "Sidebar"
 msgstr "Buscar"
 
 #, fuzzy
 msgid "Sidebar"
 msgstr "Buscar"
 

-#: actions/designadminpanel.php:639 lib/designsettings.php:217
+#. TRANS: Label on profile design page for setting a profile page text colour.
+#: actions/designadminpanel.php:639 lib/designsettings.php:225

 msgid "Text"
 msgstr "Texto"
 
 msgid "Text"
 msgstr "Texto"
 

-#: actions/designadminpanel.php:652 lib/designsettings.php:230
+#. TRANS: Label on profile design page for setting a profile page links colour.
+#: actions/designadminpanel.php:652 lib/designsettings.php:239

 msgid "Links"
 msgstr "Inicio de sesión"
 
 msgid "Links"
 msgstr "Inicio de sesión"
 


@@ -1644,29 +2128,31 @@ msgstr ""
 msgid "Custom CSS"
 msgstr ""
 
 msgid "Custom CSS"
 msgstr ""
 

-#: actions/designadminpanel.php:702 lib/designsettings.php:247
+#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
+#: actions/designadminpanel.php:702 lib/designsettings.php:257

 msgid "Use defaults"
 msgstr ""
 
 msgid "Use defaults"
 msgstr ""
 

-#: actions/designadminpanel.php:703 lib/designsettings.php:248
+#. TRANS: Title for button on profile design page to reset all colour settings to default.
+#: actions/designadminpanel.php:703 lib/designsettings.php:259

 msgid "Restore default designs"
 msgstr ""
 
 msgid "Restore default designs"
 msgstr ""
 

-#: actions/designadminpanel.php:709 lib/designsettings.php:254
+#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
+#: actions/designadminpanel.php:709 lib/designsettings.php:267

 msgid "Reset back to default"
 msgstr ""
 
 #. TRANS: Submit button title.
 #: actions/designadminpanel.php:711 actions/licenseadminpanel.php:319
 msgid "Reset back to default"
 msgstr ""
 
 #. TRANS: Submit button title.
 #: actions/designadminpanel.php:711 actions/licenseadminpanel.php:319

-#: actions/othersettings.php:126 actions/sessionsadminpanel.php:199
-#: actions/siteadminpanel.php:292 actions/sitenoticeadminpanel.php:195
+#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292

 #: actions/snapshotadminpanel.php:245 actions/tagother.php:154
 #: actions/snapshotadminpanel.php:245 actions/tagother.php:154

-#: actions/useradminpanel.php:295 lib/applicationeditform.php:357
-#: lib/designsettings.php:256 lib/groupeditform.php:202
+#: lib/applicationeditform.php:357

 msgid "Save"
 msgstr "Gardar"
 
 msgid "Save"
 msgstr "Gardar"
 

-#: actions/designadminpanel.php:712 lib/designsettings.php:257
+#. TRANS: Title for button on profile design page to save settings.
+#: actions/designadminpanel.php:712 lib/designsettings.php:272

 msgid "Save design"
 msgstr ""
 
 msgid "Save design"
 msgstr ""
 


@@ -1716,9 +2202,9 @@ msgid "Name is required."
 msgstr "A mesma contrasinal que arriba. Requerido."
 
 #. TRANS: Validation error shown when providing too long a name in the "Edit application" form.
 msgstr "A mesma contrasinal que arriba. Requerido."
 
 #. TRANS: Validation error shown when providing too long a name in the "Edit application" form.

-#: actions/editapplication.php:188
+#: actions/editapplication.php:188 actions/newapplication.php:169

 #, fuzzy
 #, fuzzy

-msgid "Name is too long (max 255 characters)."
+msgid "Name is too long (maximum 255 characters)."

 msgstr "O nome completo é demasiado longo (max 255 car)."
 
 #. TRANS: Validation error shown when providing a name for an application that already exists in the "Edit application" form.
 msgstr "O nome completo é demasiado longo (max 255 car)."
 
 #. TRANS: Validation error shown when providing a name for an application that already exists in the "Edit application" form.


@@ -1749,7 +2235,7 @@ msgid "Organization is required."
 msgstr ""
 
 #. TRANS: Validation error shown when providing too long an arganisation name in the "Edit application" form.
 msgstr ""
 
 #. TRANS: Validation error shown when providing too long an arganisation name in the "Edit application" form.

-#: actions/editapplication.php:223
+#: actions/editapplication.php:223 actions/newapplication.php:199

 #, fuzzy
 msgid "Organization is too long (maximum 255 characters)."
 msgstr "A localización é demasiado longa (max 255 car.)."
 #, fuzzy
 msgid "Organization is too long (maximum 255 characters)."
 msgstr "A localización é demasiado longa (max 255 car.)."


@@ -1774,53 +2260,53 @@ msgstr ""
 msgid "Could not update application."
 msgstr "Non se puido actualizar o usuario."
 
 msgid "Could not update application."
 msgstr "Non se puido actualizar o usuario."
 

-#: actions/editgroup.php:56
+#. TRANS: Title for form to edit a group. %s is a group nickname.
+#: actions/editgroup.php:55

 #, php-format
 msgid "Edit %s group"
 msgstr ""
 
 #, php-format
 msgid "Edit %s group"
 msgstr ""
 

+#. TRANS: Client error displayed trying to edit a group while not logged in.
+#. TRANS: Client error displayed trying to create a group while not logged in.

 #: actions/editgroup.php:68 actions/grouplogo.php:70 actions/newgroup.php:65
 #, fuzzy
 msgid "You must be logged in to create a group."
 msgstr "Debes estar logueado para invitar a outros usuarios a empregar %s"
 
 #: actions/editgroup.php:68 actions/grouplogo.php:70 actions/newgroup.php:65
 #, fuzzy
 msgid "You must be logged in to create a group."
 msgstr "Debes estar logueado para invitar a outros usuarios a empregar %s"
 

-#: actions/editgroup.php:107 actions/editgroup.php:172
+#. TRANS: Client error displayed trying to edit a group while not being a group admin.
+#: actions/editgroup.php:110 actions/editgroup.php:176

 #: actions/groupdesignsettings.php:107 actions/grouplogo.php:109
 #, fuzzy
 msgid "You must be an admin to edit the group."
 msgstr "Debes estar logueado para invitar a outros usuarios a empregar %s"
 
 #: actions/groupdesignsettings.php:107 actions/grouplogo.php:109
 #, fuzzy
 msgid "You must be an admin to edit the group."
 msgstr "Debes estar logueado para invitar a outros usuarios a empregar %s"
 

-#: actions/editgroup.php:158
+#. TRANS: Form instructions for group edit form.
+#: actions/editgroup.php:161

 msgid "Use this form to edit the group."
 msgstr ""
 
 msgid "Use this form to edit the group."
 msgstr ""
 

-#: actions/editgroup.php:205
-#, php-format
-msgid "Description is too long (max %d chars)."
-msgstr "O teu Bio é demasiado longo (max %d car.)."
-
-#: actions/editgroup.php:219
-#, php-format
-msgid "Too many aliases! Maximum %d."
-msgstr ""
-
-#: actions/editgroup.php:228 actions/newgroup.php:177
+#. TRANS: Group edit form validation error.
+#. TRANS: Group create form validation error.
+#: actions/editgroup.php:239 actions/newgroup.php:186

 #, fuzzy, php-format
 msgid "Invalid alias: \"%s\""
 msgstr "Etiqueta inválida: '%s'"
 
 #, fuzzy, php-format
 msgid "Invalid alias: \"%s\""
 msgstr "Etiqueta inválida: '%s'"
 

-#: actions/editgroup.php:258
+#. TRANS: Server error displayed when editing a group fails.
+#: actions/editgroup.php:272

 #, fuzzy
 msgid "Could not update group."
 msgstr "Non se puido actualizar o usuario."
 
 #, fuzzy
 msgid "Could not update group."
 msgstr "Non se puido actualizar o usuario."
 

+#. TRANS: Server error displayed when group aliases could not be added.

 #. TRANS: Server exception thrown when creating group aliases failed.
 #. TRANS: Server exception thrown when creating group aliases failed.

-#: actions/editgroup.php:264 classes/User_group.php:513
+#: actions/editgroup.php:279 classes/User_group.php:534

 #, fuzzy
 msgid "Could not create aliases."
 msgstr "Non se puido crear o favorito."
 
 #, fuzzy
 msgid "Could not create aliases."
 msgstr "Non se puido crear o favorito."
 

-#: actions/editgroup.php:280
+#. TRANS: Group edit form success message.
+#: actions/editgroup.php:296

 #, fuzzy
 msgid "Options saved."
 msgstr "Configuracións gardadas."
 #, fuzzy
 msgid "Options saved."
 msgstr "Configuracións gardadas."


@@ -1839,13 +2325,13 @@ msgstr "Xestina como recibir correo dende %%site.name%%."
 
 #. TRANS: Form legend for e-mail settings form.
 #. TRANS: Field label for e-mail address input in e-mail settings form.
 
 #. TRANS: Form legend for e-mail settings form.
 #. TRANS: Field label for e-mail address input in e-mail settings form.

-#: actions/emailsettings.php:106 actions/emailsettings.php:132
+#: actions/emailsettings.php:107 actions/emailsettings.php:133

 #, fuzzy
 msgid "Email address"
 msgstr "Enderezos de correo"
 
 #. TRANS: Form note in e-mail settings form.
 #, fuzzy
 msgid "Email address"
 msgstr "Enderezos de correo"
 
 #. TRANS: Form note in e-mail settings form.

-#: actions/emailsettings.php:112
+#: actions/emailsettings.php:113

 msgid "Current confirmed email address."
 msgstr "Direccións de correo confirmadas actualmente."
 
 msgid "Current confirmed email address."
 msgstr "Direccións de correo confirmadas actualmente."
 


@@ -1854,14 +2340,14 @@ 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.
 #. 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:162
+#: actions/emailsettings.php:116 actions/emailsettings.php:183

 #: actions/imsettings.php:116 actions/smssettings.php:124
 #: actions/smssettings.php:180
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "Recuperar"
 
 #: actions/imsettings.php:116 actions/smssettings.php:124
 #: actions/smssettings.php:180
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "Recuperar"
 

-#: actions/emailsettings.php:122
+#: actions/emailsettings.php:123

 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."


@@ -1875,14 +2361,14 @@ msgstr ""
 #. 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.
 #. 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
+#: actions/emailsettings.php:140

 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.
 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:143 actions/imsettings.php:151
+#: actions/emailsettings.php:144 actions/imsettings.php:151

 #: actions/smssettings.php:162
 #, fuzzy
 msgctxt "BUTTON"
 #: actions/smssettings.php:162
 #, fuzzy
 msgctxt "BUTTON"


@@ -1891,113 +2377,120 @@ msgstr "Engadir"
 
 #. TRANS: Form legend for incoming e-mail settings form.
 #. TRANS: Form legend for incoming SMS settings form.
 
 #. 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
+#: actions/emailsettings.php:152 actions/smssettings.php:171

 msgid "Incoming email"
 msgstr "Correo Entrante"
 
 msgid "Incoming email"
 msgstr "Correo Entrante"
 

+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:158
+msgid "I want to post notices by email."
+msgstr "Quero enviar chíos dende o 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.
 #. 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:159 actions/smssettings.php:178
+#: actions/emailsettings.php:180 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."
 
 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 e-mail address input form, when an address has already been assigned.

 #. TRANS: Instructions for incoming SMS e-mail address input form.
 #. TRANS: Instructions for incoming SMS e-mail address input form.

-#: actions/emailsettings.php:168 actions/smssettings.php:186
+#: actions/emailsettings.php:189 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."
 
 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: Instructions for incoming e-mail address input form.
+#: actions/emailsettings.php:193
+msgid ""
+"To send notices via email, we need to create a unique email address for you "
+"on this server:"
+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.
 #. 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:172 actions/smssettings.php:189
+#: actions/emailsettings.php:199 actions/smssettings.php:189

 #, fuzzy
 msgctxt "BUTTON"
 msgid "New"
 msgstr "Novo"
 
 #. TRANS: Form legend for e-mail preferences form.
 #, fuzzy
 msgctxt "BUTTON"
 msgid "New"
 msgstr "Novo"
 
 #. TRANS: Form legend for e-mail preferences form.

-#: actions/emailsettings.php:178
+#: actions/emailsettings.php:208

 msgid "Email preferences"
 msgstr "Enderezos de correo"
 
 #. TRANS: Checkbox label in e-mail preferences form.
 msgid "Email preferences"
 msgstr "Enderezos de correo"
 
 #. TRANS: Checkbox label in e-mail preferences form.

-#: actions/emailsettings.php:184
+#: actions/emailsettings.php:216

 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.
 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:190
+#: actions/emailsettings.php:222

 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.
 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:197
+#: actions/emailsettings.php:229

 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.
 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:203
+#: actions/emailsettings.php:235

 #, fuzzy
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr "Enviarme un email cando alguén me envíe unha mensaxe privada."
 
 #. TRANS: Checkbox label in e-mail preferences form.
 #, fuzzy
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr "Enviarme un email cando alguén me envíe unha mensaxe privada."
 
 #. TRANS: Checkbox label in e-mail preferences form.

-#: actions/emailsettings.php:209
+#: actions/emailsettings.php:241

 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.
 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: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:223
+#: actions/emailsettings.php:247

 msgid "Publish a MicroID for my email address."
 msgstr "Publicar unha MicroID dende a miña dirección de correo."
 
 #. TRANS: Confirmation message for successful e-mail preferences save.
 msgid "Publish a MicroID for my email address."
 msgstr "Publicar unha MicroID dende a miña dirección de correo."
 
 #. TRANS: Confirmation message for successful e-mail preferences save.

-#: actions/emailsettings.php:338
+#: actions/emailsettings.php:368

 #, fuzzy
 msgid "Email preferences saved."
 msgstr "Preferencias gardadas."
 
 #. TRANS: Message given saving e-mail address without having provided one.
 #, fuzzy
 msgid "Email preferences saved."
 msgstr "Preferencias gardadas."
 
 #. TRANS: Message given saving e-mail address without having provided one.

-#: actions/emailsettings.php:357
+#: actions/emailsettings.php:388

 msgid "No email address."
 msgstr "Non se inseriu unha dirección de correo"
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
 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:365
+#: actions/emailsettings.php:396

 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.
 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:370 actions/register.php:208
+#: actions/emailsettings.php:401 actions/register.php:212

 #: 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/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:374
+#: actions/emailsettings.php:405

 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.
 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:378
+#: actions/emailsettings.php:409

 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.
 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:395 actions/imsettings.php:351
+#: actions/emailsettings.php:426 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/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:402
+#: actions/emailsettings.php:433

 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."
 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."


@@ -2009,51 +2502,57 @@ 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.
 #. 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:423 actions/imsettings.php:386
+#: actions/emailsettings.php:454 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 canceling e-mail address confirmation for the wrong e-mail address.
 #: actions/smssettings.php:408
 msgid "No pending confirmation to cancel."
 msgstr "Non hai ningunha confirmación pendente para cancelar."
 
 #. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.

-#: actions/emailsettings.php:428
+#: actions/emailsettings.php:459

 #, fuzzy
 msgid "That is the wrong email address."
 msgstr "Esa é unha enderezo IM incorrecto."
 
 #, fuzzy
 msgid "That is the wrong email address."
 msgstr "Esa é unha enderezo IM incorrecto."
 

+#. 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/emailsettings.php:468 actions/smssettings.php:422
+msgid "Couldn't delete email confirmation."
+msgstr "Non se pode eliminar a confirmación de email."
+

 #. TRANS: Message given after successfully canceling e-mail address confirmation.
 #. TRANS: Message given after successfully canceling e-mail address confirmation.

-#: actions/emailsettings.php:442
+#: actions/emailsettings.php:473

 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.
 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:462
+#: actions/emailsettings.php:493

 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.
 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:483
+#: actions/emailsettings.php:514

 msgid "The email address was removed."
 msgstr "Dirección de correo entrante eliminada."
 
 msgid "The email address was removed."
 msgstr "Dirección de correo entrante eliminada."
 

-#: actions/emailsettings.php:497 actions/smssettings.php:568
+#: actions/emailsettings.php:528 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.
 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:508 actions/emailsettings.php:532
+#: actions/emailsettings.php:540 actions/emailsettings.php:565

 #: 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/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:512 actions/smssettings.php:581
+#: actions/emailsettings.php:544 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.
 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:536 actions/smssettings.php:605
+#: actions/emailsettings.php:569 actions/smssettings.php:605

 msgid "New incoming email address added."
 msgstr "Engadida nova dirección de correo entrante."
 
 msgid "New incoming email address added."
 msgstr "Engadida nova dirección de correo entrante."
 


@@ -2065,7 +2564,7 @@ msgstr "Este chío xa é un favorito!"
 msgid "Disfavor favorite"
 msgstr "Desactivar favorito"
 
 msgid "Disfavor favorite"
 msgstr "Desactivar favorito"
 

-#: actions/favorited.php:65 lib/popularnoticesection.php:91
+#: actions/favorited.php:65 lib/popularnoticesection.php:62

 #: lib/publicgroupnav.php:93
 msgid "Popular notices"
 msgstr "Chíos populares"
 #: lib/publicgroupnav.php:93
 msgid "Popular notices"
 msgstr "Chíos populares"


@@ -2098,7 +2597,7 @@ msgid ""
 msgstr ""
 
 #: actions/favoritesrss.php:111 actions/showfavorites.php:77
 msgstr ""
 
 #: actions/favoritesrss.php:111 actions/showfavorites.php:77

-#: lib/personalgroupnav.php:115
+#: lib/personalgroupnav.php:118

 #, php-format
 msgid "%s's favorite notices"
 msgstr "Chíos favoritos de %s"
 #, php-format
 msgid "%s's favorite notices"
 msgstr "Chíos favoritos de %s"


@@ -2202,19 +2701,23 @@ msgstr "Tes restrinxido o envio de chíos neste sitio."
 msgid "User already has this role."
 msgstr "O usuario non ten perfil."
 
 msgid "User already has this role."
 msgstr "O usuario non ten perfil."
 

+#. TRANS: Client error displayed when trying to unblock a user from a group without providing a profile.
+#. TRANS: Client error displayed trying a change a subscription without providing a profile.

 #: actions/groupblock.php:71 actions/groupunblock.php:71
 #: actions/groupblock.php:71 actions/groupunblock.php:71

-#: actions/makeadmin.php:71 actions/subedit.php:46
+#: actions/makeadmin.php:71 actions/subedit.php:49

 #: lib/profileformaction.php:79
 msgid "No profile specified."
 msgstr "Non se especificou ningún perfil."
 
 #: lib/profileformaction.php:79
 msgid "No profile specified."
 msgstr "Non se especificou ningún perfil."
 

-#: actions/groupblock.php:76 actions/groupunblock.php:76
-#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
+#. TRANS: Client error displayed when trying to unblock a user from a group without providing an existing profile.
+#. TRANS: Client error displayed trying a change a subscription for a non-existant profile ID.
+#: actions/groupblock.php:76 actions/groupunblock.php:77
+#: actions/makeadmin.php:76 actions/subedit.php:57 actions/tagother.php:46

 #: actions/unsubscribe.php:84 lib/profileformaction.php:86
 msgid "No profile with that ID."
 msgstr "Non se atopou un perfil con ese ID."
 
 #: actions/unsubscribe.php:84 lib/profileformaction.php:86
 msgid "No profile with that ID."
 msgstr "Non se atopou un perfil con ese ID."
 

-#: actions/groupblock.php:81 actions/groupunblock.php:81
+#: actions/groupblock.php:81 actions/groupunblock.php:82

 #: actions/makeadmin.php:81
 #, fuzzy
 msgid "No group specified."
 #: actions/makeadmin.php:81
 #, fuzzy
 msgid "No group specified."


@@ -2283,8 +2786,10 @@ msgid ""
 "palette of your choice."
 msgstr ""
 
 "palette of your choice."
 msgstr ""
 

+#. TRANS: Error message displayed if design settings could not be saved.
+#. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".

 #: actions/groupdesignsettings.php:266 actions/userdesignsettings.php:186
 #: actions/groupdesignsettings.php:266 actions/userdesignsettings.php:186

-#: lib/designsettings.php:391 lib/designsettings.php:413
+#: lib/designsettings.php:405 lib/designsettings.php:427

 #, fuzzy
 msgid "Couldn't update your design."
 msgstr "Non se puido actualizar o usuario."
 #, fuzzy
 msgid "Couldn't update your design."
 msgstr "Non se puido actualizar o usuario."


@@ -2304,6 +2809,14 @@ msgid ""
 "You can upload a logo image for your group. The maximum file size is %s."
 msgstr "Podes actualizar a túa información do perfil persoal aquí"
 
 "You can upload a logo image for your group. The maximum file size is %s."
 msgstr "Podes actualizar a túa información do perfil persoal aquí"
 

+#: actions/grouplogo.php:236
+msgid "Upload"
+msgstr "Subir"
+
+#: actions/grouplogo.php:289
+msgid "Crop"
+msgstr ""
+

 #: actions/grouplogo.php:365
 msgid "Pick a square area of the image to be the logo."
 msgstr ""
 #: actions/grouplogo.php:365
 msgid "Pick a square area of the image to be the logo."
 msgstr ""


@@ -2368,15 +2881,6 @@ msgctxt "TOOLTIP"
 msgid "Make this user an admin"
 msgstr ""
 
 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.
-#: actions/grouprss.php:139 actions/userrss.php:94
-#: lib/atomgroupnoticefeed.php:63 lib/atomusernoticefeed.php:68
-#, php-format
-msgid "%s timeline"
-msgstr "Liña de tempo de %s"
-

 #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
 #: actions/grouprss.php:142
 #, fuzzy, php-format
 #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
 #: actions/grouprss.php:142
 #, fuzzy, php-format


@@ -2441,16 +2945,19 @@ msgid ""
 "action.newgroup%%) yourself!"
 msgstr ""
 
 "action.newgroup%%) yourself!"
 msgstr ""
 

-#: actions/groupunblock.php:91
+#. TRANS: Client error displayed when trying to unblock a user from a group without being an administrator for the group.
+#: actions/groupunblock.php:94

 msgid "Only an admin can unblock group members."
 msgstr ""
 
 msgid "Only an admin can unblock group members."
 msgstr ""
 

-#: actions/groupunblock.php:95
+#. TRANS: Client error displayed when trying to unblock a non-blocked user from a group.
+#: actions/groupunblock.php:99

 #, fuzzy
 msgid "User is not blocked from group."
 msgstr "O usuario bloqueoute."
 
 #, fuzzy
 msgid "User is not blocked from group."
 msgstr "O usuario bloqueoute."
 

-#: actions/groupunblock.php:128 actions/unblock.php:86
+#. TRANS: Server error displayed when unblocking a user from a group fails because of an unknown error.
+#: actions/groupunblock.php:131 actions/unblock.php:86

 msgid "Error removing the block."
 msgstr "Acounteceu un erro borrando o bloqueo."
 
 msgid "Error removing the block."
 msgstr "Acounteceu un erro borrando o bloqueo."
 


@@ -2539,7 +3046,7 @@ 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.
 msgstr "Publicar unha MicroID dende a miña dirección de Jabber/GTalk."
 
 #. TRANS: Confirmation message for successful IM preferences save.

-#: actions/imsettings.php:290 actions/othersettings.php:180
+#: actions/imsettings.php:290 actions/othersettings.php:190

 msgid "Preferences saved."
 msgstr "Preferencias gardadas."
 
 msgid "Preferences saved."
 msgstr "Preferencias gardadas."
 


@@ -2667,10 +3174,9 @@ msgstr[4] "Xa estas suscrito a estes usuarios:"
 
 #. TRANS: Used as list item for already subscribed users (%1$s is nickname, %2$s is e-mail address).
 #. TRANS: Used as list item for already registered people (%1$s is nickname, %2$s is e-mail address).
 
 #. TRANS: Used as list item for already subscribed users (%1$s is nickname, %2$s is e-mail address).
 #. TRANS: Used as list item for already registered people (%1$s is nickname, %2$s is e-mail address).

-#. TRANS: Whois output.
-#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: actions/invite.php:145 actions/invite.php:159 lib/command.php:426
-#, php-format
+#: actions/invite.php:145 actions/invite.php:159
+#, fuzzy, php-format
+msgctxt "INVITE"

 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
 
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
 


@@ -2866,8 +3372,9 @@ msgid ""
 msgstr ""
 
 #: actions/licenseadminpanel.php:156
 msgstr ""
 
 #: actions/licenseadminpanel.php:156

-msgid "Invalid license title. Max length is 255 characters."
-msgstr ""
+#, fuzzy
+msgid "Invalid license title. Maximum length is 255 characters."
+msgstr "A localización é demasiado longa (max 255 car.)."

 
 #: actions/licenseadminpanel.php:168
 msgid "Invalid license URL."
 
 #: actions/licenseadminpanel.php:168
 msgid "Invalid license URL."


@@ -2971,11 +3478,11 @@ msgstr "Inicio de sesión"
 msgid "Login to site"
 msgstr ""
 
 msgid "Login to site"
 msgstr ""
 

-#: actions/login.php:258 actions/register.php:492
+#: actions/login.php:258 actions/register.php:491

 msgid "Remember me"
 msgstr "Lembrarme"
 
 msgid "Remember me"
 msgstr "Lembrarme"
 

-#: actions/login.php:259 actions/register.php:494
+#: actions/login.php:259 actions/register.php:493

 msgid "Automatically login in the future; not for shared computers!"
 msgstr "Endiante acceder automáticamente, coidado en equipos compartidos!"
 
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "Endiante acceder automáticamente, coidado en equipos compartidos!"
 


@@ -3044,30 +3551,28 @@ msgstr "Debes estar logueado para invitar a outros usuarios a empregar %s"
 msgid "Use this form to register a new application."
 msgstr ""
 
 msgid "Use this form to register a new application."
 msgstr ""
 

-#: actions/newapplication.php:169
-#, fuzzy
-msgid "Name is too long (maximum 255 chars)."
-msgstr "O nome completo é demasiado longo (max 255 car)."
-

 #: actions/newapplication.php:184
 msgid "Source URL is required."
 msgstr ""
 
 #: actions/newapplication.php:184
 msgid "Source URL is required."
 msgstr ""
 

-#: actions/newapplication.php:199
-#, fuzzy
-msgid "Organization is too long (maximum 255 chars)."
-msgstr "A localización é demasiado longa (max 255 car.)."
-

 #: actions/newapplication.php:266 actions/newapplication.php:275
 #, fuzzy
 msgid "Could not create application."
 msgstr "Non se puido crear o favorito."
 
 #: actions/newapplication.php:266 actions/newapplication.php:275
 #, fuzzy
 msgid "Could not create application."
 msgstr "Non se puido crear o favorito."
 

+#. TRANS: Title for form to create a group.

 #: actions/newgroup.php:53
 msgid "New group"
 msgstr ""
 
 #: actions/newgroup.php:53
 msgid "New group"
 msgstr ""
 

-#: actions/newgroup.php:110
+#. TRANS: Client exception thrown when a user tries to create a group while banned.
+#: actions/newgroup.php:73 classes/User_group.php:485
+#, fuzzy
+msgid "You are not allowed to create groups on this site."
+msgstr "Non estás suscrito a ese perfil"
+
+#. TRANS: Form instructions for group create form.
+#: actions/newgroup.php:117

 msgid "Use this form to create a new group."
 msgstr ""
 
 msgid "Use this form to create a new group."
 msgstr ""
 


@@ -3076,14 +3581,14 @@ msgid "New message"
 msgstr "Nova mensaxe"
 
 #. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
 msgstr "Nova mensaxe"
 
 #. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).

-#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:499
+#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:501

 msgid "You can't send a message to this user."
 msgstr "Non podes enviar mensaxes a este usurio."
 
 #. TRANS: Command exception text shown when trying to send a direct message to another user without content.
 #. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
 #: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:478
 msgid "You can't send a message to this user."
 msgstr "Non podes enviar mensaxes a este usurio."
 
 #. TRANS: Command exception text shown when trying to send a direct message to another user without content.
 #. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
 #: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:478

-#: lib/command.php:579
+#: lib/command.php:581

 msgid "No content!"
 msgstr "Sen contido!"
 
 msgid "No content!"
 msgstr "Sen contido!"
 


@@ -3092,7 +3597,7 @@ msgid "No recipient specified."
 msgstr "Non se especificou ningún destinatario"
 
 #. TRANS: Error text shown when trying to send a direct message to self.
 msgstr "Non se especificou ningún destinatario"
 
 #. TRANS: Error text shown when trying to send a direct message to self.

-#: actions/newmessage.php:167 lib/command.php:503
+#: actions/newmessage.php:167 lib/command.php:505

 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""


@@ -3106,12 +3611,12 @@ msgstr "Non hai mensaxes de texto!"
 
 #. TRANS: Message given have sent a direct message to another user.
 #. TRANS: %s is the name of the other user.
 
 #. TRANS: Message given have sent a direct message to another user.
 #. TRANS: %s is the name of the other user.

-#: actions/newmessage.php:188 lib/command.php:511
+#: actions/newmessage.php:188 lib/command.php:513

 #, fuzzy, php-format
 msgid "Direct message to %s sent."
 msgstr "Mensaxe directo a %s enviado"
 
 #, fuzzy, php-format
 msgid "Direct message to %s sent."
 msgstr "Mensaxe directo a %s enviado"
 

-#: actions/newmessage.php:213 actions/newnotice.php:263
+#: actions/newmessage.php:213 actions/newnotice.php:264

 msgid "Ajax Error"
 msgstr "Erro de Ajax"
 
 msgid "Ajax Error"
 msgstr "Erro de Ajax"
 


@@ -3119,17 +3624,7 @@ msgstr "Erro de Ajax"
 msgid "New notice"
 msgstr "Novo chío"
 
 msgid "New notice"
 msgstr "Novo chío"
 

-#: actions/newnotice.php:159 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/newnotice.php:183
-#, php-format
-msgid "Max notice size is %d chars, including attachment URL."
-msgstr ""
-
-#: actions/newnotice.php:229
+#: actions/newnotice.php:230

 msgid "Notice posted"
 msgstr "Chío publicado"
 
 msgid "Notice posted"
 msgstr "Chío publicado"
 


@@ -3268,26 +3763,26 @@ msgstr ""
 msgid "Notice has no profile."
 msgstr "O usuario non ten perfil."
 
 msgid "Notice has no profile."
 msgstr "O usuario non ten perfil."
 

-#: actions/oembed.php:87 actions/shownotice.php:176
+#: actions/oembed.php:83 actions/shownotice.php:172

 #, php-format
 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')
 #, php-format
 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
+#: actions/oembed.php:168

 #, fuzzy, php-format
 msgid "Content type %s not supported."
 msgstr "Conectar"
 
 #. TRANS: Error message displaying attachments. %s is the site's base URL.
 #, fuzzy, php-format
 msgid "Content type %s not supported."
 msgstr "Conectar"
 
 #. TRANS: Error message displaying attachments. %s is the site's base URL.

-#: actions/oembed.php:163
+#: actions/oembed.php:172

 #, php-format
 msgid "Only %s URLs over plain HTTP please."
 msgstr ""
 
 #. TRANS: Client error on an API request with an unsupported data format.
 #, php-format
 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:1200
-#: lib/apiaction.php:1227 lib/apiaction.php:1356
+#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1206
+#: lib/apiaction.php:1233 lib/apiaction.php:1362

 msgid "Not a supported data format."
 msgstr "Non é un formato de datos soportado."
 
 msgid "Not a supported data format."
 msgstr "Non é un formato de datos soportado."
 


@@ -3299,37 +3794,47 @@ msgstr "Procurar xente"
 msgid "Notice Search"
 msgstr "Procura de Chíos"
 
 msgid "Notice Search"
 msgstr "Procura de Chíos"
 

-#: actions/othersettings.php:60
+#: actions/othersettings.php:59

 msgid "Other settings"
 msgstr "Outras opcions"
 
 msgid "Other settings"
 msgstr "Outras opcions"
 

+#. TRANS: Instructions for tab "Other" in user profile settings.

 #: actions/othersettings.php:71
 msgid "Manage various other options."
 msgstr "Xestionár axustes varios."
 
 #: actions/othersettings.php:71
 msgid "Manage various other options."
 msgstr "Xestionár axustes varios."
 

-#: actions/othersettings.php:108
+#. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
+#. TRANS: user's profile settings. This message has one space at the beginning. Use your
+#. TRANS: language's word separator here if it has one (most likely a single space).
+#: actions/othersettings.php:111

 msgid " (free service)"
 msgstr ""
 
 msgid " (free service)"
 msgstr ""
 

-#: actions/othersettings.php:116
+#. TRANS: Label for dropdown with URL shortener services.
+#: actions/othersettings.php:120

 msgid "Shorten URLs with"
 msgstr ""
 
 msgid "Shorten URLs with"
 msgstr ""
 

-#: actions/othersettings.php:117
+#. TRANS: Tooltip for for dropdown with URL shortener services.
+#: actions/othersettings.php:122

 msgid "Automatic shortening service to use."
 msgstr "Servizo de acortado automático a usar."
 
 msgid "Automatic shortening service to use."
 msgstr "Servizo de acortado automático a usar."
 

-#: actions/othersettings.php:122
+#. TRANS: Label for checkbox.
+#: actions/othersettings.php:128

 #, fuzzy
 msgid "View profile designs"
 msgstr "Configuración de perfil"
 
 #, fuzzy
 msgid "View profile designs"
 msgstr "Configuración de perfil"
 

-#: actions/othersettings.php:123
+#. TRANS: Tooltip for checkbox.
+#: actions/othersettings.php:130

 msgid "Show or hide profile designs."
 msgstr ""
 
 msgid "Show or hide profile designs."
 msgstr ""
 

-#: actions/othersettings.php:153
-msgid "URL shortening service is too long (max 50 chars)."
+#. TRANS: Form validation error for form "Other settings" in user profile.
+#: actions/othersettings.php:162
+#, fuzzy
+msgid "URL shortening service is too long (maximum 50 characters)."

 msgstr "Sistema de acortamento de URLs demasiado longo (max 50 car.)."
 
 #: actions/otp.php:69
 msgstr "Sistema de acortamento de URLs demasiado longo (max 50 car.)."
 
 #: actions/otp.php:69


@@ -3396,11 +3901,6 @@ msgstr "Nova contrasinal"
 msgid "6 or more characters"
 msgstr "6 ou máis caracteres"
 
 msgid "6 or more characters"
 msgstr "6 ou máis caracteres"
 

-#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:442
-msgid "Confirm"
-msgstr "Confirmar"
-

 #: actions/passwordsettings.php:113 actions/recoverpassword.php:240
 msgid "Same as password above"
 msgstr "Igual que a contrasinal de enriba"
 #: actions/passwordsettings.php:113 actions/recoverpassword.php:240
 msgid "Same as password above"
 msgstr "Igual que a contrasinal de enriba"


@@ -3409,11 +3909,11 @@ msgstr "Igual que a contrasinal de enriba"
 msgid "Change"
 msgstr "Modificado"
 
 msgid "Change"
 msgstr "Modificado"
 

-#: actions/passwordsettings.php:154 actions/register.php:239
+#: actions/passwordsettings.php:154 actions/register.php:238

 msgid "Password must be 6 or more characters."
 msgstr "A contrasinal debe ter 6 caracteres ou máis."
 
 msgid "Password must be 6 or more characters."
 msgstr "A contrasinal debe ter 6 caracteres ou máis."
 

-#: actions/passwordsettings.php:157 actions/register.php:242
+#: actions/passwordsettings.php:157 actions/register.php:241

 msgid "Passwords don't match."
 msgstr "As contrasinais non coinciden"
 
 msgid "Passwords don't match."
 msgstr "As contrasinais non coinciden"
 


@@ -3646,7 +4146,7 @@ msgstr ""
 
 #. TRANS: Fieldset legens in Paths admin panel.
 #. TRANS: DT element label in attachment list.
 
 #. TRANS: Fieldset legens in Paths admin panel.
 #. TRANS: DT element label in attachment list.

-#: actions/pathsadminpanel.php:419 lib/attachmentlist.php:85
+#: actions/pathsadminpanel.php:419 lib/attachmentlist.php:99

 msgid "Attachments"
 msgstr ""
 
 msgid "Attachments"
 msgstr ""
 


@@ -3778,15 +4278,16 @@ msgstr ""
 "De 1 a 64 letras minúsculas ou númeors, nin espazos nin signos de puntuación"
 
 #. TRANS: Field label in form for profile settings.
 "De 1 a 64 letras minúsculas ou númeors, nin espazos nin signos de puntuación"
 
 #. TRANS: Field label in form for profile settings.

-#: actions/profilesettings.php:117 actions/register.php:457
-#: actions/showgroup.php:256 actions/tagother.php:104
-#: lib/groupeditform.php:157 lib/userprofile.php:150
+#. TRANS: Label for full group name (dt). Text hidden by default.
+#: actions/profilesettings.php:117 actions/register.php:456
+#: actions/showgroup.php:252 actions/tagother.php:104
+#: lib/groupeditform.php:157 lib/userprofile.php:152

 msgid "Full name"
 msgstr "Nome completo"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
 msgid "Full name"
 msgstr "Nome completo"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.

-#: actions/profilesettings.php:122 actions/register.php:462
+#: actions/profilesettings.php:122 actions/register.php:461

 #: lib/applicationeditform.php:236 lib/groupeditform.php:161
 msgid "Homepage"
 msgstr "Páxina persoal"
 #: lib/applicationeditform.php:236 lib/groupeditform.php:161
 msgid "Homepage"
 msgstr "Páxina persoal"


@@ -3800,7 +4301,7 @@ msgstr "Enderezo da túa páxina persoal, blogue, ou perfil noutro sitio"
 #. TRANS: Tooltip for field label in form for profile settings. Plural
 #. TRANS: is decided by the number of characters available for the
 #. TRANS: biography (%d).
 #. TRANS: Tooltip for field label in form for profile settings. Plural
 #. TRANS: is decided by the number of characters available for the
 #. TRANS: biography (%d).

-#: actions/profilesettings.php:133 actions/register.php:473
+#: actions/profilesettings.php:133 actions/register.php:472

 #, fuzzy, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
 #, fuzzy, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"


@@ -3811,27 +4312,28 @@ msgstr[3] "Contanos un pouco de ti e dos teus intereses en 140 caractéres."
 msgstr[4] "Contanos un pouco de ti e dos teus intereses en 140 caractéres."
 
 #. TRANS: Tooltip for field label in form for profile settings.
 msgstr[4] "Contanos un pouco de ti e dos teus intereses en 140 caractéres."
 
 #. TRANS: Tooltip for field label in form for profile settings.

-#: actions/profilesettings.php:139 actions/register.php:478
+#: actions/profilesettings.php:139 actions/register.php:477

 #, fuzzy
 msgid "Describe yourself and your interests"
 msgstr "Contanos un pouco de ti e dos teus intereses en 140 caractéres."
 
 #. TRANS: Text area label in form for profile settings where users can provide.
 #. TRANS: their biography.
 #, fuzzy
 msgid "Describe yourself and your interests"
 msgstr "Contanos un pouco de ti e dos teus intereses en 140 caractéres."
 
 #. TRANS: Text area label in form for profile settings where users can provide.
 #. TRANS: their biography.

-#: actions/profilesettings.php:143 actions/register.php:480
+#: actions/profilesettings.php:143 actions/register.php:479

 msgid "Bio"
 msgstr "Bio"
 
 #. TRANS: Field label in form for profile settings.
 msgid "Bio"
 msgstr "Bio"
 
 #. TRANS: Field label in form for profile settings.

-#: actions/profilesettings.php:149 actions/register.php:485
-#: actions/showgroup.php:265 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:177
-#: lib/userprofile.php:165
+#. TRANS: Label for group location (dt). Text hidden by default.
+#: actions/profilesettings.php:149 actions/register.php:484
+#: actions/showgroup.php:262 actions/tagother.php:112
+#: actions/userauthorization.php:166 lib/groupeditform.php:180
+#: lib/userprofile.php:167

 msgid "Location"
 msgstr "Localización"
 
 #. TRANS: Tooltip for field label in form for profile settings.
 msgid "Location"
 msgstr "Localización"
 
 #. TRANS: Tooltip for field label in form for profile settings.

-#: actions/profilesettings.php:152 actions/register.php:487
+#: actions/profilesettings.php:152 actions/register.php:486

 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "¿Onde estas, coma \"Cidade, Provincia, País\""
 
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "¿Onde estas, coma \"Cidade, Provincia, País\""
 


@@ -3843,7 +4345,7 @@ msgstr ""
 #. TRANS: Field label in form for profile settings.
 #: actions/profilesettings.php:165 actions/tagother.php:149
 #: actions/tagother.php:209 lib/subscriptionlist.php:106
 #. TRANS: Field label in form for profile settings.
 #: actions/profilesettings.php:165 actions/tagother.php:149
 #: actions/tagother.php:209 lib/subscriptionlist.php:106

-#: lib/subscriptionlist.php:108 lib/userprofile.php:210
+#: lib/subscriptionlist.php:108 lib/userprofile.php:212

 msgid "Tags"
 msgstr "Tags"
 
 msgid "Tags"
 msgstr "Tags"
 


@@ -3886,7 +4388,7 @@ msgstr ""
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Plural form is used based on the maximum number of allowed
 #. TRANS: characters for the biography (%d).
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Plural form is used based on the maximum number of allowed
 #. TRANS: characters for the biography (%d).

-#: actions/profilesettings.php:262 actions/register.php:230
+#: actions/profilesettings.php:262 actions/register.php:229

 #, fuzzy, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
 #, fuzzy, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."


@@ -3942,6 +4444,12 @@ msgstr "Non se puideron gardar as etiquetas."
 msgid "Settings saved."
 msgstr "Configuracións gardadas."
 
 msgid "Settings saved."
 msgstr "Configuracións gardadas."
 

+#. TRANS: Page title for page where a user account can be restored from backup.
+#: actions/profilesettings.php:481 actions/restoreaccount.php:60
+#, fuzzy
+msgid "Restore account"
+msgstr "Crear nova conta"
+

 #: actions/public.php:83
 #, php-format
 msgid "Beyond the page limit (%s)."
 #: actions/public.php:83
 #, php-format
 msgid "Beyond the page limit (%s)."


@@ -4172,14 +4680,15 @@ msgid "Unexpected password reset."
 msgstr "Restauración de contrasinal non esperada."
 
 #: actions/recoverpassword.php:365
 msgstr "Restauración de contrasinal non esperada."
 
 #: actions/recoverpassword.php:365

-msgid "Password must be 6 chars or more."
+#, fuzzy
+msgid "Password must be 6 characters or more."

 msgstr "A contrasinal debe ter 6 caracteres ou máis."
 
 #: actions/recoverpassword.php:369
 msgid "Password and confirmation do not match."
 msgstr "A contrasinal e a súa confirmación non coinciden."
 
 msgstr "A contrasinal debe ter 6 caracteres ou máis."
 
 #: actions/recoverpassword.php:369
 msgid "Password and confirmation do not match."
 msgstr "A contrasinal e a súa confirmación non coinciden."
 

-#: actions/recoverpassword.php:388 actions/register.php:257
+#: actions/recoverpassword.php:388 actions/register.php:256

 msgid "Error setting user."
 msgstr "Acounteceu un erro configurando o usuario."
 
 msgid "Error setting user."
 msgstr "Acounteceu un erro configurando o usuario."
 


@@ -4187,7 +4696,7 @@ msgstr "Acounteceu un erro configurando o usuario."
 msgid "New password successfully saved. You are now logged in."
 msgstr "A nova contrasinal gardouse correctamente. Xa estas logueado."
 
 msgid "New password successfully saved. You are now logged in."
 msgstr "A nova contrasinal gardouse correctamente. Xa estas logueado."
 

-#: actions/register.php:92 actions/register.php:196 actions/register.php:414
+#: actions/register.php:92 actions/register.php:196 actions/register.php:413

 msgid "Sorry, only invited people can register."
 msgstr "Desculpa, só se pode rexistrar a xente con invitación."
 
 msgid "Sorry, only invited people can register."
 msgstr "Desculpa, só se pode rexistrar a xente con invitación."
 


@@ -4200,7 +4709,7 @@ msgstr "Acounteceu un erro co código de confirmación."
 msgid "Registration successful"
 msgstr "Xa estas rexistrado!!"
 
 msgid "Registration successful"
 msgstr "Xa estas rexistrado!!"
 

-#: actions/register.php:121 actions/register.php:513 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:512 lib/logingroupnav.php:85

 msgid "Register"
 msgstr "Rexistrar"
 
 msgid "Register"
 msgstr "Rexistrar"
 


@@ -4208,19 +4717,19 @@ msgstr "Rexistrar"
 msgid "Registration not allowed."
 msgstr "Non se permite o rexistro neste intre."
 
 msgid "Registration not allowed."
 msgstr "Non se permite o rexistro neste intre."
 

-#: actions/register.php:205
+#: actions/register.php:209

 msgid "You can't register if you don't agree to the license."
 msgstr "Non podes rexistrarte se non estas de acordo coa licenza."
 
 msgid "You can't register if you don't agree to the license."
 msgstr "Non podes rexistrarte se non estas de acordo coa licenza."
 

-#: actions/register.php:219
+#: actions/register.php:218

 msgid "Email address already exists."
 msgstr "O enderezo de correo xa existe."
 
 msgid "Email address already exists."
 msgstr "O enderezo de correo xa existe."
 

-#: actions/register.php:252 actions/register.php:274
+#: actions/register.php:251 actions/register.php:273

 msgid "Invalid username or password."
 msgstr "Usuario ou contrasinal inválidos."
 
 msgid "Invalid username or password."
 msgstr "Usuario ou contrasinal inválidos."
 

-#: actions/register.php:352
+#: actions/register.php:351

 #, fuzzy
 msgid ""
 "With this form you can create a new account. You can then post notices and "
 #, fuzzy
 msgid ""
 "With this form you can create a new account. You can then post notices and "


@@ -4230,62 +4739,62 @@ msgstr ""
 "chíos, e suscribirte a amigos. (Tes unha conta [OpenID](http://openid.net/)? "
 "Proba o noso [Rexistro OpenID](%%action.openidlogin%%)!)"
 
 "chíos, e suscribirte a amigos. (Tes unha conta [OpenID](http://openid.net/)? "
 "Proba o noso [Rexistro OpenID](%%action.openidlogin%%)!)"
 

-#: actions/register.php:434
+#: actions/register.php:433

 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
 msgstr ""
 "De 1 a 64 letras minúsculas ou números, nin espazos nin signos de "
 "puntuación. Requerido."
 
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
 msgstr ""
 "De 1 a 64 letras minúsculas ou números, nin espazos nin signos de "
 "puntuación. Requerido."
 

-#: actions/register.php:439
+#: actions/register.php:438

 msgid "6 or more characters. Required."
 msgstr "6 ou máis caracteres. Requerido."
 
 msgid "6 or more characters. Required."
 msgstr "6 ou máis caracteres. Requerido."
 

-#: actions/register.php:443
+#: actions/register.php:442

 msgid "Same as password above. Required."
 msgstr "A mesma contrasinal que arriba. Requerido."
 
 #. TRANS: Link description in user account settings menu.
 msgid "Same as password above. Required."
 msgstr "A mesma contrasinal que arriba. Requerido."
 
 #. TRANS: Link description in user account settings menu.

-#: actions/register.php:447 actions/register.php:451
+#: actions/register.php:446 actions/register.php:450

 #: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
 msgid "Email"
 msgstr "Correo Electrónico"
 
 #: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
 msgid "Email"
 msgstr "Correo Electrónico"
 

-#: actions/register.php:448 actions/register.php:452
+#: actions/register.php:447 actions/register.php:451

 msgid "Used only for updates, announcements, and password recovery"
 msgstr ""
 "Empregado só para actualizacións, novidades, e recuperación de contrasinais"
 
 msgid "Used only for updates, announcements, and password recovery"
 msgstr ""
 "Empregado só para actualizacións, novidades, e recuperación de contrasinais"
 

-#: actions/register.php:459
+#: actions/register.php:458

 msgid "Longer name, preferably your \"real\" name"
 msgstr "Nome máis longo, preferiblemente o teu nome \"real\""
 
 msgid "Longer name, preferably your \"real\" name"
 msgstr "Nome máis longo, preferiblemente o teu nome \"real\""
 

-#: actions/register.php:464
+#: actions/register.php:463

 msgid "URL of your homepage, blog, or profile on another site"
 msgstr "Enderezo da túa páxina persoal, blogue, ou perfil noutro sitio"
 
 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/register.php:525
+#: actions/register.php:524

 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
 msgstr ""
 
 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
 msgstr ""
 

-#: actions/register.php:535
+#: actions/register.php:534

 #, php-format
 msgid "My text and files are copyright by %1$s."
 msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
 #, php-format
 msgid "My text and files are copyright by %1$s."
 msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.

-#: actions/register.php:539
+#: actions/register.php:538

 msgid "My text and files remain under my own copyright."
 msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
 msgid "My text and files remain under my own copyright."
 msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.

-#: actions/register.php:542
+#: actions/register.php:541

 msgid "All rights reserved."
 msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
 msgid "All rights reserved."
 msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.

-#: actions/register.php:547
+#: actions/register.php:546

 #, fuzzy, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
 #, fuzzy, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "


@@ -4294,7 +4803,7 @@ msgstr ""
 " agás esta informción privada: contrasinal, dirección de correo electrónico, "
 "dirección IM, número de teléfono."
 
 " agás esta informción privada: contrasinal, dirección de correo electrónico, "
 "dirección IM, número de teléfono."
 

-#: actions/register.php:590
+#: actions/register.php:589

 #, fuzzy, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
 #, fuzzy, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "


@@ -4326,7 +4835,7 @@ msgstr ""
 "\n"
 "Grazas por rexistrarte e esperamos que laretexes moito."
 
 "\n"
 "Grazas por rexistrarte e esperamos que laretexes moito."
 

-#: actions/register.php:614
+#: actions/register.php:613

 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"


@@ -4372,7 +4881,7 @@ msgid "URL of your profile on another compatible microblogging service"
 msgstr "Enderezo do teu perfil en outro servizo de microblogaxe compatíbel"
 
 #: actions/remotesubscribe.php:137 lib/subscribeform.php:139
 msgstr "Enderezo do teu perfil en outro servizo de microblogaxe compatíbel"
 
 #: actions/remotesubscribe.php:137 lib/subscribeform.php:139

-#: lib/userprofile.php:406
+#: lib/userprofile.php:411

 msgid "Subscribe"
 msgstr "Subscribir"
 
 msgid "Subscribe"
 msgstr "Subscribir"
 


@@ -4414,7 +4923,7 @@ msgstr "Non podes rexistrarte se non estas de acordo coa licenza."
 msgid "You already repeated that notice."
 msgstr "Xa estas suscrito a estes usuarios:"
 
 msgid "You already repeated that notice."
 msgstr "Xa estas suscrito a estes usuarios:"
 

-#: actions/repeat.php:114 lib/noticelist.php:686
+#: actions/repeat.php:114 lib/noticelist.php:692

 msgid "Repeated"
 msgstr "Destacado"
 
 msgid "Repeated"
 msgstr "Destacado"
 


@@ -4424,7 +4933,7 @@ msgid "Repeated!"
 msgstr "Crear"
 
 #: actions/replies.php:126 actions/repliesrss.php:68
 msgstr "Crear"
 
 #: actions/replies.php:126 actions/repliesrss.php:68

-#: lib/personalgroupnav.php:105
+#: lib/personalgroupnav.php:108

 #, php-format
 msgid "Replies to %s"
 msgstr "Replies to %s"
 #, php-format
 msgid "Replies to %s"
 msgstr "Replies to %s"


@@ -4459,21 +4968,107 @@ msgstr ""
 #: actions/replies.php:204
 #, php-format
 msgid ""
 #: actions/replies.php:204
 #, php-format
 msgid ""

-"You can engage other users in a conversation, subscribe to more people or "
-"[join groups](%%action.groups%%)."
+"You can engage other users in a conversation, subscribe to more people or "
+"[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 ""
+
+#: actions/repliesrss.php:72
+#, fuzzy, php-format
+msgid "Replies to %1$s on %2$s!"
+msgstr "Mensaxe de %1$s en %2$s"
+
+#. TRANS: Client exception displayed when trying to restore an account while not logged in.
+#: actions/restoreaccount.php:78
+#, fuzzy
+msgid "Only logged-in users can restore their account."
+msgstr "Só o usuario pode ler os seus propios buzóns."
+
+#. TRANS: Client exception displayed when trying to restore an account without having restore rights.
+#: actions/restoreaccount.php:83
+#, fuzzy
+msgid "You may not restore your account."
+msgstr "Non podes rexistrarte se non estas de acordo coa licenza."
+
+#. TRANS: Client exception displayed trying to restore an account while something went wrong uploading a file.
+#. TRANS: Client exception. No file; probably just a non-AJAX submission.
+#: actions/restoreaccount.php:121 actions/restoreaccount.php:146
+#, fuzzy
+msgid "No uploaded file."
+msgstr "Subir"
+
+#. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
+#: actions/restoreaccount.php:129 lib/mediafile.php:194
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
+msgstr ""
+
+#. TRANS: Client exception.
+#: actions/restoreaccount.php:135 lib/mediafile.php:200
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form."
+msgstr ""
+
+#. TRANS: Client exception.
+#: actions/restoreaccount.php:141 lib/mediafile.php:206
+msgid "The uploaded file was only partially uploaded."
+msgstr ""
+
+#. TRANS: Client exception thrown when a temporary folder is not present to store a file upload.
+#: actions/restoreaccount.php:150 lib/mediafile.php:214
+msgid "Missing a temporary folder."
+msgstr ""
+
+#. TRANS: Client exception thrown when writing to disk is not possible during a file upload operation.
+#: actions/restoreaccount.php:154 lib/mediafile.php:218
+msgid "Failed to write file to disk."
+msgstr ""
+
+#. TRANS: Client exception thrown when a file upload operation has been stopped by an extension.
+#: actions/restoreaccount.php:158 lib/mediafile.php:222
+msgid "File upload stopped by extension."
+msgstr ""
+
+#. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
+#: actions/restoreaccount.php:164 lib/imagefile.php:103 lib/mediafile.php:228
+msgid "System error uploading file."
+msgstr "Aconteceu un erro no sistema namentras se estaba cargando o ficheiro."
+
+#. TRANS: Client exception thrown when a feed is not an Atom feed.
+#: actions/restoreaccount.php:207
+msgid "Not an Atom feed."
+msgstr ""
+
+#. TRANS: Success message when a feed has been restored.
+#: actions/restoreaccount.php:241
+msgid ""
+"Feed has been restored. Your old posts should now appear in search and your "
+"profile page."

 msgstr ""
 
 msgstr ""
 

-#: actions/replies.php:206
-#, php-format
+#. TRANS: Message when a feed restore is in progress.
+#: actions/restoreaccount.php:245
+msgid "Feed will be restored. Please wait a few minutes for results."
+msgstr ""
+
+#. TRANS: Form instructions for feed restore.
+#: actions/restoreaccount.php:342

 msgid ""
 msgid ""

-"You can try to [nudge %1$s](../%2$s) or [post something to them](%%%%action."
-"newnotice%%%%?status_textarea=%3$s)."
+"You can upload a backed-up stream in <a href=\"http://activitystrea.ms/"
+"\">Activity Streams</a> format."

 msgstr ""
 
 msgstr ""
 

-#: actions/repliesrss.php:72
-#, fuzzy, php-format
-msgid "Replies to %1$s on %2$s!"
-msgstr "Mensaxe de %1$s en %2$s"
+#. TRANS: Title for submit button to confirm upload of a user backup file for account restore.
+#: actions/restoreaccount.php:373
+#, fuzzy
+msgid "Upload the file"
+msgstr "Subir"

 
 #: actions/revokerole.php:75
 msgid "You cannot revoke user roles on this site."
 
 #: actions/revokerole.php:75
 msgid "You cannot revoke user roles on this site."


@@ -4558,12 +5153,13 @@ msgstr "Invitación(s) enviada(s)."
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200

-#: lib/applicationeditform.php:208 lib/groupeditform.php:172
+#: lib/applicationeditform.php:208 lib/groupeditform.php:175

 #, fuzzy
 msgid "Description"
 msgstr "Subscricións"
 
 #, fuzzy
 msgid "Description"
 msgstr "Subscricións"
 

-#: actions/showapplication.php:192 actions/showgroup.php:442
+#. TRANS: Header for group statistics on a group page (h2).
+#: actions/showapplication.php:192 actions/showgroup.php:448

 #: lib/profileaction.php:187
 msgid "Statistics"
 msgstr "Estatísticas"
 #: lib/profileaction.php:187
 msgid "Statistics"
 msgstr "Estatísticas"


@@ -4581,6 +5177,11 @@ msgstr ""
 msgid "Reset key & secret"
 msgstr ""
 
 msgid "Reset key & secret"
 msgstr ""
 

+#: actions/showapplication.php:252 lib/deletegroupform.php:121
+#: lib/deleteuserform.php:66 lib/noticelist.php:673
+msgid "Delete"
+msgstr "Eliminar chío"
+

 #: actions/showapplication.php:261
 msgid "Application info"
 msgstr ""
 #: actions/showapplication.php:261
 msgid "Application info"
 msgstr ""


@@ -4665,81 +5266,110 @@ msgstr ""
 msgid "This is a way to share what you like."
 msgstr ""
 
 msgid "This is a way to share what you like."
 msgstr ""
 

-#: actions/showgroup.php:82
+#. TRANS: Page title for first group page. %s is a group name.
+#: actions/showgroup.php:75

 #, php-format
 msgid "%s group"
 msgstr ""
 
 #, php-format
 msgid "%s group"
 msgstr ""
 

-#: actions/showgroup.php:84
+#. TRANS: Page title for any but first group page.
+#. TRANS: %1$s is a group name, $2$s is a page number.
+#: actions/showgroup.php:79

 #, fuzzy, php-format
 msgid "%1$s group, page %2$d"
 msgstr "Tódalas subscricións"
 
 #, fuzzy, php-format
 msgid "%1$s group, page %2$d"
 msgstr "Tódalas subscricións"
 

-#: actions/showgroup.php:227
+#. TRANS: Group profile header (h2). Text hidden by default.
+#: actions/showgroup.php:220

 msgid "Group profile"
 msgstr "O usuario non ten perfil."
 
 msgid "Group profile"
 msgstr "O usuario non ten perfil."
 

-#: actions/showgroup.php:272 actions/tagother.php:118
-#: actions/userauthorization.php:175 lib/userprofile.php:178
+#. TRANS: Label for group URL (dt). Text hidden by default.
+#: actions/showgroup.php:270 actions/tagother.php:118
+#: actions/userauthorization.php:175 lib/userprofile.php:180

 msgid "URL"
 msgstr ""
 
 msgid "URL"
 msgstr ""
 

-#: actions/showgroup.php:283 actions/tagother.php:128
-#: actions/userauthorization.php:187 lib/userprofile.php:195
+#. TRANS: Label for group description or group note (dt). Text hidden by default.
+#: actions/showgroup.php:282 actions/tagother.php:128
+#: actions/userauthorization.php:187 lib/userprofile.php:197

 #, fuzzy
 msgid "Note"
 msgstr "Chíos"
 
 #, fuzzy
 msgid "Note"
 msgstr "Chíos"
 

-#: actions/showgroup.php:293 lib/groupeditform.php:184
+#. TRANS: Label for group aliases (dt). Text hidden by default.
+#: actions/showgroup.php:293 lib/groupeditform.php:187

 msgid "Aliases"
 msgstr ""
 
 msgid "Aliases"
 msgstr ""
 

-#: actions/showgroup.php:302
+#. TRANS: Group actions header (h2). Text hidden by default.
+#: actions/showgroup.php:304

 #, fuzzy
 msgid "Group actions"
 msgstr "Outras opcions"
 
 #, fuzzy
 msgid "Group actions"
 msgstr "Outras opcions"
 

-#: actions/showgroup.php:344
+#. TRANS: Tooltip for feed link. %s is a group nickname.
+#: actions/showgroup.php:345

 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
 msgstr "Fonte para os amigos de %s"
 
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
 msgstr "Fonte para os amigos de %s"
 

-#: actions/showgroup.php:350
+#. TRANS: Tooltip for feed link. %s is a group nickname.
+#: actions/showgroup.php:352

 #, php-format
 msgid "Notice feed for %s group (RSS 2.0)"
 msgstr "Fonte para os amigos de %s"
 
 #, php-format
 msgid "Notice feed for %s group (RSS 2.0)"
 msgstr "Fonte para os amigos de %s"
 

-#: actions/showgroup.php:356
+#. TRANS: Tooltip for feed link. %s is a group nickname.
+#: actions/showgroup.php:359

 #, fuzzy, php-format
 msgid "Notice feed for %s group (Atom)"
 msgstr "Fonte de chíos para %s"
 
 #, fuzzy, php-format
 msgid "Notice feed for %s group (Atom)"
 msgstr "Fonte de chíos para %s"
 

-#: actions/showgroup.php:361
+#. TRANS: Tooltip for feed link. %s is a group nickname.
+#: actions/showgroup.php:365

 #, fuzzy, php-format
 msgid "FOAF for %s group"
 msgstr "Band. Saída para %s"
 
 #, fuzzy, php-format
 msgid "FOAF for %s group"
 msgstr "Band. Saída para %s"
 

-#: actions/showgroup.php:399 actions/showgroup.php:451
+#. TRANS: Header for mini list of group members on a group page (h2).
+#: actions/showgroup.php:402

 #, fuzzy
 msgid "Members"
 msgstr "Membro dende"
 
 #, fuzzy
 msgid "Members"
 msgstr "Membro dende"
 

-#: actions/showgroup.php:404 lib/profileaction.php:117
+#. TRANS: Description for mini list of group members on a group page when the group has no members.
+#: actions/showgroup.php:408 lib/profileaction.php:117

 #: lib/profileaction.php:152 lib/profileaction.php:255 lib/section.php:95
 #: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71
 #, fuzzy
 msgid "(None)"
 msgstr "(nada)"
 
 #: lib/profileaction.php:152 lib/profileaction.php:255 lib/section.php:95
 #: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71
 #, fuzzy
 msgid "(None)"
 msgstr "(nada)"
 

-#: actions/showgroup.php:410
+#. TRANS: Link to all group members from mini list of group members if group has more than n members.
+#: actions/showgroup.php:417

 msgid "All members"
 msgstr ""
 
 msgid "All members"
 msgstr ""
 

-#: actions/showgroup.php:445
+#. TRANS: Label for creation date in statistics on group page.
+#: actions/showgroup.php:453
+#, fuzzy
+msgctxt "LABEL"

 msgid "Created"
 msgstr "Destacado"
 
 msgid "Created"
 msgstr "Destacado"
 

+#. TRANS: Label for member count in statistics on group page.

 #: actions/showgroup.php:461
 #: actions/showgroup.php:461

+#, fuzzy
+msgctxt "LABEL"
+msgid "Members"
+msgstr "Membro dende"
+
+#. TRANS: Notice on group pages for anonymous users for StatusNet sites that accept new registrations.
+#. TRANS: **%s** is the group alias, %%%%site.name%%%% is the site name,
+#. TRANS: %%%%action.register%%%% is the URL for registration, %%%%doc.help%%%% is a URL to help.
+#. TRANS: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
+#: actions/showgroup.php:476

 #, fuzzy, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
 #, fuzzy, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."


@@ -4753,7 +5383,10 @@ msgstr ""
 "(http://status.net/). [Únete agora](%%action.register%%) para compartir "
 "chíos cos teus amigos, colegas e familia! ([Ler mais](%%doc.help%%))"
 
 "(http://status.net/). [Únete agora](%%action.register%%) para compartir "
 "chíos cos teus amigos, colegas e familia! ([Ler mais](%%doc.help%%))"
 

-#: actions/showgroup.php:467
+#. TRANS: Notice on group pages for anonymous users for StatusNet sites that accept no new registrations.
+#. TRANS: **%s** is the group alias, %%%%site.name%%%% is the site name,
+#. TRANS: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
+#: actions/showgroup.php:486

 #, fuzzy, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
 #, fuzzy, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."


@@ -4766,24 +5399,31 @@ msgstr ""
 "(http://status.net/). [Únete agora](%%action.register%%) para compartir "
 "chíos cos teus amigos, colegas e familia! ([Ler mais](%%doc.help%%))"
 
 "(http://status.net/). [Únete agora](%%action.register%%) para compartir "
 "chíos cos teus amigos, colegas e familia! ([Ler mais](%%doc.help%%))"
 

-#: actions/showgroup.php:495
+#. TRANS: Header for list of group administrators on a group page (h2).
+#: actions/showgroup.php:515

 msgid "Admins"
 msgstr ""
 
 msgid "Admins"
 msgstr ""
 

-#: actions/showmessage.php:81
+#. TRANS: Client error displayed requesting a single message that does not exist.
+#: actions/showmessage.php:79

 msgid "No such message."
 msgstr "Non existe a mensaxe."
 
 msgid "No such message."
 msgstr "Non existe a mensaxe."
 

-#: actions/showmessage.php:98
+#. TRANS: Client error displayed requesting a single direct message the requesting user was not a party in.
+#: actions/showmessage.php:97

 msgid "Only the sender and recipient may read this message."
 msgstr "Só o emisor e destinatario poden ler esta mensaxe."
 
 msgid "Only the sender and recipient may read this message."
 msgstr "Só o emisor e destinatario poden ler esta mensaxe."
 

-#: actions/showmessage.php:108
+#. TRANS: Page title for single direct message display when viewing user is the sender.
+#. TRANS: %1$s is the addressed user's nickname, $2$s is a timestamp.
+#: actions/showmessage.php:110

 #, php-format
 msgid "Message to %1$s on %2$s"
 msgstr "Mensaxe de %1$s en %2$s"
 
 #, php-format
 msgid "Message to %1$s on %2$s"
 msgstr "Mensaxe de %1$s en %2$s"
 

-#: actions/showmessage.php:113
+#. TRANS: Page title for single message display.
+#. TRANS: %1$s is the sending user's nickname, $2$s is a timestamp.
+#: actions/showmessage.php:118

 #, php-format
 msgid "Message from %1$s on %2$s"
 msgstr "Mensaxe dende %1$s en %2$s"
 #, php-format
 msgid "Message from %1$s on %2$s"
 msgstr "Mensaxe dende %1$s en %2$s"


@@ -4793,60 +5433,84 @@ msgstr "Mensaxe dende %1$s en %2$s"
 msgid "Notice deleted."
 msgstr "Chío publicado"
 
 msgid "Notice deleted."
 msgstr "Chío publicado"
 

-#: actions/showstream.php:72
+#. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
+#: actions/showstream.php:70

 #, fuzzy, php-format
 #, fuzzy, php-format

-msgid " tagged %s"
+msgid "%1$s tagged %2$s"
+msgstr "%1$s (%2$s)"
+
+#. TRANS: Page title showing tagged notices in one user's stream.
+#. TRANS: %1$s is the username, %2$s is the hash tag, %1$d is the page number.
+#: actions/showstream.php:74
+#, fuzzy, php-format
+msgid "%1$s tagged %2$s, page %3$d"

 msgstr "Chíos tagueados con %s"
 
 msgstr "Chíos tagueados con %s"
 

-#: actions/showstream.php:78
+#. TRANS: Extended page title showing tagged notices in one user's stream.
+#. TRANS: %1$s is the username, %2$d is the page number.
+#: actions/showstream.php:82

 #, php-format
 msgid "%1$s, page %2$d"
 msgstr "%1$s (%2$s)"
 
 #, php-format
 msgid "%1$s, page %2$d"
 msgstr "%1$s (%2$s)"
 

-#: actions/showstream.php:120
+#. TRANS: Title for link to notice feed.
+#. TRANS: %1$s is a user nickname, %2$s is a hashtag.
+#: actions/showstream.php:127

 #, php-format
 msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
 msgstr "Fonte para os amigos de %s"
 
 #, php-format
 msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
 msgstr "Fonte para os amigos de %s"
 

-#: actions/showstream.php:127
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#: actions/showstream.php:136

 #, php-format
 msgid "Notice feed for %s (RSS 1.0)"
 msgstr "Fonte para os amigos de %s"
 
 #, php-format
 msgid "Notice feed for %s (RSS 1.0)"
 msgstr "Fonte para os amigos de %s"
 

-#: actions/showstream.php:134
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#: actions/showstream.php:145

 #, php-format
 msgid "Notice feed for %s (RSS 2.0)"
 msgstr "Fonte para os amigos de %s"
 
 #, php-format
 msgid "Notice feed for %s (RSS 2.0)"
 msgstr "Fonte para os amigos de %s"
 

-#: actions/showstream.php:141
+#: actions/showstream.php:152

 #, php-format
 msgid "Notice feed for %s (Atom)"
 msgstr "Fonte para os amigos de %s"
 
 #, php-format
 msgid "Notice feed for %s (Atom)"
 msgstr "Fonte para os amigos de %s"
 

-#: actions/showstream.php:146
+#. TRANS: Title for link to notice feed. FOAF stands for Friend of a Friend.
+#. TRANS: More information at http://www.foaf-project.org. %s is a user nickname.
+#: actions/showstream.php:159

 #, fuzzy, php-format
 msgid "FOAF for %s"
 msgstr "Band. Saída para %s"
 
 #, fuzzy, php-format
 msgid "FOAF for %s"
 msgstr "Band. Saída para %s"
 

-#: actions/showstream.php:197
+#. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
+#: actions/showstream.php:211

 #, php-format
 #, php-format

-msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet."
+msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."

 msgstr ""
 
 msgstr ""
 

-#: actions/showstream.php:202
+#. TRANS: Second sentence of empty list message for a stream for the user themselves.
+#: actions/showstream.php:217

 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
 msgstr ""
 
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
 msgstr ""
 

-#: actions/showstream.php:204
+#. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/showstream.php:221

 #, php-format
 msgid ""
 "You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
 "%?status_textarea=%2$s)."
 msgstr ""
 
 #, 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
+#. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/showstream.php:264

 #, fuzzy, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
 #, fuzzy, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."


@@ -4859,7 +5523,9 @@ msgstr ""
 "(http://status.net/). [Únete agora](%%action.register%%) para compartir "
 "chíos cos teus amigos, colegas e familia! ([Ler mais](%%doc.help%%))"
 
 "(http://status.net/). [Únete agora](%%action.register%%) para compartir "
 "chíos cos teus amigos, colegas e familia! ([Ler mais](%%doc.help%%))"
 

-#: actions/showstream.php:248
+#. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/showstream.php:271

 #, fuzzy, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
 #, fuzzy, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."


@@ -4871,7 +5537,8 @@ msgstr ""
 "(http://status.net/). [Únete agora](%%action.register%%) para compartir "
 "chíos cos teus amigos, colegas e familia! ([Ler mais](%%doc.help%%))"
 
 "(http://status.net/). [Únete agora](%%action.register%%) para compartir "
 "chíos cos teus amigos, colegas e familia! ([Ler mais](%%doc.help%%))"
 

-#: actions/showstream.php:305
+#. TRANS: Link to the author of a repeated notice. %s is a linked nickname.
+#: actions/showstream.php:328

 #, fuzzy, php-format
 msgid "Repeat of %s"
 msgstr "Replies to %s"
 #, fuzzy, php-format
 msgid "Repeat of %s"
 msgstr "Replies to %s"


@@ -4987,33 +5654,40 @@ msgstr ""
 msgid "How long users must wait (in seconds) to post the same thing again."
 msgstr ""
 
 msgid "How long users must wait (in seconds) to post the same thing again."
 msgstr ""
 

-#: actions/sitenoticeadminpanel.php:56
+#. TRANS: Page title for site-wide notice tab in admin panel.
+#: actions/sitenoticeadminpanel.php:55

 msgid "Site Notice"
 msgstr "Chíos"
 
 msgid "Site Notice"
 msgstr "Chíos"
 

-#: actions/sitenoticeadminpanel.php:67
+#. TRANS: Instructions for site-wide notice tab in admin panel.
+#: actions/sitenoticeadminpanel.php:66

 #, fuzzy
 msgid "Edit site-wide message"
 msgstr "Nova mensaxe"
 
 #, fuzzy
 msgid "Edit site-wide message"
 msgstr "Nova mensaxe"
 

-#: actions/sitenoticeadminpanel.php:103
+#. TRANS: Server error displayed when saving a site-wide notice was impossible.
+#: actions/sitenoticeadminpanel.php:101

 #, fuzzy
 msgid "Unable to save site notice."
 msgstr "Non se puideron gardar os teus axustes de Twitter!"
 
 #, fuzzy
 msgid "Unable to save site notice."
 msgstr "Non se puideron gardar os teus axustes de Twitter!"
 

-#: actions/sitenoticeadminpanel.php:113
-msgid "Max length for the site-wide notice is 255 chars."
+#. TRANS: Client error displayed when a site-wide notice was longer than allowed.
+#: actions/sitenoticeadminpanel.php:112
+msgid "Maximum length for the site-wide notice is 255 characters."

 msgstr ""
 
 msgstr ""
 

+#. TRANS: Label for site-wide notice text field in admin panel.

 #: actions/sitenoticeadminpanel.php:176
 msgid "Site notice text"
 msgstr "Eliminar chío"
 
 #: actions/sitenoticeadminpanel.php:176
 msgid "Site notice text"
 msgstr "Eliminar chío"
 

-#: actions/sitenoticeadminpanel.php:178
-msgid "Site-wide notice text (255 chars max; HTML okay)"
+#. TRANS: Tooltip for site-wide notice text field in admin panel.
+#: actions/sitenoticeadminpanel.php:179
+msgid "Site-wide notice text (255 characters maximum; HTML allowed)"

 msgstr ""
 
 msgstr ""
 

-#: actions/sitenoticeadminpanel.php:198
+#. TRANS: Title for button to save site notice in admin panel.
+#: actions/sitenoticeadminpanel.php:201

 msgid "Save site notice"
 msgstr "Eliminar chío"
 
 msgid "Save site notice"
 msgstr "Eliminar chío"
 


@@ -5234,12 +5908,14 @@ msgstr ""
 msgid "Save snapshot settings"
 msgstr "Configuracións de Twitter"
 
 msgid "Save snapshot settings"
 msgstr "Configuracións de Twitter"
 

-#: actions/subedit.php:70
+#. TRANS: Client error displayed trying a change a subscription for a non-subscribed profile.
+#: actions/subedit.php:75

 msgid "You are not subscribed to that profile."
 msgstr "Non estás suscrito a ese perfil"
 
 msgid "You are not subscribed to that profile."
 msgstr "Non estás suscrito a ese perfil"
 

+#. TRANS: Server error displayed when updating a subscription fails with a database error.

 #. TRANS: Exception thrown when a subscription could not be stored on the server.
 #. TRANS: Exception thrown when a subscription could not be stored on the server.

-#: actions/subedit.php:83 classes/Subscription.php:136
+#: actions/subedit.php:89 classes/Subscription.php:141

 msgid "Could not save subscription."
 msgstr "Non se pode gardar a subscrición."
 
 msgid "Could not save subscription."
 msgstr "Non se pode gardar a subscrición."
 


@@ -5247,11 +5923,6 @@ msgstr "Non se pode gardar a subscrición."
 msgid "This action only accepts POST requests."
 msgstr ""
 
 msgid "This action only accepts POST requests."
 msgstr ""
 

-#: actions/subscribe.php:107
-#, fuzzy
-msgid "No such profile."
-msgstr "Ningún chío."
-

 #: actions/subscribe.php:117
 #, fuzzy
 msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
 #: actions/subscribe.php:117
 #, fuzzy
 msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."


@@ -5314,13 +5985,6 @@ msgid ""
 "%) and be the first?"
 msgstr ""
 
 "%) and be the first?"
 msgstr ""
 

-#. TRANS: Header for subscriptions overview for a user (first page).
-#. TRANS: %s is a user nickname.
-#: actions/subscriptions.php:51
-#, fuzzy, php-format
-msgid "%s subscriptions"
-msgstr "Tódalas subscricións"
-

 #. TRANS: Header for subscriptions overview for a user (not first page).
 #. TRANS: %1$s is a user nickname, %2$d is the page number.
 #: actions/subscriptions.php:55
 #. TRANS: Header for subscriptions overview for a user (not first page).
 #. TRANS: %1$s is a user nickname, %2$d is the page number.
 #: actions/subscriptions.php:55


@@ -5364,13 +6028,18 @@ msgstr ""
 msgid "%s is not listening to anyone."
 msgstr "%1$s está a escoitar os teus chíos %2$s."
 
 msgid "%s is not listening to anyone."
 msgstr "%1$s está a escoitar os teus chíos %2$s."
 

+#: actions/subscriptions.php:178
+#, fuzzy, php-format
+msgid "Subscription feed for %s (Atom)"
+msgstr "Fonte para os amigos de %s"
+

 #. TRANS: Checkbox label for enabling Jabber messages for a profile in a subscriptions list.
 #. TRANS: Checkbox label for enabling Jabber messages for a profile in a subscriptions list.

-#: actions/subscriptions.php:226
+#: actions/subscriptions.php:242

 msgid "Jabber"
 msgstr "Jabber."
 
 #. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
 msgid "Jabber"
 msgstr "Jabber."
 
 #. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.

-#: actions/subscriptions.php:241
+#: actions/subscriptions.php:257

 msgid "SMS"
 msgstr "SMS"
 
 msgid "SMS"
 msgstr "SMS"
 


@@ -5410,7 +6079,7 @@ msgid "User profile"
 msgstr "O usuario non ten perfil."
 
 #: actions/tagother.php:81 actions/userauthorization.php:132
 msgstr "O usuario non ten perfil."
 
 #: actions/tagother.php:81 actions/userauthorization.php:132

-#: lib/userprofile.php:103
+#: lib/userprofile.php:107

 msgid "Photo"
 msgstr ""
 
 msgid "Photo"
 msgstr ""
 


@@ -5476,83 +6145,100 @@ msgid ""
 msgstr ""
 
 #. TRANS: User admin panel title
 msgstr ""
 
 #. TRANS: User admin panel title

-#: actions/useradminpanel.php:60
+#: actions/useradminpanel.php:58

 #, fuzzy
 msgctxt "TITLE"
 msgid "User"
 msgstr "Usuario"
 
 #, fuzzy
 msgctxt "TITLE"
 msgid "User"
 msgstr "Usuario"
 

-#: actions/useradminpanel.php:71
+#. TRANS: Instruction for user admin panel.
+#: actions/useradminpanel.php:69

 msgid "User settings for this StatusNet site"
 msgstr ""
 
 msgid "User settings for this StatusNet site"
 msgstr ""
 

-#: actions/useradminpanel.php:150
+#. TRANS: Form validation error in user admin panel when a non-numeric character limit was set.
+#: actions/useradminpanel.php:147

 msgid "Invalid bio limit. Must be numeric."
 msgstr ""
 
 msgid "Invalid bio limit. Must be numeric."
 msgstr ""
 

-#: actions/useradminpanel.php:156
-msgid "Invalid welcome text. Max length is 255 characters."
+#. TRANS: Form validation error in user admin panel when welcome text is too long.
+#: actions/useradminpanel.php:154
+msgid "Invalid welcome text. Maximum length is 255 characters."

 msgstr ""
 
 msgstr ""
 

+#. TRANS: Client error displayed when trying to set a non-existing user as default subscription for new
+#. TRANS: users in user admin panel. %1$s is the invalid nickname.

 #: actions/useradminpanel.php:166
 #, php-format
 #: actions/useradminpanel.php:166
 #, php-format

-msgid "Invalid default subscripton: '%1$s' is not user."
+msgid "Invalid default subscripton: '%1$s' is not a user."

 msgstr ""
 
 #. TRANS: Link description in user account settings menu.
 msgstr ""
 
 #. TRANS: Link description in user account settings menu.

-#: actions/useradminpanel.php:219 lib/accountsettingsaction.php:106
-#: lib/personalgroupnav.php:109
+#: actions/useradminpanel.php:215 lib/accountsettingsaction.php:106
+#: lib/personalgroupnav.php:112

 msgid "Profile"
 msgstr "Perfil"
 
 msgid "Profile"
 msgstr "Perfil"
 

-#: actions/useradminpanel.php:223
+#. TRANS: Field label in user admin panel for setting the character limit for the bio field.
+#: actions/useradminpanel.php:220

 msgid "Bio Limit"
 msgstr ""
 
 msgid "Bio Limit"
 msgstr ""
 

-#: actions/useradminpanel.php:224
+#. TRANS: Tooltip in user admin panel for setting the character limit for the bio field.
+#: actions/useradminpanel.php:222

 msgid "Maximum length of a profile bio in characters."
 msgstr ""
 
 msgid "Maximum length of a profile bio in characters."
 msgstr ""
 

-#: actions/useradminpanel.php:232
+#. TRANS: Form legend in user admin panel.
+#: actions/useradminpanel.php:231

 #, fuzzy
 msgid "New users"
 msgstr "Invitar a novos usuarios"
 
 #, fuzzy
 msgid "New users"
 msgstr "Invitar a novos usuarios"
 

+#. TRANS: Field label in user admin panel for setting new user welcome text.

 #: actions/useradminpanel.php:236
 msgid "New user welcome"
 msgstr ""
 
 #: actions/useradminpanel.php:236
 msgid "New user welcome"
 msgstr ""
 

-#: actions/useradminpanel.php:237
-msgid "Welcome text for new users (Max 255 chars)."
-msgstr ""
+#. TRANS: Tooltip in user admin panel for setting new user welcome text.
+#: actions/useradminpanel.php:238
+#, fuzzy
+msgid "Welcome text for new users (maximum 255 characters)."
+msgstr "O nome completo é demasiado longo (max 255 car)."

 
 

-#: actions/useradminpanel.php:242
+#. TRANS: Field label in user admin panel for setting default subscription for new users.
+#: actions/useradminpanel.php:244

 #, fuzzy
 msgid "Default subscription"
 msgstr "Tódalas subscricións"
 
 #, fuzzy
 msgid "Default subscription"
 msgstr "Tódalas subscricións"
 

-#: actions/useradminpanel.php:243
+#. TRANS: Tooltip in user admin panel for setting default subscription for new users.
+#: actions/useradminpanel.php:246

 #, fuzzy
 msgid "Automatically subscribe new users to this user."
 msgstr ""
 "Suscribirse automáticamente a calquera que se suscriba a min (o mellor para "
 "non humáns)"
 
 #, fuzzy
 msgid "Automatically subscribe new users to this user."
 msgstr ""
 "Suscribirse automáticamente a calquera que se suscriba a min (o mellor para "
 "non humáns)"
 

-#: actions/useradminpanel.php:252
+#. TRANS: Form legend in user admin panel.
+#: actions/useradminpanel.php:256

 #, fuzzy
 msgid "Invitations"
 msgstr "Invitación(s) enviada(s)."
 
 #, fuzzy
 msgid "Invitations"
 msgstr "Invitación(s) enviada(s)."
 

-#: actions/useradminpanel.php:257
+#. TRANS: Field label for checkbox in user admin panel for allowing users to invite friend using site e-mail.
+#: actions/useradminpanel.php:262

 #, fuzzy
 msgid "Invitations enabled"
 msgstr "Invitación(s) enviada(s)."
 
 #, fuzzy
 msgid "Invitations enabled"
 msgstr "Invitación(s) enviada(s)."
 

-#: actions/useradminpanel.php:259
+#. TRANS: Tooltip for checkbox in user admin panel for allowing users to invite friend using site e-mail.
+#: actions/useradminpanel.php:265

 msgid "Whether to allow users to invite new users."
 msgstr ""
 
 msgid "Whether to allow users to invite new users."
 msgstr ""
 

-#: actions/useradminpanel.php:295
+#. TRANS: Title for button to save user settings in user admin panel.
+#: actions/useradminpanel.php:302

 msgid "Save user settings"
 msgstr ""
 
 msgid "Save user settings"
 msgstr ""
 


@@ -5665,12 +6351,14 @@ msgstr "Non se pode ler a URL do avatar de '%s'"
 msgid "Wrong image type for avatar URL ‘%s’."
 msgstr "Tipo de imaxe incorrecto para '%s'"
 
 msgid "Wrong image type for avatar URL ‘%s’."
 msgstr "Tipo de imaxe incorrecto para '%s'"
 

-#: actions/userdesignsettings.php:76 lib/designsettings.php:65
+#. TRANS: Page title for profile design page.
+#: actions/userdesignsettings.php:76 lib/designsettings.php:63

 #, fuzzy
 msgid "Profile design"
 msgstr "Configuración de perfil"
 
 #, fuzzy
 msgid "Profile design"
 msgstr "Configuración de perfil"
 

-#: actions/userdesignsettings.php:87 lib/designsettings.php:76
+#. TRANS: Instructions for profile design page.
+#: actions/userdesignsettings.php:87 lib/designsettings.php:74

 msgid ""
 "Customize the way your profile looks with a background image and a colour "
 "palette of your choice."
 msgid ""
 "Customize the way your profile looks with a background image and a colour "
 "palette of your choice."


@@ -5755,7 +6443,7 @@ msgid "Plugins"
 msgstr ""
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
 msgstr ""
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.

-#: actions/version.php:198 lib/action.php:831
+#: actions/version.php:198 lib/action.php:885

 #, fuzzy
 msgid "Version"
 msgstr "Persoal"
 #, fuzzy
 msgid "Version"
 msgstr "Persoal"


@@ -5765,98 +6453,116 @@ msgid "Author(s)"
 msgstr ""
 
 #. TRANS: Activity title when marking a notice as favorite.
 msgstr ""
 
 #. TRANS: Activity title when marking a notice as favorite.

-#: classes/Fave.php:148 lib/favorform.php:143
+#: classes/Fave.php:164 lib/favorform.php:143

 msgid "Favor"
 msgstr "Gostame"
 
 #. TRANS: Ntofication given when a user marks a notice as favorite.
 #. TRANS: %1$s is a user nickname or full name, %2$s is a notice URI.
 msgid "Favor"
 msgstr "Gostame"
 
 #. TRANS: Ntofication given when a user marks a notice as favorite.
 #. TRANS: %1$s is a user nickname or full name, %2$s is a notice URI.

-#: classes/Fave.php:151
+#: classes/Fave.php:167

 #, fuzzy, php-format
 msgid "%1$s marked notice %2$s as a favorite."
 msgstr "Enviar un correo cando alguen enganda un chío meu coma favorito."
 
 #. TRANS: Server exception thrown when a URL cannot be processed.
 #, fuzzy, php-format
 msgid "%1$s marked notice %2$s as a favorite."
 msgstr "Enviar un correo cando alguen enganda un chío meu coma favorito."
 
 #. TRANS: Server exception thrown when a URL cannot be processed.

-#: classes/File.php:142
+#: classes/File.php:156

 #, php-format
 msgid "Cannot process URL '%s'"
 msgstr ""
 
 #. TRANS: Server exception thrown when... Robin thinks something is impossible!
 #, php-format
 msgid "Cannot process URL '%s'"
 msgstr ""
 
 #. TRANS: Server exception thrown when... Robin thinks something is impossible!

-#: classes/File.php:174
+#: classes/File.php:188

 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.
 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:189
+#. TRANS: %1$s is used for plural.
+#: classes/File.php:204

 #, php-format
 msgid ""
 #, php-format
 msgid ""

+"No file may be larger than %1$d byte and the file you sent was %2$d bytes. "
+"Try to upload a smaller version."
+msgid_plural ""

 "No file may be larger than %1$d bytes and the file you sent was %2$d bytes. "
 "Try to upload a smaller version."
 "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 ""
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""

 
 #. TRANS: Message given if an upload would exceed user quota.
 
 #. TRANS: Message given if an upload would exceed user quota.

-#. TRANS: %d (number) is the user quota in bytes.
-#: classes/File.php:201
+#. TRANS: %d (number) is the user quota in bytes and is used for plural.
+#: classes/File.php:217

 #, php-format
 #, php-format

-msgid "A file this large would exceed your user quota of %d bytes."
-msgstr ""
+msgid "A file this large would exceed your user quota of %d byte."
+msgid_plural "A file this large would exceed your user quota of %d bytes."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""

 
 #. TRANS: Message given id an upload would exceed a user's monthly quota.
 
 #. TRANS: Message given id an upload would exceed a user's monthly quota.

-#. TRANS: $d (number) is the monthly user quota in bytes.
-#: classes/File.php:210
+#. TRANS: $d (number) is the monthly user quota in bytes and is used for plural.
+#: classes/File.php:229

 #, php-format
 #, php-format

-msgid "A file this large would exceed your monthly quota of %d bytes."
-msgstr ""
+msgid "A file this large would exceed your monthly quota of %d byte."
+msgid_plural "A file this large would exceed your monthly quota of %d bytes."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""

 
 #. TRANS: Client exception thrown if a file upload does not have a valid name.
 
 #. TRANS: Client exception thrown if a file upload does not have a valid name.

-#: classes/File.php:247 classes/File.php:262
+#: classes/File.php:276 classes/File.php:291

 #, fuzzy
 msgid "Invalid filename."
 msgstr "Tamaño inválido."
 
 #. TRANS: Exception thrown when joining a group fails.
 #, fuzzy
 msgid "Invalid filename."
 msgstr "Tamaño inválido."
 
 #. TRANS: Exception thrown when joining a group fails.

-#: classes/Group_member.php:42
+#: classes/Group_member.php:51

 #, fuzzy
 msgid "Group join failed."
 msgstr "Non existe o perfil."
 
 #. TRANS: Exception thrown when trying to leave a group the user is not a member of.
 #, fuzzy
 msgid "Group join failed."
 msgstr "Non existe o perfil."
 
 #. TRANS: Exception thrown when trying to leave a group the user is not a member of.

-#: classes/Group_member.php:55
+#: classes/Group_member.php:64

 #, fuzzy
 msgid "Not part of group."
 msgstr "Non se puido actualizar o usuario."
 
 #. TRANS: Exception thrown when trying to leave a group fails.
 #, fuzzy
 msgid "Not part of group."
 msgstr "Non se puido actualizar o usuario."
 
 #. TRANS: Exception thrown when trying to leave a group fails.

-#: classes/Group_member.php:63
+#: classes/Group_member.php:72

 #, fuzzy
 msgid "Group leave failed."
 msgstr "Non existe o perfil."
 
 #. TRANS: Exception thrown providing an invalid profile ID.
 #. TRANS: %s is the invalid profile ID.
 #, fuzzy
 msgid "Group leave failed."
 msgstr "Non existe o perfil."
 
 #. TRANS: Exception thrown providing an invalid profile ID.
 #. TRANS: %s is the invalid profile ID.

-#: classes/Group_member.php:76
+#: classes/Group_member.php:85

 #, php-format
 msgid "Profile ID %s is invalid."
 msgstr ""
 
 #. TRANS: Exception thrown providing an invalid group ID.
 #. TRANS: %s is the invalid group ID.
 #, php-format
 msgid "Profile ID %s is invalid."
 msgstr ""
 
 #. TRANS: Exception thrown providing an invalid group ID.
 #. TRANS: %s is the invalid group ID.

-#: classes/Group_member.php:89
+#: classes/Group_member.php:98

 #, fuzzy, php-format
 msgid "Group ID %s is invalid."
 msgstr "Acounteceu un erro gardando o usuario: é inválido."
 
 #. TRANS: Activity title.
 #, fuzzy, php-format
 msgid "Group ID %s is invalid."
 msgstr "Acounteceu un erro gardando o usuario: é inválido."
 
 #. TRANS: Activity title.

-#: classes/Group_member.php:113 lib/joinform.php:114
+#: classes/Group_member.php:147 lib/joinform.php:114

 #, fuzzy
 msgid "Join"
 msgstr "Inicio de sesión"
 
 #. TRANS: Success message for subscribe to group attempt through OStatus.
 #. TRANS: %1$s is the member name, %2$s is the subscribed group's name.
 #, fuzzy
 msgid "Join"
 msgstr "Inicio de sesión"
 
 #. TRANS: Success message for subscribe to group attempt through OStatus.
 #. TRANS: %1$s is the member name, %2$s is the subscribed group's name.

-#: classes/Group_member.php:117
+#: classes/Group_member.php:151

 #, php-format
 msgid "%1$s has joined group %2$s."
 msgstr ""
 #, php-format
 msgid "%1$s has joined group %2$s."
 msgstr ""


@@ -5875,7 +6581,7 @@ msgid "Could not create login token for %s"
 msgstr "Non se puido crear o favorito."
 
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
 msgstr "Non se puido crear o favorito."
 
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.

-#: classes/Memcached_DataObject.php:533
+#: classes/Memcached_DataObject.php:537

 msgid "No database name or DSN found anywhere."
 msgstr ""
 
 msgid "No database name or DSN found anywhere."
 msgstr ""
 


@@ -5886,12 +6592,12 @@ msgid "You are banned from sending direct messages."
 msgstr "Erro ó enviar a mensaxe directa."
 
 #. TRANS: Message given when a message could not be stored on the server.
 msgstr "Erro ó enviar a mensaxe directa."
 
 #. TRANS: Message given when a message could not be stored on the server.

-#: classes/Message.php:62
+#: classes/Message.php:69

 msgid "Could not insert message."
 msgstr "Non se pode inserir unha mensaxe."
 
 #. TRANS: Message given when a message could not be updated on the server.
 msgid "Could not insert message."
 msgstr "Non se pode inserir unha mensaxe."
 
 #. TRANS: Message given when a message could not be updated on the server.

-#: classes/Message.php:73
+#: classes/Message.php:80

 msgid "Could not update message with new URI."
 msgstr "Non se puido actualizar a mensaxe coa nova URI."
 
 msgid "Could not update message with new URI."
 msgstr "Non se puido actualizar a mensaxe coa nova URI."
 


@@ -5903,24 +6609,24 @@ msgid "No such profile (%1$d) for notice (%2$d)."
 msgstr ""
 
 #. TRANS: Server exception. %s are the error details.
 msgstr ""
 
 #. TRANS: Server exception. %s are the error details.

-#: classes/Notice.php:193
+#: classes/Notice.php:199

 #, php-format
 msgid "Database error inserting hashtag: %s"
 msgstr "Acounteceu un erro ó inserir o avatar"
 
 #. TRANS: Client exception thrown if a notice contains too many characters.
 #, php-format
 msgid "Database error inserting hashtag: %s"
 msgstr "Acounteceu un erro ó inserir o avatar"
 
 #. TRANS: Client exception thrown if a notice contains too many characters.

-#: classes/Notice.php:265
+#: classes/Notice.php:279

 #, fuzzy
 msgid "Problem saving notice. Too long."
 msgstr "Aconteceu un erro ó gardar o chío."
 
 #. TRANS: Client exception thrown when trying to save a notice for an unknown user.
 #, fuzzy
 msgid "Problem saving notice. Too long."
 msgstr "Aconteceu un erro ó gardar o chío."
 
 #. TRANS: Client exception thrown when trying to save a notice for an unknown user.

-#: classes/Notice.php:270
+#: classes/Notice.php:284

 msgid "Problem saving notice. Unknown user."
 msgstr "Aconteceu un erro ó gardar o chío. Usuario descoñecido."
 
 #. TRANS: Client exception thrown when a user tries to post too many notices in a given time frame.
 msgid "Problem saving notice. Unknown user."
 msgstr "Aconteceu un erro ó gardar o chío. Usuario descoñecido."
 
 #. TRANS: Client exception thrown when a user tries to post too many notices in a given time frame.

-#: classes/Notice.php:276
+#: classes/Notice.php:290

 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""


@@ -5928,7 +6634,7 @@ msgstr ""
 "duns minutos."
 
 #. TRANS: Client exception thrown when a user tries to post too many duplicate notices in a given time frame.
 "duns minutos."
 
 #. TRANS: Client exception thrown when a user tries to post too many duplicate notices in a given time frame.

-#: classes/Notice.php:283
+#: classes/Notice.php:297

 #, fuzzy
 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "
 #, fuzzy
 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "


@@ -5938,51 +6644,58 @@ msgstr ""
 "duns minutos."
 
 #. TRANS: Client exception thrown when a user tries to post while being banned.
 "duns minutos."
 
 #. TRANS: Client exception thrown when a user tries to post while being banned.

-#: classes/Notice.php:291
+#: classes/Notice.php:305

 msgid "You are banned from posting notices on this site."
 msgstr "Tes restrinxido o envio de chíos neste sitio."
 
 #. TRANS: Server exception thrown when a notice cannot be saved.
 #. TRANS: Server exception thrown when a notice cannot be updated.
 msgid "You are banned from posting notices on this site."
 msgstr "Tes restrinxido o envio de chíos neste sitio."
 
 #. 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
+#: classes/Notice.php:372 classes/Notice.php:399

 msgid "Problem saving notice."
 msgstr "Aconteceu un erro ó gardar o chío."
 
 #. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
 msgid "Problem saving notice."
 msgstr "Aconteceu un erro ó gardar o chío."
 
 #. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().

-#: classes/Notice.php:907
-msgid "Bad type provided to saveKnownGroups"
+#: classes/Notice.php:914
+msgid "Bad type provided to saveKnownGroups."

 msgstr ""
 
 #. TRANS: Server exception thrown when an update for a group inbox fails.
 msgstr ""
 
 #. TRANS: Server exception thrown when an update for a group inbox fails.

-#: classes/Notice.php:1006
+#: classes/Notice.php:1013

 #, fuzzy
 msgid "Problem saving group inbox."
 msgstr "Aconteceu un erro ó gardar o chío."
 
 #. TRANS: Server exception thrown when a reply cannot be saved.
 #. TRANS: %1$d is a notice ID, %2$d is the ID of the mentioned user.
 #, fuzzy
 msgid "Problem saving group inbox."
 msgstr "Aconteceu un erro ó gardar o chío."
 
 #. TRANS: Server exception thrown when a reply cannot be saved.
 #. TRANS: %1$d is a notice ID, %2$d is the ID of the mentioned user.

-#: classes/Notice.php:1120
+#: classes/Notice.php:1127

 #, fuzzy, php-format
 msgid "Could not save reply for %1$d, %2$d."
 msgstr "Non se pode gardar a subscrición."
 
 #. 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.
 #, fuzzy, php-format
 msgid "Could not save reply for %1$d, %2$d."
 msgstr "Non se pode gardar a subscrición."
 
 #. 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:1822
+#: classes/Notice.php:1646

 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
 
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
 

+#. TRANS: Full name of a profile or group followed by nickname in parens
+#: classes/Profile.php:172 classes/User_group.php:242
+#, fuzzy, php-format
+msgctxt "FANCYNAME"
+msgid "%1$s (%2$s)"
+msgstr "%1$s (%2$s)"
+

 #. 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).
 #. 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:791
+#: classes/Profile.php:765

 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr ""
 
 #. 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).
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr ""
 
 #. 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:800
+#: classes/Profile.php:774

 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""


@@ -5999,91 +6712,91 @@ msgid "Unable to save tag."
 msgstr "Non se poden gardar as etiquetas."
 
 #. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
 msgstr "Non se poden gardar as etiquetas."
 
 #. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.

-#: classes/Subscription.php:75 lib/oauthstore.php:482
+#: classes/Subscription.php:77 lib/oauthstore.php:482

 #, fuzzy
 msgid "You have been banned from subscribing."
 msgstr "Este usuario non che permite suscribirte a el."
 
 #. TRANS: Exception thrown when trying to subscribe while already subscribed.
 #, fuzzy
 msgid "You have been banned from subscribing."
 msgstr "Este usuario non che permite suscribirte a el."
 
 #. TRANS: Exception thrown when trying to subscribe while already subscribed.

-#: classes/Subscription.php:80
+#: classes/Subscription.php:82

 #, fuzzy
 msgid "Already subscribed!"
 msgstr "Non está suscrito!"
 
 #. TRANS: Exception thrown when trying to subscribe to a user who has blocked the subscribing user.
 #, fuzzy
 msgid "Already subscribed!"
 msgstr "Non está suscrito!"
 
 #. TRANS: Exception thrown when trying to subscribe to a user who has blocked the subscribing user.

-#: classes/Subscription.php:85
+#: classes/Subscription.php:87

 msgid "User has blocked you."
 msgstr "O usuario bloqueoute."
 
 #. TRANS: Exception thrown when trying to unsibscribe without a subscription.
 msgid "User has blocked you."
 msgstr "O usuario bloqueoute."
 
 #. TRANS: Exception thrown when trying to unsibscribe without a subscription.

-#: classes/Subscription.php:171
+#: classes/Subscription.php:176

 #, fuzzy
 msgid "Not subscribed!"
 msgstr "Non está suscrito!"
 
 #. TRANS: Exception thrown when trying to unsubscribe a user from themselves.
 #, fuzzy
 msgid "Not subscribed!"
 msgstr "Non está suscrito!"
 
 #. TRANS: Exception thrown when trying to unsubscribe a user from themselves.

-#: classes/Subscription.php:178
+#: classes/Subscription.php:183

 msgid "Could not delete self-subscription."
 msgstr "Non se pode gardar a subscrición."
 
 #. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
 msgid "Could not delete self-subscription."
 msgstr "Non se pode gardar a subscrición."
 
 #. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.

-#: classes/Subscription.php:206
+#: classes/Subscription.php:211

 msgid "Could not delete subscription OMB token."
 msgstr "Non se pode gardar a subscrición."
 
 #. TRANS: Exception thrown when a subscription could not be deleted on the server.
 msgid "Could not delete subscription OMB token."
 msgstr "Non se pode gardar a subscrición."
 
 #. TRANS: Exception thrown when a subscription could not be deleted on the server.

-#: classes/Subscription.php:218
+#: classes/Subscription.php:223

 msgid "Could not delete subscription."
 msgstr "Non se pode gardar a subscrición."
 
 #. TRANS: Activity tile when subscribing to another person.
 msgid "Could not delete subscription."
 msgstr "Non se pode gardar a subscrición."
 
 #. TRANS: Activity tile when subscribing to another person.

-#: classes/Subscription.php:255
+#: classes/Subscription.php:265

 msgid "Follow"
 msgstr ""
 
 #. TRANS: Notification given when one person starts following another.
 #. TRANS: %1$s is the subscriber, %2$s is the subscribed.
 msgid "Follow"
 msgstr ""
 
 #. TRANS: Notification given when one person starts following another.
 #. TRANS: %1$s is the subscriber, %2$s is the subscribed.

-#: classes/Subscription.php:258
+#: classes/Subscription.php:268

 #, fuzzy, php-format
 msgid "%1$s is now following %2$s."
 msgstr "%1$s está a escoitar os teus chíos %2$s."
 
 #. TRANS: Notice given on user registration.
 #. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
 #, fuzzy, php-format
 msgid "%1$s is now following %2$s."
 msgstr "%1$s está a escoitar os teus chíos %2$s."
 
 #. TRANS: Notice given on user registration.
 #. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.

-#: classes/User.php:384
+#: classes/User.php:395

 #, fuzzy, php-format
 msgid "Welcome to %1$s, @%2$s!"
 msgstr "Mensaxe de %1$s en %2$s"
 
 #. TRANS: Server exception.
 #, fuzzy, php-format
 msgid "Welcome to %1$s, @%2$s!"
 msgstr "Mensaxe de %1$s en %2$s"
 
 #. TRANS: Server exception.

-#: classes/User.php:902
+#: classes/User.php:918

 msgid "No single user defined for single-user mode."
 msgstr ""
 
 #. TRANS: Server exception.
 msgid "No single user defined for single-user mode."
 msgstr ""
 
 #. TRANS: Server exception.

-#: classes/User.php:906
+#: classes/User.php:922

 msgid "Single-user mode code called when not enabled."
 msgstr ""
 
 #. TRANS: Server exception thrown when creating a group failed.
 msgid "Single-user mode code called when not enabled."
 msgstr ""
 
 #. TRANS: Server exception thrown when creating a group failed.

-#: classes/User_group.php:495
+#: classes/User_group.php:516

 #, fuzzy
 msgid "Could not create group."
 msgstr "Non se puido crear o favorito."
 
 #. TRANS: Server exception thrown when updating a group URI failed.
 #, fuzzy
 msgid "Could not create group."
 msgstr "Non se puido crear o favorito."
 
 #. TRANS: Server exception thrown when updating a group URI failed.

-#: classes/User_group.php:505
+#: classes/User_group.php:526

 msgid "Could not set group URI."
 msgstr "Non se poden gardar as etiquetas."
 
 #. TRANS: Server exception thrown when setting group membership failed.
 msgid "Could not set group URI."
 msgstr "Non se poden gardar as etiquetas."
 
 #. TRANS: Server exception thrown when setting group membership failed.

-#: classes/User_group.php:528
+#: classes/User_group.php:549

 #, fuzzy
 msgid "Could not set group membership."
 msgstr "Non se pode gardar a subscrición."
 
 #. TRANS: Server exception thrown when saving local group information failed.
 #, fuzzy
 msgid "Could not set group membership."
 msgstr "Non se pode gardar a subscrición."
 
 #. TRANS: Server exception thrown when saving local group information failed.

-#: classes/User_group.php:543
+#: classes/User_group.php:564

 #, fuzzy
 msgid "Could not save local group info."
 msgstr "Non se pode gardar a subscrición."
 #, fuzzy
 msgid "Could not save local group info."
 msgstr "Non se pode gardar a subscrición."


@@ -6136,51 +6849,57 @@ msgstr "%1$s (%2$s)"
 msgid "Untitled page"
 msgstr ""
 
 msgid "Untitled page"
 msgstr ""
 

+#. TRANS: Localized tooltip for '...' expansion button on overlong remote messages.
+#: lib/action.php:312
+msgctxt "TOOLTIP"
+msgid "Show more"
+msgstr ""
+

 #. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
 #. TRANS: DT element for primary navigation menu. String is hidden in default CSS.

-#: lib/action.php:477
+#: lib/action.php:531

 msgid "Primary site navigation"
 msgstr ""
 
 #. TRANS: Tooltip for main menu option "Personal"
 msgid "Primary site navigation"
 msgstr ""
 
 #. TRANS: Tooltip for main menu option "Personal"

-#: lib/action.php:483
+#: lib/action.php:537

 msgctxt "TOOLTIP"
 msgid "Personal profile and friends timeline"
 msgstr ""
 
 #. TRANS: Main menu option when logged in for access to personal profile and friends timeline
 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:486
+#: lib/action.php:540

 #, fuzzy
 msgctxt "MENU"
 msgid "Personal"
 msgstr "Persoal"
 
 #. TRANS: Tooltip for main menu option "Account"
 #, fuzzy
 msgctxt "MENU"
 msgid "Personal"
 msgstr "Persoal"
 
 #. TRANS: Tooltip for main menu option "Account"

-#: lib/action.php:488
+#: lib/action.php:542

 #, fuzzy
 msgctxt "TOOLTIP"
 msgid "Change your email, avatar, password, profile"
 msgstr "Cambiar contrasinal"
 
 #. TRANS: Main menu option when logged in for access to user settings
 #, fuzzy
 msgctxt "TOOLTIP"
 msgid "Change your email, avatar, password, profile"
 msgstr "Cambiar contrasinal"
 
 #. TRANS: Main menu option when logged in for access to user settings

-#: lib/action.php:491
+#: lib/action.php:545

 #, fuzzy
 msgid "Account"
 msgstr "Sobre"
 
 #. TRANS: Tooltip for main menu option "Services"
 #, fuzzy
 msgid "Account"
 msgstr "Sobre"
 
 #. TRANS: Tooltip for main menu option "Services"

-#: lib/action.php:493
+#: lib/action.php:547

 #, fuzzy
 msgctxt "TOOLTIP"
 msgid "Connect to services"
 msgstr "Non se pode redireccionar ao servidor: %s"
 
 #. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
 #, fuzzy
 msgctxt "TOOLTIP"
 msgid "Connect to services"
 msgstr "Non se pode redireccionar ao servidor: %s"
 
 #. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services

-#: lib/action.php:496
+#: lib/action.php:550

 msgid "Connect"
 msgstr "Conectar"
 
 #. TRANS: Tooltip for menu option "Admin"
 msgid "Connect"
 msgstr "Conectar"
 
 #. TRANS: Tooltip for menu option "Admin"

-#: lib/action.php:499
+#: lib/action.php:553

 #, fuzzy
 msgctxt "TOOLTIP"
 msgid "Change site configuration"
 #, fuzzy
 msgctxt "TOOLTIP"
 msgid "Change site configuration"


@@ -6188,13 +6907,13 @@ msgstr "Navegación de subscricións"
 
 #. 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.
 
 #. 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:502 lib/groupnav.php:117
+#: lib/action.php:556 lib/groupnav.php:117

 msgctxt "MENU"
 msgid "Admin"
 msgstr ""
 
 #. TRANS: Tooltip for main menu option "Invite"
 msgctxt "MENU"
 msgid "Admin"
 msgstr ""
 
 #. TRANS: Tooltip for main menu option "Invite"

-#: lib/action.php:506
+#: lib/action.php:560

 #, fuzzy, php-format
 msgctxt "TOOLTIP"
 msgid "Invite friends and colleagues to join you on %s"
 #, fuzzy, php-format
 msgctxt "TOOLTIP"
 msgid "Invite friends and colleagues to join you on %s"


@@ -6203,74 +6922,74 @@ msgstr ""
 "este servizo."
 
 #. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
 "este servizo."
 
 #. TRANS: Main menu option when logged in and invitations are allowed for inviting new users

-#: lib/action.php:509
+#: lib/action.php:563

 #, fuzzy
 msgctxt "MENU"
 msgid "Invite"
 msgstr "Invitar"
 
 #. TRANS: Tooltip for main menu option "Logout"
 #, fuzzy
 msgctxt "MENU"
 msgid "Invite"
 msgstr "Invitar"
 
 #. TRANS: Tooltip for main menu option "Logout"

-#: lib/action.php:515
+#: lib/action.php:569

 msgctxt "TOOLTIP"
 msgid "Logout from the site"
 msgstr ""
 
 #. TRANS: Main menu option when logged in to log out the current user
 msgctxt "TOOLTIP"
 msgid "Logout from the site"
 msgstr ""
 
 #. TRANS: Main menu option when logged in to log out the current user

-#: lib/action.php:518
+#: lib/action.php:572

 #, fuzzy
 msgctxt "MENU"
 msgid "Logout"
 msgstr "Sair"
 
 #. TRANS: Tooltip for main menu option "Register"
 #, fuzzy
 msgctxt "MENU"
 msgid "Logout"
 msgstr "Sair"
 
 #. TRANS: Tooltip for main menu option "Register"

-#: lib/action.php:523
+#: lib/action.php:577

 #, fuzzy
 msgctxt "TOOLTIP"
 msgid "Create an account"
 msgstr "Crear nova conta"
 
 #. TRANS: Main menu option when not logged in to register a new account
 #, fuzzy
 msgctxt "TOOLTIP"
 msgid "Create an account"
 msgstr "Crear nova conta"
 
 #. TRANS: Main menu option when not logged in to register a new account

-#: lib/action.php:526
+#: lib/action.php:580

 #, fuzzy
 msgctxt "MENU"
 msgid "Register"
 msgstr "Rexistrar"
 
 #. TRANS: Tooltip for main menu option "Login"
 #, fuzzy
 msgctxt "MENU"
 msgid "Register"
 msgstr "Rexistrar"
 
 #. TRANS: Tooltip for main menu option "Login"

-#: lib/action.php:529
+#: lib/action.php:583

 msgctxt "TOOLTIP"
 msgid "Login to the site"
 msgstr ""
 
 #. TRANS: Main menu option when not logged in to log in
 msgctxt "TOOLTIP"
 msgid "Login to the site"
 msgstr ""
 
 #. TRANS: Main menu option when not logged in to log in

-#: lib/action.php:532
+#: lib/action.php:586

 #, fuzzy
 msgctxt "MENU"
 msgid "Login"
 msgstr "Inicio de sesión"
 
 #. TRANS: Tooltip for main menu option "Help"
 #, fuzzy
 msgctxt "MENU"
 msgid "Login"
 msgstr "Inicio de sesión"
 
 #. TRANS: Tooltip for main menu option "Help"

-#: lib/action.php:535
+#: lib/action.php:589

 #, fuzzy
 msgctxt "TOOLTIP"
 msgid "Help me!"
 msgstr "Axuda"
 
 #. TRANS: Main menu option for help on the StatusNet site
 #, fuzzy
 msgctxt "TOOLTIP"
 msgid "Help me!"
 msgstr "Axuda"
 
 #. TRANS: Main menu option for help on the StatusNet site

-#: lib/action.php:538
+#: lib/action.php:592

 #, fuzzy
 msgctxt "MENU"
 msgid "Help"
 msgstr "Axuda"
 
 #. TRANS: Tooltip for main menu option "Search"
 #, fuzzy
 msgctxt "MENU"
 msgid "Help"
 msgstr "Axuda"
 
 #. TRANS: Tooltip for main menu option "Search"

-#: lib/action.php:541
+#: lib/action.php:595

 msgctxt "TOOLTIP"
 msgid "Search for people or text"
 msgstr ""
 
 #. TRANS: Main menu option when logged in or when the StatusNet instance is not private
 msgctxt "TOOLTIP"
 msgid "Search for people or text"
 msgstr ""
 
 #. TRANS: Main menu option when logged in or when the StatusNet instance is not private

-#: lib/action.php:544
+#: lib/action.php:598

 #, fuzzy
 msgctxt "MENU"
 msgid "Search"
 #, fuzzy
 msgctxt "MENU"
 msgid "Search"


@@ -6278,70 +6997,71 @@ msgstr "Buscar"
 
 #. TRANS: DT element for site notice. String is hidden in default CSS.
 #. TRANS: Menu item for site administration
 
 #. TRANS: DT element for site notice. String is hidden in default CSS.
 #. TRANS: Menu item for site administration

-#: lib/action.php:566 lib/adminpanelaction.php:387
+#: lib/action.php:620 lib/adminpanelaction.php:387

 #, fuzzy
 msgid "Site notice"
 msgstr "Novo chío"
 
 #. TRANS: DT element for local views block. String is hidden in default CSS.
 #, fuzzy
 msgid "Site notice"
 msgstr "Novo chío"
 
 #. TRANS: DT element for local views block. String is hidden in default CSS.

-#: lib/action.php:633
+#: lib/action.php:687

 msgid "Local views"
 msgstr ""
 
 #. TRANS: DT element for page notice. String is hidden in default CSS.
 msgid "Local views"
 msgstr ""
 
 #. TRANS: DT element for page notice. String is hidden in default CSS.

-#: lib/action.php:703
+#: lib/action.php:757

 #, fuzzy
 msgid "Page notice"
 msgstr "Novo chío"
 
 #. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
 #, fuzzy
 msgid "Page notice"
 msgstr "Novo chío"
 
 #. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.

-#: lib/action.php:804
+#: lib/action.php:858

 #, fuzzy
 msgid "Secondary site navigation"
 msgstr "Navegación de subscricións"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
 #, fuzzy
 msgid "Secondary site navigation"
 msgstr "Navegación de subscricións"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.

-#: lib/action.php:810
+#: lib/action.php:864

 msgid "Help"
 msgstr "Axuda"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
 msgid "Help"
 msgstr "Axuda"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.

-#: lib/action.php:813
+#: lib/action.php:867

 msgid "About"
 msgstr "Sobre"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
 msgid "About"
 msgstr "Sobre"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.

-#: lib/action.php:816
+#: lib/action.php:870

 msgid "FAQ"
 msgstr "Preguntas frecuentes"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
 msgid "FAQ"
 msgstr "Preguntas frecuentes"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.

-#: lib/action.php:821
+#: lib/action.php:875

 msgid "TOS"
 msgstr ""
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
 msgid "TOS"
 msgstr ""
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.

-#: lib/action.php:825
+#: lib/action.php:879

 msgid "Privacy"
 msgstr "Privacidade"
 
 msgid "Privacy"
 msgstr "Privacidade"
 

-#. TRANS: Secondary navigation menu option.
-#: lib/action.php:828
+#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
+#: lib/action.php:882

 msgid "Source"
 msgstr "Fonte"
 
 msgid "Source"
 msgstr "Fonte"
 

-#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:834
+#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+#: lib/action.php:889

 msgid "Contact"
 msgstr "Contacto"
 
 msgid "Contact"
 msgstr "Contacto"
 

-#. TRANS: Secondary navigation menu option.
-#: lib/action.php:837
+#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
+#: lib/action.php:892

 msgid "Badge"
 msgstr ""
 
 #. TRANS: DT element for StatusNet software license.
 msgid "Badge"
 msgstr ""
 
 #. TRANS: DT element for StatusNet software license.

-#: lib/action.php:866
+#: lib/action.php:921

 msgid "StatusNet software license"
 msgstr ""
 
 msgid "StatusNet software license"
 msgstr ""
 


@@ -6349,7 +7069,7 @@ msgstr ""
 #. 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
 #. 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:873
+#: lib/action.php:928

 #, fuzzy, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
 #, fuzzy, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."


@@ -6359,7 +7079,7 @@ msgstr ""
 "broughtby%%](%%site.broughtbyurl%%). "
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
 "broughtby%%](%%site.broughtbyurl%%). "
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.

-#: lib/action.php:876
+#: lib/action.php:931

 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** é un servizo de microbloguexo."
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** é un servizo de microbloguexo."


@@ -6368,7 +7088,7 @@ msgstr "**%%site.name%%** é un servizo de microbloguexo."
 #. 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.
 #. 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:883
+#: lib/action.php:938

 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"


@@ -6380,60 +7100,111 @@ msgstr ""
 "fsf.org/licensing/licenses/agpl-3.0.html)."
 
 #. TRANS: DT element for StatusNet site content license.
 "fsf.org/licensing/licenses/agpl-3.0.html)."
 
 #. TRANS: DT element for StatusNet site content license.

-#: lib/action.php:899
+#: lib/action.php:954

 #, fuzzy
 msgid "Site content license"
 msgstr "Atopar no contido dos chíos"
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
 #, fuzzy
 msgid "Site content license"
 msgstr "Atopar no contido dos chíos"
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.

-#: lib/action.php:906
+#: lib/action.php:961

 #, 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.
 #, 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:913
+#: lib/action.php:968

 #, 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.
 #, 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:917
+#: lib/action.php:972

 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 
 #. 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.
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 
 #. 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:949
+#: lib/action.php:1004

 #, 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.).
 #, 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:1285
+#: lib/action.php:1340

 msgid "Pagination"
 msgstr ""
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
 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:1296
+#: lib/action.php:1351

 msgid "After"
 msgstr "Outros"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
 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:1306
+#: lib/action.php:1361

 #, fuzzy
 msgid "Before"
 msgstr "Antes »"
 
 #. TRANS: Client exception thrown when a feed instance is a DOMDocument.
 #, fuzzy
 msgid "Before"
 msgstr "Antes »"
 
 #. TRANS: Client exception thrown when a feed instance is a DOMDocument.

-#: lib/activity.php:120
+#: lib/activity.php:125

 msgid "Expecting a root feed element but got a whole XML document."
 msgstr ""
 
 msgid "Expecting a root feed element but got a whole XML document."
 msgstr ""
 

+#. TRANS: Client exception thrown when using an unknown verb for the activity importer.
+#: lib/activityimporter.php:81
+#, fuzzy, php-format
+msgid "Unknown verb: \"%s\"."
+msgstr "tipo de ficheiro non soportado"
+
+#. TRANS: Client exception thrown when trying to force a subscription for an untrusted user.
+#: lib/activityimporter.php:107
+msgid "Cannot force subscription for untrusted user."
+msgstr ""
+
+#. TRANS: Client exception thrown when trying to for a remote user to subscribe.
+#: lib/activityimporter.php:117
+#, fuzzy
+msgid "Cannot force remote user to subscribe."
+msgstr "Especifica o nome do usuario ó que queres suscribirte"
+
+#. TRANS: Client exception thrown when trying to subscribe to an unknown profile.
+#: lib/activityimporter.php:132
+#, fuzzy
+msgid "Unknown profile."
+msgstr "tipo de ficheiro non soportado"
+
+#. TRANS: Client exception thrown when trying to import an event not related to the importing user.
+#: lib/activityimporter.php:138
+msgid "This activity seems unrelated to our user."
+msgstr ""
+
+#. TRANS: Client exception thrown when trying to join a remote group that is not a group.
+#: lib/activityimporter.php:154
+msgid "Remote profile is not a group!"
+msgstr ""
+
+#. TRANS: Client exception thrown when trying to join a group the importing user is already a member of.
+#: lib/activityimporter.php:163
+#, fuzzy
+msgid "User is already a member of this group."
+msgstr "Xa estas suscrito a estes usuarios:"
+
+#. TRANS: Client exception thrown when trying to overwrite the author information for a non-trusted user during import.
+#: lib/activityimporter.php:207
+msgid "Not overwriting author info for non-trusted user."
+msgstr ""
+
+#. TRANS: Client exception thrown when trying to import a notice without content.
+#. TRANS: %s is the notice URI.
+#: lib/activityimporter.php:223
+#, fuzzy, php-format
+msgid "No content for notice %s."
+msgstr "Atopar no contido dos chíos"
+

 #. TRANS: Client exception thrown when there is no source attribute.
 #: lib/activityutils.php:200
 msgid "Can't handle remote content yet."
 #. TRANS: Client exception thrown when there is no source attribute.
 #: lib/activityutils.php:200
 msgid "Can't handle remote content yet."


@@ -6514,7 +7285,7 @@ msgid "User configuration"
 msgstr "Confirmación de SMS"
 
 #. TRANS: Menu item for site administration
 msgstr "Confirmación de SMS"
 
 #. TRANS: Menu item for site administration

-#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:115
+#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:118

 msgid "User"
 msgstr "Usuario"
 
 msgid "User"
 msgstr "Usuario"
 


@@ -6737,17 +7508,23 @@ msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "Recuperar"
 
 msgid "Revoke"
 msgstr "Recuperar"
 

-#: lib/atom10feed.php:112
-msgid "author element must contain a name element."
+#: lib/atom10feed.php:113
+msgid "Author element must contain a name element."

 msgstr ""
 
 msgstr ""
 

+#. TRANS: Server exception thrown when using the method setActivitySubject() in the class Atom10Feed.
+#: lib/atom10feed.php:160
+#, fuzzy
+msgid "Do not use this method!"
+msgstr "Non se pode eliminar este chíos."
+

 #. TRANS: DT element label in attachment list item.
 #. TRANS: DT element label in attachment list item.

-#: lib/attachmentlist.php:256
+#: lib/attachmentlist.php:294

 msgid "Author"
 msgstr ""
 
 #. TRANS: DT element label in attachment list item.
 msgid "Author"
 msgstr ""
 
 #. TRANS: DT element label in attachment list item.

-#: lib/attachmentlist.php:270
+#: lib/attachmentlist.php:308

 #, fuzzy
 msgid "Provider"
 msgstr "Perfil"
 #, fuzzy
 msgid "Provider"
 msgstr "Perfil"


@@ -6791,7 +7568,7 @@ msgid "AJAX error"
 msgstr "Erro de Ajax"
 
 #. TRANS: E-mail subject when a command has completed.
 msgstr "Erro de Ajax"
 
 #. TRANS: E-mail subject when a command has completed.

-#: lib/channel.php:233 lib/mailhandler.php:142
+#: lib/channel.php:233 lib/mailhandler.php:143

 msgid "Command complete"
 msgstr "Comando completo"
 
 msgid "Command complete"
 msgstr "Comando completo"
 


@@ -6808,7 +7585,7 @@ msgstr "Non se atopou un perfil con ese ID."
 
 #. 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.
 
 #. 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:99 lib/command.php:626
+#: lib/command.php:99 lib/command.php:630

 #, fuzzy
 msgid "User has no last notice."
 msgstr "O usuario non ten último chio."
 #, fuzzy
 msgid "User has no last notice."
 msgstr "O usuario non ten último chio."


@@ -6878,6 +7655,14 @@ msgstr ""
 msgid "%1$s left group %2$s."
 msgstr ""
 
 msgid "%1$s left group %2$s."
 msgstr ""
 

+#. TRANS: Whois output.
+#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
+#: lib/command.php:426
+#, fuzzy, php-format
+msgctxt "WHOIS"
+msgid "%1$s (%2$s)"
+msgstr "%1$s (%2$s)"
+

 #. TRANS: Whois output. %s is the full name of the queried user.
 #: lib/command.php:430
 #, php-format
 #. TRANS: Whois output. %s is the full name of the queried user.
 #: lib/command.php:430
 #, php-format


@@ -6915,130 +7700,150 @@ msgid ""
 "same server."
 msgstr ""
 
 "same server."
 msgstr ""
 

-#. TRANS: Message given if content is too long.
+#. TRANS: Message given if content is too long. %1$sd is used for plural.

 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
 #: lib/command.php:488
 #, fuzzy, php-format
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
 #: lib/command.php:488
 #, fuzzy, php-format

-msgid "Message too long - maximum is %1$d characters, you sent %2$d."
-msgstr "Mensaxe demasiado longa - o máximo é 140 caracteres, ti enviaches %d "
+msgid "Message too long - maximum is %1$d character, you sent %2$d."
+msgid_plural "Message too long - maximum is %1$d characters, you sent %2$d."
+msgstr[0] ""
+"Mensaxe demasiado longa - o máximo é 140 caracteres, ti enviaches %d "
+msgstr[1] ""
+"Mensaxe demasiado longa - o máximo é 140 caracteres, ti enviaches %d "
+msgstr[2] ""
+"Mensaxe demasiado longa - o máximo é 140 caracteres, ti enviaches %d "
+msgstr[3] ""
+"Mensaxe demasiado longa - o máximo é 140 caracteres, ti enviaches %d "
+msgstr[4] ""
+"Mensaxe demasiado longa - o máximo é 140 caracteres, ti enviaches %d "

 
 #. TRANS: Error text shown sending a direct message fails with an unknown reason.
 
 #. TRANS: Error text shown sending a direct message fails with an unknown reason.

-#: lib/command.php:514
+#: lib/command.php:516

 msgid "Error sending direct message."
 msgstr "Erro ó enviar a mensaxe directa."
 
 #. TRANS: Message given having repeated a notice from another user.
 #. TRANS: %s is the name of the user for which the notice was repeated.
 msgid "Error sending direct message."
 msgstr "Erro ó enviar a mensaxe directa."
 
 #. 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:551
+#: lib/command.php:553

 #, fuzzy, php-format
 msgid "Notice from %s repeated."
 msgstr "Chío publicado"
 
 #. TRANS: Error text shown when repeating a notice fails with an unknown reason.
 #, fuzzy, php-format
 msgid "Notice from %s repeated."
 msgstr "Chío publicado"
 
 #. TRANS: Error text shown when repeating a notice fails with an unknown reason.

-#: lib/command.php:554
+#: lib/command.php:556

 msgid "Error repeating notice."
 msgstr "Acounteceu un erro configurando o usuario."
 
 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: Message given if content of a notice for a reply is too long. %1$d is used for plural.

 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.

-#: lib/command.php:589
+#: lib/command.php:591

 #, fuzzy, php-format
 #, fuzzy, php-format

-msgid "Notice too long - maximum is %1$d characters, you sent %2$d."
-msgstr "Mensaxe demasiado longa - o máximo é 140 caracteres, ti enviaches %d "
+msgid "Notice too long - maximum is %1$d character, you sent %2$d."
+msgid_plural "Notice too long - maximum is %1$d characters, you sent %2$d."
+msgstr[0] ""
+"Mensaxe demasiado longa - o máximo é 140 caracteres, ti enviaches %d "
+msgstr[1] ""
+"Mensaxe demasiado longa - o máximo é 140 caracteres, ti enviaches %d "
+msgstr[2] ""
+"Mensaxe demasiado longa - o máximo é 140 caracteres, ti enviaches %d "
+msgstr[3] ""
+"Mensaxe demasiado longa - o máximo é 140 caracteres, ti enviaches %d "
+msgstr[4] ""
+"Mensaxe demasiado longa - o máximo é 140 caracteres, ti enviaches %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.
 
 #. 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:600
+#: lib/command.php:604

 #, fuzzy, php-format
 msgid "Reply to %s sent."
 msgstr "Non se pode eliminar este chíos."
 
 #. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
 #, fuzzy, php-format
 msgid "Reply to %s sent."
 msgstr "Non se pode eliminar este chíos."
 
 #. TRANS: Error text shown when a reply to a notice fails with an unknown reason.

-#: lib/command.php:603
+#: lib/command.php:607

 #, fuzzy
 msgid "Error saving notice."
 msgstr "Aconteceu un erro ó gardar o chío."
 
 #. TRANS: Error text shown when no username was provided when issuing a subscribe command.
 #, fuzzy
 msgid "Error saving notice."
 msgstr "Aconteceu un erro ó gardar o chío."
 
 #. TRANS: Error text shown when no username was provided when issuing a subscribe command.

-#: lib/command.php:650
+#: lib/command.php:654

 #, fuzzy
 msgid "Specify the name of the user to subscribe to."
 msgstr "Especifica o nome do usuario ó que queres suscribirte"
 
 #. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
 #, fuzzy
 msgid "Specify the name of the user to subscribe to."
 msgstr "Especifica o nome do usuario ó que queres suscribirte"
 
 #. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.

-#: lib/command.php:659
+#: lib/command.php:663

 #, fuzzy
 msgid "Can't subscribe to OMB profiles by command."
 msgstr "Non estás suscrito a ese perfil"
 
 #. TRANS: Text shown after having subscribed to another user successfully.
 #. TRANS: %s is the name of the user the subscription was requested for.
 #, fuzzy
 msgid "Can't subscribe to OMB profiles by command."
 msgstr "Non estás suscrito a ese perfil"
 
 #. 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:667
+#: lib/command.php:671

 #, 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.
 #, 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:688 lib/command.php:799
+#: lib/command.php:692 lib/command.php:803

 #, fuzzy
 msgid "Specify the name of the user to unsubscribe from."
 msgstr "Especifica o nome de usuario ó que queres deixar de seguir"
 
 #. TRANS: Text shown after having unsubscribed from another user successfully.
 #. TRANS: %s is the name of the user the unsubscription was requested for.
 #, fuzzy
 msgid "Specify the name of the user to unsubscribe from."
 msgstr "Especifica o nome de usuario ó que queres deixar de seguir"
 
 #. 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:699
+#: lib/command.php:703

 #, 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.
 #, 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:719 lib/command.php:745
+#: lib/command.php:723 lib/command.php:749

 msgid "Command not yet implemented."
 msgstr "Comando non implementado."
 
 #. TRANS: Text shown when issuing the command "off" successfully.
 msgid "Command not yet implemented."
 msgstr "Comando non implementado."
 
 #. TRANS: Text shown when issuing the command "off" successfully.

-#: lib/command.php:723
+#: lib/command.php:727

 msgid "Notification off."
 msgstr "Notificación desactivada."
 
 #. TRANS: Error text shown when the command "off" fails for an unknown reason.
 msgid "Notification off."
 msgstr "Notificación desactivada."
 
 #. TRANS: Error text shown when the command "off" fails for an unknown reason.

-#: lib/command.php:726
+#: lib/command.php:730

 msgid "Can't turn off notification."
 msgstr "No se pode desactivar a notificación."
 
 #. TRANS: Text shown when issuing the command "on" successfully.
 msgid "Can't turn off notification."
 msgstr "No se pode desactivar a notificación."
 
 #. TRANS: Text shown when issuing the command "on" successfully.

-#: lib/command.php:749
+#: lib/command.php:753

 msgid "Notification on."
 msgstr "Notificación habilitada."
 
 #. TRANS: Error text shown when the command "on" fails for an unknown reason.
 msgid "Notification on."
 msgstr "Notificación habilitada."
 
 #. TRANS: Error text shown when the command "on" fails for an unknown reason.

-#: lib/command.php:752
+#: lib/command.php:756

 msgid "Can't turn on notification."
 msgstr "Non se pode activar a notificación."
 
 #. TRANS: Error text shown when issuing the login command while login is disabled.
 msgid "Can't turn on notification."
 msgstr "Non se pode activar a notificación."
 
 #. TRANS: Error text shown when issuing the login command while login is disabled.

-#: lib/command.php:766
+#: lib/command.php:770

 msgid "Login command is disabled."
 msgstr ""
 
 #. TRANS: Text shown after issuing the login command successfully.
 #. TRANS: %s is a logon link..
 msgid "Login command is disabled."
 msgstr ""
 
 #. TRANS: Text shown after issuing the login command successfully.
 #. TRANS: %s is a logon link..

-#: lib/command.php:779
+#: lib/command.php:783

 #, php-format
 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.
 #, php-format
 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:808
+#: lib/command.php:812

 #, php-format
 msgid "Unsubscribed %s."
 msgstr ""
 
 #. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
 #, 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:826
+#: lib/command.php:830

 #, fuzzy
 msgid "You are not subscribed to anyone."
 msgstr "Non estás suscrito a ese perfil"
 #, fuzzy
 msgid "You are not subscribed to anyone."
 msgstr "Non estás suscrito a ese perfil"


@@ -7046,7 +7851,7 @@ msgstr "Non estás suscrito a ese perfil"
 #. 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.
 #. 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:831
+#: lib/command.php:835

 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "Xa estas suscrito a estes usuarios:"
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "Xa estas suscrito a estes usuarios:"


@@ -7057,7 +7862,7 @@ msgstr[4] ""
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user
 #. TRANS: (followers) without having any subscribers.
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user
 #. TRANS: (followers) without having any subscribers.

-#: lib/command.php:853
+#: lib/command.php:857

 #, fuzzy
 msgid "No one is subscribed to you."
 msgstr "Outro usuario non se puido suscribir a ti."
 #, fuzzy
 msgid "No one is subscribed to you."
 msgstr "Outro usuario non se puido suscribir a ti."


@@ -7065,7 +7870,7 @@ msgstr "Outro usuario non se puido suscribir a ti."
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
 #. 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:858
+#: lib/command.php:862

 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "Outro usuario non se puido suscribir a ti."
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "Outro usuario non se puido suscribir a ti."


@@ -7076,7 +7881,7 @@ msgstr[4] ""
 
 #. TRANS: Text shown after requesting groups a user is subscribed to without having
 #. TRANS: any group subscriptions.
 
 #. TRANS: Text shown after requesting groups a user is subscribed to without having
 #. TRANS: any group subscriptions.

-#: lib/command.php:880
+#: lib/command.php:884

 #, fuzzy
 msgid "You are not a member of any groups."
 msgstr "Non estás suscrito a ese perfil"
 #, fuzzy
 msgid "You are not a member of any groups."
 msgstr "Non estás suscrito a ese perfil"


@@ -7084,7 +7889,7 @@ msgstr "Non estás suscrito a ese perfil"
 #. 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.
 #. 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:885
+#: lib/command.php:889

 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "Non estás suscrito a ese perfil"
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "Non estás suscrito a ese perfil"


@@ -7094,7 +7899,7 @@ msgstr[3] ""
 msgstr[4] ""
 
 #. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
 msgstr[4] ""
 
 #. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.

-#: lib/command.php:900
+#: lib/command.php:904

 #, fuzzy
 msgid ""
 "Commands:\n"
 #, fuzzy
 msgid ""
 "Commands:\n"


@@ -7164,26 +7969,26 @@ msgstr ""
 "tracking - non implementado por agora.\n"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 "tracking - non implementado por agora.\n"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.

-#: lib/common.php:136
+#: lib/common.php:150

 #, fuzzy
 msgid "No configuration file found."
 msgstr "Sen código de confirmación."
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: Is followed by a list of directories (separated by HTML breaks).
 #, fuzzy
 msgid "No configuration file found."
 msgstr "Sen código de confirmación."
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: Is followed by a list of directories (separated by HTML breaks).

-#: lib/common.php:139
+#: lib/common.php:153

 #, fuzzy
 msgid "I looked for configuration files in the following places:"
 msgstr "Invitación(s) enviada(s) á seguinte xente:"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #, fuzzy
 msgid "I looked for configuration files in the following places:"
 msgstr "Invitación(s) enviada(s) á seguinte xente:"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.

-#: lib/common.php:142
+#: lib/common.php:156

 msgid "You may wish to run the installer to fix this."
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: The text is link text that leads to the installer page.
 msgid "You may wish to run the installer to fix this."
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: The text is link text that leads to the installer page.

-#: lib/common.php:146
+#: lib/common.php:160

 msgid "Go to the installer."
 msgstr ""
 
 msgid "Go to the installer."
 msgstr ""
 


@@ -7227,25 +8032,41 @@ msgstr ""
 msgid "Database error"
 msgstr ""
 
 msgid "Database error"
 msgstr ""
 

-#: lib/designsettings.php:105
+#. TRANS: Label in form on profile design page.
+#. TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
+#: lib/designsettings.php:104

 #, fuzzy
 msgid "Upload file"
 msgstr "Subir"
 
 #, fuzzy
 msgid "Upload file"
 msgstr "Subir"
 

+#. TRANS: Instructions for form on profile design page.

 #: lib/designsettings.php:109
 #, fuzzy
 msgid ""
 "You can upload your personal background image. The maximum file size is 2MB."
 msgstr "Podes actualizar a túa información do perfil persoal aquí"
 
 #: lib/designsettings.php:109
 #, fuzzy
 msgid ""
 "You can upload your personal background image. The maximum file size is 2MB."
 msgstr "Podes actualizar a túa información do perfil persoal aquí"
 

-#: lib/designsettings.php:283
-#, php-format
-msgid ""
-"The server was unable to handle that much POST data (%s bytes) due to its "
-"current configuration."
+#. TRANS: Radio button on profile design page that will enable use of the uploaded profile image.
+#: lib/designsettings.php:139
+msgctxt "RADIO"
+msgid "On"

 msgstr ""
 
 msgstr ""
 

-#: lib/designsettings.php:418
+#. TRANS: Radio button on profile design page that will disable use of the uploaded profile image.
+#: lib/designsettings.php:156
+msgctxt "RADIO"
+msgid "Off"
+msgstr ""
+
+#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
+#: lib/designsettings.php:264
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Reset"
+msgstr "Restaurar"
+
+#. TRANS: Success message displayed if design settings were saved after clicking "Use defaults".
+#: lib/designsettings.php:433

 msgid "Design defaults restored."
 msgstr ""
 
 msgid "Design defaults restored."
 msgstr ""
 


@@ -7273,7 +8094,20 @@ msgstr ""
 msgid "FOAF"
 msgstr ""
 
 msgid "FOAF"
 msgstr ""
 

-#: lib/feedlist.php:65
+#: lib/feedimporter.php:75
+msgid "Not an atom feed."
+msgstr ""
+
+#: lib/feedimporter.php:82
+msgid "No author in the feed."
+msgstr ""
+
+#: lib/feedimporter.php:89
+msgid "Can't import without a user."
+msgstr ""
+
+#. TRANS: Header for feed links (h2).
+#: lib/feedlist.php:66

 msgid "Feeds"
 msgstr ""
 
 msgid "Feeds"
 msgstr ""
 


@@ -7314,7 +8148,7 @@ msgstr ""
 
 #: lib/groupeditform.php:163
 #, fuzzy
 
 #: lib/groupeditform.php:163
 #, fuzzy

-msgid "URL of the homepage or blog of the group or topic"
+msgid "URL of the homepage or blog of the group or topic."

 msgstr "Enderezo da túa páxina persoal, blogue, ou perfil noutro sitio"
 
 #: lib/groupeditform.php:168
 msgstr "Enderezo da túa páxina persoal, blogue, ou perfil noutro sitio"
 
 #: lib/groupeditform.php:168


@@ -7324,19 +8158,33 @@ msgstr "Contanos un pouco de ti e dos teus intereses en 140 caractéres."
 
 #: lib/groupeditform.php:170
 #, fuzzy, php-format
 
 #: lib/groupeditform.php:170
 #, fuzzy, php-format

-msgid "Describe the group or topic in %d characters"
-msgstr "Contanos un pouco de ti e dos teus intereses en 140 caractéres."
+msgid "Describe the group or topic in %d character or less"
+msgid_plural "Describe the group or topic in %d characters or less"
+msgstr[0] "Contanos un pouco de ti e dos teus intereses en 140 caractéres."
+msgstr[1] "Contanos un pouco de ti e dos teus intereses en 140 caractéres."
+msgstr[2] "Contanos un pouco de ti e dos teus intereses en 140 caractéres."
+msgstr[3] "Contanos un pouco de ti e dos teus intereses en 140 caractéres."
+msgstr[4] "Contanos un pouco de ti e dos teus intereses en 140 caractéres."

 
 

-#: lib/groupeditform.php:179
+#: lib/groupeditform.php:182

 #, fuzzy
 msgid ""
 #, fuzzy
 msgid ""

-"Location for the group, if any, like \"City, State (or Region), Country\""
+"Location for the group, if any, like \"City, State (or Region), Country\"."

 msgstr "¿Onde estas, coma \"Cidade, Provincia, País\""
 
 msgstr "¿Onde estas, coma \"Cidade, Provincia, País\""
 

-#: lib/groupeditform.php:187
+#: lib/groupeditform.php:190

 #, php-format
 #, php-format

-msgid "Extra nicknames for the group, comma- or space- separated, max %d"
-msgstr ""
+msgid ""
+"Extra nicknames for the group, separated with commas or spaces. Maximum %d "
+"alias allowed."
+msgid_plural ""
+"Extra nicknames for the group, separated with commas or spaces. Maximum %d "
+"aliases allowed."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""

 
 #. TRANS: Menu item in the group navigation page.
 #: lib/groupnav.php:86
 
 #. TRANS: Menu item in the group navigation page.
 #: lib/groupnav.php:86


@@ -7436,40 +8284,62 @@ msgstr "Esta páxina non está dispoñíbel no tipo de medio que aceptas"
 msgid "Unsupported image file format."
 msgstr "Formato de ficheiro de imaxe non soportado."
 
 msgid "Unsupported image file format."
 msgstr "Formato de ficheiro de imaxe non soportado."
 

-#: lib/imagefile.php:88
+#. TRANS: Exception thrown when too large a file is uploaded.
+#. TRANS: %s is the maximum file size, for example "500b", "10kB" or "2MB".
+#: lib/imagefile.php:90

 #, fuzzy, php-format
 msgid "That file is too big. The maximum file size is %s."
 msgstr "Podes actualizar a túa información do perfil persoal aquí"
 
 #, fuzzy, php-format
 msgid "That file is too big. The maximum file size is %s."
 msgstr "Podes actualizar a túa información do perfil persoal aquí"
 

-#: lib/imagefile.php:93
+#: lib/imagefile.php:95

 msgid "Partial upload."
 msgstr "Carga parcial."
 
 msgid "Partial upload."
 msgstr "Carga parcial."
 

-#. 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."
-
-#: lib/imagefile.php:109
+#: lib/imagefile.php:111

 msgid "Not an image or corrupt file."
 msgstr "Non é unha imaxe ou está corrupta."
 
 msgid "Not an image or corrupt file."
 msgstr "Non é unha imaxe ou está corrupta."
 

-#: lib/imagefile.php:122
+#: lib/imagefile.php:160

 msgid "Lost our file."
 msgstr "Ningún chío."
 
 msgid "Lost our file."
 msgstr "Ningún chío."
 

-#: lib/imagefile.php:163 lib/imagefile.php:224
+#: lib/imagefile.php:197 lib/imagefile.php:237

 #, fuzzy
 msgid "Unknown file type"
 msgstr "tipo de ficheiro non soportado"
 
 #, fuzzy
 msgid "Unknown file type"
 msgstr "tipo de ficheiro non soportado"
 

-#: lib/imagefile.php:244
-msgid "MB"
-msgstr ""
+#. TRANS: Number of megabytes. %d is the number.
+#: lib/imagefile.php:283
+#, php-format
+msgid "%dMB"
+msgid_plural "%dMB"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""

 
 

-#: lib/imagefile.php:246
-msgid "kB"
-msgstr ""
+#. TRANS: Number of kilobytes. %d is the number.
+#: lib/imagefile.php:287
+#, php-format
+msgid "%dkB"
+msgid_plural "%dkB"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+
+#. TRANS: Number of bytes. %d is the number.
+#: lib/imagefile.php:290
+#, php-format
+msgid "%dB"
+msgid_plural "%dB"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""

 
 #: lib/jabber.php:387
 #, php-format
 
 #: lib/jabber.php:387
 #, php-format


@@ -7713,7 +8583,7 @@ msgstr ""
 
 #. TRANS: Subject for favorite notification e-mail.
 #. TRANS: %1$s is the adding user's long name, %2$s is the adding user's nickname.
 
 #. TRANS: Subject for favorite notification e-mail.
 #. TRANS: %1$s is the adding user's long name, %2$s is the adding user's nickname.

-#: lib/mail.php:603
+#: lib/mail.php:607

 #, fuzzy, php-format
 msgid "%1$s (@%2$s) added your notice as a favorite"
 msgstr "Enviar un correo cando alguen enganda un chío meu coma favorito."
 #, fuzzy, php-format
 msgid "%1$s (@%2$s) added your notice as a favorite"
 msgstr "Enviar un correo cando alguen enganda un chío meu coma favorito."


@@ -7723,7 +8593,7 @@ msgstr "Enviar un correo cando alguen enganda un chío meu coma favorito."
 #. TRANS: %3$s is a URL to the faved notice, %4$s is the faved notice text,
 #. TRANS: %5$s is a URL to all faves of the adding user, %6$s is the StatusNet sitename,
 #. TRANS: %7$s is the adding user's nickname.
 #. TRANS: %3$s is a URL to the faved notice, %4$s is the faved notice text,
 #. TRANS: %5$s is a URL to all faves of the adding user, %6$s is the StatusNet sitename,
 #. TRANS: %7$s is the adding user's nickname.

-#: lib/mail.php:610
+#: lib/mail.php:614

 #, fuzzy, php-format
 msgid ""
 "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
 #, fuzzy, php-format
 msgid ""
 "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"


@@ -7757,7 +8627,7 @@ msgstr ""
 "%5$s\n"
 
 #. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
 "%5$s\n"
 
 #. TRANS: Line in @-reply notification e-mail. %s is conversation URL.

-#: lib/mail.php:668
+#: lib/mail.php:672

 #, php-format
 msgid ""
 "The full conversation can be read here:\n"
 #, php-format
 msgid ""
 "The full conversation can be read here:\n"


@@ -7767,7 +8637,7 @@ msgstr ""
 
 #. TRANS: E-mail subject for notice notification.
 #. TRANS: %1$s is the sending user's long name, %2$s is the adding user's nickname.
 
 #. TRANS: E-mail subject for notice notification.
 #. TRANS: %1$s is the sending user's long name, %2$s is the adding user's nickname.

-#: lib/mail.php:676
+#: lib/mail.php:680

 #, php-format
 msgid "%1$s (@%2$s) sent a notice to your attention"
 msgstr ""
 #, php-format
 msgid "%1$s (@%2$s) sent a notice to your attention"
 msgstr ""


@@ -7778,7 +8648,7 @@ msgstr ""
 #. TRANS: %5$s is a URL to the full conversion if it exists (otherwise empty),
 #. TRANS: %6$s is a URL to reply to the notice, %7$s is a URL to all @-replied for the addressed user,
 #. TRANS: %8$s is a URL to the addressed user's e-mail settings, %9$s is the sender's nickname.
 #. TRANS: %5$s is a URL to the full conversion if it exists (otherwise empty),
 #. TRANS: %6$s is a URL to reply to the notice, %7$s is a URL to all @-replied for the addressed user,
 #. TRANS: %8$s is a URL to the addressed user's e-mail settings, %9$s is the sender's nickname.

-#: lib/mail.php:684
+#: lib/mail.php:688

 #, php-format
 msgid ""
 "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
 #, php-format
 msgid ""
 "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"


@@ -7815,7 +8685,7 @@ msgid ""
 "users in conversation. People can send you messages for your eyes only."
 msgstr ""
 
 "users in conversation. People can send you messages for your eyes only."
 msgstr ""
 

-#: lib/mailbox.php:228 lib/noticelist.php:516
+#: lib/mailbox.php:228 lib/noticelist.php:522

 #, fuzzy
 msgid "from"
 msgstr " dende "
 #, fuzzy
 msgid "from"
 msgstr " dende "


@@ -7836,69 +8706,37 @@ msgstr "Ise é un enderezo IM incorrecto."
 msgid "Sorry, no incoming email allowed."
 msgstr "Aivá, non se permiten correos entrantes."
 
 msgid "Sorry, no incoming email allowed."
 msgstr "Aivá, non se permiten correos entrantes."
 

-#: lib/mailhandler.php:228
+#: lib/mailhandler.php:229

 #, fuzzy, php-format
 msgid "Unsupported message type: %s"
 msgstr "Formato de ficheiro de imaxe non soportado."
 
 #. TRANS: Client exception thrown when a database error was thrown during a file upload operation.
 #, fuzzy, php-format
 msgid "Unsupported message type: %s"
 msgstr "Formato de ficheiro de imaxe non soportado."
 
 #. TRANS: Client exception thrown when a database error was thrown during a file upload operation.

-#: lib/mediafile.php:99 lib/mediafile.php:125
+#: lib/mediafile.php:102 lib/mediafile.php:174

 msgid "There was a database error while saving your file. Please try again."
 msgstr ""
 
 msgid "There was a database error while saving your file. Please try again."
 msgstr ""
 

-#. 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 ""
-
-#. 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 ""
-
-#. TRANS: Client exception.
-#: lib/mediafile.php:157
-msgid "The uploaded file was only partially uploaded."
-msgstr ""
-
-#. 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 ""
-
-#. 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 ""
-

 #. TRANS: Client exception thrown when a file upload operation would cause a user to exceed a set quota.
 #. 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
+#: lib/mediafile.php:238 lib/mediafile.php:281

 msgid "File exceeds user's quota."
 msgstr ""
 
 #. 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.
 msgid "File exceeds user's quota."
 msgstr ""
 
 #. 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
+#: lib/mediafile.php:258 lib/mediafile.php:300

 msgid "File could not be moved to destination directory."
 msgstr ""
 
 #. 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.
 msgid "File could not be moved to destination directory."
 msgstr ""
 
 #. 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
+#: lib/mediafile.php:265 lib/mediafile.php:306

 msgid "Could not determine file's MIME type."
 msgstr "Non se puido eliminar o favorito."
 
 #. 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.
 msgid "Could not determine file's MIME type."
 msgstr "Non se puido eliminar o favorito."
 
 #. 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
+#: lib/mediafile.php:396

 #, php-format
 msgid ""
 "\"%1$s\" is not a supported file type on this server. Try using another %2$s "
 #, php-format
 msgid ""
 "\"%1$s\" is not a supported file type on this server. Try using another %2$s "


@@ -7907,7 +8745,7 @@ msgstr ""
 
 #. TRANS: Client exception thrown trying to upload a forbidden MIME type.
 #. TRANS: %s is the file type that was denied.
 
 #. TRANS: Client exception thrown trying to upload a forbidden MIME type.
 #. TRANS: %s is the file type that was denied.

-#: lib/mediafile.php:345
+#: lib/mediafile.php:401

 #, php-format
 msgid "\"%s\" is not a supported file type on this server."
 msgstr ""
 #, php-format
 msgid "\"%s\" is not a supported file type on this server."
 msgstr ""


@@ -7917,21 +8755,54 @@ msgstr ""
 msgid "Send a direct notice"
 msgstr "Eliminar chío"
 
 msgid "Send a direct notice"
 msgstr "Eliminar chío"
 

-#: lib/messageform.php:146
+#. TRANS Label entry in drop-down selection box in direct-message inbox/outbox. This is the default entry in the drop-down box, doubling as instructions and a brake against accidental submissions with the first user in the list.
+#: lib/messageform.php:137
+#, fuzzy
+msgid "Select recipient:"
+msgstr "Selecciona unha operadora"
+
+#. TRANS Entry in drop-down selection box in direct-message inbox/outbox when no one is available to message.
+#: lib/messageform.php:150
+#, fuzzy
+msgid "No mutual subscribers."
+msgstr "Non está suscrito!"
+
+#: lib/messageform.php:153

 msgid "To"
 msgstr "A"
 
 msgid "To"
 msgstr "A"
 

-#: lib/messageform.php:159 lib/noticeform.php:186
+#: lib/messageform.php:166 lib/noticeform.php:186

 #, fuzzy
 msgid "Available characters"
 msgstr "6 ou máis caracteres"
 
 #, fuzzy
 msgid "Available characters"
 msgstr "6 ou máis caracteres"
 

-#: lib/messageform.php:178 lib/noticeform.php:237
+#: lib/messageform.php:185 lib/noticeform.php:237

 #, fuzzy
 msgctxt "Send button for sending notice"
 msgid "Send"
 msgstr "Enviar"
 
 #, fuzzy
 msgctxt "Send button for sending notice"
 msgid "Send"
 msgstr "Enviar"
 

+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: lib/nickname.php:165
+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."
+
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: lib/nickname.php:178
+msgid "Nickname cannot be empty."
+msgstr ""
+
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: lib/nickname.php:191
+#, php-format
+msgid "Nickname cannot be more than %d character long."
+msgid_plural "Nickname cannot be more than %d characters long."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+

 #: lib/noticeform.php:160
 msgid "Send a notice"
 msgstr "Novo chío"
 #: lib/noticeform.php:160
 msgid "Send a notice"
 msgstr "Novo chío"


@@ -7966,59 +8837,59 @@ msgid ""
 msgstr ""
 
 #. TRANS: Used in coordinates as abbreviation of north
 msgstr ""
 
 #. TRANS: Used in coordinates as abbreviation of north

-#: lib/noticelist.php:446
+#: lib/noticelist.php:452

 #, fuzzy
 msgid "N"
 msgstr "No"
 
 #. TRANS: Used in coordinates as abbreviation of south
 #, fuzzy
 msgid "N"
 msgstr "No"
 
 #. TRANS: Used in coordinates as abbreviation of south

-#: lib/noticelist.php:448
+#: lib/noticelist.php:454

 msgid "S"
 msgstr ""
 
 #. TRANS: Used in coordinates as abbreviation of east
 msgid "S"
 msgstr ""
 
 #. TRANS: Used in coordinates as abbreviation of east

-#: lib/noticelist.php:450
+#: lib/noticelist.php:456

 msgid "E"
 msgstr ""
 
 #. TRANS: Used in coordinates as abbreviation of west
 msgid "E"
 msgstr ""
 
 #. TRANS: Used in coordinates as abbreviation of west

-#: lib/noticelist.php:452
+#: lib/noticelist.php:458

 msgid "W"
 msgstr ""
 
 msgid "W"
 msgstr ""
 

-#: lib/noticelist.php:454
+#: lib/noticelist.php:460

 #, php-format
 msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 msgstr ""
 
 #, php-format
 msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 msgstr ""
 

-#: lib/noticelist.php:463
+#: lib/noticelist.php:469

 msgid "at"
 msgstr ""
 
 msgid "at"
 msgstr ""
 

-#: lib/noticelist.php:512
+#: lib/noticelist.php:518

 msgid "web"
 msgstr ""
 
 msgid "web"
 msgstr ""
 

-#: lib/noticelist.php:578
+#: lib/noticelist.php:584

 #, fuzzy
 msgid "in context"
 msgstr "Sen contido!"
 
 #, fuzzy
 msgid "in context"
 msgstr "Sen contido!"
 

-#: lib/noticelist.php:613
+#: lib/noticelist.php:619

 #, fuzzy
 msgid "Repeated by"
 msgstr "Crear"
 
 #, fuzzy
 msgid "Repeated by"
 msgstr "Crear"
 

-#: lib/noticelist.php:640
+#: lib/noticelist.php:646

 #, fuzzy
 msgid "Reply to this notice"
 msgstr "Non se pode eliminar este chíos."
 
 #, fuzzy
 msgid "Reply to this notice"
 msgstr "Non se pode eliminar este chíos."
 

-#: lib/noticelist.php:641
+#: lib/noticelist.php:647

 msgid "Reply"
 msgstr "Respostas"
 
 msgid "Reply"
 msgstr "Respostas"
 

-#: lib/noticelist.php:685
+#: lib/noticelist.php:691

 #, fuzzy
 msgid "Notice repeated"
 msgstr "Chío publicado"
 #, fuzzy
 msgid "Notice repeated"
 msgstr "Chío publicado"


@@ -8059,31 +8930,31 @@ msgstr ""
 msgid "Couldn't insert new subscription."
 msgstr "Non se puido inserir a nova subscrición."
 
 msgid "Couldn't insert new subscription."
 msgstr "Non se puido inserir a nova subscrición."
 

-#: lib/personalgroupnav.php:99
+#: lib/personalgroupnav.php:102

 msgid "Personal"
 msgstr "Persoal"
 
 msgid "Personal"
 msgstr "Persoal"
 

-#: lib/personalgroupnav.php:104
+#: lib/personalgroupnav.php:107

 msgid "Replies"
 msgstr "Respostas"
 
 msgid "Replies"
 msgstr "Respostas"
 

-#: lib/personalgroupnav.php:114
+#: lib/personalgroupnav.php:117

 msgid "Favorites"
 msgstr "Favoritos"
 
 msgid "Favorites"
 msgstr "Favoritos"
 

-#: lib/personalgroupnav.php:125
+#: lib/personalgroupnav.php:128

 msgid "Inbox"
 msgstr "Band. Entrada"
 
 msgid "Inbox"
 msgstr "Band. Entrada"
 

-#: lib/personalgroupnav.php:126
+#: lib/personalgroupnav.php:129

 msgid "Your incoming messages"
 msgstr "As túas mensaxes entrantes"
 
 msgid "Your incoming messages"
 msgstr "As túas mensaxes entrantes"
 

-#: lib/personalgroupnav.php:130
+#: lib/personalgroupnav.php:133

 msgid "Outbox"
 msgstr "Band. Saída"
 
 msgid "Outbox"
 msgstr "Band. Saída"
 

-#: lib/personalgroupnav.php:131
+#: lib/personalgroupnav.php:134

 msgid "Your sent messages"
 msgstr "As túas mensaxes enviadas"
 
 msgid "Your sent messages"
 msgstr "As túas mensaxes enviadas"
 


@@ -8184,7 +9055,7 @@ msgid "Revoke the \"%s\" role from this user"
 msgstr ""
 
 #. TRANS: Client error on action trying to visit a non-existing page.
 msgstr ""
 
 #. TRANS: Client error on action trying to visit a non-existing page.

-#: lib/router.php:847
+#: lib/router.php:974

 #, fuzzy
 msgid "Page not found."
 msgstr "Método da API non atopado"
 #, fuzzy
 msgid "Page not found."
 msgstr "Método da API non atopado"


@@ -8200,17 +9071,18 @@ msgid "Sandbox this user"
 msgstr "Bloquear usuario"
 
 #. TRANS: Fieldset legend for the search form.
 msgstr "Bloquear usuario"
 
 #. TRANS: Fieldset legend for the search form.

-#: lib/searchaction.php:121
+#: lib/searchaction.php:120

 #, fuzzy
 msgid "Search site"
 msgstr "Buscar"
 
 #. TRANS: Used as a field label for the field where one or more keywords
 #. TRANS: for searching can be entered.
 #, fuzzy
 msgid "Search site"
 msgstr "Buscar"
 
 #. TRANS: Used as a field label for the field where one or more keywords
 #. TRANS: for searching can be entered.

-#: lib/searchaction.php:129
+#: lib/searchaction.php:128

 msgid "Keyword(s)"
 msgstr ""
 
 msgid "Keyword(s)"
 msgstr ""
 

+#. TRANS: Button text for searching site.

 #: lib/searchaction.php:130
 msgctxt "BUTTON"
 msgid "Search"
 #: lib/searchaction.php:130
 msgctxt "BUTTON"
 msgid "Search"


@@ -8298,6 +9170,12 @@ msgstr ""
 msgid "None"
 msgstr "No"
 
 msgid "None"
 msgstr "No"
 

+#. TRANS: Server exception displayed if a theme name was invalid.
+#: lib/theme.php:74
+#, fuzzy
+msgid "Invalid theme name."
+msgstr "Tamaño inválido."
+

 #: lib/themeuploader.php:50
 msgid "This server cannot handle theme uploads without ZIP support."
 msgstr ""
 #: lib/themeuploader.php:50
 msgid "This server cannot handle theme uploads without ZIP support."
 msgstr ""


@@ -8307,8 +9185,8 @@ msgid "The theme file is missing or the upload failed."
 msgstr ""
 
 #: lib/themeuploader.php:91 lib/themeuploader.php:102
 msgstr ""
 
 #: lib/themeuploader.php:91 lib/themeuploader.php:102

-#: lib/themeuploader.php:278 lib/themeuploader.php:282
-#: lib/themeuploader.php:290 lib/themeuploader.php:297
+#: lib/themeuploader.php:279 lib/themeuploader.php:283
+#: lib/themeuploader.php:291 lib/themeuploader.php:298

 #, fuzzy
 msgid "Failed saving theme."
 msgstr "Acounteceu un fallo ó actualizar o avatar."
 #, fuzzy
 msgid "Failed saving theme."
 msgstr "Acounteceu un fallo ó actualizar o avatar."


@@ -8319,29 +9197,35 @@ msgstr ""
 
 #: lib/themeuploader.php:166
 #, php-format
 
 #: lib/themeuploader.php:166
 #, php-format

-msgid "Uploaded theme is too large; must be less than %d bytes uncompressed."
-msgstr ""
+msgid "Uploaded theme is too large; must be less than %d byte uncompressed."
+msgid_plural ""
+"Uploaded theme is too large; must be less than %d bytes uncompressed."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""

 
 

-#: lib/themeuploader.php:178
+#: lib/themeuploader.php:179

 msgid "Invalid theme archive: missing file css/display.css"
 msgstr ""
 
 msgid "Invalid theme archive: missing file css/display.css"
 msgstr ""
 

-#: lib/themeuploader.php:218
+#: lib/themeuploader.php:219

 msgid ""
 "Theme contains invalid file or folder name. Stick with ASCII letters, "
 "digits, underscore, and minus sign."
 msgstr ""
 
 msgid ""
 "Theme contains invalid file or folder name. Stick with ASCII letters, "
 "digits, underscore, and minus sign."
 msgstr ""
 

-#: lib/themeuploader.php:224
+#: lib/themeuploader.php:225

 msgid "Theme contains unsafe file extension names; may be unsafe."
 msgstr ""
 
 msgid "Theme contains unsafe file extension names; may be unsafe."
 msgstr ""
 

-#: lib/themeuploader.php:241
+#: lib/themeuploader.php:242

 #, php-format
 msgid "Theme contains file of type '.%s', which is not allowed."
 msgstr ""
 
 #, php-format
 msgid "Theme contains file of type '.%s', which is not allowed."
 msgstr ""
 

-#: lib/themeuploader.php:259
+#: lib/themeuploader.php:260

 msgid "Error opening theme archive."
 msgstr "Acounteceu un erro borrando o bloqueo."
 
 msgid "Error opening theme archive."
 msgstr "Acounteceu un erro borrando o bloqueo."
 


@@ -8349,6 +9233,13 @@ msgstr "Acounteceu un erro borrando o bloqueo."
 msgid "Top posters"
 msgstr ""
 
 msgid "Top posters"
 msgstr ""
 

+#. TRANS: Title for the form to unblock a user.
+#: lib/unblockform.php:67
+#, fuzzy
+msgctxt "TITLE"
+msgid "Unblock"
+msgstr "Desbloquear"
+

 #: lib/unsandboxform.php:69
 msgid "Unsandbox"
 msgstr ""
 #: lib/unsandboxform.php:69
 msgid "Unsandbox"
 msgstr ""


@@ -8383,70 +9274,70 @@ msgstr "Eliminar subscrición"
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "O usuario non ten perfil."
 
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "O usuario non ten perfil."
 

-#: lib/userprofile.php:117
+#: lib/userprofile.php:119

 #, fuzzy
 msgid "Edit Avatar"
 msgstr "Avatar"
 
 #, fuzzy
 msgid "Edit Avatar"
 msgstr "Avatar"
 

-#: lib/userprofile.php:234 lib/userprofile.php:248
+#: lib/userprofile.php:236 lib/userprofile.php:250

 #, fuzzy
 msgid "User actions"
 msgstr "Outras opcions"
 
 #, fuzzy
 msgid "User actions"
 msgstr "Outras opcions"
 

-#: lib/userprofile.php:237
+#: lib/userprofile.php:239

 msgid "User deletion in progress..."
 msgstr ""
 
 msgid "User deletion in progress..."
 msgstr ""
 

-#: lib/userprofile.php:263
+#: lib/userprofile.php:265

 #, fuzzy
 msgid "Edit profile settings"
 msgstr "Configuración de perfil"
 
 #, fuzzy
 msgid "Edit profile settings"
 msgstr "Configuración de perfil"
 

-#: lib/userprofile.php:264
+#: lib/userprofile.php:266

 msgid "Edit"
 msgstr ""
 
 msgid "Edit"
 msgstr ""
 

-#: lib/userprofile.php:287
+#: lib/userprofile.php:289

 #, fuzzy
 msgid "Send a direct message to this user"
 msgstr "Non podes enviar mensaxes a este usurio."
 
 #, fuzzy
 msgid "Send a direct message to this user"
 msgstr "Non podes enviar mensaxes a este usurio."
 

-#: lib/userprofile.php:288
+#: lib/userprofile.php:290

 #, fuzzy
 msgid "Message"
 msgstr "Nova mensaxe"
 
 #, fuzzy
 msgid "Message"
 msgstr "Nova mensaxe"
 

-#: lib/userprofile.php:326
+#: lib/userprofile.php:331

 msgid "Moderate"
 msgstr ""
 
 msgid "Moderate"
 msgstr ""
 

-#: lib/userprofile.php:364
+#: lib/userprofile.php:369

 #, fuzzy
 msgid "User role"
 msgstr "O usuario non ten perfil."
 
 #, fuzzy
 msgid "User role"
 msgstr "O usuario non ten perfil."
 

-#: lib/userprofile.php:366
+#: lib/userprofile.php:371

 msgctxt "role"
 msgid "Administrator"
 msgstr ""
 
 msgctxt "role"
 msgid "Administrator"
 msgstr ""
 

-#: lib/userprofile.php:367
+#: lib/userprofile.php:372

 msgctxt "role"
 msgid "Moderator"
 msgstr ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 msgctxt "role"
 msgid "Moderator"
 msgstr ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.

-#: lib/util.php:1175
+#: lib/util.php:1306

 msgid "a few seconds ago"
 msgstr "fai uns segundos"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 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:1178
+#: lib/util.php:1309

 msgid "about a minute ago"
 msgstr "fai un minuto"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 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:1182
+#: lib/util.php:1313

 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"
 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"


@@ -8457,12 +9348,12 @@ msgstr[3] ""
 msgstr[4] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 msgstr[4] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.

-#: lib/util.php:1185
+#: lib/util.php:1316

 msgid "about an hour ago"
 msgstr "fai unha hora"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 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:1189
+#: lib/util.php:1320

 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"
 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"


@@ -8473,12 +9364,12 @@ msgstr[3] ""
 msgstr[4] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 msgstr[4] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.

-#: lib/util.php:1192
+#: lib/util.php:1323

 msgid "about a day ago"
 msgstr "fai un día"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 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:1196
+#: lib/util.php:1327

 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"
 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"


@@ -8489,12 +9380,12 @@ msgstr[3] ""
 msgstr[4] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 msgstr[4] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.

-#: lib/util.php:1199
+#: lib/util.php:1330

 msgid "about a month ago"
 msgstr "fai un mes"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 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:1203
+#: lib/util.php:1334

 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"
 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"


@@ -8505,7 +9396,7 @@ msgstr[3] ""
 msgstr[4] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 msgstr[4] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.

-#: lib/util.php:1206
+#: lib/util.php:1337

 msgid "about a year ago"
 msgstr "fai un ano"
 
 msgid "about a year ago"
 msgstr "fai un ano"
 


@@ -8522,14 +9413,14 @@ msgid "%s is not a valid color! Use 3 or 6 hex characters."
 msgstr "A páxina persoal semella que non é unha URL válida."
 
 #. TRANS: %s is the URL to the StatusNet site's Instant Messaging settings.
 msgstr "A páxina persoal semella que non é unha URL válida."
 
 #. TRANS: %s is the URL to the StatusNet site's Instant Messaging settings.

-#: lib/xmppmanager.php:285
+#: lib/xmppmanager.php:287

 #, php-format
 msgid "Unknown user. Go to %s to add your address to your account"
 msgstr ""
 
 #. TRANS: Response to XMPP source when it sent too long a message.
 #. TRANS: %1$d the maximum number of allowed characters (used for plural), %2$d is the sent number.
 #, php-format
 msgid "Unknown user. Go to %s to add your address to your account"
 msgstr ""
 
 #. TRANS: Response to XMPP source when it sent too long a message.
 #. TRANS: %1$d the maximum number of allowed characters (used for plural), %2$d is the sent number.

-#: lib/xmppmanager.php:404
+#: lib/xmppmanager.php:406

 #, fuzzy, php-format
 msgid "Message too long. Maximum is %1$d character, you sent %2$d."
 msgid_plural "Message too long. Maximum is %1$d characters, you sent %2$d."
 #, fuzzy, php-format
 msgid "Message too long. Maximum is %1$d character, you sent %2$d."
 msgid_plural "Message too long. Maximum is %1$d characters, you sent %2$d."


@@ -8544,17 +9435,19 @@ msgstr[3] ""
 msgstr[4] ""
 "Mensaxe demasiado longa - o máximo é 140 caracteres, ti enviaches %d "
 
 msgstr[4] ""
 "Mensaxe demasiado longa - o máximo é 140 caracteres, ti enviaches %d "
 

-#: scripts/restoreuser.php:82
-#, php-format
-msgid "Backup file for user %s (%s)"
-msgstr ""
-
-#: scripts/restoreuser.php:88
+#. TRANS: Exception.
+#: lib/xrd.php:64

 #, fuzzy
 #, fuzzy

-msgid "No user specified; using backup user."
-msgstr "Non se especificou ningún perfil."
+msgid "Invalid XML."
+msgstr "Tamaño inválido."
+
+#. TRANS: Exception.
+#: lib/xrd.php:69
+msgid "Invalid XML, missing XRD root."
+msgstr ""

 
 

-#: scripts/restoreuser.php:94
+#. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
+#: scripts/restoreuser.php:62

 #, php-format
 #, php-format

-msgid "%d entries in backup."
+msgid "Getting backup from file '%s'."

 msgstr ""
 msgstr ""