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

Conflicts:
	plugins/AnonymousFave/AnonymousFavePlugin.php

10 files changed, 57 insertions, 57 deletions

diff --git a/plugins/NoticeTitle/locale/NoticeTitle.pot b/plugins/NoticeTitle/locale/NoticeTitle.pot
index f6df63004..6a3ac86f2 100644
--- a/plugins/NoticeTitle/locale/NoticeTitle.pot
+++ b/plugins/NoticeTitle/locale/NoticeTitle.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-22 22:34+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"
@@ -16,12 +16,12 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: NoticeTitlePlugin.php:126
+#: NoticeTitlePlugin.php:132
 msgid "Adds optional titles to notices."
 msgstr ""
 
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
-#: NoticeTitlePlugin.php:299
+#: NoticeTitlePlugin.php:307
 #, php-format
 msgid "%1$s - %2$s"
 msgstr ""
diff --git a/plugins/NoticeTitle/locale/br/LC_MESSAGES/NoticeTitle.po b/plugins/NoticeTitle/locale/br/LC_MESSAGES/NoticeTitle.po
index 6cec21552..a2c5b823d 100644
--- a/plugins/NoticeTitle/locale/br/LC_MESSAGES/NoticeTitle.po
+++ b/plugins/NoticeTitle/locale/br/LC_MESSAGES/NoticeTitle.po
@@ -9,24 +9,24 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - NoticeTitle\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-27 22:20+0000\n"
-"PO-Revision-Date: 2010-09-27 22:42:21+0000\n"
+"POT-Creation-Date: 2010-10-03 19:53+0000\n"
+"PO-Revision-Date: 2010-10-03 19:56:58+0000\n"
 "Language-Team: Breton <http://translatewiki.net/wiki/Portal:br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 1285-19-54 82::+0000\n"
-"X-Generator: MediaWiki 1.17alpha (r73828); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2010-10-01 20:39:00+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: br\n"
 "X-Message-Group: #out-statusnet-plugin-noticetitle\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: NoticeTitlePlugin.php:126
+#: NoticeTitlePlugin.php:132
 msgid "Adds optional titles to notices."
 msgstr ""
 
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
-#: NoticeTitlePlugin.php:299
+#: NoticeTitlePlugin.php:307
 #, php-format
 msgid "%1$s - %2$s"
 msgstr "%1$s - %2$s"
diff --git a/plugins/NoticeTitle/locale/fr/LC_MESSAGES/NoticeTitle.po b/plugins/NoticeTitle/locale/fr/LC_MESSAGES/NoticeTitle.po
index 85825d452..c13b48b66 100644
--- a/plugins/NoticeTitle/locale/fr/LC_MESSAGES/NoticeTitle.po
+++ b/plugins/NoticeTitle/locale/fr/LC_MESSAGES/NoticeTitle.po
@@ -9,24 +9,24 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - NoticeTitle\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-27 22:20+0000\n"
-"PO-Revision-Date: 2010-09-27 22:42:21+0000\n"
+"POT-Creation-Date: 2010-10-03 19:53+0000\n"
+"PO-Revision-Date: 2010-10-03 19:56:58+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-19-54 82::+0000\n"
-"X-Generator: MediaWiki 1.17alpha (r73828); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2010-10-01 20:39:00+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-noticetitle\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: NoticeTitlePlugin.php:126
+#: NoticeTitlePlugin.php:132
 msgid "Adds optional titles to notices."
 msgstr "Ajoute des titres optionnels aux avis."
 
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
-#: NoticeTitlePlugin.php:299
+#: NoticeTitlePlugin.php:307
 #, php-format
 msgid "%1$s - %2$s"
 msgstr "%1$s — %2$s"
diff --git a/plugins/NoticeTitle/locale/ia/LC_MESSAGES/NoticeTitle.po b/plugins/NoticeTitle/locale/ia/LC_MESSAGES/NoticeTitle.po
index 17773a64d..ae75c1f55 100644
--- a/plugins/NoticeTitle/locale/ia/LC_MESSAGES/NoticeTitle.po
+++ b/plugins/NoticeTitle/locale/ia/LC_MESSAGES/NoticeTitle.po
@@ -9,24 +9,24 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - NoticeTitle\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-27 22:20+0000\n"
-"PO-Revision-Date: 2010-09-27 22:42:21+0000\n"
+"POT-Creation-Date: 2010-10-03 19:53+0000\n"
+"PO-Revision-Date: 2010-10-03 19:56:58+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-19-54 82::+0000\n"
-"X-Generator: MediaWiki 1.17alpha (r73828); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2010-10-01 20:39:00+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-noticetitle\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: NoticeTitlePlugin.php:126
+#: NoticeTitlePlugin.php:132
 msgid "Adds optional titles to notices."
 msgstr "Adde optional titulos a notas."
 
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
-#: NoticeTitlePlugin.php:299
+#: NoticeTitlePlugin.php:307
 #, php-format
 msgid "%1$s - %2$s"
 msgstr "%1$s - %2$s"
diff --git a/plugins/NoticeTitle/locale/mk/LC_MESSAGES/NoticeTitle.po b/plugins/NoticeTitle/locale/mk/LC_MESSAGES/NoticeTitle.po
index bda31caa4..6fe2084e6 100644
--- a/plugins/NoticeTitle/locale/mk/LC_MESSAGES/NoticeTitle.po
+++ b/plugins/NoticeTitle/locale/mk/LC_MESSAGES/NoticeTitle.po
@@ -9,24 +9,24 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - NoticeTitle\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-27 22:20+0000\n"
-"PO-Revision-Date: 2010-09-27 22:42:21+0000\n"
+"POT-Creation-Date: 2010-10-03 19:53+0000\n"
+"PO-Revision-Date: 2010-10-03 19:56:58+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-19-54 82::+0000\n"
-"X-Generator: MediaWiki 1.17alpha (r73828); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2010-10-01 20:39:00+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-noticetitle\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
 
-#: NoticeTitlePlugin.php:126
+#: NoticeTitlePlugin.php:132
 msgid "Adds optional titles to notices."
 msgstr "Додава наслови на забелешките (по избор)."
 
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
-#: NoticeTitlePlugin.php:299
+#: NoticeTitlePlugin.php:307
 #, php-format
 msgid "%1$s - %2$s"
 msgstr "%1$s - %2$s"
diff --git a/plugins/NoticeTitle/locale/nb/LC_MESSAGES/NoticeTitle.po b/plugins/NoticeTitle/locale/nb/LC_MESSAGES/NoticeTitle.po
index 50c95a569..c7309d847 100644
--- a/plugins/NoticeTitle/locale/nb/LC_MESSAGES/NoticeTitle.po
+++ b/plugins/NoticeTitle/locale/nb/LC_MESSAGES/NoticeTitle.po
@@ -9,24 +9,24 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - NoticeTitle\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-27 22:20+0000\n"
-"PO-Revision-Date: 2010-09-27 22:42:21+0000\n"
+"POT-Creation-Date: 2010-10-03 19:53+0000\n"
+"PO-Revision-Date: 2010-10-03 19:56:58+0000\n"
 "Language-Team: Norwegian (bokmål)‬ <http://translatewiki.net/wiki/Portal:no>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 1285-19-54 82::+0000\n"
-"X-Generator: MediaWiki 1.17alpha (r73828); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2010-10-01 20:39:00+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: no\n"
 "X-Message-Group: #out-statusnet-plugin-noticetitle\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: NoticeTitlePlugin.php:126
+#: NoticeTitlePlugin.php:132
 msgid "Adds optional titles to notices."
 msgstr "Legger valgfrie titler til notiser."
 
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
-#: NoticeTitlePlugin.php:299
+#: NoticeTitlePlugin.php:307
 #, php-format
 msgid "%1$s - %2$s"
 msgstr "%1$s - %2$s"
diff --git a/plugins/NoticeTitle/locale/nl/LC_MESSAGES/NoticeTitle.po b/plugins/NoticeTitle/locale/nl/LC_MESSAGES/NoticeTitle.po
index 0a71b63e0..6881e630f 100644
--- a/plugins/NoticeTitle/locale/nl/LC_MESSAGES/NoticeTitle.po
+++ b/plugins/NoticeTitle/locale/nl/LC_MESSAGES/NoticeTitle.po
@@ -9,24 +9,24 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - NoticeTitle\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-27 22:20+0000\n"
-"PO-Revision-Date: 2010-09-27 22:42:21+0000\n"
+"POT-Creation-Date: 2010-10-03 19:53+0000\n"
+"PO-Revision-Date: 2010-10-03 19:56:58+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-19-54 82::+0000\n"
-"X-Generator: MediaWiki 1.17alpha (r73828); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2010-10-01 20:39:00+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-noticetitle\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: NoticeTitlePlugin.php:126
+#: NoticeTitlePlugin.php:132
 msgid "Adds optional titles to notices."
 msgstr "Voegt optioneel titels toe aan mededelingen."
 
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
-#: NoticeTitlePlugin.php:299
+#: NoticeTitlePlugin.php:307
 #, php-format
 msgid "%1$s - %2$s"
 msgstr "%1$s - %2$s"
diff --git a/plugins/NoticeTitle/locale/te/LC_MESSAGES/NoticeTitle.po b/plugins/NoticeTitle/locale/te/LC_MESSAGES/NoticeTitle.po
index 9f3b6bee6..b098f20b5 100644
--- a/plugins/NoticeTitle/locale/te/LC_MESSAGES/NoticeTitle.po
+++ b/plugins/NoticeTitle/locale/te/LC_MESSAGES/NoticeTitle.po
@@ -9,24 +9,24 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - NoticeTitle\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-27 22:20+0000\n"
-"PO-Revision-Date: 2010-09-27 22:42:21+0000\n"
+"POT-Creation-Date: 2010-10-03 19:53+0000\n"
+"PO-Revision-Date: 2010-10-03 19:56:58+0000\n"
 "Language-Team: Telugu <http://translatewiki.net/wiki/Portal:te>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 1285-19-54 82::+0000\n"
-"X-Generator: MediaWiki 1.17alpha (r73828); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2010-10-01 20:39:00+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: te\n"
 "X-Message-Group: #out-statusnet-plugin-noticetitle\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: NoticeTitlePlugin.php:126
+#: NoticeTitlePlugin.php:132
 msgid "Adds optional titles to notices."
 msgstr ""
 
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
-#: NoticeTitlePlugin.php:299
+#: NoticeTitlePlugin.php:307
 #, php-format
 msgid "%1$s - %2$s"
 msgstr "%1$s - %2$s"
diff --git a/plugins/NoticeTitle/locale/tl/LC_MESSAGES/NoticeTitle.po b/plugins/NoticeTitle/locale/tl/LC_MESSAGES/NoticeTitle.po
index 2176f74dc..fd0831302 100644
--- a/plugins/NoticeTitle/locale/tl/LC_MESSAGES/NoticeTitle.po
+++ b/plugins/NoticeTitle/locale/tl/LC_MESSAGES/NoticeTitle.po
@@ -9,24 +9,24 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - NoticeTitle\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-27 22:20+0000\n"
-"PO-Revision-Date: 2010-09-27 22:42:21+0000\n"
+"POT-Creation-Date: 2010-10-03 19:53+0000\n"
+"PO-Revision-Date: 2010-10-03 19:56:58+0000\n"
 "Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 1285-19-54 82::+0000\n"
-"X-Generator: MediaWiki 1.17alpha (r73828); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2010-10-01 20:39:00+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: tl\n"
 "X-Message-Group: #out-statusnet-plugin-noticetitle\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: NoticeTitlePlugin.php:126
+#: NoticeTitlePlugin.php:132
 msgid "Adds optional titles to notices."
 msgstr "Nagdaragdag ng maaaring wala na mga pamagat sa mga pabatid."
 
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
-#: NoticeTitlePlugin.php:299
+#: NoticeTitlePlugin.php:307
 #, php-format
 msgid "%1$s - %2$s"
 msgstr " %1$s - %2$s"
diff --git a/plugins/NoticeTitle/locale/uk/LC_MESSAGES/NoticeTitle.po b/plugins/NoticeTitle/locale/uk/LC_MESSAGES/NoticeTitle.po
index 44f3ca400..ad4445d97 100644
--- a/plugins/NoticeTitle/locale/uk/LC_MESSAGES/NoticeTitle.po
+++ b/plugins/NoticeTitle/locale/uk/LC_MESSAGES/NoticeTitle.po
@@ -9,25 +9,25 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - NoticeTitle\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-27 22:20+0000\n"
-"PO-Revision-Date: 2010-09-27 22:42:21+0000\n"
+"POT-Creation-Date: 2010-10-03 19:53+0000\n"
+"PO-Revision-Date: 2010-10-03 19:56:58+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-19-54 82::+0000\n"
-"X-Generator: MediaWiki 1.17alpha (r73828); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2010-10-01 20:39:00+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-noticetitle\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
-#: NoticeTitlePlugin.php:126
+#: NoticeTitlePlugin.php:132
 msgid "Adds optional titles to notices."
 msgstr "Додавати до повідомлень необов’язкові заголовки."
 
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
-#: NoticeTitlePlugin.php:299
+#: NoticeTitlePlugin.php:307
 #, php-format
 msgid "%1$s - %2$s"
 msgstr "%1$s — %2$s"