Function : profile_load App $a string $nickname int $profile
+
Function : profile_load App $a string $nickname string $profile
Summary: Loads a profile into the page sidebar. The function requires a writeable copy of the main App structure, and the nickname of a registered local account.
If the viewer is an authenticated remote viewer, the profile displayed is the one that has been configured for his/her viewing in the Contact manager. Passing a non-zero profile ID can also allow a preview of a selected profile by the owner.
Profile information is placed in the App structure for later retrieval. Honours the owner's chosen theme for display.
verbs: [0] = first person singular, e.g. "I want", [1] = 3rd person singular, e.g. "Bill wants" We use the first person form when creating an activity, but the third person for use in activities FIXME: There is no accounting for verb gender for languages where this is significant. We may eventually require obj_verbs() to provide full conjugations and specify which form to use in the $_REQUEST params to this module.
verbs: [0] = first person singular, e.g. "I want", [1] = 3rd person singular, e.g. "Bill wants" We use the first person form when creating an activity, but the third person for use in activities FIXME: There is no accounting for verb gender for languages where this is significant. We may eventually require obj_verbs() to provide full conjugations and specify which form to use in the $_REQUEST params to this module.
+
The site administrator can do things that normals cannot. This is restricted because it will likely cause an activitystreams protocol violation and the activity might choke in some other network and result in unnecessary support requests. It isn't because we're trying to be heavy-handed about what you can and can't do.
+
Things, objects: We do not provide definite (a, an) or indefinite (the) articles or singular/plural designators That needs to be specified in your thing. e.g. Mike has "a carrot", Greg wants "balls", Bob likes "the Boston Red Sox".
+
Future work on this module might produce more complex activities with targets, e.g. Phillip likes Karen's moustache and to describe other non-thing objects like channels, such as Karl wants Susan - where Susan represents a channel profile.
';
@@ -162,3 +171,38 @@ function tagblock($link,$uid,$count = 0,$flags = 0,$type = TERM_HASHTAG) {
}
return $o;
}
+
+
+ /**
+ * verbs: [0] = first person singular, e.g. "I want", [1] = 3rd person singular, e.g. "Bill wants"
+ * We use the first person form when creating an activity, but the third person for use in activities
+ * FIXME: There is no accounting for verb gender for languages where this is significant. We may eventually
+ * require obj_verbs() to provide full conjugations and specify which form to use in the $_REQUEST params to this module.
+ */
+
+
+
+function obj_verbs() {
+ $verbs = array(
+ 'has' => array( t('have'), t('has')),
+ 'wants' => array( t('want'), t('wants')),
+ 'likes' => array( t('like'), t('likes')),
+ 'dislikes' => array( t('dislike'), t('dislikes')),
+ );
+
+ $arr = array('verbs' => $verbs);
+ call_hooks('obj_verbs', $arr);
+ return $arr['verbs'];
+}
+
+
+function obj_verb_selector() {
+ $verbs = obj_verbs();
+ $o .= '';
+ return $o;
+
+}
\ No newline at end of file
diff --git a/include/text.php b/include/text.php
index db29697f9..2d29dff31 100755
--- a/include/text.php
+++ b/include/text.php
@@ -1023,19 +1023,24 @@ function prepare_body($item,$attach = false) {
$s .= '
';
- }
+// At some point in time, posttags were removed from the threaded conversation templates, but remained in the search_item template.
+// Code to put them back was added into include/conversation.php and/or include/ItemObject.php but under new class names
+// Then it was discovered that the following bits remained of the old code.
+// Commented out, but we may decide to use this instead of the other version and put all the tag rendering in one place. In the other
+// location it is more theme-able.
+// if(is_array($item['term']) && count($item['term'])) {
+// $tstr = '';
+// foreach($item['term'] as $t) {
+// $t1 = format_term_for_display($t);
+// if($t1) {
+// if($tstr)
+// $tstr .= ' ';
+// $tstr .= $t1;
+// }
+// }
+// if($tstr)
+// $s .= '
' . $tstr . '
';
+// }
$writeable = ((get_observer_hash() == $item['owner_xchan']) ? true : false);
diff --git a/include/zot.php b/include/zot.php
index f9b40c06f..6c8a21d1a 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -1354,7 +1354,7 @@ function import_directory_profile($hash,$profile) {
}
else {
$update = true;
- $x = q("insert into xprof (xprof_hash, xprof_desc, xprof_dob, xprof_age, xprof_gender, xprof_marital, xprof_sexual, xprof_locale, xprof_region, xprof_postcode, xprof_country, xprof_keywords) values ('%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s') ",
+ $x = q("insert into xprof (xprof_hash, xprof_desc, xprof_dob, xprof_age, xprof_gender, xprof_marital, xprof_sexual, xprof_locale, xprof_region, xprof_postcode, xprof_country, xprof_keywords) values ('%s', '%s', '%s', %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s') ",
dbesc($arr['xprof_hash']),
dbesc($arr['xprof_desc']),
dbesc($arr['xprof_dob']),
diff --git a/index.php b/index.php
index 08943e4b7..14b8ca856 100755
--- a/index.php
+++ b/index.php
@@ -118,8 +118,11 @@ if(! x($_SESSION,'sysmsg_info'))
*/
-if($install)
- $a->module = 'setup';
+if($install) {
+ /* Allow an exception for the view module so that pcss will be interpreted during installation */
+ if($a->module != 'view')
+ $a->module = 'setup';
+}
else
check_config($a);
diff --git a/install/INSTALL.txt b/install/INSTALL.txt
index 53e2018cc..3f135c349 100644
--- a/install/INSTALL.txt
+++ b/install/INSTALL.txt
@@ -1,31 +1,28 @@
-Friendica Installation
+Red Matrix Installation
-We've tried very hard to ensure that Friendica will run on commodity hosting
-platforms - such as those used to host Wordpress blogs and Drupal websites.
-But be aware that Friendica is more than a simple web application. It is a
+We've tried very hard to ensure that the Red Matrix will run on commodity
+hosting platforms - such as those used to host Wordpress blogs and Drupal
+websites. It will run on most any Linux VPS system. Windows LAMP platforms
+such as XAMPP and WAMP are not officially supported at this time - however
+we welcome patches if you manage to get it working.
+
+Be aware that the Red Matrix is more than a simple web application. It is a
complex communications system which more closely resembles an email server
than a web server. For reliability and performance, messages are delivered in
the background and are queued for later delivery when sites are down. This
kind of functionality requires a bit more of the host system than the typical
-blog. Not every PHP/MySQL hosting provider will be able to support Friendica.
-Many will. But please review the requirements and confirm these with your
-hosting provider prior to installation.
+blog. Not every PHP/MySQL hosting provider will be able to support the
+Red Matrix. Many will - but please review the requirements and confirm these
+with your hosting provider prior to installation. (And preferably before
+entering into a long-term contract.)
Before you begin: Choose a domain name or subdomain name for your server.
Put some thought into this - because changing it is currently not-supported.
Things will break, and some of your friends may have difficulty communicating
-with you. We plan to address this limitation in a future release. Also decide
-if you wish to connect with members of the Diaspora network, as this will
-impact the installation requirements.
+with you. We plan to address this limitation in a future release.
-Decide if you will use SSL and obtain an SSL cert. Communications with the
-Diaspora network MAY require both SSL AND an SSL cert signed by a CA which is
-recognised by the major browsers. Friendica will work with self-signed certs
-but Diaspora communication may not. For best results, install your cert PRIOR
-to installing Friendica and when visiting your site for the initial
-installation in step 5, please use the https: link. (Use the http: or non-SSL
-link if your cert is self-signed).
+Decide if you will use SSL and obtain an SSL cert before software installation. You SHOULD use SSL. If you use SSL, you MUST use a "browser-valid" certificate. Please test your certificate prior to installation. A web tool for testing your certificate is available at "http://www.digicert.com/help/". When visiting your site for the first time, please use the SSL ("https://") URL if SSL is available. This will avoid problems later.
1. Requirements
@@ -35,22 +32,21 @@ local .htaccess file
- PHP 5.3+. The later the better.
- PHP *command line* access with register_argc_argv set to true in the
-php.ini file [or see 'poormancron' in section 8]
+php.ini file - and with no hosting provider restrictions on the use of exec()
+and proc_open().
- - curl, gd (with at least jpeg support), mysql, mbstring, mcrypt, and openssl extensions
+ - curl, gd (with at least jpeg support), mysqli, mbstring, mcrypt, and openssl extensions. The imagick extension is not required but desirable.
- some form of email server or email gateway such that PHP mail() works
- - Mysql 5.x
+ - Mysql 5.x or MariaDB
- - ability to schedule jobs with cron (Linux/Mac) or Scheduled Tasks
-(Windows) [Note: other options are presented in Section 8 of this document]
+ - ability to schedule jobs with cron.
- Installation into a top-level domain or sub-domain (without a
-directory/path component in the URL) is preferred. This is REQUIRED if
-you wish to communicate with the Diaspora network.
+directory/path component in the URL) is REQUIRED.
-2. Unpack the Friendica files into the root of your web server document area.
+2. Unpack the Red Matrix files into the root of your web server document area.
- If you copy the directory tree to your webserver, make sure
that you also copy .htaccess - as "dot" files are often hidden
@@ -66,8 +62,8 @@ write or create files in your web directory, create an empty file called
5. Visit your website with a web browser and follow the instructions. Please
note any error messages and correct these before continuing. If you are using
-SSL with a known signature authority (recommended), use the https: link to your
-website. If you are using a self-signed cert or no cert, use the http: link.
+SSL with a known signature authority, use the https: link to your
+website.
6. *If* the automated installation fails for any reason, check the following:
@@ -112,24 +108,6 @@ look like (changing it to the correct PHP location)
$a->config['system']['php_path'] = '/usr/local/php53/bin/php';
-Alternative: You may be able to use the 'poormancron' plugin to perform this
-step if you are using a recent Friendica release. 'poormancron' may result in
-perfomance and memory issues and is only suitable for small sites with one or
-two users and a handful of contacts. To do this, edit the file
-".htconfig.php" and look for a line describing your plugins. On a fresh
-installation, it will look like
-
-$a->config['system']['addon'] = 'js_upload';
-
-This indicates the "js_upload" addon module is enabled. You may add additional
-addons/plugins using this same line in the configuration file. Change it to
-read
-
-$a->config['system']['addon'] = 'js_upload,poormancron';
-
-and save your changes.
-
-
#####################################################################
@@ -153,8 +131,6 @@ the database server name is "localhost".
This could be the result of one of our Apache directives not being
supported by your version of Apache. Examine your apache server logs.
- You might remove the line "Options -Indexes" from the .htaccess file if
-you are using a Windows server as this has been known to cause problems.
Also check your file permissions. Your website and all contents must generally
be world-readable.
@@ -200,8 +176,7 @@ likely that mod-rewrite is not installed in your web server or is not working.
distribution or (if Windows) the provider of your Apache server software if
you need to change either of these and can not figure out how. There is
a lot of help available on the web. Google "mod-rewrite" along with the
-name of your operating system distribution or Apache package (if using
-Windows).
+name of your operating system distribution or Apache package.
#####################################################################
@@ -223,7 +198,7 @@ Retry the installation. As soon as the database has been created,
#####################################################################
- Some configurations with "suhosin" security are configured without
-an ability to run external processes. Friendica requires this ability.
+an ability to run external processes. The Red Matrix requires this ability.
Following are some notes provided by one of our members.
#####################################################################
@@ -233,26 +208,26 @@ certain functions like proc_open, as configured in /etc/php5/conf.d/suhosin.ini:
suhosin.executor.func.blacklist = proc_open, ...
-For those sites like Friendica that really need these functions they can be
-enabled, e.g. in /etc/apache2/sites-available/friendica:
+For those sites like Red Matrix that really need these functions they can be
+enabled, e.g. in /etc/apache2/sites-available/redmatrix:
-
+
php_admin_value suhosin.executor.func.blacklist none
php_admin_value suhosin.executor.eval.blacklist none
-This enables every function for Friendica if accessed via browser, but not for
+This enables every function for Red Matrix if accessed via browser, but not for
the cronjob that is called via php command line. I attempted to enable it for
cron by using something like
- */10 * * * * cd /var/www/friendica/friendica/ && sudo -u www-data /usr/bin/php
+ */10 * * * * cd /var/www/redmatrix/ && sudo -u www-data /usr/bin/php
-d suhosin.executor.func.blacklist=none -d suhosin.executor.eval.blacklist=none
-f include/poller.php
-This worked well for simple test cases, but the friendica-cron still failed with
+This worked well for simple test cases, but the cron job still failed with
a fatal error:
suhosin[22962]: ALERT - function within blacklist called: proc_open() (attacker
-'REMOTE_ADDR not set', file '/var/www/friendica/friendica/boot.php', line 1341)
+'REMOTE_ADDR not set', file '/var/www/redmatrix/boot.php', line 1341)
After a while I noticed, that include/poller.php calls further php script via
proc_open. These scripts themselves also use proc_open and fail, because they
@@ -264,7 +239,7 @@ So the simple solution is to put the correct parameters into .htconfig.php:
-d suhosin.executor.eval.blacklist=none';
-This is obvious as soon as you notice that the friendica-cron uses proc_open to
+This is obvious as soon as you notice that the cron uses proc_open to
execute php-scripts that also use proc_open, but it took me quite some time to
find that out. I hope this saves some time for other people using suhosin with
function blacklists.
diff --git a/js/main.js b/js/main.js
index 161068310..9eb9c7946 100644
--- a/js/main.js
+++ b/js/main.js
@@ -351,9 +351,12 @@ function updateConvItems(mode,data) {
var ident = $(this).attr('id');
var commentWrap = $('#'+ident+' .collapsed-comments').attr('id');
- var itmId = commentWrap.replace('collapsed-comments-','');
+ var itmId = 0;
var isVisible = false;
+ if(typeof commentWrap !== 'undefined')
+ itmId = commentWrap.replace('collapsed-comments-','');
+
if($('#' + ident).length == 0 && profile_page == 1) {
$('img',this).each(function() {
$(this).attr('src',$(this).attr('dst'));
diff --git a/mod/channel.php b/mod/channel.php
index 5d4c7ce1b..c7b631c96 100644
--- a/mod/channel.php
+++ b/mod/channel.php
@@ -48,7 +48,7 @@ function channel_aside(&$a) {
$a->set_widget('categories',categories_widget($a->get_baseurl(true) . '/channel/' . $a->profile['channel_address'],$cat));
}
if(feature_enabled($a->profile['profile_uid'],'tagadelic'))
- $a->set_widget('tagcloud',tagblock('search',$a->profile['profile_uid'],50,ITEM_WALL|ITEM_THREAD_TOP));
+ $a->set_widget('tagcloud',tagblock('search',$a->profile['profile_uid'],50,$a->profile['channel_hash'],ITEM_WALL));
}
diff --git a/mod/connections.php b/mod/connections.php
index 89c0bcbc0..1b97412d4 100644
--- a/mod/connections.php
+++ b/mod/connections.php
@@ -23,6 +23,11 @@ function connections_init(&$a) {
$a->data['abook'] = $r[0];
}
}
+
+ $channel = $a->get_channel();
+ if($channel)
+ head_set_icon($channel['xchan_photo_s']);
+
}
function connections_aside(&$a) {
diff --git a/mod/message.php b/mod/message.php
index 54615f081..f5a2101ab 100644
--- a/mod/message.php
+++ b/mod/message.php
@@ -206,6 +206,7 @@ function message_content(&$a) {
}
$channel = $a->get_channel();
+ head_set_icon($channel['xchan_photo_s']);
$tpl = get_markup_template('mail_head.tpl');
$header = replace_macros($tpl, array(
diff --git a/mod/network.php b/mod/network.php
index aa134eece..0f4b4f7e8 100644
--- a/mod/network.php
+++ b/mod/network.php
@@ -7,6 +7,9 @@ function network_init(&$a) {
notice( t('Permission denied.') . EOL);
return;
}
+
+ $channel = $a->get_channel();
+ head_set_icon($channel['xchan_photo_s']);
$is_a_date_query = false;
diff --git a/mod/profiles.php b/mod/profiles.php
index 28d8dd973..173d97138 100644
--- a/mod/profiles.php
+++ b/mod/profiles.php
@@ -200,6 +200,11 @@ function profiles_post(&$a) {
$day = intval($_POST['day']);
if(($day > $mtab[$month]) || ($day < 0))
$day = 0;
+
+ if($year && (! ($month && $day))) {
+ $month = 1; $day = 1;
+ }
+
$dob = '0000-00-00';
$dob = sprintf('%04d-%02d-%02d',$year,$month,$day);
diff --git a/mod/settings.php b/mod/settings.php
index e830d7070..164a2a8a0 100644
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -580,6 +580,11 @@ function settings_content(&$a) {
return;
}
+
+ $channel = $a->get_channel();
+ if($channel)
+ head_set_icon($channel['xchan_photo_s']);
+
// if(x($_SESSION,'submanage') && intval($_SESSION['submanage'])) {
// notice( t('Permission denied.') . EOL );
// return;
diff --git a/mod/thing.php b/mod/thing.php
index 723b069bc..91bdca78a 100644
--- a/mod/thing.php
+++ b/mod/thing.php
@@ -1,5 +1,6 @@
get_account();
+ $channel = $a->get_channel();
+
$name = escape_tags($_REQUEST['term']);
+ $verb = escape_tags($_REQUEST['verb']);
+ $profile_guid = escape_tags($_REQUEST['profile']);
$url = $_REQUEST['link'];
$photo = $_REQUEST['photo'];
$hash = random_string();
- if(! $name)
+ $verbs = obj_verbs();
+
+ /**
+ * verbs: [0] = first person singular, e.g. "I want", [1] = 3rd person singular, e.g. "Bill wants"
+ * We use the first person form when creating an activity, but the third person for use in activities
+ * FIXME: There is no accounting for verb gender for languages where this is significant. We may eventually
+ * require obj_verbs() to provide full conjugations and specify which form to use in the $_REQUEST params to this module.
+ */
+
+ $translated_verb = $verbs[$verb][1];
+
+ /**
+ * The site administrator can do things that normals cannot.
+ * This is restricted because it will likely cause
+ * an activitystreams protocol violation and the activity might
+ * choke in some other network and result in unnecessary
+ * support requests. It isn't because we're trying to be heavy-handed
+ * about what you can and can't do.
+ */
+
+ if(! $translated_verb) {
+ if(is_site_admin())
+ $translated_verb = $verb;
+ }
+
+ /**
+ * Things, objects: We do not provide definite (a, an) or indefinite (the) articles or singular/plural designators
+ * That needs to be specified in your thing. e.g. Mike has "a carrot", Greg wants "balls", Bob likes "the Boston Red Sox".
+ */
+
+ /**
+ * Future work on this module might produce more complex activities with targets, e.g. Phillip likes Karen's moustache
+ * and to describe other non-thing objects like channels, such as Karl wants Susan - where Susan represents a channel profile.
+ */
+
+ if((! $name) || (! $translated_verb))
return;
- $r = q("insert into term ( aid, uid, oid, otype, type, term, url, imgurl, term_hash )
- values( %d, %d, %d, %d, %d, '%s', '%s', '%s', '%s' ) ",
- intval($account_id),
- intval(local_user()),
- 0,
- TERM_OBJ_THING,
- TERM_THING,
- dbesc($name),
- dbesc(($url) ? $url : z_root() . '/thing/' . $hash),
- dbesc(($photo) ? $photo : ''),
- dbesc($hash)
+ $sql = (($profile_guid) ? " and profile_guid = '" . dbesc($profile_guid) . "' " : " and is_default = 1 ");
+ $p = q("select profile_guid, is_default from profile where uid = %d $sql limit 1",
+ intval(local_user())
);
+ if($p)
+ $profile = $p[0];
+ else
+ return;
+
+
+ $r = q("select * from term where uid = %d and otype = %d and type = %d and term = '%s' limit 1",
+ intval(local_user()),
+ intval(TERM_OBJ_THING),
+ intval(TERM_THING),
+ dbesc($name)
+ );
+ if(! $r) {
+ $r = q("insert into term ( aid, uid, oid, otype, type, term, url, imgurl, term_hash )
+ values( %d, %d, %d, %d, %d, '%s', '%s', '%s', '%s' ) ",
+ intval($account_id),
+ intval(local_user()),
+ 0,
+ intval(TERM_OBJ_THING),
+ intval(TERM_THING),
+ dbesc($name),
+ dbesc(($url) ? $url : z_root() . '/thing/' . $hash),
+ dbesc(($photo) ? $photo : ''),
+ dbesc($hash)
+ );
+ $r = q("select * from term where uid = %d and otype = %d and type = %d and term = '%s' limit 1",
+ intval(local_user()),
+ intval(TERM_OBJ_THING),
+ intval(TERM_THING),
+ dbesc($name)
+ );
+ }
+ $term = $r[0];
+
+ $r = q("insert into obj ( obj_page, obj_verb, obj_type, obj_channel, obj_obj) values ('%s','%s', %d, %d, '%s') ",
+ dbesc($profile['profile_guid']),
+ dbesc($verb),
+ intval(TERM_OBJ_THING),
+ intval(local_user()),
+ dbesc($term['term_hash'])
+ );
+
+ if(! $r) {
+ notice( t('Object store: failed'));
+ return;
+ }
+
+ info( t('thing/stuff added'));
+
+ $arr = array();
+ $links = array(array('rel' => 'alternate','type' => 'text/html',
+ 'href' => $term['url']));
+
+ $objtype = ACTIVITY_OBJ_THING;
+
+ $obj = json_encode(array(
+ 'type' => $objtype,
+ 'id' => $term['url'],
+ 'link' => $links,
+ 'title' => $term['term'],
+ 'content' => $term['term']
+ ));
+
+ $bodyverb = str_replace('OBJ: ', '',t('OBJ: %1$s %2$s %3$s'));
+
+ $arr['owner_xchan'] = $channel['channel_hash'];
+ $arr['author_xchan'] = $channel['channel_hash'];
+
+
+ $arr['item_flags'] = ITEM_ORIGIN|ITEM_WALL|ITEM_THREAD_TOP;
+
+ $ulink = '[zrl=' . $channel['xchan_url'] . ']' . $channel['channel_name'] . '[/zrl]';
+ $plink = '[zrl=' . $term['url'] . ']' . $term['term'] . '[/zrl]';
+
+ $arr['body'] = sprintf( $bodyverb, $ulink, $translated_verb, $plink );
+
+ $arr['verb'] = $verb;
+ $arr['obj_type'] = $objtype;
+ $arr['object'] = $obj;
+
+ if(! $profile['is_default']) {
+ $arr['item_private'] = true;
+ $str = '';
+ $r = q("select abook_hash from abook where abook_channel = %d and abook_profile = '%s'",
+ intval(local_user()),
+ dbesc($profile_guid)
+ );
+ if($r) {
+ $arr['allow_cid'] = '';
+ foreach($r as $rr)
+ $arr['allow_cid'] .= '<' . $rr['abook_hash'] . '>';
+ }
+ else
+ $arr['allow_cid'] = '<' . get_observer_hash() . '>';
+ }
+
+ $ret = post_activity_item($arr);
+
+ if($ret['success'])
+ proc_run('php','include/notifier.php','tag',$ret['activity']['id']);
}
function thing_content(&$a) {
+
+ /* placeholders */
+ if(argc() > 1) {
+ return t('not yet implemented.');
+ }
+ require_once('include/contact_selectors.php');
+
+ $o .= replace_macros(get_markup_template('thing_input.tpl'),array(
+ '$thing_hdr' => t('Add Stuff to your Profile'),
+ '$multiprof' => feature_enabled(local_user(),'multi_profiles'),
+ '$profile_lbl' => t('Select a profile'),
+ '$profile_select' => contact_profile_assign(''),
+ '$verb_lbl' => t('Select a category of stuff. e.g. I ______ something'),
+ '$verb_select' => obj_verb_selector(),
+ '$thing_lbl' => t('Name of thing or stuff e.g. something'),
+ '$url_lbl' => t('URL of thing or stuff (optional)'),
+ '$img_lbl' => t('URL for photo of thing or stuff (optional)'),
+ '$submit' => t('Submit')
+ ));
+
+ return $o;
}
diff --git a/util/messages.po b/util/messages.po
index 982efc247..e3b0c86c6 100644
--- a/util/messages.po
+++ b/util/messages.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-28 00:01-0700\n"
+"POT-Creation-Date: 2013-07-05 00:01-0700\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -243,7 +243,7 @@ msgid "Please visit %s to approve or reject the suggestion."
msgstr ""
#: ../../include/Contact.php:53 ../../include/contact_widgets.php:9
-#: ../../mod/match.php:58 ../../mod/suggest.php:56 ../../boot.php:1578
+#: ../../mod/match.php:58 ../../mod/suggest.php:56 ../../boot.php:1579
msgid "Connect"
msgstr ""
@@ -285,92 +285,92 @@ msgstr ""
msgid "Send PM"
msgstr ""
-#: ../../include/contact_selectors.php:32
+#: ../../include/contact_selectors.php:30
msgid "Unknown | Not categorised"
msgstr ""
-#: ../../include/contact_selectors.php:33
+#: ../../include/contact_selectors.php:31
msgid "Block immediately"
msgstr ""
-#: ../../include/contact_selectors.php:34
+#: ../../include/contact_selectors.php:32
msgid "Shady, spammer, self-marketer"
msgstr ""
-#: ../../include/contact_selectors.php:35
+#: ../../include/contact_selectors.php:33
msgid "Known to me, but no opinion"
msgstr ""
-#: ../../include/contact_selectors.php:36
+#: ../../include/contact_selectors.php:34
msgid "OK, probably harmless"
msgstr ""
-#: ../../include/contact_selectors.php:37
+#: ../../include/contact_selectors.php:35
msgid "Reputable, has my trust"
msgstr ""
-#: ../../include/contact_selectors.php:56
+#: ../../include/contact_selectors.php:54
msgid "Frequently"
msgstr ""
-#: ../../include/contact_selectors.php:57
+#: ../../include/contact_selectors.php:55
msgid "Hourly"
msgstr ""
-#: ../../include/contact_selectors.php:58
+#: ../../include/contact_selectors.php:56
msgid "Twice daily"
msgstr ""
-#: ../../include/contact_selectors.php:59
+#: ../../include/contact_selectors.php:57
msgid "Daily"
msgstr ""
-#: ../../include/contact_selectors.php:60
+#: ../../include/contact_selectors.php:58
msgid "Weekly"
msgstr ""
-#: ../../include/contact_selectors.php:61
+#: ../../include/contact_selectors.php:59
msgid "Monthly"
msgstr ""
-#: ../../include/contact_selectors.php:76
+#: ../../include/contact_selectors.php:74
msgid "Friendica"
msgstr ""
-#: ../../include/contact_selectors.php:77
+#: ../../include/contact_selectors.php:75
msgid "OStatus"
msgstr ""
-#: ../../include/contact_selectors.php:78
+#: ../../include/contact_selectors.php:76
msgid "RSS/Atom"
msgstr ""
-#: ../../include/contact_selectors.php:79 ../../mod/admin.php:624
+#: ../../include/contact_selectors.php:77 ../../mod/admin.php:624
#: ../../mod/admin.php:633 ../../boot.php:1323
msgid "Email"
msgstr ""
-#: ../../include/contact_selectors.php:80
+#: ../../include/contact_selectors.php:78
msgid "Diaspora"
msgstr ""
-#: ../../include/contact_selectors.php:81
+#: ../../include/contact_selectors.php:79
msgid "Facebook"
msgstr ""
-#: ../../include/contact_selectors.php:82
+#: ../../include/contact_selectors.php:80
msgid "Zot!"
msgstr ""
-#: ../../include/contact_selectors.php:83
+#: ../../include/contact_selectors.php:81
msgid "LinkedIn"
msgstr ""
-#: ../../include/contact_selectors.php:84
+#: ../../include/contact_selectors.php:82
msgid "XMPP/IM"
msgstr ""
-#: ../../include/contact_selectors.php:85
+#: ../../include/contact_selectors.php:83
msgid "MySpace"
msgstr ""
@@ -410,7 +410,7 @@ msgid "Examples: Robert Morgenstein, Fishing"
msgstr ""
#: ../../include/contact_widgets.php:33 ../../mod/directory.php:160
-#: ../../mod/directory.php:165 ../../mod/connections.php:651
+#: ../../mod/directory.php:165 ../../mod/connections.php:652
msgid "Find"
msgstr ""
@@ -450,7 +450,7 @@ msgstr[0] ""
msgstr[1] ""
#: ../../include/contact_widgets.php:126 ../../include/js_strings.php:7
-#: ../../include/ItemObject.php:273
+#: ../../include/ItemObject.php:269
msgid "show more"
msgstr ""
@@ -545,7 +545,7 @@ msgid "Finishes:"
msgstr ""
#: ../../include/event.php:40 ../../include/bb2diaspora.php:455
-#: ../../mod/events.php:448 ../../mod/directory.php:116 ../../boot.php:1632
+#: ../../mod/events.php:448 ../../mod/directory.php:116 ../../boot.php:1633
msgid "Location:"
msgstr ""
@@ -730,6 +730,14 @@ msgstr ""
msgid "Ability to mark special posts with a star indicator"
msgstr ""
+#: ../../include/features.php:61
+msgid "Tag Cloud"
+msgstr ""
+
+#: ../../include/features.php:61
+msgid "Provide a personal tag cloud on your channel page"
+msgstr ""
+
#: ../../include/group.php:25
msgid ""
"A deleted group with this name was revived. Existing item permissions "
@@ -773,9 +781,9 @@ msgstr ""
msgid "Delete this item?"
msgstr ""
-#: ../../include/js_strings.php:6 ../../include/ItemObject.php:544
-#: ../../mod/photos.php:1061 ../../mod/photos.php:1099
-#: ../../mod/photos.php:1126
+#: ../../include/js_strings.php:6 ../../include/ItemObject.php:540
+#: ../../mod/photos.php:1055 ../../mod/photos.php:1093
+#: ../../mod/photos.php:1120
msgid "Comment"
msgstr ""
@@ -887,14 +895,14 @@ msgstr ""
#: ../../include/photo/photo_driver.php:495
#: ../../include/photo/photo_driver.php:502
#: ../../include/photo/photo_driver.php:509 ../../include/photos.php:51
-#: ../../mod/photos.php:97 ../../mod/photos.php:751 ../../mod/photos.php:773
+#: ../../mod/photos.php:97 ../../mod/photos.php:748 ../../mod/photos.php:770
#: ../../mod/profile_photo.php:88 ../../mod/profile_photo.php:93
#: ../../mod/profile_photo.php:98 ../../mod/profile_photo.php:223
#: ../../mod/profile_photo.php:323 ../../mod/profile_photo.php:332
msgid "Profile Photos"
msgstr ""
-#: ../../include/profile_advanced.php:7 ../../include/profile_advanced.php:84
+#: ../../include/profile_advanced.php:7 ../../include/profile_advanced.php:118
#: ../../mod/profperm.php:112
msgid "Profile"
msgstr ""
@@ -904,7 +912,7 @@ msgid "Full Name:"
msgstr ""
#: ../../include/profile_advanced.php:17 ../../mod/directory.php:118
-#: ../../boot.php:1634
+#: ../../boot.php:1635
msgid "Gender:"
msgstr ""
@@ -925,7 +933,7 @@ msgid "Age:"
msgstr ""
#: ../../include/profile_advanced.php:37 ../../mod/directory.php:120
-#: ../../boot.php:1635
+#: ../../boot.php:1636
msgid "Status:"
msgstr ""
@@ -934,16 +942,16 @@ msgstr ""
msgid "for %1$d %2$s"
msgstr ""
-#: ../../include/profile_advanced.php:46 ../../mod/profiles.php:543
+#: ../../include/profile_advanced.php:46 ../../mod/profiles.php:549
msgid "Sexual Preference:"
msgstr ""
#: ../../include/profile_advanced.php:48 ../../mod/directory.php:122
-#: ../../boot.php:1636
+#: ../../boot.php:1637
msgid "Homepage:"
msgstr ""
-#: ../../include/profile_advanced.php:50 ../../mod/profiles.php:545
+#: ../../include/profile_advanced.php:50 ../../mod/profiles.php:551
msgid "Hometown:"
msgstr ""
@@ -951,7 +959,7 @@ msgstr ""
msgid "Tags:"
msgstr ""
-#: ../../include/profile_advanced.php:54 ../../mod/profiles.php:546
+#: ../../include/profile_advanced.php:54 ../../mod/profiles.php:552
msgid "Political Views:"
msgstr ""
@@ -967,11 +975,11 @@ msgstr ""
msgid "Hobbies/Interests:"
msgstr ""
-#: ../../include/profile_advanced.php:62 ../../mod/profiles.php:549
+#: ../../include/profile_advanced.php:62 ../../mod/profiles.php:555
msgid "Likes:"
msgstr ""
-#: ../../include/profile_advanced.php:64 ../../mod/profiles.php:550
+#: ../../include/profile_advanced.php:64 ../../mod/profiles.php:556
msgid "Dislikes:"
msgstr ""
@@ -1076,7 +1084,7 @@ msgstr ""
msgid "Manage/Edit Profiles"
msgstr ""
-#: ../../include/nav.php:78 ../../mod/fbrowser.php:25 ../../boot.php:2027
+#: ../../include/nav.php:78 ../../mod/fbrowser.php:25 ../../boot.php:2028
msgid "Photos"
msgstr ""
@@ -1174,7 +1182,7 @@ msgstr ""
msgid "Intros"
msgstr ""
-#: ../../include/nav.php:151 ../../mod/connections.php:537
+#: ../../include/nav.php:151 ../../mod/connections.php:538
msgid "New Connections"
msgstr ""
@@ -1226,7 +1234,7 @@ msgstr ""
msgid "New Message"
msgstr ""
-#: ../../include/nav.php:167 ../../mod/events.php:346 ../../boot.php:2038
+#: ../../include/nav.php:167 ../../mod/events.php:346 ../../boot.php:2039
msgid "Events"
msgstr ""
@@ -1259,7 +1267,7 @@ msgstr ""
msgid "Account/Channel Settings"
msgstr ""
-#: ../../include/nav.php:175 ../../mod/connections.php:645
+#: ../../include/nav.php:175 ../../mod/connections.php:646
msgid "Connections"
msgstr ""
@@ -1304,23 +1312,23 @@ msgstr ""
#: ../../include/attach.php:133 ../../include/attach.php:189
#: ../../include/attach.php:204 ../../include/attach.php:237
#: ../../include/attach.php:251 ../../include/attach.php:272
-#: ../../include/attach.php:464 ../../include/items.php:4455
+#: ../../include/attach.php:464 ../../include/items.php:4494
#: ../../mod/common.php:43 ../../mod/events.php:134 ../../mod/invite.php:13
#: ../../mod/invite.php:99 ../../mod/allfriends.php:10 ../../mod/api.php:26
#: ../../mod/api.php:31 ../../mod/setup.php:181 ../../mod/settings.php:579
#: ../../mod/viewconnections.php:33 ../../mod/viewconnections.php:38
#: ../../mod/delegate.php:6 ../../mod/group.php:15 ../../mod/photos.php:74
-#: ../../mod/photos.php:639 ../../mod/viewsrc.php:12 ../../mod/message.php:204
+#: ../../mod/photos.php:642 ../../mod/viewsrc.php:12 ../../mod/message.php:204
#: ../../mod/item.php:150 ../../mod/network.php:7 ../../mod/intro.php:50
#: ../../mod/connections.php:160 ../../mod/profiles.php:163
-#: ../../mod/profiles.php:471 ../../mod/new_channel.php:66
+#: ../../mod/profiles.php:476 ../../mod/new_channel.php:66
#: ../../mod/new_channel.php:97 ../../mod/manage.php:6
#: ../../mod/crepair.php:115 ../../mod/nogroup.php:25
#: ../../mod/profile_photo.php:185 ../../mod/profile_photo.php:198
#: ../../mod/notifications.php:66 ../../mod/editpost.php:10
-#: ../../mod/poke.php:128 ../../mod/channel.php:105 ../../mod/fsuggest.php:78
+#: ../../mod/poke.php:128 ../../mod/channel.php:108 ../../mod/fsuggest.php:78
#: ../../mod/suggest.php:32 ../../mod/register.php:60 ../../mod/regmod.php:18
-#: ../../mod/mood.php:111 ../../index.php:175 ../../index.php:337
+#: ../../mod/mood.php:111 ../../index.php:178 ../../index.php:340
msgid "Permission denied."
msgstr ""
@@ -1341,12 +1349,12 @@ msgstr ""
msgid "Photo storage failed."
msgstr ""
-#: ../../include/photos.php:276 ../../boot.php:2030
+#: ../../include/photos.php:276 ../../boot.php:2031
msgid "Photo Albums"
msgstr ""
-#: ../../include/photos.php:280 ../../mod/photos.php:789
-#: ../../mod/photos.php:1288
+#: ../../include/photos.php:280 ../../mod/photos.php:786
+#: ../../mod/photos.php:1268
msgid "Upload New Photos"
msgstr ""
@@ -1617,7 +1625,7 @@ msgid "Registration request at %s"
msgstr ""
#: ../../include/account.php:266 ../../include/account.php:293
-#: ../../include/account.php:350 ../../include/items.php:3980
+#: ../../include/account.php:350 ../../include/items.php:4019
#: ../../boot.php:1161
msgid "Administrator"
msgstr ""
@@ -1861,144 +1869,144 @@ msgstr ""
msgid "surprised"
msgstr ""
-#: ../../include/text.php:942
+#: ../../include/text.php:940
msgid "Monday"
msgstr ""
-#: ../../include/text.php:942
+#: ../../include/text.php:940
msgid "Tuesday"
msgstr ""
-#: ../../include/text.php:942
+#: ../../include/text.php:940
msgid "Wednesday"
msgstr ""
-#: ../../include/text.php:942
+#: ../../include/text.php:940
msgid "Thursday"
msgstr ""
-#: ../../include/text.php:942
+#: ../../include/text.php:940
msgid "Friday"
msgstr ""
-#: ../../include/text.php:942
+#: ../../include/text.php:940
msgid "Saturday"
msgstr ""
-#: ../../include/text.php:942
+#: ../../include/text.php:940
msgid "Sunday"
msgstr ""
-#: ../../include/text.php:946
+#: ../../include/text.php:944
msgid "January"
msgstr ""
-#: ../../include/text.php:946
+#: ../../include/text.php:944
msgid "February"
msgstr ""
-#: ../../include/text.php:946
+#: ../../include/text.php:944
msgid "March"
msgstr ""
-#: ../../include/text.php:946
+#: ../../include/text.php:944
msgid "April"
msgstr ""
-#: ../../include/text.php:946
+#: ../../include/text.php:944
msgid "May"
msgstr ""
-#: ../../include/text.php:946
+#: ../../include/text.php:944
msgid "June"
msgstr ""
-#: ../../include/text.php:946
+#: ../../include/text.php:944
msgid "July"
msgstr ""
-#: ../../include/text.php:946
+#: ../../include/text.php:944
msgid "August"
msgstr ""
-#: ../../include/text.php:946
+#: ../../include/text.php:944
msgid "September"
msgstr ""
-#: ../../include/text.php:946
+#: ../../include/text.php:944
msgid "October"
msgstr ""
-#: ../../include/text.php:946
+#: ../../include/text.php:944
msgid "November"
msgstr ""
-#: ../../include/text.php:946
+#: ../../include/text.php:944
msgid "December"
msgstr ""
-#: ../../include/text.php:1019
+#: ../../include/text.php:1017
msgid "unknown.???"
msgstr ""
-#: ../../include/text.php:1020
+#: ../../include/text.php:1018
msgid "bytes"
msgstr ""
-#: ../../include/text.php:1051 ../../include/text.php:1066
+#: ../../include/text.php:1049 ../../include/text.php:1064
#: ../../include/conversation.php:805
msgid "remove"
msgstr ""
-#: ../../include/text.php:1051 ../../include/text.php:1066
+#: ../../include/text.php:1049 ../../include/text.php:1064
msgid "[remove]"
msgstr ""
-#: ../../include/text.php:1054 ../../include/conversation.php:667
+#: ../../include/text.php:1052 ../../include/conversation.php:667
msgid "Categories:"
msgstr ""
-#: ../../include/text.php:1069 ../../include/conversation.php:668
+#: ../../include/text.php:1067 ../../include/conversation.php:668
msgid "Filed under:"
msgstr ""
-#: ../../include/text.php:1085 ../../include/text.php:1097
+#: ../../include/text.php:1083 ../../include/text.php:1095
msgid "Click to open/close"
msgstr ""
-#: ../../include/text.php:1249 ../../mod/events.php:324
+#: ../../include/text.php:1247 ../../mod/events.php:324
msgid "link to source"
msgstr ""
-#: ../../include/text.php:1281
+#: ../../include/text.php:1279
msgid "default"
msgstr ""
-#: ../../include/text.php:1293
+#: ../../include/text.php:1291
msgid "Select an alternate language"
msgstr ""
-#: ../../include/text.php:1445 ../../include/conversation.php:115
-#: ../../mod/like.php:103 ../../mod/subthread.php:89 ../../mod/tagger.php:43
+#: ../../include/text.php:1443 ../../include/conversation.php:115
+#: ../../mod/like.php:103 ../../mod/subthread.php:89 ../../mod/tagger.php:45
msgid "photo"
msgstr ""
-#: ../../include/text.php:1448 ../../include/conversation.php:118
-#: ../../mod/tagger.php:47
+#: ../../include/text.php:1446 ../../include/conversation.php:118
+#: ../../mod/tagger.php:49
msgid "event"
msgstr ""
-#: ../../include/text.php:1451 ../../include/conversation.php:143
-#: ../../mod/like.php:103 ../../mod/subthread.php:89 ../../mod/tagger.php:51
+#: ../../include/text.php:1449 ../../include/conversation.php:143
+#: ../../mod/like.php:103 ../../mod/subthread.php:89 ../../mod/tagger.php:53
msgid "status"
msgstr ""
-#: ../../include/text.php:1453 ../../include/conversation.php:145
-#: ../../mod/tagger.php:53
+#: ../../include/text.php:1451 ../../include/conversation.php:145
+#: ../../mod/tagger.php:55
msgid "comment"
msgstr ""
-#: ../../include/text.php:1458
+#: ../../include/text.php:1456
msgid "activity"
msgstr ""
@@ -2118,6 +2126,42 @@ msgstr ""
msgid "Extremely advanced. Leave this alone unless you know what you are doing"
msgstr ""
+#: ../../include/taxonomy.php:166
+msgid "Tags"
+msgstr ""
+
+#: ../../include/taxonomy.php:187
+msgid "have"
+msgstr ""
+
+#: ../../include/taxonomy.php:187
+msgid "has"
+msgstr ""
+
+#: ../../include/taxonomy.php:188
+msgid "want"
+msgstr ""
+
+#: ../../include/taxonomy.php:188
+msgid "wants"
+msgstr ""
+
+#: ../../include/taxonomy.php:189 ../../include/ItemObject.php:179
+msgid "like"
+msgstr ""
+
+#: ../../include/taxonomy.php:189
+msgid "likes"
+msgstr ""
+
+#: ../../include/taxonomy.php:190 ../../include/ItemObject.php:180
+msgid "dislike"
+msgstr ""
+
+#: ../../include/taxonomy.php:190
+msgid "dislikes"
+msgstr ""
+
#: ../../include/attach.php:184 ../../include/attach.php:232
msgid "Item was not found."
msgstr ""
@@ -2151,168 +2195,161 @@ msgstr ""
msgid "Path not available."
msgstr ""
-#: ../../include/ItemObject.php:109 ../../mod/photos.php:928
+#: ../../include/ItemObject.php:100 ../../mod/photos.php:928
msgid "Private Message"
msgstr ""
-#: ../../include/ItemObject.php:114 ../../mod/settings.php:659
+#: ../../include/ItemObject.php:105 ../../mod/settings.php:659
#: ../../mod/editpost.php:66
msgid "Edit"
msgstr ""
-#: ../../include/ItemObject.php:127 ../../include/conversation.php:630
+#: ../../include/ItemObject.php:118 ../../include/conversation.php:630
#: ../../mod/settings.php:660 ../../mod/group.php:177
-#: ../../mod/photos.php:1154 ../../mod/admin.php:628
+#: ../../mod/photos.php:1148 ../../mod/admin.php:628
#: ../../mod/connections.php:329
msgid "Delete"
msgstr ""
-#: ../../include/ItemObject.php:133 ../../include/conversation.php:629
+#: ../../include/ItemObject.php:124 ../../include/conversation.php:629
msgid "Select"
msgstr ""
-#: ../../include/ItemObject.php:137
+#: ../../include/ItemObject.php:128
msgid "save to folder"
msgstr ""
-#: ../../include/ItemObject.php:164
+#: ../../include/ItemObject.php:156
msgid "add star"
msgstr ""
-#: ../../include/ItemObject.php:165
+#: ../../include/ItemObject.php:157
msgid "remove star"
msgstr ""
-#: ../../include/ItemObject.php:166
+#: ../../include/ItemObject.php:158
msgid "toggle star status"
msgstr ""
-#: ../../include/ItemObject.php:170
+#: ../../include/ItemObject.php:162
msgid "starred"
msgstr ""
-#: ../../include/ItemObject.php:174
+#: ../../include/ItemObject.php:173
msgid "add tag"
msgstr ""
-#: ../../include/ItemObject.php:183 ../../mod/photos.php:1041
+#: ../../include/ItemObject.php:179 ../../mod/photos.php:1035
msgid "I like this (toggle)"
msgstr ""
-#: ../../include/ItemObject.php:183
-msgid "like"
-msgstr ""
-
-#: ../../include/ItemObject.php:184 ../../mod/photos.php:1042
+#: ../../include/ItemObject.php:180 ../../mod/photos.php:1036
msgid "I don't like this (toggle)"
msgstr ""
-#: ../../include/ItemObject.php:184
-msgid "dislike"
-msgstr ""
-
-#: ../../include/ItemObject.php:186
+#: ../../include/ItemObject.php:182
msgid "Share this"
msgstr ""
-#: ../../include/ItemObject.php:186
+#: ../../include/ItemObject.php:182
msgid "share"
msgstr ""
-#: ../../include/ItemObject.php:210 ../../include/ItemObject.php:211
+#: ../../include/ItemObject.php:206 ../../include/ItemObject.php:207
#, php-format
msgid "View %s's profile - %s"
msgstr ""
-#: ../../include/ItemObject.php:212
+#: ../../include/ItemObject.php:208
msgid "to"
msgstr ""
-#: ../../include/ItemObject.php:213
+#: ../../include/ItemObject.php:209
msgid "Wall-to-Wall"
msgstr ""
-#: ../../include/ItemObject.php:214
+#: ../../include/ItemObject.php:210
msgid "via Wall-To-Wall:"
msgstr ""
-#: ../../include/ItemObject.php:224 ../../include/conversation.php:677
+#: ../../include/ItemObject.php:220 ../../include/conversation.php:677
#, php-format
msgid " from %s"
msgstr ""
-#: ../../include/ItemObject.php:251 ../../include/conversation.php:696
-#: ../../include/conversation.php:1052 ../../mod/photos.php:1044
+#: ../../include/ItemObject.php:247 ../../include/conversation.php:696
+#: ../../include/conversation.php:1052 ../../mod/photos.php:1038
#: ../../mod/message.php:296 ../../mod/message.php:429
#: ../../mod/editpost.php:75
msgid "Please wait"
msgstr ""
-#: ../../include/ItemObject.php:272
+#: ../../include/ItemObject.php:268
#, php-format
msgid "%d comment"
msgid_plural "%d comments"
msgstr[0] ""
msgstr[1] ""
-#: ../../include/ItemObject.php:542 ../../mod/photos.php:1059
-#: ../../mod/photos.php:1097 ../../mod/photos.php:1124
+#: ../../include/ItemObject.php:538 ../../mod/photos.php:1053
+#: ../../mod/photos.php:1091 ../../mod/photos.php:1118
msgid "This is you"
msgstr ""
-#: ../../include/ItemObject.php:545 ../../mod/events.php:456
-#: ../../mod/invite.php:138 ../../mod/setup.php:283 ../../mod/setup.php:326
-#: ../../mod/settings.php:597 ../../mod/settings.php:709
-#: ../../mod/settings.php:737 ../../mod/settings.php:761
-#: ../../mod/settings.php:832 ../../mod/settings.php:999
-#: ../../mod/group.php:83 ../../mod/photos.php:674 ../../mod/photos.php:766
-#: ../../mod/photos.php:1023 ../../mod/photos.php:1062
-#: ../../mod/photos.php:1100 ../../mod/photos.php:1127
-#: ../../mod/message.php:297 ../../mod/message.php:428 ../../mod/admin.php:397
-#: ../../mod/admin.php:621 ../../mod/admin.php:757 ../../mod/admin.php:956
-#: ../../mod/admin.php:1043 ../../mod/connections.php:406
-#: ../../mod/profiles.php:523 ../../mod/import.php:351
-#: ../../mod/crepair.php:166 ../../mod/poke.php:166 ../../mod/fsuggest.php:108
-#: ../../mod/mood.php:134 ../../view/theme/redbasic/php/config.php:132
+#: ../../include/ItemObject.php:541 ../../mod/events.php:456
+#: ../../mod/thing.php:190 ../../mod/invite.php:138 ../../mod/setup.php:283
+#: ../../mod/setup.php:326 ../../mod/settings.php:597
+#: ../../mod/settings.php:709 ../../mod/settings.php:737
+#: ../../mod/settings.php:761 ../../mod/settings.php:832
+#: ../../mod/settings.php:999 ../../mod/group.php:83 ../../mod/photos.php:673
+#: ../../mod/photos.php:763 ../../mod/photos.php:1017
+#: ../../mod/photos.php:1056 ../../mod/photos.php:1094
+#: ../../mod/photos.php:1121 ../../mod/message.php:297
+#: ../../mod/message.php:428 ../../mod/admin.php:397 ../../mod/admin.php:621
+#: ../../mod/admin.php:757 ../../mod/admin.php:956 ../../mod/admin.php:1043
+#: ../../mod/connections.php:406 ../../mod/profiles.php:529
+#: ../../mod/import.php:351 ../../mod/crepair.php:166 ../../mod/poke.php:166
+#: ../../mod/fsuggest.php:108 ../../mod/mood.php:134
+#: ../../view/theme/redbasic/php/config.php:132
#: ../../view/theme/redbasic/php/config.php:149
#: ../../view/theme/redstrap/php/config.php:131
msgid "Submit"
msgstr ""
-#: ../../include/ItemObject.php:546
+#: ../../include/ItemObject.php:542
msgid "Bold"
msgstr ""
-#: ../../include/ItemObject.php:547
+#: ../../include/ItemObject.php:543
msgid "Italic"
msgstr ""
-#: ../../include/ItemObject.php:548
+#: ../../include/ItemObject.php:544
msgid "Underline"
msgstr ""
-#: ../../include/ItemObject.php:549
+#: ../../include/ItemObject.php:545
msgid "Quote"
msgstr ""
-#: ../../include/ItemObject.php:550
+#: ../../include/ItemObject.php:546
msgid "Code"
msgstr ""
-#: ../../include/ItemObject.php:551
+#: ../../include/ItemObject.php:547
msgid "Image"
msgstr ""
-#: ../../include/ItemObject.php:552
+#: ../../include/ItemObject.php:548
msgid "Link"
msgstr ""
-#: ../../include/ItemObject.php:553
+#: ../../include/ItemObject.php:549
msgid "Video"
msgstr ""
-#: ../../include/ItemObject.php:554 ../../include/conversation.php:1070
-#: ../../mod/photos.php:1063 ../../mod/editpost.php:95
+#: ../../include/ItemObject.php:550 ../../include/conversation.php:1070
+#: ../../mod/photos.php:1057 ../../mod/editpost.php:95
msgid "Preview"
msgstr ""
@@ -2434,7 +2471,7 @@ msgstr ""
msgid "Where are you right now?"
msgstr ""
-#: ../../include/conversation.php:1029 ../../mod/photos.php:1043
+#: ../../include/conversation.php:1029 ../../mod/photos.php:1037
msgid "Share"
msgstr ""
@@ -2525,51 +2562,51 @@ msgid "Example: bob@example.com, mary@example.com"
msgstr ""
#: ../../include/items.php:151 ../../mod/like.php:55 ../../mod/group.php:70
-#: ../../mod/profperm.php:28 ../../index.php:336
+#: ../../mod/profperm.php:28 ../../index.php:339
msgid "Permission denied"
msgstr ""
-#: ../../include/items.php:2508
+#: ../../include/items.php:2547
#, php-format
msgid "%s's birthday"
msgstr ""
-#: ../../include/items.php:2509
+#: ../../include/items.php:2548
#, php-format
msgid "Happy Birthday %s"
msgstr ""
-#: ../../include/items.php:3970
+#: ../../include/items.php:4009
msgid "[Name Withheld]"
msgstr ""
-#: ../../include/items.php:3978
+#: ../../include/items.php:4017
msgid "A new person is sharing with you at "
msgstr ""
-#: ../../include/items.php:3978
+#: ../../include/items.php:4017
msgid "You have a new follower at "
msgstr ""
-#: ../../include/items.php:4404 ../../mod/viewsrc.php:18
+#: ../../include/items.php:4443 ../../mod/viewsrc.php:18
#: ../../mod/admin.php:142 ../../mod/admin.php:665 ../../mod/admin.php:864
#: ../../mod/display.php:33 ../../mod/page.php:34
msgid "Item not found."
msgstr ""
-#: ../../include/items.php:4576
+#: ../../include/items.php:4615
msgid "Archives"
msgstr ""
-#: ../../include/items.php:4724 ../../mod/group.php:43 ../../mod/group.php:141
+#: ../../include/items.php:4763 ../../mod/group.php:43 ../../mod/group.php:141
msgid "Collection not found."
msgstr ""
-#: ../../include/items.php:4734
+#: ../../include/items.php:4773
msgid "Collection has no members."
msgstr ""
-#: ../../include/items.php:4750
+#: ../../include/items.php:4789
msgid "Connection not found."
msgstr ""
@@ -2654,6 +2691,47 @@ msgstr ""
msgid "Share this event"
msgstr ""
+#: ../../mod/thing.php:109
+msgid "Object store: failed"
+msgstr ""
+
+#: ../../mod/thing.php:113
+msgid "thing/stuff added"
+msgstr ""
+
+#: ../../mod/thing.php:129
+#, php-format
+msgid "OBJ: %1$s %2$s %3$s"
+msgstr ""
+
+#: ../../mod/thing.php:175
+msgid "not yet implemented."
+msgstr ""
+
+#: ../../mod/thing.php:181
+msgid "Add Stuff to your Profile"
+msgstr ""
+
+#: ../../mod/thing.php:183
+msgid "Select a profile"
+msgstr ""
+
+#: ../../mod/thing.php:185
+msgid "Select a category of stuff. e.g. I ______ something"
+msgstr ""
+
+#: ../../mod/thing.php:187
+msgid "Name of thing or stuff e.g. something"
+msgstr ""
+
+#: ../../mod/thing.php:188
+msgid "URL of thing or stuff (optional)"
+msgstr ""
+
+#: ../../mod/thing.php:189
+msgid "URL for photo of thing or stuff (optional)"
+msgstr ""
+
#: ../../mod/invite.php:25
msgid "Total invitation limit exceeded."
msgstr ""
@@ -2781,14 +2859,14 @@ msgstr ""
#: ../../mod/api.php:105 ../../mod/settings.php:954 ../../mod/settings.php:959
#: ../../mod/settings.php:982 ../../mod/settings.php:984
#: ../../mod/settings.php:985 ../../mod/settings.php:986
-#: ../../mod/profiles.php:501
+#: ../../mod/profiles.php:506
msgid "Yes"
msgstr ""
#: ../../mod/api.php:106 ../../mod/settings.php:954 ../../mod/settings.php:959
#: ../../mod/settings.php:982 ../../mod/settings.php:984
#: ../../mod/settings.php:985 ../../mod/settings.php:986
-#: ../../mod/profiles.php:502
+#: ../../mod/profiles.php:507
msgid "No"
msgstr ""
@@ -3158,7 +3236,7 @@ msgstr ""
msgid "toggle full screen mode"
msgstr ""
-#: ../../mod/tagger.php:96
+#: ../../mod/tagger.php:98
#, php-format
msgid "%1$s tagged %2$s's %3$s with %4$s"
msgstr ""
@@ -3653,7 +3731,7 @@ msgstr ""
msgid "No entries."
msgstr ""
-#: ../../mod/directory.php:103 ../../mod/profiles.php:578
+#: ../../mod/directory.php:103 ../../mod/profiles.php:584
msgid "Age: "
msgstr ""
@@ -3737,11 +3815,11 @@ msgstr ""
msgid "Album not found."
msgstr ""
-#: ../../mod/photos.php:125 ../../mod/photos.php:767
+#: ../../mod/photos.php:125 ../../mod/photos.php:764
msgid "Delete Album"
msgstr ""
-#: ../../mod/photos.php:165 ../../mod/photos.php:1024
+#: ../../mod/photos.php:165 ../../mod/photos.php:1018
msgid "Delete Photo"
msgstr ""
@@ -3772,63 +3850,55 @@ msgstr ""
msgid "You have used %1$.2f Mbytes of photo storage."
msgstr ""
-#: ../../mod/photos.php:702
+#: ../../mod/photos.php:695
msgid "Upload Photos"
msgstr ""
-#: ../../mod/photos.php:706 ../../mod/photos.php:762
+#: ../../mod/photos.php:699 ../../mod/photos.php:759
msgid "New album name: "
msgstr ""
-#: ../../mod/photos.php:707
+#: ../../mod/photos.php:700
msgid "or existing album name: "
msgstr ""
-#: ../../mod/photos.php:708
+#: ../../mod/photos.php:701
msgid "Do not show a status post for this upload"
msgstr ""
-#: ../../mod/photos.php:710 ../../mod/photos.php:1019
+#: ../../mod/photos.php:703 ../../mod/photos.php:1013
msgid "Permissions"
msgstr ""
-#: ../../mod/photos.php:751 ../../mod/photos.php:773 ../../mod/photos.php:1229
-#: ../../mod/photos.php:1241
+#: ../../mod/photos.php:748 ../../mod/photos.php:770 ../../mod/photos.php:1209
+#: ../../mod/photos.php:1221
msgid "Contact Photos"
msgstr ""
-#: ../../mod/photos.php:777
+#: ../../mod/photos.php:774
msgid "Edit Album"
msgstr ""
-#: ../../mod/photos.php:783
+#: ../../mod/photos.php:780
msgid "Show Newest First"
msgstr ""
-#: ../../mod/photos.php:785
+#: ../../mod/photos.php:782
msgid "Show Oldest First"
msgstr ""
-#: ../../mod/photos.php:828 ../../mod/photos.php:1271
+#: ../../mod/photos.php:826 ../../mod/photos.php:1251
msgid "View Photo"
msgstr ""
-#: ../../mod/photos.php:863
+#: ../../mod/photos.php:864
msgid "Permission denied. Access to this item may be restricted."
msgstr ""
-#: ../../mod/photos.php:865
+#: ../../mod/photos.php:866
msgid "Photo not available"
msgstr ""
-#: ../../mod/photos.php:921
-msgid "View photo"
-msgstr ""
-
-#: ../../mod/photos.php:921
-msgid "Edit photo"
-msgstr ""
-
#: ../../mod/photos.php:922
msgid "Use as profile photo"
msgstr ""
@@ -3837,35 +3907,39 @@ msgstr ""
msgid "View Full Size"
msgstr ""
-#: ../../mod/photos.php:1009
+#: ../../mod/photos.php:1001
+msgid "Edit photo"
+msgstr ""
+
+#: ../../mod/photos.php:1003
msgid "Rotate CW (right)"
msgstr ""
-#: ../../mod/photos.php:1010
+#: ../../mod/photos.php:1004
msgid "Rotate CCW (left)"
msgstr ""
-#: ../../mod/photos.php:1012
+#: ../../mod/photos.php:1006
msgid "New album name"
msgstr ""
-#: ../../mod/photos.php:1015
+#: ../../mod/photos.php:1009
msgid "Caption"
msgstr ""
-#: ../../mod/photos.php:1017
+#: ../../mod/photos.php:1011
msgid "Add a Tag"
msgstr ""
-#: ../../mod/photos.php:1021
+#: ../../mod/photos.php:1015
msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
msgstr ""
-#: ../../mod/photos.php:1277
+#: ../../mod/photos.php:1257
msgid "View Album"
msgstr ""
-#: ../../mod/photos.php:1286
+#: ../../mod/photos.php:1266
msgid "Recent Photos"
msgstr ""
@@ -3877,11 +3951,11 @@ msgstr ""
msgid "added your channel"
msgstr ""
-#: ../../mod/ping.php:230 ../../boot.php:1683 ../../boot.php:1763
+#: ../../mod/ping.php:230 ../../boot.php:1684 ../../boot.php:1764
msgid "g A l F d"
msgstr ""
-#: ../../mod/ping.php:252 ../../boot.php:1729 ../../boot.php:1804
+#: ../../mod/ping.php:252 ../../boot.php:1730 ../../boot.php:1805
msgid "[today]"
msgstr ""
@@ -3984,11 +4058,11 @@ msgstr ""
msgid "Help:"
msgstr ""
-#: ../../mod/help.php:38 ../../index.php:223
+#: ../../mod/help.php:38 ../../index.php:226
msgid "Not Found"
msgstr ""
-#: ../../mod/help.php:41 ../../index.php:226
+#: ../../mod/help.php:41 ../../index.php:229
msgid "Page not found."
msgstr ""
@@ -4048,7 +4122,7 @@ msgstr ""
msgid "Posts that mention or involve you"
msgstr ""
-#: ../../mod/network.php:311 ../../mod/connections.php:505
+#: ../../mod/network.php:311 ../../mod/connections.php:506
msgid "New"
msgstr ""
@@ -4529,12 +4603,12 @@ msgid "Deny"
msgstr ""
#: ../../mod/admin.php:629 ../../mod/intro.php:14 ../../mod/intro.php:99
-#: ../../mod/connections.php:303 ../../mod/connections.php:443
+#: ../../mod/connections.php:303 ../../mod/connections.php:444
msgid "Block"
msgstr ""
#: ../../mod/admin.php:630 ../../mod/connections.php:303
-#: ../../mod/connections.php:443
+#: ../../mod/connections.php:444
msgid "Unblock"
msgstr ""
@@ -4634,7 +4708,7 @@ msgid "Log level"
msgstr ""
#: ../../mod/intro.php:17 ../../mod/intro.php:100
-#: ../../mod/connections.php:310 ../../mod/connections.php:444
+#: ../../mod/connections.php:310 ../../mod/connections.php:445
#: ../../mod/notifications.php:51 ../../mod/notifications.php:160
#: ../../mod/notifications.php:206
msgid "Ignore"
@@ -4660,7 +4734,7 @@ msgstr ""
msgid "System error. Please try again later."
msgstr ""
-#: ../../mod/intro.php:95 ../../mod/connections.php:449
+#: ../../mod/intro.php:95 ../../mod/connections.php:450
#: ../../mod/notifications.php:153 ../../mod/notifications.php:200
msgid "Hide this contact from others"
msgstr ""
@@ -4767,7 +4841,7 @@ msgstr ""
msgid "Block or Unblock this connection"
msgstr ""
-#: ../../mod/connections.php:310 ../../mod/connections.php:444
+#: ../../mod/connections.php:310 ../../mod/connections.php:445
msgid "Unignore"
msgstr ""
@@ -4948,105 +5022,105 @@ msgstr ""
msgid "Update now"
msgstr ""
-#: ../../mod/connections.php:445
+#: ../../mod/connections.php:446
msgid "Currently blocked"
msgstr ""
-#: ../../mod/connections.php:446
+#: ../../mod/connections.php:447
msgid "Currently ignored"
msgstr ""
-#: ../../mod/connections.php:447
+#: ../../mod/connections.php:448
msgid "Currently archived"
msgstr ""
-#: ../../mod/connections.php:448
+#: ../../mod/connections.php:449
msgid "Currently pending"
msgstr ""
-#: ../../mod/connections.php:449
+#: ../../mod/connections.php:450
msgid ""
"Replies/likes to your public posts may still be visible"
msgstr ""
-#: ../../mod/connections.php:485 ../../mod/connections.php:556
+#: ../../mod/connections.php:486 ../../mod/connections.php:557
msgid "Blocked"
msgstr ""
-#: ../../mod/connections.php:490 ../../mod/connections.php:563
+#: ../../mod/connections.php:491 ../../mod/connections.php:564
msgid "Ignored"
msgstr ""
-#: ../../mod/connections.php:495 ../../mod/connections.php:577
+#: ../../mod/connections.php:496 ../../mod/connections.php:578
msgid "Hidden"
msgstr ""
-#: ../../mod/connections.php:500 ../../mod/connections.php:570
+#: ../../mod/connections.php:501 ../../mod/connections.php:571
msgid "Archived"
msgstr ""
-#: ../../mod/connections.php:510
+#: ../../mod/connections.php:511
msgid "All"
msgstr ""
-#: ../../mod/connections.php:531
+#: ../../mod/connections.php:532
msgid "Suggestions"
msgstr ""
-#: ../../mod/connections.php:534
+#: ../../mod/connections.php:535
msgid "Suggest new connections"
msgstr ""
-#: ../../mod/connections.php:540
+#: ../../mod/connections.php:541
msgid "Show pending (new) connections"
msgstr ""
-#: ../../mod/connections.php:543
+#: ../../mod/connections.php:544
msgid "All Connections"
msgstr ""
-#: ../../mod/connections.php:546
+#: ../../mod/connections.php:547
msgid "Show all connections"
msgstr ""
-#: ../../mod/connections.php:549
+#: ../../mod/connections.php:550
msgid "Unblocked"
msgstr ""
-#: ../../mod/connections.php:552
+#: ../../mod/connections.php:553
msgid "Only show unblocked connections"
msgstr ""
-#: ../../mod/connections.php:559
+#: ../../mod/connections.php:560
msgid "Only show blocked connections"
msgstr ""
-#: ../../mod/connections.php:566
+#: ../../mod/connections.php:567
msgid "Only show ignored connections"
msgstr ""
-#: ../../mod/connections.php:573
+#: ../../mod/connections.php:574
msgid "Only show archived connections"
msgstr ""
-#: ../../mod/connections.php:580
+#: ../../mod/connections.php:581
msgid "Only show hidden connections"
msgstr ""
-#: ../../mod/connections.php:622
+#: ../../mod/connections.php:623
#, php-format
msgid "%1$s [%2$s]"
msgstr ""
-#: ../../mod/connections.php:623 ../../mod/nogroup.php:41
+#: ../../mod/connections.php:624 ../../mod/nogroup.php:41
msgid "Edit contact"
msgstr ""
-#: ../../mod/connections.php:649
+#: ../../mod/connections.php:650
msgid "Search your connections"
msgstr ""
-#: ../../mod/connections.php:650
+#: ../../mod/connections.php:651
msgid "Finding: "
msgstr ""
@@ -5074,7 +5148,7 @@ msgid "Welcome %s. Remote authentication successful."
msgstr ""
#: ../../mod/profiles.php:18 ../../mod/profiles.php:138
-#: ../../mod/profiles.php:179 ../../mod/profiles.php:481
+#: ../../mod/profiles.php:179 ../../mod/profiles.php:486
msgid "Profile not found."
msgstr ""
@@ -5098,238 +5172,238 @@ msgstr ""
msgid "Profile Name is required."
msgstr ""
-#: ../../mod/profiles.php:312
+#: ../../mod/profiles.php:317
msgid "Marital Status"
msgstr ""
-#: ../../mod/profiles.php:316
+#: ../../mod/profiles.php:321
msgid "Romantic Partner"
msgstr ""
-#: ../../mod/profiles.php:320
+#: ../../mod/profiles.php:325
msgid "Likes"
msgstr ""
-#: ../../mod/profiles.php:324
+#: ../../mod/profiles.php:329
msgid "Dislikes"
msgstr ""
-#: ../../mod/profiles.php:328
+#: ../../mod/profiles.php:333
msgid "Work/Employment"
msgstr ""
-#: ../../mod/profiles.php:331
+#: ../../mod/profiles.php:336
msgid "Religion"
msgstr ""
-#: ../../mod/profiles.php:335
+#: ../../mod/profiles.php:340
msgid "Political Views"
msgstr ""
-#: ../../mod/profiles.php:339
+#: ../../mod/profiles.php:344
msgid "Gender"
msgstr ""
-#: ../../mod/profiles.php:343
+#: ../../mod/profiles.php:348
msgid "Sexual Preference"
msgstr ""
-#: ../../mod/profiles.php:347
+#: ../../mod/profiles.php:352
msgid "Homepage"
msgstr ""
-#: ../../mod/profiles.php:351
+#: ../../mod/profiles.php:356
msgid "Interests"
msgstr ""
-#: ../../mod/profiles.php:355
+#: ../../mod/profiles.php:360
msgid "Address"
msgstr ""
-#: ../../mod/profiles.php:362
+#: ../../mod/profiles.php:367
msgid "Location"
msgstr ""
-#: ../../mod/profiles.php:445
+#: ../../mod/profiles.php:450
msgid "Profile updated."
msgstr ""
-#: ../../mod/profiles.php:500
+#: ../../mod/profiles.php:505
msgid "Hide your contact/friend list from viewers of this profile?"
msgstr ""
-#: ../../mod/profiles.php:522
+#: ../../mod/profiles.php:528
msgid "Edit Profile Details"
msgstr ""
-#: ../../mod/profiles.php:524
+#: ../../mod/profiles.php:530
msgid "View this profile"
msgstr ""
-#: ../../mod/profiles.php:525
+#: ../../mod/profiles.php:531
msgid "Change Profile Photo"
msgstr ""
-#: ../../mod/profiles.php:526
+#: ../../mod/profiles.php:532
msgid "Create a new profile using these settings"
msgstr ""
-#: ../../mod/profiles.php:527
+#: ../../mod/profiles.php:533
msgid "Clone this profile"
msgstr ""
-#: ../../mod/profiles.php:528
+#: ../../mod/profiles.php:534
msgid "Delete this profile"
msgstr ""
-#: ../../mod/profiles.php:529
+#: ../../mod/profiles.php:535
msgid "Profile Name:"
msgstr ""
-#: ../../mod/profiles.php:530
+#: ../../mod/profiles.php:536
msgid "Your Full Name:"
msgstr ""
-#: ../../mod/profiles.php:531
+#: ../../mod/profiles.php:537
msgid "Title/Description:"
msgstr ""
-#: ../../mod/profiles.php:532
+#: ../../mod/profiles.php:538
msgid "Your Gender:"
msgstr ""
-#: ../../mod/profiles.php:533
+#: ../../mod/profiles.php:539
#, php-format
msgid "Birthday (%s):"
msgstr ""
-#: ../../mod/profiles.php:534
+#: ../../mod/profiles.php:540
msgid "Street Address:"
msgstr ""
-#: ../../mod/profiles.php:535
+#: ../../mod/profiles.php:541
msgid "Locality/City:"
msgstr ""
-#: ../../mod/profiles.php:536
+#: ../../mod/profiles.php:542
msgid "Postal/Zip Code:"
msgstr ""
-#: ../../mod/profiles.php:537
+#: ../../mod/profiles.php:543
msgid "Country:"
msgstr ""
-#: ../../mod/profiles.php:538
+#: ../../mod/profiles.php:544
msgid "Region/State:"
msgstr ""
-#: ../../mod/profiles.php:539
+#: ../../mod/profiles.php:545
msgid "♥ Marital Status:"
msgstr ""
-#: ../../mod/profiles.php:540
+#: ../../mod/profiles.php:546
msgid "Who: (if applicable)"
msgstr ""
-#: ../../mod/profiles.php:541
+#: ../../mod/profiles.php:547
msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
msgstr ""
-#: ../../mod/profiles.php:542
+#: ../../mod/profiles.php:548
msgid "Since [date]:"
msgstr ""
-#: ../../mod/profiles.php:544
+#: ../../mod/profiles.php:550
msgid "Homepage URL:"
msgstr ""
-#: ../../mod/profiles.php:547
+#: ../../mod/profiles.php:553
msgid "Religious Views:"
msgstr ""
-#: ../../mod/profiles.php:548
+#: ../../mod/profiles.php:554
msgid "Keywords:"
msgstr ""
-#: ../../mod/profiles.php:551
+#: ../../mod/profiles.php:557
msgid "Example: fishing photography software"
msgstr ""
-#: ../../mod/profiles.php:552
+#: ../../mod/profiles.php:558
msgid "Used in directory listings"
msgstr ""
-#: ../../mod/profiles.php:553
+#: ../../mod/profiles.php:559
msgid "Tell us about yourself..."
msgstr ""
-#: ../../mod/profiles.php:554
+#: ../../mod/profiles.php:560
msgid "Hobbies/Interests"
msgstr ""
-#: ../../mod/profiles.php:555
+#: ../../mod/profiles.php:561
msgid "Contact information and Social Networks"
msgstr ""
-#: ../../mod/profiles.php:556
+#: ../../mod/profiles.php:562
msgid "My other channels"
msgstr ""
-#: ../../mod/profiles.php:557
+#: ../../mod/profiles.php:563
msgid "Musical interests"
msgstr ""
-#: ../../mod/profiles.php:558
+#: ../../mod/profiles.php:564
msgid "Books, literature"
msgstr ""
-#: ../../mod/profiles.php:559
+#: ../../mod/profiles.php:565
msgid "Television"
msgstr ""
-#: ../../mod/profiles.php:560
+#: ../../mod/profiles.php:566
msgid "Film/dance/culture/entertainment"
msgstr ""
-#: ../../mod/profiles.php:561
+#: ../../mod/profiles.php:567
msgid "Love/romance"
msgstr ""
-#: ../../mod/profiles.php:562
+#: ../../mod/profiles.php:568
msgid "Work/employment"
msgstr ""
-#: ../../mod/profiles.php:563
+#: ../../mod/profiles.php:569
msgid "School/education"
msgstr ""
-#: ../../mod/profiles.php:568
+#: ../../mod/profiles.php:574
msgid ""
"This is your public profile. It may "
"be visible to anybody using the internet."
msgstr ""
-#: ../../mod/profiles.php:617
+#: ../../mod/profiles.php:623
msgid "Edit/Manage Profiles"
msgstr ""
-#: ../../mod/profiles.php:618 ../../boot.php:1596
+#: ../../mod/profiles.php:624 ../../boot.php:1597
msgid "Change profile photo"
msgstr ""
-#: ../../mod/profiles.php:619 ../../boot.php:1603
+#: ../../mod/profiles.php:625 ../../boot.php:1604
msgid "Create New Profile"
msgstr ""
-#: ../../mod/profiles.php:630 ../../boot.php:1617
+#: ../../mod/profiles.php:636 ../../boot.php:1618
msgid "Profile Image"
msgstr ""
-#: ../../mod/profiles.php:633 ../../boot.php:1620
+#: ../../mod/profiles.php:639 ../../boot.php:1621
msgid "visible to everybody"
msgstr ""
-#: ../../mod/profiles.php:634 ../../boot.php:1621
+#: ../../mod/profiles.php:640 ../../boot.php:1622
msgid "Edit visibility"
msgstr ""
@@ -5883,11 +5957,11 @@ msgstr ""
msgid "Insert Vorbis [.ogg] audio"
msgstr ""
-#: ../../mod/profile.php:8 ../../mod/channel.php:8 ../../boot.php:1493
+#: ../../mod/profile.php:8 ../../mod/channel.php:8 ../../boot.php:1494
msgid "Requested profile is not available."
msgstr ""
-#: ../../mod/profile.php:101
+#: ../../mod/profile.php:111
msgid "Access to this profile has been restricted."
msgstr ""
@@ -6181,70 +6255,70 @@ msgstr ""
msgid "Forgot your password?"
msgstr ""
-#: ../../boot.php:1447
+#: ../../boot.php:1449
msgid "Requested channel is not available."
msgstr ""
-#: ../../boot.php:1459
+#: ../../boot.php:1461
msgid " Sorry, you don't have the permission to view this profile. "
msgstr ""
-#: ../../boot.php:1602
+#: ../../boot.php:1603
msgid "Profiles"
msgstr ""
-#: ../../boot.php:1602
+#: ../../boot.php:1603
msgid "Manage/edit profiles"
msgstr ""
-#: ../../boot.php:1606
+#: ../../boot.php:1607
msgid "Edit Profile"
msgstr ""
-#: ../../boot.php:1684 ../../boot.php:1764
+#: ../../boot.php:1685 ../../boot.php:1765
msgid "F d"
msgstr ""
-#: ../../boot.php:1741
+#: ../../boot.php:1742
msgid "Birthday Reminders"
msgstr ""
-#: ../../boot.php:1742
+#: ../../boot.php:1743
msgid "Birthdays this week:"
msgstr ""
-#: ../../boot.php:1797
+#: ../../boot.php:1798
msgid "[No description]"
msgstr ""
-#: ../../boot.php:1815
+#: ../../boot.php:1816
msgid "Event Reminders"
msgstr ""
-#: ../../boot.php:1816
+#: ../../boot.php:1817
msgid "Events this week:"
msgstr ""
-#: ../../boot.php:2013
+#: ../../boot.php:2014
msgid "Channel"
msgstr ""
-#: ../../boot.php:2016
+#: ../../boot.php:2017
msgid "Status Messages and Posts"
msgstr ""
-#: ../../boot.php:2020
+#: ../../boot.php:2021
msgid "About"
msgstr ""
-#: ../../boot.php:2023
+#: ../../boot.php:2024
msgid "Profile Details"
msgstr ""
-#: ../../boot.php:2041
+#: ../../boot.php:2042
msgid "Events and Calendar"
msgstr ""
-#: ../../boot.php:2267
+#: ../../boot.php:2268
msgid "toggle mobile"
msgstr ""
diff --git a/version.inc b/version.inc
index 3e4010a3d..11af6685f 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2013-07-03.363
+2013-07-10.370
diff --git a/view/css/mod_thing.css b/view/css/mod_thing.css
new file mode 100644
index 000000000..2a2ba7c92
--- /dev/null
+++ b/view/css/mod_thing.css
@@ -0,0 +1,27 @@
+
+
+.thing-profile #contact-profile-selector {
+ margin-left: 0;
+}
+
+.thing-verb-label {
+ margin-top: 15px;
+}
+
+.thing-verb {
+ margin-bottom: 15px;
+}
+
+.thing-label {
+ float: left;
+ width: 250px;
+}
+
+.thing-input {
+ float: left;
+ margin-bottom: 15px;
+}
+
+.thing-field-end {
+ clear: both;
+}
\ No newline at end of file
diff --git a/view/theme/redbasic/css/fancy.css b/view/theme/redbasic/css/fancy.css
index eeb822f72..277ea5596 100644
--- a/view/theme/redbasic/css/fancy.css
+++ b/view/theme/redbasic/css/fancy.css
@@ -1,7 +1,7 @@
/* There's probably some stuff in here we don't need, and maybe some missing stuff we do need. We can clean it up incrementaly, just get the heavy lifting done for now */
aside {
-border-radius: 0px 0px 20px 0px;}
+border-radius: $radiuspx;}
.tab {
@@ -9,9 +9,9 @@ border-radius: 0px 0px 20px 0px;}
background-color: #f00;
color: #fff !important;
font-weight: bold;
- -webkit-border-radius: 5px;
- -moz-border-radius: 5px;
- border-radius: 20px;
+ -webkit-border-radius: $radiuspx;
+ -moz-border-radius: $radiuspx;
+ border-radius: $radiuspx;
margin: 0;
width: auto;
margin-left: 8px;
@@ -38,7 +38,7 @@ border-radius: 0px 0px 20px 0px;}
.wall-item-content-wrapper {
position: relative;
- border-radius: 10px;
+ border-radius: $radiuspx;
box-shadow: 8px 8px 8px #000;
border: 1px solid #eec;
}
@@ -68,7 +68,7 @@ opacity: 1;
ul.menu-popup {
background: #dd0000;
color: #eec;
- border-radius: 0px 0px 20px 20px;
+ border-radius: $radiuspx;
z-index: 100000;
-webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
-moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index b1509c34f..762c35a18 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -115,8 +115,8 @@ a:hover, .fakelink:hover { color: #44AAFF; text-decoration: underline; }
input {
border: 1px solid #666666;
- -moz-border-radius: 5px;
- border-radius: 5px;
+ -moz-border-radius: $radiuspx;
+ border-radius: $radiuspx;
padding: 3px;
}
@@ -209,8 +209,8 @@ nav #site-location {
border: 1px solid #444;
background-color: #ccc;
padding: 10px;
- -moz-border-radius: 5px;
- border-radius: 5px;
+ -moz-border-radius: $radiuspx;
+ border-radius: $radiuspx;
}
@@ -268,8 +268,8 @@ header #banner #logo-text {
border-bottom: 0px;
background-color: #aec0d3;
color: #565854;
- -moz-border-radius: 5px 5px 0px 0px;
- border-radius: 5px 5px 0px 0px;
+ -moz-border-radius: $radiuspx;
+ border-radius: $radiuspx;;
}
nav .nav-link {
@@ -398,7 +398,7 @@ footer {
margin-bottom: 5px;
font-weight: bold;
border: solid 1px #ffffff;
- border-radius: 5px;
+ border-radius: $radiuspx;
}
#jot-title::-webkit-input-placeholder{font-weight: bold;}
@@ -926,6 +926,9 @@ footer {
.wall-item-content-wrapper {
margin-top: 10px;
position: relative;
+ border-radius: $radiuspx;
+ border: 1px solid #eec;
+
/* background: #fff; */
/* border-radius: 5px; */
/* box-shadow: 12px 12px 12px #111; */
@@ -1175,7 +1178,7 @@ footer {
padding: 3px 1px 1px 3px;
border: 1px solid #ccc;
padding: 8px;
- border-radius: 5px 5px 5px 5px;
+ border-radius: $radiuspx;
/* box-shadow: 5px 5px 5px #666 inset; */
}
@@ -1276,7 +1279,7 @@ footer {
height: auto;
width: auto;
background-color: #0080FF;
- border-radius: 5px;
+ border-radius: $radiuspx;
border: 2px outset;
box-shadow: 5px 5px 5px #666;
margin-right: 8px;
@@ -1654,8 +1657,8 @@ border: 1px #111;
/*
#profile-jot-text_parent, .mceLayout {
- border-radius: 5px;
- -moz-border-radius: 5px;
+ border-radius: $radiuspx;
+ -moz-border-radius: $radiuspx;
box-shadow: 4px 4px 3px 0 #444444;
}
*/
@@ -1678,8 +1681,8 @@ tr.mceLast {
padding: 8px;
margin-right: 0px;
width: 90%;
- -moz-border-radius: 5px;
- border-radius: 5px;
+ -moz-border-radius: $radiuspx;
+ border-radius: $radiuspx;
/* box-shadow: 4px 4px 3px 0 #666 inset; */
}
#profile-jot-text:hover {
@@ -1687,16 +1690,16 @@ tr.mceLast {
}
.wall-item-photo, .photo, .contact-block-img, .my-comment-photo {
- border-radius: 5px;
- -moz-border-radius: 5px;
+ border-radius: $radiuspx;
+ -moz-border-radius: $radiuspx;
box-shadow: 4px 4px 3px 0 #444444;
}
#datebrowse-sidebar select {
margin-left: 25px;
- border-radius: 5px;
- -moz-border-radius: 5px;
+ border-radius: $radiuspx;
+ -moz-border-radius: $radiuspx;
opacity: 0.3;
filter:alpha(opacity=30);
}
@@ -1731,8 +1734,8 @@ tr.mceLast {
}
.contact-entry-photo img, .profile-match-photo img, #photo-photo img, .directory-photo-img, .photo-album-photo, .photo-top-photo {
- border-radius: 5px;
- -moz-border-radius: 5px;
+ border-radius: $radiuspx;
+ -moz-border-radius: $radiuspx;
box-shadow: 4px 4px 3px 0 #444444;
}
@@ -1741,9 +1744,9 @@ tr.mceLast {
background-color: #0080FF;
color: #eeeeec;
font-weight: bold;
- -webkit-border-radius: 5px;
- -moz-border-radius: 5px;
- border-radius: 5px;
+ -webkit-border-radius: $radiuspx;
+ -moz-border-radius: $radiuspx;
+ border-radius: $radiuspx;
border: 2px outset #222420 !important;
margin: 0;
float: right;
@@ -1757,8 +1760,8 @@ tr.mceLast {
}
.settings-widget .selected {
- border-radius: 5px;
- -moz-border-radius: 5px;
+ border-radius: $radiuspx;
+ -moz-border-radius: $radiuspx;
box-shadow: 4px 4px 3px 0 #444444;
}
@@ -2265,9 +2268,9 @@ aside input[type='text'] {
border-bottom: 1px solid #eec;
padding: 8px;
margin-top: 5px;
- -moz-border-radius:5px;
- -webkit-border-radius:5px;
- border-radius:5px;
+ -moz-border-radius: $radiuspx;
+ -webkit-border-radius: $radiuspx;
+ border-radius: $radiuspx;
}
@@ -2435,7 +2438,7 @@ aside input[type='text'] {
}
#nav-user-linkmenu img {
- border-radius: 5px;
+ border-radius: $radiuspx;
margin-top: -4px;
}
@@ -2824,7 +2827,7 @@ aside input[type='text'] {
filter:alpha(opacity=100) !important;
}
-.posttags {
+.posttags, .body-tag {
margin-top: 15px;
}
@@ -3464,9 +3467,9 @@ nav .nav-menu-icon {
height: 22px;
padding: 5px;
/* margin: 3px 10px; */
- -moz-border-radius: 5px 5px 0 0;
- -webkit-border-radius: 5px 5px 0 0;
- border-radius: 5px 5px 0 0;
+ -moz-border-radius: $radiuspx;
+ -webkit-border-radius: $radiuspx;
+ border-radius: $radiuspx;
}
nav .nav-menu-icon.selected {
background-color: #FF0000;
@@ -3498,9 +3501,9 @@ nav .nav-menu.selected a {
nav .nav-notify {
background-color: #0080FF;
color: #fff;
- -moz-border-radius: 5px 5px 5px 5px;
- -webkit-border-radius: 5px 5px 5px 5px;
- border-radius: 5px 5px 5px 5px;
+ -moz-border-radius: $radiuspx;
+ -webkit-border-radius: $radiuspx;
+ border-radius: $radiuspx;
opacity: 0.6;
filter:alpha(opacity=60);
@@ -3643,9 +3646,9 @@ ul.menu-popup {
max-height: 400px;
overflow-y: scroll;overflow-style:scrollbar;
background-color:#FFFFFF;
- -moz-border-radius: 5px;
- -webkit-border-radius: 5px;
- border-radius:5px;
+ -moz-border-radius: $radiuspx;
+ -webkit-border-radius: $radiuspx;
+ border-radius: $radiuspx;
border: 1px solid #888;
}
#nav-notifications-menu .contactname { font-weight: bold; font-size: 0.9em; }
@@ -3711,9 +3714,9 @@ ul.menu-popup {
background-position: 7px 7px;
background-repeat: no-repeat;
padding: 7px 5px 0px 30px;
- -webkit-border-radius: 5px ;
- -moz-border-radius: 5px;
- border-radius: 5px;
+ -webkit-border-radius: $radiuspx;
+ -moz-border-radius: $radiuspx;
+ border-radius: $radiuspx;
color: #999999;
}
#acl-showall.selected {
@@ -3881,3 +3884,13 @@ width: 200px;
.tag10 {
font-size : 2.8em !important;
}
+
+.profile-thing-list {
+ list-style-type: none;
+}
+/*
+.profile-thing-list li {
+ float: left;
+ margin-right: 25px;
+}
+*/
\ No newline at end of file
diff --git a/view/theme/redbasic/php/config.php b/view/theme/redbasic/php/config.php
index 9b1cf1fbd..5917b1e36 100644
--- a/view/theme/redbasic/php/config.php
+++ b/view/theme/redbasic/php/config.php
@@ -16,7 +16,9 @@ function theme_content(&$a) {
$iconset = get_pconfig(local_user(), 'redbasic', 'iconset');
$shiny = get_pconfig(local_user(), 'redbasic', 'shiny');
$colour_scheme = get_pconfig(local_user(), 'redbasic', 'colour_scheme');
- return redbasic_form($a, $font_size, $line_height, $colour, $shadow, $navcolour, $opaquenav, $displaystyle, $linkcolour, $iconset, $shiny, $colour_scheme);
+ $radius = get_pconfig(local_user(),'redbasic','radius');
+
+ return redbasic_form($a, $font_size, $line_height, $colour, $shadow, $navcolour, $opaquenav, $displaystyle, $linkcolour, $iconset, $shiny, $colour_scheme,$radius);
}
function theme_post(&$a) {
@@ -33,6 +35,7 @@ function theme_post(&$a) {
set_pconfig(local_user(), 'redbasic', 'iconset', $_POST['redbasic_iconset']);
set_pconfig(local_user(), 'redbasic', 'shiny', $_POST['redbasic_shiny']);
set_pconfig(local_user(), 'redbasic', 'colour_scheme', $_POST['redbasic_colour_scheme']);
+ set_pconfig(local_user(), 'redbasic', 'radius', $_POST['redbasic_radius']);
}
}
@@ -67,7 +70,7 @@ function theme_post(&$a) {
//}
// These aren't all used yet, but they're not bloat - we'll use drop down menus in idiot mode.
-function redbasic_form(&$a, $font_size, $line_height, $colour, $shadow, $navcolour, $opaquenav, $displaystyle, $linkcolour, $iconset, $shiny, $colour_scheme) {
+function redbasic_form(&$a, $font_size, $line_height, $colour, $shadow, $navcolour, $opaquenav, $displaystyle, $linkcolour, $iconset, $shiny, $colour_scheme,$radius) {
$line_heights = array(
"1.3" => "1.3",
"---" => "---",
@@ -141,6 +144,7 @@ function redbasic_form(&$a, $font_size, $line_height, $colour, $shadow, $navcolo
'$linkcolour' => array('redbasic_linkcolour', t('Display colour of links - hex value, do not include the #'), $linkcolour, '', $linkcolours),
'$iconset' => array('redbasic_iconset', t('Icons'), $iconset, '', $iconsets),
'$shiny' => array('redbasic_shiny', t('Shiny style'), $shiny, '', $shinys),
+ '$radius' => array('redbasic_radius', t('Corner radius'), $radius, t('0-99 default: 5')),
));}
if(! feature_enabled(local_user(),'expert')) {
diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php
index 31b83394f..aa88443bc 100644
--- a/view/theme/redbasic/php/style.php
+++ b/view/theme/redbasic/php/style.php
@@ -17,6 +17,7 @@
$displaystyle = false;
$linkcolour = false;
$shiny = false;
+ $radius = 5;
$site_line_height = get_config("redbasic","line_height");
$site_redbasic_font_size = get_config("redbasic", "font_size" );
$site_colour = get_config("redbasic", "colour" );
@@ -25,6 +26,10 @@
$displaystyle = get_config("redbasic", "displaystyle" );
$linkcolour = get_config("redbasic", "linkcolour" );
$shiny = get_config("redbasic", "shiny" );
+
+ $x = get_config('redbasic','radius');
+ if($x !== false)
+ $radius = $x;
if (local_user()) {
$line_height = get_pconfig(local_user(), "redbasic","line_height");
@@ -35,6 +40,10 @@
$displaystyle = get_pconfig(local_user(), "redbasic", "displaystyle");
$linkcolour = get_pconfig(local_user(), "redbasic", "linkcolour");
$shiny = get_pconfig(local_user(), "redbasic", "shiny");
+ $x = get_pconfig(local_user(),'redbasic','radius');
+ if($x !== false)
+ $radius = $x;
+
if (! feature_enabled(local_user(),'expert')) {$colour_scheme = get_pconfig(local_user(), "redbasic", "colour_scheme");}
}
@@ -45,6 +54,8 @@
// Dark themes are very different - we need to do some of these from scratch, so don't bother setting vars for anything else
if ($colour_scheme === 'dark') {$colour = 'dark'; $navcolour = 'black';}
if ($colour_scheme === 'redbasic'){$navcolour = 'red';}
+ $shadows = false;
+ $radius = 5;
}
// This is probably the easiest place to apply global settings. Don't bother with site line height and such. Instead, check pconfig for global user settings.
@@ -70,7 +81,7 @@
$x = str_replace("\n","",$x);
logger('pcss compress: final size: ' . strlen($x), LOGGER_DEBUG);
}
- echo $x;
+ echo str_replace(array('$radius'),array($radius),$x);
}
echo "\r\n";
@@ -124,7 +135,8 @@
if ($displaystyle === "fancy")
{if (file_exists('view/theme/' . current_theme() . '/css/fancy.css')) {
$fancy = (file_get_contents('view/theme/' . current_theme() . '/css/fancy.css'));
- echo "$fancy";}
+ echo str_replace(array('$radius'),array($radius),$fancy);
+ }
}
// Put the # here to force hex colours - if we don't, somebody is going to do something odd, using RGB and we're all going to be confused on the support forums
diff --git a/view/theme/redbasic/tpl/theme_settings.tpl b/view/theme/redbasic/tpl/theme_settings.tpl
index f8d9f223c..cd980fbc3 100755
--- a/view/theme/redbasic/tpl/theme_settings.tpl
+++ b/view/theme/redbasic/tpl/theme_settings.tpl
@@ -1,8 +1,3 @@
-{{*
- * AUTOMATICALLY GENERATED TEMPLATE
- * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
{{include file="field_select.tpl" field=$colour}}
{{include file="field_input.tpl" field=$font_size}}
@@ -21,6 +16,8 @@
{{include file="field_select.tpl" field=$shiny}}
+{{include file="field_input.tpl" field=$radius}}
+
{{/if}} +{{$item.term}} +
+{{/foreach}}
+