eliseuamaro/gnu-social
1
0
Fork 0
forked from GNUsocial/gnu-social
Code Issues Pull Requests Releases Wiki Activity

Merge branch '1.0.x' into testing

Browse Source 
Conflicts:
	lib/common.php
This commit is contained in:
Evan Prodromou
2011-03-17 09:20:32 -04:00
parent 6b5d183bac a9f556795b
commit 7cf12f093e
1877 changed files with 142612 additions and 125474 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/OStatus/OStatusPlugin.php
View File

@@ -1020,7 +1020,7 @@ class OStatusPlugin extends Plugin
function onEndXrdActionLinks(&$xrd, $user)
{
$xrd->links[] = array('rel' => Discovery::UPDATESFROM,
$xrd->links[] = array('rel' => Discovery::UPDATESFROM,
'href' => common_local_url('ApiTimelineUser',
array('id' => $user->id,
'format' => 'atom')),
@@ -1055,6 +1055,6 @@ class OStatusPlugin extends Plugin
$xrd->links[] = array('rel' => 'http://ostatus.org/schema/1.0/subscribe',
'template' => $url );
return true;
return true;
}
}

44
plugins/OStatus/actions/ostatussub.php
View File

@@ -163,65 +163,41 @@ class OStatusSubAction extends Action
}
$this->elementStart('div', 'entity_profile vcard');
$this->elementStart('dl', 'entity_depiction');
$this->element('dt', null, _m('Photo'));
$this->elementStart('dd');
$this->element('img', array('src' => $avatar,
'class' => 'photo avatar',
'class' => 'photo avatar entity_depiction',
'width' => AVATAR_PROFILE_SIZE,
'height' => AVATAR_PROFILE_SIZE,
'alt' => $nickname));
$this->elementEnd('dd');
$this->elementEnd('dl');
$this->elementStart('dl', 'entity_nickname');
$this->element('dt', null, _m('Nickname'));
$this->elementStart('dd');
$hasFN = ($fullname !== '') ? 'nickname' : 'fn nickname';
$hasFN = ($fullname !== '') ? 'nickname' : 'fn nickname entity_nickname';
$this->elementStart('a', array('href' => $profile,
'class' => 'url '.$hasFN));
$this->raw($nickname);
$this->elementEnd('a');
$this->elementEnd('dd');
$this->elementEnd('dl');
if (!is_null($fullname)) {
$this->elementStart('dl', 'entity_fn');
$this->elementStart('dd');
$this->elementStart('span', 'fn');
$this->elementStart('div', 'fn entity_fn');
$this->raw($fullname);
$this->elementEnd('span');
$this->elementEnd('dd');
$this->elementEnd('dl');
$this->elementEnd('div');
}
if (!is_null($location)) {
$this->elementStart('dl', 'entity_location');
$this->element('dt', null, _m('Location'));
$this->elementStart('dd', 'label');
$this->elementStart('div', 'label entity_location');
$this->raw($location);
$this->elementEnd('dd');
$this->elementEnd('dl');
$this->elementEnd('div');
}
if (!is_null($homepage)) {
$this->elementStart('dl', 'entity_url');
$this->element('dt', null, _m('URL'));
$this->elementStart('dd');
$this->elementStart('a', array('href' => $homepage,
'class' => 'url'));
'class' => 'url entity_url'));
$this->raw($homepage);
$this->elementEnd('a');
$this->elementEnd('dd');
$this->elementEnd('dl');
}
if (!is_null($note)) {
$this->elementStart('dl', 'entity_note');
$this->element('dt', null, _m('Note'));
$this->elementStart('dd', 'note');
$this->elementStart('div', 'note entity_note');
$this->raw($note);
$this->elementEnd('dd');
$this->elementEnd('dl');
$this->elementEnd('div');
}
$this->elementEnd('div');
}

88
plugins/OStatus/classes/Ostatus_profile.php
View File

@@ -25,7 +25,8 @@ if (!defined('STATUSNET')) {
* @package OStatusPlugin
* @maintainer Brion Vibber <brion@status.net>
*/
class Ostatus_profile extends Memcached_DataObject
class Ostatus_profile extends Managed_DataObject
{
public $__table = 'ostatus_profile';
@@ -47,74 +48,35 @@ class Ostatus_profile extends Memcached_DataObject
}
/**
* return table definition for DB_DataObject
*
* DB_DataObject needs to know something about the table to manipulate
* instances. This method provides all the DB_DataObject needs to know.
* Return table definition for Schema setup and DB_DataObject usage.
*
* @return array array of column definitions
*/
function table()
{
return array('uri' => DB_DATAOBJECT_STR + DB_DATAOBJECT_NOTNULL,
'profile_id' => DB_DATAOBJECT_INT,
'group_id' => DB_DATAOBJECT_INT,
'feeduri' => DB_DATAOBJECT_STR,
'salmonuri' => DB_DATAOBJECT_STR,
'avatar' => DB_DATAOBJECT_STR,
'created' => DB_DATAOBJECT_STR + DB_DATAOBJECT_DATE + DB_DATAOBJECT_TIME + DB_DATAOBJECT_NOTNULL,
'modified' => DB_DATAOBJECT_STR + DB_DATAOBJECT_DATE + DB_DATAOBJECT_TIME + DB_DATAOBJECT_NOTNULL);
}
static function schemaDef()
{
return array(new ColumnDef('uri', 'varchar',
255, false, 'PRI'),
new ColumnDef('profile_id', 'integer',
null, true, 'UNI'),
new ColumnDef('group_id', 'integer',
null, true, 'UNI'),
new ColumnDef('feeduri', 'varchar',
255, true, 'UNI'),
new ColumnDef('salmonuri', 'text',
null, true),
new ColumnDef('avatar', 'text',
null, true),
new ColumnDef('created', 'datetime',
null, false),
new ColumnDef('modified', 'datetime',
null, false));
}
/**
* return key definitions for DB_DataObject
*
* DB_DataObject needs to know about keys that the table has; this function
* defines them.
*
* @return array key definitions
*/
function keys()
{
return array_keys($this->keyTypes());
}
/**
* return key definitions for Memcached_DataObject
*
* Our caching system uses the same key definitions, but uses a different
* method to get them.
*
* @return array key definitions
*/
function keyTypes()
{
return array('uri' => 'K', 'profile_id' => 'U', 'group_id' => 'U', 'feeduri' => 'U');
}
function sequenceKey()
{
return array(false, false, false);
return array(
'fields' => array(
'uri' => array('type' => 'varchar', 'length' => 255, 'not null' => true),
'profile_id' => array('type' => 'integer'),
'group_id' => array('type' => 'integer'),
'feeduri' => array('type' => 'varchar', 'length' => 255),
'salmonuri' => array('type' => 'varchar', 'length' => 255),
'avatar' => array('type' => 'text'),
'created' => array('type' => 'datetime', 'not null' => true),
'modified' => array('type' => 'datetime', 'not null' => true),
),
'primary key' => array('uri'),
'unique keys' => array(
'ostatus_profile_profile_id_idx' => array('profile_id'),
'ostatus_profile_group_id_idx' => array('group_id'),
'ostatus_profile_feeduri_idx' => array('feeduri'),
),
'foreign keys' => array(
'ostatus_profile_profile_id_fkey' => array('profile', array('profile_id' => 'id')),
'ostatus_profile_group_id_fkey' => array('user_group', array('group_id' => 'id')),
),
);
}
/**

798
plugins/OStatus/locale/OStatus.pot
View File

@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-02-14 16:01+0000\n"
"POT-Creation-Date: 2011-03-06 02:34+0100\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:223 OStatusPlugin.php:933
@@ -111,246 +115,6 @@ 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."
msgstr ""
#. TRANS: Server exception. %s is a URI.
#: classes/Ostatus_profile.php:192
#, php-format
msgid "Invalid ostatus_profile state: both group and profile IDs set for %s."
msgstr ""
#. TRANS: Server exception. %s is a URI.
#: 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:285
#, php-format
msgid "Invalid actor passed to %1$s: %2$s."
msgstr ""
#. TRANS: Server exception.
#: classes/Ostatus_profile.php:379
msgid ""
"Invalid type passed to Ostatus_profile::notify. It must be XML string or "
"Activity entry."
msgstr ""
#. TRANS: Exception.
#: classes/Ostatus_profile.php:410
msgid "Unknown feed format."
msgstr ""
#. TRANS: Exception.
#: classes/Ostatus_profile.php:434
msgid "RSS feed without a channel."
msgstr ""
#. TRANS: Client exception.
#: classes/Ostatus_profile.php:480
msgid "Can't handle that kind of post."
msgstr ""
#. TRANS: Client exception. %s is a source URI.
#: classes/Ostatus_profile.php:538
#, php-format
msgid "No content for notice %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:573
msgid "Show more"
msgstr ""
#. TRANS: Exception. %s is a profile URL.
#: classes/Ostatus_profile.php:766
#, php-format
msgid "Could not reach profile page %s."
msgstr ""
#. TRANS: Exception. %s is a URL.
#: classes/Ostatus_profile.php:824
#, php-format
msgid "Could not find a feed URL for profile page %s."
msgstr ""
#. TRANS: Feed sub exception.
#: classes/Ostatus_profile.php:923
msgid "Can't find enough profile information to make a feed."
msgstr ""
#. TRANS: Server exception. %s is a URL.
#: classes/Ostatus_profile.php:987
#, php-format
msgid "Invalid avatar URL %s."
msgstr ""
#. TRANS: Server exception. %s is a URI.
#: classes/Ostatus_profile.php:998
#, php-format
msgid "Tried to update avatar for unsaved remote profile %s."
msgstr ""
#. TRANS: Server exception. %s is a URL.
#: classes/Ostatus_profile.php:1008
#, php-format
msgid "Unable to fetch avatar from %s."
msgstr ""
#. TRANS: Exception.
#: classes/Ostatus_profile.php:1235
msgid "Local user can't be referenced as remote."
msgstr ""
#. TRANS: Exception.
#: classes/Ostatus_profile.php:1240
msgid "Local group can't be referenced as remote."
msgstr ""
#. TRANS: Server exception.
#: classes/Ostatus_profile.php:1292 classes/Ostatus_profile.php:1303
msgid "Can't save local profile."
msgstr ""
#. TRANS: Server exception.
#: classes/Ostatus_profile.php:1311
msgid "Can't save OStatus profile."
msgstr ""
#. TRANS: Exception.
#: classes/Ostatus_profile.php:1599 classes/Ostatus_profile.php:1627
msgid "Not a valid webfinger address."
msgstr ""
#. TRANS: Exception. %s is a webfinger address.
#: classes/Ostatus_profile.php:1709
#, php-format
msgid "Couldn't save profile for \"%s\"."
msgstr ""
#. TRANS: Exception. %s is a webfinger address.
#: classes/Ostatus_profile.php:1728
#, php-format
msgid "Couldn't save ostatus_profile for \"%s\"."
msgstr ""
#. TRANS: Exception. %s is a webfinger address.
#: classes/Ostatus_profile.php:1736
#, php-format
msgid "Couldn't find a valid profile for \"%s\"."
msgstr ""
#. TRANS: Server exception.
#: classes/Ostatus_profile.php:1779
msgid "Could not store HTML content of long post as file."
msgstr ""
#. TRANS: Client exception. %s is a HTTP status code.
#: 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:359
#, php-format
msgid "Callback returned status: %1$s. Body: %2$s"
msgstr ""
#. 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: Client error. Do not translate "application/magic-envelope+xml"
#: lib/salmonaction.php:48
msgid "Salmon requires \"application/magic-envelope+xml\"."
msgstr ""
#. TRANS: Client error.
#: lib/salmonaction.php:58
msgid "Salmon signature verification failed."
msgstr ""
#. TRANS: Client error.
#: lib/salmonaction.php:70
msgid "Salmon post must be an Atom entry."
msgstr ""
#. TRANS: Client exception.
#: lib/salmonaction.php:120
msgid "Unrecognized activity type."
msgstr ""
#. TRANS: Client exception.
#: lib/salmonaction.php:130
msgid "This target doesn't understand posts."
msgstr ""
#. TRANS: Client exception.
#: lib/salmonaction.php:136
msgid "This target doesn't understand follows."
msgstr ""
#. TRANS: Client exception.
#: lib/salmonaction.php:142
msgid "This target doesn't understand unfollows."
msgstr ""
#. TRANS: Client exception.
#: lib/salmonaction.php:148
msgid "This target doesn't understand favorites."
msgstr ""
#. TRANS: Client exception.
#: lib/salmonaction.php:154
msgid "This target doesn't understand unfavorites."
msgstr ""
#. TRANS: Client exception.
#: lib/salmonaction.php:160
msgid "This target doesn't understand share events."
msgstr ""
#. 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 ""
#. TRANS: Exception.
#: lib/magicenvelope.php:80
msgid "Unable to locate signer public key."
msgstr ""
#. TRANS: Exception.
#: lib/salmon.php:126
msgid "Salmon invalid actor for signing."
msgstr ""
#: tests/gettext-speedtest.php:57
msgid "Feeds"
msgstr ""
#. TRANS: Client exception.
#: actions/pushhub.php:70
msgid "Publishing outside feeds not supported."
@@ -407,10 +171,173 @@ msgstr ""
msgid "Invalid URL passed for %1$s: \"%2$s\""
msgstr ""
#: actions/pushcallback.php:50
msgid "Empty or invalid feed id."
msgstr ""
#. TRANS: Server exception. %s is a feed ID.
#: 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: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: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:108
#, php-format
msgid "Unexpected subscribe request for %s."
msgstr ""
#. TRANS: Client exception. %s is an invalid topic.
#: actions/pushcallback.php:113
#, php-format
msgid "Unexpected unsubscribe request for %s."
msgstr ""
#: actions/ownerxrd.php:39 actions/usersalmon.php:43
msgid "No such user."
msgstr ""
#. TRANS: Field label for a field that takes an OStatus user address.
#: actions/ostatussub.php:68
msgid "Subscribe to"
msgstr ""
#. 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: Button text.
#: actions/ostatussub.php:75 actions/ostatusgroup.php:86
msgctxt "BUTTON"
msgid "Continue"
msgstr ""
#. TRANS: Button text.
#. TRANS: Tooltip for button "Join".
#: actions/ostatussub.php:112
msgctxt "BUTTON"
msgid "Join this group"
msgstr ""
#. TRANS: Button text.
#: actions/ostatussub.php:115
msgctxt "BUTTON"
msgid "Confirm"
msgstr ""
#. TRANS: Tooltip for button "Confirm".
#: actions/ostatussub.php:117
msgid "Subscribe to this user"
msgstr ""
#: actions/ostatussub.php:138
msgid "You are already subscribed to this user."
msgstr ""
#. 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: 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: OStatus remote subscription dialog error.
#: actions/ostatussub.php:293
msgid "Already subscribed!"
msgstr ""
#. TRANS: OStatus remote subscription dialog error.
#: actions/ostatussub.php:298
msgid "Remote subscription failed!"
msgstr ""
#: actions/ostatussub.php:345 actions/ostatusinit.php:64
msgid "There was a problem with your session token. Try again, please."
msgstr ""
#. TRANS: Form title.
#: actions/ostatussub.php:373 actions/ostatusinit.php:83
msgid "Subscribe to user"
msgstr ""
#. TRANS: Page title for OStatus remote subscription form
#: actions/ostatussub.php:393
msgid "Confirm"
msgstr ""
#. 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: Field label.
#: actions/ostatusgroup.php:78
msgid "Join group"
msgstr ""
#. TRANS: Tooltip for field label "Join group".
#: actions/ostatusgroup.php:81
msgid "OStatus group's address, like http://example.net/group/nickname."
msgstr ""
#: actions/ostatusgroup.php:105
msgid "You are already a member of this group."
msgstr ""
#. TRANS: OStatus remote group subscription dialog error.
#: actions/ostatusgroup.php:140
msgid "Already a member!"
msgstr ""
#. TRANS: OStatus remote group subscription dialog error.
#: actions/ostatusgroup.php:151
msgid "Remote group join failed!"
msgstr ""
#. TRANS: OStatus remote group subscription dialog error.
#: actions/ostatusgroup.php:155
msgid "Remote group join aborted!"
msgstr ""
#. TRANS: Page title for OStatus remote group join form
#: actions/ostatusgroup.php:167
msgid "Confirm joining remote group"
msgstr ""
#. TRANS: Instructions.
#: actions/ostatusgroup.php:178
msgid ""
"You can subscribe to groups from other supported sites. Paste the group's "
"profile URI below:"
msgstr ""
#. TRANS: Client error.
#: actions/usersalmon.php:37 actions/groupsalmon.php:40
msgid "No ID."
@@ -453,53 +380,6 @@ msgstr ""
msgid "Notice with ID %1$s not posted by %2$s."
msgstr ""
#. TRANS: Field label.
#: actions/ostatusgroup.php:78
msgid "Join group"
msgstr ""
#. TRANS: Tooltip for field label "Join group".
#: actions/ostatusgroup.php:81
msgid "OStatus group's address, like http://example.net/group/nickname."
msgstr ""
#. TRANS: Button text.
#: actions/ostatusgroup.php:86 actions/ostatussub.php:75
msgctxt "BUTTON"
msgid "Continue"
msgstr ""
#: actions/ostatusgroup.php:105
msgid "You are already a member of this group."
msgstr ""
#. TRANS: OStatus remote group subscription dialog error.
#: actions/ostatusgroup.php:140
msgid "Already a member!"
msgstr ""
#. TRANS: OStatus remote group subscription dialog error.
#: actions/ostatusgroup.php:151
msgid "Remote group join failed!"
msgstr ""
#. TRANS: OStatus remote group subscription dialog error.
#: actions/ostatusgroup.php:155
msgid "Remote group join aborted!"
msgstr ""
#. TRANS: Page title for OStatus remote group join form
#: actions/ostatusgroup.php:167
msgid "Confirm joining remote group"
msgstr ""
#. TRANS: Instructions.
#: actions/ostatusgroup.php:178
msgid ""
"You can subscribe to groups from other supported sites. Paste the group's "
"profile URI below:"
msgstr ""
#. TRANS: Client error.
#: actions/groupsalmon.php:47
msgid "No such group."
@@ -540,108 +420,6 @@ msgstr ""
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:68
msgid "Subscribe to"
msgstr ""
#. 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: Button text.
#. TRANS: Tooltip for button "Join".
#: actions/ostatussub.php:112
msgctxt "BUTTON"
msgid "Join this group"
msgstr ""
#. TRANS: Button text.
#: actions/ostatussub.php:115
msgctxt "BUTTON"
msgid "Confirm"
msgstr ""
#. TRANS: Tooltip for button "Confirm".
#: actions/ostatussub.php:117
msgid "Subscribe to this user"
msgstr ""
#: actions/ostatussub.php:138
msgid "You are already subscribed to this user."
msgstr ""
#: actions/ostatussub.php:167
msgid "Photo"
msgstr ""
#: actions/ostatussub.php:178
msgid "Nickname"
msgstr ""
#: actions/ostatussub.php:199
msgid "Location"
msgstr ""
#: actions/ostatussub.php:208
msgid "URL"
msgstr ""
#: actions/ostatussub.php:220
msgid "Note"
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."
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."
msgstr ""
#. TRANS: OStatus remote subscription dialog error.
#: actions/ostatussub.php:317
msgid "Already subscribed!"
msgstr ""
#. TRANS: OStatus remote subscription dialog error.
#: actions/ostatussub.php:322
msgid "Remote subscription failed!"
msgstr ""
#: 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:397 actions/ostatusinit.php:83
msgid "Subscribe to user"
msgstr ""
#. TRANS: Page title for OStatus remote subscription form
#: actions/ostatussub.php:417
msgid "Confirm"
msgstr ""
#. TRANS: Instructions.
#: 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:42
msgid "You can use the local subscription!"
@@ -719,36 +497,238 @@ msgstr ""
msgid "OStatus Connect"
msgstr ""
#: actions/pushcallback.php:50
msgid "Empty or invalid feed id."
#: classes/FeedSub.php:252
msgid "Attempting to start PuSH subscription for feed with no hub."
msgstr ""
#. TRANS: Server exception. %s is a feed ID.
#: actions/pushcallback.php:56
#, php-format
msgid "Unknown PuSH feed id %s"
#: classes/FeedSub.php:282
msgid "Attempting to end PuSH subscription for feed with no hub."
msgstr ""
#. TRANS: Client exception. %s is an invalid feed name.
#: actions/pushcallback.php:96
#. TRANS: Server exception. %s is a URI.
#: classes/Ostatus_profile.php:154
#, php-format
msgid "Bad hub.topic feed \"%s\"."
msgid "Invalid ostatus_profile state: both group and profile IDs set for %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:101
#. TRANS: Server exception. %s is a URI.
#: classes/Ostatus_profile.php:157
#, php-format
msgid "Bad hub.verify_token %1$s for %2$s."
msgid "Invalid ostatus_profile state: both group and profile IDs empty for %s."
msgstr ""
#. TRANS: Client exception. %s is an invalid topic.
#: actions/pushcallback.php:108
#. 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 "Unexpected subscribe request for %s."
msgid "Invalid actor passed to %1$s: %2$s."
msgstr ""
#. TRANS: Client exception. %s is an invalid topic.
#: actions/pushcallback.php:113
#, php-format
msgid "Unexpected unsubscribe request for %s."
#. TRANS: Server exception.
#: classes/Ostatus_profile.php:341
msgid ""
"Invalid type passed to Ostatus_profile::notify. It must be XML string or "
"Activity entry."
msgstr ""
#. TRANS: Exception.
#: classes/Ostatus_profile.php:372
msgid "Unknown feed format."
msgstr ""
#. TRANS: Exception.
#: classes/Ostatus_profile.php:396
msgid "RSS feed without a channel."
msgstr ""
#. TRANS: Client exception.
#: classes/Ostatus_profile.php:442
msgid "Can't handle that kind of post."
msgstr ""
#. TRANS: Client exception. %s is a source URI.
#: classes/Ostatus_profile.php:500
#, php-format
msgid "No content for notice %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:535
msgid "Show more"
msgstr ""
#. TRANS: Exception. %s is a profile URL.
#: classes/Ostatus_profile.php:728
#, php-format
msgid "Could not reach profile page %s."
msgstr ""
#. 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 ""
#. TRANS: Feed sub exception.
#: classes/Ostatus_profile.php:885
msgid "Can't find enough profile information to make a feed."
msgstr ""
#. TRANS: Server exception. %s is a URL.
#: classes/Ostatus_profile.php:949
#, php-format
msgid "Invalid avatar URL %s."
msgstr ""
#. 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: Server exception. %s is a URL.
#: classes/Ostatus_profile.php:970
#, php-format
msgid "Unable to fetch avatar from %s."
msgstr ""
#. TRANS: Exception.
#: classes/Ostatus_profile.php:1197
msgid "Local user can't be referenced as remote."
msgstr ""
#. TRANS: Exception.
#: classes/Ostatus_profile.php:1202
msgid "Local group can't be referenced as remote."
msgstr ""
#. TRANS: Server exception.
#: classes/Ostatus_profile.php:1254 classes/Ostatus_profile.php:1265
msgid "Can't save local profile."
msgstr ""
#. TRANS: Server exception.
#: classes/Ostatus_profile.php:1273
msgid "Can't save OStatus profile."
msgstr ""
#. TRANS: Exception.
#: classes/Ostatus_profile.php:1561 classes/Ostatus_profile.php:1589
msgid "Not a valid webfinger address."
msgstr ""
#. TRANS: Exception. %s is a webfinger address.
#: classes/Ostatus_profile.php:1671
#, php-format
msgid "Couldn't save profile for \"%s\"."
msgstr ""
#. TRANS: Exception. %s is a webfinger address.
#: classes/Ostatus_profile.php:1690
#, php-format
msgid "Couldn't save ostatus_profile for \"%s\"."
msgstr ""
#. TRANS: Exception. %s is a webfinger address.
#: classes/Ostatus_profile.php:1698
#, php-format
msgid "Couldn't find a valid profile for \"%s\"."
msgstr ""
#. TRANS: Server exception.
#: classes/Ostatus_profile.php:1741
msgid "Could not store HTML content of long post as file."
msgstr ""
#. TRANS: Client exception. %s is a HTTP status code.
#: 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:359
#, php-format
msgid "Callback returned status: %1$s. Body: %2$s"
msgstr ""
#. TRANS: Exception.
#: lib/magicenvelope.php:80
msgid "Unable to locate signer public key."
msgstr ""
#. TRANS: Exception.
#: lib/salmon.php:126
msgid "Salmon invalid actor for signing."
msgstr ""
#. 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: Client error. Do not translate "application/magic-envelope+xml"
#: lib/salmonaction.php:48
msgid "Salmon requires \"application/magic-envelope+xml\"."
msgstr ""
#. TRANS: Client error.
#: lib/salmonaction.php:58
msgid "Salmon signature verification failed."
msgstr ""
#. TRANS: Client error.
#: lib/salmonaction.php:70
msgid "Salmon post must be an Atom entry."
msgstr ""
#. TRANS: Client exception.
#: lib/salmonaction.php:120
msgid "Unrecognized activity type."
msgstr ""
#. TRANS: Client exception.
#: lib/salmonaction.php:130
msgid "This target doesn't understand posts."
msgstr ""
#. TRANS: Client exception.
#: lib/salmonaction.php:136
msgid "This target doesn't understand follows."
msgstr ""
#. TRANS: Client exception.
#: lib/salmonaction.php:142
msgid "This target doesn't understand unfollows."
msgstr ""
#. TRANS: Client exception.
#: lib/salmonaction.php:148
msgid "This target doesn't understand favorites."
msgstr ""
#. TRANS: Client exception.
#: lib/salmonaction.php:154
msgid "This target doesn't understand unfavorites."
msgstr ""
#. TRANS: Client exception.
#: lib/salmonaction.php:160
msgid "This target doesn't understand share events."
msgstr ""
#. 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 ""

833
plugins/OStatus/locale/de/LC_MESSAGES/OStatus.po
View File

File diff suppressed because it is too large Load Diff

863
plugins/OStatus/locale/fr/LC_MESSAGES/OStatus.po
View File

File diff suppressed because it is too large Load Diff

817
plugins/OStatus/locale/ia/LC_MESSAGES/OStatus.po
View File

File diff suppressed because it is too large Load Diff

827
plugins/OStatus/locale/mk/LC_MESSAGES/OStatus.po
View File

File diff suppressed because it is too large Load Diff

863
plugins/OStatus/locale/nl/LC_MESSAGES/OStatus.po
View File

File diff suppressed because it is too large Load Diff

841
plugins/OStatus/locale/uk/LC_MESSAGES/OStatus.po
View File

File diff suppressed because it is too large Load Diff