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

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

diff --git a/locale/af/LC_MESSAGES/statusnet.po b/locale/af/LC_MESSAGES/statusnet.po
index 2c8d9e4accae75a9a5a02b7505b94ab23dd6469e..4b004e3c3c727df9007de5c33fe7005ccb728ba5 100644 (file)
--- a/locale/af/LC_MESSAGES/statusnet.po
+++ b/locale/af/LC_MESSAGES/statusnet.po
@@ -9,17 +9,17 @@ 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-11-04 18:25+0000\n"
-"PO-Revision-Date: 2010-11-04 18:27:02+0000\n"
+"POT-Creation-Date: 2011-01-14 23:32+0000\n"
+"PO-Revision-Date: 2011-01-14 23:34:31+0000\n"

 "Language-Team: Afrikaans <http://translatewiki.net/wiki/Portal:af>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language-Team: Afrikaans <http://translatewiki.net/wiki/Portal:af>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

-"X-Generator: MediaWiki 1.17alpha (r76004); 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: af\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: af\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"

-"X-POT-Import-Date: 2010-11-02 23:22:49+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


@@ -85,11 +85,11 @@ msgstr "Stoor toegangsinstellings"
 #. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
 #. TRANS: Button text on profile design page to save settings.
 #. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
 #. TRANS: Button text on profile design page to save settings.

-#: actions/accessadminpanel.php:193 actions/emailsettings.php:228
+#: 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/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:246 actions/useradminpanel.php:298
+#: actions/subscriptions.php:262 actions/useradminpanel.php:298

 #: lib/applicationeditform.php:355 lib/designsettings.php:270
 #: lib/groupeditform.php:207
 msgctxt "BUTTON"
 #: lib/applicationeditform.php:355 lib/designsettings.php:270
 #: lib/groupeditform.php:207
 msgctxt "BUTTON"


@@ -104,6 +104,7 @@ msgid "No such page."
 msgstr "Hierdie bladsy bestaan nie."
 
 #. TRANS: Client error when user not found for an action.
 msgstr "Hierdie bladsy bestaan nie."
 
 #. 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,24 +125,26 @@ msgstr "Hierdie bladsy bestaan nie."
 #. 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: 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.

-#: 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: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/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."
 #: actions/xrds.php:71 lib/command.php:497 lib/galleryaction.php:59
 #: lib/mailbox.php:82 lib/profileaction.php:77
 msgid "No such user."


@@ -157,7 +160,7 @@ msgstr "%1$s en vriende, bladsy %2$d"
 #. 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
 #: lib/personalgroupnav.php:103
 #, php-format
 #: actions/apitimelinefriends.php:207 actions/apitimelinehome.php:113
 #: lib/personalgroupnav.php:103
 #, php-format


@@ -227,7 +230,7 @@ msgstr "U en vriende"
 
 #. 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!"


@@ -268,11 +271,11 @@ msgstr "Opdaterings van %1$s en vriende op %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

 msgid "API method not found."
 msgstr "Die API-funksie is nie gevind nie."
 
 msgid "API method not found."
 msgstr "Die API-funksie is nie gevind nie."
 


@@ -313,7 +316,8 @@ msgstr "Kon nie die gebruiker opdateer nie."
 #: 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/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
 #: 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


@@ -365,6 +369,38 @@ msgstr "Dit was nie moontlik om u ontwerp-instellings te stoor nie."
 msgid "Could not update your design."
 msgstr "Dit was nie moontlik om u ontwerp by te werk nie."
 
 msgid "Could not update your design."
 msgstr "Dit was nie moontlik om u ontwerp by te werk nie."
 

+#: 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 "%s tydlyn"
+
+#. 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 "Beskrywing"
+
+#: actions/apiatomservice.php:113 actions/atompubfavoritefeed.php:142
+#, fuzzy, php-format
+msgid "%s favorites"
+msgstr "Gunstelinge"
+
+#: actions/apiatomservice.php:123
+#, fuzzy, php-format
+msgid "%s memberships"
+msgstr "lede van die groep %s"
+

 #. TRANS: Client error displayed when users try to block themselves.
 #: actions/apiblockcreate.php:104
 msgid "You cannot block yourself!"
 #. TRANS: Client error displayed when users try to block themselves.
 #: actions/apiblockcreate.php:104
 msgid "You cannot block yourself!"


@@ -494,7 +530,7 @@ msgstr "U kan nie ophou om uself te volg nie."
 
 #. TRANS: Client error displayed when supplying invalid parameters to an API call checking if a friendship exists.
 #: actions/apifriendshipsexists.php:88
 
 #. TRANS: Client error displayed when supplying invalid parameters to an API call checking if a friendship exists.
 #: actions/apifriendshipsexists.php:88

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

 msgstr ""
 
 #. TRANS: Client error displayed when a source user could not be determined showing friendship.
 msgstr ""
 
 #. TRANS: Client error displayed when a source user could not be determined showing friendship.


@@ -509,24 +545,13 @@ msgstr "Kon nie die gebruiker opdateer nie."
 msgid "Could not find target user."
 msgstr "Kon nie die gebruiker opdateer nie."
 
 msgid "Could not find target user."
 msgstr "Kon nie die gebruiker opdateer nie."
 

-#. TRANS: Group edit form validation error.
-#. TRANS: Group create form validation error.
-#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:165 actions/editgroup.php:191
-#: actions/newgroup.php:127 actions/profilesettings.php:243
-#: actions/register.php:212
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
-msgstr ""
-"Die gebruikersnaam mag slegs uit kleinletters en syfers bestaan en mag geen "
-"spasies bevat nie."
-

 #. 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: 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.

-#: actions/apigroupcreate.php:175 actions/editgroup.php:196
-#: actions/newgroup.php:132 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 "Die gebruikersnaam is reeds in gebruik. Kies 'n ander een."
 
 msgid "Nickname already in use. Try another one."
 msgstr "Die gebruikersnaam is reeds in gebruik. Kies 'n ander een."
 


@@ -534,9 +559,9 @@ msgstr "Die gebruikersnaam is reeds in gebruik. Kies 'n ander een."
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.

-#: actions/apigroupcreate.php:183 actions/editgroup.php:200
-#: actions/newgroup.php:136 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 "Nie 'n geldige gebruikersnaam nie."
 
 msgid "Not a valid nickname."
 msgstr "Nie 'n geldige gebruikersnaam nie."
 


@@ -545,10 +570,10 @@ msgstr "Nie 'n geldige gebruikersnaam nie."
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.

-#: actions/apigroupcreate.php:200 actions/editapplication.php:233
-#: actions/editgroup.php:207 actions/newapplication.php:211
-#: actions/newgroup.php:143 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 "Tuisblad is nie 'n geldige URL nie."
 
 msgid "Homepage is not a valid URL."
 msgstr "Tuisblad is nie 'n geldige URL nie."
 


@@ -556,9 +581,9 @@ msgstr "Tuisblad is nie 'n geldige URL nie."
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.

-#: actions/apigroupcreate.php:210 actions/editgroup.php:211
-#: actions/newgroup.php:147 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 "Volledige naam is te lang (maksimum 255 karakters)."
 #, fuzzy
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "Volledige naam is te lang (maksimum 255 karakters)."


@@ -571,9 +596,9 @@ msgstr "Volledige naam is te lang (maksimum 255 karakters)."
 #. TRANS: %d is the maximum number of characters for the description.
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed characters.
 #. TRANS: %d is the maximum number of characters for the description.
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed characters.

-#: actions/apigroupcreate.php:220 actions/editapplication.php:201
-#: actions/editgroup.php:216 actions/newapplication.php:178
-#: actions/newgroup.php:152
+#: 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)."


@@ -584,9 +609,9 @@ msgstr[1] "Die beskrywing is te lank (die maksimum is %d karakters)."
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.

-#: actions/apigroupcreate.php:234 actions/editgroup.php:223
-#: actions/newgroup.php:159 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 "Ligging is te lank is (maksimum 255 karakters)."
 #, fuzzy
 msgid "Location is too long (maximum 255 characters)."
 msgstr "Ligging is te lank is (maksimum 255 karakters)."


@@ -597,8 +622,8 @@ msgstr "Ligging is te lank is (maksimum 255 karakters)."
 #. TRANS: %d is the maximum number of allowed aliases.
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed aliases.
 #. 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:255 actions/editgroup.php:236
-#: actions/newgroup.php:172
+#: actions/apigroupcreate.php:236 actions/editgroup.php:229
+#: actions/newgroup.php:176

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


@@ -607,7 +632,7 @@ msgstr[1] "Te veel aliasse! Die maksimum aantal is %d."
 
 #. 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 "Ongeldige alias: \"%s\""
 #, fuzzy, php-format
 msgid "Invalid alias: \"%s\"."
 msgstr "Ongeldige alias: \"%s\""


@@ -616,8 +641,8 @@ msgstr "Ongeldige alias: \"%s\""
 #. TRANS: %s is the alias that is already in use.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: %s is the alias that is already in use.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.

-#: actions/apigroupcreate.php:291 actions/editgroup.php:253
-#: actions/newgroup.php:189
+#: actions/apigroupcreate.php:264 actions/editgroup.php:244
+#: actions/newgroup.php:191

 #, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr "Die alias \"%s\" word al reeds gebruik. Probeer 'n ander een."
 #, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr "Die alias \"%s\" word al reeds gebruik. Probeer 'n ander een."


@@ -625,8 +650,8 @@ msgstr "Die alias \"%s\" word al reeds gebruik. Probeer 'n ander een."
 #. TRANS: Client error displayed when trying to use an alias during group creation that is the same as the group's nickname.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Client error displayed when trying to use an alias during group creation that is the same as the group's nickname.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.

-#: actions/apigroupcreate.php:305 actions/editgroup.php:260
-#: actions/newgroup.php:196
+#: actions/apigroupcreate.php:278 actions/editgroup.php:251
+#: actions/newgroup.php:198

 msgid "Alias can't be the same as nickname."
 msgstr "Die alias kan nie dieselfde as die gebruikersnaam wees nie."
 
 msgid "Alias can't be the same as nickname."
 msgstr "Die alias kan nie dieselfde as die gebruikersnaam wees nie."
 


@@ -734,7 +759,7 @@ msgstr ""
 #. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
 #: actions/deletenotice.php:177 actions/disfavor.php:74
 #. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
 #: actions/deletenotice.php:177 actions/disfavor.php:74

-#: actions/emailsettings.php:271 actions/favor.php:75 actions/geocode.php:55
+#: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55

 #: actions/groupblock.php:66 actions/grouplogo.php:312
 #: actions/groupunblock.php:65 actions/imsettings.php:230
 #: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
 #: actions/groupblock.php:66 actions/grouplogo.php:312
 #: actions/groupunblock.php:65 actions/imsettings.php:230
 #: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66


@@ -770,7 +795,7 @@ msgstr ""
 #. 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
 #. 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/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/smssettings.php:277 lib/designsettings.php:321
 #: actions/imsettings.php:245 actions/newapplication.php:125
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
 #: actions/smssettings.php:277 lib/designsettings.php:321


@@ -788,7 +813,7 @@ msgid "Allow or deny access"
 msgstr "Toegang toelaat of weier"
 
 #. TRANS: User notification of external application requesting account access.
 msgstr "Toegang toelaat of weier"
 
 #. 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 ""


@@ -819,17 +844,17 @@ msgstr "Gebruiker"
 #. 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
 #. 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/profilesettings.php:110 actions/register.php:433
+#: 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/showgroup.php:240 actions/tagother.php:94
 #: actions/userauthorization.php:145 lib/groupeditform.php:152

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

 msgid "Nickname"
 msgstr "Bynaam"
 
 #. 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 "Bynaam"
 
 #. 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 "Wagwoord"
 
 msgid "Password"
 msgstr "Wagwoord"
 


@@ -839,7 +864,7 @@ msgstr "Wagwoord"
 #. 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
 msgctxt "BUTTON"
 #: actions/imsettings.php:131 actions/smssettings.php:137
 #: lib/applicationeditform.php:351
 msgctxt "BUTTON"


@@ -916,7 +941,8 @@ msgstr "U mag nie 'n ander gebruiker se status verwyder nie."
 #. 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
 #. 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/deletenotice.php:61 actions/shownotice.php:92
+#: actions/atompubshowfavorite.php:82 actions/deletenotice.php:61
+#: actions/shownotice.php:92

 msgid "No such notice."
 msgstr "Die kennisgewing bestaan nie."
 
 msgid "No such notice."
 msgstr "Die kennisgewing bestaan nie."
 


@@ -932,16 +958,44 @@ msgstr "U kan nie u eie kennisgewings herhaal nie."
 msgid "Already repeated that notice."
 msgstr "U het reeds die kennisgewing herhaal."
 
 msgid "Already repeated that notice."
 msgstr "U het reeds die kennisgewing herhaal."
 

+#. 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 "Die API-funksie is nie gevind nie."
+
+#: actions/apistatusesshow.php:141
+#, fuzzy, php-format
+msgid "Unsupported format: %s"
+msgstr "Nie-ondersteunde formaat."
+

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

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

 msgid "Status deleted."
 msgstr "Die status is verwyder."
 
 #. TRANS: Client error displayed requesting a status with an invalid ID.
 msgid "Status deleted."
 msgstr "Die status is verwyder."
 
 #. 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 "Geen status met die ID gevind nie."
 
 msgid "No status with that ID found."
 msgstr "Geen status met die ID gevind nie."
 

+#: 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 "Hierdie kennisgewing kan nie verwyder word nie."
+
+#: actions/apistatusesshow.php:243
+#, fuzzy, php-format
+msgid "Deleted notice %d"
+msgstr "Verwyder kennisgewing"
+

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


@@ -995,7 +1049,7 @@ msgstr "%1$s / Gunstelinge van %2$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 "Dit was nie moontlik om die groep by te werk nie."
 #, fuzzy, php-format
 msgid "Could not generate feed for group - %s"
 msgstr "Dit was nie moontlik om die groep by te werk nie."


@@ -1060,6 +1114,61 @@ msgstr "met die etiket %s"
 msgid "Updates tagged with %1$s on %2$s!"
 msgstr "Opdaterings van %1$s op %2$s."
 
 msgid "Updates tagged with %1$s on %2$s!"
 msgstr "Opdaterings van %1$s op %2$s."
 

+#. TRANS: Client error displayed trying to add a notice to another user's timeline.
+#: actions/apitimelineuser.php:297
+msgid "Only the user can add to their own timeline."
+msgstr ""
+
+#. 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 "U kan nie u eie kennisgewings herhaal nie."
+
+#. TRANS: Client error displayed when using another format than AtomPub.
+#: actions/apitimelineuser.php:406
+#, php-format
+msgid "Notice with URI \"%s\" already exists."
+msgstr ""
+
+#: 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
 #, fuzzy
 #. TRANS: Server error for unfinished API method showTrends.
 #: actions/apitrends.php:85
 #, fuzzy


@@ -1067,11 +1176,159 @@ msgid "API method under construction."
 msgstr "Die API-funksie is nie gevind nie."
 
 #. TRANS: Client error displayed when requesting user information for a non-existing user.
 msgstr "Die API-funksie is nie gevind nie."
 
 #. 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

 #, fuzzy
 msgid "User not found."
 msgstr "Die API-funksie is nie gevind nie."
 
 #, fuzzy
 msgid "User not found."
 msgstr "Die API-funksie is nie gevind nie."
 

+#: actions/atompubfavoritefeed.php:70
+#, fuzzy
+msgid "No such profile"
+msgstr "Die lêer bestaan nie."
+
+#: 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 "Kon nie e-posbevestiging verwyder nie."
+
+#. 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 "Dit was nie moontlik om u ontwerp-instellings te stoor nie."
+
+#: actions/atompubfavoritefeed.php:256
+#, fuzzy
+msgid "Unknown note."
+msgstr "Onbekend"
+
+#: actions/atompubfavoritefeed.php:263
+#, fuzzy
+msgid "Already a favorite."
+msgstr "Voeg by gunstelinge"
+
+#: actions/atompubmembershipfeed.php:72 actions/atompubshowfavorite.php:76
+#: actions/atompubshowmembership.php:73 actions/subscribe.php:107
+#, fuzzy
+msgid "No such profile."
+msgstr "Die lêer bestaan nie."
+
+#: actions/atompubmembershipfeed.php:144
+#, fuzzy, php-format
+msgid "%s group memberships"
+msgstr "lede van die groep %s"
+
+#: actions/atompubmembershipfeed.php:147
+#, fuzzy, php-format
+msgid "Groups %s is a member of on %s"
+msgstr "Groepe waarvan %s lid is"
+
+#: 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 "Onbekend"
+
+#: actions/atompubmembershipfeed.php:263
+#, fuzzy
+msgid "Already a member."
+msgstr "Alle lede"
+
+#: actions/atompubmembershipfeed.php:270
+msgid "Blocked by admin."
+msgstr ""
+
+#: actions/atompubshowfavorite.php:89
+#, fuzzy
+msgid "No such favorite."
+msgstr "Die lêer bestaan nie."
+
+#: actions/atompubshowfavorite.php:151
+#, fuzzy
+msgid "Can't delete someone else's favorite"
+msgstr ""
+"Dit was nie moontlik om die boodskap van u gunstelinge te verwyder nie."
+
+#: actions/atompubshowmembership.php:81
+msgid "No such group"
+msgstr "Hierdie groep bestaat nie"
+
+#: actions/atompubshowmembership.php:90
+#, fuzzy
+msgid "Not a member"
+msgstr "Alle lede"
+
+#: actions/atompubshowmembership.php:115
+#, fuzzy
+msgid "Method not supported"
+msgstr "Die API-funksie is nie gevind nie."
+
+#: 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 "Die lêer bestaan nie."
+
+#. 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 "U volg hierdie gebruiker:"
+
+#. 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 ""
+"Dit was nie moontlik om die boodskap van u gunstelinge te verwyder nie."
+
+#: actions/atompubsubscriptionfeed.php:150
+#, fuzzy, php-format
+msgid "People %s has subscribed to on %s"
+msgstr "U volg hierdie gebruiker:"
+
+#. 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 "Onbekende lêertipe"
+

 #. TRANS: Client error displayed trying to get a non-existing attachment.
 #: actions/attachment.php:73
 msgid "No such attachment."
 #. TRANS: Client error displayed trying to get a non-existing attachment.
 #: actions/attachment.php:73
 msgid "No such attachment."


@@ -1143,14 +1400,16 @@ msgid "Preview"
 msgstr "Voorskou"
 
 #. TRANS: Button on avatar upload page to delete current avatar.
 msgstr "Voorskou"
 
 #. TRANS: Button on avatar upload page to delete current avatar.

-#: actions/avatarsettings.php:155
+#. TRANS: Button text for user account deletion.
+#: actions/avatarsettings.php:155 actions/deleteaccount.php:319

 #, fuzzy
 msgctxt "BUTTON"
 msgid "Delete"
 msgstr "Skrap"
 
 #. TRANS: Button on avatar upload page to upload an avatar.
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Delete"
 msgstr "Skrap"
 
 #. TRANS: Button on avatar upload page to upload an avatar.

-#: actions/avatarsettings.php:173
+#. 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"
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Upload"


@@ -1193,6 +1452,37 @@ msgstr "Die opdatering van die avatar het gefaal."
 msgid "Avatar deleted."
 msgstr "Die avatar is verwyder."
 
 msgid "Avatar deleted."
 msgstr "Die avatar is verwyder."
 

+#: actions/backupaccount.php:62 actions/profilesettings.php:467
+msgid "Backup account"
+msgstr ""
+
+#: actions/backupaccount.php:80
+msgid "Only logged-in users can backup their account."
+msgstr ""
+
+#: 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
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Backup"
+msgstr "Agtergrond"
+
+#: 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."
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
 #: actions/block.php:68
 msgid "You already blocked that user."


@@ -1363,8 +1653,8 @@ msgstr "Die E-posadres bestaan reeds."
 #. 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:118 actions/emailsettings.php:331
-#: actions/emailsettings.php:477 actions/imsettings.php:283
+#: 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
 #: actions/imsettings.php:442 actions/othersettings.php:184
 #: actions/profilesettings.php:326 actions/smssettings.php:308
 #: actions/smssettings.php:464


@@ -1401,6 +1691,76 @@ msgstr "Gesprek"
 msgid "Notices"
 msgstr "Kennisgewings"
 
 msgid "Notices"
 msgstr "Kennisgewings"
 

+#. TRANS: Client exception displayed trying to delete a user account while not logged in.
+#: actions/deleteaccount.php:71
+msgid "Only logged-in users can delete their account."
+msgstr ""
+
+#. 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 "U kan nie gebruikers verwyder nie."
+
+#. 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 "Die avatar is verwyder."
+
+#. 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 "Skep 'n gebruiker"
+
+#. 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 "Bevestig"
+
+#. 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 "U kan nie gebruikers verwyder nie."
+
+#. TRANS: Button title for user account deletion.
+#: actions/deleteaccount.php:323
+#, fuzzy
+msgid "Permanently delete your account"
+msgstr "U kan nie gebruikers verwyder nie."
+

 #. TRANS: Client error displayed trying to delete an application while not logged in.
 #: actions/deleteapplication.php:62
 msgid "You must be logged in to delete an application."
 #. TRANS: Client error displayed trying to delete an application while not logged in.
 #: actions/deleteapplication.php:62
 msgid "You must be logged in to delete an application."


@@ -1421,7 +1781,7 @@ msgstr "U is nie die eienaar van hierdie applikasie nie."
 #. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php: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:1404
+#: lib/action.php:1409

 msgid "There was a problem with your session token."
 msgstr ""
 
 msgid "There was a problem with your session token."
 msgstr ""
 


@@ -1522,11 +1882,6 @@ msgstr "Verwyder die gebruiker"
 msgid "Not logged in."
 msgstr "Nie aangeteken nie."
 
 msgid "Not logged in."
 msgstr "Nie aangeteken nie."
 

-#. TRANS: Error message displayed trying to delete a notice that was not made by the current user.
-#: actions/deletenotice.php:78
-msgid "Can't delete this notice."
-msgstr "Hierdie kennisgewing kan nie verwyder word nie."
-

 #. TRANS: Instructions for deleting a notice.
 #: actions/deletenotice.php:110
 msgid ""
 #. TRANS: Instructions for deleting a notice.
 #: actions/deletenotice.php:110
 msgid ""


@@ -1551,7 +1906,7 @@ msgid "Do not delete this notice"
 msgstr "Moenie hierdie kennisgewing verwyder nie"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
 msgstr "Moenie hierdie kennisgewing verwyder nie"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.

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

 msgid "Delete this notice"
 msgstr "Verwyder hierdie kennisgewing"
 
 msgid "Delete this notice"
 msgstr "Verwyder hierdie kennisgewing"
 


@@ -1860,24 +2215,24 @@ msgstr "Gebruik hierdie vorm om die groep te wysig."
 
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.

-#: actions/editgroup.php:248 actions/newgroup.php:184
+#: actions/editgroup.php:239 actions/newgroup.php:186

 #, php-format
 msgid "Invalid alias: \"%s\""
 msgstr "Ongeldige alias: \"%s\""
 
 #. TRANS: Server error displayed when editing a group fails.
 #, php-format
 msgid "Invalid alias: \"%s\""
 msgstr "Ongeldige alias: \"%s\""
 
 #. TRANS: Server error displayed when editing a group fails.

-#: actions/editgroup.php:281
+#: actions/editgroup.php:272

 msgid "Could not update group."
 msgstr "Dit was nie moontlik om die groep by te werk nie."
 
 #. TRANS: Server error displayed when group aliases could not be added.
 #. TRANS: Server exception thrown when creating group aliases failed.
 msgid "Could not update group."
 msgstr "Dit was nie moontlik om die groep by te werk nie."
 
 #. TRANS: Server error displayed when group aliases could not be added.
 #. TRANS: Server exception thrown when creating group aliases failed.

-#: actions/editgroup.php:288 classes/User_group.php:529
+#: actions/editgroup.php:279 classes/User_group.php:534

 msgid "Could not create aliases."
 msgstr "Dit was nie moontlik om die aliasse te skep nie."
 
 #. TRANS: Group edit form success message.
 msgid "Could not create aliases."
 msgstr "Dit was nie moontlik om die aliasse te skep nie."
 
 #. TRANS: Group edit form success message.

-#: actions/editgroup.php:305
+#: actions/editgroup.php:296

 msgid "Options saved."
 msgstr "Opsies is gestoor."
 
 msgid "Options saved."
 msgstr "Opsies is gestoor."
 


@@ -1895,12 +2250,12 @@ msgstr ""
 
 #. 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

 msgid "Email address"
 msgstr "E-posadres"
 
 #. TRANS: Form note in e-mail settings form.
 msgid "Email address"
 msgstr "E-posadres"
 
 #. TRANS: Form note in e-mail settings form.

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

 msgid "Current confirmed email address."
 msgstr "Huidige bevestigde e-posadres."
 
 msgid "Current confirmed email address."
 msgstr "Huidige bevestigde e-posadres."
 


@@ -1909,14 +2264,14 @@ msgstr "Huidige bevestigde e-posadres."
 #. TRANS: Button label to remove a confirmed IM address.
 #. TRANS: Button label to remove a confirmed SMS address.
 #. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
 #. 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 "Verwyder"
 
 #: actions/imsettings.php:116 actions/smssettings.php:124
 #: actions/smssettings.php:180
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "Verwyder"
 

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


@@ -1927,14 +2282,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 "E-posadres, soos \"UserName@example.org\""
 
 #. TRANS: Button label for adding an e-mail address in e-mail settings form.
 #. TRANS: Button label for adding an IM address in IM settings form.
 #. TRANS: Button label for adding a SMS phone number in SMS settings form.
 msgid "Email address, like \"UserName@example.org\""
 msgstr "E-posadres, soos \"UserName@example.org\""
 
 #. TRANS: Button label for adding an e-mail address in e-mail settings form.
 #. TRANS: Button label for adding an IM address in IM settings form.
 #. TRANS: Button label for adding a SMS phone number in SMS settings form.

-#: actions/emailsettings.php:143 actions/imsettings.php:151
+#: actions/emailsettings.php:144 actions/imsettings.php:151

 #: actions/smssettings.php:162
 msgctxt "BUTTON"
 msgid "Add"
 #: actions/smssettings.php:162
 msgctxt "BUTTON"
 msgid "Add"


@@ -1942,99 +2297,106 @@ msgstr "Voeg by"
 
 #. 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 "Inkomende e-pos"
 
 msgid "Incoming email"
 msgstr "Inkomende e-pos"
 

+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:158
+msgid "I want to post notices by email."
+msgstr ""
+

 #. TRANS: Form instructions for incoming e-mail form in e-mail settings.
 #. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
 #. 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 ""
 
 msgid "Send email to this address to post new notices."
 msgstr ""
 

-#. 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 ""
 
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr ""
 

+#. 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

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

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

 msgid "Email preferences"
 msgstr "E-posadresse"
 
 #. TRANS: Checkbox label in e-mail preferences form.
 msgid "Email preferences"
 msgstr "E-posadresse"
 
 #. 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 ""
 
 #. TRANS: Checkbox label in e-mail preferences form.
 msgid "Send me notices of new subscriptions through email."
 msgstr ""
 
 #. 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 ""
 
 #. TRANS: Checkbox label in e-mail preferences form.
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr ""
 
 #. 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 ""
 
 #. TRANS: Checkbox label in e-mail preferences form.
 msgid "Send me email when someone sends me a private message."
 msgstr ""
 
 #. TRANS: Checkbox label in e-mail preferences form.

-#: actions/emailsettings.php:203
+#: actions/emailsettings.php:235

 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr ""
 
 #. TRANS: Checkbox label in e-mail preferences form.
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr ""
 
 #. 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 ""
 
 #. TRANS: Checkbox label in e-mail preferences form.
 msgid "Allow friends to nudge me and send me an email."
 msgstr ""
 
 #. TRANS: Checkbox label in e-mail preferences form.

-#: actions/emailsettings.php:216
-msgid "I want to post notices by email."
-msgstr ""
-
-#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:223
+#: actions/emailsettings.php:247

 #, fuzzy
 msgid "Publish a MicroID for my email address."
 msgstr "Dit is nie u e-posadres nie."
 
 #. TRANS: Confirmation message for successful e-mail preferences save.
 #, fuzzy
 msgid "Publish a MicroID for my email address."
 msgstr "Dit is nie u e-posadres nie."
 
 #. TRANS: Confirmation message for successful e-mail preferences save.

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

 msgid "Email preferences saved."
 msgstr "E-posadresse"
 
 #. TRANS: Message given saving e-mail address without having provided one.
 msgid "Email preferences saved."
 msgstr "E-posadresse"
 
 #. TRANS: Message given saving e-mail address without having provided one.

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

 msgid "No email address."
 msgstr "Geen e-posadres."
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
 msgid "No email address."
 msgstr "Geen e-posadres."
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.

-#: actions/emailsettings.php:365
+#: actions/emailsettings.php:396

 #, fuzzy
 msgid "Cannot normalize that email address"
 msgstr "Dit was nie moontlik om die Jabber-ID te normaliseer nie"
 
 #. TRANS: Message given saving e-mail address that not valid.
 #, fuzzy
 msgid "Cannot normalize that email address"
 msgstr "Dit was nie moontlik om die Jabber-ID te normaliseer nie"
 
 #. 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 "Nie 'n geldige e-posadres nie."
 
 #. TRANS: Message given saving e-mail address that is already set.
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "Nie 'n geldige e-posadres nie."
 
 #. TRANS: Message given saving e-mail address that is already set.

-#: actions/emailsettings.php:374
+#: actions/emailsettings.php:405

 msgid "That is already your email address."
 msgstr "Dit is al reeds u e-posadres."
 
 #. TRANS: Message given saving e-mail address that is already set for another user.
 msgid "That is already your email address."
 msgstr "Dit is al reeds u e-posadres."
 
 #. TRANS: Message given saving e-mail address that is already set for another user.

-#: actions/emailsettings.php:378
+#: actions/emailsettings.php:409

 #, fuzzy
 msgid "That email address already belongs to another user."
 msgstr "Die Jabber-ID word reeds deur 'n ander gebruiker gebruik."
 #, fuzzy
 msgid "That email address already belongs to another user."
 msgstr "Die Jabber-ID word reeds deur 'n ander gebruiker gebruik."


@@ -2042,13 +2404,13 @@ msgstr "Die Jabber-ID word reeds deur 'n ander gebruiker gebruik."
 #. 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.
 #. 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 "Kon nie e-posbevestiging verwyder nie."
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
 #: actions/smssettings.php:373
 msgid "Couldn't insert confirmation code."
 msgstr "Kon nie e-posbevestiging verwyder nie."
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.

-#: actions/emailsettings.php: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."


@@ -2057,58 +2419,58 @@ 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
 #, fuzzy
 msgid "No pending confirmation to cancel."
 msgstr "Geen bevestigingskode."
 
 #. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
 #: actions/smssettings.php:408
 #, fuzzy
 msgid "No pending confirmation to cancel."
 msgstr "Geen bevestigingskode."
 
 #. 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 "Dit is die verkeerde IM-adres."
 
 #. TRANS: Server error thrown on database error canceling e-mail address confirmation.
 #. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
 #, fuzzy
 msgid "That is the wrong email address."
 msgstr "Dit is die verkeerde IM-adres."
 
 #. 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:437 actions/smssettings.php:422
+#: actions/emailsettings.php:468 actions/smssettings.php:422

 msgid "Couldn't delete email confirmation."
 msgstr "Kon nie e-posbevestiging verwyder nie."
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
 msgid "Couldn't delete email confirmation."
 msgstr "Kon nie e-posbevestiging verwyder nie."
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.

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

 msgid "Email confirmation cancelled."
 msgstr "Geen bevestigingskode."
 
 #. TRANS: Message given trying to remove an e-mail address that is not
 #. TRANS: registered for the active user.
 msgid "Email confirmation cancelled."
 msgstr "Geen bevestigingskode."
 
 #. TRANS: Message given trying to remove an e-mail address that is not
 #. TRANS: registered for the active user.

-#: actions/emailsettings.php:462
+#: actions/emailsettings.php:493

 msgid "That is not your email address."
 msgstr "Dit is nie u e-posadres nie."
 
 #. TRANS: Message given after successfully removing a registered e-mail address.
 msgid "That is not your email address."
 msgstr "Dit is nie u e-posadres nie."
 
 #. TRANS: Message given after successfully removing a registered e-mail address.

-#: actions/emailsettings.php:483
+#: actions/emailsettings.php:514

 msgid "The email address was removed."
 msgstr "Inkomende e-posadres is verwyder."
 
 msgid "The email address was removed."
 msgstr "Inkomende e-posadres is verwyder."
 

-#: actions/emailsettings.php:497 actions/smssettings.php:568
+#: actions/emailsettings.php:528 actions/smssettings.php:568

 msgid "No incoming email address."
 msgstr "Geen inkomende e-posadres."
 
 #. TRANS: Server error thrown on database error removing incoming e-mail address.
 #. TRANS: Server error thrown on database error adding incoming e-mail address.
 msgid "No incoming email address."
 msgstr "Geen inkomende e-posadres."
 
 #. TRANS: Server error thrown on database error removing incoming e-mail address.
 #. TRANS: Server error thrown on database error adding incoming e-mail address.

-#: actions/emailsettings.php: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 "Kon nie gebruikersdata opdateer nie."
 
 #. 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 "Kon nie gebruikersdata opdateer nie."
 
 #. 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 "Inkomende e-posadres is verwyder."
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
 msgid "Incoming email address removed."
 msgstr "Inkomende e-posadres is verwyder."
 
 #. 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

 #, fuzzy
 msgid "New incoming email address added."
 msgstr "Geen inkomende e-posadres."
 #, fuzzy
 msgid "New incoming email address added."
 msgstr "Geen inkomende e-posadres."


@@ -2123,7 +2485,7 @@ msgstr "Hierdie kennisgewing is nie 'n gunsteling nie!"
 msgid "Disfavor favorite"
 msgstr "Voeg by gunstelinge"
 
 msgid "Disfavor favorite"
 msgstr "Voeg by gunstelinge"
 

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

 #: lib/publicgroupnav.php:93
 msgid "Popular notices"
 msgstr "Populêre kennisgewings"
 #: lib/publicgroupnav.php:93
 msgid "Popular notices"
 msgstr "Populêre kennisgewings"


@@ -2435,15 +2797,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 "%s tydlyn"
-

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


@@ -2977,11 +3330,11 @@ msgstr "Aanteken"
 msgid "Login to site"
 msgstr "Teken aan"
 
 msgid "Login to site"
 msgstr "Teken aan"
 

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

 msgid "Remember me"
 msgstr "Onthou my"
 
 msgid "Remember me"
 msgstr "Onthou my"
 

-#: 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 ""
 
 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
 


@@ -3059,8 +3412,14 @@ msgstr "Dit was nie moontlik om die applikasie te skep nie."
 msgid "New group"
 msgstr "Nuwe groep"
 
 msgid "New group"
 msgstr "Nuwe groep"
 

+#. 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 "U is nie 'n lid van die groep nie."
+

 #. TRANS: Form instructions for group create form.
 #. TRANS: Form instructions for group create form.

-#: actions/newgroup.php:110
+#: actions/newgroup.php:117

 #, fuzzy
 msgid "Use this form to create a new group."
 msgstr "Gebruik hierdie vorm om die groep te wysig."
 #, fuzzy
 msgid "Use this form to create a new group."
 msgstr "Gebruik hierdie vorm om die groep te wysig."


@@ -3252,20 +3611,20 @@ msgid "%1$s's status on %2$s"
 msgstr "Status van %1$s op %2$s"
 
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
 msgstr "Status van %1$s op %2$s"
 
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')

-#: actions/oembed.php:155
+#: actions/oembed.php:168

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

-#: actions/oembed.php:159
+#: 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:180 actions/oembed.php:199 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

 #, fuzzy
 msgid "Not a supported data format."
 msgstr "Nie-ondersteunde formaat."
 #, fuzzy
 msgid "Not a supported data format."
 msgstr "Nie-ondersteunde formaat."


@@ -3385,11 +3744,6 @@ msgstr "Nuwe wagwoord"
 msgid "6 or more characters"
 msgstr "6 of meer karakters"
 
 msgid "6 or more characters"
 msgstr "6 of meer karakters"
 

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

 #: actions/passwordsettings.php:113 actions/recoverpassword.php:240
 msgid "Same as password above"
 msgstr "Dieselfde as wagwoord hierbo"
 #: actions/passwordsettings.php:113 actions/recoverpassword.php:240
 msgid "Same as password above"
 msgstr "Dieselfde as wagwoord hierbo"


@@ -3398,11 +3752,11 @@ msgstr "Dieselfde as wagwoord hierbo"
 msgid "Change"
 msgstr "Wysig"
 
 msgid "Change"
 msgstr "Wysig"
 

-#: 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 "Wagwoord moet 6 of meer karakters bevat."
 
 msgid "Password must be 6 or more characters."
 msgstr "Wagwoord moet 6 of meer karakters bevat."
 

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

 msgid "Passwords don't match."
 msgstr "Wagwoorde is nie dieselfde nie."
 
 msgid "Passwords don't match."
 msgstr "Wagwoorde is nie dieselfde nie."
 


@@ -3632,7 +3986,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 "Aanhangsels"
 
 msgid "Attachments"
 msgstr "Aanhangsels"
 


@@ -3763,15 +4117,15 @@ msgstr ""
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for full group name (dt). Text hidden by default.
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for full group name (dt). Text hidden by default.

-#: actions/profilesettings.php:117 actions/register.php:457
+#: actions/profilesettings.php:117 actions/register.php:456

 #: actions/showgroup.php:252 actions/tagother.php:104
 #: actions/showgroup.php:252 actions/tagother.php:104

-#: lib/groupeditform.php:157 lib/userprofile.php:150
+#: lib/groupeditform.php:157 lib/userprofile.php:152

 msgid "Full name"
 msgstr "Volledige naam"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
 msgid "Full name"
 msgstr "Volledige naam"
 
 #. 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 "Tuisblad"
 #: lib/applicationeditform.php:236 lib/groupeditform.php:161
 msgid "Homepage"
 msgstr "Tuisblad"


@@ -3784,7 +4138,7 @@ msgstr ""
 #. 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"


@@ -3792,27 +4146,27 @@ msgstr[0] "Skrap applikasie"
 msgstr[1] "Skrap applikasie"
 
 #. TRANS: Tooltip for field label in form for profile settings.
 msgstr[1] "Skrap applikasie"
 
 #. 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

 msgid "Describe yourself and your interests"
 msgstr ""
 
 #. TRANS: Text area label in form for profile settings where users can provide.
 #. TRANS: their biography.
 msgid "Describe yourself and your interests"
 msgstr ""
 
 #. 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.
 #. TRANS: Label for group location (dt). Text hidden by default.
 msgid "Bio"
 msgstr "Bio"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for group location (dt). Text hidden by default.

-#: actions/profilesettings.php:149 actions/register.php:485
+#: actions/profilesettings.php:149 actions/register.php:484

 #: actions/showgroup.php:262 actions/tagother.php:112
 #: actions/userauthorization.php:166 lib/groupeditform.php:180
 #: actions/showgroup.php:262 actions/tagother.php:112
 #: actions/userauthorization.php:166 lib/groupeditform.php:180

-#: lib/userprofile.php:165
+#: lib/userprofile.php:167

 msgid "Location"
 msgstr "Ligging"
 
 #. TRANS: Tooltip for field label in form for profile settings.
 msgid "Location"
 msgstr "Ligging"
 
 #. 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 ""
 
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr ""
 


@@ -3824,7 +4178,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 "Etikette"
 
 msgid "Tags"
 msgstr "Etikette"
 


@@ -3863,7 +4217,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)."


@@ -3919,6 +4273,12 @@ msgstr "Kon nie gebruiker opdateer nie."
 msgid "Settings saved."
 msgstr "Voorkeure is gestoor."
 
 msgid "Settings saved."
 msgstr "Voorkeure is gestoor."
 

+#. 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 "Skep 'n gebruiker"
+

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


@@ -4157,7 +4517,7 @@ msgstr "Wagwoord moet 6 of meer karakters bevat."
 msgid "Password and confirmation do not match."
 msgstr "Wagwoorde is nie dieselfde nie."
 
 msgid "Password and confirmation do not match."
 msgstr "Wagwoorde is nie dieselfde nie."
 

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

 #, fuzzy
 msgid "Error setting user."
 msgstr "Fout tydens stoor van gebruiker; ongeldig."
 #, fuzzy
 msgid "Error setting user."
 msgstr "Fout tydens stoor van gebruiker; ongeldig."


@@ -4166,7 +4526,7 @@ msgstr "Fout tydens stoor van gebruiker; ongeldig."
 msgid "New password successfully saved. You are now logged in."
 msgstr ""
 
 msgid "New password successfully saved. You are now logged in."
 msgstr ""
 

-#: 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 ""
 
 msgid "Sorry, only invited people can register."
 msgstr ""
 


@@ -4178,7 +4538,7 @@ msgstr ""
 msgid "Registration successful"
 msgstr "Die registrasie is voltooi"
 
 msgid "Registration successful"
 msgstr "Die registrasie is voltooi"
 

-#: 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 "Registreer"
 
 msgid "Register"
 msgstr "Registreer"
 


@@ -4186,86 +4546,86 @@ msgstr "Registreer"
 msgid "Registration not allowed."
 msgstr "Registrasie nie toegelaat nie."
 
 msgid "Registration not allowed."
 msgstr "Registrasie nie toegelaat nie."
 

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

 msgid "You can't register if you don't agree to the license."
 msgstr ""
 
 msgid "You can't register if you don't agree to the license."
 msgstr ""
 

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

 msgid "Email address already exists."
 msgstr "Die E-posadres bestaan reeds."
 
 msgid "Email address already exists."
 msgstr "Die E-posadres bestaan reeds."
 

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

 msgid "Invalid username or password."
 msgstr "Ongeldige gebruikersnaam of wagwoord."
 
 msgid "Invalid username or password."
 msgstr "Ongeldige gebruikersnaam of wagwoord."
 

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

 msgid ""
 "With this form you can create a new account. You can then post notices and "
 "link up to friends and colleagues. "
 msgstr ""
 
 msgid ""
 "With this form you can create a new account. You can then post notices and "
 "link up to friends and colleagues. "
 msgstr ""
 

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

 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
 msgstr ""
 
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
 msgstr ""
 

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

 #, fuzzy
 msgid "6 or more characters. Required."
 msgstr "6 of meer karakters"
 
 #, fuzzy
 msgid "6 or more characters. Required."
 msgstr "6 of meer karakters"
 

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

 #, fuzzy
 msgid "Same as password above. Required."
 msgstr "Dieselfde as wagwoord hierbo"
 
 #. TRANS: Link description in user account settings menu.
 #, fuzzy
 msgid "Same as password above. Required."
 msgstr "Dieselfde as wagwoord hierbo"
 
 #. 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 "E-pos"
 
 #: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
 msgid "Email"
 msgstr "E-pos"
 

-#: 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 ""
 
 msgid "Used only for updates, announcements, and password recovery"
 msgstr ""
 

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

 msgid "Longer name, preferably your \"real\" name"
 msgstr ""
 
 msgid "Longer name, preferably your \"real\" name"
 msgstr ""
 

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

 msgid "URL of your homepage, blog, or profile on another site"
 msgstr ""
 
 msgid "URL of your homepage, blog, or profile on another site"
 msgstr ""
 

-#: 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

 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
 "email address, IM address, and phone number."
 msgstr ""
 
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
 "email address, IM address, and phone number."
 msgstr ""
 

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

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


@@ -4284,7 +4644,7 @@ msgid ""
 "Thanks for signing up and we hope you enjoy using this service."
 msgstr ""
 
 "Thanks for signing up and we hope you enjoy using this service."
 msgstr ""
 

-#: 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.)"


@@ -4325,7 +4685,7 @@ msgid "URL of your profile on another compatible microblogging service"
 msgstr ""
 
 #: actions/remotesubscribe.php:137 lib/subscribeform.php:139
 msgstr ""
 
 #: actions/remotesubscribe.php:137 lib/subscribeform.php:139

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

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


@@ -4364,7 +4724,7 @@ msgstr "U kan nie u eie kennisgewings herhaal nie."
 msgid "You already repeated that notice."
 msgstr "U het reeds die kennisgewing herhaal."
 
 msgid "You already repeated that notice."
 msgstr "U het reeds die kennisgewing herhaal."
 

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

 msgid "Repeated"
 msgstr "Herhalend"
 
 msgid "Repeated"
 msgstr "Herhalend"
 


@@ -4426,6 +4786,92 @@ msgstr ""
 msgid "Replies to %1$s on %2$s!"
 msgstr "Opdaterings van %1$s op %2$s."
 
 msgid "Replies to %1$s on %2$s!"
 msgstr "Opdaterings van %1$s op %2$s."
 

+#. TRANS: Client exception displayed when trying to restore an account while not logged in.
+#: actions/restoreaccount.php:78
+msgid "Only logged-in users can restore their account."
+msgstr ""
+
+#. 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 "Dit was nie moontlik om die applikasie te skep nie."
+
+#. 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 "Oplaai"
+
+#. 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 ""
+
+#. TRANS: Client exception thrown when a feed is not an Atom feed.
+#: actions/restoreaccount.php:207
+#, fuzzy
+msgid "Not an Atom feed."
+msgstr "Alle lede"
+
+#. 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 ""
+
+#. 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 ""
+"You can upload a backed-up stream in <a href=\"http://activitystrea.ms/"
+"\">Activity Streams</a> format."
+msgstr ""
+
+#. 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 "Oplaai"
+

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


@@ -4534,7 +4980,7 @@ msgid "Reset key & secret"
 msgstr ""
 
 #: actions/showapplication.php:252 lib/deletegroupform.php:121
 msgstr ""
 
 #: actions/showapplication.php:252 lib/deletegroupform.php:121

-#: lib/deleteuserform.php:66 lib/noticelist.php:667
+#: lib/deleteuserform.php:66 lib/noticelist.php:673

 msgid "Delete"
 msgstr "Skrap"
 
 msgid "Delete"
 msgstr "Skrap"
 


@@ -4645,13 +5091,13 @@ msgstr "Groepsprofiel"
 
 #. TRANS: Label for group URL (dt). Text hidden by default.
 #: actions/showgroup.php:270 actions/tagother.php:118
 
 #. 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:178
+#: actions/userauthorization.php:175 lib/userprofile.php:180

 msgid "URL"
 msgstr "URL"
 
 #. TRANS: Label for group description or group note (dt). Text hidden by default.
 #: actions/showgroup.php:282 actions/tagother.php:128
 msgid "URL"
 msgstr "URL"
 
 #. 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:195
+#: actions/userauthorization.php:187 lib/userprofile.php:197

 msgid "Note"
 msgstr "Nota"
 
 msgid "Note"
 msgstr "Nota"
 


@@ -5260,7 +5706,7 @@ msgstr "U volg hierdie gebruiker:"
 
 #. 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: 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.

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

 #, fuzzy
 msgid "Could not save subscription."
 msgstr "Kon nie die profiel stoor nie."
 #, fuzzy
 msgid "Could not save subscription."
 msgstr "Kon nie die profiel stoor nie."


@@ -5269,11 +5715,6 @@ msgstr "Kon nie die profiel stoor nie."
 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 "Die lêer bestaan nie."
-

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


@@ -5335,13 +5776,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 "Beskrywing"
-

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


@@ -5385,13 +5819,18 @@ msgstr ""
 msgid "%s is not listening to anyone."
 msgstr "%s volg niemand nie."
 
 msgid "%s is not listening to anyone."
 msgstr "%s volg niemand nie."
 

+#: actions/subscriptions.php:178
+#, fuzzy, php-format
+msgid "Subscription feed for %s (Atom)"
+msgstr "Voer vir vriende van %s (Atom)"
+

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


@@ -5429,7 +5868,7 @@ msgid "User profile"
 msgstr "Gebruikersprofiel"
 
 #: actions/tagother.php:81 actions/userauthorization.php:132
 msgstr "Gebruikersprofiel"
 
 #: actions/tagother.php:81 actions/userauthorization.php:132

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

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


@@ -5776,7 +6215,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:880
+#: actions/version.php:198 lib/action.php:885

 msgid "Version"
 msgstr "Weergawe"
 
 msgid "Version"
 msgstr "Weergawe"
 


@@ -5785,33 +6224,33 @@ msgid "Author(s)"
 msgstr "Outeur(s)"
 
 #. TRANS: Activity title when marking a notice as favorite.
 msgstr "Outeur(s)"
 
 #. 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

 #, fuzzy
 msgid "Favor"
 msgstr "Gunstelinge"
 
 #. 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.
 #, fuzzy
 msgid "Favor"
 msgstr "Gunstelinge"
 
 #. 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 "Hierdie kennisgewing is nie 'n gunsteling nie!"
 
 #. TRANS: Server exception thrown when a URL cannot be processed.
 #, fuzzy, php-format
 msgid "%1$s marked notice %2$s as a favorite."
 msgstr "Hierdie kennisgewing is nie 'n gunsteling nie!"
 
 #. 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.
 #. TRANS: %1$s is used for plural.
 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.
 #. TRANS: %1$s is used for plural.

-#: classes/File.php:190
+#: classes/File.php:204

 #, php-format
 msgid ""
 "No file may be larger than %1$d byte and the file you sent was %2$d bytes. "
 #, php-format
 msgid ""
 "No file may be larger than %1$d byte and the file you sent was %2$d bytes. "


@@ -5824,7 +6263,7 @@ msgstr[1] ""
 
 #. TRANS: Message given if an upload would exceed user quota.
 #. TRANS: %d (number) is the user quota in bytes and is used for plural.
 
 #. TRANS: Message given if an upload would exceed user quota.
 #. TRANS: %d (number) is the user quota in bytes and is used for plural.

-#: classes/File.php:203
+#: classes/File.php:217

 #, php-format
 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."
 #, php-format
 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."


@@ -5833,7 +6272,7 @@ msgstr[1] ""
 
 #. TRANS: Message given id an upload would exceed a user's monthly quota.
 #. TRANS: $d (number) is the monthly user quota in bytes and is used for plural.
 
 #. TRANS: Message given id an upload would exceed a user's monthly quota.
 #. TRANS: $d (number) is the monthly user quota in bytes and is used for plural.

-#: classes/File.php:215
+#: classes/File.php:229

 #, php-format
 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."
 #, php-format
 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."


@@ -5841,50 +6280,50 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Client exception thrown if a file upload does not have a valid name.
 msgstr[1] ""
 
 #. TRANS: Client exception thrown if a file upload does not have a valid name.

-#: classes/File.php:262 classes/File.php:277
+#: classes/File.php:276 classes/File.php:291

 #, fuzzy
 msgid "Invalid filename."
 msgstr "Ongeldige grootte."
 
 #. TRANS: Exception thrown when joining a group fails.
 #, fuzzy
 msgid "Invalid filename."
 msgstr "Ongeldige grootte."
 
 #. TRANS: Exception thrown when joining a group fails.

-#: classes/Group_member.php:42
+#: classes/Group_member.php:51

 #, fuzzy
 msgid "Group join failed."
 msgstr "Groepsprofiel"
 
 #. TRANS: Exception thrown when trying to leave a group the user is not a member of.
 #, fuzzy
 msgid "Group join failed."
 msgstr "Groepsprofiel"
 
 #. 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

 msgid "Not part of group."
 msgstr "Nie lid van die groep nie."
 
 #. TRANS: Exception thrown when trying to leave a group fails.
 msgid "Not part of group."
 msgstr "Nie lid van die groep nie."
 
 #. 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 "Groepsprofiel"
 
 #. TRANS: Exception thrown providing an invalid profile ID.
 #. TRANS: %s is the invalid profile ID.
 #, fuzzy
 msgid "Group leave failed."
 msgstr "Groepsprofiel"
 
 #. 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 "Fout tydens stoor van gebruiker; ongeldig."
 
 #. TRANS: Activity title.
 #, fuzzy, php-format
 msgid "Group ID %s is invalid."
 msgstr "Fout tydens stoor van gebruiker; ongeldig."
 
 #. TRANS: Activity title.

-#: classes/Group_member.php:113 lib/joinform.php:114
+#: classes/Group_member.php:147 lib/joinform.php:114

 msgid "Join"
 msgstr "Aansluit"
 
 #. 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.
 msgid "Join"
 msgstr "Aansluit"
 
 #. 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 ""


@@ -5903,7 +6342,7 @@ msgid "Could not create login token for %s"
 msgstr "Dit was nie moontlik om die aliasse te skep nie."
 
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
 msgstr "Dit was nie moontlik om die aliasse te skep nie."
 
 #. 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 ""
 


@@ -5914,13 +6353,13 @@ msgid "You are banned from sending direct messages."
 msgstr "U inkomende boodskappe"
 
 #. TRANS: Message given when a message could not be stored on the server.
 msgstr "U inkomende boodskappe"
 
 #. TRANS: Message given when a message could not be stored on the server.

-#: classes/Message.php:62
+#: classes/Message.php:69

 #, fuzzy
 msgid "Could not insert message."
 msgstr "Kan nie boodskap verwerk nie."
 
 #. TRANS: Message given when a message could not be updated on the server.
 #, fuzzy
 msgid "Could not insert message."
 msgstr "Kan nie boodskap verwerk nie."
 
 #. TRANS: Message given when a message could not be updated on the server.

-#: classes/Message.php:73
+#: classes/Message.php:80

 #, fuzzy
 msgid "Could not update message with new URI."
 msgstr "Kan nie boodskap verwerk nie."
 #, fuzzy
 msgid "Could not update message with new URI."
 msgstr "Kan nie boodskap verwerk nie."


@@ -5933,72 +6372,72 @@ 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 ""
 
 #. TRANS: Client exception thrown if a notice contains too many characters.
 #, php-format
 msgid "Database error inserting hashtag: %s"
 msgstr ""
 
 #. TRANS: Client exception thrown if a notice contains too many characters.

-#: classes/Notice.php:265
+#: classes/Notice.php:279

 msgid "Problem saving notice. Too long."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to save a notice for an unknown user.
 msgid "Problem saving notice. Too long."
 msgstr ""
 
 #. 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 ""
 
 #. 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 ""
 
 #. 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 ""
 
 #. TRANS: Client exception thrown when a user tries to post too many duplicate notices in a given time frame.
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
 
 #. 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

 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "
 "few minutes."
 msgstr ""
 
 #. TRANS: Client exception thrown when a user tries to post while being banned.
 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "
 "few minutes."
 msgstr ""
 
 #. TRANS: Client exception thrown when a user tries to post while being banned.

-#: classes/Notice.php:291
+#: classes/Notice.php:305

 #, fuzzy
 msgid "You are banned from posting notices on this site."
 msgstr "Jy kan nie gebruikers op hierdie webwerf stilmaak nie."
 
 #. TRANS: Server exception thrown when a notice cannot be saved.
 #. TRANS: Server exception thrown when a notice cannot be updated.
 #, fuzzy
 msgid "You are banned from posting notices on this site."
 msgstr "Jy kan nie gebruikers op hierdie webwerf stilmaak nie."
 
 #. 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 ""
 
 #. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
 msgid "Problem saving notice."
 msgstr ""
 
 #. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().

-#: classes/Notice.php:905
+#: classes/Notice.php:914

 msgid "Bad type provided to saveKnownGroups."
 msgstr ""
 
 #. TRANS: Server exception thrown when an update for a group inbox fails.
 msgid "Bad type provided to saveKnownGroups."
 msgstr ""
 
 #. TRANS: Server exception thrown when an update for a group inbox fails.

-#: classes/Notice.php:1004
+#: classes/Notice.php:1013

 msgid "Problem saving group inbox."
 msgstr ""
 
 #. 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.
 msgid "Problem saving group inbox."
 msgstr ""
 
 #. 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:1118
+#: classes/Notice.php:1127

 #, fuzzy, php-format
 msgid "Could not save reply for %1$d, %2$d."
 msgstr "Kon nie die profiel stoor nie."
 
 #. 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 "Kon nie die profiel stoor nie."
 
 #. 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:1820
+#: classes/Notice.php:1646

 #, 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
 #, 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:164 classes/User_group.php:247
+#: classes/Profile.php:172 classes/User_group.php:242

 #, fuzzy, php-format
 msgctxt "FANCYNAME"
 msgid "%1$s (%2$s)"
 #, fuzzy, php-format
 msgctxt "FANCYNAME"
 msgid "%1$s (%2$s)"


@@ -6006,14 +6445,14 @@ 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:812
+#: 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:821
+#: 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 ""


@@ -6031,95 +6470,95 @@ msgid "Unable to save tag."
 msgstr "Dit was nie moontlik om u ontwerp-instellings te stoor nie."
 
 #. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
 msgstr "Dit was nie moontlik om u ontwerp-instellings te stoor nie."
 
 #. 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

 msgid "You have been banned from subscribing."
 msgstr ""
 
 #. TRANS: Exception thrown when trying to subscribe while already subscribed.
 msgid "You have been banned from subscribing."
 msgstr ""
 
 #. TRANS: Exception thrown when trying to subscribe while already subscribed.

-#: classes/Subscription.php:80
+#: classes/Subscription.php:82

 msgid "Already subscribed!"
 msgstr ""
 
 #. TRANS: Exception thrown when trying to subscribe to a user who has blocked the subscribing user.
 msgid "Already subscribed!"
 msgstr ""
 
 #. TRANS: Exception thrown when trying to subscribe to a user who has blocked the subscribing user.

-#: classes/Subscription.php:85
+#: classes/Subscription.php:87

 #, fuzzy
 msgid "User has blocked you."
 msgstr "Hierdie gebruiker het nie 'n profiel nie."
 
 #. TRANS: Exception thrown when trying to unsibscribe without a subscription.
 #, fuzzy
 msgid "User has blocked you."
 msgstr "Hierdie gebruiker het nie 'n profiel nie."
 
 #. TRANS: Exception thrown when trying to unsibscribe without a subscription.

-#: classes/Subscription.php:171
+#: classes/Subscription.php:176

 msgid "Not subscribed!"
 msgstr ""
 
 #. TRANS: Exception thrown when trying to unsubscribe a user from themselves.
 msgid "Not subscribed!"
 msgstr ""
 
 #. TRANS: Exception thrown when trying to unsubscribe a user from themselves.

-#: classes/Subscription.php:178
+#: classes/Subscription.php:183

 #, fuzzy
 msgid "Could not delete self-subscription."
 msgstr ""
 "Dit was nie moontlik om die boodskap van u gunstelinge te verwyder nie."
 
 #. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
 #, fuzzy
 msgid "Could not delete self-subscription."
 msgstr ""
 "Dit was nie moontlik om die boodskap van u gunstelinge te verwyder nie."
 
 #. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.

-#: classes/Subscription.php:206
+#: classes/Subscription.php:211

 #, fuzzy
 msgid "Could not delete subscription OMB token."
 msgstr ""
 "Dit was nie moontlik om die boodskap van u gunstelinge te verwyder nie."
 
 #. TRANS: Exception thrown when a subscription could not be deleted on the server.
 #, fuzzy
 msgid "Could not delete subscription OMB token."
 msgstr ""
 "Dit was nie moontlik om die boodskap van u gunstelinge te verwyder nie."
 
 #. TRANS: Exception thrown when a subscription could not be deleted on the server.

-#: classes/Subscription.php:218
+#: classes/Subscription.php:223

 #, fuzzy
 msgid "Could not delete subscription."
 msgstr ""
 "Dit was nie moontlik om die boodskap van u gunstelinge te verwyder nie."
 
 #. TRANS: Activity tile when subscribing to another person.
 #, fuzzy
 msgid "Could not delete subscription."
 msgstr ""
 "Dit was nie moontlik om die boodskap van u gunstelinge te verwyder nie."
 
 #. 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 "%s volg niemand nie."
 
 #. 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 "%s volg niemand nie."
 
 #. 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

 #, php-format
 msgid "Welcome to %1$s, @%2$s!"
 msgstr "Welkom by %1$s, @%2$s!"
 
 #. TRANS: Server exception.
 #, php-format
 msgid "Welcome to %1$s, @%2$s!"
 msgstr "Welkom by %1$s, @%2$s!"
 
 #. TRANS: Server exception.

-#: classes/User.php:912
+#: 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:916
+#: 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:511
+#: classes/User_group.php:516

 msgid "Could not create group."
 msgstr "Kon nie die groep skep nie."
 
 #. TRANS: Server exception thrown when updating a group URI failed.
 msgid "Could not create group."
 msgstr "Kon nie die groep skep nie."
 
 #. TRANS: Server exception thrown when updating a group URI failed.

-#: classes/User_group.php:521
+#: classes/User_group.php:526

 #, fuzzy
 msgid "Could not set group URI."
 msgstr "Kon nie die groep skep nie."
 
 #. TRANS: Server exception thrown when setting group membership failed.
 #, fuzzy
 msgid "Could not set group URI."
 msgstr "Kon nie die groep skep nie."
 
 #. TRANS: Server exception thrown when setting group membership failed.

-#: classes/User_group.php:544
+#: classes/User_group.php:549

 #, fuzzy
 msgid "Could not set group membership."
 msgstr "Kon nie die groep skep nie."
 
 #. TRANS: Server exception thrown when saving local group information failed.
 #, fuzzy
 msgid "Could not set group membership."
 msgstr "Kon nie die groep skep nie."
 
 #. TRANS: Server exception thrown when saving local group information failed.

-#: classes/User_group.php:559
+#: classes/User_group.php:564

 #, fuzzy
 msgid "Could not save local group info."
 msgstr "Kon nie die profiel stoor nie."
 #, fuzzy
 msgid "Could not save local group info."
 msgstr "Kon nie die profiel stoor nie."


@@ -6172,206 +6611,206 @@ msgid "Untitled page"
 msgstr ""
 
 #. TRANS: Localized tooltip for '...' expansion button on overlong remote messages.
 msgstr ""
 
 #. TRANS: Localized tooltip for '...' expansion button on overlong remote messages.

-#: lib/action.php:310
+#: lib/action.php:312

 msgctxt "TOOLTIP"
 msgid "Show more"
 msgstr ""
 
 #. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
 msgctxt "TOOLTIP"
 msgid "Show more"
 msgstr ""
 
 #. TRANS: DT element for primary navigation menu. String is hidden in default CSS.

-#: lib/action.php:526
+#: 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:532
+#: 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:535
+#: lib/action.php:540

 msgctxt "MENU"
 msgid "Personal"
 msgstr "Persoonlik"
 
 #. TRANS: Tooltip for main menu option "Account"
 msgctxt "MENU"
 msgid "Personal"
 msgstr "Persoonlik"
 
 #. TRANS: Tooltip for main menu option "Account"

-#: lib/action.php:537
+#: lib/action.php:542

 #, fuzzy
 msgctxt "TOOLTIP"
 msgid "Change your email, avatar, password, profile"
 msgstr "Verander u wagwoord"
 
 #. TRANS: Main menu option when logged in for access to user settings
 #, fuzzy
 msgctxt "TOOLTIP"
 msgid "Change your email, avatar, password, profile"
 msgstr "Verander u wagwoord"
 
 #. TRANS: Main menu option when logged in for access to user settings

-#: lib/action.php:540
+#: lib/action.php:545

 msgid "Account"
 msgstr "Gebruiker"
 
 #. TRANS: Tooltip for main menu option "Services"
 msgid "Account"
 msgstr "Gebruiker"
 
 #. TRANS: Tooltip for main menu option "Services"

-#: lib/action.php:542
+#: lib/action.php:547

 msgctxt "TOOLTIP"
 msgid "Connect to services"
 msgstr ""
 
 #. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
 msgctxt "TOOLTIP"
 msgid "Connect to services"
 msgstr ""
 
 #. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services

-#: lib/action.php:545
+#: lib/action.php:550

 msgid "Connect"
 msgstr "Konnekteer"
 
 #. TRANS: Tooltip for menu option "Admin"
 msgid "Connect"
 msgstr "Konnekteer"
 
 #. TRANS: Tooltip for menu option "Admin"

-#: lib/action.php:548
+#: lib/action.php:553

 msgctxt "TOOLTIP"
 msgid "Change site configuration"
 msgstr ""
 
 #. TRANS: Main menu option when logged in and site admin for access to site configuration
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
 msgctxt "TOOLTIP"
 msgid "Change site configuration"
 msgstr ""
 
 #. TRANS: Main menu option when logged in and site admin for access to site configuration
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.

-#: lib/action.php:551 lib/groupnav.php:117
+#: lib/action.php:556 lib/groupnav.php:117

 msgctxt "MENU"
 msgid "Admin"
 msgstr "Beheer"
 
 #. TRANS: Tooltip for main menu option "Invite"
 msgctxt "MENU"
 msgid "Admin"
 msgstr "Beheer"
 
 #. TRANS: Tooltip for main menu option "Invite"

-#: lib/action.php:555
+#: lib/action.php:560

 #, php-format
 msgctxt "TOOLTIP"
 msgid "Invite friends and colleagues to join you on %s"
 msgstr ""
 
 #. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Invite friends and colleagues to join you on %s"
 msgstr ""
 
 #. TRANS: Main menu option when logged in and invitations are allowed for inviting new users

-#: lib/action.php:558
+#: lib/action.php:563

 msgctxt "MENU"
 msgid "Invite"
 msgstr "Uitnodig"
 
 #. TRANS: Tooltip for main menu option "Logout"
 msgctxt "MENU"
 msgid "Invite"
 msgstr "Uitnodig"
 
 #. TRANS: Tooltip for main menu option "Logout"

-#: lib/action.php:564
+#: lib/action.php:569

 #, fuzzy
 msgctxt "TOOLTIP"
 msgid "Logout from the site"
 msgstr "Meld by die webwerf aan"
 
 #. TRANS: Main menu option when logged in to log out the current user
 #, fuzzy
 msgctxt "TOOLTIP"
 msgid "Logout from the site"
 msgstr "Meld by die webwerf aan"
 
 #. TRANS: Main menu option when logged in to log out the current user

-#: lib/action.php:567
+#: lib/action.php:572

 msgctxt "MENU"
 msgid "Logout"
 msgstr "Teken uit"
 
 #. TRANS: Tooltip for main menu option "Register"
 msgctxt "MENU"
 msgid "Logout"
 msgstr "Teken uit"
 
 #. TRANS: Tooltip for main menu option "Register"

-#: lib/action.php:572
+#: lib/action.php:577

 msgctxt "TOOLTIP"
 msgid "Create an account"
 msgstr "Skep 'n gebruiker"
 
 #. TRANS: Main menu option when not logged in to register a new account
 msgctxt "TOOLTIP"
 msgid "Create an account"
 msgstr "Skep 'n gebruiker"
 
 #. TRANS: Main menu option when not logged in to register a new account

-#: lib/action.php:575
+#: lib/action.php:580

 msgctxt "MENU"
 msgid "Register"
 msgstr "Registreer"
 
 #. TRANS: Tooltip for main menu option "Login"
 msgctxt "MENU"
 msgid "Register"
 msgstr "Registreer"
 
 #. TRANS: Tooltip for main menu option "Login"

-#: lib/action.php:578
+#: lib/action.php:583

 msgctxt "TOOLTIP"
 msgid "Login to the site"
 msgstr "Meld by die webwerf aan"
 
 #. TRANS: Main menu option when not logged in to log in
 msgctxt "TOOLTIP"
 msgid "Login to the site"
 msgstr "Meld by die webwerf aan"
 
 #. TRANS: Main menu option when not logged in to log in

-#: lib/action.php:581
+#: lib/action.php:586

 msgctxt "MENU"
 msgid "Login"
 msgstr "Teken in"
 
 #. TRANS: Tooltip for main menu option "Help"
 msgctxt "MENU"
 msgid "Login"
 msgstr "Teken in"
 
 #. TRANS: Tooltip for main menu option "Help"

-#: lib/action.php:584
+#: lib/action.php:589

 msgctxt "TOOLTIP"
 msgid "Help me!"
 msgstr "Help my!"
 
 #. TRANS: Main menu option for help on the StatusNet site
 msgctxt "TOOLTIP"
 msgid "Help me!"
 msgstr "Help my!"
 
 #. TRANS: Main menu option for help on the StatusNet site

-#: lib/action.php:587
+#: lib/action.php:592

 msgctxt "MENU"
 msgid "Help"
 msgstr "Help"
 
 #. TRANS: Tooltip for main menu option "Search"
 msgctxt "MENU"
 msgid "Help"
 msgstr "Help"
 
 #. TRANS: Tooltip for main menu option "Search"

-#: lib/action.php:590
+#: lib/action.php:595

 msgctxt "TOOLTIP"
 msgid "Search for people or text"
 msgstr "Soek na mense of teks"
 
 #. TRANS: Main menu option when logged in or when the StatusNet instance is not private
 msgctxt "TOOLTIP"
 msgid "Search for people or text"
 msgstr "Soek na mense of teks"
 
 #. TRANS: Main menu option when logged in or when the StatusNet instance is not private

-#: lib/action.php:593
+#: lib/action.php:598

 msgctxt "MENU"
 msgid "Search"
 msgstr "Soek"
 
 #. TRANS: DT element for site notice. String is hidden in default CSS.
 #. TRANS: Menu item for site administration
 msgctxt "MENU"
 msgid "Search"
 msgstr "Soek"
 
 #. TRANS: DT element for site notice. String is hidden in default CSS.
 #. TRANS: Menu item for site administration

-#: lib/action.php:615 lib/adminpanelaction.php:387
+#: lib/action.php:620 lib/adminpanelaction.php:387

 #, fuzzy
 msgid "Site notice"
 msgstr "Verwyder kennisgewing"
 
 #. TRANS: DT element for local views block. String is hidden in default CSS.
 #, fuzzy
 msgid "Site notice"
 msgstr "Verwyder kennisgewing"
 
 #. TRANS: DT element for local views block. String is hidden in default CSS.

-#: lib/action.php:682
+#: lib/action.php:687

 #, fuzzy
 msgid "Local views"
 msgstr "Lokaal"
 
 #. TRANS: DT element for page notice. String is hidden in default CSS.
 #, fuzzy
 msgid "Local views"
 msgstr "Lokaal"
 
 #. TRANS: DT element for page notice. String is hidden in default CSS.

-#: lib/action.php:752
+#: lib/action.php:757

 #, fuzzy
 msgid "Page notice"
 msgstr "Populêre kennisgewings"
 
 #. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
 #, fuzzy
 msgid "Page notice"
 msgstr "Populêre kennisgewings"
 
 #. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.

-#: lib/action.php:853
+#: lib/action.php:858

 msgid "Secondary site navigation"
 msgstr ""
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
 msgid "Secondary site navigation"
 msgstr ""
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.

-#: lib/action.php:859
+#: lib/action.php:864

 msgid "Help"
 msgstr "Help"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
 msgid "Help"
 msgstr "Help"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.

-#: lib/action.php:862
+#: lib/action.php:867

 msgid "About"
 msgstr "Aangaande"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
 msgid "About"
 msgstr "Aangaande"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.

-#: lib/action.php:865
+#: lib/action.php:870

 msgid "FAQ"
 msgstr "Gewilde vrae"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
 msgid "FAQ"
 msgstr "Gewilde vrae"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.

-#: lib/action.php:870
+#: lib/action.php:875

 msgid "TOS"
 msgstr "Gebruiksvoorwaardes"
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
 msgid "TOS"
 msgstr "Gebruiksvoorwaardes"
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.

-#: lib/action.php:874
+#: lib/action.php:879

 msgid "Privacy"
 msgstr "Privaatheid"
 
 #. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
 msgid "Privacy"
 msgstr "Privaatheid"
 
 #. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.

-#: lib/action.php:877
+#: lib/action.php:882

 msgid "Source"
 msgstr "Bron"
 
 #. TRANS: Secondary navigation menu option leading to e-mail contact information on the
 #. TRANS: StatusNet site, where to report bugs, ...
 msgid "Source"
 msgstr "Bron"
 
 #. TRANS: Secondary navigation menu option leading to e-mail contact information on the
 #. TRANS: StatusNet site, where to report bugs, ...

-#: lib/action.php:884
+#: lib/action.php:889

 msgid "Contact"
 msgstr "Kontak"
 
 #. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
 msgid "Contact"
 msgstr "Kontak"
 
 #. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.

-#: lib/action.php:887
+#: lib/action.php:892

 #, fuzzy
 msgid "Badge"
 msgstr "Aanpor"
 
 #. TRANS: DT element for StatusNet software license.
 #, fuzzy
 msgid "Badge"
 msgstr "Aanpor"
 
 #. TRANS: DT element for StatusNet software license.

-#: lib/action.php:916
+#: lib/action.php:921

 msgid "StatusNet software license"
 msgstr ""
 
 msgid "StatusNet software license"
 msgstr ""
 


@@ -6379,7 +6818,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:923
+#: lib/action.php:928

 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."


@@ -6387,7 +6826,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
 msgstr ""
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.

-#: lib/action.php:926
+#: lib/action.php:931

 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr ""
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr ""


@@ -6396,7 +6835,7 @@ msgstr ""
 #. 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:933
+#: 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 %"


@@ -6405,59 +6844,110 @@ msgid ""
 msgstr ""
 
 #. TRANS: DT element for StatusNet site content license.
 msgstr ""
 
 #. TRANS: DT element for StatusNet site content license.

-#: lib/action.php:949
+#: lib/action.php:954

 msgid "Site content license"
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
 msgid "Site content license"
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.

-#: lib/action.php:956
+#: 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:963
+#: 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:967
+#: 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:999
+#: 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:1335
+#: lib/action.php:1340

 #, fuzzy
 msgid "Pagination"
 msgstr "Registratie"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
 #, fuzzy
 msgid "Pagination"
 msgstr "Registratie"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.

-#: lib/action.php:1346
+#: lib/action.php:1351

 msgid "After"
 msgstr "Na"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
 msgid "After"
 msgstr "Na"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.

-#: lib/action.php:1356
+#: lib/action.php:1361

 msgid "Before"
 msgstr "Voor"
 
 #. TRANS: Client exception thrown when a feed instance is a DOMDocument.
 msgid "Before"
 msgstr "Voor"
 
 #. 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 "Onbekende taal \"%s\"."
+
+#. 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 "Kon nie gebruikersdata opdateer nie."
+
+#. TRANS: Client exception thrown when trying to subscribe to an unknown profile.
+#: lib/activityimporter.php:132
+#, fuzzy
+msgid "Unknown profile."
+msgstr "Onbekende lêertipe"
+
+#. 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 "U is reeds 'n lid van die groep."
+
+#. 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 "U kan nie u eie kennisgewings herhaal nie."
+

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


@@ -6757,17 +7247,23 @@ msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "Verwyder"
 
 msgid "Revoke"
 msgstr "Verwyder"
 

-#: 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 "Moenie hierdie kennisgewing verwyder nie"
+

 #. 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 "Outeur"
 
 #. TRANS: DT element label in attachment list item.
 msgid "Author"
 msgstr "Outeur"
 
 #. TRANS: DT element label in attachment list item.

-#: lib/attachmentlist.php:270
+#: lib/attachmentlist.php:308

 msgid "Provider"
 msgstr "Verskaffer"
 
 msgid "Provider"
 msgstr "Verskaffer"
 


@@ -7165,25 +7661,25 @@ msgid ""
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 msgstr ""
 
 #. 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 "Geen bevestigingskode."
 
 #. 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 "Geen bevestigingskode."
 
 #. 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

 msgid "I looked for configuration files in the following places:"
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 msgid "I looked for configuration files in the following places:"
 msgstr ""
 
 #. 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 "Gaan na die installeerder."
 
 msgid "Go to the installer."
 msgstr "Gaan na die installeerder."
 


@@ -7293,6 +7789,19 @@ msgstr "Atom"
 msgid "FOAF"
 msgstr "Vriende van vriende (FOAF)"
 
 msgid "FOAF"
 msgstr "Vriende van vriende (FOAF)"
 

+#: lib/feedimporter.php:75
+#, fuzzy
+msgid "Not an atom feed."
+msgstr "Alle lede"
+
+#: 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"
 #. TRANS: Header for feed links (h2).
 #: lib/feedlist.php:66
 msgid "Feeds"


@@ -7478,26 +7987,21 @@ msgstr "Die kennisgewing is te lank. Gebruik maksimum %d karakters."
 msgid "Partial upload."
 msgstr "Geen lêer opgelaai nie."
 
 msgid "Partial upload."
 msgstr "Geen lêer opgelaai nie."
 

-#. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
-#: lib/imagefile.php:103 lib/mediafile.php:179
-msgid "System error uploading file."
-msgstr ""
-

 #: lib/imagefile.php:111
 msgid "Not an image or corrupt file."
 msgstr ""
 
 #: lib/imagefile.php:111
 msgid "Not an image or corrupt file."
 msgstr ""
 

-#: lib/imagefile.php:124
+#: lib/imagefile.php:160

 #, fuzzy
 msgid "Lost our file."
 msgstr "Die lêer bestaan nie."
 
 #, fuzzy
 msgid "Lost our file."
 msgstr "Die lêer bestaan nie."
 

-#: lib/imagefile.php:165 lib/imagefile.php:226
+#: lib/imagefile.php:197 lib/imagefile.php:237

 msgid "Unknown file type"
 msgstr "Onbekende lêertipe"
 
 #. TRANS: Number of megabytes. %d is the number.
 msgid "Unknown file type"
 msgstr "Onbekende lêertipe"
 
 #. TRANS: Number of megabytes. %d is the number.

-#: lib/imagefile.php:248
+#: lib/imagefile.php:283

 #, fuzzy, php-format
 msgid "%dMB"
 msgid_plural "%dMB"
 #, fuzzy, php-format
 msgid "%dMB"
 msgid_plural "%dMB"


@@ -7505,7 +8009,7 @@ msgstr[0] "MB"
 msgstr[1] "MB"
 
 #. TRANS: Number of kilobytes. %d is the number.
 msgstr[1] "MB"
 
 #. TRANS: Number of kilobytes. %d is the number.

-#: lib/imagefile.php:252
+#: lib/imagefile.php:287

 #, fuzzy, php-format
 msgid "%dkB"
 msgid_plural "%dkB"
 #, fuzzy, php-format
 msgid "%dkB"
 msgid_plural "%dkB"


@@ -7513,7 +8017,7 @@ msgstr[0] "kB"
 msgstr[1] "kB"
 
 #. TRANS: Number of bytes. %d is the number.
 msgstr[1] "kB"
 
 #. TRANS: Number of bytes. %d is the number.

-#: lib/imagefile.php:255
+#: lib/imagefile.php:290

 #, php-format
 msgid "%dB"
 msgid_plural "%dB"
 #, php-format
 msgid "%dB"
 msgid_plural "%dB"


@@ -7802,7 +8306,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

 msgid "from"
 msgstr "van"
 
 msgid "from"
 msgstr "van"
 


@@ -7828,56 +8332,24 @@ msgid "Unsupported message type: %s"
 msgstr "Nie-ondersteunde formaat."
 
 #. TRANS: Client exception thrown when a database error was thrown during a file upload operation.
 msgstr "Nie-ondersteunde formaat."
 
 #. 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

 #, fuzzy
 msgid "Could not determine file's MIME type."
 msgstr ""
 #, fuzzy
 msgid "Could not determine file's MIME type."
 msgstr ""


@@ -7886,7 +8358,7 @@ msgstr ""
 #. 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.
 #. 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:345
+#: 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 "


@@ -7895,7 +8367,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:350
+#: 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 ""


@@ -7905,19 +8377,50 @@ msgstr ""
 msgid "Send a direct notice"
 msgstr "Stuur 'n direkte boodskap aan hierdie gebruiker"
 
 msgid "Send a direct notice"
 msgstr "Stuur 'n direkte boodskap aan hierdie gebruiker"
 

-#: 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
+msgid "Select recipient:"
+msgstr ""
+
+#. 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 "Alle lede"
+
+#: lib/messageform.php:153

 msgid "To"
 msgstr "Aan"
 
 msgid "To"
 msgstr "Aan"
 

-#: lib/messageform.php:159 lib/noticeform.php:186
+#: lib/messageform.php:166 lib/noticeform.php:186

 msgid "Available characters"
 msgstr "Beskikbare karakters"
 
 msgid "Available characters"
 msgstr "Beskikbare karakters"
 

-#: lib/messageform.php:178 lib/noticeform.php:237
+#: lib/messageform.php:185 lib/noticeform.php:237

 msgctxt "Send button for sending notice"
 msgid "Send"
 msgstr "Stuur"
 
 msgctxt "Send button for sending notice"
 msgid "Send"
 msgstr "Stuur"
 

+#. 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 ""
+"Die gebruikersnaam mag slegs uit kleinletters en syfers bestaan en mag geen "
+"spasies bevat nie."
+
+#. 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] ""
+

 #: lib/noticeform.php:160
 #, fuzzy
 msgid "Send a notice"
 #: lib/noticeform.php:160
 #, fuzzy
 msgid "Send a notice"


@@ -7952,56 +8455,56 @@ 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

 msgid "N"
 msgstr "N"
 
 #. TRANS: Used in coordinates as abbreviation of south
 msgid "N"
 msgstr "N"
 
 #. TRANS: Used in coordinates as abbreviation of south

-#: lib/noticelist.php:448
+#: lib/noticelist.php:454

 msgid "S"
 msgstr "S"
 
 #. TRANS: Used in coordinates as abbreviation of east
 msgid "S"
 msgstr "S"
 
 #. TRANS: Used in coordinates as abbreviation of east

-#: lib/noticelist.php:450
+#: lib/noticelist.php:456

 msgid "E"
 msgstr "O"
 
 #. TRANS: Used in coordinates as abbreviation of west
 msgid "E"
 msgstr "O"
 
 #. TRANS: Used in coordinates as abbreviation of west

-#: lib/noticelist.php:452
+#: lib/noticelist.php:458

 msgid "W"
 msgstr "W"
 
 msgid "W"
 msgstr "W"
 

-#: 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 "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 
 #, php-format
 msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 

-#: lib/noticelist.php:463
+#: lib/noticelist.php:469

 msgid "at"
 msgstr "op"
 
 msgid "at"
 msgstr "op"
 

-#: lib/noticelist.php:512
+#: lib/noticelist.php:518

 msgid "web"
 msgstr ""
 
 msgid "web"
 msgstr ""
 

-#: lib/noticelist.php:578
+#: lib/noticelist.php:584

 msgid "in context"
 msgstr "in konteks"
 
 msgid "in context"
 msgstr "in konteks"
 

-#: lib/noticelist.php:613
+#: lib/noticelist.php:619

 msgid "Repeated by"
 msgstr "Herhaal deur"
 
 msgid "Repeated by"
 msgstr "Herhaal deur"
 

-#: lib/noticelist.php:640
+#: lib/noticelist.php:646

 #, fuzzy
 msgid "Reply to this notice"
 msgstr "Verwyder hierdie kennisgewing"
 
 #, fuzzy
 msgid "Reply to this notice"
 msgstr "Verwyder hierdie kennisgewing"
 

-#: lib/noticelist.php:641
+#: lib/noticelist.php:647

 msgid "Reply"
 msgstr "Antwoord"
 
 msgid "Reply"
 msgstr "Antwoord"
 

-#: lib/noticelist.php:685
+#: lib/noticelist.php:691

 #, fuzzy
 msgid "Notice repeated"
 msgstr "Hierdie kennisgewing is verwyder."
 #, fuzzy
 msgid "Notice repeated"
 msgstr "Hierdie kennisgewing is verwyder."


@@ -8166,7 +8669,7 @@ msgid "Revoke the \"%s\" role from this user"
 msgstr "Blok hierdie gebruiker van hierdie groep"
 
 #. TRANS: Client error on action trying to visit a non-existing page.
 msgstr "Blok hierdie gebruiker van hierdie groep"
 
 #. 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 "Die API-funksie is nie gevind nie."
 #, fuzzy
 msgid "Page not found."
 msgstr "Die API-funksie is nie gevind nie."


@@ -8378,64 +8881,64 @@ msgstr ""
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "Hierdie gebruiker het nie 'n profiel nie."
 
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "Hierdie gebruiker het nie 'n profiel nie."
 

-#: lib/userprofile.php:117
+#: lib/userprofile.php:119

 msgid "Edit Avatar"
 msgstr "Wysig Avatar"
 
 msgid "Edit Avatar"
 msgstr "Wysig Avatar"
 

-#: lib/userprofile.php:234 lib/userprofile.php:248
+#: lib/userprofile.php:236 lib/userprofile.php:250

 msgid "User actions"
 msgstr "Gebruikershandelinge"
 
 msgid "User actions"
 msgstr "Gebruikershandelinge"
 

-#: 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

 msgid "Edit profile settings"
 msgstr "Wysig profiel-instellings"
 
 msgid "Edit profile settings"
 msgstr "Wysig profiel-instellings"
 

-#: lib/userprofile.php:264
+#: lib/userprofile.php:266

 msgid "Edit"
 msgstr "Wysig"
 
 msgid "Edit"
 msgstr "Wysig"
 

-#: lib/userprofile.php:287
+#: lib/userprofile.php:289

 msgid "Send a direct message to this user"
 msgstr "Stuur 'n direkte boodskap aan hierdie gebruiker"
 
 msgid "Send a direct message to this user"
 msgstr "Stuur 'n direkte boodskap aan hierdie gebruiker"
 

-#: lib/userprofile.php:288
+#: lib/userprofile.php:290

 msgid "Message"
 msgstr "Boodskap"
 
 msgid "Message"
 msgstr "Boodskap"
 

-#: lib/userprofile.php:326
+#: lib/userprofile.php:331

 msgid "Moderate"
 msgstr "Modereer"
 
 msgid "Moderate"
 msgstr "Modereer"
 

-#: lib/userprofile.php:364
+#: lib/userprofile.php:369

 msgid "User role"
 msgstr "Gebruikersrol"
 
 msgid "User role"
 msgstr "Gebruikersrol"
 

-#: lib/userprofile.php:366
+#: lib/userprofile.php:371

 msgctxt "role"
 msgid "Administrator"
 msgstr "Administrateur"
 
 msgctxt "role"
 msgid "Administrator"
 msgstr "Administrateur"
 

-#: lib/userprofile.php:367
+#: lib/userprofile.php:372

 msgctxt "role"
 msgid "Moderator"
 msgstr "Moderator"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 msgctxt "role"
 msgid "Moderator"
 msgstr "Moderator"
 
 #. 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 "'n paar sekondes gelede"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 msgid "a few seconds ago"
 msgstr "'n paar sekondes gelede"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.

-#: lib/util.php:1178
+#: lib/util.php:1309

 msgid "about a minute ago"
 msgstr "ongeveer 'n minuut gelede"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 msgid "about a minute ago"
 msgstr "ongeveer 'n minuut gelede"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.

-#: lib/util.php: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"


@@ -8443,12 +8946,12 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 msgstr[1] ""
 
 #. 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 "ongeveer 'n uur gelede"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 msgid "about an hour ago"
 msgstr "ongeveer 'n uur gelede"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.

-#: lib/util.php: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"


@@ -8456,12 +8959,12 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 msgstr[1] ""
 
 #. 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 "ongeveer een dag gelede"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 msgid "about a day ago"
 msgstr "ongeveer een dag gelede"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.

-#: lib/util.php: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"


@@ -8469,12 +8972,12 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 msgstr[1] ""
 
 #. 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 "ongeveer een maand gelede"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 msgid "about a month ago"
 msgstr "ongeveer een maand gelede"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.

-#: lib/util.php: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"


@@ -8482,7 +8985,7 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 msgstr[1] ""
 
 #. 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 "ongeveer een jaar gelede"
 
 msgid "about a year ago"
 msgstr "ongeveer een jaar gelede"
 


@@ -8500,14 +9003,14 @@ msgstr ""
 "%s is nie 'n geldige kleur nie. Gebruik drie of ses heksadesimale karakters."
 
 #. TRANS: %s is the URL to the StatusNet site's Instant Messaging settings.
 "%s is nie 'n geldige kleur nie. Gebruik drie of ses heksadesimale karakters."
 
 #. 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."


@@ -8518,22 +9021,19 @@ msgstr[1] ""
 "Boodskap is te lank. Die maksimum is %1$d karakters. U het %2$d karakters "
 "gestuur."
 
 "Boodskap is te lank. Die maksimum is %1$d karakters. U het %2$d karakters "
 "gestuur."
 

+#. TRANS: Exception.
+#: lib/xrd.php:64
+#, fuzzy
+msgid "Invalid XML."
+msgstr "Ongeldige grootte."
+
+#. TRANS: Exception.
+#: lib/xrd.php:69
+msgid "Invalid XML, missing XRD root."
+msgstr ""
+

 #. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
 #. TRANS: Commandline script output. %s is the filename that contains a backup for a user.

-#: scripts/restoreuser.php:61
+#: scripts/restoreuser.php:62

 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""

-
-#. TRANS: Commandline script output.
-#: scripts/restoreuser.php:91
-#, fuzzy
-msgid "No user specified; using backup user."
-msgstr "Geen groep verskaf nie."
-
-#. TRANS: Commandline script output. %d is the number of entries in the activity stream in backup; used for plural.
-#: scripts/restoreuser.php:98
-#, php-format
-msgid "%d entry in backup."
-msgid_plural "%d entries in backup."
-msgstr[0] ""
-msgstr[1] ""