Merge branch '1.0.x' into schema-x

1 files changed, 106 insertions, 106 deletions

diff --git a/plugins/OStatus/locale/OStatus.pot b/plugins/OStatus/locale/OStatus.pot
index a94ea84dd..24b434757 100644
--- a/plugins/OStatus/locale/OStatus.pot
+++ b/plugins/OStatus/locale/OStatus.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-04 22:30+0000\n"
+"POT-Creation-Date: 2010-10-09 14:04+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"
@@ -18,243 +18,243 @@ msgstr ""
 
 #. TRANS: Link description for link to subscribe to a remote user.
 #. TRANS: Link text for a user to subscribe to an OStatus user.
-#: OStatusPlugin.php:227 OStatusPlugin.php:937
+#: OStatusPlugin.php:229 OStatusPlugin.php:939
 msgid "Subscribe"
 msgstr ""
 
 #. TRANS: Link description for link to join a remote group.
-#: OStatusPlugin.php:246 OStatusPlugin.php:655 actions/ostatussub.php:107
+#: OStatusPlugin.php:248 OStatusPlugin.php:657 actions/ostatussub.php:109
 msgid "Join"
 msgstr ""
 
 #. TRANSLATE: %s is a domain.
-#: OStatusPlugin.php:459
+#: OStatusPlugin.php:461
 #, php-format
 msgid "Sent from %s via OStatus"
 msgstr ""
 
 #. TRANS: Exception.
-#: OStatusPlugin.php:531
+#: OStatusPlugin.php:533
 msgid "Could not set up remote subscription."
 msgstr ""
 
-#: OStatusPlugin.php:605
+#: OStatusPlugin.php:607
 msgid "Unfollow"
 msgstr ""
 
 #. TRANS: Success message for unsubscribe from user attempt through OStatus.
 #. TRANS: %1$s is the unsubscriber's name, %2$s is the unsubscribed user's name.
-#: OStatusPlugin.php:608
+#: OStatusPlugin.php:610
 #, php-format
 msgid "%1$s stopped following %2$s."
 msgstr ""
 
-#: OStatusPlugin.php:636
+#: OStatusPlugin.php:638
 msgid "Could not set up remote group membership."
 msgstr ""
 
 #. 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.
-#: OStatusPlugin.php:658
+#: OStatusPlugin.php:660
 #, php-format
 msgid "%1$s has joined group %2$s."
 msgstr ""
 
 #. TRANS: Exception.
-#: OStatusPlugin.php:667
+#: OStatusPlugin.php:669
 msgid "Failed joining remote group."
 msgstr ""
 
-#: OStatusPlugin.php:707
+#: OStatusPlugin.php:709
 msgid "Leave"
 msgstr ""
 
 #. TRANS: Success message for unsubscribe from group attempt through OStatus.
 #. TRANS: %1$s is the member name, %2$s is the unsubscribed group's name.
-#: OStatusPlugin.php:710
+#: OStatusPlugin.php:712
 #, php-format
 msgid "%1$s has left group %2$s."
 msgstr ""
 
-#: OStatusPlugin.php:785
+#: OStatusPlugin.php:787
 msgid "Disfavor"
 msgstr ""
 
 #. TRANS: Success message for remove a favorite notice through OStatus.
 #. TRANS: %1$s is the unfavoring user's name, %2$s is URI to the no longer favored notice.
-#: OStatusPlugin.php:788
+#: OStatusPlugin.php:790
 #, php-format
 msgid "%1$s marked notice %2$s as no longer a favorite."
 msgstr ""
 
 #. TRANS: Link text for link to remote subscribe.
-#: OStatusPlugin.php:864
+#: OStatusPlugin.php:866
 msgid "Remote"
 msgstr ""
 
 #. TRANS: Title for activity.
-#: OStatusPlugin.php:904
+#: OStatusPlugin.php:906
 msgid "Profile update"
 msgstr ""
 
 #. TRANS: Ping text for remote profile update through OStatus.
 #. TRANS: %s is user that updated their profile.
-#: OStatusPlugin.php:907
+#: OStatusPlugin.php:909
 #, php-format
 msgid "%s has updated their profile page."
 msgstr ""
 
 #. TRANS: Plugin description.
-#: OStatusPlugin.php:952
+#: OStatusPlugin.php:954
 msgid ""
 "Follow people across social networks that implement <a href=\"http://ostatus."
 "org/\">OStatus</a>."
 msgstr ""
 
-#: classes/FeedSub.php:248
+#: classes/FeedSub.php:252
 msgid "Attempting to start PuSH subscription for feed with no hub."
 msgstr ""
 
-#: classes/FeedSub.php:278
+#: classes/FeedSub.php:282
 msgid "Attempting to end PuSH subscription for feed with no hub."
 msgstr ""
 
 #. TRANS: Server exception.
-#: classes/Ostatus_profile.php:188
+#: classes/Ostatus_profile.php:192
 #, php-format
 msgid "Invalid ostatus_profile state: both group and profile IDs set for %s."
 msgstr ""
 
 #. TRANS: Server exception.
-#: classes/Ostatus_profile.php:191
+#: classes/Ostatus_profile.php:195
 #, php-format
 msgid "Invalid ostatus_profile state: both group and profile IDs empty for %s."
 msgstr ""
 
 #. TRANS: Server exception.
 #. TRANS: %1$s is the method name the exception occured in, %2$s is the actor type.
-#: classes/Ostatus_profile.php:281
+#: classes/Ostatus_profile.php:285
 #, php-format
 msgid "Invalid actor passed to %1$s: %2$s."
 msgstr ""
 
 #. TRANS: Server exception.
-#: classes/Ostatus_profile.php:374
+#: classes/Ostatus_profile.php:378
 msgid ""
 "Invalid type passed to Ostatus_profile::notify. It must be XML string or "
 "Activity entry."
 msgstr ""
 
-#: classes/Ostatus_profile.php:404
+#: classes/Ostatus_profile.php:408
 msgid "Unknown feed format."
 msgstr ""
 
-#: classes/Ostatus_profile.php:427
+#: classes/Ostatus_profile.php:431
 msgid "RSS feed without a channel."
 msgstr ""
 
 #. TRANS: Client exception.
-#: classes/Ostatus_profile.php:472
+#: classes/Ostatus_profile.php:476
 msgid "Can't handle that kind of post."
 msgstr ""
 
 #. TRANS: Client exception. %s is a source URL.
-#: classes/Ostatus_profile.php:555
+#: classes/Ostatus_profile.php:559
 #, php-format
 msgid "No content for notice %s."
 msgstr ""
 
 #. TRANS: Shown when a notice is longer than supported and/or when attachments are present.
-#: classes/Ostatus_profile.php:588
+#: classes/Ostatus_profile.php:592
 msgid "Show more"
 msgstr ""
 
 #. TRANS: Exception. %s is a profile URL.
-#: classes/Ostatus_profile.php:781
+#: classes/Ostatus_profile.php:785
 #, php-format
 msgid "Could not reach profile page %s."
 msgstr ""
 
 #. TRANS: Exception.
-#: classes/Ostatus_profile.php:839
+#: classes/Ostatus_profile.php:843
 #, php-format
 msgid "Could not find a feed URL for profile page %s."
 msgstr ""
 
-#: classes/Ostatus_profile.php:976
+#: classes/Ostatus_profile.php:980
 msgid "Can't find enough profile information to make a feed."
 msgstr ""
 
-#: classes/Ostatus_profile.php:1035
+#: classes/Ostatus_profile.php:1039
 #, php-format
 msgid "Invalid avatar URL %s."
 msgstr ""
 
-#: classes/Ostatus_profile.php:1045
+#: classes/Ostatus_profile.php:1049
 #, php-format
 msgid "Tried to update avatar for unsaved remote profile %s."
 msgstr ""
 
-#: classes/Ostatus_profile.php:1053
+#: classes/Ostatus_profile.php:1057
 #, php-format
 msgid "Unable to fetch avatar from %s."
 msgstr ""
 
 #. TRANS: Exception.
-#: classes/Ostatus_profile.php:1275
+#: classes/Ostatus_profile.php:1279
 msgid "Local user can't be referenced as remote."
 msgstr ""
 
 #. TRANS: Exception.
-#: classes/Ostatus_profile.php:1280
+#: classes/Ostatus_profile.php:1284
 msgid "Local group can't be referenced as remote."
 msgstr ""
 
 #. TRANS: Exception.
-#: classes/Ostatus_profile.php:1332 classes/Ostatus_profile.php:1343
+#: classes/Ostatus_profile.php:1336 classes/Ostatus_profile.php:1347
 msgid "Can't save local profile."
 msgstr ""
 
 #. TRANS: Exception.
-#: classes/Ostatus_profile.php:1351
+#: classes/Ostatus_profile.php:1355
 msgid "Can't save OStatus profile."
 msgstr ""
 
 #. TRANS: Exception.
-#: classes/Ostatus_profile.php:1610 classes/Ostatus_profile.php:1638
+#: classes/Ostatus_profile.php:1614 classes/Ostatus_profile.php:1642
 msgid "Not a valid webfinger address."
 msgstr ""
 
 #. TRANS: Exception. %s is a webfinger address.
-#: classes/Ostatus_profile.php:1720
+#: classes/Ostatus_profile.php:1724
 #, php-format
 msgid "Couldn't save profile for \"%s\"."
 msgstr ""
 
 #. TRANS: Exception. %s is a webfinger address.
-#: classes/Ostatus_profile.php:1739
+#: classes/Ostatus_profile.php:1743
 #, php-format
 msgid "Couldn't save ostatus_profile for \"%s\"."
 msgstr ""
 
 #. TRANS: Exception. %s is a webfinger address.
-#: classes/Ostatus_profile.php:1747
+#: classes/Ostatus_profile.php:1751
 #, php-format
 msgid "Couldn't find a valid profile for \"%s\"."
 msgstr ""
 
-#: classes/Ostatus_profile.php:1789
+#: classes/Ostatus_profile.php:1793
 msgid "Could not store HTML content of long post as file."
 msgstr ""
 
 #. TRANS: Client exception. %s is a HTTP status code.
-#: classes/HubSub.php:208
+#: classes/HubSub.php:212
 #, php-format
 msgid "Hub subscriber verification returned HTTP %s."
 msgstr ""
 
 #. TRANS: Exception. %1$s is a response status code, %2$s is the body of the response.
-#: classes/HubSub.php:355
+#: classes/HubSub.php:359
 #, php-format
 msgid "Callback returned status: %1$s. Body: %2$s"
 msgstr ""
@@ -360,18 +360,18 @@ msgid "Feeds"
 msgstr ""
 
 #. TRANS: Client exception.
-#: actions/pushhub.php:66
+#: actions/pushhub.php:70
 msgid "Publishing outside feeds not supported."
 msgstr ""
 
 #. TRANS: Client exception. %s is a mode.
-#: actions/pushhub.php:69
+#: actions/pushhub.php:73
 #, php-format
 msgid "Unrecognized mode \"%s\"."
 msgstr ""
 
 #. TRANS: Client exception. %s is a topic.
-#: actions/pushhub.php:89
+#: actions/pushhub.php:93
 #, php-format
 msgid ""
 "Unsupported hub.topic %s this hub only serves local user and group Atom "
@@ -379,43 +379,43 @@ msgid ""
 msgstr ""
 
 #. TRANS: Client exception.
-#: actions/pushhub.php:95
+#: actions/pushhub.php:99
 #, php-format
 msgid "Invalid hub.verify \"%s\". It must be sync or async."
 msgstr ""
 
 #. TRANS: Client exception.
-#: actions/pushhub.php:101
+#: actions/pushhub.php:105
 #, php-format
 msgid "Invalid hub.lease \"%s\". It must be empty or positive integer."
 msgstr ""
 
 #. TRANS: Client exception.
-#: actions/pushhub.php:109
+#: actions/pushhub.php:113
 #, php-format
 msgid "Invalid hub.secret \"%s\". It must be under 200 bytes."
 msgstr ""
 
 #. TRANS: Client exception.
-#: actions/pushhub.php:161
+#: actions/pushhub.php:165
 #, php-format
 msgid "Invalid hub.topic \"%s\". User doesn't exist."
 msgstr ""
 
 #. TRANS: Client exception.
-#: actions/pushhub.php:170
+#: actions/pushhub.php:174
 #, php-format
 msgid "Invalid hub.topic \"%s\". Group doesn't exist."
 msgstr ""
 
 #. TRANS: Client exception.
 #. TRANS: %1$s is this argument to the method this exception occurs in, %2$s is a URL.
-#: actions/pushhub.php:195
+#: actions/pushhub.php:199
 #, php-format
 msgid "Invalid URL passed for %1$s: \"%2$s\""
 msgstr ""
 
-#: actions/userxrd.php:49 actions/ownerxrd.php:37 actions/usersalmon.php:43
+#: actions/userxrd.php:51 actions/ownerxrd.php:39 actions/usersalmon.php:43
 msgid "No such user."
 msgstr ""
 
@@ -462,47 +462,47 @@ msgid "Notice with ID %1$s not posted by %2$s."
 msgstr ""
 
 #. TRANS: Field label.
-#: actions/ostatusgroup.php:76
+#: actions/ostatusgroup.php:78
 msgid "Join group"
 msgstr ""
 
 #. TRANS: Tooltip for field label "Join group".
-#: actions/ostatusgroup.php:79
+#: actions/ostatusgroup.php:81
 msgid "OStatus group's address, like http://example.net/group/nickname."
 msgstr ""
 
 #. TRANS: Button text.
-#: actions/ostatusgroup.php:84 actions/ostatussub.php:73
+#: actions/ostatusgroup.php:86 actions/ostatussub.php:75
 msgctxt "BUTTON"
 msgid "Continue"
 msgstr ""
 
-#: actions/ostatusgroup.php:103
+#: actions/ostatusgroup.php:105
 msgid "You are already a member of this group."
 msgstr ""
 
 #. TRANS: OStatus remote group subscription dialog error.
-#: actions/ostatusgroup.php:138
+#: actions/ostatusgroup.php:140
 msgid "Already a member!"
 msgstr ""
 
 #. TRANS: OStatus remote group subscription dialog error.
-#: actions/ostatusgroup.php:149
+#: actions/ostatusgroup.php:151
 msgid "Remote group join failed!"
 msgstr ""
 
 #. TRANS: OStatus remote group subscription dialog error.
-#: actions/ostatusgroup.php:153
+#: actions/ostatusgroup.php:155
 msgid "Remote group join aborted!"
 msgstr ""
 
 #. TRANS: Page title for OStatus remote group join form
-#: actions/ostatusgroup.php:165
+#: actions/ostatusgroup.php:167
 msgid "Confirm joining remote group"
 msgstr ""
 
 #. TRANS: Instructions.
-#: actions/ostatusgroup.php:176
+#: actions/ostatusgroup.php:178
 msgid ""
 "You can subscribe to groups from other supported sites. Paste the group's "
 "profile URI below:"
@@ -549,12 +549,12 @@ msgid "Could not remove remote user %1$s from group %2$s."
 msgstr ""
 
 #. TRANS: Field label for a field that takes an OStatus user address.
-#: actions/ostatussub.php:66
+#: actions/ostatussub.php:68
 msgid "Subscribe to"
 msgstr ""
 
 #. TRANS: Tooltip for field label "Subscribe to".
-#: actions/ostatussub.php:69
+#: actions/ostatussub.php:71
 msgid ""
 "OStatus user's address, like nickname@example.com or http://example.net/"
 "nickname"
@@ -562,192 +562,192 @@ msgstr ""
 
 #. TRANS: Button text.
 #. TRANS: Tooltip for button "Join".
-#: actions/ostatussub.php:110
+#: actions/ostatussub.php:112
 msgctxt "BUTTON"
 msgid "Join this group"
 msgstr ""
 
 #. TRANS: Button text.
-#: actions/ostatussub.php:113
+#: actions/ostatussub.php:115
 msgctxt "BUTTON"
 msgid "Confirm"
 msgstr ""
 
 #. TRANS: Tooltip for button "Confirm".
-#: actions/ostatussub.php:115
+#: actions/ostatussub.php:117
 msgid "Subscribe to this user"
 msgstr ""
 
-#: actions/ostatussub.php:136
+#: actions/ostatussub.php:138
 msgid "You are already subscribed to this user."
 msgstr ""
 
-#: actions/ostatussub.php:165
+#: actions/ostatussub.php:167
 msgid "Photo"
 msgstr ""
 
-#: actions/ostatussub.php:176
+#: actions/ostatussub.php:178
 msgid "Nickname"
 msgstr ""
 
-#: actions/ostatussub.php:197
+#: actions/ostatussub.php:199
 msgid "Location"
 msgstr ""
 
-#: actions/ostatussub.php:206
+#: actions/ostatussub.php:208
 msgid "URL"
 msgstr ""
 
-#: actions/ostatussub.php:218
+#: actions/ostatussub.php:220
 msgid "Note"
 msgstr ""
 
 #. TRANS: Error text.
-#: actions/ostatussub.php:254 actions/ostatussub.php:261
-#: actions/ostatussub.php:286
+#: actions/ostatussub.php:256 actions/ostatussub.php:263
+#: actions/ostatussub.php:288
 msgid ""
 "Sorry, we could not reach that address. Please make sure that the OStatus "
 "address is like nickname@example.com or http://example.net/nickname."
 msgstr ""
 
 #. TRANS: Error text.
-#: actions/ostatussub.php:265 actions/ostatussub.php:269
-#: actions/ostatussub.php:273 actions/ostatussub.php:277
-#: actions/ostatussub.php:281
+#: actions/ostatussub.php:267 actions/ostatussub.php:271
+#: actions/ostatussub.php:275 actions/ostatussub.php:279
+#: actions/ostatussub.php:283
 msgid ""
 "Sorry, we could not reach that feed. Please try that OStatus address again "
 "later."
 msgstr ""
 
 #. TRANS: OStatus remote subscription dialog error.
-#: actions/ostatussub.php:315
+#: actions/ostatussub.php:317
 msgid "Already subscribed!"
 msgstr ""
 
 #. TRANS: OStatus remote subscription dialog error.
-#: actions/ostatussub.php:320
+#: actions/ostatussub.php:322
 msgid "Remote subscription failed!"
 msgstr ""
 
-#: actions/ostatussub.php:367 actions/ostatusinit.php:63
+#: actions/ostatussub.php:369 actions/ostatusinit.php:64
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 
 #. TRANS: Form title.
-#: actions/ostatussub.php:395 actions/ostatusinit.php:82
+#: actions/ostatussub.php:397 actions/ostatusinit.php:83
 msgid "Subscribe to user"
 msgstr ""
 
 #. TRANS: Page title for OStatus remote subscription form
-#: actions/ostatussub.php:415
+#: actions/ostatussub.php:417
 msgid "Confirm"
 msgstr ""
 
 #. TRANS: Instructions.
-#: actions/ostatussub.php:427
+#: actions/ostatussub.php:429
 msgid ""
 "You can subscribe to users from other supported sites. Paste their address "
 "or profile URI below:"
 msgstr ""
 
 #. TRANS: Client error.
-#: actions/ostatusinit.php:41
+#: actions/ostatusinit.php:42
 msgid "You can use the local subscription!"
 msgstr ""
 
 #. TRANS: Form legend.
-#: actions/ostatusinit.php:97
+#: actions/ostatusinit.php:98
 #, php-format
 msgid "Join group %s"
 msgstr ""
 
 #. TRANS: Button text.
-#: actions/ostatusinit.php:99
+#: actions/ostatusinit.php:100
 msgctxt "BUTTON"
 msgid "Join"
 msgstr ""
 
 #. TRANS: Form legend.
-#: actions/ostatusinit.php:102
+#: actions/ostatusinit.php:103
 #, php-format
 msgid "Subscribe to %s"
 msgstr ""
 
 #. TRANS: Button text.
-#: actions/ostatusinit.php:104
+#: actions/ostatusinit.php:105
 msgctxt "BUTTON"
 msgid "Subscribe"
 msgstr ""
 
 #. TRANS: Field label.
-#: actions/ostatusinit.php:117
+#: actions/ostatusinit.php:118
 msgid "User nickname"
 msgstr ""
 
-#: actions/ostatusinit.php:118
+#: actions/ostatusinit.php:119
 msgid "Nickname of the user you want to follow."
 msgstr ""
 
 #. TRANS: Field label.
-#: actions/ostatusinit.php:123
+#: actions/ostatusinit.php:124
 msgid "Profile Account"
 msgstr ""
 
 #. TRANS: Tooltip for field label "Profile Account".
-#: actions/ostatusinit.php:125
+#: actions/ostatusinit.php:126
 msgid "Your account id (e.g. user@identi.ca)."
 msgstr ""
 
 #. TRANS: Client error.
-#: actions/ostatusinit.php:147
+#: actions/ostatusinit.php:148
 msgid "Must provide a remote profile."
 msgstr ""
 
 #. TRANS: Client error.
-#: actions/ostatusinit.php:159
+#: actions/ostatusinit.php:160
 msgid "Couldn't look up OStatus account profile."
 msgstr ""
 
 #. TRANS: Client error.
-#: actions/ostatusinit.php:172
+#: actions/ostatusinit.php:173
 msgid "Couldn't confirm remote profile address."
 msgstr ""
 
 #. TRANS: Page title.
-#: actions/ostatusinit.php:217
+#: actions/ostatusinit.php:218
 msgid "OStatus Connect"
 msgstr ""
 
-#: actions/pushcallback.php:48
+#: actions/pushcallback.php:50
 msgid "Empty or invalid feed id."
 msgstr ""
 
 #. TRANS: Server exception. %s is a feed ID.
-#: actions/pushcallback.php:54
+#: actions/pushcallback.php:56
 #, php-format
 msgid "Unknown PuSH feed id %s"
 msgstr ""
 
 #. TRANS: Client exception. %s is an invalid feed name.
-#: actions/pushcallback.php:94
+#: actions/pushcallback.php:96
 #, php-format
 msgid "Bad hub.topic feed \"%s\"."
 msgstr ""
 
 #. TRANS: Client exception. %1$s the invalid token, %2$s is the topic for which the invalid token was given.
-#: actions/pushcallback.php:99
+#: actions/pushcallback.php:101
 #, php-format
 msgid "Bad hub.verify_token %1$s for %2$s."
 msgstr ""
 
 #. TRANS: Client exception. %s is an invalid topic.
-#: actions/pushcallback.php:106
+#: actions/pushcallback.php:108
 #, php-format
 msgid "Unexpected subscribe request for %s."
 msgstr ""
 
 #. TRANS: Client exception. %s is an invalid topic.
-#: actions/pushcallback.php:111
+#: actions/pushcallback.php:113
 #, php-format
 msgid "Unexpected unsubscribe request for %s."
 msgstr ""