Merge branch '0.8.x' into deleteuser

3 files changed, 12 insertions, 12 deletions

diff --git a/locale/bg_BG/LC_MESSAGES/laconica.mo b/locale/bg_BG/LC_MESSAGES/laconica.mo
deleted file mode 100644
index 4aa8804c5..000000000
--- a/locale/bg_BG/LC_MESSAGES/laconica.mo
+++ /dev/null
diff --git a/locale/bg_BG/LC_MESSAGES/statusnet.mo b/locale/bg_BG/LC_MESSAGES/statusnet.mo
new file mode 100644
index 000000000..8cfa1523d
--- /dev/null
+++ b/locale/bg_BG/LC_MESSAGES/statusnet.mo
diff --git a/locale/bg_BG/LC_MESSAGES/laconica.po b/locale/bg_BG/LC_MESSAGES/statusnet.po
index 3ad602175..c0bc8379f 100644
--- a/locale/bg_BG/LC_MESSAGES/laconica.po
+++ b/locale/bg_BG/LC_MESSAGES/statusnet.po
@@ -1,13 +1,13 @@
-# #-#-#-#-#  laconica.pot (Laconica 0.6.4)  #-#-#-#-#
-# Laconica Bulgarian translation.
+# #-#-#-#-#  statusnet.pot (StatusNet 0.6.4)  #-#-#-#-#
+# StatusNet Bulgarian translation.
 # Copyright (C) 2008
-# This file is distributed under the same license as the Laconica package.
+# This file is distributed under the same license as the StatusNet package.
 # Yasen Pramatarov <yasen@lindeas.com>, 2008
-# Stoyan Zhekov <laconica@zh.otherinbox.com>, 2008
+# Stoyan Zhekov <statusnet@zh.otherinbox.com>, 2008
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Laconica 0.6.4\n"
+"Project-Id-Version: StatusNet 0.6.4\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2009-01-25 16:24+0000\n"
 "PO-Revision-Date: 2009-06-27 18:04+0000\n"
@@ -276,8 +276,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
@@ -302,7 +302,7 @@ msgstr "Не е открит методът в API."
 #: 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."
@@ -1143,11 +1143,11 @@ msgstr "Покани за нови потребители"
 #: ../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 ""
-"Ползва [Laconica](http://laconi.ca/) версия %s, система за микроблогване, "
+"Ползва [StatusNet](http://status.net/) версия %s, система за микроблогване, "
 "достъпна под [GNU Affero General Public License](http://www.fsf.org/"
 "licensing/licenses/agpl-3.0.html)."
 
@@ -4537,8 +4537,8 @@ msgid "Secondary site navigation"
 msgstr "Абонаменти"
 
 #: lib/action.php:602 lib/action.php:623
-msgid "Laconica software license"
-msgstr "Лиценз на програмата Laconica"
+msgid "StatusNet software license"
+msgstr "Лиценз на програмата StatusNet"
 
 #: lib/action.php:630
 msgid "All "