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

Conflicts:
	plugins/AnonymousFave/AnonymousFavePlugin.php

6 files changed, 114 insertions, 94 deletions

diff --git a/plugins/OStatus/locale/OStatus.pot b/plugins/OStatus/locale/OStatus.pot
index f684a138b..a55b30f4b 100644
--- a/plugins/OStatus/locale/OStatus.pot
+++ b/plugins/OStatus/locale/OStatus.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-27 21:40+0000\n"
+"POT-Creation-Date: 2010-10-03 19:53+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"
diff --git a/plugins/OStatus/locale/fr/LC_MESSAGES/OStatus.po b/plugins/OStatus/locale/fr/LC_MESSAGES/OStatus.po
index 4d4ee37d2..39101b839 100644
--- a/plugins/OStatus/locale/fr/LC_MESSAGES/OStatus.po
+++ b/plugins/OStatus/locale/fr/LC_MESSAGES/OStatus.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OStatus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-27 22:20+0000\n"
-"PO-Revision-Date: 2010-09-27 22:42:39+0000\n"
+"POT-Creation-Date: 2010-10-03 19:53+0000\n"
+"PO-Revision-Date: 2010-10-03 19:57:15+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: 1285-62-55 00::+0000\n"
-"X-Generator: MediaWiki 1.17alpha (r73828); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2010-10-01 20:39:03+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r74231); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-ostatus\n"
diff --git a/plugins/OStatus/locale/ia/LC_MESSAGES/OStatus.po b/plugins/OStatus/locale/ia/LC_MESSAGES/OStatus.po
index 63c7def6e..cd5eebd16 100644
--- a/plugins/OStatus/locale/ia/LC_MESSAGES/OStatus.po
+++ b/plugins/OStatus/locale/ia/LC_MESSAGES/OStatus.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OStatus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-27 22:20+0000\n"
-"PO-Revision-Date: 2010-09-27 22:42:39+0000\n"
+"POT-Creation-Date: 2010-10-03 19:53+0000\n"
+"PO-Revision-Date: 2010-10-03 19:57:15+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: 1285-62-55 00::+0000\n"
-"X-Generator: MediaWiki 1.17alpha (r73828); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2010-10-01 20:39:03+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r74231); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-ostatus\n"
diff --git a/plugins/OStatus/locale/mk/LC_MESSAGES/OStatus.po b/plugins/OStatus/locale/mk/LC_MESSAGES/OStatus.po
index 53970a77f..fc2e4b1e2 100644
--- a/plugins/OStatus/locale/mk/LC_MESSAGES/OStatus.po
+++ b/plugins/OStatus/locale/mk/LC_MESSAGES/OStatus.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OStatus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-27 22:20+0000\n"
-"PO-Revision-Date: 2010-09-27 22:42:39+0000\n"
+"POT-Creation-Date: 2010-10-03 19:53+0000\n"
+"PO-Revision-Date: 2010-10-03 19:57:15+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: 1285-62-55 00::+0000\n"
-"X-Generator: MediaWiki 1.17alpha (r73828); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2010-10-01 20:39:03+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r74231); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-ostatus\n"
@@ -69,14 +69,14 @@ msgstr "Напушти"
 
 #: OStatusPlugin.php:785
 msgid "Disfavor"
-msgstr "Откажи омилено"
+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:788
 #, php-format
 msgid "%1$s marked notice %2$s as no longer a favorite."
-msgstr "%1$s ја означи забелешката %2$s како неомилена."
+msgstr "%1$s повеќе не ја бендисува забелешката %2$s."
 
 #. TRANS: Link text for link to remote subscribe.
 #: OStatusPlugin.php:864
@@ -304,12 +304,12 @@ msgstr "Оваа цел не разбира прекини на следења."
 #. TRANS: Client exception.
 #: lib/salmonaction.php:145
 msgid "This target doesn't understand favorites."
-msgstr "Оваа цел не разбира омилени."
+msgstr "Оваа цел не разбира бендисување на забелешки."
 
 #. TRANS: Client exception.
 #: lib/salmonaction.php:151
 msgid "This target doesn't understand unfavorites."
-msgstr "Оваа цел не разбира отстранувања од омилени."
+msgstr "Оваа цел не разбира одбендисување на забелешки."
 
 #. TRANS: Client exception.
 #: lib/salmonaction.php:157
@@ -442,18 +442,18 @@ msgstr ""
 #. TRANS: Client exception.
 #: actions/usersalmon.php:163
 msgid "Could not save new favorite."
-msgstr "Не можам да го зачувам новото омилено."
+msgstr "Не можам да го зачувам новобендисаното."
 
 #. TRANS: Client exception.
 #: actions/usersalmon.php:195
 msgid "Can't favorite/unfavorite without an object."
-msgstr "Не можам да означам како омилено или да тргнам омилено без објект."
+msgstr "Не можам да означам како бендисано или да тргнам бендисано без објект."
 
 #. TRANS: Client exception.
 #: actions/usersalmon.php:207
 msgid "Can't handle that kind of object for liking/faving."
 msgstr ""
-"Не можам да работам со таков објект за ставање врски/означување омилени."
+"Не можам да работам со таков објект за ставање врски/означување бендисани."
 
 #. TRANS: Client exception. %s is an object ID.
 #: actions/usersalmon.php:214
diff --git a/plugins/OStatus/locale/nl/LC_MESSAGES/OStatus.po b/plugins/OStatus/locale/nl/LC_MESSAGES/OStatus.po
index 51f26d7ac..e0c6c4aa8 100644
--- a/plugins/OStatus/locale/nl/LC_MESSAGES/OStatus.po
+++ b/plugins/OStatus/locale/nl/LC_MESSAGES/OStatus.po
@@ -10,13 +10,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OStatus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-27 22:20+0000\n"
-"PO-Revision-Date: 2010-09-27 22:42:39+0000\n"
+"POT-Creation-Date: 2010-10-03 19:53+0000\n"
+"PO-Revision-Date: 2010-10-03 19:57:16+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: 1285-62-55 00::+0000\n"
-"X-Generator: MediaWiki 1.17alpha (r73828); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2010-10-01 20:39:03+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r74231); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-ostatus\n"
@@ -124,19 +124,23 @@ msgstr ""
 #, php-format
 msgid "Invalid ostatus_profile state: both group and profile IDs set for %s."
 msgstr ""
+"Ongeldige ostatus_profile status: het ID voor zowel de groep als het profiel "
+"voor %s is ingesteld."
 
 #. TRANS: Server exception.
 #: classes/Ostatus_profile.php:191
 #, php-format
 msgid "Invalid ostatus_profile state: both group and profile IDs empty for %s."
 msgstr ""
+"Ongeldige ostatus_profile status: het ID voor zowel de groep als het profiel "
+"voor %s is leeg."
 
 #. TRANS: Server exception.
 #. TRANS: %1$s is the method name the exception occured in, %2$s is the actor type.
 #: classes/Ostatus_profile.php:281
 #, php-format
 msgid "Invalid actor passed to %1$s: %2$s."
-msgstr ""
+msgstr "Ongeldige actor doorgegeven aan %1$s: %2$s."
 
 #. TRANS: Server exception.
 #: classes/Ostatus_profile.php:374
@@ -144,6 +148,8 @@ msgid ""
 "Invalid type passed to Ostatus_profile::notify. It must be XML string or "
 "Activity entry."
 msgstr ""
+"Ongeldig type doorgegeven aan Ostatus_profile::notify. Het moet een XML-"
+"string of Activity zijn."
 
 #: classes/Ostatus_profile.php:404
 msgid "Unknown feed format."
@@ -220,12 +226,12 @@ msgstr ""
 #. TRANS: Exception.
 #: classes/Ostatus_profile.php:1332 classes/Ostatus_profile.php:1343
 msgid "Can't save local profile."
-msgstr ""
+msgstr "Het was niet mogelijk het lokale profiel op te slaan."
 
 #. TRANS: Exception.
 #: classes/Ostatus_profile.php:1351
 msgid "Can't save OStatus profile."
-msgstr ""
+msgstr "Het was niet mogelijk het Ostatusprofiel op te slaan."
 
 #. TRANS: Exception.
 #: classes/Ostatus_profile.php:1610 classes/Ostatus_profile.php:1638
@@ -236,35 +242,37 @@ msgstr "Geen geldig webfingeradres."
 #: classes/Ostatus_profile.php:1720
 #, php-format
 msgid "Couldn't save profile for \"%s\"."
-msgstr ""
+msgstr "Het was niet mogelijk het profiel voor \"%s\" op te slaan."
 
 #. TRANS: Exception. %s is a webfinger address.
 #: classes/Ostatus_profile.php:1739
 #, php-format
 msgid "Couldn't save ostatus_profile for \"%s\"."
-msgstr ""
+msgstr "Het was niet mogelijk het ostatus_profile voor \"%s\" op te slaan."
 
 #. TRANS: Exception. %s is a webfinger address.
 #: classes/Ostatus_profile.php:1747
 #, php-format
 msgid "Couldn't find a valid profile for \"%s\"."
-msgstr ""
+msgstr "Er is geen geldig profiel voor \"%s\" gevonden."
 
 #: classes/Ostatus_profile.php:1789
 msgid "Could not store HTML content of long post as file."
 msgstr ""
+"Het was niet mogelijk de HTML-inhoud van het lange bericht als bestand op te "
+"slaan."
 
 #. TRANS: Client exception. %s is a HTTP status code.
 #: classes/HubSub.php:208
 #, php-format
 msgid "Hub subscriber verification returned HTTP %s."
-msgstr ""
+msgstr "De controle voor de hubabonnee heeft een HTTP %s teruggegeven."
 
 #. TRANS: Exception. %1$s is a response status code, %2$s is the body of the response.
 #: classes/HubSub.php:355
 #, php-format
 msgid "Callback returned status: %1$s. Body: %2$s"
-msgstr ""
+msgstr "De callback heeft de status %1$s teruggegeven. Inhoud: %2$s."
 
 #. TRANS: Client error. POST is a HTTP command. It should not be translated.
 #: lib/salmonaction.php:42
@@ -274,73 +282,73 @@ msgstr "Deze methode vereist een POST."
 #. TRANS: Client error. Do not translate "application/magic-envelope+xml"
 #: lib/salmonaction.php:47
 msgid "Salmon requires \"application/magic-envelope+xml\"."
-msgstr ""
+msgstr "Salmon vereist \"application/magic-envelope+xml\"."
 
 #. TRANS: Client error.
 #: lib/salmonaction.php:57
 msgid "Salmon signature verification failed."
-msgstr ""
+msgstr "De controle voor Salmon is mislukt."
 
 #. TRANS: Client error.
 #: lib/salmonaction.php:69
 msgid "Salmon post must be an Atom entry."
-msgstr ""
+msgstr "Een Salmonbericht moet in Atomopmaak gemaakt zijn."
 
 #. TRANS: Client exception.
 #: lib/salmonaction.php:118
 msgid "Unrecognized activity type."
-msgstr ""
+msgstr "Onbekend activiteitentype."
 
 #. TRANS: Client exception.
 #: lib/salmonaction.php:127
 msgid "This target doesn't understand posts."
-msgstr ""
+msgstr "Deze bestemming begrijpt berichten niet."
 
 #. TRANS: Client exception.
 #: lib/salmonaction.php:133
 msgid "This target doesn't understand follows."
-msgstr ""
+msgstr "Deze bestemming begrijpt volgen niet."
 
 #. TRANS: Client exception.
 #: lib/salmonaction.php:139
 msgid "This target doesn't understand unfollows."
-msgstr ""
+msgstr "Deze bestemming begrijpt niet langer volgen niet."
 
 #. TRANS: Client exception.
 #: lib/salmonaction.php:145
 msgid "This target doesn't understand favorites."
-msgstr ""
+msgstr "Deze bestemming begrijpt favorieten niet."
 
 #. TRANS: Client exception.
 #: lib/salmonaction.php:151
 msgid "This target doesn't understand unfavorites."
-msgstr ""
+msgstr "Deze bestemming begrijpt favorieten verwijderen niet."
 
 #. TRANS: Client exception.
 #: lib/salmonaction.php:157
 msgid "This target doesn't understand share events."
-msgstr ""
+msgstr "Deze bestemming begrijpt gebeurtenissen delen niet."
 
 #. TRANS: Client exception.
 #: lib/salmonaction.php:163
 msgid "This target doesn't understand joins."
-msgstr ""
+msgstr "Deze bestemming begrijpt lid worden niet."
 
 #. TRANS: Client exception.
 #: lib/salmonaction.php:169
 msgid "This target doesn't understand leave events."
-msgstr ""
+msgstr "Deze bestemming begrijpt uitschrijven van gebeurtenissen niet."
 
 #. TRANS: Exception.
 #: lib/salmonaction.php:197
 msgid "Received a salmon slap from unidentified actor."
-msgstr ""
+msgstr "Er is een Salmonslap ontvangen van een niet-geïdentificeerde actor."
 
 #. TRANS: Exception.
 #: lib/discovery.php:110
 #, php-format
 msgid "Unable to find services for %s."
-msgstr ""
+msgstr "Het was niet mogelijk diensten te vinden voor %s."
 
 #. TRANS: Exception.
 #: lib/xrd.php:64
@@ -350,17 +358,18 @@ msgstr "Ongeldige XML."
 #. TRANS: Exception.
 #: lib/xrd.php:69
 msgid "Invalid XML, missing XRD root."
-msgstr ""
+msgstr "Ongeldige XML. De XRD-root mist."
 
 #. TRANS: Exception.
 #: lib/magicenvelope.php:80
 msgid "Unable to locate signer public key."
 msgstr ""
+"Het was niet mogelijk de publieke sleutel van de ondertekenaar te vinden."
 
 #. TRANS: Exception.
 #: lib/salmon.php:93
 msgid "Salmon invalid actor for signing."
-msgstr ""
+msgstr "Ongeldige actor voor het ondertekenen van Salmon."
 
 #: tests/gettext-speedtest.php:57
 msgid "Feeds"
@@ -407,25 +416,26 @@ msgstr ""
 #, php-format
 msgid "Invalid hub.secret \"%s\". It must be under 200 bytes."
 msgstr ""
+"Ongeldig hub.secret \"%s\". Het moet minder dan tweehonderd bytes bevatten."
 
 #. TRANS: Client exception.
 #: actions/pushhub.php:161
 #, php-format
 msgid "Invalid hub.topic \"%s\". User doesn't exist."
-msgstr ""
+msgstr "Ongeldig hub.topic \"%s\". De gebruiker bestaat niet."
 
 #. TRANS: Client exception.
 #: actions/pushhub.php:170
 #, php-format
 msgid "Invalid hub.topic \"%s\". Group doesn't exist."
-msgstr ""
+msgstr "Ongeldig hub.topic \"%s\". De groep bestaat niet."
 
 #. TRANS: Client exception.
 #. TRANS: %1$s is this argument to the method this exception occurs in, %2$s is a URL.
 #: actions/pushhub.php:195
 #, php-format
 msgid "Invalid URL passed for %1$s: \"%2$s\""
-msgstr ""
+msgstr "Er is een ongeldige URL doorgegeven voor %1$s: \"%2$s\""
 
 #: actions/userxrd.php:49 actions/ownerxrd.php:37 actions/usersalmon.php:43
 msgid "No such user."
@@ -445,6 +455,8 @@ msgstr "In antwoord op een onbekende mededeling."
 #: actions/usersalmon.php:86
 msgid "In reply to a notice not by this user and not mentioning this user."
 msgstr ""
+"In antwoord op een mededeling niet door deze gebruiker en niet over of aan "
+"deze gebruiker."
 
 #. TRANS: Client exception.
 #: actions/usersalmon.php:163
@@ -455,23 +467,25 @@ msgstr "Het was niet mogelijk de nieuwe favoriet op te slaan."
 #: actions/usersalmon.php:195
 msgid "Can't favorite/unfavorite without an object."
 msgstr ""
+"Het is niet mogelijk (niet langer) als favoriet te markeren zonder object."
 
 #. TRANS: Client exception.
 #: actions/usersalmon.php:207
 msgid "Can't handle that kind of object for liking/faving."
 msgstr ""
+"Dat object is niet beschikbaar voor (niet langer) als favoriet aanmerken."
 
 #. TRANS: Client exception. %s is an object ID.
 #: actions/usersalmon.php:214
 #, php-format
 msgid "Notice with ID %s unknown."
-msgstr ""
+msgstr "De mededeling met ID %s is onbekend."
 
 #. TRANS: Client exception. %1$s is a notice ID, %2$s is a user ID.
 #: actions/usersalmon.php:219
 #, php-format
 msgid "Notice with ID %1$s not posted by %2$s."
-msgstr ""
+msgstr "De mededeling met ID %1$s is niet geplaatst foor %2$s."
 
 #. TRANS: Field label.
 #: actions/ostatusgroup.php:76
@@ -482,6 +496,8 @@ msgstr "Lid worden van groep"
 #: actions/ostatusgroup.php:79
 msgid "OStatus group's address, like http://example.net/group/nickname."
 msgstr ""
+"Het adres voor de OStatusgroep. Bijvoorbeeld; http://example.net/group/"
+"nickname."
 
 #. TRANS: Button text.
 #: actions/ostatusgroup.php:84 actions/ostatussub.php:73
@@ -580,6 +596,8 @@ msgid ""
 "OStatus user's address, like nickname@example.com or http://example.net/"
 "nickname"
 msgstr ""
+"Het OStatusadres van de gebruiker. Bijvoorbeeld nickname@example.com of "
+"http://example.net/nickname"
 
 #. TRANS: Button text.
 #. TRANS: Tooltip for button "Join".
@@ -641,6 +659,7 @@ msgid ""
 "Sorry, we could not reach that feed. Please try that OStatus address again "
 "later."
 msgstr ""
+"Die feed was niet te bereiken. Probeer dat OStatusadres later nog een keer."
 
 #. TRANS: OStatus remote subscription dialog error.
 #: actions/ostatussub.php:315
@@ -650,7 +669,7 @@ msgstr "U bent al gebonneerd!"
 #. TRANS: OStatus remote subscription dialog error.
 #: actions/ostatussub.php:320
 msgid "Remote subscription failed!"
-msgstr ""
+msgstr "Abonneren via een andere dienst is mislukt!"
 
 #: actions/ostatussub.php:367 actions/ostatusinit.php:63
 msgid "There was a problem with your session token. Try again, please."
@@ -744,38 +763,38 @@ msgstr ""
 #. TRANS: Page title.
 #: actions/ostatusinit.php:217
 msgid "OStatus Connect"
-msgstr ""
+msgstr "OStatuskoppeling"
 
 #: actions/pushcallback.php:48
 msgid "Empty or invalid feed id."
-msgstr ""
+msgstr "Het feed-ID is leeg of ongeldig."
 
 #. TRANS: Server exception. %s is a feed ID.
 #: actions/pushcallback.php:54
 #, php-format
 msgid "Unknown PuSH feed id %s"
-msgstr ""
+msgstr "Het PuSH feed-ID %s is onbekend"
 
 #. TRANS: Client exception. %s is an invalid feed name.
 #: actions/pushcallback.php:93
 #, php-format
 msgid "Bad hub.topic feed \"%s\"."
-msgstr ""
+msgstr "Ongeldige hub.topic feed \"%s\"."
 
 #. TRANS: Client exception. %1$s the invalid token, %2$s is the topic for which the invalid token was given.
 #: actions/pushcallback.php:98
 #, php-format
 msgid "Bad hub.verify_token %1$s for %2$s."
-msgstr ""
+msgstr "Ongeldig hub.verify_token %1$s voor %2$s."
 
 #. TRANS: Client exception. %s is an invalid topic.
 #: actions/pushcallback.php:105
 #, php-format
 msgid "Unexpected subscribe request for %s."
-msgstr ""
+msgstr "Onverwacht abonneringsverzoek voor %s."
 
 #. TRANS: Client exception. %s is an invalid topic.
 #: actions/pushcallback.php:110
 #, php-format
 msgid "Unexpected unsubscribe request for %s."
-msgstr ""
+msgstr "Onverwacht verzoek om abonnement op te hebben voor %s."
diff --git a/plugins/OStatus/locale/uk/LC_MESSAGES/OStatus.po b/plugins/OStatus/locale/uk/LC_MESSAGES/OStatus.po
index 016925961..0f49a0245 100644
--- a/plugins/OStatus/locale/uk/LC_MESSAGES/OStatus.po
+++ b/plugins/OStatus/locale/uk/LC_MESSAGES/OStatus.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OStatus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-27 22:20+0000\n"
-"PO-Revision-Date: 2010-09-27 22:42:39+0000\n"
+"POT-Creation-Date: 2010-10-03 19:53+0000\n"
+"PO-Revision-Date: 2010-10-03 19:57:16+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: 1285-62-55 00::+0000\n"
-"X-Generator: MediaWiki 1.17alpha (r73828); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2010-10-01 20:39:03+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r74231); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-ostatus\n"
@@ -53,16 +53,16 @@ msgstr "Не читати"
 #: OStatusPlugin.php:608
 #, php-format
 msgid "%1$s stopped following %2$s."
-msgstr "%1$s припинив читати Ваші дописи %2$s."
+msgstr "%1$s припинив читати ваші дописи %2$s."
 
 #: OStatusPlugin.php:636
 msgid "Could not set up remote group membership."
-msgstr "Не вдалося приєднатися до віддаленої групи."
+msgstr "Не вдалося приєднатися до віддаленої спільноти."
 
 #. TRANS: Exception.
 #: OStatusPlugin.php:667
 msgid "Failed joining remote group."
-msgstr "Помилка приєднання до віддаленої групи."
+msgstr "Помилка приєднання до віддаленої спільноти."
 
 #: OStatusPlugin.php:707
 msgid "Leave"
@@ -102,8 +102,8 @@ msgid ""
 "Follow people across social networks that implement <a href=\"http://ostatus."
 "org/\">OStatus</a>."
 msgstr ""
-"Слідкуйте за дописами людей з інших мереж, що підтримують протокол <a href="
-"\"http://ostatus.org/\">OStatus</a>."
+"Додає можливість слідкувати за дописами людей з інших мереж, які підтримують "
+"протокол <a href=\"http://ostatus.org/\">OStatus</a>."
 
 #: classes/FeedSub.php:248
 msgid "Attempting to start PuSH subscription for feed with no hub."
@@ -212,7 +212,7 @@ msgstr "Місцевий користувач не може бути зазна�
 #. TRANS: Exception.
 #: classes/Ostatus_profile.php:1280
 msgid "Local group can't be referenced as remote."
-msgstr "Місцева група не може бути зазначена у якості віддаленої."
+msgstr "Локальну спільноту не можна зазначити у якості віддаленої."
 
 #. TRANS: Exception.
 #: classes/Ostatus_profile.php:1332 classes/Ostatus_profile.php:1343
@@ -414,7 +414,7 @@ msgstr "hub.topic «%s» невірний. Користувача не існу�
 #: actions/pushhub.php:170
 #, php-format
 msgid "Invalid hub.topic \"%s\". Group doesn't exist."
-msgstr "hub.topic «%s» невірний. Групи не існує."
+msgstr "hub.topic «%s» невірний. Спільноти не існує."
 
 #. TRANS: Client exception.
 #. TRANS: %1$s is this argument to the method this exception occurs in, %2$s is a URL.
@@ -477,14 +477,14 @@ msgstr "Допис з ідентифікатором %1$s було надісл�
 #. TRANS: Field label.
 #: actions/ostatusgroup.php:76
 msgid "Join group"
-msgstr "Приєднатися до групи"
+msgstr "Долучитися до спільноти"
 
 #. TRANS: Tooltip for field label "Join group".
 #: actions/ostatusgroup.php:79
 msgid "OStatus group's address, like http://example.net/group/nickname."
 msgstr ""
-"Адреса групи згідно протоколу OStatus, наприклад http://example.net/group/"
-"nickname."
+"Адреса спільноти згідно протоколу OStatus, наприклад http://example.net/"
+"group/nickname."
 
 #. TRANS: Button text.
 #: actions/ostatusgroup.php:84 actions/ostatussub.php:73
@@ -494,7 +494,7 @@ msgstr "Продовжити"
 
 #: actions/ostatusgroup.php:103
 msgid "You are already a member of this group."
-msgstr "Ви вже є учасником цієї групи."
+msgstr "Ви вже є учасником цієї спільноти."
 
 #. TRANS: OStatus remote group subscription dialog error.
 #: actions/ostatusgroup.php:138
@@ -504,17 +504,17 @@ msgstr "Ви вже учасник!"
 #. TRANS: OStatus remote group subscription dialog error.
 #: actions/ostatusgroup.php:149
 msgid "Remote group join failed!"
-msgstr "Приєднатися до віддаленої групи не вдалося!"
+msgstr "Приєднатися до віддаленої спільноти не вдалося!"
 
 #. TRANS: OStatus remote group subscription dialog error.
 #: actions/ostatusgroup.php:153
 msgid "Remote group join aborted!"
-msgstr "Приєднання до віддаленої групи перервано!"
+msgstr "Приєднання до віддаленої спільноти перервано!"
 
 #. TRANS: Page title for OStatus remote group join form
 #: actions/ostatusgroup.php:165
 msgid "Confirm joining remote group"
-msgstr "Підтвердження приєднання до віддаленої групи"
+msgstr "Підтвердження приєднання до віддаленої спільноти"
 
 #. TRANS: Instructions.
 #: actions/ostatusgroup.php:176
@@ -522,50 +522,51 @@ msgid ""
 "You can subscribe to groups from other supported sites. Paste the group's "
 "profile URI below:"
 msgstr ""
-"Ви маєте можливість приєднатися до груп на аналогічних сайтах. Просто "
-"вставте URI профілю групи тут:"
+"Ви можете долучатися до спільнот на аналогічних сайтах. Просто вставте URI "
+"профілю спільноти тут:"
 
 #. TRANS: Client error.
 #: actions/groupsalmon.php:47
 msgid "No such group."
-msgstr "Такої групи немає."
+msgstr "Такої спільноти немає."
 
 #. TRANS: Client error.
 #: actions/groupsalmon.php:53
 msgid "Can't accept remote posts for a remote group."
-msgstr "Не можу узгодити віддалену пересилку дописів до віддаленої групи."
+msgstr "Не можу узгодити віддалену пересилку дописів до віддаленої спільноти."
 
 #. TRANS: Client error.
 #: actions/groupsalmon.php:127
 msgid "Can't read profile to set up group membership."
-msgstr "Не можу прочитати профіль, аби встановити членство у групі."
+msgstr "Не можу прочитати профіль, аби долучитися до спільноти."
 
 #. TRANS: Client error.
 #: actions/groupsalmon.php:131 actions/groupsalmon.php:174
 msgid "Groups can't join groups."
-msgstr "Групи ніяк не можуть приєднуватися до груп."
+msgstr "Спільноти ніяк не можуть приєднуватися до спільнот."
 
 #: actions/groupsalmon.php:144
 msgid "You have been blocked from that group by the admin."
-msgstr "Адміністратор групи заблокував Ваш профіль."
+msgstr "Адміністратор спільноти заблокував ваш профіль."
 
 #. TRANS: Server error. %1$s is a profile URI, %2$s is a group nickname.
 #: actions/groupsalmon.php:159
 #, php-format
 msgid "Could not join remote user %1$s to group %2$s."
-msgstr "Віддаленому користувачеві %1$s не вдалося приєднатися до групи %2$s."
+msgstr ""
+"Віддаленому користувачеві %1$s не вдалося долучитися до спільноти %2$s."
 
 #: actions/groupsalmon.php:171
 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:188
 #, php-format
 msgid "Could not remove remote user %1$s from group %2$s."
-msgstr "Не вдалось видалити віддаленого користувача %1$s з групи %2$s."
+msgstr "Не вдалось видалити віддаленого користувача %1$s зі спільноти %2$s."
 
 #. TRANS: Field label for a field that takes an OStatus user address.
 #: actions/ostatussub.php:66
@@ -586,7 +587,7 @@ msgstr ""
 #: actions/ostatussub.php:110
 msgctxt "BUTTON"
 msgid "Join this group"
-msgstr "Приєднатися до групи"
+msgstr "Приєднатися до спільноти"
 
 #. TRANS: Button text.
 #: actions/ostatussub.php:113
@@ -687,7 +688,7 @@ msgstr "Ви можете користуватись локальними під
 #: actions/ostatusinit.php:97
 #, php-format
 msgid "Join group %s"
-msgstr "Приєднатися до групи %s"
+msgstr "Приєднатися до спільноти %s"
 
 #. TRANS: Button text.
 #: actions/ostatusinit.php:99
@@ -714,7 +715,7 @@ msgstr "Ім’я користувача"
 
 #: actions/ostatusinit.php:118
 msgid "Nickname of the user you want to follow."
-msgstr "Ім’я користувача, дописи якого Ви хотіли б читати."
+msgstr "Ім’я користувача, дописи якого ви хотіли б читати."
 
 #. TRANS: Field label.
 #: actions/ostatusinit.php:123
@@ -724,7 +725,7 @@ msgstr "Профіль акаунту"
 #. TRANS: Tooltip for field label "Profile Account".
 #: actions/ostatusinit.php:125
 msgid "Your account id (e.g. user@identi.ca)."
-msgstr "Ідентифікатор Вашого акаунту (щось на зразок user@identi.ca)"
+msgstr "Ідентифікатор вашого акаунту (щось на зразок user@identi.ca)"
 
 #. TRANS: Client error.
 #: actions/ostatusinit.php:147