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

Merge branch '1.0.x' into testing

Browse Source 
Conflicts:
	plugins/Event/RSVP.php
This commit is contained in:
Evan Prodromou
2011-04-05 13:16:28 -04:00
parent 69bb30e09c 7533c7cfe1
commit 36b331d469
1703 changed files with 92273 additions and 26282 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
plugins/OStatus/OStatusPlugin.php
View File

@@ -111,7 +111,9 @@ class OStatusPlugin extends Plugin
*/
function onStartEnqueueNotice($notice, &$transports)
{
if ($notice->isLocal()) {
// FIXME: we don't do privacy-controlled OStatus updates yet.
// once that happens, finer grain of control here.
if ($notice->isLocal() && $notice->inScope(null)) {
// put our transport first, in case there's any conflict (like OMB)
array_unshift($transports, 'ostatus');
}
@@ -228,7 +230,7 @@ class OStatusPlugin extends Plugin
return false;
}
function onStartGroupSubscribe($output, $group)
function onStartGroupSubscribe($widget, $group)
{
$cur = common_current_user();
@@ -236,7 +238,7 @@ class OStatusPlugin extends Plugin
// Add an OStatus subscribe
$url = common_local_url('ostatusinit',
array('group' => $group->nickname));
$output->element('a', array('href' => $url,
$widget->out->element('a', array('href' => $url,
'class' => 'entity_remote_subscribe'),
// TRANS: Link description for link to join a remote group.
_m('Join'));
@@ -675,7 +677,7 @@ class OStatusPlugin extends Plugin
* it'll be left with a stray membership record.
*
* @param User_group $group
* @param User $user
* @param Profile $user
*
* @return mixed hook return value
*/

15
plugins/OStatus/actions/groupsalmon.php
View File

@@ -149,14 +149,7 @@ class GroupsalmonAction extends SalmonAction
}
try {
// @fixme that event currently passes a user from main UI
// Event should probably move into Group_member::join
// and take a Profile object.
//
//if (Event::handle('StartJoinGroup', array($this->group, $profile))) {
Group_member::join($this->group->id, $profile->id);
//Event::handle('EndJoinGroup', array($this->group, $profile));
//}
$profile->joinGroup($this->group);
} catch (Exception $e) {
// TRANS: Server error. %1$s is a profile URI, %2$s is a group nickname.
$this->serverError(sprintf(_m('Could not join remote user %1$s to group %2$s.'),
@@ -181,11 +174,7 @@ class GroupsalmonAction extends SalmonAction
$profile = $oprofile->localProfile();
try {
// @fixme event needs to be refactored as above
//if (Event::handle('StartLeaveGroup', array($this->group, $profile))) {
Group_member::leave($this->group->id, $profile->id);
//Event::handle('EndLeaveGroup', array($this->group, $profile));
//}
$profile->leaveGroup($this->group);
} catch (Exception $e) {
// TRANS: Server error. %1$s is a profile URI, %2$s is a group nickname.
$this->serverError(sprintf(_m('Could not remove remote user %1$s from group %2$s.'),

16
plugins/OStatus/actions/ostatusgroup.php
View File

@@ -141,18 +141,12 @@ class OStatusGroupAction extends OStatusSubAction
return;
}
if (Event::handle('StartJoinGroup', array($group, $user))) {
$ok = Group_member::join($this->oprofile->group_id, $user->id);
if ($ok) {
Event::handle('EndJoinGroup', array($group, $user));
$this->success();
} else {
// TRANS: OStatus remote group subscription dialog error.
$this->showForm(_m('Remote group join failed!'));
}
} else {
try {
$user->joinGroup($group);
} catch (Exception $e) {
// TRANS: OStatus remote group subscription dialog error.
$this->showForm(_m('Remote group join aborted!'));
$this->showForm(_m('Remote group join failed!'));
return;
}
}

4
plugins/OStatus/actions/usersalmon.php
View File

@@ -157,7 +157,7 @@ class UsersalmonAction extends SalmonAction
if (!empty($old)) {
// TRANS: Client exception.
throw new ClientException(_('This is already a favorite.'));
throw new ClientException(_m('This is already a favorite.'));
}
if (!Fave::addNew($profile, $notice)) {
@@ -179,7 +179,7 @@ class UsersalmonAction extends SalmonAction
'notice_id' => $notice->id));
if (empty($fave)) {
// TRANS: Client exception.
throw new ClientException(_('Notice wasn\'t favorited!'));
throw new ClientException(_m('Notice was not favorited!'));
}
$fave->delete();

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

@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-03-06 02:34+0100\n"
"POT-Creation-Date: 2011-04-01 20:45+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"
@@ -22,94 +22,94 @@ msgstr ""
#. TRANS: Link description for link to subscribe to a remote user.
#. TRANS: Link text for a user to subscribe to an OStatus user.
#: OStatusPlugin.php:223 OStatusPlugin.php:933
#: OStatusPlugin.php:225 OStatusPlugin.php:935
msgid "Subscribe"
msgstr ""
#. TRANS: Link description for link to join a remote group.
#: OStatusPlugin.php:242 OStatusPlugin.php:651 actions/ostatussub.php:109
#: OStatusPlugin.php:244 OStatusPlugin.php:653 actions/ostatussub.php:109
msgid "Join"
msgstr ""
#. TRANSLATE: %s is a domain.
#: OStatusPlugin.php:455
#: OStatusPlugin.php:457
#, php-format
msgid "Sent from %s via OStatus"
msgstr ""
#. TRANS: Exception.
#: OStatusPlugin.php:527
#: OStatusPlugin.php:529
msgid "Could not set up remote subscription."
msgstr ""
#: OStatusPlugin.php:601
#: OStatusPlugin.php:603
msgid "Unfollow"
msgstr ""
#. TRANS: Success message for unsubscribe from user attempt through OStatus.
#. TRANS: %1$s is the unsubscriber's name, %2$s is the unsubscribed user's name.
#: OStatusPlugin.php:604
#: OStatusPlugin.php:606
#, php-format
msgid "%1$s stopped following %2$s."
msgstr ""
#: OStatusPlugin.php:632
#: OStatusPlugin.php:634
msgid "Could not set up remote group membership."
msgstr ""
#. TRANS: Success message for subscribe to group attempt through OStatus.
#. TRANS: %1$s is the member name, %2$s is the subscribed group's name.
#: OStatusPlugin.php:654
#: OStatusPlugin.php:656
#, php-format
msgid "%1$s has joined group %2$s."
msgstr ""
#. TRANS: Exception.
#: OStatusPlugin.php:663
#: OStatusPlugin.php:665
msgid "Failed joining remote group."
msgstr ""
#: OStatusPlugin.php:703
#: OStatusPlugin.php:705
msgid "Leave"
msgstr ""
#. TRANS: Success message for unsubscribe from group attempt through OStatus.
#. TRANS: %1$s is the member name, %2$s is the unsubscribed group's name.
#: OStatusPlugin.php:706
#: OStatusPlugin.php:708
#, php-format
msgid "%1$s has left group %2$s."
msgstr ""
#: OStatusPlugin.php:781
#: OStatusPlugin.php:783
msgid "Disfavor"
msgstr ""
#. TRANS: Success message for remove a favorite notice through OStatus.
#. TRANS: %1$s is the unfavoring user's name, %2$s is URI to the no longer favored notice.
#: OStatusPlugin.php:784
#: OStatusPlugin.php:786
#, php-format
msgid "%1$s marked notice %2$s as no longer a favorite."
msgstr ""
#. TRANS: Link text for link to remote subscribe.
#: OStatusPlugin.php:860
#: OStatusPlugin.php:862
msgid "Remote"
msgstr ""
#. TRANS: Title for activity.
#: OStatusPlugin.php:900
#: OStatusPlugin.php:902
msgid "Profile update"
msgstr ""
#. TRANS: Ping text for remote profile update through OStatus.
#. TRANS: %s is user that updated their profile.
#: OStatusPlugin.php:903
#: OStatusPlugin.php:905
#, php-format
msgid "%s has updated their profile page."
msgstr ""
#. TRANS: Plugin description.
#: OStatusPlugin.php:948
#: OStatusPlugin.php:950
msgid ""
"Follow people across social networks that implement <a href=\"http://ostatus."
"org/\">OStatus</a>."
@@ -317,22 +317,17 @@ msgid "Already a member!"
msgstr ""
#. TRANS: OStatus remote group subscription dialog error.
#: actions/ostatusgroup.php:151
#: actions/ostatusgroup.php:148
msgid "Remote group join failed!"
msgstr ""
#. TRANS: OStatus remote group subscription dialog error.
#: actions/ostatusgroup.php:155
msgid "Remote group join aborted!"
msgstr ""
#. TRANS: Page title for OStatus remote group join form
#: actions/ostatusgroup.php:167
#: actions/ostatusgroup.php:161
msgid "Confirm joining remote group"
msgstr ""
#. TRANS: Instructions.
#: actions/ostatusgroup.php:178
#: actions/ostatusgroup.php:172
msgid ""
"You can subscribe to groups from other supported sites. Paste the group's "
"profile URI below:"
@@ -353,11 +348,21 @@ msgstr ""
msgid "In reply to a notice not by this user and not mentioning this user."
msgstr ""
#. TRANS: Client exception.
#: actions/usersalmon.php:160
msgid "This is already a favorite."
msgstr ""
#. TRANS: Client exception.
#: actions/usersalmon.php:165
msgid "Could not save new favorite."
msgstr ""
#. TRANS: Client exception.
#: actions/usersalmon.php:182
msgid "Notice was not favorited!"
msgstr ""
#. TRANS: Client exception.
#: actions/usersalmon.php:197
msgid "Can't favorite/unfavorite without an object."
@@ -396,7 +401,7 @@ msgid "Can't read profile to set up group membership."
msgstr ""
#. TRANS: Client error.
#: actions/groupsalmon.php:134 actions/groupsalmon.php:177
#: actions/groupsalmon.php:134 actions/groupsalmon.php:170
msgid "Groups can't join groups."
msgstr ""
@@ -405,17 +410,17 @@ msgid "You have been blocked from that group by the admin."
msgstr ""
#. TRANS: Server error. %1$s is a profile URI, %2$s is a group nickname.
#: actions/groupsalmon.php:162
#: actions/groupsalmon.php:155
#, php-format
msgid "Could not join remote user %1$s to group %2$s."
msgstr ""
#: actions/groupsalmon.php:174
#: actions/groupsalmon.php:167
msgid "Can't read profile to cancel group membership."
msgstr ""
#. TRANS: Server error. %1$s is a profile URI, %2$s is a group nickname.
#: actions/groupsalmon.php:191
#: actions/groupsalmon.php:180
#, php-format
msgid "Could not remove remote user %1$s from group %2$s."
msgstr ""

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

@@ -10,13 +10,13 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - OStatus\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-03-06 02:34+0100\n"
"PO-Revision-Date: 2011-03-06 01:37:59+0000\n"
"POT-Creation-Date: 2011-04-03 13:16+0000\n"
"PO-Revision-Date: 2011-04-03 13:21:52+0000\n"
"Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-POT-Import-Date: 2011-03-03 17:49:39+0000\n"
"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
"X-POT-Import-Date: 2011-04-01 21:06:07+0000\n"
"X-Generator: MediaWiki 1.18alpha (r85253); Translate extension (2011-03-11)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: de\n"
"X-Message-Group: #out-statusnet-plugin-ostatus\n"
@@ -285,10 +285,6 @@ msgstr "Bereits Mitglied!"
msgid "Remote group join failed!"
msgstr "Beitritt in Remote-Gruppe fehlgeschlagen!"
#. TRANS: OStatus remote group subscription dialog error.
msgid "Remote group join aborted!"
msgstr "Beitritt in Remote-Gruppe abgebrochen!"
#. TRANS: Page title for OStatus remote group join form
msgid "Confirm joining remote group"
msgstr "Bestätige das Beitreten einer Remotegruppe"
@@ -315,10 +311,19 @@ msgstr ""
"In einer Antowrt auf eine Nachricht, die nicht von diesem Benutzer stammt "
"und diesen Benutzer nicht erwähnt."
#. TRANS: Client exception.
#, fuzzy
msgid "This is already a favorite."
msgstr "Dieses Ziel versteht keine Favoriten."
#. TRANS: Client exception.
msgid "Could not save new favorite."
msgstr "Neuer Favorit konnte nicht gespeichert werden."
#. TRANS: Client exception.
msgid "Notice was not favorited!"
msgstr ""
#. TRANS: Client exception.
msgid "Can't favorite/unfavorite without an object."
msgstr "Kann nicht ohne Objekt (ent)favorisieren."

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

@@ -11,13 +11,13 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - OStatus\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-03-06 02:34+0100\n"
"PO-Revision-Date: 2011-03-06 01:37:59+0000\n"
"POT-Creation-Date: 2011-04-03 13:16+0000\n"
"PO-Revision-Date: 2011-04-03 13:21:52+0000\n"
"Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-POT-Import-Date: 2011-03-03 17:49:39+0000\n"
"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
"X-POT-Import-Date: 2011-04-01 21:06:07+0000\n"
"X-Generator: MediaWiki 1.18alpha (r85253); Translate extension (2011-03-11)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: fr\n"
"X-Message-Group: #out-statusnet-plugin-ostatus\n"
@@ -297,10 +297,6 @@ msgstr "Déjà membre !"
msgid "Remote group join failed!"
msgstr "L’adhésion au groupe distant a échoué !"
#. TRANS: OStatus remote group subscription dialog error.
msgid "Remote group join aborted!"
msgstr "L’adhésion au groupe distant a été avortée !"
#. TRANS: Page title for OStatus remote group join form
msgid "Confirm joining remote group"
msgstr "Confirmer l’adhésion au groupe distant"
@@ -327,10 +323,19 @@ msgstr ""
"En réponse à un avis non émis par cet utilisateur et ne mentionnant pas cet "
"utilisateur."
#. TRANS: Client exception.
#, fuzzy
msgid "This is already a favorite."
msgstr "Cette cible ne reconnaît pas les indications de mise en favoris."
#. TRANS: Client exception.
msgid "Could not save new favorite."
msgstr "Impossible de sauvegarder le nouveau favori."
#. TRANS: Client exception.
msgid "Notice was not favorited!"
msgstr ""
#. TRANS: Client exception.
msgid "Can't favorite/unfavorite without an object."
msgstr "Impossible de mettre en favoris ou retirer des favoris sans un objet."

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

@@ -9,13 +9,13 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - OStatus\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-03-06 02:34+0100\n"
"PO-Revision-Date: 2011-03-06 01:37:59+0000\n"
"POT-Creation-Date: 2011-04-03 13:16+0000\n"
"PO-Revision-Date: 2011-04-03 13:21:52+0000\n"
"Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-POT-Import-Date: 2011-03-03 17:49:39+0000\n"
"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
"X-POT-Import-Date: 2011-04-01 21:06:07+0000\n"
"X-Generator: MediaWiki 1.18alpha (r85253); Translate extension (2011-03-11)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ia\n"
"X-Message-Group: #out-statusnet-plugin-ostatus\n"
@@ -284,10 +284,6 @@ msgstr "Ja membro!"
msgid "Remote group join failed!"
msgstr "Le adhesion al gruppo remote ha fallite!"
#. TRANS: OStatus remote group subscription dialog error.
msgid "Remote group join aborted!"
msgstr "Le adhesion al gruppo remote ha essite abortate!"
#. TRANS: Page title for OStatus remote group join form
msgid "Confirm joining remote group"
msgstr "Confirmar adhesion a gruppo remote"
@@ -314,10 +310,19 @@ msgstr ""
"In responsa a un nota non scribite per iste usator e que non mentiona iste "
"usator."
#. TRANS: Client exception.
#, fuzzy
msgid "This is already a favorite."
msgstr "Iste destination non comprende le addition de favorites."
#. TRANS: Client exception.
msgid "Could not save new favorite."
msgstr "Non poteva salveguardar le nove favorite."
#. TRANS: Client exception.
msgid "Notice was not favorited!"
msgstr ""
#. TRANS: Client exception.
msgid "Can't favorite/unfavorite without an object."
msgstr "Non pote favorir/disfavorir sin objecto."

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

@@ -9,13 +9,13 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - OStatus\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-03-06 02:34+0100\n"
"PO-Revision-Date: 2011-03-06 01:37:59+0000\n"
"POT-Creation-Date: 2011-04-03 13:16+0000\n"
"PO-Revision-Date: 2011-04-03 13:21:52+0000\n"
"Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-POT-Import-Date: 2011-03-03 17:49:39+0000\n"
"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
"X-POT-Import-Date: 2011-04-01 21:06:07+0000\n"
"X-Generator: MediaWiki 1.18alpha (r85253); Translate extension (2011-03-11)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: mk\n"
"X-Message-Group: #out-statusnet-plugin-ostatus\n"
@@ -282,10 +282,6 @@ msgstr "Веќе членувате!"
msgid "Remote group join failed!"
msgstr "Придружувањето на далечинската група не успеа!"
#. TRANS: OStatus remote group subscription dialog error.
msgid "Remote group join aborted!"
msgstr "Придружувањето на далечинската група е откажано!"
#. TRANS: Page title for OStatus remote group join form
msgid "Confirm joining remote group"
msgstr "Потврди придружување кон далечинска група."
@@ -311,10 +307,18 @@ msgid "In reply to a notice not by this user and not mentioning this user."
msgstr ""
"Како одговор на забелешка која не е од овој корисник и не го споменува."
#. TRANS: Client exception.
msgid "This is already a favorite."
msgstr "Ова веќе Ви е бендисано."
#. TRANS: Client exception.
msgid "Could not save new favorite."
msgstr "Не можам да го зачувам новобендисаното."
#. TRANS: Client exception.
msgid "Notice was not favorited!"
msgstr "Забелешката не е бендисана!"
#. TRANS: Client exception.
msgid "Can't favorite/unfavorite without an object."
msgstr "Не можам да означам како бендисано или да тргнам бендисано без објект."

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

@@ -10,13 +10,13 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - OStatus\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-03-06 02:34+0100\n"
"PO-Revision-Date: 2011-03-06 01:37:59+0000\n"
"POT-Creation-Date: 2011-04-03 13:16+0000\n"
"PO-Revision-Date: 2011-04-03 13:21:52+0000\n"
"Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-POT-Import-Date: 2011-03-03 17:49:39+0000\n"
"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
"X-POT-Import-Date: 2011-04-01 21:06:07+0000\n"
"X-Generator: MediaWiki 1.18alpha (r85253); Translate extension (2011-03-11)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: nl\n"
"X-Message-Group: #out-statusnet-plugin-ostatus\n"
@@ -191,7 +191,7 @@ msgid "Unexpected unsubscribe request for %s."
msgstr "Onverwacht verzoek om abonnement op te hebben voor %s."
msgid "No such user."
msgstr "Onbekende gebruiker."
msgstr "Deze gebruiker bestaat niet."
#. TRANS: Field label for a field that takes an OStatus user address.
msgid "Subscribe to"
@@ -223,7 +223,7 @@ msgstr "Bevestigen"
#. TRANS: Tooltip for button "Confirm".
msgid "Subscribe to this user"
msgstr "Abonneren op deze gebruiker"
msgstr "Op deze gebruiker abonneren"
msgid "You are already subscribed to this user."
msgstr "U bent al geabonneerd op deze gebruiker."
@@ -293,10 +293,6 @@ msgstr "U bent al lid!"
msgid "Remote group join failed!"
msgstr "Het verlaten van de groep bij een andere dienst is mislukt."
#. TRANS: OStatus remote group subscription dialog error.
msgid "Remote group join aborted!"
msgstr "Het lid worden van de groep bij een andere dienst is afgebroken."
#. TRANS: Page title for OStatus remote group join form
msgid "Confirm joining remote group"
msgstr "Lid worden van groep bij andere dienst"
@@ -323,10 +319,18 @@ msgstr ""
"In antwoord op een mededeling niet door deze gebruiker en niet over of aan "
"deze gebruiker."
#. TRANS: Client exception.
msgid "This is already a favorite."
msgstr "Deze mededeling staat al in uw favorietenlijst."
#. TRANS: Client exception.
msgid "Could not save new favorite."
msgstr "Het was niet mogelijk de nieuwe favoriet op te slaan."
#. TRANS: Client exception.
msgid "Notice was not favorited!"
msgstr "De mededeling is niet op de favorietenlijst geplaatst!"
#. TRANS: Client exception.
msgid "Can't favorite/unfavorite without an object."
msgstr ""

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

@@ -9,13 +9,13 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - OStatus\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-03-06 02:34+0100\n"
"PO-Revision-Date: 2011-03-06 01:38:00+0000\n"
"POT-Creation-Date: 2011-04-03 13:16+0000\n"
"PO-Revision-Date: 2011-04-03 13:21:53+0000\n"
"Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-POT-Import-Date: 2011-03-03 17:49:39+0000\n"
"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
"X-POT-Import-Date: 2011-04-01 21:06:07+0000\n"
"X-Generator: MediaWiki 1.18alpha (r85253); Translate extension (2011-03-11)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: uk\n"
"X-Message-Group: #out-statusnet-plugin-ostatus\n"
@@ -287,10 +287,6 @@ msgstr "Ви вже учасник!"
msgid "Remote group join failed!"
msgstr "Приєднатися до віддаленої спільноти не вдалося!"
#. TRANS: OStatus remote group subscription dialog error.
msgid "Remote group join aborted!"
msgstr "Приєднання до віддаленої спільноти перервано!"
#. TRANS: Page title for OStatus remote group join form
msgid "Confirm joining remote group"
msgstr "Підтвердження приєднання до віддаленої спільноти"
@@ -317,10 +313,19 @@ msgstr ""
"У відповідь на допис іншого користувача, а даний користувач у ньому навіть "
"не згадується."
#. TRANS: Client exception.
#, fuzzy
msgid "This is already a favorite."
msgstr "Ціль не розуміє, що таке «додати до обраних»."
#. TRANS: Client exception.
msgid "Could not save new favorite."
msgstr "Не вдалося зберегти як новий обраний допис."
#. TRANS: Client exception.
msgid "Notice was not favorited!"
msgstr ""
#. TRANS: Client exception.
msgid "Can't favorite/unfavorite without an object."
msgstr ""