Merge branch '0.8.x' into 0.9.x

Conflicts:
	EVENTS.txt
	actions/finishremotesubscribe.php
	actions/postnotice.php
	actions/public.php
	actions/remotesubscribe.php
	actions/showstream.php
	actions/updateprofile.php
	actions/userauthorization.php
	classes/laconica.ini
	lib/common.php
	lib/oauthstore.php
	lib/omb.php

3 files changed, 10 insertions, 10 deletions

diff --git a/locale/vi_VN/LC_MESSAGES/laconica.mo b/locale/vi_VN/LC_MESSAGES/laconica.mo
deleted file mode 100644
index b7f5e3c2c..000000000
--- a/locale/vi_VN/LC_MESSAGES/laconica.mo
+++ /dev/null
diff --git a/locale/vi_VN/LC_MESSAGES/statusnet.mo b/locale/vi_VN/LC_MESSAGES/statusnet.mo
new file mode 100644
index 000000000..65add28b4
--- /dev/null
+++ b/locale/vi_VN/LC_MESSAGES/statusnet.mo
diff --git a/locale/vi_VN/LC_MESSAGES/laconica.po b/locale/vi_VN/LC_MESSAGES/statusnet.po
index 0b9477a6a..af34d5210 100644
--- a/locale/vi_VN/LC_MESSAGES/laconica.po
+++ b/locale/vi_VN/LC_MESSAGES/statusnet.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: laconica\n"
+"Project-Id-Version: statusnet\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2009-01-25 16:24+0000\n"
 "PO-Revision-Date: 2009-05-10 05:27+0000\n"
@@ -271,8 +271,8 @@ msgstr ""
 #: actions/twitapiusers.php:55 actions/twitapiaccount.php:37
 #: actions/twitapidirect_messages.php:111 actions/twitapifavorites.php:85
 #: actions/twitapifavorites.php:102 actions/twitapifriendships.php:121
-#: actions/twitapihelp.php:44 actions/twitapilaconica.php:82
-#: actions/twitapilaconica.php:151 actions/twitapistatuses.php:79
+#: actions/twitapihelp.php:44 actions/twitapistatusnet.php:82
+#: actions/twitapistatusnet.php:151 actions/twitapistatuses.php:79
 #: actions/twitapistatuses.php:147 actions/twitapistatuses.php:228
 #: actions/twitapistatuses.php:239 actions/twitapistatuses.php:392
 #: actions/twitapistatuses.php:402 actions/twitapistatuses.php:429
@@ -297,7 +297,7 @@ msgstr "Phương thức API không tìm thấy!"
 #: actions/twitapistatuses.php:690 actions/twitapiaccount.php:45
 #: actions/twitapiaccount.php:97 actions/twitapiaccount.php:103
 #: actions/twitapidirect_messages.php:184 actions/twitapifavorites.php:143
-#: actions/twitapihelp.php:52 actions/twitapilaconica.php:172
+#: actions/twitapihelp.php:52 actions/twitapistatusnet.php:172
 #: actions/twitapinotifications.php:31 actions/twitapinotifications.php:37
 #: actions/twitapistatuses.php:562
 msgid "API method under construction."
@@ -1147,11 +1147,11 @@ msgstr "Gửi thư mời đến những người chưa có tài khoản"
 #: ../lib/util.php:261 lib/util.php:277 lib/action.php:609
 #, fuzzy, php-format
 msgid ""
-"It runs the [Laconica](http://laconi.ca/) microblogging software, version %"
+"It runs the [StatusNet](http://status.net/) microblogging software, version %"
 "s, available under the [GNU Affero General Public License](http://www.fsf."
 "org/licensing/licenses/agpl-3.0.html)."
 msgstr ""
-"Đang dùng [Laconica](http://laconi.ca/), phiên bản %s phát hành theo bản "
+"Đang dùng [StatusNet](http://status.net/), phiên bản %s phát hành theo bản "
 "quyền [GNU Affero General Public "
 "License](http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
 
@@ -4705,7 +4705,7 @@ msgid "Secondary site navigation"
 msgstr "Tôi theo"
 
 #: lib/action.php:602 lib/action.php:623
-msgid "Laconica software license"
+msgid "StatusNet software license"
 msgstr ""
 
 #: lib/action.php:630
@@ -5097,11 +5097,11 @@ msgstr "Ngừng đăng ký từ người dùng này"
 #~ msgstr "FAQ - Hỏi đáp"
 
 #~ msgid ""
-#~ "It runs the [Laconica](http://laconi.ca/) microblogging software, version "
+#~ "It runs the [StatusNet](http://status.net/) microblogging software, version "
 #~ "%s, available under the [GNU Affero General Public License] (http://www."
 #~ "fsf.org/licensing/licenses/agpl-3.0.html)."
 #~ msgstr ""
-#~ "Microblogging [Laconica](http://laconi.ca/), version %s đã có ở [GNU "
+#~ "Microblogging [StatusNet](http://status.net/), version %s đã có ở [GNU "
 #~ "Affero General Public License] (http://www.fsf.org/licensing/licenses/"
 #~ "agpl-3.0.html)."
 
@@ -5282,7 +5282,7 @@ msgstr "Ngừng đăng ký từ người dùng này"
 
 #~ msgid ""
 #~ "To use this [Saigonica version](%%doc.source%%), you must write the "
-#~ "license is of Laconica and has contributions from Saigonica."
+#~ "license is of StatusNet and has contributions from Saigonica."
 #~ msgstr ""
 #~ "Để sử dụng [phiên bản Saigonica](%%doc.source%%) này, cần ghi rõ bản "
 #~ "quyền của Laconia cộng thêm sự đóng góp của Saigonica."