We are no longer offering accounts on this server. Consider https://gitlab.freedesktop.org/ as a place to host projects.

Commit 173778ea authored by Brion Vibber's avatar Brion Vibber

Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x

Conflicts:
	lib/xmppmanager.php (resolved: code has moved to XmppPlugin.php)
parents ddc7811a e05415f6
......@@ -3,7 +3,7 @@ README
------
StatusNet 0.9.2 ("King of Birds")
21 Apr 2010
3 May 2010
This is the README file for StatusNet, the Open Source microblogging
platform. It includes installation instructions, descriptions of
......@@ -85,18 +85,27 @@ public sites upgrade to the new version immediately.
Notable changes this version:
- Installer no longer fails with a PHP fatal error when trying to set up the
subscription to update@status.net
- Fixed email notifications for @-replies that come in via OStatus
- OStatus related Fixes to the cloudy theme
- Pass geo locations over Twitter bridge (will only be used if enabled on the Twitter side)
- scripts/showplugins.php - script to dump the list of activated plugins and their settings
- scripts/fixup_blocks.php - script to finds any stray subscriptions in violation of blocks, and removes them
- Allow blocking someone who's not currently subscribed to you (prevents seeing @-replies from them, or them subbing to you in future)
- Default 2-second timeout on Geonames web service lookups
- OStatus related Fixes to the cloudy theme
- Pass geo locations over Twitter bridge (will only be used if enabled on the
Twitter side)
- scripts/showplugins.php - script to dump the list of activated plugins and
their settings
- scripts/fixup_blocks.php - script to finds any stray subscriptions in
violation of blocks, and removes them
- Allow blocking someone who's not currently subscribed to you (prevents
seeing @-replies from them, or them subbing to you in future)
- Default 2-second timeout on Geonames web service lookups
- Improved localization for plugins
- New anti-spam measures: added nofollow rels to group members list, subscribers list
- Shared cache key option for Geonames plugin (lets multi-instance sites share their cached geoname lookups)
- New anti-spam measures: added nofollow rels to group members list,
subscribers list
- Shared cache key option for Geonames plugin (lets multi-instance sites
share their cached geoname lookups)
- Stability fixes to the TwitterStatusFetcher
- If user allows location sharing but turned off browser location use profile location
- If user allows location sharing but turned off browser location use profile
location
- Improved group listing via the API
- Improved FOAF output
- Several other bugfixes
......
......@@ -185,17 +185,23 @@ class ApiTimelineFavoritesAction extends ApiBareAuthAction
{
$notices = array();
common_debug("since id = " . $this->since_id . " max id = " . $this->max_id);
if (!empty($this->auth_user) && $this->auth_user->id == $this->user->id) {
$notice = $this->user->favoriteNotices(
true,
($this->page-1) * $this->count,
$this->count,
true
$this->since_id,
$this->max_id
);
} else {
$notice = $this->user->favoriteNotices(
false,
($this->page-1) * $this->count,
$this->count,
false
$this->since_id,
$this->max_id
);
}
......
......@@ -89,7 +89,7 @@ class FavoritesrssAction extends Rss10Action
function getNotices($limit=0)
{
$user = $this->user;
$notice = $user->favoriteNotices(0, $limit);
$notice = $user->favoriteNotices(false, 0, $limit);
$notices = array();
while ($notice->fetch()) {
$notices[] = clone($notice);
......
......@@ -121,11 +121,11 @@ class ShowfavoritesAction extends OwnerDesignAction
// Show imported/gateway notices as well as local if
// the user is looking at his own favorites
$this->notice = $this->user->favoriteNotices(($this->page-1)*NOTICES_PER_PAGE,
NOTICES_PER_PAGE + 1, true);
$this->notice = $this->user->favoriteNotices(true, ($this->page-1)*NOTICES_PER_PAGE,
NOTICES_PER_PAGE + 1);
} else {
$this->notice = $this->user->favoriteNotices(($this->page-1)*NOTICES_PER_PAGE,
NOTICES_PER_PAGE + 1, false);
$this->notice = $this->user->favoriteNotices(false, ($this->page-1)*NOTICES_PER_PAGE,
NOTICES_PER_PAGE + 1);
}
if (empty($this->notice)) {
......
......@@ -75,13 +75,13 @@ class Fave extends Memcached_DataObject
return Memcached_DataObject::pkeyGet('Fave', $kv);
}
function stream($user_id, $offset=0, $limit=NOTICES_PER_PAGE, $own=false)
function stream($user_id, $offset=0, $limit=NOTICES_PER_PAGE, $own=false, $since_id=0, $max_id=0)
{
$ids = Notice::stream(array('Fave', '_streamDirect'),
array($user_id, $own),
($own) ? 'fave:ids_by_user_own:'.$user_id :
'fave:ids_by_user:'.$user_id,
$offset, $limit);
$offset, $limit, $since_id, $max_id);
return $ids;
}
......
......@@ -459,9 +459,9 @@ class User extends Memcached_DataObject
return $profile->getNotices($offset, $limit, $since_id, $before_id);
}
function favoriteNotices($offset=0, $limit=NOTICES_PER_PAGE, $own=false)
function favoriteNotices($own=false, $offset=0, $limit=NOTICES_PER_PAGE, $since_id=0, $max_id=0)
{
$ids = Fave::stream($this->id, $offset, $limit, $own);
$ids = Fave::stream($this->id, $offset, $limit, $own, $since_id, $max_id);
return Notice::getStreamByIds($ids);
}
......
......@@ -45,7 +45,7 @@ $config['site']['path'] = 'statusnet';
// lighttpd, nginx), you can enable X-Sendfile support for better
// performance. Presently, only attachment serving when the site is
// in private mode will use X-Sendfile.
// $config['site']['X-Sendfile'] = false;
// $config['site']['use_x_sendfile'] = false;
// You may also need to enable X-Sendfile support for your web server and
// allow it to access files outside of the web root. For Apache with
// mod_xsendfile, you can add these to your .htaccess or server config:
......
......@@ -188,7 +188,8 @@ $default =
'cache' =>
array('base' => null),
'ping' =>
array('notify' => array()),
array('notify' => array(),
'timeout' => 2),
'inboxes' =>
array('enabled' => true), # ignored after 0.9.x
'newuser' =>
......
......@@ -265,6 +265,10 @@ class MailHandler
if (preg_match('/^\s*Begin\s+forward/', $line)) {
break;
}
// skip everything after a blank line if we already have content
if ($output !== '' && $line === '') {
break;
}
$output .= ' ' . $line;
}
......
......@@ -45,7 +45,15 @@ function ping_broadcast_notice($notice) {
$tags));
$request = HTTPClient::start();
$httpResponse = $request->post($notify_url, array('Content-Type: text/xml'), $req);
$request->setConfig('connect_timeout', common_config('ping', 'timeout'));
$request->setConfig('timeout', common_config('ping', 'timeout'));
try {
$httpResponse = $request->post($notify_url, array('Content-Type: text/xml'), $req);
} catch (Exception $e) {
common_log(LOG_ERR,
"Exception pinging $notify_url: " . $e->getMessage());
continue;
}
if (!$httpResponse || mb_strlen($httpResponse->getBody()) == 0) {
common_log(LOG_WARNING,
......
......@@ -12,11 +12,11 @@ msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-04-24 14:16+0000\n"
"PO-Revision-Date: 2010-05-03 19:17:30+0000\n"
"PO-Revision-Date: 2010-05-05 22:19:09+0000\n"
"Language-Team: Catalan\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n"
"X-Generator: MediaWiki 1.17alpha (r65963); Translate extension (2010-05-01)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ca\n"
"X-Message-Group: out-statusnet\n"
......@@ -176,6 +176,8 @@ msgid ""
"You can try to [nudge %1$s](../%2$s) from his profile or [post something to "
"his or her attention](%%%%action.newnotice%%%%?status_textarea=%3$s)."
msgstr ""
"Podeu provar d'[avisar %1$s](../%2$s) des del seu perfil o [enviar quelcom "
"per reclamar-li l'atenció](%%%%action.newnotice%%%%?status_textarea=%3$s)."
#: actions/all.php:145 actions/replies.php:210 actions/showstream.php:211
#, php-format
......@@ -183,6 +185,8 @@ msgid ""
"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
"post a notice to his or her attention."
msgstr ""
"Per què no [registreu un compte](%%%%action.register%%%%) i aviseu %s o "
"envieu un avís a la seva atenció."
#. TRANS: H1 text
#: actions/all.php:178
......@@ -558,11 +562,13 @@ msgid ""
"The request token %s has been authorized. Please exchange it for an access "
"token."
msgstr ""
"S'ha autoritzat el testimoni de sol·licitud %s. Si us plau, canvieu-lo per "
"un testimoni d'accés."
#: actions/apioauthauthorize.php:227
#, php-format
msgid "The request token %s has been denied and revoked."
msgstr ""
msgstr "S'ha denegat i revocat el testimoni de sol·licitud %s."
#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
#. TRANS: Message given submitting a form with an unknown action in IM settings.
......@@ -591,6 +597,9 @@ msgid ""
"the ability to <strong>%3$s</strong> your %4$s account data. You should only "
"give access to your %4$s account to third parties you trust."
msgstr ""
"L'aplicació <strong>%1$s</strong>, de <strong>%2$s</strong>, voldria obtenir "
"l'habilitat de <strong>%3$s</strong> les dades del vostre compte %4$s. Només "
"hauríeu de donar accés al compte %4$s a terceres parts en què confieu."
#. TRANS: Main menu option when logged in for access to user settings
#: actions/apioauthauthorize.php:310 lib/action.php:440
......@@ -826,6 +835,9 @@ msgid ""
"unsubscribed from you, unable to subscribe to you in the future, and you "
"will not be notified of any @-replies from them."
msgstr ""
"Esteu segur que voleu blocar l'usuari? Tot seguit, deixarà la vostra "
"subscripció, no us podrà subscriure en el futur, i no en rebreu cap avís de "
"respostes @."
#. TRANS: Button label on the user block form.
#. TRANS: Button label on the delete application form.
......@@ -1273,11 +1285,11 @@ msgstr "Cal una pàgina d'inici de l'organització."
#: actions/editapplication.php:218 actions/newapplication.php:206
msgid "Callback is too long."
msgstr ""
msgstr "La crida de retorn és massa llarga."
#: actions/editapplication.php:225 actions/newapplication.php:215
msgid "Callback URL is not valid."
msgstr ""
msgstr "L'URL de la crida de retorn no és vàlid."
#: actions/editapplication.php:258
msgid "Could not update application."
......@@ -1666,9 +1678,8 @@ msgid "You are not authorized."
msgstr "No esteu autoritzat."
#: actions/finishremotesubscribe.php:113
#, fuzzy
msgid "Could not convert request token to access token."
msgstr "No s'han pogut convertir els senyals de petició a senyals d'accés."
msgstr "No s'ha pogut convertir el testimoni de sol·licitud a un d'accés."
#: actions/finishremotesubscribe.php:118
msgid "Remote service uses unknown version of OMB protocol."
......@@ -1880,6 +1891,11 @@ msgid ""
"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup"
"%%%%)"
msgstr ""
"Els grups de %%%%site.name%%%% us permeten trobar-vos i parlar amb gent "
"d'interessos semblants. Després d'unir-vos a un grup, podeu enviar missatges "
"a altres membres emprant la sintaxi «!groupname». No veieu cap grup que us "
"agradi? Proveu de [cercar-ne un](%%%%action.groupsearch%%%%) o [comenceu-ne "
"un de propi!](%%%%action.newgroup%%%%)"
#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:122
msgid "Create a new group"
......@@ -1909,6 +1925,8 @@ msgid ""
"If you can't find the group you're looking for, you can [create it](%%action."
"newgroup%%) yourself."
msgstr ""
"Si no podeu trobar el grup que cerqueu, podeu provar de [crear-lo](%%action."
"newgroup%%) també."
#: actions/groupsearch.php:85
#, php-format
......@@ -1916,6 +1934,8 @@ msgid ""
"Why not [register an account](%%action.register%%) and [create the group](%%"
"action.newgroup%%) yourself!"
msgstr ""
"Per què no [registreu un compte](%%action.register%%) i proveu de [crear-hi "
"un grup](%%action.newgroup%%)!"
#: actions/groupunblock.php:91
msgid "Only an admin can unblock group members."
......@@ -2444,6 +2464,8 @@ msgid ""
"Be the first to [post on this topic](%%%%action.newnotice%%%%?"
"status_textarea=%s)!"
msgstr ""
"Sigueu el primer en [enviar sobre aquest tema](%%%%action.newnotice%%%%?"
"status_textarea=%s)!"
#: actions/noticesearch.php:124
#, php-format
......@@ -2451,6 +2473,8 @@ msgid ""
"Why not [register an account](%%%%action.register%%%%) and be the first to "
"[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
msgstr ""
"Per què no [registreu un compte](%%%%action.register%%%%) i sou el primer "
"[en parlar del tema](%%%%action.newnotice%%%%?status_textarea=%s)!"
#: actions/noticesearchrss.php:96
#, php-format
......@@ -2510,15 +2534,17 @@ msgstr "No sou usuari de l'aplicació."
#: actions/oauthconnectionssettings.php:186
#, php-format
msgid "Unable to revoke access for app: %s."
msgstr ""
msgstr "No s'ha pogut revocar l'accés de l'aplicació: %s"
#: actions/oauthconnectionssettings.php:198
msgid "You have not authorized any applications to use your account."
msgstr ""
msgstr "No heu autoritzat cap aplicació perquè utilitzi el vostre compte."
#: actions/oauthconnectionssettings.php:211
msgid "Developers can edit the registration settings for their applications "
msgstr ""
"Els desenvolupadors poden editar els paràmetres de registre de llurs "
"aplicacions "
#: actions/oembed.php:79 actions/shownotice.php:100
msgid "Notice has no profile."
......@@ -2539,7 +2565,7 @@ msgstr "El tipus de contingut %s no està permès."
#: actions/oembed.php:162
#, php-format
msgid "Only %s URLs over plain HTTP please."
msgstr ""
msgstr "Si us plau, només URL %s sobre HTTP pla."
#. TRANS: Client error on an API request with an unsupported data format.
#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131
......@@ -2593,29 +2619,25 @@ msgid "No user ID specified."
msgstr "No s'ha especificat cap ID d'usuari."
#: actions/otp.php:83
#, fuzzy
msgid "No login token specified."
msgstr "No s'ha especificat perfil."
msgstr "No s'ha especificat cap testimoni d'inici de sessió."
#: actions/otp.php:90
#, fuzzy
msgid "No login token requested."
msgstr "No id en el perfil sol·licitat."
msgstr "No s'ha sol·licitat cap testimoni d'inici de sessió."
#: actions/otp.php:95
#, fuzzy
msgid "Invalid login token specified."
msgstr "El contingut de l'avís és invàlid"
msgstr "No s'ha especificat un testimoni d'inici de sessió vàlid."
#: actions/otp.php:104
#, fuzzy
msgid "Login token expired."
msgstr "Accedir al lloc"
msgstr "El testimoni d'inici de sessió ha vençut."
#: actions/outbox.php:58
#, fuzzy, php-format
#, php-format
msgid "Outbox for %1$s - page %2$d"
msgstr "Safata de sortida per %s"
msgstr "Safata de sortida de %1$s - pàgina %2$d"
#: actions/outbox.php:61
#, php-format
......@@ -2696,31 +2718,31 @@ msgstr "Camins"
#: actions/pathsadminpanel.php:70
msgid "Path and server settings for this StatusNet site."
msgstr ""
msgstr "Camí i paràmetres del servidor d'aquest lloc StatusNet."
#: actions/pathsadminpanel.php:157
#, fuzzy, php-format
#, php-format
msgid "Theme directory not readable: %s."
msgstr "Aquesta pàgina no està disponible en "
msgstr "No es pot llegir el directori de temes: %s"
#: actions/pathsadminpanel.php:163
#, fuzzy, php-format
#, php-format
msgid "Avatar directory not writable: %s."
msgstr "No es pot escriure al directori de fons: %s"
msgstr "No es pot escriure al directori d'avatars: %s"
#: actions/pathsadminpanel.php:169
#, fuzzy, php-format
#, php-format
msgid "Background directory not writable: %s."
msgstr "No es pot escriure al directori de fons: %s"
#: actions/pathsadminpanel.php:177
#, fuzzy, php-format
#, php-format
msgid "Locales directory not readable: %s."
msgstr "Aquesta pàgina no està disponible en "
msgstr "No es pot llegir el directori de les traduccions: %s"
#: actions/pathsadminpanel.php:183
msgid "Invalid SSL server. The maximum length is 255 characters."
msgstr ""
msgstr "El servidor SSL no és vàlid. La mida màxima és de 255 caràcters."
#: actions/pathsadminpanel.php:234 actions/siteadminpanel.php:58
msgid "Site"
......@@ -2744,11 +2766,11 @@ msgstr "Camí del lloc"
#: actions/pathsadminpanel.php:246
msgid "Path to locales"
msgstr ""
msgstr "El camí a les traduccions"
#: actions/pathsadminpanel.php:246
msgid "Directory path to locales"
msgstr ""
msgstr "El camí del directori a les traduccions"
#: actions/pathsadminpanel.php:250
msgid "Fancy URLs"
......@@ -2856,9 +2878,9 @@ msgid "People search"
msgstr "Cerca de gent"
#: actions/peopletag.php:68
#, fuzzy, php-format
#, php-format
msgid "Not a valid people tag: %s."
msgstr "Etiqueta no vàlida per a la gent: %s"
msgstr "No és una etiqueta de gent vàlida: %s"
#: actions/peopletag.php:142
#, php-format
......@@ -2873,6 +2895,8 @@ msgstr "El contingut de l'avís no és vàlid."
#, php-format
msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’."
msgstr ""
"La llicència ‘%1$s’ de l'avís no és compatible amb la llicència ‘%2$s’ del "
"lloc."
#: actions/profilesettings.php:60
msgid "Profile settings"
......@@ -2916,9 +2940,8 @@ msgid "Describe yourself and your interests in %d chars"
msgstr "Descriviu qui sou i els vostres interessos en %d caràcters"
#: actions/profilesettings.php:125 actions/register.php:464
#, fuzzy
msgid "Describe yourself and your interests"
msgstr "Explica'ns alguna cosa sobre tu "
msgstr "Feu una descripció personal i interessos"
#: actions/profilesettings.php:127 actions/register.php:466
msgid "Bio"
......@@ -3073,16 +3096,20 @@ msgid ""
"tool. [Join now](%%action.register%%) to share notices about yourself with "
"friends, family, and colleagues! ([Read more](%%doc.help%%))"
msgstr ""
"Això és %%site.name%%, un servei de [micro-blogging](http://en.wikipedia.org/"
"wiki/Micro-blogging) basat en l'eina lliure [StatusNet](http://status.net/). "
"[Uniu-vos-hi ara](%%action.register%%) per a compartir què feu amb els "
"vostres amics, familiars, i companys! ([Més informació](%%doc.help%%))"
#: actions/public.php:247
#, fuzzy, php-format
#, 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."
msgstr ""
"Això és %%site.name%%, un servei de [microblogging](http://ca.wikipedia.org/"
"wiki/Microblogging) "
"wiki/Microblogging) basat en l'eina lliure [StatusNet](http://status.net/)."
#: actions/publictagcloud.php:57
msgid "Public tag cloud"
......@@ -3108,6 +3135,8 @@ msgid ""
"Why not [register an account](%%action.register%%) and be the first to post "
"one!"
msgstr ""
"Per què no hi [registreu un compte](%%action.register%%) i sou el primer en "
"escriure'n un!"
#: actions/publictagcloud.php:134
msgid "Tag cloud"
......@@ -3272,7 +3301,6 @@ msgid "Invalid username or password."
msgstr "Nom d'usuari o contrasenya invàlids."
#: actions/register.php:343
#, fuzzy
msgid ""
"With this form you can create a new account. You can then post notices and "
"link up to friends and colleagues. "
......@@ -3309,13 +3337,14 @@ msgid "Longer name, preferably your \"real\" name"
msgstr "Nom llarg, preferiblement el teu nom \"real\""
#: actions/register.php:494
#, fuzzy, php-format
#, php-format
msgid ""
"My text and files are available under %s except this private data: password, "
"email address, IM address, and phone number."
msgstr ""
"excepte les següents dades privades: contrasenya, adreça de correu "
"electrònic, adreça de missatgeria instantània, número de telèfon."
"El meu text i fitxers es troben disponibles sota %s, excepte pel que fa a "
"les dades privades: contrasenya, adreça de correu electrònic, adreça de "
"missatgeria instantània i número de telèfon."
#: actions/register.php:542
#, fuzzy, php-format
......@@ -3335,7 +3364,8 @@ msgid ""
"\n"
"Thanks for signing up and we hope you enjoy using this service."
msgstr ""
"Felicitats, %s! I benvingut/da a %%%%site.name%%%%. Des d'aquí, podries...\n"
"Enhorabona, %1$s! Us donem la benvinguda a %%%%site.name%%%%. Des d'aquí, "
"podríeu voler...\n"
"\n"
"* Anar al teu [teu perfil](%s) i publicar el teu primer missatge.\n"
"* Afegir una [direcció Jabber/GTalk](%%%%action.imsettings%%%%) i així poder "
......@@ -3402,18 +3432,18 @@ msgid "Invalid profile URL (bad format)"
msgstr "L'URL del perfil és invàlid (format incorrecte)"
#: actions/remotesubscribe.php:168
#, fuzzy
msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
msgstr "URL de perfil no vàlid (cap document YADIS)."
msgstr ""
"L'URL del perfil no és vàlid (no és un document YADIS o no s'ha definit un "
"XRDS vàlid)."
#: actions/remotesubscribe.php:176
msgid "That’s a local profile! Login to subscribe."
msgstr "Aquest és un perfil local! Inicieu una sessió per a subscriure-us-hi."
#: actions/remotesubscribe.php:183
#, fuzzy
msgid "Couldn’t get a request token."
msgstr "No s'ha pogut obtenir un senyal de petició."
msgstr "No s'ha pogut obtenir un testimoni de sol·licitud."
#: actions/repeat.php:57
msgid "Only logged-in users can repeat notices."
......@@ -3424,9 +3454,8 @@ msgid "No notice specified."
msgstr "No s'ha especificat cap avís."
#: actions/repeat.php:76
#, fuzzy
msgid "You can't repeat your own notice."
msgstr "No pots registrar-te si no estàs d'acord amb la llicència."
msgstr "No podeu repetir el vostre propi avís."
#: actions/repeat.php:90
msgid "You already repeated that notice."
......@@ -3467,13 +3496,13 @@ msgid "Replies feed for %s (Atom)"
msgstr "Feed d'avisos de %s"
#: actions/replies.php:199
#, fuzzy, php-format
#, php-format
msgid ""
"This is the timeline showing replies to %1$s but %2$s hasn't received a "
"notice to his attention yet."
msgstr ""
"Aquesta és la línia temporal de %s i amics, però ningú hi ha enviat res "
"encara."
"Aquesta és la línia temporal que mostra les respostes a %1$s, però %2$s "
"encara no ha rebut cap avís a la seva atenció."
#: actions/replies.php:204
#, php-format
......@@ -3481,6 +3510,8 @@ msgid ""
"You can engage other users in a conversation, subscribe to more people or "
"[join groups](%%action.groups%%)."
msgstr ""
"Podeu animar altres usuaris a una conversa, subscriviu-vos a més gent o "
"[uniu-vos a grups](%%action.groups%%)."
#: actions/replies.php:206
#, php-format
......@@ -3488,6 +3519,8 @@ msgid ""
"You can try to [nudge %1$s](../%2$s) or [post something to his or her "
"attention](%%%%action.newnotice%%%%?status_textarea=%3$s)."
msgstr ""
"Podeu provar d'[avisar %1$s](../%2$s) o [enviar quelcom per demanar la seva "
"atenció](%%%%action.newnotice%%%%?status_textarea=%3$s)."
#: actions/repliesrss.php:72
#, php-format
......@@ -3495,28 +3528,24 @@ msgid "Replies to %1$s on %2$s!"
msgstr "Respostes a %1$s el %2$s!"
#: actions/revokerole.php:75
#, fuzzy
msgid "You cannot revoke user roles on this site."
msgstr "No podeu silenciar els usuaris d'aquest lloc."
msgstr "No podeu revocar els rols d'usuari en aquest lloc."
#: actions/revokerole.php:82
#, fuzzy
msgid "User doesn't have this role."
msgstr "Usuari sense perfil coincident"
msgstr "L'usuari no té aquest rol."
#: actions/rsd.php:146 actions/version.php:157
msgid "StatusNet"
msgstr "StatusNet"
#: actions/sandbox.php:65 actions/unsandbox.php:65
#, fuzzy
msgid "You cannot sandbox users on this site."
msgstr "No pots enviar un missatge a aquest usuari."
msgstr "No podeu posar els usuaris en un entorn de prova en aquest lloc."
#: actions/sandbox.php:72
#, fuzzy
msgid "User is already sandboxed."
msgstr "Un usuari t'ha bloquejat."
msgstr "L'usuari ja es troba en un entorn de proves."
#. TRANS: Menu item for site administration
#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
......@@ -3525,9 +3554,8 @@ msgid "Sessions"
msgstr "Sessions"
#: actions/sessionsadminpanel.php:65
#, fuzzy
msgid "Session settings for this StatusNet site."
msgstr "Paràmetres de disseny d'aquest lloc StatusNet."
msgstr "Paràmetres de sessió d'aquest lloc StatusNet."
#: actions/sessionsadminpanel.php:175
msgid "Handle sessions"
......@@ -3551,9 +3579,8 @@ msgid "Save site settings"
msgstr "Desa els paràmetres del lloc"
#: actions/showapplication.php:82
#, fuzzy
msgid "You must be logged in to view an application."
msgstr "Has d'haver entrat per a poder marxar d'un grup."