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

1 files changed, 58 insertions, 22 deletions

diff --git a/plugins/Blacklist/locale/fr/LC_MESSAGES/Blacklist.po b/plugins/Blacklist/locale/fr/LC_MESSAGES/Blacklist.po
index f6a1d195c..23502a737 100644
--- a/plugins/Blacklist/locale/fr/LC_MESSAGES/Blacklist.po
+++ b/plugins/Blacklist/locale/fr/LC_MESSAGES/Blacklist.po
@@ -10,63 +10,99 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Blacklist\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-03 19:53+0000\n"
-"PO-Revision-Date: 2010-10-03 19:56:26+0000\n"
+"POT-Creation-Date: 2010-10-27 23:43+0000\n"
+"PO-Revision-Date: 2010-10-27 23:46:17+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: 2010-09-27 23:18:14+0000\n"
-"X-Generator: MediaWiki 1.17alpha (r74231); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2010-10-18 20:29:05+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r75590); 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-blacklist\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: BlacklistPlugin.php:148
-#, php-format
-msgid "You may not register with homepage '%s'."
+#. TRANS: Validation failure for URL. %s is the URL.
+#: BlacklistPlugin.php:149
+#, fuzzy, php-format
+msgid "You may not register with homepage \"%s\"."
 msgstr "Vous ne pouvez pas vous inscrire avec la page d’accueil « %s »."
 
-#: BlacklistPlugin.php:158
-#, php-format
-msgid "You may not register with nickname '%s'."
+#. TRANS: Validation failure for nickname. %s is the nickname.
+#: BlacklistPlugin.php:160
+#, fuzzy, php-format
+msgid "You may not register with nickname \"%s\"."
 msgstr "Vous ne pouvez pas vous inscrire avec le pseudonyme « %s »."
 
-#: BlacklistPlugin.php:182
-#, php-format
-msgid "You may not use homepage '%s'."
+#. TRANS: Validation failure for URL. %s is the URL.
+#: BlacklistPlugin.php:185
+#, fuzzy, php-format
+msgid "You may not use homepage \"%s\"."
 msgstr "Vous ne pouvez pas utiliser la page d’accueil « %s »."
 
-#: BlacklistPlugin.php:192
-#, php-format
-msgid "You may not use nickname '%s'."
+#. TRANS: Validation failure for nickname. %s is the nickname.
+#: BlacklistPlugin.php:196
+#, fuzzy, php-format
+msgid "You may not use nickname \"%s\"."
 msgstr "Vous ne pouvez pas utiliser le pseudonyme « %s »."
 
-#: BlacklistPlugin.php:234
+#. TRANS: Validation failure for URL. %s is the URL.
+#: BlacklistPlugin.php:239
 #, php-format
 msgid "You may not use URL \"%s\" in notices."
 msgstr "Vous ne pouvez pas utiliser l’URL « %s » dans les avis."
 
-#: BlacklistPlugin.php:338
+#: BlacklistPlugin.php:343
 msgid "Keeps a blacklist of forbidden nickname and URL patterns."
 msgstr "Maintient une liste noire des pseudonymes et motifs d’URL interdits."
 
-#: BlacklistPlugin.php:375 blacklistadminpanel.php:52
+#. TRANS: Menu item in admin panel.
+#: BlacklistPlugin.php:381
+#, fuzzy
+msgctxt "MENU"
 msgid "Blacklist"
 msgstr "Liste noire"
 
-#: BlacklistPlugin.php:376
+#. TRANS: Tooltip for menu item in admin panel.
+#: BlacklistPlugin.php:383
+#, fuzzy
+msgctxt "TOOLTIP"
 msgid "Blacklist configuration"
 msgstr "Configuration de la liste noire"
 
-#: BlacklistPlugin.php:402
+#. TRANS: Checkbox with text label in the delete user form.
+#: BlacklistPlugin.php:410
 msgid "Add this nickname pattern to blacklist"
 msgstr "Ajouter ce motif de pseudonymes à la liste noire"
 
-#: BlacklistPlugin.php:411
+#. TRANS: Checkbox with text label in the delete user form.
+#: BlacklistPlugin.php:420
 msgid "Add this homepage pattern to blacklist"
 msgstr "Ajouter ce motif de pages d’accueil à la liste noire"
 
+#. TRANS: Exception thrown trying to post a notice while having set a blocked homepage URL. %s is the blocked URL.
+#. TRANS: Client exception thrown trying to subscribe to a person with a blocked homepage or site URL. %s is the blocked URL.
+#: BlacklistPlugin.php:499 BlacklistPlugin.php:534
+#, php-format
+msgid "Users from \"%s\" blocked."
+msgstr ""
+
+#. TRANS: Exception thrown trying to post a notice while having a blocked nickname. %s is the blocked nickname.
+#: BlacklistPlugin.php:510
+#, php-format
+msgid "Posts from nickname \"%s\" disallowed."
+msgstr ""
+
+#. TRANS: Client exception thrown trying to subscribe to a person with a blocked nickname. %s is the blocked nickname.
+#: BlacklistPlugin.php:545
+#, fuzzy, php-format
+msgid "Can't subscribe to nickname \"%s\"."
+msgstr "Vous ne pouvez pas utiliser le pseudonyme « %s »."
+
+#: blacklistadminpanel.php:52
+msgid "Blacklist"
+msgstr "Liste noire"
+
 #: blacklistadminpanel.php:62
 msgid "Blacklisted URLs and nicknames"
 msgstr "Liste noire d’URL et de pseudonymes"