Merge branch '0.9.x' into pluginize-twitter-bridge

Conflicts:
	plugins/TwitterBridge/twitterauthorization.php

2 files changed, 8 insertions, 8 deletions

diff --git a/locale/en_GB/LC_MESSAGES/laconica.mo b/locale/en_GB/LC_MESSAGES/statusnet.mo
index 93ff37f9d..11eacc9ac 100644
--- a/locale/en_GB/LC_MESSAGES/laconica.mo
+++ b/locale/en_GB/LC_MESSAGES/statusnet.mo
diff --git a/locale/en_GB/LC_MESSAGES/laconica.po b/locale/en_GB/LC_MESSAGES/statusnet.po
index 4e261723f..a105d2b86 100644
--- a/locale/en_GB/LC_MESSAGES/laconica.po
+++ b/locale/en_GB/LC_MESSAGES/statusnet.po
@@ -1,4 +1,4 @@
-# #-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#
+# #-#-#-#-#  statusnet.new.pot (PACKAGE VERSION)  #-#-#-#-#
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
@@ -273,8 +273,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
@@ -299,7 +299,7 @@ msgstr "API method not found!"
 #: 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."
@@ -1150,11 +1150,11 @@ msgstr "Invite new users"
 #: ../lib/util.php:261 lib/util.php:277 lib/action.php:609
 #, 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 ""
-"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 Licence](http://www.fsf."
 "org/licensing/licenses/agpl-3.0.html)."
 
@@ -4534,8 +4534,8 @@ msgid "Secondary site navigation"
 msgstr "Secondary site navigation"
 
 #: lib/action.php:602 lib/action.php:623
-msgid "Laconica software license"
-msgstr "Laconica software licence"
+msgid "StatusNet software license"
+msgstr "StatusNet software licence"
 
 #: lib/action.php:630
 msgid "All "