From e797001be4cd982ed778bda16744ab4007eb31c8 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Wed, 5 Aug 2009 16:02:47 -0400
Subject: add livetweeter to notice source

---
 db/notice_source.sql | 1 +
 1 file changed, 1 insertion(+)

(limited to 'db/notice_source.sql')

diff --git a/db/notice_source.sql b/db/notice_source.sql
index 983ea9150..71fa89344 100644
--- a/db/notice_source.sql
+++ b/db/notice_source.sql
@@ -22,6 +22,7 @@ VALUES
     ('IdentiFox','IdentiFox','http://www.bitbucket.org/uncryptic/identifox/', now()),
     ('identitwitch','IdentiTwitch','http://richfish.org/identitwitch/', now()),
     ('LaTwit','LaTwit','http://latwit.mac65.com/', now()),
+    ('livetweeter', 'livetweeter', 'http://addons.songbirdnest.com/addon/1204', now()),
     ('maisha', 'Maisha', 'http://maisha.grango.org/', now()),
     ('mbpidgin','mbpidgin','http://code.google.com/p/microblog-purple/', now()),
     ('Mobidentica', 'Mobidentica', 'http://www.substanceofcode.com/software/mobidentica/', now()),
-- 
cgit v1.2.3-54-g00ecf


From 43e1c3d71f0366be96c4d7fe8d6b7d76c7f90498 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Thu, 6 Aug 2009 12:30:56 -0400
Subject: add qwit

---
 db/notice_source.sql | 1 +
 1 file changed, 1 insertion(+)

(limited to 'db/notice_source.sql')

diff --git a/db/notice_source.sql b/db/notice_source.sql
index 71fa89344..f1d52403b 100644
--- a/db/notice_source.sql
+++ b/db/notice_source.sql
@@ -35,6 +35,7 @@ VALUES
     ('pocketwit','PockeTwit','http://code.google.com/p/pocketwit/', now()),
     ('posty','Posty','http://spreadingfunkyness.com/posty/', now()),
     ('qtwitter','qTwitter','http://qtwitter.ayoy.net/', now()),
+    ('qwit', 'Qwit', 'http://code.google.com/p/qwit/', now()),
     ('royalewithcheese','Royale With Cheese','http://p.hellyeah.org/', now()),
     ('rssdent','rssdent','http://github.com/zcopley/rssdent/tree/master', now()),
     ('rygh.no','rygh.no','http://rygh.no/', now()),
-- 
cgit v1.2.3-54-g00ecf


From 406020df38642b59f59b42d59c617487386bd4d9 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Thu, 6 Aug 2009 12:35:35 -0400
Subject: add LiveTweeter (note caps)

---
 db/notice_source.sql | 1 +
 1 file changed, 1 insertion(+)

(limited to 'db/notice_source.sql')

diff --git a/db/notice_source.sql b/db/notice_source.sql
index f1d52403b..f590d1b97 100644
--- a/db/notice_source.sql
+++ b/db/notice_source.sql
@@ -22,6 +22,7 @@ VALUES
     ('IdentiFox','IdentiFox','http://www.bitbucket.org/uncryptic/identifox/', now()),
     ('identitwitch','IdentiTwitch','http://richfish.org/identitwitch/', now()),
     ('LaTwit','LaTwit','http://latwit.mac65.com/', now()),
+    ('LiveTweeter', 'LiveTweeter', 'http://addons.songbirdnest.com/addon/1204', now()),
     ('livetweeter', 'livetweeter', 'http://addons.songbirdnest.com/addon/1204', now()),
     ('maisha', 'Maisha', 'http://maisha.grango.org/', now()),
     ('mbpidgin','mbpidgin','http://code.google.com/p/microblog-purple/', now()),
-- 
cgit v1.2.3-54-g00ecf


From 3567b9d708971f9075db1fd847158c3c15a04e23 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Tue, 25 Aug 2009 18:53:24 -0400
Subject: global search and replace for laconica -> statusnet

---
 README                                |  42 +++++++++++++++++-----------------
 actions/api.php                       |  10 ++++----
 actions/twitapigroups.php             |   8 +++----
 actions/twitapisearchatom.php         |   2 +-
 actions/twitapistatusnet.php          |   8 +++----
 actions/twitapitags.php               |   4 ++--
 classes/Status_network.php            |   2 +-
 config.php.sample                     |  14 ++++++------
 db/notice_source.sql                  |   2 +-
 index.php                             |   2 +-
 install.php                           |   4 ++--
 js/identica-badge.js                  |  16 ++++++-------
 lib/action.php                        |   2 +-
 lib/common.php                        |  16 ++++++-------
 lib/facebookaction.php                |   4 ++--
 lib/router.php                        |  24 +++++++++----------
 lib/rssaction.php                     |   4 ++--
 lib/util.php                          |   8 +++----
 locale/bg_BG/LC_MESSAGES/statusnet.po |  10 ++++----
 locale/ca_ES/LC_MESSAGES/statusnet.po |   6 ++---
 locale/cs_CZ/LC_MESSAGES/statusnet.po |   6 ++---
 locale/de_DE/LC_MESSAGES/statusnet.po |   6 ++---
 locale/el_GR/LC_MESSAGES/statusnet.po |   6 ++---
 locale/en_GB/LC_MESSAGES/statusnet.po |   8 +++----
 locale/es/LC_MESSAGES/statusnet.po    |   6 ++---
 locale/fi/LC_MESSAGES/statusnet.po    |   6 ++---
 locale/fr_FR/LC_MESSAGES/statusnet.po |  28 +++++++++++------------
 locale/he_IL/LC_MESSAGES/statusnet.po |  10 ++++----
 locale/it_IT/LC_MESSAGES/statusnet.mo | Bin 80184 -> 80186 bytes
 locale/it_IT/LC_MESSAGES/statusnet.po |  16 ++++++-------
 locale/ja_JP/LC_MESSAGES/statusnet.po |  10 ++++----
 locale/ko_KR/LC_MESSAGES/statusnet.po |   6 ++---
 locale/mk_MK/LC_MESSAGES/statusnet.mo | Bin 37729 -> 37731 bytes
 locale/mk_MK/LC_MESSAGES/statusnet.po |  14 ++++++------
 locale/nb_NO/LC_MESSAGES/statusnet.po |   8 +++----
 locale/nl_NL/LC_MESSAGES/statusnet.po |   6 ++---
 locale/nn_NO/LC_MESSAGES/statusnet.po |   6 ++---
 locale/pl_PL/LC_MESSAGES/statusnet.po |  10 ++++----
 locale/pt/LC_MESSAGES/statusnet.po    |   6 ++---
 locale/pt_BR/LC_MESSAGES/statusnet.mo | Bin 76796 -> 76797 bytes
 locale/pt_BR/LC_MESSAGES/statusnet.po |   8 +++----
 locale/ru_RU/LC_MESSAGES/statusnet.po |   8 +++----
 locale/statusnet.po                   |   6 ++---
 locale/sv_SE/LC_MESSAGES/statusnet.po |   6 ++---
 locale/te_IN/LC_MESSAGES/statusnet.po |  10 ++++----
 locale/tr_TR/LC_MESSAGES/statusnet.po |   8 +++----
 locale/uk_UA/LC_MESSAGES/statusnet.po |   8 +++----
 locale/vi_VN/LC_MESSAGES/statusnet.mo | Bin 50649 -> 50650 bytes
 locale/vi_VN/LC_MESSAGES/statusnet.po |   8 +++----
 locale/zh_CN/LC_MESSAGES/statusnet.po |   6 ++---
 locale/zh_TW/LC_MESSAGES/statusnet.po |   6 ++---
 plugins/Autocomplete/Autocomplete.js  |   2 +-
 plugins/PiwikAnalyticsPlugin.php      |   4 ++--
 plugins/TemplatePlugin.php            |   4 ++--
 scripts/delete_status_network.sh      |   2 +-
 scripts/rebuilddb_psql.sh             |   4 ++--
 scripts/setup_status_network.sh       |   4 ++--
 scripts/statusnet.spec                |  28 +++++++++++------------
 scripts/twitterstatusfetcher.php      |   2 +-
 scripts/update_pot.sh                 |   2 +-
 scripts/update_translations.php       |  10 ++++----
 sphinx.conf.sample                    |   2 +-
 theme/readme.txt                      |   4 ++--
 63 files changed, 244 insertions(+), 244 deletions(-)

(limited to 'db/notice_source.sql')

diff --git a/README b/README
index 83f893daa..195d1b4ec 100644
--- a/README
+++ b/README
@@ -231,9 +231,9 @@ especially if you've previously installed PHP/MySQL packages.
 1. Unpack the tarball you downloaded on your Web server. Usually a
    command like this will work:
 
-   	   tar zxf laconica-0.8.0.tar.gz
+   	   tar zxf statusnet-0.8.0.tar.gz
 
-   ...which will make a laconica-0.8.0 subdirectory in your current
+   ...which will make a statusnet-0.8.0 subdirectory in your current
    directory. (If you don't have shell access on your Web server, you
    may have to unpack the tarball on your local computer and FTP the
    files to the server.)
@@ -241,11 +241,11 @@ especially if you've previously installed PHP/MySQL packages.
 2. Move the tarball to a directory of your choosing in your Web root
    directory. Usually something like this will work:
 
-   	   mv laconica-0.8.0 /var/www/mublog
+   	   mv statusnet-0.8.0 /var/www/mublog
 
    This will make your StatusNet instance available in the mublog path of
    your server, like "http://example.net/mublog". "microblog" or
-   "laconica" might also be good path names. If you know how to
+   "statusnet" might also be good path names. If you know how to
    configure virtual hosts on your web server, you can try setting up
    "http://micro.example.net/" or the like.
 
@@ -276,7 +276,7 @@ especially if you've previously installed PHP/MySQL packages.
 5. Create a database to hold your microblog data. Something like this
    should work:
 
-   	  mysqladmin -u "username" [REDACTED]create laconica
+   	  mysqladmin -u "username" [REDACTED]create statusnet
 
    Note that StatusNet must have its own database; you can't share the
    database with another program. You can name it whatever you want,
@@ -290,7 +290,7 @@ especially if you've previously installed PHP/MySQL packages.
    database. If you have shell access, this will probably work from the
    MySQL shell:
 
-          GRANT ALL on laconica.*
+          GRANT ALL on statusnet.*
 	  TO 'lacuser'@'localhost'
 	  IDENTIFIED BY 'lacpassword';
 
@@ -398,7 +398,7 @@ For this to work, there *must* be a domain or sub-domain for which all
 1. Run the SQL script carrier.sql in your StatusNet database. This will
    usually work:
 
-   	   mysql -u "lacuser" [REDACTED]laconica < db/carrier.sql
+   	   mysql -u "lacuser" [REDACTED]statusnet < db/carrier.sql
 
    This will populate your database with a list of wireless carriers
    that support email SMS gateways.
@@ -412,7 +412,7 @@ For this to work, there *must* be a domain or sub-domain for which all
 
 2. Edit /etc/aliases on your mail server and add the following line:
 
-      *: /path/to/laconica/scripts/maildaemon.php
+      *: /path/to/statusnet/scripts/maildaemon.php
 
 3. Run whatever code you need to to update your aliases database. For
    many mail servers (Postfix, Exim, Sendmail), this should work:
@@ -813,7 +813,7 @@ instructions; read to the end first before trying them.
     Otherwise, go to your StatusNet directory and AFTER YOU MAKE A
     BACKUP run the rebuilddb.sh script like this:
 
-    ./scripts/rebuilddb.sh rootuser rootpassword database db/laconica.sql
+    ./scripts/rebuilddb.sh rootuser rootpassword database db/statusnet.sql
 
     Here, rootuser and rootpassword are the username and password for a
     user who can drop and create databases as well as tables; typically
@@ -835,7 +835,7 @@ precooked data in the DB. All upgraders should check out the inboxes
 options below.
 
 NOTE: the database definition file, stoica.ini, has been renamed to
-laconica.ini (since this is the recommended database name). If you
+statusnet.ini (since this is the recommended database name). If you
 have a line in your config.php pointing to the old name, you'll need
 to update it.
 
@@ -907,12 +907,12 @@ of the defaults are defined), you will lose your configuration options
 in any upgrade, and you will wish that you had been more careful.
 
 Starting with version 0.7.1, you can put config files in the
-/etc/laconica/ directory on your server, if it exists. Config files
+/etc/statusnet/ directory on your server, if it exists. Config files
 will be included in this order:
 
-* /etc/laconica/laconica.php - server-wide config
-* /etc/laconica/<servername>.php - for a virtual host
-* /etc/laconica/<servername>_<pathname>.php - for a path
+* /etc/statusnet/laconica.php - server-wide config
+* /etc/statusnet/<servername>.php - for a virtual host
+* /etc/statusnet/<servername>_<pathname>.php - for a path
 * INSTALLDIR/config.php - for a particular implementation
 
 Almost all configuration options are made through a two-dimensional
@@ -1010,9 +1010,9 @@ database: a DSN (Data Source Name) for your StatusNet database. This is
 	  where 'protocol' is 'mysql' or 'mysqli' (or possibly 'postgresql', if you
 	  really know what you're doing), 'username' is the username,
 	  'password' is the password, and etc.
-ini_yourdbname: if your database is not named 'laconica', you'll need
+ini_yourdbname: if your database is not named 'statusnet', you'll need
 		to set this to point to the location of the
-		laconica.ini file. Note that the real name of your database
+		statusnet.ini file. Note that the real name of your database
 		should go in there, not literally 'yourdbname'.
 db_driver: You can try changing this to 'MDB2' to use the other driver
 	   type for DB_DataObject, but note that it breaks the OpenID
@@ -1044,7 +1044,7 @@ By default, StatusNet sites log error messages to the syslog facility.
 (You can override this using the 'logfile' parameter described above).
 
 appname: The name that StatusNet uses to log messages. By default it's
-	 "laconica", but if you have more than one installation on the
+	 "statusnet", but if you have more than one installation on the
 	 server, you may want to change the name for each instance so
 	 you can track log messages more easily.
 priority: level to log at. Currently ignored.
@@ -1296,7 +1296,7 @@ integration
 A catch-all for integration with other systems.
 
 source: The name to use for the source of posts to Twitter. Defaults
-	to 'laconica', but if you request your own source name from
+	to 'statusnet', but if you request your own source name from
 	Twitter <http://twitter.com/help/request_source>, you can use
 	that here instead. Status updates on Twitter will then have
 	links to your site.
@@ -1595,7 +1595,7 @@ If you're adventurous or impatient, you may want to install the
 development version of StatusNet. To get it, use the git version
 control tool <http://git-scm.com/> like so:
 
-	git clone http://status.net/software/laconica.git
+	git clone http://status.net/software/statusnet.git
 
 To keep it up-to-date, use 'git pull'. Watch for conflicts!
 
@@ -1605,8 +1605,8 @@ Further information
 There are several ways to get more information about StatusNet.
 
 * There is a mailing list for StatusNet developers and admins at
-  http://mail.status.net/mailman/listinfo/laconica-dev
-* The #laconica IRC channel on freenode.net <http://www.freenode.net/>.
+  http://mail.status.net/mailman/listinfo/statusnet-dev
+* The #statusnet IRC channel on freenode.net <http://www.freenode.net/>.
 * The StatusNet wiki, http://status.net/trac/
 
 Feedback
diff --git a/actions/api.php b/actions/api.php
index 897e848c1..91f30e87a 100644
--- a/actions/api.php
+++ b/actions/api.php
@@ -125,9 +125,9 @@ class ApiAction extends Action
                                 'users/show',
                                 'help/test',
                                 'help/downtime_schedule',
-                                'laconica/version',
-                                'laconica/config',
-                                'laconica/wadl',
+                                'statusnet/version',
+                                'statusnet/config',
+                                'statusnet/wadl',
                                 'tags/timeline',
                                 'oembed/oembed',
                                 'groups/show',
@@ -147,11 +147,11 @@ class ApiAction extends Action
 
         $fullname = "$this->api_action/$this->api_method";
 
-        // If the site is "private", all API methods except laconica/config
+        // If the site is "private", all API methods except statusnet/config
         // need authentication
 
         if (common_config('site', 'private')) {
-            return $fullname != 'laconica/config' || false;
+            return $fullname != 'statusnet/config' || false;
         }
 
         // bareauth: only needs auth if without an argument or query param specifying user
diff --git a/actions/twitapigroups.php b/actions/twitapigroups.php
index 4d2388919..c3e028c17 100644
--- a/actions/twitapigroups.php
+++ b/actions/twitapigroups.php
@@ -88,7 +88,7 @@ require_once INSTALLDIR.'/lib/twitterapi.php';
              $this->show_rss_groups($group, $title, $link, $subtitle);
              break;
          case 'atom':
-             $selfuri = common_root_url() . 'api/laconica/groups/list/' . $user->id . '.atom';
+             $selfuri = common_root_url() . 'api/statusnet/groups/list/' . $user->id . '.atom';
              $this->show_atom_groups($group, $title, $id, $link,
                  $subtitle, $selfuri);
              break;
@@ -135,7 +135,7 @@ require_once INSTALLDIR.'/lib/twitterapi.php';
              $this->show_rss_groups($group, $title, $link, $subtitle);
              break;
          case 'atom':
-             $selfuri = common_root_url() . 'api/laconica/groups/list_all.atom';
+             $selfuri = common_root_url() . 'api/statusnet/groups/list_all.atom';
              $this->show_atom_groups($group, $title, $id, $link,
                  $subtitle, $selfuri);
              break;
@@ -216,11 +216,11 @@ require_once INSTALLDIR.'/lib/twitterapi.php';
           case 'atom':
              if (isset($apidata['api_arg'])) {
                  $selfuri = common_root_url() .
-                     'api/laconica/groups/timeline/' .
+                     'api/statusnet/groups/timeline/' .
                          $apidata['api_arg'] . '.atom';
              } else {
                  $selfuri = common_root_url() .
-                  'api/laconica/groups/timeline.atom';
+                  'api/statusnet/groups/timeline.atom';
              }
              $this->show_atom_timeline($notice, $title, $id, $link,
                  $subtitle, null, $selfuri);
diff --git a/actions/twitapisearchatom.php b/actions/twitapisearchatom.php
index d3e17650d..3ccd8c5b6 100644
--- a/actions/twitapisearchatom.php
+++ b/actions/twitapisearchatom.php
@@ -227,7 +227,7 @@ class TwitapisearchatomAction extends TwitterapiAction
         $server   = common_config('site', 'server');
         $sitename = common_config('site', 'name');
 
-        // XXX: Use xmlns:laconica instead?
+        // XXX: Use xmlns:statusnet instead?
 
         $this->elementStart('feed',
             array('xmlns' => 'http://www.w3.org/2005/Atom',
diff --git a/actions/twitapistatusnet.php b/actions/twitapistatusnet.php
index a36c162d9..c75e5e858 100644
--- a/actions/twitapistatusnet.php
+++ b/actions/twitapistatusnet.php
@@ -36,7 +36,7 @@ require_once INSTALLDIR.'/lib/twitterapi.php';
 /**
  * StatusNet-specific API methods
  *
- * This class handles all /laconica/ API methods.
+ * This class handles all /statusnet/ API methods.
  *
  * @category  Twitter
  * @package   StatusNet
@@ -46,14 +46,14 @@ require_once INSTALLDIR.'/lib/twitterapi.php';
  * @link      http://status.net/
  */
 
-class TwitapilaconicaAction extends TwitterapiAction
+class TwitapistatusnetAction extends TwitterapiAction
 {
     /**
      * A version stamp for the API
      *
      * Returns a version number for this version of StatusNet, which
      * should make things a bit easier for upgrades.
-     * URL: http://identi.ca/api/laconica/version.(xml|json)
+     * URL: http://identi.ca/api/statusnet/version.(xml|json)
      * Formats: xml, json
      *
      * @param array $args    Web arguments
@@ -89,7 +89,7 @@ class TwitapilaconicaAction extends TwitterapiAction
      * Gives a full dump of configuration variables for this instance
      * of StatusNet, minus variables that may be security-sensitive (like
      * passwords).
-     * URL: http://identi.ca/api/laconica/config.(xml|json)
+     * URL: http://identi.ca/api/statusnet/config.(xml|json)
      * Formats: xml, json
      *
      * @param array $args    Web arguments
diff --git a/actions/twitapitags.php b/actions/twitapitags.php
index f889ae8c0..0f2b571c6 100644
--- a/actions/twitapitags.php
+++ b/actions/twitapitags.php
@@ -93,11 +93,11 @@ require_once INSTALLDIR.'/lib/twitterapi.php';
           case 'atom':
              if (isset($apidata['api_arg'])) {
                  $selfuri = common_root_url() .
-                     'api/laconica/tags/timeline/' .
+                     'api/statusnet/tags/timeline/' .
                          $apidata['api_arg'] . '.atom';
              } else {
                  $selfuri = common_root_url() .
-                  'api/laconica/tags/timeline.atom';
+                  'api/statusnet/tags/timeline.atom';
              }
              $this->show_atom_timeline($notice, $title, $id, $link,
                  $subtitle, null, $selfuri);
diff --git a/classes/Status_network.php b/classes/Status_network.php
index 78c1640cd..e91bba1ac 100644
--- a/classes/Status_network.php
+++ b/classes/Status_network.php
@@ -71,7 +71,7 @@ class Status_network extends DB_DataObject
     }
 
     static function cacheKey($k, $v) {
-        return 'laconica:' . self::$base . ':status_network:'.$k.':'.$v;
+        return 'statusnet:' . self::$base . ':status_network:'.$k.':'.$v;
     }
 
     static function memGet($k, $v)
diff --git a/config.php.sample b/config.php.sample
index 0fc5163b7..e73489990 100644
--- a/config.php.sample
+++ b/config.php.sample
@@ -15,7 +15,7 @@ if (!defined('LACONICA')) { exit(1); }
 
 $config['site']['name'] = 'Just another Laconica microblog';
 $config['site']['server'] = 'localhost';
-$config['site']['path'] = 'laconica';
+$config['site']['path'] = 'statusnet';
 // $config['site']['fancy'] = false;
 // $config['site']['theme'] = 'default';
 // Sets the site's default design values
@@ -44,7 +44,7 @@ $config['site']['path'] = 'laconica';
 // $config['site']['private'] = true;
 
 // If you want logging sent to a file instead of syslog
-// $config['site']['logfile'] = '/tmp/laconica.log';
+// $config['site']['logfile'] = '/tmp/statusnet.log';
 
 // Change the syslog facility that Laconica logs to (default is LOG_USER)
 // $config['syslog']['facility'] = LOG_LOCAL7;
@@ -58,8 +58,8 @@ $config['site']['path'] = 'laconica';
 // This is a PEAR DB DSN, see http://pear.php.net/manual/en/package.database.db.intro-dsn.php
 // Set it to match your actual database
 
-$config['db']['database'] = '[REDACTED]/laconica';
-// $config['db']['ini_your_db_name'] = $config['db']['schema_location'].'/laconica.ini';
+$config['db']['database'] = '[REDACTED]/laconica';
+// $config['db']['ini_your_db_name'] = $config['db']['schema_location'].'/statusnet.ini';
 // *** WARNING *** WARNING *** WARNING *** WARNING ***
 // Setting debug to a non-zero value will expose your DATABASE PASSWORD to Web users.
 // !!!!!! DO NOT SET THIS ON PRODUCTION SERVERS !!!!!! DB_DataObject's bug, btw, not
@@ -154,15 +154,15 @@ $config['sphinx']['port'] = 3312;
 // using stomp requires an external message queue server
 // $config['queue']['subsystem'] = 'stomp';
 // $config['queue']['stomp_server'] = 'tcp://localhost:61613';
-// use different queue_basename for each laconica instance managed by the server
-// $config['queue']['queue_basename'] = 'laconica';
+// use different queue_basename for each statusnet instance managed by the server
+// $config['queue']['queue_basename'] = 'statusnet';
 
 // The following customise the behaviour of the various daemons:
 // $config['daemon']['piddir'] = '/var/run';
 // $config['daemon']['user'] = false;
 // $config['daemon']['group'] = false;
 
-// For installations with high traffic, laconica can use MemCached to cache
+// For installations with high traffic, statusnet can use MemCached to cache
 // frequently requested information. Only enable the following if you have
 // MemCached up and running:
 // $config['memcached']['enabled'] = false;
diff --git a/db/notice_source.sql b/db/notice_source.sql
index f590d1b97..8d114ac30 100644
--- a/db/notice_source.sql
+++ b/db/notice_source.sql
@@ -17,7 +17,7 @@ VALUES
     ('gravity', 'Gravity', 'http://mobileways.de/gravity', now()),
     ('Gwibber','Gwibber','http://launchpad.net/gwibber', now()),
     ('HelloTxt','HelloTxt','http://hellotxt.com/', now()),
-    ('identicatools','Laconica Tools','http://bitbucketlabs.net/laconica-tools/', now()),
+    ('identicatools','Laconica Tools','http://bitbucketlabs.net/statusnet-tools/', now()),
     ('identichat','identichat','http://identichat.prosody.im/', now()),
     ('IdentiFox','IdentiFox','http://www.bitbucket.org/uncryptic/identifox/', now()),
     ('identitwitch','IdentiTwitch','http://richfish.org/identitwitch/', now()),
diff --git a/index.php b/index.php
index 56e76be9f..bbb78b6a9 100644
--- a/index.php
+++ b/index.php
@@ -93,7 +93,7 @@ function checkMirror($action_obj, $args)
         // on the master DB
 
         $config['db']['database_rw'] = $config['db']['database'];
-        $config['db']['ini_rw'] = INSTALLDIR.'/classes/laconica.ini';
+        $config['db']['ini_rw'] = INSTALLDIR.'/classes/statusnet.ini';
 
         foreach ($alwaysRW as $table) {
             $config['db']['table_'.$table] = 'rw';
diff --git a/install.php b/install.php
index f9056727b..9e01ff738 100644
--- a/install.php
+++ b/install.php
@@ -284,7 +284,7 @@ function pgsql_db_installer($host, $database, $username, $password) {
   updateStatus("Running database script...");
   //wrap in transaction;
   pg_query($conn, 'BEGIN');
-  $res = runDbScript(INSTALLDIR.'/db/laconica_pg.sql', $conn, 'pgsql');
+  $res = runDbScript(INSTALLDIR.'/db/statusnet_pg.sql', $conn, 'pgsql');
   
   if ($res === false) {
       updateStatus("Can't run database script.", true);
@@ -335,7 +335,7 @@ function mysql_db_installer($host, $database, $username, $password) {
       return false;
   }
   updateStatus("Running database script...");
-  $res = runDbScript(INSTALLDIR.'/db/laconica.sql', $conn);
+  $res = runDbScript(INSTALLDIR.'/db/statusnet.sql', $conn);
   if ($res === false) {
       updateStatus("Can't run database script.", true);
       showForm();
diff --git a/js/identica-badge.js b/js/identica-badge.js
index ffa55ae93..49c42b70c 100644
--- a/js/identica-badge.js
+++ b/js/identica-badge.js
@@ -119,7 +119,7 @@
             $.s.className = trueName;         
             $.s.h = document.createElement('H3');
             $.s.h.a = document.createElement('A');
-            $.s.h.a.target = '_laconica';
+            $.s.h.a.target = '_statusnet';
             $.s.h.appendChild($.s.h.a);
             $.s.appendChild($.s.h);
             $.s.r = document.createElement('UL');
@@ -184,11 +184,11 @@
                var icon = document.createElement('A');
                if (r[i] && r[i].url) {
                   icon.href = r[i].url;
-                  icon.target = '_laconica'; 
+                  icon.target = '_statusnet'; 
                   icon.title = 'Visit ' + r[i].screen_name + ' at ' + r[i].url;
                } else {
                   icon.href = 'http://' + $.a.server + '/' + r[i].screen_name;
-                  icon.target = '_laconica'; 
+                  icon.target = '_statusnet'; 
                   icon.title = 'Visit ' + r[i].screen_name + ' at http://' + $.a.server + '/' + r[i].screen_name;
                }
 
@@ -215,14 +215,14 @@
                   var date_link = document.createElement('A');
                   date_link.innerHTML = r[i].status.created_at.split(/\+/)[0];
                   date_link.href = 'http://' + $.a.server + '/notice/' + r[i].status.id;
-                  date_link.target = '_laconica';
+                  date_link.target = '_statusnet';
                   updated.appendChild(date_link);
                   if (r[i].status.in_reply_to_status_id) {
                      updated.appendChild(document.createTextNode(' in reply to '));
                      var in_reply_to = document.createElement('A');
                      in_reply_to.innerHTML = r[i].status.in_reply_to_status_id;
                      in_reply_to.href = 'http://' + $.a.server + '/notice/' + r[i].status.in_reply_to_status_id;
-                     in_reply_to.target = '_laconica';
+                     in_reply_to.target = '_statusnet';
                      updated.appendChild(in_reply_to);
                   }
                } else {
@@ -233,9 +233,9 @@
                if (r[i].status && r[i].status.text) {
                   var raw = r[i].status.text;
                   var cooked = raw;
-                  cooked = cooked.replace(/http:\/\/([^ ]+)/g, "<a href=\"http://$1\" target=\"_laconica\">http://$1</a>");
-                  cooked = cooked.replace(/@([\w*]+)/g, '@<a href="http://' + $.a.server + '/$1" target=\"_laconica\">$1</a>');
-                  cooked = cooked.replace(/#([\w*]+)/g, '#<a href="http://' + $.a.server + '/tag/$1" target="_laconica">$1</a>');
+                  cooked = cooked.replace(/http:\/\/([^ ]+)/g, "<a href=\"http://$1\" target=\"_statusnet\">http://$1</a>");
+                  cooked = cooked.replace(/@([\w*]+)/g, '@<a href="http://' + $.a.server + '/$1" target=\"_statusnet\">$1</a>');
+                  cooked = cooked.replace(/#([\w*]+)/g, '#<a href="http://' + $.a.server + '/tag/$1" target="_statusnet">$1</a>');
                   p.innerHTML = cooked;
                }
                li.appendChild(p);
diff --git a/lib/action.php b/lib/action.php
index dd9d87a6c..a99c885dd 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -754,7 +754,7 @@ class Action extends HTMLOutputter // lawsuit
      */
     function showStatusNetLicense()
     {
-        $this->element('dt', array('id' => 'site_laconica_license'), _('StatusNet software license'));
+        $this->element('dt', array('id' => 'site_statusnet_license'), _('StatusNet software license'));
         $this->elementStart('dd', null);
         if (common_config('site', 'broughtby')) {
             $instr = _('**%%site.name%%** is a microblogging service brought to you by [%%site.broughtby%%](%%site.broughtbyurl%%). ');
diff --git a/lib/common.php b/lib/common.php
index f8cf93717..c3e83789f 100644
--- a/lib/common.php
+++ b/lib/common.php
@@ -119,14 +119,14 @@ $config =
               'shorturllength' => 30,
               'dupelimit' => 60), # default for same person saying the same thing
         'syslog' =>
-        array('appname' => 'laconica', # for syslog
+        array('appname' => 'statusnet', # for syslog
               'priority' => 'debug', # XXX: currently ignored
               'facility' => LOG_USER),
         'queue' =>
         array('enabled' => false,
               'subsystem' => 'db', # default to database, or 'stomp'
               'stomp_server' => null,
-              'queue_basename' => 'laconica',
+              'queue_basename' => 'statusnet',
               'stomp_username' => null,
               'stomp_password' => null,
               ),
@@ -341,11 +341,11 @@ function addPlugin($name, $attrs = null)
 if (isset($conffile)) {
     $_config_files = array($conffile);
 } else {
-    $_config_files = array('/etc/laconica/laconica.php',
-                           '/etc/laconica/'.$_server.'.php');
+    $_config_files = array('/etc/statusnet/laconica.php',
+                           '/etc/statusnet/'.$_server.'.php');
 
     if (strlen($_path) > 0) {
-        $_config_files[] = '/etc/laconica/'.$_server.'_'.$_path.'.php';
+        $_config_files[] = '/etc/statusnet/'.$_server.'_'.$_path.'.php';
     }
 
     $_config_files[] = INSTALLDIR.'/config.php';
@@ -368,12 +368,12 @@ function _have_config()
 
 // XXX: Throw a conniption if database not installed
 
-// Fixup for laconica.ini
+// Fixup for statusnet.ini
 
 $_db_name = substr($config['db']['database'], strrpos($config['db']['database'], '/') + 1);
 
-if ($_db_name != 'laconica' && !array_key_exists('ini_'.$_db_name, $config['db'])) {
-    $config['db']['ini_'.$_db_name] = INSTALLDIR.'/classes/laconica.ini';
+if ($_db_name != 'statusnet' && !array_key_exists('ini_'.$_db_name, $config['db'])) {
+    $config['db']['ini_'.$_db_name] = INSTALLDIR.'/classes/statusnet.ini';
 }
 
 // Ignore openidonly if OpenID is disabled
diff --git a/lib/facebookaction.php b/lib/facebookaction.php
index e7c78f070..62797d1dd 100644
--- a/lib/facebookaction.php
+++ b/lib/facebookaction.php
@@ -373,7 +373,7 @@ class FacebookAction extends Action
          display:inline-block;
          }
 
-     #facebook_laconica_app {
+     #facebook_statusnet_app {
      text-indent:-9999px;
      height:16px;
      width:16px;
@@ -672,7 +672,7 @@ class FacebookProfileBoxNotice extends FacebookNoticeListItem
         $this->app_uri = 'http://apps.facebook.com/' . $app_props['canvas_name'];
         $this->app_name = $app_props['application_name'];
 
-        $this->out->elementStart('a', array('id' => 'facebook_laconica_app',
+        $this->out->elementStart('a', array('id' => 'facebook_statusnet_app',
                                             'href' => $this->app_uri));
         $this->out->text($this->app_name);
         $this->out->elementEnd('a');
diff --git a/lib/router.php b/lib/router.php
index e91b2c537..b7b4a8e59 100644
--- a/lib/router.php
+++ b/lib/router.php
@@ -395,30 +395,30 @@ class Router
                     array('action' => 'api',
                           'apiaction' => 'help'));
 
-        // laconica
+        // statusnet
 
-        $m->connect('api/laconica/:method',
+        $m->connect('api/statusnet/:method',
                     array('action' => 'api',
-                          'apiaction' => 'laconica'));
+                          'apiaction' => 'statusnet'));
 
-        $m->connect('api/laconica/:method',
+        $m->connect('api/statusnet/:method',
                     array('action' => 'api',
-                          'apiaction' => 'laconica'));
+                          'apiaction' => 'statusnet'));
 
         // Groups
         //'list' has to be handled differently, as php will not allow a method to be named 'list'
-        $m->connect('api/laconica/groups/list/:argument',
+        $m->connect('api/statusnet/groups/list/:argument',
                     array('action' => 'api',
                           'method' => 'list_groups',
                           'apiaction' => 'groups'));
         foreach (array('xml', 'json', 'rss', 'atom') as $e) {
-            $m->connect('api/laconica/groups/list.' . $e,
+            $m->connect('api/statusnet/groups/list.' . $e,
                     array('action' => 'api',
                           'method' => 'list_groups.' . $e,
                           'apiaction' => 'groups'));
         }
 
-        $m->connect('api/laconica/groups/:method',
+        $m->connect('api/statusnet/groups/:method',
                     array('action' => 'api',
                           'apiaction' => 'statuses'),
                     array('method' => '(list_all|)(\.(atom|rss|xml|json))?'));
@@ -428,20 +428,20 @@ class Router
                           'apiaction' => 'statuses'),
                     array('method' => '(|user_timeline|friends_timeline|replies|mentions|show|destroy|friends|followers)'));
 
-        $m->connect('api/laconica/groups/:method/:argument',
+        $m->connect('api/statusnet/groups/:method/:argument',
                     array('action' => 'api',
                           'apiaction' => 'groups'));
 
-        $m->connect('api/laconica/groups/:method',
+        $m->connect('api/statusnet/groups/:method',
                     array('action' => 'api',
                           'apiaction' => 'groups'));
 
         // Tags
-        $m->connect('api/laconica/tags/:method/:argument',
+        $m->connect('api/statusnet/tags/:method/:argument',
                     array('action' => 'api',
                           'apiaction' => 'tags'));
 
-        $m->connect('api/laconica/tags/:method',
+        $m->connect('api/statusnet/tags/:method',
                     array('action' => 'api',
                           'apiaction' => 'tags'));
 
diff --git a/lib/rssaction.php b/lib/rssaction.php
index 878309dce..44c9003a0 100644
--- a/lib/rssaction.php
+++ b/lib/rssaction.php
@@ -244,7 +244,7 @@ class Rss10Action extends Action
         $this->element('dc:creator', null, ($profile->fullname) ? $profile->fullname : $profile->nickname);
         $this->element('foaf:maker', array('rdf:resource' => $creator_uri));
         $this->element('sioc:has_creator', array('rdf:resource' => $creator_uri.'#acct'));
-        $this->element('laconica:postIcon', array('rdf:resource' => $profile->avatarUrl()));
+        $this->element('statusnet:postIcon', array('rdf:resource' => $profile->avatarUrl()));
         $this->element('cc:licence', array('rdf:resource' => common_config('license', 'url')));
         if ($notice->reply_to) {
             $replyurl = common_local_url('shownotice', array('notice' => $notice->reply_to));
@@ -353,7 +353,7 @@ class Rss10Action extends Action
                                               'http://rdfs.org/sioc/types#',
                                               'xmlns:rdfs' =>
                                               'http://www.w3.org/2000/01/rdf-schema#',
-                                              'xmlns:laconica' =>
+                                              'xmlns:statusnet' =>
                                               'http://status.net/ont/',
                                               'xmlns' => 'http://purl.org/rss/1.0/'));
         $this->elementStart('sioc:Site', array('rdf:about' => common_root_url()));
diff --git a/lib/util.php b/lib/util.php
index dbd0e0a0f..4ad5c48f5 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -54,9 +54,9 @@ function common_init_language()
     $language = common_language();
     // So we don't have to make people install the gettext locales
     $locale_set = common_init_locale($language);
-    bindtextdomain("laconica", common_config('site','locale_path'));
-    bind_textdomain_codeset("laconica", "UTF-8");
-    textdomain("laconica");
+    bindtextdomain("statusnet", common_config('site','locale_path'));
+    bind_textdomain_codeset("statusnet", "UTF-8");
+    textdomain("statusnet");
     setlocale(LC_CTYPE, 'C');
     if(!$locale_set) {
         common_log(LOG_INFO,'Language requested:'.$language.' - locale could not be set:',__FILE__);
@@ -1319,7 +1319,7 @@ function common_cache_key($extra)
         $base_key = common_keyize(common_config('site', 'name'));
     }
 
-    return 'laconica:' . $base_key . ':' . $extra;
+    return 'statusnet:' . $base_key . ':' . $extra;
 }
 
 function common_keyize($str)
diff --git a/locale/bg_BG/LC_MESSAGES/statusnet.po b/locale/bg_BG/LC_MESSAGES/statusnet.po
index 2c359f0e8..c0bc8379f 100644
--- a/locale/bg_BG/LC_MESSAGES/statusnet.po
+++ b/locale/bg_BG/LC_MESSAGES/statusnet.po
@@ -1,9 +1,9 @@
-# #-#-#-#-#  laconica.pot (StatusNet 0.6.4)  #-#-#-#-#
+# #-#-#-#-#  statusnet.pot (StatusNet 0.6.4)  #-#-#-#-#
 # StatusNet Bulgarian translation.
 # Copyright (C) 2008
 # 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 ""
@@ -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."
diff --git a/locale/ca_ES/LC_MESSAGES/statusnet.po b/locale/ca_ES/LC_MESSAGES/statusnet.po
index 65ea42c8d..44944c8ba 100644
--- a/locale/ca_ES/LC_MESSAGES/statusnet.po
+++ b/locale/ca_ES/LC_MESSAGES/statusnet.po
@@ -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 "No s'ha trobat el mètode 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."
diff --git a/locale/cs_CZ/LC_MESSAGES/statusnet.po b/locale/cs_CZ/LC_MESSAGES/statusnet.po
index e2c40ae12..aee74f1af 100644
--- a/locale/cs_CZ/LC_MESSAGES/statusnet.po
+++ b/locale/cs_CZ/LC_MESSAGES/statusnet.po
@@ -241,8 +241,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
@@ -267,7 +267,7 @@ msgstr ""
 #: 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."
diff --git a/locale/de_DE/LC_MESSAGES/statusnet.po b/locale/de_DE/LC_MESSAGES/statusnet.po
index 4124224d7..ed0252879 100644
--- a/locale/de_DE/LC_MESSAGES/statusnet.po
+++ b/locale/de_DE/LC_MESSAGES/statusnet.po
@@ -277,8 +277,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
@@ -303,7 +303,7 @@ msgstr "API-Methode nicht gefunden!"
 #: 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."
diff --git a/locale/el_GR/LC_MESSAGES/statusnet.po b/locale/el_GR/LC_MESSAGES/statusnet.po
index f3fe65499..314dd358c 100644
--- a/locale/el_GR/LC_MESSAGES/statusnet.po
+++ b/locale/el_GR/LC_MESSAGES/statusnet.po
@@ -228,8 +228,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
@@ -254,7 +254,7 @@ msgstr ""
 #: 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."
diff --git a/locale/en_GB/LC_MESSAGES/statusnet.po b/locale/en_GB/LC_MESSAGES/statusnet.po
index 3810a904e..a105d2b86 100644
--- a/locale/en_GB/LC_MESSAGES/statusnet.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."
diff --git a/locale/es/LC_MESSAGES/statusnet.po b/locale/es/LC_MESSAGES/statusnet.po
index 6fd5060ac..c0e69e3a7 100644
--- a/locale/es/LC_MESSAGES/statusnet.po
+++ b/locale/es/LC_MESSAGES/statusnet.po
@@ -279,8 +279,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
@@ -305,7 +305,7 @@ msgstr "¡No se encontró el método de la 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."
diff --git a/locale/fi/LC_MESSAGES/statusnet.po b/locale/fi/LC_MESSAGES/statusnet.po
index 0d3f0a511..5a53dd2df 100644
--- a/locale/fi/LC_MESSAGES/statusnet.po
+++ b/locale/fi/LC_MESSAGES/statusnet.po
@@ -281,8 +281,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
@@ -307,7 +307,7 @@ msgstr "API-metodia ei löytynyt!"
 #: 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."
diff --git a/locale/fr_FR/LC_MESSAGES/statusnet.po b/locale/fr_FR/LC_MESSAGES/statusnet.po
index 1a4426180..23365960b 100644
--- a/locale/fr_FR/LC_MESSAGES/statusnet.po
+++ b/locale/fr_FR/LC_MESSAGES/statusnet.po
@@ -1,12 +1,12 @@
-# #-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#
+# #-#-#-#-#  statusnet-no-duplicates.po (0.43)  #-#-#-#-#
 # French translations for StatusNet package
 # Traductions françaises du paquet StatusNet.
 # Copyright (C) 2008 THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the StatusNet package.
 # Florian Birée <florian@biree.name>, 2008.
 # For translation choices and other informations, please read
-# <http://dev.filyb.info/laconica/wiki/french-translation>
-# #-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#
+# <http://dev.filyb.info/statusnet/wiki/french-translation>
+# #-#-#-#-#  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.
@@ -326,8 +326,8 @@ msgstr ""
 #: actions/twitapifavorites.php:102
 #: actions/twitapifriendships.php:121
 #: actions/twitapihelp.php:44
-#: actions/twitapilaconica.php:82
-#: actions/twitapilaconica.php:151
+#: actions/twitapistatusnet.php:82
+#: actions/twitapistatusnet.php:151
 #: actions/twitapistatuses.php:79
 #: actions/twitapistatuses.php:147
 #: actions/twitapistatuses.php:228
@@ -372,7 +372,7 @@ msgstr "Méthode API non trouvée !"
 #: actions/twitapidirect_messages.php:184
 #: actions/twitapifavorites.php:143
 #: actions/twitapihelp.php:52
-#: actions/twitapilaconica.php:172
+#: actions/twitapistatusnet.php:172
 #: actions/twitapinotifications.php:31
 #: actions/twitapinotifications.php:37
 #: actions/twitapistatuses.php:562
@@ -958,9 +958,9 @@ msgstr "Erreur de base de donnée en insérant le hashtag : %s"
 msgid "DB error inserting reply: %s"
 msgstr "Erreur de base de donnée en insérant la réponse :%s"
 
-# De #-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n
+# De #-#-#-#-#  statusnet-no-duplicates.po (0.43)  #-#-#-#-#\n
 # Nouveau message\n
-# #-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n
+# #-#-#-#-#  statusnet.new.pot (PACKAGE VERSION)  #-#-#-#-#\n
 # à "Supprimer l'avis"
 #: ../actions/deletenotice.php:41
 #: actions/deletenotice.php:41
@@ -5742,9 +5742,9 @@ msgstr "%1$s a ajouté votre statut depuis %2$s"
 msgid "From"
 msgstr "De"
 
-# De #-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n
+# De #-#-#-#-#  statusnet-no-duplicates.po (0.43)  #-#-#-#-#\n
 # Nouveau message\n
-# #-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n
+# #-#-#-#-#  statusnet.new.pot (PACKAGE VERSION)  #-#-#-#-#\n
 # à "Supprimer l'avis"
 #: lib/messageform.php:110
 msgid "Send a direct notice"
@@ -5771,18 +5771,18 @@ msgstr "Répondre à ce statut"
 msgid "Reply"
 msgstr "Répondre"
 
-# De #-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n
+# De #-#-#-#-#  statusnet-no-duplicates.po (0.43)  #-#-#-#-#\n
 # Nouveau message\n
-# #-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n
+# #-#-#-#-#  statusnet.new.pot (PACKAGE VERSION)  #-#-#-#-#\n
 # à "Supprimer l'avis"
 #: lib/noticelist.php:471
 #: lib/noticelist.php:474
 msgid "Delete this notice"
 msgstr "Supprimer ce statut"
 
-# De #-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n
+# De #-#-#-#-#  statusnet-no-duplicates.po (0.43)  #-#-#-#-#\n
 # Nouveau message\n
-# #-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n
+# #-#-#-#-#  statusnet.new.pot (PACKAGE VERSION)  #-#-#-#-#\n
 # à "Supprimer l'avis"
 #: lib/noticelist.php:474
 msgid "Delete"
diff --git a/locale/he_IL/LC_MESSAGES/statusnet.po b/locale/he_IL/LC_MESSAGES/statusnet.po
index 4644540ca..8d43dfeaa 100644
--- a/locale/he_IL/LC_MESSAGES/statusnet.po
+++ b/locale/he_IL/LC_MESSAGES/statusnet.po
@@ -1,4 +1,4 @@
-# #-#-#-#-#  laconica.pot (PACKAGE VERSION)  #-#-#-#-#
+# #-#-#-#-#  statusnet.pot (PACKAGE VERSION)  #-#-#-#-#
 # Hebrew translation for StatusNet
 # תרגום לעברית של לאקוניה
 # Copyright (C) 2008 COPYRIGHT HOLDER
@@ -7,7 +7,7 @@
 # קובץ זה מופץ תחת רשיון זהה לזה של החבילה לאקוניקה
 # Hezy Amiel חזי עמיאל <open@hezyamiel.com>, 2008.
 #
-# #-#-#-#-#  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.
@@ -247,8 +247,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
@@ -273,7 +273,7 @@ msgstr ""
 #: 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."
diff --git a/locale/it_IT/LC_MESSAGES/statusnet.mo b/locale/it_IT/LC_MESSAGES/statusnet.mo
index 87c242f03..95764f1e2 100644
Binary files a/locale/it_IT/LC_MESSAGES/statusnet.mo and b/locale/it_IT/LC_MESSAGES/statusnet.mo differ
diff --git a/locale/it_IT/LC_MESSAGES/statusnet.po b/locale/it_IT/LC_MESSAGES/statusnet.po
index f67f870a5..1a59adf85 100644
--- a/locale/it_IT/LC_MESSAGES/statusnet.po
+++ b/locale/it_IT/LC_MESSAGES/statusnet.po
@@ -1,12 +1,12 @@
-# Italian translation of laconica
-# Copyright (C) 2008 THE laconica'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the laconica package.
+# Italian translation of statusnet
+# Copyright (C) 2008 THE statusnet'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the statusnet package.
 # Milo Casagrande <milo@ubuntu.com>, 2008
 #
 #
 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-06-04 14:09+0000\n"
@@ -286,8 +286,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
@@ -312,7 +312,7 @@ msgstr "Metodo delle API non trovato!"
 #: 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."
@@ -4583,7 +4583,7 @@ msgstr "Esplorazione secondaria del sito"
 
 #: lib/action.php:602 lib/action.php:623
 msgid "StatusNet software license"
-msgstr "Licenza del software laconica"
+msgstr "Licenza del software statusnet"
 
 #: lib/action.php:630
 msgid "All "
diff --git a/locale/ja_JP/LC_MESSAGES/statusnet.po b/locale/ja_JP/LC_MESSAGES/statusnet.po
index 37fde0ecb..bb7d777ba 100644
--- a/locale/ja_JP/LC_MESSAGES/statusnet.po
+++ b/locale/ja_JP/LC_MESSAGES/statusnet.po
@@ -1,10 +1,10 @@
-# #-#-#-#-#  laconica.pot (PACKAGE VERSION)  #-#-#-#-#
+# #-#-#-#-#  statusnet.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.
 # Toshiya TSURU <turutosiya@gmail.com>, 2008
 #
-# #-#-#-#-#  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.
@@ -245,8 +245,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
@@ -271,7 +271,7 @@ msgstr ""
 #: 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."
diff --git a/locale/ko_KR/LC_MESSAGES/statusnet.po b/locale/ko_KR/LC_MESSAGES/statusnet.po
index df9981992..dd7edc510 100644
--- a/locale/ko_KR/LC_MESSAGES/statusnet.po
+++ b/locale/ko_KR/LC_MESSAGES/statusnet.po
@@ -254,8 +254,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
@@ -280,7 +280,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."
diff --git a/locale/mk_MK/LC_MESSAGES/statusnet.mo b/locale/mk_MK/LC_MESSAGES/statusnet.mo
index c916d0292..0ac378c79 100644
Binary files a/locale/mk_MK/LC_MESSAGES/statusnet.mo and b/locale/mk_MK/LC_MESSAGES/statusnet.mo differ
diff --git a/locale/mk_MK/LC_MESSAGES/statusnet.po b/locale/mk_MK/LC_MESSAGES/statusnet.po
index 2b8a12acc..d4c4eb235 100644
--- a/locale/mk_MK/LC_MESSAGES/statusnet.po
+++ b/locale/mk_MK/LC_MESSAGES/statusnet.po
@@ -1,10 +1,10 @@
-# #-#-#-#-#  laconica.pot (PACKAGE VERSION)  #-#-#-#-#
+# #-#-#-#-#  statusnet.pot (PACKAGE VERSION)  #-#-#-#-#
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) 2008 FREE SOFTWARE MACEDONIA
 # This file is distributed under the same license as the PACKAGE package.
 # IGOR STAMATOVSKI <igor@slobodensoftver.org.mk>, 2008.
 #
-# #-#-#-#-#  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.
@@ -22,8 +22,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"#-#-#-#-#  laconica.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+"#-#-#-#-#  statusnet.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+"#-#-#-#-#  statusnet.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
 #: ../actions/noticesearchrss.php:64 actions/noticesearchrss.php:68
 #: actions/noticesearchrss.php:88
@@ -249,8 +249,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
@@ -275,7 +275,7 @@ msgstr ""
 #: 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."
diff --git a/locale/nb_NO/LC_MESSAGES/statusnet.po b/locale/nb_NO/LC_MESSAGES/statusnet.po
index 3c93acd23..116513857 100644
--- a/locale/nb_NO/LC_MESSAGES/statusnet.po
+++ b/locale/nb_NO/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.
@@ -249,8 +249,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
@@ -275,7 +275,7 @@ msgstr "API-metode ikke funnet!"
 #: 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."
diff --git a/locale/nl_NL/LC_MESSAGES/statusnet.po b/locale/nl_NL/LC_MESSAGES/statusnet.po
index 14b7783ee..6cc0a52c4 100644
--- a/locale/nl_NL/LC_MESSAGES/statusnet.po
+++ b/locale/nl_NL/LC_MESSAGES/statusnet.po
@@ -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 functie niet gevonden"
 #: 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."
diff --git a/locale/nn_NO/LC_MESSAGES/statusnet.po b/locale/nn_NO/LC_MESSAGES/statusnet.po
index d0dd92366..4da276adb 100644
--- a/locale/nn_NO/LC_MESSAGES/statusnet.po
+++ b/locale/nn_NO/LC_MESSAGES/statusnet.po
@@ -268,8 +268,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
@@ -294,7 +294,7 @@ msgstr "Fann ikkje API-metode."
 #: 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."
diff --git a/locale/pl_PL/LC_MESSAGES/statusnet.po b/locale/pl_PL/LC_MESSAGES/statusnet.po
index 321e49573..e866145b2 100644
--- a/locale/pl_PL/LC_MESSAGES/statusnet.po
+++ b/locale/pl_PL/LC_MESSAGES/statusnet.po
@@ -1,10 +1,10 @@
-# #-#-#-#-#  laconica.pot (PACKAGE VERSION)  #-#-#-#-#
+# #-#-#-#-#  statusnet.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.
 # Paweł Wilk <siefca@gnu.org>, 2008.
 #
-# #-#-#-#-#  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.
@@ -263,8 +263,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
@@ -289,7 +289,7 @@ msgstr "metoda API nie znaleziona!"
 #: 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."
diff --git a/locale/pt/LC_MESSAGES/statusnet.po b/locale/pt/LC_MESSAGES/statusnet.po
index 7d866679d..779d7489e 100644
--- a/locale/pt/LC_MESSAGES/statusnet.po
+++ b/locale/pt/LC_MESSAGES/statusnet.po
@@ -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 "Método da API não encontrado!"
 #: 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."
diff --git a/locale/pt_BR/LC_MESSAGES/statusnet.mo b/locale/pt_BR/LC_MESSAGES/statusnet.mo
index 819cdb35b..9db1638b0 100644
Binary files a/locale/pt_BR/LC_MESSAGES/statusnet.mo and b/locale/pt_BR/LC_MESSAGES/statusnet.mo differ
diff --git a/locale/pt_BR/LC_MESSAGES/statusnet.po b/locale/pt_BR/LC_MESSAGES/statusnet.po
index 456122de6..7fae3f5f3 100644
--- a/locale/pt_BR/LC_MESSAGES/statusnet.po
+++ b/locale/pt_BR/LC_MESSAGES/statusnet.po
@@ -2,7 +2,7 @@
 # Frederico Goncalves Guimaraes <frederico@teia.bio.br>, 2009.
 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-07-14 11:24+0000\n"
@@ -274,8 +274,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
@@ -300,7 +300,7 @@ msgstr "O método da API não foi encontrado!"
 #: 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."
diff --git a/locale/ru_RU/LC_MESSAGES/statusnet.po b/locale/ru_RU/LC_MESSAGES/statusnet.po
index fa85ee740..8a553a37f 100644
--- a/locale/ru_RU/LC_MESSAGES/statusnet.po
+++ b/locale/ru_RU/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.
@@ -244,8 +244,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
@@ -270,7 +270,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."
diff --git a/locale/statusnet.po b/locale/statusnet.po
index ebdc9603a..c7ac6ac9b 100644
--- a/locale/statusnet.po
+++ b/locale/statusnet.po
@@ -247,8 +247,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
@@ -286,7 +286,7 @@ msgstr ""
 #: 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 actions/twitapiaccount.php:46
 #: actions/twitapiaccount.php:98 actions/twitapiaccount.php:104
diff --git a/locale/sv_SE/LC_MESSAGES/statusnet.po b/locale/sv_SE/LC_MESSAGES/statusnet.po
index fdea771b9..d0a5001da 100644
--- a/locale/sv_SE/LC_MESSAGES/statusnet.po
+++ b/locale/sv_SE/LC_MESSAGES/statusnet.po
@@ -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 "API-metoden hittades inte!"
 #: 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."
diff --git a/locale/te_IN/LC_MESSAGES/statusnet.po b/locale/te_IN/LC_MESSAGES/statusnet.po
index 83f9f46dc..4576f3613 100644
--- a/locale/te_IN/LC_MESSAGES/statusnet.po
+++ b/locale/te_IN/LC_MESSAGES/statusnet.po
@@ -1,10 +1,10 @@
-# #-#-#-#-#  laconica.pot (PACKAGE VERSION)  #-#-#-#-#
+# #-#-#-#-#  statusnet.pot (PACKAGE VERSION)  #-#-#-#-#
 # StatusNet Telugu Translation
 # Copyright (C) 2008 THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the StatusNet package.
 # Veeven <veeven@gmail.com>, 2008.
 #
-# #-#-#-#-#  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.
@@ -237,8 +237,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
@@ -263,7 +263,7 @@ msgstr ""
 #: 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."
diff --git a/locale/tr_TR/LC_MESSAGES/statusnet.po b/locale/tr_TR/LC_MESSAGES/statusnet.po
index b6cb260f8..e67fbf33c 100644
--- a/locale/tr_TR/LC_MESSAGES/statusnet.po
+++ b/locale/tr_TR/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.
@@ -245,8 +245,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
@@ -271,7 +271,7 @@ msgstr ""
 #: 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."
diff --git a/locale/uk_UA/LC_MESSAGES/statusnet.po b/locale/uk_UA/LC_MESSAGES/statusnet.po
index 396e78508..55cea21c3 100644
--- a/locale/uk_UA/LC_MESSAGES/statusnet.po
+++ b/locale/uk_UA/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.
@@ -280,8 +280,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
@@ -306,7 +306,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."
diff --git a/locale/vi_VN/LC_MESSAGES/statusnet.mo b/locale/vi_VN/LC_MESSAGES/statusnet.mo
index 6ac9a37c2..65add28b4 100644
Binary files a/locale/vi_VN/LC_MESSAGES/statusnet.mo and b/locale/vi_VN/LC_MESSAGES/statusnet.mo differ
diff --git a/locale/vi_VN/LC_MESSAGES/statusnet.po b/locale/vi_VN/LC_MESSAGES/statusnet.po
index 595004d8a..af34d5210 100644
--- a/locale/vi_VN/LC_MESSAGES/statusnet.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."
diff --git a/locale/zh_CN/LC_MESSAGES/statusnet.po b/locale/zh_CN/LC_MESSAGES/statusnet.po
index 28188fce3..529d2f4f8 100644
--- a/locale/zh_CN/LC_MESSAGES/statusnet.po
+++ b/locale/zh_CN/LC_MESSAGES/statusnet.po
@@ -258,8 +258,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
@@ -284,7 +284,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."
diff --git a/locale/zh_TW/LC_MESSAGES/statusnet.po b/locale/zh_TW/LC_MESSAGES/statusnet.po
index 707fa3191..a94187518 100644
--- a/locale/zh_TW/LC_MESSAGES/statusnet.po
+++ b/locale/zh_TW/LC_MESSAGES/statusnet.po
@@ -237,8 +237,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
@@ -263,7 +263,7 @@ msgstr ""
 #: 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."
diff --git a/plugins/Autocomplete/Autocomplete.js b/plugins/Autocomplete/Autocomplete.js
index e799c11e5..dfadea004 100644
--- a/plugins/Autocomplete/Autocomplete.js
+++ b/plugins/Autocomplete/Autocomplete.js
@@ -17,7 +17,7 @@ $(document).ready(function(){
             });
         }
     );
-    $.getJSON($('address .url')[0].href+'/api/laconica/groups/list.json?user_id=' + current_user['id'] + '&callback=?',
+    $.getJSON($('address .url')[0].href+'/api/statusnet/groups/list.json?user_id=' + current_user['id'] + '&callback=?',
         function(groups){
             $('#notice_data-text').autocomplete(groups, {
                 multiple: true,
diff --git a/plugins/PiwikAnalyticsPlugin.php b/plugins/PiwikAnalyticsPlugin.php
index 902d1744d..85a24c132 100644
--- a/plugins/PiwikAnalyticsPlugin.php
+++ b/plugins/PiwikAnalyticsPlugin.php
@@ -45,7 +45,7 @@ if (!defined('STATUSNET')) {
  *
  * exchange example.com/piwik/ with the url to your piwik installation and
  * make sure you don't forget the final /
- * exchange id with the ID your laconica installation has in your Piwik analytics
+ * exchange id with the ID your statusnet installation has in your Piwik analytics
  *
  * @category Plugin
  * @package  StatusNet
@@ -60,7 +60,7 @@ class PiwikAnalyticsPlugin extends Plugin
 {
     /** the base of your Piwik installation */
     var $piwikroot = null;
-    /** the Piwik Id of your laconica installation */
+    /** the Piwik Id of your statusnet installation */
     var $piwikId   = null;
 
     /**
diff --git a/plugins/TemplatePlugin.php b/plugins/TemplatePlugin.php
index b56fa3dbd..cfa051162 100644
--- a/plugins/TemplatePlugin.php
+++ b/plugins/TemplatePlugin.php
@@ -195,7 +195,7 @@ class TemplatePlugin extends Plugin {
     );
     
     // use the PHP template
-    // unless laconica config:
+    // unless statusnet config:
     //   $config['template']['mode'] = 'html';
     if (!(common_config('template', 'mode') == 'html')) {
       $tpl_file = $this->templateFolder() . '/index.php';
@@ -326,7 +326,7 @@ class TemplateAction extends Action
 }
 
 /**
- * Function for retrieving a laconica display section
+ * Function for retrieving a statusnet display section
  *
  * requires one parameter, the name of the section
  * section names are listed in the comments of the TemplatePlugin class
diff --git a/scripts/delete_status_network.sh b/scripts/delete_status_network.sh
index 32187382c..f55f1486b 100755
--- a/scripts/delete_status_network.sh
+++ b/scripts/delete_status_network.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-source /etc/laconica/setup.cfg
+source /etc/statusnet/setup.cfg
 
 export nickname=$1
 
diff --git a/scripts/rebuilddb_psql.sh b/scripts/rebuilddb_psql.sh
index 9ade515ad..6b15b9212 100755
--- a/scripts/rebuilddb_psql.sh
+++ b/scripts/rebuilddb_psql.sh
@@ -15,7 +15,7 @@
 #
 # You MUST run this script as the 'postgres' user.
 # You MUST be able to write to /tmp/rebuilddb_psql.sql
-# You MUST specify the laconica database user and database name on the
+# You MUST specify the statusnet database user and database name on the
 # command line, e.g. ./rebuilddb_psql.sh myuser mydbname
 #
 
@@ -27,7 +27,7 @@ cd `dirname $0`
 pg_dump -a -D --disable-trigger $DB > /tmp/rebuilddb_psql.sql
 psql -c "drop schema public cascade; create schema public;" $DB
 psql -c "grant all privileges on schema public to $user;" $DB
-psql $DB < ../db/laconica_pg.sql
+psql $DB < ../db/statusnet_pg.sql
 psql $DB < /tmp/rebuilddb_psql.sql
 for tab in `psql -c '\dts' $DB -tA | cut -d\| -f2`; do
   psql -c "ALTER TABLE \"$tab\" OWNER TO $user;" $DB
diff --git a/scripts/setup_status_network.sh b/scripts/setup_status_network.sh
index 17440640e..d40d4724f 100755
--- a/scripts/setup_status_network.sh
+++ b/scripts/setup_status_network.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-source /etc/laconica/setup.cfg
+source /etc/statusnet/setup.cfg
 
 export nickname=$1
 export sitename=$2
@@ -13,7 +13,7 @@ export username=$nickname$USERBASE
 
 mysqladmin -h $DBHOST -u $ADMIN --password=$ADMINPASS create $database
 
-for f in laconica.sql innodb.sql sms_carrier.sql foreign_services.sql notice_source.sql; do
+for f in statusnet.sql innodb.sql sms_carrier.sql foreign_services.sql notice_source.sql; do
     mysql -h $DBHOST -u $ADMIN --password=$ADMINPASS $database < ../db/$f;
 done
 
diff --git a/scripts/statusnet.spec b/scripts/statusnet.spec
index 331e10671..2019d8abb 100644
--- a/scripts/statusnet.spec
+++ b/scripts/statusnet.spec
@@ -4,11 +4,11 @@
 BuildRequires:	php-pear
 BuildRequires:	httpd-devel
 
-Name:           laconica
+Name:           statusnet
 Version:        %{LACVER}
 Release:        1%{?dist}
 License:        GAGPL v3 or later
-Source:         laconica-%{version}.tar.gz
+Source:         statusnet-%{version}.tar.gz
 Group:          Applications/Internet
 Summary:        Laconica, the Open Source microblogging platform
 BuildArch:      noarch
@@ -49,16 +49,16 @@ similar service to sites like Twitter, Jaiku, and Plurk.
 mkdir -p %{buildroot}%{wwwpath}
 cp -a * %{buildroot}%{wwwpath}
 
-mkdir -p %{buildroot}%{_datadir}/laconica
-cp -a db %{buildroot}%{_datadir}/laconica/db
+mkdir -p %{buildroot}%{_datadir}/statusnet
+cp -a db %{buildroot}%{_datadir}/statusnet/db
 
-mkdir -p %{buildroot}%{_datadir}/laconica/avatar
+mkdir -p %{buildroot}%{_datadir}/statusnet/avatar
 
 mkdir -p %{buildroot}%{_sysconfdir}/httpd/conf.d
-cat > %{buildroot}%{_sysconfdir}/httpd/conf.d/laconica.conf <<"EOF"
-Alias /laconica/ "/var/www/laconica/"
+cat > %{buildroot}%{_sysconfdir}/httpd/conf.d/statusnet.conf <<"EOF"
+Alias /statusnet/ "/var/www/laconica/"
 
-<Directory "/var/www/laconica">
+<Directory "/var/www/statusnet">
     Options Indexes FollowSymLinks
     AllowOverride All
     Order allow,deny
@@ -73,17 +73,17 @@ rm -rf %buildroot
 %defattr(-,root,root)
 %dir %{wwwpath}
 %{wwwpath}/*
-%{_datadir}/laconica/*
-%attr(-,apache,apache) %dir %{_datadir}/laconica/avatar
+%{_datadir}/statusnet/*
+%attr(-,apache,apache) %dir %{_datadir}/statusnet/avatar
 %doc COPYING README doc-src/*
-%config(noreplace) %{_sysconfdir}/httpd/conf.d/laconica.conf
+%config(noreplace) %{_sysconfdir}/httpd/conf.d/statusnet.conf
 
 %changelog
 * Wed Apr 03 2009 Zach Copley <zach@controlyourself.ca> - 0.7.3
 - Changed version number to 0.7.3.
 
 * Fri Mar 13 2009 Ken Sedgwick <ksedgwic@bonsai.com> - 0.7.2.1-1
-- Factored laconica version to the first line of the file.
+- Factored statusnet version to the first line of the file.
 
 * Wed Mar 03 2009 Zach Copley <zach@controlyourself.ca> - 0.7.2
 - Changed version number to 0.7.2.
@@ -92,7 +92,7 @@ rm -rf %buildroot
 - Modified RPM for Fedora.
 
 * Thu Feb 13 2009 tuukka.pasanen@ilmi.fi
-- packaged laconica version 0.7.1
+- packaged statusnet version 0.7.1
 
 * Wed Feb 04 2009 tuukka.pasanen@ilmi.fi
-- packaged laconica version 0.7.0 using the buildservice spec file wizard
+- packaged statusnet version 0.7.0 using the buildservice spec file wizard
diff --git a/scripts/twitterstatusfetcher.php b/scripts/twitterstatusfetcher.php
index f25690e58..9a74ae99d 100755
--- a/scripts/twitterstatusfetcher.php
+++ b/scripts/twitterstatusfetcher.php
@@ -54,7 +54,7 @@ require_once INSTALLDIR . '/lib/daemon.php';
  */
 
 // NOTE: an Avatar path MUST be set in config.php for this
-// script to work: e.g.: $config['avatar']['path'] = '/laconica/avatar';
+// script to work: e.g.: $config['avatar']['path'] = '/statusnet/avatar';
 
 class TwitterStatusFetcher extends ParallelizingDaemon
 {
diff --git a/scripts/update_pot.sh b/scripts/update_pot.sh
index a7f5e4d3a..dbbe4354f 100755
--- a/scripts/update_pot.sh
+++ b/scripts/update_pot.sh
@@ -1,3 +1,3 @@
 cd `dirname $0`
 cd ..
-xgettext --from-code=UTF-8 --default-domain=laconica --output=locale/laconica.po --language=PHP --join-existing actions/*.php classes/*.php lib/*.php scripts/*.php
+xgettext --from-code=UTF-8 --default-domain=statusnet --output=locale/laconica.po --language=PHP --join-existing actions/*.php classes/*.php lib/*.php scripts/*.php
diff --git a/scripts/update_translations.php b/scripts/update_translations.php
index 8120f636f..1f291dc42 100755
--- a/scripts/update_translations.php
+++ b/scripts/update_translations.php
@@ -30,7 +30,7 @@ define('STATUSNET', true);
 require_once(INSTALLDIR . '/lib/common.php');
 
 // Master StatusNet .pot file location (created by update_pot.sh)
-$laconica_pot = INSTALLDIR . '/locale/laconica.po';
+$statusnet_pot = INSTALLDIR . '/locale/laconica.po';
 
 set_time_limit(60);
 
@@ -43,11 +43,11 @@ foreach ($languages as $language) {
 
     $code = $language['lang'];
     $file_url = 'http://status.net/pootle/' . $code .
-        '/laconica/LC_MESSAGES/laconica.po';
+        '/statusnet/LC_MESSAGES/laconica.po';
     $lcdir = INSTALLDIR . '/locale/' . $code;
     $msgdir = "$lcdir/LC_MESSAGES";
-    $pofile = "$msgdir/laconica.po";
-    $mofile = "$msgdir/laconica.mo";
+    $pofile = "$msgdir/statusnet.po";
+    $mofile = "$msgdir/statusnet.mo";
 
     /* Check for an existing */
     if (!is_dir($msgdir)) {
@@ -71,7 +71,7 @@ foreach ($languages as $language) {
     if (sha1($new_file) != $existingSHA1 || !file_exists($mofile)) {
         echo "Updating ".$code."\n";
         file_put_contents($pofile, $new_file);
-        system(sprintf('msgmerge -U %s %s', $pofile, $laconica_pot));
+        system(sprintf('msgmerge -U %s %s', $pofile, $statusnet_pot));
         system(sprintf('msgfmt -f -o %s %s', $mofile, $pofile));
     } else {
         echo "Unchanged - ".$code."\n";
diff --git a/sphinx.conf.sample b/sphinx.conf.sample
index 8204b9db6..3de62f637 100644
--- a/sphinx.conf.sample
+++ b/sphinx.conf.sample
@@ -1,5 +1,5 @@
 #
-# Minimal Sphinx configuration sample for laconica
+# Minimal Sphinx configuration sample for statusnet
 #
 
 source src1
diff --git a/theme/readme.txt b/theme/readme.txt
index 3794eecb3..151b1fb71 100644
--- a/theme/readme.txt
+++ b/theme/readme.txt
@@ -1,4 +1,4 @@
-/** Howto: create a laconica theme
+/** Howto: create a statusnet theme
  *
  * @package   StatusNet
  * @author Sarven Capadisli <csarven@controlyourself.ca>
@@ -18,7 +18,7 @@ Location of key paths and files under theme/:
 ./default/images/
 
 ./base/display.css contains layout, typography rules:
-Only alter this file if you want to change the layout of the site. Please note that, any updates to this in future laconica releases may not be compatible with your version.
+Only alter this file if you want to change the layout of the site. Please note that, any updates to this in future statusnet releases may not be compatible with your version.
 
 ./default/css/display.css contains only the background images and colour rules:
 This file is a good basis for creating your own theme.
-- 
cgit v1.2.3-54-g00ecf


From ff01140d7163e1831adf9fc1bf5625afbee76a37 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Wed, 26 Aug 2009 03:13:09 -0400
Subject: accidentally changed the URL for Laconica Tools

---
 db/notice_source.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'db/notice_source.sql')

diff --git a/db/notice_source.sql b/db/notice_source.sql
index 8d114ac30..f590d1b97 100644
--- a/db/notice_source.sql
+++ b/db/notice_source.sql
@@ -17,7 +17,7 @@ VALUES
     ('gravity', 'Gravity', 'http://mobileways.de/gravity', now()),
     ('Gwibber','Gwibber','http://launchpad.net/gwibber', now()),
     ('HelloTxt','HelloTxt','http://hellotxt.com/', now()),
-    ('identicatools','Laconica Tools','http://bitbucketlabs.net/statusnet-tools/', now()),
+    ('identicatools','Laconica Tools','http://bitbucketlabs.net/laconica-tools/', now()),
     ('identichat','identichat','http://identichat.prosody.im/', now()),
     ('IdentiFox','IdentiFox','http://www.bitbucket.org/uncryptic/identifox/', now()),
     ('identitwitch','IdentiTwitch','http://richfish.org/identitwitch/', now()),
-- 
cgit v1.2.3-54-g00ecf


From d2bf5761225835470d2dcc80fdba2149d1ed51cd Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@controlyourself.ca>
Date: Tue, 15 Sep 2009 14:37:11 -0700
Subject: Add Jiminy to notice sources

---
 db/notice_source.sql | 1 +
 1 file changed, 1 insertion(+)

(limited to 'db/notice_source.sql')

diff --git a/db/notice_source.sql b/db/notice_source.sql
index f590d1b97..2657763f4 100644
--- a/db/notice_source.sql
+++ b/db/notice_source.sql
@@ -21,6 +21,7 @@ VALUES
     ('identichat','identichat','http://identichat.prosody.im/', now()),
     ('IdentiFox','IdentiFox','http://www.bitbucket.org/uncryptic/identifox/', now()),
     ('identitwitch','IdentiTwitch','http://richfish.org/identitwitch/', now()),
+    ('Jiminy','Jiminy','http://code.google.com/p/jiminy/', now()),
     ('LaTwit','LaTwit','http://latwit.mac65.com/', now()),
     ('LiveTweeter', 'LiveTweeter', 'http://addons.songbirdnest.com/addon/1204', now()),
     ('livetweeter', 'livetweeter', 'http://addons.songbirdnest.com/addon/1204', now()),
-- 
cgit v1.2.3-54-g00ecf

