diff options
79 files changed, 3449 insertions, 6317 deletions
diff --git a/actions/apiaccountupdateprofileimage.php b/actions/apiaccountupdateprofileimage.php index 72fb361bf..2f8e9628c 100644 --- a/actions/apiaccountupdateprofileimage.php +++ b/actions/apiaccountupdateprofileimage.php @@ -102,7 +102,7 @@ class ApiAccountUpdateProfileImageAction extends ApiAuthAction } if (empty($this->user)) { - $this->clientError(_('No such user!'), 404, $this->format); + $this->clientError(_('No such user.'), 404, $this->format); return; } diff --git a/actions/apiblockcreate.php b/actions/apiblockcreate.php index 1cab2df5d..4f941f6c3 100644 --- a/actions/apiblockcreate.php +++ b/actions/apiblockcreate.php @@ -94,7 +94,7 @@ class ApiBlockCreateAction extends ApiAuthAction } if (empty($this->user) || empty($this->other)) { - $this->clientError(_('No such user!'), 404, $this->format); + $this->clientError(_('No such user.'), 404, $this->format); return; } diff --git a/actions/apiblockdestroy.php b/actions/apiblockdestroy.php index 16dbf94ca..328f18ab0 100644 --- a/actions/apiblockdestroy.php +++ b/actions/apiblockdestroy.php @@ -93,7 +93,7 @@ class ApiBlockDestroyAction extends ApiAuthAction } if (empty($this->user) || empty($this->other)) { - $this->clientError(_('No such user!'), 404, $this->format); + $this->clientError(_('No such user.'), 404, $this->format); return; } diff --git a/actions/apidirectmessage.php b/actions/apidirectmessage.php index a21fe86d2..5b3f412ad 100644 --- a/actions/apidirectmessage.php +++ b/actions/apidirectmessage.php @@ -74,7 +74,7 @@ class ApiDirectMessageAction extends ApiAuthAction $this->user = $this->auth_user; if (empty($this->user)) { - $this->clientError(_('No such user!'), 404, $this->format); + $this->clientError(_('No such user.'), 404, $this->format); return; } diff --git a/actions/apidirectmessagenew.php b/actions/apidirectmessagenew.php index ca1ee70dd..fed6acc30 100644 --- a/actions/apidirectmessagenew.php +++ b/actions/apidirectmessagenew.php @@ -72,7 +72,7 @@ class ApiDirectMessageNewAction extends ApiAuthAction $this->user = $this->auth_user; if (empty($this->user)) { - $this->clientError(_('No such user!'), 404, $this->format); + $this->clientError(_('No such user.'), 404, $this->format); return; } diff --git a/actions/apigroupcreate.php b/actions/apigroupcreate.php index f66e83073..895dfb7ab 100644 --- a/actions/apigroupcreate.php +++ b/actions/apigroupcreate.php @@ -109,7 +109,7 @@ class ApiGroupCreateAction extends ApiAuthAction } if (empty($this->user)) { - $this->clientError(_('No such user!'), 404, $this->format); + $this->clientError(_('No such user.'), 404, $this->format); return; } diff --git a/actions/apigroupismember.php b/actions/apigroupismember.php index a8a40a6b3..a822d18dd 100644 --- a/actions/apigroupismember.php +++ b/actions/apigroupismember.php @@ -87,7 +87,7 @@ class ApiGroupIsMemberAction extends ApiBareAuthAction parent::handle($args); if (empty($this->user)) { - $this->clientError(_('No such user!'), 404, $this->format); + $this->clientError(_('No such user.'), 404, $this->format); return; } diff --git a/actions/apigroupjoin.php b/actions/apigroupjoin.php index 071cd9290..ffda3986f 100644 --- a/actions/apigroupjoin.php +++ b/actions/apigroupjoin.php @@ -96,7 +96,7 @@ class ApiGroupJoinAction extends ApiAuthAction } if (empty($this->user)) { - $this->clientError(_('No such user!'), 404, $this->format); + $this->clientError(_('No such user.'), 404, $this->format); return; } diff --git a/actions/apigroupleave.php b/actions/apigroupleave.php index 0d4bb9e4d..8665ea1aa 100644 --- a/actions/apigroupleave.php +++ b/actions/apigroupleave.php @@ -96,7 +96,7 @@ class ApiGroupLeaveAction extends ApiAuthAction } if (empty($this->user)) { - $this->clientError(_('No such user!'), 404, $this->format); + $this->clientError(_('No such user.'), 404, $this->format); return; } diff --git a/actions/apigrouplist.php b/actions/apigrouplist.php index c529c1e40..7b05f8a96 100644 --- a/actions/apigrouplist.php +++ b/actions/apigrouplist.php @@ -87,7 +87,7 @@ class ApiGroupListAction extends ApiBareAuthAction parent::handle($args); if (empty($this->user)) { - $this->clientError(_('No such user!'), 404, $this->format); + $this->clientError(_('No such user.'), 404, $this->format); return; } diff --git a/actions/apistatusesupdate.php b/actions/apistatusesupdate.php index e369fa71e..5c23accca 100644 --- a/actions/apistatusesupdate.php +++ b/actions/apistatusesupdate.php @@ -136,7 +136,7 @@ class ApiStatusesUpdateAction extends ApiAuthAction } if (empty($this->user)) { - $this->clientError(_('No such user!'), 404, $this->format); + $this->clientError(_('No such user.'), 404, $this->format); return; } diff --git a/actions/apisubscriptions.php b/actions/apisubscriptions.php index bc68dd192..2c691bb84 100644 --- a/actions/apisubscriptions.php +++ b/actions/apisubscriptions.php @@ -84,7 +84,7 @@ class ApiSubscriptionsAction extends ApiBareAuthAction $this->user = $this->getTargetUser($this->arg('id')); if (empty($this->user)) { - $this->clientError(_('No such user!'), 404, $this->format); + $this->clientError(_('No such user.'), 404, $this->format); return false; } diff --git a/actions/apitimelinefavorites.php b/actions/apitimelinefavorites.php index b8ae74f13..f84d7b4cb 100644 --- a/actions/apitimelinefavorites.php +++ b/actions/apitimelinefavorites.php @@ -67,7 +67,7 @@ class ApiTimelineFavoritesAction extends ApiBareAuthAction $this->user = $this->getTargetUser($this->arg('id')); if (empty($this->user)) { - $this->clientError(_('No such user!'), 404, $this->format); + $this->clientError(_('No such user.'), 404, $this->format); return; } diff --git a/actions/apitimelinefriends.php b/actions/apitimelinefriends.php index 66dd3f2b2..e84f77372 100644 --- a/actions/apitimelinefriends.php +++ b/actions/apitimelinefriends.php @@ -76,7 +76,7 @@ class ApiTimelineFriendsAction extends ApiBareAuthAction $this->user = $this->getTargetUser($this->arg('id')); if (empty($this->user)) { - $this->clientError(_('No such user!'), 404, $this->format); + $this->clientError(_('No such user.'), 404, $this->format); return; } diff --git a/actions/apitimelinementions.php b/actions/apitimelinementions.php index fe5ff0f28..0956ccdce 100644 --- a/actions/apitimelinementions.php +++ b/actions/apitimelinementions.php @@ -76,7 +76,7 @@ class ApiTimelineMentionsAction extends ApiBareAuthAction $this->user = $this->getTargetUser($this->arg('id')); if (empty($this->user)) { - $this->clientError(_('No such user!'), 404, $this->format); + $this->clientError(_('No such user.'), 404, $this->format); return; } diff --git a/actions/apitimelineuser.php b/actions/apitimelineuser.php index 285735fd1..ca1d21772 100644 --- a/actions/apitimelineuser.php +++ b/actions/apitimelineuser.php @@ -78,7 +78,7 @@ class ApiTimelineUserAction extends ApiBareAuthAction $this->user = $this->getTargetUser($this->arg('id')); if (empty($this->user)) { - $this->clientError(_('No such user!'), 404, $this->format); + $this->clientError(_('No such user.'), 404, $this->format); return; } diff --git a/actions/emailsettings.php b/actions/emailsettings.php index 67b991cdc..715457eab 100644 --- a/actions/emailsettings.php +++ b/actions/emailsettings.php @@ -452,7 +452,7 @@ class EmailsettingsAction extends AccountSettingsAction if (!$user->updateKeys($orig)) { common_log_db_error($user, 'UPDATE', __FILE__); - $this->serverError(_("Couldn't update user record.")); + $this->serverError(_("Could not update user record.")); } $this->showForm(_('Incoming email address removed.'), true); @@ -474,7 +474,7 @@ class EmailsettingsAction extends AccountSettingsAction if (!$user->updateKeys($orig)) { common_log_db_error($user, 'UPDATE', __FILE__); - $this->serverError(_("Couldn't update user record.")); + $this->serverError(_("Could not update user record.")); } $this->showForm(_('New incoming email address added.'), true); diff --git a/actions/microsummary.php b/actions/microsummary.php index 5c01a9ce0..5c761e8bb 100644 --- a/actions/microsummary.php +++ b/actions/microsummary.php @@ -59,7 +59,7 @@ class MicrosummaryAction extends Action $user = User::staticGet('nickname', $nickname); if (!$user) { - $this->clientError(_('No such user'), 404); + $this->clientError(_('No such user.'), 404); return; } diff --git a/actions/newmessage.php b/actions/newmessage.php index 095a7d1d3..0db2e7181 100644 --- a/actions/newmessage.php +++ b/actions/newmessage.php @@ -113,7 +113,7 @@ class NewmessageAction extends Action $this->other = User::staticGet('id', $this->to); if (!$this->other) { - $this->clientError(_('No such user'), 404); + $this->clientError(_('No such user.'), 404); return false; } diff --git a/actions/remotesubscribe.php b/actions/remotesubscribe.php index aee2a5d8e..74025cf80 100644 --- a/actions/remotesubscribe.php +++ b/actions/remotesubscribe.php @@ -151,7 +151,7 @@ class RemotesubscribeAction extends Action $this->profile_url = $this->trimmed('profile_url'); if (!$this->profile_url) { - $this->showForm(_('No such user')); + $this->showForm(_('No such user.')); return; } diff --git a/actions/smssettings.php b/actions/smssettings.php index 9fa7f62fb..4debe1967 100644 --- a/actions/smssettings.php +++ b/actions/smssettings.php @@ -525,7 +525,7 @@ class SmssettingsAction extends ConnectSettingsAction if (!$user->updateKeys($orig)) { common_log_db_error($user, 'UPDATE', __FILE__); - $this->serverError(_("Couldn't update user record.")); + $this->serverError(_("Could not update user record.")); } $this->showForm(_('Incoming email address removed.'), true); diff --git a/classes/File.php b/classes/File.php index e04a9d525..dd0c3227e 100644 --- a/classes/File.php +++ b/classes/File.php @@ -99,7 +99,7 @@ class File extends Memcached_DataObject } elseif (is_string($redir_data)) { $redir_url = $redir_data; } else { - throw new ServerException("Can't process url '$given_url'"); + throw new ServerException("Cannot process url '$given_url'"); } // TODO: max field length if ($redir_url === $given_url || strlen($redir_url) > 255) { diff --git a/classes/Notice.php b/classes/Notice.php index 9886875cb..862d4c762 100644 --- a/classes/Notice.php +++ b/classes/Notice.php @@ -680,7 +680,7 @@ class Notice extends Memcached_DataObject return Notice::getStreamDirect($qry, $offset, $limit, null, null, $order, null); } - # Get the cache; if we can't, just go to the DB + # Get the cache; if we cannot, just go to the DB $cache = common_memcache(); @@ -1364,7 +1364,7 @@ class Notice extends Memcached_DataObject } } - // If it's not a "low bandwidth" source (one where you can't set + // If it's not a "low bandwidth" source (one where you cannot set // a reply_to argument), we return. This is mostly web and API // clients. diff --git a/extlib/Auth/OpenID/Consumer.php b/extlib/Auth/OpenID/Consumer.php index 500890b65..c75ef4c06 100644 --- a/extlib/Auth/OpenID/Consumer.php +++ b/extlib/Auth/OpenID/Consumer.php @@ -1059,7 +1059,7 @@ class Auth_OpenID_GenericConsumer { } } - // Fragments do not influence discovery, so we can't compare a + // Fragments do not influence discovery, so we cannot compare a // claimed identifier with a fragment to discovered // information. list($defragged_claimed_id, $_) = diff --git a/extlib/Auth/OpenID/Discover.php b/extlib/Auth/OpenID/Discover.php index 62aeb1d2b..9bb3ee357 100644 --- a/extlib/Auth/OpenID/Discover.php +++ b/extlib/Auth/OpenID/Discover.php @@ -515,7 +515,7 @@ function Auth_OpenID_discoverXRI($iname, &$fetcher) function Auth_OpenID_discover($uri, &$fetcher) { - // If the fetcher (i.e., PHP) doesn't support SSL, we can't do + // If the fetcher (i.e., PHP) doesn't support SSL, we cannot do // discovery on an HTTPS URL. if ($fetcher->isHTTPS($uri) && !$fetcher->supportsSSL()) { return array($uri, array()); @@ -527,7 +527,7 @@ function Auth_OpenID_discover($uri, &$fetcher) $result = Auth_OpenID_discoverURI($uri, $fetcher); } - // If the fetcher doesn't support SSL, we can't interact with + // If the fetcher doesn't support SSL, we cannot interact with // HTTPS server URLs; remove those endpoints from the list. if (!$fetcher->supportsSSL()) { $http_endpoints = array(); diff --git a/extlib/Auth/OpenID/FileStore.php b/extlib/Auth/OpenID/FileStore.php index 29d8d20e7..d9962e153 100644 --- a/extlib/Auth/OpenID/FileStore.php +++ b/extlib/Auth/OpenID/FileStore.php @@ -496,7 +496,7 @@ class Auth_OpenID_FileStore extends Auth_OpenID_OpenIDStore { return true; } else { - // Couldn't open directory. + // Could not open directory. return false; } } diff --git a/extlib/DB.php b/extlib/DB.php index a511979e6..4ef66f66f 100644 --- a/extlib/DB.php +++ b/extlib/DB.php @@ -1341,7 +1341,7 @@ class DB_result * returning the total number of rows that would have been returned, * rather than the real number. As a result, we'll just do the limit * calculations for fbsql in the same way as a database with emulated - * limits. Unfortunately, we can't just do this in DB_fbsql::numRows() + * limits. Unfortunately, we cannot just do this in DB_fbsql::numRows() * because that only gets the result resource, rather than the full * DB_Result object. */ if (($this->dbh->features['limit'] === 'emulate' diff --git a/extlib/DB/DataObject/Generator.php b/extlib/DB/DataObject/Generator.php index ff6e42c7d..e14e3ef7f 100644 --- a/extlib/DB/DataObject/Generator.php +++ b/extlib/DB/DataObject/Generator.php @@ -632,7 +632,7 @@ class DB_DataObject_Generator extends DB_DataObject echo "*****************************************************************\n". "** WARNING COLUMN NAME UNUSABLE **\n". "** Found column '{$t->name}', of type '{$t->type}' **\n". - "** Since this column name can't be converted to a php variable **\n". + "** Since this column name cannot be converted to a php variable **\n". "** name, and the whole idea of mapping would result in a mess **\n". "** This column has been ignored... **\n". "*****************************************************************\n"; @@ -910,7 +910,7 @@ class DB_DataObject_Generator extends DB_DataObject echo "*****************************************************************\n". "** WARNING COLUMN NAME UNUSABLE **\n". "** Found column '{$t->name}', of type '{$t->type}' **\n". - "** Since this column name can't be converted to a php variable **\n". + "** Since this column name cannot be converted to a php variable **\n". "** name, and the whole idea of mapping would result in a mess **\n". "** This column has been ignored... **\n". "*****************************************************************\n"; diff --git a/extlib/DB/dbase.php b/extlib/DB/dbase.php index 67afc897d..15d259c4d 100644 --- a/extlib/DB/dbase.php +++ b/extlib/DB/dbase.php @@ -287,7 +287,7 @@ class DB_dbase extends DB_common * See DB_result::fetchInto() for more information. * * This method is not meant to be called directly. Use - * DB_result::fetchInto() instead. It can't be declared "protected" + * DB_result::fetchInto() instead. It cannot be declared "protected" * because DB_result is a separate object. * * @param resource $result the query result resource @@ -352,7 +352,7 @@ class DB_dbase extends DB_common * Gets the number of columns in a result set * * This method is not meant to be called directly. Use - * DB_result::numCols() instead. It can't be declared "protected" + * DB_result::numCols() instead. It cannot be declared "protected" * because DB_result is a separate object. * * @param resource $result PHP's query result resource @@ -373,7 +373,7 @@ class DB_dbase extends DB_common * Gets the number of rows in a result set * * This method is not meant to be called directly. Use - * DB_result::numRows() instead. It can't be declared "protected" + * DB_result::numRows() instead. It cannot be declared "protected" * because DB_result is a separate object. * * @param resource $result PHP's query result resource diff --git a/extlib/DB/fbsql.php b/extlib/DB/fbsql.php index 4de4078f7..48ff705cf 100644 --- a/extlib/DB/fbsql.php +++ b/extlib/DB/fbsql.php @@ -262,7 +262,7 @@ class DB_fbsql extends DB_common * See DB_result::fetchInto() for more information. * * This method is not meant to be called directly. Use - * DB_result::fetchInto() instead. It can't be declared "protected" + * DB_result::fetchInto() instead. It cannot be declared "protected" * because DB_result is a separate object. * * @param resource $result the query result resource @@ -309,7 +309,7 @@ class DB_fbsql extends DB_common * Deletes the result set and frees the memory occupied by the result set * * This method is not meant to be called directly. Use - * DB_result::free() instead. It can't be declared "protected" + * DB_result::free() instead. It cannot be declared "protected" * because DB_result is a separate object. * * @param resource $result PHP's query result resource @@ -376,7 +376,7 @@ class DB_fbsql extends DB_common * Gets the number of columns in a result set * * This method is not meant to be called directly. Use - * DB_result::numCols() instead. It can't be declared "protected" + * DB_result::numCols() instead. It cannot be declared "protected" * because DB_result is a separate object. * * @param resource $result PHP's query result resource @@ -401,7 +401,7 @@ class DB_fbsql extends DB_common * Gets the number of rows in a result set * * This method is not meant to be called directly. Use - * DB_result::numRows() instead. It can't be declared "protected" + * DB_result::numRows() instead. It cannot be declared "protected" * because DB_result is a separate object. * * @param resource $result PHP's query result resource diff --git a/extlib/DB/ibase.php b/extlib/DB/ibase.php index ee19c5589..1e444d634 100644 --- a/extlib/DB/ibase.php +++ b/extlib/DB/ibase.php @@ -353,7 +353,7 @@ class DB_ibase extends DB_common * See DB_result::fetchInto() for more information. * * This method is not meant to be called directly. Use - * DB_result::fetchInto() instead. It can't be declared "protected" + * DB_result::fetchInto() instead. It cannot be declared "protected" * because DB_result is a separate object. * * @param resource $result the query result resource @@ -402,7 +402,7 @@ class DB_ibase extends DB_common * Deletes the result set and frees the memory occupied by the result set * * This method is not meant to be called directly. Use - * DB_result::free() instead. It can't be declared "protected" + * DB_result::free() instead. It cannot be declared "protected" * because DB_result is a separate object. * * @param resource $result PHP's query result resource @@ -449,7 +449,7 @@ class DB_ibase extends DB_common * Gets the number of columns in a result set * * This method is not meant to be called directly. Use - * DB_result::numCols() instead. It can't be declared "protected" + * DB_result::numCols() instead. It cannot be declared "protected" * because DB_result is a separate object. * * @param resource $result PHP's query result resource diff --git a/extlib/DB/ifx.php b/extlib/DB/ifx.php index baa6f2867..dcb3dbd3e 100644 --- a/extlib/DB/ifx.php +++ b/extlib/DB/ifx.php @@ -147,7 +147,7 @@ class DB_ifx extends DB_common /** * The quantity of transactions begun * - * {@internal While this is private, it can't actually be designated + * {@internal While this is private, it cannot actually be designated * private in PHP 5 because it is directly accessed in the test suite.}} * * @var integer @@ -328,7 +328,7 @@ class DB_ifx extends DB_common * See DB_result::fetchInto() for more information. * * This method is not meant to be called directly. Use - * DB_result::fetchInto() instead. It can't be declared "protected" + * DB_result::fetchInto() instead. It cannot be declared "protected" * because DB_result is a separate object. * * @param resource $result the query result resource @@ -387,7 +387,7 @@ class DB_ifx extends DB_common * Gets the number of columns in a result set * * This method is not meant to be called directly. Use - * DB_result::numCols() instead. It can't be declared "protected" + * DB_result::numCols() instead. It cannot be declared "protected" * because DB_result is a separate object. * * @param resource $result PHP's query result resource @@ -411,7 +411,7 @@ class DB_ifx extends DB_common * Deletes the result set and frees the memory occupied by the result set * * This method is not meant to be called directly. Use - * DB_result::free() instead. It can't be declared "protected" + * DB_result::free() instead. It cannot be declared "protected" * because DB_result is a separate object. * * @param resource $result PHP's query result resource @@ -555,7 +555,7 @@ class DB_ifx extends DB_common * * If analyzing a query result and the result has duplicate field names, * an error will be raised saying - * <samp>can't distinguish duplicate field names</samp>. + * <samp>cannot distinguish duplicate field names</samp>. * * @param object|string $result DB_result object from a query or a * string containing the name of a table. @@ -604,7 +604,7 @@ class DB_ifx extends DB_common $count = @ifx_num_fields($id); if (count($flds) != $count) { - return $this->raiseError("can't distinguish duplicate field names"); + return $this->raiseError("cannot distinguish duplicate field names"); } if ($this->options['portability'] & DB_PORTABILITY_LOWERCASE) { diff --git a/extlib/DB/msql.php b/extlib/DB/msql.php index 34854f472..ee64f932f 100644 --- a/extlib/DB/msql.php +++ b/extlib/DB/msql.php @@ -288,7 +288,7 @@ class DB_msql extends DB_common * See DB_result::fetchInto() for more information. * * This method is not meant to be called directly. Use - * DB_result::fetchInto() instead. It can't be declared "protected" + * DB_result::fetchInto() instead. It cannot be declared "protected" * because DB_result is a separate object. * * PHP's mSQL extension did weird things with NULL values prior to PHP @@ -339,7 +339,7 @@ class DB_msql extends DB_common * Deletes the result set and frees the memory occupied by the result set * * This method is not meant to be called directly. Use - * DB_result::free() instead. It can't be declared "protected" + * DB_result::free() instead. It cannot be declared "protected" * because DB_result is a separate object. * * @param resource $result PHP's query result resource @@ -360,7 +360,7 @@ class DB_msql extends DB_common * Gets the number of columns in a result set * * This method is not meant to be called directly. Use - * DB_result::numCols() instead. It can't be declared "protected" + * DB_result::numCols() instead. It cannot be declared "protected" * because DB_result is a separate object. * * @param resource $result PHP's query result resource @@ -385,7 +385,7 @@ class DB_msql extends DB_common * Gets the number of rows in a result set * * This method is not meant to be called directly. Use - * DB_result::numRows() instead. It can't be declared "protected" + * DB_result::numRows() instead. It cannot be declared "protected" * because DB_result is a separate object. * * @param resource $result PHP's query result resource diff --git a/extlib/DB/mssql.php b/extlib/DB/mssql.php index 511a2b686..1aad75671 100644 --- a/extlib/DB/mssql.php +++ b/extlib/DB/mssql.php @@ -156,7 +156,7 @@ class DB_mssql extends DB_common /** * The quantity of transactions begun * - * {@internal While this is private, it can't actually be designated + * {@internal While this is private, it cannot actually be designated * private in PHP 5 because it is directly accessed in the test suite.}} * * @var integer @@ -324,7 +324,7 @@ class DB_mssql extends DB_common * See DB_result::fetchInto() for more information. * * This method is not meant to be called directly. Use - * DB_result::fetchInto() instead. It can't be declared "protected" + * DB_result::fetchInto() instead. It cannot be declared "protected" * because DB_result is a separate object. * * @param resource $result the query result resource @@ -371,7 +371,7 @@ class DB_mssql extends DB_common * Deletes the result set and frees the memory occupied by the result set * * This method is not meant to be called directly. Use - * DB_result::free() instead. It can't be declared "protected" + * DB_result::free() instead. It cannot be declared "protected" * because DB_result is a separate object. * * @param resource $result PHP's query result resource @@ -392,7 +392,7 @@ class DB_mssql extends DB_common * Gets the number of columns in a result set * * This method is not meant to be called directly. Use - * DB_result::numCols() instead. It can't be declared "protected" + * DB_result::numCols() instead. It cannot be declared "protected" * because DB_result is a separate object. * * @param resource $result PHP's query result resource @@ -417,7 +417,7 @@ class DB_mssql extends DB_common * Gets the number of rows in a result set * * This method is not meant to be called directly. Use - * DB_result::numRows() instead. It can't be declared "protected" + * DB_result::numRows() instead. It cannot be declared "protected" * because DB_result is a separate object. * * @param resource $result PHP's query result resource diff --git a/extlib/DB/mysql.php b/extlib/DB/mysql.php index c67254520..bfe34dbe8 100644 --- a/extlib/DB/mysql.php +++ b/extlib/DB/mysql.php @@ -139,7 +139,7 @@ class DB_mysql extends DB_common /** * The quantity of transactions begun * - * {@internal While this is private, it can't actually be designated + * {@internal While this is private, it cannot actually be designated * private in PHP 5 because it is directly accessed in the test suite.}} * * @var integer @@ -359,7 +359,7 @@ class DB_mysql extends DB_common * See DB_result::fetchInto() for more information. * * This method is not meant to be called directly. Use - * DB_result::fetchInto() instead. It can't be declared "protected" + * DB_result::fetchInto() instead. It cannot be declared "protected" * because DB_result is a separate object. * * @param resource $result the query result resource @@ -411,7 +411,7 @@ class DB_mysql extends DB_common * Deletes the result set and frees the memory occupied by the result set * * This method is not meant to be called directly. Use - * DB_result::free() instead. It can't be declared "protected" + * DB_result::free() instead. It cannot be declared "protected" * because DB_result is a separate object. * * @param resource $result PHP's query result resource @@ -432,7 +432,7 @@ class DB_mysql extends DB_common * Gets the number of columns in a result set * * This method is not meant to be called directly. Use - * DB_result::numCols() instead. It can't be declared "protected" + * DB_result::numCols() instead. It cannot be declared "protected" * because DB_result is a separate object. * * @param resource $result PHP's query result resource @@ -457,7 +457,7 @@ class DB_mysql extends DB_common * Gets the number of rows in a result set * * This method is not meant to be called directly. Use - * DB_result::numRows() instead. It can't be declared "protected" + * DB_result::numRows() instead. It cannot be declared "protected" * because DB_result is a separate object. * * @param resource $result PHP's query result resource @@ -722,7 +722,7 @@ class DB_mysql extends DB_common return $result; } if ($result == 0) { - // Failed to get the lock, can't do the conversion, bail + // Failed to get the lock, cannot do the conversion, bail // with a DB_ERROR_NOT_LOCKED error return $this->mysqlRaiseError(DB_ERROR_NOT_LOCKED); } @@ -757,7 +757,7 @@ class DB_mysql extends DB_common * Quotes a string so it can be safely used as a table or column name * (WARNING: using names that require this is a REALLY BAD IDEA) * - * WARNING: Older versions of MySQL can't handle the backtick + * WARNING: Older versions of MySQL cannot handle the backtick * character (<kbd>`</kbd>) in table or column names. * * @param string $str identifier name to be quoted diff --git a/extlib/DB/mysqli.php b/extlib/DB/mysqli.php index c6941b170..b6196dfcc 100644 --- a/extlib/DB/mysqli.php +++ b/extlib/DB/mysqli.php @@ -142,7 +142,7 @@ class DB_mysqli extends DB_common /** * The quantity of transactions begun * - * {@internal While this is private, it can't actually be designated + * {@internal While this is private, it cannot actually be designated * private in PHP 5 because it is directly accessed in the test suite.}} * * @var integer @@ -434,7 +434,7 @@ class DB_mysqli extends DB_common * See DB_result::fetchInto() for more information. * * This method is not meant to be called directly. Use - * DB_result::fetchInto() instead. It can't be declared "protected" + * DB_result::fetchInto() instead. It cannot be declared "protected" * because DB_result is a separate object. * * @param resource $result the query result resource @@ -486,7 +486,7 @@ class DB_mysqli extends DB_common * Deletes the result set and frees the memory occupied by the result set * * This method is not meant to be called directly. Use - * DB_result::free() instead. It can't be declared "protected" + * DB_result::free() instead. It cannot be declared "protected" * because DB_result is a separate object. * * @param resource $result PHP's query result resource @@ -507,7 +507,7 @@ class DB_mysqli extends DB_common * Gets the number of columns in a result set * * This method is not meant to be called directly. Use - * DB_result::numCols() instead. It can't be declared "protected" + * DB_result::numCols() instead. It cannot be declared "protected" * because DB_result is a separate object. * * @param resource $result PHP's query result resource @@ -532,7 +532,7 @@ class DB_mysqli extends DB_common * Gets the number of rows in a result set * * This method is not meant to be called directly. Use - * DB_result::numRows() instead. It can't be declared "protected" + * DB_result::numRows() instead. It cannot be declared "protected" * because DB_result is a separate object. * * @param resource $result PHP's query result resource @@ -796,7 +796,7 @@ class DB_mysqli extends DB_common return $result; } if ($result == 0) { - // Failed to get the lock, can't do the conversion, bail + // Failed to get the lock, cannot do the conversion, bail // with a DB_ERROR_NOT_LOCKED error return $this->mysqliRaiseError(DB_ERROR_NOT_LOCKED); } @@ -832,7 +832,7 @@ class DB_mysqli extends DB_common * Quotes a string so it can be safely used as a table or column name * (WARNING: using names that require this is a REALLY BAD IDEA) * - * WARNING: Older versions of MySQL can't handle the backtick + * WARNING: Older versions of MySQL cannot handle the backtick * character (<kbd>`</kbd>) in table or column names. * * @param string $str identifier name to be quoted diff --git a/extlib/DB/oci8.php b/extlib/DB/oci8.php index d30794871..6ad36643a 100644 --- a/extlib/DB/oci8.php +++ b/extlib/DB/oci8.php @@ -251,7 +251,7 @@ class DB_oci8 extends DB_common $char); $error = OCIError(); if (!empty($error) && $error['code'] == 12541) { - // Couldn't find TNS listener. Try direct connection. + // Could not find TNS listener. Try direct connection. $this->connection = @$connect_function($dsn['username'], $dsn['password'], null, @@ -368,7 +368,7 @@ class DB_oci8 extends DB_common * See DB_result::fetchInto() for more information. * * This method is not meant to be called directly. Use - * DB_result::fetchInto() instead. It can't be declared "protected" + * DB_result::fetchInto() instead. It cannot be declared "protected" * because DB_result is a separate object. * * @param resource $result the query result resource @@ -415,7 +415,7 @@ class DB_oci8 extends DB_common * Deletes the result set and frees the memory occupied by the result set * * This method is not meant to be called directly. Use - * DB_result::free() instead. It can't be declared "protected" + * DB_result::free() instead. It cannot be declared "protected" * because DB_result is a separate object. * * @param resource $result PHP's query result resource @@ -468,7 +468,7 @@ class DB_oci8 extends DB_common * is turned on. * * This method is not meant to be called directly. Use - * DB_result::numRows() instead. It can't be declared "protected" + * DB_result::numRows() instead. It cannot be declared "protected" * because DB_result is a separate object. * * @param resource $result PHP's query result resource @@ -511,7 +511,7 @@ class DB_oci8 extends DB_common * Gets the number of columns in a result set * * This method is not meant to be called directly. Use - * DB_result::numCols() instead. It can't be declared "protected" + * DB_result::numCols() instead. It cannot be declared "protected" * because DB_result is a separate object. * * @param resource $result PHP's query result resource diff --git a/extlib/DB/odbc.php b/extlib/DB/odbc.php index eba43659a..b0dc83ab5 100644 --- a/extlib/DB/odbc.php +++ b/extlib/DB/odbc.php @@ -301,7 +301,7 @@ class DB_odbc extends DB_common * See DB_result::fetchInto() for more information. * * This method is not meant to be called directly. Use - * DB_result::fetchInto() instead. It can't be declared "protected" + * DB_result::fetchInto() instead. It cannot be declared "protected" * because DB_result is a separate object. * * @param resource $result the query result resource @@ -356,7 +356,7 @@ class DB_odbc extends DB_common * Deletes the result set and frees the memory occupied by the result set * * This method is not meant to be called directly. Use - * DB_result::free() instead. It can't be declared "protected" + * DB_result::free() instead. It cannot be declared "protected" * because DB_result is a separate object. * * @param resource $result PHP's query result resource @@ -377,7 +377,7 @@ class DB_odbc extends DB_common * Gets the number of columns in a result set * * This method is not meant to be called directly. Use - * DB_result::numCols() instead. It can't be declared "protected" + * DB_result::numCols() instead. It cannot be declared "protected" * because DB_result is a separate object. * * @param resource $result PHP's query result resource @@ -427,7 +427,7 @@ class DB_odbc extends DB_common * a DB_Error object for DB_ERROR_UNSUPPORTED is returned. * * This method is not meant to be called directly. Use - * DB_result::numRows() instead. It can't be declared "protected" + * DB_result::numRows() instead. It cannot be declared "protected" * because DB_result is a separate object. * * @param resource $result PHP's query result resource diff --git a/extlib/DB/pgsql.php b/extlib/DB/pgsql.php index 6030bb4c1..498ef8ade 100644 --- a/extlib/DB/pgsql.php +++ b/extlib/DB/pgsql.php @@ -115,7 +115,7 @@ class DB_pgsql extends DB_common /** * The quantity of transactions begun * - * {@internal While this is private, it can't actually be designated + * {@internal While this is private, it cannot actually be designated * private in PHP 5 because it is directly accessed in the test suite.}} * * @var integer @@ -397,7 +397,7 @@ class DB_pgsql extends DB_common * See DB_result::fetchInto() for more information. * * This method is not meant to be called directly. Use - * DB_result::fetchInto() instead. It can't be declared "protected" + * DB_result::fetchInto() instead. It cannot be declared "protected" * because DB_result is a separate object. * * @param resource $result the query result resource @@ -445,7 +445,7 @@ class DB_pgsql extends DB_common * Deletes the result set and frees the memory occupied by the result set * * This method is not meant to be called directly. Use - * DB_result::free() instead. It can't be declared "protected" + * DB_result::free() instead. It cannot be declared "protected" * because DB_result is a separate object. * * @param resource $result PHP's query result resource @@ -535,7 +535,7 @@ class DB_pgsql extends DB_common * Gets the number of columns in a result set * * This method is not meant to be called directly. Use - * DB_result::numCols() instead. It can't be declared "protected" + * DB_result::numCols() instead. It cannot be declared "protected" * because DB_result is a separate object. * * @param resource $result PHP's query result resource @@ -560,7 +560,7 @@ class DB_pgsql extends DB_common * Gets the number of rows in a result set * * This method is not meant to be called directly. Use - * DB_result::numRows() instead. It can't be declared "protected" + * DB_result::numRows() instead. It cannot be declared "protected" * because DB_result is a separate object. * * @param resource $result PHP's query result resource diff --git a/extlib/DB/sqlite.php b/extlib/DB/sqlite.php index 5c4b396e5..96d5c934a 100644 --- a/extlib/DB/sqlite.php +++ b/extlib/DB/sqlite.php @@ -334,7 +334,7 @@ class DB_sqlite extends DB_common * See DB_result::fetchInto() for more information. * * This method is not meant to be called directly. Use - * DB_result::fetchInto() instead. It can't be declared "protected" + * DB_result::fetchInto() instead. It cannot be declared "protected" * because DB_result is a separate object. * * @param resource $result the query result resource @@ -396,7 +396,7 @@ class DB_sqlite extends DB_common * Deletes the result set and frees the memory occupied by the result set * * This method is not meant to be called directly. Use - * DB_result::free() instead. It can't be declared "protected" + * DB_result::free() instead. It cannot be declared "protected" * because DB_result is a separate object. * * @param resource $result PHP's query result resource @@ -422,7 +422,7 @@ class DB_sqlite extends DB_common * Gets the number of columns in a result set * * This method is not meant to be called directly. Use - * DB_result::numCols() instead. It can't be declared "protected" + * DB_result::numCols() instead. It cannot be declared "protected" * because DB_result is a separate object. * * @param resource $result PHP's query result resource @@ -447,7 +447,7 @@ class DB_sqlite extends DB_common * Gets the number of rows in a result set * * This method is not meant to be called directly. Use - * DB_result::numRows() instead. It can't be declared "protected" + * DB_result::numRows() instead. It cannot be declared "protected" * because DB_result is a separate object. * * @param resource $result PHP's query result resource diff --git a/extlib/DB/sybase.php b/extlib/DB/sybase.php index 3befbf6ea..97ab41a22 100644 --- a/extlib/DB/sybase.php +++ b/extlib/DB/sybase.php @@ -118,7 +118,7 @@ class DB_sybase extends DB_common /** * The quantity of transactions begun * - * {@internal While this is private, it can't actually be designated + * {@internal While this is private, it cannot actually be designated * private in PHP 5 because it is directly accessed in the test suite.}} * * @var integer @@ -302,7 +302,7 @@ class DB_sybase extends DB_common * See DB_result::fetchInto() for more information. * * This method is not meant to be called directly. Use - * DB_result::fetchInto() instead. It can't be declared "protected" + * DB_result::fetchInto() instead. It cannot be declared "protected" * because DB_result is a separate object. * * @param resource $result the query result resource @@ -359,7 +359,7 @@ class DB_sybase extends DB_common * Deletes the result set and frees the memory occupied by the result set * * This method is not meant to be called directly. Use - * DB_result::free() instead. It can't be declared "protected" + * DB_result::free() instead. It cannot be declared "protected" * because DB_result is a separate object. * * @param resource $result PHP's query result resource @@ -380,7 +380,7 @@ class DB_sybase extends DB_common * Gets the number of columns in a result set * * This method is not meant to be called directly. Use - * DB_result::numCols() instead. It can't be declared "protected" + * DB_result::numCols() instead. It cannot be declared "protected" * because DB_result is a separate object. * * @param resource $result PHP's query result resource @@ -405,7 +405,7 @@ class DB_sybase extends DB_common * Gets the number of rows in a result set * * This method is not meant to be called directly. Use - * DB_result::numRows() instead. It can't be declared "protected" + * DB_result::numRows() instead. It cannot be declared "protected" * because DB_result is a separate object. * * @param resource $result PHP's query result resource @@ -835,7 +835,7 @@ class DB_sybase extends DB_common $tableName = $table; /* We're running sp_helpindex directly because it doesn't exist in - * older versions of ASE -- unfortunately, we can't just use + * older versions of ASE -- unfortunately, we cannot just use * DB::isError() because the user may be using callback error * handling. */ $res = @sybase_query("sp_helpindex $table", $this->connection); diff --git a/extlib/HTTP/Request2/Adapter/Socket.php b/extlib/HTTP/Request2/Adapter/Socket.php index ff44d4959..13cd6136f 100644 --- a/extlib/HTTP/Request2/Adapter/Socket.php +++ b/extlib/HTTP/Request2/Adapter/Socket.php @@ -1,971 +1,971 @@ -<?php
-/**
- * Socket-based adapter for HTTP_Request2
- *
- * PHP version 5
- *
- * LICENSE:
- *
- * Copyright (c) 2008, 2009, Alexey Borzov <avb@php.net>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * * The names of the authors may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
- * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * @category HTTP
- * @package HTTP_Request2
- * @author Alexey Borzov <avb@php.net>
- * @license http://opensource.org/licenses/bsd-license.php New BSD License
- * @version CVS: $Id: Socket.php 279760 2009-05-03 10:46:42Z avb $
- * @link http://pear.php.net/package/HTTP_Request2
- */
-
-/**
- * Base class for HTTP_Request2 adapters
- */
-require_once 'HTTP/Request2/Adapter.php';
-
-/**
- * Socket-based adapter for HTTP_Request2
- *
- * This adapter uses only PHP sockets and will work on almost any PHP
- * environment. Code is based on original HTTP_Request PEAR package.
- *
- * @category HTTP
- * @package HTTP_Request2
- * @author Alexey Borzov <avb@php.net>
- * @version Release: 0.4.1
- */
-class HTTP_Request2_Adapter_Socket extends HTTP_Request2_Adapter
-{
- /**
- * Regular expression for 'token' rule from RFC 2616
- */
- const REGEXP_TOKEN = '[^\x00-\x1f\x7f-\xff()<>@,;:\\\\"/\[\]?={}\s]+';
-
- /**
- * Regular expression for 'quoted-string' rule from RFC 2616
- */
- const REGEXP_QUOTED_STRING = '"(?:\\\\.|[^\\\\"])*"';
-
- /**
- * Connected sockets, needed for Keep-Alive support
- * @var array
- * @see connect()
- */
- protected static $sockets = array();
-
- /**
- * Data for digest authentication scheme
- *
- * The keys for the array are URL prefixes.
- *
- * The values are associative arrays with data (realm, nonce, nonce-count,
- * opaque...) needed for digest authentication. Stored here to prevent making
- * duplicate requests to digest-protected resources after we have already
- * received the challenge.
- *
- * @var array
- */
- protected static $challenges = array();
-
- /**
- * Connected socket
- * @var resource
- * @see connect()
- */
- protected $socket;
-
- /**
- * Challenge used for server digest authentication
- * @var array
- */
- protected $serverChallenge;
-
- /**
- * Challenge used for proxy digest authentication
- * @var array
- */
- protected $proxyChallenge;
-
- /**
- * Global timeout, exception will be raised if request continues past this time
- * @var integer
- */
- protected $timeout = null;
-
- /**
- * Remaining length of the current chunk, when reading chunked response
- * @var integer
- * @see readChunked()
- */
- protected $chunkLength = 0;
-
- /**
- * Sends request to the remote server and returns its response
- *
- * @param HTTP_Request2
- * @return HTTP_Request2_Response
- * @throws HTTP_Request2_Exception
- */
- public function sendRequest(HTTP_Request2 $request)
- {
- $this->request = $request;
- $keepAlive = $this->connect();
- $headers = $this->prepareHeaders();
-
- // Use global request timeout if given, see feature requests #5735, #8964
- if ($timeout = $request->getConfig('timeout')) {
- $this->timeout = time() + $timeout;
- } else {
- $this->timeout = null;
- }
-
- try {
- if (false === @fwrite($this->socket, $headers, strlen($headers))) {
- throw new HTTP_Request2_Exception('Error writing request');
- }
- // provide request headers to the observer, see request #7633
- $this->request->setLastEvent('sentHeaders', $headers);
- $this->writeBody();
-
- if ($this->timeout && time() > $this->timeout) {
- throw new HTTP_Request2_Exception(
- 'Request timed out after ' .
- $request->getConfig('timeout') . ' second(s)'
- );
- }
-
- $response = $this->readResponse();
-
- if (!$this->canKeepAlive($keepAlive, $response)) {
- $this->disconnect();
- }
-
- if ($this->shouldUseProxyDigestAuth($response)) {
- return $this->sendRequest($request);
- }
- if ($this->shouldUseServerDigestAuth($response)) {
- return $this->sendRequest($request);
- }
- if ($authInfo = $response->getHeader('authentication-info')) {
- $this->updateChallenge($this->serverChallenge, $authInfo);
- }
- if ($proxyInfo = $response->getHeader('proxy-authentication-info')) {
- $this->updateChallenge($this->proxyChallenge, $proxyInfo);
- }
-
- } catch (Exception $e) {
- $this->disconnect();
- throw $e;
- }
-
- return $response;
- }
-
- /**
- * Connects to the remote server
- *
- * @return bool whether the connection can be persistent
- * @throws HTTP_Request2_Exception
- */
- protected function connect()
- {
- $secure = 0 == strcasecmp($this->request->getUrl()->getScheme(), 'https');
- $tunnel = HTTP_Request2::METHOD_CONNECT == $this->request->getMethod();
- $headers = $this->request->getHeaders();
- $reqHost = $this->request->getUrl()->getHost();
- if (!($reqPort = $this->request->getUrl()->getPort())) {
- $reqPort = $secure? 443: 80;
- }
-
- if ($host = $this->request->getConfig('proxy_host')) {
- if (!($port = $this->request->getConfig('proxy_port'))) {
- throw new HTTP_Request2_Exception('Proxy port not provided');
- }
- $proxy = true;
- } else {
- $host = $reqHost;
- $port = $reqPort;
- $proxy = false;
- }
-
- if ($tunnel && !$proxy) {
- throw new HTTP_Request2_Exception(
- "Trying to perform CONNECT request without proxy"
- );
- }
- if ($secure && !in_array('ssl', stream_get_transports())) {
- throw new HTTP_Request2_Exception(
- 'Need OpenSSL support for https:// requests'
- );
- }
-
- // RFC 2068, section 19.7.1: A client MUST NOT send the Keep-Alive
- // connection token to a proxy server...
- if ($proxy && !$secure &&
- !empty($headers['connection']) && 'Keep-Alive' == $headers['connection']
- ) {
- $this->request->setHeader('connection');
- }
-
- $keepAlive = ('1.1' == $this->request->getConfig('protocol_version') &&
- empty($headers['connection'])) ||
- (!empty($headers['connection']) &&
- 'Keep-Alive' == $headers['connection']);
- $host = ((!$secure || $proxy)? 'tcp://': 'ssl://') . $host;
-
- $options = array();
- if ($secure || $tunnel) {
- foreach ($this->request->getConfig() as $name => $value) {
- if ('ssl_' == substr($name, 0, 4) && null !== $value) {
- if ('ssl_verify_host' == $name) {
- if ($value) {
- $options['CN_match'] = $reqHost;
- }
- } else {
- $options[substr($name, 4)] = $value;
- }
- }
- }
- ksort($options);
- }
-
- // Changing SSL context options after connection is established does *not*
- // work, we need a new connection if options change
- $remote = $host . ':' . $port;
- $socketKey = $remote . (($secure && $proxy)? "->{$reqHost}:{$reqPort}": '') .
- (empty($options)? '': ':' . serialize($options));
- unset($this->socket);
-
- // We use persistent connections and have a connected socket?
- // Ensure that the socket is still connected, see bug #16149
- if ($keepAlive && !empty(self::$sockets[$socketKey]) &&
- !feof(self::$sockets[$socketKey])
- ) {
- $this->socket =& self::$sockets[$socketKey];
-
- } elseif ($secure && $proxy && !$tunnel) {
- $this->establishTunnel();
- $this->request->setLastEvent(
- 'connect', "ssl://{$reqHost}:{$reqPort} via {$host}:{$port}"
- );
- self::$sockets[$socketKey] =& $this->socket;
-
- } else {
- // Set SSL context options if doing HTTPS request or creating a tunnel
- $context = stream_context_create();
- foreach ($options as $name => $value) {
- if (!stream_context_set_option($context, 'ssl', $name, $value)) {
- throw new HTTP_Request2_Exception(
- "Error setting SSL context option '{$name}'"
- );
- }
- }
- $this->socket = @stream_socket_client(
- $remote, $errno, $errstr,
- $this->request->getConfig('connect_timeout'),
- STREAM_CLIENT_CONNECT, $context
- );
- if (!$this->socket) {
- throw new HTTP_Request2_Exception(
- "Unable to connect to {$remote}. Error #{$errno}: {$errstr}"
- );
- }
- $this->request->setLastEvent('connect', $remote);
- self::$sockets[$socketKey] =& $this->socket;
- }
- return $keepAlive;
- }
-
- /**
- * Establishes a tunnel to a secure remote server via HTTP CONNECT request
- *
- * This method will fail if 'ssl_verify_peer' is enabled. Probably because PHP
- * sees that we are connected to a proxy server (duh!) rather than the server
- * that presents its certificate.
- *
- * @link http://tools.ietf.org/html/rfc2817#section-5.2
- * @throws HTTP_Request2_Exception
- */
- protected function establishTunnel()
- {
- $donor = new self;
- $connect = new HTTP_Request2(
- $this->request->getUrl(), HTTP_Request2::METHOD_CONNECT,
- array_merge($this->request->getConfig(),
- array('adapter' => $donor))
- );
- $response = $connect->send();
- // Need any successful (2XX) response
- if (200 > $response->getStatus() || 300 <= $response->getStatus()) {
- throw new HTTP_Request2_Exception(
- 'Failed to connect via HTTPS proxy. Proxy response: ' .
- $response->getStatus() . ' ' . $response->getReasonPhrase()
- );
- }
- $this->socket = $donor->socket;
-
- $modes = array(
- STREAM_CRYPTO_METHOD_TLS_CLIENT,
- STREAM_CRYPTO_METHOD_SSLv3_CLIENT,
- STREAM_CRYPTO_METHOD_SSLv23_CLIENT,
- STREAM_CRYPTO_METHOD_SSLv2_CLIENT
- );
-
- foreach ($modes as $mode) {
- if (stream_socket_enable_crypto($this->socket, true, $mode)) {
- return;
- }
- }
- throw new HTTP_Request2_Exception(
- 'Failed to enable secure connection when connecting through proxy'
- );
- }
-
- /**
- * Checks whether current connection may be reused or should be closed
- *
- * @param boolean whether connection could be persistent
- * in the first place
- * @param HTTP_Request2_Response response object to check
- * @return boolean
- */
- protected function canKeepAlive($requestKeepAlive, HTTP_Request2_Response $response)
- {
- // Do not close socket on successful CONNECT request
- if (HTTP_Request2::METHOD_CONNECT == $this->request->getMethod() &&
- 200 <= $response->getStatus() && 300 > $response->getStatus()
- ) {
- return true;
- }
-
- $lengthKnown = 'chunked' == strtolower($response->getHeader('transfer-encoding')) ||
- null !== $response->getHeader('content-length');
- $persistent = 'keep-alive' == strtolower($response->getHeader('connection')) ||
- (null === $response->getHeader('connection') &&
- '1.1' == $response->getVersion());
- return $requestKeepAlive && $lengthKnown && $persistent;
- }
-
- /**
- * Disconnects from the remote server
- */
- protected function disconnect()
- {
- if (is_resource($this->socket)) {
- fclose($this->socket);
- $this->socket = null;
- $this->request->setLastEvent('disconnect');
- }
- }
-
- /**
- * Checks whether another request should be performed with server digest auth
- *
- * Several conditions should be satisfied for it to return true:
- * - response status should be 401
- * - auth credentials should be set in the request object
- * - response should contain WWW-Authenticate header with digest challenge
- * - there is either no challenge stored for this URL or new challenge
- * contains stale=true parameter (in other case we probably just failed
- * due to invalid username / password)
- *
- * The method stores challenge values in $challenges static property
- *
- * @param HTTP_Request2_Response response to check
- * @return boolean whether another request should be performed
- * @throws HTTP_Request2_Exception in case of unsupported challenge parameters
- */
- protected function shouldUseServerDigestAuth(HTTP_Request2_Response $response)
- {
- // no sense repeating a request if we don't have credentials
- if (401 != $response->getStatus() || !$this->request->getAuth()) {
- return false;
- }
- if (!$challenge = $this->parseDigestChallenge($response->getHeader('www-authenticate'))) {
- return false;
- }
-
- $url = $this->request->getUrl();
- $scheme = $url->getScheme();
- $host = $scheme . '://' . $url->getHost();
- if ($port = $url->getPort()) {
- if ((0 == strcasecmp($scheme, 'http') && 80 != $port) ||
- (0 == strcasecmp($scheme, 'https') && 443 != $port)
- ) {
- $host .= ':' . $port;
- }
- }
-
- if (!empty($challenge['domain'])) {
- $prefixes = array();
- foreach (preg_split('/\\s+/', $challenge['domain']) as $prefix) {
- // don't bother with different servers
- if ('/' == substr($prefix, 0, 1)) {
- $prefixes[] = $host . $prefix;
- }
- }
- }
- if (empty($prefixes)) {
- $prefixes = array($host . '/');
- }
-
- $ret = true;
- foreach ($prefixes as $prefix) {
- if (!empty(self::$challenges[$prefix]) &&
- (empty($challenge['stale']) || strcasecmp('true', $challenge['stale']))
- ) {
- // probably credentials are invalid
- $ret = false;
- }
- self::$challenges[$prefix] =& $challenge;
- }
- return $ret;
- }
-
- /**
- * Checks whether another request should be performed with proxy digest auth
- *
- * Several conditions should be satisfied for it to return true:
- * - response status should be 407
- * - proxy auth credentials should be set in the request object
- * - response should contain Proxy-Authenticate header with digest challenge
- * - there is either no challenge stored for this proxy or new challenge
- * contains stale=true parameter (in other case we probably just failed
- * due to invalid username / password)
- *
- * The method stores challenge values in $challenges static property
- *
- * @param HTTP_Request2_Response response to check
- * @return boolean whether another request should be performed
- * @throws HTTP_Request2_Exception in case of unsupported challenge parameters
- */
- protected function shouldUseProxyDigestAuth(HTTP_Request2_Response $response)
- {
- if (407 != $response->getStatus() || !$this->request->getConfig('proxy_user')) {
- return false;
- }
- if (!($challenge = $this->parseDigestChallenge($response->getHeader('proxy-authenticate')))) {
- return false;
- }
-
- $key = 'proxy://' . $this->request->getConfig('proxy_host') .
- ':' . $this->request->getConfig('proxy_port');
-
- if (!empty(self::$challenges[$key]) &&
- (empty($challenge['stale']) || strcasecmp('true', $challenge['stale']))
- ) {
- $ret = false;
- } else {
- $ret = true;
- }
- self::$challenges[$key] = $challenge;
- return $ret;
- }
-
- /**
- * Extracts digest method challenge from (WWW|Proxy)-Authenticate header value
- *
- * There is a problem with implementation of RFC 2617: several of the parameters
- * here are defined as quoted-string and thus may contain backslash escaped
- * double quotes (RFC 2616, section 2.2). However, RFC 2617 defines unq(X) as
- * just value of quoted-string X without surrounding quotes, it doesn't speak
- * about removing backslash escaping.
- *
- * Now realm parameter is user-defined and human-readable, strange things
- * happen when it contains quotes:
- * - Apache allows quotes in realm, but apparently uses realm value without
- * backslashes for digest computation
- * - Squid allows (manually escaped) quotes there, but it is impossible to
- * authorize with either escaped or unescaped quotes used in digest,
- * probably it can't parse the response (?)
- * - Both IE and Firefox display realm value with backslashes in
- * the password popup and apparently use the same value for digest
- *
- * HTTP_Request2 follows IE and Firefox (and hopefully RFC 2617) in
- * quoted-string handling, unfortunately that means failure to authorize
- * sometimes
- *
- * @param string value of WWW-Authenticate or Proxy-Authenticate header
- * @return mixed associative array with challenge parameters, false if
- * no challenge is present in header value
- * @throws HTTP_Request2_Exception in case of unsupported challenge parameters
- */
- protected function parseDigestChallenge($headerValue)
- {
- $authParam = '(' . self::REGEXP_TOKEN . ')\\s*=\\s*(' .
- self::REGEXP_TOKEN . '|' . self::REGEXP_QUOTED_STRING . ')';
- $challenge = "!(?<=^|\\s|,)Digest ({$authParam}\\s*(,\\s*|$))+!";
- if (!preg_match($challenge, $headerValue, $matches)) {
- return false;
- }
-
- preg_match_all('!' . $authParam . '!', $matches[0], $params);
- $paramsAry = array();
- $knownParams = array('realm', 'domain', 'nonce', 'opaque', 'stale',
- 'algorithm', 'qop');
- for ($i = 0; $i < count($params[0]); $i++) {
- // section 3.2.1: Any unrecognized directive MUST be ignored.
- if (in_array($params[1][$i], $knownParams)) {
- if ('"' == substr($params[2][$i], 0, 1)) {
- $paramsAry[$params[1][$i]] = substr($params[2][$i], 1, -1);
- } else {
- $paramsAry[$params[1][$i]] = $params[2][$i];
- }
- }
- }
- // we only support qop=auth
- if (!empty($paramsAry['qop']) &&
- !in_array('auth', array_map('trim', explode(',', $paramsAry['qop'])))
- ) {
- throw new HTTP_Request2_Exception(
- "Only 'auth' qop is currently supported in digest authentication, " .
- "server requested '{$paramsAry['qop']}'"
- );
- }
- // we only support algorithm=MD5
- if (!empty($paramsAry['algorithm']) && 'MD5' != $paramsAry['algorithm']) {
- throw new HTTP_Request2_Exception(
- "Only 'MD5' algorithm is currently supported in digest authentication, " .
- "server requested '{$paramsAry['algorithm']}'"
- );
- }
-
- return $paramsAry;
- }
-
- /**
- * Parses [Proxy-]Authentication-Info header value and updates challenge
- *
- * @param array challenge to update
- * @param string value of [Proxy-]Authentication-Info header
- * @todo validate server rspauth response
- */
- protected function updateChallenge(&$challenge, $headerValue)
- {
- $authParam = '!(' . self::REGEXP_TOKEN . ')\\s*=\\s*(' .
- self::REGEXP_TOKEN . '|' . self::REGEXP_QUOTED_STRING . ')!';
- $paramsAry = array();
-
- preg_match_all($authParam, $headerValue, $params);
- for ($i = 0; $i < count($params[0]); $i++) {
- if ('"' == substr($params[2][$i], 0, 1)) {
- $paramsAry[$params[1][$i]] = substr($params[2][$i], 1, -1);
- } else {
- $paramsAry[$params[1][$i]] = $params[2][$i];
- }
- }
- // for now, just update the nonce value
- if (!empty($paramsAry['nextnonce'])) {
- $challenge['nonce'] = $paramsAry['nextnonce'];
- $challenge['nc'] = 1;
- }
- }
-
- /**
- * Creates a value for [Proxy-]Authorization header when using digest authentication
- *
- * @param string user name
- * @param string password
- * @param string request URL
- * @param array digest challenge parameters
- * @return string value of [Proxy-]Authorization request header
- * @link http://tools.ietf.org/html/rfc2617#section-3.2.2
- */
- protected function createDigestResponse($user, $password, $url, &$challenge)
- {
- if (false !== ($q = strpos($url, '?')) &&
- $this->request->getConfig('digest_compat_ie')
- ) {
- $url = substr($url, 0, $q);
- }
-
- $a1 = md5($user . ':' . $challenge['realm'] . ':' . $password);
- $a2 = md5($this->request->getMethod() . ':' . $url);
-
- if (empty($challenge['qop'])) {
- $digest = md5($a1 . ':' . $challenge['nonce'] . ':' . $a2);
- } else {
- $challenge['cnonce'] = 'Req2.' . rand();
- if (empty($challenge['nc'])) {
- $challenge['nc'] = 1;
- }
- $nc = sprintf('%08x', $challenge['nc']++);
- $digest = md5($a1 . ':' . $challenge['nonce'] . ':' . $nc . ':' .
- $challenge['cnonce'] . ':auth:' . $a2);
- }
- return 'Digest username="' . str_replace(array('\\', '"'), array('\\\\', '\\"'), $user) . '", ' .
- 'realm="' . $challenge['realm'] . '", ' .
- 'nonce="' . $challenge['nonce'] . '", ' .
- 'uri="' . $url . '", ' .
- 'response="' . $digest . '"' .
- (!empty($challenge['opaque'])?
- ', opaque="' . $challenge['opaque'] . '"':
- '') .
- (!empty($challenge['qop'])?
- ', qop="auth", nc=' . $nc . ', cnonce="' . $challenge['cnonce'] . '"':
- '');
- }
-
- /**
- * Adds 'Authorization' header (if needed) to request headers array
- *
- * @param array request headers
- * @param string request host (needed for digest authentication)
- * @param string request URL (needed for digest authentication)
- * @throws HTTP_Request2_Exception
- */
- protected function addAuthorizationHeader(&$headers, $requestHost, $requestUrl)
- {
- if (!($auth = $this->request->getAuth())) {
- return;
- }
- switch ($auth['scheme']) {
- case HTTP_Request2::AUTH_BASIC:
- $headers['authorization'] =
- 'Basic ' . base64_encode($auth['user'] . ':' . $auth['password']);
- break;
-
- case HTTP_Request2::AUTH_DIGEST:
- unset($this->serverChallenge);
- $fullUrl = ('/' == $requestUrl[0])?
- $this->request->getUrl()->getScheme() . '://' .
- $requestHost . $requestUrl:
- $requestUrl;
- foreach (array_keys(self::$challenges) as $key) {
- if ($key == substr($fullUrl, 0, strlen($key))) {
- $headers['authorization'] = $this->createDigestResponse(
- $auth['user'], $auth['password'],
- $requestUrl, self::$challenges[$key]
- );
- $this->serverChallenge =& self::$challenges[$key];
- break;
- }
- }
- break;
-
- default:
- throw new HTTP_Request2_Exception(
- "Unknown HTTP authentication scheme '{$auth['scheme']}'"
- );
- }
- }
-
- /**
- * Adds 'Proxy-Authorization' header (if needed) to request headers array
- *
- * @param array request headers
- * @param string request URL (needed for digest authentication)
- * @throws HTTP_Request2_Exception
- */
- protected function addProxyAuthorizationHeader(&$headers, $requestUrl)
- {
- if (!$this->request->getConfig('proxy_host') ||
- !($user = $this->request->getConfig('proxy_user')) ||
- (0 == strcasecmp('https', $this->request->getUrl()->getScheme()) &&
- HTTP_Request2::METHOD_CONNECT != $this->request->getMethod())
- ) {
- return;
- }
-
- $password = $this->request->getConfig('proxy_password');
- switch ($this->request->getConfig('proxy_auth_scheme')) {
- case HTTP_Request2::AUTH_BASIC:
- $headers['proxy-authorization'] =
- 'Basic ' . base64_encode($user . ':' . $password);
- break;
-
- case HTTP_Request2::AUTH_DIGEST:
- unset($this->proxyChallenge);
- $proxyUrl = 'proxy://' . $this->request->getConfig('proxy_host') .
- ':' . $this->request->getConfig('proxy_port');
- if (!empty(self::$challenges[$proxyUrl])) {
- $headers['proxy-authorization'] = $this->createDigestResponse(
- $user, $password,
- $requestUrl, self::$challenges[$proxyUrl]
- );
- $this->proxyChallenge =& self::$challenges[$proxyUrl];
- }
- break;
-
- default:
- throw new HTTP_Request2_Exception(
- "Unknown HTTP authentication scheme '" .
- $this->request->getConfig('proxy_auth_scheme') . "'"
- );
- }
- }
-
-
- /**
- * Creates the string with the Request-Line and request headers
- *
- * @return string
- * @throws HTTP_Request2_Exception
- */
- protected function prepareHeaders()
- {
- $headers = $this->request->getHeaders();
- $url = $this->request->getUrl();
- $connect = HTTP_Request2::METHOD_CONNECT == $this->request->getMethod();
- $host = $url->getHost();
-
- $defaultPort = 0 == strcasecmp($url->getScheme(), 'https')? 443: 80;
- if (($port = $url->getPort()) && $port != $defaultPort || $connect) {
- $host .= ':' . (empty($port)? $defaultPort: $port);
- }
- // Do not overwrite explicitly set 'Host' header, see bug #16146
- if (!isset($headers['host'])) {
- $headers['host'] = $host;
- }
-
- if ($connect) {
- $requestUrl = $host;
-
- } else {
- if (!$this->request->getConfig('proxy_host') ||
- 0 == strcasecmp($url->getScheme(), 'https')
- ) {
- $requestUrl = '';
- } else {
- $requestUrl = $url->getScheme() . '://' . $host;
- }
- $path = $url->getPath();
- $query = $url->getQuery();
- $requestUrl .= (empty($path)? '/': $path) . (empty($query)? '': '?' . $query);
- }
-
- if ('1.1' == $this->request->getConfig('protocol_version') &&
- extension_loaded('zlib') && !isset($headers['accept-encoding'])
- ) {
- $headers['accept-encoding'] = 'gzip, deflate';
- }
-
- $this->addAuthorizationHeader($headers, $host, $requestUrl);
- $this->addProxyAuthorizationHeader($headers, $requestUrl);
- $this->calculateRequestLength($headers);
-
- $headersStr = $this->request->getMethod() . ' ' . $requestUrl . ' HTTP/' .
- $this->request->getConfig('protocol_version') . "\r\n";
- foreach ($headers as $name => $value) {
- $canonicalName = implode('-', array_map('ucfirst', explode('-', $name)));
- $headersStr .= $canonicalName . ': ' . $value . "\r\n";
- }
- return $headersStr . "\r\n";
- }
-
- /**
- * Sends the request body
- *
- * @throws HTTP_Request2_Exception
- */
- protected function writeBody()
- {
- if (in_array($this->request->getMethod(), self::$bodyDisallowed) ||
- 0 == $this->contentLength
- ) {
- return;
- }
-
- $position = 0;
- $bufferSize = $this->request->getConfig('buffer_size');
- while ($position < $this->contentLength) {
- if (is_string($this->requestBody)) {
- $str = substr($this->requestBody, $position, $bufferSize);
- } elseif (is_resource($this->requestBody)) {
- $str = fread($this->requestBody, $bufferSize);
- } else {
- $str = $this->requestBody->read($bufferSize);
- }
- if (false === @fwrite($this->socket, $str, strlen($str))) {
- throw new HTTP_Request2_Exception('Error writing request');
- }
- // Provide the length of written string to the observer, request #7630
- $this->request->setLastEvent('sentBodyPart', strlen($str));
- $position += strlen($str);
- }
- }
-
- /**
- * Reads the remote server's response
- *
- * @return HTTP_Request2_Response
- * @throws HTTP_Request2_Exception
- */
- protected function readResponse()
- {
- $bufferSize = $this->request->getConfig('buffer_size');
-
- do {
- $response = new HTTP_Request2_Response($this->readLine($bufferSize), true);
- do {
- $headerLine = $this->readLine($bufferSize);
- $response->parseHeaderLine($headerLine);
- } while ('' != $headerLine);
- } while (in_array($response->getStatus(), array(100, 101)));
-
- $this->request->setLastEvent('receivedHeaders', $response);
-
- // No body possible in such responses
- if (HTTP_Request2::METHOD_HEAD == $this->request->getMethod() ||
- (HTTP_Request2::METHOD_CONNECT == $this->request->getMethod() &&
- 200 <= $response->getStatus() && 300 > $response->getStatus()) ||
- in_array($response->getStatus(), array(204, 304))
- ) {
- return $response;
- }
-
- $chunked = 'chunked' == $response->getHeader('transfer-encoding');
- $length = $response->getHeader('content-length');
- $hasBody = false;
- if ($chunked || null === $length || 0 < intval($length)) {
- // RFC 2616, section 4.4:
- // 3. ... If a message is received with both a
- // Transfer-Encoding header field and a Content-Length header field,
- // the latter MUST be ignored.
- $toRead = ($chunked || null === $length)? null: $length;
- $this->chunkLength = 0;
-
- while (!feof($this->socket) && (is_null($toRead) || 0 < $toRead)) {
- if ($chunked) {
- $data = $this->readChunked($bufferSize);
- } elseif (is_null($toRead)) {
- $data = $this->fread($bufferSize);
- } else {
- $data = $this->fread(min($toRead, $bufferSize));
- $toRead -= strlen($data);
- }
- if ('' == $data && (!$this->chunkLength || feof($this->socket))) {
- break;
- }
-
- $hasBody = true;
- if ($this->request->getConfig('store_body')) {
- $response->appendBody($data);
- }
- if (!in_array($response->getHeader('content-encoding'), array('identity', null))) {
- $this->request->setLastEvent('receivedEncodedBodyPart', $data);
- } else {
- $this->request->setLastEvent('receivedBodyPart', $data);
- }
- }
- }
-
- if ($hasBody) {
- $this->request->setLastEvent('receivedBody', $response);
- }
- return $response;
- }
-
- /**
- * Reads until either the end of the socket or a newline, whichever comes first
- *
- * Strips the trailing newline from the returned data, handles global
- * request timeout. Method idea borrowed from Net_Socket PEAR package.
- *
- * @param int buffer size to use for reading
- * @return Available data up to the newline (not including newline)
- * @throws HTTP_Request2_Exception In case of timeout
- */
- protected function readLine($bufferSize)
- {
- $line = '';
- while (!feof($this->socket)) {
- if ($this->timeout) {
- stream_set_timeout($this->socket, max($this->timeout - time(), 1));
- }
- $line .= @fgets($this->socket, $bufferSize);
- $info = stream_get_meta_data($this->socket);
- if ($info['timed_out'] || $this->timeout && time() > $this->timeout) {
- throw new HTTP_Request2_Exception(
- 'Request timed out after ' .
- $this->request->getConfig('timeout') . ' second(s)'
- );
- }
- if (substr($line, -1) == "\n") {
- return rtrim($line, "\r\n");
- }
- }
- return $line;
- }
-
- /**
- * Wrapper around fread(), handles global request timeout
- *
- * @param int Reads up to this number of bytes
- * @return Data read from socket
- * @throws HTTP_Request2_Exception In case of timeout
- */
- protected function fread($length)
- {
- if ($this->timeout) {
- stream_set_timeout($this->socket, max($this->timeout - time(), 1));
- }
- $data = fread($this->socket, $length);
- $info = stream_get_meta_data($this->socket);
- if ($info['timed_out'] || $this->timeout && time() > $this->timeout) {
- throw new HTTP_Request2_Exception(
- 'Request timed out after ' .
- $this->request->getConfig('timeout') . ' second(s)'
- );
- }
- return $data;
- }
-
- /**
- * Reads a part of response body encoded with chunked Transfer-Encoding
- *
- * @param int buffer size to use for reading
- * @return string
- * @throws HTTP_Request2_Exception
- */
- protected function readChunked($bufferSize)
- {
- // at start of the next chunk?
- if (0 == $this->chunkLength) {
- $line = $this->readLine($bufferSize);
- if (!preg_match('/^([0-9a-f]+)/i', $line, $matches)) {
- throw new HTTP_Request2_Exception(
- "Cannot decode chunked response, invalid chunk length '{$line}'"
- );
- } else {
- $this->chunkLength = hexdec($matches[1]);
- // Chunk with zero length indicates the end
- if (0 == $this->chunkLength) {
- $this->readLine($bufferSize);
- return '';
- }
- }
- }
- $data = $this->fread(min($this->chunkLength, $bufferSize));
- $this->chunkLength -= strlen($data);
- if (0 == $this->chunkLength) {
- $this->readLine($bufferSize); // Trailing CRLF
- }
- return $data;
- }
-}
-
+<?php +/** + * Socket-based adapter for HTTP_Request2 + * + * PHP version 5 + * + * LICENSE: + * + * Copyright (c) 2008, 2009, Alexey Borzov <avb@php.net> + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * * The names of the authors may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS + * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, + * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY + * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * @category HTTP + * @package HTTP_Request2 + * @author Alexey Borzov <avb@php.net> + * @license http://opensource.org/licenses/bsd-license.php New BSD License + * @version CVS: $Id: Socket.php 279760 2009-05-03 10:46:42Z avb $ + * @link http://pear.php.net/package/HTTP_Request2 + */ + +/** + * Base class for HTTP_Request2 adapters + */ +require_once 'HTTP/Request2/Adapter.php'; + +/** + * Socket-based adapter for HTTP_Request2 + * + * This adapter uses only PHP sockets and will work on almost any PHP + * environment. Code is based on original HTTP_Request PEAR package. + * + * @category HTTP + * @package HTTP_Request2 + * @author Alexey Borzov <avb@php.net> + * @version Release: 0.4.1 + */ +class HTTP_Request2_Adapter_Socket extends HTTP_Request2_Adapter +{ + /** + * Regular expression for 'token' rule from RFC 2616 + */ + const REGEXP_TOKEN = '[^\x00-\x1f\x7f-\xff()<>@,;:\\\\"/\[\]?={}\s]+'; + + /** + * Regular expression for 'quoted-string' rule from RFC 2616 + */ + const REGEXP_QUOTED_STRING = '"(?:\\\\.|[^\\\\"])*"'; + + /** + * Connected sockets, needed for Keep-Alive support + * @var array + * @see connect() + */ + protected static $sockets = array(); + + /** + * Data for digest authentication scheme + * + * The keys for the array are URL prefixes. + * + * The values are associative arrays with data (realm, nonce, nonce-count, + * opaque...) needed for digest authentication. Stored here to prevent making + * duplicate requests to digest-protected resources after we have already + * received the challenge. + * + * @var array + */ + protected static $challenges = array(); + + /** + * Connected socket + * @var resource + * @see connect() + */ + protected $socket; + + /** + * Challenge used for server digest authentication + * @var array + */ + protected $serverChallenge; + + /** + * Challenge used for proxy digest authentication + * @var array + */ + protected $proxyChallenge; + + /** + * Global timeout, exception will be raised if request continues past this time + * @var integer + */ + protected $timeout = null; + + /** + * Remaining length of the current chunk, when reading chunked response + * @var integer + * @see readChunked() + */ + protected $chunkLength = 0; + + /** + * Sends request to the remote server and returns its response + * + * @param HTTP_Request2 + * @return HTTP_Request2_Response + * @throws HTTP_Request2_Exception + */ + public function sendRequest(HTTP_Request2 $request) + { + $this->request = $request; + $keepAlive = $this->connect(); + $headers = $this->prepareHeaders(); + + // Use global request timeout if given, see feature requests #5735, #8964 + if ($timeout = $request->getConfig('timeout')) { + $this->timeout = time() + $timeout; + } else { + $this->timeout = null; + } + + try { + if (false === @fwrite($this->socket, $headers, strlen($headers))) { + throw new HTTP_Request2_Exception('Error writing request'); + } + // provide request headers to the observer, see request #7633 + $this->request->setLastEvent('sentHeaders', $headers); + $this->writeBody(); + + if ($this->timeout && time() > $this->timeout) { + throw new HTTP_Request2_Exception( + 'Request timed out after ' . + $request->getConfig('timeout') . ' second(s)' + ); + } + + $response = $this->readResponse(); + + if (!$this->canKeepAlive($keepAlive, $response)) { + $this->disconnect(); + } + + if ($this->shouldUseProxyDigestAuth($response)) { + return $this->sendRequest($request); + } + if ($this->shouldUseServerDigestAuth($response)) { + return $this->sendRequest($request); + } + if ($authInfo = $response->getHeader('authentication-info')) { + $this->updateChallenge($this->serverChallenge, $authInfo); + } + if ($proxyInfo = $response->getHeader('proxy-authentication-info')) { + $this->updateChallenge($this->proxyChallenge, $proxyInfo); + } + + } catch (Exception $e) { + $this->disconnect(); + throw $e; + } + + return $response; + } + + /** + * Connects to the remote server + * + * @return bool whether the connection can be persistent + * @throws HTTP_Request2_Exception + */ + protected function connect() + { + $secure = 0 == strcasecmp($this->request->getUrl()->getScheme(), 'https'); + $tunnel = HTTP_Request2::METHOD_CONNECT == $this->request->getMethod(); + $headers = $this->request->getHeaders(); + $reqHost = $this->request->getUrl()->getHost(); + if (!($reqPort = $this->request->getUrl()->getPort())) { + $reqPort = $secure? 443: 80; + } + + if ($host = $this->request->getConfig('proxy_host')) { + if (!($port = $this->request->getConfig('proxy_port'))) { + throw new HTTP_Request2_Exception('Proxy port not provided'); + } + $proxy = true; + } else { + $host = $reqHost; + $port = $reqPort; + $proxy = false; + } + + if ($tunnel && !$proxy) { + throw new HTTP_Request2_Exception( + "Trying to perform CONNECT request without proxy" + ); + } + if ($secure && !in_array('ssl', stream_get_transports())) { + throw new HTTP_Request2_Exception( + 'Need OpenSSL support for https:// requests' + ); + } + + // RFC 2068, section 19.7.1: A client MUST NOT send the Keep-Alive + // connection token to a proxy server... + if ($proxy && !$secure && + !empty($headers['connection']) && 'Keep-Alive' == $headers['connection'] + ) { + $this->request->setHeader('connection'); + } + + $keepAlive = ('1.1' == $this->request->getConfig('protocol_version') && + empty($headers['connection'])) || + (!empty($headers['connection']) && + 'Keep-Alive' == $headers['connection']); + $host = ((!$secure || $proxy)? 'tcp://': 'ssl://') . $host; + + $options = array(); + if ($secure || $tunnel) { + foreach ($this->request->getConfig() as $name => $value) { + if ('ssl_' == substr($name, 0, 4) && null !== $value) { + if ('ssl_verify_host' == $name) { + if ($value) { + $options['CN_match'] = $reqHost; + } + } else { + $options[substr($name, 4)] = $value; + } + } + } + ksort($options); + } + + // Changing SSL context options after connection is established does *not* + // work, we need a new connection if options change + $remote = $host . ':' . $port; + $socketKey = $remote . (($secure && $proxy)? "->{$reqHost}:{$reqPort}": '') . + (empty($options)? '': ':' . serialize($options)); + unset($this->socket); + + // We use persistent connections and have a connected socket? + // Ensure that the socket is still connected, see bug #16149 + if ($keepAlive && !empty(self::$sockets[$socketKey]) && + !feof(self::$sockets[$socketKey]) + ) { + $this->socket =& self::$sockets[$socketKey]; + + } elseif ($secure && $proxy && !$tunnel) { + $this->establishTunnel(); + $this->request->setLastEvent( + 'connect', "ssl://{$reqHost}:{$reqPort} via {$host}:{$port}" + ); + self::$sockets[$socketKey] =& $this->socket; + + } else { + // Set SSL context options if doing HTTPS request or creating a tunnel + $context = stream_context_create(); + foreach ($options as $name => $value) { + if (!stream_context_set_option($context, 'ssl', $name, $value)) { + throw new HTTP_Request2_Exception( + "Error setting SSL context option '{$name}'" + ); + } + } + $this->socket = @stream_socket_client( + $remote, $errno, $errstr, + $this->request->getConfig('connect_timeout'), + STREAM_CLIENT_CONNECT, $context + ); + if (!$this->socket) { + throw new HTTP_Request2_Exception( + "Unable to connect to {$remote}. Error #{$errno}: {$errstr}" + ); + } + $this->request->setLastEvent('connect', $remote); + self::$sockets[$socketKey] =& $this->socket; + } + return $keepAlive; + } + + /** + * Establishes a tunnel to a secure remote server via HTTP CONNECT request + * + * This method will fail if 'ssl_verify_peer' is enabled. Probably because PHP + * sees that we are connected to a proxy server (duh!) rather than the server + * that presents its certificate. + * + * @link http://tools.ietf.org/html/rfc2817#section-5.2 + * @throws HTTP_Request2_Exception + */ + protected function establishTunnel() + { + $donor = new self; + $connect = new HTTP_Request2( + $this->request->getUrl(), HTTP_Request2::METHOD_CONNECT, + array_merge($this->request->getConfig(), + array('adapter' => $donor)) + ); + $response = $connect->send(); + // Need any successful (2XX) response + if (200 > $response->getStatus() || 300 <= $response->getStatus()) { + throw new HTTP_Request2_Exception( + 'Failed to connect via HTTPS proxy. Proxy response: ' . + $response->getStatus() . ' ' . $response->getReasonPhrase() + ); + } + $this->socket = $donor->socket; + + $modes = array( + STREAM_CRYPTO_METHOD_TLS_CLIENT, + STREAM_CRYPTO_METHOD_SSLv3_CLIENT, + STREAM_CRYPTO_METHOD_SSLv23_CLIENT, + STREAM_CRYPTO_METHOD_SSLv2_CLIENT + ); + + foreach ($modes as $mode) { + if (stream_socket_enable_crypto($this->socket, true, $mode)) { + return; + } + } + throw new HTTP_Request2_Exception( + 'Failed to enable secure connection when connecting through proxy' + ); + } + + /** + * Checks whether current connection may be reused or should be closed + * + * @param boolean whether connection could be persistent + * in the first place + * @param HTTP_Request2_Response response object to check + * @return boolean + */ + protected function canKeepAlive($requestKeepAlive, HTTP_Request2_Response $response) + { + // Do not close socket on successful CONNECT request + if (HTTP_Request2::METHOD_CONNECT == $this->request->getMethod() && + 200 <= $response->getStatus() && 300 > $response->getStatus() + ) { + return true; + } + + $lengthKnown = 'chunked' == strtolower($response->getHeader('transfer-encoding')) || + null !== $response->getHeader('content-length'); + $persistent = 'keep-alive' == strtolower($response->getHeader('connection')) || + (null === $response->getHeader('connection') && + '1.1' == $response->getVersion()); + return $requestKeepAlive && $lengthKnown && $persistent; + } + + /** + * Disconnects from the remote server + */ + protected function disconnect() + { + if (is_resource($this->socket)) { + fclose($this->socket); + $this->socket = null; + $this->request->setLastEvent('disconnect'); + } + } + + /** + * Checks whether another request should be performed with server digest auth + * + * Several conditions should be satisfied for it to return true: + * - response status should be 401 + * - auth credentials should be set in the request object + * - response should contain WWW-Authenticate header with digest challenge + * - there is either no challenge stored for this URL or new challenge + * contains stale=true parameter (in other case we probably just failed + * due to invalid username / password) + * + * The method stores challenge values in $challenges static property + * + * @param HTTP_Request2_Response response to check + * @return boolean whether another request should be performed + * @throws HTTP_Request2_Exception in case of unsupported challenge parameters + */ + protected function shouldUseServerDigestAuth(HTTP_Request2_Response $response) + { + // no sense repeating a request if we don't have credentials + if (401 != $response->getStatus() || !$this->request->getAuth()) { + return false; + } + if (!$challenge = $this->parseDigestChallenge($response->getHeader('www-authenticate'))) { + return false; + } + + $url = $this->request->getUrl(); + $scheme = $url->getScheme(); + $host = $scheme . '://' . $url->getHost(); + if ($port = $url->getPort()) { + if ((0 == strcasecmp($scheme, 'http') && 80 != $port) || + (0 == strcasecmp($scheme, 'https') && 443 != $port) + ) { + $host .= ':' . $port; + } + } + + if (!empty($challenge['domain'])) { + $prefixes = array(); + foreach (preg_split('/\\s+/', $challenge['domain']) as $prefix) { + // don't bother with different servers + if ('/' == substr($prefix, 0, 1)) { + $prefixes[] = $host . $prefix; + } + } + } + if (empty($prefixes)) { + $prefixes = array($host . '/'); + } + + $ret = true; + foreach ($prefixes as $prefix) { + if (!empty(self::$challenges[$prefix]) && + (empty($challenge['stale']) || strcasecmp('true', $challenge['stale'])) + ) { + // probably credentials are invalid + $ret = false; + } + self::$challenges[$prefix] =& $challenge; + } + return $ret; + } + + /** + * Checks whether another request should be performed with proxy digest auth + * + * Several conditions should be satisfied for it to return true: + * - response status should be 407 + * - proxy auth credentials should be set in the request object + * - response should contain Proxy-Authenticate header with digest challenge + * - there is either no challenge stored for this proxy or new challenge + * contains stale=true parameter (in other case we probably just failed + * due to invalid username / password) + * + * The method stores challenge values in $challenges static property + * + * @param HTTP_Request2_Response response to check + * @return boolean whether another request should be performed + * @throws HTTP_Request2_Exception in case of unsupported challenge parameters + */ + protected function shouldUseProxyDigestAuth(HTTP_Request2_Response $response) + { + if (407 != $response->getStatus() || !$this->request->getConfig('proxy_user')) { + return false; + } + if (!($challenge = $this->parseDigestChallenge($response->getHeader('proxy-authenticate')))) { + return false; + } + + $key = 'proxy://' . $this->request->getConfig('proxy_host') . + ':' . $this->request->getConfig('proxy_port'); + + if (!empty(self::$challenges[$key]) && + (empty($challenge['stale']) || strcasecmp('true', $challenge['stale'])) + ) { + $ret = false; + } else { + $ret = true; + } + self::$challenges[$key] = $challenge; + return $ret; + } + + /** + * Extracts digest method challenge from (WWW|Proxy)-Authenticate header value + * + * There is a problem with implementation of RFC 2617: several of the parameters + * here are defined as quoted-string and thus may contain backslash escaped + * double quotes (RFC 2616, section 2.2). However, RFC 2617 defines unq(X) as + * just value of quoted-string X without surrounding quotes, it doesn't speak + * about removing backslash escaping. + * + * Now realm parameter is user-defined and human-readable, strange things + * happen when it contains quotes: + * - Apache allows quotes in realm, but apparently uses realm value without + * backslashes for digest computation + * - Squid allows (manually escaped) quotes there, but it is impossible to + * authorize with either escaped or unescaped quotes used in digest, + * probably it cannot parse the response (?) + * - Both IE and Firefox display realm value with backslashes in + * the password popup and apparently use the same value for digest + * + * HTTP_Request2 follows IE and Firefox (and hopefully RFC 2617) in + * quoted-string handling, unfortunately that means failure to authorize + * sometimes + * + * @param string value of WWW-Authenticate or Proxy-Authenticate header + * @return mixed associative array with challenge parameters, false if + * no challenge is present in header value + * @throws HTTP_Request2_Exception in case of unsupported challenge parameters + */ + protected function parseDigestChallenge($headerValue) + { + $authParam = '(' . self::REGEXP_TOKEN . ')\\s*=\\s*(' . + self::REGEXP_TOKEN . '|' . self::REGEXP_QUOTED_STRING . ')'; + $challenge = "!(?<=^|\\s|,)Digest ({$authParam}\\s*(,\\s*|$))+!"; + if (!preg_match($challenge, $headerValue, $matches)) { + return false; + } + + preg_match_all('!' . $authParam . '!', $matches[0], $params); + $paramsAry = array(); + $knownParams = array('realm', 'domain', 'nonce', 'opaque', 'stale', + 'algorithm', 'qop'); + for ($i = 0; $i < count($params[0]); $i++) { + // section 3.2.1: Any unrecognized directive MUST be ignored. + if (in_array($params[1][$i], $knownParams)) { + if ('"' == substr($params[2][$i], 0, 1)) { + $paramsAry[$params[1][$i]] = substr($params[2][$i], 1, -1); + } else { + $paramsAry[$params[1][$i]] = $params[2][$i]; + } + } + } + // we only support qop=auth + if (!empty($paramsAry['qop']) && + !in_array('auth', array_map('trim', explode(',', $paramsAry['qop']))) + ) { + throw new HTTP_Request2_Exception( + "Only 'auth' qop is currently supported in digest authentication, " . + "server requested '{$paramsAry['qop']}'" + ); + } + // we only support algorithm=MD5 + if (!empty($paramsAry['algorithm']) && 'MD5' != $paramsAry['algorithm']) { + throw new HTTP_Request2_Exception( + "Only 'MD5' algorithm is currently supported in digest authentication, " . + "server requested '{$paramsAry['algorithm']}'" + ); + } + + return $paramsAry; + } + + /** + * Parses [Proxy-]Authentication-Info header value and updates challenge + * + * @param array challenge to update + * @param string value of [Proxy-]Authentication-Info header + * @todo validate server rspauth response + */ + protected function updateChallenge(&$challenge, $headerValue) + { + $authParam = '!(' . self::REGEXP_TOKEN . ')\\s*=\\s*(' . + self::REGEXP_TOKEN . '|' . self::REGEXP_QUOTED_STRING . ')!'; + $paramsAry = array(); + + preg_match_all($authParam, $headerValue, $params); + for ($i = 0; $i < count($params[0]); $i++) { + if ('"' == substr($params[2][$i], 0, 1)) { + $paramsAry[$params[1][$i]] = substr($params[2][$i], 1, -1); + } else { + $paramsAry[$params[1][$i]] = $params[2][$i]; + } + } + // for now, just update the nonce value + if (!empty($paramsAry['nextnonce'])) { + $challenge['nonce'] = $paramsAry['nextnonce']; + $challenge['nc'] = 1; + } + } + + /** + * Creates a value for [Proxy-]Authorization header when using digest authentication + * + * @param string user name + * @param string password + * @param string request URL + * @param array digest challenge parameters + * @return string value of [Proxy-]Authorization request header + * @link http://tools.ietf.org/html/rfc2617#section-3.2.2 + */ + protected function createDigestResponse($user, $password, $url, &$challenge) + { + if (false !== ($q = strpos($url, '?')) && + $this->request->getConfig('digest_compat_ie') + ) { + $url = substr($url, 0, $q); + } + + $a1 = md5($user . ':' . $challenge['realm'] . ':' . $password); + $a2 = md5($this->request->getMethod() . ':' . $url); + + if (empty($challenge['qop'])) { + $digest = md5($a1 . ':' . $challenge['nonce'] . ':' . $a2); + } else { + $challenge['cnonce'] = 'Req2.' . rand(); + if (empty($challenge['nc'])) { + $challenge['nc'] = 1; + } + $nc = sprintf('%08x', $challenge['nc']++); + $digest = md5($a1 . ':' . $challenge['nonce'] . ':' . $nc . ':' . + $challenge['cnonce'] . ':auth:' . $a2); + } + return 'Digest username="' . str_replace(array('\\', '"'), array('\\\\', '\\"'), $user) . '", ' . + 'realm="' . $challenge['realm'] . '", ' . + 'nonce="' . $challenge['nonce'] . '", ' . + 'uri="' . $url . '", ' . + 'response="' . $digest . '"' . + (!empty($challenge['opaque'])? + ', opaque="' . $challenge['opaque'] . '"': + '') . + (!empty($challenge['qop'])? + ', qop="auth", nc=' . $nc . ', cnonce="' . $challenge['cnonce'] . '"': + ''); + } + + /** + * Adds 'Authorization' header (if needed) to request headers array + * + * @param array request headers + * @param string request host (needed for digest authentication) + * @param string request URL (needed for digest authentication) + * @throws HTTP_Request2_Exception + */ + protected function addAuthorizationHeader(&$headers, $requestHost, $requestUrl) + { + if (!($auth = $this->request->getAuth())) { + return; + } + switch ($auth['scheme']) { + case HTTP_Request2::AUTH_BASIC: + $headers['authorization'] = + 'Basic ' . base64_encode($auth['user'] . ':' . $auth['password']); + break; + + case HTTP_Request2::AUTH_DIGEST: + unset($this->serverChallenge); + $fullUrl = ('/' == $requestUrl[0])? + $this->request->getUrl()->getScheme() . '://' . + $requestHost . $requestUrl: + $requestUrl; + foreach (array_keys(self::$challenges) as $key) { + if ($key == substr($fullUrl, 0, strlen($key))) { + $headers['authorization'] = $this->createDigestResponse( + $auth['user'], $auth['password'], + $requestUrl, self::$challenges[$key] + ); + $this->serverChallenge =& self::$challenges[$key]; + break; + } + } + break; + + default: + throw new HTTP_Request2_Exception( + "Unknown HTTP authentication scheme '{$auth['scheme']}'" + ); + } + } + + /** + * Adds 'Proxy-Authorization' header (if needed) to request headers array + * + * @param array request headers + * @param string request URL (needed for digest authentication) + * @throws HTTP_Request2_Exception + */ + protected function addProxyAuthorizationHeader(&$headers, $requestUrl) + { + if (!$this->request->getConfig('proxy_host') || + !($user = $this->request->getConfig('proxy_user')) || + (0 == strcasecmp('https', $this->request->getUrl()->getScheme()) && + HTTP_Request2::METHOD_CONNECT != $this->request->getMethod()) + ) { + return; + } + + $password = $this->request->getConfig('proxy_password'); + switch ($this->request->getConfig('proxy_auth_scheme')) { + case HTTP_Request2::AUTH_BASIC: + $headers['proxy-authorization'] = + 'Basic ' . base64_encode($user . ':' . $password); + break; + + case HTTP_Request2::AUTH_DIGEST: + unset($this->proxyChallenge); + $proxyUrl = 'proxy://' . $this->request->getConfig('proxy_host') . + ':' . $this->request->getConfig('proxy_port'); + if (!empty(self::$challenges[$proxyUrl])) { + $headers['proxy-authorization'] = $this->createDigestResponse( + $user, $password, + $requestUrl, self::$challenges[$proxyUrl] + ); + $this->proxyChallenge =& self::$challenges[$proxyUrl]; + } + break; + + default: + throw new HTTP_Request2_Exception( + "Unknown HTTP authentication scheme '" . + $this->request->getConfig('proxy_auth_scheme') . "'" + ); + } + } + + + /** + * Creates the string with the Request-Line and request headers + * + * @return string + * @throws HTTP_Request2_Exception + */ + protected function prepareHeaders() + { + $headers = $this->request->getHeaders(); + $url = $this->request->getUrl(); + $connect = HTTP_Request2::METHOD_CONNECT == $this->request->getMethod(); + $host = $url->getHost(); + + $defaultPort = 0 == strcasecmp($url->getScheme(), 'https')? 443: 80; + if (($port = $url->getPort()) && $port != $defaultPort || $connect) { + $host .= ':' . (empty($port)? $defaultPort: $port); + } + // Do not overwrite explicitly set 'Host' header, see bug #16146 + if (!isset($headers['host'])) { + $headers['host'] = $host; + } + + if ($connect) { + $requestUrl = $host; + + } else { + if (!$this->request->getConfig('proxy_host') || + 0 == strcasecmp($url->getScheme(), 'https') + ) { + $requestUrl = ''; + } else { + $requestUrl = $url->getScheme() . '://' . $host; + } + $path = $url->getPath(); + $query = $url->getQuery(); + $requestUrl .= (empty($path)? '/': $path) . (empty($query)? '': '?' . $query); + } + + if ('1.1' == $this->request->getConfig('protocol_version') && + extension_loaded('zlib') && !isset($headers['accept-encoding']) + ) { + $headers['accept-encoding'] = 'gzip, deflate'; + } + + $this->addAuthorizationHeader($headers, $host, $requestUrl); + $this->addProxyAuthorizationHeader($headers, $requestUrl); + $this->calculateRequestLength($headers); + + $headersStr = $this->request->getMethod() . ' ' . $requestUrl . ' HTTP/' . + $this->request->getConfig('protocol_version') . "\r\n"; + foreach ($headers as $name => $value) { + $canonicalName = implode('-', array_map('ucfirst', explode('-', $name))); + $headersStr .= $canonicalName . ': ' . $value . "\r\n"; + } + return $headersStr . "\r\n"; + } + + /** + * Sends the request body + * + * @throws HTTP_Request2_Exception + */ + protected function writeBody() + { + if (in_array($this->request->getMethod(), self::$bodyDisallowed) || + 0 == $this->contentLength + ) { + return; + } + + $position = 0; + $bufferSize = $this->request->getConfig('buffer_size'); + while ($position < $this->contentLength) { + if (is_string($this->requestBody)) { + $str = substr($this->requestBody, $position, $bufferSize); + } elseif (is_resource($this->requestBody)) { + $str = fread($this->requestBody, $bufferSize); + } else { + $str = $this->requestBody->read($bufferSize); + } + if (false === @fwrite($this->socket, $str, strlen($str))) { + throw new HTTP_Request2_Exception('Error writing request'); + } + // Provide the length of written string to the observer, request #7630 + $this->request->setLastEvent('sentBodyPart', strlen($str)); + $position += strlen($str); + } + } + + /** + * Reads the remote server's response + * + * @return HTTP_Request2_Response + * @throws HTTP_Request2_Exception + */ + protected function readResponse() + { + $bufferSize = $this->request->getConfig('buffer_size'); + + do { + $response = new HTTP_Request2_Response($this->readLine($bufferSize), true); + do { + $headerLine = $this->readLine($bufferSize); + $response->parseHeaderLine($headerLine); + } while ('' != $headerLine); + } while (in_array($response->getStatus(), array(100, 101))); + + $this->request->setLastEvent('receivedHeaders', $response); + + // No body possible in such responses + if (HTTP_Request2::METHOD_HEAD == $this->request->getMethod() || + (HTTP_Request2::METHOD_CONNECT == $this->request->getMethod() && + 200 <= $response->getStatus() && 300 > $response->getStatus()) || + in_array($response->getStatus(), array(204, 304)) + ) { + return $response; + } + + $chunked = 'chunked' == $response->getHeader('transfer-encoding'); + $length = $response->getHeader('content-length'); + $hasBody = false; + if ($chunked || null === $length || 0 < intval($length)) { + // RFC 2616, section 4.4: + // 3. ... If a message is received with both a + // Transfer-Encoding header field and a Content-Length header field, + // the latter MUST be ignored. + $toRead = ($chunked || null === $length)? null: $length; + $this->chunkLength = 0; + + while (!feof($this->socket) && (is_null($toRead) || 0 < $toRead)) { + if ($chunked) { + $data = $this->readChunked($bufferSize); + } elseif (is_null($toRead)) { + $data = $this->fread($bufferSize); + } else { + $data = $this->fread(min($toRead, $bufferSize)); + $toRead -= strlen($data); + } + if ('' == $data && (!$this->chunkLength || feof($this->socket))) { + break; + } + + $hasBody = true; + if ($this->request->getConfig('store_body')) { + $response->appendBody($data); + } + if (!in_array($response->getHeader('content-encoding'), array('identity', null))) { + $this->request->setLastEvent('receivedEncodedBodyPart', $data); + } else { + $this->request->setLastEvent('receivedBodyPart', $data); + } + } + } + + if ($hasBody) { + $this->request->setLastEvent('receivedBody', $response); + } + return $response; + } + + /** + * Reads until either the end of the socket or a newline, whichever comes first + * + * Strips the trailing newline from the returned data, handles global + * request timeout. Method idea borrowed from Net_Socket PEAR package. + * + * @param int buffer size to use for reading + * @return Available data up to the newline (not including newline) + * @throws HTTP_Request2_Exception In case of timeout + */ + protected function readLine($bufferSize) + { + $line = ''; + while (!feof($this->socket)) { + if ($this->timeout) { + stream_set_timeout($this->socket, max($this->timeout - time(), 1)); + } + $line .= @fgets($this->socket, $bufferSize); + $info = stream_get_meta_data($this->socket); + if ($info['timed_out'] || $this->timeout && time() > $this->timeout) { + throw new HTTP_Request2_Exception( + 'Request timed out after ' . + $this->request->getConfig('timeout') . ' second(s)' + ); + } + if (substr($line, -1) == "\n") { + return rtrim($line, "\r\n"); + } + } + return $line; + } + + /** + * Wrapper around fread(), handles global request timeout + * + * @param int Reads up to this number of bytes + * @return Data read from socket + * @throws HTTP_Request2_Exception In case of timeout + */ + protected function fread($length) + { + if ($this->timeout) { + stream_set_timeout($this->socket, max($this->timeout - time(), 1)); + } + $data = fread($this->socket, $length); + $info = stream_get_meta_data($this->socket); + if ($info['timed_out'] || $this->timeout && time() > $this->timeout) { + throw new HTTP_Request2_Exception( + 'Request timed out after ' . + $this->request->getConfig('timeout') . ' second(s)' + ); + } + return $data; + } + + /** + * Reads a part of response body encoded with chunked Transfer-Encoding + * + * @param int buffer size to use for reading + * @return string + * @throws HTTP_Request2_Exception + */ + protected function readChunked($bufferSize) + { + // at start of the next chunk? + if (0 == $this->chunkLength) { + $line = $this->readLine($bufferSize); + if (!preg_match('/^([0-9a-f]+)/i', $line, $matches)) { + throw new HTTP_Request2_Exception( + "Cannot decode chunked response, invalid chunk length '{$line}'" + ); + } else { + $this->chunkLength = hexdec($matches[1]); + // Chunk with zero length indicates the end + if (0 == $this->chunkLength) { + $this->readLine($bufferSize); + return ''; + } + } + } + $data = $this->fread(min($this->chunkLength, $bufferSize)); + $this->chunkLength -= strlen($data); + if (0 == $this->chunkLength) { + $this->readLine($bufferSize); // Trailing CRLF + } + return $data; + } +} + ?>
\ No newline at end of file diff --git a/extlib/MIME/Type.php b/extlib/MIME/Type.php index c335f8d92..8653362d3 100644 --- a/extlib/MIME/Type.php +++ b/extlib/MIME/Type.php @@ -478,7 +478,7 @@ class MIME_Type // Don't return an empty string if (!$type || !strlen($type)) { - return PEAR::raiseError("Sorry, couldn't determine file type."); + return PEAR::raiseError("Sorry. Could not determine file type."); } // Strip parameters if present & requested @@ -510,7 +510,7 @@ class MIME_Type $fileCmd = PEAR::getStaticProperty('MIME_Type', 'fileCmd'); if (!$cmd->which($fileCmd)) { unset($cmd); - return PEAR::raiseError("Can't find file command \"{$fileCmd}\""); + return PEAR::raiseError("Cannot find file command \"{$fileCmd}\""); } $cmd->pushCommand($fileCmd, "-bi " . escapeshellarg($file)); diff --git a/extlib/MIME/Type/Extension.php b/extlib/MIME/Type/Extension.php index 1987e2a10..2ffdee9a9 100644 --- a/extlib/MIME/Type/Extension.php +++ b/extlib/MIME/Type/Extension.php @@ -265,7 +265,7 @@ class MIME_Type_Extension } if (!isset($this->extensionToType[$extension])) { - return PEAR::raiseError("Sorry, couldn't determine file type."); + return PEAR::raiseError("Sorry. Could not determine file type."); } return $this->extensionToType[$extension]; @@ -288,7 +288,7 @@ class MIME_Type_Extension $extension = array_search($type, $this->extensionToType); if ($extension === false) { - return PEAR::raiseError("Sorry, couldn't determine extension."); + return PEAR::raiseError("Sorry. Could not determine extension."); } return $extension; } diff --git a/extlib/Mail/mail.php b/extlib/Mail/mail.php index b13d69565..112ff940c 100644 --- a/extlib/Mail/mail.php +++ b/extlib/Mail/mail.php @@ -51,7 +51,7 @@ class Mail_mail extends Mail { } /* Because the mail() function may pass headers as command - * line arguments, we can't guarantee the use of the standard + * line arguments, we cannot guarantee the use of the standard * "\r\n" separator. Instead, we use the system's native line * separator. */ if (defined('PHP_EOL')) { diff --git a/extlib/Mail/sendmail.php b/extlib/Mail/sendmail.php index cd248e61d..aea52081a 100644 --- a/extlib/Mail/sendmail.php +++ b/extlib/Mail/sendmail.php @@ -67,7 +67,7 @@ class Mail_sendmail extends Mail { /* * Because we need to pass message headers to the sendmail program on - * the commandline, we can't guarantee the use of the standard "\r\n" + * the commandline, we cannot guarantee the use of the standard "\r\n" * separator. Instead, we use the system's native line separator. */ if (defined('PHP_EOL')) { diff --git a/extlib/Net/LDAP2/Entry.php b/extlib/Net/LDAP2/Entry.php index 66de96678..5531bfa13 100644 --- a/extlib/Net/LDAP2/Entry.php +++ b/extlib/Net/LDAP2/Entry.php @@ -665,7 +665,7 @@ class Net_LDAP2_Entry extends PEAR * To force replace mode instead of add, you can set $force to true. * * @param array $attr Attributes to replace - * @param bool $force Force replacing mode in case we can't read the attr value but are allowed to replace it + * @param bool $force Force replacing mode in case we cannot read the attr value but are allowed to replace it * * @access public * @return true|Net_LDAP2_Error diff --git a/extlib/Net/LDAP2/Filter.php b/extlib/Net/LDAP2/Filter.php index 0723edab2..bd13d1ee4 100644 --- a/extlib/Net/LDAP2/Filter.php +++ b/extlib/Net/LDAP2/Filter.php @@ -439,7 +439,7 @@ class Net_LDAP2_Filter extends PEAR * * This method is only for compatibility to the perl interface. * However, the original method was called "print" but due to PHP language restrictions, - * we can't have a print() method. + * we cannot have a print() method. * * @param resource $FH (optional) A filehandle resource * diff --git a/extlib/System/Command.php b/extlib/System/Command.php index f5c3ec6b9..d2001a975 100644 --- a/extlib/System/Command.php +++ b/extlib/System/Command.php @@ -376,7 +376,7 @@ class System_Command { return $this->_initError; } - // if the command is empty or if the last element was a control operator, we can't continue + // if the command is empty or if the last element was a control operator, we cannot continue if (is_null($this->previousElement) || $this->commandStatus == -1 || in_array($this->previousElement, $this->controlOperators)) { return PEAR::raiseError(null, SYSTEM_COMMAND_INVALID_COMMAND, null, E_USER_WARNING, $this->systemCommand, 'System_Command_Error', true); } diff --git a/extlib/markdown.php b/extlib/markdown.php index 8179b568b..1bb1b6ce4 100644 --- a/extlib/markdown.php +++ b/extlib/markdown.php @@ -1348,7 +1348,7 @@ class Markdown_Parser { // { // list(, $div_open, , $div_content, $div_close) = $matches; // -// # We can't call Markdown(), because that resets the hash; +// # We cannot call Markdown(), because that resets the hash; // # that initialization code should be pulled into its own sub, though. // $div_content = $this->hashHTMLBlocks($div_content); // diff --git a/install.php b/install.php index e7f7cf318..78a4b8763 100644 --- a/install.php +++ b/install.php @@ -391,7 +391,7 @@ function showLibs() libraries instead, as they tend to provide security updates faster, and may offer improved performance.</p> <p>On Debian based distributions, such as Ubuntu, use a package manager (such as "aptitude", "apt-get", and "synaptic") to install the package listed.</p> <p>On RPM based distributions, such as Red Hat, Fedora, CentOS, Scientific Linux, Yellow Dog Linux and Oracle Enterprise Linux, use a package manager (such as "yum", "apt-rpm", and "up2date") to install the package listed.</p> - <p>On servers without a package manager (such as Windows), or if the library is not packaged for your distribution, you can use PHP's PEAR to install the library. Simply run "pear install <name>".</p> + <p>On servers without a package manager (such as Windows), or if the library is not packaged for your distribution, you can use PHP PEAR to install the library. Simply run "pear install <name>".</p> </div> <h2>Absent Libraries</h2> <ul id="absent_libraries"> @@ -570,7 +570,7 @@ STR; $res = writeConf($sitename, $server, $path, $fancy, $db); if (!$res) { - updateStatus("Can't write config file.", true); + updateStatus("Cannot write config file.", true); showForm(); return; } @@ -616,7 +616,7 @@ function Pgsql_Db_installer($host, $database, $username, $password) $res = runDbScript(INSTALLDIR.'/db/statusnet_pg.sql', $conn, 'pgsql'); if ($res === false) { - updateStatus("Can't run database script.", true); + updateStatus("Cannot run database script.", true); showForm(); return false; } @@ -627,7 +627,7 @@ function Pgsql_Db_installer($host, $database, $username, $password) updateStatus(sprintf("Adding %s data to database...", $name)); $res = runDbScript(INSTALLDIR.'/db/'.$scr.'.sql', $conn, 'pgsql'); if ($res === false) { - updateStatus(sprintf("Can't run %d script.", $name), true); + updateStatus(sprintf("Cannot run %d script.", $name), true); showForm(); return false; } @@ -652,21 +652,21 @@ function Mysql_Db_installer($host, $database, $username, $password) $conn = mysql_connect($host, $username, $password); if (!$conn) { - updateStatus("Can't connect to server '$host' as '$username'.", true); + updateStatus("Cannot connect to server '$host' as '$username'.", true); showForm(); return false; } updateStatus("Changing to database..."); $res = mysql_select_db($database, $conn); if (!$res) { - updateStatus("Can't change to database.", true); + updateStatus("Cannot change to database.", true); showForm(); return false; } updateStatus("Running database script..."); $res = runDbScript(INSTALLDIR.'/db/statusnet.sql', $conn); if ($res === false) { - updateStatus("Can't run database script.", true); + updateStatus("Cannot run database script.", true); showForm(); return false; } @@ -677,7 +677,7 @@ function Mysql_Db_installer($host, $database, $username, $password) updateStatus(sprintf("Adding %s data to database...", $name)); $res = runDbScript(INSTALLDIR.'/db/'.$scr.'.sql', $conn); if ($res === false) { - updateStatus(sprintf("Can't run %d script.", $name), true); + updateStatus(sprintf("Cannot run %d script.", $name), true); showForm(); return false; } diff --git a/lib/attachmentlist.php b/lib/attachmentlist.php index 51ceca857..60095dace 100644 --- a/lib/attachmentlist.php +++ b/lib/attachmentlist.php @@ -71,7 +71,7 @@ class AttachmentList extends Widget /** * show the list of notices * - * "Uses up" the stream by looping through it. So, probably can't + * "Uses up" the stream by looping through it. So, probably cannot * be called twice on the same list. * * @return int count of notices listed. diff --git a/lib/noticelist.php b/lib/noticelist.php index bf12bb73c..027db2b3e 100644 --- a/lib/noticelist.php +++ b/lib/noticelist.php @@ -75,7 +75,7 @@ class NoticeList extends Widget /** * show the list of notices * - * "Uses up" the stream by looping through it. So, probably can't + * "Uses up" the stream by looping through it. So, probably cannot * be called twice on the same list. * * @return int count of notices listed. diff --git a/lib/oauthstore.php b/lib/oauthstore.php index d617a7df7..a4ea5ad4d 100644 --- a/lib/oauthstore.php +++ b/lib/oauthstore.php @@ -351,7 +351,7 @@ class StatusNetOAuthDataStore extends OAuthDataStore $author = User::staticGet('uri', $author_uri); } if (!$author) { - throw new Exception('No such user'); + throw new Exception('No such user.'); } common_log(LOG_DEBUG, print_r($author, true), __FILE__); @@ -407,7 +407,7 @@ class StatusNetOAuthDataStore extends OAuthDataStore $user = User::staticGet('uri', $uri); } if (!$user) { - throw new Exception('No such user'); + throw new Exception('No such user.'); } return $user; } diff --git a/lib/profilelist.php b/lib/profilelist.php index bbb722701..f3eb66658 100644 --- a/lib/profilelist.php +++ b/lib/profilelist.php @@ -269,7 +269,7 @@ class ProfileListItem extends Widget $usf = new UnsubscribeForm($this->out, $this->profile); $usf->show(); } else { - // Is it a local user? can't remote sub from a list + // Is it a local user? cannot remote sub from a list // XXX: make that possible! $other = User::staticGet('id', $this->profile->id); if (!empty($other)) { diff --git a/lib/serverexception.php b/lib/serverexception.php index 7dc9765ad..6b2d55a0b 100644 --- a/lib/serverexception.php +++ b/lib/serverexception.php @@ -34,7 +34,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { /** * Class for server exceptions * - * Subclass of PHP Exception for server errors. The user typically can't fix these. + * Subclass of PHP Exception for server errors. The user typically cannot fix these. * * @category Exception * @package StatusNet diff --git a/lib/settingsaction.php b/lib/settingsaction.php index c3669868d..4193ea521 100644 --- a/lib/settingsaction.php +++ b/lib/settingsaction.php @@ -72,7 +72,7 @@ class SettingsAction extends CurrentUserDesignAction $this->clientError(_('Not logged in.')); return; } else if (!common_is_real_login()) { - // Cookie theft means that automatic logins can't + // Cookie theft means that automatic logins cannot // change important settings or see private info, and // _all_ our settings are important common_set_returnto($this->selfUrl()); diff --git a/lib/util.php b/lib/util.php index a4865c46c..dde3fb48f 100644 --- a/lib/util.php +++ b/lib/util.php @@ -576,7 +576,7 @@ function common_linkify($url) { } elseif (is_string($longurl_data)) { $longurl = $longurl_data; } else { - throw new ServerException("Can't linkify url '$url'"); + throw new ServerException("Cannot linkify url '$url'"); } } $attrs = array('href' => $canon, 'title' => $longurl, 'rel' => 'external'); diff --git a/lib/xmppqueuehandler.php b/lib/xmppqueuehandler.php index f28fc9088..8acdcafe7 100644 --- a/lib/xmppqueuehandler.php +++ b/lib/xmppqueuehandler.php @@ -43,7 +43,7 @@ class XmppQueueHandler extends QueueHandler $this->conn = jabber_connect($this->_id.$this->transport()); if (empty($this->conn)) { - $this->log(LOG_ERR, "Couldn't connect to server."); + $this->log(LOG_ERR, "Could not connect to server."); return false; } diff --git a/locale/statusnet.po b/locale/statusnet.po index 4331b906e..3ea314f34 100644 --- a/locale/statusnet.po +++ b/locale/statusnet.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-08 11:53+0000\n" +"POT-Creation-Date: 2009-11-08 22:12+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,4763 +16,2765 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../actions/noticesearchrss.php:64 actions/noticesearchrss.php:68 -#: actions/noticesearchrss.php:88 actions/noticesearchrss.php:89 -#, php-format -msgid " Search Stream for \"%s\"" -msgstr "" - -#: ../actions/finishopenidlogin.php:82 ../actions/register.php:191 -#: actions/finishopenidlogin.php:88 actions/register.php:205 -#: actions/finishopenidlogin.php:110 actions/finishopenidlogin.php:109 -msgid "" -" except this private data: password, email address, IM address, phone number." -msgstr "" - -#: ../actions/showstream.php:400 ../lib/stream.php:109 -#: actions/showstream.php:418 lib/mailbox.php:164 lib/stream.php:76 -msgid " from " -msgstr "" - -#: ../actions/twitapistatuses.php:478 actions/twitapistatuses.php:412 -#: actions/twitapistatuses.php:347 actions/twitapistatuses.php:363 -#, php-format -msgid "%1$s / Updates replying to %2$s" -msgstr "" - -#: ../actions/invite.php:168 actions/invite.php:176 actions/invite.php:211 -#: actions/invite.php:218 actions/invite.php:220 actions/invite.php:226 -#, php-format -msgid "%1$s has invited you to join them on %2$s" -msgstr "" - -#: ../actions/invite.php:170 actions/invite.php:220 actions/invite.php:222 -#: actions/invite.php:228 -#, php-format -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 people " -"you know and people who interest you.\n" -"\n" -"You can also share news about yourself, your thoughts, or your life online " -"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" -"%4$s\n" -"\n" -"You can see %1$s's profile page on %2$s here:\n" -"\n" -"%5$s\n" -"\n" -"If you'd like to try the service, click on the link below to accept the " -"invitation.\n" -"\n" -"%6$s\n" -"\n" -"If not, you can ignore this message. Thanks for your patience and your " -"time.\n" -"\n" -"Sincerely, %2$s\n" -msgstr "" - -#: ../lib/mail.php:124 lib/mail.php:124 lib/mail.php:126 lib/mail.php:241 -#: lib/mail.php:236 lib/mail.php:235 -#, php-format -msgid "%1$s is now listening to your notices on %2$s." -msgstr "" - -#: ../lib/mail.php:126 -#, php-format -msgid "" -"%1$s is now listening to your notices on %2$s.\n" -"\n" -"\t%3$s\n" -"\n" -"Faithfully yours,\n" -"%4$s.\n" -msgstr "" - -#: ../actions/twitapistatuses.php:482 actions/twitapistatuses.php:415 -#: actions/twitapistatuses.php:350 actions/twitapistatuses.php:367 -#: actions/twitapistatuses.php:328 actions/apitimelinementions.php:126 -#, php-format -msgid "%1$s updates that reply to updates from %2$s / %3$s." -msgstr "" - -#: ../actions/shownotice.php:45 actions/shownotice.php:45 -#: actions/shownotice.php:161 actions/shownotice.php:174 actions/oembed.php:86 -#: actions/shownotice.php:180 -#, php-format -msgid "%1$s's status on %2$s" +#: actions/all.php:63 actions/public.php:97 actions/replies.php:92 +#: actions/showfavorites.php:137 actions/tag.php:51 +msgid "No such page" msgstr "" -#: ../actions/invite.php:84 ../actions/invite.php:92 actions/invite.php:91 -#: actions/invite.php:99 actions/invite.php:123 actions/invite.php:131 -#: actions/invite.php:125 actions/invite.php:133 actions/invite.php:139 -#, php-format -msgid "%s (%s)" +#: 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/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 +#: lib/command.php:364 lib/command.php:411 lib/command.php:466 +#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 +#: lib/subs.php:34 lib/subs.php:112 +msgid "No such user." msgstr "" -#: ../actions/publicrss.php:62 actions/publicrss.php:48 -#: actions/publicrss.php:90 actions/publicrss.php:89 +#: actions/all.php:84 #, php-format -msgid "%s Public Stream" +msgid "%s and friends, page %d" msgstr "" -#: ../actions/all.php:47 ../actions/allrss.php:60 -#: ../actions/twitapistatuses.php:238 ../lib/stream.php:51 actions/all.php:47 -#: actions/allrss.php:60 actions/twitapistatuses.php:155 lib/personal.php:51 -#: actions/all.php:65 actions/allrss.php:103 actions/facebookhome.php:164 -#: actions/twitapistatuses.php:126 lib/personalgroupnav.php:99 -#: actions/all.php:68 actions/all.php:114 actions/allrss.php:106 -#: actions/facebookhome.php:163 actions/twitapistatuses.php:130 -#: actions/all.php:50 actions/all.php:127 actions/allrss.php:114 -#: actions/facebookhome.php:158 actions/twitapistatuses.php:89 -#: lib/personalgroupnav.php:100 actions/all.php:86 actions/all.php:167 -#: actions/allrss.php:115 actions/apitimelinefriends.php:114 +#: actions/all.php:86 actions/all.php:167 actions/allrss.php:115 +#: actions/apitimelinefriends.php:114 lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" msgstr "" -#: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49 -#: actions/twitapistatuses.php:33 actions/twitapistatuses.php:32 -#: actions/twitapistatuses.php:37 actions/apitimelinepublic.php:106 -#: actions/publicrss.php:103 +#: actions/all.php:99 #, php-format -msgid "%s public timeline" +msgid "Feed for friends of %s (RSS 1.0)" msgstr "" -#: ../lib/mail.php:206 lib/mail.php:212 lib/mail.php:411 lib/mail.php:412 +#: actions/all.php:107 #, php-format -msgid "%s status" +msgid "Feed for friends of %s (RSS 2.0)" msgstr "" -#: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265 -#: actions/twitapistatuses.php:199 actions/twitapistatuses.php:209 -#: actions/twitapigroups.php:69 actions/twitapistatuses.php:154 -#: actions/apitimelinegroup.php:102 actions/apitimelineuser.php:117 -#: actions/grouprss.php:131 actions/userrss.php:90 +#: actions/all.php:115 #, php-format -msgid "%s timeline" +msgid "Feed for friends of %s (Atom)" msgstr "" -#: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52 -#: actions/twitapistatuses.php:36 actions/twitapistatuses.php:38 -#: actions/twitapistatuses.php:41 actions/apitimelinepublic.php:110 -#: actions/publicrss.php:105 +#: actions/all.php:127 #, php-format -msgid "%s updates from everyone!" -msgstr "" - -#: ../actions/register.php:213 actions/register.php:497 -#: actions/register.php:545 actions/register.php:555 actions/register.php:561 msgid "" -"(You should receive a message by email momentarily, with instructions on how " -"to confirm your email address.)" +"This is the timeline for %s and friends but no one has posted anything yet." msgstr "" -#: ../lib/util.php:257 lib/util.php:273 lib/action.php:605 lib/action.php:702 -#: lib/action.php:752 lib/action.php:767 +#: actions/all.php:132 #, php-format msgid "" -"**%%site.name%%** is a microblogging service brought to you by [%%site." -"broughtby%%](%%site.broughtbyurl%%). " +"Try subscribing to more users, [join a group](%%action.groups%%) or post " +"something yourself." msgstr "" -#: ../lib/util.php:259 lib/util.php:275 lib/action.php:607 lib/action.php:704 -#: lib/action.php:754 lib/action.php:769 +#: actions/all.php:134 #, php-format -msgid "**%%site.name%%** is a microblogging service. " +msgid "" +"You can try to [nudge %s](../%s) from his profile or [post something to his " +"or her attention](%%%%action.newnotice%%%%?status_textarea=%s)." msgstr "" -#: ../actions/finishopenidlogin.php:73 ../actions/profilesettings.php:43 -#: actions/finishopenidlogin.php:79 actions/profilesettings.php:76 -#: actions/finishopenidlogin.php:101 actions/profilesettings.php:100 -#: lib/groupeditform.php:139 actions/finishopenidlogin.php:100 -#: lib/groupeditform.php:154 actions/profilesettings.php:108 -msgid "1-64 lowercase letters or numbers, no punctuation or spaces" +#: actions/all.php:137 actions/replies.php:209 actions/showstream.php:202 +#, php-format +msgid "" +"Why not [register an account](%%%%action.register%%%%) and then nudge %s or " +"post a notice to his or her attention." msgstr "" -#: ../actions/register.php:152 actions/register.php:166 -#: actions/register.php:368 actions/register.php:414 actions/register.php:418 -#: actions/register.php:424 -msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required." +#: actions/all.php:165 +msgid "You and friends" msgstr "" -#: ../actions/password.php:42 actions/profilesettings.php:181 -#: actions/passwordsettings.php:102 actions/passwordsettings.php:108 -msgid "6 or more characters" +#: actions/allrss.php:119 actions/apitimelinefriends.php:121 +#, php-format +msgid "Updates from %1$s and friends on %2$s!" msgstr "" -#: ../actions/recoverpassword.php:180 actions/recoverpassword.php:186 -#: actions/recoverpassword.php:220 actions/recoverpassword.php:233 -#: actions/recoverpassword.php:236 -msgid "6 or more characters, and don't forget it!" +#: 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!" msgstr "" -#: ../actions/register.php:154 actions/register.php:168 -#: actions/register.php:373 actions/register.php:419 actions/register.php:423 -#: actions/register.php:429 -msgid "6 or more characters. Required." +#: actions/apiaccountupdateprofileimage.php:84 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 +msgid "This method requires a POST." msgstr "" -#: ../actions/imsettings.php:197 actions/imsettings.php:205 -#: actions/imsettings.php:321 actions/imsettings.php:327 +#: actions/apiaccountupdateprofileimage.php:97 +#: actions/apistatusesupdate.php:122 actions/avatarsettings.php:254 +#: actions/newnotice.php:94 lib/designsettings.php:283 #, php-format msgid "" -"A confirmation code was sent to the IM address you added. You must approve %" -"s for sending messages to you." -msgstr "" - -#: ../actions/emailsettings.php:213 actions/emailsettings.php:231 -#: actions/emailsettings.php:350 actions/emailsettings.php:358 -msgid "" -"A confirmation code was sent to the email address you added. Check your " -"inbox (and spam box!) for the code and instructions on how to use it." -msgstr "" - -#: ../actions/smssettings.php:216 actions/smssettings.php:224 -msgid "" -"A confirmation code was sent to the phone number you added. Check your inbox " -"(and spam box!) for the code and instructions on how to use it." -msgstr "" - -#: ../actions/twitapiaccount.php:49 ../actions/twitapihelp.php:45 -#: ../actions/twitapistatuses.php:88 ../actions/twitapistatuses.php:259 -#: ../actions/twitapistatuses.php:370 ../actions/twitapistatuses.php:532 -#: ../actions/twitapiusers.php:122 actions/twitapiaccount.php:49 -#: actions/twitapidirect_messages.php:104 actions/twitapifavorites.php:111 -#: actions/twitapifavorites.php:120 actions/twitapifriendships.php:156 -#: actions/twitapihelp.php:46 actions/twitapistatuses.php:93 -#: actions/twitapistatuses.php:176 actions/twitapistatuses.php:288 -#: actions/twitapistatuses.php:298 actions/twitapistatuses.php:454 -#: actions/twitapistatuses.php:463 actions/twitapistatuses.php:504 -#: actions/twitapiusers.php:55 actions/twitapiaccount.php:37 -#: actions/twitapidirect_messages.php:111 actions/twitapifavorites.php:85 -#: actions/twitapifavorites.php:102 actions/twitapifriendships.php:121 -#: actions/twitapihelp.php:44 actions/twitapistatusnet.php:82 -#: actions/twitapistatusnet.php:151 actions/twitapistatuses.php:79 -#: actions/twitapistatuses.php:147 actions/twitapistatuses.php:228 -#: actions/twitapistatuses.php:239 actions/twitapistatuses.php:392 -#: actions/twitapistatuses.php:402 actions/twitapistatuses.php:429 -#: actions/twitapiusers.php:32 actions/twitapidirect_messages.php:120 -#: actions/twitapifavorites.php:91 actions/twitapifavorites.php:108 -#: actions/twitapistatuses.php:82 actions/twitapistatuses.php:159 -#: actions/twitapistatuses.php:246 actions/twitapistatuses.php:257 -#: actions/twitapistatuses.php:416 actions/twitapistatuses.php:426 -#: actions/twitapistatuses.php:453 actions/twitapidirect_messages.php:113 -#: actions/twitapifavorites.php:92 actions/twitapifavorites.php:109 -#: actions/twitapifavorites.php:160 actions/twitapifriendships.php:128 -#: actions/twitapifriendships.php:168 actions/twitapigroups.php:110 -#: actions/twitapistatuses.php:68 actions/twitapistatuses.php:134 -#: actions/twitapistatuses.php:201 actions/twitapistatuses.php:211 -#: actions/twitapistatuses.php:357 actions/twitapistatuses.php:372 -#: actions/twitapistatuses.php:409 actions/twitapitags.php:110 -#: actions/twitapiusers.php:34 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/apigrouplist.php:132 actions/apigrouplistall.php:120 -#: 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/twitapiaccount.php:57 ../actions/twitapiaccount.php:113 -#: ../actions/twitapiaccount.php:119 ../actions/twitapiblocks.php:28 -#: ../actions/twitapiblocks.php:34 ../actions/twitapidirect_messages.php:43 -#: ../actions/twitapidirect_messages.php:49 -#: ../actions/twitapidirect_messages.php:56 -#: ../actions/twitapidirect_messages.php:62 ../actions/twitapifavorites.php:41 -#: ../actions/twitapifavorites.php:47 ../actions/twitapifavorites.php:53 -#: ../actions/twitapihelp.php:52 ../actions/twitapinotifications.php:29 -#: ../actions/twitapinotifications.php:35 ../actions/twitapistatuses.php:768 -#: actions/twitapiaccount.php:56 actions/twitapiaccount.php:109 -#: actions/twitapiaccount.php:114 actions/twitapiblocks.php:28 -#: actions/twitapiblocks.php:33 actions/twitapidirect_messages.php:170 -#: actions/twitapifavorites.php:168 actions/twitapihelp.php:53 -#: actions/twitapinotifications.php:29 actions/twitapinotifications.php:34 -#: actions/twitapistatuses.php:690 actions/twitapiaccount.php:45 -#: actions/twitapiaccount.php:97 actions/twitapiaccount.php:103 -#: actions/twitapidirect_messages.php:184 actions/twitapifavorites.php:143 -#: actions/twitapihelp.php:52 actions/twitapistatusnet.php:172 -#: actions/twitapinotifications.php:31 actions/twitapinotifications.php:37 -#: actions/twitapistatuses.php:562 actions/twitapiaccount.php:46 -#: actions/twitapiaccount.php:98 actions/twitapiaccount.php:104 -#: actions/twitapidirect_messages.php:193 actions/twitapifavorites.php:149 -#: actions/twitapistatuses.php:625 actions/twitapitrends.php:87 -#: actions/twitapiaccount.php:48 actions/twitapidirect_messages.php:189 -#: actions/twitapihelp.php:54 actions/twitapistatuses.php:582 -msgid "API method under construction." +"The server was unable to handle that much POST data (%s bytes) due to its " +"current configuration." msgstr "" -#: ../lib/util.php:324 lib/util.php:340 lib/action.php:568 lib/action.php:661 -#: lib/action.php:706 lib/action.php:721 -msgid "About" +#: 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!" msgstr "" -#: ../actions/userauthorization.php:119 actions/userauthorization.php:126 -#: actions/userauthorization.php:143 actions/userauthorization.php:178 -#: actions/userauthorization.php:209 -msgid "Accept" +#: actions/apiaccountupdateprofileimage.php:130 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/emailsettings.php:62 ../actions/imsettings.php:63 -#: ../actions/openidsettings.php:57 ../actions/smssettings.php:71 -#: actions/emailsettings.php:63 actions/imsettings.php:64 -#: actions/openidsettings.php:58 actions/smssettings.php:71 -#: actions/twittersettings.php:85 actions/emailsettings.php:120 -#: actions/imsettings.php:127 actions/openidsettings.php:111 -#: actions/smssettings.php:133 actions/twittersettings.php:163 -#: actions/twittersettings.php:166 actions/twittersettings.php:182 -#: actions/emailsettings.php:126 actions/imsettings.php:133 -#: actions/smssettings.php:145 -msgid "Add" +#: actions/apiblockcreate.php:108 +msgid "Block user failed." msgstr "" -#: ../actions/openidsettings.php:43 actions/openidsettings.php:44 -#: actions/openidsettings.php:93 -msgid "Add OpenID" +#: actions/apiblockdestroy.php:107 +msgid "Unblock user failed." msgstr "" -#: ../lib/settingsaction.php:97 lib/settingsaction.php:91 -#: lib/accountsettingsaction.php:117 -msgid "Add or remove OpenIDs" +#: actions/apidirectmessagenew.php:126 +msgid "No message text!" msgstr "" -#: ../actions/emailsettings.php:38 ../actions/imsettings.php:39 -#: ../actions/smssettings.php:39 actions/emailsettings.php:39 -#: actions/imsettings.php:40 actions/smssettings.php:39 -#: actions/emailsettings.php:94 actions/imsettings.php:94 -#: actions/smssettings.php:92 actions/emailsettings.php:100 -#: actions/imsettings.php:100 actions/smssettings.php:104 -msgid "Address" +#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150 +#, php-format +msgid "That's too long. Max message size is %d chars." msgstr "" -#: ../actions/invite.php:131 actions/invite.php:139 actions/invite.php:176 -#: actions/invite.php:181 actions/invite.php:183 actions/invite.php:189 -msgid "Addresses of friends to invite (one per line)" +#: actions/apidirectmessagenew.php:146 +msgid "Recipient user not found." msgstr "" -#: ../actions/showstream.php:273 actions/showstream.php:288 -#: actions/showstream.php:422 lib/profileaction.php:126 -msgid "All subscriptions" +#: actions/apidirectmessagenew.php:150 +msgid "Can't send direct messages to users who aren't your friend." msgstr "" -#: ../actions/publicrss.php:64 actions/publicrss.php:50 -#: actions/publicrss.php:92 actions/publicrss.php:91 +#: actions/apidirectmessage.php:89 #, php-format -msgid "All updates for %s" +msgid "Direct messages from %s" msgstr "" -#: ../actions/noticesearchrss.php:66 actions/noticesearchrss.php:70 -#: actions/noticesearchrss.php:90 actions/noticesearchrss.php:91 +#: actions/apidirectmessage.php:93 #, php-format -msgid "All updates matching search term \"%s\"" -msgstr "" - -#: ../actions/finishopenidlogin.php:29 ../actions/login.php:31 -#: ../actions/openidlogin.php:29 ../actions/register.php:30 -#: actions/finishopenidlogin.php:29 actions/login.php:31 -#: actions/openidlogin.php:29 actions/register.php:30 -#: actions/finishopenidlogin.php:34 actions/login.php:77 -#: actions/openidlogin.php:30 actions/register.php:92 actions/register.php:131 -#: actions/login.php:79 actions/register.php:137 -msgid "Already logged in." -msgstr "" - -#: ../lib/subs.php:42 lib/subs.php:42 lib/subs.php:49 lib/subs.php:48 -msgid "Already subscribed!." -msgstr "" - -#: ../actions/deletenotice.php:54 actions/deletenotice.php:55 -#: actions/deletenotice.php:113 actions/deletenotice.php:114 -#: actions/deletenotice.php:144 -msgid "Are you sure you want to delete this notice?" -msgstr "" - -#: ../actions/userauthorization.php:77 actions/userauthorization.php:83 -#: actions/userauthorization.php:81 actions/userauthorization.php:76 -#: actions/userauthorization.php:105 -msgid "Authorize subscription" -msgstr "" - -#: ../actions/login.php:104 ../actions/register.php:178 -#: actions/register.php:192 actions/login.php:218 actions/openidlogin.php:117 -#: actions/register.php:416 actions/register.php:463 actions/login.php:226 -#: actions/register.php:473 actions/login.php:253 actions/register.php:479 -msgid "Automatically login in the future; not for shared computers!" -msgstr "" - -#: ../actions/profilesettings.php:65 actions/profilesettings.php:98 -#: actions/profilesettings.php:144 actions/profilesettings.php:145 -#: actions/profilesettings.php:160 -msgid "" -"Automatically subscribe to whoever subscribes to me (best for non-humans)" -msgstr "" - -#: ../actions/avatar.php:32 ../lib/settingsaction.php:90 -#: actions/profilesettings.php:34 actions/avatarsettings.php:65 -#: actions/showgroup.php:209 lib/accountsettingsaction.php:107 -#: actions/avatarsettings.php:67 actions/showgroup.php:211 -#: actions/showgroup.php:216 actions/showgroup.php:221 -#: lib/accountsettingsaction.php:111 -msgid "Avatar" +msgid "All the direct messages sent from %s" msgstr "" -#: ../actions/avatar.php:113 actions/profilesettings.php:350 -#: actions/avatarsettings.php:395 actions/avatarsettings.php:346 -#: actions/avatarsettings.php:360 -msgid "Avatar updated." +#: actions/apidirectmessage.php:101 +#, php-format +msgid "Direct messages to %s" msgstr "" -#: ../actions/imsettings.php:55 actions/imsettings.php:56 -#: actions/imsettings.php:108 actions/imsettings.php:114 +#: actions/apidirectmessage.php:105 #, php-format -msgid "" -"Awaiting confirmation on this address. Check your Jabber/GTalk account for a " -"message with further instructions. (Did you add %s to your buddy list?)" +msgid "All the direct messages sent to %s" msgstr "" -#: ../actions/emailsettings.php:54 actions/emailsettings.php:55 -#: actions/emailsettings.php:107 actions/emailsettings.php:113 -msgid "" -"Awaiting confirmation on this address. Check your inbox (and spam box!) for " -"a message with further instructions." +#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109 +#: actions/apistatusesdestroy.php:113 +msgid "No status found with that ID." msgstr "" -#: ../actions/smssettings.php:58 actions/smssettings.php:58 -#: actions/smssettings.php:111 actions/smssettings.php:123 -msgid "Awaiting confirmation on this phone number." +#: actions/apifavoritecreate.php:119 +msgid "This status is already a favorite!" msgstr "" -#: ../lib/util.php:1318 lib/util.php:1452 -msgid "Before »" +#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176 +msgid "Could not create favorite." msgstr "" -#: ../actions/profilesettings.php:49 ../actions/register.php:170 -#: actions/profilesettings.php:82 actions/register.php:184 -#: actions/profilesettings.php:112 actions/register.php:402 -#: actions/register.php:448 actions/profilesettings.php:127 -#: actions/register.php:459 actions/register.php:465 -msgid "Bio" +#: actions/apifavoritedestroy.php:122 +msgid "That status is not a favorite!" msgstr "" -#: ../actions/profilesettings.php:101 ../actions/register.php:82 -#: ../actions/updateprofile.php:103 actions/profilesettings.php:216 -#: actions/register.php:89 actions/updateprofile.php:104 -#: actions/profilesettings.php:205 actions/register.php:174 -#: actions/updateprofile.php:107 actions/updateprofile.php:109 -#: actions/profilesettings.php:206 actions/register.php:211 -msgid "Bio is too long (max 140 chars)." +#: actions/apifavoritedestroy.php:134 actions/disfavor.php:87 +msgid "Could not delete favorite." msgstr "" -#: ../lib/deleteaction.php:41 lib/deleteaction.php:41 lib/deleteaction.php:69 -#: actions/deletenotice.php:71 -msgid "Can't delete this notice." +#: actions/apifriendshipscreate.php:109 +msgid "Could not follow user: User not found." msgstr "" -#: ../actions/updateprofile.php:119 actions/updateprofile.php:120 -#: actions/updateprofile.php:123 actions/updateprofile.php:125 +#: actions/apifriendshipscreate.php:118 #, php-format -msgid "Can't read avatar URL '%s'" -msgstr "" - -#: ../actions/password.php:85 ../actions/recoverpassword.php:300 -#: actions/profilesettings.php:404 actions/recoverpassword.php:313 -#: actions/passwordsettings.php:169 actions/recoverpassword.php:347 -#: actions/passwordsettings.php:174 actions/recoverpassword.php:365 -#: actions/passwordsettings.php:180 actions/recoverpassword.php:368 -#: actions/passwordsettings.php:185 -msgid "Can't save new password." -msgstr "" - -#: ../actions/emailsettings.php:57 ../actions/imsettings.php:58 -#: ../actions/smssettings.php:62 actions/emailsettings.php:58 -#: actions/imsettings.php:59 actions/smssettings.php:62 -#: actions/emailsettings.php:111 actions/imsettings.php:114 -#: actions/smssettings.php:114 actions/emailsettings.php:117 -#: actions/imsettings.php:120 actions/smssettings.php:126 -msgid "Cancel" +msgid "Could not follow user: %s is already on your list." msgstr "" -#: ../lib/openid.php:121 lib/openid.php:121 lib/openid.php:130 -#: lib/openid.php:133 -msgid "Cannot instantiate OpenID consumer object." +#: actions/apifriendshipsdestroy.php:109 +msgid "Could not unfollow user: User not found." msgstr "" -#: ../actions/imsettings.php:163 actions/imsettings.php:171 -#: actions/imsettings.php:286 actions/imsettings.php:292 -msgid "Cannot normalize that Jabber ID" +#: actions/apifriendshipsdestroy.php:120 +msgid "You cannot unfollow yourself!" msgstr "" -#: ../actions/emailsettings.php:181 actions/emailsettings.php:199 -#: actions/emailsettings.php:311 actions/emailsettings.php:318 -#: actions/emailsettings.php:326 -msgid "Cannot normalize that email address" +#: actions/apifriendshipsexists.php:94 +msgid "Two user ids or screen_names must be supplied." msgstr "" -#: ../actions/password.php:45 actions/profilesettings.php:184 -#: actions/passwordsettings.php:110 actions/passwordsettings.php:116 -msgid "Change" +#: actions/apifriendshipsshow.php:135 +msgid "Could not determine source user." msgstr "" -#: ../lib/settingsaction.php:88 lib/settingsaction.php:88 -#: lib/accountsettingsaction.php:114 lib/accountsettingsaction.php:118 -msgid "Change email handling" +#: actions/apifriendshipsshow.php:143 +msgid "Could not find target user." msgstr "" -#: ../actions/password.php:32 actions/profilesettings.php:36 -#: actions/passwordsettings.php:58 -msgid "Change password" +#: actions/apigroupcreate.php:136 actions/newgroup.php:204 +msgid "Could not create group." msgstr "" -#: ../lib/settingsaction.php:94 lib/accountsettingsaction.php:111 -#: lib/accountsettingsaction.php:115 -msgid "Change your password" +#: actions/apigroupcreate.php:147 actions/editgroup.php:259 +#: actions/newgroup.php:210 +msgid "Could not create aliases." msgstr "" -#: ../lib/settingsaction.php:85 lib/settingsaction.php:85 -#: lib/accountsettingsaction.php:105 lib/accountsettingsaction.php:109 -msgid "Change your profile settings" +#: actions/apigroupcreate.php:166 actions/newgroup.php:224 +msgid "Could not set group membership." msgstr "" -#: ../actions/password.php:43 ../actions/recoverpassword.php:181 -#: ../actions/register.php:155 ../actions/smssettings.php:65 -#: actions/profilesettings.php:182 actions/recoverpassword.php:187 -#: actions/register.php:169 actions/smssettings.php:65 -#: actions/passwordsettings.php:105 actions/recoverpassword.php:221 -#: actions/register.php:376 actions/smssettings.php:122 -#: actions/recoverpassword.php:236 actions/register.php:422 -#: actions/passwordsettings.php:111 actions/recoverpassword.php:239 -#: actions/register.php:426 actions/smssettings.php:134 -#: actions/register.php:432 -msgid "Confirm" +#: actions/apigroupcreate.php:212 actions/editgroup.php:182 +#: actions/newgroup.php:126 actions/profilesettings.php:208 +#: actions/register.php:205 +msgid "Nickname must have only lowercase letters and numbers and no spaces." msgstr "" -#: ../actions/confirmaddress.php:90 actions/confirmaddress.php:90 -#: actions/confirmaddress.php:144 -msgid "Confirm Address" +#: actions/apigroupcreate.php:221 actions/editgroup.php:186 +#: actions/newgroup.php:130 actions/profilesettings.php:231 +#: actions/register.php:208 +msgid "Nickname already in use. Try another one." msgstr "" -#: ../actions/emailsettings.php:238 ../actions/imsettings.php:222 -#: ../actions/smssettings.php:245 actions/emailsettings.php:256 -#: actions/imsettings.php:230 actions/smssettings.php:253 -#: actions/emailsettings.php:379 actions/imsettings.php:361 -#: actions/smssettings.php:374 actions/emailsettings.php:386 -#: actions/emailsettings.php:394 actions/imsettings.php:367 -#: actions/smssettings.php:386 -msgid "Confirmation cancelled." +#: actions/apigroupcreate.php:228 actions/editgroup.php:189 +#: actions/newgroup.php:133 actions/profilesettings.php:211 +#: actions/register.php:210 +msgid "Not a valid nickname." msgstr "" -#: ../actions/smssettings.php:63 actions/smssettings.php:63 -#: actions/smssettings.php:118 actions/smssettings.php:130 -msgid "Confirmation code" +#: actions/apigroupcreate.php:244 actions/editgroup.php:195 +#: actions/newgroup.php:139 actions/profilesettings.php:215 +#: actions/register.php:217 +msgid "Homepage is not a valid URL." msgstr "" -#: ../actions/confirmaddress.php:38 actions/confirmaddress.php:38 -#: actions/confirmaddress.php:80 -msgid "Confirmation code not found." +#: actions/apigroupcreate.php:253 actions/editgroup.php:198 +#: actions/newgroup.php:142 actions/profilesettings.php:218 +#: actions/register.php:220 +msgid "Full name is too long (max 255 chars)." msgstr "" -#: ../actions/register.php:202 actions/register.php:473 -#: actions/register.php:521 actions/register.php:531 actions/register.php:537 +#: actions/apigroupcreate.php:261 #, php-format -msgid "" -"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may " -"want to...\n" -"\n" -"* 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 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" -"* Read over the [online docs](%%%%doc.help%%%%) for features you may have " -"missed. \n" -"\n" -"Thanks for signing up and we hope you enjoy using this service." -msgstr "" - -#: ../actions/finishopenidlogin.php:91 actions/finishopenidlogin.php:97 -#: actions/finishopenidlogin.php:119 lib/action.php:330 lib/action.php:403 -#: lib/action.php:406 actions/finishopenidlogin.php:118 lib/action.php:422 -#: lib/action.php:425 lib/action.php:435 -msgid "Connect" -msgstr "" - -#: ../actions/finishopenidlogin.php:86 actions/finishopenidlogin.php:92 -#: actions/finishopenidlogin.php:114 actions/finishopenidlogin.php:113 -msgid "Connect existing account" +msgid "Description is too long (max %d chars)." msgstr "" -#: ../lib/util.php:332 lib/util.php:348 lib/action.php:576 lib/action.php:669 -#: lib/action.php:719 lib/action.php:734 -msgid "Contact" +#: actions/apigroupcreate.php:272 actions/editgroup.php:204 +#: actions/newgroup.php:148 actions/profilesettings.php:225 +#: actions/register.php:227 +msgid "Location is too long (max 255 chars)." msgstr "" -#: ../lib/openid.php:178 lib/openid.php:178 lib/openid.php:187 -#: lib/openid.php:190 +#: actions/apigroupcreate.php:291 actions/editgroup.php:215 +#: actions/newgroup.php:159 #, php-format -msgid "Could not create OpenID form: %s" +msgid "Too many aliases! Maximum %d." msgstr "" -#: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76 -#: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76 -#: actions/twitapifriendships.php:48 actions/twitapifriendships.php:64 -#: actions/twitapifriendships.php:51 actions/twitapifriendships.php:68 -#: actions/apifriendshipscreate.php:118 +#: actions/apigroupcreate.php:312 actions/editgroup.php:224 +#: actions/newgroup.php:168 #, php-format -msgid "Could not follow user: %s is already on your list." -msgstr "" - -#: ../actions/twitapifriendships.php:53 actions/twitapifriendships.php:53 -#: actions/twitapifriendships.php:41 actions/twitapifriendships.php:43 -#: actions/apifriendshipscreate.php:109 -msgid "Could not follow user: User not found." +msgid "Invalid alias: \"%s\"" msgstr "" -#: ../lib/openid.php:160 lib/openid.php:160 lib/openid.php:169 -#: lib/openid.php:172 +#: actions/apigroupcreate.php:321 actions/editgroup.php:228 +#: actions/newgroup.php:172 #, php-format -msgid "Could not redirect to server: %s" -msgstr "" - -#: ../actions/updateprofile.php:162 actions/updateprofile.php:163 -#: actions/updateprofile.php:166 actions/updateprofile.php:176 -msgid "Could not save avatar info" -msgstr "" - -#: ../actions/updateprofile.php:155 actions/updateprofile.php:156 -#: actions/updateprofile.php:159 actions/updateprofile.php:163 -msgid "Could not save new profile info" -msgstr "" - -#: ../lib/subs.php:54 lib/subs.php:61 lib/subs.php:72 lib/subs.php:75 -msgid "Could not subscribe other to you." -msgstr "" - -#: ../lib/subs.php:46 lib/subs.php:46 lib/subs.php:57 lib/subs.php:56 -msgid "Could not subscribe." -msgstr "" - -#: ../actions/recoverpassword.php:102 actions/recoverpassword.php:105 -#: actions/recoverpassword.php:111 -msgid "Could not update user with confirmed email address." +msgid "Alias \"%s\" already in use. Try another one." msgstr "" -#: ../actions/finishremotesubscribe.php:99 -#: actions/finishremotesubscribe.php:101 actions/finishremotesubscribe.php:114 -msgid "Couldn't convert request tokens to access tokens." +#: actions/apigroupcreate.php:334 actions/editgroup.php:234 +#: actions/newgroup.php:178 +msgid "Alias can't be the same as nickname." msgstr "" -#: ../actions/confirmaddress.php:84 ../actions/emailsettings.php:234 -#: ../actions/imsettings.php:218 ../actions/smssettings.php:241 -#: actions/confirmaddress.php:84 actions/emailsettings.php:252 -#: actions/imsettings.php:226 actions/smssettings.php:249 -#: actions/confirmaddress.php:126 actions/emailsettings.php:375 -#: actions/imsettings.php:357 actions/smssettings.php:370 -#: actions/emailsettings.php:382 actions/emailsettings.php:390 -#: actions/imsettings.php:363 actions/smssettings.php:382 -msgid "Couldn't delete email confirmation." +#: actions/apigroupjoin.php:110 +msgid "You are already a member of that group." msgstr "" -#: ../lib/subs.php:103 lib/subs.php:116 lib/subs.php:134 lib/subs.php:136 -msgid "Couldn't delete subscription." +#: actions/apigroupjoin.php:119 actions/joingroup.php:95 lib/command.php:221 +msgid "You have been blocked from that group by the admin." msgstr "" -#: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98 -#: actions/twitapistatuses.php:84 actions/twitapistatuses.php:87 -msgid "Couldn't find any statuses." +#: actions/apigroupjoin.php:138 +#, php-format +msgid "Could not join user %s to group %s." msgstr "" -#: ../actions/remotesubscribe.php:127 actions/remotesubscribe.php:136 -#: actions/remotesubscribe.php:178 -msgid "Couldn't get a request token." +#: actions/apigroupleave.php:114 +msgid "You are not a member of this group." msgstr "" -#: ../actions/emailsettings.php:205 ../actions/imsettings.php:187 -#: ../actions/smssettings.php:206 actions/emailsettings.php:223 -#: actions/imsettings.php:195 actions/smssettings.php:214 -#: actions/emailsettings.php:337 actions/imsettings.php:311 -#: actions/smssettings.php:325 actions/emailsettings.php:344 -#: actions/emailsettings.php:352 actions/imsettings.php:317 -#: actions/smssettings.php:337 -msgid "Couldn't insert confirmation code." +#: actions/apigroupleave.php:124 +#, php-format +msgid "Could not remove user %s to group %s." msgstr "" -#: ../actions/finishremotesubscribe.php:180 -#: actions/finishremotesubscribe.php:182 actions/finishremotesubscribe.php:218 -#: lib/oauthstore.php:487 -msgid "Couldn't insert new subscription." +#: actions/apigrouplistall.php:90 actions/usergroups.php:62 +#, php-format +msgid "%s groups" msgstr "" -#: ../actions/profilesettings.php:184 ../actions/twitapiaccount.php:96 -#: actions/profilesettings.php:299 actions/twitapiaccount.php:94 -#: actions/profilesettings.php:302 actions/twitapiaccount.php:81 -#: actions/twitapiaccount.php:82 actions/profilesettings.php:328 -msgid "Couldn't save profile." +#: actions/apigrouplistall.php:94 +#, php-format +msgid "groups on %s" msgstr "" -#: ../actions/profilesettings.php:161 actions/profilesettings.php:276 -#: actions/profilesettings.php:279 actions/profilesettings.php:295 -msgid "Couldn't update user for autosubscribe." +#: actions/apigrouplist.php:95 +#, php-format +msgid "%s's groups" msgstr "" -#: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294 -#: actions/emailsettings.php:298 actions/emailsettings.php:312 -#: actions/emailsettings.php:440 actions/emailsettings.php:462 -#: actions/emailsettings.php:447 actions/emailsettings.php:469 -#: actions/smssettings.php:515 actions/smssettings.php:539 -#: actions/smssettings.php:516 actions/smssettings.php:540 -#: actions/emailsettings.php:455 actions/emailsettings.php:477 -#: actions/smssettings.php:528 actions/smssettings.php:552 -msgid "Couldn't update user record." +#: actions/apigrouplist.php:103 +#, php-format +msgid "Groups %s is a member of on %s." msgstr "" -#: ../actions/confirmaddress.php:72 ../actions/emailsettings.php:156 -#: ../actions/emailsettings.php:259 ../actions/imsettings.php:138 -#: ../actions/imsettings.php:243 ../actions/profilesettings.php:141 -#: ../actions/smssettings.php:157 ../actions/smssettings.php:269 -#: actions/confirmaddress.php:72 actions/emailsettings.php:174 -#: actions/emailsettings.php:277 actions/imsettings.php:146 -#: actions/imsettings.php:251 actions/profilesettings.php:256 -#: actions/smssettings.php:165 actions/smssettings.php:277 -#: actions/confirmaddress.php:114 actions/emailsettings.php:280 -#: actions/emailsettings.php:411 actions/imsettings.php:252 -#: actions/imsettings.php:395 actions/othersettings.php:162 -#: actions/profilesettings.php:259 actions/smssettings.php:266 -#: actions/smssettings.php:408 actions/emailsettings.php:287 -#: actions/emailsettings.php:418 actions/othersettings.php:167 -#: actions/profilesettings.php:260 actions/emailsettings.php:295 -#: actions/emailsettings.php:426 actions/imsettings.php:258 -#: actions/imsettings.php:401 actions/othersettings.php:174 -#: actions/profilesettings.php:276 actions/smssettings.php:278 -#: actions/smssettings.php:420 -msgid "Couldn't update user." +#: actions/apistatusesdestroy.php:107 +msgid "This method requires a POST or DELETE." msgstr "" -#: ../actions/finishopenidlogin.php:84 actions/finishopenidlogin.php:90 -#: actions/finishopenidlogin.php:112 actions/finishopenidlogin.php:111 -msgid "Create" +#: actions/apistatusesdestroy.php:130 +msgid "You may not delete another user's status." msgstr "" -#: ../actions/finishopenidlogin.php:70 actions/finishopenidlogin.php:76 -#: actions/finishopenidlogin.php:98 actions/finishopenidlogin.php:97 -msgid "Create a new user with this nickname." +#: actions/apistatusesshow.php:138 +msgid "Status deleted." msgstr "" -#: ../actions/finishopenidlogin.php:68 actions/finishopenidlogin.php:74 -#: actions/finishopenidlogin.php:96 actions/finishopenidlogin.php:95 -msgid "Create new account" +#: actions/apistatusesshow.php:144 +msgid "No status with that ID found." msgstr "" -#: ../actions/finishopenidlogin.php:191 actions/finishopenidlogin.php:197 -#: actions/finishopenidlogin.php:231 actions/finishopenidlogin.php:247 -msgid "Creating new account for OpenID that already has a user." +#: actions/apistatusesupdate.php:152 actions/newnotice.php:155 +#: scripts/maildaemon.php:71 +#, php-format +msgid "That's too long. Max notice size is %d chars." msgstr "" -#: ../actions/imsettings.php:45 actions/imsettings.php:46 -#: actions/imsettings.php:100 actions/imsettings.php:106 -msgid "Current confirmed Jabber/GTalk address." +#: actions/apistatusesupdate.php:193 +msgid "Not found" msgstr "" -#: ../actions/smssettings.php:46 actions/smssettings.php:46 -#: actions/smssettings.php:100 actions/smssettings.php:112 -msgid "Current confirmed SMS-enabled phone number." +#: actions/apistatusesupdate.php:216 actions/newnotice.php:178 +#, php-format +msgid "Max notice size is %d chars, including attachment URL." msgstr "" -#: ../actions/emailsettings.php:44 actions/emailsettings.php:45 -#: actions/emailsettings.php:99 actions/emailsettings.php:105 -msgid "Current confirmed email address." +#: actions/apisubscriptions.php:231 actions/apisubscriptions.php:261 +msgid "Unsupported format." msgstr "" -#: ../classes/Notice.php:72 classes/Notice.php:86 classes/Notice.php:91 -#: classes/Notice.php:114 classes/Notice.php:124 classes/Notice.php:164 +#: actions/apitimelinefavorites.php:107 #, php-format -msgid "DB error inserting hashtag: %s" +msgid "%s / Favorites from %s" msgstr "" -#: ../lib/util.php:1061 lib/util.php:1110 classes/Notice.php:698 -#: classes/Notice.php:757 classes/Notice.php:1042 classes/Notice.php:1117 -#: classes/Notice.php:1120 +#: actions/apitimelinefavorites.php:119 #, php-format -msgid "DB error inserting reply: %s" -msgstr "" - -#: ../actions/deletenotice.php:41 actions/deletenotice.php:41 -#: actions/deletenotice.php:79 actions/deletenotice.php:111 -#: actions/deletenotice.php:109 actions/deletenotice.php:141 -msgid "Delete notice" +msgid "%s updates favorited by %s / %s." msgstr "" -#: ../actions/profilesettings.php:51 ../actions/register.php:172 -#: actions/profilesettings.php:84 actions/register.php:186 -#: actions/profilesettings.php:114 actions/register.php:404 -#: actions/register.php:450 -msgid "Describe yourself and your interests in 140 chars" +#: actions/apitimelinegroup.php:102 actions/apitimelineuser.php:117 +#: actions/grouprss.php:131 actions/userrss.php:90 +#, php-format +msgid "%s timeline" msgstr "" -#: ../actions/register.php:158 ../actions/register.php:161 -#: ../lib/settingsaction.php:87 actions/register.php:172 -#: actions/register.php:175 lib/settingsaction.php:87 actions/register.php:381 -#: actions/register.php:385 lib/accountsettingsaction.php:113 -#: actions/register.php:427 actions/register.php:431 actions/register.php:435 -#: lib/accountsettingsaction.php:117 actions/register.php:437 -#: actions/register.php:441 -msgid "Email" +#: actions/apitimelinegroup.php:110 actions/apitimelineuser.php:125 +#: actions/userrss.php:92 +#, php-format +msgid "Updates from %1$s on %2$s!" msgstr "" -#: ../actions/emailsettings.php:59 actions/emailsettings.php:60 -#: actions/emailsettings.php:115 actions/emailsettings.php:121 -msgid "Email Address" +#: actions/apitimelinementions.php:116 +#, php-format +msgid "%1$s / Updates mentioning %2$s" msgstr "" -#: ../actions/emailsettings.php:32 actions/emailsettings.php:32 -#: actions/emailsettings.php:60 -msgid "Email Settings" +#: actions/apitimelinementions.php:126 +#, php-format +msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "" -#: ../actions/register.php:73 actions/register.php:80 actions/register.php:163 -#: actions/register.php:200 actions/register.php:206 actions/register.php:212 -msgid "Email address already exists." +#: actions/apitimelinepublic.php:106 actions/publicrss.php:103 +#, php-format +msgid "%s public timeline" msgstr "" -#: ../lib/mail.php:90 lib/mail.php:90 lib/mail.php:173 lib/mail.php:172 -msgid "Email address confirmation" +#: actions/apitimelinepublic.php:110 actions/publicrss.php:105 +#, php-format +msgid "%s updates from everyone!" msgstr "" -#: ../actions/emailsettings.php:61 actions/emailsettings.php:62 -#: actions/emailsettings.php:117 actions/emailsettings.php:123 -msgid "Email address, like \"UserName@example.org\"" +#: actions/apitimelinetag.php:101 actions/tag.php:66 +#, php-format +msgid "Notices tagged with %s" msgstr "" -#: ../actions/invite.php:129 actions/invite.php:137 actions/invite.php:174 -#: actions/invite.php:179 actions/invite.php:181 actions/invite.php:187 -msgid "Email addresses" +#: actions/apitimelinetag.php:107 actions/tagrss.php:64 +#, php-format +msgid "Updates tagged with %1$s on %2$s!" msgstr "" -#: ../actions/recoverpassword.php:191 actions/recoverpassword.php:197 -#: actions/recoverpassword.php:231 actions/recoverpassword.php:249 -#: actions/recoverpassword.php:252 -msgid "Enter a nickname or email address." +#: actions/apiusershow.php:96 +msgid "Not found." msgstr "" -#: ../actions/smssettings.php:64 actions/smssettings.php:64 -#: actions/smssettings.php:119 actions/smssettings.php:131 -msgid "Enter the code you received on your phone." +#: actions/attachment.php:73 +msgid "No such attachment." msgstr "" -#: ../actions/userauthorization.php:137 actions/userauthorization.php:144 -#: actions/userauthorization.php:161 actions/userauthorization.php:200 -msgid "Error authorizing token" +#: actions/avatarbynickname.php:59 actions/leavegroup.php:76 +msgid "No nickname." msgstr "" -#: ../actions/finishopenidlogin.php:253 actions/finishopenidlogin.php:259 -#: actions/finishopenidlogin.php:297 actions/finishopenidlogin.php:302 -#: actions/finishopenidlogin.php:325 -msgid "Error connecting user to OpenID." +#: actions/avatarbynickname.php:64 +msgid "No size." msgstr "" -#: ../actions/finishaddopenid.php:78 actions/finishaddopenid.php:78 -#: actions/finishaddopenid.php:126 -msgid "Error connecting user." +#: actions/avatarbynickname.php:69 +msgid "Invalid size." msgstr "" -#: ../actions/finishremotesubscribe.php:151 -#: actions/finishremotesubscribe.php:153 actions/finishremotesubscribe.php:166 -#: lib/oauthstore.php:291 -msgid "Error inserting avatar" +#: actions/avatarsettings.php:67 actions/showgroup.php:221 +#: lib/accountsettingsaction.php:111 +msgid "Avatar" msgstr "" -#: ../actions/finishremotesubscribe.php:143 -#: actions/finishremotesubscribe.php:145 actions/finishremotesubscribe.php:158 -#: lib/oauthstore.php:283 -msgid "Error inserting new profile" +#: actions/avatarsettings.php:78 +#, php-format +msgid "You can upload your personal avatar. The maximum file size is %s." msgstr "" -#: ../actions/finishremotesubscribe.php:167 -#: actions/finishremotesubscribe.php:169 actions/finishremotesubscribe.php:182 -#: lib/oauthstore.php:311 -msgid "Error inserting remote profile" +#: actions/avatarsettings.php:106 actions/avatarsettings.php:182 +#: actions/grouplogo.php:178 actions/remotesubscribe.php:191 +#: actions/userauthorization.php:72 actions/userrss.php:103 +msgid "User without matching profile" msgstr "" -#: ../actions/recoverpassword.php:240 actions/recoverpassword.php:246 -#: actions/recoverpassword.php:280 actions/recoverpassword.php:298 -#: actions/recoverpassword.php:301 -msgid "Error saving address confirmation." +#: actions/avatarsettings.php:119 actions/avatarsettings.php:194 +#: actions/grouplogo.php:251 +msgid "Avatar settings" msgstr "" -#: ../actions/userauthorization.php:140 actions/userauthorization.php:147 -#: actions/userauthorization.php:164 actions/userauthorization.php:203 -msgid "Error saving remote profile" +#: actions/avatarsettings.php:126 actions/avatarsettings.php:202 +#: actions/grouplogo.php:199 actions/grouplogo.php:259 +msgid "Original" msgstr "" -#: ../lib/openid.php:226 lib/openid.php:226 lib/openid.php:235 -#: lib/openid.php:238 -msgid "Error saving the profile." +#: actions/avatarsettings.php:141 actions/avatarsettings.php:214 +#: actions/grouplogo.php:210 actions/grouplogo.php:271 +msgid "Preview" msgstr "" -#: ../lib/openid.php:237 lib/openid.php:237 lib/openid.php:246 -#: lib/openid.php:249 -msgid "Error saving the user." +#: actions/avatarsettings.php:148 lib/noticelist.php:522 +msgid "Delete" msgstr "" -#: ../actions/password.php:80 actions/profilesettings.php:399 -#: actions/passwordsettings.php:164 actions/passwordsettings.php:169 -#: actions/passwordsettings.php:175 actions/passwordsettings.php:180 -msgid "Error saving user; invalid." +#: actions/avatarsettings.php:165 actions/grouplogo.php:233 +msgid "Upload" msgstr "" -#: ../actions/login.php:47 ../actions/login.php:73 -#: ../actions/recoverpassword.php:307 ../actions/register.php:98 -#: actions/login.php:47 actions/login.php:73 actions/recoverpassword.php:320 -#: actions/register.php:108 actions/login.php:112 actions/login.php:138 -#: actions/recoverpassword.php:354 actions/register.php:198 -#: actions/login.php:120 actions/recoverpassword.php:372 -#: actions/register.php:235 actions/login.php:122 -#: actions/recoverpassword.php:375 actions/register.php:242 -#: actions/login.php:149 actions/register.php:248 -msgid "Error setting user." +#: actions/avatarsettings.php:228 actions/grouplogo.php:286 +msgid "Crop" msgstr "" -#: ../actions/finishaddopenid.php:83 actions/finishaddopenid.php:83 -#: actions/finishaddopenid.php:131 -msgid "Error updating profile" +#: actions/avatarsettings.php:265 actions/block.php:64 actions/disfavor.php:74 +#: actions/emailsettings.php:237 actions/favor.php:75 +#: actions/groupblock.php:66 actions/grouplogo.php:309 +#: 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/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 +#: actions/tagother.php:166 actions/unblock.php:65 actions/unsubscribe.php:69 +#: actions/userauthorization.php:52 lib/designsettings.php:294 +msgid "There was a problem with your session token. Try again, please." msgstr "" -#: ../actions/finishremotesubscribe.php:161 -#: actions/finishremotesubscribe.php:163 actions/finishremotesubscribe.php:176 -#: actions/finishremotesubscribe.php:133 lib/oauthstore.php:306 -msgid "Error updating remote profile" +#: actions/avatarsettings.php:277 actions/emailsettings.php:255 +#: actions/grouplogo.php:319 actions/imsettings.php:220 +#: actions/recoverpassword.php:44 actions/smssettings.php:248 +#: lib/designsettings.php:304 +msgid "Unexpected form submission." msgstr "" -#: ../actions/recoverpassword.php:80 actions/recoverpassword.php:80 -#: actions/recoverpassword.php:86 -msgid "Error with confirmation code." +#: actions/avatarsettings.php:322 +msgid "Pick a square area of the image to be your avatar" msgstr "" -#: ../actions/finishopenidlogin.php:89 actions/finishopenidlogin.php:95 -#: actions/finishopenidlogin.php:117 actions/finishopenidlogin.php:116 -msgid "Existing nickname" +#: actions/avatarsettings.php:337 actions/grouplogo.php:377 +msgid "Lost our file data." msgstr "" -#: ../lib/util.php:326 lib/util.php:342 lib/action.php:570 lib/action.php:663 -#: lib/action.php:708 lib/action.php:723 -msgid "FAQ" +#: actions/avatarsettings.php:360 +msgid "Avatar updated." msgstr "" -#: ../actions/avatar.php:115 actions/profilesettings.php:352 -#: actions/avatarsettings.php:397 actions/avatarsettings.php:349 #: actions/avatarsettings.php:363 msgid "Failed updating avatar." msgstr "" -#: ../actions/all.php:61 ../actions/allrss.php:64 actions/all.php:61 -#: actions/allrss.php:64 actions/all.php:75 actions/allrss.php:107 -#: actions/allrss.php:110 actions/allrss.php:118 -#, php-format -msgid "Feed for friends of %s" -msgstr "" - -#: ../actions/replies.php:65 ../actions/repliesrss.php:80 -#: actions/replies.php:65 actions/repliesrss.php:66 actions/replies.php:134 -#: actions/repliesrss.php:71 actions/replies.php:136 actions/replies.php:135 -#, php-format -msgid "Feed for replies to %s" +#: actions/avatarsettings.php:387 +msgid "Avatar deleted." msgstr "" -#: ../actions/tag.php:55 actions/tag.php:55 actions/tag.php:61 -#: actions/tag.php:68 -#, php-format -msgid "Feed for tag %s" +#: actions/blockedfromgroup.php:73 actions/editgroup.php:84 +#: actions/groupdesignsettings.php:84 actions/grouplogo.php:86 +#: actions/groupmembers.php:76 actions/grouprss.php:91 +#: actions/joingroup.php:76 actions/showgroup.php:121 +msgid "No nickname" msgstr "" -#: ../lib/searchaction.php:105 lib/searchaction.php:105 -#: lib/searchgroupnav.php:83 -msgid "Find content of notices" +#: actions/blockedfromgroup.php:80 actions/editgroup.php:96 +#: actions/groupbyid.php:83 actions/groupdesignsettings.php:97 +#: actions/grouplogo.php:99 actions/groupmembers.php:83 +#: actions/grouprss.php:98 actions/joingroup.php:83 actions/showgroup.php:137 +msgid "No such group" msgstr "" -#: ../lib/searchaction.php:101 lib/searchaction.php:101 -#: lib/searchgroupnav.php:81 -msgid "Find people on this site" +#: actions/blockedfromgroup.php:90 +#, php-format +msgid "%s blocked profiles" msgstr "" -#: ../actions/login.php:122 actions/login.php:247 actions/login.php:255 -#: actions/login.php:282 -msgid "" -"For security reasons, please re-enter your user name and password before " -"changing your settings." +#: actions/blockedfromgroup.php:93 +#, php-format +msgid "%s blocked profiles, page %d" msgstr "" -#: ../actions/profilesettings.php:44 ../actions/register.php:164 -#: actions/profilesettings.php:77 actions/register.php:178 -#: actions/profilesettings.php:103 actions/register.php:391 -#: actions/showgroup.php:235 actions/showstream.php:262 -#: actions/tagother.php:105 lib/groupeditform.php:142 -#: actions/showgroup.php:237 actions/showstream.php:255 -#: actions/tagother.php:104 actions/register.php:437 actions/showgroup.php:242 -#: actions/showstream.php:220 lib/groupeditform.php:157 -#: actions/profilesettings.php:111 actions/register.php:441 -#: actions/showgroup.php:247 actions/showstream.php:267 -#: actions/register.php:447 lib/userprofile.php:149 -msgid "Full name" +#: actions/blockedfromgroup.php:108 +msgid "A list of the users blocked from joining this group." msgstr "" -#: ../actions/profilesettings.php:98 ../actions/register.php:79 -#: ../actions/updateprofile.php:93 actions/profilesettings.php:213 -#: actions/register.php:86 actions/updateprofile.php:94 -#: actions/editgroup.php:195 actions/newgroup.php:146 -#: actions/profilesettings.php:202 actions/register.php:171 -#: actions/updateprofile.php:97 actions/updateprofile.php:99 -#: actions/editgroup.php:197 actions/newgroup.php:147 -#: actions/profilesettings.php:203 actions/register.php:208 -#: actions/apigroupcreate.php:253 actions/editgroup.php:198 -#: actions/newgroup.php:142 actions/profilesettings.php:218 -#: actions/register.php:214 actions/register.php:220 -msgid "Full name is too long (max 255 chars)." +#: actions/blockedfromgroup.php:281 +msgid "Unblock user from group" msgstr "" -#: ../lib/util.php:322 lib/util.php:338 lib/action.php:344 lib/action.php:566 -#: lib/action.php:421 lib/action.php:659 lib/action.php:446 lib/action.php:704 -#: lib/action.php:456 lib/action.php:719 -msgid "Help" +#: actions/blockedfromgroup.php:313 lib/unblockform.php:150 +msgid "Unblock" msgstr "" -#: ../lib/util.php:298 lib/util.php:314 lib/action.php:322 -#: lib/facebookaction.php:200 lib/action.php:393 lib/facebookaction.php:213 -#: lib/action.php:417 lib/action.php:430 -msgid "Home" +#: actions/blockedfromgroup.php:313 lib/unblockform.php:120 +#: lib/unblockform.php:150 +msgid "Unblock this user" msgstr "" -#: ../actions/profilesettings.php:46 ../actions/register.php:167 -#: actions/profilesettings.php:79 actions/register.php:181 -#: actions/profilesettings.php:107 actions/register.php:396 -#: lib/groupeditform.php:146 actions/register.php:442 -#: lib/groupeditform.php:161 actions/profilesettings.php:115 -#: actions/register.php:446 actions/register.php:452 -msgid "Homepage" +#: actions/block.php:59 actions/deletenotice.php:67 actions/disfavor.php:61 +#: actions/favor.php:62 actions/groupblock.php:61 actions/groupunblock.php:61 +#: actions/logout.php:69 actions/makeadmin.php:61 actions/newmessage.php:87 +#: actions/newnotice.php:89 actions/nudge.php:63 actions/subedit.php:31 +#: actions/subscribe.php:30 actions/unblock.php:60 actions/unsubscribe.php:52 +#: lib/settingsaction.php:72 +msgid "Not logged in." msgstr "" -#: ../actions/profilesettings.php:95 ../actions/register.php:76 -#: actions/profilesettings.php:210 actions/register.php:83 -#: actions/editgroup.php:192 actions/newgroup.php:143 -#: actions/profilesettings.php:199 actions/register.php:168 -#: actions/editgroup.php:194 actions/newgroup.php:144 -#: actions/profilesettings.php:200 actions/register.php:205 -#: actions/apigroupcreate.php:244 actions/editgroup.php:195 -#: actions/newgroup.php:139 actions/profilesettings.php:215 -#: actions/register.php:211 actions/register.php:217 -msgid "Homepage is not a valid URL." +#: actions/block.php:69 actions/groupblock.php:71 actions/groupunblock.php:71 +#: actions/makeadmin.php:71 actions/subedit.php:46 actions/unblock.php:70 +msgid "No profile specified." msgstr "" -#: ../actions/emailsettings.php:91 actions/emailsettings.php:98 -#: actions/emailsettings.php:173 actions/emailsettings.php:178 -#: actions/emailsettings.php:185 -msgid "I want to post notices by email." +#: actions/block.php:74 actions/groupblock.php:76 actions/groupunblock.php:76 +#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46 +#: actions/unblock.php:75 +msgid "No profile with that ID." msgstr "" -#: ../lib/settingsaction.php:102 lib/settingsaction.php:96 -#: lib/connectsettingsaction.php:104 lib/connectsettingsaction.php:110 -msgid "IM" +#: actions/block.php:111 actions/block.php:134 +msgid "Block user" msgstr "" -#: ../actions/imsettings.php:60 actions/imsettings.php:61 -#: actions/imsettings.php:118 actions/imsettings.php:124 -msgid "IM Address" +#: actions/block.php:136 +msgid "" +"Are you sure you want to block this user? Afterwards, they will be " +"unsubscribed from you, unable to subscribe to you in the future, and you " +"will not be notified of any @-replies from them." msgstr "" -#: ../actions/imsettings.php:33 actions/imsettings.php:33 -#: actions/imsettings.php:59 -msgid "IM Settings" +#: actions/block.php:149 actions/deletenotice.php:145 +#: actions/groupblock.php:176 +msgid "No" msgstr "" -#: ../actions/finishopenidlogin.php:88 actions/finishopenidlogin.php:94 -#: actions/finishopenidlogin.php:116 actions/finishopenidlogin.php:115 -msgid "" -"If you already have an account, login with your username and password to " -"connect it to your OpenID." +#: actions/block.php:149 +msgid "Do not block this user from this group" msgstr "" -#: ../actions/openidsettings.php:45 actions/openidsettings.php:96 -msgid "" -"If you want to add an OpenID to your account, enter it in the box below and " -"click \"Add\"." +#: actions/block.php:150 actions/deletenotice.php:146 +#: actions/groupblock.php:177 +msgid "Yes" msgstr "" -#: ../actions/emailsettings.php:67 ../actions/smssettings.php:76 -#: actions/emailsettings.php:68 actions/smssettings.php:76 -#: actions/emailsettings.php:127 actions/smssettings.php:140 -#: actions/emailsettings.php:133 actions/smssettings.php:152 -msgid "Incoming email" +#: actions/block.php:150 +msgid "Block this user from this group" msgstr "" -#: ../actions/emailsettings.php:283 actions/emailsettings.php:301 -#: actions/emailsettings.php:443 actions/emailsettings.php:450 -#: actions/smssettings.php:518 actions/smssettings.php:519 -#: actions/emailsettings.php:458 actions/smssettings.php:531 -msgid "Incoming email address removed." +#: actions/block.php:165 +msgid "You have already blocked this user." msgstr "" -#: ../actions/password.php:69 actions/profilesettings.php:388 -#: actions/passwordsettings.php:153 actions/passwordsettings.php:158 -#: actions/passwordsettings.php:164 -msgid "Incorrect old password" +#: actions/block.php:170 +msgid "Failed to save block information." msgstr "" -#: ../actions/login.php:67 actions/login.php:67 actions/facebookhome.php:131 -#: actions/login.php:132 actions/facebookhome.php:130 actions/login.php:114 -#: actions/facebookhome.php:129 actions/login.php:116 actions/login.php:143 -msgid "Incorrect username or password." +#: actions/bookmarklet.php:50 +msgid "Post to " msgstr "" -#: ../actions/recoverpassword.php:265 actions/recoverpassword.php:304 -#: actions/recoverpassword.php:322 actions/recoverpassword.php:325 -msgid "" -"Instructions for recovering your password have been sent to the email " -"address registered to your account." +#: actions/confirmaddress.php:75 +msgid "No confirmation code." msgstr "" -#: ../actions/updateprofile.php:114 actions/updateprofile.php:115 -#: actions/updateprofile.php:118 actions/updateprofile.php:120 -#, php-format -msgid "Invalid avatar URL '%s'" +#: actions/confirmaddress.php:80 +msgid "Confirmation code not found." msgstr "" -#: ../actions/invite.php:55 actions/invite.php:62 actions/invite.php:70 -#: actions/invite.php:72 -#, php-format -msgid "Invalid email address: %s" +#: actions/confirmaddress.php:85 +msgid "That confirmation code is not for you!" msgstr "" -#: ../actions/updateprofile.php:98 actions/updateprofile.php:99 -#: actions/updateprofile.php:102 actions/updateprofile.php:104 +#: actions/confirmaddress.php:90 #, php-format -msgid "Invalid homepage '%s'" +msgid "Unrecognized address type %s" msgstr "" -#: ../actions/updateprofile.php:82 actions/updateprofile.php:83 -#: actions/updateprofile.php:86 actions/updateprofile.php:88 -#, php-format -msgid "Invalid license URL '%s'" +#: actions/confirmaddress.php:94 +msgid "That address has already been confirmed." msgstr "" -#: ../actions/postnotice.php:61 actions/postnotice.php:62 -#: actions/postnotice.php:66 actions/postnotice.php:84 -msgid "Invalid notice content" +#: actions/confirmaddress.php:114 actions/emailsettings.php:295 +#: actions/emailsettings.php:426 actions/imsettings.php:258 +#: actions/imsettings.php:401 actions/othersettings.php:174 +#: actions/profilesettings.php:276 actions/smssettings.php:278 +#: actions/smssettings.php:420 +msgid "Couldn't update user." msgstr "" -#: ../actions/postnotice.php:67 actions/postnotice.php:68 -#: actions/postnotice.php:72 -msgid "Invalid notice uri" +#: actions/confirmaddress.php:126 actions/emailsettings.php:390 +#: actions/imsettings.php:363 actions/smssettings.php:382 +msgid "Couldn't delete email confirmation." msgstr "" -#: ../actions/postnotice.php:72 actions/postnotice.php:73 -#: actions/postnotice.php:77 -msgid "Invalid notice url" +#: actions/confirmaddress.php:144 +msgid "Confirm Address" msgstr "" -#: ../actions/updateprofile.php:87 actions/updateprofile.php:88 -#: actions/updateprofile.php:91 actions/updateprofile.php:93 +#: actions/confirmaddress.php:159 #, php-format -msgid "Invalid profile URL '%s'." +msgid "The address \"%s\" has been confirmed for your account." msgstr "" -#: ../actions/remotesubscribe.php:96 actions/remotesubscribe.php:105 -#: actions/remotesubscribe.php:135 actions/remotesubscribe.php:159 -msgid "Invalid profile URL (bad format)" +#: actions/conversation.php:99 +msgid "Conversation" msgstr "" -#: ../actions/finishremotesubscribe.php:77 -#: actions/finishremotesubscribe.php:79 actions/finishremotesubscribe.php:80 -msgid "Invalid profile URL returned by server." +#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87 +#: lib/profileaction.php:206 +msgid "Notices" msgstr "" -#: ../actions/avatarbynickname.php:37 actions/avatarbynickname.php:37 -#: actions/avatarbynickname.php:69 -msgid "Invalid size." +#: actions/deletenotice.php:52 actions/shownotice.php:92 +msgid "No such notice." msgstr "" -#: ../actions/finishopenidlogin.php:235 ../actions/register.php:93 -#: ../actions/register.php:111 actions/finishopenidlogin.php:241 -#: actions/register.php:103 actions/register.php:121 -#: actions/finishopenidlogin.php:279 actions/register.php:193 -#: actions/register.php:211 actions/finishopenidlogin.php:284 -#: actions/finishopenidlogin.php:307 actions/register.php:230 -#: actions/register.php:251 actions/register.php:237 actions/register.php:258 -#: actions/register.php:243 actions/register.php:264 -msgid "Invalid username or password." +#: actions/deletenotice.php:71 +msgid "Can't delete this notice." msgstr "" -#: ../actions/invite.php:79 actions/invite.php:86 actions/invite.php:102 -#: actions/invite.php:104 actions/invite.php:110 -msgid "Invitation(s) sent" +#: actions/deletenotice.php:103 +msgid "" +"You are about to permanently delete a notice. Once this is done, it cannot " +"be undone." msgstr "" -#: ../actions/invite.php:97 actions/invite.php:104 actions/invite.php:136 -#: actions/invite.php:138 actions/invite.php:144 -msgid "Invitation(s) sent to the following people:" +#: actions/deletenotice.php:109 actions/deletenotice.php:141 +msgid "Delete notice" msgstr "" -#: ../lib/util.php:306 lib/util.php:322 lib/facebookaction.php:207 -#: lib/subgroupnav.php:103 lib/facebookaction.php:220 lib/action.php:429 -#: lib/facebookaction.php:221 lib/subgroupnav.php:105 lib/action.php:439 -msgid "Invite" +#: actions/deletenotice.php:144 +msgid "Are you sure you want to delete this notice?" msgstr "" -#: ../actions/invite.php:123 actions/invite.php:130 actions/invite.php:104 -#: actions/invite.php:106 actions/invite.php:112 -msgid "Invite new users" +#: actions/deletenotice.php:145 +msgid "Do not delete this notice" msgstr "" -#: ../lib/util.php:261 lib/util.php:277 lib/action.php:609 lib/action.php:706 -#: lib/action.php:756 lib/action.php:771 -#, php-format -msgid "" -"It runs the [StatusNet](http://status.net/) microblogging software, version %" -"s, available under the [GNU Affero General Public License](http://www.fsf." -"org/licensing/licenses/agpl-3.0.html)." +#: actions/deletenotice.php:146 lib/noticelist.php:522 +msgid "Delete this notice" msgstr "" -#: ../actions/imsettings.php:173 actions/imsettings.php:181 -#: actions/imsettings.php:296 actions/imsettings.php:302 -msgid "Jabber ID already belongs to another user." +#: actions/deletenotice.php:157 +msgid "There was a problem with your session token. Try again, please." msgstr "" -#: ../actions/imsettings.php:62 actions/imsettings.php:63 -#: actions/imsettings.php:120 actions/imsettings.php:126 -#, php-format -msgid "" -"Jabber or GTalk address, like \"UserName@example.org\". First, make sure to " -"add %s to your buddy list in your IM client or on GTalk." +#: actions/disfavor.php:81 +msgid "This notice is not a favorite!" msgstr "" -#: ../actions/profilesettings.php:57 actions/profilesettings.php:90 -#: actions/profilesettings.php:128 actions/profilesettings.php:129 -#: actions/profilesettings.php:144 -msgid "Language" +#: actions/disfavor.php:94 +msgid "Add to favorites" msgstr "" -#: ../actions/profilesettings.php:113 actions/profilesettings.php:228 -#: actions/profilesettings.php:217 actions/profilesettings.php:218 -#: actions/profilesettings.php:234 -msgid "Language is too long (max 50 chars)." +#: actions/doc.php:69 +msgid "No such document." msgstr "" -#: ../actions/profilesettings.php:52 ../actions/register.php:173 -#: actions/profilesettings.php:85 actions/register.php:187 -#: actions/profilesettings.php:117 actions/register.php:408 -#: actions/showgroup.php:244 actions/showstream.php:271 -#: actions/tagother.php:113 lib/groupeditform.php:156 lib/grouplist.php:126 -#: lib/profilelist.php:125 actions/showgroup.php:246 -#: actions/showstream.php:264 actions/tagother.php:112 lib/profilelist.php:123 -#: actions/register.php:454 actions/showgroup.php:251 -#: actions/showstream.php:229 actions/userauthorization.php:128 -#: lib/groupeditform.php:171 lib/profilelist.php:185 -#: actions/profilesettings.php:132 actions/register.php:464 -#: actions/showgroup.php:256 actions/showstream.php:282 -#: actions/userauthorization.php:158 lib/groupeditform.php:177 -#: lib/profilelist.php:218 actions/register.php:470 lib/userprofile.php:164 -msgid "Location" +#: actions/editgroup.php:56 +#, php-format +msgid "Edit %s group" msgstr "" -#: ../actions/profilesettings.php:104 ../actions/register.php:85 -#: ../actions/updateprofile.php:108 actions/profilesettings.php:219 -#: actions/register.php:92 actions/updateprofile.php:109 -#: actions/editgroup.php:201 actions/newgroup.php:152 -#: actions/profilesettings.php:208 actions/register.php:177 -#: actions/updateprofile.php:112 actions/updateprofile.php:114 -#: actions/editgroup.php:203 actions/newgroup.php:153 -#: actions/profilesettings.php:209 actions/register.php:214 -#: actions/apigroupcreate.php:272 actions/editgroup.php:204 -#: actions/newgroup.php:148 actions/profilesettings.php:225 -#: actions/register.php:221 actions/register.php:227 -msgid "Location is too long (max 255 chars)." +#: actions/editgroup.php:68 actions/grouplogo.php:70 actions/newgroup.php:65 +msgid "You must be logged in to create a group." msgstr "" -#: ../actions/login.php:97 ../actions/login.php:106 -#: ../actions/openidlogin.php:68 ../lib/util.php:310 actions/login.php:97 -#: actions/login.php:106 actions/openidlogin.php:77 lib/util.php:326 -#: actions/facebooklogin.php:93 actions/login.php:186 actions/login.php:239 -#: actions/openidlogin.php:112 lib/action.php:335 lib/facebookaction.php:288 -#: lib/facebookaction.php:315 lib/logingroupnav.php:75 actions/login.php:169 -#: actions/login.php:222 actions/openidlogin.php:121 lib/action.php:412 -#: lib/facebookaction.php:293 lib/facebookaction.php:319 lib/action.php:443 -#: lib/facebookaction.php:295 lib/facebookaction.php:321 actions/login.php:177 -#: actions/login.php:230 lib/action.php:453 lib/logingroupnav.php:79 -#: actions/login.php:204 actions/login.php:257 -#, php-format -msgid "Login" +#: actions/editgroup.php:103 actions/editgroup.php:168 +#: actions/groupdesignsettings.php:104 actions/grouplogo.php:106 +msgid "You must be an admin to edit the group" msgstr "" -#: ../actions/openidlogin.php:44 actions/openidlogin.php:52 -#: actions/openidlogin.php:62 actions/openidlogin.php:70 -#, php-format -msgid "Login with an [OpenID](%%doc.openid%%) account." +#: actions/editgroup.php:154 +msgid "Use this form to edit the group." msgstr "" -#: ../actions/login.php:126 actions/login.php:251 +#: actions/editgroup.php:201 actions/newgroup.php:145 #, php-format -msgid "" -"Login with your username and password. Don't have a username yet? [Register]" -"(%%action.register%%) a new account, or try [OpenID](%%action.openidlogin%" -"%). " -msgstr "" - -#: ../lib/util.php:308 lib/util.php:324 lib/action.php:332 lib/action.php:409 -#: lib/action.php:435 lib/action.php:445 -msgid "Logout" +msgid "description is too long (max %d chars)." msgstr "" -#: ../actions/register.php:166 actions/register.php:180 -#: actions/register.php:393 actions/register.php:439 actions/register.php:443 -#: actions/register.php:449 -msgid "Longer name, preferably your \"real\" name" +#: actions/editgroup.php:253 +msgid "Could not update group." msgstr "" -#: ../actions/login.php:110 actions/login.php:110 actions/login.php:245 -#: lib/facebookaction.php:320 actions/login.php:228 lib/facebookaction.php:325 -#: lib/facebookaction.php:327 actions/login.php:236 actions/login.php:263 -msgid "Lost or forgotten password?" +#: actions/editgroup.php:269 +msgid "Options saved." msgstr "" -#: ../actions/emailsettings.php:80 ../actions/smssettings.php:89 -#: actions/emailsettings.php:81 actions/smssettings.php:89 -#: actions/emailsettings.php:139 actions/smssettings.php:150 -#: actions/emailsettings.php:145 actions/smssettings.php:162 -msgid "Make a new email address for posting to; cancels the old one." +#: actions/emailsettings.php:60 +msgid "Email Settings" msgstr "" -#: ../actions/emailsettings.php:27 actions/emailsettings.php:27 #: actions/emailsettings.php:71 #, php-format msgid "Manage how you get email from %%site.name%%." msgstr "" -#: ../actions/showstream.php:300 actions/showstream.php:315 -#: actions/showstream.php:480 lib/profileaction.php:182 -msgid "Member since" -msgstr "" - -#: ../actions/userrss.php:70 actions/userrss.php:67 actions/userrss.php:72 -#: actions/userrss.php:93 -#, php-format -msgid "Microblog by %s" -msgstr "" - -#: ../actions/smssettings.php:304 actions/smssettings.php:464 -#: actions/smssettings.php:476 -#, php-format -msgid "" -"Mobile carrier for your phone. If you know a carrier that accepts SMS over " -"email but isn't listed here, send email to let us know at %s." +#: actions/emailsettings.php:100 +msgid "Address" msgstr "" -#: ../actions/finishopenidlogin.php:79 ../actions/register.php:188 -#: actions/finishopenidlogin.php:85 actions/register.php:202 -#: actions/finishopenidlogin.php:107 actions/register.php:429 -#: actions/register.php:430 actions/finishopenidlogin.php:106 -#: actions/register.php:477 actions/register.php:487 actions/register.php:493 -msgid "My text and files are available under " +#: actions/emailsettings.php:105 +msgid "Current confirmed email address." msgstr "" -#: ../actions/emailsettings.php:82 ../actions/smssettings.php:91 -#: actions/emailsettings.php:83 actions/smssettings.php:91 -#: actions/emailsettings.php:142 actions/smssettings.php:152 -#: actions/emailsettings.php:148 actions/smssettings.php:164 -msgid "New" +#: actions/emailsettings.php:107 actions/emailsettings.php:140 +#: actions/imsettings.php:108 actions/smssettings.php:115 +#: actions/smssettings.php:158 +msgid "Remove" msgstr "" -#: ../lib/mail.php:144 lib/mail.php:144 lib/mail.php:286 lib/mail.php:285 -#, php-format -msgid "New email address for posting to %s" +#: actions/emailsettings.php:113 +msgid "" +"Awaiting confirmation on this address. Check your inbox (and spam box!) for " +"a message with further instructions." msgstr "" -#: ../actions/emailsettings.php:297 actions/emailsettings.php:315 -#: actions/emailsettings.php:465 actions/emailsettings.php:472 -#: actions/smssettings.php:542 actions/smssettings.php:543 -#: actions/emailsettings.php:480 actions/smssettings.php:555 -msgid "New incoming email address added." +#: actions/emailsettings.php:117 actions/imsettings.php:120 +#: actions/smssettings.php:126 +msgid "Cancel" msgstr "" -#: ../actions/finishopenidlogin.php:71 actions/finishopenidlogin.php:77 -#: actions/finishopenidlogin.php:99 actions/finishopenidlogin.php:98 -msgid "New nickname" +#: actions/emailsettings.php:121 +msgid "Email Address" msgstr "" -#: ../actions/newnotice.php:87 actions/newnotice.php:96 -#: actions/newnotice.php:68 actions/newnotice.php:69 -msgid "New notice" +#: actions/emailsettings.php:123 +msgid "Email address, like \"UserName@example.org\"" msgstr "" -#: ../actions/password.php:41 ../actions/recoverpassword.php:179 -#: actions/profilesettings.php:180 actions/recoverpassword.php:185 -#: actions/passwordsettings.php:101 actions/recoverpassword.php:219 -#: actions/recoverpassword.php:232 actions/passwordsettings.php:107 -#: actions/recoverpassword.php:235 -msgid "New password" +#: actions/emailsettings.php:126 actions/imsettings.php:133 +#: actions/smssettings.php:145 +msgid "Add" msgstr "" -#: ../actions/recoverpassword.php:314 actions/recoverpassword.php:361 -#: actions/recoverpassword.php:379 actions/recoverpassword.php:382 -msgid "New password successfully saved. You are now logged in." +#: actions/emailsettings.php:133 actions/smssettings.php:152 +msgid "Incoming email" msgstr "" -#: ../actions/login.php:101 ../actions/profilesettings.php:41 -#: ../actions/register.php:151 actions/login.php:101 -#: actions/profilesettings.php:74 actions/register.php:165 -#: actions/login.php:228 actions/profilesettings.php:98 -#: actions/register.php:367 actions/showgroup.php:224 -#: actions/showstream.php:251 actions/tagother.php:95 -#: lib/facebookaction.php:308 lib/groupeditform.php:137 actions/login.php:211 -#: actions/showgroup.php:226 actions/showstream.php:244 -#: actions/tagother.php:94 lib/facebookaction.php:312 actions/register.php:413 -#: actions/showgroup.php:231 actions/showstream.php:209 -#: lib/facebookaction.php:314 lib/groupeditform.php:152 actions/login.php:219 -#: actions/profilesettings.php:106 actions/register.php:417 -#: actions/showgroup.php:236 actions/showstream.php:249 actions/login.php:246 -#: actions/register.php:423 lib/userprofile.php:131 -msgid "Nickname" +#: actions/emailsettings.php:138 actions/smssettings.php:157 +msgid "Send email to this address to post new notices." msgstr "" -#: ../actions/finishopenidlogin.php:175 ../actions/profilesettings.php:110 -#: ../actions/register.php:69 actions/finishopenidlogin.php:181 -#: actions/profilesettings.php:225 actions/register.php:76 -#: actions/editgroup.php:183 actions/finishopenidlogin.php:215 -#: actions/newgroup.php:134 actions/profilesettings.php:214 -#: actions/register.php:159 actions/editgroup.php:185 -#: actions/finishopenidlogin.php:231 actions/newgroup.php:135 -#: actions/profilesettings.php:215 actions/register.php:196 -#: actions/apigroupcreate.php:221 actions/editgroup.php:186 -#: actions/newgroup.php:130 actions/profilesettings.php:231 -#: actions/register.php:202 actions/register.php:208 -msgid "Nickname already in use. Try another one." +#: actions/emailsettings.php:145 actions/smssettings.php:162 +msgid "Make a new email address for posting to; cancels the old one." msgstr "" -#: ../actions/finishopenidlogin.php:165 ../actions/profilesettings.php:88 -#: ../actions/register.php:67 ../actions/updateprofile.php:77 -#: actions/finishopenidlogin.php:171 actions/profilesettings.php:203 -#: actions/register.php:74 actions/updateprofile.php:78 -#: actions/finishopenidlogin.php:205 actions/profilesettings.php:192 -#: actions/updateprofile.php:81 actions/editgroup.php:179 -#: actions/newgroup.php:130 actions/register.php:156 -#: actions/updateprofile.php:83 actions/editgroup.php:181 -#: actions/finishopenidlogin.php:221 actions/newgroup.php:131 -#: actions/profilesettings.php:193 actions/register.php:193 -#: actions/apigroupcreate.php:212 actions/editgroup.php:182 -#: actions/newgroup.php:126 actions/profilesettings.php:208 -#: actions/register.php:199 actions/register.php:205 -msgid "Nickname must have only lowercase letters and numbers and no spaces." +#: actions/emailsettings.php:148 actions/smssettings.php:164 +msgid "New" msgstr "" -#: ../actions/finishopenidlogin.php:170 actions/finishopenidlogin.php:176 -#: actions/finishopenidlogin.php:210 actions/finishopenidlogin.php:226 -msgid "Nickname not allowed." +#: actions/emailsettings.php:153 actions/imsettings.php:139 +#: actions/smssettings.php:169 +msgid "Preferences" msgstr "" -#: ../actions/remotesubscribe.php:72 actions/remotesubscribe.php:81 -#: actions/remotesubscribe.php:106 actions/remotesubscribe.php:130 -msgid "Nickname of the user you want to follow" +#: actions/emailsettings.php:158 +msgid "Send me notices of new subscriptions through email." msgstr "" -#: ../actions/recoverpassword.php:162 actions/recoverpassword.php:167 -#: actions/recoverpassword.php:186 actions/recoverpassword.php:191 -msgid "Nickname or email" +#: actions/emailsettings.php:163 +msgid "Send me email when someone adds my notice as a favorite." msgstr "" -#: ../actions/deletenotice.php:59 actions/deletenotice.php:60 -#: actions/block.php:147 actions/deletenotice.php:118 -#: actions/deletenotice.php:116 actions/block.php:149 -#: actions/deletenotice.php:115 actions/groupblock.php:176 -#: actions/deletenotice.php:145 -msgid "No" +#: actions/emailsettings.php:169 +msgid "Send me email when someone sends me a private message." msgstr "" -#: ../actions/imsettings.php:156 actions/imsettings.php:164 -#: actions/imsettings.php:279 actions/imsettings.php:285 -msgid "No Jabber ID." +#: actions/emailsettings.php:174 +msgid "Send me email when someone sends me an \"@-reply\"." msgstr "" -#: ../actions/userauthorization.php:129 actions/userauthorization.php:136 -#: actions/userauthorization.php:153 actions/userauthorization.php:192 -#: actions/userauthorization.php:225 -msgid "No authorization request!" +#: actions/emailsettings.php:179 +msgid "Allow friends to nudge me and send me an email." msgstr "" -#: ../actions/smssettings.php:181 actions/smssettings.php:189 -#: actions/smssettings.php:299 actions/smssettings.php:311 -msgid "No carrier selected." +#: actions/emailsettings.php:185 +msgid "I want to post notices by email." msgstr "" -#: ../actions/smssettings.php:316 actions/smssettings.php:324 -#: actions/smssettings.php:486 actions/smssettings.php:498 -msgid "No code entered" +#: actions/emailsettings.php:191 +msgid "Publish a MicroID for my email address." msgstr "" -#: ../actions/confirmaddress.php:33 actions/confirmaddress.php:33 -#: actions/confirmaddress.php:75 -msgid "No confirmation code." +#: actions/emailsettings.php:195 actions/imsettings.php:163 +#: actions/othersettings.php:126 actions/profilesettings.php:167 +#: actions/smssettings.php:181 actions/subscriptions.php:203 +#: actions/tagother.php:154 lib/designsettings.php:256 +#: lib/groupeditform.php:202 +msgid "Save" msgstr "" -#: ../actions/newnotice.php:44 actions/newmessage.php:53 -#: actions/newnotice.php:44 classes/Command.php:197 actions/newmessage.php:109 -#: actions/newnotice.php:126 classes/Command.php:223 -#: actions/newmessage.php:142 actions/newnotice.php:131 lib/command.php:223 -#: actions/newnotice.php:162 lib/command.php:216 actions/newmessage.php:144 -#: actions/newnotice.php:136 lib/command.php:351 lib/command.php:424 -msgid "No content!" +#: actions/emailsettings.php:301 actions/imsettings.php:264 +#: actions/othersettings.php:180 actions/smssettings.php:284 +msgid "Preferences saved." msgstr "" -#: ../actions/emailsettings.php:174 actions/emailsettings.php:192 -#: actions/emailsettings.php:304 actions/emailsettings.php:311 #: actions/emailsettings.php:319 msgid "No email address." msgstr "" -#: ../actions/userbyid.php:32 actions/userbyid.php:32 actions/userbyid.php:70 -msgid "No id." -msgstr "" - -#: ../actions/emailsettings.php:271 actions/emailsettings.php:289 -#: actions/emailsettings.php:430 actions/emailsettings.php:437 -#: actions/smssettings.php:505 actions/smssettings.php:506 -#: actions/emailsettings.php:445 actions/smssettings.php:518 -msgid "No incoming email address." -msgstr "" - -#: ../actions/finishremotesubscribe.php:65 -#: actions/finishremotesubscribe.php:67 actions/finishremotesubscribe.php:68 -msgid "No nickname provided by remote server." -msgstr "" - -#: ../actions/avatarbynickname.php:27 actions/avatarbynickname.php:27 -#: actions/avatarbynickname.php:59 actions/leavegroup.php:81 -#: actions/leavegroup.php:76 -msgid "No nickname." -msgstr "" - -#: ../actions/emailsettings.php:222 ../actions/imsettings.php:206 -#: ../actions/smssettings.php:229 actions/emailsettings.php:240 -#: actions/imsettings.php:214 actions/smssettings.php:237 -#: actions/emailsettings.php:363 actions/imsettings.php:345 -#: actions/smssettings.php:358 actions/emailsettings.php:370 -#: actions/emailsettings.php:378 actions/imsettings.php:351 -#: actions/smssettings.php:370 -msgid "No pending confirmation to cancel." -msgstr "" - -#: ../actions/smssettings.php:176 actions/smssettings.php:184 -#: actions/smssettings.php:294 actions/smssettings.php:306 -msgid "No phone number." -msgstr "" - -#: ../actions/finishremotesubscribe.php:72 -#: actions/finishremotesubscribe.php:74 actions/finishremotesubscribe.php:75 -msgid "No profile URL returned by server." -msgstr "" - -#: ../actions/recoverpassword.php:226 actions/recoverpassword.php:232 -#: actions/recoverpassword.php:266 actions/recoverpassword.php:284 -#: actions/recoverpassword.php:287 -msgid "No registered email address for that user." -msgstr "" - -#: ../actions/userauthorization.php:49 actions/userauthorization.php:55 -#: actions/userauthorization.php:57 -msgid "No request found!" -msgstr "" - -#: ../actions/noticesearch.php:64 ../actions/peoplesearch.php:64 -#: actions/noticesearch.php:69 actions/peoplesearch.php:69 -#: actions/groupsearch.php:81 actions/noticesearch.php:104 -#: actions/peoplesearch.php:85 actions/noticesearch.php:117 -msgid "No results" -msgstr "" - -#: ../actions/avatarbynickname.php:32 actions/avatarbynickname.php:32 -#: actions/avatarbynickname.php:64 -msgid "No size." -msgstr "" - -#: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136 -#: actions/twitapistatuses.php:520 actions/twitapifavorites.php:112 -#: actions/twitapistatuses.php:446 actions/twitapifavorites.php:118 -#: actions/twitapistatuses.php:470 actions/twitapifavorites.php:169 -#: actions/twitapistatuses.php:426 actions/apifavoritecreate.php:108 -#: actions/apifavoritedestroy.php:109 actions/apistatusesdestroy.php:113 -msgid "No status found with that ID." -msgstr "" - -#: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478 -#: actions/twitapistatuses.php:418 actions/twitapistatuses.php:442 -#: actions/twitapistatuses.php:399 actions/apistatusesshow.php:144 -msgid "No status with that ID found." -msgstr "" - -#: ../actions/openidsettings.php:135 actions/openidsettings.php:144 -#: actions/openidsettings.php:222 -msgid "No such OpenID." -msgstr "" - -#: ../actions/doc.php:29 actions/doc.php:29 actions/doc.php:64 -#: actions/doc.php:69 -msgid "No such document." -msgstr "" - -#: ../actions/shownotice.php:32 ../actions/shownotice.php:83 -#: ../lib/deleteaction.php:30 actions/shownotice.php:32 -#: actions/shownotice.php:83 lib/deleteaction.php:30 actions/shownotice.php:87 -#: lib/deleteaction.php:51 actions/deletenotice.php:52 -#: actions/shownotice.php:92 -msgid "No such notice." -msgstr "" - -#: ../actions/recoverpassword.php:56 actions/recoverpassword.php:56 -#: actions/recoverpassword.php:62 -msgid "No such recovery code." -msgstr "" - -#: ../actions/postnotice.php:56 actions/postnotice.php:57 -#: actions/postnotice.php:60 -msgid "No such subscription" -msgstr "" - -#: ../actions/all.php:34 ../actions/allrss.php:35 -#: ../actions/avatarbynickname.php:43 ../actions/foaf.php:40 -#: ../actions/remotesubscribe.php:84 ../actions/remotesubscribe.php:91 -#: ../actions/replies.php:57 ../actions/repliesrss.php:35 -#: ../actions/showstream.php:110 ../actions/userbyid.php:36 -#: ../actions/userrss.php:35 ../actions/xrds.php:35 ../lib/gallery.php:57 -#: ../lib/subs.php:33 ../lib/subs.php:82 actions/all.php:34 -#: actions/allrss.php:35 actions/avatarbynickname.php:43 -#: actions/favoritesrss.php:35 actions/foaf.php:40 actions/ical.php:31 -#: actions/remotesubscribe.php:93 actions/remotesubscribe.php:100 -#: actions/replies.php:57 actions/repliesrss.php:35 -#: actions/showfavorites.php:34 actions/showstream.php:110 -#: actions/userbyid.php:36 actions/userrss.php:35 actions/xrds.php:35 -#: classes/Command.php:120 classes/Command.php:162 classes/Command.php:203 -#: classes/Command.php:237 lib/gallery.php:62 lib/mailbox.php:36 -#: lib/subs.php:33 lib/subs.php:95 actions/all.php:53 actions/allrss.php:66 -#: actions/avatarbynickname.php:75 actions/favoritesrss.php:64 -#: actions/foaf.php:41 actions/remotesubscribe.php:123 -#: actions/remotesubscribe.php:130 actions/replies.php:73 -#: actions/repliesrss.php:38 actions/showfavorites.php:105 -#: actions/showstream.php:100 actions/userbyid.php:74 -#: actions/usergroups.php:92 actions/userrss.php:38 actions/xrds.php:73 -#: classes/Command.php:140 classes/Command.php:185 classes/Command.php:234 -#: classes/Command.php:271 lib/galleryaction.php:60 lib/mailbox.php:82 -#: lib/subs.php:34 lib/subs.php:109 actions/all.php:56 actions/allrss.php:68 -#: actions/favoritesrss.php:74 lib/command.php:140 lib/command.php:185 -#: lib/command.php:234 lib/command.php:271 lib/mailbox.php:84 -#: actions/all.php:38 actions/foaf.php:58 actions/replies.php:72 -#: actions/usergroups.php:91 actions/userrss.php:39 lib/command.php:133 -#: lib/command.php:178 lib/command.php:227 lib/command.php:264 -#: lib/galleryaction.php:59 lib/profileaction.php:77 lib/subs.php:112 -#: actions/all.php:74 actions/remotesubscribe.php:145 actions/xrds.php:71 -#: lib/command.php:163 lib/command.php:311 lib/command.php:364 -#: lib/command.php:411 lib/command.php:466 -msgid "No such user." -msgstr "" - -#: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217 -#: actions/recoverpassword.php:251 actions/recoverpassword.php:269 -#: actions/recoverpassword.php:272 -msgid "No user with that email address or username." -msgstr "" - -#: ../lib/gallery.php:80 lib/gallery.php:85 -msgid "Nobody to show!" -msgstr "" - -#: ../actions/recoverpassword.php:60 actions/recoverpassword.php:60 -#: actions/recoverpassword.php:66 -msgid "Not a recovery code." -msgstr "" - -#: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50 -#: scripts/maildaemon.php:53 scripts/maildaemon.php:52 -msgid "Not a registered user." -msgstr "" - -#: ../lib/twitterapi.php:226 ../lib/twitterapi.php:247 -#: ../lib/twitterapi.php:332 lib/twitterapi.php:391 lib/twitterapi.php:418 -#: lib/twitterapi.php:502 lib/twitterapi.php:448 lib/twitterapi.php:476 -#: lib/twitterapi.php:566 lib/twitterapi.php:483 lib/twitterapi.php:511 -#: lib/twitterapi.php:601 lib/twitterapi.php:620 lib/twitterapi.php:648 -#: lib/twitterapi.php:741 actions/oembed.php:181 actions/oembed.php:200 -#: lib/api.php:954 lib/api.php:982 lib/api.php:1092 lib/api.php:963 -#: lib/api.php:991 lib/api.php:1101 -msgid "Not a supported data format." -msgstr "" - -#: ../actions/imsettings.php:167 actions/imsettings.php:175 -#: actions/imsettings.php:290 actions/imsettings.php:296 -msgid "Not a valid Jabber ID" -msgstr "" - -#: ../lib/openid.php:131 lib/openid.php:131 lib/openid.php:140 -#: lib/openid.php:143 -msgid "Not a valid OpenID." +#: actions/emailsettings.php:326 +msgid "Cannot normalize that email address" msgstr "" -#: ../actions/emailsettings.php:185 actions/emailsettings.php:203 -#: actions/emailsettings.php:315 actions/emailsettings.php:322 #: actions/emailsettings.php:330 msgid "Not a valid email address" msgstr "" -#: ../actions/register.php:63 actions/register.php:70 actions/register.php:152 -#: actions/register.php:189 actions/register.php:195 actions/register.php:201 -msgid "Not a valid email address." -msgstr "" - -#: ../actions/profilesettings.php:91 ../actions/register.php:71 -#: actions/profilesettings.php:206 actions/register.php:78 -#: actions/editgroup.php:186 actions/newgroup.php:137 -#: actions/profilesettings.php:195 actions/register.php:161 -#: actions/editgroup.php:188 actions/newgroup.php:138 -#: actions/profilesettings.php:196 actions/register.php:198 -#: actions/apigroupcreate.php:228 actions/editgroup.php:189 -#: actions/newgroup.php:133 actions/profilesettings.php:211 -#: actions/register.php:204 actions/register.php:210 -msgid "Not a valid nickname." +#: actions/emailsettings.php:333 +msgid "That is already your email address." msgstr "" -#: ../actions/remotesubscribe.php:120 actions/remotesubscribe.php:129 -#: actions/remotesubscribe.php:159 -msgid "Not a valid profile URL (incorrect services)." +#: actions/emailsettings.php:336 +msgid "That email address already belongs to another user." msgstr "" -#: ../actions/remotesubscribe.php:113 actions/remotesubscribe.php:122 -#: actions/remotesubscribe.php:152 -msgid "Not a valid profile URL (no XRDS defined)." +#: actions/emailsettings.php:352 actions/imsettings.php:317 +#: actions/smssettings.php:337 +msgid "Couldn't insert confirmation code." msgstr "" -#: ../actions/remotesubscribe.php:104 actions/remotesubscribe.php:113 -#: actions/remotesubscribe.php:143 -msgid "Not a valid profile URL (no YADIS document)." +#: actions/emailsettings.php:358 +msgid "" +"A confirmation code was sent to the email address you added. Check your " +"inbox (and spam box!) for the code and instructions on how to use it." msgstr "" -#: ../actions/avatar.php:95 actions/profilesettings.php:332 -#: lib/imagefile.php:87 lib/imagefile.php:90 lib/imagefile.php:91 -#: lib/imagefile.php:96 -msgid "Not an image or corrupt file." +#: actions/emailsettings.php:378 actions/imsettings.php:351 +#: actions/smssettings.php:370 +msgid "No pending confirmation to cancel." msgstr "" -#: ../actions/finishremotesubscribe.php:51 -#: actions/finishremotesubscribe.php:53 actions/finishremotesubscribe.php:54 -msgid "Not authorized." +#: actions/emailsettings.php:382 actions/imsettings.php:355 +msgid "That is the wrong IM address." msgstr "" -#: ../actions/finishremotesubscribe.php:38 -#: actions/finishremotesubscribe.php:38 actions/finishremotesubscribe.php:40 -#: actions/finishremotesubscribe.php:69 -msgid "Not expecting this response!" +#: actions/emailsettings.php:394 actions/imsettings.php:367 +#: actions/smssettings.php:386 +msgid "Confirmation cancelled." msgstr "" -#: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361 -#: actions/twitapistatuses.php:309 actions/twitapistatuses.php:327 -#: actions/twitapistatuses.php:284 actions/apistatusesupdate.php:186 -#: actions/apistatusesupdate.php:193 -msgid "Not found" +#: actions/emailsettings.php:412 +msgid "That is not your email address." msgstr "" -#: ../actions/finishaddopenid.php:29 ../actions/logout.php:33 -#: ../actions/newnotice.php:29 ../actions/subscribe.php:28 -#: ../actions/unsubscribe.php:25 ../lib/deleteaction.php:38 -#: ../lib/settingsaction.php:27 actions/disfavor.php:29 actions/favor.php:30 -#: actions/finishaddopenid.php:29 actions/logout.php:33 -#: actions/newmessage.php:28 actions/newnotice.php:29 actions/subscribe.php:28 -#: actions/unsubscribe.php:25 lib/deleteaction.php:38 -#: lib/settingsaction.php:27 actions/block.php:59 actions/disfavor.php:61 -#: actions/favor.php:64 actions/finishaddopenid.php:67 actions/logout.php:71 -#: actions/newmessage.php:83 actions/newnotice.php:90 actions/nudge.php:63 -#: actions/subedit.php:31 actions/subscribe.php:30 actions/unblock.php:60 -#: actions/unsubscribe.php:27 lib/deleteaction.php:66 -#: lib/settingsaction.php:72 actions/newmessage.php:87 actions/favor.php:62 -#: actions/groupblock.php:61 actions/groupunblock.php:61 -#: actions/makeadmin.php:61 actions/newnotice.php:88 -#: actions/deletenotice.php:67 actions/logout.php:69 actions/newnotice.php:89 -#: actions/unsubscribe.php:52 -msgid "Not logged in." +#: actions/emailsettings.php:431 actions/imsettings.php:408 +#: actions/smssettings.php:425 +msgid "The address was removed." msgstr "" -#: ../lib/subs.php:91 lib/subs.php:104 lib/subs.php:122 lib/subs.php:124 -msgid "Not subscribed!." +#: actions/emailsettings.php:445 actions/smssettings.php:518 +msgid "No incoming email address." msgstr "" -#: ../actions/opensearch.php:35 actions/opensearch.php:35 -#: actions/opensearch.php:67 -msgid "Notice Search" +#: actions/emailsettings.php:455 actions/emailsettings.php:477 +#: actions/smssettings.php:528 actions/smssettings.php:552 +msgid "Couldn't update user record." msgstr "" -#: ../actions/showstream.php:82 actions/showstream.php:82 -#: actions/showstream.php:180 actions/showstream.php:187 -#: actions/showstream.php:192 -#, php-format -msgid "Notice feed for %s" +#: actions/emailsettings.php:458 actions/smssettings.php:531 +msgid "Incoming email address removed." msgstr "" -#: ../actions/shownotice.php:39 actions/shownotice.php:39 -#: actions/shownotice.php:94 actions/oembed.php:79 actions/shownotice.php:100 -msgid "Notice has no profile" +#: actions/emailsettings.php:480 actions/smssettings.php:555 +msgid "New incoming email address added." msgstr "" -#: ../actions/showstream.php:316 actions/showstream.php:331 -#: actions/showstream.php:504 lib/facebookaction.php:477 lib/mailbox.php:116 -#: lib/noticelist.php:87 lib/facebookaction.php:581 lib/mailbox.php:118 -#: actions/conversation.php:149 lib/facebookaction.php:572 -#: lib/profileaction.php:206 actions/conversation.php:154 -msgid "Notices" +#: actions/favorited.php:65 lib/popularnoticesection.php:87 +#: lib/publicgroupnav.php:93 +msgid "Popular notices" msgstr "" -#: ../actions/tag.php:35 ../actions/tag.php:81 actions/tag.php:35 -#: actions/tag.php:81 actions/tag.php:41 actions/tag.php:49 actions/tag.php:57 -#: actions/twitapitags.php:69 actions/apitimelinetag.php:101 -#: actions/tag.php:66 +#: actions/favorited.php:67 #, php-format -msgid "Notices tagged with %s" -msgstr "" - -#: ../actions/password.php:39 actions/profilesettings.php:178 -#: actions/passwordsettings.php:97 actions/passwordsettings.php:103 -msgid "Old password" -msgstr "" - -#: ../lib/settingsaction.php:96 ../lib/util.php:314 lib/settingsaction.php:90 -#: lib/util.php:330 lib/accountsettingsaction.php:116 lib/action.php:341 -#: lib/logingroupnav.php:81 lib/action.php:418 -msgid "OpenID" -msgstr "" - -#: ../actions/finishopenidlogin.php:61 actions/finishopenidlogin.php:66 -#: actions/finishopenidlogin.php:73 actions/finishopenidlogin.php:72 -msgid "OpenID Account Setup" -msgstr "" - -#: ../lib/openid.php:180 lib/openid.php:180 lib/openid.php:266 -#: lib/openid.php:269 -msgid "OpenID Auto-Submit" +msgid "Popular notices, page %d" msgstr "" -#: ../actions/finishaddopenid.php:99 ../actions/finishopenidlogin.php:140 -#: ../actions/openidlogin.php:60 actions/finishaddopenid.php:99 -#: actions/finishopenidlogin.php:146 actions/openidlogin.php:68 -#: actions/finishaddopenid.php:170 actions/openidlogin.php:80 -#: actions/openidlogin.php:89 -msgid "OpenID Login" +#: actions/favorited.php:79 +msgid "The most popular notices on the site right now." msgstr "" -#: ../actions/openidlogin.php:65 ../actions/openidsettings.php:49 -#: actions/openidlogin.php:74 actions/openidsettings.php:50 -#: actions/openidlogin.php:102 actions/openidsettings.php:101 -#: actions/openidlogin.php:111 -msgid "OpenID URL" +#: actions/favorited.php:150 +msgid "Favorite notices appear on this page but no one has favorited one yet." msgstr "" -#: ../actions/finishaddopenid.php:42 ../actions/finishopenidlogin.php:103 -#: actions/finishaddopenid.php:42 actions/finishopenidlogin.php:109 -#: actions/finishaddopenid.php:88 actions/finishopenidlogin.php:130 -#: actions/finishopenidlogin.php:129 -msgid "OpenID authentication cancelled." +#: actions/favorited.php:153 +msgid "" +"Be the first to add a notice to your favorites by clicking the fave button " +"next to any notice you like." msgstr "" -#: ../actions/finishaddopenid.php:46 ../actions/finishopenidlogin.php:107 -#: actions/finishaddopenid.php:46 actions/finishopenidlogin.php:113 -#: actions/finishaddopenid.php:92 actions/finishopenidlogin.php:134 -#: actions/finishopenidlogin.php:133 +#: actions/favorited.php:156 #, php-format -msgid "OpenID authentication failed: %s" +msgid "" +"Why not [register an account](%%action.register%%) and be the first to add a " +"notice to your favorites!" msgstr "" -#: ../lib/openid.php:133 lib/openid.php:133 lib/openid.php:142 -#: lib/openid.php:145 +#: actions/favoritesrss.php:111 actions/showfavorites.php:77 +#: lib/personalgroupnav.php:115 #, php-format -msgid "OpenID failure: %s" -msgstr "" - -#: ../actions/openidsettings.php:144 actions/openidsettings.php:153 -#: actions/openidsettings.php:231 -msgid "OpenID removed." -msgstr "" - -#: ../actions/openidsettings.php:37 actions/openidsettings.php:37 -#: actions/openidsettings.php:59 -msgid "OpenID settings" -msgstr "" - -#: ../actions/invite.php:135 actions/invite.php:143 actions/invite.php:180 -#: actions/invite.php:186 actions/invite.php:188 actions/invite.php:194 -msgid "Optionally add a personal message to the invitation." -msgstr "" - -#: ../actions/avatar.php:84 actions/profilesettings.php:321 -#: lib/imagefile.php:75 lib/imagefile.php:79 lib/imagefile.php:80 -msgid "Partial upload." -msgstr "" - -#: ../actions/finishopenidlogin.php:90 ../actions/login.php:102 -#: ../actions/register.php:153 ../lib/settingsaction.php:93 -#: actions/finishopenidlogin.php:96 actions/login.php:102 -#: actions/register.php:167 actions/finishopenidlogin.php:118 -#: actions/login.php:231 actions/register.php:372 -#: lib/accountsettingsaction.php:110 lib/facebookaction.php:311 -#: actions/login.php:214 lib/facebookaction.php:315 -#: actions/finishopenidlogin.php:117 actions/register.php:418 -#: lib/facebookaction.php:317 actions/login.php:222 actions/register.php:422 -#: lib/accountsettingsaction.php:114 actions/login.php:249 -#: actions/register.php:428 -msgid "Password" -msgstr "" - -#: ../actions/recoverpassword.php:288 actions/recoverpassword.php:301 -#: actions/recoverpassword.php:335 actions/recoverpassword.php:353 -#: actions/recoverpassword.php:356 -msgid "Password and confirmation do not match." -msgstr "" - -#: ../actions/recoverpassword.php:284 actions/recoverpassword.php:297 -#: actions/recoverpassword.php:331 actions/recoverpassword.php:349 -#: actions/recoverpassword.php:352 -msgid "Password must be 6 chars or more." -msgstr "" - -#: ../actions/recoverpassword.php:261 ../actions/recoverpassword.php:263 -#: actions/recoverpassword.php:267 actions/recoverpassword.php:269 -#: actions/recoverpassword.php:199 actions/recoverpassword.php:301 -#: actions/recoverpassword.php:207 actions/recoverpassword.php:319 -#: actions/recoverpassword.php:210 actions/recoverpassword.php:322 -msgid "Password recovery requested" +msgid "%s's favorite notices" msgstr "" -#: ../actions/password.php:89 ../actions/recoverpassword.php:313 -#: actions/profilesettings.php:408 actions/recoverpassword.php:326 -#: actions/passwordsettings.php:173 actions/recoverpassword.php:200 -#: actions/passwordsettings.php:178 actions/recoverpassword.php:208 -#: actions/passwordsettings.php:184 actions/recoverpassword.php:211 -#: actions/passwordsettings.php:191 -msgid "Password saved." +#: actions/favoritesrss.php:115 +#, php-format +msgid "Updates favored by %1$s on %2$s!" msgstr "" -#: ../actions/password.php:61 ../actions/register.php:88 -#: actions/profilesettings.php:380 actions/register.php:98 -#: actions/passwordsettings.php:145 actions/register.php:183 -#: actions/passwordsettings.php:150 actions/register.php:220 -#: actions/passwordsettings.php:156 actions/register.php:227 -#: actions/register.php:233 -msgid "Passwords don't match." +#: actions/favor.php:79 +msgid "This notice is already a favorite!" msgstr "" -#: ../lib/searchaction.php:100 lib/searchaction.php:100 -#: lib/searchgroupnav.php:80 -msgid "People" +#: actions/favor.php:92 lib/disfavorform.php:140 +msgid "Disfavor favorite" msgstr "" -#: ../actions/opensearch.php:33 actions/opensearch.php:33 -#: actions/opensearch.php:64 -msgid "People Search" +#: actions/featured.php:69 lib/featureduserssection.php:87 +#: lib/publicgroupnav.php:89 +msgid "Featured users" msgstr "" -#: ../actions/peoplesearch.php:33 actions/peoplesearch.php:33 -#: actions/peoplesearch.php:58 -msgid "People search" +#: actions/featured.php:71 +#, php-format +msgid "Featured users, page %d" msgstr "" -#: ../lib/stream.php:50 lib/personal.php:50 lib/personalgroupnav.php:98 -#: lib/personalgroupnav.php:99 -msgid "Personal" +#: actions/featured.php:99 +#, php-format +msgid "A selection of some of the great users on %s" msgstr "" -#: ../actions/invite.php:133 actions/invite.php:141 actions/invite.php:178 -#: actions/invite.php:184 actions/invite.php:186 actions/invite.php:192 -msgid "Personal message" +#: actions/file.php:34 +msgid "No notice id" msgstr "" -#: ../actions/smssettings.php:69 actions/smssettings.php:69 -#: actions/smssettings.php:128 actions/smssettings.php:140 -msgid "Phone number, no punctuation or spaces, with area code" +#: actions/file.php:38 +msgid "No notice" msgstr "" -#: ../actions/userauthorization.php:78 -msgid "" -"Please check these details to make sure that you want to subscribe to this " -"user's notices. If you didn't just ask to subscribe to someone's notices, " -"click \"Cancel\"." +#: actions/file.php:42 +msgid "No attachments" msgstr "" -#: ../actions/imsettings.php:73 actions/imsettings.php:74 -#: actions/imsettings.php:142 actions/imsettings.php:148 -msgid "Post a notice when my Jabber/GTalk status changes." +#: actions/file.php:51 +msgid "No uploaded attachments" msgstr "" -#: ../actions/emailsettings.php:85 ../actions/imsettings.php:67 -#: ../actions/smssettings.php:94 actions/emailsettings.php:86 -#: actions/imsettings.php:68 actions/smssettings.php:94 -#: actions/twittersettings.php:70 actions/emailsettings.php:147 -#: actions/imsettings.php:133 actions/smssettings.php:157 -#: actions/twittersettings.php:134 actions/twittersettings.php:137 -#: actions/emailsettings.php:153 actions/imsettings.php:139 -#: actions/smssettings.php:169 -msgid "Preferences" +#: actions/finishremotesubscribe.php:69 +msgid "Not expecting this response!" msgstr "" -#: ../actions/emailsettings.php:162 ../actions/imsettings.php:144 -#: ../actions/smssettings.php:163 actions/emailsettings.php:180 -#: actions/imsettings.php:152 actions/smssettings.php:171 -#: actions/emailsettings.php:286 actions/imsettings.php:258 -#: actions/othersettings.php:168 actions/smssettings.php:272 -#: actions/emailsettings.php:293 actions/othersettings.php:173 -#: actions/emailsettings.php:301 actions/imsettings.php:264 -#: actions/othersettings.php:180 actions/smssettings.php:284 -msgid "Preferences saved." +#: actions/finishremotesubscribe.php:80 +msgid "User being listened to does not exist." msgstr "" -#: ../actions/profilesettings.php:57 actions/profilesettings.php:90 -#: actions/profilesettings.php:129 actions/profilesettings.php:130 -#: actions/profilesettings.php:145 -msgid "Preferred language" +#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59 +msgid "You can use the local subscription!" msgstr "" -#: ../lib/util.php:328 lib/util.php:344 lib/action.php:572 lib/action.php:665 -#: lib/action.php:715 lib/action.php:730 -msgid "Privacy" +#: actions/finishremotesubscribe.php:96 +msgid "That user has blocked you from subscribing." msgstr "" -#: ../classes/Notice.php:95 ../classes/Notice.php:106 classes/Notice.php:109 -#: classes/Notice.php:119 classes/Notice.php:145 classes/Notice.php:155 -#: classes/Notice.php:178 classes/Notice.php:188 classes/Notice.php:206 -#: classes/Notice.php:216 classes/Notice.php:232 classes/Notice.php:268 -#: classes/Notice.php:293 -msgid "Problem saving notice." +#: actions/finishremotesubscribe.php:106 +msgid "You are not authorized." msgstr "" -#: ../lib/settingsaction.php:84 ../lib/stream.php:60 lib/personal.php:60 -#: lib/settingsaction.php:84 lib/accountsettingsaction.php:104 -#: lib/personalgroupnav.php:108 lib/personalgroupnav.php:109 -#: lib/accountsettingsaction.php:108 -msgid "Profile" +#: actions/finishremotesubscribe.php:109 +msgid "Could not convert request token to access token." msgstr "" -#: ../actions/remotesubscribe.php:73 actions/remotesubscribe.php:82 -#: actions/remotesubscribe.php:109 actions/remotesubscribe.php:133 -msgid "Profile URL" +#: actions/finishremotesubscribe.php:114 +msgid "Remote service uses unknown version of OMB protocol." msgstr "" -#: ../actions/profilesettings.php:34 actions/profilesettings.php:32 -#: actions/profilesettings.php:58 actions/profilesettings.php:60 -msgid "Profile settings" +#: actions/finishremotesubscribe.php:133 lib/oauthstore.php:306 +msgid "Error updating remote profile" msgstr "" -#: ../actions/postnotice.php:51 ../actions/updateprofile.php:52 -#: actions/postnotice.php:52 actions/updateprofile.php:53 -#: actions/postnotice.php:55 actions/updateprofile.php:56 -#: actions/updateprofile.php:58 -msgid "Profile unknown" +#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86 +#: actions/groupunblock.php:86 actions/leavegroup.php:83 +#: actions/makeadmin.php:86 lib/command.php:212 lib/command.php:263 +msgid "No such group." msgstr "" -#: ../actions/public.php:54 actions/public.php:54 actions/public.php:124 -msgid "Public Stream Feed" +#: actions/getfile.php:75 +msgid "No such file." msgstr "" -#: ../actions/public.php:33 actions/public.php:33 actions/public.php:109 -#: lib/publicgroupnav.php:77 actions/public.php:112 lib/publicgroupnav.php:79 -#: actions/public.php:120 actions/public.php:131 -msgid "Public timeline" +#: actions/getfile.php:79 +msgid "Cannot read file." msgstr "" -#: ../actions/imsettings.php:79 actions/imsettings.php:80 -#: actions/imsettings.php:153 actions/imsettings.php:159 -msgid "Publish a MicroID for my Jabber/GTalk address." +#: actions/groupblock.php:81 actions/groupunblock.php:81 +#: actions/makeadmin.php:81 +msgid "No group specified." msgstr "" -#: ../actions/emailsettings.php:94 actions/emailsettings.php:101 -#: actions/emailsettings.php:178 actions/emailsettings.php:183 -#: actions/emailsettings.php:191 -msgid "Publish a MicroID for my email address." +#: actions/groupblock.php:91 +msgid "Only an admin can block group members." msgstr "" -#: ../actions/tag.php:75 ../actions/tag.php:76 actions/tag.php:75 -#: actions/tag.php:76 -msgid "Recent Tags" +#: actions/groupblock.php:95 +msgid "User is already blocked from group." msgstr "" -#: ../actions/recoverpassword.php:166 actions/recoverpassword.php:171 -#: actions/recoverpassword.php:190 actions/recoverpassword.php:197 -#: actions/recoverpassword.php:199 actions/recoverpassword.php:200 -msgid "Recover" +#: actions/groupblock.php:100 +msgid "User is not a member of group." msgstr "" -#: ../actions/recoverpassword.php:156 actions/recoverpassword.php:161 -#: actions/recoverpassword.php:198 actions/recoverpassword.php:206 -#: actions/recoverpassword.php:209 -msgid "Recover password" +#: actions/groupblock.php:136 actions/groupmembers.php:314 +msgid "Block user from group" msgstr "" -#: ../actions/recoverpassword.php:67 actions/recoverpassword.php:67 -#: actions/recoverpassword.php:73 -msgid "Recovery code for unknown user." +#: actions/groupblock.php:155 +#, php-format +msgid "" +"Are you sure you want to block user \"%s\" from the group \"%s\"? They will " +"be removed from the group, unable to post, and unable to subscribe to the " +"group in the future." msgstr "" -#: ../actions/register.php:142 ../actions/register.php:193 ../lib/util.php:312 -#: actions/register.php:152 actions/register.php:207 lib/util.php:328 -#: actions/register.php:69 actions/register.php:436 lib/action.php:338 -#: lib/facebookaction.php:277 lib/logingroupnav.php:78 -#: actions/register.php:438 lib/action.php:415 lib/facebookaction.php:279 -#: actions/register.php:108 actions/register.php:486 lib/action.php:440 -#: lib/facebookaction.php:281 actions/register.php:496 lib/action.php:450 -#: lib/logingroupnav.php:85 actions/register.php:114 actions/register.php:502 -msgid "Register" +#: actions/groupblock.php:193 +msgid "Database error blocking user from group." msgstr "" -#: ../actions/register.php:28 actions/register.php:28 -#: actions/finishopenidlogin.php:196 actions/register.php:90 -#: actions/finishopenidlogin.php:195 actions/finishopenidlogin.php:204 -#: actions/register.php:129 actions/register.php:135 -msgid "Registration not allowed." +#: actions/groupbyid.php:74 +msgid "No ID" msgstr "" -#: ../actions/register.php:200 actions/register.php:214 -#: actions/register.php:67 actions/register.php:106 actions/register.php:112 -msgid "Registration successful" +#: actions/groupdesignsettings.php:68 +msgid "You must be logged in to edit a group." msgstr "" -#: ../actions/userauthorization.php:120 actions/userauthorization.php:127 -#: actions/userauthorization.php:144 actions/userauthorization.php:179 -#: actions/userauthorization.php:211 -msgid "Reject" +#: actions/groupdesignsettings.php:141 +msgid "Group design" msgstr "" -#: ../actions/login.php:103 ../actions/register.php:176 actions/login.php:103 -#: actions/register.php:190 actions/login.php:234 actions/openidlogin.php:107 -#: actions/register.php:414 actions/login.php:217 actions/openidlogin.php:116 -#: actions/register.php:461 actions/login.php:225 actions/register.php:471 -#: actions/login.php:252 actions/register.php:477 -msgid "Remember me" +#: actions/groupdesignsettings.php:152 +msgid "" +"Customize the way your group looks with a background image and a colour " +"palette of your choice." msgstr "" -#: ../actions/updateprofile.php:70 actions/updateprofile.php:71 -#: actions/updateprofile.php:74 actions/updateprofile.php:76 -msgid "Remote profile with no matching profile" +#: actions/groupdesignsettings.php:262 actions/userdesignsettings.php:186 +#: lib/designsettings.php:434 lib/designsettings.php:464 +msgid "Couldn't update your design." msgstr "" -#: ../actions/remotesubscribe.php:65 actions/remotesubscribe.php:73 -#: actions/remotesubscribe.php:88 actions/remotesubscribe.php:112 -msgid "Remote subscribe" +#: actions/groupdesignsettings.php:286 actions/groupdesignsettings.php:296 +#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220 +#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273 +msgid "Unable to save your design settings!" msgstr "" -#: ../actions/emailsettings.php:47 ../actions/emailsettings.php:75 -#: ../actions/imsettings.php:48 ../actions/openidsettings.php:106 -#: ../actions/smssettings.php:50 ../actions/smssettings.php:84 -#: actions/emailsettings.php:48 actions/emailsettings.php:76 -#: actions/imsettings.php:49 actions/openidsettings.php:108 -#: actions/smssettings.php:50 actions/smssettings.php:84 -#: actions/twittersettings.php:59 actions/emailsettings.php:101 -#: actions/emailsettings.php:134 actions/imsettings.php:102 -#: actions/openidsettings.php:166 actions/smssettings.php:103 -#: actions/smssettings.php:146 actions/twittersettings.php:115 -#: actions/twittersettings.php:118 actions/emailsettings.php:107 -#: actions/emailsettings.php:140 actions/imsettings.php:108 -#: actions/smssettings.php:115 actions/smssettings.php:158 -msgid "Remove" +#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:231 +msgid "Design preferences saved." msgstr "" -#: ../actions/openidsettings.php:68 actions/openidsettings.php:69 -#: actions/openidsettings.php:123 -msgid "Remove OpenID" +#: actions/grouplogo.php:139 actions/grouplogo.php:192 +msgid "Group logo" msgstr "" -#: ../actions/openidsettings.php:73 actions/openidsettings.php:128 +#: actions/grouplogo.php:150 +#, php-format msgid "" -"Removing your only OpenID would make it impossible to log in! If you need to " -"remove it, add another OpenID first." -msgstr "" - -#: ../lib/stream.php:55 lib/personal.php:55 lib/personalgroupnav.php:103 -#: lib/personalgroupnav.php:104 -msgid "Replies" +"You can upload a logo image for your group. The maximum file size is %s." msgstr "" -#: ../actions/replies.php:47 ../actions/repliesrss.php:76 ../lib/stream.php:56 -#: actions/replies.php:47 actions/repliesrss.php:62 lib/personal.php:56 -#: actions/replies.php:116 actions/repliesrss.php:67 -#: lib/personalgroupnav.php:104 actions/replies.php:118 -#: actions/replies.php:117 lib/personalgroupnav.php:105 -#: actions/replies.php:125 actions/repliesrss.php:68 -#, php-format -msgid "Replies to %s" +#: actions/grouplogo.php:362 +msgid "Pick a square area of the image to be the logo." msgstr "" -#: ../actions/recoverpassword.php:183 actions/recoverpassword.php:189 -#: actions/recoverpassword.php:223 actions/recoverpassword.php:240 -#: actions/recoverpassword.php:243 -msgid "Reset" +#: actions/grouplogo.php:396 +msgid "Logo updated." msgstr "" -#: ../actions/recoverpassword.php:173 actions/recoverpassword.php:178 -#: actions/recoverpassword.php:197 actions/recoverpassword.php:205 -#: actions/recoverpassword.php:208 -msgid "Reset password" +#: actions/grouplogo.php:398 +msgid "Failed updating logo." msgstr "" -#: ../lib/settingsaction.php:99 lib/settingsaction.php:93 -#: actions/subscriptions.php:123 lib/connectsettingsaction.php:107 -#: actions/subscriptions.php:125 actions/subscriptions.php:184 -#: actions/subscriptions.php:199 lib/connectsettingsaction.php:115 -msgid "SMS" +#: actions/groupmembers.php:93 lib/groupnav.php:91 +#, php-format +msgid "%s group members" msgstr "" -#: ../actions/smssettings.php:67 actions/smssettings.php:67 -#: actions/smssettings.php:126 actions/smssettings.php:138 -msgid "SMS Phone number" +#: actions/groupmembers.php:96 +#, php-format +msgid "%s group members, page %d" msgstr "" -#: ../actions/smssettings.php:33 actions/smssettings.php:33 -#: actions/smssettings.php:58 -msgid "SMS Settings" +#: actions/groupmembers.php:111 +msgid "A list of the users in this group." msgstr "" -#: ../lib/mail.php:219 lib/mail.php:225 lib/mail.php:437 lib/mail.php:438 -msgid "SMS confirmation" +#: actions/groupmembers.php:175 lib/groupnav.php:106 +msgid "Admin" msgstr "" -#: ../actions/recoverpassword.php:182 actions/recoverpassword.php:188 -#: actions/recoverpassword.php:222 actions/recoverpassword.php:237 -#: actions/recoverpassword.php:240 -msgid "Same as password above" +#: actions/groupmembers.php:346 lib/blockform.php:153 +msgid "Block" msgstr "" -#: ../actions/register.php:156 actions/register.php:170 -#: actions/register.php:377 actions/register.php:423 actions/register.php:427 -#: actions/register.php:433 -msgid "Same as password above. Required." +#: actions/groupmembers.php:346 lib/blockform.php:123 lib/blockform.php:153 +msgid "Block this user" msgstr "" -#: ../actions/emailsettings.php:97 ../actions/imsettings.php:81 -#: ../actions/profilesettings.php:67 ../actions/smssettings.php:100 -#: actions/emailsettings.php:104 actions/imsettings.php:82 -#: actions/profilesettings.php:101 actions/smssettings.php:100 -#: actions/twittersettings.php:83 actions/emailsettings.php:182 -#: actions/facebooksettings.php:114 actions/imsettings.php:157 -#: actions/othersettings.php:117 actions/profilesettings.php:150 -#: actions/smssettings.php:169 actions/subscriptions.php:124 -#: actions/tagother.php:152 actions/twittersettings.php:161 -#: lib/groupeditform.php:171 actions/emailsettings.php:187 -#: actions/subscriptions.php:126 actions/tagother.php:154 -#: actions/twittersettings.php:164 actions/othersettings.php:119 -#: actions/profilesettings.php:152 actions/subscriptions.php:185 -#: actions/twittersettings.php:180 lib/designsettings.php:256 -#: lib/groupeditform.php:196 actions/emailsettings.php:195 -#: actions/imsettings.php:163 actions/othersettings.php:126 -#: actions/profilesettings.php:167 actions/smssettings.php:181 -#: actions/subscriptions.php:203 lib/groupeditform.php:202 -msgid "Save" +#: actions/groupmembers.php:441 +msgid "Make user an admin of the group" msgstr "" -#: ../lib/searchaction.php:84 ../lib/util.php:300 lib/searchaction.php:84 -#: lib/util.php:316 lib/action.php:325 lib/action.php:396 lib/action.php:448 -#: lib/action.php:459 -msgid "Search" +#: actions/groupmembers.php:473 +msgid "Make Admin" msgstr "" -#: ../actions/noticesearch.php:80 actions/noticesearch.php:85 -#: actions/noticesearch.php:127 -msgid "Search Stream Feed" +#: actions/groupmembers.php:473 +msgid "Make this user an admin" msgstr "" -#: ../actions/noticesearch.php:30 actions/noticesearch.php:30 -#: actions/noticesearch.php:57 actions/noticesearch.php:68 +#: actions/grouprss.php:133 #, php-format -msgid "" -"Search for notices on %%site.name%% by their contents. Separate search terms " -"by spaces; they must be 3 characters or more." +msgid "Updates from members of %1$s on %2$s!" msgstr "" -#: ../actions/peoplesearch.php:28 actions/peoplesearch.php:52 +#: actions/groupsearch.php:52 #, php-format msgid "" -"Search for people on %%site.name%% by their name, location, or interests. " +"Search for groups on %%site.name%% by their name, location, or description. " "Separate the terms by spaces; they must be 3 characters or more." msgstr "" -#: ../actions/smssettings.php:296 actions/smssettings.php:304 -#: actions/smssettings.php:457 actions/smssettings.php:469 -msgid "Select a carrier" -msgstr "" - -#: ../actions/invite.php:137 ../lib/util.php:1172 actions/invite.php:145 -#: lib/util.php:1306 lib/util.php:1731 actions/invite.php:182 -#: lib/messageform.php:167 lib/noticeform.php:177 actions/invite.php:189 -#: lib/messageform.php:165 actions/invite.php:191 lib/messageform.php:157 -#: lib/noticeform.php:179 actions/invite.php:197 lib/messageform.php:181 -#: lib/noticeform.php:208 -msgid "Send" -msgstr "" - -#: ../actions/emailsettings.php:73 ../actions/smssettings.php:82 -#: actions/emailsettings.php:74 actions/smssettings.php:82 -#: actions/emailsettings.php:132 actions/smssettings.php:145 -#: actions/emailsettings.php:138 actions/smssettings.php:157 -msgid "Send email to this address to post new notices." -msgstr "" - -#: ../actions/emailsettings.php:88 actions/emailsettings.php:89 -#: actions/emailsettings.php:152 actions/emailsettings.php:158 -msgid "Send me notices of new subscriptions through email." +#: actions/groupsearch.php:58 +msgid "Group search" msgstr "" -#: ../actions/imsettings.php:70 actions/imsettings.php:71 -#: actions/imsettings.php:137 actions/imsettings.php:143 -msgid "Send me notices through Jabber/GTalk." +#: actions/groupsearch.php:79 actions/noticesearch.php:117 +#: actions/peoplesearch.php:83 +msgid "No results." msgstr "" -#: ../actions/smssettings.php:97 actions/smssettings.php:97 -#: actions/smssettings.php:162 actions/smssettings.php:174 +#: actions/groupsearch.php:82 +#, php-format msgid "" -"Send me notices through SMS; I understand I may incur exorbitant charges " -"from my carrier." -msgstr "" - -#: ../actions/imsettings.php:76 actions/imsettings.php:77 -#: actions/imsettings.php:147 actions/imsettings.php:153 -msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to." -msgstr "" - -#: ../lib/util.php:304 lib/util.php:320 lib/facebookaction.php:215 -#: lib/facebookaction.php:228 lib/facebookaction.php:230 -msgid "Settings" +"If you can't find the group you're looking for, you can [create it](%%action." +"newgroup%%) yourself." msgstr "" -#: ../actions/profilesettings.php:192 actions/profilesettings.php:307 -#: actions/profilesettings.php:319 actions/profilesettings.php:318 -#: actions/profilesettings.php:344 -msgid "Settings saved." +#: actions/groupsearch.php:85 +#, php-format +msgid "" +"Why not [register an account](%%action.register%%) and [create the group](%%" +"action.newgroup%%) yourself!" msgstr "" -#: ../actions/tag.php:60 actions/tag.php:60 -msgid "Showing most popular tags from the last week" +#: actions/groups.php:62 lib/profileaction.php:220 lib/publicgroupnav.php:81 +#: lib/subgroupnav.php:98 +msgid "Groups" msgstr "" -#: ../actions/finishaddopenid.php:66 actions/finishaddopenid.php:66 -#: actions/finishaddopenid.php:114 -msgid "Someone else already has this OpenID." +#: actions/groups.php:64 +#, php-format +msgid "Groups, page %d" msgstr "" -#: ../actions/finishopenidlogin.php:42 ../actions/openidsettings.php:126 -#: actions/finishopenidlogin.php:47 actions/openidsettings.php:135 -#: actions/finishopenidlogin.php:52 actions/openidsettings.php:202 -msgid "Something weird happened." +#: actions/groups.php:90 +#, php-format +msgid "" +"%%%%site.name%%%% groups let you find and talk with users 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%%%%)!" msgstr "" -#: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58 -#: scripts/maildaemon.php:61 scripts/maildaemon.php:60 -msgid "Sorry, no incoming email allowed." +#: actions/groups.php:108 actions/usergroups.php:124 lib/groupeditform.php:122 +msgid "Create a new group" msgstr "" -#: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54 -#: scripts/maildaemon.php:57 scripts/maildaemon.php:56 -msgid "Sorry, that is not your incoming email address." +#: actions/groupunblock.php:91 +msgid "Only an admin can unblock group members." msgstr "" -#: ../lib/util.php:330 lib/util.php:346 lib/action.php:574 lib/action.php:667 -#: lib/action.php:717 lib/action.php:732 -msgid "Source" +#: actions/groupunblock.php:95 +msgid "User is not blocked from group." msgstr "" -#: ../actions/showstream.php:296 actions/showstream.php:311 -#: actions/showstream.php:476 actions/showgroup.php:375 -#: actions/showgroup.php:421 lib/profileaction.php:173 -#: actions/showgroup.php:429 -msgid "Statistics" +#: actions/groupunblock.php:128 actions/unblock.php:108 +msgid "Error removing the block." msgstr "" -#: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:246 -#: actions/finishopenidlogin.php:188 actions/finishopenidlogin.php:252 -#: actions/finishopenidlogin.php:222 actions/finishopenidlogin.php:290 -#: actions/finishopenidlogin.php:295 actions/finishopenidlogin.php:238 -#: actions/finishopenidlogin.php:318 -msgid "Stored OpenID not found." +#: actions/imsettings.php:59 +msgid "IM Settings" msgstr "" -#: ../actions/remotesubscribe.php:75 ../actions/showstream.php:188 -#: ../actions/showstream.php:197 actions/remotesubscribe.php:84 -#: actions/showstream.php:197 actions/showstream.php:206 -#: actions/remotesubscribe.php:113 actions/showstream.php:376 -#: lib/subscribeform.php:139 actions/showstream.php:345 -#: actions/remotesubscribe.php:137 actions/showstream.php:439 -#: lib/userprofile.php:321 -msgid "Subscribe" +#: actions/imsettings.php:70 +#, php-format +msgid "" +"You can send and receive notices through Jabber/GTalk [instant messages](%%" +"doc.im%%). Configure your instant messages address and settings below." msgstr "" -#: ../actions/showstream.php:313 ../actions/subscribers.php:27 -#: actions/showstream.php:328 actions/subscribers.php:27 -#: actions/showstream.php:436 actions/showstream.php:498 -#: lib/subgroupnav.php:88 lib/profileaction.php:140 lib/profileaction.php:200 -#: lib/subgroupnav.php:90 -msgid "Subscribers" +#: actions/imsettings.php:89 +msgid "IM is not available." msgstr "" -#: ../actions/userauthorization.php:310 actions/userauthorization.php:322 -#: actions/userauthorization.php:338 actions/userauthorization.php:344 -#: actions/userauthorization.php:378 actions/userauthorization.php:247 -msgid "Subscription authorized" +#: actions/imsettings.php:100 +msgid "IM address" msgstr "" -#: ../actions/userauthorization.php:320 actions/userauthorization.php:332 -#: actions/userauthorization.php:349 actions/userauthorization.php:355 -#: actions/userauthorization.php:389 actions/userauthorization.php:259 -msgid "Subscription rejected" +#: actions/imsettings.php:106 +msgid "Current confirmed Jabber/GTalk address." msgstr "" -#: ../actions/showstream.php:230 ../actions/showstream.php:307 -#: ../actions/subscriptions.php:27 actions/showstream.php:240 -#: actions/showstream.php:322 actions/subscriptions.php:27 -#: actions/showstream.php:407 actions/showstream.php:489 -#: lib/subgroupnav.php:80 lib/profileaction.php:109 lib/profileaction.php:191 -#: lib/subgroupnav.php:82 -msgid "Subscriptions" +#: 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?)" msgstr "" -#: ../actions/avatar.php:87 actions/profilesettings.php:324 -#: lib/imagefile.php:78 lib/imagefile.php:82 lib/imagefile.php:83 -#: lib/imagefile.php:88 lib/mediafile.php:170 -msgid "System error uploading file." +#: actions/imsettings.php:124 +msgid "IM Address" msgstr "" -#: ../actions/tag.php:41 ../lib/util.php:301 actions/tag.php:41 -#: lib/util.php:317 actions/profilesettings.php:122 actions/showstream.php:297 -#: actions/tagother.php:147 actions/tagother.php:207 lib/profilelist.php:162 -#: lib/profilelist.php:164 actions/showstream.php:290 actions/tagother.php:149 -#: actions/tagother.php:209 lib/profilelist.php:160 -#: actions/profilesettings.php:123 actions/showstream.php:255 -#: lib/subscriptionlist.php:106 lib/subscriptionlist.php:108 -#: actions/profilesettings.php:138 actions/showstream.php:327 -#: lib/userprofile.php:209 -msgid "Tags" +#: actions/imsettings.php:126 +#, php-format +msgid "" +"Jabber or GTalk address, like \"UserName@example.org\". First, make sure to " +"add %s to your buddy list in your IM client or on GTalk." msgstr "" -#: ../lib/searchaction.php:104 lib/searchaction.php:104 -#: lib/designsettings.php:217 -msgid "Text" +#: actions/imsettings.php:143 +msgid "Send me notices through Jabber/GTalk." msgstr "" -#: ../actions/noticesearch.php:34 actions/noticesearch.php:34 -#: actions/noticesearch.php:67 actions/noticesearch.php:78 -msgid "Text search" +#: actions/imsettings.php:148 +msgid "Post a notice when my Jabber/GTalk status changes." msgstr "" -#: ../actions/openidsettings.php:140 actions/openidsettings.php:149 -#: actions/openidsettings.php:227 -msgid "That OpenID does not belong to you." +#: actions/imsettings.php:153 +msgid "Send me replies through Jabber/GTalk from users I am not subscribed to." msgstr "" -#: ../actions/confirmaddress.php:52 actions/confirmaddress.php:52 -#: actions/confirmaddress.php:94 -msgid "That address has already been confirmed." +#: actions/imsettings.php:159 +msgid "Publish a MicroID for my Jabber/GTalk address." msgstr "" -#: ../actions/confirmaddress.php:43 actions/confirmaddress.php:43 -#: actions/confirmaddress.php:85 -msgid "That confirmation code is not for you!" +#: actions/imsettings.php:285 +msgid "No Jabber ID." msgstr "" -#: ../actions/emailsettings.php:191 actions/emailsettings.php:209 -#: actions/emailsettings.php:328 actions/emailsettings.php:336 -msgid "That email address already belongs to another user." +#: actions/imsettings.php:292 +msgid "Cannot normalize that Jabber ID" msgstr "" -#: ../actions/avatar.php:80 actions/profilesettings.php:317 -#: lib/imagefile.php:71 -msgid "That file is too big." +#: actions/imsettings.php:296 +msgid "Not a valid Jabber ID" msgstr "" -#: ../actions/imsettings.php:170 actions/imsettings.php:178 -#: actions/imsettings.php:293 actions/imsettings.php:299 +#: actions/imsettings.php:299 msgid "That is already your Jabber ID." msgstr "" -#: ../actions/emailsettings.php:188 actions/emailsettings.php:206 -#: actions/emailsettings.php:318 actions/emailsettings.php:325 -#: actions/emailsettings.php:333 -msgid "That is already your email address." -msgstr "" - -#: ../actions/smssettings.php:188 actions/smssettings.php:196 -#: actions/smssettings.php:306 actions/smssettings.php:318 -msgid "That is already your phone number." -msgstr "" - -#: ../actions/imsettings.php:233 actions/imsettings.php:241 -#: actions/imsettings.php:381 actions/imsettings.php:387 -msgid "That is not your Jabber ID." -msgstr "" - -#: ../actions/emailsettings.php:249 actions/emailsettings.php:267 -#: actions/emailsettings.php:397 actions/emailsettings.php:404 -#: actions/emailsettings.php:412 -msgid "That is not your email address." -msgstr "" - -#: ../actions/smssettings.php:257 actions/smssettings.php:265 -#: actions/smssettings.php:393 actions/smssettings.php:405 -msgid "That is not your phone number." -msgstr "" - -#: ../actions/emailsettings.php:226 ../actions/imsettings.php:210 -#: actions/emailsettings.php:244 actions/imsettings.php:218 -#: actions/emailsettings.php:367 actions/imsettings.php:349 -#: actions/emailsettings.php:374 actions/emailsettings.php:382 -#: actions/imsettings.php:355 -msgid "That is the wrong IM address." -msgstr "" - -#: ../actions/smssettings.php:233 actions/smssettings.php:241 -#: actions/smssettings.php:362 actions/smssettings.php:374 -msgid "That is the wrong confirmation number." -msgstr "" - -#: ../actions/smssettings.php:191 actions/smssettings.php:199 -#: actions/smssettings.php:309 actions/smssettings.php:321 -msgid "That phone number already belongs to another user." -msgstr "" - -#: ../actions/newnotice.php:49 ../actions/twitapistatuses.php:408 -#: actions/newnotice.php:49 actions/twitapistatuses.php:330 -#: actions/facebookhome.php:243 actions/twitapistatuses.php:276 -#: actions/newnotice.php:136 actions/twitapistatuses.php:294 -#: lib/facebookaction.php:485 actions/newnotice.php:166 -#: actions/twitapistatuses.php:251 lib/facebookaction.php:477 -#: scripts/maildaemon.php:70 -msgid "That's too long. Max notice size is 140 chars." -msgstr "" - -#: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72 -#: actions/twitapiaccount.php:62 actions/twitapiaccount.php:63 -#: actions/twitapiaccount.php:66 -msgid "That's too long. Max notice size is 255 chars." +#: actions/imsettings.php:302 +msgid "Jabber ID already belongs to another user." msgstr "" -#: ../actions/confirmaddress.php:92 actions/confirmaddress.php:92 -#: actions/confirmaddress.php:159 +#: actions/imsettings.php:327 #, php-format -msgid "The address \"%s\" has been confirmed for your account." -msgstr "" - -#: ../actions/emailsettings.php:264 ../actions/imsettings.php:250 -#: ../actions/smssettings.php:274 actions/emailsettings.php:282 -#: actions/imsettings.php:258 actions/smssettings.php:282 -#: actions/emailsettings.php:416 actions/imsettings.php:402 -#: actions/smssettings.php:413 actions/emailsettings.php:423 -#: actions/emailsettings.php:431 actions/imsettings.php:408 -#: actions/smssettings.php:425 -msgid "The address was removed." -msgstr "" - -#: ../actions/userauthorization.php:312 actions/userauthorization.php:346 -#: actions/userauthorization.php:380 -msgid "" -"The subscription has been authorized, but no callback URL was passed. Check " -"with the site's instructions for details on how to authorize the " -"subscription. Your subscription token is:" -msgstr "" - -#: ../actions/userauthorization.php:322 actions/userauthorization.php:357 -#: actions/userauthorization.php:391 msgid "" -"The subscription has been rejected, but no callback URL was passed. Check " -"with the site's instructions for details on how to fully reject the " -"subscription." -msgstr "" - -#: ../actions/subscribers.php:35 actions/subscribers.php:35 -#: actions/subscribers.php:67 -#, php-format -msgid "These are the people who listen to %s's notices." +"A confirmation code was sent to the IM address you added. You must approve %" +"s for sending messages to you." msgstr "" -#: ../actions/subscribers.php:33 actions/subscribers.php:33 -#: actions/subscribers.php:63 -msgid "These are the people who listen to your notices." +#: actions/imsettings.php:387 +msgid "That is not your Jabber ID." msgstr "" -#: ../actions/subscriptions.php:35 actions/subscriptions.php:35 -#: actions/subscriptions.php:69 +#: actions/inbox.php:59 #, php-format -msgid "These are the people whose notices %s listens to." -msgstr "" - -#: ../actions/subscriptions.php:33 actions/subscriptions.php:33 -#: actions/subscriptions.php:65 -msgid "These are the people whose notices you listen to." -msgstr "" - -#: ../actions/invite.php:89 actions/invite.php:96 actions/invite.php:128 -#: actions/invite.php:130 actions/invite.php:136 -msgid "" -"These people are already users and you were automatically subscribed to them:" -msgstr "" - -#: ../actions/recoverpassword.php:88 actions/recoverpassword.php:97 -msgid "This confirmation code is too old. Please start again." -msgstr "" - -#: ../lib/openid.php:195 lib/openid.php:206 -msgid "" -"This form should automatically submit itself. If not, click the submit " -"button to go to your OpenID provider." +msgid "Inbox for %s - page %d" msgstr "" -#: ../actions/finishopenidlogin.php:56 actions/finishopenidlogin.php:61 -#: actions/finishopenidlogin.php:67 actions/finishopenidlogin.php:66 +#: actions/inbox.php:62 #, php-format -msgid "" -"This is the first time you've logged into %s so we must connect your OpenID " -"to a local account. You can either create a new account, or connect with " -"your existing account, if you have one." -msgstr "" - -#: ../actions/twitapifriendships.php:108 ../actions/twitapistatuses.php:586 -#: actions/twitapifavorites.php:127 actions/twitapifriendships.php:108 -#: actions/twitapistatuses.php:511 actions/twitapifavorites.php:97 -#: actions/twitapifriendships.php:85 actions/twitapistatuses.php:436 -#: actions/twitapifavorites.php:103 actions/twitapistatuses.php:460 -#: actions/twitapifavorites.php:154 actions/twitapifriendships.php:90 -#: actions/twitapistatuses.php:416 actions/apistatusesdestroy.php:107 -msgid "This method requires a POST or DELETE." -msgstr "" - -#: ../actions/twitapiaccount.php:65 ../actions/twitapifriendships.php:44 -#: ../actions/twitapistatuses.php:381 actions/twitapiaccount.php:63 -#: actions/twitapidirect_messages.php:114 actions/twitapifriendships.php:44 -#: actions/twitapistatuses.php:303 actions/twitapiaccount.php:53 -#: actions/twitapidirect_messages.php:122 actions/twitapifriendships.php:32 -#: actions/twitapistatuses.php:244 actions/twitapiaccount.php:54 -#: actions/twitapidirect_messages.php:131 actions/twitapistatuses.php:262 -#: actions/twitapiaccount.php:56 actions/twitapidirect_messages.php:124 -#: actions/twitapifriendships.php:34 actions/twitapistatuses.php:216 -#: 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/apiaccountupdateprofileimage.php:84 -msgid "This method requires a POST." -msgstr "" - -#: ../lib/util.php:164 lib/util.php:246 lib/htmloutputter.php:104 -msgid "This page is not available in a media type you accept" +msgid "Inbox for %s" msgstr "" -#: ../actions/profilesettings.php:63 actions/profilesettings.php:96 -#: actions/profilesettings.php:138 actions/profilesettings.php:139 -#: actions/profilesettings.php:154 -msgid "Timezone" +#: actions/inbox.php:115 +msgid "This is your inbox, which lists your incoming private messages." msgstr "" -#: ../actions/profilesettings.php:107 actions/profilesettings.php:222 -#: actions/profilesettings.php:211 actions/profilesettings.php:212 -#: actions/profilesettings.php:228 -msgid "Timezone not selected." +#: actions/invite.php:39 +msgid "Invites have been disabled." msgstr "" -#: ../actions/remotesubscribe.php:43 actions/remotesubscribe.php:74 -#: actions/remotesubscribe.php:98 +#: actions/invite.php:41 #, php-format -msgid "" -"To subscribe, you can [login](%%action.login%%), or [register](%%action." -"register%%) a new account. If you already have an account on a [compatible " -"microblogging site](%%doc.openmublog%%), enter your profile URL below." -msgstr "" - -#: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167 -#: actions/twitapifriendships.php:132 actions/twitapifriendships.php:139 -#: actions/apifriendshipsexists.php:103 actions/apifriendshipsexists.php:94 -msgid "Two user ids or screen_names must be supplied." -msgstr "" - -#: ../actions/profilesettings.php:48 ../actions/register.php:169 -#: actions/profilesettings.php:81 actions/register.php:183 -#: actions/profilesettings.php:109 actions/register.php:398 -#: actions/register.php:444 actions/profilesettings.php:117 -#: actions/register.php:448 actions/register.php:454 -msgid "URL of your homepage, blog, or profile on another site" -msgstr "" - -#: ../actions/remotesubscribe.php:74 actions/remotesubscribe.php:83 -#: actions/remotesubscribe.php:110 actions/remotesubscribe.php:134 -msgid "URL of your profile on another compatible microblogging service" -msgstr "" - -#: ../actions/emailsettings.php:130 ../actions/imsettings.php:110 -#: ../actions/recoverpassword.php:39 ../actions/smssettings.php:135 -#: actions/emailsettings.php:144 actions/imsettings.php:118 -#: actions/recoverpassword.php:39 actions/smssettings.php:143 -#: actions/twittersettings.php:108 actions/avatarsettings.php:258 -#: actions/emailsettings.php:242 actions/grouplogo.php:317 -#: actions/imsettings.php:214 actions/recoverpassword.php:44 -#: actions/smssettings.php:236 actions/twittersettings.php:302 -#: actions/avatarsettings.php:263 actions/emailsettings.php:247 -#: actions/grouplogo.php:324 actions/twittersettings.php:306 -#: actions/twittersettings.php:322 lib/designsettings.php:301 -#: actions/emailsettings.php:255 actions/grouplogo.php:319 -#: actions/imsettings.php:220 actions/smssettings.php:248 -#: actions/avatarsettings.php:277 lib/designsettings.php:304 -msgid "Unexpected form submission." -msgstr "" - -#: ../actions/recoverpassword.php:276 actions/recoverpassword.php:289 -#: actions/recoverpassword.php:323 actions/recoverpassword.php:341 -#: actions/recoverpassword.php:344 -msgid "Unexpected password reset." -msgstr "" - -#: ../index.php:57 index.php:57 actions/recoverpassword.php:202 -#: actions/recoverpassword.php:210 actions/recoverpassword.php:213 -msgid "Unknown action" -msgstr "" - -#: ../actions/finishremotesubscribe.php:58 -#: actions/finishremotesubscribe.php:60 actions/finishremotesubscribe.php:61 -msgid "Unknown version of OMB protocol." -msgstr "" - -#: ../lib/util.php:269 lib/util.php:285 -msgid "" -"Unless otherwise specified, contents of this site are copyright by the " -"contributors and available under the " +msgid "You must be logged in to invite other users to use %s" msgstr "" -#: ../actions/confirmaddress.php:48 actions/confirmaddress.php:48 -#: actions/confirmaddress.php:90 +#: actions/invite.php:72 #, php-format -msgid "Unrecognized address type %s" -msgstr "" - -#: ../actions/showstream.php:209 actions/showstream.php:219 -#: lib/unsubscribeform.php:137 -msgid "Unsubscribe" -msgstr "" - -#: ../actions/postnotice.php:44 ../actions/updateprofile.php:45 -#: actions/postnotice.php:45 actions/updateprofile.php:46 -#: actions/postnotice.php:48 actions/updateprofile.php:49 -#: actions/updateprofile.php:51 -msgid "Unsupported OMB version" +msgid "Invalid email address: %s" msgstr "" -#: ../actions/avatar.php:105 actions/profilesettings.php:342 -#: lib/imagefile.php:102 lib/imagefile.php:99 lib/imagefile.php:100 -#: lib/imagefile.php:105 -msgid "Unsupported image file format." +#: actions/invite.php:110 +msgid "Invitation(s) sent" msgstr "" -#: ../lib/settingsaction.php:100 lib/settingsaction.php:94 -#: lib/connectsettingsaction.php:108 lib/connectsettingsaction.php:116 -msgid "Updates by SMS" +#: actions/invite.php:112 +msgid "Invite new users" msgstr "" -#: ../lib/settingsaction.php:103 lib/settingsaction.php:97 -#: lib/connectsettingsaction.php:105 lib/connectsettingsaction.php:111 -msgid "Updates by instant messenger (IM)" +#: actions/invite.php:128 +msgid "You are already subscribed to these users:" msgstr "" -#: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158 -#: actions/twitapistatuses.php:129 actions/twitapistatuses.php:134 -#: actions/twitapistatuses.php:94 actions/allrss.php:119 -#: actions/apitimelinefriends.php:121 +#: actions/invite.php:131 actions/invite.php:139 #, php-format -msgid "Updates from %1$s and friends on %2$s!" +msgid "%s (%s)" msgstr "" -#: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268 -#: actions/twitapistatuses.php:202 actions/twitapistatuses.php:213 -#: actions/twitapigroups.php:74 actions/twitapistatuses.php:159 -#: actions/apitimelinegroup.php:110 actions/apitimelineuser.php:125 -#: actions/userrss.php:92 -#, php-format -msgid "Updates from %1$s on %2$s!" +#: actions/invite.php:136 +msgid "These are already users and you were automatically subscribed to them:" msgstr "" -#: ../actions/avatar.php:68 actions/profilesettings.php:161 -#: actions/avatarsettings.php:162 actions/grouplogo.php:232 -#: actions/avatarsettings.php:165 actions/grouplogo.php:238 -#: actions/grouplogo.php:233 -msgid "Upload" +#: actions/invite.php:144 +msgid "Invitation(s) sent to the following e-mail addresses:" msgstr "" -#: ../actions/avatar.php:27 +#: actions/invite.php:150 msgid "" -"Upload a new \"avatar\" (user image) here. You can't edit the picture after " -"you upload it, so make sure it's more or less square. It must be under the " -"site license, also. Use a picture that belongs to you and that you want to " -"share." -msgstr "" - -#: ../lib/settingsaction.php:91 -msgid "Upload a new profile image" +"You will be notified when your invitees accept the invitation and register " +"on the site. Thanks for growing the community!" msgstr "" -#: ../actions/invite.php:114 actions/invite.php:121 actions/invite.php:154 -#: actions/invite.php:156 actions/invite.php:162 +#: actions/invite.php:162 msgid "" "Use this form to invite your friends and colleagues to use this service." msgstr "" -#: ../actions/register.php:159 ../actions/register.php:162 -#: actions/register.php:173 actions/register.php:176 actions/register.php:382 -#: actions/register.php:386 actions/register.php:428 actions/register.php:432 -#: actions/register.php:436 actions/register.php:438 actions/register.php:442 -msgid "Used only for updates, announcements, and password recovery" -msgstr "" - -#: ../actions/finishremotesubscribe.php:86 -#: actions/finishremotesubscribe.php:88 actions/finishremotesubscribe.php:94 -msgid "User being listened to doesn't exist." -msgstr "" - -#: ../actions/all.php:41 ../actions/avatarbynickname.php:48 -#: ../actions/foaf.php:47 ../actions/replies.php:41 -#: ../actions/showstream.php:44 ../actions/twitapiaccount.php:82 -#: ../actions/twitapistatuses.php:319 ../actions/twitapistatuses.php:685 -#: ../actions/twitapiusers.php:82 actions/all.php:41 -#: actions/avatarbynickname.php:48 actions/foaf.php:47 actions/replies.php:41 -#: actions/showfavorites.php:41 actions/showstream.php:44 -#: actions/twitapiaccount.php:80 actions/twitapifavorites.php:68 -#: actions/twitapistatuses.php:235 actions/twitapistatuses.php:609 -#: actions/twitapiusers.php:87 lib/mailbox.php:50 -#: actions/avatarbynickname.php:80 actions/foaf.php:48 actions/replies.php:80 -#: actions/showstream.php:107 actions/twitapiaccount.php:70 -#: actions/twitapifavorites.php:42 actions/twitapistatuses.php:167 -#: actions/twitapistatuses.php:503 actions/twitapiusers.php:55 -#: actions/usergroups.php:99 lib/galleryaction.php:67 lib/twitterapi.php:626 -#: actions/twitapiaccount.php:71 actions/twitapistatuses.php:179 -#: actions/twitapistatuses.php:535 actions/twitapiusers.php:59 -#: actions/foaf.php:65 actions/replies.php:79 actions/twitapiusers.php:57 -#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84 -#: actions/apiusershow.php:108 actions/apiaccountupdateprofileimage.php:124 -#: actions/apiaccountupdateprofileimage.php:130 -msgid "User has no profile." -msgstr "" - -#: ../actions/remotesubscribe.php:71 actions/remotesubscribe.php:80 -#: actions/remotesubscribe.php:105 actions/remotesubscribe.php:129 -msgid "User nickname" +#: actions/invite.php:187 +msgid "Email addresses" msgstr "" -#: ../actions/twitapiusers.php:75 actions/twitapiusers.php:80 -msgid "User not found." +#: actions/invite.php:189 +msgid "Addresses of friends to invite (one per line)" msgstr "" -#: ../actions/profilesettings.php:63 actions/profilesettings.php:96 -#: actions/profilesettings.php:139 actions/profilesettings.php:140 -#: actions/profilesettings.php:155 -msgid "What timezone are you normally in?" +#: actions/invite.php:192 +msgid "Personal message" msgstr "" -#: ../lib/util.php:1159 lib/util.php:1293 lib/noticeform.php:141 -#: lib/noticeform.php:158 -#, php-format -msgid "What's up, %s?" +#: actions/invite.php:194 +msgid "Optionally add a personal message to the invitation." msgstr "" -#: ../actions/profilesettings.php:54 ../actions/register.php:175 -#: actions/profilesettings.php:87 actions/register.php:189 -#: actions/profilesettings.php:119 actions/register.php:410 -#: actions/register.php:456 actions/profilesettings.php:134 -#: actions/register.php:466 actions/register.php:472 -msgid "Where you are, like \"City, State (or Region), Country\"" +#: actions/invite.php:197 lib/messageform.php:181 lib/noticeform.php:208 +msgid "Send" msgstr "" -#: ../actions/updateprofile.php:128 actions/updateprofile.php:129 -#: actions/updateprofile.php:132 actions/updateprofile.php:134 +#: actions/invite.php:226 #, php-format -msgid "Wrong image type for '%s'" +msgid "%1$s has invited you to join them on %2$s" msgstr "" -#: ../actions/updateprofile.php:123 actions/updateprofile.php:124 -#: actions/updateprofile.php:127 actions/updateprofile.php:129 +#: actions/invite.php:228 #, php-format -msgid "Wrong size image at '%s'" -msgstr "" - -#: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72 -#: actions/deletenotice.php:64 actions/deletenotice.php:79 -#: actions/block.php:148 actions/deletenotice.php:122 -#: actions/deletenotice.php:141 actions/deletenotice.php:115 -#: actions/block.php:150 actions/deletenotice.php:116 -#: actions/groupblock.php:177 actions/deletenotice.php:146 -msgid "Yes" +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" +"\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" +"\n" +"%1$s said:\n" +"\n" +"%4$s\n" +"\n" +"You can see %1$s's profile page on %2$s here:\n" +"\n" +"%5$s\n" +"\n" +"If you'd like to try the service, click on the link below to accept the " +"invitation.\n" +"\n" +"%6$s\n" +"\n" +"If not, you can ignore this message. Thanks for your patience and your " +"time.\n" +"\n" +"Sincerely, %2$s\n" msgstr "" -#: ../actions/finishaddopenid.php:64 actions/finishaddopenid.php:64 -#: actions/finishaddopenid.php:112 -msgid "You already have this OpenID!" +#: actions/joingroup.php:60 +msgid "You must be logged in to join a group." msgstr "" -#: ../actions/deletenotice.php:37 actions/deletenotice.php:37 -msgid "" -"You are about to permanently delete a notice. Once this is done, it cannot " -"be undone." +#: actions/joingroup.php:90 lib/command.php:217 +msgid "You are already a member of that group" msgstr "" -#: ../actions/recoverpassword.php:31 actions/recoverpassword.php:31 -#: actions/recoverpassword.php:36 -msgid "You are already logged in!" +#: actions/joingroup.php:128 lib/command.php:234 +#, php-format +msgid "Could not join user %s to group %s" msgstr "" -#: ../actions/invite.php:81 actions/invite.php:88 actions/invite.php:120 -#: actions/invite.php:122 actions/invite.php:128 -msgid "You are already subscribed to these users:" +#: actions/joingroup.php:135 lib/command.php:239 +#, php-format +msgid "%s joined group %s" msgstr "" -#: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128 -#: actions/twitapifriendships.php:105 actions/twitapifriendships.php:111 -msgid "You are not friends with the specified user." +#: actions/leavegroup.php:60 +msgid "You must be logged in to leave a group." msgstr "" -#: ../actions/password.php:27 -msgid "You can change your password here. Choose a good one!" +#: actions/leavegroup.php:90 lib/command.php:268 +msgid "You are not a member of that group." msgstr "" -#: ../actions/register.php:135 actions/register.php:145 -msgid "You can create a new account to start posting notices." +#: actions/leavegroup.php:119 lib/command.php:278 +msgid "Could not find membership record." msgstr "" -#: ../actions/smssettings.php:28 actions/smssettings.php:28 -#: actions/smssettings.php:69 +#: actions/leavegroup.php:127 lib/command.php:284 #, php-format -msgid "You can receive SMS messages through email from %%site.name%%." -msgstr "" - -#: ../actions/openidsettings.php:86 actions/openidsettings.php:143 -msgid "" -"You can remove an OpenID from your account by clicking the button marked " -"\"Remove\"." +msgid "Could not remove user %s to group %s" msgstr "" -#: ../actions/imsettings.php:28 actions/imsettings.php:28 -#: actions/imsettings.php:70 +#: actions/leavegroup.php:134 lib/command.php:289 #, php-format -msgid "" -"You can send and receive notices through Jabber/GTalk [instant messages](%%" -"doc.im%%). Configure your address and settings below." +msgid "%s left group %s" msgstr "" -#: ../actions/profilesettings.php:27 actions/profilesettings.php:69 -#: actions/profilesettings.php:71 -msgid "" -"You can update your personal profile info here so people know more about you." +#: actions/login.php:79 actions/register.php:137 +msgid "Already logged in." msgstr "" -#: ../actions/finishremotesubscribe.php:31 ../actions/remotesubscribe.php:31 -#: actions/finishremotesubscribe.php:31 actions/remotesubscribe.php:31 -#: actions/finishremotesubscribe.php:33 actions/finishremotesubscribe.php:85 -#: actions/finishremotesubscribe.php:101 actions/remotesubscribe.php:35 -#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59 -msgid "You can use the local subscription!" +#: actions/login.php:110 actions/login.php:120 +msgid "Invalid or expired token." msgstr "" -#: ../actions/finishopenidlogin.php:33 ../actions/register.php:61 -#: actions/finishopenidlogin.php:38 actions/register.php:68 -#: actions/finishopenidlogin.php:43 actions/register.php:149 -#: actions/register.php:186 actions/register.php:192 actions/register.php:198 -msgid "You can't register if you don't agree to the license." +#: actions/login.php:143 +msgid "Incorrect username or password." msgstr "" -#: ../actions/updateprofile.php:63 actions/updateprofile.php:64 -#: actions/updateprofile.php:67 actions/updateprofile.php:69 -msgid "You did not send us that profile" +#: actions/login.php:149 actions/recoverpassword.php:375 +#: actions/register.php:248 +msgid "Error setting user." msgstr "" -#: ../lib/mail.php:147 lib/mail.php:289 lib/mail.php:288 -#, php-format -msgid "" -"You have a new posting address on %1$s.\n" -"\n" -"Send email to %2$s to post new messages.\n" -"\n" -"More email instructions at %3$s.\n" -"\n" -"Faithfully yours,\n" -"%4$s" +#: actions/login.php:204 actions/login.php:257 lib/action.php:453 +#: lib/logingroupnav.php:79 +msgid "Login" msgstr "" -#: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537 -#: actions/twitapistatuses.php:463 actions/twitapistatuses.php:486 -#: actions/twitapistatuses.php:443 actions/apistatusesdestroy.php:130 -msgid "You may not delete another user's status." +#: actions/login.php:243 +msgid "Login to site" msgstr "" -#: ../actions/invite.php:31 actions/invite.php:31 actions/invite.php:39 -#: actions/invite.php:41 -#, php-format -msgid "You must be logged in to invite other users to use %s" +#: actions/login.php:246 actions/profilesettings.php:106 +#: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94 +#: lib/groupeditform.php:152 lib/userprofile.php:131 +msgid "Nickname" msgstr "" -#: ../actions/invite.php:103 actions/invite.php:110 actions/invite.php:142 -#: actions/invite.php:144 actions/invite.php:150 -msgid "" -"You will be notified when your invitees accept the invitation and register " -"on the site. Thanks for growing the community!" +#: actions/login.php:249 actions/register.php:428 +#: lib/accountsettingsaction.php:114 +msgid "Password" msgstr "" -#: ../actions/recoverpassword.php:149 actions/recoverpassword.php:158 -msgid "You've been identified. Enter a new password below. " +#: actions/login.php:252 actions/register.php:477 +msgid "Remember me" msgstr "" -#: ../actions/openidlogin.php:67 actions/openidlogin.php:76 -#: actions/openidlogin.php:104 actions/openidlogin.php:113 -msgid "Your OpenID URL" +#: actions/login.php:253 actions/register.php:479 +msgid "Automatically login in the future; not for shared computers!" msgstr "" -#: ../actions/recoverpassword.php:164 actions/recoverpassword.php:188 -#: actions/recoverpassword.php:193 -msgid "Your nickname on this server, or your registered email address." +#: actions/login.php:263 +msgid "Lost or forgotten password?" msgstr "" -#: ../actions/openidsettings.php:28 actions/openidsettings.php:70 -#, php-format +#: actions/login.php:282 msgid "" -"[OpenID](%%doc.openid%%) lets you log into many sites with the same user " -"account. Manage your associated OpenIDs from here." +"For security reasons, please re-enter your user name and password before " +"changing your settings." msgstr "" -#: ../lib/util.php:943 lib/util.php:992 lib/util.php:945 lib/util.php:756 -#: lib/util.php:770 lib/util.php:816 lib/util.php:844 -msgid "a few seconds ago" +#: actions/login.php:286 +#, php-format +msgid "" +"Login with your username and password. Don't have a username yet? [Register]" +"(%%action.register%%) a new account." msgstr "" -#: ../lib/util.php:955 lib/util.php:1004 lib/util.php:957 lib/util.php:768 -#: lib/util.php:782 lib/util.php:828 lib/util.php:856 -#, php-format -msgid "about %d days ago" +#: actions/makeadmin.php:91 +msgid "Only an admin can make another user an admin." msgstr "" -#: ../lib/util.php:951 lib/util.php:1000 lib/util.php:953 lib/util.php:764 -#: lib/util.php:778 lib/util.php:824 lib/util.php:852 +#: actions/makeadmin.php:95 #, php-format -msgid "about %d hours ago" +msgid "%s is already an admin for group \"%s\"." msgstr "" -#: ../lib/util.php:947 lib/util.php:996 lib/util.php:949 lib/util.php:760 -#: lib/util.php:774 lib/util.php:820 lib/util.php:848 +#: actions/makeadmin.php:132 #, php-format -msgid "about %d minutes ago" +msgid "Can't get membership record for %s in group %s" msgstr "" -#: ../lib/util.php:959 lib/util.php:1008 lib/util.php:961 lib/util.php:772 -#: lib/util.php:786 lib/util.php:832 lib/util.php:860 +#: actions/makeadmin.php:145 #, php-format -msgid "about %d months ago" +msgid "Can't make %s an admin for group %s" msgstr "" -#: ../lib/util.php:953 lib/util.php:1002 lib/util.php:955 lib/util.php:766 -#: lib/util.php:780 lib/util.php:826 lib/util.php:854 -msgid "about a day ago" +#: actions/microsummary.php:62 actions/newmessage.php:116 +#: actions/remotesubscribe.php:154 +msgid "No such user" msgstr "" -#: ../lib/util.php:945 lib/util.php:994 lib/util.php:947 lib/util.php:758 -#: lib/util.php:772 lib/util.php:818 lib/util.php:846 -msgid "about a minute ago" +#: actions/microsummary.php:69 +msgid "No current status" msgstr "" -#: ../lib/util.php:957 lib/util.php:1006 lib/util.php:959 lib/util.php:770 -#: lib/util.php:784 lib/util.php:830 lib/util.php:858 -msgid "about a month ago" +#: actions/newgroup.php:53 +msgid "New group" msgstr "" -#: ../lib/util.php:961 lib/util.php:1010 lib/util.php:963 lib/util.php:774 -#: lib/util.php:788 lib/util.php:834 lib/util.php:862 -msgid "about a year ago" +#: actions/newgroup.php:110 +msgid "Use this form to create a new group." msgstr "" -#: ../lib/util.php:949 lib/util.php:998 lib/util.php:951 lib/util.php:762 -#: lib/util.php:776 lib/util.php:822 lib/util.php:850 -msgid "about an hour ago" +#: actions/newmessage.php:71 actions/newmessage.php:231 +msgid "New message" msgstr "" -#: ../actions/showstream.php:423 ../lib/stream.php:132 -#: actions/showstream.php:441 lib/stream.php:99 -msgid "delete" +#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:367 +msgid "You can't send a message to this user." msgstr "" -#: ../actions/noticesearch.php:130 ../actions/showstream.php:408 -#: ../lib/stream.php:117 actions/noticesearch.php:136 -#: actions/showstream.php:426 lib/stream.php:84 actions/noticesearch.php:187 -msgid "in reply to..." +#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351 +#: lib/command.php:424 +msgid "No content!" msgstr "" -#: ../actions/noticesearch.php:137 ../actions/showstream.php:415 -#: ../lib/stream.php:124 actions/noticesearch.php:143 -#: actions/showstream.php:433 lib/stream.php:91 actions/noticesearch.php:194 -msgid "reply" +#: actions/newmessage.php:158 +msgid "No recipient specified." msgstr "" -#: ../actions/password.php:44 actions/profilesettings.php:183 -#: actions/passwordsettings.php:106 actions/passwordsettings.php:112 -msgid "same as password above" +#: actions/newmessage.php:164 lib/command.php:370 +msgid "" +"Don't send a message to yourself; just say it to yourself quietly instead." msgstr "" -#: ../actions/twitapistatuses.php:755 actions/twitapistatuses.php:678 -#: actions/twitapistatuses.php:555 actions/twitapistatuses.php:596 -#: actions/twitapistatuses.php:618 actions/twitapistatuses.php:553 -#: actions/twitapistatuses.php:575 -msgid "unsupported file type" -msgstr "" - -#: ../lib/util.php:1309 lib/util.php:1443 -msgid "« After" -msgstr "" - -#: actions/deletenotice.php:74 actions/disfavor.php:43 -#: actions/emailsettings.php:127 actions/favor.php:45 -#: actions/finishopenidlogin.php:33 actions/imsettings.php:105 -#: actions/invite.php:46 actions/newmessage.php:45 actions/openidlogin.php:36 -#: actions/openidsettings.php:123 actions/profilesettings.php:47 -#: actions/recoverpassword.php:282 actions/register.php:42 -#: actions/remotesubscribe.php:40 actions/smssettings.php:124 -#: actions/subscribe.php:44 actions/twittersettings.php:97 -#: actions/unsubscribe.php:41 actions/userauthorization.php:35 -#: actions/block.php:64 actions/disfavor.php:74 actions/favor.php:77 -#: actions/finishopenidlogin.php:38 actions/invite.php:54 actions/nudge.php:80 -#: actions/openidlogin.php:37 actions/recoverpassword.php:316 -#: actions/subscribe.php:46 actions/unblock.php:65 actions/unsubscribe.php:43 -#: actions/avatarsettings.php:251 actions/emailsettings.php:229 -#: actions/grouplogo.php:314 actions/imsettings.php:200 actions/login.php:103 -#: actions/newmessage.php:133 actions/newnotice.php:96 -#: actions/openidsettings.php:188 actions/othersettings.php:136 -#: actions/passwordsettings.php:131 actions/profilesettings.php:172 -#: actions/register.php:113 actions/remotesubscribe.php:53 -#: actions/smssettings.php:216 actions/subedit.php:38 actions/tagother.php:166 -#: actions/twittersettings.php:294 actions/userauthorization.php:39 -#: actions/favor.php:75 actions/groupblock.php:66 actions/groupunblock.php:66 -#: actions/invite.php:56 actions/makeadmin.php:66 actions/newnotice.php:102 -#: actions/othersettings.php:138 actions/recoverpassword.php:334 -#: actions/register.php:153 actions/twittersettings.php:310 -#: lib/designsettings.php:291 actions/emailsettings.php:237 -#: actions/grouplogo.php:309 actions/imsettings.php:206 actions/login.php:105 -#: actions/newmessage.php:135 actions/newnotice.php:103 -#: actions/othersettings.php:145 actions/passwordsettings.php:137 -#: actions/profilesettings.php:187 actions/recoverpassword.php:337 -#: actions/register.php:159 actions/remotesubscribe.php:77 -#: actions/smssettings.php:228 actions/unsubscribe.php:69 -#: actions/userauthorization.php:52 actions/login.php:131 -#: actions/register.php:165 actions/avatarsettings.php:265 -#: lib/designsettings.php:294 -msgid "There was a problem with your session token. Try again, please." +#: actions/newmessage.php:181 +msgid "Message sent" msgstr "" -#: actions/disfavor.php:55 actions/disfavor.php:81 -msgid "This notice is not a favorite!" +#: actions/newmessage.php:185 lib/command.php:375 +#, php-format +msgid "Direct message to %s sent" msgstr "" -#: actions/disfavor.php:63 actions/disfavor.php:87 -#: actions/twitapifavorites.php:188 actions/apifavoritedestroy.php:134 -msgid "Could not delete favorite." +#: actions/newmessage.php:210 actions/newnotice.php:233 lib/channel.php:170 +msgid "Ajax Error" msgstr "" -#: actions/disfavor.php:72 lib/favorform.php:140 -msgid "Favor" +#: actions/newnotice.php:69 +msgid "New notice" msgstr "" -#: actions/emailsettings.php:92 actions/emailsettings.php:157 -#: actions/emailsettings.php:163 -msgid "Send me email when someone adds my notice as a favorite." +#: actions/newnotice.php:199 +msgid "Notice posted" msgstr "" -#: actions/emailsettings.php:95 actions/emailsettings.php:163 -#: actions/emailsettings.php:169 -msgid "Send me email when someone sends me a private message." +#: actions/noticesearch.php:68 +#, php-format +msgid "" +"Search for notices on %%site.name%% by their contents. Separate search terms " +"by spaces; they must be 3 characters or more." msgstr "" -#: actions/favor.php:53 actions/twitapifavorites.php:142 actions/favor.php:81 -#: actions/twitapifavorites.php:118 actions/twitapifavorites.php:124 -#: actions/favor.php:79 -msgid "This notice is already a favorite!" +#: actions/noticesearch.php:78 +msgid "Text search" msgstr "" -#: actions/favor.php:60 actions/twitapifavorites.php:151 -#: classes/Command.php:132 actions/favor.php:86 -#: actions/twitapifavorites.php:125 classes/Command.php:152 -#: actions/twitapifavorites.php:131 lib/command.php:152 actions/favor.php:84 -#: actions/twitapifavorites.php:133 lib/command.php:145 -#: actions/apifavoritecreate.php:130 lib/command.php:176 -msgid "Could not create favorite." +#: actions/noticesearch.php:91 +#, php-format +msgid "Search results for \"%s\" on %s" msgstr "" -#: actions/favor.php:70 -msgid "Disfavor" +#: actions/noticesearch.php:121 +#, php-format +msgid "" +"Be the first to [post on this topic](%%%%action.newnotice%%%%?" +"status_textarea=%s)!" msgstr "" -#: actions/favoritesrss.php:60 actions/showfavorites.php:47 -#: actions/favoritesrss.php:100 actions/showfavorites.php:77 -#: actions/favoritesrss.php:110 +#: actions/noticesearch.php:124 #, php-format -msgid "%s favorite notices" +msgid "" +"Why not [register an account](%%%%action.register%%%%) and be the first to " +"[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!" msgstr "" -#: actions/favoritesrss.php:64 actions/favoritesrss.php:104 -#: actions/favoritesrss.php:114 +#: actions/noticesearchrss.php:89 #, php-format -msgid "Feed of favorite notices of %s" +msgid "Updates with \"%s\"" msgstr "" -#: actions/inbox.php:28 actions/inbox.php:59 +#: actions/noticesearchrss.php:91 #, php-format -msgid "Inbox for %s - page %d" +msgid "Updates matching search term \"%1$s\" on %2$s!" msgstr "" -#: actions/inbox.php:30 actions/inbox.php:62 -#, php-format -msgid "Inbox for %s" +#: actions/nudge.php:85 +msgid "" +"This user doesn't allow nudges or hasn't confirmed or set his email yet." msgstr "" -#: actions/inbox.php:53 actions/inbox.php:115 -msgid "This is your inbox, which lists your incoming private messages." +#: actions/nudge.php:94 +msgid "Nudge sent" msgstr "" -#: actions/invite.php:178 actions/invite.php:213 -#, php-format -msgid "" -"%1$s has invited you to join them on %2$s (%3$s).\n" -"\n" +#: actions/nudge.php:97 +msgid "Nudge sent!" msgstr "" -#: actions/login.php:104 actions/login.php:235 actions/openidlogin.php:108 -#: actions/register.php:416 -msgid "Automatically login in the future; " +#: actions/oembed.php:79 actions/shownotice.php:100 +msgid "Notice has no profile" msgstr "" -#: actions/login.php:122 actions/login.php:264 -msgid "For security reasons, please re-enter your " +#: actions/oembed.php:86 actions/shownotice.php:180 +#, php-format +msgid "%1$s's status on %2$s" msgstr "" -#: actions/login.php:126 actions/login.php:268 -msgid "Login with your username and password. " +#: actions/oembed.php:157 +msgid "content type " msgstr "" -#: actions/newmessage.php:58 actions/twitapidirect_messages.php:130 -#: actions/twitapidirect_messages.php:141 actions/newmessage.php:148 -#: actions/twitapidirect_messages.php:150 -#: actions/twitapidirect_messages.php:145 -msgid "That's too long. Max message size is 140 chars." +#: actions/oembed.php:160 +msgid "Only " msgstr "" -#: actions/newmessage.php:65 actions/newmessage.php:128 -#: actions/newmessage.php:155 actions/newmessage.php:158 -msgid "No recipient specified." +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:963 +#: lib/api.php:991 lib/api.php:1101 +msgid "Not a supported data format." msgstr "" -#: actions/newmessage.php:68 actions/newmessage.php:113 -#: classes/Command.php:206 actions/newmessage.php:131 -#: actions/newmessage.php:168 classes/Command.php:237 -#: actions/newmessage.php:119 actions/newmessage.php:158 lib/command.php:237 -#: lib/command.php:230 actions/newmessage.php:121 actions/newmessage.php:161 -#: lib/command.php:367 -msgid "You can't send a message to this user." +#: actions/opensearch.php:64 +msgid "User Search" msgstr "" -#: actions/newmessage.php:71 actions/twitapidirect_messages.php:146 -#: classes/Command.php:209 actions/twitapidirect_messages.php:158 -#: classes/Command.php:240 actions/newmessage.php:161 -#: actions/twitapidirect_messages.php:167 lib/command.php:240 -#: actions/twitapidirect_messages.php:163 lib/command.php:233 -#: actions/newmessage.php:164 lib/command.php:370 -msgid "" -"Don't send a message to yourself; just say it to yourself quietly instead." +#: actions/opensearch.php:67 +msgid "Notice Search" msgstr "" -#: actions/newmessage.php:108 actions/microsummary.php:62 -#: actions/newmessage.php:163 actions/newmessage.php:114 -#: actions/newmessage.php:116 actions/remotesubscribe.php:154 -msgid "No such user" +#: actions/othersettings.php:60 +msgid "Other Settings" msgstr "" -#: actions/newmessage.php:117 actions/newmessage.php:67 -#: actions/newmessage.php:71 actions/newmessage.php:231 -msgid "New message" +#: actions/othersettings.php:71 +msgid "Manage various other options." msgstr "" -#: actions/noticesearch.php:95 actions/noticesearch.php:146 -msgid "Notice without matching profile" +#: actions/othersettings.php:117 +msgid "Shorten URLs with" msgstr "" -#: actions/openidsettings.php:28 actions/openidsettings.php:70 -#, php-format -msgid "[OpenID](%%doc.openid%%) lets you log into many sites " +#: actions/othersettings.php:118 +msgid "Automatic shortening service to use." msgstr "" -#: actions/openidsettings.php:46 actions/openidsettings.php:96 -msgid "If you want to add an OpenID to your account, " +#: actions/othersettings.php:122 +msgid "View profile designs" msgstr "" -#: actions/openidsettings.php:74 -msgid "Removing your only OpenID would make it impossible to log in! " +#: actions/othersettings.php:123 +msgid "Show or hide profile designs." msgstr "" -#: actions/openidsettings.php:87 actions/openidsettings.php:143 -msgid "You can remove an OpenID from your account " +#: actions/othersettings.php:153 +msgid "URL shortening service is too long (max 50 chars)." msgstr "" -#: actions/outbox.php:28 actions/outbox.php:58 +#: actions/outbox.php:58 #, php-format msgid "Outbox for %s - page %d" msgstr "" -#: actions/outbox.php:30 actions/outbox.php:61 +#: actions/outbox.php:61 #, php-format msgid "Outbox for %s" msgstr "" -#: actions/outbox.php:53 actions/outbox.php:116 +#: actions/outbox.php:116 msgid "This is your outbox, which lists private messages you have sent." msgstr "" -#: actions/peoplesearch.php:28 actions/peoplesearch.php:52 -#, php-format -msgid "" -"Search for people on %%site.name%% by their name, location, or interests. " +#: actions/passwordsettings.php:58 +msgid "Change password" msgstr "" -#: actions/profilesettings.php:27 actions/profilesettings.php:69 -msgid "You can update your personal profile info here " +#: actions/passwordsettings.php:69 +msgid "Change your password." msgstr "" -#: actions/profilesettings.php:115 actions/remotesubscribe.php:320 -#: actions/userauthorization.php:159 actions/userrss.php:76 -#: actions/avatarsettings.php:104 actions/avatarsettings.php:179 -#: actions/grouplogo.php:177 actions/remotesubscribe.php:367 -#: actions/userauthorization.php:176 actions/userrss.php:82 -#: actions/avatarsettings.php:106 actions/avatarsettings.php:182 -#: actions/grouplogo.php:183 actions/remotesubscribe.php:366 -#: actions/remotesubscribe.php:364 actions/userauthorization.php:215 -#: actions/userrss.php:103 actions/grouplogo.php:178 -#: actions/remotesubscribe.php:191 actions/userauthorization.php:72 -msgid "User without matching profile" +#: actions/passwordsettings.php:95 actions/recoverpassword.php:231 +msgid "Password change" msgstr "" -#: actions/recoverpassword.php:91 actions/recoverpassword.php:97 -msgid "This confirmation code is too old. " +#: actions/passwordsettings.php:103 +msgid "Old password" msgstr "" -#: actions/recoverpassword.php:141 actions/recoverpassword.php:152 -msgid "If you've forgotten or lost your" +#: actions/passwordsettings.php:107 actions/recoverpassword.php:235 +msgid "New password" msgstr "" -#: actions/recoverpassword.php:154 actions/recoverpassword.php:158 -msgid "You've been identified. Enter a " +#: actions/passwordsettings.php:108 +msgid "6 or more characters" msgstr "" -#: actions/recoverpassword.php:169 actions/recoverpassword.php:188 -msgid "Your nickname on this server, " +#: actions/passwordsettings.php:111 actions/recoverpassword.php:239 +#: actions/register.php:432 actions/smssettings.php:134 +msgid "Confirm" msgstr "" -#: actions/recoverpassword.php:271 actions/recoverpassword.php:304 -msgid "Instructions for recovering your password " +#: actions/passwordsettings.php:112 +msgid "same as password above" msgstr "" -#: actions/recoverpassword.php:327 actions/recoverpassword.php:361 -msgid "New password successfully saved. " +#: actions/passwordsettings.php:116 +msgid "Change" msgstr "" -#: actions/register.php:95 actions/register.php:180 -#: actions/passwordsettings.php:147 actions/register.php:217 -#: actions/passwordsettings.php:153 actions/register.php:224 -#: actions/register.php:230 +#: actions/passwordsettings.php:153 actions/register.php:230 msgid "Password must be 6 or more characters." msgstr "" -#: actions/register.php:216 -#, php-format -msgid "" -"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may " -"want to..." -msgstr "" - -#: actions/register.php:227 -msgid "(You should receive a message by email momentarily, with " -msgstr "" - -#: actions/remotesubscribe.php:51 actions/remotesubscribe.php:74 -#, php-format -msgid "To subscribe, you can [login](%%action.login%%)," -msgstr "" - -#: actions/showfavorites.php:61 actions/showfavorites.php:145 -#: actions/showfavorites.php:147 -#, php-format -msgid "Feed for favorites of %s" +#: actions/passwordsettings.php:156 actions/register.php:233 +msgid "Passwords don't match." msgstr "" -#: actions/showfavorites.php:84 actions/twitapifavorites.php:85 -#: actions/showfavorites.php:202 actions/twitapifavorites.php:59 -#: actions/showfavorites.php:179 actions/showfavorites.php:209 -#: actions/showfavorites.php:132 -msgid "Could not retrieve favorite notices." +#: actions/passwordsettings.php:164 +msgid "Incorrect old password" msgstr "" -#: actions/showmessage.php:33 actions/showmessage.php:81 -msgid "No such message." +#: actions/passwordsettings.php:180 +msgid "Error saving user; invalid." msgstr "" -#: actions/showmessage.php:42 actions/showmessage.php:98 -msgid "Only the sender and recipient may read this message." +#: actions/passwordsettings.php:185 actions/recoverpassword.php:368 +msgid "Can't save new password." msgstr "" -#: actions/showmessage.php:61 actions/showmessage.php:108 -#, php-format -msgid "Message to %1$s on %2$s" +#: actions/passwordsettings.php:191 actions/recoverpassword.php:211 +msgid "Password saved." msgstr "" -#: actions/showmessage.php:66 actions/showmessage.php:113 +#: actions/peoplesearch.php:52 #, php-format -msgid "Message from %1$s on %2$s" +msgid "" +"Search for users on %%site.name%% by their name, location, or interests. " +"Separate the terms by spaces; they must be 3 characters or more." msgstr "" -#: actions/showstream.php:154 -msgid "Send a message" +#: actions/peoplesearch.php:58 +msgid "People search" msgstr "" -#: actions/smssettings.php:312 actions/smssettings.php:464 +#: actions/peopletag.php:70 #, php-format -msgid "Mobile carrier for your phone. " +msgid "Not a valid user tag: %s" msgstr "" -#: actions/twitapidirect_messages.php:76 actions/twitapidirect_messages.php:68 -#: actions/twitapidirect_messages.php:67 actions/twitapidirect_messages.php:53 -#: actions/apidirectmessage.php:101 +#: actions/peopletag.php:144 #, php-format -msgid "Direct messages to %s" +msgid "Users self-tagged with %s - page %d" msgstr "" -#: actions/twitapidirect_messages.php:77 actions/twitapidirect_messages.php:69 -#: actions/twitapidirect_messages.php:68 actions/twitapidirect_messages.php:54 -#: actions/apidirectmessage.php:105 -#, php-format -msgid "All the direct messages sent to %s" +#: actions/postnotice.php:84 +msgid "Invalid notice content" msgstr "" -#: actions/twitapidirect_messages.php:81 actions/twitapidirect_messages.php:73 -#: actions/twitapidirect_messages.php:72 actions/twitapidirect_messages.php:59 -msgid "Direct Messages You've Sent" +#: actions/postnotice.php:90 +#, php-format +msgid "Notice license ‘%s’ is not compatible with site license ‘%s’." msgstr "" -#: actions/twitapidirect_messages.php:82 actions/twitapidirect_messages.php:74 -#: actions/twitapidirect_messages.php:73 actions/twitapidirect_messages.php:60 -#: actions/apidirectmessage.php:93 -#, php-format -msgid "All the direct messages sent from %s" +#: actions/profilesettings.php:60 +msgid "Profile settings" msgstr "" -#: actions/twitapidirect_messages.php:128 -#: actions/twitapidirect_messages.php:137 -#: actions/twitapidirect_messages.php:146 -#: actions/twitapidirect_messages.php:140 actions/apidirectmessagenew.php:126 -msgid "No message text!" +#: actions/profilesettings.php:71 +msgid "" +"You can update your personal profile info here so readers know more about " +"you." msgstr "" -#: actions/twitapidirect_messages.php:138 -#: actions/twitapidirect_messages.php:150 -#: actions/twitapidirect_messages.php:159 -#: actions/twitapidirect_messages.php:154 actions/apidirectmessagenew.php:146 -msgid "Recipient user not found." +#: actions/profilesettings.php:99 +msgid "Profile information" msgstr "" -#: actions/twitapidirect_messages.php:141 -#: actions/twitapidirect_messages.php:153 -#: actions/twitapidirect_messages.php:162 -#: actions/twitapidirect_messages.php:158 actions/apidirectmessagenew.php:150 -msgid "Can't send direct messages to users who aren't your friend." +#: actions/profilesettings.php:108 lib/groupeditform.php:154 +msgid "1-64 lowercase letters or numbers, no punctuation or spaces" msgstr "" -#: actions/twitapifavorites.php:92 actions/twitapifavorites.php:66 -#: actions/twitapifavorites.php:64 actions/twitapifavorites.php:49 -#: actions/apitimelinefavorites.php:107 -#, php-format -msgid "%s / Favorites from %s" +#: actions/profilesettings.php:111 actions/register.php:447 +#: actions/showgroup.php:247 actions/tagother.php:104 +#: lib/groupeditform.php:157 lib/userprofile.php:149 +msgid "Full name" msgstr "" -#: actions/twitapifavorites.php:95 actions/twitapifavorites.php:69 -#: actions/twitapifavorites.php:68 actions/twitapifavorites.php:55 -#: actions/apitimelinefavorites.php:119 -#, php-format -msgid "%s updates favorited by %s / %s." +#: actions/profilesettings.php:115 actions/register.php:452 +#: lib/groupeditform.php:161 +msgid "Homepage" msgstr "" -#: actions/twitapifavorites.php:187 lib/mail.php:275 -#: actions/twitapifavorites.php:164 lib/mail.php:553 -#: actions/twitapifavorites.php:170 lib/mail.php:554 -#: actions/twitapifavorites.php:221 -#, php-format -msgid "%s added your notice as a favorite" +#: actions/profilesettings.php:117 actions/register.php:454 +msgid "URL of your homepage, blog, or profile on another site" msgstr "" -#: actions/twitapifavorites.php:188 lib/mail.php:276 -#: actions/twitapifavorites.php:165 +#: actions/profilesettings.php:122 actions/register.php:460 #, php-format -msgid "" -"%1$s just added your notice from %2$s as one of their favorites.\n" -"\n" +msgid "Describe yourself and your interests in %d chars" msgstr "" -#: actions/twittersettings.php:27 -msgid "" -"Add your Twitter account to automatically send your notices to Twitter, " +#: actions/profilesettings.php:125 actions/register.php:463 +msgid "Describe yourself and your interests" msgstr "" -#: actions/twittersettings.php:41 actions/twittersettings.php:60 -#: actions/twittersettings.php:61 -msgid "Twitter settings" +#: actions/profilesettings.php:127 actions/register.php:465 +msgid "Bio" msgstr "" -#: actions/twittersettings.php:48 actions/twittersettings.php:105 -#: actions/twittersettings.php:106 -msgid "Twitter Account" +#: actions/profilesettings.php:132 actions/register.php:470 +#: actions/showgroup.php:256 actions/tagother.php:112 +#: actions/userauthorization.php:158 lib/groupeditform.php:177 +#: lib/userprofile.php:164 +msgid "Location" msgstr "" -#: actions/twittersettings.php:56 actions/twittersettings.php:113 -#: actions/twittersettings.php:114 -msgid "Current verified Twitter account." +#: actions/profilesettings.php:134 actions/register.php:472 +msgid "Where you are, like \"City, State (or Region), Country\"" msgstr "" -#: actions/twittersettings.php:63 -msgid "Twitter Username" +#: actions/profilesettings.php:138 actions/tagother.php:149 +#: actions/tagother.php:209 lib/subscriptionlist.php:106 +#: lib/subscriptionlist.php:108 lib/userprofile.php:209 +msgid "Tags" msgstr "" -#: actions/twittersettings.php:65 actions/twittersettings.php:123 -#: actions/twittersettings.php:126 -msgid "No spaces, please." +#: actions/profilesettings.php:140 +msgid "" +"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated" msgstr "" -#: actions/twittersettings.php:67 -msgid "Twitter Password" +#: actions/profilesettings.php:144 +msgid "Language" msgstr "" -#: actions/twittersettings.php:72 actions/twittersettings.php:139 -#: actions/twittersettings.php:142 -msgid "Automatically send my notices to Twitter." +#: actions/profilesettings.php:145 +msgid "Preferred language" msgstr "" -#: actions/twittersettings.php:75 actions/twittersettings.php:146 -#: actions/twittersettings.php:149 -msgid "Send local \"@\" replies to Twitter." +#: actions/profilesettings.php:154 +msgid "Timezone" msgstr "" -#: actions/twittersettings.php:78 actions/twittersettings.php:153 -#: actions/twittersettings.php:156 -msgid "Subscribe to my Twitter friends here." +#: actions/profilesettings.php:155 +msgid "What timezone are you normally in?" msgstr "" -#: actions/twittersettings.php:122 actions/twittersettings.php:331 -#: actions/twittersettings.php:348 +#: actions/profilesettings.php:160 msgid "" -"Username must have only numbers, upper- and lowercase letters, and " -"underscore (_). 15 chars max." -msgstr "" - -#: actions/twittersettings.php:128 actions/twittersettings.php:334 -#: actions/twittersettings.php:338 actions/twittersettings.php:355 -msgid "Could not verify your Twitter credentials!" +"Automatically subscribe to whoever subscribes to me (best for non-humans)" msgstr "" -#: actions/twittersettings.php:137 +#: actions/profilesettings.php:221 actions/register.php:223 #, php-format -msgid "Unable to retrieve account information for \"%s\" from Twitter." -msgstr "" - -#: actions/twittersettings.php:151 actions/twittersettings.php:170 -#: actions/twittersettings.php:348 actions/twittersettings.php:368 -#: actions/twittersettings.php:352 actions/twittersettings.php:372 -#: actions/twittersettings.php:369 actions/twittersettings.php:389 -msgid "Unable to save your Twitter settings!" -msgstr "" - -#: actions/twittersettings.php:174 actions/twittersettings.php:376 -#: actions/twittersettings.php:380 actions/twittersettings.php:399 -msgid "Twitter settings saved." -msgstr "" - -#: actions/twittersettings.php:192 actions/twittersettings.php:395 -#: actions/twittersettings.php:399 actions/twittersettings.php:418 -msgid "That is not your Twitter account." -msgstr "" - -#: actions/twittersettings.php:200 actions/twittersettings.php:208 -#: actions/twittersettings.php:403 actions/twittersettings.php:407 -#: actions/twittersettings.php:426 -msgid "Couldn't remove Twitter user." -msgstr "" - -#: actions/twittersettings.php:212 actions/twittersettings.php:407 -#: actions/twittersettings.php:411 actions/twittersettings.php:430 -msgid "Twitter account removed." +msgid "Bio is too long (max %d chars)." msgstr "" -#: actions/twittersettings.php:225 actions/twittersettings.php:239 -#: actions/twittersettings.php:428 actions/twittersettings.php:439 -#: actions/twittersettings.php:453 actions/twittersettings.php:432 -#: actions/twittersettings.php:443 actions/twittersettings.php:457 -#: actions/twittersettings.php:452 actions/twittersettings.php:463 -#: actions/twittersettings.php:477 -msgid "Couldn't save Twitter preferences." +#: actions/profilesettings.php:228 +msgid "Timezone not selected." msgstr "" -#: actions/twittersettings.php:245 actions/twittersettings.php:461 -#: actions/twittersettings.php:465 actions/twittersettings.php:485 -msgid "Twitter preferences saved." +#: actions/profilesettings.php:234 +msgid "Language is too long (max 50 chars)." msgstr "" -#: actions/userauthorization.php:84 actions/userauthorization.php:86 -msgid "Please check these details to make sure " +#: actions/profilesettings.php:246 actions/tagother.php:178 +#, php-format +msgid "Invalid tag: \"%s\"" msgstr "" -#: actions/userauthorization.php:324 actions/userauthorization.php:340 -msgid "The subscription has been authorized, but no " +#: actions/profilesettings.php:295 +msgid "Couldn't update user for autosubscribe." msgstr "" -#: actions/userauthorization.php:334 actions/userauthorization.php:351 -msgid "The subscription has been rejected, but no " +#: actions/profilesettings.php:328 +msgid "Couldn't save profile." msgstr "" -#: classes/Channel.php:113 classes/Channel.php:132 classes/Channel.php:151 -#: lib/channel.php:138 lib/channel.php:158 -msgid "Command results" +#: actions/profilesettings.php:336 +msgid "Couldn't save tags." msgstr "" -#: classes/Channel.php:148 classes/Channel.php:204 lib/channel.php:210 -msgid "Command complete" +#: actions/profilesettings.php:344 +msgid "Settings saved." msgstr "" -#: classes/Channel.php:158 classes/Channel.php:215 lib/channel.php:221 -msgid "Command failed" +#: actions/public.php:83 +#, php-format +msgid "Beyond the page limit (%s)" msgstr "" -#: classes/Command.php:39 classes/Command.php:44 lib/command.php:44 -msgid "Sorry, this command is not yet implemented." +#: actions/public.php:92 +msgid "Could not retrieve public stream." msgstr "" -#: classes/Command.php:96 classes/Command.php:113 +#: actions/public.php:129 #, php-format -msgid "Subscriptions: %1$s\n" +msgid "Public timeline, page %d" msgstr "" -#: classes/Command.php:125 classes/Command.php:242 classes/Command.php:145 -#: classes/Command.php:276 lib/command.php:145 lib/command.php:276 -#: lib/command.php:138 lib/command.php:269 lib/command.php:168 -#: lib/command.php:416 lib/command.php:471 -msgid "User has no last notice" +#: actions/public.php:131 lib/publicgroupnav.php:79 +msgid "Public timeline" msgstr "" -#: classes/Command.php:146 classes/Command.php:166 lib/command.php:166 -#: lib/command.php:159 lib/command.php:190 -msgid "Notice marked as fave." +#: actions/public.php:151 +msgid "Public Stream Feed (RSS 1.0)" msgstr "" -#: classes/Command.php:166 classes/Command.php:189 lib/command.php:189 -#: lib/command.php:182 lib/command.php:315 -#, php-format -msgid "%1$s (%2$s)" +#: actions/public.php:155 +msgid "Public Stream Feed (RSS 2.0)" msgstr "" -#: classes/Command.php:169 classes/Command.php:192 lib/command.php:192 -#: lib/command.php:185 lib/command.php:318 -#, php-format -msgid "Fullname: %s" +#: actions/public.php:159 +msgid "Public Stream Feed (Atom)" msgstr "" -#: classes/Command.php:172 classes/Command.php:195 lib/command.php:195 -#: lib/command.php:188 lib/command.php:321 +#: actions/public.php:179 #, php-format -msgid "Location: %s" +msgid "" +"This is the public timeline for %%site.name%% but no one has posted anything " +"yet." msgstr "" -#: classes/Command.php:175 classes/Command.php:198 lib/command.php:198 -#: lib/command.php:191 lib/command.php:324 -#, php-format -msgid "Homepage: %s" +#: actions/public.php:182 +msgid "Be the first to post!" msgstr "" -#: classes/Command.php:178 classes/Command.php:201 lib/command.php:201 -#: lib/command.php:194 lib/command.php:327 +#: actions/public.php:186 #, php-format -msgid "About: %s" +msgid "" +"Why not [register an account](%%action.register%%) and be the first to post!" msgstr "" -#: classes/Command.php:200 classes/Command.php:228 lib/command.php:228 -#: lib/command.php:221 +#: actions/public.php:233 #, php-format -msgid "Message too long - maximum is 140 characters, you sent %d" +msgid "" +"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-" +"blogging) service based on the Free Software [StatusNet](http://status.net/) " +"tool. [Join now](%%action.register%%) to share notices about yourself with " +"friends, family, and colleagues! ([Read more](%%doc.help%%))" msgstr "" -#: classes/Command.php:214 classes/Command.php:245 lib/command.php:245 -#: actions/newmessage.php:182 lib/command.php:238 actions/newmessage.php:185 -#: lib/command.php:375 +#: actions/public.php:238 #, php-format -msgid "Direct message to %s sent" -msgstr "" - -#: classes/Command.php:216 classes/Command.php:247 lib/command.php:247 -#: lib/command.php:240 lib/command.php:377 -msgid "Error sending direct message." +msgid "" +"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-" +"blogging) service based on the Free Software [StatusNet](http://status.net/) " +"tool." msgstr "" -#: classes/Command.php:263 classes/Command.php:300 lib/command.php:300 -#: lib/command.php:293 lib/command.php:495 -msgid "Specify the name of the user to subscribe to" +#: actions/publictagcloud.php:57 +msgid "Public tag cloud" msgstr "" -#: classes/Command.php:270 classes/Command.php:307 lib/command.php:307 -#: lib/command.php:300 lib/command.php:502 +#: actions/publictagcloud.php:63 #, php-format -msgid "Subscribed to %s" -msgstr "" - -#: classes/Command.php:288 classes/Command.php:328 lib/command.php:328 -#: lib/command.php:321 lib/command.php:523 -msgid "Specify the name of the user to unsubscribe from" +msgid "These are most popular recent tags on %s " msgstr "" -#: classes/Command.php:295 classes/Command.php:335 lib/command.php:335 -#: lib/command.php:328 lib/command.php:530 +#: actions/publictagcloud.php:69 #, php-format -msgid "Unsubscribed from %s" -msgstr "" - -#: classes/Command.php:310 classes/Command.php:330 classes/Command.php:353 -#: classes/Command.php:376 lib/command.php:353 lib/command.php:376 -#: lib/command.php:346 lib/command.php:369 lib/command.php:548 -#: lib/command.php:571 -msgid "Command not yet implemented." +msgid "No one has posted a notice with a [hashtag](%%doc.tags%%) yet." msgstr "" -#: classes/Command.php:313 classes/Command.php:356 lib/command.php:356 -#: lib/command.php:349 lib/command.php:551 -msgid "Notification off." +#: actions/publictagcloud.php:72 +msgid "Be the first to post one!" msgstr "" -#: classes/Command.php:315 classes/Command.php:358 lib/command.php:358 -#: lib/command.php:351 lib/command.php:553 -msgid "Can't turn off notification." +#: actions/publictagcloud.php:75 +#, php-format +msgid "" +"Why not [register an account](%%action.register%%) and be the first to post " +"one!" msgstr "" -#: classes/Command.php:333 classes/Command.php:379 lib/command.php:379 -#: lib/command.php:372 lib/command.php:574 -msgid "Notification on." +#: actions/publictagcloud.php:135 +msgid "Tag cloud" msgstr "" -#: classes/Command.php:335 classes/Command.php:381 lib/command.php:381 -#: lib/command.php:374 lib/command.php:576 -msgid "Can't turn on notification." +#: actions/recoverpassword.php:36 +msgid "You are already logged in!" msgstr "" -#: classes/Command.php:344 classes/Command.php:392 -msgid "Commands:\n" +#: actions/recoverpassword.php:62 +msgid "No such recovery code." msgstr "" -#: classes/Message.php:53 classes/Message.php:56 classes/Message.php:55 -msgid "Could not insert message." +#: actions/recoverpassword.php:66 +msgid "Not a recovery code." msgstr "" -#: classes/Message.php:63 classes/Message.php:66 classes/Message.php:65 -msgid "Could not update message with new URI." +#: actions/recoverpassword.php:73 +msgid "Recovery code for unknown user." msgstr "" -#: lib/gallery.php:46 -msgid "User without matching profile in system." +#: actions/recoverpassword.php:86 +msgid "Error with confirmation code." msgstr "" -#: lib/mail.php:147 lib/mail.php:289 -#, php-format -msgid "" -"You have a new posting address on %1$s.\n" -"\n" +#: actions/recoverpassword.php:97 +msgid "This confirmation code is too old. Please start again." msgstr "" -#: lib/mail.php:249 lib/mail.php:508 lib/mail.php:509 -#, php-format -msgid "New private message from %s" +#: actions/recoverpassword.php:111 +msgid "Could not update user with confirmed email address." msgstr "" -#: lib/mail.php:253 lib/mail.php:512 -#, php-format +#: actions/recoverpassword.php:152 msgid "" -"%1$s (%2$s) sent you a private message:\n" -"\n" -msgstr "" - -#: lib/mailbox.php:43 lib/mailbox.php:89 lib/mailbox.php:91 -msgid "Only the user can read their own mailboxes." -msgstr "" - -#: lib/openid.php:195 lib/openid.php:203 -msgid "This form should automatically submit itself. " -msgstr "" - -#: lib/personal.php:65 lib/personalgroupnav.php:113 -#: lib/personalgroupnav.php:114 -msgid "Favorites" +"If you have forgotten or lost your password, you can get a new one sent to " +"the email address you have stored in your account." msgstr "" -#: lib/personal.php:66 lib/personalgroupnav.php:114 -#: actions/favoritesrss.php:110 actions/showfavorites.php:77 -#: lib/personalgroupnav.php:115 actions/favoritesrss.php:111 -#, php-format -msgid "%s's favorite notices" -msgstr "" - -#: lib/personal.php:66 lib/personalgroupnav.php:114 -#: lib/personalgroupnav.php:115 -msgid "User" +#: actions/recoverpassword.php:158 +msgid "You have been identified. Enter a new password below. " msgstr "" -#: lib/personal.php:75 lib/personalgroupnav.php:123 -#: lib/personalgroupnav.php:124 -msgid "Inbox" +#: actions/recoverpassword.php:188 +msgid "Password recovery" msgstr "" -#: lib/personal.php:76 lib/personalgroupnav.php:124 -#: lib/personalgroupnav.php:125 -msgid "Your incoming messages" +#: actions/recoverpassword.php:191 +msgid "Nickname or email address" msgstr "" -#: lib/personal.php:80 lib/personalgroupnav.php:128 -#: lib/personalgroupnav.php:129 -msgid "Outbox" +#: actions/recoverpassword.php:193 +msgid "Your nickname on this server, or your registered email address." msgstr "" -#: lib/personal.php:81 lib/personalgroupnav.php:129 -#: lib/personalgroupnav.php:130 -msgid "Your sent messages" +#: actions/recoverpassword.php:199 actions/recoverpassword.php:200 +msgid "Recover" msgstr "" -#: lib/settingsaction.php:99 lib/connectsettingsaction.php:110 -msgid "Twitter" +#: actions/recoverpassword.php:208 +msgid "Reset password" msgstr "" -#: lib/settingsaction.php:100 lib/connectsettingsaction.php:111 -msgid "Twitter integration options" +#: actions/recoverpassword.php:209 +msgid "Recover password" msgstr "" -#: lib/util.php:1718 lib/messageform.php:139 lib/noticelist.php:422 -#: lib/messageform.php:137 lib/noticelist.php:425 lib/messageform.php:135 -#: lib/noticelist.php:433 lib/messageform.php:146 -msgid "To" +#: actions/recoverpassword.php:210 actions/recoverpassword.php:322 +msgid "Password recovery requested" msgstr "" -#: scripts/maildaemon.php:45 scripts/maildaemon.php:48 -#: scripts/maildaemon.php:47 -msgid "Could not parse message." +#: actions/recoverpassword.php:213 +msgid "Unknown action" msgstr "" -#: actions/all.php:63 actions/facebookhome.php:162 actions/all.php:66 -#: actions/facebookhome.php:161 actions/all.php:48 -#: actions/facebookhome.php:156 actions/all.php:84 -#, php-format -msgid "%s and friends, page %d" +#: actions/recoverpassword.php:236 +msgid "6 or more characters, and don't forget it!" msgstr "" -#: actions/avatarsettings.php:76 -msgid "You can upload your personal avatar." +#: actions/recoverpassword.php:240 +msgid "Same as password above" msgstr "" -#: actions/avatarsettings.php:117 actions/avatarsettings.php:191 -#: actions/grouplogo.php:250 actions/avatarsettings.php:119 -#: actions/avatarsettings.php:194 actions/grouplogo.php:256 -#: actions/grouplogo.php:251 -msgid "Avatar settings" +#: actions/recoverpassword.php:243 +msgid "Reset" msgstr "" -#: actions/avatarsettings.php:124 actions/avatarsettings.php:199 -#: actions/grouplogo.php:198 actions/grouplogo.php:258 -#: actions/avatarsettings.php:126 actions/avatarsettings.php:202 -#: actions/grouplogo.php:204 actions/grouplogo.php:264 -#: actions/grouplogo.php:199 actions/grouplogo.php:259 -msgid "Original" +#: actions/recoverpassword.php:252 +msgid "Enter a nickname or email address." msgstr "" -#: actions/avatarsettings.php:139 actions/avatarsettings.php:211 -#: actions/grouplogo.php:209 actions/grouplogo.php:270 -#: actions/avatarsettings.php:141 actions/avatarsettings.php:214 -#: actions/grouplogo.php:215 actions/grouplogo.php:276 -#: actions/grouplogo.php:210 actions/grouplogo.php:271 -msgid "Preview" +#: actions/recoverpassword.php:272 +msgid "No user with that email address or username." msgstr "" -#: actions/avatarsettings.php:225 actions/grouplogo.php:284 -#: actions/avatarsettings.php:228 actions/grouplogo.php:291 -#: actions/grouplogo.php:286 -msgid "Crop" +#: actions/recoverpassword.php:287 +msgid "No registered email address for that user." msgstr "" -#: actions/avatarsettings.php:248 actions/deletenotice.php:133 -#: actions/emailsettings.php:224 actions/grouplogo.php:307 -#: actions/imsettings.php:200 actions/login.php:102 actions/newmessage.php:100 -#: actions/newnotice.php:96 actions/openidsettings.php:188 -#: actions/othersettings.php:136 actions/passwordsettings.php:131 -#: actions/profilesettings.php:172 actions/register.php:113 -#: actions/remotesubscribe.php:53 actions/smssettings.php:216 -#: actions/subedit.php:38 actions/twittersettings.php:290 -#: actions/userauthorization.php:39 -msgid "There was a problem with your session token. " +#: actions/recoverpassword.php:301 +msgid "Error saving address confirmation." msgstr "" -#: actions/avatarsettings.php:303 actions/grouplogo.php:360 -#: actions/avatarsettings.php:308 actions/avatarsettings.php:322 -msgid "Pick a square area of the image to be your avatar" +#: actions/recoverpassword.php:325 +msgid "" +"Instructions for recovering your password have been sent to the email " +"address registered to your account." msgstr "" -#: actions/avatarsettings.php:327 actions/grouplogo.php:384 -#: actions/avatarsettings.php:323 actions/grouplogo.php:382 -#: actions/grouplogo.php:377 actions/avatarsettings.php:337 -msgid "Lost our file data." +#: actions/recoverpassword.php:344 +msgid "Unexpected password reset." msgstr "" -#: actions/avatarsettings.php:334 actions/grouplogo.php:391 -#: classes/User_group.php:112 lib/imagefile.php:112 lib/imagefile.php:113 -#: lib/imagefile.php:118 -msgid "Lost our file." +#: actions/recoverpassword.php:352 +msgid "Password must be 6 chars or more." msgstr "" -#: actions/avatarsettings.php:349 actions/avatarsettings.php:383 -#: actions/grouplogo.php:406 actions/grouplogo.php:440 -#: classes/User_group.php:129 classes/User_group.php:161 lib/imagefile.php:144 -#: lib/imagefile.php:191 lib/imagefile.php:145 lib/imagefile.php:192 -#: lib/imagefile.php:150 lib/imagefile.php:197 -msgid "Unknown file type" +#: actions/recoverpassword.php:356 +msgid "Password and confirmation do not match." msgstr "" -#: actions/block.php:69 actions/subedit.php:46 actions/unblock.php:70 -#: actions/groupblock.php:71 actions/groupunblock.php:71 -#: actions/makeadmin.php:71 -msgid "No profile specified." +#: actions/recoverpassword.php:382 +msgid "New password successfully saved. You are now logged in." msgstr "" -#: actions/block.php:74 actions/subedit.php:53 actions/tagother.php:46 -#: actions/unblock.php:75 actions/groupblock.php:76 -#: actions/groupunblock.php:76 actions/makeadmin.php:76 -msgid "No profile with that ID." +#: actions/register.php:85 actions/register.php:189 actions/register.php:404 +msgid "Sorry. Only those invited can register." msgstr "" -#: actions/block.php:111 actions/block.php:134 -msgid "Block user" +#: actions/register.php:92 +msgid "Sorry. This is an invalid invitation code." msgstr "" -#: actions/block.php:129 -msgid "Are you sure you want to block this user? " +#: actions/register.php:112 +msgid "Registration successful" msgstr "" -#: actions/block.php:162 actions/block.php:165 -msgid "You have already blocked this user." +#: actions/register.php:114 actions/register.php:502 lib/action.php:450 +#: lib/logingroupnav.php:85 +msgid "Register" msgstr "" -#: actions/block.php:167 actions/block.php:170 -msgid "Failed to save block information." +#: actions/register.php:135 +msgid "Registration not allowed." msgstr "" -#: actions/confirmaddress.php:159 -#, php-format -msgid "The address \"%s\" has been " +#: actions/register.php:198 +msgid "You can't register if you don't agree to the license." msgstr "" -#: actions/deletenotice.php:73 -msgid "You are about to permanently delete a notice. " +#: actions/register.php:201 +msgid "Not a valid email address." msgstr "" -#: actions/disfavor.php:94 -msgid "Add to favorites" +#: actions/register.php:212 +msgid "Email address already exists." msgstr "" -#: actions/editgroup.php:54 actions/editgroup.php:56 -#, php-format -msgid "Edit %s group" +#: actions/register.php:243 actions/register.php:264 +msgid "Invalid username or password." msgstr "" -#: actions/editgroup.php:66 actions/groupbyid.php:72 actions/grouplogo.php:66 -#: actions/joingroup.php:60 actions/newgroup.php:65 actions/showgroup.php:100 -#: actions/grouplogo.php:70 actions/grouprss.php:80 actions/editgroup.php:68 -#: actions/groupdesignsettings.php:68 actions/showgroup.php:105 -msgid "Inboxes must be enabled for groups to work" +#: actions/register.php:342 +msgid "" +"With this form you can create a new account. You can then post notices and " +"link up to friends and colleagues. " msgstr "" -#: actions/editgroup.php:71 actions/grouplogo.php:71 actions/newgroup.php:70 -#: actions/grouplogo.php:75 actions/editgroup.php:73 actions/editgroup.php:68 -#: actions/grouplogo.php:70 actions/newgroup.php:65 -msgid "You must be logged in to create a group." +#: actions/register.php:424 +msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required." msgstr "" -#: actions/editgroup.php:87 actions/grouplogo.php:87 -#: actions/groupmembers.php:76 actions/joingroup.php:81 -#: actions/showgroup.php:121 actions/grouplogo.php:91 actions/grouprss.php:96 -#: actions/blockedfromgroup.php:73 actions/editgroup.php:89 -#: actions/groupdesignsettings.php:89 actions/showgroup.php:126 -#: actions/editgroup.php:84 actions/groupdesignsettings.php:84 -#: actions/grouplogo.php:86 actions/grouprss.php:91 actions/joingroup.php:76 -msgid "No nickname" +#: actions/register.php:429 +msgid "6 or more characters. Required." msgstr "" -#: actions/editgroup.php:99 actions/groupbyid.php:88 actions/grouplogo.php:100 -#: actions/groupmembers.php:83 actions/joingroup.php:88 -#: actions/showgroup.php:128 actions/grouplogo.php:104 -#: actions/grouprss.php:103 actions/blockedfromgroup.php:80 -#: actions/editgroup.php:101 actions/groupdesignsettings.php:102 -#: actions/showgroup.php:133 actions/editgroup.php:96 actions/groupbyid.php:83 -#: actions/groupdesignsettings.php:97 actions/grouplogo.php:99 -#: actions/grouprss.php:98 actions/joingroup.php:83 actions/showgroup.php:137 -msgid "No such group" +#: actions/register.php:433 +msgid "Same as password above. Required." msgstr "" -#: actions/editgroup.php:106 actions/editgroup.php:165 -#: actions/grouplogo.php:107 actions/grouplogo.php:111 -#: actions/editgroup.php:108 actions/editgroup.php:167 -#: actions/groupdesignsettings.php:109 actions/editgroup.php:103 -#: actions/editgroup.php:168 actions/groupdesignsettings.php:104 -#: actions/grouplogo.php:106 -msgid "You must be an admin to edit the group" +#: actions/register.php:437 actions/register.php:441 +#: lib/accountsettingsaction.php:117 +msgid "Email" msgstr "" -#: actions/editgroup.php:157 actions/editgroup.php:159 -#: actions/editgroup.php:154 -msgid "Use this form to edit the group." +#: actions/register.php:438 actions/register.php:442 +msgid "Used only for updates, announcements, and password recovery" msgstr "" -#: actions/editgroup.php:179 actions/newgroup.php:130 actions/register.php:156 -msgid "Nickname must have only lowercase letters " +#: actions/register.php:449 +msgid "Longer name, preferably your \"real\" name" msgstr "" -#: actions/editgroup.php:198 actions/newgroup.php:149 -#: actions/editgroup.php:200 actions/newgroup.php:150 -msgid "description is too long (max 140 chars)." +#: actions/register.php:493 +msgid "My text and files are available under " msgstr "" -#: actions/editgroup.php:218 actions/editgroup.php:253 -msgid "Could not update group." +#: actions/register.php:495 +msgid "Creative Commons Attribution 3.0" msgstr "" -#: actions/editgroup.php:226 actions/editgroup.php:269 -msgid "Options saved." +#: actions/register.php:496 +msgid "" +" except this private data: password, email address, IM address, and phone " +"number." msgstr "" -#: actions/emailsettings.php:107 actions/imsettings.php:108 +#: actions/register.php:537 #, php-format -msgid "Awaiting confirmation on this address. " -msgstr "" - -#: actions/emailsettings.php:139 actions/smssettings.php:150 -msgid "Make a new email address for posting to; " -msgstr "" - -#: actions/emailsettings.php:157 -msgid "Send me email when someone " +msgid "" +"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may " +"want to...\n" +"\n" +"* 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 " +"share your interests. \n" +"* Update your [profile settings](%%%%action.profilesettings%%%%) to tell " +"others more about you. \n" +"* Read over the [online docs](%%%%doc.help%%%%) for features you may have " +"missed. \n" +"\n" +"Thanks for signing up and we hope you enjoy using this service." msgstr "" -#: actions/emailsettings.php:168 actions/emailsettings.php:173 -#: actions/emailsettings.php:179 -msgid "Allow friends to nudge me and send me an email." +#: actions/register.php:561 +msgid "" +"(You should receive a message by email momentarily, with instructions on how " +"to confirm your email address.)" msgstr "" -#: actions/emailsettings.php:321 -msgid "That email address already belongs " +#: actions/remotesubscribe.php:98 +#, php-format +msgid "" +"To subscribe, you can [login](%%action.login%%), or [register](%%action." +"register%%) a new account. If you already have an account on a [compatible " +"microblogging site](%%doc.openmublog%%), enter your profile URL below." msgstr "" -#: actions/emailsettings.php:343 -msgid "A confirmation code was sent to the email address you added. " +#: actions/remotesubscribe.php:112 +msgid "Remote subscribe" msgstr "" -#: actions/facebookhome.php:110 actions/facebookhome.php:109 -msgid "Server error - couldn't get user!" +#: actions/remotesubscribe.php:124 +msgid "Subscribe to a remote user" msgstr "" -#: actions/facebookhome.php:196 -#, php-format -msgid "If you would like the %s app to automatically update " +#: actions/remotesubscribe.php:129 +msgid "User nickname" msgstr "" -#: actions/facebookhome.php:213 actions/facebooksettings.php:137 -#, php-format -msgid "Allow %s to update my Facebook status" +#: actions/remotesubscribe.php:130 +msgid "Nickname of the user you want to follow" msgstr "" -#: actions/facebookhome.php:218 actions/facebookhome.php:223 -#: actions/facebookhome.php:217 -msgid "Skip" +#: actions/remotesubscribe.php:133 +msgid "Profile URL" msgstr "" -#: actions/facebookhome.php:235 lib/facebookaction.php:479 -#: lib/facebookaction.php:471 -msgid "No notice content!" +#: actions/remotesubscribe.php:134 +msgid "URL of your profile on another compatible microblogging service" msgstr "" -#: actions/facebookhome.php:295 lib/action.php:870 lib/facebookaction.php:399 -#: actions/facebookhome.php:253 lib/action.php:973 lib/facebookaction.php:433 -#: actions/facebookhome.php:247 lib/action.php:1037 lib/facebookaction.php:435 -#: lib/action.php:1053 -msgid "Pagination" +#: actions/remotesubscribe.php:137 lib/subscribeform.php:139 +#: lib/userprofile.php:321 +msgid "Subscribe" msgstr "" -#: actions/facebookhome.php:304 lib/action.php:879 lib/facebookaction.php:408 -#: actions/facebookhome.php:262 lib/action.php:982 lib/facebookaction.php:442 -#: actions/facebookhome.php:256 lib/action.php:1046 lib/facebookaction.php:444 -#: lib/action.php:1062 -msgid "After" +#: actions/remotesubscribe.php:159 +msgid "Invalid profile URL (bad format)" msgstr "" -#: actions/facebookhome.php:312 lib/action.php:887 lib/facebookaction.php:416 -#: actions/facebookhome.php:270 lib/action.php:990 lib/facebookaction.php:450 -#: actions/facebookhome.php:264 lib/action.php:1054 lib/facebookaction.php:452 -#: lib/action.php:1070 -msgid "Before" +#: actions/remotesubscribe.php:168 +msgid "" +"Not a valid profile URL (no YADIS document or no or invalid XRDS defined)." msgstr "" -#: actions/facebookinvite.php:70 actions/facebookinvite.php:72 -#, php-format -msgid "Thanks for inviting your friends to use %s" +#: actions/remotesubscribe.php:176 +msgid "That’s a local profile! Login to subscribe." msgstr "" -#: actions/facebookinvite.php:72 actions/facebookinvite.php:74 -msgid "Invitations have been sent to the following users:" +#: actions/remotesubscribe.php:183 +msgid "Couldn’t get a request token." msgstr "" -#: actions/facebookinvite.php:96 actions/facebookinvite.php:102 -#: actions/facebookinvite.php:94 +#: actions/replies.php:125 actions/repliesrss.php:68 +#: lib/personalgroupnav.php:105 #, php-format -msgid "You have been invited to %s" +msgid "Replies to %s" msgstr "" -#: actions/facebookinvite.php:105 actions/facebookinvite.php:111 -#: actions/facebookinvite.php:103 +#: actions/replies.php:127 #, php-format -msgid "Invite your friends to use %s" +msgid "Replies to %s, page %d" msgstr "" -#: actions/facebookinvite.php:113 actions/facebookinvite.php:126 -#: actions/facebookinvite.php:124 +#: actions/replies.php:144 #, php-format -msgid "Friends already using %s:" +msgid "Replies feed for %s (RSS 1.0)" msgstr "" -#: actions/facebookinvite.php:130 actions/facebookinvite.php:143 -#: actions/facebookinvite.php:142 +#: actions/replies.php:151 #, php-format -msgid "Send invitations" -msgstr "" - -#: actions/facebookremove.php:56 -msgid "Couldn't remove Facebook user." -msgstr "" - -#: actions/facebooksettings.php:65 -msgid "There was a problem saving your sync preferences!" -msgstr "" - -#: actions/facebooksettings.php:67 -msgid "Sync preferences saved." -msgstr "" - -#: actions/facebooksettings.php:90 -msgid "Automatically update my Facebook status with my notices." -msgstr "" - -#: actions/facebooksettings.php:97 -msgid "Send \"@\" replies to Facebook." -msgstr "" - -#: actions/facebooksettings.php:106 -msgid "Prefix" -msgstr "" - -#: actions/facebooksettings.php:108 -msgid "A string to prefix notices with." +msgid "Replies feed for %s (RSS 2.0)" msgstr "" -#: actions/facebooksettings.php:124 +#: actions/replies.php:158 #, php-format -msgid "If you would like %s to automatically update " -msgstr "" - -#: actions/facebooksettings.php:147 -msgid "Sync preferences" -msgstr "" - -#: actions/favor.php:94 lib/disfavorform.php:140 actions/favor.php:92 -msgid "Disfavor favorite" -msgstr "" - -#: actions/favorited.php:65 lib/popularnoticesection.php:76 -#: lib/publicgroupnav.php:91 lib/popularnoticesection.php:82 -#: lib/publicgroupnav.php:93 lib/popularnoticesection.php:91 -#: lib/popularnoticesection.php:87 -msgid "Popular notices" +msgid "Replies feed for %s (Atom)" msgstr "" -#: actions/favorited.php:67 +#: actions/replies.php:198 #, php-format -msgid "Popular notices, page %d" -msgstr "" - -#: actions/favorited.php:79 -msgid "The most popular notices on the site right now." -msgstr "" - -#: actions/featured.php:69 lib/featureduserssection.php:82 -#: lib/publicgroupnav.php:87 lib/publicgroupnav.php:89 -#: lib/featureduserssection.php:87 -msgid "Featured users" +msgid "" +"This is the timeline showing replies to %s but %s has not received a notice " +"to his attention yet." msgstr "" -#: actions/featured.php:71 +#: actions/replies.php:203 #, php-format -msgid "Featured users, page %d" +msgid "" +"You can engage other users in a conversation, subscribe to more users or " +"[join groups](%%action.groups%%)." msgstr "" -#: actions/featured.php:99 +#: actions/replies.php:205 #, php-format -msgid "A selection of some of the great users on %s" -msgstr "" - -#: actions/finishremotesubscribe.php:188 actions/finishremotesubscribe.php:96 -msgid "That user has blocked you from subscribing." -msgstr "" - -#: actions/groupbyid.php:79 actions/groupbyid.php:74 -msgid "No ID" -msgstr "" - -#: actions/grouplogo.php:138 actions/grouplogo.php:191 -#: actions/grouplogo.php:144 actions/grouplogo.php:197 -#: actions/grouplogo.php:139 actions/grouplogo.php:192 -msgid "Group logo" -msgstr "" - -#: actions/grouplogo.php:149 -msgid "You can upload a logo image for your group." -msgstr "" - -#: actions/grouplogo.php:448 actions/grouplogo.php:401 -#: actions/grouplogo.php:396 -msgid "Logo updated." -msgstr "" - -#: actions/grouplogo.php:450 actions/grouplogo.php:403 -#: actions/grouplogo.php:398 -msgid "Failed updating logo." +msgid "" +"You can try to [nudge %s](../%s) or [post something to his or her attention]" +"(%%%%action.newnotice%%%%?status_textarea=%s)." msgstr "" -#: actions/groupmembers.php:93 lib/groupnav.php:91 +#: actions/repliesrss.php:72 #, php-format -msgid "%s group members" +msgid "Replies to %1$s on %2$s!" msgstr "" -#: actions/groupmembers.php:96 +#: actions/showfavorites.php:79 #, php-format -msgid "%s group members, page %d" -msgstr "" - -#: actions/groupmembers.php:111 -msgid "A list of the users in this group." +msgid "%s's favorite notices, page %d" msgstr "" -#: actions/groups.php:62 actions/showstream.php:518 lib/publicgroupnav.php:79 -#: lib/subgroupnav.php:96 lib/publicgroupnav.php:81 lib/profileaction.php:220 -#: lib/subgroupnav.php:98 -msgid "Groups" +#: actions/showfavorites.php:132 +msgid "Could not retrieve favorite notices." msgstr "" -#: actions/groups.php:64 +#: actions/showfavorites.php:170 #, php-format -msgid "Groups, page %d" +msgid "Feed for favorites of %s (RSS 1.0)" msgstr "" -#: actions/groups.php:90 +#: actions/showfavorites.php:177 #, php-format -msgid "%%%%site.name%%%% groups let you find and talk with " -msgstr "" - -#: actions/groups.php:106 actions/usergroups.php:124 lib/groupeditform.php:123 -#: actions/usergroups.php:125 actions/groups.php:107 lib/groupeditform.php:122 -msgid "Create a new group" +msgid "Feed for favorites of %s (RSS 2.0)" msgstr "" -#: actions/groupsearch.php:57 +#: actions/showfavorites.php:184 #, php-format -msgid "" -"Search for groups on %%site.name%% by their name, location, or description. " -msgstr "" - -#: actions/groupsearch.php:63 actions/groupsearch.php:58 -msgid "Group search" +msgid "Feed for favorites of %s (Atom)" msgstr "" -#: actions/imsettings.php:70 -msgid "You can send and receive notices through " +#: actions/showfavorites.php:205 +msgid "" +"You haven't chosen any favorite notices yet. Click the fave button on " +"notices you like to bookmark them for later or shed a spotlight on them." msgstr "" -#: actions/imsettings.php:120 +#: actions/showfavorites.php:207 #, php-format -msgid "Jabber or GTalk address, " -msgstr "" - -#: actions/imsettings.php:147 -msgid "Send me replies through Jabber/GTalk " +msgid "" +"%s hasn't added any notices to his favorites yet. Post something interesting " +"they would add to their favorites :)" msgstr "" -#: actions/imsettings.php:321 +#: actions/showfavorites.php:211 #, php-format -msgid "A confirmation code was sent " -msgstr "" - -#: actions/joingroup.php:65 actions/joingroup.php:60 -msgid "You must be logged in to join a group." +msgid "" +"%s hasn't added any notices to his favorites yet. Why not [register an " +"account](%%%%action.register%%%%) and then post something interesting they " +"would add to their favorites :)" msgstr "" -#: actions/joingroup.php:95 actions/joingroup.php:90 lib/command.php:217 -msgid "You are already a member of that group" +#: actions/showfavorites.php:242 +msgid "This is a way to share what you like." msgstr "" -#: actions/joingroup.php:128 actions/joingroup.php:133 lib/command.php:234 +#: actions/showgroup.php:82 lib/groupnav.php:85 #, php-format -msgid "Could not join user %s to group %s" +msgid "%s group" msgstr "" -#: actions/joingroup.php:135 actions/joingroup.php:140 lib/command.php:239 +#: actions/showgroup.php:84 #, php-format -msgid "%s joined group %s" -msgstr "" - -#: actions/leavegroup.php:60 -msgid "Inboxes must be enabled for groups to work." +msgid "%s group, page %d" msgstr "" -#: actions/leavegroup.php:65 actions/leavegroup.php:60 -msgid "You must be logged in to leave a group." +#: actions/showgroup.php:218 +msgid "Group profile" msgstr "" -#: actions/leavegroup.php:88 actions/groupblock.php:86 -#: actions/groupunblock.php:86 actions/makeadmin.php:86 -#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/leavegroup.php:83 -#: lib/command.php:212 lib/command.php:263 -msgid "No such group." +#: actions/showgroup.php:263 actions/tagother.php:118 +#: actions/userauthorization.php:167 lib/userprofile.php:177 +msgid "URL" msgstr "" -#: actions/leavegroup.php:95 actions/leavegroup.php:90 lib/command.php:268 -msgid "You are not a member of that group." +#: actions/showgroup.php:274 actions/tagother.php:128 +#: actions/userauthorization.php:179 lib/userprofile.php:194 +msgid "Note" msgstr "" -#: actions/leavegroup.php:100 -msgid "You may not leave a group while you are its administrator." +#: actions/showgroup.php:284 lib/groupeditform.php:184 +msgid "Aliases" msgstr "" -#: actions/leavegroup.php:130 actions/leavegroup.php:124 -#: actions/leavegroup.php:119 lib/command.php:278 -msgid "Could not find membership record." +#: actions/showgroup.php:293 +msgid "Group actions" msgstr "" -#: actions/leavegroup.php:138 actions/leavegroup.php:132 -#: actions/leavegroup.php:127 lib/command.php:284 +#: actions/showgroup.php:328 #, php-format -msgid "Could not remove user %s to group %s" +msgid "Notice feed for %s group (RSS 1.0)" msgstr "" -#: actions/leavegroup.php:145 actions/leavegroup.php:139 -#: actions/leavegroup.php:134 lib/command.php:289 +#: actions/showgroup.php:334 #, php-format -msgid "%s left group %s" -msgstr "" - -#: actions/login.php:225 lib/facebookaction.php:304 actions/login.php:208 -#: actions/login.php:216 actions/login.php:243 -msgid "Login to site" -msgstr "" - -#: actions/microsummary.php:69 -msgid "No current status" -msgstr "" - -#: actions/newgroup.php:53 -msgid "New group" +msgid "Notice feed for %s group (RSS 2.0)" msgstr "" -#: actions/newgroup.php:115 actions/newgroup.php:110 -msgid "Use this form to create a new group." +#: actions/showgroup.php:340 +#, php-format +msgid "Notice feed for %s group (Atom)" msgstr "" -#: actions/newgroup.php:177 actions/newgroup.php:209 -#: actions/apigroupcreate.php:136 actions/newgroup.php:204 -msgid "Could not create group." +#: actions/showgroup.php:345 +#, php-format +msgid "FOAF for %s group" msgstr "" -#: actions/newgroup.php:191 actions/newgroup.php:229 -#: actions/apigroupcreate.php:166 actions/newgroup.php:224 -msgid "Could not set group membership." +#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:90 +msgid "Members" msgstr "" -#: actions/newmessage.php:119 actions/newnotice.php:132 -msgid "That's too long. " +#: actions/showgroup.php:386 lib/profileaction.php:117 +#: lib/profileaction.php:148 lib/profileaction.php:226 lib/section.php:95 +#: lib/tagcloudsection.php:71 +msgid "(None)" msgstr "" -#: actions/newmessage.php:134 -msgid "Don't send a message to yourself; " +#: actions/showgroup.php:392 +msgid "All members" msgstr "" -#: actions/newnotice.php:166 actions/newnotice.php:174 -#: actions/newnotice.php:272 actions/newnotice.php:199 -msgid "Notice posted" +#: actions/showgroup.php:429 lib/profileaction.php:173 +msgid "Statistics" msgstr "" -#: actions/newnotice.php:200 classes/Channel.php:163 actions/newnotice.php:208 -#: lib/channel.php:170 actions/newmessage.php:207 actions/newnotice.php:387 -#: actions/newmessage.php:210 actions/newnotice.php:233 -msgid "Ajax Error" +#: actions/showgroup.php:432 +msgid "Created" msgstr "" -#: actions/nudge.php:85 +#: actions/showgroup.php:448 +#, php-format msgid "" -"This user doesn't allow nudges or hasn't confirmed or set his email yet." -msgstr "" - -#: actions/nudge.php:94 -msgid "Nudge sent" -msgstr "" - -#: actions/nudge.php:97 -msgid "Nudge sent!" -msgstr "" - -#: actions/openidlogin.php:97 actions/openidlogin.php:106 -msgid "OpenID login" -msgstr "" - -#: actions/openidsettings.php:128 -msgid "Removing your only OpenID " -msgstr "" - -#: actions/othersettings.php:60 -msgid "Other Settings" +"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." +"wikipedia.org/wiki/Micro-blogging) service based on the Free Software " +"[StatusNet](http://status.net/) tool. Its members share short messages about " +"their life and interests. [Join now](%%%%action.register%%%%) to become part " +"of this group and many more! ([Read more](%%%%doc.help%%%%))" msgstr "" -#: actions/othersettings.php:71 -msgid "Manage various other options." +#: actions/showgroup.php:454 +#, php-format +msgid "" +"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." +"wikipedia.org/wiki/Micro-blogging) service based on the Free Software " +"[StatusNet](http://status.net/) tool. Its members share short messages about " +"their life and interests. " msgstr "" -#: actions/othersettings.php:93 -msgid "URL Auto-shortening" +#: actions/showgroup.php:482 +msgid "Admins" msgstr "" -#: actions/othersettings.php:112 -msgid "Service" +#: actions/showmessage.php:81 +msgid "No such message." msgstr "" -#: actions/othersettings.php:113 actions/othersettings.php:111 -#: actions/othersettings.php:118 -msgid "Automatic shortening service to use." +#: actions/showmessage.php:98 +msgid "Only the sender and recipient may read this message." msgstr "" -#: actions/othersettings.php:144 actions/othersettings.php:146 -#: actions/othersettings.php:153 -msgid "URL shortening service is too long (max 50 chars)." +#: actions/showmessage.php:108 +#, php-format +msgid "Message to %1$s on %2$s" msgstr "" -#: actions/passwordsettings.php:69 -msgid "Change your password." +#: actions/showmessage.php:113 +#, php-format +msgid "Message from %1$s on %2$s" msgstr "" -#: actions/passwordsettings.php:89 actions/recoverpassword.php:228 -#: actions/passwordsettings.php:95 actions/recoverpassword.php:231 -msgid "Password change" +#: actions/shownotice.php:90 +msgid "Notice deleted." msgstr "" -#: actions/peopletag.php:35 actions/peopletag.php:70 +#: actions/showstream.php:73 #, php-format -msgid "Not a valid people tag: %s" +msgid " tagged %s" msgstr "" -#: actions/peopletag.php:47 actions/peopletag.php:144 +#: actions/showstream.php:79 #, php-format -msgid "Users self-tagged with %s - page %d" +msgid "%s, page %d" msgstr "" -#: actions/peopletag.php:91 +#: actions/showstream.php:122 #, php-format -msgid "These are users who have tagged themselves \"%s\" " -msgstr "" - -#: actions/profilesettings.php:91 actions/profilesettings.php:99 -msgid "Profile information" -msgstr "" - -#: actions/profilesettings.php:124 actions/profilesettings.php:125 -#: actions/profilesettings.php:140 -msgid "" -"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated" -msgstr "" - -#: actions/profilesettings.php:144 -msgid "Automatically subscribe to whoever " +msgid "Notice feed for %s tagged %s (RSS 1.0)" msgstr "" -#: actions/profilesettings.php:229 actions/tagother.php:176 -#: actions/tagother.php:178 actions/profilesettings.php:230 -#: actions/profilesettings.php:246 +#: actions/showstream.php:129 #, php-format -msgid "Invalid tag: \"%s\"" -msgstr "" - -#: actions/profilesettings.php:311 actions/profilesettings.php:310 -#: actions/profilesettings.php:336 -msgid "Couldn't save tags." +msgid "Notice feed for %s (RSS 1.0)" msgstr "" -#: actions/public.php:107 actions/public.php:110 actions/public.php:118 -#: actions/public.php:129 +#: actions/showstream.php:136 #, php-format -msgid "Public timeline, page %d" -msgstr "" - -#: actions/public.php:173 actions/public.php:184 actions/public.php:210 -#: actions/public.php:92 -msgid "Could not retrieve public stream." +msgid "Notice feed for %s (RSS 2.0)" msgstr "" -#: actions/public.php:220 +#: actions/showstream.php:143 #, php-format -msgid "" -"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-" -"blogging) service " -msgstr "" - -#: actions/publictagcloud.php:57 -msgid "Public tag cloud" +msgid "Notice feed for %s (Atom)" msgstr "" -#: actions/publictagcloud.php:63 +#: actions/showstream.php:148 #, php-format -msgid "These are most popular recent tags on %s " -msgstr "" - -#: actions/publictagcloud.php:119 actions/publictagcloud.php:135 -msgid "Tag cloud" -msgstr "" - -#: actions/register.php:139 actions/register.php:349 actions/register.php:79 -#: actions/register.php:177 actions/register.php:394 actions/register.php:183 -#: actions/register.php:398 actions/register.php:85 actions/register.php:189 -#: actions/register.php:404 -msgid "Sorry, only invited people can register." -msgstr "" - -#: actions/register.php:149 -msgid "You can't register if you don't " -msgstr "" - -#: actions/register.php:286 -msgid "With this form you can create " -msgstr "" - -#: actions/register.php:368 -msgid "1-64 lowercase letters or numbers, " -msgstr "" - -#: actions/register.php:382 actions/register.php:386 -msgid "Used only for updates, announcements, " -msgstr "" - -#: actions/register.php:398 -msgid "URL of your homepage, blog, " -msgstr "" - -#: actions/register.php:404 -msgid "Describe yourself and your " -msgstr "" - -#: actions/register.php:410 -msgid "Where you are, like \"City, " -msgstr "" - -#: actions/register.php:432 -msgid " except this private data: password, " +msgid "FOAF for %s" msgstr "" -#: actions/register.php:471 +#: actions/showstream.php:191 #, php-format -msgid "Congratulations, %s! And welcome to %%%%site.name%%%%. " +msgid "This is the timeline for %s but %s hasn't posted anything yet." msgstr "" -#: actions/register.php:495 -msgid "(You should receive a message by email " +#: actions/showstream.php:196 +msgid "" +"Seen anything interesting recently? You haven't posted any notices yet, now " +"would be a good time to start :)" msgstr "" -#: actions/remotesubscribe.php:166 actions/remotesubscribe.php:171 -msgid "That's a local profile! Login to subscribe." +#: actions/showstream.php:198 +#, php-format +msgid "" +"You can try to nudge %s or [post something to his or her attention](%%%%" +"action.newnotice%%%%?status_textarea=%s)." msgstr "" -#: actions/replies.php:118 actions/replies.php:120 actions/replies.php:119 -#: actions/replies.php:127 +#: actions/showstream.php:234 #, php-format -msgid "Replies to %s, page %d" +msgid "" +"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en." +"wikipedia.org/wiki/Micro-blogging) service based on the Free Software " +"[StatusNet](http://status.net/) tool. [Join now](%%%%action.register%%%%) to " +"follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))" msgstr "" -#: actions/showfavorites.php:79 +#: actions/showstream.php:239 #, php-format -msgid "%s favorite notices, page %d" +msgid "" +"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en." +"wikipedia.org/wiki/Micro-blogging) service based on the Free Software " +"[StatusNet](http://status.net/) tool. " msgstr "" -#: actions/showgroup.php:77 lib/groupnav.php:85 actions/showgroup.php:82 -#, php-format -msgid "%s group" +#: actions/smssettings.php:58 +msgid "SMS Settings" msgstr "" -#: actions/showgroup.php:79 actions/showgroup.php:84 +#: actions/smssettings.php:69 #, php-format -msgid "%s group, page %d" +msgid "You can receive SMS messages through email from %%site.name%%." msgstr "" -#: actions/showgroup.php:206 actions/showgroup.php:208 -#: actions/showgroup.php:213 actions/showgroup.php:218 -msgid "Group profile" +#: actions/smssettings.php:91 +msgid "SMS is not available." msgstr "" -#: actions/showgroup.php:251 actions/showstream.php:278 -#: actions/tagother.php:119 lib/grouplist.php:134 lib/profilelist.php:133 -#: actions/showgroup.php:253 actions/showstream.php:271 -#: actions/tagother.php:118 lib/profilelist.php:131 actions/showgroup.php:258 -#: actions/showstream.php:236 actions/userauthorization.php:137 -#: lib/profilelist.php:197 actions/showgroup.php:263 -#: actions/showstream.php:295 actions/userauthorization.php:167 -#: lib/profilelist.php:230 lib/userprofile.php:177 -msgid "URL" +#: actions/smssettings.php:104 +msgid "SMS address" msgstr "" -#: actions/showgroup.php:262 actions/showstream.php:289 -#: actions/tagother.php:129 lib/grouplist.php:145 lib/profilelist.php:144 -#: actions/showgroup.php:264 actions/showstream.php:282 -#: actions/tagother.php:128 lib/profilelist.php:142 actions/showgroup.php:269 -#: actions/showstream.php:247 actions/userauthorization.php:149 -#: lib/profilelist.php:212 actions/showgroup.php:274 -#: actions/showstream.php:312 actions/userauthorization.php:179 -#: lib/profilelist.php:245 lib/userprofile.php:194 -msgid "Note" +#: actions/smssettings.php:112 +msgid "Current confirmed SMS-enabled phone number." msgstr "" -#: actions/showgroup.php:270 actions/showgroup.php:272 -#: actions/showgroup.php:288 actions/showgroup.php:293 -msgid "Group actions" +#: actions/smssettings.php:123 +msgid "Awaiting confirmation on this phone number." msgstr "" -#: actions/showgroup.php:323 actions/showgroup.php:304 -#, php-format -msgid "Notice feed for %s group" +#: actions/smssettings.php:130 +msgid "Confirmation code" msgstr "" -#: actions/showgroup.php:357 lib/groupnav.php:90 actions/showgroup.php:339 -#: actions/showgroup.php:384 actions/showgroup.php:373 -#: actions/showgroup.php:430 actions/showgroup.php:381 -#: actions/showgroup.php:438 -msgid "Members" +#: actions/smssettings.php:131 +msgid "Enter the code you received on your phone." msgstr "" -#: actions/showgroup.php:363 actions/showstream.php:413 -#: actions/showstream.php:442 actions/showstream.php:524 lib/section.php:95 -#: lib/tagcloudsection.php:71 actions/showgroup.php:344 -#: actions/showgroup.php:378 lib/profileaction.php:117 -#: lib/profileaction.php:148 lib/profileaction.php:226 -#: actions/showgroup.php:386 -msgid "(None)" +#: actions/smssettings.php:138 +msgid "SMS Phone number" msgstr "" -#: actions/showgroup.php:370 actions/showgroup.php:350 -#: actions/showgroup.php:384 actions/showgroup.php:392 -msgid "All members" +#: actions/smssettings.php:140 +msgid "Phone number, no punctuation or spaces, with area code" msgstr "" -#: actions/showgroup.php:378 -#, php-format +#: actions/smssettings.php:174 msgid "" -"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." -"wikipedia.org/wiki/Micro-blogging) service " -msgstr "" - -#: actions/showmessage.php:98 -msgid "Only the sender and recipient " +"Send me notices through SMS; I understand I may incur exorbitant charges " +"from my carrier." msgstr "" -#: actions/showstream.php:73 actions/showstream.php:78 -#: actions/showstream.php:79 -#, php-format -msgid "%s, page %d" +#: actions/smssettings.php:306 +msgid "No phone number." msgstr "" -#: actions/showstream.php:143 -msgid "'s profile" +#: actions/smssettings.php:311 +msgid "No carrier selected." msgstr "" -#: actions/showstream.php:236 actions/tagother.php:77 -#: actions/showstream.php:220 actions/showstream.php:185 -#: actions/showstream.php:193 lib/userprofile.php:75 -msgid "User profile" +#: actions/smssettings.php:318 +msgid "That is already your phone number." msgstr "" -#: actions/showstream.php:240 actions/tagother.php:81 -#: actions/showstream.php:224 actions/showstream.php:189 -#: actions/showstream.php:220 lib/userprofile.php:102 -msgid "Photo" +#: actions/smssettings.php:321 +msgid "That phone number already belongs to another user." msgstr "" -#: actions/showstream.php:317 actions/showstream.php:309 -#: actions/showstream.php:274 actions/showstream.php:354 -#: lib/userprofile.php:236 -msgid "User actions" +#: actions/smssettings.php:347 +msgid "" +"A confirmation code was sent to the phone number you added. Check your phone " +"for the code and instructions on how to use it." msgstr "" -#: actions/showstream.php:342 actions/showstream.php:307 -#: actions/showstream.php:390 lib/userprofile.php:272 -msgid "Send a direct message to this user" +#: actions/smssettings.php:374 +msgid "That is the wrong confirmation number." msgstr "" -#: actions/showstream.php:343 actions/showstream.php:308 -#: actions/showstream.php:391 lib/userprofile.php:273 -msgid "Message" +#: actions/smssettings.php:405 +msgid "That is not your phone number." msgstr "" -#: actions/showstream.php:451 lib/profileaction.php:157 -msgid "All subscribers" +#: actions/smssettings.php:465 +msgid "Mobile carrier" msgstr "" -#: actions/showstream.php:533 lib/profileaction.php:235 -msgid "All groups" +#: actions/smssettings.php:469 +msgid "Select a carrier" msgstr "" -#: actions/showstream.php:542 +#: actions/smssettings.php:476 #, php-format msgid "" -"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en." -"wikipedia.org/wiki/Micro-blogging) service " -msgstr "" - -#: actions/smssettings.php:128 -msgid "Phone number, no punctuation or spaces, " -msgstr "" - -#: actions/smssettings.php:162 -msgid "Send me notices through SMS; " -msgstr "" - -#: actions/smssettings.php:335 -msgid "A confirmation code was sent to the phone number you added. " +"Mobile carrier for your phone. If you know a carrier that accepts SMS over " +"email but isn't listed here, send email to let us know at %s." msgstr "" -#: actions/smssettings.php:453 actions/smssettings.php:465 -msgid "Mobile carrier" +#: actions/smssettings.php:498 +msgid "No code entered" msgstr "" #: actions/subedit.php:70 @@ -4802,12 +2804,30 @@ msgid "%s subscribers, page %d" msgstr "" #: actions/subscribers.php:63 -msgid "These are the people who listen to " +msgid "These are the users who have subscribed to your notices." msgstr "" #: actions/subscribers.php:67 #, php-format -msgid "These are the people who " +msgid "These are the users who have subscribed to %s's notices." +msgstr "" + +#: actions/subscribers.php:108 +msgid "" +"You have no subscribers. Try subscribing to users you know and they might " +"return the favor" +msgstr "" + +#: actions/subscribers.php:110 +#, php-format +msgid "%s has no subscribers. Want to be the first?" +msgstr "" + +#: actions/subscribers.php:114 +#, php-format +msgid "" +"%s has no subscribers. Why not [register an account](%%%%action.register%%%" +"%) and be the first?" msgstr "" #: actions/subscriptions.php:52 @@ -4821,27 +2841,35 @@ msgid "%s subscriptions, page %d" msgstr "" #: actions/subscriptions.php:65 -msgid "These are the people whose notices " +msgid "These are the users whose notices you have subscribed to." msgstr "" #: actions/subscriptions.php:69 #, php-format -msgid "These are the people whose " +msgid "These are the users whose notices %s has subscribed to." msgstr "" -#: actions/subscriptions.php:122 actions/subscriptions.php:124 -#: actions/subscriptions.php:183 actions/subscriptions.php:194 -msgid "Jabber" +#: 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." msgstr "" -#: actions/tag.php:43 actions/tag.php:51 actions/tag.php:59 actions/tag.php:68 +#: actions/subscriptions.php:123 actions/subscriptions.php:127 #, php-format -msgid "Notices tagged with %s, page %d" +msgid "%s is not listening to anyone." msgstr "" -#: actions/tag.php:66 actions/tag.php:73 -#, php-format -msgid "Messages tagged \"%s\", most recent first" +#: actions/subscriptions.php:194 +msgid "Jabber" +msgstr "" + +#: actions/subscriptions.php:199 lib/connectsettingsaction.php:115 +msgid "SMS" msgstr "" #: actions/tagother.php:33 @@ -4857,862 +2885,536 @@ msgstr "" msgid "Tag %s" msgstr "" +#: actions/tagother.php:77 lib/userprofile.php:75 +msgid "User profile" +msgstr "" + +#: actions/tagother.php:81 lib/userprofile.php:102 +msgid "Photo" +msgstr "" + #: actions/tagother.php:141 msgid "Tag user" msgstr "" -#: actions/tagother.php:149 actions/tagother.php:151 +#: actions/tagother.php:151 msgid "" "Tags for this user (letters, numbers, -, ., and _), comma- or space- " "separated" msgstr "" -#: actions/tagother.php:164 -msgid "There was a problem with your session token." -msgstr "" - -#: actions/tagother.php:191 actions/tagother.php:193 +#: actions/tagother.php:193 msgid "" -"You can only tag people you are subscribed to or who are subscribed to you." +"You can only tag users you are subscribed to or who are subscribed to you." msgstr "" -#: actions/tagother.php:198 actions/tagother.php:200 +#: actions/tagother.php:200 msgid "Could not save tags." msgstr "" -#: actions/tagother.php:233 actions/tagother.php:235 actions/tagother.php:236 +#: actions/tagother.php:236 msgid "Use this form to add tags to your subscribers or subscriptions." msgstr "" -#: actions/tagrss.php:35 -msgid "No such tag." -msgstr "" - -#: actions/tagrss.php:66 actions/tagrss.php:64 +#: actions/tag.php:68 #, php-format -msgid "Microblog tagged with %s" -msgstr "" - -#: actions/twitapiblocks.php:47 actions/twitapiblocks.php:49 -#: actions/apiblockcreate.php:108 -msgid "Block user failed." -msgstr "" - -#: actions/twitapiblocks.php:69 actions/twitapiblocks.php:71 -#: actions/apiblockdestroy.php:107 -msgid "Unblock user failed." -msgstr "" - -#: actions/twitapiusers.php:48 actions/twitapiusers.php:52 -#: actions/twitapiusers.php:50 actions/apiusershow.php:96 -msgid "Not found." -msgstr "" - -#: actions/twittersettings.php:71 -msgid "Add your Twitter account to automatically send " -msgstr "" - -#: actions/twittersettings.php:119 actions/twittersettings.php:122 -msgid "Twitter user name" +msgid "Notices tagged with %s, page %d" msgstr "" -#: actions/twittersettings.php:126 actions/twittersettings.php:129 -msgid "Twitter password" +#: actions/tag.php:86 +#, php-format +msgid "Notice feed for tag %s (RSS 1.0)" msgstr "" -#: actions/twittersettings.php:228 actions/twittersettings.php:232 -#: actions/twittersettings.php:248 -msgid "Twitter Friends" +#: actions/tag.php:92 +#, php-format +msgid "Notice feed for tag %s (RSS 2.0)" msgstr "" -#: actions/twittersettings.php:327 -msgid "Username must have only numbers, " +#: actions/tag.php:98 +#, php-format +msgid "Notice feed for tag %s (Atom)" msgstr "" -#: actions/twittersettings.php:341 -#, php-format -msgid "Unable to retrieve account information " +#: actions/tagrss.php:35 +msgid "No such tag." msgstr "" -#: actions/unblock.php:108 actions/groupunblock.php:128 -msgid "Error removing the block." +#: actions/twitapitrends.php:87 +msgid "API method under construction." msgstr "" -#: actions/unsubscribe.php:50 actions/unsubscribe.php:77 +#: actions/unsubscribe.php:77 msgid "No profile id in request." msgstr "" -#: actions/unsubscribe.php:57 actions/unsubscribe.php:84 +#: actions/unsubscribe.php:84 msgid "No profile with that id." msgstr "" -#: actions/unsubscribe.php:71 actions/unsubscribe.php:98 +#: actions/unsubscribe.php:98 msgid "Unsubscribed" msgstr "" -#: actions/usergroups.php:63 actions/usergroups.php:62 -#: actions/apigrouplistall.php:90 -#, php-format -msgid "%s groups" -msgstr "" - -#: actions/usergroups.php:65 actions/usergroups.php:64 +#: actions/updateprofile.php:62 actions/userauthorization.php:330 #, php-format -msgid "%s groups, page %d" +msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’." msgstr "" -#: classes/Notice.php:104 classes/Notice.php:128 classes/Notice.php:144 -#: classes/Notice.php:183 -msgid "Problem saving notice. Unknown user." +#: actions/userauthorization.php:105 +msgid "Authorize subscription" msgstr "" -#: classes/Notice.php:109 classes/Notice.php:133 classes/Notice.php:149 -#: classes/Notice.php:188 +#: actions/userauthorization.php:110 msgid "" -"Too many notices too fast; take a breather and post again in a few minutes." -msgstr "" - -#: classes/Notice.php:116 classes/Notice.php:145 classes/Notice.php:161 -#: classes/Notice.php:202 -msgid "You are banned from posting notices on this site." -msgstr "" - -#: lib/accountsettingsaction.php:108 lib/accountsettingsaction.php:112 -msgid "Upload an avatar" -msgstr "" - -#: lib/accountsettingsaction.php:119 lib/accountsettingsaction.php:122 -#: lib/accountsettingsaction.php:123 -msgid "Other" -msgstr "" - -#: lib/accountsettingsaction.php:120 lib/accountsettingsaction.php:123 -#: lib/accountsettingsaction.php:124 -msgid "Other options" -msgstr "" - -#: lib/action.php:130 lib/action.php:132 lib/action.php:142 lib/action.php:144 -#, php-format -msgid "%s - %s" -msgstr "" - -#: lib/action.php:145 lib/action.php:147 lib/action.php:157 lib/action.php:159 -msgid "Untitled page" -msgstr "" - -#: lib/action.php:316 lib/action.php:387 lib/action.php:411 lib/action.php:424 -msgid "Primary site navigation" -msgstr "" - -#: lib/action.php:322 lib/action.php:393 lib/action.php:417 lib/action.php:430 -msgid "Personal profile and friends timeline" -msgstr "" - -#: lib/action.php:325 lib/action.php:396 lib/action.php:448 lib/action.php:459 -msgid "Search for people or text" -msgstr "" - -#: lib/action.php:328 lib/action.php:399 lib/action.php:419 lib/action.php:432 -msgid "Account" -msgstr "" - -#: lib/action.php:328 lib/action.php:399 lib/action.php:419 lib/action.php:432 -msgid "Change your email, avatar, password, profile" -msgstr "" - -#: lib/action.php:330 lib/action.php:403 lib/action.php:422 -msgid "Connect to IM, SMS, Twitter" -msgstr "" - -#: lib/action.php:332 lib/action.php:409 lib/action.php:435 lib/action.php:445 -msgid "Logout from the site" -msgstr "" - -#: lib/action.php:335 lib/action.php:412 lib/action.php:443 lib/action.php:453 -msgid "Login to the site" -msgstr "" - -#: lib/action.php:338 lib/action.php:415 lib/action.php:440 lib/action.php:450 -msgid "Create an account" -msgstr "" - -#: lib/action.php:341 lib/action.php:418 -msgid "Login with OpenID" -msgstr "" - -#: lib/action.php:344 lib/action.php:421 lib/action.php:446 lib/action.php:456 -msgid "Help me!" -msgstr "" - -#: lib/action.php:362 lib/action.php:441 lib/action.php:468 lib/action.php:480 -msgid "Site notice" -msgstr "" - -#: lib/action.php:417 lib/action.php:504 lib/action.php:531 lib/action.php:546 -msgid "Local views" -msgstr "" - -#: lib/action.php:472 lib/action.php:559 lib/action.php:597 lib/action.php:612 -msgid "Page notice" -msgstr "" - -#: lib/action.php:562 lib/action.php:654 lib/action.php:699 lib/action.php:714 -msgid "Secondary site navigation" -msgstr "" - -#: lib/action.php:602 lib/action.php:623 lib/action.php:699 lib/action.php:720 -#: lib/action.php:749 lib/action.php:770 lib/action.php:764 -msgid "StatusNet software license" -msgstr "" - -#: lib/action.php:630 lib/action.php:727 lib/action.php:779 lib/action.php:794 -msgid "All " -msgstr "" - -#: lib/action.php:635 lib/action.php:732 lib/action.php:784 lib/action.php:799 -msgid "license." -msgstr "" - -#: lib/blockform.php:123 lib/blockform.php:153 actions/groupmembers.php:343 -#: actions/groupmembers.php:346 -msgid "Block this user" -msgstr "" - -#: lib/blockform.php:153 actions/groupmembers.php:343 -#: actions/groupmembers.php:346 -msgid "Block" -msgstr "" - -#: lib/disfavorform.php:114 lib/disfavorform.php:140 -msgid "Disfavor this notice" -msgstr "" - -#: lib/facebookaction.php:268 -#, php-format -msgid "To use the %s Facebook Application you need to login " -msgstr "" - -#: lib/facebookaction.php:271 lib/facebookaction.php:273 -#: lib/facebookaction.php:275 -msgid " a new account." -msgstr "" - -#: lib/facebookaction.php:557 lib/mailbox.php:214 lib/noticelist.php:354 -#: lib/facebookaction.php:675 lib/mailbox.php:216 lib/noticelist.php:357 -#: lib/mailbox.php:217 lib/noticelist.php:361 -msgid "Published" -msgstr "" - -#: lib/favorform.php:114 lib/favorform.php:140 -msgid "Favor this notice" -msgstr "" - -#: lib/feedlist.php:64 -msgid "Export data" -msgstr "" - -#: lib/galleryaction.php:121 -msgid "Filter tags" +"Please check these details to make sure that you want to subscribe to this " +"user’s notices. If you didn’t just ask to subscribe to someone’s notices, " +"click “Reject”." msgstr "" -#: lib/galleryaction.php:131 -msgid "All" +#: actions/userauthorization.php:188 +msgid "License" msgstr "" -#: lib/galleryaction.php:137 lib/galleryaction.php:138 -#: lib/galleryaction.php:140 -msgid "Tag" +#: actions/userauthorization.php:209 +msgid "Accept" msgstr "" -#: lib/galleryaction.php:138 lib/galleryaction.php:139 -#: lib/galleryaction.php:141 -msgid "Choose a tag to narrow list" +#: actions/userauthorization.php:210 lib/subscribeform.php:115 +#: lib/subscribeform.php:139 +msgid "Subscribe to this user" msgstr "" -#: lib/galleryaction.php:139 lib/galleryaction.php:141 -#: lib/galleryaction.php:143 -msgid "Go" +#: actions/userauthorization.php:211 +msgid "Reject" msgstr "" -#: lib/groupeditform.php:148 lib/groupeditform.php:163 -msgid "URL of the homepage or blog of the group or topic" +#: actions/userauthorization.php:212 +msgid "Reject this subscription" msgstr "" -#: lib/groupeditform.php:151 lib/groupeditform.php:166 -#: lib/groupeditform.php:172 -msgid "Description" +#: actions/userauthorization.php:225 +msgid "No authorization request!" msgstr "" -#: lib/groupeditform.php:153 lib/groupeditform.php:168 -msgid "Describe the group or topic in 140 chars" +#: actions/userauthorization.php:247 +msgid "Subscription authorized" msgstr "" -#: lib/groupeditform.php:158 lib/groupeditform.php:173 -#: lib/groupeditform.php:179 +#: actions/userauthorization.php:249 msgid "" -"Location for the group, if any, like \"City, State (or Region), Country\"" +"The subscription has been authorized, but no callback URL was passed. Check " +"with the site’s instructions for details on how to authorize the " +"subscription. Your subscription token is:" msgstr "" -#: lib/groupnav.php:84 lib/searchgroupnav.php:84 -msgid "Group" +#: actions/userauthorization.php:259 +msgid "Subscription rejected" msgstr "" -#: lib/groupnav.php:100 actions/groupmembers.php:175 lib/groupnav.php:106 -msgid "Admin" +#: actions/userauthorization.php:261 +msgid "" +"The subscription has been rejected, but no callback URL was passed. Check " +"with the site’s instructions for details on how to fully reject the " +"subscription." msgstr "" -#: lib/groupnav.php:101 lib/groupnav.php:107 +#: actions/userauthorization.php:296 #, php-format -msgid "Edit %s group properties" -msgstr "" - -#: lib/groupnav.php:106 lib/groupnav.php:112 -msgid "Logo" +msgid "Listener URI ‘%s’ not found here" msgstr "" -#: lib/groupnav.php:107 lib/groupnav.php:113 +#: actions/userauthorization.php:301 #, php-format -msgid "Add or edit %s logo" +msgid "Listenee URI ‘%s’ is too long." msgstr "" -#: lib/groupsbymemberssection.php:71 -msgid "Groups with most members" +#: actions/userauthorization.php:307 +#, php-format +msgid "Listenee URI ‘%s’ is a local user." msgstr "" -#: lib/groupsbypostssection.php:71 -msgid "Groups with most posts" +#: actions/userauthorization.php:322 +#, php-format +msgid "Profile URL ‘%s’ is for a local user." msgstr "" -#: lib/grouptagcloudsection.php:56 +#: actions/userauthorization.php:338 #, php-format -msgid "Tags in %s group's notices" +msgid "Avatar URL ‘%s’ is not valid." msgstr "" -#: lib/htmloutputter.php:104 -msgid "This page is not available in a " +#: actions/userauthorization.php:343 +#, php-format +msgid "Can’t read avatar URL ‘%s’." msgstr "" -#: lib/joinform.php:114 -msgid "Join" +#: actions/userauthorization.php:348 +#, php-format +msgid "Wrong image type for avatar URL ‘%s’." msgstr "" -#: lib/leaveform.php:114 -msgid "Leave" +#: actions/userbyid.php:70 +msgid "No id." msgstr "" -#: lib/logingroupnav.php:76 lib/logingroupnav.php:80 -msgid "Login with a username and password" +#: actions/userdesignsettings.php:76 lib/designsettings.php:65 +msgid "Profile design" msgstr "" -#: lib/logingroupnav.php:79 lib/logingroupnav.php:86 -msgid "Sign up for a new account" +#: actions/userdesignsettings.php:87 lib/designsettings.php:76 +msgid "" +"Customize the way your profile looks with a background image and a colour " +"palette of your choice." msgstr "" -#: lib/logingroupnav.php:82 -msgid "Login or register with OpenID" +#: actions/userdesignsettings.php:282 +msgid "Enjoy your hotdog!" msgstr "" -#: lib/mail.php:175 +#: actions/usergroups.php:64 #, php-format -msgid "" -"Hey, %s.\n" -"\n" +msgid "%s groups, page %d" msgstr "" -#: lib/mail.php:236 -#, php-format -msgid "%1$s is now listening to " +#: actions/usergroups.php:130 +msgid "Search for more groups" msgstr "" -#: lib/mail.php:254 lib/mail.php:253 +#: actions/usergroups.php:153 #, php-format -msgid "Location: %s\n" +msgid "%s is not a member of any group." msgstr "" -#: lib/mail.php:256 lib/mail.php:255 +#: actions/usergroups.php:158 #, php-format -msgid "Homepage: %s\n" +msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." msgstr "" -#: lib/mail.php:258 lib/mail.php:257 +#: classes/File.php:137 #, php-format msgid "" -"Bio: %s\n" -"\n" -msgstr "" - -#: lib/mail.php:461 lib/mail.php:462 -#, php-format -msgid "You've been nudged by %s" +"No file may be larger than %d bytes and the file you sent was %d bytes. Try " +"to upload a smaller version." msgstr "" -#: lib/mail.php:465 +#: classes/File.php:147 #, php-format -msgid "%1$s (%2$s) is wondering what you are up to " +msgid "A file this large would exceed your user quota of %d bytes." msgstr "" -#: lib/mail.php:555 +#: classes/File.php:154 #, php-format -msgid "%1$s just added your notice from %2$s" -msgstr "" - -#: lib/mailbox.php:229 lib/noticelist.php:380 lib/mailbox.php:231 -#: lib/noticelist.php:383 lib/mailbox.php:232 lib/noticelist.php:388 -msgid "From" -msgstr "" - -#: lib/messageform.php:110 lib/messageform.php:109 lib/messageform.php:120 -msgid "Send a direct notice" +msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "" -#: lib/noticeform.php:125 lib/noticeform.php:128 lib/noticeform.php:145 -msgid "Send a notice" +#: classes/Message.php:55 +msgid "Could not insert message." msgstr "" -#: lib/noticeform.php:152 lib/noticeform.php:149 lib/messageform.php:162 -#: lib/noticeform.php:173 -msgid "Available characters" +#: classes/Message.php:65 +msgid "Could not update message with new URI." msgstr "" -#: lib/noticelist.php:426 lib/noticelist.php:429 -msgid "in reply to" +#: classes/Notice.php:164 +#, php-format +msgid "DB error inserting hashtag: %s" msgstr "" -#: lib/noticelist.php:447 lib/noticelist.php:450 lib/noticelist.php:451 -#: lib/noticelist.php:454 lib/noticelist.php:458 lib/noticelist.php:461 -#: lib/noticelist.php:498 -msgid "Reply to this notice" +#: classes/Notice.php:179 +msgid "Problem saving notice. Too long." msgstr "" -#: lib/noticelist.php:451 lib/noticelist.php:455 lib/noticelist.php:462 -#: lib/noticelist.php:499 -msgid "Reply" +#: classes/Notice.php:183 +msgid "Problem saving notice. Unknown user." msgstr "" -#: lib/noticelist.php:471 lib/noticelist.php:474 lib/noticelist.php:476 -#: lib/noticelist.php:479 actions/deletenotice.php:116 lib/noticelist.php:483 -#: lib/noticelist.php:486 actions/deletenotice.php:146 lib/noticelist.php:522 -msgid "Delete this notice" +#: classes/Notice.php:188 +msgid "" +"Too many notices too fast; take a breather and post again in a few minutes." msgstr "" -#: lib/noticelist.php:474 actions/avatarsettings.php:148 -#: lib/noticelist.php:479 lib/noticelist.php:486 lib/noticelist.php:522 -msgid "Delete" +#: classes/Notice.php:194 +msgid "" +"Too many duplicate messages too quickly; take a breather and post again in a " +"few minutes." msgstr "" -#: lib/nudgeform.php:116 -msgid "Nudge this user" +#: classes/Notice.php:202 +msgid "You are banned from posting notices on this site." msgstr "" -#: lib/nudgeform.php:128 -msgid "Nudge" +#: classes/Notice.php:268 classes/Notice.php:293 +msgid "Problem saving notice." msgstr "" -#: lib/nudgeform.php:128 -msgid "Send a nudge to this user" +#: classes/Notice.php:1120 +#, php-format +msgid "DB error inserting reply: %s" msgstr "" -#: lib/personaltagcloudsection.php:56 +#: classes/User.php:333 #, php-format -msgid "Tags in %s's notices" +msgid "Welcome to %1$s, @%2$s!" msgstr "" -#: lib/profilelist.php:182 lib/profilelist.php:180 -#: lib/subscriptionlist.php:126 -msgid "(none)" +#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109 +msgid "Profile" msgstr "" -#: lib/publicgroupnav.php:76 lib/publicgroupnav.php:78 -msgid "Public" +#: lib/accountsettingsaction.php:109 +msgid "Change your profile settings" msgstr "" -#: lib/publicgroupnav.php:80 lib/publicgroupnav.php:82 -msgid "User groups" +#: lib/accountsettingsaction.php:112 +msgid "Upload an avatar" msgstr "" -#: lib/publicgroupnav.php:82 lib/publicgroupnav.php:83 -#: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85 -msgid "Recent tags" +#: lib/accountsettingsaction.php:115 +msgid "Change your password" msgstr "" -#: lib/publicgroupnav.php:86 lib/publicgroupnav.php:88 -msgid "Featured" +#: lib/accountsettingsaction.php:118 +msgid "Change email handling" msgstr "" -#: lib/publicgroupnav.php:90 lib/publicgroupnav.php:92 -msgid "Popular" +#: lib/accountsettingsaction.php:120 lib/groupnav.php:118 +msgid "Design" msgstr "" -#: lib/searchgroupnav.php:82 -msgid "Notice" +#: lib/accountsettingsaction.php:121 +msgid "Design your profile" msgstr "" -#: lib/searchgroupnav.php:85 -msgid "Find groups on this site" +#: lib/accountsettingsaction.php:123 +msgid "Other" msgstr "" -#: lib/section.php:89 -msgid "Untitled section" +#: lib/accountsettingsaction.php:124 +msgid "Other options" msgstr "" -#: lib/subgroupnav.php:81 lib/subgroupnav.php:83 +#: lib/action.php:144 #, php-format -msgid "People %s subscribes to" +msgid "%s - %s" msgstr "" -#: lib/subgroupnav.php:89 lib/subgroupnav.php:91 -#, php-format -msgid "People subscribed to %s" +#: lib/action.php:159 +msgid "Untitled page" msgstr "" -#: lib/subgroupnav.php:97 lib/subgroupnav.php:99 -#, php-format -msgid "Groups %s is a member of" +#: lib/action.php:424 +msgid "Primary site navigation" msgstr "" -#: lib/subgroupnav.php:104 lib/action.php:430 lib/subgroupnav.php:106 -#: lib/action.php:440 -#, php-format -msgid "Invite friends and colleagues to join you on %s" +#: lib/action.php:430 +msgid "Home" msgstr "" -#: lib/subs.php:53 lib/subs.php:52 -msgid "User has blocked you." +#: lib/action.php:430 +msgid "Personal profile and friends timeline" msgstr "" -#: lib/subscribeform.php:115 lib/subscribeform.php:139 -#: actions/userauthorization.php:178 actions/userauthorization.php:210 -msgid "Subscribe to this user" +#: lib/action.php:432 +msgid "Account" msgstr "" -#: lib/tagcloudsection.php:56 -msgid "None" +#: lib/action.php:432 +msgid "Change your email, avatar, password, profile" msgstr "" -#: lib/topposterssection.php:74 -msgid "Top posters" +#: lib/action.php:435 +msgid "Connect" msgstr "" -#: lib/unblockform.php:120 lib/unblockform.php:150 -#: actions/blockedfromgroup.php:313 -msgid "Unblock this user" +#: lib/action.php:435 +msgid "Connect to services" msgstr "" -#: lib/unblockform.php:150 actions/blockedfromgroup.php:313 -msgid "Unblock" +#: lib/action.php:439 lib/subgroupnav.php:105 +msgid "Invite" msgstr "" -#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137 -msgid "Unsubscribe from this user" +#: lib/action.php:440 lib/subgroupnav.php:106 +#, php-format +msgid "Invite friends and colleagues to join you on %s" msgstr "" -#: actions/all.php:77 actions/all.php:59 actions/all.php:99 -#, php-format -msgid "Feed for friends of %s (RSS 1.0)" +#: lib/action.php:445 +msgid "Logout" msgstr "" -#: actions/all.php:82 actions/all.php:64 actions/all.php:107 -#, php-format -msgid "Feed for friends of %s (RSS 2.0)" +#: lib/action.php:445 +msgid "Logout from the site" msgstr "" -#: actions/all.php:87 actions/all.php:69 actions/all.php:115 -#, php-format -msgid "Feed for friends of %s (Atom)" +#: lib/action.php:450 +msgid "Create an account" msgstr "" -#: actions/all.php:112 actions/all.php:125 actions/all.php:165 -msgid "You and friends" +#: lib/action.php:453 +msgid "Login to the site" msgstr "" -#: actions/avatarsettings.php:78 -#, php-format -msgid "You can upload your personal avatar. The maximum file size is %s." +#: lib/action.php:456 lib/action.php:719 +msgid "Help" msgstr "" -#: actions/avatarsettings.php:373 actions/avatarsettings.php:387 -msgid "Avatar deleted." +#: lib/action.php:456 +msgid "Help me!" msgstr "" -#: actions/block.php:129 actions/block.php:136 -msgid "" -"Are you sure you want to block this user? Afterwards, they will be " -"unsubscribed from you, unable to subscribe to you in the future, and you " -"will not be notified of any @-replies from them." +#: lib/action.php:459 +msgid "Search" msgstr "" -#: actions/deletenotice.php:73 actions/deletenotice.php:103 -msgid "" -"You are about to permanently delete a notice. Once this is done, it cannot " -"be undone." +#: lib/action.php:459 +msgid "Search for users or text" msgstr "" -#: actions/deletenotice.php:127 actions/deletenotice.php:157 -msgid "There was a problem with your session token. Try again, please." +#: lib/action.php:480 +msgid "Site notice" msgstr "" -#: actions/emailsettings.php:168 actions/emailsettings.php:174 -msgid "Send me email when someone sends me an \"@-reply\"." +#: lib/action.php:546 +msgid "Local views" msgstr "" -#: actions/facebookhome.php:193 actions/facebookhome.php:187 -#, php-format -msgid "" -"If you would like the %s app to automatically update your Facebook status " -"with your latest notice, you need to give it permission." +#: lib/action.php:612 +msgid "Page notice" msgstr "" -#: actions/facebookhome.php:217 actions/facebookhome.php:211 -#, php-format -msgid "Okay, do it!" +#: lib/action.php:714 +msgid "Secondary site navigation" msgstr "" -#: actions/facebooksettings.php:124 -#, php-format -msgid "" -"If you would like %s to automatically update your Facebook status with your " -"latest notice, you need to give it permission." +#: lib/action.php:721 +msgid "About" msgstr "" -#: actions/grouplogo.php:155 actions/grouplogo.php:150 -#, php-format -msgid "" -"You can upload a logo image for your group. The maximum file size is %s." +#: lib/action.php:723 +msgid "FAQ" msgstr "" -#: actions/grouplogo.php:367 actions/grouplogo.php:362 -msgid "Pick a square area of the image to be the logo." +#: lib/action.php:727 +msgid "TOS" msgstr "" -#: actions/grouprss.php:136 actions/grouprss.php:137 -#, php-format -msgid "Microblog by %s group" +#: lib/action.php:730 +msgid "Privacy" msgstr "" -#: actions/groupsearch.php:57 actions/groupsearch.php:52 -#, php-format -msgid "" -"Search for groups on %%site.name%% by their name, location, or description. " -"Separate the terms by spaces; they must be 3 characters or more." +#: lib/action.php:732 +msgid "Source" msgstr "" -#: actions/groups.php:90 -#, php-format -msgid "" -"%%%%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\". Don't see a group you like? Try [searching " -"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup" -"%%%%)" +#: lib/action.php:734 +msgid "Contact" msgstr "" -#: actions/newmessage.php:102 -msgid "Only logged-in users can send direct messages." +#: lib/action.php:736 +msgid "Badge" msgstr "" -#: actions/noticesearch.php:91 -#, php-format -msgid "Search results for \"%s\" on %s" +#: lib/action.php:764 +msgid "StatusNet software license" msgstr "" -#: actions/openidlogin.php:66 +#: lib/action.php:767 #, php-format msgid "" -"For security reasons, please re-login with your [OpenID](%%doc.openid%%) " -"before changing your settings." -msgstr "" - -#: actions/public.php:125 actions/public.php:133 actions/public.php:151 -msgid "Public Stream Feed (RSS 1.0)" -msgstr "" - -#: actions/public.php:130 actions/public.php:138 actions/public.php:155 -msgid "Public Stream Feed (RSS 2.0)" -msgstr "" - -#: actions/public.php:135 actions/public.php:143 actions/public.php:159 -msgid "Public Stream Feed (Atom)" +"**%%site.name%%** is a microblogging service brought to you by [%%site." +"broughtby%%](%%site.broughtbyurl%%). " msgstr "" -#: actions/public.php:210 actions/public.php:241 actions/public.php:233 +#: lib/action.php:769 #, php-format -msgid "" -"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-" -"blogging) service based on the Free Software [StatusNet](http://status.net/) " -"tool. [Join now](%%action.register%%) to share notices about yourself with " -"friends, family, and colleagues! ([Read more](%%doc.help%%))" +msgid "**%%site.name%%** is a microblogging service. " msgstr "" -#: actions/register.php:286 actions/register.php:329 +#: lib/action.php:771 #, php-format msgid "" -"With this form you can create a new account. You can then post notices and " -"link up to friends and colleagues. (Have an [OpenID](http://openid.net/)? " -"Try our [OpenID registration](%%action.openidlogin%%)!)" +"It runs the [StatusNet](http://status.net/) microblogging software, version %" +"s, available under the [GNU Affero General Public License](http://www.fsf." +"org/licensing/licenses/agpl-3.0.html)." msgstr "" -#: actions/register.php:432 actions/register.php:479 actions/register.php:489 -#: actions/register.php:495 -msgid "Creative Commons Attribution 3.0" +#: lib/action.php:785 +msgid "Site content license" msgstr "" -#: actions/register.php:433 actions/register.php:480 actions/register.php:490 -#: actions/register.php:496 -msgid "" -" except this private data: password, email address, IM address, and phone " -"number." +#: lib/action.php:794 +msgid "All " msgstr "" -#: actions/showgroup.php:378 actions/showgroup.php:424 -#: actions/showgroup.php:432 -msgid "Created" +#: lib/action.php:799 +msgid "license." msgstr "" -#: actions/showgroup.php:393 actions/showgroup.php:440 -#: actions/showgroup.php:448 -#, php-format -msgid "" -"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." -"wikipedia.org/wiki/Micro-blogging) service based on the Free Software " -"[StatusNet](http://status.net/) tool. Its members share short messages about " -"their life and interests. [Join now](%%%%action.register%%%%) to become part " -"of this group and many more! ([Read more](%%%%doc.help%%%%))" +#: lib/action.php:1053 +msgid "Pagination" msgstr "" -#: actions/showstream.php:147 -msgid "Your profile" +#: lib/action.php:1062 +msgid "After" msgstr "" -#: actions/showstream.php:149 -#, php-format -msgid "%s's profile" +#: lib/action.php:1070 +msgid "Before" msgstr "" -#: actions/showstream.php:163 actions/showstream.php:128 -#: actions/showstream.php:129 -#, php-format -msgid "Notice feed for %s (RSS 1.0)" +#: lib/attachmentlist.php:87 +msgid "Attachments" msgstr "" -#: actions/showstream.php:170 actions/showstream.php:135 -#: actions/showstream.php:136 -#, php-format -msgid "Notice feed for %s (RSS 2.0)" +#: lib/attachmentlist.php:265 +msgid "Author" msgstr "" -#: actions/showstream.php:177 actions/showstream.php:142 -#: actions/showstream.php:143 -#, php-format -msgid "Notice feed for %s (Atom)" +#: lib/attachmentlist.php:278 +msgid "Provider" msgstr "" -#: actions/showstream.php:182 actions/showstream.php:147 -#: actions/showstream.php:148 -#, php-format -msgid "FOAF for %s" +#: lib/attachmentnoticesection.php:67 +msgid "Notices where this attachment appears" msgstr "" -#: actions/showstream.php:237 actions/showstream.php:202 -#: actions/showstream.php:234 lib/userprofile.php:116 -msgid "Edit Avatar" +#: lib/attachmenttagcloudsection.php:48 +msgid "Tags for this attachment" msgstr "" -#: actions/showstream.php:316 actions/showstream.php:281 -#: actions/showstream.php:366 lib/userprofile.php:248 -msgid "Edit profile settings" +#: lib/channel.php:138 lib/channel.php:158 +msgid "Command results" msgstr "" -#: actions/showstream.php:317 actions/showstream.php:282 -#: actions/showstream.php:367 lib/userprofile.php:249 -msgid "Edit" +#: lib/channel.php:210 +msgid "Command complete" msgstr "" -#: actions/showstream.php:542 actions/showstream.php:388 -#: actions/showstream.php:487 actions/showstream.php:234 -#, php-format -msgid "" -"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en." -"wikipedia.org/wiki/Micro-blogging) service based on the Free Software " -"[StatusNet](http://status.net/) tool. [Join now](%%%%action.register%%%%) to " -"follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))" +#: lib/channel.php:221 +msgid "Command failed" msgstr "" -#: actions/smssettings.php:335 actions/smssettings.php:347 -msgid "" -"A confirmation code was sent to the phone number you added. Check your phone " -"for the code and instructions on how to use it." +#: lib/command.php:44 +msgid "Sorry, this command is not yet implemented." msgstr "" -#: actions/twitapifavorites.php:171 lib/mail.php:556 -#: actions/twitapifavorites.php:222 +#: lib/command.php:88 #, php-format -msgid "" -"%1$s just added your notice from %2$s as one of their favorites.\n" -"\n" -"In case you forgot, you can see the text of your notice here:\n" -"\n" -"%3$s\n" -"\n" -"You can see the list of %1$s's favorites here:\n" -"\n" -"%4$s\n" -"\n" -"Faithfully yours,\n" -"%5$s\n" -msgstr "" - -#: actions/twitapistatuses.php:124 actions/twitapistatuses.php:82 -#: actions/twitapistatuses.php:314 actions/apiblockcreate.php:97 -#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77 -#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 -#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 -#: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:125 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79 -#: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81 -#: actions/apiaccountupdateprofileimage.php:91 -#: actions/apiaccountupdateprofileimage.php:105 -#: actions/apistatusesupdate.php:139 -msgid "No such user!" +msgid "Could not find a user with nickname %s" msgstr "" -#: actions/twittersettings.php:72 -msgid "" -"Add your Twitter account to automatically send your notices to Twitter, and " -"subscribe to Twitter friends already here." +#: lib/command.php:92 +msgid "It does not make a lot of sense to nudge yourself!" msgstr "" -#: actions/twittersettings.php:345 actions/twittersettings.php:362 +#: lib/command.php:99 #, php-format -msgid "Unable to retrieve account information For \"%s\" from Twitter." -msgstr "" - -#: actions/userauthorization.php:86 actions/userauthorization.php:81 -msgid "" -"Please check these details to make sure that you want to subscribe to this " -"user's notices. If you didn't just ask to subscribe to someone's notices, " -"click \"Reject\"." -msgstr "" - -#: actions/usergroups.php:131 actions/usergroups.php:130 -msgid "Search for more groups" -msgstr "" - -#: classes/Notice.php:138 classes/Notice.php:154 classes/Notice.php:194 -msgid "" -"Too many duplicate messages too quickly; take a breather and post again in a " -"few minutes." -msgstr "" - -#: lib/action.php:406 lib/action.php:425 -msgid "Connect to SMS, Twitter" -msgstr "" - -#: lib/action.php:671 lib/action.php:721 lib/action.php:736 -msgid "Badge" +msgid "Nudge sent to %s" msgstr "" -#: lib/command.php:113 lib/command.php:106 lib/command.php:126 +#: lib/command.php:126 #, php-format msgid "" "Subscriptions: %1$s\n" @@ -5720,988 +3422,594 @@ msgid "" "Notices: %3$s" msgstr "" -#: lib/dberroraction.php:60 -msgid "Database error" -msgstr "" - -#: lib/facebookaction.php:271 lib/facebookaction.php:273 -#, php-format -msgid "" -"To use the %s Facebook Application you need to login with your username and " -"password. Don't have a username yet? " -msgstr "" - -#: lib/feed.php:85 -msgid "RSS 1.0" -msgstr "" - -#: lib/feed.php:87 -msgid "RSS 2.0" -msgstr "" - -#: lib/feed.php:89 -msgid "Atom" -msgstr "" - -#: lib/feed.php:91 -msgid "FOAF" +#: lib/command.php:152 lib/command.php:400 +msgid "Notice with that id does not exist" msgstr "" -#: lib/imagefile.php:75 -#, php-format -msgid "That file is too big. The maximum file size is %d." +#: lib/command.php:168 lib/command.php:416 lib/command.php:471 +msgid "User has no last notice" msgstr "" -#: lib/mail.php:175 lib/mail.php:174 -#, php-format -msgid "" -"Hey, %s.\n" -"\n" -"Someone just entered this email address on %s.\n" -"\n" -"If it was you, and you want to confirm your entry, use the URL below:\n" -"\n" -"\t%s\n" -"\n" -"If not, just ignore this message.\n" -"\n" -"Thanks for your time, \n" -"%s\n" +#: lib/command.php:190 +msgid "Notice marked as fave." msgstr "" -#: lib/mail.php:241 lib/mail.php:240 +#: lib/command.php:315 #, php-format -msgid "" -"%1$s is now listening to your notices on %2$s.\n" -"\n" -"\t%3$s\n" -"\n" -"%4$s%5$s%6$s\n" -"Faithfully yours,\n" -"%7$s.\n" -"\n" -"----\n" -"Change your email address or notification options at %8$s\n" +msgid "%1$s (%2$s)" msgstr "" -#: lib/mail.php:466 +#: lib/command.php:318 #, php-format -msgid "" -"%1$s (%2$s) is wondering what you are up to these days and is inviting you " -"to post some news.\n" -"\n" -"So let's hear from you :)\n" -"\n" -"%3$s\n" -"\n" -"Don't reply to this email; it won't get to them.\n" -"\n" -"With kind regards,\n" -"%4$s\n" +msgid "Fullname: %s" msgstr "" -#: lib/mail.php:513 +#: lib/command.php:321 #, php-format -msgid "" -"%1$s (%2$s) sent you a private message:\n" -"\n" -"------------------------------------------------------\n" -"%3$s\n" -"------------------------------------------------------\n" -"\n" -"You can reply to their message here:\n" -"\n" -"%4$s\n" -"\n" -"Don't reply to this email; it won't get to them.\n" -"\n" -"With kind regards,\n" -"%5$s\n" +msgid "Location: %s" msgstr "" -#: lib/mail.php:598 lib/mail.php:600 +#: lib/command.php:324 #, php-format -msgid "%s sent a notice to your attention" +msgid "Homepage: %s" msgstr "" -#: lib/mail.php:600 lib/mail.php:602 +#: lib/command.php:327 #, php-format -msgid "" -"%1$s just sent a notice to your attention (an '@-reply') on %2$s.\n" -"\n" -"The notice is here:\n" -"\n" -"\t%3$s\n" -"\n" -"It reads:\n" -"\n" -"\t%4$s\n" -"\n" -"You can reply back here:\n" -"\n" -"\t%5$s\n" -"\n" -"The list of all @-replies for you here:\n" -"\n" -"%6$s\n" -"\n" -"Faithfully yours,\n" -"%2$s\n" -"\n" -"P.S. You can turn off these email notifications here: %7$s\n" -msgstr "" - -#: lib/searchaction.php:122 lib/searchaction.php:120 -msgid "Search site" -msgstr "" - -#: lib/section.php:106 -msgid "More..." +msgid "About: %s" msgstr "" -#: actions/all.php:80 actions/all.php:127 +#: lib/command.php:358 scripts/xmppdaemon.php:321 #, php-format -msgid "" -"This is the timeline for %s and friends but no one has posted anything yet." +msgid "Message too long - maximum is %d characters, you sent %d" msgstr "" -#: actions/all.php:85 actions/all.php:132 -#, php-format -msgid "" -"Try subscribing to more people, [join a group](%%action.groups%%) or post " -"something yourself." +#: lib/command.php:377 +msgid "Error sending direct message." msgstr "" -#: actions/all.php:87 actions/all.php:134 +#: lib/command.php:431 #, php-format -msgid "" -"You can try to [nudge %s](../%s) from his profile or [post something to his " -"or her attention](%%%%action.newnotice%%%%?status_textarea=%s)." +msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "" -#: actions/all.php:91 actions/replies.php:190 actions/showstream.php:361 -#: actions/all.php:137 actions/replies.php:209 actions/showstream.php:455 -#: actions/showstream.php:202 +#: lib/command.php:439 #, php-format -msgid "" -"Why not [register an account](%%%%action.register%%%%) and then nudge %s or " -"post a notice to his or her attention." +msgid "Reply to %s sent" msgstr "" -#: actions/attachment.php:73 -msgid "No such attachment." +#: lib/command.php:441 +msgid "Error saving notice." msgstr "" -#: actions/block.php:149 -msgid "Do not block this user from this group" +#: lib/command.php:495 +msgid "Specify the name of the user to subscribe to" msgstr "" -#: actions/block.php:150 -msgid "Block this user from this group" +#: lib/command.php:502 +#, php-format +msgid "Subscribed to %s" msgstr "" -#: actions/blockedfromgroup.php:90 -#, php-format -msgid "%s blocked profiles" +#: lib/command.php:523 +msgid "Specify the name of the user to unsubscribe from" msgstr "" -#: actions/blockedfromgroup.php:93 +#: lib/command.php:530 #, php-format -msgid "%s blocked profiles, page %d" +msgid "Unsubscribed from %s" msgstr "" -#: actions/blockedfromgroup.php:108 -msgid "A list of the users blocked from joining this group." +#: lib/command.php:548 lib/command.php:571 +msgid "Command not yet implemented." msgstr "" -#: actions/blockedfromgroup.php:281 -msgid "Unblock user from group" +#: lib/command.php:551 +msgid "Notification off." msgstr "" -#: actions/conversation.php:99 -msgid "Conversation" +#: lib/command.php:553 +msgid "Can't turn off notification." msgstr "" -#: actions/deletenotice.php:115 actions/deletenotice.php:145 -msgid "Do not delete this notice" +#: lib/command.php:574 +msgid "Notification on." msgstr "" -#: actions/editgroup.php:214 actions/newgroup.php:164 -#: actions/apigroupcreate.php:291 actions/editgroup.php:215 -#: actions/newgroup.php:159 -#, php-format -msgid "Too many aliases! Maximum %d." +#: lib/command.php:576 +msgid "Can't turn on notification." msgstr "" -#: actions/editgroup.php:223 actions/newgroup.php:173 -#: actions/apigroupcreate.php:312 actions/editgroup.php:224 -#: actions/newgroup.php:168 +#: lib/command.php:597 #, php-format -msgid "Invalid alias: \"%s\"" +msgid "Could not create login token for %s" msgstr "" -#: actions/editgroup.php:227 actions/newgroup.php:177 -#: actions/apigroupcreate.php:321 actions/editgroup.php:228 -#: actions/newgroup.php:172 +#: lib/command.php:602 #, php-format -msgid "Alias \"%s\" already in use. Try another one." -msgstr "" - -#: actions/editgroup.php:233 actions/newgroup.php:183 -#: actions/apigroupcreate.php:334 actions/editgroup.php:234 -#: actions/newgroup.php:178 -msgid "Alias can't be the same as nickname." -msgstr "" - -#: actions/editgroup.php:259 actions/newgroup.php:215 -#: actions/apigroupcreate.php:147 actions/newgroup.php:210 -msgid "Could not create aliases." -msgstr "" - -#: actions/favorited.php:150 -msgid "Favorite notices appear on this page but no one has favorited one yet." -msgstr "" - -#: actions/favorited.php:153 -msgid "" -"Be the first to add a notice to your favorites by clicking the fave button " -"next to any notice you like." +msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: actions/favorited.php:156 -#, php-format +#: lib/command.php:613 msgid "" -"Why not [register an account](%%action.register%%) and be the first to add a " -"notice to your favorites!" -msgstr "" - -#: actions/file.php:34 -msgid "No notice id" -msgstr "" - -#: actions/file.php:38 -msgid "No notice" -msgstr "" - -#: actions/file.php:42 -msgid "No attachments" -msgstr "" - -#: actions/file.php:51 -msgid "No uploaded attachments" +"Commands:\n" +"on - turn on notifications\n" +"off - turn off notifications\n" +"help - show this help\n" +"follow <nickname> - subscribe to user\n" +"leave <nickname> - unsubscribe from user\n" +"d <nickname> <text> - direct message to user\n" +"get <nickname> - get last notice from user\n" +"whois <nickname> - get profile info on user\n" +"fav <nickname> - add user's last notice as a 'fave'\n" +"fav #<notice_id> - add notice with the given id as a 'fave'\n" +"reply #<notice_id> - reply to notice with a given id\n" +"reply <nickname> - reply to the last notice from user\n" +"join <group> - join group\n" +"login - Get a link to login to the web interface\n" +"drop <group> - leave group\n" +"stats - get your stats\n" +"stop - same as 'off'\n" +"quit - same as 'off'\n" +"sub <nickname> - same as 'follow'\n" +"unsub <nickname> - same as 'leave'\n" +"last <nickname> - same as 'get'\n" +"on <nickname> - not yet implemented.\n" +"off <nickname> - not yet implemented.\n" +"nudge <nickname> - remind a user to update.\n" +"invite <phone number> - not yet implemented.\n" +"track <word> - not yet implemented.\n" +"untrack <word> - not yet implemented.\n" +"track off - not yet implemented.\n" +"untrack all - not yet implemented.\n" +"tracks - not yet implemented.\n" +"tracking - not yet implemented.\n" msgstr "" -#: actions/finishopenidlogin.php:211 -msgid "Not a valid invitation code." +#: lib/common.php:191 +msgid "No configuration file found. " msgstr "" -#: actions/groupblock.php:81 actions/groupunblock.php:81 -#: actions/makeadmin.php:81 -msgid "No group specified." +#: lib/common.php:192 +msgid "I looked for configuration files in the following places: " msgstr "" -#: actions/groupblock.php:91 -msgid "Only an admin can block group members." +#: lib/common.php:193 +msgid "You may wish to run the installer to fix this." msgstr "" -#: actions/groupblock.php:95 -msgid "User is already blocked from group." +#: lib/common.php:194 +msgid "Go to the installer." msgstr "" -#: actions/groupblock.php:100 -msgid "User is not a member of group." +#: lib/connectsettingsaction.php:110 +msgid "IM" msgstr "" -#: actions/groupblock.php:136 actions/groupmembers.php:311 -#: actions/groupmembers.php:314 -msgid "Block user from group" +#: lib/connectsettingsaction.php:111 +msgid "Updates by instant messenger (IM)" msgstr "" -#: actions/groupblock.php:155 -#, php-format -msgid "" -"Are you sure you want to block user \"%s\" from the group \"%s\"? They will " -"be removed from the group, unable to post, and unable to subscribe to the " -"group in the future." +#: lib/connectsettingsaction.php:116 +msgid "Updates by SMS" msgstr "" -#: actions/groupblock.php:193 -msgid "Database error blocking user from group." +#: lib/dberroraction.php:60 +msgid "Database error" msgstr "" -#: actions/groupdesignsettings.php:73 actions/groupdesignsettings.php:68 -msgid "You must be logged in to edit a group." +#: lib/designsettings.php:101 +msgid "Change background image" msgstr "" -#: actions/groupdesignsettings.php:146 actions/groupdesignsettings.php:141 -msgid "Group design" +#: lib/designsettings.php:105 +msgid "Upload file" msgstr "" -#: actions/groupdesignsettings.php:157 actions/groupdesignsettings.php:152 +#: lib/designsettings.php:109 msgid "" -"Customize the way your group looks with a background image and a colour " -"palette of your choice." +"You can upload your personal background image. The maximum file size is 2Mb." msgstr "" -#: actions/groupdesignsettings.php:267 actions/userdesignsettings.php:186 -#: lib/designsettings.php:440 lib/designsettings.php:470 -#: actions/groupdesignsettings.php:262 lib/designsettings.php:431 -#: lib/designsettings.php:461 lib/designsettings.php:434 -#: lib/designsettings.php:464 -msgid "Couldn't update your design." +#: lib/designsettings.php:139 +msgid "On" msgstr "" -#: actions/groupdesignsettings.php:291 actions/groupdesignsettings.php:301 -#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220 -#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273 -#: actions/groupdesignsettings.php:286 actions/groupdesignsettings.php:296 -msgid "Unable to save your design settings!" +#: lib/designsettings.php:155 +msgid "Off" msgstr "" -#: actions/groupdesignsettings.php:312 actions/userdesignsettings.php:231 -#: actions/groupdesignsettings.php:307 -msgid "Design preferences saved." +#: lib/designsettings.php:156 +msgid "Turn background image on or off." msgstr "" -#: actions/groupmembers.php:438 actions/groupmembers.php:441 -msgid "Make user an admin of the group" +#: lib/designsettings.php:161 +msgid "Tile background image" msgstr "" -#: actions/groupmembers.php:470 actions/groupmembers.php:473 -msgid "Make Admin" +#: lib/designsettings.php:170 +msgid "Change colours" msgstr "" -#: actions/groupmembers.php:470 actions/groupmembers.php:473 -msgid "Make this user an admin" +#: lib/designsettings.php:178 +msgid "Background" msgstr "" -#: actions/groupsearch.php:79 actions/noticesearch.php:117 -#: actions/peoplesearch.php:83 -msgid "No results." +#: lib/designsettings.php:191 +msgid "Content" msgstr "" -#: actions/groupsearch.php:82 -#, php-format -msgid "" -"If you can't find the group you're looking for, you can [create it](%%action." -"newgroup%%) yourself." +#: lib/designsettings.php:204 +msgid "Sidebar" msgstr "" -#: actions/groupsearch.php:85 -#, php-format -msgid "" -"Why not [register an account](%%action.register%%) and [create the group](%%" -"action.newgroup%%) yourself!" +#: lib/designsettings.php:217 +msgid "Text" msgstr "" -#: actions/groupunblock.php:91 -msgid "Only an admin can unblock group members." +#: lib/designsettings.php:230 +msgid "Links" msgstr "" -#: actions/groupunblock.php:95 -msgid "User is not blocked from group." +#: lib/designsettings.php:247 +msgid "Use defaults" msgstr "" -#: actions/invite.php:39 -msgid "Invites have been disabled." +#: lib/designsettings.php:248 +msgid "Restore default designs" msgstr "" -#: actions/joingroup.php:100 actions/apigroupjoin.php:119 -#: actions/joingroup.php:95 lib/command.php:221 -msgid "You have been blocked from that group by the admin." +#: lib/designsettings.php:254 +msgid "Reset back to default" msgstr "" -#: actions/makeadmin.php:91 -msgid "Only an admin can make another user an admin." +#: lib/designsettings.php:257 +msgid "Save design" msgstr "" -#: actions/makeadmin.php:95 -#, php-format -msgid "%s is already an admin for group \"%s\"." +#: lib/designsettings.php:372 +msgid "Bad default color settings: " msgstr "" -#: actions/makeadmin.php:132 -#, php-format -msgid "Can't get membership record for %s in group %s" +#: lib/designsettings.php:468 +msgid "Design defaults restored." msgstr "" -#: actions/makeadmin.php:145 -#, php-format -msgid "Can't make %s an admin for group %s" +#: lib/disfavorform.php:114 lib/disfavorform.php:140 +msgid "Disfavor this notice" msgstr "" -#: actions/newmessage.php:178 actions/newmessage.php:181 -msgid "Message sent" +#: lib/favorform.php:114 lib/favorform.php:140 +msgid "Favor this notice" msgstr "" -#: actions/newnotice.php:93 lib/designsettings.php:281 -#: actions/newnotice.php:94 actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:122 actions/avatarsettings.php:254 -#: lib/designsettings.php:283 -#, php-format -msgid "" -"The server was unable to handle that much POST data (%s bytes) due to its " -"current configuration." +#: lib/favorform.php:140 +msgid "Favor" msgstr "" -#: actions/newnotice.php:128 scripts/maildaemon.php:185 lib/mediafile.php:270 -#, php-format -msgid " Try using another %s format." +#: lib/feedlist.php:64 +msgid "Export data" msgstr "" -#: actions/newnotice.php:133 scripts/maildaemon.php:190 lib/mediafile.php:275 -#, php-format -msgid "%s is not a supported filetype on this server." +#: lib/feed.php:85 +msgid "RSS 1.0" msgstr "" -#: actions/newnotice.php:205 lib/mediafile.php:142 -msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini." +#: lib/feed.php:87 +msgid "RSS 2.0" msgstr "" -#: actions/newnotice.php:208 lib/mediafile.php:147 -msgid "" -"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in " -"the HTML form." +#: lib/feed.php:89 +msgid "Atom" msgstr "" -#: actions/newnotice.php:211 lib/mediafile.php:152 -msgid "The uploaded file was only partially uploaded." +#: lib/feed.php:91 +msgid "FOAF" msgstr "" -#: actions/newnotice.php:214 lib/mediafile.php:159 -msgid "Missing a temporary folder." +#: lib/galleryaction.php:121 +msgid "Filter tags" msgstr "" -#: actions/newnotice.php:217 lib/mediafile.php:162 -msgid "Failed to write file to disk." +#: lib/galleryaction.php:131 +msgid "All" msgstr "" -#: actions/newnotice.php:220 lib/mediafile.php:165 -msgid "File upload stopped by extension." +#: lib/galleryaction.php:139 +msgid "Select tag to filter" msgstr "" -#: actions/newnotice.php:230 scripts/maildaemon.php:85 -msgid "Couldn't save file." +#: lib/galleryaction.php:140 +msgid "Tag" msgstr "" -#: actions/newnotice.php:246 scripts/maildaemon.php:101 -msgid "Max notice size is 140 chars, including attachment URL." +#: lib/galleryaction.php:141 +msgid "Choose a tag to narrow list" msgstr "" -#: actions/newnotice.php:297 -msgid "Somehow lost the login in saveFile" +#: lib/galleryaction.php:143 +msgid "Go" msgstr "" -#: actions/newnotice.php:309 scripts/maildaemon.php:127 lib/mediafile.php:196 -#: lib/mediafile.php:233 -msgid "File could not be moved to destination directory." +#: lib/groupeditform.php:163 +msgid "URL of the homepage or blog of the group or topic" msgstr "" -#: actions/newnotice.php:336 actions/newnotice.php:360 -#: scripts/maildaemon.php:148 scripts/maildaemon.php:167 lib/mediafile.php:98 -#: lib/mediafile.php:123 -msgid "There was a database error while saving your file. Please try again." +#: lib/groupeditform.php:168 +msgid "Describe the group or topic" msgstr "" -#: actions/noticesearch.php:121 +#: lib/groupeditform.php:170 #, php-format -msgid "" -"Be the first to [post on this topic](%%%%action.newnotice%%%%?" -"status_textarea=%s)!" +msgid "Describe the group or topic in %d characters" msgstr "" -#: actions/noticesearch.php:124 -#, php-format -msgid "" -"Why not [register an account](%%%%action.register%%%%) and be the first to " -"[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!" +#: lib/groupeditform.php:172 +msgid "Description" msgstr "" -#: actions/openidsettings.php:70 -#, php-format +#: lib/groupeditform.php:179 msgid "" -"[OpenID](%%doc.openid%%) lets you log into many sites with the same user " -"account. Manage your associated OpenIDs from here." -msgstr "" - -#: actions/othersettings.php:110 actions/othersettings.php:117 -msgid "Shorten URLs with" -msgstr "" - -#: actions/othersettings.php:115 actions/othersettings.php:122 -msgid "View profile designs" -msgstr "" - -#: actions/othersettings.php:116 actions/othersettings.php:123 -msgid "Show or hide profile designs." -msgstr "" - -#: actions/public.php:82 actions/public.php:83 -#, php-format -msgid "Beyond the page limit (%s)" +"Location for the group, if any, like \"City, State (or Region), Country\"" msgstr "" -#: actions/public.php:179 +#: lib/groupeditform.php:187 #, php-format -msgid "" -"This is the public timeline for %%site.name%% but no one has posted anything " -"yet." +msgid "Extra nicknames for the group, comma- or space- separated, max %d" msgstr "" -#: actions/public.php:182 -msgid "Be the first to post!" +#: lib/groupnav.php:84 lib/searchgroupnav.php:84 +msgid "Group" msgstr "" -#: actions/public.php:186 -#, php-format -msgid "" -"Why not [register an account](%%action.register%%) and be the first to post!" +#: lib/groupnav.php:100 +msgid "Blocked" msgstr "" -#: actions/public.php:245 actions/public.php:238 +#: lib/groupnav.php:101 #, php-format -msgid "" -"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-" -"blogging) service based on the Free Software [StatusNet](http://status.net/) " -"tool." +msgid "%s blocked users" msgstr "" -#: actions/publictagcloud.php:69 +#: lib/groupnav.php:107 #, php-format -msgid "No one has posted a notice with a [hashtag](%%doc.tags%%) yet." +msgid "Edit %s group properties" msgstr "" -#: actions/publictagcloud.php:72 -msgid "Be the first to post one!" +#: lib/groupnav.php:112 +msgid "Logo" msgstr "" -#: actions/publictagcloud.php:75 +#: lib/groupnav.php:113 #, php-format -msgid "" -"Why not [register an account](%%action.register%%) and be the first to post " -"one!" -msgstr "" - -#: actions/recoverpassword.php:152 -msgid "" -"If you've forgotten or lost your password, you can get a new one sent to the " -"email address you have stored in your account." -msgstr "" - -#: actions/recoverpassword.php:158 -msgid "You've been identified. Enter a new password below. " -msgstr "" - -#: actions/recoverpassword.php:188 -msgid "Password recover" -msgstr "" - -#: actions/register.php:86 actions/register.php:92 -msgid "Sorry, invalid invitation code." -msgstr "" - -#: actions/remotesubscribe.php:100 actions/remotesubscribe.php:124 -msgid "Subscribe to a remote user" +msgid "Add or edit %s logo" msgstr "" -#: actions/replies.php:179 actions/replies.php:198 +#: lib/groupnav.php:119 #, php-format -msgid "" -"This is the timeline showing replies to %s but %s hasn't received a notice " -"to his attention yet." +msgid "Add or edit %s design" msgstr "" -#: actions/replies.php:184 actions/replies.php:203 -#, php-format -msgid "" -"You can engage other users in a conversation, subscribe to more people or " -"[join groups](%%action.groups%%)." +#: lib/groupsbymemberssection.php:71 +msgid "Groups with most members" msgstr "" -#: actions/replies.php:186 actions/replies.php:205 -#, php-format -msgid "" -"You can try to [nudge %s](../%s) or [post something to his or her attention]" -"(%%%%action.newnotice%%%%?status_textarea=%s)." +#: lib/groupsbypostssection.php:71 +msgid "Groups with most posts" msgstr "" -#: actions/showfavorites.php:79 +#: lib/grouptagcloudsection.php:56 #, php-format -msgid "%s's favorite notices, page %d" -msgstr "" - -#: actions/showfavorites.php:170 actions/showfavorites.php:205 -msgid "" -"You haven't chosen any favorite notices yet. Click the fave button on " -"notices you like to bookmark them for later or shed a spotlight on them." +msgid "Tags in %s group's notices" msgstr "" -#: actions/showfavorites.php:172 actions/showfavorites.php:207 -#, php-format -msgid "" -"%s hasn't added any notices to his favorites yet. Post something interesting " -"they would add to their favorites :)" +#: lib/htmloutputter.php:104 +msgid "This page is not available in a media type you accept" msgstr "" -#: actions/showfavorites.php:176 +#: lib/imagefile.php:75 #, php-format -msgid "" -"%s hasn't added any notices to his favorites yet. Why not [register an " -"account](%%%%action.register%%%%) and then post something interesting they " -"would add to thier favorites :)" -msgstr "" - -#: actions/showfavorites.php:226 actions/showfavorites.php:242 -msgid "This is a way to share what you like." -msgstr "" - -#: actions/showgroup.php:279 lib/groupeditform.php:178 -#: actions/showgroup.php:284 lib/groupeditform.php:184 -msgid "Aliases" +msgid "That file is too big. The maximum file size is %s." msgstr "" -#: actions/showgroup.php:323 actions/showgroup.php:328 -#, php-format -msgid "Notice feed for %s group (RSS 1.0)" +#: lib/imagefile.php:80 +msgid "Partial upload." msgstr "" -#: actions/showgroup.php:330 actions/tag.php:84 actions/showgroup.php:334 -#, php-format -msgid "Notice feed for %s group (RSS 2.0)" +#: lib/imagefile.php:88 lib/mediafile.php:170 +msgid "System error uploading file." msgstr "" -#: actions/showgroup.php:337 actions/showgroup.php:340 -#, php-format -msgid "Notice feed for %s group (Atom)" +#: lib/imagefile.php:96 +msgid "Not an image or corrupt file." msgstr "" -#: actions/showgroup.php:446 actions/showgroup.php:454 -#, php-format -msgid "" -"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." -"wikipedia.org/wiki/Micro-blogging) service based on the Free Software " -"[StatusNet](http://status.net/) tool. Its members share short messages about " -"their life and interests. " +#: lib/imagefile.php:105 +msgid "Unsupported image file format." msgstr "" -#: actions/showgroup.php:474 actions/showgroup.php:482 -msgid "Admins" +#: lib/imagefile.php:118 +msgid "Lost our file." msgstr "" -#: actions/shownotice.php:101 -msgid "Not a local notice" +#: lib/imagefile.php:150 lib/imagefile.php:197 +msgid "Unknown file type" msgstr "" -#: actions/showstream.php:72 actions/showstream.php:73 +#: lib/jabber.php:192 #, php-format -msgid " tagged %s" +msgid "notice id: %s" msgstr "" -#: actions/showstream.php:121 actions/showstream.php:122 -#, php-format -msgid "Notice feed for %s tagged %s (RSS 1.0)" +#: lib/joinform.php:114 +msgid "Join" msgstr "" -#: actions/showstream.php:350 actions/showstream.php:444 -#: actions/showstream.php:191 -#, php-format -msgid "This is the timeline for %s but %s hasn't posted anything yet." +#: lib/leaveform.php:114 +msgid "Leave" msgstr "" -#: actions/showstream.php:355 actions/showstream.php:449 -#: actions/showstream.php:196 -msgid "" -"Seen anything interesting recently? You haven't posted any notices yet, now " -"would be a good time to start :)" +#: lib/logingroupnav.php:80 +msgid "Login with a username and password" msgstr "" -#: actions/showstream.php:357 actions/showstream.php:451 -#: actions/showstream.php:198 -#, php-format -msgid "" -"You can try to nudge %s or [post something to his or her attention](%%%%" -"action.newnotice%%%%?status_textarea=%s)." +#: lib/logingroupnav.php:86 +msgid "Sign up for a new account" msgstr "" -#: actions/showstream.php:393 actions/showstream.php:492 -#: actions/showstream.php:239 -#, php-format -msgid "" -"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en." -"wikipedia.org/wiki/Micro-blogging) service based on the Free Software " -"[StatusNet](http://status.net/) tool. " +#: lib/mailbox.php:89 +msgid "Only the user can read their own mailboxes." msgstr "" -#: actions/subscribers.php:108 +#: lib/mailbox.php:139 msgid "" -"You have no subscribers. Try subscribing to people you know and they might " -"return the favor" +"You have no private messages. You can send private message to engage other " +"users in conversation. People can send you messages for your eyes only." msgstr "" -#: actions/subscribers.php:110 -#, php-format -msgid "%s has no subscribers. Want to be the first?" +#: lib/mailbox.php:227 lib/noticelist.php:424 +msgid "from" msgstr "" -#: actions/subscribers.php:114 -#, php-format -msgid "" -"%s has no subscribers. Why not [register an account](%%%%action.register%%%" -"%) and be the first?" +#: lib/mail.php:172 +msgid "Email address confirmation" msgstr "" -#: actions/subscriptions.php:115 actions/subscriptions.php:121 +#: lib/mail.php:174 #, php-format msgid "" -"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." +"Hey, %s.\n" +"\n" +"Someone just entered this email address on %s.\n" +"\n" +"If it was you, and you want to confirm your entry, use the URL below:\n" +"\n" +"\t%s\n" +"\n" +"If not, just ignore this message.\n" +"\n" +"Thanks for your time, \n" +"%s\n" msgstr "" -#: actions/subscriptions.php:117 actions/subscriptions.php:121 -#: actions/subscriptions.php:123 actions/subscriptions.php:127 +#: lib/mail.php:235 #, php-format -msgid "%s is not listening to anyone." +msgid "%1$s is now listening to your notices on %2$s." msgstr "" -#: actions/tag.php:77 actions/tag.php:86 +#: lib/mail.php:240 #, php-format -msgid "Notice feed for tag %s (RSS 1.0)" +msgid "" +"%1$s is now listening to your notices on %2$s.\n" +"\n" +"\t%3$s\n" +"\n" +"%4$s%5$s%6$s\n" +"Faithfully yours,\n" +"%7$s.\n" +"\n" +"----\n" +"Change your email address or notification options at %8$s\n" msgstr "" -#: actions/tag.php:91 actions/tag.php:98 +#: lib/mail.php:253 #, php-format -msgid "Notice feed for tag %s (Atom)" -msgstr "" - -#: actions/twitapifavorites.php:125 actions/apifavoritecreate.php:119 -msgid "This status is already a favorite!" -msgstr "" - -#: actions/twitapifavorites.php:179 actions/apifavoritedestroy.php:122 -msgid "That status is not a favorite!" -msgstr "" - -#: actions/twitapifriendships.php:180 actions/twitapifriendships.php:200 -#: actions/apifriendshipsshow.php:135 -msgid "Could not determine source user." -msgstr "" - -#: actions/twitapifriendships.php:215 -msgid "Target user not specified." -msgstr "" - -#: actions/twitapifriendships.php:221 actions/apifriendshipsshow.php:143 -msgid "Could not find target user." +msgid "Location: %s\n" msgstr "" -#: actions/twitapistatuses.php:322 actions/apitimelinementions.php:116 +#: lib/mail.php:255 #, php-format -msgid "%1$s / Updates mentioning %2$s" +msgid "Homepage: %s\n" msgstr "" -#: actions/twitapitags.php:74 actions/apitimelinetag.php:107 -#: actions/tagrss.php:64 +#: lib/mail.php:257 #, php-format -msgid "Updates tagged with %1$s on %2$s!" -msgstr "" - -#: actions/twittersettings.php:165 -msgid "Import my Friends Timeline." -msgstr "" - -#: actions/userauthorization.php:158 actions/userauthorization.php:188 -msgid "License" -msgstr "" - -#: actions/userauthorization.php:179 actions/userauthorization.php:212 -msgid "Reject this subscription" -msgstr "" - -#: actions/userdesignsettings.php:76 lib/designsettings.php:65 -msgid "Profile design" -msgstr "" - -#: actions/userdesignsettings.php:87 lib/designsettings.php:76 msgid "" -"Customize the way your profile looks with a background image and a colour " -"palette of your choice." -msgstr "" - -#: actions/userdesignsettings.php:282 -msgid "Enjoy your hotdog!" -msgstr "" - -#: actions/usergroups.php:153 -#, php-format -msgid "%s is not a member of any group." +"Bio: %s\n" +"\n" msgstr "" -#: actions/usergroups.php:158 +#: lib/mail.php:285 #, php-format -msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." +msgid "New email address for posting to %s" msgstr "" -#: classes/File.php:127 classes/File.php:137 +#: lib/mail.php:288 #, php-format msgid "" -"No file may be larger than %d bytes and the file you sent was %d bytes. Try " -"to upload a smaller version." -msgstr "" - -#: classes/File.php:137 classes/File.php:147 -#, php-format -msgid "A file this large would exceed your user quota of %d bytes." +"You have a new posting address on %1$s.\n" +"\n" +"Send email to %2$s to post new messages.\n" +"\n" +"More email instructions at %3$s.\n" +"\n" +"Faithfully yours,\n" +"%4$s" msgstr "" -#: classes/File.php:145 classes/File.php:154 +#: lib/mail.php:412 #, php-format -msgid "A file this large would exceed your monthly quota of %d bytes." +msgid "%s status" msgstr "" -#: classes/Notice.php:139 classes/Notice.php:179 -msgid "Problem saving notice. Too long." +#: lib/mail.php:438 +msgid "SMS confirmation" msgstr "" -#: classes/User.php:319 classes/User.php:327 classes/User.php:334 -#: classes/User.php:333 +#: lib/mail.php:462 #, php-format -msgid "Welcome to %1$s, @%2$s!" -msgstr "" - -#: lib/accountsettingsaction.php:119 lib/groupnav.php:118 -#: lib/accountsettingsaction.php:120 -msgid "Design" -msgstr "" - -#: lib/accountsettingsaction.php:120 lib/accountsettingsaction.php:121 -msgid "Design your profile" -msgstr "" - -#: lib/action.php:712 lib/action.php:727 -msgid "TOS" -msgstr "" - -#: lib/attachmentlist.php:87 -msgid "Attachments" -msgstr "" - -#: lib/attachmentlist.php:265 -msgid "Author" -msgstr "" - -#: lib/attachmentlist.php:278 -msgid "Provider" -msgstr "" - -#: lib/attachmentnoticesection.php:67 -msgid "Notices where this attachment appears" -msgstr "" - -#: lib/attachmenttagcloudsection.php:48 -msgid "Tags for this attachment" -msgstr "" - -#: lib/designsettings.php:101 -msgid "Change background image" -msgstr "" - -#: lib/designsettings.php:105 -msgid "Upload file" +msgid "You've been nudged by %s" msgstr "" -#: lib/designsettings.php:109 +#: lib/mail.php:466 +#, php-format msgid "" -"You can upload your personal background image. The maximum file size is 2Mb." -msgstr "" - -#: lib/designsettings.php:139 -msgid "On" -msgstr "" - -#: lib/designsettings.php:155 -msgid "Off" -msgstr "" - -#: lib/designsettings.php:156 -msgid "Turn background image on or off." -msgstr "" - -#: lib/designsettings.php:161 -msgid "Tile background image" -msgstr "" - -#: lib/designsettings.php:170 -msgid "Change colours" -msgstr "" - -#: lib/designsettings.php:178 -msgid "Background" -msgstr "" - -#: lib/designsettings.php:191 -msgid "Content" -msgstr "" - -#: lib/designsettings.php:204 -msgid "Sidebar" -msgstr "" - -#: lib/designsettings.php:230 -msgid "Links" -msgstr "" - -#: lib/designsettings.php:247 -msgid "Use defaults" -msgstr "" - -#: lib/designsettings.php:248 -msgid "Restore default designs" -msgstr "" - -#: lib/designsettings.php:254 -msgid "Reset back to default" -msgstr "" - -#: lib/designsettings.php:257 -msgid "Save design" -msgstr "" - -#: lib/designsettings.php:378 lib/designsettings.php:369 -#: lib/designsettings.php:372 -msgid "Bad default color settings: " -msgstr "" - -#: lib/designsettings.php:474 lib/designsettings.php:465 -#: lib/designsettings.php:468 -msgid "Design defaults restored." +"%1$s (%2$s) is wondering what you are up to these days and is inviting you " +"to post some news.\n" +"\n" +"So let's hear from you :)\n" +"\n" +"%3$s\n" +"\n" +"Don't reply to this email; it won't get to them.\n" +"\n" +"With kind regards,\n" +"%4$s\n" msgstr "" -#: lib/groupeditform.php:181 lib/groupeditform.php:187 +#: lib/mail.php:509 #, php-format -msgid "Extra nicknames for the group, comma- or space- separated, max %d" -msgstr "" - -#: lib/groupnav.php:100 -msgid "Blocked" +msgid "New private message from %s" msgstr "" -#: lib/groupnav.php:101 +#: lib/mail.php:513 #, php-format -msgid "%s blocked users" +msgid "" +"%1$s (%2$s) sent you a private message:\n" +"\n" +"------------------------------------------------------\n" +"%3$s\n" +"------------------------------------------------------\n" +"\n" +"You can reply to their message here:\n" +"\n" +"%4$s\n" +"\n" +"Don't reply to this email; it won't get to them.\n" +"\n" +"With kind regards,\n" +"%5$s\n" msgstr "" -#: lib/groupnav.php:119 +#: lib/mail.php:554 #, php-format -msgid "Add or edit %s design" +msgid "%s (@%s) added your notice as a favorite" msgstr "" #: lib/mail.php:556 #, php-format msgid "" -"%1$s just added your notice from %2$s as one of their favorites.\n" +"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n" "\n" "The URL of your notice is:\n" "\n" @@ -6719,607 +4027,431 @@ msgid "" "%6$s\n" msgstr "" -#: lib/mail.php:646 +#: lib/mail.php:611 #, php-format -msgid "Your Twitter bridge has been disabled." +msgid "%s (@%s) sent a notice to your attention" msgstr "" -#: lib/mail.php:648 +#: lib/mail.php:613 #, php-format msgid "" -"Hi, %1$s. We're sorry to inform you that your link to Twitter has been " -"disabled. Your Twitter credentials have either changed (did you recently " -"change your Twitter password?) or you have otherwise revoked our access to " -"your Twitter account.\n" +"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n" "\n" -"You can re-enable your Twitter bridge by visiting your Twitter settings " -"page:\n" +"The notice is here:\n" "\n" -"\t%2$s\n" +"\t%3$s\n" "\n" -"Regards,\n" -"%3$s\n" -msgstr "" - -#: lib/mail.php:682 -#, php-format -msgid "Your %s Facebook application access has been disabled." -msgstr "" - -#: lib/mail.php:685 -#, php-format -msgid "" -"Hi, %1$s. We're sorry to inform you that we are unable to update your " -"Facebook status from %s, and have disabled the Facebook application for your " -"account. This may be because you have removed the Facebook application's " -"authorization, or have deleted your Facebook account. You can re-enable the " -"Facebook application and automatic status updating by re-installing the %1$s " -"Facebook application.\n" +"It reads:\n" "\n" -"Regards,\n" +"\t%4$s\n" "\n" -"%1$s" -msgstr "" - -#: lib/mailbox.php:139 -msgid "" -"You have no private messages. You can send private message to engage other " -"users in conversation. People can send you messages for your eyes only." -msgstr "" - -#: lib/noticeform.php:154 lib/noticeform.php:180 -msgid "Attach" -msgstr "" - -#: lib/noticeform.php:158 lib/noticeform.php:184 -msgid "Attach a file" -msgstr "" - -#: lib/noticelist.php:436 lib/noticelist.php:478 -msgid "in context" -msgstr "" - -#: lib/profileaction.php:177 -msgid "User ID" msgstr "" -#: lib/searchaction.php:156 lib/searchaction.php:162 -msgid "Search help" +#: lib/mediafile.php:98 lib/mediafile.php:123 +msgid "There was a database error while saving your file. Please try again." msgstr "" -#: lib/subscriberspeopleselftagcloudsection.php:48 -#: lib/subscriptionspeopleselftagcloudsection.php:48 -msgid "People Tagcloud as self-tagged" +#: lib/mediafile.php:142 +msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini." msgstr "" -#: lib/subscriberspeopletagcloudsection.php:48 -#: lib/subscriptionspeopletagcloudsection.php:48 -msgid "People Tagcloud as tagged" +#: lib/mediafile.php:147 +msgid "" +"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in " +"the HTML form." msgstr "" -#: lib/webcolor.php:82 -#, php-format -msgid "%s is not a valid color!" +#: lib/mediafile.php:152 +msgid "The uploaded file was only partially uploaded." msgstr "" -#: lib/webcolor.php:123 -#, php-format -msgid "%s is not a valid color! Use 3 or 6 hex chars." +#: lib/mediafile.php:159 +msgid "Missing a temporary folder." msgstr "" -#: actions/all.php:63 actions/public.php:97 actions/replies.php:92 -#: actions/showfavorites.php:137 actions/tag.php:51 -msgid "No such page" +#: lib/mediafile.php:162 +msgid "Failed to write file to disk." msgstr "" -#: actions/apidirectmessage.php:89 -#, php-format -msgid "Direct messages from %s" +#: lib/mediafile.php:165 +msgid "File upload stopped by extension." msgstr "" -#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150 -#, php-format -msgid "That's too long. Max message size is %d chars." +#: lib/mediafile.php:179 lib/mediafile.php:216 +msgid "File exceeds user's quota!" msgstr "" -#: actions/apifriendshipsdestroy.php:109 -msgid "Could not unfollow user: User not found." +#: lib/mediafile.php:196 lib/mediafile.php:233 +msgid "File could not be moved to destination directory." msgstr "" -#: actions/apifriendshipsdestroy.php:120 -msgid "You cannot unfollow yourself!" +#: lib/mediafile.php:201 lib/mediafile.php:237 +msgid "Could not determine file's mime-type!" msgstr "" -#: actions/apigroupcreate.php:261 +#: lib/mediafile.php:270 #, php-format -msgid "Description is too long (max %d chars)." -msgstr "" - -#: actions/apigroupjoin.php:110 -msgid "You are already a member of that group." +msgid " Try using another %s format." msgstr "" -#: actions/apigroupjoin.php:138 +#: lib/mediafile.php:275 #, php-format -msgid "Could not join user %s to group %s." +msgid "%s is not a supported filetype on this server." msgstr "" -#: actions/apigroupleave.php:114 -msgid "You are not a member of this group." +#: lib/messageform.php:120 +msgid "Send a direct notice" msgstr "" -#: actions/apigroupleave.php:124 -#, php-format -msgid "Could not remove user %s to group %s." +#: lib/messageform.php:146 +msgid "To" msgstr "" -#: actions/apigrouplist.php:95 -#, php-format -msgid "%s's groups" +#: lib/messageform.php:162 lib/noticeform.php:173 +msgid "Available characters" msgstr "" -#: actions/apigrouplist.php:103 -#, php-format -msgid "Groups %s is a member of on %s." +#: lib/noticeform.php:145 +msgid "Send a notice" msgstr "" -#: actions/apigrouplistall.php:94 +#: lib/noticeform.php:158 #, php-format -msgid "groups on %s" -msgstr "" - -#: actions/apistatusesshow.php:138 -msgid "Status deleted." +msgid "What's up, %s?" msgstr "" -#: actions/apistatusesupdate.php:132 -#: actions/apiaccountupdateprofileimage.php:99 -msgid "Unable to handle that much POST data!" +#: lib/noticeform.php:180 +msgid "Attach" msgstr "" -#: actions/apistatusesupdate.php:145 actions/newnotice.php:155 -#: scripts/maildaemon.php:71 actions/apistatusesupdate.php:152 -#, php-format -msgid "That's too long. Max notice size is %d chars." +#: lib/noticeform.php:184 +msgid "Attach a file" msgstr "" -#: actions/apistatusesupdate.php:209 actions/newnotice.php:178 -#: actions/apistatusesupdate.php:216 -#, php-format -msgid "Max notice size is %d chars, including attachment URL." +#: lib/noticelist.php:478 +msgid "in context" msgstr "" -#: actions/apisubscriptions.php:231 actions/apisubscriptions.php:261 -msgid "Unsupported format." +#: lib/noticelist.php:498 +msgid "Reply to this notice" msgstr "" -#: actions/bookmarklet.php:50 -msgid "Post to " +#: lib/noticelist.php:499 +msgid "Reply" msgstr "" -#: actions/editgroup.php:201 actions/newgroup.php:145 -#, php-format -msgid "description is too long (max %d chars)." +#: lib/nudgeform.php:116 +msgid "Nudge this user" msgstr "" -#: actions/favoritesrss.php:115 -#, php-format -msgid "Updates favored by %1$s on %2$s!" +#: lib/nudgeform.php:128 +msgid "Nudge" msgstr "" -#: actions/finishremotesubscribe.php:80 -msgid "User being listened to does not exist." +#: lib/nudgeform.php:128 +msgid "Send a nudge to this user" msgstr "" -#: actions/finishremotesubscribe.php:106 -msgid "You are not authorized." +#: lib/oauthstore.php:283 +msgid "Error inserting new profile" msgstr "" -#: actions/finishremotesubscribe.php:109 -msgid "Could not convert request token to access token." +#: lib/oauthstore.php:291 +msgid "Error inserting avatar" msgstr "" -#: actions/finishremotesubscribe.php:114 -msgid "Remote service uses unknown version of OMB protocol." +#: lib/oauthstore.php:311 +msgid "Error inserting remote profile" msgstr "" -#: actions/getfile.php:75 -msgid "No such file." +#: lib/oauthstore.php:345 +msgid "Duplicate notice" msgstr "" -#: actions/getfile.php:79 -msgid "Cannot read file." +#: lib/oauthstore.php:487 +msgid "Couldn't insert new subscription." msgstr "" -#: actions/grouprss.php:133 -#, php-format -msgid "Updates from members of %1$s on %2$s!" +#: lib/personalgroupnav.php:99 +msgid "Personal" msgstr "" -#: actions/imsettings.php:89 -msgid "IM is not available." +#: lib/personalgroupnav.php:104 +msgid "Replies" msgstr "" -#: actions/login.php:259 actions/login.php:286 -#, php-format -msgid "" -"Login with your username and password. Don't have a username yet? [Register]" -"(%%action.register%%) a new account." +#: lib/personalgroupnav.php:114 +msgid "Favorites" msgstr "" -#: actions/noticesearchrss.php:89 -#, php-format -msgid "Updates with \"%s\"" +#: lib/personalgroupnav.php:115 +msgid "User" msgstr "" -#: actions/noticesearchrss.php:91 -#, php-format -msgid "Updates matching search term \"%1$s\" on %2$s!" +#: lib/personalgroupnav.php:124 +msgid "Inbox" msgstr "" -#: actions/oembed.php:157 -msgid "content type " +#: lib/personalgroupnav.php:125 +msgid "Your incoming messages" msgstr "" -#: actions/oembed.php:160 -msgid "Only " +#: lib/personalgroupnav.php:129 +msgid "Outbox" msgstr "" -#: actions/postnotice.php:90 -#, php-format -msgid "Notice license ‘%s’ is not compatible with site license ‘%s’." +#: lib/personalgroupnav.php:130 +msgid "Your sent messages" msgstr "" -#: actions/profilesettings.php:122 actions/register.php:454 -#: actions/register.php:460 +#: lib/personaltagcloudsection.php:56 #, php-format -msgid "Describe yourself and your interests in %d chars" -msgstr "" - -#: actions/profilesettings.php:125 actions/register.php:457 -#: actions/register.php:463 -msgid "Describe yourself and your interests" +msgid "Tags in %s's notices" msgstr "" -#: actions/profilesettings.php:221 actions/register.php:217 -#: actions/register.php:223 -#, php-format -msgid "Bio is too long (max %d chars)." +#: lib/profileaction.php:109 lib/profileaction.php:191 lib/subgroupnav.php:82 +msgid "Subscriptions" msgstr "" -#: actions/register.php:336 actions/register.php:342 -msgid "" -"With this form you can create a new account. You can then post notices and " -"link up to friends and colleagues. " +#: lib/profileaction.php:126 +msgid "All subscriptions" msgstr "" -#: actions/remotesubscribe.php:168 -msgid "" -"Not a valid profile URL (no YADIS document or no or invalid XRDS defined)." +#: lib/profileaction.php:140 lib/profileaction.php:200 lib/subgroupnav.php:90 +msgid "Subscribers" msgstr "" -#: actions/remotesubscribe.php:176 -msgid "That’s a local profile! Login to subscribe." +#: lib/profileaction.php:157 +msgid "All subscribers" msgstr "" -#: actions/remotesubscribe.php:183 -msgid "Couldn’t get a request token." +#: lib/profileaction.php:177 +msgid "User ID" msgstr "" -#: actions/replies.php:144 -#, php-format -msgid "Replies feed for %s (RSS 1.0)" +#: lib/profileaction.php:182 +msgid "Member since" msgstr "" -#: actions/replies.php:151 -#, php-format -msgid "Replies feed for %s (RSS 2.0)" +#: lib/profileaction.php:235 +msgid "All groups" msgstr "" -#: actions/replies.php:158 -#, php-format -msgid "Replies feed for %s (Atom)" +#: lib/publicgroupnav.php:78 +msgid "Public" msgstr "" -#: actions/repliesrss.php:72 -#, php-format -msgid "Replies to %1$s on %2$s!" +#: lib/publicgroupnav.php:82 +msgid "User groups" msgstr "" -#: actions/showfavorites.php:170 -#, php-format -msgid "Feed for favorites of %s (RSS 1.0)" +#: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85 +msgid "Recent tags" msgstr "" -#: actions/showfavorites.php:177 -#, php-format -msgid "Feed for favorites of %s (RSS 2.0)" +#: lib/publicgroupnav.php:88 +msgid "Featured" msgstr "" -#: actions/showfavorites.php:184 -#, php-format -msgid "Feed for favorites of %s (Atom)" +#: lib/publicgroupnav.php:92 +msgid "Popular" msgstr "" -#: actions/showfavorites.php:211 -#, php-format -msgid "" -"%s hasn't added any notices to his favorites yet. Why not [register an " -"account](%%%%action.register%%%%) and then post something interesting they " -"would add to their favorites :)" +#: lib/searchaction.php:120 +msgid "Search site" msgstr "" -#: actions/showgroup.php:345 -#, php-format -msgid "FOAF for %s group" +#: lib/searchaction.php:162 +msgid "Search help" msgstr "" -#: actions/shownotice.php:90 -msgid "Notice deleted." +#: lib/searchgroupnav.php:80 +msgid "People" msgstr "" -#: actions/smssettings.php:91 -msgid "SMS is not available." +#: lib/searchgroupnav.php:81 +msgid "Find people on this site" msgstr "" -#: actions/tag.php:92 -#, php-format -msgid "Notice feed for tag %s (RSS 2.0)" +#: lib/searchgroupnav.php:82 +msgid "Notice" msgstr "" -#: actions/updateprofile.php:62 actions/userauthorization.php:330 -#, php-format -msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’." +#: lib/searchgroupnav.php:83 +msgid "Find content of notices" msgstr "" -#: actions/userauthorization.php:110 -msgid "" -"Please check these details to make sure that you want to subscribe to this " -"user’s notices. If you didn’t just ask to subscribe to someone’s notices, " -"click “Reject”." +#: lib/searchgroupnav.php:85 +msgid "Find groups on this site" msgstr "" -#: actions/userauthorization.php:249 -msgid "" -"The subscription has been authorized, but no callback URL was passed. Check " -"with the site’s instructions for details on how to authorize the " -"subscription. Your subscription token is:" +#: lib/section.php:89 +msgid "Untitled section" msgstr "" -#: actions/userauthorization.php:261 -msgid "" -"The subscription has been rejected, but no callback URL was passed. Check " -"with the site’s instructions for details on how to fully reject the " -"subscription." +#: lib/section.php:106 +msgid "More..." msgstr "" -#: actions/userauthorization.php:296 +#: lib/subgroupnav.php:83 #, php-format -msgid "Listener URI ‘%s’ not found here" +msgid "People %s subscribes to" msgstr "" -#: actions/userauthorization.php:301 +#: lib/subgroupnav.php:91 #, php-format -msgid "Listenee URI ‘%s’ is too long." +msgid "People subscribed to %s" msgstr "" -#: actions/userauthorization.php:307 +#: lib/subgroupnav.php:99 #, php-format -msgid "Listenee URI ‘%s’ is a local user." +msgid "Groups %s is a member of" msgstr "" -#: actions/userauthorization.php:322 -#, php-format -msgid "Profile URL ‘%s’ is for a local user." +#: lib/subscriberspeopleselftagcloudsection.php:48 +#: lib/subscriptionspeopleselftagcloudsection.php:48 +msgid "People Tagcloud as self-tagged" msgstr "" -#: actions/userauthorization.php:338 -#, php-format -msgid "Avatar URL ‘%s’ is not valid." +#: lib/subscriberspeopletagcloudsection.php:48 +#: lib/subscriptionspeopletagcloudsection.php:48 +msgid "People Tagcloud as tagged" msgstr "" -#: actions/userauthorization.php:343 -#, php-format -msgid "Can’t read avatar URL ‘%s’." +#: lib/subscriptionlist.php:126 +msgid "(none)" msgstr "" -#: actions/userauthorization.php:348 -#, php-format -msgid "Wrong image type for avatar URL ‘%s’." +#: lib/subs.php:48 +msgid "Already subscribed!" msgstr "" -#: lib/action.php:435 -msgid "Connect to services" +#: lib/subs.php:52 +msgid "User has blocked you." msgstr "" -#: lib/action.php:785 -msgid "Site content license" +#: lib/subs.php:56 +msgid "Could not subscribe." msgstr "" -#: lib/command.php:88 -#, php-format -msgid "Could not find a user with nickname %s" +#: lib/subs.php:75 +msgid "Could not subscribe other to you." msgstr "" -#: lib/command.php:92 -msgid "It does not make a lot of sense to nudge yourself!" +#: lib/subs.php:124 +msgid "Not subscribed!." msgstr "" -#: lib/command.php:99 -#, php-format -msgid "Nudge sent to %s" +#: lib/subs.php:136 +msgid "Couldn't delete subscription." msgstr "" -#: lib/command.php:152 lib/command.php:400 -msgid "Notice with that id does not exist" +#: lib/tagcloudsection.php:56 +msgid "None" msgstr "" -#: lib/command.php:358 scripts/xmppdaemon.php:321 -#, php-format -msgid "Message too long - maximum is %d characters, you sent %d" +#: lib/topposterssection.php:74 +msgid "Top posters" msgstr "" -#: lib/command.php:431 -#, php-format -msgid "Notice too long - maximum is %d characters, you sent %d" +#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137 +msgid "Unsubscribe from this user" msgstr "" -#: lib/command.php:439 -#, php-format -msgid "Reply to %s sent" +#: lib/unsubscribeform.php:137 +msgid "Unsubscribe" msgstr "" -#: lib/command.php:441 -msgid "Error saving notice." +#: lib/userprofile.php:116 +msgid "Edit Avatar" msgstr "" -#: lib/common.php:191 -msgid "No configuration file found. " +#: lib/userprofile.php:236 +msgid "User actions" msgstr "" -#: lib/common.php:192 -msgid "I looked for configuration files in the following places: " +#: lib/userprofile.php:248 +msgid "Edit profile settings" msgstr "" -#: lib/common.php:193 -msgid "You may wish to run the installer to fix this." +#: lib/userprofile.php:249 +msgid "Edit" msgstr "" -#: lib/common.php:194 -msgid "Go to the installer." +#: lib/userprofile.php:272 +msgid "Send a direct message to this user" msgstr "" -#: lib/galleryaction.php:139 -msgid "Select tag to filter" +#: lib/userprofile.php:273 +msgid "Message" msgstr "" -#: lib/groupeditform.php:168 -msgid "Describe the group or topic" +#: lib/util.php:844 +msgid "a few seconds ago" msgstr "" -#: lib/groupeditform.php:170 -#, php-format -msgid "Describe the group or topic in %d characters" +#: lib/util.php:846 +msgid "about a minute ago" msgstr "" -#: lib/jabber.php:192 +#: lib/util.php:848 #, php-format -msgid "notice id: %s" +msgid "about %d minutes ago" msgstr "" -#: lib/mail.php:554 -#, php-format -msgid "%s (@%s) added your notice as a favorite" +#: lib/util.php:850 +msgid "about an hour ago" msgstr "" -#: lib/mail.php:556 +#: lib/util.php:852 #, php-format -msgid "" -"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n" -"\n" -"The URL of your notice is:\n" -"\n" -"%3$s\n" -"\n" -"The text of your notice is:\n" -"\n" -"%4$s\n" -"\n" -"You can see the list of %1$s's favorites here:\n" -"\n" -"%5$s\n" -"\n" -"Faithfully yours,\n" -"%6$s\n" +msgid "about %d hours ago" msgstr "" -#: lib/mail.php:611 -#, php-format -msgid "%s (@%s) sent a notice to your attention" +#: lib/util.php:854 +msgid "about a day ago" msgstr "" -#: lib/mail.php:613 +#: lib/util.php:856 #, php-format -msgid "" -"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n" -"\n" -"The notice is here:\n" -"\n" -"\t%3$s\n" -"\n" -"It reads:\n" -"\n" -"\t%4$s\n" -"\n" +msgid "about %d days ago" msgstr "" -#: lib/mailbox.php:227 lib/noticelist.php:424 -msgid "from" +#: lib/util.php:858 +msgid "about a month ago" msgstr "" -#: lib/mediafile.php:179 lib/mediafile.php:216 -msgid "File exceeds user's quota!" +#: lib/util.php:860 +#, php-format +msgid "about %d months ago" msgstr "" -#: lib/mediafile.php:201 lib/mediafile.php:237 -msgid "Could not determine file's mime-type!" +#: lib/util.php:862 +msgid "about a year ago" msgstr "" -#: lib/oauthstore.php:345 -msgid "Duplicate notice" +#: lib/webcolor.php:82 +#, php-format +msgid "%s is not a valid color!" msgstr "" -#: actions/login.php:110 actions/login.php:120 -msgid "Invalid or expired token." +#: lib/webcolor.php:123 +#, php-format +msgid "%s is not a valid color! Use 3 or 6 hex chars." msgstr "" -#: lib/command.php:597 -#, php-format -msgid "Could not create login token for %s" +#: scripts/maildaemon.php:48 +msgid "Could not parse message." msgstr "" -#: lib/command.php:602 -#, php-format -msgid "This link is useable only once, and is good for only 2 minutes: %s" +#: scripts/maildaemon.php:53 +msgid "Not a registered user." msgstr "" -#: lib/imagefile.php:75 -#, php-format -msgid "That file is too big. The maximum file size is %s." +#: scripts/maildaemon.php:57 +msgid "Sorry, that is not your incoming email address." msgstr "" -#: lib/command.php:613 -msgid "" -"Commands:\n" -"on - turn on notifications\n" -"off - turn off notifications\n" -"help - show this help\n" -"follow <nickname> - subscribe to user\n" -"leave <nickname> - unsubscribe from user\n" -"d <nickname> <text> - direct message to user\n" -"get <nickname> - get last notice from user\n" -"whois <nickname> - get profile info on user\n" -"fav <nickname> - add user's last notice as a 'fave'\n" -"fav #<notice_id> - add notice with the given id as a 'fave'\n" -"reply #<notice_id> - reply to notice with a given id\n" -"reply <nickname> - reply to the last notice from user\n" -"join <group> - join group\n" -"login - Get a link to login to the web interface\n" -"drop <group> - leave group\n" -"stats - get your stats\n" -"stop - same as 'off'\n" -"quit - same as 'off'\n" -"sub <nickname> - same as 'follow'\n" -"unsub <nickname> - same as 'leave'\n" -"last <nickname> - same as 'get'\n" -"on <nickname> - not yet implemented.\n" -"off <nickname> - not yet implemented.\n" -"nudge <nickname> - remind a user to update.\n" -"invite <phone number> - not yet implemented.\n" -"track <word> - not yet implemented.\n" -"untrack <word> - not yet implemented.\n" -"track off - not yet implemented.\n" -"untrack all - not yet implemented.\n" -"tracks - not yet implemented.\n" -"tracking - not yet implemented.\n" +#: scripts/maildaemon.php:61 +msgid "Sorry, no incoming email allowed." msgstr "" diff --git a/plugins/Facebook/facebook/facebookapi_php5_restlib.php b/plugins/Facebook/facebook/facebookapi_php5_restlib.php index 55cb7fb86..e2a6fe88b 100755 --- a/plugins/Facebook/facebook/facebookapi_php5_restlib.php +++ b/plugins/Facebook/facebook/facebookapi_php5_restlib.php @@ -2951,7 +2951,7 @@ function toggleDisplay(id, type) { /** - * Bans a list of users from the app. Banned users can't + * Bans a list of users from the app. Banned users cannot * access the app's canvas page and forums. * * @param array $uids an array of user ids diff --git a/plugins/Facebook/facebook/jsonwrapper/JSON/JSON.php b/plugins/Facebook/facebook/jsonwrapper/JSON/JSON.php index 0cddbddb4..92542b47d 100644 --- a/plugins/Facebook/facebook/jsonwrapper/JSON/JSON.php +++ b/plugins/Facebook/facebook/jsonwrapper/JSON/JSON.php @@ -124,7 +124,7 @@ class Services_JSON * "{...}" syntax creates associative arrays * instead of objects in decode(). * - SERVICES_JSON_SUPPRESS_ERRORS: error suppression. - * Values which can't be encoded (e.g. resources) + * Values which cannot be encoded (e.g. resources) * appear as NULL instead of throwing errors. * By default, a deeply-nested resource will * bubble up with an error, so all return values diff --git a/plugins/Facebook/facebookaction.php b/plugins/Facebook/facebookaction.php index a10fdf90d..1d8b5217b 100644 --- a/plugins/Facebook/facebookaction.php +++ b/plugins/Facebook/facebookaction.php @@ -513,7 +513,7 @@ class FacebookNoticeList extends NoticeList /** * show the list of notices * - * "Uses up" the stream by looping through it. So, probably can't + * "Uses up" the stream by looping through it. So, probably cannot * be called twice on the same list. * * @return int count of notices listed. diff --git a/plugins/Facebook/facebookhome.php b/plugins/Facebook/facebookhome.php index 91c0cc6b8..ee6e6620b 100644 --- a/plugins/Facebook/facebookhome.php +++ b/plugins/Facebook/facebookhome.php @@ -108,7 +108,7 @@ class FacebookhomeAction extends FacebookAction $user = User::staticGet('nickname', $nickname); if (!$user) { - $this->showLoginForm(_("Server error - couldn't get user!")); + $this->showLoginForm(_("Server error. Could not get user.")); } $flink = DB_DataObject::factory('foreign_link'); diff --git a/plugins/LinkbackPlugin.php b/plugins/LinkbackPlugin.php index 915d15c07..bc433b896 100644 --- a/plugins/LinkbackPlugin.php +++ b/plugins/LinkbackPlugin.php @@ -125,7 +125,7 @@ class LinkbackPlugin extends Plugin if (!extension_loaded('xmlrpc')) { if (!dl('xmlrpc.so')) { - common_log(LOG_ERR, "Can't pingback; xmlrpc extension not available."); + common_log(LOG_ERR, "Cannot pingback; xmlrpc extension not available."); } } diff --git a/plugins/Meteor/MeteorPlugin.php b/plugins/Meteor/MeteorPlugin.php index 5b345d7c2..f3cbc3eea 100644 --- a/plugins/Meteor/MeteorPlugin.php +++ b/plugins/Meteor/MeteorPlugin.php @@ -85,7 +85,7 @@ class MeteorPlugin extends RealtimePlugin // May throw an exception. $this->_socket = stream_socket_client("tcp://{$controlserver}:{$this->controlport}"); if (!$this->_socket) { - throw new Exception("Couldn't connect to {$controlserver} on {$this->controlport}"); + throw new Exception("Could not connect to {$controlserver} on {$this->controlport}"); } } diff --git a/plugins/OpenID/openid.php b/plugins/OpenID/openid.php index ff7a93899..cd042226b 100644 --- a/plugins/OpenID/openid.php +++ b/plugins/OpenID/openid.php @@ -36,7 +36,7 @@ function oid_store() { static $store = null; if (!$store) { - # Can't be called statically + # Cannot be called statically $user = new User(); $conn = $user->getDatabaseConnection(); $store = new Auth_OpenID_MySQLStore($conn); @@ -192,7 +192,7 @@ function oid_authenticate($openid_url, $returnto, $immediate=false) $form_html = preg_replace('/&/', '&', $form_html); - // Display an error if the form markup couldn't be generated; + // Display an error if the form markup could not be generated; // otherwise, render the HTML. if (Auth_OpenID::isFailure($form_html)) { common_server_error(sprintf(_('Could not create OpenID form: %s'), $form_html->message)); diff --git a/plugins/TwitterBridge/daemons/synctwitterfriends.php b/plugins/TwitterBridge/daemons/synctwitterfriends.php index 671e3c7af..6a155b301 100755 --- a/plugins/TwitterBridge/daemons/synctwitterfriends.php +++ b/plugins/TwitterBridge/daemons/synctwitterfriends.php @@ -126,7 +126,7 @@ class SyncTwitterFriendsDaemon extends ParallelizingDaemon $conn->disconnect(); - // XXX: Couldn't find a less brutal way to blow + // XXX: Could not find a less brutal way to blow // away a cached connection global $_DB_DATAOBJECT; @@ -188,7 +188,7 @@ class SyncTwitterFriendsDaemon extends ParallelizingDaemon if (empty($more_friends)) { common_log(LOG_WARNING, $this->name() . - " - Couldn't retrieve page $i " . + " - Could not retrieve page $i " . "of Twitter user $flink->foreign_id friends."); continue; } else { @@ -222,11 +222,11 @@ class SyncTwitterFriendsDaemon extends ParallelizingDaemon if (!save_twitter_user($friend_id, $friend_name)) { common_log(LOG_WARNING, $this-name() . - " - Couldn't save $screen_name's friend, $friend_name."); + " - Could not save $screen_name's friend, $friend_name."); continue; } - // Check to see if there's a related local user + // Check to see if there is a related local user $friend_flink = Foreign_link::getByForeignID($friend_id, TWITTER_SERVICE); diff --git a/plugins/TwitterBridge/daemons/twitterstatusfetcher.php b/plugins/TwitterBridge/daemons/twitterstatusfetcher.php index b5428316b..ab610e553 100755 --- a/plugins/TwitterBridge/daemons/twitterstatusfetcher.php +++ b/plugins/TwitterBridge/daemons/twitterstatusfetcher.php @@ -147,7 +147,7 @@ class TwitterStatusFetcher extends ParallelizingDaemon $conn->disconnect(); - // XXX: Couldn't find a less brutal way to blow + // XXX: Could not find a less brutal way to blow // away a cached connection global $_DB_DATAOBJECT; @@ -158,7 +158,7 @@ class TwitterStatusFetcher extends ParallelizingDaemon { if (empty($flink)) { common_log(LOG_WARNING, $this->name() . - " - Can't retrieve Foreign_link for foreign ID $fid"); + " - Cannot retrieve Foreign_link for foreign ID $fid"); return; } @@ -458,7 +458,7 @@ class TwitterStatusFetcher extends ParallelizingDaemon $profile = Profile::staticGet($profile_id); if (empty($profile)) { - common_debug($this->name() . " - Couldn't get profile: $profile_id!"); + common_debug($this->name() . " - Could not get profile: $profile_id!"); return; } @@ -537,7 +537,7 @@ class TwitterStatusFetcher extends ParallelizingDaemon $ok = file_put_contents($avatarfile, $response->getBody()); if (!$ok) { common_log(LOG_WARNING, $this->name() . - " - Couldn't open file $filename"); + " - Could not open file $filename"); return false; } } else { diff --git a/plugins/UserFlag/flagprofile.php b/plugins/UserFlag/flagprofile.php index c72b74c6a..84c343c48 100644 --- a/plugins/UserFlag/flagprofile.php +++ b/plugins/UserFlag/flagprofile.php @@ -135,7 +135,7 @@ class FlagprofileAction extends Action $ufp->created = common_sql_now(); if (!$ufp->insert()) { - throw new ServerException(sprintf(_("Couldn't flag profile '%s' with flag '%s'."), + throw new ServerException(sprintf(_("Could not flag profile '%s' with flag '%s'."), $this->profile->nickname, $this->flag)); } diff --git a/scripts/console.php b/scripts/console.php index 41dd43f28..2413f5079 100755 --- a/scripts/console.php +++ b/scripts/console.php @@ -90,7 +90,7 @@ function readline_emulation($prompt) if ($retval == 0) { return $line; } elseif ($retval == 127) { - // Couldn't execute bash even though we thought we saw it. + // Could not execute bash even though we thought we saw it. // Shell probably spit out an error message, sorry :( // Fall through to fgets()... } else { diff --git a/scripts/createsim.php b/scripts/createsim.php index 1266a9700..592853f86 100644 --- a/scripts/createsim.php +++ b/scripts/createsim.php @@ -85,7 +85,7 @@ function newSub($i) $from = User::staticGet('nickname', $fromnick); if (empty($from)) { - throw new Exception("Can't find user '$fromnick'."); + throw new Exception("Cannot find user '$fromnick'."); } $t = rand(0, $i - 1); @@ -102,7 +102,7 @@ function newSub($i) $to = User::staticGet('nickname', $tunic); if (empty($to)) { - throw new Exception("Can't find user '$tunic'."); + throw new Exception("Cannot find user '$tunic'."); } subs_subscribe_to($from, $to); diff --git a/scripts/deleteuser.php b/scripts/deleteuser.php index 52389123c..39331f1a8 100644 --- a/scripts/deleteuser.php +++ b/scripts/deleteuser.php @@ -39,14 +39,14 @@ if (have_option('i', 'id')) { $id = get_option_value('i', 'id'); $user = User::staticGet('id', $id); if (empty($user)) { - print "Can't find user with ID $id\n"; + print "Cannot find user with ID $id\n"; exit(1); } } else if (have_option('n', 'nickname')) { $nickname = get_option_value('n', 'nickname'); $user = User::staticGet('nickname', $nickname); if (empty($user)) { - print "Can't find user with nickname '$nickname'\n"; + print "Cannot find user with nickname '$nickname'\n"; exit(1); } } else { diff --git a/scripts/fixup_utf8.php b/scripts/fixup_utf8.php index 5a9fba7c3..5581633ec 100755 --- a/scripts/fixup_utf8.php +++ b/scripts/fixup_utf8.php @@ -76,7 +76,7 @@ class UTF8FixerUpper $succ = mysqli_set_charset($conn, $charset); if (!$succ) { - echo "ERROR: couldn't set charset\n"; + echo "ERROR: Could not set charset\n"; $db->disconnect(); return NULL; } diff --git a/scripts/makegroupadmin.php b/scripts/makegroupadmin.php index a68798451..07f980d58 100644 --- a/scripts/makegroupadmin.php +++ b/scripts/makegroupadmin.php @@ -67,7 +67,7 @@ try { $member->created = common_sql_now(); if (!$member->insert()) { - throw new Exception("Can't add '$nickname' to '$groupname'."); + throw new Exception("Cannot add '$nickname' to '$groupname'."); } } @@ -80,7 +80,7 @@ try { $member->is_admin = 1; if (!$member->update($orig)) { - throw new Exception("Can't make '$nickname' admin of '$groupname'."); + throw new Exception("Cannot make '$nickname' admin of '$groupname'."); } } catch (Exception $e) { diff --git a/scripts/registeruser.php b/scripts/registeruser.php index 5d9c8862d..8aab325b7 100644 --- a/scripts/registeruser.php +++ b/scripts/registeruser.php @@ -60,7 +60,7 @@ try { 'fullname' => $fullname)); if (empty($user)) { - throw new Exception("Can't register user '$nickname' with password '$password' and fullname '$fullname'."); + throw new Exception("Cannot register user '$nickname' with password '$password' and fullname '$fullname'."); } if (!empty($email)) { @@ -71,7 +71,7 @@ try { if (!$user->updateKeys($orig)) { print "Failed!\n"; - throw new Exception("Can't update email address."); + throw new Exception("Cannot update email address."); } } diff --git a/scripts/showcache.php b/scripts/showcache.php index f17979572..6b00a8f7b 100644 --- a/scripts/showcache.php +++ b/scripts/showcache.php @@ -58,7 +58,7 @@ print "Checking key '$k'...\n"; $c = common_memcache(); if (empty($c)) { - die("Can't initialize cache object!\n"); + die("Cannot initialize cache object!\n"); } $obj = $c->get($k); diff --git a/scripts/sitemap.php b/scripts/sitemap.php index f8c392146..ee5d33e1e 100755 --- a/scripts/sitemap.php +++ b/scripts/sitemap.php @@ -377,11 +377,11 @@ function write_file($path, $data) } if (($fh_out = fopen($path,'w')) === false) { - error("couldn't open $path for writing."); + error("Could not open $path for writing."); } if (fwrite($fh_out, $data) === false) { - error("couldn't write to $path."); + error("Could not write to $path."); } } diff --git a/scripts/update_translations.php b/scripts/update_translations.php index 580c472ee..8d4c9d3d2 100755 --- a/scripts/update_translations.php +++ b/scripts/update_translations.php @@ -98,7 +98,7 @@ foreach ($languages as $language) { $new_file = curl_get_file($file_url); if ($new_file === FALSE) { - echo "Couldn't retrieve .po file for $code: $file_url\n"; + echo "Could not retrieve .po file for $code: $file_url\n"; continue; } |