Merge remote-tracking branch 'mainline/1.0.x' into people_tags_rebase

Conflicts: actions/tagother.php lib/subscriberspeopleselftagcloudsection.php lib/subscriptionspeopleselftagcloudsection.php
2011-04-04 13:26:27 +05:30
parent 5a2bab07b2 e552993307
commit 57198a7464
1544 changed files with 53904 additions and 17301 deletions
--- a/plugins/OStatus/actions/usersalmon.php
+++ b/plugins/OStatus/actions/usersalmon.php
@@ -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();
--- 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: 2011-03-24 11:10+0000\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>."
@@ -348,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."
--- a/plugins/OStatus/locale/de/LC_MESSAGES/OStatus.po
+++ b/plugins/OStatus/locale/de/LC_MESSAGES/OStatus.po
@@ -10,13 +10,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OStatus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-26 11:02+0000\n"
-"PO-Revision-Date: 2011-03-26 11:06:52+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-24 15:25:40+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r84791); Translate extension (2011-03-11)\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"
@@ -311,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."
--- a/plugins/OStatus/locale/fr/LC_MESSAGES/OStatus.po
+++ b/plugins/OStatus/locale/fr/LC_MESSAGES/OStatus.po
@@ -11,13 +11,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OStatus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-26 11:02+0000\n"
-"PO-Revision-Date: 2011-03-26 11:06:52+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-24 15:25:40+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r84791); Translate extension (2011-03-11)\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"
@@ -323,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."
--- 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: 2011-03-26 11:02+0000\n"
-"PO-Revision-Date: 2011-03-26 11:06:52+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-24 15:25:40+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r84791); Translate extension (2011-03-11)\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"
@@ -310,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."
--- 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: 2011-03-26 11:02+0000\n"
-"PO-Revision-Date: 2011-03-26 11:06:52+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-24 15:25:40+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r84791); Translate extension (2011-03-11)\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"
@@ -307,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 "Не можам да означам како бендисано или да тргнам бендисано без објект."
--- 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: 2011-03-26 11:02+0000\n"
-"PO-Revision-Date: 2011-03-26 11:06:52+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-24 15:25:40+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r84791); Translate extension (2011-03-11)\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"
@@ -319,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 ""
--- 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: 2011-03-26 11:02+0000\n"
-"PO-Revision-Date: 2011-03-26 11:06:53+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-24 15:25:40+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r84791); Translate extension (2011-03-11)\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"
@@ -313,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 ""