Localisation updates from http://translatewiki.net.

[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 e7b29b7247d0e79b1d886a8853e9e8519413378f..5d42ad2553ff2c743318179405c60575a53ca117 100644 (file)
--- a/locale/af/LC_MESSAGES/statusnet.po
+++ b/locale/af/LC_MESSAGES/statusnet.po
@@ -1,154 +1,192 @@
-# Translation of StatusNet to Afrikaans
+# Translation of StatusNet - Core to Afrikaans (Afrikaans)
+# Expored from translatewiki.net

 #
 #

-# Author@translatewiki.net: Naudefj
+# Author: Naudefj

 # --
 # This file is distributed under the same license as the StatusNet package.
 #
 msgid ""
 msgstr ""
 # --
 # This file is distributed under the same license as the StatusNet package.
 #
 msgid ""
 msgstr ""

-"Project-Id-Version: StatusNet\n"
+"Project-Id-Version: StatusNet - Core\n"

 "Report-Msgid-Bugs-To: \n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2010-09-05 09:45+0000\n"
-"PO-Revision-Date: 2010-09-05 09:45:08+0000\n"
-"Language-Team: Afrikaans\n"
+"POT-Creation-Date: 2010-11-30 20:16+0000\n"
+"PO-Revision-Date: 2010-11-30 20:17:46+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"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

-"X-Generator: MediaWiki 1.17alpha (r72319); Translate extension (2010-08-20)\n"
+"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"

 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: af\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: af\n"

-"X-Message-Group: out-statusnet\n"
+"X-Message-Group: #out-statusnet-core\n"

 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"

+"X-POT-Import-Date: 2010-11-30 17:54:26+0000\n"

 
 

-#. TRANS: Page title
+#. TRANS: Page title for Access admin panel that allows configuring site access.

 #. TRANS: Menu item for site administration
 #. TRANS: Menu item for site administration

-#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:376
+#: actions/accessadminpanel.php:53 lib/adminpanelaction.php:363

 msgid "Access"
 msgstr "Toegang"
 
 msgid "Access"
 msgstr "Toegang"
 

-#. TRANS: Page notice
-#: actions/accessadminpanel.php:67
+#. TRANS: Page notice.
+#: actions/accessadminpanel.php:64

 msgid "Site access settings"
 msgstr "Instellings vir toegang tot webwerf"
 
 #. TRANS: Form legend for registration form.
 msgid "Site access settings"
 msgstr "Instellings vir toegang tot webwerf"
 
 #. TRANS: Form legend for registration form.

-#: actions/accessadminpanel.php:161
+#: actions/accessadminpanel.php:151

 msgid "Registration"
 msgstr "Registratie"
 
 msgid "Registration"
 msgstr "Registratie"
 

-#. TRANS: Checkbox instructions for admin setting "Private"
-#: actions/accessadminpanel.php:165
+#. TRANS: Checkbox instructions for admin setting "Private".
+#: actions/accessadminpanel.php:155

 msgid "Prohibit anonymous users (not logged in) from viewing site?"
 msgstr "Mag anonieme gebruikers (nie aangeteken nie) die webwerf besigtig?"
 
 #. TRANS: Checkbox label for prohibiting anonymous users from viewing site.
 msgid "Prohibit anonymous users (not logged in) from viewing site?"
 msgstr "Mag anonieme gebruikers (nie aangeteken nie) die webwerf besigtig?"
 
 #. TRANS: Checkbox label for prohibiting anonymous users from viewing site.

-#: actions/accessadminpanel.php:167
+#: actions/accessadminpanel.php:157

 msgctxt "LABEL"
 msgid "Private"
 msgstr "Geen anonieme toegang"
 
 msgctxt "LABEL"
 msgid "Private"
 msgstr "Geen anonieme toegang"
 

-#. TRANS: Checkbox instructions for admin setting "Invite only"
-#: actions/accessadminpanel.php:174
+#. TRANS: Checkbox instructions for admin setting "Invite only".
+#: actions/accessadminpanel.php:164

 msgid "Make registration invitation only."
 msgstr "Registrasie slegs op uitnodiging."
 
 #. TRANS: Checkbox label for configuring site as invite only.
 msgid "Make registration invitation only."
 msgstr "Registrasie slegs op uitnodiging."
 
 #. TRANS: Checkbox label for configuring site as invite only.

-#: actions/accessadminpanel.php:176
+#: actions/accessadminpanel.php:166

 msgid "Invite only"
 msgstr "Slegs op uitnodiging"
 
 msgid "Invite only"
 msgstr "Slegs op uitnodiging"
 

-#. TRANS: Checkbox instructions for admin setting "Closed" (no new registrations)
-#: actions/accessadminpanel.php:183
+#. TRANS: Checkbox instructions for admin setting "Closed" (no new registrations).
+#: actions/accessadminpanel.php:173

 msgid "Disable new registrations."
 msgstr "Deaktiveer nuwe registrasies."
 
 #. TRANS: Checkbox label for disabling new user registrations.
 msgid "Disable new registrations."
 msgstr "Deaktiveer nuwe registrasies."
 
 #. TRANS: Checkbox label for disabling new user registrations.

-#: actions/accessadminpanel.php:185
+#: actions/accessadminpanel.php:175

 msgid "Closed"
 msgstr "Gesluit"
 
 msgid "Closed"
 msgstr "Gesluit"
 

-#. TRANS: Title / tooltip for button to save access settings in site admin panel
-#: actions/accessadminpanel.php:202
+#. TRANS: Title for button to save access settings in site admin panel.
+#: actions/accessadminpanel.php:191

 msgid "Save access settings"
 msgstr "Stoor toegangsinstellings"
 
 msgid "Save access settings"
 msgstr "Stoor toegangsinstellings"
 

+#. TRANS: Tooltip for button to save access settings in site admin panel.

 #. TRANS: Button label to save e-mail preferences.
 #. TRANS: Button label to save IM preferences.
 #. TRANS: Button label to save e-mail preferences.
 #. TRANS: Button label to save IM preferences.

+#. TRANS: Button text for saving "Other settings" in profile.
+#. TRANS: Button text to store form data in the Paths admin panel.
+#. TRANS: Button to save input in profile settings.
+#. TRANS: Button text for saving site notice in admin panel.

 #. TRANS: Button label to save SMS preferences.
 #. TRANS: Button label to save SMS preferences.

-#. TRANS: Button label
-#: actions/accessadminpanel.php:203 actions/emailsettings.php:224
-#: actions/imsettings.php:184 actions/smssettings.php:209
-#: lib/applicationeditform.php:361
+#. TRANS: Save button for settings for a profile in a subscriptions list.
+#. TRANS: Button text to save user settings in user admin panel.
+#. TRANS: Button label in the "Edit application" form.
+#. TRANS: Button text on profile design page to save settings.
+#: actions/accessadminpanel.php:193 actions/emailsettings.php:232
+#: 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
+#: lib/applicationeditform.php:355 lib/designsettings.php:270
+#: lib/groupeditform.php:207

 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Stoor"
 
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Stoor"
 

+#. TRANS: Server error when page not found (404).

 #. TRANS: Server error when page not found (404)
 #: actions/all.php:68 actions/public.php:98 actions/replies.php:93
 #: actions/showfavorites.php:138 actions/tag.php:52
 msgid "No such page."
 msgstr "Hierdie bladsy bestaan nie."
 
 #. TRANS: Server error when page not found (404)
 #: actions/all.php:68 actions/public.php:98 actions/replies.php:93
 #: actions/showfavorites.php:138 actions/tag.php:52
 msgid "No such page."
 msgstr "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 updating profile image without having a user object.
+#. TRANS: Client error when user not found for an API action to remove a block for a user.
+#. TRANS: Client error given when a user was not found (404).
+#. TRANS: Client error when user not found for an API direct message action.
+#. TRANS: Client error given when a user was not found (404).
+#. TRANS: Client error displayed when checking group membership for a non-existing user.
+#. TRANS: Client error displayed when trying to have a non-existing user join a group.
+#. TRANS: Client error displayed when trying to have a non-existing user leave a group.
+#. TRANS: Client error displayed when updating a status for a non-existing user.
+#. TRANS: Client error displayed when requesting a list of followers for a non-existing user.
+#. TRANS: Client error displayed when requesting most recent favourite notices by a user for a non-existing user.
+#. TRANS: Client error displayed when requesting dents of a user and friends for a user that does not exist.
+#. TRANS: Client error displayed when requesting most recent dents by user and friends for a non-existing user.
+#. TRANS: Client error displayed when requesting most recent mentions for a non-existing user.
+#. TRANS: Client error displayed requesting most recent notices for a non-existing user.
+#. TRANS: Client error displayed trying to get an avatar for a non-existing user.

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

-#: actions/all.php:79 actions/allrss.php:68
-#: actions/apiaccountupdatedeliverydevice.php:114
-#: actions/apiaccountupdateprofile.php:105
-#: actions/apiaccountupdateprofilebackgroundimage.php:116
-#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
-#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
-#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:113
-#: actions/apigroupismember.php:91 actions/apigroupjoin.php:100
-#: actions/apigroupleave.php:100 actions/apigrouplist.php:73
-#: actions/apistatusesupdate.php:229 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:72 actions/apitimelinefriends.php:174
-#: actions/apitimelinehome.php:80 actions/apitimelinementions.php:80
-#: actions/apitimelineuser.php:82 actions/avatarbynickname.php:75
-#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
-#: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116
-#: actions/otp.php:76 actions/remotesubscribe.php:145
-#: actions/remotesubscribe.php:154 actions/replies.php:73
-#: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
-#: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:498 lib/galleryaction.php:59
+#: actions/all.php:80 actions/allrss.php:69
+#: actions/apiaccountupdatedeliverydevice.php:110
+#: actions/apiaccountupdateprofile.php:103
+#: actions/apiaccountupdateprofilebackgroundimage.php:118
+#: actions/apiaccountupdateprofileimage.php:104 actions/apiatomservice.php:60
+#: actions/apiblockcreate.php:95 actions/apiblockdestroy.php:94
+#: actions/apidirectmessage.php:75 actions/apidirectmessagenew.php:72
+#: actions/apigroupcreate.php:111 actions/apigroupismember.php:89
+#: actions/apigroupjoin.php:98 actions/apigroupleave.php:98
+#: actions/apigrouplist.php:70 actions/apistatusesupdate.php:230
+#: actions/apisubscriptions.php:85 actions/apitimelinefavorites.php:70
+#: actions/apitimelinefriends.php:173 actions/apitimelinehome.php:78
+#: actions/apitimelinementions.php:77 actions/apitimelineuser.php:79
+#: actions/avatarbynickname.php:79 actions/favoritesrss.php:74
+#: actions/foaf.php:40 actions/foaf.php:58 actions/hcard.php:67
+#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
+#: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154
+#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
+#: actions/showfavorites.php:105 actions/userbyid.php:74
+#: actions/usergroups.php:93 actions/userrss.php:40 actions/userxrd.php:59
+#: actions/xrds.php:71 lib/command.php:497 lib/galleryaction.php:59

 #: lib/mailbox.php:82 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Onbekende gebruiker."
 
 #. TRANS: Page title. %1$s is user nickname, %2$d is page number
 #: lib/mailbox.php:82 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Onbekende gebruiker."
 
 #. TRANS: Page title. %1$s is user nickname, %2$d is page number

-#: actions/all.php:90
+#: actions/all.php:91

 #, php-format
 msgid "%1$s and friends, page %2$d"
 msgstr "%1$s en vriende, bladsy %2$d"
 
 #, php-format
 msgid "%1$s and friends, page %2$d"
 msgstr "%1$s en vriende, bladsy %2$d"
 

-#. TRANS: Page title. %1$s is user nickname
-#. TRANS: H1 text. %1$s is user nickname
+#. TRANS: Page title. %s is 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: Message is used as link title. %s is a user nickname.

-#: actions/all.php:93 actions/all.php:185 actions/allrss.php:116
-#: actions/apitimelinefriends.php:210 actions/apitimelinehome.php:116
-#: lib/personalgroupnav.php:100
+#. TRANS: Timeline title for user and friends. %s is a user nickname.
+#: 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
 msgid "%s and friends"
 msgstr "%s en vriende"
 
 #, php-format
 msgid "%s and friends"
 msgstr "%s en vriende"
 

-#. TRANS: %1$s is user nickname
-#: actions/all.php:107
+#. TRANS: %s is user nickname.
+#: actions/all.php:108

 #, php-format
 msgid "Feed for friends of %s (RSS 1.0)"
 msgstr "Voer vir vriende van %s (RSS 1.0)"
 
 #, php-format
 msgid "Feed for friends of %s (RSS 1.0)"
 msgstr "Voer vir vriende van %s (RSS 1.0)"
 

-#. TRANS: %1$s is user nickname
-#: actions/all.php:116
+#. TRANS: %s is user nickname.
+#: actions/all.php:117

 #, php-format
 msgid "Feed for friends of %s (RSS 2.0)"
 msgstr "Voer vir vriende van %s (RSS 2.0)"
 
 #, php-format
 msgid "Feed for friends of %s (RSS 2.0)"
 msgstr "Voer vir vriende van %s (RSS 2.0)"
 

-#. TRANS: %1$s is user nickname
-#: actions/all.php:125
+#. TRANS: %s is user nickname.
+#: actions/all.php:126

 #, php-format
 msgid "Feed for friends of %s (Atom)"
 msgstr "Voer vir vriende van %s (Atom)"
 
 #, php-format
 msgid "Feed for friends of %s (Atom)"
 msgstr "Voer vir vriende van %s (Atom)"
 

-#. TRANS: %1$s is user nickname
-#: actions/all.php:138
+#. TRANS: Empty list message. %s is a user nickname.
+#: actions/all.php:139

 #, php-format
 msgid ""
 "This is the timeline for %s and friends but no one has posted anything yet."
 #, php-format
 msgid ""
 "This is the timeline for %s and friends but no one has posted anything yet."


@@ -156,401 +194,619 @@ msgstr ""
 "Hierdie is die tydslyn vir %s en vriende, maar niemand het nog iets gepos "
 "nie."
 
 "Hierdie is die tydslyn vir %s en vriende, maar niemand het nog iets gepos "
 "nie."
 

-#: actions/all.php:143
+#. TRANS: Encouragement displayed on logged in user's empty timeline.
+#. TRANS: This message contains Markdown links. Keep "](" together.
+#: actions/all.php:146

 #, php-format
 msgid ""
 "Try subscribing to more people, [join a group](%%action.groups%%) or post "
 "something yourself."
 msgstr ""
 
 #, php-format
 msgid ""
 "Try subscribing to more people, [join a group](%%action.groups%%) or post "
 "something yourself."
 msgstr ""
 

-#. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@"
-#: actions/all.php:146
+#. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@".
+#. TRANS: This message contains Markdown links. Keep "](" together.
+#: actions/all.php:150

 #, php-format
 msgid ""
 "You can try to [nudge %1$s](../%2$s) from their profile or [post something "
 "to them](%%%%action.newnotice%%%%?status_textarea=%3$s)."
 msgstr ""
 
 #, php-format
 msgid ""
 "You can try to [nudge %1$s](../%2$s) from their profile or [post something "
 "to them](%%%%action.newnotice%%%%?status_textarea=%3$s)."
 msgstr ""
 

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

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

-#. TRANS: H1 text
-#: actions/all.php:182
+#. TRANS: H1 text for page when viewing a list for self.
+#: actions/all.php:188

 msgid "You and friends"
 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.
 msgid "You and friends"
 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.

-#: actions/allrss.php:121 actions/apitimelinefriends.php:216
-#: actions/apitimelinehome.php:122
+#: actions/allrss.php:122 actions/apitimelinefriends.php:213
+#: actions/apitimelinehome.php:119

 #, php-format
 msgid "Updates from %1$s and friends on %2$s!"
 msgstr "Opdaterings van %1$s en vriende op %2$s."
 
 #, php-format
 msgid "Updates from %1$s and friends on %2$s!"
 msgstr "Opdaterings van %1$s en vriende op %2$s."
 

-#: actions/apiaccountratelimitstatus.php:72
-#: actions/apiaccountupdatedeliverydevice.php:94
-#: actions/apiaccountupdateprofile.php:97
-#: actions/apiaccountupdateprofilebackgroundimage.php:94
-#: actions/apiaccountupdateprofilecolors.php:118
-#: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156
-#: actions/apifavoritecreate.php:100 actions/apifavoritedestroy.php:101
-#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100
-#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:139
-#: actions/apigroupismember.php:115 actions/apigroupjoin.php:156
-#: actions/apigroupleave.php:142 actions/apigrouplist.php:137
-#: actions/apigrouplistall.php:122 actions/apigroupmembership.php:107
-#: actions/apigroupshow.php:116 actions/apihelptest.php:88
-#: actions/apistatusesdestroy.php:104 actions/apistatusesretweets.php:112
-#: actions/apistatusesshow.php:109 actions/apistatusnetconfig.php:141
-#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:271
-#: actions/apitimelinegroup.php:154 actions/apitimelinehome.php:175
-#: actions/apitimelinementions.php:174 actions/apitimelinepublic.php:241
-#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:161
-#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
+#. TRANS: Client error displayed handling a non-existing API method.
+#. TRANS: Client error displayed when trying to handle an unknown API method.
+#. TRANS: Client error displayed trying to execute an unknown API method updating profile colours.
+#. TRANS: Client error displayed trying to execute an unknown API method verifying user credentials.
+#. TRANS: Client error given when an API method was not found (404).
+#. TRANS: Client error displayed when trying to handle an unknown API method.
+#. TRANS: Client error displayed trying to execute an unknown API method showing friendship.
+#. TRANS: Client error given when an API method was not found (404).
+#. TRANS: Client error displayed trying to execute an unknown API method showing group membership.
+#. TRANS: Client error displayed trying to execute an unknown API method joining a group.
+#. TRANS: Client error displayed trying to execute an unknown API method leaving a group.
+#. TRANS: Client error displayed trying to execute an unknown API method checking group membership.
+#. TRANS: Client error displayed trying to execute an unknown API method listing the latest 20 groups.
+#. TRANS: Client error displayed trying to execute an unknown API method showing group membership.
+#. TRANS: Client error displayed trying to execute an unknown API method showing a group.
+#. TRANS: Client error displayed trying to execute an unknown API method testing API connectivity.
+#. TRANS: Client error displayed trying to execute an unknown API method deleting a status.
+#. TRANS: Client error displayed when trying to handle an unknown API method.
+#: actions/apiaccountratelimitstatus.php:69
+#: actions/apiaccountupdatedeliverydevice.php:92
+#: actions/apiaccountupdateprofile.php:94
+#: actions/apiaccountupdateprofilebackgroundimage.php:92
+#: actions/apiaccountupdateprofilecolors.php:115
+#: actions/apiaccountverifycredentials.php:68 actions/apidirectmessage.php:157
+#: actions/apifavoritecreate.php:98 actions/apifavoritedestroy.php:98
+#: actions/apifriendshipscreate.php:99 actions/apifriendshipsdestroy.php:99
+#: actions/apifriendshipsshow.php:124 actions/apigroupcreate.php:138
+#: actions/apigroupismember.php:115 actions/apigroupjoin.php:160
+#: actions/apigroupleave.php:145 actions/apigrouplist.php:134
+#: actions/apigrouplistall.php:120 actions/apigroupmembership.php:105
+#: actions/apigroupshow.php:114 actions/apihelptest.php:84
+#: actions/apistatusesdestroy.php:101 actions/apistatusesretweets.php:110
+#: 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/apitimelinementions.php:174 actions/apitimelinepublic.php:239
+#: actions/apitimelineretweetedtome.php:118
+#: actions/apitimelineretweetsofme.php:150 actions/apitimelinetag.php:159
+#: 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."
 

-#: actions/apiaccountupdatedeliverydevice.php:86
-#: actions/apiaccountupdateprofile.php:89
-#: actions/apiaccountupdateprofilebackgroundimage.php:86
-#: actions/apiaccountupdateprofilecolors.php:110
-#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89
-#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109
-#: actions/apifavoritecreate.php:91 actions/apifavoritedestroy.php:92
-#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
-#: actions/apigroupcreate.php:105 actions/apigroupjoin.php:92
-#: actions/apigroupleave.php:92 actions/apimediaupload.php:67
-#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:198
+#. TRANS: Client error message. POST is a HTTP command. It should not be translated.
+#. TRANS: Client error. POST is a HTTP command. It should not be translated.
+#: actions/apiaccountupdatedeliverydevice.php:83
+#: actions/apiaccountupdateprofile.php:85
+#: actions/apiaccountupdateprofilebackgroundimage.php:83
+#: actions/apiaccountupdateprofilecolors.php:106
+#: actions/apiaccountupdateprofileimage.php:80 actions/apiblockcreate.php:87
+#: actions/apiblockdestroy.php:85 actions/apidirectmessagenew.php:107
+#: actions/apifavoritecreate.php:88 actions/apifavoritedestroy.php:88
+#: actions/apifriendshipscreate.php:89 actions/apifriendshipsdestroy.php:89
+#: actions/apigroupcreate.php:102 actions/apigroupjoin.php:89
+#: actions/apigroupleave.php:89 actions/apimediaupload.php:66
+#: actions/apistatusesretweet.php:63 actions/apistatusesupdate.php:194

 msgid "This method requires a POST."
 msgstr "Hierdie metode benodig 'n POST."
 
 msgid "This method requires a POST."
 msgstr "Hierdie metode benodig 'n POST."
 

-#: actions/apiaccountupdatedeliverydevice.php:106
+#. TRANS: Client error displayed when no valid device parameter is provided for a user's delivery device setting.
+#: actions/apiaccountupdatedeliverydevice.php:103

 msgid ""
 "You must specify a parameter named 'device' with a value of one of: sms, im, "
 "none."
 msgstr ""
 
 msgid ""
 "You must specify a parameter named 'device' with a value of one of: sms, im, "
 "none."
 msgstr ""
 

-#: actions/apiaccountupdatedeliverydevice.php:133
+#. TRANS: Server error displayed when a user's delivery device cannot be updated.
+#: actions/apiaccountupdatedeliverydevice.php:130

 msgid "Could not update user."
 msgstr "Kon nie die gebruiker opdateer nie."
 
 msgid "Could not update user."
 msgstr "Kon nie die gebruiker opdateer nie."
 

-#: actions/apiaccountupdateprofile.php:112
-#: actions/apiaccountupdateprofilebackgroundimage.php:194
-#: actions/apiaccountupdateprofilecolors.php:185
+#. TRANS: Client error displayed if a user profile could not be found.
+#. TRANS: Client error displayed when a user has no profile.
+#. TRANS: Client error displayed a user has no profile updating profile colours.
+#. TRANS: Client error displayed if a user profile could not be found updating a profile image.
+#. TRANS: Client error displayed when requesting user information for a user without a profile.
+#. TRANS: Client error displayed trying to get an avatar for a user without a profile.
+#: actions/apiaccountupdateprofile.php:111
+#: actions/apiaccountupdateprofilebackgroundimage.php:199
+#: actions/apiaccountupdateprofilecolors.php:183

 #: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
 #: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108

-#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/hcard.php:74
+#: actions/avatarbynickname.php:85 actions/foaf.php:65 actions/hcard.php:74

 #: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
 #: lib/profileaction.php:84
 msgid "User has no profile."
 msgstr "Hierdie gebruiker het nie 'n profiel nie."
 
 #: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
 #: lib/profileaction.php:84
 msgid "User has no profile."
 msgstr "Hierdie gebruiker het nie 'n profiel nie."
 

+#. TRANS: Server error displayed if a user profile could not be saved.

 #: actions/apiaccountupdateprofile.php:147
 msgid "Could not save profile."
 msgstr "Kon nie die profiel stoor nie."
 
 #: actions/apiaccountupdateprofile.php:147
 msgid "Could not save profile."
 msgstr "Kon nie die profiel stoor nie."
 

+#. TRANS: Client error displayed when the number of bytes in a POST request exceeds a limit.
+#. TRANS: %s is the number of bytes of the CONTENT_LENGTH.
+#. TRANS: Form validation error in design settings form. POST should remain untranslated.

 #: actions/apiaccountupdateprofilebackgroundimage.php:108
 #: actions/apiaccountupdateprofilebackgroundimage.php:108

-#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
-#: actions/apistatusesupdate.php:212 actions/avatarsettings.php:257
-#: actions/designadminpanel.php:123 actions/editapplication.php:118
-#: actions/newapplication.php:101 actions/newnotice.php:94
-#: lib/designsettings.php:283
+#: actions/apiaccountupdateprofileimage.php:95 actions/apimediaupload.php:81
+#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
+#: actions/designadminpanel.php:125 actions/editapplication.php:121
+#: actions/newapplication.php:104 actions/newnotice.php:95
+#: lib/designsettings.php:298

 #, php-format
 msgid ""
 #, php-format
 msgid ""

+"The server was unable to handle that much POST data (%s byte) due to its "
+"current configuration."
+msgid_plural ""

 "The server was unable to handle that much POST data (%s bytes) due to its "
 "current configuration."
 "The server was unable to handle that much POST data (%s bytes) due to its "
 "current configuration."

-msgstr ""
-
-#: actions/apiaccountupdateprofilebackgroundimage.php:136
-#: actions/apiaccountupdateprofilebackgroundimage.php:146
-#: actions/apiaccountupdateprofilecolors.php:164
-#: actions/apiaccountupdateprofilecolors.php:174
+msgstr[0] ""
+msgstr[1] ""
+
+#. TRANS: Client error displayed when saving design settings fails because of an empty id.
+#. TRANS: Client error displayed when saving design settings fails because of an empty result.
+#. TRANS: Client error displayed when a database error occurs inserting profile colours.
+#. TRANS: Client error displayed when a database error occurs updating profile colours.
+#: actions/apiaccountupdateprofilebackgroundimage.php:138
+#: actions/apiaccountupdateprofilebackgroundimage.php:149
+#: actions/apiaccountupdateprofilecolors.php:160
+#: actions/apiaccountupdateprofilecolors.php:171

 #: actions/groupdesignsettings.php:290 actions/groupdesignsettings.php:300
 #: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
 #: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
 msgid "Unable to save your design settings."
 msgstr "Dit was nie moontlik om u ontwerp-instellings te stoor nie."
 
 #: actions/groupdesignsettings.php:290 actions/groupdesignsettings.php:300
 #: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
 #: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
 msgid "Unable to save your design settings."
 msgstr "Dit was nie moontlik om u ontwerp-instellings te stoor nie."
 

-#: actions/apiaccountupdateprofilebackgroundimage.php:187
-#: actions/apiaccountupdateprofilecolors.php:142
+#. TRANS: Error displayed when updating design settings fails.
+#. TRANS: Client error displayed when a database error occurs updating profile colours.
+#: actions/apiaccountupdateprofilebackgroundimage.php:191
+#: actions/apiaccountupdateprofilecolors.php:139

 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/apiblockcreate.php:105
+#: actions/apiatomservice.php:85
+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:92 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: Client error displayed when users try to block themselves.
+#: actions/apiblockcreate.php:104

 msgid "You cannot block yourself!"
 msgstr "U kan nie uself blokkeer nie!"
 
 msgid "You cannot block yourself!"
 msgstr "U kan nie uself blokkeer nie!"
 

+#. TRANS: Server error displayed when blocking a user has failed.

 #: actions/apiblockcreate.php:126
 msgid "Block user failed."
 msgstr "Die blokkering van die gebruiker het gefaal."
 
 #: actions/apiblockcreate.php:126
 msgid "Block user failed."
 msgstr "Die blokkering van die gebruiker het gefaal."
 

-#: actions/apiblockdestroy.php:114
+#. TRANS: Server error displayed when unblocking a user has failed.
+#: actions/apiblockdestroy.php:113

 msgid "Unblock user failed."
 msgstr "Die deblokkering van die gebruiker het gefaal."
 
 msgid "Unblock user failed."
 msgstr "Die deblokkering van die gebruiker het gefaal."
 

-#: actions/apidirectmessage.php:89
+#. TRANS: Title. %s is a user nickname.
+#: actions/apidirectmessage.php:88

 #, php-format
 msgid "Direct messages from %s"
 msgstr "Direkte boodskappe vanaf %s"
 
 #, php-format
 msgid "Direct messages from %s"
 msgstr "Direkte boodskappe vanaf %s"
 

+#. TRANS: Subtitle. %s is a user nickname.

 #: actions/apidirectmessage.php:93
 #, php-format
 msgid "All the direct messages sent from %s"
 msgstr "Alle direkte boodskappe deur %s gestuur"
 
 #: actions/apidirectmessage.php:93
 #, php-format
 msgid "All the direct messages sent from %s"
 msgstr "Alle direkte boodskappe deur %s gestuur"
 

-#: actions/apidirectmessage.php:101
+#. TRANS: Title. %s is a user nickname.
+#: actions/apidirectmessage.php:102

 #, php-format
 msgid "Direct messages to %s"
 msgstr "Direkte boodskappe aan %s"
 
 #, php-format
 msgid "Direct messages to %s"
 msgstr "Direkte boodskappe aan %s"
 

-#: actions/apidirectmessage.php:105
+#. TRANS: Subtitle. %s is a user nickname.
+#: actions/apidirectmessage.php:107

 #, php-format
 msgid "All the direct messages sent to %s"
 msgstr "Alle direkte boodskappe gestuur aan %s"
 
 #, php-format
 msgid "All the direct messages sent to %s"
 msgstr "Alle direkte boodskappe gestuur aan %s"
 

-#: actions/apidirectmessagenew.php:118
+#. TRANS: Client error displayed when no message text was submitted (406).
+#: actions/apidirectmessagenew.php:117

 msgid "No message text!"
 msgstr "Die boodskap bevat geen inhoud nie!"
 
 msgid "No message text!"
 msgstr "Die boodskap bevat geen inhoud nie!"
 

-#: actions/apidirectmessagenew.php:127 actions/newmessage.php:150
-#, php-format
-msgid "That's too long. Max message size is %d chars."
-msgstr "Dit is te lank. Die maksimum boodskaplengte is %d karakters."
-
-#: actions/apidirectmessagenew.php:138
+#. TRANS: Client error displayed when message content is too long.
+#. TRANS: %d is the maximum number of characters for a message.
+#. TRANS: Form validation error displayed when message content is too long.
+#. TRANS: %d is the maximum number of characters for a message.
+#: actions/apidirectmessagenew.php:127 actions/newmessage.php:152
+#, fuzzy, php-format
+msgid "That's too long. Maximum message size is %d character."
+msgid_plural "That's too long. Maximum message size is %d characters."
+msgstr[0] "Dit is te lank. Die maksimum boodskaplengte is %d karakters."
+msgstr[1] "Dit is te lank. Die maksimum boodskaplengte is %d karakters."
+
+#. TRANS: Client error displayed if a recipient user could not be found (403).
+#: actions/apidirectmessagenew.php:139

 msgid "Recipient user not found."
 msgstr "Die ontvanger kon gevind word nie."
 
 msgid "Recipient user not found."
 msgstr "Die ontvanger kon gevind word nie."
 

-#: actions/apidirectmessagenew.php:142
+#. TRANS: Client error displayed trying to direct message another user who's not a friend (403).
+#: actions/apidirectmessagenew.php:144

 msgid "Can't send direct messages to users who aren't your friend."
 msgstr ""
 "U kan nie direkte boodskappe aan gebruikers wat nie op u viendelys is stuur "
 "nie."
 
 msgid "Can't send direct messages to users who aren't your friend."
 msgstr ""
 "U kan nie direkte boodskappe aan gebruikers wat nie op u viendelys is stuur "
 "nie."
 

-#: actions/apifavoritecreate.php:109 actions/apifavoritedestroy.php:110
+#. TRANS: Client error displayed trying to direct message self (403).
+#: actions/apidirectmessagenew.php:154
+msgid ""
+"Do not send a message to yourself; just say it to yourself quietly instead."
+msgstr ""
+
+#. TRANS: Client error displayed when requesting a status with a non-existing ID.
+#. TRANS: Client error displayed when trying to remove a favourite with an invalid ID.
+#. TRANS: Client error displayed trying to delete a status with an invalid ID.
+#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:108

 #: actions/apistatusesdestroy.php:121
 msgid "No status found with that ID."
 msgstr "Geen status met die ID gevind nie."
 
 #: actions/apistatusesdestroy.php:121
 msgid "No status found with that ID."
 msgstr "Geen status met die ID gevind nie."
 

+#. TRANS: Client error displayed when trying to mark a notice favourite that already is a favourite.

 #: actions/apifavoritecreate.php:120
 msgid "This status is already a favorite."
 msgstr "Hierdie status is reeds 'n gunsteling."
 
 #: actions/apifavoritecreate.php:120
 msgid "This status is already a favorite."
 msgstr "Hierdie status is reeds 'n gunsteling."
 

+#. TRANS: Client error displayed when marking a notice as favourite fails.

 #. TRANS: Error message text shown when a favorite could not be set.
 #. TRANS: Error message text shown when a favorite could not be set.

-#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:296
+#: actions/apifavoritecreate.php:132 actions/favor.php:84 lib/command.php:294

 msgid "Could not create favorite."
 msgstr "Dit was nie moontlik om 'n gunsteling te skep nie."
 
 msgid "Could not create favorite."
 msgstr "Dit was nie moontlik om 'n gunsteling te skep nie."
 

-#: actions/apifavoritedestroy.php:123
+#. TRANS: Client error displayed when trying to remove a favourite that was not a favourite.
+#: actions/apifavoritedestroy.php:122

 msgid "That status is not a favorite."
 msgstr "Hierdie status is nie 'n gunsteling nie."
 
 msgid "That status is not a favorite."
 msgstr "Hierdie status is nie 'n gunsteling nie."
 

+#. TRANS: Client error displayed when removing a favourite has failed.

 #: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
 msgid "Could not delete favorite."
 msgstr ""
 "Dit was nie moontlik om die boodskap van u gunstelinge te verwyder nie."
 
 #: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
 msgid "Could not delete favorite."
 msgstr ""
 "Dit was nie moontlik om die boodskap van u gunstelinge te verwyder nie."
 

+#. TRANS: Client error displayed when trying follow who's profile could not be found.

 #: actions/apifriendshipscreate.php:109
 msgid "Could not follow user: profile not found."
 msgstr "U kan nie die gebruiker volg nie: die gebruiker bestaan nie."
 
 #: actions/apifriendshipscreate.php:109
 msgid "Could not follow user: profile not found."
 msgstr "U kan nie die gebruiker volg nie: die gebruiker bestaan nie."
 

-#: actions/apifriendshipscreate.php:118
+#. TRANS: Client error displayed when trying to follow a user that's already being followed.
+#. TRANS: %s is the nickname of the user that is already being followed.
+#: actions/apifriendshipscreate.php:120

 #, php-format
 msgid "Could not follow user: %s is already on your list."
 msgstr "U kan nie die gebruiker volg nie: %1 is alreeds op u lys."
 
 #, php-format
 msgid "Could not follow user: %s is already on your list."
 msgstr "U kan nie die gebruiker volg nie: %1 is alreeds op u lys."
 

+#. TRANS: Client error displayed when trying to unfollow a user that cannot be found.

 #: actions/apifriendshipsdestroy.php:109
 msgid "Could not unfollow user: User not found."
 msgstr ""
 "U kan nie die gebruiker van u volglys verwyder nie: die gebruiker bestaan "
 "nie."
 
 #: actions/apifriendshipsdestroy.php:109
 msgid "Could not unfollow user: User not found."
 msgstr ""
 "U kan nie die gebruiker van u volglys verwyder nie: die gebruiker bestaan "
 "nie."
 

-#: actions/apifriendshipsdestroy.php:120
+#. TRANS: Client error displayed when trying to unfollow self.
+#: actions/apifriendshipsdestroy.php:121

 msgid "You cannot unfollow yourself."
 msgstr "U kan nie ophou om uself te volg nie."
 
 msgid "You cannot unfollow yourself."
 msgstr "U kan nie ophou om uself te volg nie."
 

-#: actions/apifriendshipsexists.php:91
-msgid "Two valid IDs or screen_names must be supplied."
+#. 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 nick names must be supplied."

 msgstr ""
 
 msgstr ""
 

-#: actions/apigroupcreate.php:167 actions/editgroup.php:186
-#: actions/newgroup.php:126 actions/profilesettings.php:215
-#: actions/register.php:212
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
-msgstr ""
-"Die gebruikersnaam mag slegs uit kleinletters en syfers bestaan en mag geen "
-"spasies bevat nie."
+#. TRANS: Client error displayed when a source user could not be determined showing friendship.
+#: actions/apifriendshipsshow.php:131
+#, fuzzy
+msgid "Could not determine source user."
+msgstr "Kon nie die gebruiker opdateer nie."
+
+#. TRANS: Client error displayed when a target user could not be determined showing friendship.
+#: actions/apifriendshipsshow.php:140
+#, fuzzy
+msgid "Could not find target user."
+msgstr "Kon nie die gebruiker opdateer nie."

 
 

-#: actions/apigroupcreate.php:176 actions/editgroup.php:190
-#: actions/newgroup.php:130 actions/profilesettings.php:238
-#: actions/register.php:215
+#. 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:156 actions/editgroup.php:189
+#: actions/newgroup.php:129 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."
 

-#: actions/apigroupcreate.php:183 actions/editgroup.php:193
-#: actions/newgroup.php:133 actions/profilesettings.php:218
-#: actions/register.php:217
+#. TRANS: Client error in form for group creation.
+#. TRANS: Group edit form validation error.
+#. TRANS: Group create form validation error.
+#. TRANS: Validation error in form for profile settings.
+#: actions/apigroupcreate.php:164 actions/editgroup.php:193
+#: actions/newgroup.php:133 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."
 

-#: actions/apigroupcreate.php:199 actions/editapplication.php:215
-#: actions/editgroup.php:199 actions/newapplication.php:203
-#: actions/newgroup.php:139 actions/profilesettings.php:222
-#: actions/register.php:224
+#. TRANS: Client error in form for group creation.
+#. TRANS: Validation error shown when providing an invalid homepage URL in the "Edit application" form.
+#. TRANS: Group edit form validation error.
+#. TRANS: Group create form validation error.
+#. TRANS: Validation error in form for profile settings.
+#: actions/apigroupcreate.php:181 actions/editapplication.php:233
+#: actions/editgroup.php:200 actions/newapplication.php:211
+#: actions/newgroup.php:140 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."
 

-#: actions/apigroupcreate.php:208 actions/editgroup.php:202
-#: actions/newgroup.php:142 actions/profilesettings.php:225
-#: actions/register.php:227
-msgid "Full name is too long (max 255 chars)."
+#. TRANS: Client error in form for group creation.
+#. TRANS: Group edit form validation error.
+#. TRANS: Group create form validation error.
+#. TRANS: Validation error in form for profile settings.
+#: actions/apigroupcreate.php:191 actions/editgroup.php:204
+#: actions/newgroup.php:144 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)."
 
 msgstr "Volledige naam is te lang (maksimum 255 karakters)."
 

-#: actions/apigroupcreate.php:216 actions/editapplication.php:190
-#: actions/newapplication.php:172
-#, php-format
-msgid "Description is too long (max %d chars)."
-msgstr "Die beskrywing is te lank (die maksimum is %d karakters)."
-
-#: actions/apigroupcreate.php:227 actions/editgroup.php:208
-#: actions/newgroup.php:148 actions/profilesettings.php:232
-#: actions/register.php:234
-msgid "Location is too long (max 255 chars)."
+#. TRANS: Client error shown when providing too long a description during group creation.
+#. TRANS: %d is the maximum number of allowed characters.
+#. TRANS: Validation error shown when providing too long a description in the "Edit application" form.
+#. TRANS: Group edit form validation error.
+#. TRANS: Form validation error in New application form.
+#. TRANS: %d is the maximum number of characters for the description.
+#. TRANS: Group create form validation error.
+#. TRANS: %d is the maximum number of allowed characters.
+#: actions/apigroupcreate.php:201 actions/editapplication.php:201
+#: actions/editgroup.php:209 actions/newapplication.php:178
+#: actions/newgroup.php:149
+#, fuzzy, php-format
+msgid "Description is too long (maximum %d character)."
+msgid_plural "Description is too long (maximum %d characters)."
+msgstr[0] "Die beskrywing is te lank (die maksimum is %d karakters)."
+msgstr[1] "Die beskrywing is te lank (die maksimum is %d karakters)."
+
+#. TRANS: Client error shown when providing too long a location during group creation.
+#. TRANS: Group edit form validation error.
+#. TRANS: Group create form validation error.
+#. TRANS: Validation error in form for profile settings.
+#: actions/apigroupcreate.php:215 actions/editgroup.php:216
+#: actions/newgroup.php:156 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)."
 
 msgstr "Ligging is te lank is (maksimum 255 karakters)."
 

-#: actions/apigroupcreate.php:246 actions/editgroup.php:219
-#: actions/newgroup.php:159
-#, php-format
-msgid "Too many aliases! Maximum %d."
-msgstr "Te veel aliasse! Die maksimum aantal is %d."
+#. TRANS: Client error shown when providing too many aliases during group creation.
+#. TRANS: %d is the maximum number of allowed aliases.
+#. TRANS: Group edit form validation error.
+#. TRANS: %d is the maximum number of allowed aliases.
+#. TRANS: Group create form validation error.
+#. TRANS: %d is the maximum number of allowed aliases.
+#: actions/apigroupcreate.php:236 actions/editgroup.php:229
+#: actions/newgroup.php:169
+#, fuzzy, php-format
+msgid "Too many aliases! Maximum %d allowed."
+msgid_plural "Too many aliases! Maximum %d allowed."
+msgstr[0] "Te veel aliasse! Die maksimum aantal is %d."
+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.
+#: actions/apigroupcreate.php:253
+#, fuzzy, php-format
+msgid "Invalid alias: \"%s\"."
+msgstr "Ongeldige alias: \"%s\""

 
 

-#: actions/apigroupcreate.php:276 actions/editgroup.php:232
-#: actions/newgroup.php:172
+#. TRANS: Client error displayed when trying to use an alias during group creation that is already in use.
+#. TRANS: %s is the alias that is already in use.
+#. TRANS: Group edit form validation error.
+#. TRANS: Group create form validation error.
+#: actions/apigroupcreate.php:264 actions/editgroup.php:244
+#: actions/newgroup.php:184

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

-#: actions/apigroupcreate.php:289 actions/editgroup.php:238
-#: actions/newgroup.php:178
+#. 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:278 actions/editgroup.php:251
+#: actions/newgroup.php:191

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

-#: actions/apigroupismember.php:96 actions/apigroupjoin.php:105
-#: actions/apigroupleave.php:105 actions/apigroupmembership.php:92
-#: actions/apigroupshow.php:83 actions/apitimelinegroup.php:92
+#. TRANS: Client error displayed when checking group membership for a non-existing group.
+#. TRANS: Client error displayed when trying to join a group that does not exist.
+#. TRANS: Client error displayed when trying to leave a group that does not exist.
+#. TRANS: Client error displayed trying to show group membership on a non-existing group.
+#. TRANS: Client error displayed when trying to show a group that could not be found.
+#. TRANS: Client error displayed requesting most recent notices to a group for a non-existing group.
+#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
+#: actions/apigroupleave.php:104 actions/apigroupmembership.php:89
+#: actions/apigroupshow.php:81 actions/apitimelinegroup.php:89

 msgid "Group not found."
 msgstr "Nie gevind nie."
 
 msgid "Group not found."
 msgstr "Nie gevind nie."
 

+#. TRANS: Server error displayed when trying to join a group the user is already a member of.

 #. TRANS: Error text shown a user tries to join a group they already are a member of.
 #. TRANS: Error text shown a user tries to join a group they already are a member of.

-#: actions/apigroupjoin.php:111 actions/joingroup.php:100 lib/command.php:336
+#: actions/apigroupjoin.php:111 actions/joingroup.php:100 lib/command.php:333

 msgid "You are already a member of that group."
 msgstr "U is reeds 'n lid van die groep."
 
 msgid "You are already a member of that group."
 msgstr "U is reeds 'n lid van die groep."
 

+#. TRANS: Server error displayed when trying to join a group the user is blocked from joining.

 #. TRANS: Error text shown when a user tries to join a group they are blocked from joining.
 #. TRANS: Error text shown when a user tries to join a group they are blocked from joining.

-#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:341
+#: actions/apigroupjoin.php:121 actions/joingroup.php:105 lib/command.php:338

 msgid "You have been blocked from that group by the admin."
 msgstr ""
 
 msgid "You have been blocked from that group by the admin."
 msgstr ""
 

+#. TRANS: Server error displayed when joining a group fails.
+#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
+#. TRANS: Message given having failed to add a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/apigroupjoin.php:142 actions/joingroup.php:134 lib/command.php:350
+#, fuzzy, php-format
+msgid "Could not join user %1$s to group %2$s."
+msgstr "Dit was nie moontlik om die groep by te werk nie."
+
+#. TRANS: Server error displayed when trying to leave a group the user is not a member of.

 #: actions/apigroupleave.php:115
 msgid "You are not a member of this group."
 msgstr "U is nie 'n lid van die groep nie."
 
 #: actions/apigroupleave.php:115
 msgid "You are not a member of this group."
 msgstr "U is nie 'n lid van die groep nie."
 

-#. TRANS: %s is a user name
-#: actions/apigrouplist.php:98
+#. TRANS: Server error displayed when leaving a group fails.
+#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
+#. TRANS: Message given having failed to remove a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/apigroupleave.php:127 actions/leavegroup.php:129
+#: lib/command.php:398
+#, fuzzy, php-format
+msgid "Could not remove user %1$s from group %2$s."
+msgstr "Kon nie die groep skep nie."
+
+#. TRANS: Used as title in check for group membership. %s is a user name.
+#: actions/apigrouplist.php:94

 #, php-format
 msgid "%s's groups"
 msgstr "%s se groepe"
 
 #, php-format
 msgid "%s's groups"
 msgstr "%s se groepe"
 

-#. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s
-#: actions/apigrouplist.php:108
+#. TRANS: Used as subtitle in check for group membership. %1$s is a user name, %2$s is the site name.
+#: actions/apigrouplist.php:104

 #, php-format
 msgid "%1$s groups %2$s is a member of."
 msgstr "Groepe op %1$s waar %2$s lid van is."
 
 #, php-format
 msgid "%1$s groups %2$s is a member of."
 msgstr "Groepe op %1$s waar %2$s lid van is."
 

-#. TRANS: Message is used as a title. %s is a site name.
+#. TRANS: Message is used as a title when listing the lastest 20 groups. %s is a site name.

 #. TRANS: Message is used as a page title. %s is a nick name.
 #. TRANS: Message is used as a page title. %s is a nick name.

-#: actions/apigrouplistall.php:92 actions/usergroups.php:63
+#: actions/apigrouplistall.php:88 actions/usergroups.php:63

 #, php-format
 msgid "%s groups"
 msgstr "%s groepe"
 
 #, php-format
 msgid "%s groups"
 msgstr "%s groepe"
 

-#: actions/apigrouplistall.php:96
+#. TRANS: Message is used as a subtitle when listing the lastest 20 groups. %s is a site name.
+#: actions/apigrouplistall.php:93

 #, php-format
 msgid "groups on %s"
 msgstr "groepe op %s"
 
 #, php-format
 msgid "groups on %s"
 msgstr "groepe op %s"
 

-#: actions/apioauthauthorize.php:101
+#. TRANS: Client error displayed when uploading a media file has failed.
+#: actions/apimediaupload.php:101
+#, fuzzy
+msgid "Upload failed."
+msgstr "Die deblokkering van die gebruiker het gefaal."
+
+#. TRANS: Client error given from the OAuth API when the request token or verifier is invalid.
+#: actions/apioauthaccesstoken.php:101
+#, fuzzy
+msgid "Invalid request token or verifier."
+msgstr "Ongeldige token."
+
+#. TRANS: Client error given when no oauth_token was passed to the OAuth API.
+#: actions/apioauthauthorize.php:107

 msgid "No oauth_token parameter provided."
 msgstr ""
 
 msgid "No oauth_token parameter provided."
 msgstr ""
 

-#: actions/apioauthauthorize.php:106
-msgid "Invalid token."
+#. TRANS: Client error given when an invalid request token was passed to the OAuth API.
+#: actions/apioauthauthorize.php:115 actions/apioauthauthorize.php:129
+#, fuzzy
+msgid "Invalid request token."

 msgstr "Ongeldige token."
 
 msgstr "Ongeldige token."
 

-#: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
-#: actions/deletenotice.php:169 actions/disfavor.php:74
-#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:55
+#. TRANS: Client error given when an invalid request token was passed to the OAuth API.
+#: actions/apioauthauthorize.php:121
+msgid "Request token already authorized."
+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
+#: actions/emailsettings.php:275 actions/favor.php:75 actions/geocode.php:55

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

-#: actions/groupunblock.php:66 actions/imsettings.php:227
-#: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66
-#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
-#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
-#: actions/othersettings.php:145 actions/passwordsettings.php:138
-#: actions/profilesettings.php:194 actions/recoverpassword.php:350
+#: actions/groupunblock.php:65 actions/imsettings.php:230
+#: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
+#: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
+#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
+#: actions/othersettings.php:153 actions/passwordsettings.php:138
+#: actions/profilesettings.php:221 actions/recoverpassword.php:350

 #: actions/register.php:172 actions/remotesubscribe.php:77
 #: actions/register.php:172 actions/remotesubscribe.php:77

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

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

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

 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 

-#: actions/apioauthauthorize.php:135
+#. TRANS: Form validation error given when an invalid username and/or password was passed to the OAuth API.
+#: actions/apioauthauthorize.php:168

 msgid "Invalid nickname / password!"
 msgstr "Ongeldige gebruikersnaam of wagwoord!"
 
 msgid "Invalid nickname / password!"
 msgstr "Ongeldige gebruikersnaam of wagwoord!"
 

-#: actions/apioauthauthorize.php:185
-msgid "Database error inserting OAuth application user."
-msgstr ""
-
-#: actions/apioauthauthorize.php:214
-#, php-format
-msgid ""
-"The request token %s has been authorized. Please exchange it for an access "
-"token."
-msgstr ""
-
-#: actions/apioauthauthorize.php:227
-#, php-format
-msgid "The request token %s has been denied and revoked."
+#. TRANS: Server error displayed when a database action fails.
+#: actions/apioauthauthorize.php:217
+msgid "Database error inserting oauth_token_association."

 msgstr ""
 
 msgstr ""
 

+#. TRANS: Client error given on when invalid data was passed through a form in the OAuth API.
+#. TRANS: Unexpected validation error on avatar upload form.
+#. TRANS: Client error displayed submitting invalid form data for edit application.

 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Message given submitting a form with an unknown action in IM settings.
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Message given submitting a form with an unknown action in IM settings.

+#. TRANS: Client error when submitting a form with unexpected information.

 #. TRANS: Message given submitting a form with an unknown action in SMS settings.
 #. TRANS: Message given submitting a form with an unknown action in SMS settings.

-#: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
-#: actions/designadminpanel.php:104 actions/editapplication.php:139
-#: actions/emailsettings.php:286 actions/grouplogo.php:322
-#: actions/imsettings.php:242 actions/newapplication.php:121
+#. 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:294 actions/grouplogo.php:322
+#: actions/imsettings.php:245 actions/newapplication.php:125

 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44

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

 msgid "Unexpected form submission."
 msgstr "Die vorm is onverwags ingestuur."
 
 msgid "Unexpected form submission."
 msgstr "Die vorm is onverwags ingestuur."
 

-#: actions/apioauthauthorize.php:259
+#. TRANS: Title for a page where a user can confirm/deny account access by an external application.
+#: actions/apioauthauthorize.php:387

 msgid "An application would like to connect to your account"
 msgstr "'n Toepassing vra toegang tot u gebruikersinligting"
 
 msgid "An application would like to connect to your account"
 msgstr "'n Toepassing vra toegang tot u gebruikersinligting"
 

-#: actions/apioauthauthorize.php:276
+#. TRANS: Fieldset legend.
+#: actions/apioauthauthorize.php:404

 msgid "Allow or deny access"
 msgstr "Toegang toelaat of weier"
 
 msgid "Allow or deny access"
 msgstr "Toegang toelaat of weier"
 

-#: actions/apioauthauthorize.php:292
+#. TRANS: User notification of external application requesting account access.
+#. 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 ""
+"An application would like the ability to <strong>%3$s</strong> your %4$s "
+"account data. You should only give access to your %4$s account to third "
+"parties you trust."
+msgstr ""
+
+#. TRANS: User notification of external application requesting account access.
+#. TRANS: %1$s is the application name requesting access, %2$s is the organisation behind the application,
+#. TRANS: %3$s is the access type requested, %4$s is the StatusNet sitename.
+#: actions/apioauthauthorize.php:433

 #, php-format
 msgid ""
 "The application <strong>%1$s</strong> by <strong>%2$s</strong> would like "
 #, php-format
 msgid ""
 "The application <strong>%1$s</strong> by <strong>%2$s</strong> would like "


@@ -558,207 +814,459 @@ msgid ""
 "give access to your %4$s account to third parties you trust."
 msgstr ""
 
 "give access to your %4$s account to third parties you trust."
 msgstr ""
 

-#. TRANS: Main menu option when logged in for access to user settings
-#: actions/apioauthauthorize.php:310 lib/action.php:463
+#. TRANS: Fieldset legend.
+#: actions/apioauthauthorize.php:455
+#, fuzzy
+msgctxt "LEGEND"

 msgid "Account"
 msgstr "Gebruiker"
 
 msgid "Account"
 msgstr "Gebruiker"
 

-#: actions/apioauthauthorize.php:313 actions/login.php:252
-#: actions/profilesettings.php:106 actions/register.php:431
-#: actions/showgroup.php:245 actions/tagother.php:94
+#. TRANS: Field label on OAuth API authorisation form.
+#. TRANS: Field label in form for profile settings.
+#. TRANS: Label for group nickname (dt). Text hidden by default.
+#: actions/apioauthauthorize.php:459 actions/login.php:252
+#: actions/profilesettings.php:110 actions/register.php:432
+#: actions/showgroup.php:240 actions/tagother.php:94

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

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

 msgid "Nickname"
 msgstr "Bynaam"
 
 msgid "Nickname"
 msgstr "Bynaam"
 

+#. TRANS: Field label on OAuth API authorisation form.

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

-#: actions/apioauthauthorize.php:316 actions/login.php:255
-#: actions/register.php:436 lib/accountsettingsaction.php:125
+#: actions/apioauthauthorize.php:463 actions/login.php:255
+#: actions/register.php:437 lib/accountsettingsaction.php:120

 msgid "Password"
 msgstr "Wagwoord"
 
 msgid "Password"
 msgstr "Wagwoord"
 

-#: actions/apioauthauthorize.php:328
-msgid "Deny"
-msgstr "Ontsê"
+#. TRANS: Button text that when clicked will cancel the process of allowing access to an account
+#. TRANS: by an external application.
+#. TRANS: Button label to cancel an e-mail address confirmation procedure.
+#. TRANS: Button label to cancel an IM address confirmation procedure.
+#. TRANS: Button label to cancel a SMS address confirmation procedure.
+#. TRANS: Button label in the "Edit application" form.
+#: actions/apioauthauthorize.php:478 actions/emailsettings.php:127
+#: actions/imsettings.php:131 actions/smssettings.php:137
+#: lib/applicationeditform.php:351
+msgctxt "BUTTON"
+msgid "Cancel"
+msgstr "Kanselleer"

 
 

-#: actions/apioauthauthorize.php:334
+#. TRANS: Button text that when clicked will allow access to an account by an external application.
+#: actions/apioauthauthorize.php:485
+#, fuzzy
+msgctxt "BUTTON"

 msgid "Allow"
 msgstr "Toestaan"
 
 msgid "Allow"
 msgstr "Toestaan"
 

-#: actions/apioauthauthorize.php:351
-msgid "Allow or deny access to your account information."
+#. TRANS: Form instructions.
+#: actions/apioauthauthorize.php:502
+#, fuzzy
+msgid "Authorize access to your account information."

 msgstr "Laat toegang tot u gebruikersinligting toe of weier dit."
 
 msgstr "Laat toegang tot u gebruikersinligting toe of weier dit."
 

-#: actions/apistatusesdestroy.php:112
+#. TRANS: Header for user notification after revoking OAuth access to an application.
+#: actions/apioauthauthorize.php:594
+#, fuzzy
+msgid "Authorization canceled."
+msgstr "Geen bevestigingskode."
+
+#. TRANS: User notification after revoking OAuth access to an application.
+#. TRANS: %s is an OAuth token.
+#: actions/apioauthauthorize.php:598
+#, php-format
+msgid "The request token %s has been revoked."
+msgstr ""
+
+#. TRANS: Title of the page notifying the user that an anonymous client application was successfully authorized to access the user's account with OAuth.
+#: actions/apioauthauthorize.php:621
+#, fuzzy
+msgid "You have successfully authorized the application"
+msgstr "Dit was nie moontlik om die applikasie te skep nie."
+
+#. TRANS: Message notifying the user that an anonymous client application was successfully authorized to access the user's account with OAuth.
+#: actions/apioauthauthorize.php:625
+msgid ""
+"Please return to the application and enter the following security code to "
+"complete the process."
+msgstr ""
+
+#. TRANS: Title of the page notifying the user that the client application was successfully authorized to access the user's account with OAuth.
+#. TRANS: %s is the authorised application name.
+#: actions/apioauthauthorize.php:632
+#, php-format
+msgid "You have successfully authorized %s"
+msgstr ""
+
+#. TRANS: Message notifying the user that the client application was successfully authorized to access the user's account with OAuth.
+#. TRANS: %s is the authorised application name.
+#: actions/apioauthauthorize.php:639
+#, php-format
+msgid ""
+"Please return to %s and enter the following security code to complete the "
+"process."
+msgstr ""
+
+#. TRANS: Client error displayed trying to delete a status not using POST or DELETE.
+#. TRANS: POST and DELETE should not be translated.
+#: actions/apistatusesdestroy.php:111

 msgid "This method requires a POST or DELETE."
 msgstr "Hierdie metode vereis 'n POST of DELETE."
 
 msgid "This method requires a POST or DELETE."
 msgstr "Hierdie metode vereis 'n POST of DELETE."
 

-#: actions/apistatusesdestroy.php:135
+#. TRANS: Client error displayed trying to delete a status of another user.
+#: actions/apistatusesdestroy.php:136

 msgid "You may not delete another user's status."
 msgstr "U mag nie 'n ander gebruiker se status verwyder nie."
 
 msgid "You may not delete another user's status."
 msgstr "U mag nie 'n ander gebruiker se status verwyder nie."
 

-#: actions/apistatusesretweet.php:75 actions/apistatusesretweets.php:72
-#: actions/deletenotice.php:52 actions/shownotice.php:92
+#. TRANS: Client error displayed trying to repeat a non-existing notice through the API.
+#. TRANS: Client error displayed trying to display redents of a non-exiting notice.
+#. TRANS: Error message displayed trying to delete a non-existing notice.
+#: actions/apistatusesretweet.php:74 actions/apistatusesretweets.php:70
+#: actions/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."
 

+#. TRANS: Client error displayed trying to repeat an own notice through the API.

 #. TRANS: Error text shown when trying to repeat an own notice.
 #. TRANS: Error text shown when trying to repeat an own notice.

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

 msgid "Cannot repeat your own notice."
 msgstr "U kan nie u eie kennisgewings herhaal nie."
 
 msgid "Cannot repeat your own notice."
 msgstr "U kan nie u eie kennisgewings herhaal nie."
 

+#. TRANS: Client error displayed trying to re-repeat a notice through the API.

 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.

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

 msgid "Already repeated that notice."
 msgstr "U het reeds die kennisgewing herhaal."
 
 msgid "Already repeated that notice."
 msgstr "U het reeds die kennisgewing herhaal."
 

-#: actions/apistatusesshow.php:139
+#: actions/apistatusesshow.php:117
+#, 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.
+#: actions/apistatusesshow.php:152

 msgid "Status deleted."
 msgstr "Die status is verwyder."
 
 msgid "Status deleted."
 msgstr "Die status is verwyder."
 

-#: actions/apistatusesshow.php:145
+#. TRANS: Client error displayed requesting a status with an invalid ID.
+#: 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:227
+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:234 actions/deletenotice.php:78
+msgid "Can't delete this notice."
+msgstr "Hierdie kennisgewing kan nie verwyder word nie."
+
+#: actions/apistatusesshow.php:247
+#, 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."
 msgstr ""
 
 #: actions/apistatusesupdate.php:221
 msgid "Client must provide a 'status' parameter with a value."
 msgstr ""
 

-#: actions/apistatusesupdate.php:242 actions/newnotice.php:157
+#. TRANS: Client error displayed when the parameter "status" is missing.
+#. TRANS: %d is the maximum number of character for a notice.
+#: actions/apistatusesupdate.php:244 actions/newnotice.php:161

 #: lib/mailhandler.php:60
 #: lib/mailhandler.php:60

-#, php-format
-msgid "That's too long. Max notice size is %d chars."
-msgstr "Die kennisgewing is te lank. Gebruik maksimum %d karakters."
-
-#: actions/apistatusesupdate.php:283 actions/apiusershow.php:96
-msgid "Not found."
-msgstr "Nie gevind nie."
+#, fuzzy, php-format
+msgid "That's too long. Maximum notice size is %d character."
+msgid_plural "That's too long. Maximum notice size is %d characters."
+msgstr[0] "Die kennisgewing is te lank. Gebruik maksimum %d karakters."
+msgstr[1] "Die kennisgewing is te lank. Gebruik maksimum %d karakters."
+
+#. TRANS: Client error displayed when replying to a non-existing notice.
+#: actions/apistatusesupdate.php:284
+#, fuzzy
+msgid "Parent notice not found."
+msgstr "Die API-funksie is nie gevind nie."

 
 

-#: actions/apistatusesupdate.php:306 actions/newnotice.php:181
+#. TRANS: Client error displayed exceeding the maximum notice length.
+#. TRANS: %d is the maximum lenth for a notice.
+#: actions/apistatusesupdate.php:308 actions/newnotice.php:184

 #, php-format
 #, php-format

-msgid "Max notice size is %d chars, including attachment URL."
-msgstr ""
+msgid "Maximum notice size is %d character, including attachment URL."
+msgid_plural "Maximum notice size is %d characters, including attachment URL."
+msgstr[0] ""
+msgstr[1] ""

 
 

-#: actions/apisubscriptions.php:232 actions/apisubscriptions.php:262
+#. TRANS: Client error displayed when requesting profiles of followers in an unsupported format.
+#. TRANS: Client error displayed when requesting IDs of followers in an unsupported format.
+#: actions/apisubscriptions.php:228 actions/apisubscriptions.php:258

 msgid "Unsupported format."
 msgstr "Nie-ondersteunde formaat."
 
 msgid "Unsupported format."
 msgstr "Nie-ondersteunde formaat."
 

-#: actions/apitimelinefavorites.php:110
+#. TRANS: Title for timeline of most recent favourite notices by a user.
+#. TRANS: %1$s is the StatusNet sitename, %2$s is a user nickname.
+#: actions/apitimelinefavorites.php:108

 #, php-format
 msgid "%1$s / Favorites from %2$s"
 msgstr "%1$s / Gunstelinge van %2$s"
 
 #, php-format
 msgid "%1$s / Favorites from %2$s"
 msgstr "%1$s / Gunstelinge van %2$s"
 

+#. TRANS: Subtitle for timeline of most recent favourite notices by a user.
+#. TRANS: %1$s is the StatusNet sitename, %2$s is a user's full name,
+#. TRANS: %3$s is a user nickname.
+#: actions/apitimelinefavorites.php:120
+#, fuzzy, php-format
+msgid "%1$s updates favorited by %2$s / %3$s."
+msgstr "%1$s / Gunstelinge van %2$s"
+
+#. TRANS: Server error displayed when generating an Atom feed fails.
+#. TRANS: %s is the error.
+#: actions/apitimelinegroup.php:138
+#, fuzzy, php-format
+msgid "Could not generate feed for group - %s"
+msgstr "Dit was nie moontlik om die groep by te werk nie."
+
+#. TRANS: Title for timeline of most recent mentions of a user.
+#. TRANS: %1$s is the StatusNet sitename, %2$s is a user nickname.
+#: actions/apitimelinementions.php:115
+#, fuzzy, php-format
+msgid "%1$s / Updates mentioning %2$s"
+msgstr "%1$s / Gunstelinge van %2$s"
+
+#. TRANS: Subtitle for timeline of most recent mentions of a user.
+#. TRANS: %1$s is the StatusNet sitename, %2$s is a user nickname,
+#. TRANS: %3$s is a user's full name.

 #: actions/apitimelinementions.php:131
 #, php-format
 msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr ""
 
 #: actions/apitimelinementions.php:131
 #, php-format
 msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr ""
 

-#: actions/apitimelinepublic.php:202 actions/publicrss.php:105
+#. TRANS: Title for site timeline. %s is the StatusNet sitename.
+#: actions/apitimelinepublic.php:193 actions/publicrss.php:103
+#, fuzzy, php-format
+msgid "%s public timeline"
+msgstr "%s tydlyn"
+
+#. TRANS: Subtitle for site timeline. %s is the StatusNet sitename.
+#: actions/apitimelinepublic.php:199 actions/publicrss.php:105

 #, php-format
 msgid "%s updates from everyone!"
 msgstr ""
 
 #, php-format
 msgid "%s updates from everyone!"
 msgstr ""
 

-#: actions/apitimelineretweetedtome.php:111
+#. TRANS: Server error displayed calling unimplemented API method for 'retweeted by me'.
+#: actions/apitimelineretweetedbyme.php:71
+#, fuzzy
+msgid "Unimplemented."
+msgstr "Opdrag voltooi"
+
+#. TRANS: Title for Atom feed "repeated to me". %s is the user nickname.
+#: actions/apitimelineretweetedtome.php:108

 #, php-format
 msgid "Repeated to %s"
 msgstr "Na %s herhaal"
 
 #, php-format
 msgid "Repeated to %s"
 msgstr "Na %s herhaal"
 

-#: actions/apitimelineretweetsofme.php:114
+#. TRANS: Title of list of repeated notices of the logged in user.
+#. TRANS: %s is the nickname of the logged in user.
+#: actions/apitimelineretweetsofme.php:112

 #, php-format
 msgid "Repeats of %s"
 msgstr "Herhalings van %s"
 
 #, php-format
 msgid "Repeats of %s"
 msgstr "Herhalings van %s"
 

+#. TRANS: Title for timeline with lastest notices with a given tag.
+#. TRANS: %s is the tag.
+#: actions/apitimelinetag.php:101 actions/tag.php:67
+#, fuzzy, php-format
+msgid "Notices tagged with %s"
+msgstr "met die etiket %s"
+
+#. TRANS: Subtitle for timeline with lastest notices with a given tag.
+#. TRANS: %1$s is the tag, $2$s is the StatusNet sitename.
+#: actions/apitimelinetag.php:105 actions/tagrss.php:65
+#, fuzzy, php-format
+msgid "Updates tagged with %1$s on %2$s!"
+msgstr "Opdaterings van %1$s op %2$s."
+
+#: actions/apitimelineuser.php:300
+msgid "Only the user can add to their own timeline."
+msgstr ""
+
+#: actions/apitimelineuser.php:306
+msgid "Only accept AtomPub for atom feeds."
+msgstr ""
+
+#: actions/apitimelineuser.php:316
+msgid "Atom post must be an Atom entry."
+msgstr ""
+
+#: actions/apitimelineuser.php:325
+msgid "Can only handle post activities."
+msgstr ""
+
+#: actions/apitimelineuser.php:334
+#, php-format
+msgid "Cannot handle activity object type \"%s\""
+msgstr ""
+
+#: actions/apitimelineuser.php:392
+#, php-format
+msgid "Notice with URI \"%s\" already exists."
+msgstr ""
+
+#: actions/apitimelineuser.php:423
+#, php-format
+msgid "AtomPub post with unknown attention URI %s"
+msgstr ""
+
+#. TRANS: Server error for unfinished API method showTrends.
+#: actions/apitrends.php:85
+#, fuzzy
+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.
+#: actions/apiusershow.php:94
+#, fuzzy
+msgid "User not found."
+msgstr "Die API-funksie is nie gevind nie."
+
+#. TRANS: Client error displayed trying to get a non-existing attachment.

 #: actions/attachment.php:73
 msgid "No such attachment."
 msgstr "Die aanhangsel bestaan nie."
 
 #: actions/attachment.php:73
 msgid "No such attachment."
 msgstr "Die aanhangsel bestaan nie."
 

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

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

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

 msgid "No nickname."
 msgstr "Geen gebruikersnaam nie."
 
 msgid "No nickname."
 msgstr "Geen gebruikersnaam nie."
 

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

 msgid "No size."
 msgstr "Geen grootte nie."
 
 msgid "No size."
 msgstr "Geen grootte nie."
 

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

 msgid "Invalid size."
 msgstr "Ongeldige grootte."
 
 msgid "Invalid size."
 msgstr "Ongeldige grootte."
 

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

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

-#: actions/avatarsettings.php:67 actions/showgroup.php:230
-#: lib/accountsettingsaction.php:118
+#: actions/avatarsettings.php:66 actions/showgroup.php:224
+#: lib/accountsettingsaction.php:113

 msgid "Avatar"
 msgstr "Avatar"
 
 msgid "Avatar"
 msgstr "Avatar"
 

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

 #: actions/avatarsettings.php:78
 #, php-format
 msgid "You can upload your personal avatar. The maximum file size is %s."
 msgstr ""
 
 #: actions/avatarsettings.php:78
 #, php-format
 msgid "You can upload your personal avatar. The maximum file size is %s."
 msgstr ""
 

-#: actions/avatarsettings.php:119 actions/avatarsettings.php:197
+#. TRANS: Server error displayed in avatar upload page when no matching profile can be found for a user.
+#: actions/avatarsettings.php:108 actions/avatarsettings.php:192
+#: actions/grouplogo.php:181 actions/remotesubscribe.php:191
+#: actions/userauthorization.php:72 actions/userrss.php:108
+#, fuzzy
+msgid "User without matching profile."
+msgstr "Hierdie gebruiker het nie 'n profiel nie."
+
+#. TRANS: Avatar upload page form legend.
+#. TRANS: Avatar upload page crop form legend.
+#: actions/avatarsettings.php:122 actions/avatarsettings.php:205

 #: actions/grouplogo.php:254
 msgid "Avatar settings"
 msgstr "Avatar-instellings"
 
 #: actions/grouplogo.php:254
 msgid "Avatar settings"
 msgstr "Avatar-instellings"
 

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

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

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

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

-#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:657
+#. TRANS: Button on avatar upload page to delete current avatar.
+#: actions/avatarsettings.php:155
+#, fuzzy
+msgctxt "BUTTON"

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

-#: actions/avatarsettings.php:166 actions/grouplogo.php:236
+#. TRANS: Button on avatar upload page to upload an avatar.
+#: actions/avatarsettings.php:173
+#, fuzzy
+msgctxt "BUTTON"

 msgid "Upload"
 msgstr "Oplaai"
 
 msgid "Upload"
 msgstr "Oplaai"
 

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

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

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

 msgid "No file uploaded."
 msgstr "Geen lêer opgelaai nie."
 
 msgid "No file uploaded."
 msgstr "Geen lêer opgelaai nie."
 

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

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

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

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

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

 msgid "Avatar updated."
 msgstr "Die avatar is opgedateer."
 
 msgid "Avatar updated."
 msgstr "Die avatar is opgedateer."
 

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

 msgid "Failed updating avatar."
 msgstr "Die opdatering van die avatar het gefaal."
 
 msgid "Failed updating avatar."
 msgstr "Die opdatering van die avatar het gefaal."
 

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

 msgid "Avatar deleted."
 msgstr "Die avatar is verwyder."
 
 msgid "Avatar deleted."
 msgstr "Die avatar is verwyder."
 

-#: actions/block.php:69
+#. TRANS: Client error displayed when blocking a user that has already been blocked.
+#: actions/block.php:68

 msgid "You already blocked that user."
 msgstr "U het reeds die gebruiker geblokkeer."
 
 msgid "You already blocked that user."
 msgstr "U het reeds die gebruiker geblokkeer."
 

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

 msgid "Block user"
 msgstr "Blokkeer gebruiker"
 
 msgid "Block user"
 msgstr "Blokkeer gebruiker"
 

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

 msgid ""
 "Are you sure you want to block this user? Afterwards, they will be "
 "unsubscribed from you, unable to subscribe to you in the future, and you "
 msgid ""
 "Are you sure you want to block this user? Afterwards, they will be "
 "unsubscribed from you, unable to subscribe to you in the future, and you "


@@ -767,150 +1275,225 @@ msgstr ""
 
 #. TRANS: Button label on the user block form.
 #. TRANS: Button label on the delete application form.
 
 #. TRANS: Button label on the user block form.
 #. TRANS: Button label on the delete application form.

+#. TRANS: Button label on the delete group form.

 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.

-#: actions/block.php:153 actions/deleteapplication.php:154
-#: actions/deletenotice.php:147 actions/deleteuser.php:152
-#: actions/groupblock.php:178
+#: actions/block.php:154 actions/deleteapplication.php:157
+#: actions/deletegroup.php:220 actions/deletenotice.php:155
+#: actions/deleteuser.php:152 actions/groupblock.php:178

 msgctxt "BUTTON"
 msgid "No"
 msgstr "Nee"
 
 #. TRANS: Submit button title for 'No' when blocking a user.
 #. TRANS: Submit button title for 'No' when deleting a user.
 msgctxt "BUTTON"
 msgid "No"
 msgstr "Nee"
 
 #. TRANS: Submit button title for 'No' when blocking a user.
 #. TRANS: Submit button title for 'No' when deleting a user.

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

 msgid "Do not block this user"
 msgstr "Moenie hierdie gebruiker blokkeer nie"
 
 #. TRANS: Button label on the user block form.
 #. TRANS: Button label on the delete application form.
 msgid "Do not block this user"
 msgstr "Moenie hierdie gebruiker blokkeer nie"
 
 #. TRANS: Button label on the user block form.
 #. TRANS: Button label on the delete application form.

+#. TRANS: Button label on the delete group form.

 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.

-#: actions/block.php:160 actions/deleteapplication.php:161
-#: actions/deletenotice.php:154 actions/deleteuser.php:159
-#: actions/groupblock.php:185
+#: actions/block.php:161 actions/deleteapplication.php:164
+#: actions/deletegroup.php:227 actions/deletenotice.php:162
+#: actions/deleteuser.php:159 actions/groupblock.php:185

 msgctxt "BUTTON"
 msgid "Yes"
 msgstr "Ja"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
 msgctxt "BUTTON"
 msgid "Yes"
 msgstr "Ja"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.

-#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
+#. TRANS: Description of the form to block a user.
+#: actions/block.php:165 lib/blockform.php:79

 msgid "Block this user"
 msgstr "Blokkeer hierdie gebruiker"
 
 msgid "Block this user"
 msgstr "Blokkeer hierdie gebruiker"
 

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

 msgid "Failed to save block information."
 msgstr ""
 
 msgid "Failed to save block information."
 msgstr ""
 

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

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

-#: actions/blockedfromgroup.php:80 actions/blockedfromgroup.php:87
-#: actions/editgroup.php:100 actions/foafgroup.php:44 actions/foafgroup.php:62
+#: actions/blockedfromgroup.php:81 actions/blockedfromgroup.php:89
+#: actions/deletegroup.php:87 actions/deletegroup.php:100
+#: actions/editgroup.php:102 actions/foafgroup.php:44 actions/foafgroup.php:62

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

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

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

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

 msgid "No such group."
 msgstr "Die groep bestaan nie."
 
 msgid "No such group."
 msgstr "Die groep bestaan nie."
 

-#: actions/blockedfromgroup.php:288
+#. TRANS: Title for first page with list of users blocked from a group.
+#. TRANS: %s is a group nickname.
+#: actions/blockedfromgroup.php:101
+#, fuzzy, php-format
+msgid "%s blocked profiles"
+msgstr "%s geblokkeerde gebruikers"
+
+#. TRANS: Title for any but the first page with list of users blocked from a group.
+#. TRANS: %1$s is a group nickname, %2$d is a page number.
+#: actions/blockedfromgroup.php:106
+#, fuzzy, php-format
+msgid "%1$s blocked profiles, page %2$d"
+msgstr "%1$s en vriende, bladsy %2$d"
+
+#. TRANS: Instructions for list of users blocked from a group.
+#: actions/blockedfromgroup.php:122
+#, fuzzy
+msgid "A list of the users blocked from joining this group."
+msgstr "Blok hierdie gebruiker van hierdie groep"
+
+#. TRANS: Form legend for unblocking a user from a group.
+#: actions/blockedfromgroup.php:291

 msgid "Unblock user from group"
 msgstr "Gee gebruiker weer toegang tot die groep"
 
 msgid "Unblock user from group"
 msgstr "Gee gebruiker weer toegang tot die groep"
 

-#: actions/blockedfromgroup.php:320 lib/unblockform.php:69
+#. TRANS: Button text for unblocking a user from a group.
+#: actions/blockedfromgroup.php:323
+#, fuzzy
+msgctxt "BUTTON"

 msgid "Unblock"
 msgstr "Deblokkeer"
 
 msgid "Unblock"
 msgstr "Deblokkeer"
 

-#: actions/blockedfromgroup.php:320 lib/unblockform.php:80
+#. TRANS: Tooltip for button for unblocking a user from a group.
+#. TRANS: Description of the form to unblock a user.
+#: actions/blockedfromgroup.php:327 lib/unblockform.php:78

 msgid "Unblock this user"
 msgstr "Deblokkeer hierdie gebruiker"
 
 #. TRANS: Title for mini-posting window loaded from bookmarklet.
 msgid "Unblock this user"
 msgstr "Deblokkeer hierdie gebruiker"
 
 #. TRANS: Title for mini-posting window loaded from bookmarklet.

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

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

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

 msgid "No confirmation code."
 msgstr "Geen bevestigingskode."
 
 msgid "No confirmation code."
 msgstr "Geen bevestigingskode."
 

-#. TRANS: Server error for an unknow address type, which can be 'email', 'jabber', or 'sms'.
-#: actions/confirmaddress.php:91
+#. TRANS: Client error displayed when providing a non-existing confirmation code in the contact address confirmation action.
+#: actions/confirmaddress.php:80
+#, fuzzy
+msgid "Confirmation code not found."
+msgstr "Geen bevestigingskode."
+
+#. TRANS: Client error displayed when not providing a confirmation code for another user in the contact address confirmation action.
+#: actions/confirmaddress.php:86
+#, fuzzy
+msgid "That confirmation code is not for you!"
+msgstr "Geen bevestigingskode."
+
+#. TRANS: Server error for a unknow address type %s, which can be 'email', 'jabber', or 'sms'.
+#: actions/confirmaddress.php:92

 #, php-format
 msgid "Unrecognized address type %s."
 msgstr ""
 
 #, php-format
 msgid "Unrecognized address type %s."
 msgstr ""
 

+#. TRANS: Client error for an already confirmed email/jabber/sms address.
+#: actions/confirmaddress.php:97
+#, fuzzy
+msgid "That address has already been confirmed."
+msgstr "Die E-posadres bestaan reeds."
+
+#. TRANS: Server error displayed when a user update to the database fails in the contact address confirmation action.

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

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

 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.
 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.

-#: actions/confirmaddress.php:116 actions/emailsettings.php:327
-#: actions/emailsettings.php:473 actions/imsettings.php:280
-#: actions/imsettings.php:439 actions/othersettings.php:174
-#: actions/profilesettings.php:283 actions/smssettings.php:308
+#: actions/confirmaddress.php:118 actions/emailsettings.php:337
+#: actions/emailsettings.php:486 actions/imsettings.php:283
+#: actions/imsettings.php:442 actions/othersettings.php:184
+#: actions/profilesettings.php:326 actions/smssettings.php:308

 #: actions/smssettings.php:464
 msgid "Couldn't update user."
 msgstr "Kon nie gebruiker opdateer nie."
 
 #: actions/smssettings.php:464
 msgid "Couldn't update user."
 msgstr "Kon nie gebruiker opdateer nie."
 

-#. TRANS: Server error thrown on database error canceling e-mail address confirmation.
-#. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
-#: actions/confirmaddress.php:128 actions/emailsettings.php:433
-#: actions/smssettings.php:422
-msgid "Couldn't delete email confirmation."
+#. TRANS: Server error displayed when an address confirmation code deletion from the
+#. TRANS: database fails in the contact address confirmation action.
+#: actions/confirmaddress.php:132
+#, fuzzy
+msgid "Could not delete address confirmation."

 msgstr "Kon nie e-posbevestiging verwyder nie."
 
 msgstr "Kon nie e-posbevestiging verwyder nie."
 

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

 msgid "Confirm address"
 msgstr "Bevestig adres"
 
 msgid "Confirm address"
 msgstr "Bevestig adres"
 

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

 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr ""
 
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr ""
 

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

 msgid "Conversation"
 msgstr "Gesprek"
 
 msgid "Conversation"
 msgstr "Gesprek"
 

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

 #: lib/profileaction.php:229 lib/searchgroupnav.php:82
 msgid "Notices"
 msgstr "Kennisgewings"
 
 #: lib/profileaction.php:229 lib/searchgroupnav.php:82
 msgid "Notices"
 msgstr "Kennisgewings"
 

-#: actions/deleteapplication.php:63
+#. 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."
 msgstr "U moet aangeteken alvorens u 'n aansoek kan skrap."
 
 msgid "You must be logged in to delete an application."
 msgstr "U moet aangeteken alvorens u 'n aansoek kan skrap."
 

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

 #: actions/deleteapplication.php:71
 msgid "Application not found."
 msgstr "Die applikasie is nie gevind nie."
 
 #: actions/deleteapplication.php:71
 msgid "Application not found."
 msgstr "Die applikasie is nie gevind nie."
 

-#: actions/deleteapplication.php:78 actions/editapplication.php:77
+#. TRANS: Client error displayed trying to delete an application the current user does not own.
+#. TRANS: Client error displayed trying to edit an application while not being its owner.
+#: actions/deleteapplication.php:79 actions/editapplication.php:78

 #: actions/showapplication.php:94
 msgid "You are not the owner of this application."
 msgstr "U is nie die eienaar van hierdie applikasie nie."
 
 #: actions/showapplication.php:94
 msgid "You are not the owner of this application."
 msgstr "U is nie die eienaar van hierdie applikasie nie."
 

-#: actions/deleteapplication.php:102 actions/editapplication.php:127
-#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1307
+#. 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:1409

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

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

 msgid "Delete application"
 msgstr "Skrap applikasie"
 
 msgid "Delete application"
 msgstr "Skrap applikasie"
 

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

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


@@ -918,51 +1501,113 @@ msgid ""
 msgstr ""
 
 #. TRANS: Submit button title for 'No' when deleting an application.
 msgstr ""
 
 #. TRANS: Submit button title for 'No' when deleting an application.

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

 msgid "Do not delete this application"
 msgstr "Moenie die applikasie verwyder nie"
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
 msgid "Do not delete this application"
 msgstr "Moenie die applikasie verwyder nie"
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.

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

 msgid "Delete this application"
 msgstr "Skrap hierdie applikasie"
 
 msgid "Delete this application"
 msgstr "Skrap hierdie applikasie"
 

+#. TRANS: Client error when trying to delete group while not logged in.
+#: actions/deletegroup.php:64
+#, fuzzy
+msgid "You must be logged in to delete a group."
+msgstr "U moet aanteken alvorens u 'n groep kan verlaat."
+
+#. TRANS: Client error when trying to delete a group without providing a nickname or ID for the group.
+#: actions/deletegroup.php:94 actions/joingroup.php:88
+#: actions/leavegroup.php:88
+msgid "No nickname or ID."
+msgstr "Geen gebruikersnaam of ID nie."
+
+#. TRANS: Client error when trying to delete a group without having the rights to delete it.
+#: actions/deletegroup.php:107
+#, fuzzy
+msgid "You are not allowed to delete this group."
+msgstr "U is nie 'n lid van die groep nie."
+
+#. TRANS: Server error displayed if a group could not be deleted.
+#. TRANS: %s is the name of the group that could not be deleted.
+#: actions/deletegroup.php:150
+#, fuzzy, php-format
+msgid "Could not delete group %s."
+msgstr "Dit was nie moontlik om die groep by te werk nie."
+
+#. TRANS: Message given after deleting a group.
+#. TRANS: %s is the deleted group's name.
+#: actions/deletegroup.php:159
+#, fuzzy, php-format
+msgid "Deleted group %s"
+msgstr "%1$s het die groep %2$s verlaat"
+
+#. TRANS: Title of delete group page.
+#. TRANS: Form legend for deleting a group.
+#: actions/deletegroup.php:176 actions/deletegroup.php:202
+#, fuzzy
+msgid "Delete group"
+msgstr "Verwyder gebruiker"
+
+#. TRANS: Warning in form for deleleting a group.
+#: actions/deletegroup.php:206
+msgid ""
+"Are you sure you want to delete this group? This will clear all data about "
+"the group from the database, without a backup. Public posts to this group "
+"will still appear in individual timelines."
+msgstr ""
+
+#. TRANS: Submit button title for 'No' when deleting a group.
+#: actions/deletegroup.php:224
+#, fuzzy
+msgid "Do not delete this group"
+msgstr "Moenie hierdie kennisgewing verwyder nie"
+
+#. TRANS: Submit button title for 'Yes' when deleting a group.
+#: actions/deletegroup.php:231
+#, fuzzy
+msgid "Delete this group"
+msgstr "Verwyder die gebruiker"
+
+#. TRANS: Error message displayed trying to delete a notice while not logged in.
+#. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
+#. TRANS: Client error displayed trying a change a subscription while not logged in.

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

-#: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62
-#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
-#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
-#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
+#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
+#: actions/groupblock.php:61 actions/groupunblock.php:60 actions/logout.php:69
+#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
+#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96

 #: actions/tagother.php:33 actions/unsubscribe.php:52
 #: actions/tagother.php:33 actions/unsubscribe.php:52

-#: lib/adminpanelaction.php:73 lib/profileformaction.php:64
+#: lib/adminpanelaction.php:71 lib/profileformaction.php:64

 #: lib/settingsaction.php:72
 msgid "Not logged in."
 msgstr "Nie aangeteken nie."
 
 #: lib/settingsaction.php:72
 msgid "Not logged in."
 msgstr "Nie aangeteken nie."
 

-#: actions/deletenotice.php:71
-msgid "Can't delete this notice."
-msgstr "Hierdie kennisgewing kan nie verwyder word nie."
-
-#: actions/deletenotice.php:103
+#. TRANS: Instructions for deleting a notice.
+#: actions/deletenotice.php:110

 msgid ""
 "You are about to permanently delete a notice. Once this is done, it cannot "
 "be undone."
 msgstr ""
 
 msgid ""
 "You are about to permanently delete a notice. Once this is done, it cannot "
 "be undone."
 msgstr ""
 

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

 msgid "Delete notice"
 msgstr "Verwyder kennisgewing"
 
 msgid "Delete notice"
 msgstr "Verwyder kennisgewing"
 

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

 msgid "Are you sure you want to delete this notice?"
 msgstr "Is u seker u wil hierdie kennisgewing verwyder?"
 
 #. TRANS: Submit button title for 'No' when deleting a notice.
 msgid "Are you sure you want to delete this notice?"
 msgstr "Is u seker u wil hierdie kennisgewing verwyder?"
 
 #. TRANS: Submit button title for 'No' when deleting a notice.

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

 msgid "Do not delete this notice"
 msgstr "Moenie hierdie kennisgewing verwyder nie"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
 msgid "Do not delete this notice"
 msgstr "Moenie hierdie kennisgewing verwyder nie"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.

-#: actions/deletenotice.php:158 lib/noticelist.php:657
+#: actions/deletenotice.php:166 lib/noticelist.php:672

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


@@ -991,58 +1636,74 @@ msgstr "Verwyder die gebruiker"
 
 #. TRANS: Message used as title for design settings for the site.
 #. TRANS: Link description in user account settings menu.
 
 #. TRANS: Message used as title for design settings for the site.
 #. TRANS: Link description in user account settings menu.

-#: actions/designadminpanel.php:63 lib/accountsettingsaction.php:139
-#: lib/groupnav.php:119
+#: actions/designadminpanel.php:63 lib/accountsettingsaction.php:134

 msgid "Design"
 msgstr "Ontwerp"
 
 #: actions/designadminpanel.php:74
 msgid "Design"
 msgstr "Ontwerp"
 
 #: actions/designadminpanel.php:74

-msgid "Design settings for this StatusNet site."
+msgid "Design settings for this StatusNet site"

 msgstr ""
 
 msgstr ""
 

-#: actions/designadminpanel.php:318
+#: actions/designadminpanel.php:335

 msgid "Invalid logo URL."
 msgstr "Die logo-URL is ongeldig."
 
 msgid "Invalid logo URL."
 msgstr "Die logo-URL is ongeldig."
 

-#: actions/designadminpanel.php:322
+#: actions/designadminpanel.php:340
+#, fuzzy
+msgid "Invalid SSL logo URL."
+msgstr "Die logo-URL is ongeldig."
+
+#: actions/designadminpanel.php:344

 #, php-format
 msgid "Theme not available: %s."
 msgstr "IM is nie beskikbaar nie."
 
 #, php-format
 msgid "Theme not available: %s."
 msgstr "IM is nie beskikbaar nie."
 

-#: actions/designadminpanel.php:426
+#: actions/designadminpanel.php:448

 msgid "Change logo"
 msgstr "Verander logo"
 
 msgid "Change logo"
 msgstr "Verander logo"
 

-#: actions/designadminpanel.php:431
+#: actions/designadminpanel.php:453

 msgid "Site logo"
 msgstr "Webwerf-logo"
 
 msgid "Site logo"
 msgstr "Webwerf-logo"
 

-#: actions/designadminpanel.php:443
+#: actions/designadminpanel.php:457
+#, fuzzy
+msgid "SSL logo"
+msgstr "Webwerf-logo"
+
+#: actions/designadminpanel.php:469

 msgid "Change theme"
 msgstr "Verander tema"
 
 msgid "Change theme"
 msgstr "Verander tema"
 

-#: actions/designadminpanel.php:460
+#: actions/designadminpanel.php:486

 msgid "Site theme"
 msgstr "Werf se tema"
 
 msgid "Site theme"
 msgstr "Werf se tema"
 

-#: actions/designadminpanel.php:461
+#: actions/designadminpanel.php:487

 msgid "Theme for the site."
 msgstr "Tema vir die werf."
 
 msgid "Theme for the site."
 msgstr "Tema vir die werf."
 

-#: actions/designadminpanel.php:471
+#: actions/designadminpanel.php:493
+#, fuzzy
+msgid "Custom theme"
+msgstr "Werf se tema"
+
+#: actions/designadminpanel.php:497

 msgid "You can upload a custom StatusNet theme as a .ZIP archive."
 msgstr ""
 
 msgid "You can upload a custom StatusNet theme as a .ZIP archive."
 msgstr ""
 

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

 msgid "Change background image"
 msgstr "Verander die agtergrond-prent"
 
 msgid "Change background image"
 msgstr "Verander die agtergrond-prent"
 

-#: actions/designadminpanel.php:491 actions/designadminpanel.php:574
-#: lib/designsettings.php:178
+#. TRANS: Label on profile design page for setting a profile page background colour.
+#: actions/designadminpanel.php:517 actions/designadminpanel.php:600
+#: lib/designsettings.php:183

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

-#: actions/designadminpanel.php:496
+#: actions/designadminpanel.php:522

 #, php-format
 msgid ""
 "You can upload a background image for the site. The maximum file size is %1"
 #, php-format
 msgid ""
 "You can upload a background image for the site. The maximum file size is %1"


@@ -1050,63 +1711,87 @@ msgid ""
 msgstr ""
 
 #. TRANS: Used as radio button label to add a background image.
 msgstr ""
 
 #. TRANS: Used as radio button label to add a background image.

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

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

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

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

-#: actions/designadminpanel.php:564 lib/designsettings.php:170
+#. TRANS: Form guide for a set of radio buttons on the profile design page that will enable or disable
+#. TRANS: use of the uploaded profile image.
+#: actions/designadminpanel.php:571 lib/designsettings.php:159
+#, fuzzy
+msgid "Turn background image on or off."
+msgstr "Verander die agtergrond-prent"
+
+#. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
+#: actions/designadminpanel.php:576 lib/designsettings.php:165
+#, fuzzy
+msgid "Tile background image"
+msgstr "Verander die agtergrond-prent"
+
+#. TRANS: Fieldset legend on profile design page to change profile page colours.
+#: actions/designadminpanel.php:590 lib/designsettings.php:175

 msgid "Change colours"
 msgstr "Verander kleure"
 
 msgid "Change colours"
 msgstr "Verander kleure"
 

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

 msgid "Content"
 msgstr "Inhoud"
 
 msgid "Content"
 msgstr "Inhoud"
 

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

 msgid "Sidebar"
 msgstr "Kantstrook"
 
 msgid "Sidebar"
 msgstr "Kantstrook"
 

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

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

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

 msgid "Links"
 msgstr "Skakels"
 
 msgid "Links"
 msgstr "Skakels"
 

-#: actions/designadminpanel.php:651
+#: actions/designadminpanel.php:677

 msgid "Advanced"
 msgstr "Gevorderd"
 
 msgid "Advanced"
 msgstr "Gevorderd"
 

-#: actions/designadminpanel.php:655
+#: actions/designadminpanel.php:681

 msgid "Custom CSS"
 msgstr ""
 
 msgid "Custom CSS"
 msgstr ""
 

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

 msgid "Use defaults"
 msgstr "Gebruik verstekwaardes"
 
 msgid "Use defaults"
 msgstr "Gebruik verstekwaardes"
 

-#: actions/designadminpanel.php:683 lib/designsettings.php:254
+#. TRANS: Title for button on profile design page to reset all colour settings to default.
+#: actions/designadminpanel.php:703 lib/designsettings.php:259
+#, fuzzy
+msgid "Restore default designs"
+msgstr "Gebruik verstekwaardes"
+
+#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
+#: actions/designadminpanel.php:709 lib/designsettings.php:267

 msgid "Reset back to default"
 msgstr "Stel terug na standaard"
 
 msgid "Reset back to default"
 msgstr "Stel terug na standaard"
 

-#. TRANS: Submit button title
-#: actions/designadminpanel.php:685 actions/othersettings.php:126
-#: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
+#. TRANS: Submit button title.
+#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:319

 #: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
 #: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292

-#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245
-#: actions/subscriptions.php:226 actions/tagother.php:154
-#: actions/useradminpanel.php:294 lib/applicationeditform.php:363
-#: lib/designsettings.php:256 lib/groupeditform.php:202
+#: actions/snapshotadminpanel.php:245 actions/tagother.php:154
+#: lib/applicationeditform.php:357

 msgid "Save"
 msgstr "Stoor"
 
 msgid "Save"
 msgstr "Stoor"
 

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

 msgid "Save design"
 msgstr "Stoor ontwerp"
 
 msgid "Save design"
 msgstr "Stoor ontwerp"
 


@@ -1123,109 +1808,132 @@ msgstr "Voeg by gunstelinge"
 msgid "No such document \"%s\""
 msgstr "Onbekende dokument \"%s\""
 
 msgid "No such document \"%s\""
 msgstr "Onbekende dokument \"%s\""
 

-#: actions/editapplication.php:54
-msgid "Edit Application"
+#. TRANS: Title for "Edit application" form.
+#. TRANS: Form legend.
+#: actions/editapplication.php:54 lib/applicationeditform.php:129
+#, fuzzy
+msgid "Edit application"

 msgstr "Wysig applikasie"
 
 msgstr "Wysig applikasie"
 

+#. TRANS: Client error displayed trying to edit an application while not logged in.

 #: actions/editapplication.php:66
 msgid "You must be logged in to edit an application."
 msgstr "U moet aangeteken wees alvorens u 'n applikasie kan wysig."
 
 #: actions/editapplication.php:66
 msgid "You must be logged in to edit an application."
 msgstr "U moet aangeteken wees alvorens u 'n applikasie kan wysig."
 

-#: actions/editapplication.php:81 actions/oauthconnectionssettings.php:166
-#: actions/showapplication.php:87
+#. TRANS: Client error displayed trying to edit an application that does not exist.
+#: actions/editapplication.php:83 actions/showapplication.php:87

 msgid "No such application."
 msgstr "Die applikasie bestaan nie."
 
 msgid "No such application."
 msgstr "Die applikasie bestaan nie."
 

-#: actions/editapplication.php:161
+#. TRANS: Instructions for "Edit application" form.
+#: actions/editapplication.php:167

 msgid "Use this form to edit your application."
 msgstr "Gebruik die vorm om u applikasie te wysig."
 
 msgid "Use this form to edit your application."
 msgstr "Gebruik die vorm om u applikasie te wysig."
 

-#: actions/editapplication.php:177 actions/newapplication.php:159
+#. TRANS: Validation error shown when not providing a name in the "Edit application" form.
+#: actions/editapplication.php:184 actions/newapplication.php:163

 msgid "Name is required."
 msgstr "'n Naam is verpligtend."
 
 msgid "Name is required."
 msgstr "'n Naam is verpligtend."
 

-#: actions/editapplication.php:180 actions/newapplication.php:165
-msgid "Name is too long (max 255 chars)."
+#. TRANS: Validation error shown when providing too long a name in the "Edit application" form.
+#: actions/editapplication.php:188 actions/newapplication.php:169
+#, fuzzy
+msgid "Name is too long (maximum 255 characters)."

 msgstr "Die naam is te lank (maksimum 255 karakters)."
 
 msgstr "Die naam is te lank (maksimum 255 karakters)."
 

-#: actions/editapplication.php:183 actions/newapplication.php:162
+#. TRANS: Validation error shown when providing a name for an application that already exists in the "Edit application" form.
+#: actions/editapplication.php:192 actions/newapplication.php:166

 msgid "Name already in use. Try another one."
 msgstr "Die naam is reeds in gebruik. Kies 'n ander een."
 
 msgid "Name already in use. Try another one."
 msgstr "Die naam is reeds in gebruik. Kies 'n ander een."
 

-#: actions/editapplication.php:186 actions/newapplication.php:168
+#. TRANS: Validation error shown when not providing a description in the "Edit application" form.
+#: actions/editapplication.php:196 actions/newapplication.php:172

 msgid "Description is required."
 msgstr "Beskrywing word vereis."
 
 msgid "Description is required."
 msgstr "Beskrywing word vereis."
 

-#: actions/editapplication.php:194
+#. TRANS: Validation error shown when providing too long a source URL in the "Edit application" form.
+#: actions/editapplication.php:208

 msgid "Source URL is too long."
 msgstr "Die bron-URL is te lank."
 
 msgid "Source URL is too long."
 msgstr "Die bron-URL is te lank."
 

-#: actions/editapplication.php:200 actions/newapplication.php:185
+#. TRANS: Validation error shown when providing an invalid source URL in the "Edit application" form.
+#: actions/editapplication.php:215 actions/newapplication.php:193

 msgid "Source URL is not valid."
 msgstr "Die bron-URL is nie geldig nie."
 
 msgid "Source URL is not valid."
 msgstr "Die bron-URL is nie geldig nie."
 

-#: actions/editapplication.php:203 actions/newapplication.php:188
+#. TRANS: Validation error shown when not providing an organisation in the "Edit application" form.
+#: actions/editapplication.php:219 actions/newapplication.php:196

 msgid "Organization is required."
 msgstr "Organisasie is verpligtend."
 
 msgid "Organization is required."
 msgstr "Organisasie is verpligtend."
 

-#: actions/editapplication.php:206 actions/newapplication.php:191
-msgid "Organization is too long (max 255 chars)."
+#. TRANS: Validation error shown when providing too long an arganisation name in the "Edit application" form.
+#: actions/editapplication.php:223 actions/newapplication.php:199
+#, fuzzy
+msgid "Organization is too long (maximum 255 characters)."

 msgstr "Die organisasienaam is te lang (maksimum 255 karakters)."
 
 msgstr "Die organisasienaam is te lang (maksimum 255 karakters)."
 

-#: actions/editapplication.php:209 actions/newapplication.php:194
+#: actions/editapplication.php:226 actions/newapplication.php:202

 msgid "Organization homepage is required."
 msgstr "Die tuisblad vir die organisasie is verpligtend."
 
 msgid "Organization homepage is required."
 msgstr "Die tuisblad vir die organisasie is verpligtend."
 

-#: actions/editapplication.php:218 actions/newapplication.php:206
+#. TRANS: Validation error shown when providing too long a callback URL in the "Edit application" form.
+#: actions/editapplication.php:237 actions/newapplication.php:214

 msgid "Callback is too long."
 msgstr "Die \"callback\" is te lank."
 
 msgid "Callback is too long."
 msgstr "Die \"callback\" is te lank."
 

-#: actions/editapplication.php:225 actions/newapplication.php:215
+#. TRANS: Validation error shown when providing an invalid callback URL in the "Edit application" form.
+#: actions/editapplication.php:245 actions/newapplication.php:223

 msgid "Callback URL is not valid."
 msgstr "Die \"callback\"-URL is nie geldig nie."
 
 msgid "Callback URL is not valid."
 msgstr "Die \"callback\"-URL is nie geldig nie."
 

-#: actions/editapplication.php:258
+#. TRANS: Server error occuring when an application could not be updated from the "Edit application" form.
+#: actions/editapplication.php:282

 msgid "Could not update application."
 msgstr "Dit was nie moontlik om die applikasie by te werk nie."
 
 msgid "Could not update application."
 msgstr "Dit was nie moontlik om die applikasie by te werk nie."
 

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

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

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

 #: actions/editgroup.php:68 actions/grouplogo.php:70 actions/newgroup.php:65
 msgid "You must be logged in to create a group."
 msgstr "U moet aangeteken wees alvorens u 'n groep kan skep."
 
 #: actions/editgroup.php:68 actions/grouplogo.php:70 actions/newgroup.php:65
 msgid "You must be logged in to create a group."
 msgstr "U moet aangeteken wees alvorens u 'n groep kan skep."
 

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

 #: actions/groupdesignsettings.php:107 actions/grouplogo.php:109
 msgid "You must be an admin to edit the group."
 msgstr "U moet 'n administrateur wees alvorens u 'n groep kan wysig."
 
 #: actions/groupdesignsettings.php:107 actions/grouplogo.php:109
 msgid "You must be an admin to edit the group."
 msgstr "U moet 'n administrateur wees alvorens u 'n groep kan wysig."
 

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

 msgid "Use this form to edit the group."
 msgstr "Gebruik hierdie vorm om die groep te wysig."
 
 msgid "Use this form to edit the group."
 msgstr "Gebruik hierdie vorm om die groep te wysig."
 

-#: actions/editgroup.php:205 actions/newgroup.php:145
-#, php-format
-msgid "description is too long (max %d chars)."
-msgstr "Die beskrywing is te lank (die maksimum is %d karakters)."
-
-#: actions/editgroup.php:228 actions/newgroup.php:168
+#. TRANS: Group edit form validation error.
+#. TRANS: Group create form validation error.
+#: actions/editgroup.php:239 actions/newgroup.php:179

 #, php-format
 msgid "Invalid alias: \"%s\""
 msgstr "Ongeldige alias: \"%s\""
 
 #, php-format
 msgid "Invalid alias: \"%s\""
 msgstr "Ongeldige alias: \"%s\""
 

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

 msgid "Could not update group."
 msgstr "Dit was nie moontlik om die groep by te werk nie."
 
 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.
 #. TRANS: Server exception thrown when creating group aliases failed.

-#: actions/editgroup.php:264 classes/User_group.php:514
+#: actions/editgroup.php:279 classes/User_group.php:529

 msgid "Could not create aliases."
 msgstr "Dit was nie moontlik om die aliasse te skep nie."
 
 msgid "Could not create aliases."
 msgstr "Dit was nie moontlik om die aliasse te skep nie."
 

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

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


@@ -1257,7 +1965,7 @@ msgstr "Huidige bevestigde e-posadres."
 #. TRANS: Button label to remove a confirmed IM address.
 #. TRANS: Button label to remove a confirmed SMS address.
 #. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
 #. TRANS: Button label to remove a confirmed IM address.
 #. TRANS: Button label to remove a confirmed SMS address.
 #. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.

-#: actions/emailsettings.php:115 actions/emailsettings.php:158
+#: actions/emailsettings.php:115 actions/emailsettings.php:162

 #: actions/imsettings.php:116 actions/smssettings.php:124
 #: actions/smssettings.php:180
 msgctxt "BUTTON"
 #: actions/imsettings.php:116 actions/smssettings.php:124
 #: actions/smssettings.php:180
 msgctxt "BUTTON"


@@ -1270,25 +1978,19 @@ msgid ""
 "a message with further instructions."
 msgstr ""
 
 "a message with further instructions."
 msgstr ""
 

-#. TRANS: Button label to cancel an e-mail address confirmation procedure.
-#. TRANS: Button label to cancel an IM address confirmation procedure.
-#. TRANS: Button label to cancel a SMS address confirmation procedure.
-#. TRANS: Button label
-#: actions/emailsettings.php:127 actions/imsettings.php:131
-#: actions/smssettings.php:137 lib/applicationeditform.php:357
-msgctxt "BUTTON"
-msgid "Cancel"
-msgstr "Kanselleer"
-
-#. TRANS: Instructions for e-mail address input form.
-#: actions/emailsettings.php:135
+#. TRANS: Instructions for e-mail address input form. Do not translate
+#. TRANS: "example.org". It is one of the domain names reserved for
+#. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
+#. TRANS: Any other domain may be owned by a legitimate person or
+#. TRANS: organization.
+#: actions/emailsettings.php:139

 msgid "Email address, like \"UserName@example.org\""
 msgstr "E-posadres, soos \"UserName@example.org\""
 
 #. TRANS: Button label for adding an e-mail address in e-mail settings form.
 #. TRANS: Button label for adding an IM address in IM settings form.
 #. TRANS: Button label for adding a SMS phone number in SMS settings form.
 msgid "Email address, like \"UserName@example.org\""
 msgstr "E-posadres, soos \"UserName@example.org\""
 
 #. TRANS: Button label for adding an e-mail address in e-mail settings form.
 #. TRANS: Button label for adding an IM address in IM settings form.
 #. TRANS: Button label for adding a SMS phone number in SMS settings form.

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

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


@@ -1296,133 +1998,188 @@ 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:147 actions/smssettings.php:171
+#: actions/emailsettings.php:151 actions/smssettings.php:171

 msgid "Incoming email"
 msgstr "Inkomende e-pos"
 
 #. TRANS: Form instructions for incoming e-mail form in e-mail settings.
 #. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
 msgid "Incoming email"
 msgstr "Inkomende e-pos"
 
 #. TRANS: Form instructions for incoming e-mail form in e-mail settings.
 #. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.

-#: actions/emailsettings.php:155 actions/smssettings.php:178
+#: actions/emailsettings.php:159 actions/smssettings.php:178

 msgid "Send email to this address to post new notices."
 msgstr ""
 
 #. TRANS: Instructions for incoming e-mail address input form.
 #. TRANS: Instructions for incoming SMS e-mail address input form.
 msgid "Send email to this address to post new notices."
 msgstr ""
 
 #. TRANS: Instructions for incoming e-mail address input form.
 #. TRANS: Instructions for incoming SMS e-mail address input form.

-#: actions/emailsettings.php:164 actions/smssettings.php:186
+#: actions/emailsettings.php:168 actions/smssettings.php:186

 msgid "Make a new email address for posting to; cancels the old one."
 msgstr ""
 
 #. TRANS: Button label for adding an e-mail address to send notices from.
 #. TRANS: Button label for adding an SMS e-mail address to send notices from.
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr ""
 
 #. TRANS: Button label for adding an e-mail address to send notices from.
 #. TRANS: Button label for adding an SMS e-mail address to send notices from.

-#: actions/emailsettings.php:168 actions/smssettings.php:189
+#: actions/emailsettings.php:172 actions/smssettings.php:189

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

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

 msgid "Email preferences"
 msgstr "E-posadresse"
 
 #. TRANS: Checkbox label in e-mail preferences form.
 msgid "Email preferences"
 msgstr "E-posadresse"
 
 #. TRANS: Checkbox label in e-mail preferences form.

-#: actions/emailsettings.php:180
+#: actions/emailsettings.php:186

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

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

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

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

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

 msgid "I want to post notices by email."
 msgstr ""
 
 msgid "I want to post notices by email."
 msgstr ""
 

+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:225
+#, 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.
 #. TRANS: Confirmation message for successful e-mail preferences save.

-#: actions/emailsettings.php:334
+#: actions/emailsettings.php:346

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

 msgid "No email address."
 msgstr "Geen e-posadres."
 
 msgid "No email address."
 msgstr "Geen e-posadres."
 

+#. TRANS: Message given saving e-mail address that cannot be normalised.
+#: actions/emailsettings.php:374
+#, 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.
 #. TRANS: Message given saving e-mail address that not valid.

-#: actions/emailsettings.php:366 actions/register.php:208
+#: actions/emailsettings.php:379 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:370
+#: actions/emailsettings.php:383

 msgid "That is already your email address."
 msgstr "Dit is al reeds u e-posadres."
 
 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:387
+#, fuzzy
+msgid "That email address already belongs to another user."
+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:391 actions/imsettings.php:348
+#: actions/emailsettings.php:404 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:398
+#: actions/emailsettings.php:411

 msgid ""
 "A confirmation code was sent to the email address you added. Check your "
 "inbox (and spam box!) for the code and instructions on how to use it."
 msgstr ""
 
 msgid ""
 "A confirmation code was sent to the email address you added. Check your "
 "inbox (and spam box!) for the code and instructions on how to use it."
 msgstr ""
 

+#. TRANS: Message given canceling e-mail address confirmation 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:432 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/emailsettings.php:437
+#, 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:446 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.
 #. TRANS: Message given after successfully canceling e-mail address confirmation.

-#: actions/emailsettings.php:438
+#: actions/emailsettings.php:451

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

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

 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:493 actions/smssettings.php:568
+#: actions/emailsettings.php:506 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:504 actions/emailsettings.php:528
+#: actions/emailsettings.php:517 actions/emailsettings.php:541

 #: 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:508 actions/smssettings.php:581
+#: actions/emailsettings.php:521 actions/smssettings.php:581

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

-#: actions/favorited.php:65 lib/popularnoticesection.php:91
+#. TRANS: Message given after successfully adding an incoming e-mail address.
+#: actions/emailsettings.php:545 actions/smssettings.php:605
+#, fuzzy
+msgid "New incoming email address added."
+msgstr "Geen inkomende e-posadres."
+
+#: actions/favor.php:79
+#, fuzzy
+msgid "This notice is already a favorite!"
+msgstr "Hierdie kennisgewing is nie 'n gunsteling nie!"
+
+#: actions/favor.php:92 lib/disfavorform.php:144
+#, fuzzy
+msgid "Disfavor favorite"
+msgstr "Voeg by gunstelinge"
+
+#: 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"


@@ -1454,11 +2211,16 @@ msgid ""
 msgstr ""
 
 #: actions/favoritesrss.php:111 actions/showfavorites.php:77
 msgstr ""
 
 #: actions/favoritesrss.php:111 actions/showfavorites.php:77

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

 #, php-format
 msgid "%s's favorite notices"
 msgstr "%s se gunsteling kennisgewings"
 
 #, php-format
 msgid "%s's favorite notices"
 msgstr "%s se gunsteling kennisgewings"
 

+#: actions/favoritesrss.php:115
+#, fuzzy, php-format
+msgid "Updates favored by %1$s on %2$s!"
+msgstr "Opdaterings van %1$s op %2$s."
+

 #: actions/featured.php:69 lib/featureduserssection.php:87
 #: lib/publicgroupnav.php:89
 msgid "Featured users"
 #: actions/featured.php:69 lib/featureduserssection.php:87
 #: lib/publicgroupnav.php:89
 msgid "Featured users"


@@ -1486,6 +2248,11 @@ msgstr "Geen kennisgewing."
 msgid "No attachments."
 msgstr "Geen aanhangsels."
 
 msgid "No attachments."
 msgstr "Geen aanhangsels."
 

+#: actions/file.php:51
+#, fuzzy
+msgid "No uploaded attachments."
+msgstr "Geen aanhangsels."
+

 #: actions/finishremotesubscribe.php:69
 msgid "Not expecting this response!"
 msgstr ""
 #: actions/finishremotesubscribe.php:69
 msgid "Not expecting this response!"
 msgstr ""


@@ -1494,6 +2261,11 @@ msgstr ""
 msgid "User being listened to does not exist."
 msgstr ""
 
 msgid "User being listened to does not exist."
 msgstr ""
 

+#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59
+#, fuzzy
+msgid "You can use the local subscription!"
+msgstr "U kan slegs lokale gebruikers verwyder."
+

 #: actions/finishremotesubscribe.php:99
 msgid "That user has blocked you from subscribing."
 msgstr ""
 #: actions/finishremotesubscribe.php:99
 msgid "That user has blocked you from subscribing."
 msgstr ""


@@ -1510,6 +2282,11 @@ msgstr ""
 msgid "Remote service uses unknown version of OMB protocol."
 msgstr ""
 
 msgid "Remote service uses unknown version of OMB protocol."
 msgstr ""
 

+#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:317
+#, fuzzy
+msgid "Error updating remote profile."
+msgstr "Kon nie die profiel stoor nie."
+

 #: actions/getfile.php:79
 msgid "No such file."
 msgstr "Die lêer bestaan nie."
 #: actions/getfile.php:79
 msgid "No such file."
 msgstr "Die lêer bestaan nie."


@@ -1526,19 +2303,33 @@ msgstr "Ongeldige rol."
 msgid "This role is reserved and cannot be set."
 msgstr ""
 
 msgid "This role is reserved and cannot be set."
 msgstr ""
 

+#: actions/grantrole.php:75
+#, fuzzy
+msgid "You cannot grant user roles on this site."
+msgstr "Jy kan nie gebruikers op hierdie webwerf stilmaak nie."
+
+#: actions/grantrole.php:82
+#, fuzzy
+msgid "User already has this role."
+msgstr "Hierdie gebruiker is reeds stilgemaak."
+
+#. TRANS: Client error displayed when trying to unblock a user from a group without providing a profile.
+#. TRANS: Client error displayed trying a change a subscription without providing a profile.

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

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

 #: lib/profileformaction.php:79
 msgid "No profile specified."
 msgstr "Geen profiel verskaf nie."
 
 #: lib/profileformaction.php:79
 msgid "No profile specified."
 msgstr "Geen profiel verskaf nie."
 

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

 #: actions/unsubscribe.php:84 lib/profileformaction.php:86
 msgid "No profile with that ID."
 msgstr "Daar is geen profiel met daardie ID nie."
 
 #: actions/unsubscribe.php:84 lib/profileformaction.php:86
 msgid "No profile with that ID."
 msgstr "Daar is geen profiel met daardie ID nie."
 

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

 #: actions/makeadmin.php:81
 msgid "No group specified."
 msgstr "Geen groep verskaf nie."
 #: actions/makeadmin.php:81
 msgid "No group specified."
 msgstr "Geen groep verskaf nie."


@@ -1547,7 +2338,17 @@ msgstr "Geen groep verskaf nie."
 msgid "Only an admin can block group members."
 msgstr ""
 
 msgid "Only an admin can block group members."
 msgstr ""
 

-#: actions/groupblock.php:134 actions/groupmembers.php:360
+#: actions/groupblock.php:95
+#, fuzzy
+msgid "User is already blocked from group."
+msgstr "Hierdie gebruiker is reeds stilgemaak."
+
+#: actions/groupblock.php:100
+#, fuzzy
+msgid "User is not a member of group."
+msgstr "U is nie 'n lid van die groep nie."
+
+#: actions/groupblock.php:134 actions/groupmembers.php:364

 msgid "Block user from group"
 msgstr "Blok gebruiker toegang tot die groep"
 
 msgid "Block user from group"
 msgstr "Blok gebruiker toegang tot die groep"
 


@@ -1559,21 +2360,55 @@ msgid ""
 "the group in the future."
 msgstr ""
 
 "the group in the future."
 msgstr ""
 

+#. TRANS: Submit button title for 'No' when blocking a user from a group.
+#: actions/groupblock.php:182
+#, fuzzy
+msgid "Do not block this user from this group"
+msgstr "Blok hierdie gebruiker van hierdie groep"
+

 #. TRANS: Submit button title for 'Yes' when blocking a user from a group.
 #: actions/groupblock.php:189
 msgid "Block this user from this group"
 msgstr "Blok hierdie gebruiker van hierdie groep"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user from a group.
 #: actions/groupblock.php:189
 msgid "Block this user from this group"
 msgstr "Blok hierdie gebruiker van hierdie groep"
 

+#: actions/groupblock.php:206
+#, fuzzy
+msgid "Database error blocking user from group."
+msgstr "Gee gebruiker weer toegang tot die groep"
+

 #: actions/groupbyid.php:74 actions/userbyid.php:70
 msgid "No ID."
 msgstr "Geen ID."
 
 #: actions/groupbyid.php:74 actions/userbyid.php:70
 msgid "No ID."
 msgstr "Geen ID."
 

+#: actions/groupdesignsettings.php:68
+#, fuzzy
+msgid "You must be logged in to edit a group."
+msgstr "U moet aangeteken wees alvorens u 'n groep kan skep."
+
+#: actions/groupdesignsettings.php:144
+#, fuzzy
+msgid "Group design"
+msgstr "Groepe"
+

 #: actions/groupdesignsettings.php:155
 msgid ""
 "Customize the way your group looks with a background image and a colour "
 "palette of your choice."
 msgstr ""
 
 #: actions/groupdesignsettings.php:155
 msgid ""
 "Customize the way your group looks with a background image and a colour "
 "palette of your choice."
 msgstr ""
 

+#. TRANS: Error message displayed if design settings could not be saved.
+#. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
+#: actions/groupdesignsettings.php:266 actions/userdesignsettings.php:186
+#: lib/designsettings.php:405 lib/designsettings.php:427
+#, fuzzy
+msgid "Couldn't update your design."
+msgstr "Dit was nie moontlik om u ontwerp by te werk nie."
+
+#: actions/groupdesignsettings.php:311 actions/userdesignsettings.php:231
+#, fuzzy
+msgid "Design preferences saved."
+msgstr "Voorkeure is gestoor."
+

 #: actions/grouplogo.php:142 actions/grouplogo.php:195
 msgid "Group logo"
 msgstr "Groepslogo"
 #: actions/grouplogo.php:142 actions/grouplogo.php:195
 msgid "Group logo"
 msgstr "Groepslogo"


@@ -1584,9 +2419,17 @@ msgid ""
 "You can upload a logo image for your group. The maximum file size is %s."
 msgstr ""
 
 "You can upload a logo image for your group. The maximum file size is %s."
 msgstr ""
 

-#: actions/grouplogo.php:365
-msgid "Pick a square area of the image to be the logo."
-msgstr ""
+#: actions/grouplogo.php:236
+msgid "Upload"
+msgstr "Oplaai"
+
+#: actions/grouplogo.php:289
+msgid "Crop"
+msgstr "Uitsny"
+
+#: actions/grouplogo.php:365
+msgid "Pick a square area of the image to be the logo."
+msgstr ""

 
 #: actions/grouplogo.php:399
 msgid "Logo updated."
 
 #: actions/grouplogo.php:399
 msgid "Logo updated."


@@ -1596,35 +2439,63 @@ msgstr "Logo opgedateer."
 msgid "Failed updating logo."
 msgstr "Die opdatering van die logo het gefaal."
 
 msgid "Failed updating logo."
 msgstr "Die opdatering van die logo het gefaal."
 

-#: actions/groupmembers.php:100 lib/groupnav.php:92
+#. TRANS: Title of the page showing group members.
+#. TRANS: %s is the name of the group.
+#: actions/groupmembers.php:102

 #, php-format
 msgid "%s group members"
 msgstr "lede van die groep %s"
 
 #, php-format
 msgid "%s group members"
 msgstr "lede van die groep %s"
 

-#: actions/groupmembers.php:182 lib/groupnav.php:107
+#. TRANS: Title of the page showing group members.
+#. TRANS: %1$s is the name of the group, %2$d is the page number of the members list.
+#: actions/groupmembers.php:107
+#, fuzzy, php-format
+msgid "%1$s group members, page %2$d"
+msgstr "%1$s groepe, bladsy %2$d"
+
+#: actions/groupmembers.php:122
+#, fuzzy
+msgid "A list of the users in this group."
+msgstr "Blok hierdie gebruiker van hierdie groep"
+
+#: actions/groupmembers.php:186

 msgid "Admin"
 msgstr "Administrateur"
 
 msgid "Admin"
 msgstr "Administrateur"
 

-#: actions/groupmembers.php:392 lib/blockform.php:69
+#. TRANS: Button text for the form that will block a user from a group.
+#: actions/groupmembers.php:399
+msgctxt "BUTTON"

 msgid "Block"
 msgid "Block"

-msgstr "Blokkeer"
+msgstr ""
+
+#. TRANS: Submit button title.
+#: actions/groupmembers.php:403
+msgctxt "TOOLTIP"
+msgid "Block this user"
+msgstr ""
+
+#: actions/groupmembers.php:498
+#, fuzzy
+msgid "Make user an admin of the group"
+msgstr "U moet 'n administrateur wees alvorens u 'n groep kan wysig."

 
 

-#: actions/groupmembers.php:519
+#. TRANS: Button text for the form that will make a user administrator.
+#: actions/groupmembers.php:533
+msgctxt "BUTTON"

 msgid "Make Admin"
 msgid "Make Admin"

-msgstr "Maak Admin"
+msgstr ""

 
 

-#: actions/groupmembers.php:519
+#. TRANS: Submit button title.
+#: actions/groupmembers.php:537
+msgctxt "TOOLTIP"

 msgid "Make this user an admin"
 msgid "Make this user an admin"

-msgstr "Maak hierdie gebruiker 'n administrateur"
+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:69
-#, 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
+msgid "Updates from members of %1$s on %2$s!"
+msgstr "Opdaterings van %1$s op %2$s."

 
 #: actions/groups.php:62 lib/profileaction.php:223 lib/profileaction.php:249
 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
 
 #: actions/groups.php:62 lib/profileaction.php:223 lib/profileaction.php:249
 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98


@@ -1657,6 +2528,11 @@ msgid ""
 "Separate the terms by spaces; they must be 3 characters or more."
 msgstr ""
 
 "Separate the terms by spaces; they must be 3 characters or more."
 msgstr ""
 

+#: actions/groupsearch.php:58
+#, fuzzy
+msgid "Group search"
+msgstr "Soek gebruikers"
+

 #: actions/groupsearch.php:79 actions/noticesearch.php:117
 #: actions/peoplesearch.php:83
 msgid "No results."
 #: actions/groupsearch.php:79 actions/noticesearch.php:117
 #: actions/peoplesearch.php:83
 msgid "No results."


@@ -1676,11 +2552,19 @@ msgid ""
 "action.newgroup%%) yourself!"
 msgstr ""
 
 "action.newgroup%%) yourself!"
 msgstr ""
 

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

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

-#: actions/groupunblock.php:128 actions/unblock.php:86
+#. TRANS: Client error displayed when trying to unblock a non-blocked user from a group.
+#: actions/groupunblock.php:99
+#, fuzzy
+msgid "User is not blocked from group."
+msgstr "Gee gebruiker weer toegang tot die groep"
+
+#. TRANS: Server error displayed when unblocking a user from a group fails because of an unknown error.
+#: actions/groupunblock.php:131 actions/unblock.php:86

 msgid "Error removing the block."
 msgstr ""
 
 msgid "Error removing the block."
 msgstr ""
 


@@ -1710,6 +2594,11 @@ msgstr "IM is nie beskikbaar nie."
 msgid "IM address"
 msgstr "IP-adres"
 
 msgid "IM address"
 msgstr "IP-adres"
 

+#: actions/imsettings.php:113
+#, fuzzy
+msgid "Current confirmed Jabber/GTalk address."
+msgstr "Huidige bevestigde e-posadres."
+

 #. TRANS: Form note in IM settings form.
 #. TRANS: %s is the IM address set for the site.
 #: actions/imsettings.php:124
 #. TRANS: Form note in IM settings form.
 #. TRANS: %s is the IM address set for the site.
 #: actions/imsettings.php:124


@@ -1721,7 +2610,10 @@ msgstr ""
 
 #. TRANS: IM address input field instructions in IM settings form.
 #. TRANS: %s is the IM address set for the site.
 
 #. TRANS: IM address input field instructions in IM settings form.
 #. TRANS: %s is the IM address set for the site.

-#: actions/imsettings.php:140
+#. TRANS: Do not translate "example.org". It is one of the domain names reserved for use in examples by
+#. TRANS: http://www.rfc-editor.org/rfc/rfc2606.txt. Any other domain may be owned by a legitimate
+#. TRANS: person or organization.
+#: actions/imsettings.php:143

 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "


@@ -1729,63 +2621,63 @@ msgid ""
 msgstr ""
 
 #. TRANS: Form legend for IM preferences form.
 msgstr ""
 
 #. TRANS: Form legend for IM preferences form.

-#: actions/imsettings.php:155
+#: actions/imsettings.php:158

 msgid "IM preferences"
 msgstr "Voorkeure is gestoor."
 
 #. TRANS: Checkbox label in IM preferences form.
 msgid "IM preferences"
 msgstr "Voorkeure is gestoor."
 
 #. TRANS: Checkbox label in IM preferences form.

-#: actions/imsettings.php:160
+#: actions/imsettings.php:163

 msgid "Send me notices through Jabber/GTalk."
 msgstr ""
 
 #. TRANS: Checkbox label in IM preferences form.
 msgid "Send me notices through Jabber/GTalk."
 msgstr ""
 
 #. TRANS: Checkbox label in IM preferences form.

-#: actions/imsettings.php:166
+#: actions/imsettings.php:169

 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr ""
 
 #. TRANS: Checkbox label in IM preferences form.
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr ""
 
 #. TRANS: Checkbox label in IM preferences form.

-#: actions/imsettings.php:172
+#: actions/imsettings.php:175

 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr ""
 
 #. TRANS: Checkbox label in IM preferences form.
 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr ""
 
 #. TRANS: Checkbox label in IM preferences form.

-#: actions/imsettings.php:179
+#: actions/imsettings.php:182

 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr ""
 
 #. TRANS: Confirmation message for successful IM preferences save.
 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr ""
 
 #. TRANS: Confirmation message for successful IM preferences save.

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

 msgid "Preferences saved."
 msgstr "Voorkeure is gestoor."
 
 #. TRANS: Message given saving IM address without having provided one.
 msgid "Preferences saved."
 msgstr "Voorkeure is gestoor."
 
 #. TRANS: Message given saving IM address without having provided one.

-#: actions/imsettings.php:309
+#: actions/imsettings.php:312

 msgid "No Jabber ID."
 msgstr "Geen Jabber-ID nie."
 
 #. TRANS: Message given saving IM address that cannot be normalised.
 msgid "No Jabber ID."
 msgstr "Geen Jabber-ID nie."
 
 #. TRANS: Message given saving IM address that cannot be normalised.

-#: actions/imsettings.php:317
+#: actions/imsettings.php:320

 msgid "Cannot normalize that Jabber ID"
 msgstr "Dit was nie moontlik om die Jabber-ID te normaliseer nie"
 
 #. TRANS: Message given saving IM address that not valid.
 msgid "Cannot normalize that Jabber ID"
 msgstr "Dit was nie moontlik om die Jabber-ID te normaliseer nie"
 
 #. TRANS: Message given saving IM address that not valid.

-#: actions/imsettings.php:322
+#: actions/imsettings.php:325

 msgid "Not a valid Jabber ID"
 msgstr "Nie 'n geldige Jabber-ID nie"
 
 #. TRANS: Message given saving IM address that is already set.
 msgid "Not a valid Jabber ID"
 msgstr "Nie 'n geldige Jabber-ID nie"
 
 #. TRANS: Message given saving IM address that is already set.

-#: actions/imsettings.php:326
+#: actions/imsettings.php:329

 msgid "That is already your Jabber ID."
 msgstr "Dit is al reeds u Jabber-ID."
 
 #. TRANS: Message given saving IM address that is already set for another user.
 msgid "That is already your Jabber ID."
 msgstr "Dit is al reeds u Jabber-ID."
 
 #. TRANS: Message given saving IM address that is already set for another user.

-#: actions/imsettings.php:330
+#: actions/imsettings.php:333

 msgid "Jabber ID already belongs to another user."
 msgstr "Die Jabber-ID word reeds deur 'n ander gebruiker gebruik."
 
 #. TRANS: Message given saving valid IM address that is to be confirmed.
 #. TRANS: %s is the IM address set for the site.
 msgid "Jabber ID already belongs to another user."
 msgstr "Die Jabber-ID word reeds deur 'n ander gebruiker gebruik."
 
 #. TRANS: Message given saving valid IM address that is to be confirmed.
 #. TRANS: %s is the IM address set for the site.

-#: actions/imsettings.php:358
+#: actions/imsettings.php:361

 #, php-format
 msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
 #, php-format
 msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"


@@ -1793,105 +2685,167 @@ msgid ""
 msgstr ""
 
 #. TRANS: Message given canceling IM address confirmation for the wrong IM address.
 msgstr ""
 
 #. TRANS: Message given canceling IM address confirmation for the wrong IM address.

-#: actions/imsettings.php:388
+#: actions/imsettings.php:391

 msgid "That is the wrong IM address."
 msgstr "Dit is die verkeerde IM-adres."
 
 #. TRANS: Server error thrown on database error canceling IM address confirmation.
 msgid "That is the wrong IM address."
 msgstr "Dit is die verkeerde IM-adres."
 
 #. TRANS: Server error thrown on database error canceling IM address confirmation.

-#: actions/imsettings.php:397
+#: actions/imsettings.php:400

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

-#: actions/imsettings.php:402
+#: actions/imsettings.php:405

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

-#: actions/imsettings.php:424
+#: actions/imsettings.php:427

 msgid "That is not your Jabber ID."
 msgstr "Dit is nie u Jabber-ID nie."
 
 #. TRANS: Message given after successfully removing a registered IM address.
 msgid "That is not your Jabber ID."
 msgstr "Dit is nie u Jabber-ID nie."
 
 #. TRANS: Message given after successfully removing a registered IM address.

-#: actions/imsettings.php:447
+#: actions/imsettings.php:450

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

+#: actions/inbox.php:59
+#, fuzzy, php-format
+msgid "Inbox for %1$s - page %2$d"
+msgstr "%1$s, bladsy %2$d"
+
+#: actions/inbox.php:62
+#, fuzzy, php-format
+msgid "Inbox for %s"
+msgstr "Vriend van 'n vriend (FOAF) vir %s"
+

 #: actions/inbox.php:115
 msgid "This is your inbox, which lists your incoming private messages."
 msgstr ""
 
 #: actions/inbox.php:115
 msgid "This is your inbox, which lists your incoming private messages."
 msgstr ""
 

-#: actions/invite.php:39
+#. TRANS: Client error displayed when trying to sent invites while they have been disabled.
+#: actions/invite.php:40

 msgid "Invites have been disabled."
 msgstr ""
 
 msgid "Invites have been disabled."
 msgstr ""
 

-#: actions/invite.php:72
-#, php-format
-msgid "Invalid email address: %s"
+#. TRANS: Client error displayed when trying to sent invites while not logged in.
+#. TRANS: %s is the StatusNet site name.
+#: actions/invite.php:44
+#, fuzzy, php-format
+msgid "You must be logged in to invite other users to use %s."
+msgstr "U moet aanteken alvorens u by groep kan aansluit."
+
+#. TRANS: Form validation message when providing an e-mail address that does not validate.
+#. TRANS: %s is an invalid e-mail address.
+#: actions/invite.php:77
+#, fuzzy, php-format
+msgid "Invalid email address: %s."

 msgstr "Ongeldige e-posadres: %s"
 
 msgstr "Ongeldige e-posadres: %s"
 

-#: actions/invite.php:112
+#. TRANS: Page title when invitations have been sent.
+#: actions/invite.php:116
+#, fuzzy
+msgid "Invitations sent"
+msgstr "Uitnodigings"
+
+#. TRANS: Page title when inviting potential users.
+#: actions/invite.php:119

 msgid "Invite new users"
 msgstr "Nooi nuwe gebruikers"
 
 msgid "Invite new users"
 msgstr "Nooi nuwe gebruikers"
 

-#. TRANS: Whois output.
-#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:430
-#, php-format
+#. TRANS: Message displayed inviting users to use a StatusNet site while the inviting user
+#. TRANS: is already subscribed to one or more users with the given e-mail address(es).
+#. TRANS: Plural form is based on the number of reported already subscribed e-mail addresses.
+#. TRANS: Followed by a bullet list.
+#: actions/invite.php:139
+#, fuzzy
+msgid "You are already subscribed to this user:"
+msgid_plural "You are already subscribed to these users:"
+msgstr[0] "U volg hierdie gebruiker:"
+msgstr[1] "U volg hierdie gebruiker:"
+
+#. TRANS: Used as list item for already subscribed users (%1$s is nickname, %2$s is e-mail address).
+#. TRANS: Used as list item for already registered people (%1$s is nickname, %2$s is e-mail address).
+#: actions/invite.php:145 actions/invite.php:159
+#, fuzzy, php-format
+msgctxt "INVITE"

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

-#: actions/invite.php:136
-msgid ""
+#. TRANS: Message displayed inviting users to use a StatusNet site while the invited user
+#. TRANS: already uses a this StatusNet site. Plural form is based on the number of
+#. TRANS: reported already present people. Followed by a bullet list.
+#: actions/invite.php:153
+msgid "This person is already a user and you were automatically subscribed:"
+msgid_plural ""

 "These people are already users and you were automatically subscribed to them:"
 "These people are already users and you were automatically subscribed to them:"

-msgstr ""
-
-#: actions/invite.php:144
-msgid "Invitation(s) sent to the following people:"
-msgstr ""
-
-#: actions/invite.php:150
+msgstr[0] ""
+msgstr[1] ""
+
+#. TRANS: Message displayed inviting users to use a StatusNet site. Plural form is
+#. TRANS: based on the number of invitations sent. Followed by a bullet list of
+#. TRANS: e-mail addresses to which invitations were sent.
+#: actions/invite.php:167
+msgid "Invitation sent to the following person:"
+msgid_plural "Invitations sent to the following people:"
+msgstr[0] ""
+msgstr[1] ""
+
+#. TRANS: Generic message displayed after sending out one or more invitations to
+#. TRANS: people to join a StatusNet site.
+#: actions/invite.php:177

 msgid ""
 "You will be notified when your invitees accept the invitation and register "
 "on the site. Thanks for growing the community!"
 msgstr ""
 
 msgid ""
 "You will be notified when your invitees accept the invitation and register "
 "on the site. Thanks for growing the community!"
 msgstr ""
 

-#: actions/invite.php:162
+#. TRANS: Form instructions.
+#: actions/invite.php:190

 msgid ""
 "Use this form to invite your friends and colleagues to use this service."
 msgstr ""
 
 msgid ""
 "Use this form to invite your friends and colleagues to use this service."
 msgstr ""
 

-#: actions/invite.php:187
+#. TRANS: Field label for a list of e-mail addresses.
+#: actions/invite.php:217

 msgid "Email addresses"
 msgstr "E-posadresse"
 
 msgid "Email addresses"
 msgstr "E-posadresse"
 

-#: actions/invite.php:189
+#. TRANS: Tooltip for field label for a list of e-mail addresses.
+#: actions/invite.php:220

 msgid "Addresses of friends to invite (one per line)"
 msgstr ""
 
 msgid "Addresses of friends to invite (one per line)"
 msgstr ""
 

-#: actions/invite.php:192
+#. TRANS: Field label for a personal message to send to invitees.
+#: actions/invite.php:224

 msgid "Personal message"
 msgstr "Persoonlike boodskap"
 
 msgid "Personal message"
 msgstr "Persoonlike boodskap"
 

-#: actions/invite.php:194
+#. TRANS: Tooltip for field label for a personal message to send to invitees.
+#: actions/invite.php:227

 msgid "Optionally add a personal message to the invitation."
 msgstr ""
 
 #. TRANS: Send button for inviting friends
 msgid "Optionally add a personal message to the invitation."
 msgstr ""
 
 #. TRANS: Send button for inviting friends

-#: actions/invite.php:198
+#: actions/invite.php:231

 msgctxt "BUTTON"
 msgid "Send"
 msgstr "Stuur"
 
 msgctxt "BUTTON"
 msgid "Send"
 msgstr "Stuur"
 

-#. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English.
-#: actions/invite.php:228
+#. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral
+#. TRANS: singular 3rd-person pronoun in English. %1$s is the inviting user, $2$s is
+#. TRANS: the StatusNet sitename.
+#: actions/invite.php:263

 #, php-format
 msgid "%1$s has invited you to join them on %2$s"
 msgstr ""
 
 #, php-format
 msgid "%1$s has invited you to join them on %2$s"
 msgstr ""
 

-#. TRANS: Body text for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English.
-#: actions/invite.php:231
+#. TRANS: Body text for invitation email. Note that 'them' is correct as a gender-neutral
+#. TRANS: singular 3rd-person pronoun in English. %1$s is the inviting user, %2$s is the
+#. TRANS: StatusNet sitename, %3$s is the site URL, %4$s is the personal message from the
+#. TRANS: inviting user, %s%5 a link to the timeline for the inviting user, %s$6 is a link
+#. TRANS: to register with the StatusNet site.
+#: actions/invite.php:270

 #, php-format
 msgid ""
 "%1$s has invited you to join them on %2$s (%3$s).\n"
 #, php-format
 msgid ""
 "%1$s has invited you to join them on %2$s (%3$s).\n"


@@ -1926,10 +2880,6 @@ msgstr ""
 msgid "You must be logged in to join a group."
 msgstr "U moet aanteken alvorens u by groep kan aansluit."
 
 msgid "You must be logged in to join a group."
 msgstr "U moet aanteken alvorens u by groep kan aansluit."
 

-#: actions/joingroup.php:88 actions/leavegroup.php:88
-msgid "No nickname or ID."
-msgstr "Geen gebruikersnaam of ID nie."
-

 #: actions/joingroup.php:141
 #, php-format
 msgid "%1$s joined group %2$s"
 #: actions/joingroup.php:141
 #, php-format
 msgid "%1$s joined group %2$s"


@@ -1940,7 +2890,7 @@ msgid "You must be logged in to leave a group."
 msgstr "U moet aanteken alvorens u 'n groep kan verlaat."
 
 #. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
 msgstr "U moet aanteken alvorens u 'n groep kan verlaat."
 
 #. TRANS: Error text shown when trying to leave an existing group the user is not a member of.

-#: actions/leavegroup.php:100 lib/command.php:389
+#: actions/leavegroup.php:100 lib/command.php:386

 msgid "You are not a member of that group."
 msgstr "U is nie 'n lid van daardie groep nie."
 
 msgid "You are not a member of that group."
 msgstr "U is nie 'n lid van daardie groep nie."
 


@@ -1949,6 +2899,111 @@ msgstr "U is nie 'n lid van daardie groep nie."
 msgid "%1$s left group %2$s"
 msgstr "%1$s het die groep %2$s verlaat"
 
 msgid "%1$s left group %2$s"
 msgstr "%1$s het die groep %2$s verlaat"
 

+#. TRANS: User admin panel title
+#: actions/licenseadminpanel.php:56
+msgctxt "TITLE"
+msgid "License"
+msgstr ""
+
+#: actions/licenseadminpanel.php:67
+msgid "License for this StatusNet site"
+msgstr ""
+
+#: actions/licenseadminpanel.php:139
+msgid "Invalid license selection."
+msgstr ""
+
+#: actions/licenseadminpanel.php:149
+msgid ""
+"You must specify the owner of the content when using the All Rights Reserved "
+"license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:156
+#, fuzzy
+msgid "Invalid license title. Maximum length is 255 characters."
+msgstr "Ligging is te lank is (maksimum 255 karakters)."
+
+#: actions/licenseadminpanel.php:168
+msgid "Invalid license URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:171
+msgid "Invalid license image URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:179
+msgid "License URL must be blank or a valid URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:187
+msgid "License image must be blank or valid URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:239
+msgid "License selection"
+msgstr ""
+
+#: actions/licenseadminpanel.php:245
+msgid "Private"
+msgstr "Privaat"
+
+#: actions/licenseadminpanel.php:246
+msgid "All Rights Reserved"
+msgstr ""
+
+#: actions/licenseadminpanel.php:247
+msgid "Creative Commons"
+msgstr ""
+
+#: actions/licenseadminpanel.php:252
+msgid "Type"
+msgstr ""
+
+#: actions/licenseadminpanel.php:254
+msgid "Select license"
+msgstr ""
+
+#: actions/licenseadminpanel.php:268
+msgid "License details"
+msgstr ""
+
+#: actions/licenseadminpanel.php:274
+msgid "Owner"
+msgstr ""
+
+#: actions/licenseadminpanel.php:275
+msgid "Name of the owner of the site's content (if applicable)."
+msgstr ""
+
+#: actions/licenseadminpanel.php:283
+msgid "License Title"
+msgstr ""
+
+#: actions/licenseadminpanel.php:284
+msgid "The title of the license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:292
+msgid "License URL"
+msgstr ""
+
+#: actions/licenseadminpanel.php:293
+msgid "URL for more information about the license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:300
+msgid "License Image URL"
+msgstr ""
+
+#: actions/licenseadminpanel.php:301
+msgid "URL for an image to display with the license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:319
+msgid "Save license settings"
+msgstr ""
+

 #: actions/login.php:102 actions/otp.php:62 actions/register.php:144
 msgid "Already logged in."
 msgstr "U is reeds aangeteken."
 #: actions/login.php:102 actions/otp.php:62 actions/register.php:144
 msgid "Already logged in."
 msgstr "U is reeds aangeteken."


@@ -1969,11 +3024,11 @@ msgstr "Aanteken"
 msgid "Login to site"
 msgstr "Teken aan"
 
 msgid "Login to site"
 msgstr "Teken aan"
 

-#: actions/login.php:258 actions/register.php:485
+#: 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:487
+#: 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 ""
 


@@ -1987,6 +3042,11 @@ msgid ""
 "changing your settings."
 msgstr ""
 
 "changing your settings."
 msgstr ""
 

+#: actions/login.php:292
+#, fuzzy
+msgid "Login with your username and password."
+msgstr "Verkeerde gebruikersnaam of wagwoord."
+

 #: actions/login.php:295
 #, php-format
 msgid ""
 #: actions/login.php:295
 #, php-format
 msgid ""


@@ -1997,6 +3057,11 @@ msgstr ""
 msgid "Only an admin can make another user an admin."
 msgstr ""
 
 msgid "Only an admin can make another user an admin."
 msgstr ""
 

+#: actions/makeadmin.php:96
+#, fuzzy, php-format
+msgid "%1$s is already an admin for group \"%2$s\"."
+msgstr "%1$s het die groep %2$s verlaat"
+

 #: actions/makeadmin.php:133
 #, php-format
 msgid "Can't get membership record for %1$s in group %2$s."
 #: actions/makeadmin.php:133
 #, php-format
 msgid "Can't get membership record for %1$s in group %2$s."


@@ -2011,56 +3076,93 @@ msgstr ""
 msgid "No current status."
 msgstr "Geen resultate nie."
 
 msgid "No current status."
 msgstr "Geen resultate nie."
 

+#. TRANS: This is the title of the form for adding a new application.

 #: actions/newapplication.php:52
 #: actions/newapplication.php:52

-msgid "New Application"
+#, fuzzy
+msgid "New application"

 msgstr "Nuwe appplikasie"
 
 msgstr "Nuwe appplikasie"
 

-#: actions/newapplication.php:176
+#. TRANS: Client error displayed trying to add a new application while not logged in.
+#: actions/newapplication.php:65
+#, fuzzy
+msgid "You must be logged in to register an application."
+msgstr "U moet aangeteken wees alvorens u 'n applikasie kan wysig."
+
+#: actions/newapplication.php:147
+#, fuzzy
+msgid "Use this form to register a new application."
+msgstr "Gebruik die vorm om u applikasie te wysig."
+
+#: actions/newapplication.php:184

 msgid "Source URL is required."
 msgstr "'n Bron-URL is verpligtend."
 
 msgid "Source URL is required."
 msgstr "'n Bron-URL is verpligtend."
 

-#: actions/newapplication.php:258 actions/newapplication.php:267
+#: actions/newapplication.php:266 actions/newapplication.php:275

 msgid "Could not create application."
 msgstr "Dit was nie moontlik om die applikasie te skep nie."
 
 msgid "Could not create application."
 msgstr "Dit was nie moontlik om die applikasie te skep nie."
 

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

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

-#: actions/newmessage.php:71 actions/newmessage.php:231
+#. TRANS: Form instructions for group create form.
+#: actions/newgroup.php:110
+#, fuzzy
+msgid "Use this form to create a new group."
+msgstr "Gebruik hierdie vorm om die groep te wysig."
+
+#: actions/newmessage.php:71 actions/newmessage.php:234

 msgid "New message"
 msgstr "Nuwe boodskap"
 
 #. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
 msgid "New message"
 msgstr "Nuwe boodskap"
 
 #. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).

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

 msgid "You can't send a message to this user."
 msgstr "U kan nie 'n boodskap aan hierdie gebruiker stuur nie."
 
 #. TRANS: Command exception text shown when trying to send a direct message to another user without content.
 #. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
 msgid "You can't send a message to this user."
 msgstr "U kan nie 'n boodskap aan hierdie gebruiker stuur nie."
 
 #. TRANS: Command exception text shown when trying to send a direct message to another user without content.
 #. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.

-#: actions/newmessage.php:144 actions/newnotice.php:138 lib/command.php:481
-#: lib/command.php:582
+#: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:478
+#: lib/command.php:581

 msgid "No content!"
 msgstr "Geen inhoud nie!"
 
 msgid "No content!"
 msgstr "Geen inhoud nie!"
 

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

 msgid "No recipient specified."
 msgstr "Geen ontvanger gespesifiseer nie."
 
 #. TRANS: Error text shown when trying to send a direct message to self.
 msgid "No recipient specified."
 msgstr "Geen ontvanger gespesifiseer nie."
 
 #. TRANS: Error text shown when trying to send a direct message to self.

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

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

-#: actions/newmessage.php:181
+#: actions/newmessage.php:184

 msgid "Message sent"
 msgstr "Boodskap is gestuur."
 
 msgid "Message sent"
 msgstr "Boodskap is gestuur."
 

-#: actions/newmessage.php:210 actions/newnotice.php:261 lib/channel.php:189
+#. TRANS: Message given have sent a direct message to another user.
+#. TRANS: %s is the name of the other user.
+#: actions/newmessage.php:188 lib/command.php:513
+#, fuzzy, php-format
+msgid "Direct message to %s sent."
+msgstr "Direkte boodskappe aan %s"
+
+#: actions/newmessage.php:213 actions/newnotice.php:264

 msgid "Ajax Error"
 msgstr "Ajax-fout"
 
 msgid "Ajax Error"
 msgstr "Ajax-fout"
 

+#: actions/newnotice.php:69
+#, fuzzy
+msgid "New notice"
+msgstr "Geen kennisgewing."
+
+#: actions/newnotice.php:230
+#, fuzzy
+msgid "Notice posted"
+msgstr "Hierdie kennisgewing is verwyder."
+

 #: actions/noticesearch.php:68
 #, php-format
 msgid ""
 #: actions/noticesearch.php:68
 #, php-format
 msgid ""


@@ -2072,6 +3174,11 @@ msgstr ""
 msgid "Text search"
 msgstr "Teks soektog"
 
 msgid "Text search"
 msgstr "Teks soektog"
 

+#: actions/noticesearch.php:91
+#, fuzzy, php-format
+msgid "Search results for \"%1$s\" on %2$s"
+msgstr "Opdaterings van %1$s op %2$s."
+

 #: actions/noticesearch.php:121
 #, php-format
 msgid ""
 #: actions/noticesearch.php:121
 #, php-format
 msgid ""


@@ -2091,9 +3198,15 @@ msgstr ""
 msgid "Updates with \"%s\""
 msgstr "Opdaterings met \"%s\""
 
 msgid "Updates with \"%s\""
 msgstr "Opdaterings met \"%s\""
 

+#: actions/noticesearchrss.php:98
+#, fuzzy, php-format
+msgid "Updates matching search term \"%1$s\" on %2$s!"
+msgstr "Opdaterings van %1$s op %2$s."
+

 #: actions/nudge.php:85
 msgid ""
 #: actions/nudge.php:85
 msgid ""

-"This user doesn't allow nudges or hasn't confirmed or set their email yet."
+"This user doesn't allow nudges or hasn't confirmed or set their email "
+"address yet."

 msgstr ""
 
 #: actions/nudge.php:94
 msgstr ""
 
 #: actions/nudge.php:94


@@ -2104,72 +3217,193 @@ msgstr "Die por is gestuur"
 msgid "Nudge sent!"
 msgstr "Die por is gestuur!"
 
 msgid "Nudge sent!"
 msgstr "Die por is gestuur!"
 

-#: actions/oauthappssettings.php:85
+#. TRANS: Message displayed to an anonymous user trying to view OAuth application list.
+#: actions/oauthappssettings.php:60
+#, fuzzy
+msgid "You must be logged in to list your applications."
+msgstr "U moet aangeteken wees alvorens u 'n applikasie kan wysig."
+
+#. TRANS: Page title for OAuth applications
+#: actions/oauthappssettings.php:76
+#, fuzzy
+msgid "OAuth applications"
+msgstr "Die applikasie bestaan nie."
+
+#. TRANS: Page instructions for OAuth applications
+#: actions/oauthappssettings.php:88

 msgid "Applications you have registered"
 msgstr ""
 
 msgid "Applications you have registered"
 msgstr ""
 

+#. TRANS: Empty list message on page with OAuth applications.
+#: actions/oauthappssettings.php:141
+#, fuzzy, php-format
+msgid "You have not registered any applications yet."
+msgstr "Dit was nie moontlik om die applikasie te skep nie."
+
+#. TRANS: Title for OAuth connection settings.
+#: actions/oauthconnectionssettings.php:71
+#, fuzzy
+msgid "Connected applications"
+msgstr "Skrap applikasie"
+
+#. TRANS: Instructions for OAuth connection settings.

 #: actions/oauthconnectionssettings.php:83
 #: actions/oauthconnectionssettings.php:83

-msgid "You have allowed the following applications to access you account."
+msgid "The following connections exist for your account."

 msgstr ""
 
 msgstr ""
 

-#: actions/oauthconnectionssettings.php:186
+#. TRANS: Client error when trying to revoke access for an application while not being a user of it.
+#: actions/oauthconnectionssettings.php:168
+#, fuzzy
+msgid "You are not a user of that application."
+msgstr "U is nie die eienaar van hierdie applikasie nie."
+
+#. TRANS: Client error when revoking access has failed for some reason.
+#. TRANS: %s is the application ID revoking access failed for.
+#: actions/oauthconnectionssettings.php:183
+#, fuzzy, php-format
+msgid "Unable to revoke access for application: %s."
+msgstr "Gebruik die vorm om u applikasie te wysig."
+
+#. TRANS: Success message after revoking access for an application.
+#. TRANS: %1$s is the application name, %2$s is the first part of the user token.
+#: actions/oauthconnectionssettings.php:202

 #, php-format
 #, php-format

-msgid "Unable to revoke access for app: %s."
+msgid ""
+"You have successfully revoked access for %1$s and the access token starting "
+"with %2$s."

 msgstr ""
 
 msgstr ""
 

-#: actions/oauthconnectionssettings.php:198
+#. TRANS: Empty list message when no applications have been authorised yet.
+#: actions/oauthconnectionssettings.php:213

 msgid "You have not authorized any applications to use your account."
 msgstr ""
 
 msgid "You have not authorized any applications to use your account."
 msgstr ""
 

-#: actions/oauthconnectionssettings.php:211
-msgid "Developers can edit the registration settings for their applications "
+#. TRANS: Note for developers in the OAuth connection settings form.
+#. TRANS: This message contains a Markdown link. Do not separate "](".
+#. TRANS: %s is the URL to the OAuth settings.
+#: actions/oauthconnectionssettings.php:233
+#, php-format
+msgid ""
+"Are you a developer? [Register an OAuth client application](%s) to use with "
+"this instance of StatusNet."

 msgstr ""
 
 msgstr ""
 

-#: actions/oembed.php:87 actions/shownotice.php:175
+#: actions/oembed.php:80 actions/shownotice.php:100
+#, fuzzy
+msgid "Notice has no profile."
+msgstr "Hierdie gebruiker het nie 'n profiel nie."
+
+#: actions/oembed.php:83 actions/shownotice.php:172

 #, php-format
 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')
 #, php-format
 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')

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

 #, php-format
 msgid "Only %s URLs over plain HTTP please."
 msgstr ""
 
 #, 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: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."
+

 #: actions/opensearch.php:64
 msgid "People Search"
 msgstr "Mense soek"
 
 #: actions/opensearch.php:64
 msgid "People Search"
 msgstr "Mense soek"
 

+#: actions/opensearch.php:67
+#, fuzzy
+msgid "Notice Search"
+msgstr "Mense soek"
+
+#: actions/othersettings.php:59
+#, fuzzy
+msgid "Other settings"
+msgstr "Avatar-instellings"
+
+#. TRANS: Instructions for tab "Other" in user profile settings.

 #: actions/othersettings.php:71
 msgid "Manage various other options."
 msgstr ""
 
 #: actions/othersettings.php:71
 msgid "Manage various other options."
 msgstr ""
 

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

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

-msgstr "(gratis diens)"
+msgstr " (gratis diens)"

 
 

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

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

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

 msgid "Automatic shortening service to use."
 msgstr ""
 
 msgid "Automatic shortening service to use."
 msgstr ""
 

-#: actions/othersettings.php:123
+#. TRANS: Label for checkbox.
+#: actions/othersettings.php:128
+#, fuzzy
+msgid "View profile designs"
+msgstr "Wysig profiel-instellings"
+
+#. TRANS: Tooltip for checkbox.
+#: actions/othersettings.php:130

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

+#. TRANS: Form validation error for form "Other settings" in user profile.
+#: actions/othersettings.php:162
+#, fuzzy
+msgid "URL shortening service is too long (maximum 50 characters)."
+msgstr "Ligging is te lank is (maksimum 255 karakters)."
+
+#: actions/otp.php:69
+#, fuzzy
+msgid "No user ID specified."
+msgstr "Geen groep verskaf nie."
+
+#: actions/otp.php:83
+#, fuzzy
+msgid "No login token specified."
+msgstr "Geen profiel verskaf nie."
+

 #: actions/otp.php:90
 msgid "No login token requested."
 msgstr ""
 
 #: actions/otp.php:90
 msgid "No login token requested."
 msgstr ""
 

+#: actions/otp.php:95
+#, fuzzy
+msgid "Invalid login token specified."
+msgstr "Ongeldige token."
+
+#: actions/otp.php:104
+#, fuzzy
+msgid "Login token expired."
+msgstr "Teken aan"
+
+#: actions/outbox.php:58
+#, fuzzy, php-format
+msgid "Outbox for %1$s - page %2$d"
+msgstr "%1$s, bladsy %2$d"
+
+#: actions/outbox.php:61
+#, fuzzy, php-format
+msgid "Outbox for %s"
+msgstr "Vriend van 'n vriend (FOAF) vir %s"
+

 #: actions/outbox.php:116
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr ""
 #: actions/outbox.php:116
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr ""


@@ -2199,7 +3433,7 @@ msgid "6 or more characters"
 msgstr "6 of meer karakters"
 
 #: actions/passwordsettings.php:112 actions/recoverpassword.php:239
 msgstr "6 of meer karakters"
 
 #: actions/passwordsettings.php:112 actions/recoverpassword.php:239

-#: actions/register.php:440
+#: actions/register.php:441

 msgid "Confirm"
 msgstr "Bevestig"
 
 msgid "Confirm"
 msgstr "Bevestig"
 


@@ -2211,11 +3445,11 @@ msgstr "Dieselfde as wagwoord hierbo"
 msgid "Change"
 msgstr "Wysig"
 
 msgid "Change"
 msgstr "Wysig"
 

-#: actions/passwordsettings.php:154 actions/register.php:237
+#: 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:240
+#: 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."
 


@@ -2235,146 +3469,289 @@ msgstr "Kon nie nuwe wagwoord stoor nie."
 msgid "Password saved."
 msgstr "Wagwoord gestoor."
 
 msgid "Password saved."
 msgstr "Wagwoord gestoor."
 

+#. TRANS: Title for Paths admin panel.

 #. TRANS: Menu item for site administration
 #. TRANS: Menu item for site administration

-#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:384
+#: actions/pathsadminpanel.php:58 lib/adminpanelaction.php:371

 msgid "Paths"
 msgstr "Paaie"
 
 msgid "Paths"
 msgstr "Paaie"
 

-#: actions/pathsadminpanel.php:70
-msgid "Path and server settings for this StatusNet site."
+#. TRANS: Form instructions for Path admin panel.
+#: actions/pathsadminpanel.php:69
+msgid "Path and server settings for this StatusNet site"

 msgstr ""
 
 msgstr ""
 

-#: actions/pathsadminpanel.php:157
+#. TRANS: Client error in Paths admin panel.
+#. TRANS: %s is the directory that could not be read from.
+#: actions/pathsadminpanel.php:155

 #, php-format
 msgid "Theme directory not readable: %s."
 msgstr "Tema-gids"
 
 #, php-format
 msgid "Theme directory not readable: %s."
 msgstr "Tema-gids"
 

+#. TRANS: Client error in Paths admin panel.
+#. TRANS: %s is the avatar directory that could not be written to.

 #: actions/pathsadminpanel.php:163
 #, php-format
 msgid "Avatar directory not writable: %s."
 msgstr "Tema-gids"
 
 #: actions/pathsadminpanel.php:163
 #, php-format
 msgid "Avatar directory not writable: %s."
 msgstr "Tema-gids"
 

-#: actions/pathsadminpanel.php:169
+#. TRANS: Client error in Paths admin panel.
+#. TRANS: %s is the background directory that could not be written to.
+#: actions/pathsadminpanel.php:171

 #, php-format
 msgid "Background directory not writable: %s."
 msgstr "Tema-gids"
 
 #, php-format
 msgid "Background directory not writable: %s."
 msgstr "Tema-gids"
 

-#: actions/pathsadminpanel.php:183
+#. TRANS: Client error in Paths admin panel.
+#. TRANS: %s is the locales directory that could not be read from.
+#: actions/pathsadminpanel.php:181
+#, fuzzy, php-format
+msgid "Locales directory not readable: %s."
+msgstr "Tema-gids"
+
+#. TRANS: Client error in Paths admin panel.
+#. TRANS: %s is the SSL server URL that is too long.
+#: actions/pathsadminpanel.php:189

 msgid "Invalid SSL server. The maximum length is 255 characters."
 msgstr ""
 
 msgid "Invalid SSL server. The maximum length is 255 characters."
 msgstr ""
 

-#: actions/pathsadminpanel.php:234 actions/siteadminpanel.php:58
+#. TRANS: Fieldset legend in Paths admin panel.
+#: actions/pathsadminpanel.php:235 actions/siteadminpanel.php:58

 msgid "Site"
 msgstr "Webtuiste"
 
 msgid "Site"
 msgstr "Webtuiste"
 

-#: actions/pathsadminpanel.php:238
+#. TRANS: Field label in Paths admin panel.
+#: actions/pathsadminpanel.php:241 actions/pathsadminpanel.php:279
+#: actions/pathsadminpanel.php:370 actions/pathsadminpanel.php:425

 msgid "Server"
 msgstr "Bediener"
 
 msgid "Server"
 msgstr "Bediener"
 

-#: actions/pathsadminpanel.php:238
+#: actions/pathsadminpanel.php:242

 msgid "Site's server hostname."
 msgstr ""
 
 msgid "Site's server hostname."
 msgstr ""
 

-#: actions/pathsadminpanel.php:242
+#. TRANS: Field label in Paths admin panel.
+#: actions/pathsadminpanel.php:248 actions/pathsadminpanel.php:288
+#: actions/pathsadminpanel.php:379 actions/pathsadminpanel.php:434

 msgid "Path"
 msgstr "Pad"
 
 msgid "Path"
 msgstr "Pad"
 

-#: actions/pathsadminpanel.php:246
-msgid "Path to locales"
-msgstr ""
+#: actions/pathsadminpanel.php:249
+#, fuzzy
+msgid "Site path."
+msgstr "Werf se tema"
+
+#. TRANS: Field label in Paths admin panel.
+#: actions/pathsadminpanel.php:255
+#, fuzzy
+msgid "Locale directory"
+msgstr "Tema-gids"

 
 

-#: actions/pathsadminpanel.php:246
-msgid "Directory path to locales"
+#: actions/pathsadminpanel.php:256
+msgid "Directory path to locales."

 msgstr ""
 
 msgstr ""
 

-#: actions/pathsadminpanel.php:250
+#. TRANS: Checkbox label in Paths admin panel.
+#: actions/pathsadminpanel.php:263

 msgid "Fancy URLs"
 msgstr ""
 
 msgid "Fancy URLs"
 msgstr ""
 

-#: actions/pathsadminpanel.php:252
+#: actions/pathsadminpanel.php:265

 msgid "Use fancy (more readable and memorable) URLs?"
 msgstr ""
 
 msgid "Use fancy (more readable and memorable) URLs?"
 msgstr ""
 

-#: actions/pathsadminpanel.php:259
+#: actions/pathsadminpanel.php:272

 msgid "Theme"
 msgstr "Tema"
 
 msgid "Theme"
 msgstr "Tema"
 

-#: actions/pathsadminpanel.php:264
-msgid "Theme server"
-msgstr "Tema-bediener"
+#. TRANS: Tooltip for field label in Paths admin panel.
+#: actions/pathsadminpanel.php:281
+#, fuzzy
+msgid "Server for themes."
+msgstr "Tema vir die werf."

 
 

-#: actions/pathsadminpanel.php:268
-msgid "Theme path"
-msgstr "Tema-pad"
+#. TRANS: Tooltip for field label in Paths admin panel.
+#: actions/pathsadminpanel.php:290
+msgid "Web path to themes."
+msgstr ""

 
 

-#: actions/pathsadminpanel.php:272
-msgid "Theme directory"
+#. TRANS: Field label in Paths admin panel.
+#: actions/pathsadminpanel.php:297 actions/pathsadminpanel.php:388
+#: actions/pathsadminpanel.php:443 actions/pathsadminpanel.php:495
+msgid "SSL server"
+msgstr "SSL-bediener"
+
+#. TRANS: Tooltip for field label in Paths admin panel.
+#: actions/pathsadminpanel.php:299
+msgid "SSL server for themes (default: SSL server)."
+msgstr ""
+
+#. TRANS: Field label in Paths admin panel.
+#: actions/pathsadminpanel.php:306 actions/pathsadminpanel.php:397
+#: actions/pathsadminpanel.php:452
+#, fuzzy
+msgid "SSL path"
+msgstr "Werf se tema"
+
+#. TRANS: Tooltip for field label in Paths admin panel.
+#: actions/pathsadminpanel.php:308
+msgid "SSL path to themes (default: /theme/)."
+msgstr ""
+
+#. TRANS: Field label in Paths admin panel.
+#: actions/pathsadminpanel.php:315 actions/pathsadminpanel.php:406
+#: actions/pathsadminpanel.php:461
+#, fuzzy
+msgid "Directory"

 msgstr "Tema-gids"
 
 msgstr "Tema-gids"
 

-#: actions/pathsadminpanel.php:279
+#. TRANS: Tooltip for field label in Paths admin panel.
+#: actions/pathsadminpanel.php:317
+msgid "Directory where themes are located."
+msgstr ""
+
+#. TRANS: Fieldset legend in Paths admin panel.
+#: actions/pathsadminpanel.php:326

 msgid "Avatars"
 msgstr "Avatars"
 
 msgid "Avatars"
 msgstr "Avatars"
 

-#: actions/pathsadminpanel.php:284
+#. TRANS: Field label in Paths admin panel.
+#: actions/pathsadminpanel.php:333

 msgid "Avatar server"
 msgstr "Avatar-bediener"
 
 msgid "Avatar server"
 msgstr "Avatar-bediener"
 

-#: actions/pathsadminpanel.php:288
+#. TRANS: Tooltip for field label in Paths admin panel.
+#: actions/pathsadminpanel.php:335
+#, fuzzy
+msgid "Server for avatars."
+msgstr "Tema vir die werf."
+
+#. TRANS: Field label in Paths admin panel.
+#: actions/pathsadminpanel.php:342

 msgid "Avatar path"
 msgstr "Avatar-pad"
 
 msgid "Avatar path"
 msgstr "Avatar-pad"
 

-#: actions/pathsadminpanel.php:292
+#. TRANS: Tooltip for field label in Paths admin panel.
+#: actions/pathsadminpanel.php:344
+#, fuzzy
+msgid "Web path to avatars."
+msgstr "Die opdatering van die avatar het gefaal."
+
+#. TRANS: Field label in Paths admin panel.
+#: actions/pathsadminpanel.php:351

 msgid "Avatar directory"
 msgstr "Avatar-gids"
 
 msgid "Avatar directory"
 msgstr "Avatar-gids"
 

-#: actions/pathsadminpanel.php:301
+#. TRANS: Tooltip for field label in Paths admin panel.
+#: actions/pathsadminpanel.php:353
+msgid "Directory where avatars are located."
+msgstr ""
+
+#. TRANS: Fieldset legend in Paths admin panel.
+#: actions/pathsadminpanel.php:364

 msgid "Backgrounds"
 msgstr "Agtergronde"
 
 msgid "Backgrounds"
 msgstr "Agtergronde"
 

-#: actions/pathsadminpanel.php:305
-msgid "Background server"
-msgstr "Agtergrond-bediener"
+#. TRANS: Tooltip for field label in Paths admin panel.
+#: actions/pathsadminpanel.php:372
+#, fuzzy
+msgid "Server for backgrounds."
+msgstr "Tema vir die werf."
+
+#. TRANS: Tooltip for field label in Paths admin panel.
+#: actions/pathsadminpanel.php:381
+msgid "Web path to backgrounds."
+msgstr ""
+
+#. TRANS: Tooltip for field label in Paths admin panel.
+#: actions/pathsadminpanel.php:390
+msgid "Server for backgrounds on SSL pages."
+msgstr ""
+
+#. TRANS: Tooltip for field label in Paths admin panel.
+#: actions/pathsadminpanel.php:399
+msgid "Web path to backgrounds on SSL pages."
+msgstr ""
+
+#. TRANS: Tooltip for field label in Paths admin panel.
+#: actions/pathsadminpanel.php:408
+msgid "Directory where backgrounds are located."
+msgstr ""
+
+#. TRANS: Fieldset legens in Paths admin panel.
+#. TRANS: DT element label in attachment list.
+#: actions/pathsadminpanel.php:419 lib/attachmentlist.php:99
+msgid "Attachments"
+msgstr "Aanhangsels"
+
+#. TRANS: Tooltip for field label in Paths admin panel.
+#: actions/pathsadminpanel.php:427
+#, fuzzy
+msgid "Server for attachments."
+msgstr "Tema vir die werf."
+
+#. TRANS: Tooltip for field label in Paths admin panel.
+#: actions/pathsadminpanel.php:436
+#, fuzzy
+msgid "Web path to attachments."
+msgstr "Geen aanhangsels."

 
 

-#: actions/pathsadminpanel.php:309
-msgid "Background path"
-msgstr "Agtergrond-pad"
+#. TRANS: Tooltip for field label in Paths admin panel.
+#: actions/pathsadminpanel.php:445
+#, fuzzy
+msgid "Server for attachments on SSL pages."
+msgstr "Tema vir die werf."

 
 

-#: actions/pathsadminpanel.php:313
-msgid "Background directory"
-msgstr "Agtergrond-gids"
+#. TRANS: Tooltip for field label in Paths admin panel.
+#: actions/pathsadminpanel.php:454
+msgid "Web path to attachments on SSL pages."
+msgstr ""

 
 

-#: actions/pathsadminpanel.php:320
+#. TRANS: Tooltip for field label in Paths admin panel.
+#: actions/pathsadminpanel.php:463
+msgid "Directory where attachments are located."
+msgstr ""
+
+#. TRANS: Fieldset legend in Paths admin panel.
+#: actions/pathsadminpanel.php:472

 msgid "SSL"
 msgstr "SSL"
 
 msgid "SSL"
 msgstr "SSL"
 

-#: actions/pathsadminpanel.php:323 actions/snapshotadminpanel.php:202
+#. TRANS: Drop down option in Paths admin panel (option for "When to use SSL").
+#: actions/pathsadminpanel.php:477 actions/snapshotadminpanel.php:202

 msgid "Never"
 msgstr "Nooit"
 
 msgid "Never"
 msgstr "Nooit"
 

-#: actions/pathsadminpanel.php:324
+#. TRANS: Drop down option in Paths admin panel (option for "When to use SSL").
+#: actions/pathsadminpanel.php:479

 msgid "Sometimes"
 msgstr "Soms"
 
 msgid "Sometimes"
 msgstr "Soms"
 

-#: actions/pathsadminpanel.php:325
+#. TRANS: Drop down option in Paths admin panel (option for "When to use SSL").
+#: actions/pathsadminpanel.php:481

 msgid "Always"
 msgstr "Altyd"
 
 msgid "Always"
 msgstr "Altyd"
 

-#: actions/pathsadminpanel.php:329
+#: actions/pathsadminpanel.php:485

 msgid "Use SSL"
 msgstr "Gebruik SSL"
 
 msgid "Use SSL"
 msgstr "Gebruik SSL"
 

-#: actions/pathsadminpanel.php:330
-msgid "When to use SSL"
+#. TRANS: Tooltip for field label in Paths admin panel.
+#: actions/pathsadminpanel.php:487
+#, fuzzy
+msgid "When to use SSL."

 msgstr "Wanneer SSL gebruik moet word"
 
 msgstr "Wanneer SSL gebruik moet word"
 

-#: actions/pathsadminpanel.php:335
-msgid "SSL server"
-msgstr "SSL-bediener"
-
-#: actions/pathsadminpanel.php:336
-msgid "Server to direct SSL requests to"
+#. TRANS: Tooltip for field label in Paths admin panel.
+#: actions/pathsadminpanel.php:497
+msgid "Server to direct SSL requests to."

 msgstr ""
 
 msgstr ""
 

+#. TRANS: Button title text to store form data in the Paths admin panel.
+#: actions/pathsadminpanel.php:514
+#, fuzzy
+msgid "Save paths"
+msgstr "Tema-pad"
+

 #: actions/peoplesearch.php:52
 #, php-format
 msgid ""
 #: actions/peoplesearch.php:52
 #, php-format
 msgid ""


@@ -2386,112 +3763,206 @@ msgstr ""
 msgid "People search"
 msgstr "Soek gebruikers"
 
 msgid "People search"
 msgstr "Soek gebruikers"
 

+#: actions/peopletag.php:68
+#, fuzzy, php-format
+msgid "Not a valid people tag: %s."
+msgstr "Nie 'n geldige e-posadres nie."
+

 #: actions/peopletag.php:142
 #, php-format
 msgid "Users self-tagged with %1$s - page %2$d"
 msgstr ""
 
 #: actions/peopletag.php:142
 #, php-format
 msgid "Users self-tagged with %1$s - page %2$d"
 msgstr ""
 

+#: actions/postnotice.php:95
+#, fuzzy
+msgid "Invalid notice content."
+msgstr "Ongeldige token."
+

 #: actions/postnotice.php:101
 #, php-format
 msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’."
 msgstr ""
 
 #: actions/postnotice.php:101
 #, php-format
 msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’."
 msgstr ""
 

-#: actions/profilesettings.php:71
+#. TRANS: Page title for profile settings.
+#: actions/profilesettings.php:61
+#, fuzzy
+msgid "Profile settings"
+msgstr "Wysig profiel-instellings"
+
+#. TRANS: Usage instructions for profile settings.
+#: actions/profilesettings.php:73

 msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr ""
 
 msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr ""
 

-#: actions/profilesettings.php:99
+#. TRANS: Profile settings form legend.
+#: actions/profilesettings.php:102

 msgid "Profile information"
 msgstr ""
 
 msgid "Profile information"
 msgstr ""
 

-#: actions/profilesettings.php:111 actions/register.php:455
-#: actions/showgroup.php:256 actions/tagother.php:104
-#: lib/groupeditform.php:157 lib/userprofile.php:150
+#. TRANS: Tooltip for field label in form for profile settings.
+#: actions/profilesettings.php:113
+#, fuzzy
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
+msgstr ""
+"Die gebruikersnaam mag slegs uit kleinletters en syfers bestaan en mag geen "
+"spasies bevat nie."
+
+#. 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:456
+#: actions/showgroup.php:252 actions/tagother.php:104
+#: lib/groupeditform.php:157 lib/userprofile.php:152

 msgid "Full name"
 msgstr "Volledige naam"
 
 msgid "Full name"
 msgstr "Volledige naam"
 

+#. TRANS: Field label in form for profile settings.

 #. TRANS: Form input field label.
 #. TRANS: Form input field label.

-#: actions/profilesettings.php:115 actions/register.php:460
-#: lib/applicationeditform.php:244 lib/groupeditform.php:161
+#: actions/profilesettings.php:122 actions/register.php:461
+#: lib/applicationeditform.php:236 lib/groupeditform.php:161

 msgid "Homepage"
 msgstr "Tuisblad"
 
 msgid "Homepage"
 msgstr "Tuisblad"
 

-#: actions/profilesettings.php:117 actions/register.php:462
-msgid "URL of your homepage, blog, or profile on another site"
+#. TRANS: Tooltip for field label in form for profile settings.
+#: actions/profilesettings.php:125
+msgid "URL of your homepage, blog, or profile on another site."

 msgstr ""
 
 msgstr ""
 

-#: actions/profilesettings.php:122 actions/register.php:468
-#, php-format
-msgid "Describe yourself and your interests in %d chars"
-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).
+#: 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"
+msgstr[0] "Skrap applikasie"
+msgstr[1] "Skrap applikasie"

 
 

-#: actions/profilesettings.php:125 actions/register.php:471
+#. TRANS: Tooltip for field label in form for profile settings.
+#: actions/profilesettings.php:139 actions/register.php:477

 msgid "Describe yourself and your interests"
 msgstr ""
 
 msgid "Describe yourself and your interests"
 msgstr ""
 

-#: actions/profilesettings.php:127 actions/register.php:473
+#. TRANS: Text area label in form for profile settings where users can provide.
+#. TRANS: their biography.
+#: actions/profilesettings.php:143 actions/register.php:479

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

-#: actions/profilesettings.php:132 actions/register.php:478
-#: actions/showgroup.php:265 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:177
-#: lib/userprofile.php:165
+#. 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:484
+#: actions/showgroup.php:262 actions/tagother.php:112
+#: actions/userauthorization.php:166 lib/groupeditform.php:180
+#: lib/userprofile.php:167

 msgid "Location"
 msgstr "Ligging"
 
 msgid "Location"
 msgstr "Ligging"
 

-#: actions/profilesettings.php:134 actions/register.php:480
+#. TRANS: Tooltip for field label in form for profile settings.
+#: 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 ""
 

-#: actions/profilesettings.php:138
+#. TRANS: Checkbox label in form for profile settings.
+#: actions/profilesettings.php:157

 msgid "Share my current location when posting notices"
 msgstr ""
 
 msgid "Share my current location when posting notices"
 msgstr ""
 

-#: actions/profilesettings.php:145 actions/tagother.php:149
+#. TRANS: Field label in form for profile settings.
+#: actions/profilesettings.php:165 actions/tagother.php:149

 #: actions/tagother.php:209 lib/subscriptionlist.php:106
 #: 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"
 

-#: actions/profilesettings.php:147
+#. TRANS: Tooltip for field label in form for profile settings.
+#: actions/profilesettings.php:168

 msgid ""
 "Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 msgstr ""
 
 msgid ""
 "Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 msgstr ""
 

-#: actions/profilesettings.php:151
+#. TRANS: Dropdownlist label in form for profile settings.
+#: actions/profilesettings.php:173

 msgid "Language"
 msgstr "Taal"
 
 msgid "Language"
 msgstr "Taal"
 

-#: actions/profilesettings.php:152
+#. TRANS: Tooltip for dropdown list label in form for profile settings.
+#: actions/profilesettings.php:175

 msgid "Preferred language"
 msgstr ""
 
 msgid "Preferred language"
 msgstr ""
 

-#: actions/profilesettings.php:161
+#. TRANS: Dropdownlist label in form for profile settings.
+#: actions/profilesettings.php:185

 msgid "Timezone"
 msgstr "Tydsone"
 
 msgid "Timezone"
 msgstr "Tydsone"
 

-#: actions/profilesettings.php:162
+#. TRANS: Tooltip for dropdown list label in form for profile settings.
+#: actions/profilesettings.php:187

 msgid "What timezone are you normally in?"
 msgstr ""
 
 msgid "What timezone are you normally in?"
 msgstr ""
 

-#: actions/profilesettings.php:167
+#. TRANS: Checkbox label in form for profile settings.
+#: actions/profilesettings.php:193

 msgid ""
 "Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr ""
 
 msgid ""
 "Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr ""
 

-#: actions/profilesettings.php:235 actions/siteadminpanel.php:151
+#. 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:229
+#, fuzzy, php-format
+msgid "Bio is too long (maximum %d character)."
+msgid_plural "Bio is too long (maximum %d characters)."
+msgstr[0] "Die beskrywing is te lank (die maksimum is %d karakters)."
+msgstr[1] "Die beskrywing is te lank (die maksimum is %d karakters)."
+
+#. TRANS: Validation error in form for profile settings.
+#: actions/profilesettings.php:273 actions/siteadminpanel.php:151

 msgid "Timezone not selected."
 msgstr ""
 
 msgid "Timezone not selected."
 msgstr ""
 

-#: actions/profilesettings.php:253 actions/tagother.php:178
+#. TRANS: Validation error in form for profile settings.
+#: actions/profilesettings.php:281
+#, fuzzy
+msgid "Language is too long (maximum 50 characters)."
+msgstr "Die naam is te lank (maksimum 255 karakters)."
+
+#. TRANS: Validation error in form for profile settings.
+#. TRANS: %s is an invalid tag.
+#: actions/profilesettings.php:295 actions/tagother.php:178

 #, php-format
 msgid "Invalid tag: \"%s\""
 msgstr "Ongeldige etiket: \"$s\""
 
 #, php-format
 msgid "Invalid tag: \"%s\""
 msgstr "Ongeldige etiket: \"$s\""
 

+#. TRANS: Server error thrown when user profile settings could not be updated to
+#. TRANS: automatically subscribe to any subscriber.
+#: actions/profilesettings.php:351
+#, fuzzy
+msgid "Couldn't update user for autosubscribe."
+msgstr "Kon nie gebruikersdata opdateer nie."
+
+#. TRANS: Server error thrown when user profile location preference settings could not be updated.
+#: actions/profilesettings.php:409
+#, fuzzy
+msgid "Couldn't save location prefs."
+msgstr "Dit was nie moontlik om die applikasie by te werk nie."
+
+#. TRANS: Server error thrown when user profile settings could not be saved.
+#: actions/profilesettings.php:422
+#, fuzzy
+msgid "Couldn't save profile."
+msgstr "Kon nie die profiel stoor nie."
+
+#. TRANS: Server error thrown when user profile settings tags could not be saved.
+#: actions/profilesettings.php:431
+#, fuzzy
+msgid "Couldn't save tags."
+msgstr "Kon nie gebruiker opdateer nie."
+
+#. TRANS: Confirmation shown when user profile settings are saved.

 #. TRANS: Message after successful saving of administrative settings.
 #. TRANS: Message after successful saving of administrative settings.

-#: actions/profilesettings.php:391 lib/adminpanelaction.php:141
+#: actions/profilesettings.php:440 lib/adminpanelaction.php:138

 msgid "Settings saved."
 msgstr "Voorkeure is gestoor."
 
 msgid "Settings saved."
 msgstr "Voorkeure is gestoor."
 


@@ -2500,6 +3971,21 @@ msgstr "Voorkeure is gestoor."
 msgid "Beyond the page limit (%s)."
 msgstr ""
 
 msgid "Beyond the page limit (%s)."
 msgstr ""
 

+#: actions/public.php:92
+#, fuzzy
+msgid "Could not retrieve public stream."
+msgstr "Dit was nie moontlik om die aliasse te skep nie."
+
+#: actions/public.php:130
+#, fuzzy, php-format
+msgid "Public timeline, page %d"
+msgstr "Populêre kennisgewings, bladsy %d"
+
+#: actions/public.php:132 lib/publicgroupnav.php:79
+#, fuzzy
+msgid "Public timeline"
+msgstr "%s tydlyn"
+

 #: actions/public.php:160
 msgid "Public Stream Feed (RSS 1.0)"
 msgstr ""
 #: actions/public.php:160
 msgid "Public Stream Feed (RSS 1.0)"
 msgstr ""


@@ -2512,6 +3998,15 @@ msgstr ""
 msgid "Public Stream Feed (Atom)"
 msgstr ""
 
 msgid "Public Stream Feed (Atom)"
 msgstr ""
 

+#: actions/public.php:188
+#, fuzzy, php-format
+msgid ""
+"This is the public timeline for %%site.name%% but no one has posted anything "
+"yet."
+msgstr ""
+"Hierdie is die tydslyn vir %s en vriende, maar niemand het nog iets gepos "
+"nie."
+

 #: actions/public.php:191
 msgid "Be the first to post!"
 msgstr "U kan die eerste een wees om 'n boodskap te plaas!"
 #: actions/public.php:191
 msgid "Be the first to post!"
 msgstr "U kan die eerste een wees om 'n boodskap te plaas!"


@@ -2539,35 +4034,83 @@ msgid ""
 "tool."
 msgstr ""
 
 "tool."
 msgstr ""
 

+#. TRANS: Title for public tag cloud.

 #: actions/publictagcloud.php:57
 msgid "Public tag cloud"
 msgstr ""
 
 #: actions/publictagcloud.php:57
 msgid "Public tag cloud"
 msgstr ""
 

-#: actions/publictagcloud.php:63
+#. TRANS: Instructions (more used like an explanation/header).
+#. TRANS: %s is the StatusNet sitename.
+#: actions/publictagcloud.php:65

 #, php-format
 #, php-format

-msgid "These are most popular recent tags on %s "
+msgid "These are most popular recent tags on %s"

 msgstr ""
 
 msgstr ""
 

-#: actions/publictagcloud.php:69
+#. TRANS: This message contains a Markdown URL. The link description is between
+#. TRANS: square brackets, and the link between parentheses. Do not separate "]("
+#. TRANS: and do not change the URL part.
+#: actions/publictagcloud.php:74

 #, php-format
 msgid "No one has posted a notice with a [hashtag](%%doc.tags%%) yet."
 msgstr ""
 
 #, php-format
 msgid "No one has posted a notice with a [hashtag](%%doc.tags%%) yet."
 msgstr ""
 

-#: actions/publictagcloud.php:75
+#. TRANS: Message shown to a logged in user for the public tag cloud
+#. TRANS: while no tags exist yet. "One" refers to the non-existing hashtag.
+#: actions/publictagcloud.php:79
+#, fuzzy
+msgid "Be the first to post one!"
+msgstr "U kan die eerste een wees om 'n boodskap te plaas!"
+
+#. TRANS: Message shown to a anonymous user for the public tag cloud
+#. TRANS: while no tags exist yet. "One" refers to the non-existing hashtag.
+#. TRANS: This message contains a Markdown URL. The link description is between
+#. TRANS: square brackets, and the link between parentheses. Do not separate "]("
+#. TRANS: and do not change the URL part.
+#: actions/publictagcloud.php:87

 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to post "
 "one!"
 msgstr ""
 
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to post "
 "one!"
 msgstr ""
 

+#: actions/publictagcloud.php:146
+#, fuzzy
+msgid "Tag cloud"
+msgstr "Verander kleure"
+
+#: actions/recoverpassword.php:36
+#, fuzzy
+msgid "You are already logged in!"
+msgstr "U is reeds aangeteken."
+
+#: actions/recoverpassword.php:62
+#, fuzzy
+msgid "No such recovery code."
+msgstr "Die kennisgewing bestaan nie."
+
+#: actions/recoverpassword.php:66
+#, fuzzy
+msgid "Not a recovery code."
+msgstr "Nie 'n geregistreerde gebruiker nie."
+

 #: actions/recoverpassword.php:73
 msgid "Recovery code for unknown user."
 msgstr ""
 
 #: actions/recoverpassword.php:73
 msgid "Recovery code for unknown user."
 msgstr ""
 

+#: actions/recoverpassword.php:86
+#, fuzzy
+msgid "Error with confirmation code."
+msgstr "Geen bevestigingskode."
+

 #: actions/recoverpassword.php:97
 msgid "This confirmation code is too old. Please start again."
 msgstr ""
 
 #: actions/recoverpassword.php:97
 msgid "This confirmation code is too old. Please start again."
 msgstr ""
 

+#: actions/recoverpassword.php:111
+#, fuzzy
+msgid "Could not update user with confirmed email address."
+msgstr "Huidige bevestigde e-posadres."
+

 #: actions/recoverpassword.php:152
 msgid ""
 "If you have forgotten or lost your password, you can get a new one sent to "
 #: actions/recoverpassword.php:152
 msgid ""
 "If you have forgotten or lost your password, you can get a new one sent to "


@@ -2578,10 +4121,25 @@ msgstr ""
 msgid "You have been identified. Enter a new password below. "
 msgstr ""
 
 msgid "You have been identified. Enter a new password below. "
 msgstr ""
 

+#: actions/recoverpassword.php:188
+#, fuzzy
+msgid "Password recovery"
+msgstr "Verander wagwoord"
+
+#: actions/recoverpassword.php:191
+#, fuzzy
+msgid "Nickname or email address"
+msgstr "Geen e-posadres."
+

 #: actions/recoverpassword.php:193
 msgid "Your nickname on this server, or your registered email address."
 msgstr ""
 
 #: actions/recoverpassword.php:193
 msgid "Your nickname on this server, or your registered email address."
 msgstr ""
 

+#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
+#, fuzzy
+msgid "Recover"
+msgstr "Verwyder"
+

 #: actions/recoverpassword.php:208
 msgid "Reset password"
 msgstr "Herstel wagwoord"
 #: actions/recoverpassword.php:208
 msgid "Reset password"
 msgstr "Herstel wagwoord"


@@ -2598,10 +4156,20 @@ msgstr ""
 msgid "Unknown action"
 msgstr "Onbekende aksie"
 
 msgid "Unknown action"
 msgstr "Onbekende aksie"
 

+#: actions/recoverpassword.php:236
+#, fuzzy
+msgid "6 or more characters, and don't forget it!"
+msgstr "6 of meer karakters"
+

 #: actions/recoverpassword.php:243
 msgid "Reset"
 msgstr "Herstel"
 
 #: actions/recoverpassword.php:243
 msgid "Reset"
 msgstr "Herstel"
 

+#: actions/recoverpassword.php:252
+#, fuzzy
+msgid "Enter a nickname or email address."
+msgstr "Dit is nie u e-posadres nie."
+

 #: actions/recoverpassword.php:282
 msgid "No user with that email address or username."
 msgstr ""
 #: actions/recoverpassword.php:282
 msgid "No user with that email address or username."
 msgstr ""


@@ -2610,17 +4178,42 @@ msgstr ""
 msgid "No registered email address for that user."
 msgstr ""
 
 msgid "No registered email address for that user."
 msgstr ""
 

+#: actions/recoverpassword.php:313
+#, fuzzy
+msgid "Error saving address confirmation."
+msgstr "Fout tydens stoor van gebruiker; ongeldig."
+

 #: actions/recoverpassword.php:338
 msgid ""
 "Instructions for recovering your password have been sent to the email "
 "address registered to your account."
 msgstr ""
 
 #: actions/recoverpassword.php:338
 msgid ""
 "Instructions for recovering your password have been sent to the email "
 "address registered to your account."
 msgstr ""
 

+#: actions/recoverpassword.php:357
+#, fuzzy
+msgid "Unexpected password reset."
+msgstr "Die vorm is onverwags ingestuur."
+
+#: actions/recoverpassword.php:365
+#, fuzzy
+msgid "Password must be 6 characters or more."
+msgstr "Wagwoord moet 6 of meer karakters bevat."
+
+#: actions/recoverpassword.php:369
+#, fuzzy
+msgid "Password and confirmation do not match."
+msgstr "Wagwoorde is nie dieselfde nie."
+
+#: actions/recoverpassword.php:388 actions/register.php:256
+#, fuzzy
+msgid "Error setting user."
+msgstr "Fout tydens stoor van gebruiker; ongeldig."
+

 #: actions/recoverpassword.php:395
 msgid "New password successfully saved. You are now logged in."
 msgstr ""
 
 #: actions/recoverpassword.php:395
 msgid "New password successfully saved. You are now logged in."
 msgstr ""
 

-#: actions/register.php:92 actions/register.php:196 actions/register.php:412
+#: 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 ""
 


@@ -2632,7 +4225,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:506 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:512 lib/logingroupnav.php:85

 msgid "Register"
 msgstr "Registreer"
 
 msgid "Register"
 msgstr "Registreer"
 


@@ -2640,72 +4233,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:250 actions/register.php:272
+#: 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:350
+#: 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:432
+#: 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:438
+#, fuzzy
+msgid "6 or more characters. Required."
+msgstr "6 of meer karakters"
+
+#: actions/register.php:442
+#, fuzzy
+msgid "Same as password above. Required."
+msgstr "Dieselfde as wagwoord hierbo"
+

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

-#: actions/register.php:445 actions/register.php:449
-#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132
+#: actions/register.php:446 actions/register.php:450
+#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127

 msgid "Email"
 msgstr "E-pos"
 
 msgid "Email"
 msgstr "E-pos"
 

-#: actions/register.php:446 actions/register.php:450
+#: 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:457
+#: actions/register.php:458

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

-#: actions/register.php:518
+#: actions/register.php:463
+msgid "URL of your homepage, blog, or profile on another site"
+msgstr ""
+
+#: 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:528
+#: 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:532
+#: 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:535
+#: 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:540
+#: 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:583
+#: 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 "


@@ -2724,7 +4331,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:607
+#: 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.)"


@@ -2746,16 +4353,26 @@ msgstr ""
 msgid "Subscribe to a remote user"
 msgstr ""
 
 msgid "Subscribe to a remote user"
 msgstr ""
 

+#: actions/remotesubscribe.php:129
+#, fuzzy
+msgid "User nickname"
+msgstr "Geen gebruikersnaam nie."
+

 #: actions/remotesubscribe.php:130
 msgid "Nickname of the user you want to follow"
 msgstr ""
 
 #: actions/remotesubscribe.php:130
 msgid "Nickname of the user you want to follow"
 msgstr ""
 

+#: actions/remotesubscribe.php:133
+#, fuzzy
+msgid "Profile URL"
+msgstr "Profiel"
+

 #: actions/remotesubscribe.php:134
 msgid "URL of your profile on another compatible microblogging service"
 msgstr ""
 
 #: actions/remotesubscribe.php:137 lib/subscribeform.php:139
 #: actions/remotesubscribe.php:134
 msgid "URL of your profile on another compatible microblogging service"
 msgstr ""
 
 #: actions/remotesubscribe.php:137 lib/subscribeform.php:139

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

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


@@ -2779,7 +4396,22 @@ msgstr ""
 msgid "Only logged-in users can repeat notices."
 msgstr ""
 
 msgid "Only logged-in users can repeat notices."
 msgstr ""
 

-#: actions/repeat.php:114 lib/noticelist.php:676
+#: actions/repeat.php:64 actions/repeat.php:71
+#, fuzzy
+msgid "No notice specified."
+msgstr "Geen profiel verskaf nie."
+
+#: actions/repeat.php:76
+#, fuzzy
+msgid "You can't repeat your own notice."
+msgstr "U kan nie u eie kennisgewings herhaal nie."
+
+#: actions/repeat.php:90
+#, fuzzy
+msgid "You already repeated that notice."
+msgstr "U het reeds die kennisgewing herhaal."
+
+#: actions/repeat.php:114 lib/noticelist.php:691

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


@@ -2787,6 +4419,41 @@ msgstr "Herhalend"
 msgid "Repeated!"
 msgstr "Herhaal!"
 
 msgid "Repeated!"
 msgstr "Herhaal!"
 

+#: actions/replies.php:126 actions/repliesrss.php:68
+#: lib/personalgroupnav.php:108
+#, fuzzy, php-format
+msgid "Replies to %s"
+msgstr "Herhalings van %s"
+
+#: actions/replies.php:128
+#, fuzzy, php-format
+msgid "Replies to %1$s, page %2$d"
+msgstr "%1$s, bladsy %2$d"
+
+#: actions/replies.php:145
+#, fuzzy, php-format
+msgid "Replies feed for %s (RSS 1.0)"
+msgstr "Voer vir vriende van %s (RSS 1.0)"
+
+#: actions/replies.php:152
+#, fuzzy, php-format
+msgid "Replies feed for %s (RSS 2.0)"
+msgstr "Voer vir vriende van %s (RSS 2.0)"
+
+#: actions/replies.php:159
+#, fuzzy, php-format
+msgid "Replies feed for %s (Atom)"
+msgstr "Voer vir vriende van %s (Atom)"
+
+#: actions/replies.php:199
+#, fuzzy, php-format
+msgid ""
+"This is the timeline showing replies to %1$s but %2$s hasn't received a "
+"notice to them yet."
+msgstr ""
+"Hierdie is die tydslyn vir %s en vriende, maar niemand het nog iets gepos "
+"nie."
+

 #: actions/replies.php:204
 #, php-format
 msgid ""
 #: actions/replies.php:204
 #, php-format
 msgid ""


@@ -2801,6 +4468,16 @@ msgid ""
 "newnotice%%%%?status_textarea=%3$s)."
 msgstr ""
 
 "newnotice%%%%?status_textarea=%3$s)."
 msgstr ""
 

+#: actions/repliesrss.php:72
+#, fuzzy, php-format
+msgid "Replies to %1$s on %2$s!"
+msgstr "Opdaterings van %1$s op %2$s."
+
+#: actions/revokerole.php:75
+#, fuzzy
+msgid "You cannot revoke user roles on this site."
+msgstr "Jy kan nie gebruikers op hierdie webwerf stilmaak nie."
+

 #: actions/revokerole.php:82
 msgid "User doesn't have this role."
 msgstr ""
 #: actions/revokerole.php:82
 msgid "User doesn't have this role."
 msgstr ""


@@ -2809,16 +4486,31 @@ msgstr ""
 msgid "StatusNet"
 msgstr "StatusNet"
 
 msgid "StatusNet"
 msgstr "StatusNet"
 

+#: actions/sandbox.php:65 actions/unsandbox.php:65
+#, fuzzy
+msgid "You cannot sandbox users on this site."
+msgstr "Jy kan nie gebruikers op hierdie webwerf stilmaak nie."
+
+#: actions/sandbox.php:72
+#, fuzzy
+msgid "User is already sandboxed."
+msgstr "Hierdie gebruiker is reeds stilgemaak."
+

 #. TRANS: Menu item for site administration
 #: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
 #. TRANS: Menu item for site administration
 #: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170

-#: lib/adminpanelaction.php:392
+#: lib/adminpanelaction.php:379

 msgid "Sessions"
 msgstr "Sessies"
 
 #: actions/sessionsadminpanel.php:65
 msgid "Sessions"
 msgstr "Sessies"
 
 #: actions/sessionsadminpanel.php:65

-msgid "Session settings for this StatusNet site."
+msgid "Session settings for this StatusNet site"

 msgstr ""
 
 msgstr ""
 

+#: actions/sessionsadminpanel.php:175
+#, fuzzy
+msgid "Handle sessions"
+msgstr "Sessies"
+

 #: actions/sessionsadminpanel.php:177
 msgid "Whether to handle sessions ourselves."
 msgstr ""
 #: actions/sessionsadminpanel.php:177
 msgid "Whether to handle sessions ourselves."
 msgstr ""


@@ -2831,29 +4523,45 @@ msgstr ""
 msgid "Turn on debugging output for sessions."
 msgstr ""
 
 msgid "Turn on debugging output for sessions."
 msgstr ""
 

+#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
+#, fuzzy
+msgid "Save site settings"
+msgstr "Stoor toegangsinstellings"
+
+#: actions/showapplication.php:82
+#, fuzzy
+msgid "You must be logged in to view an application."
+msgstr "U moet aangeteken wees alvorens u 'n applikasie kan wysig."
+
+#: actions/showapplication.php:157
+#, fuzzy
+msgid "Application profile"
+msgstr "Die applikasie is nie gevind nie."
+

 #. TRANS: Form input field label for application icon.
 #. TRANS: Form input field label for application icon.

-#: actions/showapplication.php:159 lib/applicationeditform.php:182
+#: actions/showapplication.php:159 lib/applicationeditform.php:173

 msgid "Icon"
 msgstr "Ikoon"
 
 #. TRANS: Form input field label for application name.
 #: actions/showapplication.php:169 actions/version.php:197
 msgid "Icon"
 msgstr "Ikoon"
 
 #. TRANS: Form input field label for application name.
 #: actions/showapplication.php:169 actions/version.php:197

-#: lib/applicationeditform.php:199
+#: lib/applicationeditform.php:190

 msgid "Name"
 msgstr "Naam"
 
 #. TRANS: Form input field label.
 msgid "Name"
 msgstr "Naam"
 
 #. TRANS: Form input field label.

-#: actions/showapplication.php:178 lib/applicationeditform.php:235
+#: actions/showapplication.php:178 lib/applicationeditform.php:227

 msgid "Organization"
 msgstr "Organisasie"
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
 msgid "Organization"
 msgstr "Organisasie"
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200

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

 msgid "Description"
 msgstr "Beskrywing"
 
 msgid "Description"
 msgstr "Beskrywing"
 

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

 #: lib/profileaction.php:187
 msgid "Statistics"
 msgstr "Statistieke"
 #: lib/profileaction.php:187
 msgid "Statistics"
 msgstr "Statistieke"


@@ -2863,10 +4571,25 @@ msgstr "Statistieke"
 msgid "Created by %1$s - %2$s access by default - %3$d users"
 msgstr ""
 
 msgid "Created by %1$s - %2$s access by default - %3$d users"
 msgstr ""
 

+#: actions/showapplication.php:213
+#, fuzzy
+msgid "Application actions"
+msgstr "Die applikasie is nie gevind nie."
+

 #: actions/showapplication.php:236
 msgid "Reset key & secret"
 msgstr ""
 
 #: actions/showapplication.php:236
 msgid "Reset key & secret"
 msgstr ""
 

+#: actions/showapplication.php:252 lib/deletegroupform.php:121
+#: lib/deleteuserform.php:66 lib/noticelist.php:672
+msgid "Delete"
+msgstr "Skrap"
+
+#: actions/showapplication.php:261
+#, fuzzy
+msgid "Application info"
+msgstr "Die applikasie is nie gevind nie."
+

 #: actions/showapplication.php:263
 msgid "Consumer key"
 msgstr ""
 #: actions/showapplication.php:263
 msgid "Consumer key"
 msgstr ""


@@ -2883,12 +4606,47 @@ msgstr ""
 msgid "Access token URL"
 msgstr ""
 
 msgid "Access token URL"
 msgstr ""
 

+#: actions/showapplication.php:283
+#, fuzzy
+msgid "Authorize URL"
+msgstr "Outeur"
+

 #: actions/showapplication.php:288
 msgid ""
 "Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
 "signature method."
 msgstr ""
 
 #: actions/showapplication.php:288
 msgid ""
 "Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
 "signature method."
 msgstr ""
 

+#: actions/showapplication.php:309
+#, fuzzy
+msgid "Are you sure you want to reset your consumer key and secret?"
+msgstr "Is u seker u wil hierdie kennisgewing verwyder?"
+
+#: actions/showfavorites.php:79
+#, fuzzy, php-format
+msgid "%1$s's favorite notices, page %2$d"
+msgstr "%s se gunsteling kennisgewings"
+
+#: actions/showfavorites.php:132
+#, fuzzy
+msgid "Could not retrieve favorite notices."
+msgstr "Dit was nie moontlik om 'n gunsteling te skep nie."
+
+#: actions/showfavorites.php:171
+#, fuzzy, php-format
+msgid "Feed for favorites of %s (RSS 1.0)"
+msgstr "Voer vir vriende van %s (RSS 1.0)"
+
+#: actions/showfavorites.php:178
+#, fuzzy, php-format
+msgid "Feed for favorites of %s (RSS 2.0)"
+msgstr "Voer vir vriende van %s (RSS 2.0)"
+
+#: actions/showfavorites.php:185
+#, fuzzy, php-format
+msgid "Feed for favorites of %s (Atom)"
+msgstr "Voer vir vriende van %s (Atom)"
+

 #: actions/showfavorites.php:206
 msgid ""
 "You haven't chosen any favorite notices yet. Click the fave button on "
 #: actions/showfavorites.php:206
 msgid ""
 "You haven't chosen any favorite notices yet. Click the fave button on "


@@ -2914,62 +4672,106 @@ msgstr ""
 msgid "This is a way to share what you like."
 msgstr ""
 
 msgid "This is a way to share what you like."
 msgstr ""
 

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

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

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

 #, php-format
 msgid "%1$s group, page %2$d"
 msgstr "Groep %1$s, bladsy %2$d"
 
 #, php-format
 msgid "%1$s group, page %2$d"
 msgstr "Groep %1$s, bladsy %2$d"
 

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

 msgid "Group profile"
 msgstr "Groepsprofiel"
 
 msgid "Group profile"
 msgstr "Groepsprofiel"
 

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

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

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

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

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

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

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

 msgid "Group actions"
 msgstr "Groepsaksies"
 
 msgid "Group actions"
 msgstr "Groepsaksies"
 

-#: actions/showgroup.php:355
+#. TRANS: Tooltip for feed link. %s is a group nickname.
+#: actions/showgroup.php:345
+#, fuzzy, php-format
+msgid "Notice feed for %s group (RSS 1.0)"
+msgstr "Voer vir vriende van %s (RSS 1.0)"
+
+#. TRANS: Tooltip for feed link. %s is a group nickname.
+#: actions/showgroup.php:352
+#, fuzzy, php-format
+msgid "Notice feed for %s group (RSS 2.0)"
+msgstr "Voer vir vriende van %s (RSS 2.0)"
+
+#. TRANS: Tooltip for feed link. %s is a group nickname.
+#: actions/showgroup.php:359
+#, fuzzy, php-format
+msgid "Notice feed for %s group (Atom)"
+msgstr "Voer vir vriende van %s (Atom)"
+
+#. TRANS: Tooltip for feed link. %s is a group nickname.
+#: actions/showgroup.php:365

 #, php-format
 msgid "FOAF for %s group"
 msgstr "Vriend van 'n vriend vir die groep %s"
 
 #, php-format
 msgid "FOAF for %s group"
 msgstr "Vriend van 'n vriend vir die groep %s"
 

-#: actions/showgroup.php:393 actions/showgroup.php:445 lib/groupnav.php:91
+#. TRANS: Header for mini list of group members on a group page (h2).
+#: actions/showgroup.php:402

 msgid "Members"
 msgstr "Lede"
 
 msgid "Members"
 msgstr "Lede"
 

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

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

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

 msgid "All members"
 msgstr "Alle lede"
 
 msgid "All members"
 msgstr "Alle lede"
 

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

 msgid "Created"
 msgstr "Geskep"
 
 msgid "Created"
 msgstr "Geskep"
 

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

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


@@ -2979,7 +4781,10 @@ msgid ""
 "of this group and many more! ([Read more](%%%%doc.help%%%%))"
 msgstr ""
 
 "of this group and many more! ([Read more](%%%%doc.help%%%%))"
 msgstr ""
 

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

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


@@ -2988,51 +4793,119 @@ msgid ""
 "their life and interests. "
 msgstr ""
 
 "their life and interests. "
 msgstr ""
 

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

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

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

 msgid "No such message."
 msgstr "Die boodskap bestaan nie."
 
 msgid "No such message."
 msgstr "Die boodskap bestaan nie."
 

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

 msgid "Only the sender and recipient may read this message."
 msgstr ""
 
 msgid "Only the sender and recipient may read this message."
 msgstr ""
 

+#. TRANS: Page title for single direct message display when viewing user is the sender.
+#. TRANS: %1$s is the addressed user's nickname, $2$s is a timestamp.
+#: actions/showmessage.php:110
+#, fuzzy, php-format
+msgid "Message to %1$s on %2$s"
+msgstr "Opdaterings van %1$s op %2$s."
+
+#. TRANS: Page title for single message display.
+#. TRANS: %1$s is the sending user's nickname, $2$s is a timestamp.
+#: actions/showmessage.php:118
+#, fuzzy, php-format
+msgid "Message from %1$s on %2$s"
+msgstr "Opdaterings van %1$s op %2$s."
+

 #: actions/shownotice.php:90
 msgid "Notice deleted."
 msgstr "Hierdie kennisgewing is verwyder."
 
 #: actions/shownotice.php:90
 msgid "Notice deleted."
 msgstr "Hierdie kennisgewing is verwyder."
 

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

 
 

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

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

-#: actions/showstream.php:148
+#. TRANS: Title for link to notice feed.
+#. TRANS: %1$s is a user nickname, %2$s is a hashtag.
+#: actions/showstream.php:127
+#, fuzzy, php-format
+msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
+msgstr "Voer vir vriende van %s (RSS 1.0)"
+
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#: actions/showstream.php:136
+#, fuzzy, php-format
+msgid "Notice feed for %s (RSS 1.0)"
+msgstr "Voer vir vriende van %s (RSS 1.0)"
+
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#: actions/showstream.php:145
+#, fuzzy, php-format
+msgid "Notice feed for %s (RSS 2.0)"
+msgstr "Voer vir vriende van %s (RSS 2.0)"
+
+#: actions/showstream.php:152
+#, fuzzy, php-format
+msgid "Notice feed for %s (Atom)"
+msgstr "Voer vir vriende van %s (Atom)"
+
+#. TRANS: Title for link to notice feed. FOAF stands for Friend of a Friend.
+#. TRANS: More information at http://www.foaf-project.org. %s is a user nickname.
+#: actions/showstream.php:159

 #, php-format
 msgid "FOAF for %s"
 msgstr "Vriend van 'n vriend (FOAF) vir %s"
 
 #, php-format
 msgid "FOAF for %s"
 msgstr "Vriend van 'n vriend (FOAF) vir %s"
 

-#: actions/showstream.php:205
+#. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
+#: actions/showstream.php:211
+#, fuzzy, php-format
+msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
+msgstr ""
+"Hierdie is die tydslyn vir %s en vriende, maar niemand het nog iets gepos "
+"nie."
+
+#. TRANS: Second sentence of empty list message for a stream for the user themselves.
+#: actions/showstream.php:217

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

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

 #, php-format
 msgid ""
 "You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
 "%?status_textarea=%2$s)."
 msgstr ""
 
 #, php-format
 msgid ""
 "You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
 "%?status_textarea=%2$s)."
 msgstr ""
 

-#: actions/showstream.php:243
+#. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/showstream.php:264

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


@@ -3041,7 +4914,9 @@ msgid ""
 "follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))"
 msgstr ""
 
 "follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))"
 msgstr ""
 

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

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


@@ -3049,7 +4924,8 @@ msgid ""
 "[StatusNet](http://status.net/) tool. "
 msgstr ""
 
 "[StatusNet](http://status.net/) tool. "
 msgstr ""
 

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

 #, php-format
 msgid "Repeat of %s"
 msgstr "Herhaling van %s"
 #, php-format
 msgid "Repeat of %s"
 msgstr "Herhaling van %s"


@@ -3070,6 +4946,11 @@ msgstr ""
 msgid "Site name must have non-zero length."
 msgstr ""
 
 msgid "Site name must have non-zero length."
 msgstr ""
 

+#: actions/siteadminpanel.php:141
+#, fuzzy
+msgid "You must have a valid contact email address."
+msgstr "Nie 'n geldige e-posadres nie."
+

 #: actions/siteadminpanel.php:159
 #, php-format
 msgid "Unknown language \"%s\"."
 #: actions/siteadminpanel.php:159
 #, php-format
 msgid "Unknown language \"%s\"."


@@ -3087,6 +4968,11 @@ msgstr ""
 msgid "General"
 msgstr "Algemeen"
 
 msgid "General"
 msgstr "Algemeen"
 

+#: actions/siteadminpanel.php:224
+#, fuzzy
+msgid "Site name"
+msgstr "Werf se tema"
+

 #: actions/siteadminpanel.php:225
 msgid "The name of your site, like \"Yourcompany Microblog\""
 msgstr ""
 #: actions/siteadminpanel.php:225
 msgid "The name of your site, like \"Yourcompany Microblog\""
 msgstr ""


@@ -3107,6 +4993,11 @@ msgstr ""
 msgid "URL used for credits link in footer of each page"
 msgstr ""
 
 msgid "URL used for credits link in footer of each page"
 msgstr ""
 

+#: actions/siteadminpanel.php:239
+#, fuzzy
+msgid "Contact email address for your site"
+msgstr "Inkomende e-posadres is verwyder."
+

 #: actions/siteadminpanel.php:245
 msgid "Local"
 msgstr "Lokaal"
 #: actions/siteadminpanel.php:245
 msgid "Local"
 msgstr "Lokaal"


@@ -3119,6 +5010,11 @@ msgstr "Standaardtydsone"
 msgid "Default timezone for the site; usually UTC."
 msgstr ""
 
 msgid "Default timezone for the site; usually UTC."
 msgstr ""
 

+#: actions/siteadminpanel.php:262
+#, fuzzy
+msgid "Default language"
+msgstr "Standaardtydsone"
+

 #: actions/siteadminpanel.php:263
 msgid "Site language when autodetection from browser settings is not available"
 msgstr ""
 #: actions/siteadminpanel.php:263
 msgid "Site language when autodetection from browser settings is not available"
 msgstr ""


@@ -3143,14 +5039,46 @@ msgstr "Duplikaatlimiet"
 msgid "How long users must wait (in seconds) to post the same thing again."
 msgstr ""
 
 msgid "How long users must wait (in seconds) to post the same thing again."
 msgstr ""
 

-#: actions/sitenoticeadminpanel.php:113
-msgid "Max length for the site-wide notice is 255 chars."
+#. TRANS: Page title for site-wide notice tab in admin panel.
+#: actions/sitenoticeadminpanel.php:55
+#, fuzzy
+msgid "Site Notice"
+msgstr "Kennisgewings"
+
+#. TRANS: Instructions for site-wide notice tab in admin panel.
+#: actions/sitenoticeadminpanel.php:66
+#, fuzzy
+msgid "Edit site-wide message"
+msgstr "Nuwe boodskap"
+
+#. TRANS: Server error displayed when saving a site-wide notice was impossible.
+#: actions/sitenoticeadminpanel.php:101
+#, fuzzy
+msgid "Unable to save site notice."
+msgstr "Dit was nie moontlik om u ontwerp-instellings te stoor nie."
+
+#. TRANS: Client error displayed when a site-wide notice was longer than allowed.
+#: actions/sitenoticeadminpanel.php:112
+msgid "Maximum length for the site-wide notice is 255 characters."

 msgstr ""
 
 msgstr ""
 

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

 msgstr ""
 
 msgstr ""
 

+#. TRANS: Title for button to save site notice in admin panel.
+#: actions/sitenoticeadminpanel.php:201
+#, fuzzy
+msgid "Save site notice"
+msgstr "Verwyder kennisgewing"
+

 #. TRANS: Title for SMS settings.
 #: actions/smssettings.php:59
 msgid "SMS settings"
 #. TRANS: Title for SMS settings.
 #: actions/smssettings.php:59
 msgid "SMS settings"


@@ -3163,16 +5091,47 @@ msgstr "SMS-instellings"
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr ""
 
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr ""
 

+#. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
+#: actions/smssettings.php:97
+#, fuzzy
+msgid "SMS is not available."
+msgstr "IM is nie beskikbaar nie."
+
+#. TRANS: Form legend for SMS settings form.
+#: actions/smssettings.php:111
+#, fuzzy
+msgid "SMS address"
+msgstr "IP-adres"
+
+#. TRANS: Form guide in SMS settings form.
+#: actions/smssettings.php:120
+#, fuzzy
+msgid "Current confirmed SMS-enabled phone number."
+msgstr "Huidige bevestigde e-posadres."
+

 #. TRANS: Form guide in IM settings form.
 #: actions/smssettings.php:133
 msgid "Awaiting confirmation on this phone number."
 msgstr ""
 
 #. TRANS: Form guide in IM settings form.
 #: actions/smssettings.php:133
 msgid "Awaiting confirmation on this phone number."
 msgstr ""
 

+#. TRANS: Field label for SMS address input in SMS settings form.
+#: actions/smssettings.php:142
+#, fuzzy
+msgid "Confirmation code"
+msgstr "Geen bevestigingskode."
+

 #. TRANS: Form field instructions in SMS settings form.
 #: actions/smssettings.php:144
 msgid "Enter the code you received on your phone."
 msgstr ""
 
 #. TRANS: Form field instructions in SMS settings form.
 #: actions/smssettings.php:144
 msgid "Enter the code you received on your phone."
 msgstr ""
 

+#. TRANS: Button label to confirm SMS confirmation code in SMS settings.
+#: actions/smssettings.php:148
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Confirm"
+msgstr "Bevestig"
+

 #. TRANS: Field label for SMS phone number input in SMS settings form.
 #: actions/smssettings.php:153
 msgid "SMS phone number"
 #. TRANS: Field label for SMS phone number input in SMS settings form.
 #: actions/smssettings.php:153
 msgid "SMS phone number"


@@ -3195,11 +5154,35 @@ msgid ""
 "from my carrier."
 msgstr ""
 
 "from my carrier."
 msgstr ""
 

+#. TRANS: Confirmation message for successful SMS preferences save.
+#: actions/smssettings.php:315
+#, fuzzy
+msgid "SMS preferences saved."
+msgstr "Voorkeure is gestoor."
+

 #. TRANS: Message given saving SMS phone number without having provided one.
 #: actions/smssettings.php:338
 msgid "No phone number."
 msgstr "Geen telefoonnommer."
 
 #. TRANS: Message given saving SMS phone number without having provided one.
 #: actions/smssettings.php:338
 msgid "No phone number."
 msgstr "Geen telefoonnommer."
 

+#. TRANS: Message given saving SMS phone number without having selected a carrier.
+#: actions/smssettings.php:344
+#, fuzzy
+msgid "No carrier selected."
+msgstr "Hierdie kennisgewing is verwyder."
+
+#. TRANS: Message given saving SMS phone number that is already set.
+#: actions/smssettings.php:352
+#, fuzzy
+msgid "That is already your phone number."
+msgstr "Dit is al reeds u Jabber-ID."
+
+#. TRANS: Message given saving SMS phone number that is already set for another user.
+#: actions/smssettings.php:356
+#, fuzzy
+msgid "That phone number already belongs to another user."
+msgstr "Die Jabber-ID word reeds deur 'n ander gebruiker gebruik."
+

 #. TRANS: Message given saving valid SMS phone number that is to be confirmed.
 #: actions/smssettings.php:384
 msgid ""
 #. TRANS: Message given saving valid SMS phone number that is to be confirmed.
 #: actions/smssettings.php:384
 msgid ""


@@ -3207,11 +5190,24 @@ msgid ""
 "for the code and instructions on how to use it."
 msgstr ""
 
 "for the code and instructions on how to use it."
 msgstr ""
 

+#. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
+#: actions/smssettings.php:413
+#, fuzzy
+msgid "That is the wrong confirmation number."
+msgstr "Dit is die verkeerde IM-adres."
+

 #. TRANS: Message given after successfully canceling SMS phone number confirmation.
 #: actions/smssettings.php:427
 msgid "SMS confirmation cancelled."
 msgstr "SMS-bevestiging"
 
 #. TRANS: Message given after successfully canceling SMS phone number confirmation.
 #: actions/smssettings.php:427
 msgid "SMS confirmation cancelled."
 msgstr "SMS-bevestiging"
 

+#. TRANS: Message given trying to remove an SMS phone number that is not
+#. TRANS: registered for the active user.
+#: actions/smssettings.php:448
+#, fuzzy
+msgid "That is not your phone number."
+msgstr "Dit is nie u Jabber-ID nie."
+

 #. TRANS: Message given after successfully removing a registered SMS phone number.
 #: actions/smssettings.php:470
 msgid "The SMS phone number was removed."
 #. TRANS: Message given after successfully removing a registered SMS phone number.
 #: actions/smssettings.php:470
 msgid "The SMS phone number was removed."


@@ -3236,9 +5232,15 @@ msgid ""
 "email but isn't listed here, send email to let us know at %s."
 msgstr ""
 
 "email but isn't listed here, send email to let us know at %s."
 msgstr ""
 

+#. TRANS: Message given saving SMS phone number confirmation code without having provided one.
+#: actions/smssettings.php:548
+#, fuzzy
+msgid "No code entered"
+msgstr "Geen inhoud nie!"
+

 #. TRANS: Menu item for site administration
 #: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
 #. TRANS: Menu item for site administration
 #: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196

-#: lib/adminpanelaction.php:408
+#: lib/adminpanelaction.php:395

 msgid "Snapshots"
 msgstr ""
 
 msgid "Snapshots"
 msgstr ""
 


@@ -3246,10 +5248,20 @@ msgstr ""
 msgid "Manage snapshot configuration"
 msgstr ""
 
 msgid "Manage snapshot configuration"
 msgstr ""
 

+#: actions/snapshotadminpanel.php:127
+#, fuzzy
+msgid "Invalid snapshot run value."
+msgstr "Ongeldige rol."
+

 #: actions/snapshotadminpanel.php:133
 msgid "Snapshot frequency must be a number."
 msgstr ""
 
 #: actions/snapshotadminpanel.php:133
 msgid "Snapshot frequency must be a number."
 msgstr ""
 

+#: actions/snapshotadminpanel.php:144
+#, fuzzy
+msgid "Invalid snapshot report URL."
+msgstr "Die logo-URL is ongeldig."
+

 #: actions/snapshotadminpanel.php:200
 msgid "Randomly during web hit"
 msgstr ""
 #: actions/snapshotadminpanel.php:200
 msgid "Randomly during web hit"
 msgstr ""


@@ -3282,10 +5294,33 @@ msgstr ""
 msgid "Snapshots will be sent to this URL"
 msgstr ""
 
 msgid "Snapshots will be sent to this URL"
 msgstr ""
 

+#: actions/snapshotadminpanel.php:248
+#, fuzzy
+msgid "Save snapshot settings"
+msgstr "Stoor toegangsinstellings"
+
+#. TRANS: Client error displayed trying a change a subscription for a non-subscribed profile.
+#: actions/subedit.php:75
+#, fuzzy
+msgid "You are not subscribed to that profile."
+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.
+#: actions/subedit.php:89 classes/Subscription.php:136
+#, fuzzy
+msgid "Could not save subscription."
+msgstr "Kon nie die profiel stoor nie."
+

 #: actions/subscribe.php:77
 msgid "This action only accepts POST requests."
 msgstr ""
 
 #: actions/subscribe.php:77
 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 ""


@@ -3294,48 +5329,91 @@ msgstr ""
 msgid "Subscribed"
 msgstr ""
 
 msgid "Subscribed"
 msgstr ""
 

-#: actions/subscribers.php:50
+#. TRANS: Header for list of subscribers for a user (first page).
+#. TRANS: %s is the user's nickname.
+#: actions/subscribers.php:51

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

-#: actions/subscribers.php:63
+#. TRANS: Header for list of subscribers for a user (not first page).
+#. TRANS: %1$s is the user's nickname, $2$d is the page number.
+#: actions/subscribers.php:55
+#, fuzzy, php-format
+msgid "%1$s subscribers, page %2$d"
+msgstr "%1$s en vriende, bladsy %2$d"
+
+#. TRANS: Page notice for page with an overview of all subscribers
+#. TRANS: of the logged in user's own profile.
+#: actions/subscribers.php:68

 msgid "These are the people who listen to your notices."
 msgstr ""
 
 msgid "These are the people who listen to your notices."
 msgstr ""
 

-#: actions/subscribers.php:67
+#. TRANS: Page notice for page with an overview of all subscribers of a user other
+#. TRANS: than the logged in user. %s is the user nickname.
+#: actions/subscribers.php:74

 #, php-format
 msgid "These are the people who listen to %s's notices."
 msgstr ""
 
 #, php-format
 msgid "These are the people who listen to %s's notices."
 msgstr ""
 

-#: actions/subscribers.php:108
+#. TRANS: Subscriber list text when the logged in user has no subscribers.
+#: actions/subscribers.php:116

 msgid ""
 "You have no subscribers. Try subscribing to people you know and they might "
 msgid ""
 "You have no subscribers. Try subscribing to people you know and they might "

-"return the favor"
+"return the favor."

 msgstr ""
 
 msgstr ""
 

-#: actions/subscribers.php:110
+#. TRANS: Subscriber list text when looking at the subscribers for a of a user other
+#. TRANS: than the logged in user that has no subscribers. %s is the user nickname.
+#: actions/subscribers.php:120

 #, php-format
 msgid "%s has no subscribers. Want to be the first?"
 msgstr ""
 
 #, php-format
 msgid "%s has no subscribers. Want to be the first?"
 msgstr ""
 

-#: actions/subscribers.php:114
+#. TRANS: Subscriber list text when looking at the subscribers for a of a user that has none
+#. TRANS: as an anonymous user. %s is the user nickname.
+#. TRANS: This message contains a Markdown URL. The link description is between
+#. TRANS: square brackets, and the link between parentheses. Do not separate "]("
+#. TRANS: and do not change the URL part.
+#: actions/subscribers.php:129

 #, php-format
 msgid ""
 "%s has no subscribers. Why not [register an account](%%%%action.register%%%"
 "%) and be the first?"
 msgstr ""
 
 #, php-format
 msgid ""
 "%s has no subscribers. Why not [register an account](%%%%action.register%%%"
 "%) and be the first?"
 msgstr ""
 

-#: actions/subscriptions.php:65
+#. 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
+#, fuzzy, php-format
+msgid "%1$s subscriptions, page %2$d"
+msgstr "%1$s groepe, bladsy %2$d"
+
+#. TRANS: Page notice for page with an overview of all subscriptions
+#. TRANS: of the logged in user's own profile.
+#: actions/subscriptions.php:68

 msgid "These are the people whose notices you listen to."
 msgstr ""
 
 msgid "These are the people whose notices you listen to."
 msgstr ""
 

-#: actions/subscriptions.php:69
+#. TRANS: Page notice for page with an overview of all subscriptions of a user other
+#. TRANS: than the logged in user. %s is the user nickname.
+#: actions/subscriptions.php:74

 #, php-format
 msgid "These are the people whose notices %s listens to."
 msgstr ""
 
 #, php-format
 msgid "These are the people whose notices %s listens to."
 msgstr ""
 

-#: actions/subscriptions.php:126
+#. TRANS: Subscription list text when the logged in user has no subscriptions.
+#. TRANS: This message contains Markdown URLs. The link description is between
+#. TRANS: square brackets, and the link between parentheses. Do not separate "]("
+#. TRANS: and do not change the URL part.
+#: actions/subscriptions.php:135

 #, php-format
 msgid ""
 "You're not listening to anyone's notices right now, try subscribing to "
 #, php-format
 msgid ""
 "You're not listening to anyone's notices right now, try subscribing to "


@@ -3345,19 +5423,45 @@ msgid ""
 "automatically subscribe to people you already follow there."
 msgstr ""
 
 "automatically subscribe to people you already follow there."
 msgstr ""
 

-#: actions/subscriptions.php:128 actions/subscriptions.php:132
+#. TRANS: Subscription list text when looking at the subscriptions for a of a user other
+#. TRANS: than the logged in user that has no subscriptions. %s is the user nickname.
+#. TRANS: Subscription list text when looking at the subscriptions for a of a user that has none
+#. TRANS: as an anonymous user. %s is the user nickname.
+#: actions/subscriptions.php:143 actions/subscriptions.php:149

 #, php-format
 msgid "%s is not listening to anyone."
 msgstr "%s volg niemand nie."
 
 #, php-format
 msgid "%s is not listening to anyone."
 msgstr "%s volg niemand nie."
 

-#: actions/subscriptions.php:208
+#. TRANS: Checkbox label for enabling Jabber messages for a profile in a subscriptions list.
+#: actions/subscriptions.php:226

 msgid "Jabber"
 msgstr "Jabber"
 
 msgid "Jabber"
 msgstr "Jabber"
 

-#: actions/subscriptions.php:222 lib/connectsettingsaction.php:115
+#. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
+#: actions/subscriptions.php:241

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

+#: actions/tag.php:69
+#, fuzzy, php-format
+msgid "Notices tagged with %1$s, page %2$d"
+msgstr "%1$s, bladsy %2$d"
+
+#: actions/tag.php:87
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (RSS 1.0)"
+msgstr "Voer vir vriende van %s (RSS 1.0)"
+
+#: actions/tag.php:93
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (RSS 2.0)"
+msgstr "Voer vir vriende van %s (RSS 2.0)"
+
+#: actions/tag.php:99
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (Atom)"
+msgstr "Voer vir vriende van %s (Atom)"
+

 #: actions/tagother.php:39
 msgid "No ID argument."
 msgstr "Geen ID-argument."
 #: actions/tagother.php:39
 msgid "No ID argument."
 msgstr "Geen ID-argument."


@@ -3372,7 +5476,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"
 


@@ -3391,10 +5495,39 @@ msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
 
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
 

+#: actions/tagother.php:200
+msgid "Could not save tags."
+msgstr "Kon nie die etikette stoor nie."
+
+#: actions/tagother.php:236
+#, fuzzy
+msgid "Use this form to add tags to your subscribers or subscriptions."
+msgstr "Gebruik die vorm om u applikasie te wysig."
+

 #: actions/tagrss.php:35
 msgid "No such tag."
 msgstr "Onbekende etiket."
 
 #: actions/tagrss.php:35
 msgid "No such tag."
 msgstr "Onbekende etiket."
 

+#: actions/unblock.php:59
+#, fuzzy
+msgid "You haven't blocked that user."
+msgstr "U het reeds die gebruiker geblokkeer."
+
+#: actions/unsandbox.php:72
+#, fuzzy
+msgid "User is not sandboxed."
+msgstr "Hierdie gebruiker het nie 'n profiel nie."
+
+#: actions/unsilence.php:72
+#, fuzzy
+msgid "User is not silenced."
+msgstr "Hierdie gebruiker is reeds stilgemaak."
+
+#: actions/unsubscribe.php:77
+#, fuzzy
+msgid "No profile ID in request."
+msgstr "Daar is geen profiel met daardie ID nie."
+

 #: actions/unsubscribe.php:98
 msgid "Unsubscribed"
 msgstr ""
 #: actions/unsubscribe.php:98
 msgid "Unsubscribed"
 msgstr ""


@@ -3406,54 +5539,104 @@ msgid ""
 msgstr ""
 
 #. TRANS: User admin panel title
 msgstr ""
 
 #. TRANS: User admin panel title

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

 msgctxt "TITLE"
 msgid "User"
 msgstr "Gebruiker"
 
 msgctxt "TITLE"
 msgid "User"
 msgstr "Gebruiker"
 

-#: actions/useradminpanel.php:70
-msgid "User settings for this StatusNet site."
+#. TRANS: Instruction for user admin panel.
+#: actions/useradminpanel.php:69
+msgid "User settings for this StatusNet site"

 msgstr ""
 
 msgstr ""
 

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

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

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

 msgstr ""
 
 msgstr ""
 

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

 #, php-format
 #, php-format

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

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

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

 msgid "Profile"
 msgstr "Profiel"
 
 msgid "Profile"
 msgstr "Profiel"
 

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

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

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

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

+#. TRANS: Form legend in user admin panel.

 #: actions/useradminpanel.php:231
 msgid "New users"
 msgstr "Nuwe gebruikers"
 
 #: actions/useradminpanel.php:231
 msgid "New users"
 msgstr "Nuwe gebruikers"
 

-#: actions/useradminpanel.php:251
+#. TRANS: Field label in user admin panel for setting new user welcome text.
+#: actions/useradminpanel.php:236
+#, fuzzy
+msgid "New user welcome"
+msgstr "Nuwe gebruikers"
+
+#. TRANS: Tooltip in user admin panel for setting new user welcome text.
+#: actions/useradminpanel.php:238
+#, fuzzy
+msgid "Welcome text for new users (maximum 255 characters)."
+msgstr "Die naam is te lank (maksimum 255 karakters)."
+
+#. TRANS: Field label in user admin panel for setting default subscription for new users.
+#: actions/useradminpanel.php:244
+#, fuzzy
+msgid "Default subscription"
+msgstr "Beskrywing"
+
+#. TRANS: Tooltip in user admin panel for setting default subscription for new users.
+#: actions/useradminpanel.php:246
+#, fuzzy
+msgid "Automatically subscribe new users to this user."
+msgstr "Jy kan nie gebruikers op hierdie webwerf stilmaak nie."
+
+#. TRANS: Form legend in user admin panel.
+#: actions/useradminpanel.php:256

 msgid "Invitations"
 msgstr "Uitnodigings"
 
 msgid "Invitations"
 msgstr "Uitnodigings"
 

-#: actions/useradminpanel.php:258
+#. TRANS: Field label for checkbox in user admin panel for allowing users to invite friend using site e-mail.
+#: actions/useradminpanel.php:262
+#, fuzzy
+msgid "Invitations enabled"
+msgstr "Uitnodigings"
+
+#. TRANS: Tooltip for checkbox in user admin panel for allowing users to invite friend using site e-mail.
+#: actions/useradminpanel.php:265

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

+#. TRANS: Title for button to save user settings in user admin panel.
+#: actions/useradminpanel.php:302
+msgid "Save user settings"
+msgstr ""
+
+#: actions/userauthorization.php:105
+#, fuzzy
+msgid "Authorize subscription"
+msgstr "Beskrywing"
+

 #: actions/userauthorization.php:110
 msgid ""
 "Please check these details to make sure that you want to subscribe to this "
 #: actions/userauthorization.php:110
 msgid ""
 "Please check these details to make sure that you want to subscribe to this "


@@ -3461,7 +5644,9 @@ msgid ""
 "click “Reject”."
 msgstr ""
 
 "click “Reject”."
 msgstr ""
 

+#. TRANS: Menu item for site administration

 #: actions/userauthorization.php:196 actions/version.php:167
 #: actions/userauthorization.php:196 actions/version.php:167

+#: lib/adminpanelaction.php:403

 msgid "License"
 msgstr "Lisensie"
 
 msgid "License"
 msgstr "Lisensie"
 


@@ -3469,10 +5654,21 @@ msgstr "Lisensie"
 msgid "Accept"
 msgstr "Aanvaar"
 
 msgid "Accept"
 msgstr "Aanvaar"
 

+#: actions/userauthorization.php:218 lib/subscribeform.php:115
+#: lib/subscribeform.php:139
+#, fuzzy
+msgid "Subscribe to this user"
+msgstr "U volg hierdie gebruiker:"
+

 #: actions/userauthorization.php:219
 msgid "Reject"
 msgstr "Verwerp"
 
 #: actions/userauthorization.php:219
 msgid "Reject"
 msgstr "Verwerp"
 

+#: actions/userauthorization.php:220
+#, fuzzy
+msgid "Reject this subscription"
+msgstr "Verwyder die gebruiker"
+

 #: actions/userauthorization.php:232
 msgid "No authorization request!"
 msgstr ""
 #: actions/userauthorization.php:232
 msgid "No authorization request!"
 msgstr ""


@@ -3488,6 +5684,11 @@ msgid ""
 "subscription. Your subscription token is:"
 msgstr ""
 
 "subscription. Your subscription token is:"
 msgstr ""
 

+#: actions/userauthorization.php:266
+#, fuzzy
+msgid "Subscription rejected"
+msgstr "Beskrywing word vereis."
+

 #: actions/userauthorization.php:268
 msgid ""
 "The subscription has been rejected, but no callback URL was passed. Check "
 #: actions/userauthorization.php:268
 msgid ""
 "The subscription has been rejected, but no callback URL was passed. Check "


@@ -3515,12 +5716,29 @@ msgstr ""
 msgid "Profile URL ‘%s’ is for a local user."
 msgstr ""
 
 msgid "Profile URL ‘%s’ is for a local user."
 msgstr ""
 

+#: actions/userauthorization.php:345
+#, fuzzy, php-format
+msgid "Avatar URL ‘%s’ is not valid."
+msgstr "Die \"callback\"-URL is nie geldig nie."
+

 #: actions/userauthorization.php:350
 #, php-format
 msgid "Can’t read avatar URL ‘%s’."
 msgstr "Kan nie die avatar-URL \"%s\" lees nie."
 
 #: actions/userauthorization.php:350
 #, php-format
 msgid "Can’t read avatar URL ‘%s’."
 msgstr "Kan nie die avatar-URL \"%s\" lees nie."
 

-#: actions/userdesignsettings.php:87 lib/designsettings.php:76
+#: actions/userauthorization.php:355
+#, fuzzy, php-format
+msgid "Wrong image type for avatar URL ‘%s’."
+msgstr "Kan nie die avatar-URL \"%s\" lees nie."
+
+#. TRANS: Page title for profile design page.
+#: actions/userdesignsettings.php:76 lib/designsettings.php:63
+#, fuzzy
+msgid "Profile design"
+msgstr "Profiel"
+
+#. TRANS: Instructions for profile design page.
+#: actions/userdesignsettings.php:87 lib/designsettings.php:74

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


@@ -3540,6 +5758,11 @@ msgstr "%1$s groepe, bladsy %2$d"
 msgid "Search for more groups"
 msgstr "Soek vir meer groepe"
 
 msgid "Search for more groups"
 msgstr "Soek vir meer groepe"
 

+#: actions/usergroups.php:159
+#, fuzzy, php-format
+msgid "%s is not a member of any group."
+msgstr "U is nie 'n lid van enige groep nie."
+

 #: actions/usergroups.php:164
 #, php-format
 msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
 #: actions/usergroups.php:164
 #, php-format
 msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."


@@ -3551,7 +5774,7 @@ msgstr ""
 #. TRANS: Message is used as a subtitle in atom user notice feed.
 #. TRANS: %1$s is a user name, %2$s is a site name.
 #: actions/userrss.php:97 lib/atomgroupnoticefeed.php:70
 #. TRANS: Message is used as a subtitle in atom user notice feed.
 #. TRANS: %1$s is a user name, %2$s is a site name.
 #: actions/userrss.php:97 lib/atomgroupnoticefeed.php:70

-#: lib/atomusernoticefeed.php:76
+#: lib/atomusernoticefeed.php:75

 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr "Opdaterings van %1$s op %2$s."
 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr "Opdaterings van %1$s op %2$s."


@@ -3600,7 +5823,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:805
+#: actions/version.php:198 lib/action.php:885

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


@@ -3608,50 +5831,147 @@ msgstr "Weergawe"
 msgid "Author(s)"
 msgstr "Outeur(s)"
 
 msgid "Author(s)"
 msgstr "Outeur(s)"
 

+#. TRANS: Activity title when marking a notice as favorite.
+#: classes/Fave.php:148 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.
+#: classes/Fave.php:151
+#, 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.
 #. TRANS: Server exception thrown when a URL cannot be processed.

-#: classes/File.php:143
+#: 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:175
+#: classes/File.php:188

 msgid "Robin thinks something is impossible."
 msgstr ""
 
 #. TRANS: Message given if an upload is larger than the configured maximum.
 #. TRANS: %1$d is the byte limit for uploads, %2$d is the byte count for the uploaded file.
 msgid "Robin thinks something is impossible."
 msgstr ""
 
 #. TRANS: Message given if an upload is larger than the configured maximum.
 #. TRANS: %1$d is the byte limit for uploads, %2$d is the byte count for the uploaded file.

-#: classes/File.php:190
+#. TRANS: %1$s is used for plural.
+#: classes/File.php:204

 #, php-format
 msgid ""
 #, php-format
 msgid ""

+"No file may be larger than %1$d byte and the file you sent was %2$d bytes. "
+"Try to upload a smaller version."
+msgid_plural ""

 "No file may be larger than %1$d bytes and the file you sent was %2$d bytes. "
 "Try to upload a smaller version."
 "No file may be larger than %1$d bytes and the file you sent was %2$d bytes. "
 "Try to upload a smaller version."

-msgstr ""
+msgstr[0] ""
+msgstr[1] ""

 
 #. TRANS: Message given if an upload would exceed user quota.
 
 #. TRANS: Message given if an upload would exceed user quota.

-#. TRANS: %d (number) is the user quota in bytes.
-#: classes/File.php:202
+#. TRANS: %d (number) is the user quota in bytes and is used for plural.
+#: classes/File.php:217

 #, php-format
 #, php-format

-msgid "A file this large would exceed your user quota of %d bytes."
-msgstr ""
+msgid "A file this large would exceed your user quota of %d byte."
+msgid_plural "A file this large would exceed your user quota of %d bytes."
+msgstr[0] ""
+msgstr[1] ""

 
 #. TRANS: Message given id an upload would exceed a user's monthly quota.
 
 #. TRANS: Message given id an upload would exceed a user's monthly quota.

-#. TRANS: $d (number) is the monthly user quota in bytes.
-#: classes/File.php:211
-#, php-format
-msgid "A file this large would exceed your monthly quota of %d bytes."
-msgstr ""
+#. TRANS: $d (number) is the monthly user quota in bytes and is used for plural.
+#: 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."
+msgstr[0] ""
+msgstr[1] ""
+
+#. TRANS: Client exception thrown if a file upload does not have a valid name.
+#: classes/File.php:276 classes/File.php:291
+#, fuzzy
+msgid "Invalid filename."
+msgstr "Ongeldige grootte."
+
+#. TRANS: Exception thrown when joining a group fails.
+#: classes/Group_member.php:42
+#, 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
 msgid "Not part of group."
 msgstr "Nie lid van die groep nie."
 
 
 #. TRANS: Exception thrown when trying to leave a group the user is not a member of.
 #: classes/Group_member.php:55
 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
+#, 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
+#, 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
+#, 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
+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
+#, php-format
+msgid "%1$s has joined group %2$s."
+msgstr ""
+
+#. TRANS: Server exception thrown when updating a local group fails.
+#: classes/Local_group.php:42
+#, fuzzy
+msgid "Could not update local group."
+msgstr "Dit was nie moontlik om die groep by te werk nie."
+
+#. TRANS: Exception thrown when trying creating a login token failed.
+#. TRANS: %s is the user nickname for which token creation failed.
+#: classes/Login_token.php:78
+#, fuzzy, php-format
+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.
 #: classes/Memcached_DataObject.php:533
 msgid "No database name or DSN found anywhere."
 msgstr ""
 
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
 #: classes/Memcached_DataObject.php:533
 msgid "No database name or DSN found anywhere."
 msgstr ""
 

+#. TRANS: Client exception thrown when a user tries to send a direct message while being banned from sending them.
+#: classes/Message.php:45
+#, fuzzy
+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.
+#: classes/Message.php:62
+#, 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
+#, fuzzy
+msgid "Could not update message with new URI."
+msgstr "Kan nie boodskap verwerk nie."
+

 #. TRANS: Server exception thrown when a user profile for a notice cannot be found.
 #. TRANS: %1$d is a profile ID (number), %2$d is a notice ID (number).
 #: classes/Notice.php:98
 #. TRANS: Server exception thrown when a user profile for a notice cannot be found.
 #. TRANS: %1$d is a profile ID (number), %2$d is a notice ID (number).
 #: classes/Notice.php:98


@@ -3688,6 +6008,12 @@ msgid ""
 "few minutes."
 msgstr ""
 
 "few minutes."
 msgstr ""
 

+#. TRANS: Client exception thrown when a user tries to post while being banned.
+#: classes/Notice.php:291
+#, 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
 #. 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


@@ -3695,38 +6021,64 @@ msgid "Problem saving notice."
 msgstr ""
 
 #. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
 msgstr ""
 
 #. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().

-#: classes/Notice.php:897
-msgid "Bad type provided to saveKnownGroups"
+#: classes/Notice.php:909
+msgid "Bad type provided to saveKnownGroups."

 msgstr ""
 
 #. TRANS: Server exception thrown when an update for a group inbox fails.
 msgstr ""
 
 #. TRANS: Server exception thrown when an update for a group inbox fails.

-#: classes/Notice.php:996
+#: classes/Notice.php:1008

 msgid "Problem saving group inbox."
 msgstr ""
 
 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:1122
+#, 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.
 #. 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:1757
+#: classes/Notice.php:1853

 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
 
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
 

+#. TRANS: Full name of a profile or group followed by nickname in parens
+#: classes/Profile.php:172 classes/User_group.php:247
+#, fuzzy, php-format
+msgctxt "FANCYNAME"
+msgid "%1$s (%2$s)"
+msgstr "%1$s (%2$s)"
+

 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).

-#: classes/Profile.php:737
+#: classes/Profile.php:845

 #, 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:746
+#: classes/Profile.php:854

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

+#. TRANS: Exception thrown when a right for a non-existing user profile is checked.
+#: classes/Remote_profile.php:54
+#, fuzzy
+msgid "Missing profile."
+msgstr "Hierdie gebruiker het nie 'n profiel nie."
+
+#. TRANS: Exception thrown when a tag cannot be saved.
+#: classes/Status_network.php:338
+#, fuzzy
+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.
 #. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.

-#: classes/Subscription.php:75 lib/oauthstore.php:465
+#: classes/Subscription.php:75 lib/oauthstore.php:482

 msgid "You have been banned from subscribing."
 msgstr ""
 
 msgid "You have been banned from subscribing."
 msgstr ""
 


@@ -3735,50 +6087,123 @@ msgstr ""
 msgid "Already subscribed!"
 msgstr ""
 
 msgid "Already subscribed!"
 msgstr ""
 

+#. TRANS: Exception thrown when trying to subscribe to a user who has blocked the subscribing user.
+#: classes/Subscription.php:85
+#, 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
 msgid "Not subscribed!"
 msgstr ""
 
 #. TRANS: Exception thrown when trying to unsibscribe without a subscription.
 #: classes/Subscription.php:171
 msgid "Not subscribed!"
 msgstr ""
 

+#. TRANS: Exception thrown when trying to unsubscribe a user from themselves.
+#: classes/Subscription.php:178
+#, 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
+#, 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
+#, 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
+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
+#, 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.
 #. TRANS: Notice given on user registration.
 #. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.

-#: classes/User.php:365
+#: classes/User.php:395

 #, php-format
 msgid "Welcome to %1$s, @%2$s!"
 msgstr "Welkom by %1$s, @%2$s!"
 
 #, php-format
 msgid "Welcome to %1$s, @%2$s!"
 msgstr "Welkom by %1$s, @%2$s!"
 

+#. TRANS: Server exception.
+#: classes/User.php:923
+msgid "No single user defined for single-user mode."
+msgstr ""
+
+#. TRANS: Server exception.
+#: classes/User.php:927
+msgid "Single-user mode code called when not enabled."
+msgstr ""
+

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

-#: classes/User_group.php:496
+#: classes/User_group.php:511

 msgid "Could not create group."
 msgstr "Kon nie die groep skep nie."
 
 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
+#, 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
+#, 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
+#, fuzzy
+msgid "Could not save local group info."
+msgstr "Kon nie die profiel stoor nie."
+

 #. TRANS: Link title attribute in user account settings menu.
 #. TRANS: Link title attribute in user account settings menu.

-#: lib/accountsettingsaction.php:109
+#: lib/accountsettingsaction.php:104

 msgid "Change your profile settings"
 msgstr "Verander u profiel gegewens"
 
 #. TRANS: Link title attribute in user account settings menu.
 msgid "Change your profile settings"
 msgstr "Verander u profiel gegewens"
 
 #. TRANS: Link title attribute in user account settings menu.

-#: lib/accountsettingsaction.php:123
+#: lib/accountsettingsaction.php:111
+#, fuzzy
+msgid "Upload an avatar"
+msgstr "Die opdatering van die avatar het gefaal."
+
+#. TRANS: Link title attribute in user account settings menu.
+#: lib/accountsettingsaction.php:118

 msgid "Change your password"
 msgstr "Verander u wagwoord"
 
 #. TRANS: Link title attribute in user account settings menu.
 msgid "Change your password"
 msgstr "Verander u wagwoord"
 
 #. TRANS: Link title attribute in user account settings menu.

-#: lib/accountsettingsaction.php:130
+#: lib/accountsettingsaction.php:125

 msgid "Change email handling"
 msgstr ""
 
 #. TRANS: Link title attribute in user account settings menu.
 msgid "Change email handling"
 msgstr ""
 
 #. TRANS: Link title attribute in user account settings menu.

-#: lib/accountsettingsaction.php:137
+#: lib/accountsettingsaction.php:132

 msgid "Design your profile"
 msgstr "Ontwerp u profiel"
 
 #. TRANS: Link title attribute in user account settings menu.
 msgid "Design your profile"
 msgstr "Ontwerp u profiel"
 
 #. TRANS: Link title attribute in user account settings menu.

-#: lib/accountsettingsaction.php:144
+#: lib/accountsettingsaction.php:139

 msgid "Other options"
 msgstr "Ander opsies"
 
 #. TRANS: Link description in user account settings menu.
 msgid "Other options"
 msgstr "Ander opsies"
 
 #. TRANS: Link description in user account settings menu.

-#: lib/accountsettingsaction.php:146
+#: lib/accountsettingsaction.php:141

 msgid "Other"
 msgstr "Ander"
 
 msgid "Other"
 msgstr "Ander"
 


@@ -3793,157 +6218,215 @@ msgstr "%1$s - %2$s"
 msgid "Untitled page"
 msgstr ""
 
 msgid "Untitled page"
 msgstr ""
 

+#. TRANS: Localized tooltip for '...' expansion button on overlong remote messages.
+#: lib/action.php:312
+msgctxt "TOOLTIP"
+msgid "Show more"
+msgstr ""
+

 #. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
 #. TRANS: DT element for primary navigation menu. String is hidden in default CSS.

-#: lib/action.php:449
+#: 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:455
+#: 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:458
+#: lib/action.php:540

 msgctxt "MENU"
 msgid "Personal"
 msgstr "Persoonlik"
 
 msgctxt "MENU"
 msgid "Personal"
 msgstr "Persoonlik"
 

+#. TRANS: Tooltip for main menu option "Account"
+#: 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
+#: lib/action.php:545
+msgid "Account"
+msgstr "Gebruiker"
+

 #. TRANS: Tooltip for main menu option "Services"
 #. TRANS: Tooltip for main menu option "Services"

-#: lib/action.php:465
+#: 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:468
+#: 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:471
+#: 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
 msgctxt "TOOLTIP"
 msgid "Change site configuration"
 msgstr ""
 
 #. TRANS: Main menu option when logged in and site admin for access to site configuration

-#: lib/action.php:474
+#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
+#: lib/action.php: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:478
+#: 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:481
+#: lib/action.php:563

 msgctxt "MENU"
 msgid "Invite"
 msgstr "Uitnodig"
 
 msgctxt "MENU"
 msgid "Invite"
 msgstr "Uitnodig"
 

+#. TRANS: Tooltip for main menu option "Logout"
+#: 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
 #. TRANS: Main menu option when logged in to log out the current user

-#: lib/action.php:490
+#: 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:495
+#: 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:498
+#: 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:501
+#: lib/action.php:583

 msgctxt "TOOLTIP"
 msgid "Login to the site"
 msgstr "Meld by die webwerf aan"
 
 msgctxt "TOOLTIP"
 msgid "Login to the site"
 msgstr "Meld by die webwerf aan"
 

-#: lib/action.php:504
+#. TRANS: Main menu option when not logged in to log in
+#: 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:507
+#: lib/action.php:589

 msgctxt "TOOLTIP"
 msgid "Help me!"
 msgstr "Help my!"
 
 msgctxt "TOOLTIP"
 msgid "Help me!"
 msgstr "Help my!"
 

-#: lib/action.php:510
+#. TRANS: Main menu option for help on the StatusNet site
+#: 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:513
+#: lib/action.php:595

 msgctxt "TOOLTIP"
 msgid "Search for people or text"
 msgstr "Soek na mense of teks"
 
 msgctxt "TOOLTIP"
 msgid "Search for people or text"
 msgstr "Soek na mense of teks"
 

-#: lib/action.php:516
+#. TRANS: Main menu option when logged in or when the StatusNet instance is not private
+#: lib/action.php:598

 msgctxt "MENU"
 msgid "Search"
 msgstr "Soek"
 
 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: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.
+#: lib/action.php:687
+#, fuzzy
+msgid "Local views"
+msgstr "Lokaal"
+
+#. TRANS: DT element for page notice. String is hidden in default CSS.
+#: 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.
 #. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.

-#: lib/action.php:778
+#: 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:784
+#: 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:787
+#: 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:790
+#: 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:795
+#: 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:799
+#: lib/action.php:879

 msgid "Privacy"
 msgstr "Privaatheid"
 
 msgid "Privacy"
 msgstr "Privaatheid"
 

-#. TRANS: Secondary navigation menu option.
-#: lib/action.php:802
+#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
+#: lib/action.php:882

 msgid "Source"
 msgstr "Bron"
 
 msgid "Source"
 msgstr "Bron"
 

-#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:808
+#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+#: lib/action.php:889

 msgid "Contact"
 msgstr "Kontak"
 
 msgid "Contact"
 msgstr "Kontak"
 

+#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
+#: lib/action.php:892
+#, fuzzy
+msgid "Badge"
+msgstr "Aanpor"
+

 #. TRANS: DT element for StatusNet software license.
 #. TRANS: DT element for StatusNet software license.

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

 msgid "StatusNet software license"
 msgstr ""
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
 msgid "StatusNet software license"
 msgstr ""
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.

-#: lib/action.php:843
+#. TRANS: Text between [] is a link description, text between () is the link itself.
+#. TRANS: Make sure there is no whitespace between "]" and "(".
+#. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
+#: lib/action.php: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."


@@ -3951,13 +6434,16 @@ 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:846
+#: lib/action.php:931

 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr ""
 
 #. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr ""
 
 #. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.

-#: lib/action.php:850
+#. TRANS: Make sure there is no whitespace between "]" and "(".
+#. TRANS: Text between [] is a link description, text between () is the link itself.
+#. TRANS: %s is the version of StatusNet that is being used.
+#: lib/action.php: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 %"


@@ -3966,228 +6452,469 @@ msgid ""
 msgstr ""
 
 #. TRANS: DT element for StatusNet site content license.
 msgstr ""
 
 #. TRANS: DT element for StatusNet site content license.

-#: lib/action.php:866
+#: 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:873
+#: 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:880
+#: 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:884
+#: lib/action.php:972

 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 

-#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:897
+#. TRANS: license message in footer.
+#. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
+#: lib/action.php:1004

 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr ""
 
 #, 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: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.
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.

-#: lib/action.php:1247
+#: lib/action.php: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:1257
+#: 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:122
+#: lib/activity.php:120

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

-#: lib/activityutils.php:208
+#. TRANS: Client exception thrown when there is no source attribute.
+#: lib/activityutils.php:200

 msgid "Can't handle remote content yet."
 msgstr ""
 
 msgid "Can't handle remote content yet."
 msgstr ""
 

-#: lib/activityutils.php:244
+#. TRANS: Client exception thrown when there embedded XML content is found that cannot be processed yet.
+#: lib/activityutils.php:237

 msgid "Can't handle embedded XML content yet."
 msgstr ""
 
 msgid "Can't handle embedded XML content yet."
 msgstr ""
 

-#: lib/activityutils.php:248
+#. TRANS: Client exception thrown when base64 encoded content is found that cannot be processed yet.
+#: lib/activityutils.php:242

 msgid "Can't handle embedded Base64 content yet."
 msgstr ""
 
 msgid "Can't handle embedded Base64 content yet."
 msgstr ""
 

+#. TRANS: Client error message thrown when a user tries to change admin settings but has no access rights.
+#: lib/adminpanelaction.php:96
+#, fuzzy
+msgid "You cannot make changes to this site."
+msgstr "Jy kan nie gebruikers op hierdie webwerf stilmaak nie."
+
+#. TRANS: Client error message throw when a certain panel's settings cannot be changed.
+#: lib/adminpanelaction.php:108
+#, fuzzy
+msgid "Changes to that panel are not allowed."
+msgstr "Registrasie nie toegelaat nie."
+

 #. TRANS: Client error message.
 #. TRANS: Client error message.

-#: lib/adminpanelaction.php:229
+#: lib/adminpanelaction.php:222

 msgid "showForm() not implemented."
 msgstr ""
 
 #. TRANS: Client error message
 msgid "showForm() not implemented."
 msgstr ""
 
 #. TRANS: Client error message

-#: lib/adminpanelaction.php:259
+#: lib/adminpanelaction.php:250

 msgid "saveSettings() not implemented."
 msgstr ""
 
 msgid "saveSettings() not implemented."
 msgstr ""
 

+#. TRANS: Client error message thrown if design settings could not be deleted in
+#. TRANS: the admin panel Design.
+#: lib/adminpanelaction.php:274
+#, fuzzy
+msgid "Unable to delete design setting."
+msgstr "Dit was nie moontlik om u ontwerp-instellings te stoor nie."
+
+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:337
+#, fuzzy
+msgid "Basic site configuration"
+msgstr "SMS-bevestiging"
+

 #. TRANS: Menu item for site administration
 #. TRANS: Menu item for site administration

-#: lib/adminpanelaction.php:352
+#: lib/adminpanelaction.php:339

 msgctxt "MENU"
 msgid "Site"
 msgstr "Webtuiste"
 
 msgctxt "MENU"
 msgid "Site"
 msgstr "Webtuiste"
 

+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:345
+#, fuzzy
+msgid "Design configuration"
+msgstr "SMS-bevestiging"
+

 #. TRANS: Menu item for site administration
 #. TRANS: Menu item for site administration

-#: lib/adminpanelaction.php:360
+#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
+#: lib/adminpanelaction.php:347 lib/groupnav.php:135

 msgctxt "MENU"
 msgid "Design"
 msgstr "Ontwerp"
 
 msgctxt "MENU"
 msgid "Design"
 msgstr "Ontwerp"
 

+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:353
+#, fuzzy
+msgid "User configuration"
+msgstr "SMS-bevestiging"
+

 #. TRANS: Menu item for site administration
 #. TRANS: Menu item for site administration

-#: lib/adminpanelaction.php:368 lib/personalgroupnav.php:115
+#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:118

 msgid "User"
 msgstr "Gebruiker"
 
 msgid "User"
 msgstr "Gebruiker"
 

+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:361
+#, fuzzy
+msgid "Access configuration"
+msgstr "SMS-bevestiging"
+
+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:369
+#, fuzzy
+msgid "Paths configuration"
+msgstr "SMS-bevestiging"
+
+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:377
+#, fuzzy
+msgid "Sessions configuration"
+msgstr "SMS-bevestiging"
+
+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:385
+#, fuzzy
+msgid "Edit site notice"
+msgstr "Verwyder kennisgewing"
+
+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:393
+#, fuzzy
+msgid "Snapshots configuration"
+msgstr "SMS-bevestiging"
+
+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:401
+msgid "Set site license"
+msgstr ""
+

 #. TRANS: Client error 401.
 #. TRANS: Client error 401.

-#: lib/apiauth.php:113
+#: lib/apiauth.php:111

 msgid "API resource requires read-write access, but you only have read access."
 msgstr ""
 
 msgid "API resource requires read-write access, but you only have read access."
 msgstr ""
 

-#. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:209
-#, php-format
-msgid "Describe your application in %d characters"
+#. TRANS: OAuth exception thrown when no application is found for a given consumer key.
+#: lib/apiauth.php:177
+msgid "No application for that consumer key."
+msgstr ""
+
+#. TRANS: OAuth exception given when an incorrect access token was given for a user.
+#: lib/apiauth.php:219
+msgid "Bad access token."
+msgstr ""
+
+#. TRANS: OAuth exception given when no user was found for a given token (no token was found).
+#: lib/apiauth.php:224
+msgid "No user for that token."
+msgstr ""
+
+#. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel".
+#. TRANS: Client error thrown when authentication fails.
+#: lib/apiauth.php:266 lib/apiauth.php:293
+msgid "Could not authenticate you."
+msgstr ""
+
+#. TRANS: Server error displayed when trying to create an anynymous OAuth consumer.
+#: lib/apioauthstore.php:45
+#, fuzzy
+msgid "Could not create anonymous consumer."
+msgstr "Dit was nie moontlik om die aliasse te skep nie."
+
+#. TRANS: Server error displayed when trying to create an anynymous OAuth application.
+#: lib/apioauthstore.php:69
+#, fuzzy
+msgid "Could not create anonymous OAuth application."
+msgstr "Dit was nie moontlik om die applikasie te skep nie."
+
+#. TRANS: Exception thrown when no token association could be found.
+#: lib/apioauthstore.php:151
+msgid ""
+"Could not find a profile and application associated with the request token."
+msgstr ""
+
+#. TRANS: Exception thrown when no access token can be issued.
+#: lib/apioauthstore.php:186
+#, fuzzy
+msgid "Could not issue access token."
+msgstr "Kan nie boodskap verwerk nie."
+
+#. TRANS: Server error displayed when a database error occurs.
+#: lib/apioauthstore.php:243
+msgid "Database error inserting OAuth application user."
+msgstr ""
+
+#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
+#: lib/apioauthstore.php:285
+msgid "Tried to revoke unknown token."

 msgstr ""
 
 msgstr ""
 

+#. TRANS: Exception thrown when an attempt is made to remove a revoked token.
+#: lib/apioauthstore.php:290
+msgid "Failed to delete revoked token."
+msgstr ""
+
+#. TRANS: Form guide.
+#: lib/applicationeditform.php:178
+#, fuzzy
+msgid "Icon for this application"
+msgstr "Moenie die applikasie verwyder nie"
+
+#. TRANS: Form input field instructions.
+#. TRANS: %d is the number of available characters for the description.
+#: lib/applicationeditform.php:201
+#, fuzzy, php-format
+msgid "Describe your application in %d character"
+msgid_plural "Describe your application in %d characters"
+msgstr[0] "Skrap applikasie"
+msgstr[1] "Skrap applikasie"
+
+#. TRANS: Form input field instructions.
+#: lib/applicationeditform.php:205
+#, fuzzy
+msgid "Describe your application"
+msgstr "Skrap applikasie"
+
+#. TRANS: Form input field instructions.
+#: lib/applicationeditform.php:216
+#, fuzzy
+msgid "URL of the homepage of this application"
+msgstr "U is nie die eienaar van hierdie applikasie nie."
+
+#. TRANS: Form input field label.
+#: lib/applicationeditform.php:218
+#, fuzzy
+msgid "Source URL"
+msgstr "Bron"
+

 #. TRANS: Form input field instructions.
 #. TRANS: Form input field instructions.

-#: lib/applicationeditform.php:242
+#: lib/applicationeditform.php:225
+#, fuzzy
+msgid "Organization responsible for this application"
+msgstr "U is nie die eienaar van hierdie applikasie nie."
+
+#. TRANS: Form input field instructions.
+#: lib/applicationeditform.php:234

 msgid "URL for the homepage of the organization"
 msgstr ""
 
 #. TRANS: Form input field instructions.
 msgid "URL for the homepage of the organization"
 msgstr ""
 
 #. TRANS: Form input field instructions.

-#: lib/applicationeditform.php:251
+#: lib/applicationeditform.php:243

 msgid "URL to redirect to after authentication"
 msgstr ""
 
 #. TRANS: Radio button label for application type
 msgid "URL to redirect to after authentication"
 msgstr ""
 
 #. TRANS: Radio button label for application type

-#: lib/applicationeditform.php:278
+#: lib/applicationeditform.php:271

 msgid "Browser"
 msgstr "Webblaaier"
 
 #. TRANS: Radio button label for application type
 msgid "Browser"
 msgstr "Webblaaier"
 
 #. TRANS: Radio button label for application type

-#: lib/applicationeditform.php:295
+#: lib/applicationeditform.php:288

 msgid "Desktop"
 msgstr ""
 
 #. TRANS: Form guide.
 msgid "Desktop"
 msgstr ""
 
 #. TRANS: Form guide.

-#: lib/applicationeditform.php:297
+#: lib/applicationeditform.php:290

 msgid "Type of application, browser or desktop"
 msgstr ""
 
 #. TRANS: Radio button label for access type.
 msgid "Type of application, browser or desktop"
 msgstr ""
 
 #. TRANS: Radio button label for access type.

-#: lib/applicationeditform.php:320
+#: lib/applicationeditform.php:314

 msgid "Read-only"
 msgstr "Lees-alleen"
 
 #. TRANS: Radio button label for access type.
 msgid "Read-only"
 msgstr "Lees-alleen"
 
 #. TRANS: Radio button label for access type.

-#: lib/applicationeditform.php:339
+#: lib/applicationeditform.php:334

 msgid "Read-write"
 msgstr "Lees-skryf"
 
 #. TRANS: Form guide.
 msgid "Read-write"
 msgstr "Lees-skryf"
 
 #. TRANS: Form guide.

-#: lib/applicationeditform.php:341
+#: lib/applicationeditform.php:336

 msgid "Default access for this application: read-only, or read-write"
 msgstr ""
 
 msgid "Default access for this application: read-only, or read-write"
 msgstr ""
 

-#. TRANS: Submit button title
-#: lib/applicationeditform.php:359
+#. TRANS: Submit button title.
+#: lib/applicationeditform.php:353

 msgid "Cancel"
 msgstr "Kanselleer"
 
 msgid "Cancel"
 msgstr "Kanselleer"
 

-#. TRANS: Used in application list. %1$s is a modified date, %2$s is access type (read-write or read-only)
-#: lib/applicationlist.php:144
+#: lib/applicationlist.php:247
+msgid " by "
+msgstr ""
+
+#. TRANS: Application access type
+#: lib/applicationlist.php:260
+#, fuzzy
+msgid "read-write"
+msgstr "Lees-skryf"
+
+#. TRANS: Application access type
+#: lib/applicationlist.php:262
+#, fuzzy
+msgid "read-only"
+msgstr "Lees-alleen"
+
+#. TRANS: Used in application list. %1$s is a modified date, %2$s is access type ("read-write" or "read-only")
+#: lib/applicationlist.php:268

 #, php-format
 msgid "Approved %1$s - \"%2$s\" access."
 msgstr ""
 
 #, php-format
 msgid "Approved %1$s - \"%2$s\" access."
 msgstr ""
 

+#. TRANS: Access token in the application list.
+#. TRANS: %s are the first 7 characters of the access token.
+#: lib/applicationlist.php:282
+#, php-format
+msgid "Access token starting with: %s"
+msgstr ""
+

 #. TRANS: Button label
 #. TRANS: Button label

-#: lib/applicationlist.php:159
+#: lib/applicationlist.php:298

 msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "Verwyder"
 
 msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "Verwyder"
 

-#. TRANS: DT element label in attachment list.
-#: lib/attachmentlist.php:88
-msgid "Attachments"
-msgstr "Aanhangsels"
+#: lib/atom10feed.php:112
+msgid "author element must contain a name element."
+msgstr ""

 
 #. TRANS: DT element label in attachment list item.
 
 #. TRANS: DT element label in attachment list item.

-#: lib/attachmentlist.php:265
+#: 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:279
+#: lib/attachmentlist.php:308

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

+#. TRANS: Title.
+#: lib/attachmentnoticesection.php:67
+#, fuzzy
+msgid "Notices where this attachment appears"
+msgstr "Etikette vir hierdie aanhangsel"
+
+#. TRANS: Title.

 #: lib/attachmenttagcloudsection.php:48
 msgid "Tags for this attachment"
 msgstr "Etikette vir hierdie aanhangsel"
 
 #: lib/attachmenttagcloudsection.php:48
 msgid "Tags for this attachment"
 msgstr "Etikette vir hierdie aanhangsel"
 

-#: lib/authenticationplugin.php:221 lib/authenticationplugin.php:226
-msgid "Password changing failed"
+#. TRANS: Exception thrown when a password change fails.
+#: lib/authenticationplugin.php:221 lib/authenticationplugin.php:227
+#, fuzzy
+msgid "Password changing failed."

 msgstr "Wagwoord wysiging het misluk"
 
 msgstr "Wagwoord wysiging het misluk"
 

-#: lib/authenticationplugin.php:236
-msgid "Password changing is not allowed"
+#. TRANS: Exception thrown when a password change attempt fails because it is not allowed.
+#: lib/authenticationplugin.php:238
+#, fuzzy
+msgid "Password changing is not allowed."

 msgstr "Wagwoord verandering word nie toegelaat nie"
 
 msgstr "Wagwoord verandering word nie toegelaat nie"
 

-#: lib/channel.php:157 lib/channel.php:177
+#. TRANS: Title for the form to block a user.
+#: lib/blockform.php:68
+msgid "Block"
+msgstr "Blokkeer"
+
+#. TRANS: Title for command results.
+#: lib/channel.php:160 lib/channel.php:181

 msgid "Command results"
 msgstr "Opdragresultate"
 
 msgid "Command results"
 msgstr "Opdragresultate"
 

-#: lib/channel.php:229 lib/mailhandler.php:142
+#. TRANS: Title for command results.
+#: lib/channel.php:194
+#, fuzzy
+msgid "AJAX error"
+msgstr "Ajax-fout"
+
+#. TRANS: E-mail subject when a command has completed.
+#: lib/channel.php:233 lib/mailhandler.php:143

 msgid "Command complete"
 msgstr "Opdrag voltooi"
 
 msgid "Command complete"
 msgstr "Opdrag voltooi"
 

+#. TRANS: E-mail subject when a command has failed.
+#: lib/channel.php:244
+#, fuzzy
+msgid "Command failed"
+msgstr "Opdrag voltooi"
+

 #. TRANS: Command exception text shown when a notice ID is requested that does not exist.
 #. TRANS: Command exception text shown when a notice ID is requested that does not exist.

-#: lib/command.php:84 lib/command.php:108
+#: lib/command.php:82 lib/command.php:106

 msgid "Notice with that id does not exist."
 msgstr ""
 
 msgid "Notice with that id does not exist."
 msgstr ""
 

+#. TRANS: Command exception text shown when a last user notice is requested and it does not exist.
+#. TRANS: Error text shown when a last user notice is requested and it does not exist.
+#: lib/command.php:99 lib/command.php:630
+msgid "User has no last notice."
+msgstr ""
+

 #. TRANS: Message given requesting a profile for a non-existing user.
 #. TRANS: %s is the nickname of the user for which the profile could not be found.
 #. TRANS: Message given requesting a profile for a non-existing user.
 #. TRANS: %s is the nickname of the user for which the profile could not be found.

-#: lib/command.php:130
+#: lib/command.php:128

 #, php-format
 msgid "Could not find a user with nickname %s."
 msgstr ""
 
 #. TRANS: Message given getting a non-existing user.
 #. TRANS: %s is the nickname of the user that could not be found.
 #, php-format
 msgid "Could not find a user with nickname %s."
 msgstr ""
 
 #. TRANS: Message given getting a non-existing user.
 #. TRANS: %s is the nickname of the user that could not be found.

-#: lib/command.php:150
+#: lib/command.php:148

 #, php-format
 msgid "Could not find a local user with nickname %s."
 msgstr ""
 
 #. TRANS: Error text shown when an unimplemented command is given.
 #, php-format
 msgid "Could not find a local user with nickname %s."
 msgstr ""
 
 #. TRANS: Error text shown when an unimplemented command is given.

-#: lib/command.php:185
+#: lib/command.php:183

 msgid "Sorry, this command is not yet implemented."
 msgstr ""
 
 #. TRANS: Command exception text shown when a user tries to nudge themselves.
 msgid "Sorry, this command is not yet implemented."
 msgstr ""
 
 #. TRANS: Command exception text shown when a user tries to nudge themselves.

-#: lib/command.php:231
+#: lib/command.php:229

 msgid "It does not make a lot of sense to nudge yourself!"
 msgstr ""
 
 msgid "It does not make a lot of sense to nudge yourself!"
 msgstr ""
 

+#. TRANS: Message given having nudged another user.
+#. TRANS: %s is the nickname of the user that was nudged.
+#: lib/command.php:238
+#, php-format
+msgid "Nudge sent to %s."
+msgstr ""
+

 #. TRANS: User statistics text.
 #. TRANS: %1$s is the number of other user the user is subscribed to.
 #. TRANS: %2$s is the number of users that are subscribed to the user.
 #. TRANS: %3$s is the number of notices the user has sent.
 #. TRANS: User statistics text.
 #. TRANS: %1$s is the number of other user the user is subscribed to.
 #. TRANS: %2$s is the number of users that are subscribed to the user.
 #. TRANS: %3$s is the number of notices the user has sent.

-#: lib/command.php:270
+#: lib/command.php:268

 #, php-format
 msgid ""
 "Subscriptions: %1$s\n"
 #, php-format
 msgid ""
 "Subscriptions: %1$s\n"


@@ -4196,125 +6923,231 @@ msgid ""
 msgstr ""
 
 #. TRANS: Text shown when a notice has been marked as favourite successfully.
 msgstr ""
 
 #. TRANS: Text shown when a notice has been marked as favourite successfully.

-#: lib/command.php:314
+#: lib/command.php:312

 msgid "Notice marked as fave."
 msgstr ""
 
 msgid "Notice marked as fave."
 msgstr ""
 

+#. TRANS: Message given having added a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: lib/command.php:357
+#, php-format
+msgid "%1$s joined group %2$s."
+msgstr ""
+
+#. TRANS: Message given having removed a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: lib/command.php:405
+#, php-format
+msgid "%1$s left group %2$s."
+msgstr ""
+
+#. TRANS: Whois output.
+#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
+#: lib/command.php:426
+#, fuzzy, php-format
+msgctxt "WHOIS"
+msgid "%1$s (%2$s)"
+msgstr "%1$s (%2$s)"
+

 #. TRANS: Whois output. %s is the full name of the queried user.
 #. TRANS: Whois output. %s is the full name of the queried user.

-#: lib/command.php:434
+#: lib/command.php:430

 #, php-format
 msgid "Fullname: %s"
 msgstr "Volle naam: %s"
 
 #. TRANS: Whois output. %s is the location of the queried user.
 #, php-format
 msgid "Fullname: %s"
 msgstr "Volle naam: %s"
 
 #. TRANS: Whois output. %s is the location of the queried user.

-#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:438 lib/mail.php:268
+#. TRANS: Profile info line in new-subscriber notification e-mail.
+#. TRANS: %s is a location.
+#: lib/command.php:434 lib/mail.php:278

 #, php-format
 msgid "Location: %s"
 msgstr "Ligging: %s"
 
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #, php-format
 msgid "Location: %s"
 msgstr "Ligging: %s"
 
 #. TRANS: Whois output. %s is the homepage of the queried user.

-#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:442 lib/mail.php:271
+#. TRANS: Profile info line in new-subscriber notification e-mail.
+#. TRANS: %s is a homepage.
+#: lib/command.php:438 lib/mail.php:282

 #, php-format
 msgid "Homepage: %s"
 msgstr "Tuisblad: %s"
 
 #. TRANS: Whois output. %s is the bio information of the queried user.
 #, php-format
 msgid "Homepage: %s"
 msgstr "Tuisblad: %s"
 
 #. TRANS: Whois output. %s is the bio information of the queried user.

-#: lib/command.php:446
+#: lib/command.php:442

 #, php-format
 msgid "About: %s"
 msgstr "Oor: %s"
 
 #. TRANS: Command exception text shown when trying to send a direct message to a remote user (a user not registered at the current server).
 #, php-format
 msgid "About: %s"
 msgstr "Oor: %s"
 
 #. TRANS: Command exception text shown when trying to send a direct message to a remote user (a user not registered at the current server).

-#: lib/command.php:474
+#. TRANS: %s is a remote profile.
+#: lib/command.php:471

 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
 "same server."
 msgstr ""
 
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
 "same server."
 msgstr ""
 

-#. TRANS: Message given if content is too long.
+#. TRANS: Message given if content is too long. %1$sd is used for plural.

 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.

-#: lib/command.php:491 lib/xmppmanager.php:403
-#, php-format
-msgid "Message too long - maximum is %1$d characters, you sent %2$d."
-msgstr ""
+#: lib/command.php:488
+#, 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."
+msgstr[0] ""
+"Boodskap is te lank. Die maksimum is %1$d karakters. U het %2$d karakters "
+"gestuur."
+msgstr[1] ""

 "Boodskap is te lank. Die maksimum is %1$d karakters. U het %2$d karakters "
 "gestuur."
 
 #. TRANS: Error text shown sending a direct message fails with an unknown reason.
 "Boodskap is te lank. Die maksimum is %1$d karakters. U het %2$d karakters "
 "gestuur."
 
 #. TRANS: Error text shown sending a direct message fails with an unknown reason.

-#: lib/command.php:517
+#: lib/command.php:516

 msgid "Error sending direct message."
 msgstr ""
 
 msgid "Error sending direct message."
 msgstr ""
 

+#. TRANS: Message given having repeated a notice from another user.
+#. TRANS: %s is the name of the user for which the notice was repeated.
+#: lib/command.php:553
+#, php-format
+msgid "Notice from %s repeated."
+msgstr ""
+
+#. TRANS: Error text shown when repeating a notice fails with an unknown reason.
+#: lib/command.php:556
+#, fuzzy
+msgid "Error repeating notice."
+msgstr "U kan nie u eie kennisgewings herhaal nie."
+
+#. TRANS: Message given if content of a notice for a reply is too long. %1$d is used for plural.
+#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
+#: lib/command.php:591
+#, fuzzy, php-format
+msgid "Notice too long - maximum is %1$d character, you sent %2$d."
+msgid_plural "Notice too long - maximum is %1$d characters, you sent %2$d."
+msgstr[0] ""
+"Boodskap is te lank. Die maksimum is %1$d karakters. U het %2$d karakters "
+"gestuur."
+msgstr[1] ""
+"Boodskap is te lank. Die maksimum is %1$d karakters. U het %2$d karakters "
+"gestuur."
+

 #. TRANS: Text shown having sent a reply to a notice successfully.
 #. TRANS: %s is the nickname of the user of the notice the reply was sent to.
 #. TRANS: Text shown having sent a reply to a notice successfully.
 #. TRANS: %s is the nickname of the user of the notice the reply was sent to.

-#: lib/command.php:603
+#: lib/command.php:604

 #, php-format
 msgid "Reply to %s sent."
 msgstr ""
 
 #, php-format
 msgid "Reply to %s sent."
 msgstr ""
 

+#. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
+#: lib/command.php:607
+#, fuzzy
+msgid "Error saving notice."
+msgstr "Fout tydens stoor van gebruiker; ongeldig."
+

 #. TRANS: Error text shown when no username was provided when issuing a subscribe command.
 #. TRANS: Error text shown when no username was provided when issuing a subscribe command.

-#: lib/command.php:655
+#: lib/command.php:654

 msgid "Specify the name of the user to subscribe to."
 msgstr ""
 
 #. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
 msgid "Specify the name of the user to subscribe to."
 msgstr ""
 
 #. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.

-#: lib/command.php:664
+#: lib/command.php:663

 msgid "Can't subscribe to OMB profiles by command."
 msgstr ""
 
 #. TRANS: Text shown after having subscribed to another user successfully.
 #. TRANS: %s is the name of the user the subscription was requested for.
 msgid "Can't subscribe to OMB profiles by command."
 msgstr ""
 
 #. TRANS: Text shown after having subscribed to another user successfully.
 #. TRANS: %s is the name of the user the subscription was requested for.

-#: lib/command.php:672
+#: lib/command.php:671

 #, php-format
 msgid "Subscribed to %s."
 msgstr ""
 
 #. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
 #. TRANS: Error text shown when no username was provided when issuing the command.
 #, php-format
 msgid "Subscribed to %s."
 msgstr ""
 
 #. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
 #. TRANS: Error text shown when no username was provided when issuing the command.

-#: lib/command.php:694 lib/command.php:804
+#: lib/command.php:692 lib/command.php:803

 msgid "Specify the name of the user to unsubscribe from."
 msgstr ""
 
 msgid "Specify the name of the user to unsubscribe from."
 msgstr ""
 

+#. TRANS: Text shown after having unsubscribed from another user successfully.
+#. TRANS: %s is the name of the user the unsubscription was requested for.
+#: lib/command.php:703
+#, php-format
+msgid "Unsubscribed from %s."
+msgstr ""
+
+#. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
+#. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
+#: lib/command.php:723 lib/command.php:749
+#, fuzzy
+msgid "Command not yet implemented."
+msgstr "Opdrag voltooi"
+
+#. TRANS: Text shown when issuing the command "off" successfully.
+#: lib/command.php:727
+#, fuzzy
+msgid "Notification off."
+msgstr "Geen bevestigingskode."
+

 #. TRANS: Error text shown when the command "off" fails for an unknown reason.
 #. TRANS: Error text shown when the command "off" fails for an unknown reason.

-#: lib/command.php:731
+#: lib/command.php:730

 msgid "Can't turn off notification."
 msgstr ""
 
 msgid "Can't turn off notification."
 msgstr ""
 

+#. TRANS: Text shown when issuing the command "on" successfully.
+#: lib/command.php:753
+#, fuzzy
+msgid "Notification on."
+msgstr "Geen bevestigingskode."
+
+#. TRANS: Error text shown when the command "on" fails for an unknown reason.
+#: lib/command.php:756
+#, fuzzy
+msgid "Can't turn on notification."
+msgstr "U kan nie u eie kennisgewings herhaal nie."
+

 #. TRANS: Error text shown when issuing the login command while login is disabled.
 #. TRANS: Error text shown when issuing the login command while login is disabled.

-#: lib/command.php:771
+#: lib/command.php:770

 msgid "Login command is disabled."
 msgstr ""
 
 #. TRANS: Text shown after issuing the login command successfully.
 #. TRANS: %s is a logon link..
 msgid "Login command is disabled."
 msgstr ""
 
 #. TRANS: Text shown after issuing the login command successfully.
 #. TRANS: %s is a logon link..

-#: lib/command.php:784
+#: lib/command.php:783

 #, php-format
 msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr ""
 
 #. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
 #. TRANS: %s is the name of the user the unsubscription was requested for.
 #, php-format
 msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr ""
 
 #. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
 #. TRANS: %s is the name of the user the unsubscription was requested for.

-#: lib/command.php:813
+#: lib/command.php:812

 #, php-format
 msgid "Unsubscribed %s."
 msgstr ""
 
 #, php-format
 msgid "Unsubscribed %s."
 msgstr ""
 

+#. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
+#: lib/command.php:830
+#, fuzzy
+msgid "You are not subscribed to anyone."
+msgstr "U volg hierdie gebruiker:"
+

 #. TRANS: Text shown after requesting other users a user is subscribed to.
 #. TRANS: Text shown after requesting other users a user is subscribed to.

-#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: This message supports plural forms. This message is followed by a

 #. TRANS: hard coded space and a comma separated list of subscribed users.
 #. TRANS: hard coded space and a comma separated list of subscribed users.

-#: lib/command.php:836
+#: lib/command.php:835

 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "U volg hierdie gebruiker:"
 msgstr[1] "U volg hierdie gebruikers:"
 
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "U volg hierdie gebruiker:"
 msgstr[1] "U volg hierdie gebruikers:"
 

+#. TRANS: Text shown after requesting other users that are subscribed to a user
+#. TRANS: (followers) without having any subscribers.
+#: lib/command.php:857
+#, fuzzy
+msgid "No one is subscribed to you."
+msgstr "Hierdie gebruiker volg u:"
+

 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).

-#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: This message supports plural forms. This message is followed by a

 #. TRANS: hard coded space and a comma separated list of subscribing users.
 #. TRANS: hard coded space and a comma separated list of subscribing users.

-#: lib/command.php:863
+#: lib/command.php:862

 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "Hierdie gebruiker volg u:"
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "Hierdie gebruiker volg u:"


@@ -4322,20 +7155,21 @@ msgstr[1] "Hierdie gebruikers volg u:"
 
 #. TRANS: Text shown after requesting groups a user is subscribed to without having
 #. TRANS: any group subscriptions.
 
 #. TRANS: Text shown after requesting groups a user is subscribed to without having
 #. TRANS: any group subscriptions.

-#: lib/command.php:885
+#: lib/command.php:884

 msgid "You are not a member of any groups."
 msgstr "U is nie 'n lid van enige groep nie."
 
 #. TRANS: Text shown after requesting groups a user is subscribed to.
 msgid "You are not a member of any groups."
 msgstr "U is nie 'n lid van enige groep nie."
 
 #. TRANS: Text shown after requesting groups a user is subscribed to.

-#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: This message supports plural forms. This message is followed by a

 #. TRANS: hard coded space and a comma separated list of subscribed groups.
 #. TRANS: hard coded space and a comma separated list of subscribed groups.

-#: lib/command.php:890
+#: lib/command.php:889

 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "U is 'n lid van hierdie groep:"
 msgstr[1] "U is 'n lid van hierdie groepe:"
 
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "U is 'n lid van hierdie groep:"
 msgstr[1] "U is 'n lid van hierdie groepe:"
 

-#: lib/command.php:905
+#. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
+#: lib/command.php:904

 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"


@@ -4377,61 +7211,138 @@ msgid ""
 "tracking - not yet implemented.\n"
 msgstr ""
 
 "tracking - not yet implemented.\n"
 msgstr ""
 

-#: lib/common.php:136
-msgid "I looked for configuration files in the following places: "
+#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
+#: lib/common.php:147
+#, 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:150
+msgid "I looked for configuration files in the following places:"

 msgstr ""
 
 msgstr ""
 

-#: lib/common.php:138
+#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
+#: lib/common.php:153

 msgid "You may wish to run the installer to fix this."
 msgstr ""
 
 msgid "You may wish to run the installer to fix this."
 msgstr ""
 

-#: lib/common.php:139
+#. 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:157

 msgid "Go to the installer."
 msgstr "Gaan na die installeerder."
 
 msgid "Go to the installer."
 msgstr "Gaan na die installeerder."
 

-#: lib/connectsettingsaction.php:110
+#. TRANS: Menu item for Instant Messaging settings.
+#: lib/connectsettingsaction.php:106
+#, fuzzy
+msgctxt "MENU"

 msgid "IM"
 msgstr "IM"
 
 msgid "IM"
 msgstr "IM"
 

-#: lib/connectsettingsaction.php:111
+#. TRANS: Tooltip for Instant Messaging menu item.
+#: lib/connectsettingsaction.php:108

 msgid "Updates by instant messenger (IM)"
 msgstr ""
 
 msgid "Updates by instant messenger (IM)"
 msgstr ""
 

-#: lib/connectsettingsaction.php:116
+#. TRANS: Menu item for Short Message Service settings.
+#: lib/connectsettingsaction.php:113
+#, fuzzy
+msgctxt "MENU"
+msgid "SMS"
+msgstr "SMS"
+
+#. TRANS: Tooltip for Short Message Service menu item.
+#: lib/connectsettingsaction.php:115

 msgid "Updates by SMS"
 msgstr ""
 
 msgid "Updates by SMS"
 msgstr ""
 

-#: lib/dberroraction.php:60
+#. TRANS: Menu item for OuAth connection settings.
+#: lib/connectsettingsaction.php:120
+#, fuzzy
+msgctxt "MENU"
+msgid "Connections"
+msgstr "Konnekteer"
+
+#. TRANS: Tooltip for connected applications (Connections through OAuth) menu item.
+#: lib/connectsettingsaction.php:122
+#, fuzzy
+msgid "Authorized connected applications"
+msgstr "Skrap applikasie"
+
+#: lib/dberroraction.php:59

 msgid "Database error"
 msgstr "Databasisfout"
 
 msgid "Database error"
 msgstr "Databasisfout"
 

+#. TRANS: Label in form on profile design page.
+#. TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
+#: lib/designsettings.php:104
+#, fuzzy
+msgid "Upload file"
+msgstr "Oplaai"
+
+#. TRANS: Instructions for form on profile design page.

 #: lib/designsettings.php:109
 msgid ""
 "You can upload your personal background image. The maximum file size is 2MB."
 msgstr ""
 
 #: lib/designsettings.php:109
 msgid ""
 "You can upload your personal background image. The maximum file size is 2MB."
 msgstr ""
 

-#: lib/designsettings.php:418
+#. TRANS: Radio button on profile design page that will enable use of the uploaded profile image.
+#: lib/designsettings.php:139
+#, fuzzy
+msgctxt "RADIO"
+msgid "On"
+msgstr "Aan"
+
+#. TRANS: Radio button on profile design page that will disable use of the uploaded profile image.
+#: lib/designsettings.php:156
+#, fuzzy
+msgctxt "RADIO"
+msgid "Off"
+msgstr "Af"
+
+#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
+#: lib/designsettings.php:264
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Reset"
+msgstr "Herstel"
+
+#. TRANS: Success message displayed if design settings were saved after clicking "Use defaults".
+#: lib/designsettings.php:433

 msgid "Design defaults restored."
 msgstr ""
 
 msgid "Design defaults restored."
 msgstr ""
 

-#: lib/feed.php:85
+#: lib/disfavorform.php:114 lib/disfavorform.php:144
+#, fuzzy
+msgid "Disfavor this notice"
+msgstr "Verwyder hierdie kennisgewing"
+
+#: lib/favorform.php:114 lib/favorform.php:143
+#, fuzzy
+msgid "Favor this notice"
+msgstr "Verwyder hierdie kennisgewing"
+
+#: lib/feed.php:84

 msgid "RSS 1.0"
 msgstr "RSS 1.0"
 
 msgid "RSS 1.0"
 msgstr "RSS 1.0"
 

-#: lib/feed.php:87
+#: lib/feed.php:86

 msgid "RSS 2.0"
 msgstr "RSS 2.0"
 
 msgid "RSS 2.0"
 msgstr "RSS 2.0"
 

-#: lib/feed.php:89
+#: lib/feed.php:88

 msgid "Atom"
 msgstr "Atom"
 
 msgid "Atom"
 msgstr "Atom"
 

-#: lib/feed.php:91
+#: lib/feed.php:90

 msgid "FOAF"
 msgstr "Vriende van vriende (FOAF)"
 
 msgid "FOAF"
 msgstr "Vriende van vriende (FOAF)"
 

-#: lib/feedlist.php:64
-msgid "Export data"
+#. TRANS: Header for feed links (h2).
+#: lib/feedlist.php:66
+msgid "Feeds"

 msgstr ""
 
 #: lib/galleryaction.php:121
 msgstr ""
 
 #: lib/galleryaction.php:121


@@ -4463,134 +7374,270 @@ msgstr "OK"
 msgid "Grant this user the \"%s\" role"
 msgstr ""
 
 msgid "Grant this user the \"%s\" role"
 msgstr ""
 

-#: lib/groupeditform.php:163
-msgid "URL of the homepage or blog of the group or topic"
+#: lib/groupeditform.php:154
+#, fuzzy
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces"

 msgstr ""
 msgstr ""

+"Die gebruikersnaam mag slegs uit kleinletters en syfers bestaan en mag geen "
+"spasies bevat nie."
+
+#: lib/groupeditform.php:163
+#, fuzzy
+msgid "URL of the homepage or blog of the group or topic."
+msgstr "U is nie die eienaar van hierdie applikasie nie."

 
 #: lib/groupeditform.php:168
 msgid "Describe the group or topic"
 msgstr ""
 
 #: lib/groupeditform.php:170
 
 #: lib/groupeditform.php:168
 msgid "Describe the group or topic"
 msgstr ""
 
 #: lib/groupeditform.php:170

-#, php-format
-msgid "Describe the group or topic in %d characters"
+#, fuzzy, php-format
+msgid "Describe the group or topic in %d character or less"
+msgid_plural "Describe the group or topic in %d characters or less"
+msgstr[0] "Skrap applikasie"
+msgstr[1] "Skrap applikasie"
+
+#: lib/groupeditform.php:182
+msgid ""
+"Location for the group, if any, like \"City, State (or Region), Country\"."

 msgstr ""
 
 msgstr ""
 

-#: lib/groupeditform.php:179
+#: lib/groupeditform.php:190
+#, php-format

 msgid ""
 msgid ""

-"Location for the group, if any, like \"City, State (or Region), Country\""
+"Extra nicknames for the group, separated with commas or spaces. Maximum %d "
+"alias allowed."
+msgid_plural ""
+"Extra nicknames for the group, separated with commas or spaces. Maximum %d "
+"aliases allowed."
+msgstr[0] ""
+msgstr[1] ""
+
+#. TRANS: Menu item in the group navigation page.
+#: lib/groupnav.php:86
+msgctxt "MENU"
+msgid "Group"

 msgstr ""
 
 msgstr ""
 

-#: lib/groupeditform.php:187
+#. TRANS: Tooltip for menu item in the group navigation page.
+#. TRANS: %s is the nickname of the group.
+#: lib/groupnav.php:89

 #, php-format
 #, php-format

-msgid "Extra nicknames for the group, comma- or space- separated, max %d"
+msgctxt "TOOLTIP"
+msgid "%s group"

 msgstr ""
 
 msgstr ""
 

-#: lib/groupnav.php:85
-msgid "Group"
-msgstr "Groep"
+#. TRANS: Menu item in the group navigation page.
+#: lib/groupnav.php:95
+msgctxt "MENU"
+msgid "Members"
+msgstr ""
+
+#. TRANS: Tooltip for menu item in the group navigation page.
+#. TRANS: %s is the nickname of the group.
+#: lib/groupnav.php:98
+#, php-format
+msgctxt "TOOLTIP"
+msgid "%s group members"
+msgstr ""

 
 

-#: lib/groupnav.php:101
+#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
+#: lib/groupnav.php:108
+msgctxt "MENU"

 msgid "Blocked"
 msgid "Blocked"

-msgstr "Geblokkeer"
+msgstr ""

 
 

-#: lib/groupnav.php:102
+#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
+#. TRANS: %s is the nickname of the group.
+#: lib/groupnav.php:111

 #, php-format
 #, php-format

+msgctxt "TOOLTIP"

 msgid "%s blocked users"
 msgid "%s blocked users"

-msgstr "%s geblokkeerde gebruikers"
+msgstr ""
+
+#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
+#. TRANS: %s is the nickname of the group.
+#: lib/groupnav.php:120
+#, php-format
+msgctxt "TOOLTIP"
+msgid "Edit %s group properties"
+msgstr ""

 
 

-#: lib/groupnav.php:113
+#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
+#: lib/groupnav.php:126
+msgctxt "MENU"

 msgid "Logo"
 msgid "Logo"

-msgstr "Logo"
+msgstr ""

 
 

-#: lib/groupnav.php:114
+#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
+#. TRANS: %s is the nickname of the group.
+#: lib/groupnav.php:129

 #, php-format
 #, php-format

+msgctxt "TOOLTIP"

 msgid "Add or edit %s logo"
 msgstr ""
 
 msgid "Add or edit %s logo"
 msgstr ""
 

-#: lib/groupnav.php:120
+#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
+#. TRANS: %s is the nickname of the group.
+#: lib/groupnav.php:138

 #, php-format
 #, php-format

+msgctxt "TOOLTIP"

 msgid "Add or edit %s design"
 msgstr ""
 
 msgid "Add or edit %s design"
 msgstr ""
 

+#. TRANS: Title for groups with the most members section.
+#: lib/groupsbymemberssection.php:71
+#, fuzzy
+msgid "Groups with most members"
+msgstr "Groepe waarvan %s lid is"
+
+#. TRANS: Title for groups with the most posts section.

 #: lib/groupsbypostssection.php:71
 msgid "Groups with most posts"
 msgstr ""
 
 #: lib/groupsbypostssection.php:71
 msgid "Groups with most posts"
 msgstr ""
 

-#: lib/grouptagcloudsection.php:56
+#. TRANS: Title for group tag cloud section.
+#. TRANS: %s is a group name.
+#: lib/grouptagcloudsection.php:57

 #, php-format
 msgid "Tags in %s group's notices"
 #, php-format
 msgid "Tags in %s group's notices"

-msgstr ""
+msgstr "Etikette in groepsaankondigings van %s"

 
 #. TRANS: Client exception 406
 #: lib/htmloutputter.php:104
 msgid "This page is not available in a media type you accept"
 msgstr ""
 
 
 #. TRANS: Client exception 406
 #: lib/htmloutputter.php:104
 msgid "This page is not available in a media type you accept"
 msgstr ""
 

-#: lib/imagefile.php:101 lib/mediafile.php:170
+#: lib/imagefile.php:72
+#, fuzzy
+msgid "Unsupported image file format."
+msgstr "Nie-ondersteunde formaat."
+
+#. TRANS: Exception thrown when too large a file is uploaded.
+#. TRANS: %s is the maximum file size, for example "500b", "10kB" or "2MB".
+#: lib/imagefile.php:90
+#, fuzzy, php-format
+msgid "That file is too big. The maximum file size is %s."
+msgstr "Die kennisgewing is te lank. Gebruik maksimum %d karakters."
+
+#: lib/imagefile.php:95
+#, fuzzy
+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:228

 msgid "System error uploading file."
 msgstr ""
 
 msgid "System error uploading file."
 msgstr ""
 

-#: lib/imagefile.php:109
+#: lib/imagefile.php:111

 msgid "Not an image or corrupt file."
 msgstr ""
 
 msgid "Not an image or corrupt file."
 msgstr ""
 

-#: lib/imagefile.php:163 lib/imagefile.php:224
+#: lib/imagefile.php:160
+#, fuzzy
+msgid "Lost our file."
+msgstr "Die lêer bestaan nie."
+
+#: lib/imagefile.php:197 lib/imagefile.php:237

 msgid "Unknown file type"
 msgstr "Onbekende lêertipe"
 
 msgid "Unknown file type"
 msgstr "Onbekende lêertipe"
 

-#: lib/imagefile.php:244
-msgid "MB"
-msgstr "MB"
-
-#: lib/imagefile.php:246
-msgid "kB"
-msgstr "kB"
+#. TRANS: Number of megabytes. %d is the number.
+#: lib/imagefile.php:283
+#, fuzzy, php-format
+msgid "%dMB"
+msgid_plural "%dMB"
+msgstr[0] "MB"
+msgstr[1] "MB"
+
+#. TRANS: Number of kilobytes. %d is the number.
+#: lib/imagefile.php:287
+#, fuzzy, php-format
+msgid "%dkB"
+msgid_plural "%dkB"
+msgstr[0] "kB"
+msgstr[1] "kB"
+
+#. TRANS: Number of bytes. %d is the number.
+#: lib/imagefile.php:290
+#, php-format
+msgid "%dB"
+msgid_plural "%dB"
+msgstr[0] ""
+msgstr[1] ""

 
 #: lib/jabber.php:387
 #, php-format
 msgid "[%s]"
 msgstr "[%s]"
 
 
 #: lib/jabber.php:387
 #, php-format
 msgid "[%s]"
 msgstr "[%s]"
 

-#: lib/joinform.php:114
-msgid "Join"
-msgstr "Aansluit"
+#: lib/jabber.php:567
+#, fuzzy, php-format
+msgid "Unknown inbox source %d."
+msgstr "Onbekende taal \"%s\"."

 
 #: lib/leaveform.php:114
 msgid "Leave"
 msgstr "Verlaat"
 
 
 #: lib/leaveform.php:114
 msgid "Leave"
 msgstr "Verlaat"
 

+#: lib/logingroupnav.php:80
+#, fuzzy
+msgid "Login with a username and password"
+msgstr "Ongeldige gebruikersnaam of wagwoord."
+

 #: lib/logingroupnav.php:86
 msgid "Sign up for a new account"
 msgstr ""
 
 #: lib/logingroupnav.php:86
 msgid "Sign up for a new account"
 msgstr ""
 

+#. TRANS: Subject for address confirmation email.
+#: lib/mail.php:174
+#, fuzzy
+msgid "Email address confirmation"
+msgstr "E-posadres"
+

 #. TRANS: Body for address confirmation email.
 #. TRANS: Body for address confirmation email.

-#: lib/mail.php:177
+#. TRANS: %1$s is the addressed user's nickname, %2$s is the StatusNet sitename,
+#. TRANS: %3$s is the URL to confirm at.
+#: lib/mail.php:179

 #, php-format
 msgid ""
 #, php-format
 msgid ""

-"Hey, %s.\n"
+"Hey, %1$s.\n"

 "\n"
 "\n"

-"Someone just entered this email address on %s.\n"
+"Someone just entered this email address on %2$s.\n"

 "\n"
 "If it was you, and you want to confirm your entry, use the URL below:\n"
 "\n"
 "\n"
 "If it was you, and you want to confirm your entry, use the URL below:\n"
 "\n"

-"\t%s\n"
+"\t%3$s\n"

 "\n"
 "If not, just ignore this message.\n"
 "\n"
 "Thanks for your time, \n"
 "\n"
 "If not, just ignore this message.\n"
 "\n"
 "Thanks for your time, \n"

-"%s\n"
+"%2$s\n"

 msgstr ""
 
 msgstr ""
 

-#: lib/mail.php:248
+#. TRANS: Subject of new-subscriber notification e-mail.
+#. TRANS: %1$s is the subscribing user's nickname, %2$s is the StatusNet sitename.
+#: lib/mail.php:246
+#, fuzzy, php-format
+msgid "%1$s is now listening to your notices on %2$s."
+msgstr "%s volg niemand nie."
+
+#. TRANS: This is a paragraph in a new-subscriber e-mail.
+#. TRANS: %s is a URL where the subscriber can be reported as abusive.
+#: lib/mail.php:253

 #, php-format
 msgid ""
 "If you believe this account is being used abusively, you can block them from "
 "your subscribers list and report as spam to site administrators at %s"
 msgstr ""
 
 #, php-format
 msgid ""
 "If you believe this account is being used abusively, you can block them from "
 "your subscribers list and report as spam to site administrators at %s"
 msgstr ""
 

-#. TRANS: Main body of new-subscriber notification e-mail
-#: lib/mail.php:254
+#. TRANS: Main body of new-subscriber notification e-mail.
+#. TRANS: %1$s is the subscriber's long name, %2$s is the StatusNet sitename,
+#. TRANS: %3$s is the subscriber's profile URL, %4$s is the subscriber's location (or empty)
+#. TRANS: %5$s is the subscriber's homepage URL (or empty), %6%s is the subscriber's bio (or empty)
+#. TRANS: %7$s is a link to the addressed user's e-mail settings.
+#: lib/mail.php:263

 #, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
 #, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"


@@ -4599,26 +7646,30 @@ msgid ""
 "\n"
 "%4$s%5$s%6$s\n"
 "Faithfully yours,\n"
 "\n"
 "%4$s%5$s%6$s\n"
 "Faithfully yours,\n"

-"%7$s.\n"
+"%2$s.\n"

 "\n"
 "----\n"
 "\n"
 "----\n"

-"Change your email address or notification options at %8$s\n"
+"Change your email address or notification options at %7$s\n"

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/mail.php:274
+#. TRANS: Profile info line in new-subscriber notification e-mail.
+#. TRANS: %s is biographical information.
+#: lib/mail.php:286

 #, php-format
 msgid "Bio: %s"
 msgstr "Beskrywing: %s"
 
 #, php-format
 msgid "Bio: %s"
 msgstr "Beskrywing: %s"
 

-#. TRANS: Subject of notification mail for new posting email address
-#: lib/mail.php:304
+#. TRANS: Subject of notification mail for new posting email address.
+#. TRANS: %s is the StatusNet sitename.
+#: lib/mail.php:315

 #, php-format
 msgid "New email address for posting to %s"
 msgstr ""
 
 #, php-format
 msgid "New email address for posting to %s"
 msgstr ""
 

-#. TRANS: Body of notification mail for new posting email address
-#: lib/mail.php:308
+#. TRANS: Body of notification mail for new posting email address.
+#. TRANS: %1$s is the StatusNet sitename, %2$s is the e-mail address to send
+#. TRANS: to to post by e-mail, %3$s is a URL to more instructions.
+#: lib/mail.php:321

 #, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
 #, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"


@@ -4628,34 +7679,39 @@ msgid ""
 "More email instructions at %3$s.\n"
 "\n"
 "Faithfully yours,\n"
 "More email instructions at %3$s.\n"
 "\n"
 "Faithfully yours,\n"

-"%4$s"
+"%1$s"

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Subject line for SMS-by-email notification messages
-#: lib/mail.php:433
+#. TRANS: Subject line for SMS-by-email notification messages.
+#. TRANS: %s is the posting user's nickname.
+#: lib/mail.php:442

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

-#. TRANS: Subject line for SMS-by-email address confirmation message
-#: lib/mail.php:460
+#. TRANS: Subject line for SMS-by-email address confirmation message.
+#: lib/mail.php:468

 msgid "SMS confirmation"
 msgstr "SMS-bevestiging"
 
 msgid "SMS confirmation"
 msgstr "SMS-bevestiging"
 

-#. TRANS: Main body heading for SMS-by-email address confirmation message
-#: lib/mail.php:463
+#. TRANS: Main body heading for SMS-by-email address confirmation message.
+#. TRANS: %s is the addressed user's nickname.
+#: lib/mail.php:472

 #, php-format
 msgid "%s: confirm you own this phone number with this code:"
 msgstr ""
 
 #, php-format
 msgid "%s: confirm you own this phone number with this code:"
 msgstr ""
 

-#. TRANS: Subject for 'nudge' notification email
-#: lib/mail.php:484
+#. TRANS: Subject for 'nudge' notification email.
+#. TRANS: %s is the nudging user.
+#: lib/mail.php:493

 #, php-format
 msgid "You've been nudged by %s"
 msgstr ""
 
 #, php-format
 msgid "You've been nudged by %s"
 msgstr ""
 

-#. TRANS: Body for 'nudge' notification email
-#: lib/mail.php:489
+#. TRANS: Body for 'nudge' notification email.
+#. TRANS: %1$s is the nuding user's long name, $2$s is the nudging user's nickname,
+#. TRANS: %3$s is a URL to post notices at, %4$s is the StatusNet sitename.
+#: lib/mail.php:500

 #, php-format
 msgid ""
 "%1$s (%2$s) is wondering what you are up to these days and is inviting you "
 #, php-format
 msgid ""
 "%1$s (%2$s) is wondering what you are up to these days and is inviting you "


@@ -4671,14 +7727,18 @@ msgid ""
 "%4$s\n"
 msgstr ""
 
 "%4$s\n"
 msgstr ""
 

-#. TRANS: Subject for direct-message notification email
-#: lib/mail.php:536
+#. TRANS: Subject for direct-message notification email.
+#. TRANS: %s is the sending user's nickname.
+#: lib/mail.php:547

 #, php-format
 msgid "New private message from %s"
 msgstr "Nuwe privaat boodskap vanaf %s"
 
 #, php-format
 msgid "New private message from %s"
 msgstr "Nuwe privaat boodskap vanaf %s"
 

-#. TRANS: Body for direct-message notification email
-#: lib/mail.php:541
+#. TRANS: Body for direct-message notification email.
+#. TRANS: %1$s is the sending user's long name, %2$s is the sending user's nickname,
+#. TRANS: %3$s is the message content, %4$s a URL to the message,
+#. TRANS: %5$s is the StatusNet sitename.
+#: lib/mail.php:555

 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"


@@ -4697,8 +7757,19 @@ msgid ""
 "%5$s\n"
 msgstr ""
 
 "%5$s\n"
 msgstr ""
 

-#. TRANS: Body for favorite notification email
-#: lib/mail.php:592
+#. TRANS: Subject for favorite notification e-mail.
+#. TRANS: %1$s is the adding user's long name, %2$s is the adding user's nickname.
+#: lib/mail.php:607
+#, fuzzy, php-format
+msgid "%1$s (@%2$s) added your notice as a favorite"
+msgstr "Hierdie kennisgewing is nie 'n gunsteling nie!"
+
+#. TRANS: Body for favorite notification e-mail.
+#. TRANS: %1$s is the adding user's long name, $2$s is the date the notice was created,
+#. TRANS: %3$s is a URL to the faved notice, %4$s is the faved notice text,
+#. TRANS: %5$s is a URL to all faves of the adding user, %6$s is the StatusNet sitename,
+#. TRANS: %7$s is the adding user's nickname.
+#: lib/mail.php:614

 #, php-format
 msgid ""
 "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
 #, php-format
 msgid ""
 "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"


@@ -4720,7 +7791,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
 msgstr ""
 
 #. TRANS: Line in @-reply notification e-mail. %s is conversation URL.

-#: lib/mail.php:651
+#: lib/mail.php:672

 #, php-format
 msgid ""
 "The full conversation can be read here:\n"
 #, php-format
 msgid ""
 "The full conversation can be read here:\n"


@@ -4728,13 +7799,20 @@ msgid ""
 "\t%s"
 msgstr ""
 
 "\t%s"
 msgstr ""
 

-#: lib/mail.php:657
+#. TRANS: E-mail subject for notice notification.
+#. TRANS: %1$s is the sending user's long name, %2$s is the adding user's nickname.
+#: lib/mail.php:680

 #, php-format
 #, php-format

-msgid "%s (@%s) sent a notice to your attention"
+msgid "%1$s (@%2$s) sent a notice to your attention"

 msgstr ""
 
 #. TRANS: Body of @-reply notification e-mail.
 msgstr ""
 
 #. TRANS: Body of @-reply notification e-mail.

-#: lib/mail.php:660
+#. TRANS: %1$s is the sending user's long name, $2$s is the StatusNet sitename,
+#. TRANS: %3$s is a URL to the notice, %4$s is the notice text,
+#. TRANS: %5$s is a URL to the full conversion if it exists (otherwise empty),
+#. TRANS: %6$s is a URL to reply to the notice, %7$s is a URL to all @-replied for the addressed user,
+#. TRANS: %8$s is a URL to the addressed user's e-mail settings, %9$s is the sender's nickname.
+#: lib/mail.php:688

 #, php-format
 msgid ""
 "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
 #, php-format
 msgid ""
 "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"


@@ -4771,7 +7849,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:506
+#: lib/mailbox.php:228 lib/noticelist.php:521

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


@@ -4791,67 +7869,138 @@ msgstr "Jammer, dit is nie u inkomende e-posadres nie."
 msgid "Sorry, no incoming email allowed."
 msgstr "Jammer, inkomende e-pos word nie toegelaat nie."
 
 msgid "Sorry, no incoming email allowed."
 msgstr "Jammer, inkomende e-pos word nie toegelaat nie."
 

-#: lib/mediafile.php:98 lib/mediafile.php:123
+#: lib/mailhandler.php:229
+#, fuzzy, php-format
+msgid "Unsupported message type: %s"
+msgstr "Nie-ondersteunde formaat."
+
+#. TRANS: Client exception thrown when a database error was thrown during a file upload operation.
+#: 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 ""
 

-#: lib/mediafile.php:142
+#. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
+#: lib/mediafile.php:194

 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
 msgstr ""
 
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
 msgstr ""
 

-#: lib/mediafile.php:147
+#. TRANS: Client exception.
+#: lib/mediafile.php:200

 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form."
 msgstr ""
 
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form."
 msgstr ""
 

-#: lib/mediafile.php:152
+#. TRANS: Client exception.
+#: lib/mediafile.php:206

 msgid "The uploaded file was only partially uploaded."
 msgstr ""
 
 msgid "The uploaded file was only partially uploaded."
 msgstr ""
 

-#: lib/mediafile.php:159
+#. TRANS: Client exception thrown when a temporary folder is not present to store a file upload.
+#: lib/mediafile.php:214

 msgid "Missing a temporary folder."
 msgstr ""
 
 msgid "Missing a temporary folder."
 msgstr ""
 

-#: lib/mediafile.php:162
+#. TRANS: Client exception thrown when writing to disk is not possible during a file upload operation.
+#: lib/mediafile.php:218

 msgid "Failed to write file to disk."
 msgstr ""
 
 msgid "Failed to write file to disk."
 msgstr ""
 

-#: lib/mediafile.php:165
+#. TRANS: Client exception thrown when a file upload operation has been stopped by an extension.
+#: lib/mediafile.php:222

 msgid "File upload stopped by extension."
 msgstr ""
 
 msgid "File upload stopped by extension."
 msgstr ""
 

-#: lib/mediafile.php:179 lib/mediafile.php:217
+#. TRANS: Client exception thrown when a file upload operation would cause a user to exceed a set quota.
+#: lib/mediafile.php:238 lib/mediafile.php:281

 msgid "File exceeds user's quota."
 msgstr ""
 
 msgid "File exceeds user's quota."
 msgstr ""
 

-#: lib/mediafile.php:197 lib/mediafile.php:234
+#. TRANS: Client exception thrown when a file upload operation fails because the file could
+#. TRANS: not be moved from the temporary folder to the permanent file location.
+#: lib/mediafile.php:258 lib/mediafile.php:300

 msgid "File could not be moved to destination directory."
 msgstr ""
 
 msgid "File could not be moved to destination directory."
 msgstr ""
 

-#: lib/mediafile.php:318
+#. 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:265 lib/mediafile.php:306
+#, fuzzy
+msgid "Could not determine file's MIME type."
+msgstr ""
+"Dit was nie moontlik om die boodskap van u gunstelinge te verwyder nie."
+
+#. 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:394

 #, php-format
 #, php-format

-msgid " Try using another %s format."
+msgid ""
+"\"%1$s\" is not a supported file type on this server. Try using another %2$s "
+"format."

 msgstr ""
 
 msgstr ""
 

-#: lib/mediafile.php:323
+#. TRANS: Client exception thrown trying to upload a forbidden MIME type.
+#. TRANS: %s is the file type that was denied.
+#: lib/mediafile.php:399

 #, php-format
 #, php-format

-msgid "%s is not a supported file type on this server."
+msgid "\"%s\" is not a supported file type on this server."
+msgstr ""
+
+#: lib/messageform.php:120
+#, fuzzy
+msgid "Send a direct notice"
+msgstr "Stuur 'n direkte boodskap aan hierdie gebruiker"
+
+#. 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 ""
 
 msgstr ""
 

-#: lib/messageform.php:146
+#. 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:145
+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:158
+msgid "Nickname cannot be empty."
+msgstr ""
+
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: lib/nickname.php:171
+#, 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"
+msgstr "Verwyder kennisgewing"
+

 #: lib/noticeform.php:174
 #, php-format
 msgid "What's up, %s?"
 #: lib/noticeform.php:174
 #, php-format
 msgid "What's up, %s?"


@@ -4869,6 +8018,11 @@ msgstr "Heg 'n lêer aan"
 msgid "Share my location"
 msgstr ""
 
 msgid "Share my location"
 msgstr ""
 

+#: lib/noticeform.php:216
+#, fuzzy
+msgid "Do not share my location"
+msgstr "Moenie die applikasie verwyder nie"
+

 #: lib/noticeform.php:217
 msgid ""
 "Sorry, retrieving your geo location is taking longer than expected, please "
 #: lib/noticeform.php:217
 msgid ""
 "Sorry, retrieving your geo location is taking longer than expected, please "


@@ -4876,103 +8030,154 @@ msgid ""
 msgstr ""
 
 #. TRANS: Used in coordinates as abbreviation of north
 msgstr ""
 
 #. TRANS: Used in coordinates as abbreviation of north

-#: lib/noticelist.php:436
+#: lib/noticelist.php:451

 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:438
+#: lib/noticelist.php:453

 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:440
+#: lib/noticelist.php:455

 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:442
+#: lib/noticelist.php:457

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

-#: lib/noticelist.php:444
+#: lib/noticelist.php:459

 #, 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:453
+#: lib/noticelist.php:468

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

-#: lib/noticelist.php:502
+#: lib/noticelist.php:517

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

-#: lib/noticelist.php:568
+#: lib/noticelist.php:583

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

-#: lib/noticelist.php:603
+#: lib/noticelist.php:618

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

-#: lib/noticelist.php:631
+#: lib/noticelist.php:645
+#, fuzzy
+msgid "Reply to this notice"
+msgstr "Verwyder hierdie kennisgewing"
+
+#: lib/noticelist.php:646

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

+#: lib/noticelist.php:690
+#, fuzzy
+msgid "Notice repeated"
+msgstr "Hierdie kennisgewing is verwyder."
+
+#: lib/nudgeform.php:116
+#, fuzzy
+msgid "Nudge this user"
+msgstr "Verwyder die gebruiker"
+

 #: lib/nudgeform.php:128
 msgid "Nudge"
 msgstr "Aanpor"
 
 #: lib/nudgeform.php:128
 msgid "Nudge"
 msgstr "Aanpor"
 

-#: lib/oauthstore.php:283
-msgid "Error inserting new profile"
+#: lib/nudgeform.php:128
+#, fuzzy
+msgid "Send a nudge to this user"
+msgstr "Stuur 'n direkte boodskap aan hierdie gebruiker"
+
+#: lib/oauthstore.php:294
+msgid "Error inserting new profile."
+msgstr ""
+
+#: lib/oauthstore.php:302
+msgid "Error inserting avatar."

 msgstr ""
 
 msgstr ""
 

-#: lib/oauthstore.php:306
-msgid "Error updating remote profile"
+#: lib/oauthstore.php:322
+msgid "Error inserting remote profile."

 msgstr ""
 
 msgstr ""
 

-#: lib/oauthstore.php:311
-msgid "Error inserting remote profile"
+#. TRANS: Exception thrown when a notice is denied because it has been sent before.
+#: lib/oauthstore.php:362
+msgid "Duplicate notice."

 msgstr ""
 
 msgstr ""
 

-#: lib/personalgroupnav.php:99
+#: lib/oauthstore.php:507
+#, fuzzy
+msgid "Couldn't insert new subscription."
+msgstr "Kon nie e-posbevestiging verwyder nie."
+
+#: lib/personalgroupnav.php:102

 msgid "Personal"
 msgstr "Persoonlik"
 
 msgid "Personal"
 msgstr "Persoonlik"
 

-#: lib/personalgroupnav.php:104
+#: lib/personalgroupnav.php:107

 msgid "Replies"
 msgstr "Antwoorde"
 
 msgid "Replies"
 msgstr "Antwoorde"
 

-#: lib/personalgroupnav.php:114
+#: lib/personalgroupnav.php:117

 msgid "Favorites"
 msgstr "Gunstelinge"
 
 msgid "Favorites"
 msgstr "Gunstelinge"
 

-#: lib/personalgroupnav.php:125
+#: lib/personalgroupnav.php:128

 msgid "Inbox"
 msgstr ""
 
 msgid "Inbox"
 msgstr ""
 

-#: lib/personalgroupnav.php:126
+#: lib/personalgroupnav.php:129

 msgid "Your incoming messages"
 msgstr "U inkomende boodskappe"
 
 msgid "Your incoming messages"
 msgstr "U inkomende boodskappe"
 

-#: lib/personalgroupnav.php:130
+#: lib/personalgroupnav.php:133

 msgid "Outbox"
 msgstr ""
 
 msgid "Outbox"
 msgstr ""
 

+#: lib/personalgroupnav.php:134
+#, fuzzy
+msgid "Your sent messages"
+msgstr "U inkomende boodskappe"
+

 #: lib/personaltagcloudsection.php:56
 #, php-format
 msgid "Tags in %s's notices"
 #: lib/personaltagcloudsection.php:56
 #, php-format
 msgid "Tags in %s's notices"

-msgstr ""
+msgstr "Etikette in die aankondigings van %s"

 
 

-#: lib/plugin.php:115
+#. TRANS: Displayed as version information for a plugin if no version information was found.
+#: lib/plugin.php:121

 msgid "Unknown"
 msgstr "Onbekend"
 
 msgid "Unknown"
 msgstr "Onbekend"
 

+#: lib/profileaction.php:109 lib/profileaction.php:205 lib/subgroupnav.php:82
+#, fuzzy
+msgid "Subscriptions"
+msgstr "Beskrywing"
+
+#: lib/profileaction.php:126
+#, fuzzy
+msgid "All subscriptions"
+msgstr "Beskrywing"
+

 #: lib/profileaction.php:144 lib/profileaction.php:214 lib/subgroupnav.php:90
 msgid "Subscribers"
 msgstr ""
 
 #: lib/profileaction.php:144 lib/profileaction.php:214 lib/subgroupnav.php:90
 msgid "Subscribers"
 msgstr ""
 

+#: lib/profileaction.php:161
+#, fuzzy
+msgid "All subscribers"
+msgstr "Alle lede"
+

 #: lib/profileaction.php:191
 msgid "User ID"
 msgstr "Gebruikers-ID"
 #: lib/profileaction.php:191
 msgid "User ID"
 msgstr "Gebruikers-ID"


@@ -5014,24 +8219,67 @@ msgstr "Uitgelig"
 msgid "Popular"
 msgstr "Gewild"
 
 msgid "Popular"
 msgstr "Gewild"
 

+#: lib/redirectingaction.php:95
+#, fuzzy
+msgid "No return-to arguments."
+msgstr "Geen ID-argument."
+
+#: lib/repeatform.php:107
+#, fuzzy
+msgid "Repeat this notice?"
+msgstr "Verwyder hierdie kennisgewing"
+

 #: lib/repeatform.php:132
 msgid "Yes"
 msgstr "Ja"
 
 #: lib/repeatform.php:132
 msgid "Yes"
 msgstr "Ja"
 

-#: lib/router.php:709
-msgid "No single user defined for single-user mode."
-msgstr ""
+#: lib/repeatform.php:132
+#, fuzzy
+msgid "Repeat this notice"
+msgstr "Verwyder hierdie kennisgewing"
+
+#: lib/revokeroleform.php:91
+#, fuzzy, php-format
+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.
+#: lib/router.php:938
+#, fuzzy
+msgid "Page not found."
+msgstr "Die API-funksie is nie gevind nie."

 
 #: lib/sandboxform.php:67
 msgid "Sandbox"
 msgstr ""
 
 
 #: lib/sandboxform.php:67
 msgid "Sandbox"
 msgstr ""
 

-#: lib/searchaction.php:126
+#: lib/sandboxform.php:78
+#, fuzzy
+msgid "Sandbox this user"
+msgstr "Deblokkeer hierdie gebruiker"
+
+#. TRANS: Fieldset legend for the search form.
+#: lib/searchaction.php:120
+#, fuzzy
+msgid "Search site"
+msgstr "Soek"
+
+#. TRANS: Used as a field label for the field where one or more keywords
+#. TRANS: for searching can be entered.
+#: lib/searchaction.php:128

 msgid "Keyword(s)"
 msgstr "Term(e)"
 
 msgid "Keyword(s)"
 msgstr "Term(e)"
 

-#: lib/searchaction.php:127
+#. TRANS: Button text for searching site.
+#: lib/searchaction.php:130
+msgctxt "BUTTON"

 msgid "Search"
 msgid "Search"

+msgstr ""
+
+#. TRANS: Definition list item with instructions on how to get (better) search results.
+#: lib/searchaction.php:170
+#, fuzzy
+msgid "Search help"

 msgstr "Soek"
 
 #: lib/searchgroupnav.php:80
 msgstr "Soek"
 
 #: lib/searchgroupnav.php:80


@@ -5046,6 +8294,11 @@ msgstr ""
 msgid "Find content of notices"
 msgstr ""
 
 msgid "Find content of notices"
 msgstr ""
 

+#: lib/searchgroupnav.php:85
+#, fuzzy
+msgid "Find groups on this site"
+msgstr "groepe op %s"
+

 #: lib/section.php:89
 msgid "Untitled section"
 msgstr ""
 #: lib/section.php:89
 msgid "Untitled section"
 msgstr ""


@@ -5062,6 +8315,16 @@ msgstr "Maak stil"
 msgid "Silence this user"
 msgstr "Maak die gebruikers stil"
 
 msgid "Silence this user"
 msgstr "Maak die gebruikers stil"
 

+#: lib/subgroupnav.php:83
+#, fuzzy, php-format
+msgid "People %s subscribes to"
+msgstr "Hierdie gebruiker volg u:"
+
+#: lib/subgroupnav.php:91
+#, fuzzy, php-format
+msgid "People subscribed to %s"
+msgstr "U volg hierdie gebruiker:"
+

 #: lib/subgroupnav.php:99
 #, php-format
 msgid "Groups %s is a member of"
 #: lib/subgroupnav.php:99
 #, php-format
 msgid "Groups %s is a member of"


@@ -5090,6 +8353,12 @@ msgstr ""
 msgid "None"
 msgstr "Geen"
 
 msgid "None"
 msgstr "Geen"
 

+#. TRANS: Server exception displayed if a theme name was invalid.
+#: lib/theme.php:74
+#, fuzzy
+msgid "Invalid theme name."
+msgstr "Ongeldige grootte."
+

 #: lib/themeuploader.php:50
 msgid "This server cannot handle theme uploads without ZIP support."
 msgstr ""
 #: lib/themeuploader.php:50
 msgid "This server cannot handle theme uploads without ZIP support."
 msgstr ""


@@ -5098,157 +8367,262 @@ msgstr ""
 msgid "The theme file is missing or the upload failed."
 msgstr ""
 
 msgid "The theme file is missing or the upload failed."
 msgstr ""
 

+#: lib/themeuploader.php:91 lib/themeuploader.php:102
+#: lib/themeuploader.php:279 lib/themeuploader.php:283
+#: lib/themeuploader.php:291 lib/themeuploader.php:298
+#, fuzzy
+msgid "Failed saving theme."
+msgstr "Die opdatering van die avatar het gefaal."
+

 #: lib/themeuploader.php:147
 msgid "Invalid theme: bad directory structure."
 msgstr ""
 
 #: lib/themeuploader.php:166
 #, php-format
 #: lib/themeuploader.php:147
 msgid "Invalid theme: bad directory structure."
 msgstr ""
 
 #: lib/themeuploader.php:166
 #, php-format

-msgid "Uploaded theme is too large; must be less than %d bytes uncompressed."
-msgstr ""
+msgid "Uploaded theme is too large; must be less than %d byte uncompressed."
+msgid_plural ""
+"Uploaded theme is too large; must be less than %d bytes uncompressed."
+msgstr[0] ""
+msgstr[1] ""

 
 

-#: lib/themeuploader.php:178
+#: lib/themeuploader.php:179

 msgid "Invalid theme archive: missing file css/display.css"
 msgstr ""
 
 msgid "Invalid theme archive: missing file css/display.css"
 msgstr ""
 

-#: lib/themeuploader.php:218
+#: lib/themeuploader.php:219

 msgid ""
 "Theme contains invalid file or folder name. Stick with ASCII letters, "
 "digits, underscore, and minus sign."
 msgstr ""
 
 msgid ""
 "Theme contains invalid file or folder name. Stick with ASCII letters, "
 "digits, underscore, and minus sign."
 msgstr ""
 

-#: lib/themeuploader.php:224
+#: lib/themeuploader.php:225

 msgid "Theme contains unsafe file extension names; may be unsafe."
 msgstr ""
 
 msgid "Theme contains unsafe file extension names; may be unsafe."
 msgstr ""
 

-#: lib/themeuploader.php:241
+#: lib/themeuploader.php:242

 #, php-format
 msgid "Theme contains file of type '.%s', which is not allowed."
 msgstr ""
 
 #, php-format
 msgid "Theme contains file of type '.%s', which is not allowed."
 msgstr ""
 

-#: lib/themeuploader.php:259
+#: lib/themeuploader.php:260
+#, fuzzy

 msgid "Error opening theme archive."
 msgid "Error opening theme archive."

-msgstr ""
+msgstr "Kon nie die profiel stoor nie."

 
 #: lib/topposterssection.php:74
 msgid "Top posters"
 msgstr "Mees aktiewe gebruikers"
 
 
 #: lib/topposterssection.php:74
 msgid "Top posters"
 msgstr "Mees aktiewe gebruikers"
 

+#. TRANS: Title for the form to unblock a user.
+#: lib/unblockform.php:67
+#, fuzzy
+msgctxt "TITLE"
+msgid "Unblock"
+msgstr "Deblokkeer"
+

 #: lib/unsandboxform.php:69
 msgid "Unsandbox"
 msgstr ""
 
 #: lib/unsandboxform.php:69
 msgid "Unsandbox"
 msgstr ""
 

+#: lib/unsandboxform.php:80
+#, fuzzy
+msgid "Unsandbox this user"
+msgstr "Deblokkeer hierdie gebruiker"
+
+#: lib/unsilenceform.php:67
+#, fuzzy
+msgid "Unsilence"
+msgstr "Maak stil"
+
+#: lib/unsilenceform.php:78
+#, fuzzy
+msgid "Unsilence this user"
+msgstr "Maak die gebruikers stil"
+
+#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
+#, fuzzy
+msgid "Unsubscribe from this user"
+msgstr "Deblokkeer hierdie gebruiker"
+

 #: lib/unsubscribeform.php:137
 msgid "Unsubscribe"
 msgstr ""
 
 #: lib/unsubscribeform.php:137
 msgid "Unsubscribe"
 msgstr ""
 

-#: lib/userprofile.php:117
+#. TRANS: Exception text shown when no profile can be found for a user.
+#. TRANS: %1$s is a user nickname, $2$d is a user ID (number).
+#: lib/usernoprofileexception.php:60
+#, fuzzy, php-format
+msgid "User %1$s (%2$d) has no profile record."
+msgstr "Hierdie gebruiker het nie 'n profiel nie."
+
+#: 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:1102
+#: lib/util.php:1276

 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:1105
+#: lib/util.php:1279

 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:1109
+#: lib/util.php:1283

 #, php-format
 #, php-format

-msgid "about %d minutes ago"
-msgstr "ongeveer %d minute gelede"
+msgid "about one minute ago"
+msgid_plural "about %d minutes ago"
+msgstr[0] ""
+msgstr[1] ""

 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.

-#: lib/util.php:1112
+#: lib/util.php:1286

 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:1116
+#: lib/util.php:1290

 #, php-format
 #, php-format

-msgid "about %d hours ago"
-msgstr "ongeveer %d uur gelede"
+msgid "about one hour ago"
+msgid_plural "about %d hours ago"
+msgstr[0] ""
+msgstr[1] ""

 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.

-#: lib/util.php:1119
+#: lib/util.php:1293

 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:1123
+#: lib/util.php:1297

 #, php-format
 #, php-format

-msgid "about %d days ago"
-msgstr "ongeveer %d dae gelede"
+msgid "about one day ago"
+msgid_plural "about %d days ago"
+msgstr[0] ""
+msgstr[1] ""

 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.

-#: lib/util.php:1126
+#: lib/util.php:1300

 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:1130
+#: lib/util.php:1304

 #, php-format
 #, php-format

-msgid "about %d months ago"
-msgstr "ongeveer %d maande gelede"
+msgid "about one month ago"
+msgid_plural "about %d months ago"
+msgstr[0] ""
+msgstr[1] ""

 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.

-#: lib/util.php:1133
+#: lib/util.php:1307

 msgid "about a year ago"
 msgstr "ongeveer een jaar gelede"
 
 msgid "about a year ago"
 msgstr "ongeveer een jaar gelede"
 

-#: lib/webcolor.php:82
+#: lib/webcolor.php:80

 #, php-format
 msgid "%s is not a valid color!"
 msgstr "%s is nie 'n geldige kleur nie!"
 
 #, php-format
 msgid "%s is not a valid color!"
 msgstr "%s is nie 'n geldige kleur nie!"
 

-#: lib/webcolor.php:123
-#, php-format
-msgid "%s is not a valid color! Use 3 or 6 hex chars."
+#. TRANS: Validation error for a web colour.
+#. TRANS: %s is the provided (invalid) text for colour.
+#: lib/webcolor.php:120
+#, fuzzy, php-format
+msgid "%s is not a valid color! Use 3 or 6 hex characters."

 msgstr ""
 "%s is nie 'n geldige kleur nie. Gebruik drie of ses heksadesimale karakters."
 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.
+#: 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.
+#: 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."
+msgstr[0] ""
+"Boodskap is te lank. Die maksimum is %1$d karakters. U het %2$d karakters "
+"gestuur."
+msgstr[1] ""
+"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.
+#: scripts/restoreuser.php:61
+#, 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] ""