From 0bca36109a0959089a4183c3ea1cde4574ea78ce Mon Sep 17 00:00:00 2001 From: "Abinoam P. Marques Jr" Date: Sun, 19 Feb 2012 15:27:54 -0300 Subject: Scrape.php - Friendika -> Friendica --- include/Scrape.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/Scrape.php b/include/Scrape.php index e42d22afc..52405ae2d 100755 --- a/include/Scrape.php +++ b/include/Scrape.php @@ -314,7 +314,7 @@ function scrape_feed($url) { * * PROBE_DIASPORA has a bias towards returning Diaspora information * while PROBE_NORMAL has a bias towards dfrn/zot - in the case where - * an address (such as a Friendika address) supports more than one type + * an address (such as a Friendica address) supports more than one type * of network. * */ -- cgit v1.2.3 From 03834b24332966239e207f86643adb633b8809b9 Mon Sep 17 00:00:00 2001 From: "Abinoam P. Marques Jr" Date: Sun, 19 Feb 2012 15:30:32 -0300 Subject: text.php - Friendika -> Friendica (just to prepare for deprecate the friendika.png at the future) --- include/text.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/text.php b/include/text.php index b9813cfa9..044ee4e08 100755 --- a/include/text.php +++ b/include/text.php @@ -759,7 +759,7 @@ function smilies($s, $sample = false) { ':facepalm', ':headdesk', '~friendika ~friendika', - '~friendica ~friendica', + '~friendica ~friendica', 'DiasporaDiaspora*', ); -- cgit v1.2.3 From 7ed1e3f1776e858189a1b15eafa6bc323dc702dc Mon Sep 17 00:00:00 2001 From: "Abinoam P. Marques Jr" Date: Sun, 19 Feb 2012 15:31:34 -0300 Subject: acl_selectors.php - Friendika -> Friendica --- include/acl_selectors.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/acl_selectors.php b/include/acl_selectors.php index d8f530daf..6070b7db2 100755 --- a/include/acl_selectors.php +++ b/include/acl_selectors.php @@ -157,7 +157,7 @@ function contact_select($selname, $selclass, $preselected = false, $size = 4, $p $o = ''; - // When used for private messages, we limit correspondence to mutual DFRN/Friendika friends and the selector + // When used for private messages, we limit correspondence to mutual DFRN/Friendica friends and the selector // to one recipient. By default our selector allows multiple selects amongst all contacts. $sql_extra = ''; -- cgit v1.2.3 From 19fea9c2ceef879648fcf7514c31b0bce47cefd9 Mon Sep 17 00:00:00 2001 From: "Abinoam P. Marques Jr" Date: Sun, 19 Feb 2012 15:32:22 -0300 Subject: poller.php - Friendika -> Friendica --- include/poller.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/poller.php b/include/poller.php index 7d42c63b5..3e10533b3 100755 --- a/include/poller.php +++ b/include/poller.php @@ -349,7 +349,7 @@ function poller_run($argv, $argc){ || ($contact['network'] === NETWORK_DIASPORA) || ($contact['network'] === NETWORK_FEED) ) { - // Upgrading DB fields from an older Friendika version + // Upgrading DB fields from an older Friendica version // Will only do this once per notify-enabled OStatus contact // or if relationship changes -- cgit v1.2.3 From fed6330ea62ce4b87de6a1bd9e16cd68f09e10d7 Mon Sep 17 00:00:00 2001 From: "Abinoam P. Marques Jr" Date: Sun, 19 Feb 2012 15:34:48 -0300 Subject: include/api.php - Friendika -> Friendica --- include/api.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'include') diff --git a/include/api.php b/include/api.php index 7b8709659..04f95ebd9 100755 --- a/include/api.php +++ b/include/api.php @@ -179,7 +179,7 @@ 'updated' => api_date(null), 'atom_updated' => datetime_convert('UTC','UTC','now',ATOM_TIME), 'language' => $user_info['language'], - 'logo' => $a->get_baseurl()."/images/friendika-32.png", + 'logo' => $a->get_baseurl()."/images/friendica-32.png", ); return $arr; @@ -739,7 +739,7 @@ if (local_user()===false) return false; $user_info = api_get_user($a); - // in friendika starred item are private + // in friendica starred item are private // return favorites only for self logger('api_favorites: self:' . $user_info['self']); @@ -912,7 +912,7 @@ function api_statusnet_config(&$a,$type) { $name = $a->config['sitename']; $server = $a->get_hostname(); - $logo = $a->get_baseurl() . '/images/friendika-64.png'; + $logo = $a->get_baseurl() . '/images/friendica-64.png'; $email = $a->config['admin_email']; $closed = (($a->config['register_policy'] == REGISTER_CLOSED) ? 'true' : 'false'); $private = (($a->config['system']['block_public']) ? 'true' : 'false'); -- cgit v1.2.3 From 3ef6344d4172c8aef7c4f895d4c1122f676bbece Mon Sep 17 00:00:00 2001 From: "Abinoam P. Marques Jr" Date: Sun, 19 Feb 2012 15:35:34 -0300 Subject: include/nav.php - Friendika -> Friendica --- include/nav.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/nav.php b/include/nav.php index 95dd37ba6..c8a44af80 100755 --- a/include/nav.php +++ b/include/nav.php @@ -148,7 +148,7 @@ function nav(&$a) { $banner = get_config('system','banner'); if($banner === false) - $banner .= 'logoFriendica'; + $banner .= 'logoFriendica'; $tpl = get_markup_template('nav.tpl'); -- cgit v1.2.3