]> git.mxchange.org Git - quix0rs-gnu-social.git/blobdiff - locale/statusnet.po
Relaxed the CSS selector for design settings so it can be used in
[quix0rs-gnu-social.git] / locale / statusnet.po
index 3ea314f340769e6209ab0c7068856d519202f5d0..0d0ea85f617f853b7ae4f474492f8f6fcd762a9d 100644 (file)
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-08 22:12+0000\n"
+"POT-Creation-Date: 2009-11-16 19:42+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -21,9 +21,22 @@ msgstr ""
 msgid "No such page"
 msgstr ""
 
-#: actions/all.php:74 actions/allrss.php:68 actions/avatarbynickname.php:75
-#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
-#: actions/remotesubscribe.php:145 actions/replies.php:73
+#: actions/all.php:74 actions/allrss.php:68
+#: actions/apiaccountupdatedeliverydevice.php:113
+#: actions/apiaccountupdateprofilebackgroundimage.php:116
+#: actions/apiaccountupdateprofileimage.php:105
+#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97
+#: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75
+#: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112
+#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
+#: actions/apigroupleave.php:99 actions/apigrouplist.php:90
+#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
+#: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81
+#: actions/avatarbynickname.php:75 actions/favoritesrss.php:74
+#: actions/foaf.php:40 actions/foaf.php:58 actions/microsummary.php:62
+#: actions/newmessage.php:116 actions/remotesubscribe.php:145
+#: actions/remotesubscribe.php:154 actions/replies.php:73
 #: actions/repliesrss.php:38 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38
 #: actions/xrds.php:71 lib/command.php:163 lib/command.php:311
@@ -68,7 +81,7 @@ msgstr ""
 #: actions/all.php:132
 #, php-format
 msgid ""
-"Try subscribing to more users, [join a group](%%action.groups%%) or post "
+"Try subscribing to more people, [join a group](%%action.groups%%) or post "
 "something yourself."
 msgstr ""
 
@@ -95,35 +108,40 @@ msgstr ""
 msgid "Updates from %1$s and friends on %2$s!"
 msgstr ""
 
-#: actions/apiaccountratelimitstatus.php:70 actions/apidirectmessage.php:156
-#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100
-#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100
-#: actions/apifriendshipsshow.php:129 actions/apigroupcreate.php:184
-#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155
-#: actions/apigroupleave.php:141 actions/apigrouplistall.php:120
-#: actions/apigrouplist.php:132 actions/apigroupmembership.php:101
-#: actions/apigroupshow.php:105 actions/apihelptest.php:88
-#: actions/apistatusesdestroy.php:102 actions/apistatusesshow.php:108
-#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93
-#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:144
-#: actions/apitimelinefriends.php:154 actions/apitimelinegroup.php:141
-#: actions/apitimelinementions.php:149 actions/apitimelinepublic.php:130
-#: actions/apitimelinetag.php:139 actions/apitimelineuser.php:163
-#: actions/apiusershow.php:101
-msgid "API method not found!"
+#: actions/apiaccountratelimitstatus.php:70
+#: actions/apiaccountupdatedeliverydevice.php:93
+#: actions/apiaccountupdateprofilebackgroundimage.php:94
+#: actions/apiaccountupdateprofilecolors.php:118
+#: actions/apiaccountupdateprofile.php:97
+msgid "API method not found."
 msgstr ""
 
-#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89
+#: actions/apiaccountupdatedeliverydevice.php:85
+#: actions/apiaccountupdateprofilebackgroundimage.php:86
+#: actions/apiaccountupdateprofilecolors.php:110
+#: actions/apiaccountupdateprofileimage.php:84
+#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89
 #: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117
 #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91
 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
-#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:109
+#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114
 msgid "This method requires a POST."
 msgstr ""
 
+#: actions/apiaccountupdatedeliverydevice.php:105
+msgid ""
+"You must specify a parameter named 'device' with a value of one of: sms, im, "
+"none"
+msgstr ""
+
+#: actions/apiaccountupdatedeliverydevice.php:132
+msgid "Could not update user."
+msgstr ""
+
+#: actions/apiaccountupdateprofilebackgroundimage.php:108
 #: actions/apiaccountupdateprofileimage.php:97
-#: actions/apistatusesupdate.php:122 actions/avatarsettings.php:254
+#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
 #: actions/newnotice.php:94 lib/designsettings.php:283
 #, php-format
 msgid ""
@@ -131,23 +149,31 @@ msgid ""
 "current configuration."
 msgstr ""
 
-#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
-#: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75
-#: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112
-#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
-#: actions/apigroupleave.php:99 actions/apigrouplist.php:90
-#: actions/apistatusesupdate.php:139 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
-#: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81
-msgid "No such user!"
+#: actions/apiaccountupdateprofilebackgroundimage.php:136
+#: actions/apiaccountupdateprofilebackgroundimage.php:146
+#: actions/apiaccountupdateprofilecolors.php:164
+#: actions/apiaccountupdateprofilecolors.php:174
+msgid "Unable to save your design settings."
+msgstr ""
+
+#: actions/apiaccountupdateprofilebackgroundimage.php:187
+#: actions/apiaccountupdateprofilecolors.php:142
+msgid "Could not update your design."
 msgstr ""
 
-#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/apiaccountupdateprofilebackgroundimage.php:194
+#: actions/apiaccountupdateprofilecolors.php:185
+#: actions/apiaccountupdateprofileimage.php:130
+#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108
 #: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80
 #: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
 msgid "User has no profile."
 msgstr ""
 
+#: actions/apiaccountupdateprofile.php:147
+msgid "Could not save profile."
+msgstr ""
+
 #: actions/apiblockcreate.php:108
 msgid "Block user failed."
 msgstr ""
@@ -193,6 +219,23 @@ msgstr ""
 msgid "All the direct messages sent to %s"
 msgstr ""
 
+#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99
+#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100
+#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129
+#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114
+#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
+#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132
+#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105
+#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
+#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
+#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
+#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149
+#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
+#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
+msgid "API method not found!"
+msgstr ""
+
 #: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109
 #: actions/apistatusesdestroy.php:113
 msgid "No status found with that ID."
@@ -378,17 +421,17 @@ msgstr ""
 msgid "No status with that ID found."
 msgstr ""
 
-#: actions/apistatusesupdate.php:152 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:157 actions/newnotice.php:155
 #: scripts/maildaemon.php:71
 #, php-format
 msgid "That's too long. Max notice size is %d chars."
 msgstr ""
 
-#: actions/apistatusesupdate.php:193
+#: actions/apistatusesupdate.php:198
 msgid "Not found"
 msgstr ""
 
-#: actions/apistatusesupdate.php:216 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:227 actions/newnotice.php:178
 #, php-format
 msgid "Max notice size is %d chars, including attachment URL."
 msgstr ""
@@ -470,7 +513,7 @@ msgid "Invalid size."
 msgstr ""
 
 #: actions/avatarsettings.php:67 actions/showgroup.php:221
-#: lib/accountsettingsaction.php:111
+#: lib/accountsettingsaction.php:112
 msgid "Avatar"
 msgstr ""
 
@@ -518,7 +561,7 @@ msgstr ""
 #: actions/groupunblock.php:66 actions/imsettings.php:206
 #: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
-#: actions/othersettings.php:145 actions/passwordsettings.php:137
+#: actions/othersettings.php:145 actions/passwordsettings.php:138
 #: actions/profilesettings.php:187 actions/recoverpassword.php:337
 #: actions/register.php:165 actions/remotesubscribe.php:77
 #: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46
@@ -615,7 +658,7 @@ msgstr ""
 msgid "No profile with that ID."
 msgstr ""
 
-#: actions/block.php:111 actions/block.php:134
+#: actions/block.php:111 actions/block.php:134 actions/groupblock.php:160
 msgid "Block user"
 msgstr ""
 
@@ -627,21 +670,22 @@ msgid ""
 msgstr ""
 
 #: actions/block.php:149 actions/deletenotice.php:145
-#: actions/groupblock.php:176
+#: actions/groupblock.php:178
 msgid "No"
 msgstr ""
 
 #: actions/block.php:149
-msgid "Do not block this user from this group"
+msgid "Do not block this user"
 msgstr ""
 
 #: actions/block.php:150 actions/deletenotice.php:146
-#: actions/groupblock.php:177
+#: actions/groupblock.php:179
 msgid "Yes"
 msgstr ""
 
-#: actions/block.php:150
-msgid "Block this user from this group"
+#: actions/block.php:150 actions/groupmembers.php:346 lib/blockform.php:123
+#: lib/blockform.php:153
+msgid "Block this user"
 msgstr ""
 
 #: actions/block.php:165
@@ -794,7 +838,8 @@ msgstr ""
 msgid "Manage how you get email from %%site.name%%."
 msgstr ""
 
-#: actions/emailsettings.php:100
+#: actions/emailsettings.php:100 actions/imsettings.php:100
+#: actions/smssettings.php:104
 msgid "Address"
 msgstr ""
 
@@ -1113,7 +1158,7 @@ msgstr ""
 msgid "Block user from group"
 msgstr ""
 
-#: actions/groupblock.php:155
+#: actions/groupblock.php:162
 #, php-format
 msgid ""
 "Are you sure you want to block user \"%s\" from the group \"%s\"? They will "
@@ -1121,7 +1166,15 @@ msgid ""
 "group in the future."
 msgstr ""
 
-#: actions/groupblock.php:193
+#: actions/groupblock.php:178
+msgid "Do not block this user from this group"
+msgstr ""
+
+#: actions/groupblock.php:179
+msgid "Block this user from this group"
+msgstr ""
+
+#: actions/groupblock.php:196
 msgid "Database error blocking user from group."
 msgstr ""
 
@@ -1180,7 +1233,7 @@ msgstr ""
 msgid "Failed updating logo."
 msgstr ""
 
-#: actions/groupmembers.php:93 lib/groupnav.php:91
+#: actions/groupmembers.php:93 lib/groupnav.php:92
 #, php-format
 msgid "%s group members"
 msgstr ""
@@ -1194,7 +1247,7 @@ msgstr ""
 msgid "A list of the users in this group."
 msgstr ""
 
-#: actions/groupmembers.php:175 lib/groupnav.php:106
+#: actions/groupmembers.php:175 lib/groupnav.php:107
 msgid "Admin"
 msgstr ""
 
@@ -1202,10 +1255,6 @@ msgstr ""
 msgid "Block"
 msgstr ""
 
-#: actions/groupmembers.php:346 lib/blockform.php:123 lib/blockform.php:153
-msgid "Block this user"
-msgstr ""
-
 #: actions/groupmembers.php:441
 msgid "Make user an admin of the group"
 msgstr ""
@@ -1266,14 +1315,14 @@ msgstr ""
 #: actions/groups.php:90
 #, php-format
 msgid ""
-"%%%%site.name%%%% groups let you find and talk with users of similar "
+"%%%%site.name%%%% groups let you find and talk with people of similar "
 "interests. After you join a group you can send messages to all other members "
-"using the syntax \"!groupname\". Are you not seeing any groups you like? Try "
-"[searching for one](%%%%action.groupsearch%%%%) or [start your own](%%%%"
-"action.newgroup%%%%)!"
+"using the syntax \"!groupname\". Don't see a group you like? Try [searching "
+"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup"
+"%%%%)"
 msgstr ""
 
-#: actions/groups.php:108 actions/usergroups.php:124 lib/groupeditform.php:122
+#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122
 msgid "Create a new group"
 msgstr ""
 
@@ -1297,17 +1346,13 @@ msgstr ""
 #, php-format
 msgid ""
 "You can send and receive notices through Jabber/GTalk [instant messages](%%"
-"doc.im%%). Configure your instant messages address and settings below."
+"doc.im%%). Configure your address and settings below."
 msgstr ""
 
 #: actions/imsettings.php:89
 msgid "IM is not available."
 msgstr ""
 
-#: actions/imsettings.php:100
-msgid "IM address"
-msgstr ""
-
 #: actions/imsettings.php:106
 msgid "Current confirmed Jabber/GTalk address."
 msgstr ""
@@ -1315,8 +1360,8 @@ msgstr ""
 #: actions/imsettings.php:114
 #, php-format
 msgid ""
-"Awaiting confirmation on this IM address. Check your Jabber/GTalk account "
-"for a message with further instructions. (Did you add %s to your buddy list?)"
+"Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
+"message with further instructions. (Did you add %s to your buddy list?)"
 msgstr ""
 
 #: actions/imsettings.php:124
@@ -1339,7 +1384,7 @@ msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr ""
 
 #: actions/imsettings.php:153
-msgid "Send me replies through Jabber/GTalk from users I am not subscribed to."
+msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr ""
 
 #: actions/imsettings.php:159
@@ -1423,11 +1468,12 @@ msgid "%s (%s)"
 msgstr ""
 
 #: actions/invite.php:136
-msgid "These are already users and you were automatically subscribed to them:"
+msgid ""
+"These people are already users and you were automatically subscribed to them:"
 msgstr ""
 
 #: actions/invite.php:144
-msgid "Invitation(s) sent to the following e-mail addresses:"
+msgid "Invitation(s) sent to the following people:"
 msgstr ""
 
 #: actions/invite.php:150
@@ -1471,12 +1517,12 @@ msgstr ""
 msgid ""
 "%1$s has invited you to join them on %2$s (%3$s).\n"
 "\n"
-"%2$s is a micro-blogging service that lets you keep up-to-date with those "
-"you know and those who interest you.\n"
+"%2$s is a micro-blogging service that lets you keep up-to-date with people "
+"you know and people who interest you.\n"
 "\n"
 "You can also share news about yourself, your thoughts, or your life online "
-"with users who know about you. It is also great for meeting others who share "
-"your interests.\n"
+"with people who know about you. It's also great for meeting new people who "
+"share your interests.\n"
 "\n"
 "%1$s said:\n"
 "\n"
@@ -1570,7 +1616,7 @@ msgid "Nickname"
 msgstr ""
 
 #: actions/login.php:249 actions/register.php:428
-#: lib/accountsettingsaction.php:114
+#: lib/accountsettingsaction.php:116
 msgid "Password"
 msgstr ""
 
@@ -1618,11 +1664,6 @@ msgstr ""
 msgid "Can't make %s an admin for group %s"
 msgstr ""
 
-#: actions/microsummary.php:62 actions/newmessage.php:116
-#: actions/remotesubscribe.php:154
-msgid "No such user"
-msgstr ""
-
 #: actions/microsummary.php:69
 msgid "No current status"
 msgstr ""
@@ -1704,7 +1745,7 @@ msgstr ""
 #: actions/noticesearch.php:124
 #, php-format
 msgid ""
-"Why not [register an account](%%%%action.register%%%%) and be the first to  "
+"Why not [register an account](%%%%action.register%%%%) and be the first to "
 "[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
 msgstr ""
 
@@ -1748,13 +1789,13 @@ msgstr ""
 msgid "Only "
 msgstr ""
 
-#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:963
-#: lib/api.php:991 lib/api.php:1101
+#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999
+#: lib/api.php:1027 lib/api.php:1137
 msgid "Not a supported data format."
 msgstr ""
 
 #: actions/opensearch.php:64
-msgid "User Search"
+msgid "People Search"
 msgstr ""
 
 #: actions/opensearch.php:67
@@ -1769,11 +1810,15 @@ msgstr ""
 msgid "Manage various other options."
 msgstr ""
 
-#: actions/othersettings.php:117
+#: actions/othersettings.php:108
+msgid " (free service)"
+msgstr ""
+
+#: actions/othersettings.php:116
 msgid "Shorten URLs with"
 msgstr ""
 
-#: actions/othersettings.php:118
+#: actions/othersettings.php:117
 msgid "Automatic shortening service to use."
 msgstr ""
 
@@ -1811,63 +1856,63 @@ msgstr ""
 msgid "Change your password."
 msgstr ""
 
-#: actions/passwordsettings.php:95 actions/recoverpassword.php:231
+#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
 msgid "Password change"
 msgstr ""
 
-#: actions/passwordsettings.php:103
+#: actions/passwordsettings.php:104
 msgid "Old password"
 msgstr ""
 
-#: actions/passwordsettings.php:107 actions/recoverpassword.php:235
+#: actions/passwordsettings.php:108 actions/recoverpassword.php:235
 msgid "New password"
 msgstr ""
 
-#: actions/passwordsettings.php:108
+#: actions/passwordsettings.php:109
 msgid "6 or more characters"
 msgstr ""
 
-#: actions/passwordsettings.php:111 actions/recoverpassword.php:239
+#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
 #: actions/register.php:432 actions/smssettings.php:134
 msgid "Confirm"
 msgstr ""
 
-#: actions/passwordsettings.php:112
+#: actions/passwordsettings.php:113
 msgid "same as password above"
 msgstr ""
 
-#: actions/passwordsettings.php:116
+#: actions/passwordsettings.php:117
 msgid "Change"
 msgstr ""
 
-#: actions/passwordsettings.php:153 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:230
 msgid "Password must be 6 or more characters."
 msgstr ""
 
-#: actions/passwordsettings.php:156 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:233
 msgid "Passwords don't match."
 msgstr ""
 
-#: actions/passwordsettings.php:164
+#: actions/passwordsettings.php:165
 msgid "Incorrect old password"
 msgstr ""
 
-#: actions/passwordsettings.php:180
+#: actions/passwordsettings.php:181
 msgid "Error saving user; invalid."
 msgstr ""
 
-#: actions/passwordsettings.php:185 actions/recoverpassword.php:368
+#: actions/passwordsettings.php:186 actions/recoverpassword.php:368
 msgid "Can't save new password."
 msgstr ""
 
-#: actions/passwordsettings.php:191 actions/recoverpassword.php:211
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
 msgid "Password saved."
 msgstr ""
 
 #: actions/peoplesearch.php:52
 #, php-format
 msgid ""
-"Search for users on %%site.name%% by their name, location, or interests. "
+"Search for people on %%site.name%% by their name, location, or interests. "
 "Separate the terms by spaces; they must be 3 characters or more."
 msgstr ""
 
@@ -1877,7 +1922,7 @@ msgstr ""
 
 #: actions/peopletag.php:70
 #, php-format
-msgid "Not a valid user tag: %s"
+msgid "Not a valid people tag: %s"
 msgstr ""
 
 #: actions/peopletag.php:144
@@ -1900,8 +1945,7 @@ msgstr ""
 
 #: actions/profilesettings.php:71
 msgid ""
-"You can update your personal profile info here so readers know more about "
-"you."
+"You can update your personal profile info here so people know more about you."
 msgstr ""
 
 #: actions/profilesettings.php:99
@@ -2231,11 +2275,11 @@ msgid "New password successfully saved. You are now logged in."
 msgstr ""
 
 #: actions/register.php:85 actions/register.php:189 actions/register.php:404
-msgid "Sorry. Only those invited can register."
+msgid "Sorry, only invited people can register."
 msgstr ""
 
 #: actions/register.php:92
-msgid "Sorry. This is an invalid invitation code."
+msgid "Sorry, invalid invitation code."
 msgstr ""
 
 #: actions/register.php:112
@@ -2286,7 +2330,7 @@ msgid "Same as password above. Required."
 msgstr ""
 
 #: actions/register.php:437 actions/register.php:441
-#: lib/accountsettingsaction.php:117
+#: lib/accountsettingsaction.php:120
 msgid "Email"
 msgstr ""
 
@@ -2321,7 +2365,7 @@ msgid ""
 "* Go to [your profile](%s) and post your first message.\n"
 "* Add a [Jabber/GTalk address](%%%%action.imsettings%%%%) so you can send "
 "notices through instant messages.\n"
-"* [Search for users](%%%%action.peoplesearch%%%%) that you may know or that "
+"* [Search for people](%%%%action.peoplesearch%%%%) that you may know or that "
 "share your interests. \n"
 "* Update your [profile settings](%%%%action.profilesettings%%%%) to tell "
 "others more about you. \n"
@@ -2420,14 +2464,14 @@ msgstr ""
 #: actions/replies.php:198
 #, php-format
 msgid ""
-"This is the timeline showing replies to %s but %s has not received a notice "
+"This is the timeline showing replies to %s but %s hasn't received a notice "
 "to his attention yet."
 msgstr ""
 
 #: actions/replies.php:203
 #, php-format
 msgid ""
-"You can engage other users in a conversation, subscribe to more users or "
+"You can engage other users in a conversation, subscribe to more people or "
 "[join groups](%%action.groups%%)."
 msgstr ""
 
@@ -2492,7 +2536,7 @@ msgstr ""
 msgid "This is a way to share what you like."
 msgstr ""
 
-#: actions/showgroup.php:82 lib/groupnav.php:85
+#: actions/showgroup.php:82 lib/groupnav.php:86
 #, php-format
 msgid "%s group"
 msgstr ""
@@ -2544,7 +2588,7 @@ msgstr ""
 msgid "FOAF for %s group"
 msgstr ""
 
-#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:90
+#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:91
 msgid "Members"
 msgstr ""
 
@@ -2694,10 +2738,6 @@ msgstr ""
 msgid "SMS is not available."
 msgstr ""
 
-#: actions/smssettings.php:104
-msgid "SMS address"
-msgstr ""
-
 #: actions/smssettings.php:112
 msgid "Current confirmed SMS-enabled phone number."
 msgstr ""
@@ -2804,17 +2844,17 @@ msgid "%s subscribers, page %d"
 msgstr ""
 
 #: actions/subscribers.php:63
-msgid "These are the users who have subscribed to your notices."
+msgid "These are the people who listen to your notices."
 msgstr ""
 
 #: actions/subscribers.php:67
 #, php-format
-msgid "These are the users who have subscribed to %s's notices."
+msgid "These are the people who listen to %s's notices."
 msgstr ""
 
 #: actions/subscribers.php:108
 msgid ""
-"You have no subscribers. Try subscribing to users you know and they might "
+"You have no subscribers. Try subscribing to people you know and they might "
 "return the favor"
 msgstr ""
 
@@ -2841,22 +2881,22 @@ msgid "%s subscriptions, page %d"
 msgstr ""
 
 #: actions/subscriptions.php:65
-msgid "These are the users whose notices you have subscribed to."
+msgid "These are the people whose notices you listen to."
 msgstr ""
 
 #: actions/subscriptions.php:69
 #, php-format
-msgid "These are the users whose notices %s has subscribed to."
+msgid "These are the people whose notices %s listens to."
 msgstr ""
 
 #: actions/subscriptions.php:121
 #, php-format
 msgid ""
-"You have not subscribed to anyone's notices right now. Try subscribing to "
-"users you know. Try [user search](%%action.peoplesearch%%), look for members "
-"in groups you're interested in and in our [featured users](%%action.featured%"
-"%). If you are a [Twitter user](%%action.twittersettings%%), you can "
-"automatically subscribe to users you already follow there."
+"You're not listening to anyone's notices right now, try subscribing to "
+"people you know. Try [people search](%%action.peoplesearch%%), look for "
+"members in groups you're interested in and in our [featured users](%%action."
+"featured%%). If you're a [Twitter user](%%action.twittersettings%%), you can "
+"automatically subscribe to people you already follow there."
 msgstr ""
 
 #: actions/subscriptions.php:123 actions/subscriptions.php:127
@@ -2905,7 +2945,7 @@ msgstr ""
 
 #: actions/tagother.php:193
 msgid ""
-"You can only tag users you are subscribed to or who are subscribed to you."
+"You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
 
 #: actions/tagother.php:200
@@ -3153,7 +3193,7 @@ msgstr ""
 msgid "DB error inserting reply: %s"
 msgstr ""
 
-#: classes/User.php:333
+#: classes/User.php:347
 #, php-format
 msgid "Welcome to %1$s, @%2$s!"
 msgstr ""
@@ -3162,7 +3202,7 @@ msgstr ""
 msgid "Profile"
 msgstr ""
 
-#: lib/accountsettingsaction.php:109
+#: lib/accountsettingsaction.php:108
 msgid "Change your profile settings"
 msgstr ""
 
@@ -3170,27 +3210,27 @@ msgstr ""
 msgid "Upload an avatar"
 msgstr ""
 
-#: lib/accountsettingsaction.php:115
+#: lib/accountsettingsaction.php:116
 msgid "Change your password"
 msgstr ""
 
-#: lib/accountsettingsaction.php:118
+#: lib/accountsettingsaction.php:120
 msgid "Change email handling"
 msgstr ""
 
-#: lib/accountsettingsaction.php:120 lib/groupnav.php:118
+#: lib/accountsettingsaction.php:124 lib/groupnav.php:119
 msgid "Design"
 msgstr ""
 
-#: lib/accountsettingsaction.php:121
+#: lib/accountsettingsaction.php:124
 msgid "Design your profile"
 msgstr ""
 
-#: lib/accountsettingsaction.php:123
+#: lib/accountsettingsaction.php:128
 msgid "Other"
 msgstr ""
 
-#: lib/accountsettingsaction.php:124
+#: lib/accountsettingsaction.php:128
 msgid "Other options"
 msgstr ""
 
@@ -3269,7 +3309,7 @@ msgid "Search"
 msgstr ""
 
 #: lib/action.php:459
-msgid "Search for users or text"
+msgid "Search for people or text"
 msgstr ""
 
 #: lib/action.php:480
@@ -3352,18 +3392,22 @@ msgstr ""
 msgid "license."
 msgstr ""
 
-#: lib/action.php:1053
+#: lib/action.php:1052
 msgid "Pagination"
 msgstr ""
 
-#: lib/action.php:1062
+#: lib/action.php:1061
 msgid "After"
 msgstr ""
 
-#: lib/action.php:1070
+#: lib/action.php:1069
 msgid "Before"
 msgstr ""
 
+#: lib/action.php:1117
+msgid "There was a problem with your session token."
+msgstr ""
+
 #: lib/attachmentlist.php:87
 msgid "Attachments"
 msgstr ""
@@ -3530,13 +3574,40 @@ msgstr ""
 msgid "This link is useable only once, and is good for only 2 minutes: %s"
 msgstr ""
 
-#: lib/command.php:613
+#: lib/command.php:618
+msgid "You are not subscribed to anyone."
+msgstr ""
+
+#: lib/command.php:620
+msgid "You are subscribed to these people: "
+msgstr ""
+
+#: lib/command.php:637
+msgid "No one is subscribed to you."
+msgstr ""
+
+#: lib/command.php:639
+msgid "These people are subscribed to you: "
+msgstr ""
+
+#: lib/command.php:656
+msgid "You are not a member of any groups."
+msgstr ""
+
+#: lib/command.php:658
+msgid "You are a member of these groups: "
+msgstr ""
+
+#: lib/command.php:670
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
 "off - turn off notifications\n"
 "help - show this help\n"
 "follow <nickname> - subscribe to user\n"
+"groups - lists the groups you have joined\n"
+"subscriptions - list the people you follow\n"
+"subscribers - list the people that follow you\n"
 "leave <nickname> - unsubscribe from user\n"
 "d <nickname> <text> - direct message to user\n"
 "get <nickname> - get last notice from user\n"
@@ -3566,19 +3637,19 @@ msgid ""
 "tracking - not yet implemented.\n"
 msgstr ""
 
-#: lib/common.php:191
+#: lib/common.php:192
 msgid "No configuration file found. "
 msgstr ""
 
-#: lib/common.php:192
+#: lib/common.php:193
 msgid "I looked for configuration files in the following places: "
 msgstr ""
 
-#: lib/common.php:193
+#: lib/common.php:194
 msgid "You may wish to run the installer to fix this."
 msgstr ""
 
-#: lib/common.php:194
+#: lib/common.php:195
 msgid "Go to the installer."
 msgstr ""
 
@@ -3758,34 +3829,34 @@ msgstr ""
 msgid "Extra nicknames for the group, comma- or space- separated, max %d"
 msgstr ""
 
-#: lib/groupnav.php:84 lib/searchgroupnav.php:84
+#: lib/groupnav.php:85 lib/searchgroupnav.php:84
 msgid "Group"
 msgstr ""
 
-#: lib/groupnav.php:100
+#: lib/groupnav.php:101
 msgid "Blocked"
 msgstr ""
 
-#: lib/groupnav.php:101
+#: lib/groupnav.php:102
 #, php-format
 msgid "%s blocked users"
 msgstr ""
 
-#: lib/groupnav.php:107
+#: lib/groupnav.php:108
 #, php-format
 msgid "Edit %s group properties"
 msgstr ""
 
-#: lib/groupnav.php:112
+#: lib/groupnav.php:113
 msgid "Logo"
 msgstr ""
 
-#: lib/groupnav.php:113
+#: lib/groupnav.php:114
 #, php-format
 msgid "Add or edit %s logo"
 msgstr ""
 
-#: lib/groupnav.php:119
+#: lib/groupnav.php:120
 #, php-format
 msgid "Add or edit %s design"
 msgstr ""
@@ -3838,7 +3909,7 @@ msgstr ""
 
 #: lib/jabber.php:192
 #, php-format
-msgid "notice id: %s"
+msgid "[%s]"
 msgstr ""
 
 #: lib/joinform.php:114
@@ -4339,7 +4410,7 @@ msgid "Could not subscribe other to you."
 msgstr ""
 
 #: lib/subs.php:124
-msgid "Not subscribed!."
+msgid "Not subscribed!"
 msgstr ""
 
 #: lib/subs.php:136
@@ -4386,47 +4457,47 @@ msgstr ""
 msgid "Message"
 msgstr ""
 
-#: lib/util.php:844
+#: lib/util.php:821
 msgid "a few seconds ago"
 msgstr ""
 
-#: lib/util.php:846
+#: lib/util.php:823
 msgid "about a minute ago"
 msgstr ""
 
-#: lib/util.php:848
+#: lib/util.php:825
 #, php-format
 msgid "about %d minutes ago"
 msgstr ""
 
-#: lib/util.php:850
+#: lib/util.php:827
 msgid "about an hour ago"
 msgstr ""
 
-#: lib/util.php:852
+#: lib/util.php:829
 #, php-format
 msgid "about %d hours ago"
 msgstr ""
 
-#: lib/util.php:854
+#: lib/util.php:831
 msgid "about a day ago"
 msgstr ""
 
-#: lib/util.php:856
+#: lib/util.php:833
 #, php-format
 msgid "about %d days ago"
 msgstr ""
 
-#: lib/util.php:858
+#: lib/util.php:835
 msgid "about a month ago"
 msgstr ""
 
-#: lib/util.php:860
+#: lib/util.php:837
 #, php-format
 msgid "about %d months ago"
 msgstr ""
 
-#: lib/util.php:862
+#: lib/util.php:839
 msgid "about a year ago"
 msgstr ""