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

1 files changed, 41 insertions, 26 deletions

diff --git a/locale/pt_BR/LC_MESSAGES/statusnet.po b/locale/pt_BR/LC_MESSAGES/statusnet.po
index 0c9150517..bf9def292 100644
--- a/locale/pt_BR/LC_MESSAGES/statusnet.po
+++ b/locale/pt_BR/LC_MESSAGES/statusnet.po
@@ -13,12 +13,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-29 18:20+0000\n"
-"PO-Revision-Date: 2010-07-29 18:21:46+0000\n"
+"POT-Creation-Date: 2010-07-31 22:59+0000\n"
+"PO-Revision-Date: 2010-07-31 23:00:05+0000\n"
 "Language-Team: Brazilian Portuguese\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r70152); Translate extension (2010-07-21)\n"
+"X-Generator: MediaWiki 1.17alpha (r70249); Translate extension (2010-07-21)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt-br\n"
 "X-Message-Group: out-statusnet\n"
@@ -102,7 +102,7 @@ msgstr "Esta página não existe."
 #: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:113
 #: actions/apigroupismember.php:91 actions/apigroupjoin.php:100
 #: actions/apigroupleave.php:100 actions/apigrouplist.php:73
-#: actions/apistatusesupdate.php:228 actions/apisubscriptions.php:87
+#: actions/apistatusesupdate.php:229 actions/apisubscriptions.php:87
 #: actions/apitimelinefavorites.php:72 actions/apitimelinefriends.php:174
 #: actions/apitimelinehome.php:80 actions/apitimelinementions.php:80
 #: actions/apitimelineuser.php:82 actions/avatarbynickname.php:75
@@ -174,7 +174,7 @@ msgstr ""
 #, fuzzy, php-format
 msgid ""
 "You can try to [nudge %1$s](../%2$s) from their profile or [post something "
-"to their attention](%%%%action.newnotice%%%%?status_textarea=%3$s)."
+"to them](%%%%action.newnotice%%%%?status_textarea=%3$s)."
 msgstr ""
 "Você pode tentar [chamar a atenção de %1$s](../%2$s) em seu perfil ou "
 "[publicar alguma coisa que desperte seu interesse](%%%%action.newnotice%%%%?"
@@ -184,7 +184,7 @@ msgstr ""
 #, fuzzy, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
-"post a notice to their attention."
+"post a notice to them."
 msgstr ""
 "Por que não [registrar uma conta](%%%%action.register%%%%) e então chamar a "
 "atenção de %s ou publicar uma mensagem para sua atenção."
@@ -219,7 +219,7 @@ msgstr "Atualizações de %1$s e amigos no %2$s!"
 #: actions/apistatusesshow.php:109 actions/apistatusnetconfig.php:141
 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
 #: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:271
-#: actions/apitimelinegroup.php:152 actions/apitimelinehome.php:175
+#: actions/apitimelinegroup.php:154 actions/apitimelinehome.php:175
 #: actions/apitimelinementions.php:174 actions/apitimelinepublic.php:241
 #: actions/apitimelineretweetedtome.php:121
 #: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:161
@@ -269,7 +269,7 @@ msgstr "Não foi possível salvar o perfil."
 
 #: actions/apiaccountupdateprofilebackgroundimage.php:108
 #: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
-#: actions/apistatusesupdate.php:211 actions/avatarsettings.php:257
+#: actions/apistatusesupdate.php:212 actions/avatarsettings.php:257
 #: actions/designadminpanel.php:123 actions/editapplication.php:118
 #: actions/newapplication.php:101 actions/newnotice.php:94
 #: lib/designsettings.php:283
@@ -518,6 +518,11 @@ msgstr "Grupos de %s"
 msgid "groups on %s"
 msgstr "grupos no %s"
 
+#: actions/apimediaupload.php:99
+#, fuzzy
+msgid "Upload failed."
+msgstr "Enviar arquivo"
+
 #: actions/apioauthauthorize.php:101
 msgid "No oauth_token parameter provided."
 msgstr "Não foi fornecido nenhum parâmetro oauth_token"
@@ -665,17 +670,21 @@ msgstr "A mensagem foi excluída."
 msgid "No status with that ID found."
 msgstr "Não foi encontrada nenhuma mensagem com esse ID."
 
-#: actions/apistatusesupdate.php:241 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:221
+msgid "Client must provide a 'status' parameter with a value."
+msgstr ""
+
+#: actions/apistatusesupdate.php:242 actions/newnotice.php:155
 #: lib/mailhandler.php:60
 #, php-format
 msgid "That's too long. Max notice size is %d chars."
 msgstr "Está muito extenso. O tamanho máximo é de %s caracteres."
 
-#: actions/apistatusesupdate.php:282 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:283 actions/apiusershow.php:96
 msgid "Not found."
 msgstr "Não encontrado."
 
-#: actions/apistatusesupdate.php:305 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:306 actions/newnotice.php:178
 #, php-format
 msgid "Max notice size is %d chars, including attachment URL."
 msgstr "O tamanho máximo da mensagem é de %s caracteres"
@@ -3555,7 +3564,7 @@ msgstr "Fonte de respostas para %s (Atom)"
 #, fuzzy, php-format
 msgid ""
 "This is the timeline showing replies to %1$s but %2$s hasn't received a "
-"notice to their attention yet."
+"notice to them yet."
 msgstr ""
 "Esse é o fluxo de mensagens de resposta para %1$s, mas %2$s ainda não "
 "recebeu nenhuma mensagem direcionada a ele(a)."
@@ -3572,8 +3581,8 @@ msgstr ""
 #: actions/replies.php:206
 #, fuzzy, php-format
 msgid ""
-"You can try to [nudge %1$s](../%2$s) or [post something to their attention](%"
-"%%%action.newnotice%%%%?status_textarea=%3$s)."
+"You can try to [nudge %1$s](../%2$s) or [post something to them](%%%%action."
+"newnotice%%%%?status_textarea=%3$s)."
 msgstr ""
 "Você pode tentar [chamar a atenção de %1$s](../%2$s) ou [publicar alguma "
 "coisa que desperte seu interesse](%%%%action.newnotice%%%%?status_textarea=%3"
@@ -3954,8 +3963,8 @@ msgstr ""
 #: actions/showstream.php:207
 #, fuzzy, php-format
 msgid ""
-"You can try to nudge %1$s or [post something to their attention](%%%%action."
-"newnotice%%%%?status_textarea=%2$s)."
+"You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
+"%?status_textarea=%2$s)."
 msgstr ""
 "Você pode tentar chamar a atenção de %1$s ou [publicar alguma coisa que "
 "desperte seu interesse](%%%%action.newnotice%%%%?status_textarea=%2$s)."
@@ -4834,6 +4843,12 @@ msgstr "Versão"
 msgid "Author(s)"
 msgstr "Autor(es)"
 
+#. TRANS: Server exception thrown when a URL cannot be processed.
+#: classes/File.php:143
+#, php-format
+msgid "Cannot process URL '%s'"
+msgstr ""
+
 #. TRANS: Server exception thrown when... Robin thinks something is impossible!
 #: classes/File.php:175
 msgid "Robin thinks something is impossible."
@@ -4899,7 +4914,7 @@ msgstr "Não foi possível criar o token de autenticação para %s"
 
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
 #: classes/Memcached_DataObject.php:533
-msgid "No database name / DSN found anywhere"
+msgid "No database name or DSN found anywhere."
 msgstr ""
 
 #. TRANS: Client exception thrown when a user tries to send a direct message while being banned from sending them.
@@ -4958,45 +4973,45 @@ msgstr ""
 "publique novamente daqui a alguns minutos."
 
 #. TRANS: Client exception thrown when a user tries to post while being banned.
-#: classes/Notice.php:285
+#: classes/Notice.php:286
 msgid "You are banned from posting notices on this site."
 msgstr "Você está proibido de publicar mensagens neste site."
 
 #. TRANS: Server exception thrown when a notice cannot be saved.
 #. TRANS: Server exception thrown when a notice cannot be updated.
-#: classes/Notice.php:352 classes/Notice.php:379
+#: classes/Notice.php:353 classes/Notice.php:380
 msgid "Problem saving notice."
 msgstr "Problema no salvamento da mensagem."
 
 #. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:891
+#: classes/Notice.php:892
 msgid "Bad type provided to saveKnownGroups"
 msgstr ""
 
 #. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:990
+#: classes/Notice.php:991
 msgid "Problem saving group inbox."
 msgstr "Problema no salvamento das mensagens recebidas do grupo."
 
 #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
 #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1599
+#: classes/Notice.php:1600
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
 
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
-#. TRANS: %1$s is the role name, %2$s is the user ID.
+#. TRANS: %1$s is the role name, %2$s is the user ID (number).
 #: classes/Profile.php:740
 #, php-format
-msgid "Cannot revoke role \"%s\" for user #%2$s; does not exist."
+msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr ""
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
-#. TRANS: %1$s is the role name, %2$s is the user ID.
+#. TRANS: %1$s is the role name, %2$s is the user ID (number).
 #: classes/Profile.php:749
 #, php-format
-msgid "Cannot revoke role \"%1$s\" for user #%2$s; database error."
+msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
 
 #. TRANS: Exception thrown when a right for a non-existing user profile is checked.