last scrub of Laconica -> StatusNet

5 files changed, 12 insertions, 12 deletions

diff --git a/scripts/commandline.inc b/scripts/commandline.inc
index 3b6ef6098..1573b569d 100644
--- a/scripts/commandline.inc
+++ b/scripts/commandline.inc
@@ -1,7 +1,7 @@
 <?php
 /*
- * Laconica - a distributed open-source microblogging tool
- * Copyright (C) 2008, 2009, Control Yourself, Inc.
+ * StatusNet - a distributed open-source microblogging tool
+ * Copyright (C) 2008, 2009, StatusNet, Inc.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -26,7 +26,7 @@ if (isset($_SERVER) && array_key_exists('REQUEST_METHOD', $_SERVER)) {
     exit();
 }
 
-define('LACONICA', true);
+define('STATUSNET', true);
 
 // Set various flags so we don't time out on long-running processes
 
diff --git a/scripts/statusnet.spec b/scripts/statusnet.spec
index 2019d8abb..ca2e483a7 100644
--- a/scripts/statusnet.spec
+++ b/scripts/statusnet.spec
@@ -10,7 +10,7 @@ Release:        1%{?dist}
 License:        GAGPL v3 or later
 Source:         statusnet-%{version}.tar.gz
 Group:          Applications/Internet
-Summary:        Laconica, the Open Source microblogging platform
+Summary:        StatusNet, the Open Source microblogging platform
 BuildArch:      noarch
 
 Requires:	httpd
@@ -31,7 +31,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %define confpath %{_sysconfdir}/%{name}
 
 %description
-From the ABOUT file: Laconica (pronounced "luh-KAWN-ih-kuh") is a Free
+From the ABOUT file: StatusNet (pronounced "luh-KAWN-ih-kuh") is a Free
 and Open Source microblogging platform. It helps people in a
 community, company or group to exchange short (140 character) messages
 over the Web. Users can choose which people to "follow" and receive
@@ -56,7 +56,7 @@ mkdir -p %{buildroot}%{_datadir}/statusnet/avatar
 
 mkdir -p %{buildroot}%{_sysconfdir}/httpd/conf.d
 cat > %{buildroot}%{_sysconfdir}/httpd/conf.d/statusnet.conf <<"EOF"
-Alias /statusnet/ "/var/www/laconica/"
+Alias /statusnet/ "/var/www/statusnet/"
 
 <Directory "/var/www/statusnet">
     Options Indexes FollowSymLinks
@@ -79,13 +79,13 @@ rm -rf %buildroot
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/statusnet.conf
 
 %changelog
-* Wed Apr 03 2009 Zach Copley <zach@controlyourself.ca> - 0.7.3
+* Wed Apr 03 2009 Zach Copley <zach@status.net> - 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 statusnet version to the first line of the file.
 
-* Wed Mar 03 2009 Zach Copley <zach@controlyourself.ca> - 0.7.2
+* Wed Mar 03 2009 Zach Copley <zach@status.net> - 0.7.2
 - Changed version number to 0.7.2.
 
 * Sat Feb 28 2009 Ken Sedgwick <ken@bonsai.com> - 0.7.1-1
diff --git a/scripts/twitterstatusfetcher.php b/scripts/twitterstatusfetcher.php
index 9a74ae99d..68f7e9bf7 100755
--- a/scripts/twitterstatusfetcher.php
+++ b/scripts/twitterstatusfetcher.php
@@ -478,7 +478,7 @@ class TwitterStatusFetcher extends ParallelizingDaemon
         default:
 
             // Note: Twitter's big avatars are a different size than
-            // StatusNet's (Laconica's = 96)
+            // StatusNet's (StatusNet's = 96)
 
             $avatar->width  = 73;
             $avatar->height = 73;
diff --git a/scripts/update_pot.sh b/scripts/update_pot.sh
index dbbe4354f..9419e4337 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=statusnet --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/statusnet.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 1f291dc42..4f02b55ec 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)
-$statusnet_pot = INSTALLDIR . '/locale/laconica.po';
+$statusnet_pot = INSTALLDIR . '/locale/statusnet.po';
 
 set_time_limit(60);
 
@@ -43,7 +43,7 @@ foreach ($languages as $language) {
 
     $code = $language['lang'];
     $file_url = 'http://status.net/pootle/' . $code .
-        '/statusnet/LC_MESSAGES/laconica.po';
+        '/statusnet/LC_MESSAGES/statusnet.po';
     $lcdir = INSTALLDIR . '/locale/' . $code;
     $msgdir = "$lcdir/LC_MESSAGES";
     $pofile = "$msgdir/statusnet.po";