X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=plugins%2FOStatus%2Flocale%2FOStatus.pot;h=741eb8ff0da5b4134e1b6e3df8469e17b593826b;hb=8b46624d19b7d95045c355f116e5d6ca66776e1c;hp=1a95a43bf9b3bdc50ec631e3f5d8af4b913c7871;hpb=749367e12f9742d7fd5ee028230fefa627599125;p=quix0rs-gnu-social.git

diff --git a/plugins/OStatus/locale/OStatus.pot b/plugins/OStatus/locale/OStatus.pot
index 1a95a43bf9..741eb8ff0d 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-11-29 15:37+0000\n"
+"POT-Creation-Date: 2011-04-09 18:34+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"
@@ -16,6 +16,10 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: tests/gettext-speedtest.php:57
+msgid "Feeds"
+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:225 OStatusPlugin.php:935
@@ -111,641 +115,625 @@ msgid ""
 "org/\">OStatus</a>."
 msgstr ""
 
-#: classes/FeedSub.php:252
-msgid "Attempting to start PuSH subscription for feed with no hub."
-msgstr ""
-
-#: classes/FeedSub.php:282
-msgid "Attempting to end PuSH subscription for feed with no hub."
+#. TRANS: Client exception.
+#: actions/pushhub.php:70
+msgid "Publishing outside feeds not supported."
 msgstr ""
 
-#. TRANS: Server exception. %s is a URI.
-#: classes/Ostatus_profile.php:192
+#. TRANS: Client exception. %s is a mode.
+#: actions/pushhub.php:73
 #, php-format
-msgid "Invalid ostatus_profile state: both group and profile IDs set for %s."
+msgid "Unrecognized mode \"%s\"."
 msgstr ""
 
-#. TRANS: Server exception. %s is a URI.
-#: classes/Ostatus_profile.php:195
+#. TRANS: Client exception. %s is a topic.
+#: actions/pushhub.php:93
 #, php-format
-msgid "Invalid ostatus_profile state: both group and profile IDs empty for %s."
+msgid ""
+"Unsupported hub.topic %s this hub only serves local user and group Atom "
+"feeds."
 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:285
+#. TRANS: Client exception.
+#: actions/pushhub.php:99
 #, php-format
-msgid "Invalid actor passed to %1$s: %2$s."
+msgid "Invalid hub.verify \"%s\". It must be sync or async."
 msgstr ""
 
-#. TRANS: Server exception.
-#: classes/Ostatus_profile.php:378
-msgid ""
-"Invalid type passed to Ostatus_profile::notify. It must be XML string or "
-"Activity entry."
+#. TRANS: Client exception.
+#: actions/pushhub.php:105
+#, php-format
+msgid "Invalid hub.lease \"%s\". It must be empty or positive integer."
 msgstr ""
 
-#. TRANS: Exception.
-#: classes/Ostatus_profile.php:409
-msgid "Unknown feed format."
+#. TRANS: Client exception.
+#: actions/pushhub.php:113
+#, php-format
+msgid "Invalid hub.secret \"%s\". It must be under 200 bytes."
 msgstr ""
 
-#. TRANS: Exception.
-#: classes/Ostatus_profile.php:433
-msgid "RSS feed without a channel."
+#. TRANS: Client exception.
+#: actions/pushhub.php:165
+#, php-format
+msgid "Invalid hub.topic \"%s\". User doesn't exist."
 msgstr ""
 
 #. TRANS: Client exception.
-#: classes/Ostatus_profile.php:478
-msgid "Can't handle that kind of post."
+#: actions/pushhub.php:174
+#, php-format
+msgid "Invalid hub.topic \"%s\". Group doesn't exist."
 msgstr ""
 
-#. TRANS: Client exception. %s is a source URI.
-#: classes/Ostatus_profile.php:561
+#. TRANS: Client exception.
+#. TRANS: %1$s is this argument to the method this exception occurs in, %2$s is a URL.
+#: actions/pushhub.php:199
 #, php-format
-msgid "No content for notice %s."
+msgid "Invalid URL passed for %1$s: \"%2$s\""
 msgstr ""
 
-#. TRANS: Shown when a notice is longer than supported and/or when attachments are present. At runtime
-#. TRANS: this will usually be replaced with localised text from StatusNet core messages.
-#: classes/Ostatus_profile.php:596
-msgid "Show more"
+#: actions/pushcallback.php:50
+msgid "Empty or invalid feed id."
 msgstr ""
 
-#. TRANS: Exception. %s is a profile URL.
-#: classes/Ostatus_profile.php:789
+#. TRANS: Server exception. %s is a feed ID.
+#: actions/pushcallback.php:56
 #, php-format
-msgid "Could not reach profile page %s."
+msgid "Unknown PuSH feed id %s"
 msgstr ""
 
-#. TRANS: Exception. %s is a URL.
-#: classes/Ostatus_profile.php:847
+#. TRANS: Client exception. %s is an invalid feed name.
+#: actions/pushcallback.php:96
 #, php-format
-msgid "Could not find a feed URL for profile page %s."
+msgid "Bad hub.topic feed \"%s\"."
 msgstr ""
 
-#. TRANS: Feed sub exception.
-#: classes/Ostatus_profile.php:985
-msgid "Can't find enough profile information to make a feed."
+#. TRANS: Client exception. %1$s the invalid token, %2$s is the topic for which the invalid token was given.
+#: actions/pushcallback.php:101
+#, php-format
+msgid "Bad hub.verify_token %1$s for %2$s."
 msgstr ""
 
-#. TRANS: Server exception. %s is a URL.
-#: classes/Ostatus_profile.php:1045
+#. TRANS: Client exception. %s is an invalid topic.
+#: actions/pushcallback.php:108
 #, php-format
-msgid "Invalid avatar URL %s."
+msgid "Unexpected subscribe request for %s."
 msgstr ""
 
-#. TRANS: Server exception. %s is a URI.
-#: classes/Ostatus_profile.php:1056
+#. TRANS: Client exception. %s is an invalid topic.
+#: actions/pushcallback.php:113
 #, php-format
-msgid "Tried to update avatar for unsaved remote profile %s."
+msgid "Unexpected unsubscribe request for %s."
 msgstr ""
 
-#. TRANS: Server exception. %s is a URL.
-#: classes/Ostatus_profile.php:1066
-#, php-format
-msgid "Unable to fetch avatar from %s."
+#: actions/ownerxrd.php:39 actions/usersalmon.php:43
+msgid "No such user."
 msgstr ""
 
-#. TRANS: Exception.
-#: classes/Ostatus_profile.php:1292
-msgid "Local user can't be referenced as remote."
+#. TRANS: Field label for a field that takes an OStatus user address.
+#: actions/ostatussub.php:68
+msgid "Subscribe to"
 msgstr ""
 
-#. TRANS: Exception.
-#: classes/Ostatus_profile.php:1297
-msgid "Local group can't be referenced as remote."
+#. TRANS: Tooltip for field label "Subscribe to".
+#: actions/ostatussub.php:71
+msgid ""
+"OStatus user's address, like nickname@example.com or http://example.net/"
+"nickname"
 msgstr ""
 
-#. TRANS: Server exception.
-#: classes/Ostatus_profile.php:1349 classes/Ostatus_profile.php:1360
-msgid "Can't save local profile."
+#. TRANS: Button text.
+#: actions/ostatussub.php:75 actions/ostatusgroup.php:86
+msgctxt "BUTTON"
+msgid "Continue"
 msgstr ""
 
-#. TRANS: Server exception.
-#: classes/Ostatus_profile.php:1368
-msgid "Can't save OStatus profile."
+#. TRANS: Button text.
+#. TRANS: Tooltip for button "Join".
+#: actions/ostatussub.php:112
+msgctxt "BUTTON"
+msgid "Join this group"
 msgstr ""
 
-#. TRANS: Exception.
-#: classes/Ostatus_profile.php:1627 classes/Ostatus_profile.php:1655
-msgid "Not a valid webfinger address."
+#. TRANS: Button text.
+#: actions/ostatussub.php:115
+msgctxt "BUTTON"
+msgid "Confirm"
 msgstr ""
 
-#. TRANS: Exception. %s is a webfinger address.
-#: classes/Ostatus_profile.php:1737
-#, php-format
-msgid "Couldn't save profile for \"%s\"."
+#. TRANS: Tooltip for button "Confirm".
+#: actions/ostatussub.php:117
+msgid "Subscribe to this user"
 msgstr ""
 
-#. TRANS: Exception. %s is a webfinger address.
-#: classes/Ostatus_profile.php:1756
-#, php-format
-msgid "Couldn't save ostatus_profile for \"%s\"."
+#: actions/ostatussub.php:138
+msgid "You are already subscribed to this user."
 msgstr ""
 
-#. TRANS: Exception. %s is a webfinger address.
-#: classes/Ostatus_profile.php:1764
-#, php-format
-msgid "Couldn't find a valid profile for \"%s\"."
+#. TRANS: Error text.
+#: actions/ostatussub.php:232 actions/ostatussub.php:239
+#: actions/ostatussub.php:264
+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: Server exception.
-#: classes/Ostatus_profile.php:1807
-msgid "Could not store HTML content of long post as file."
+#. TRANS: Error text.
+#: actions/ostatussub.php:243 actions/ostatussub.php:247
+#: actions/ostatussub.php:251 actions/ostatussub.php:255
+#: actions/ostatussub.php:259
+msgid ""
+"Sorry, we could not reach that feed. Please try that OStatus address again "
+"later."
 msgstr ""
 
-#. TRANS: Client exception. %s is a HTTP status code.
-#: classes/HubSub.php:212
-#, php-format
-msgid "Hub subscriber verification returned HTTP %s."
+#. TRANS: OStatus remote subscription dialog error.
+#: actions/ostatussub.php:293
+msgid "Already subscribed!"
 msgstr ""
 
-#. TRANS: Exception. %1$s is a response status code, %2$s is the body of the response.
-#: classes/HubSub.php:359
-#, php-format
-msgid "Callback returned status: %1$s. Body: %2$s"
+#. TRANS: OStatus remote subscription dialog error.
+#: actions/ostatussub.php:298
+msgid "Remote subscription failed!"
 msgstr ""
 
-#. TRANS: Client error. POST is a HTTP command. It should not be translated.
-#: lib/salmonaction.php:42
-msgid "This method requires a POST."
+#: actions/ostatussub.php:345 actions/ostatusinit.php:64
+msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 
-#. TRANS: Client error. Do not translate "application/magic-envelope+xml"
-#: lib/salmonaction.php:47
-msgid "Salmon requires \"application/magic-envelope+xml\"."
+#. TRANS: Form title.
+#: actions/ostatussub.php:373 actions/ostatusinit.php:83
+msgid "Subscribe to user"
 msgstr ""
 
-#. TRANS: Client error.
-#: lib/salmonaction.php:57
-msgid "Salmon signature verification failed."
+#. TRANS: Page title for OStatus remote subscription form
+#: actions/ostatussub.php:393
+msgid "Confirm"
 msgstr ""
 
-#. TRANS: Client error.
-#: lib/salmonaction.php:69
-msgid "Salmon post must be an Atom entry."
+#. TRANS: Instructions.
+#: actions/ostatussub.php:405
+msgid ""
+"You can subscribe to users from other supported sites. Paste their address "
+"or profile URI below:"
 msgstr ""
 
-#. TRANS: Client exception.
-#: lib/salmonaction.php:118
-msgid "Unrecognized activity type."
+#. TRANS: Field label.
+#: actions/ostatusgroup.php:78
+msgid "Join group"
 msgstr ""
 
-#. TRANS: Client exception.
-#: lib/salmonaction.php:127
-msgid "This target doesn't understand posts."
+#. TRANS: Tooltip for field label "Join group".
+#: actions/ostatusgroup.php:81
+msgid "OStatus group's address, like http://example.net/group/nickname."
 msgstr ""
 
-#. TRANS: Client exception.
-#: lib/salmonaction.php:133
-msgid "This target doesn't understand follows."
+#: actions/ostatusgroup.php:105
+msgid "You are already a member of this group."
 msgstr ""
 
-#. TRANS: Client exception.
-#: lib/salmonaction.php:139
-msgid "This target doesn't understand unfollows."
+#. TRANS: OStatus remote group subscription dialog error.
+#: actions/ostatusgroup.php:140
+msgid "Already a member!"
 msgstr ""
 
-#. TRANS: Client exception.
-#: lib/salmonaction.php:145
-msgid "This target doesn't understand favorites."
+#. TRANS: OStatus remote group subscription dialog error.
+#: actions/ostatusgroup.php:148
+msgid "Remote group join failed!"
 msgstr ""
 
-#. TRANS: Client exception.
-#: lib/salmonaction.php:151
-msgid "This target doesn't understand unfavorites."
+#. TRANS: Page title for OStatus remote group join form
+#: actions/ostatusgroup.php:161
+msgid "Confirm joining remote group"
 msgstr ""
 
-#. TRANS: Client exception.
-#: lib/salmonaction.php:157
-msgid "This target doesn't understand share events."
+#. TRANS: Instructions.
+#: actions/ostatusgroup.php:172
+msgid ""
+"You can subscribe to groups from other supported sites. Paste the group's "
+"profile URI below:"
 msgstr ""
 
-#. TRANS: Client exception.
-#: lib/salmonaction.php:163
-msgid "This target doesn't understand joins."
+#. TRANS: Client error.
+#: actions/usersalmon.php:37 actions/groupsalmon.php:40
+msgid "No ID."
 msgstr ""
 
 #. TRANS: Client exception.
-#: lib/salmonaction.php:169
-msgid "This target doesn't understand leave events."
+#: actions/usersalmon.php:83
+msgid "In reply to unknown notice."
 msgstr ""
 
-#. TRANS: Exception.
-#: lib/salmonaction.php:197
-msgid "Received a salmon slap from unidentified actor."
+#. TRANS: Client exception.
+#: actions/usersalmon.php:88
+msgid "In reply to a notice not by this user and not mentioning this user."
 msgstr ""
 
-#. TRANS: Exception.
-#: lib/discovery.php:110
-#, php-format
-msgid "Unable to find services for %s."
+#. TRANS: Client exception.
+#: actions/usersalmon.php:160
+msgid "This is already a favorite."
 msgstr ""
 
-#. TRANS: Exception.
-#: lib/magicenvelope.php:80
-msgid "Unable to locate signer public key."
+#. TRANS: Client exception.
+#: actions/usersalmon.php:165
+msgid "Could not save new favorite."
 msgstr ""
 
-#. TRANS: Exception.
-#: lib/salmon.php:93
-msgid "Salmon invalid actor for signing."
+#. TRANS: Client exception.
+#: actions/usersalmon.php:182
+msgid "Notice was not favorited!"
 msgstr ""
 
-#: tests/gettext-speedtest.php:57
-msgid "Feeds"
+#. TRANS: Client exception.
+#: actions/usersalmon.php:197
+msgid "Can't favorite/unfavorite without an object."
 msgstr ""
 
 #. TRANS: Client exception.
-#: actions/pushhub.php:70
-msgid "Publishing outside feeds not supported."
+#: actions/usersalmon.php:209
+msgid "Can't handle that kind of object for liking/faving."
 msgstr ""
 
-#. TRANS: Client exception. %s is a mode.
-#: actions/pushhub.php:73
+#. TRANS: Client exception. %s is an object ID.
+#: actions/usersalmon.php:216
 #, php-format
-msgid "Unrecognized mode \"%s\"."
+msgid "Notice with ID %s unknown."
 msgstr ""
 
-#. TRANS: Client exception. %s is a topic.
-#: actions/pushhub.php:93
+#. TRANS: Client exception. %1$s is a notice ID, %2$s is a user ID.
+#: actions/usersalmon.php:221
 #, php-format
-msgid ""
-"Unsupported hub.topic %s this hub only serves local user and group Atom "
-"feeds."
+msgid "Notice with ID %1$s not posted by %2$s."
 msgstr ""
 
-#. TRANS: Client exception.
-#: actions/pushhub.php:99
-#, php-format
-msgid "Invalid hub.verify \"%s\". It must be sync or async."
-msgstr ""
-
-#. TRANS: Client exception.
-#: 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:113
-#, php-format
-msgid "Invalid hub.secret \"%s\". It must be under 200 bytes."
-msgstr ""
-
-#. TRANS: Client exception.
-#: actions/pushhub.php:165
-#, php-format
-msgid "Invalid hub.topic \"%s\". User doesn't exist."
-msgstr ""
-
-#. TRANS: Client exception.
-#: 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:199
-#, php-format
-msgid "Invalid URL passed for %1$s: \"%2$s\""
+#. TRANS: Client error.
+#: actions/groupsalmon.php:47
+msgid "No such group."
 msgstr ""
 
-#: actions/ownerxrd.php:39 actions/usersalmon.php:43
-msgid "No such user."
+#. TRANS: Client error.
+#: actions/groupsalmon.php:56
+msgid "Can't accept remote posts for a remote group."
 msgstr ""
 
 #. TRANS: Client error.
-#: actions/usersalmon.php:37 actions/groupsalmon.php:40
-msgid "No ID."
+#: actions/groupsalmon.php:130
+msgid "Can't read profile to set up group membership."
 msgstr ""
 
-#. TRANS: Client exception.
-#: actions/usersalmon.php:81
-msgid "In reply to unknown notice."
+#. TRANS: Client error.
+#: actions/groupsalmon.php:134 actions/groupsalmon.php:170
+msgid "Groups can't join groups."
 msgstr ""
 
-#. TRANS: Client exception.
-#: actions/usersalmon.php:86
-msgid "In reply to a notice not by this user and not mentioning this user."
+#: actions/groupsalmon.php:147
+msgid "You have been blocked from that group by the admin."
 msgstr ""
 
-#. TRANS: Client exception.
-#: actions/usersalmon.php:163
-msgid "Could not save new favorite."
+#. TRANS: Server error. %1$s is a profile URI, %2$s is a group nickname.
+#: actions/groupsalmon.php:155
+#, php-format
+msgid "Could not join remote user %1$s to group %2$s."
 msgstr ""
 
-#. TRANS: Client exception.
-#: actions/usersalmon.php:195
-msgid "Can't favorite/unfavorite without an object."
+#: actions/groupsalmon.php:167
+msgid "Can't read profile to cancel group membership."
 msgstr ""
 
-#. TRANS: Client exception.
-#: actions/usersalmon.php:207
-msgid "Can't handle that kind of object for liking/faving."
+#. TRANS: Server error. %1$s is a profile URI, %2$s is a group nickname.
+#: actions/groupsalmon.php:180
+#, php-format
+msgid "Could not remove remote user %1$s from group %2$s."
 msgstr ""
 
-#. TRANS: Client exception. %s is an object ID.
-#: actions/usersalmon.php:214
-#, php-format
-msgid "Notice with ID %s unknown."
+#. TRANS: Client error.
+#: actions/ostatusinit.php:42
+msgid "You can use the local subscription!"
 msgstr ""
 
-#. TRANS: Client exception. %1$s is a notice ID, %2$s is a user ID.
-#: actions/usersalmon.php:219
+#. TRANS: Form legend.
+#: actions/ostatusinit.php:98
 #, php-format
-msgid "Notice with ID %1$s not posted by %2$s."
+msgid "Join group %s"
 msgstr ""
 
-#. TRANS: Field label.
-#: actions/ostatusgroup.php:78
-msgid "Join group"
+#. TRANS: Button text.
+#: actions/ostatusinit.php:100
+msgctxt "BUTTON"
+msgid "Join"
 msgstr ""
 
-#. TRANS: Tooltip for field label "Join group".
-#: actions/ostatusgroup.php:81
-msgid "OStatus group's address, like http://example.net/group/nickname."
+#. TRANS: Form legend.
+#: actions/ostatusinit.php:103
+#, php-format
+msgid "Subscribe to %s"
 msgstr ""
 
 #. TRANS: Button text.
-#: actions/ostatusgroup.php:86 actions/ostatussub.php:75
+#: actions/ostatusinit.php:105
 msgctxt "BUTTON"
-msgid "Continue"
+msgid "Subscribe"
 msgstr ""
 
-#: actions/ostatusgroup.php:105
-msgid "You are already a member of this group."
+#. TRANS: Field label.
+#: actions/ostatusinit.php:119
+msgid "Group nickname"
 msgstr ""
 
-#. TRANS: OStatus remote group subscription dialog error.
-#: actions/ostatusgroup.php:140
-msgid "Already a member!"
+#: actions/ostatusinit.php:120
+msgid "Nickname of the group you want to join."
 msgstr ""
 
-#. TRANS: OStatus remote group subscription dialog error.
-#: actions/ostatusgroup.php:151
-msgid "Remote group join failed!"
+#. TRANS: Field label.
+#: actions/ostatusinit.php:123
+msgid "User nickname"
 msgstr ""
 
-#. TRANS: OStatus remote group subscription dialog error.
-#: actions/ostatusgroup.php:155
-msgid "Remote group join aborted!"
+#: actions/ostatusinit.php:124
+msgid "Nickname of the user you want to follow."
 msgstr ""
 
-#. TRANS: Page title for OStatus remote group join form
-#: actions/ostatusgroup.php:167
-msgid "Confirm joining remote group"
+#. TRANS: Field label.
+#: actions/ostatusinit.php:129
+msgid "Profile Account"
 msgstr ""
 
-#. TRANS: Instructions.
-#: actions/ostatusgroup.php:178
-msgid ""
-"You can subscribe to groups from other supported sites. Paste the group's "
-"profile URI below:"
+#. TRANS: Tooltip for field label "Profile Account".
+#: actions/ostatusinit.php:131
+msgid "Your account id (e.g. user@identi.ca)."
 msgstr ""
 
 #. TRANS: Client error.
-#: actions/groupsalmon.php:47
-msgid "No such group."
+#: actions/ostatusinit.php:153
+msgid "Must provide a remote profile."
 msgstr ""
 
 #. TRANS: Client error.
-#: actions/groupsalmon.php:53
-msgid "Can't accept remote posts for a remote group."
+#: actions/ostatusinit.php:165
+msgid "Couldn't look up OStatus account profile."
 msgstr ""
 
 #. TRANS: Client error.
-#: actions/groupsalmon.php:127
-msgid "Can't read profile to set up group membership."
+#: actions/ostatusinit.php:178
+msgid "Couldn't confirm remote profile address."
 msgstr ""
 
-#. TRANS: Client error.
-#: actions/groupsalmon.php:131 actions/groupsalmon.php:174
-msgid "Groups can't join groups."
+#. TRANS: Page title.
+#: actions/ostatusinit.php:223
+msgid "OStatus Connect"
 msgstr ""
 
-#: actions/groupsalmon.php:144
-msgid "You have been blocked from that group by the admin."
+#: classes/FeedSub.php:252
+msgid "Attempting to start PuSH subscription for feed with no hub."
 msgstr ""
 
-#. TRANS: Server error. %1$s is a profile URI, %2$s is a group nickname.
-#: actions/groupsalmon.php:159
-#, php-format
-msgid "Could not join remote user %1$s to group %2$s."
+#: classes/FeedSub.php:282
+msgid "Attempting to end PuSH subscription for feed with no hub."
 msgstr ""
 
-#: actions/groupsalmon.php:171
-msgid "Can't read profile to cancel group membership."
+#. TRANS: Server exception. %s is a URI.
+#: classes/Ostatus_profile.php:154
+#, php-format
+msgid "Invalid ostatus_profile state: both group and profile IDs set for %s."
 msgstr ""
 
-#. TRANS: Server error. %1$s is a profile URI, %2$s is a group nickname.
-#: actions/groupsalmon.php:188
+#. TRANS: Server exception. %s is a URI.
+#: classes/Ostatus_profile.php:157
 #, php-format
-msgid "Could not remove remote user %1$s from group %2$s."
+msgid "Invalid ostatus_profile state: both group and profile IDs empty for %s."
 msgstr ""
 
-#. TRANS: Field label for a field that takes an OStatus user address.
-#: actions/ostatussub.php:68
-msgid "Subscribe to"
+#. TRANS: Server exception.
+#. TRANS: %1$s is the method name the exception occured in, %2$s is the actor type.
+#: classes/Ostatus_profile.php:247
+#, php-format
+msgid "Invalid actor passed to %1$s: %2$s."
 msgstr ""
 
-#. TRANS: Tooltip for field label "Subscribe to".
-#: actions/ostatussub.php:71
+#. TRANS: Server exception.
+#: classes/Ostatus_profile.php:341
 msgid ""
-"OStatus user's address, like nickname@example.com or http://example.net/"
-"nickname"
+"Invalid type passed to Ostatus_profile::notify. It must be XML string or "
+"Activity entry."
 msgstr ""
 
-#. TRANS: Button text.
-#. TRANS: Tooltip for button "Join".
-#: actions/ostatussub.php:112
-msgctxt "BUTTON"
-msgid "Join this group"
+#. TRANS: Exception.
+#: classes/Ostatus_profile.php:372
+msgid "Unknown feed format."
 msgstr ""
 
-#. TRANS: Button text.
-#: actions/ostatussub.php:115
-msgctxt "BUTTON"
-msgid "Confirm"
+#. TRANS: Exception.
+#: classes/Ostatus_profile.php:396
+msgid "RSS feed without a channel."
 msgstr ""
 
-#. TRANS: Tooltip for button "Confirm".
-#: actions/ostatussub.php:117
-msgid "Subscribe to this user"
+#. TRANS: Client exception.
+#: classes/Ostatus_profile.php:442
+msgid "Can't handle that kind of post."
 msgstr ""
 
-#: actions/ostatussub.php:138
-msgid "You are already subscribed to this user."
+#. TRANS: Client exception. %s is a source URI.
+#: classes/Ostatus_profile.php:500
+#, php-format
+msgid "No content for notice %s."
 msgstr ""
 
-#: actions/ostatussub.php:167
-msgid "Photo"
+#. TRANS: Shown when a notice is longer than supported and/or when attachments are present. At runtime
+#. TRANS: this will usually be replaced with localised text from StatusNet core messages.
+#: classes/Ostatus_profile.php:535
+msgid "Show more"
 msgstr ""
 
-#: actions/ostatussub.php:178
-msgid "Nickname"
+#. TRANS: Exception. %s is a profile URL.
+#: classes/Ostatus_profile.php:728
+#, php-format
+msgid "Could not reach profile page %s."
 msgstr ""
 
-#: actions/ostatussub.php:199
-msgid "Location"
+#. TRANS: Exception. %s is a URL.
+#: classes/Ostatus_profile.php:786
+#, php-format
+msgid "Could not find a feed URL for profile page %s."
 msgstr ""
 
-#: actions/ostatussub.php:208
-msgid "URL"
+#. TRANS: Feed sub exception.
+#: classes/Ostatus_profile.php:885
+msgid "Can't find enough profile information to make a feed."
 msgstr ""
 
-#: actions/ostatussub.php:220
-msgid "Note"
+#. TRANS: Server exception. %s is a URL.
+#: classes/Ostatus_profile.php:949
+#, php-format
+msgid "Invalid avatar URL %s."
 msgstr ""
 
-#. TRANS: Error text.
-#: 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."
+#. TRANS: Server exception. %s is a URI.
+#: classes/Ostatus_profile.php:960
+#, php-format
+msgid "Tried to update avatar for unsaved remote profile %s."
 msgstr ""
 
-#. TRANS: Error text.
-#: 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."
+#. TRANS: Server exception. %s is a URL.
+#: classes/Ostatus_profile.php:970
+#, php-format
+msgid "Unable to fetch avatar from %s."
 msgstr ""
 
-#. TRANS: OStatus remote subscription dialog error.
-#: actions/ostatussub.php:317
-msgid "Already subscribed!"
+#. TRANS: Exception.
+#: classes/Ostatus_profile.php:1197
+msgid "Local user can't be referenced as remote."
 msgstr ""
 
-#. TRANS: OStatus remote subscription dialog error.
-#: actions/ostatussub.php:322
-msgid "Remote subscription failed!"
+#. TRANS: Exception.
+#: classes/Ostatus_profile.php:1202
+msgid "Local group can't be referenced as remote."
 msgstr ""
 
-#: actions/ostatussub.php:369 actions/ostatusinit.php:64
-msgid "There was a problem with your session token. Try again, please."
+#. TRANS: Server exception.
+#: classes/Ostatus_profile.php:1254 classes/Ostatus_profile.php:1265
+msgid "Can't save local profile."
 msgstr ""
 
-#. TRANS: Form title.
-#: actions/ostatussub.php:397 actions/ostatusinit.php:83
-msgid "Subscribe to user"
+#. TRANS: Server exception.
+#: classes/Ostatus_profile.php:1273
+msgid "Can't save OStatus profile."
 msgstr ""
 
-#. TRANS: Page title for OStatus remote subscription form
-#: actions/ostatussub.php:417
-msgid "Confirm"
+#. TRANS: Exception.
+#: classes/Ostatus_profile.php:1561 classes/Ostatus_profile.php:1589
+msgid "Not a valid webfinger address."
 msgstr ""
 
-#. TRANS: Instructions.
-#: actions/ostatussub.php:429
-msgid ""
-"You can subscribe to users from other supported sites. Paste their address "
-"or profile URI below:"
+#. TRANS: Exception. %s is a webfinger address.
+#: classes/Ostatus_profile.php:1671
+#, php-format
+msgid "Couldn't save profile for \"%s\"."
 msgstr ""
 
-#. TRANS: Client error.
-#: actions/ostatusinit.php:42
-msgid "You can use the local subscription!"
+#. TRANS: Exception. %s is a webfinger address.
+#: classes/Ostatus_profile.php:1690
+#, php-format
+msgid "Couldn't save ostatus_profile for \"%s\"."
 msgstr ""
 
-#. TRANS: Form legend.
-#: actions/ostatusinit.php:98
+#. TRANS: Exception. %s is a webfinger address.
+#: classes/Ostatus_profile.php:1698
 #, php-format
-msgid "Join group %s"
+msgid "Couldn't find a valid profile for \"%s\"."
 msgstr ""
 
-#. TRANS: Button text.
-#: actions/ostatusinit.php:100
-msgctxt "BUTTON"
-msgid "Join"
+#. TRANS: Server exception.
+#: classes/Ostatus_profile.php:1741
+msgid "Could not store HTML content of long post as file."
 msgstr ""
 
-#. TRANS: Form legend.
-#: actions/ostatusinit.php:103
+#. TRANS: Client exception. %s is a HTTP status code.
+#: classes/HubSub.php:212
 #, php-format
-msgid "Subscribe to %s"
+msgid "Hub subscriber verification returned HTTP %s."
 msgstr ""
 
-#. TRANS: Button text.
-#: actions/ostatusinit.php:105
-msgctxt "BUTTON"
-msgid "Subscribe"
+#. TRANS: Exception. %1$s is a response status code, %2$s is the body of the response.
+#: classes/HubSub.php:359
+#, php-format
+msgid "Callback returned status: %1$s. Body: %2$s"
 msgstr ""
 
-#. TRANS: Field label.
-#: actions/ostatusinit.php:118
-msgid "User nickname"
+#. TRANS: Exception.
+#: lib/magicenvelope.php:80
+msgid "Unable to locate signer public key."
 msgstr ""
 
-#: actions/ostatusinit.php:119
-msgid "Nickname of the user you want to follow."
+#. TRANS: Exception.
+#: lib/salmon.php:126
+msgid "Salmon invalid actor for signing."
 msgstr ""
 
-#. TRANS: Field label.
-#: actions/ostatusinit.php:124
-msgid "Profile Account"
+#. TRANS: Client error. POST is a HTTP command. It should not be translated.
+#: lib/salmonaction.php:43
+msgid "This method requires a POST."
 msgstr ""
 
-#. TRANS: Tooltip for field label "Profile Account".
-#: actions/ostatusinit.php:126
-msgid "Your account id (e.g. user@identi.ca)."
+#. TRANS: Client error. Do not translate "application/magic-envelope+xml"
+#: lib/salmonaction.php:48
+msgid "Salmon requires \"application/magic-envelope+xml\"."
 msgstr ""
 
 #. TRANS: Client error.
-#: actions/ostatusinit.php:148
-msgid "Must provide a remote profile."
+#: lib/salmonaction.php:58
+msgid "Salmon signature verification failed."
 msgstr ""
 
 #. TRANS: Client error.
-#: actions/ostatusinit.php:160
-msgid "Couldn't look up OStatus account profile."
+#: lib/salmonaction.php:70
+msgid "Salmon post must be an Atom entry."
 msgstr ""
 
-#. TRANS: Client error.
-#: actions/ostatusinit.php:173
-msgid "Couldn't confirm remote profile address."
+#. TRANS: Client exception.
+#: lib/salmonaction.php:120
+msgid "Unrecognized activity type."
 msgstr ""
 
-#. TRANS: Page title.
-#: actions/ostatusinit.php:218
-msgid "OStatus Connect"
+#. TRANS: Client exception.
+#: lib/salmonaction.php:130
+msgid "This target doesn't understand posts."
 msgstr ""
 
-#: actions/pushcallback.php:50
-msgid "Empty or invalid feed id."
+#. TRANS: Client exception.
+#: lib/salmonaction.php:136
+msgid "This target doesn't understand follows."
 msgstr ""
 
-#. TRANS: Server exception. %s is a feed ID.
-#: actions/pushcallback.php:56
-#, php-format
-msgid "Unknown PuSH feed id %s"
+#. TRANS: Client exception.
+#: lib/salmonaction.php:142
+msgid "This target doesn't understand unfollows."
 msgstr ""
 
-#. TRANS: Client exception. %s is an invalid feed name.
-#: actions/pushcallback.php:96
-#, php-format
-msgid "Bad hub.topic feed \"%s\"."
+#. TRANS: Client exception.
+#: lib/salmonaction.php:148
+msgid "This target doesn't understand favorites."
 msgstr ""
 
-#. TRANS: Client exception. %1$s the invalid token, %2$s is the topic for which the invalid token was given.
-#: actions/pushcallback.php:101
-#, php-format
-msgid "Bad hub.verify_token %1$s for %2$s."
+#. TRANS: Client exception.
+#: lib/salmonaction.php:154
+msgid "This target doesn't understand unfavorites."
 msgstr ""
 
-#. TRANS: Client exception. %s is an invalid topic.
-#: actions/pushcallback.php:108
-#, php-format
-msgid "Unexpected subscribe request for %s."
+#. TRANS: Client exception.
+#: lib/salmonaction.php:160
+msgid "This target doesn't understand share events."
 msgstr ""
 
-#. TRANS: Client exception. %s is an invalid topic.
-#: actions/pushcallback.php:113
-#, php-format
-msgid "Unexpected unsubscribe request for %s."
+#. TRANS: Client exception.
+#: lib/salmonaction.php:166
+msgid "This target doesn't understand joins."
+msgstr ""
+
+#. TRANS: Client exception.
+#: lib/salmonaction.php:172
+msgid "This target doesn't understand leave events."
+msgstr ""
+
+#. TRANS: Exception.
+#: lib/salmonaction.php:200
+msgid "Received a salmon slap from unidentified actor."
 msgstr ""