From e3a53251c08ce5245f098bb37ca955016d9d57a0 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Wed, 26 Aug 2009 03:33:43 -0400
Subject: [PATCH] last scrub of Laconica -> StatusNet

---
 README                                |  20 ++++++++---------
 htaccess.sample                       |   2 +-
 js/jcrop/jquery.Jcrop.go.js           |   8 +++----
 lib/common.php                        |   3 ++-
 locale/ko_KR/LC_MESSAGES/statusnet.mo | Bin 88928 -> 88929 bytes
 locale/ko_KR/LC_MESSAGES/statusnet.po |   2 +-
 plugins/FBConnect/FBConnectPlugin.css |   8 +++----
 plugins/FBConnect/README              |  30 +++++++++++++-------------
 plugins/InfiniteScroll/readme.txt     |   2 +-
 plugins/recaptcha/README              |   2 +-
 scripts/commandline.inc               |   6 +++---
 scripts/statusnet.spec                |  10 ++++-----
 scripts/twitterstatusfetcher.php      |   2 +-
 scripts/update_pot.sh                 |   2 +-
 scripts/update_translations.php       |   4 ++--
 15 files changed, 51 insertions(+), 50 deletions(-)

diff --git a/README b/README
index 195d1b4ec8..f10c8e10ed 100644
--- a/README
+++ b/README
@@ -60,7 +60,7 @@ License along with this program, in the file "COPYING".  If not, see
     you *MUST MAKE AVAILABLE* the modified version of the source code
     to your users under the same license. This is a legal requirement
     of using the software, and if you do not wish to share your
-    modifications, *YOU MAY NOT INSTALL LACONICA*.
+    modifications, *YOU MAY NOT INSTALL STATUSNET*.
 
 Additional library software has been made available in the 'extlib'
 directory. All of it is Free Software and can be distributed under
@@ -910,7 +910,7 @@ Starting with version 0.7.1, you can put config files in the
 /etc/statusnet/ directory on your server, if it exists. Config files
 will be included in this order:
 
-* /etc/statusnet/laconica.php - server-wide config
+* /etc/statusnet/statusnet.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
@@ -1622,15 +1622,15 @@ Credits
 =======
 
 The following is an incomplete list of developers who've worked on
-Laconi.ca. Apologies for any oversight; please let evan@identi.ca know
+StatusNet. Apologies for any oversight; please let evan@status.net know
 if anyone's been overlooked in error.
 
-* Evan Prodromou, founder and lead developer, Control Yourself, Inc.
-* Zach Copley, Control Yourself, Inc.
-* Earle Martin, Control Yourself, Inc.
-* Marie-Claude Doyon, designer, Control Yourself, Inc.
-* Sarven Capadisli, Control Yourself, Inc.
-* Robin Millette, Control Yourself, Inc.
+* Evan Prodromou, founder and lead developer, StatusNet, Inc.
+* Zach Copley, StatusNet, Inc.
+* Earle Martin, StatusNet, Inc.
+* Marie-Claude Doyon, designer, StatusNet, Inc.
+* Sarven Capadisli, StatusNet, Inc.
+* Robin Millette, StatusNet, Inc.
 * Ciaran Gultnieks
 * Michael Landers
 * Ori Avtalion
@@ -1662,6 +1662,6 @@ if anyone's been overlooked in error.
 * Craig Andrews
 
 Thanks also to the developers of our upstream library code and to the
-thousands of people who have tried out Identi.ca, installed Laconi.ca,
+thousands of people who have tried out Identi.ca, installed StatusNet,
 told their friends, and built the Open Microblogging network to what
 it is today.
diff --git a/htaccess.sample b/htaccess.sample
index 942e98334a..37eb8e01ec 100644
--- a/htaccess.sample
+++ b/htaccess.sample
@@ -1,7 +1,7 @@
 <IfModule mod_rewrite.c>
   RewriteEngine On
 
-  # NOTE: change this to your actual Laconica path; may be "/".
+  # NOTE: change this to your actual StatusNet path; may be "/".
 
   RewriteBase /mublog/
 
diff --git a/js/jcrop/jquery.Jcrop.go.js b/js/jcrop/jquery.Jcrop.go.js
index 4e1cbfd1e7..5739f676d0 100644
--- a/js/jcrop/jquery.Jcrop.go.js
+++ b/js/jcrop/jquery.Jcrop.go.js
@@ -1,10 +1,10 @@
 /** Init for Jcrop library and page setup
  *
- * @package   Laconica
- * @author Sarven Capadisli <csarven@controlyourself.ca>
- * @copyright 2009 Control Yourself, Inc.
+ * @package   StatusNet
+ * @author Sarven Capadisli <csarven@status.net>
+ * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
 $(function(){
diff --git a/lib/common.php b/lib/common.php
index c3e83789fb..9a5d33e658 100644
--- a/lib/common.php
+++ b/lib/common.php
@@ -341,7 +341,8 @@ function addPlugin($name, $attrs = null)
 if (isset($conffile)) {
     $_config_files = array($conffile);
 } else {
-    $_config_files = array('/etc/statusnet/laconica.php',
+    $_config_files = array('/etc/statusnet/statusnet.php',
+                           '/etc/laconica/laconica.php',
                            '/etc/statusnet/'.$_server.'.php');
 
     if (strlen($_path) > 0) {
diff --git a/locale/ko_KR/LC_MESSAGES/statusnet.mo b/locale/ko_KR/LC_MESSAGES/statusnet.mo
index e7fb77d614ca1af241de423185d8531bbbaf6813..2b177ff86b9e6e8a0a54923d3bf5e77050713af7 100644
GIT binary patch
delta 4437
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

delta 4436
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

diff --git a/locale/ko_KR/LC_MESSAGES/statusnet.po b/locale/ko_KR/LC_MESSAGES/statusnet.po
index dd7edc5104..7bbdcdcf27 100644
--- a/locale/ko_KR/LC_MESSAGES/statusnet.po
+++ b/locale/ko_KR/LC_MESSAGES/statusnet.po
@@ -1104,7 +1104,7 @@ msgid ""
 "s, available under the [GNU Affero General Public License](http://www.fsf."
 "org/licensing/licenses/agpl-3.0.html)."
 msgstr ""
-"이 사이트는 [StatusNet](http://status.net/) 마이크로블로깅 소프트웨어 %s 버전을 사용합니다. Laconica는 "
+"이 사이트는 [StatusNet](http://status.net/) 마이크로블로깅 소프트웨어 %s 버전을 사용합니다. StatusNet는 "
 "[GNU Affero General Public "
 "License](http://www.fsf.org/licensing/licenses/agpl-3.0.html) 라이선스에 따라 사용할 수 "
 "있습니다."
diff --git a/plugins/FBConnect/FBConnectPlugin.css b/plugins/FBConnect/FBConnectPlugin.css
index e52675459e..49217bf13f 100644
--- a/plugins/FBConnect/FBConnectPlugin.css
+++ b/plugins/FBConnect/FBConnectPlugin.css
@@ -1,10 +1,10 @@
 /** Styles for Facebook logo and Facebook user profile avatar.
  *
- * @package   Laconica
- * @author Sarven Capadisli <csarven@controlyourself.ca>
- * @copyright 2009 Control Yourself, Inc.
+ * @package   StatusNet
+ * @author Sarven Capadisli <csarven@status.net>
+ * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
 #site_nav_global_primary #nav_fb {
diff --git a/plugins/FBConnect/README b/plugins/FBConnect/README
index 11e5ce4537..77d57eff92 100644
--- a/plugins/FBConnect/README
+++ b/plugins/FBConnect/README
@@ -1,18 +1,18 @@
-This plugin allows you to utilize Facebook Connect with Laconica.
+This plugin allows you to utilize Facebook Connect with StatusNet.
 Supported Facebook Connect features:
 
 - Authenticate (register/login/logout -- works similar to OpenID)
-- Associate an existing Laconica account with a Facebook account
-- Disconnect a Facebook account from a Laconica account
+- Associate an existing StatusNet account with a Facebook account
+- Disconnect a Facebook account from a StatusNet account
 
 Future planned functionality:
 
-- Invite Facebook friends to use your Laconica installation
-- Auto-subscribe Facebook friends already using Laconica
-- Share Laconica favorite notices to your Facebook stream
+- Invite Facebook friends to use your StatusNet installation
+- Auto-subscribe Facebook friends already using StatusNet
+- Share StatusNet favorite notices to your Facebook stream
 
 To use the plugin you will need to configure a Facebook application
-to point to your Laconica installation (see the Installation section
+to point to your StatusNet installation (see the Installation section
 below).
 
 Installation
@@ -26,16 +26,16 @@ Facebook developer wiki:
 
     http://wiki.developers.facebook.com/index.php/Connect/Setting_Up_Your_Site
 
-If you already are using the build-in Laconica Facebook application,
+If you already are using the build-in StatusNet Facebook application,
 you can modify your existing application's configuration using the
 Facebook Developer Application on Facebook.  Use it to edit your
 application settings, and under the 'Connect' tab, change the 'Connect
-URL' to be the main URL for your Laconica site.  E.g.:
+URL' to be the main URL for your StatusNet site.  E.g.:
 
-    http://SITE/PATH_TO_LACONICA/
+    http://SITE/PATH_TO_STATUSNET/
 
 After you application is created and configured, you'll need to add its
-API key and secret to your Laconica config.php file:
+API key and secret to your StatusNet config.php file:
 
     $config['facebook']['apikey'] = 'APIKEY';
     $config['facebook']['secret'] = 'SECRET';
@@ -47,11 +47,11 @@ config.php:
 
 To try out the plugin, fire up your browser and connect to:
 
-    http://SITE/PATH_TO_LACONICA/main/facebooklogin
+    http://SITE/PATH_TO_STATUSNET/main/facebooklogin
 
 or, if you do not have fancy URLs turned on:
 
-    http://SITE/PATH_TO_LACONICA/index.php/main/facebooklogin
+    http://SITE/PATH_TO_STATUSNET/index.php/main/facebooklogin
 
 You should see a page with a blue button that says: "Connect with
 Facebook".
@@ -62,10 +62,10 @@ Connect/Disconnect existing account
 If the Facebook Connect plugin is enabled, there will be a new Facebook
 Connect Settings tab under each user's Connect menu. Users can connect
 and disconnect to their Facebook accounts from it.  Note:  Before a user
-can disconnect from Facebook, she must set a normal Laconica password.
+can disconnect from Facebook, she must set a normal StatusNet password.
 Otherwise, she might not be able to login in to her account in the
 future.  This is usually only required for users who have used Facebook
-Connect to register their Laconica account, and therefore haven't
+Connect to register their StatusNet account, and therefore haven't
 already set a local password.
 
 Helpful links
diff --git a/plugins/InfiniteScroll/readme.txt b/plugins/InfiniteScroll/readme.txt
index 3ce3b7fd23..2428cc69a3 100644
--- a/plugins/InfiniteScroll/readme.txt
+++ b/plugins/InfiniteScroll/readme.txt
@@ -1,4 +1,4 @@
-Infinite Scroll adds the following functionality to your Laconica installation: When a user scrolls towards the bottom of the page, the next page of notices is automatically retrieved and appended. This means they never need to click "Next Page", which dramatically increases stickiness.
+Infinite Scroll adds the following functionality to your StatusNet installation: When a user scrolls towards the bottom of the page, the next page of notices is automatically retrieved and appended. This means they never need to click "Next Page", which dramatically increases stickiness.
 
 Installation
 ============
diff --git a/plugins/recaptcha/README b/plugins/recaptcha/README
index 3100f697e4..ce23a26953 100644
--- a/plugins/recaptcha/README
+++ b/plugins/recaptcha/README
@@ -1,4 +1,4 @@
-Laconica reCAPTCHA plugin 0.2 8/3/09
+StatusNet reCAPTCHA plugin 0.2 8/3/09
 ====================================
 Adds a captcha to your registration page to reduce automated spam bots registering.
 
diff --git a/scripts/commandline.inc b/scripts/commandline.inc
index 3b6ef60987..1573b569db 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 2019d8abb2..ca2e483a77 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 9a74ae99d8..68f7e9bf75 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 dbbe4354f5..9419e4337f 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 1f291dc423..4f02b55ec7 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";
-- 
2.39.5