252 files changed, 20704 insertions, 3416 deletions
diff --git a/.gitignore b/.gitignore
index 3dfb8a903..6302bc1c8 100755
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,11 @@ home.html
 addon
 *~
 
+#ignore documentation, it should be newly built 
+doc/api
+
+#ignore config files from eclipse, we don't want IDE files in our repository
+.project
+.buildpath
+.externalToolBuilders
+.settings
diff --git a/view/theme/dispy/experimental b/.gitmodules
index e69de29bb..e69de29bb 100755..100644
--- a/view/theme/dispy/experimental
+++ b/.gitmodules
diff --git a/LICENSE b/LICENSE
index 65ec68b9c..15c3e825b 100755
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2010, 2011 the Friendica Project
+Copyright (c) 2010-2012 the Friendica Project
 All rights reserved.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
diff --git a/README b/README
index e69de29bb..d85d98aad 100644
--- a/README
+++ b/README
@@ -0,0 +1,11 @@
+Friendica Social Communications Server
+======================================
+
+http://friendica.com
+
+Welcome to the free social web.
+
+
+Friendica is a communications platform for integrated social communications utilising decentralised communications and linkage to several indie social projects - as well as popular mainstream providers.
+
+Our mission is to free our friends and families from the clutches of data-harvesting corporations, and pave the way to a future where social communications are free and open and flow between alternate providers as easily as email does today.  
+\ No newline at end of file
diff --git a/boot.php b/boot.php
index 18b6f8375..b4c6ad0ac 100755
--- a/boot.php
+++ b/boot.php
@@ -9,9 +9,9 @@ require_once('include/nav.php');
 require_once('include/cache.php');
 
 define ( 'FRIENDICA_PLATFORM',     'Friendica');
-define ( 'FRIENDICA_VERSION',      '2.3.1265' );
+define ( 'FRIENDICA_VERSION',      '2.3.1275' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.22'    );
-define ( 'DB_UPDATE_VERSION',      1129      );
+define ( 'DB_UPDATE_VERSION',      1131      );
 
 define ( 'EOL',                    "<br />\r\n"     );
 define ( 'ATOM_TIME',              'Y-m-d\TH:i:s\Z' );
diff --git a/build.xml b/build.xml
new file mode 100644
index 000000000..83c530026
--- /dev/null
+++ b/build.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project name="friendica" default="test">
+
+	<!-- =================================== -->
+	<!-- Target: test -->
+	<!-- this target runs all test files -->
+	<!-- =================================== -->
+
+	<target name="test">
+		<!-- there are no tests by now, so, nothing to do -->
+	</target>
+
+	<!-- ===================================================== -->
+	<!-- Target: clean-doc -->
+	<!-- this target removes documentation from a previous run -->
+	<!-- ===================================================== -->
+	<target name="doc-clean">
+		<echo msg="Removing old documentation..." />
+		<delete dir="./doc/api/" />
+		<echo msg="Generate documentation directory..." />
+		<mkdir dir="./doc/api/" />
+	</target>
+
+	<!-- ====================================== -->
+	<!-- Target: doc -->
+	<!-- this target builds all documentation -->
+	<!-- ====================================== -->
+	<target name="doc" depends="doc-clean">
+		<echo msg="Building documentation..." />
+		<docblox title="Friendica API" destdir="./doc/api">
+			<fileset dir=".">
+				<include name="**/*.php" />
+			</fileset>
+		</docblox>
+	</target>
+
+</project>
diff --git a/database.sql b/database.sql
index 8c74ecddf..35c257f02 100755
--- a/database.sql
+++ b/database.sql
@@ -216,6 +216,7 @@ CREATE TABLE IF NOT EXISTS `item` (
   `tag` mediumtext NOT NULL,
   `attach` mediumtext NOT NULL,
   `inform` mediumtext NOT NULL,
+  `file` mediumtext NOT NULL,
   `location` char(255) NOT NULL,
   `coord` char(255) NOT NULL,
   `allow_cid` mediumtext NOT NULL,
@@ -262,6 +263,7 @@ CREATE TABLE IF NOT EXISTS `item` (
   FULLTEXT KEY `title` (`title`),
   FULLTEXT KEY `body` (`body`),
   FULLTEXT KEY `tag` (`tag`),
+  FULLTEXT KEY `file` (`file`),
   FULLTEXT KEY `allow_cid` (`allow_cid`),
   FULLTEXT KEY `allow_gid` (`allow_gid`),
   FULLTEXT KEY `deny_cid` (`deny_cid`),
@@ -752,14 +754,18 @@ CREATE TABLE IF NOT EXISTS `notify` (
 `msg` MEDIUMTEXT NOT NULL ,
 `uid` INT NOT NULL ,
 `link` CHAR( 255 ) NOT NULL ,
+`parent` INT( 11 ) NOT NULL,
 `seen` TINYINT( 1 ) NOT NULL DEFAULT '0',
 `verb` CHAR( 255 ) NOT NULL,
 `otype` CHAR( 16 ) NOT NULL,
 INDEX ( `hash` ),
 INDEX ( `type` ),
 INDEX ( `uid` ),
+INDEX ( `link` ),
+INDEX ( `parent` ),
 INDEX ( `seen` ),
-INDEX ( `date` )
+INDEX ( `date` ),
+INDEX ( `otype` )
 ) ENGINE = MyISAM DEFAULT CHARSET=utf8;
 
 CREATE TABLE IF NOT EXISTS `item_id` (
diff --git a/doc/Account-Basics.md b/doc/Account-Basics.md
index b5e757dbc..164a6be46 100755
--- a/doc/Account-Basics.md
+++ b/doc/Account-Basics.md
@@ -6,7 +6,9 @@ Account Basics
 
 **Registration**
 
-Not all Friendica sites allow open registration. If registration is allowed, you will see a "Register" link immediately below the login prompts on the site home page. Following this link will take you to the site Registration page.
+Not all Friendica sites allow open registration. If registration is allowed, you will see a "Register" link immediately below the login prompts on the site home page. Following this link will take you to the site registration page.  The strength of our network is that lots of different sites are all completely compatible with each other.  If the site you're visting doesn't allow registration, or you think you might prefer another one, you can find a <a href ="http://dir.friendica.com/siteinfo">list of public servers here</a>, and find one that meets your needs.  
+
+If you'd like to have your own server, you can do that too.  Visit <a href = "http://friendica.com/download">the Friendica website</a> to download the code with setup instructions.  It's a very simple install process that anybody experienced in hosting websites, or with basic Linux experience can handle easily.
 
 *OpenID*
 
@@ -14,11 +16,11 @@ The first field on the Registration page is for an OpenID address. If you do not
 
 *Your Full Name*
 
-Please provide your full name as you would like it to be displayed on this system.
+Please provide your full name **as you would like it to be displayed on this system**.  Most people use their real name for this, but you're under no obligation to do so yourself.
 
 *Email Address*
 
-Please provide a valid email address. Your email address is **never** published. We need this to send you account information and your login details. You may also occasionally receive notifications of incoming messages or items requiring your attention, but you have the ability to completely disable these from your Settings page once you have logged in.     
+Please provide a valid email address. Your email address is **never** published. We need this to send you account information and your login details. You may also occasionally receive notifications of incoming messages or items requiring your attention, but you have the ability to completely disable these from your Settings page once you have logged in.  This doesn't have to be your primary email address, but it does need to be a real email address.  You can't get your initial password, or reset a lost password later without it.  This is the only bit of personal information that has to be accurate.
 
 *Nickname*
 
@@ -28,12 +30,12 @@ A nickname is used to generate web addresses for many of your personal pages, an
 
 *Directory Publishing*
 
-The Registration form also allows you to choose whether or not to list your account in the online directory. This is like a "phone book" and you may choose to be unlisted. We recommend that you select 'Yes' so that other people (friends, family, etc.) will be able to find you. If you choose 'No', you will essentially be invisible and have few opportunities for interaction. Whichever you choose, this can be changed any time from your Settings page after you login.  
-
+The Registration form also allows you to choose whether or not to list your account in the online directory. This is like a "phone book" and you may choose to be unlisted. We recommend that you select 'Yes' so that other people (friends, family, etc.) will be able to find you. If you choose 'No', you will essentially be invisible and have few opportunities for interaction. Whichever you choose, this can be changed any time from your Settings page after you login. 
 
 *Register*
 
-Once you have provided the necessary details, click the 'Register' button. An email will be sent to you providing your account login details. Some sites may require administrator approval before the registration is processed, and you will be alerted if this is the case. Please watch your email (including spam folders) for your registration approval. 
+Once you have provided the necessary details, click the 'Register' button. An email will be sent to you providing your account login details. Please watch your email (including spam folders) for your registration details and initial password. 
+
 
 
 
@@ -58,6 +60,11 @@ After your first login, please visit the 'Settings' page from the top menu bar a
 A ['Tips for New Members'](newmember) link will show up on your home page for two weeks to provide some important Getting Started information.
 
 
+**Retrieving Personal Data**
+
+You can export a copy of your personal data in XML format from the "Export personal data" link at the top of your settings  page.
+
+
 **See Also**
 
 * [Profiles](help/Profiles)
@@ -66,4 +73,3 @@ A ['Tips for New Members'](newmember) link will show up on your home page for tw
 
 * [Remove Account](help/Remove-Account)
 
- 
-\ No newline at end of file
diff --git a/doc/Bugs-and-Issues.md b/doc/Bugs-and-Issues.md
index c119b9968..46abea9a3 100755
--- a/doc/Bugs-and-Issues.md
+++ b/doc/Bugs-and-Issues.md
@@ -4,18 +4,19 @@ Bugs and Issues
 * [Home](help)
 
 
-Please report any bugs/issues you encounter using our bug tracker at [[http://bugs.friendica.com]]
+If your server has a support page, you should report any bugs/issues you encounter there first.  Reporting to your support page before reporting to the developers makes their job easier, as they don't have to deal with bug reports that might not have anything to do with them, and that helps us get new features faster.
 
-Try to provide as much information as you can about the bug (including the full text of any error messages or notices), and if possible your Friendica version.
+If you're a technical user, or your site doesn't have a support page, you'll need to use the <a href = "http://bugs.friendica.com/">Bug Tracker</a>.  Please perform a search to see if there's already an open bug that matches yours before submitting anything.
 
-Your Friendica version may be found in newer releases by visiting http://YOURFRIENDICASITE/friendica
+Try to provide as much information as you can about the bug, including the **full** text of any error messages or notices, and any steps required to replicate the problem in as much detail as possible.  It's generally better to provide too much information than not enough.
 
-For older versions, view the HTML source of your profile page. The Friendica version is in the HTML header, 5-10 lines from the top of the page.
+<a href = "http://www.chiark.greenend.org.uk/~sgtatham/bugs.html">See this article</a> to learn more about submitting **good** bug reports.
 
-For really old versions which don't have a version number in the HTML header - please upgrade. Your bug was probably fixed a long time ago. 
 
 **Bug Sponsorship**
 
+If you find a bug, and it is caused by a problem in main branch (ie, is not specific to our site), you may sponsor it.
+
 The bug/issue database allows you to sponsor issues. This provides an incentive for developers to work on your issue. This isn't necessary - we don't like bugs and will try to fix them. This has more importance for future development projects and feature requests.
 
 Bug sponsorship works on the honour system. If you agree to pay $10 to fix a bug, when the fix has been checked in and verified you should send a paypal payment to the developer assigned to the bug. Don't ever think you can get away with not paying a developer for work performed. Some of these guys could hack into your credit card account if you make them mad.
diff --git a/doc/Making-Friends.md b/doc/Making-Friends.md
index 1a9c8d898..3f1a24c8d 100755
--- a/doc/Making-Friends.md
+++ b/doc/Making-Friends.md
@@ -5,7 +5,13 @@ Making Friends
 
 Friendship in Friendica can take on a great many different meanings. But let's keep it simple, you want to be friends with somebody. How do you do it?
 
-The first thing you can do is look at the Directory for somebody you would like to connect with. Visit their profile. Just beneath their profile picture will be the word 'Connect' (we're assuming this is an English language profile).
+The easiest thing to do is to join the <a href = "http://kakste.com/profile/newhere">New Here</a> group.  This group is especially for people new to the Friendica network.  Simply connect to the group, post to the wall, and make new friends.  You don't even have to like us - comment on a few of our posts, and other people will start to add you too.
+
+The next thing you can do is look at the Directory.  The directory is split up into two parts.  If you click the directory button, you will be presented with a list of all members (who chose to be listed) on your server.  You'll also see a link to the Global Directory.  If you click through to the global directory, you will be presented with a list of everybody who chose to be listed across all instances of Friendica.  You will also see a "Show Community Forums" link, which will direct you to Groups, Forums and Fanpages.  You connect to people, groups and forums in the same way, except groups and forums will automatically accept your introduction request, whereas a human will approve you manually.
+
+To connect with other Friendica user
+
+Visit their profile. Just beneath their profile picture will be the word 'Connect' (we're assuming this is an English language profile).
 
 Click that. It will take you to a "Connect" form.
 
@@ -23,6 +29,7 @@ When you've submitted the connection page, it will take you back to your own sit
 
 If you already know somebody's Identity Address, you can enter it in the "connect" box on your "Contacts" page. This will take you through a similar process.
 
+
 **Alternate Networks**
 
 You can also use your Identity Address or other people's Identity Addresses to become friends across networks. The list of possible networks is growing all the time. If you know (for instance) "bob" on identi.ca (a Status.Net site) you could put bob@identi.ca into your Contact page and become friends across networks.  (Or you can put in the URL to Bob's identi.ca page if you wish).  You can also be "partial" friends with somebody on Google Buzz by putting in their gmail address. Google Buzz does not yet support all the protocols we need for direct messaging, but you should be able to follow status updates from within Friendica. You can do the same for Twitter accounts and Diaspora accounts. In fact you can "follow" most anybody or any website that produces a syndication feed (RSS/Atom,etc.). If we can find an information stream and a name to attach to the contact, we'll try to connect with them. 
diff --git a/doc/Remove-Account.md b/doc/Remove-Account.md
index f526b78a8..ae5de2cb6 100755
--- a/doc/Remove-Account.md
+++ b/doc/Remove-Account.md
@@ -5,9 +5,20 @@ Remove Account
 
 We don't like to see people leave Friendica, but if you need to remove your account, you should visit the URL
 
-http://friendica-site/removeme
+http://sitename/removeme
 
-with your web browser. You will need to be logged in at the time.  (Replace "friendica-site" with the hostname of your Friendica server)
+with your web browser. You will need to be logged in at the time.
 
 You will be asked for your password to confirm the request. If this matches your stored password, your account will immediately be removed. Unlike some social networks we do **not** hold onto it for a grace period in case you change your mind. Your user details, your conversations, your photos, your friends - everything; will be removed immediately and you will be logged out. 
 
+When we expire posts we send notifications out to Friendica to remove the posts. Diaspora doesn't have a bulk delete so this step is skipped on that network - and hopefully it will be obvious that deletion doesn't work on any other networks. If you manually delete a post or a range of posts we send individual delete notifications to Friendica and Diaspora for each deleted post.
+
+Diaspora often loses these.
+
+If you delete a post but somebody else has starred it, it is still removed. Your wishes take priority.
+
+When you remove your account we physically remove all your posts and your profile and user data, etc. immediately.
+
+In order to send out a bulk remove we would need to keep your account around to do this, as we would need to prove to your friends who it is that is submitting the request. We can't do this if you don't have an account.
+
+Your friends may still see your posts if your account is gone, but there is no public place within Friendica where they can be viewed. If you had friends on Diaspora, your public posts may stick around and be visible to others from that network.
diff --git a/docblox.dist.xml b/docblox.dist.xml
new file mode 100644
index 000000000..a2ea8e2cb
--- /dev/null
+++ b/docblox.dist.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<docblox>
+  <parser>
+    <target>data/output</target>
+  </parser>
+  <transformer>
+    <target>data/output</target>
+  </transformer>
+  <files>
+    <directory>.</directory>
+  </files>
+</docblox>
+
diff --git a/htconfig.php b/htconfig.php
index 01f56f2c4..f52aed2b1 100755
--- a/htconfig.php
+++ b/htconfig.php
@@ -69,7 +69,7 @@ $a->config['system']['rino_encrypt'] = true;
 
 // allowed themes (change this from admin panel after installation)
 
-$a->config['system']['allowed_themes'] = 'dispy,quattro,testbubble,vier,darkbubble,darkzero,duepuntozero,greenzero,purplezero,quattro-green,slackr';
+$a->config['system']['allowed_themes'] = 'dispy,quattro,testbubble,vier,darkbubble,darkzero,duepuntozero,greenzero,purplezero,quattro-green,slackr,diabook,diabook-blue';
 
 // default system theme
 
diff --git a/images/beer_mug.gif b/images/beer_mug.gif
index a047d1987..9a3e05192 100644
--- a/images/beer_mug.gif
+++ b/images/beer_mug.gif
diff --git a/images/bug-x.gif b/images/bug-x.gif
new file mode 100644
index 000000000..10936caa7
--- /dev/null
+++ b/images/bug-x.gif
diff --git a/images/icons/lock.png.tmp b/images/icons/lock.png.tmp
deleted file mode 100755
index 7e58ead2e..000000000
--- a/images/icons/lock.png.tmp
+++ /dev/null
diff --git a/images/smiley-Oo.gif b/images/smiley-Oo.gif
index a125d0ff2..a15d97427 100755
--- a/images/smiley-Oo.gif
+++ b/images/smiley-Oo.gif
diff --git a/images/smiley-beard.png b/images/smiley-beard.png
new file mode 100644
index 000000000..5d4b28463
--- /dev/null
+++ b/images/smiley-beard.png
diff --git a/images/smiley-brokenheart.gif b/images/smiley-brokenheart.gif
index 79ca0c31b..971b57fd9 100755
--- a/images/smiley-brokenheart.gif
+++ b/images/smiley-brokenheart.gif
diff --git a/images/smiley-cool.gif b/images/smiley-cool.gif
index ba90cc36f..cee1c1aa3 100755
--- a/images/smiley-cool.gif
+++ b/images/smiley-cool.gif
diff --git a/images/smiley-cry.gif b/images/smiley-cry.gif
index 74d897a4f..06e6ca2c2 100755
--- a/images/smiley-cry.gif
+++ b/images/smiley-cry.gif
diff --git a/images/smiley-embarassed.gif b/images/smiley-embarassed.gif
index 963a96b8a..adc12e7c5 100755
--- a/images/smiley-embarassed.gif
+++ b/images/smiley-embarassed.gif
diff --git a/images/smiley-foot-in-mouth.gif b/images/smiley-foot-in-mouth.gif
index 16f68cc1e..b444e5781 100755
--- a/images/smiley-foot-in-mouth.gif
+++ b/images/smiley-foot-in-mouth.gif
diff --git a/images/smiley-frown.gif b/images/smiley-frown.gif
index 716f55e16..9ff19850d 100755
--- a/images/smiley-frown.gif
+++ b/images/smiley-frown.gif
diff --git a/images/smiley-heart.gif b/images/smiley-heart.gif
index 21c0c6530..6a11e7065 100755
--- a/images/smiley-heart.gif
+++ b/images/smiley-heart.gif
diff --git a/images/smiley-innocent.gif b/images/smiley-innocent.gif
index 334d49e0e..9d747140e 100755
--- a/images/smiley-innocent.gif
+++ b/images/smiley-innocent.gif
diff --git a/images/smiley-kiss.gif b/images/smiley-kiss.gif
index 4efd549ed..cc356611e 100755
--- a/images/smiley-kiss.gif
+++ b/images/smiley-kiss.gif
diff --git a/images/smiley-laughing.gif b/images/smiley-laughing.gif
index 1606c119e..1bf29de79 100755
--- a/images/smiley-laughing.gif
+++ b/images/smiley-laughing.gif
diff --git a/images/smiley-money-mouth.gif b/images/smiley-money-mouth.gif
index ca2451e10..1e8ccd0f3 100755
--- a/images/smiley-money-mouth.gif
+++ b/images/smiley-money-mouth.gif
diff --git a/images/smiley-sealed.gif b/images/smiley-sealed.gif
index b33d3cca1..98186742d 100755
--- a/images/smiley-sealed.gif
+++ b/images/smiley-sealed.gif
diff --git a/images/smiley-smile.gif b/images/smiley-smile.gif
index e6a9e60d5..b9bff40a4 100755
--- a/images/smiley-smile.gif
+++ b/images/smiley-smile.gif
diff --git a/images/smiley-surprised.gif b/images/smiley-surprised.gif
index cb99cdd91..b07465326 100755
--- a/images/smiley-surprised.gif
+++ b/images/smiley-surprised.gif
diff --git a/images/smiley-tongue-out.gif b/images/smiley-tongue-out.gif
index 2075dc160..48867dc26 100755
--- a/images/smiley-tongue-out.gif
+++ b/images/smiley-tongue-out.gif
diff --git a/images/smiley-undecided.gif b/images/smiley-undecided.gif
index bef7e2573..28029794f 100755
--- a/images/smiley-undecided.gif
+++ b/images/smiley-undecided.gif
diff --git a/images/smiley-whitebeard.png b/images/smiley-whitebeard.png
new file mode 100644
index 000000000..2a1fccbb7
--- /dev/null
+++ b/images/smiley-whitebeard.png
diff --git a/images/smiley-wink.gif b/images/smiley-wink.gif
index 9faf1aff8..e1cefb05c 100755
--- a/images/smiley-wink.gif
+++ b/images/smiley-wink.gif
diff --git a/images/smiley-yell.gif b/images/smiley-yell.gif
index 648e6e879..5296c8836 100755
--- a/images/smiley-yell.gif
+++ b/images/smiley-yell.gif
diff --git a/images/star.png b/images/star.png
new file mode 100755
index 000000000..0b00cb189
--- /dev/null
+++ b/images/star.png
diff --git a/images/star_dummy.png b/images/star_dummy.png
new file mode 100644
index 000000000..ce11f30d4
--- /dev/null
+++ b/images/star_dummy.png
diff --git a/include/Scrape.php b/include/Scrape.php
index 4c4ad3cdb..8344aa737 100755
--- a/include/Scrape.php
+++ b/include/Scrape.php
@@ -255,6 +255,11 @@ function scrape_feed($url) {
 				}
 			}
 		}
+		// perhaps an RSS version 1 feed with a generic or incorrect content-type?
+		if(stristr($s,'</item>')) {
+			$ret['feed_rss'] = $url;
+			return $ret;
+		}
 	}
 
 	try {
diff --git a/include/acl_selectors.php b/include/acl_selectors.php
index 6070b7db2..67d8cebde 100755
--- a/include/acl_selectors.php
+++ b/include/acl_selectors.php
@@ -1,6 +1,11 @@
 <?php
+/**
+ * 
+ */
 
-
+/**
+ * @package acl_selectors 
+ */
 function group_select($selname,$selclass,$preselected = false,$size = 4) {
 
 	$a = get_app();
diff --git a/include/conversation.php b/include/conversation.php
index bd9b11bee..4b2ca316b 100755
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -6,11 +6,6 @@
 function localize_item(&$item){
 
 	$Text = $item['body'];
-
-
-	// find private image (w/data url) if present and convert image 
-	// link to a magic-auth redirect.
-
 	$saved_image = '';
 	$img_start = strpos($Text,'[img]data:');
 	$img_end = strpos($Text,'[/img]');
@@ -184,8 +179,11 @@ function localize_item(&$item){
  * that are based on unique features of the calling module.
  *
  */
+
+if(!function_exists('conversation')) {
 function conversation(&$a, $items, $mode, $update, $preview = false) {
 
+
 	require_once('bbcode.php');
 
 	$profile_owner = 0;
@@ -221,7 +219,7 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
 	if($update)
 		$return_url = $_SESSION['return_url'];
 	else
-		$return_url = $_SESSION['return_url'] = $a->cmd;
+		$return_url = $_SESSION['return_url'] = $a->query_string;
 
 	load_contact_links(local_user());
 
@@ -231,13 +229,13 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
 	$items = $cb['items'];
 
 	$cmnt_tpl    = get_markup_template('comment_item.tpl');
-	$tpl         = get_markup_template('wall_item.tpl');
-	$wallwall    = get_markup_template('wallwall_item.tpl');
+	$tpl         = 'wall_item.tpl';
+	$wallwall    = 'wallwall_item.tpl';
 	$hide_comments_tpl = get_markup_template('hide_comments.tpl');
 
 	$alike = array();
 	$dlike = array();
-	$o = "";
+	
 	
 	// array with html for each thread (parent+comments)
 	$threads = array();
@@ -250,7 +248,8 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
 			// "New Item View" on network page or search page results 
 			// - just loop through the items and format them minimally for display
 
-			$tpl = get_markup_template('search_item.tpl');
+			//$tpl = get_markup_template('search_item.tpl');
+			$tpl = 'search_item.tpl';
 
 			foreach($items as $item) {
 				$threadsid++;
@@ -316,43 +315,46 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
 
 				$body = prepare_body($item,true);
 				
-				$tmp_item = replace_macros($tpl,array(
-					'$id' => (($preview) ? 'P0' : $item['item_id']),
-					'$linktitle' => sprintf( t('View %s\'s profile @ %s'), $profile_name, ((strlen($item['author-link'])) ? $item['author-link'] : $item['url'])),
-					'$profile_url' => $profile_link,
-					'$item_photo_menu' => item_photo_menu($item),
-					'$name' => template_escape($profile_name),
-					'$sparkle' => $sparkle,
-					'$lock' => $lock,
-					'$thumb' => $profile_avatar,
-					'$title' => template_escape($item['title']),
-					'$body' => template_escape($body),
-					'$ago' => (($item['app']) ? sprintf( t('%s from %s'),relative_date($item['created']),$item['app']) : relative_date($item['created'])),
-					'$lock' => $lock,
-					'$location' => template_escape($location),
-					'$indent' => '',
-					'$owner_name' => template_escape($owner_name),
-					'$owner_url' => $owner_url,
-					'$owner_photo' => $owner_photo,
-					'$plink' => get_plink($item),
-					'$edpost' => false,
-					'$isstarred' => $isstarred,
-					'$star' => $star,
-					'$drop' => $drop,
-					'$vote' => $likebuttons,
-					'$like' => '',
-					'$dislike' => '',
-					'$comment' => '',
-					'$conv' => (($preview) ? '' : array('href'=> $a->get_baseurl() . '/display/' . $nickname . '/' . $item['id'], 'title'=> t('View in context'))),
-					'$previewing' => $previewing,
-					'$wait' => t('Please wait'),
-				));
+				//$tmp_item = replace_macros($tpl,array(
+				$tmp_item = array(
+					'template' => $tpl,
+					'id' => (($preview) ? 'P0' : $item['item_id']),
+					'linktitle' => sprintf( t('View %s\'s profile @ %s'), $profile_name, ((strlen($item['author-link'])) ? $item['author-link'] : $item['url'])),
+					'profile_url' => $profile_link,
+					'item_photo_menu' => item_photo_menu($item),
+					'name' => template_escape($profile_name),
+					'sparkle' => $sparkle,
+					'lock' => $lock,
+					'thumb' => $profile_avatar,
+					'title' => template_escape($item['title']),
+					'body' => template_escape($body),
+					'text' => strip_tags(template_escape($body)),
+					'ago' => (($item['app']) ? sprintf( t('%s from %s'),relative_date($item['created']),$item['app']) : relative_date($item['created'])),
+					'lock' => $lock,
+					'location' => template_escape($location),
+					'indent' => '',
+					'owner_name' => template_escape($owner_name),
+					'owner_url' => $owner_url,
+					'owner_photo' => $owner_photo,
+					'plink' => get_plink($item),
+					'edpost' => false,
+					'isstarred' => $isstarred,
+					'star' => $star,
+					'drop' => $drop,
+					'vote' => $likebuttons,
+					'like' => '',
+					'dislike' => '',
+					'comment' => '',
+					'conv' => (($preview) ? '' : array('href'=> $a->get_baseurl() . '/display/' . $nickname . '/' . $item['id'], 'title'=> t('View in context'))),
+					'previewing' => $previewing,
+					'wait' => t('Please wait'),
+				);
 
 				$arr = array('item' => $item, 'output' => $tmp_item);
 				call_hooks('display_item', $arr);
 
 				$threads[$threadsid]['id'] = $item['item_id'];
-				$threads[$threadsid]['html'] .= $arr['output'];
+				$threads[$threadsid]['items'] = array($arr['output']);
 
 			}
 
@@ -386,6 +388,8 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
 			}
 
 			$comments_collapsed = false;
+			$comment_lastcollapsed = false;
+			$comment_firstcollapsed = false;
 			$blowhard = 0;
 			$blowhard_count = 0;
 
@@ -417,39 +421,26 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
 					$toplevelprivate = (($toplevelpost && $item['private']) ? true : false);
 					$item_writeable = (($item['writable'] || $item['self']) ? true : false);
 
-					// DISABLED
-					/*
-					if($blowhard == $item['cid'] && (! $item['self']) && ($mode != 'profile') && ($mode != 'notes')) {
-						$blowhard_count ++;
-						if($blowhard_count == 3) {
-							$o .= '<div class="icollapse-wrapper fakelink" id="icollapse-wrapper-' . $item['parent'] 
-								. '" onclick="openClose(' . '\'icollapse-' . $item['parent'] . '\'); $(\'#icollapse-wrapper-' . $item['parent'] . '\').hide();" >' 
-								. t('See more posts like this') . '</div>' . '<div class="icollapse" id="icollapse-' 
-								. $item['parent'] . '" style="display: none;" >';
-						}
-					}
-					else {
-						$blowhard = $item['cid'];					
-						if($blowhard_count >= 3)
-							$o .= '</div>';
-						$blowhard_count = 0;
-					}
-					// END DISABLED
-					*/
-
 					$comments_seen = 0;
 					$comments_collapsed = false;
+					$comment_lastcollapsed  = false;
+					$comment_firstcollapsed = false;
 					
 					$threadsid++;
 					$threads[$threadsid]['id'] = $item['item_id'];
-					$threads[$threadsid]['html'] = "";
+					$threads[$threadsid]['private'] = $item['private'];
+					$threads[$threadsid]['items'] = array();
 
 				}
 				else {
-					// prevent private email from leaking into public conversation
-					if((! $toplevelpost) && (! $toplevelprivate) && ($item['private']) && ($profile_owner != local_user()))
+
+					// prevent private email reply to public conversation from leaking.
+					if($item['private'] && ! $threads[$threadsid]['private'])
 						continue;
+
 					$comments_seen ++;
+					$comment_lastcollapsed  = false;
+					$comment_firstcollapsed = false;
 				}	
 
 				$override_comment_box = ((($page_writeable) && ($item_writeable)) ? true : false);
@@ -457,23 +448,17 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
 
 
 				if(($comments[$item['parent']] > 2) && ($comments_seen <= ($comments[$item['parent']] - 2)) && ($item['gravity'] == 6)) {
-					if(! $comments_collapsed) {
 
-						// IMPORTANT: the closing </div> in the hide_comments template
-						// is supplied below in code. 
-
-						$threads[$threadsid]['html'] .= replace_macros($hide_comments_tpl,array(
-							'$id' => $item['parent'],
-							'$num_comments' => sprintf( tt('%d comment','%d comments',$comments[$item['parent']]),
-								$comments[$item['parent']]),
-							'$display' => 'none',
-							'$hide_text' => t('show more')
-						));
+					if (!$comments_collapsed){
+						$threads[$threadsid]['num_comments'] = sprintf( tt('%d comment','%d comments',$comments[$item['parent']]),$comments[$item['parent']] );
+						$threads[$threadsid]['hide_text'] = t('show more');
 						$comments_collapsed = true;
+						$comment_firstcollapsed = true;
 					}
 				}
 				if(($comments[$item['parent']] > 2) && ($comments_seen == ($comments[$item['parent']] - 1))) {
-					$threads[$threadsid]['html'] .= '</div>';
+
+					$comment_lastcollapsed = true;
 				}
 
 				$redirect_url = $a->get_baseurl() . '/redir/' . $item['cid'] ;
@@ -503,7 +488,7 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
 						$template = $wallwall;
 						$commentww = 'ww';	
 					}
-					if((! $item['wall']) && (strlen($item['owner-link'])) && ($item['owner-link'] != $item['author-link'])) {
+					if((! $item['wall']) && (strlen($item['owner-link'])) && (! link_compare($item['owner-link'],$item['author-link']))) {
 
 						// Could be anybody. 
 
@@ -650,63 +635,72 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
 				// Build the HTML
 
 				$body = prepare_body($item,true);
+				//$tmp_item = replace_macros($template,
+				$tmp_item = array(
+					// collapse comments in template. I don't like this much...
+					'comment_firstcollapsed' => $comment_firstcollapsed,
+					'comment_lastcollapsed' => $comment_lastcollapsed,
+					// template to use to render item (wall, walltowall, search)
+					'template' => $template,
+					
+					'type' => implode("",array_slice(split("/",$item['verb']),-1)),
+					'tags' => $tags,
+					'body' => template_escape($body),
+					'text' => strip_tags(template_escape($body)),
+					'id' => $item['item_id'],
+					'linktitle' => sprintf( t('View %s\'s profile @ %s'), $profile_name, ((strlen($item['author-link'])) ? $item['author-link'] : $item['url'])),
+					'olinktitle' => sprintf( t('View %s\'s profile @ %s'), $profile_name, ((strlen($item['owner-link'])) ? $item['owner-link'] : $item['url'])),
+					'to' => t('to'),
+					'wall' => t('Wall-to-Wall'),
+					'vwall' => t('via Wall-To-Wall:'),
+					'profile_url' => $profile_link,
+					'item_photo_menu' => item_photo_menu($item),
+					'name' => template_escape($profile_name),
+					'thumb' => $profile_avatar,
+					'osparkle' => $osparkle,
+					'sparkle' => $sparkle,
+					'title' => template_escape($item['title']),
+					'ago' => (($item['app']) ? sprintf( t('%s from %s'),relative_date($item['created']),$item['app']) : relative_date($item['created'])),
+					'lock' => $lock,
+					'location' => template_escape($location),
+					'indent' => $indent,
+					'owner_url' => $owner_url,
+					'owner_photo' => $owner_photo,
+					'owner_name' => template_escape($owner_name),
+					'plink' => get_plink($item),
+					'edpost' => $edpost,
+					'isstarred' => $isstarred,
+					'star' => $star,
+					'drop' => $drop,
+					'vote' => $likebuttons,
+					'like' => $like,
+					'dislike' => $dislike,
+					'comment' => $comment,
+					'previewing' => $previewing,
+					'wait' => t('Please wait'),
 
-				$tmp_item = replace_macros($template,array(
-					'$type' => implode("",array_slice(explode("/",$item['verb']),-1)),
-					'$tags' => $tags,
-					'$body' => template_escape($body),
-					'$id' => $item['item_id'],
-					'$linktitle' => sprintf( t('View %s\'s profile @ %s'), $profile_name, ((strlen($item['author-link'])) ? $item['author-link'] : $item['url'])),
-					'$olinktitle' => sprintf( t('View %s\'s profile @ %s'), $profile_name, ((strlen($item['owner-link'])) ? $item['owner-link'] : $item['url'])),
-					'$to' => t('to'),
-					'$wall' => t('Wall-to-Wall'),
-					'$vwall' => t('via Wall-To-Wall:'),
-					'$profile_url' => $profile_link,
-					'$item_photo_menu' => item_photo_menu($item),
-					'$name' => template_escape($profile_name),
-					'$thumb' => $profile_avatar,
-					'$osparkle' => $osparkle,
-					'$sparkle' => $sparkle,
-					'$title' => template_escape($item['title']),
-					'$ago' => (($item['app']) ? sprintf( t('%s from %s'),relative_date($item['created']),$item['app']) : relative_date($item['created'])),
-					'$lock' => $lock,
-					'$location' => template_escape($location),
-					'$indent' => $indent,
-					'$owner_url' => $owner_url,
-					'$owner_photo' => $owner_photo,
-					'$owner_name' => template_escape($owner_name),
-					'$plink' => get_plink($item),
-					'$edpost' => $edpost,
-					'$isstarred' => $isstarred,
-					'$star' => $star,
-					'$drop' => $drop,
-					'$vote' => $likebuttons,
-					'$like' => $like,
-					'$dislike' => $dislike,
-					'$comment' => $comment,
-					'$previewing' => $previewing,
-					'$wait' => t('Please wait'),
-
-				));
+				);
 
 
 				$arr = array('item' => $item, 'output' => $tmp_item);
 				call_hooks('display_item', $arr);
 
-				$threads[$threadsid]['html'] .= $arr['output'];
+				$threads[$threadsid]['items'][] = $arr['output'];
 			}
 		}
 	}
 
-
 	$page_template = get_markup_template("conversation.tpl");
 	$o .= replace_macros($page_template, array(
+		'$baseurl' => $a->get_baseurl(),
+		'$mode' => $mode,
+		'$user' => $a->user,
 		'$threads' => $threads,
 		'$dropping' => ($dropping?t('Delete Selected Items'):False),
 	));
 
 	return $o;
-} 
+}}
 
 function best_link_url($item,&$sparkle) {
 
diff --git a/include/enotify.php b/include/enotify.php
index 76e7eb9dc..a505f1f04 100755
--- a/include/enotify.php
+++ b/include/enotify.php
@@ -25,6 +25,9 @@ function notification($params) {
 		$title = $body = '';
 	}
 
+	// e.g. "your post", "David's photo", etc.
+	$possess_desc = t('%s <!item_type!>');
+
 	if($params['type'] == NOTIFY_MAIL) {
 
 		$subject = 	sprintf( t('[Friendica:Notify] New mail received at %s'),$sitename);
@@ -41,7 +44,32 @@ function notification($params) {
 //		logger("notification: params = " . print_r($params, true), LOGGER_DEBUG);
 
 		$parent_id = $params['parent'];
+
+
+		// if it's a post figure out who's post it is.
+
+		$p = null;
+
+		if($params['otype'] === 'item' && $parent_id) {
+			$p = q("select * from item where id = %d and uid = %d limit 1",
+				intval($parent_id),
+				intval($params['uid'])
+			);
+		}
+
+		$possess_desc = str_replace('<!item_type!>',item_post_type($p[0]),$possess_desc);
+
+		// "a post"
+		$dest_str = sprintf($possess_desc,'a');
+
+		// "George Bull's post"
+		if($p)
+			$dest_str = sprintf($possess_desc,sprintf( t("%s's"),$p[0]['author-name']));
 		
+		// "your post"
+		if($p[0]['owner-name'] == $p[0]['author-name'] && $p[0]['wall'])
+			$dest_str = sprintf($possess_desc, t('your') );
+
 		// Some mail softwares relies on subject field for threading.
 		// So, we cannot have different subjects for notifications of the same thread.
 		// Before this we have the name of the replier on the subject rendering 
@@ -49,7 +77,7 @@ function notification($params) {
 
 		$subject = sprintf( t('[Friendica:Notify] Comment to conversation #%d by %s'), $parent_id, $params['source_name']);
 		$preamble = sprintf( t('%s commented on an item/conversation you have been following.'), $params['source_name']); 
-		$epreamble = sprintf( t('%s commented in %s.'), '[url=' . $params['source_link'] . ']' . $params['source_name'] . '[/url]', '[url=$itemlink]' . t('a watched conversation') . '[/url]'); 
+		$epreamble = sprintf( t('%s commented on %s.'), '[url=' . $params['source_link'] . ']' . $params['source_name'] . '[/url]', '[url=$itemlink]' . $dest_str . '[/url]'); 
 
 		$sitelink = t('Please visit %s to view and/or reply to the conversation.');
 		$tsitelink = sprintf( $sitelink, $siteurl );
@@ -149,6 +177,7 @@ function notification($params) {
 	$datarray['date']  = datetime_convert();
 	$datarray['uid']   = $params['uid'];
 	$datarray['link']  = $itemlink;
+	$datarray['parent'] = $parent_id;
 	$datarray['type']  = $params['type'];
 	$datarray['verb']  = $params['verb'];
 	$datarray['otype'] = $params['otype'];
@@ -157,8 +186,8 @@ function notification($params) {
 
 	// create notification entry in DB
 
-	$r = q("insert into notify (hash,name,url,photo,date,uid,link,type,verb,otype)
-		values('%s','%s','%s','%s','%s',%d,'%s',%d,'%s','%s')",
+	$r = q("insert into notify (hash,name,url,photo,date,uid,link,parent,type,verb,otype)
+		values('%s','%s','%s','%s','%s',%d,'%s',%d,%d,'%s','%s')",
 		dbesc($datarray['hash']),
 		dbesc($datarray['name']),
 		dbesc($datarray['url']),
@@ -166,6 +195,7 @@ function notification($params) {
 		dbesc($datarray['date']),
 		intval($datarray['uid']),
 		dbesc($datarray['link']),
+		intval($datarray['parent']),
 		intval($datarray['type']),
 		dbesc($datarray['verb']),
 		dbesc($datarray['otype'])
diff --git a/include/html2bbcode.php b/include/html2bbcode.php
index 65920380b..32a90d7d6 100755
--- a/include/html2bbcode.php
+++ b/include/html2bbcode.php
@@ -10,7 +10,7 @@ Originally made for the syncom project: http://wiki.piratenpartei.de/Syncom
 function node2bbcode(&$doc, $oldnode, $attributes, $startbb, $endbb)
 {
 	do {
-		$done = node2bbcodesub(&$doc, $oldnode, $attributes, $startbb, $endbb);
+		$done = node2bbcodesub($doc, $oldnode, $attributes, $startbb, $endbb);
 	} while ($done);
 }
 
@@ -212,7 +212,7 @@ function html2bbcode($message)
 	node2bbcode($doc, 'audio', array('src'=>'/(.+)/'), '[audio]$1', '[/audio]');
 	node2bbcode($doc, 'iframe', array('src'=>'/(.+)/'), '[iframe]$1', '[/iframe]');
 
-	node2bbcode($doc, 'code', array(), '[code]$1', '[/code]');
+	node2bbcode($doc, 'code', array(), '[code]', '[/code]');
 
 	$message = $doc->saveHTML();
 
diff --git a/include/items.php b/include/items.php
index 5268dfc1d..70c72ae16 100755
--- a/include/items.php
+++ b/include/items.php
@@ -1598,6 +1598,14 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0)
 				if((activity_match($datarray['verb'],ACTIVITY_LIKE)) || (activity_match($datarray['verb'],ACTIVITY_DISLIKE))) {
 					$datarray['type'] = 'activity';
 					$datarray['gravity'] = GRAVITY_LIKE;
+					// only one like or dislike per person
+					$r = q("select id from item where uid = %d and `contact-id` = %d and verb ='%s' and deleted = 0 limit 1",
+						intval($datarray['uid']),
+						intval($datarray['contact-id']),
+						dbesc($datarray['verb'])
+					);
+					if($r && count($r))
+						continue; 
 				}
 
 				if(($datarray['verb'] === ACTIVITY_TAG) && ($datarray['object-type'] === ACTIVITY_OBJ_TAGTERM)) {
@@ -1750,6 +1758,18 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0)
 				$datarray['parent-uri'] = $item_id;
 				$datarray['uid'] = $importer['uid'];
 				$datarray['contact-id'] = $contact['id'];
+
+				if(! link_compare($datarray['owner-link'],$contact['url'])) {
+					// The item owner info is not our contact. It's OK and is to be expected if this is a tgroup delivery, 
+					// but otherwise there's a possible data mixup on the sender's system.
+					// the tgroup delivery code called from item_store will correct it if it's a forum,
+					// but we're going to unconditionally correct it here so that the post will always be owned by our contact. 
+					logger('local_delivery: Correcting item owner.', LOGGER_DEBUG);
+					$datarray['owner-name']   = $contact['name'];
+					$datarray['owner-link']   = $contact['url'];
+					$datarray['owner-avatar'] = $contact['thumb'];
+				}
+
 				$r = item_store($datarray);
 				continue;
 
@@ -2139,6 +2159,14 @@ function local_delivery($importer,$data) {
 					$datarray['type'] = 'activity';
 					$datarray['gravity'] = GRAVITY_LIKE;
 					$datarray['last-child'] = 0;
+					// only one like or dislike per person
+					$r = q("select id from item where uid = %d and `contact-id` = %d and verb ='%s' and deleted = 0 limit 1",
+						intval($datarray['uid']),
+						intval($datarray['contact-id']),
+						dbesc($datarray['verb'])
+					);
+					if($r && count($r))
+						continue; 
 				}
 
 				if(($datarray['verb'] === ACTIVITY_TAG) && ($datarray['object-type'] === ACTIVITY_OBJ_TAGTERM)) {
@@ -2288,6 +2316,15 @@ function local_delivery($importer,$data) {
 				if(($datarray['verb'] == ACTIVITY_LIKE) || ($datarray['verb'] == ACTIVITY_DISLIKE)) {
 					$datarray['type'] = 'activity';
 					$datarray['gravity'] = GRAVITY_LIKE;
+					// only one like or dislike per person
+					$r = q("select id from item where uid = %d and `contact-id` = %d and verb ='%s' and deleted = 0 limit 1",
+						intval($datarray['uid']),
+						intval($datarray['contact-id']),
+						dbesc($datarray['verb'])
+					);
+					if($r && count($r))
+						continue; 
+
 				}
 
 				if(($datarray['verb'] === ACTIVITY_TAG) && ($datarray['object-type'] === ACTIVITY_OBJ_TAGTERM)) {
@@ -2328,35 +2365,44 @@ function local_delivery($importer,$data) {
 
 					if(count($myconv)) {
 						$importer_url = $a->get_baseurl() . '/profile/' . $importer['nickname'];
-						foreach($myconv as $conv) {
 
-							if(! link_compare($conv['author-link'],$importer_url))
-								continue;
+						// first make sure this isn't our own post coming back to us from a wall-to-wall event
+						if(! link_compare($datarray['author-link'],$importer_url)) {
 
-							require_once('include/enotify.php');
 							
-							$conv_parent = $conv['parent'];
-
-							notification(array(
-								'type'         => NOTIFY_COMMENT,
-								'notify_flags' => $importer['notify-flags'],
-								'language'     => $importer['language'],
-								'to_name'      => $importer['username'],
-								'to_email'     => $importer['email'],
-								'uid'          => $importer['importer_uid'],
-								'item'         => $datarray,
-								'link'		   => $a->get_baseurl() . '/display/' . $importer['nickname'] . '/' . $posted_id,
-								'source_name'  => stripslashes($datarray['author-name']),
-								'source_link'  => $datarray['author-link'],
-								'source_photo' => ((link_compare($datarray['author-link'],$importer['url'])) 
-									? $importer['thumb'] : $datarray['author-avatar']),
-								'verb'         => ACTIVITY_POST,
-								'otype'        => 'item',
-								'parent'       => $conv_parent,
+							foreach($myconv as $conv) {
 
-							));
+								// now if we find a match, it means we're in this conversation
+	
+								if(! link_compare($conv['author-link'],$importer_url))
+									continue;
 
-							break;
+								require_once('include/enotify.php');
+								
+								$conv_parent = $conv['parent'];
+
+								notification(array(
+									'type'         => NOTIFY_COMMENT,
+									'notify_flags' => $importer['notify-flags'],
+									'language'     => $importer['language'],
+									'to_name'      => $importer['username'],
+									'to_email'     => $importer['email'],
+									'uid'          => $importer['importer_uid'],
+									'item'         => $datarray,
+									'link'		   => $a->get_baseurl() . '/display/' . $importer['nickname'] . '/' . $posted_id,
+									'source_name'  => stripslashes($datarray['author-name']),
+									'source_link'  => $datarray['author-link'],
+									'source_photo' => ((link_compare($datarray['author-link'],$importer['url'])) 
+										? $importer['thumb'] : $datarray['author-avatar']),
+									'verb'         => ACTIVITY_POST,
+									'otype'        => 'item',
+									'parent'       => $conv_parent,
+
+								));
+
+								// only send one notification
+								break;
+							}
 						}
 					}
 				}
@@ -2427,12 +2473,24 @@ function local_delivery($importer,$data) {
 			// This is my contact on another system, but it's really me.
 			// Turn this into a wall post.
 
-			if($contact['remote_self'])
+			if($importer['remote_self'])
 				$datarray['wall'] = 1;
 
 			$datarray['parent-uri'] = $item_id;
 			$datarray['uid'] = $importer['importer_uid'];
 			$datarray['contact-id'] = $importer['id'];
+
+			if(! link_compare($datarray['owner-link'],$contact['url'])) {
+				// The item owner info is not our contact. It's OK and is to be expected if this is a tgroup delivery, 
+				// but otherwise there's a possible data mixup on the sender's system.
+				// the tgroup delivery code called from item_store will correct it if it's a forum,
+				// but we're going to unconditionally correct it here so that the post will always be owned by our contact. 
+				logger('local_delivery: Correcting item owner.', LOGGER_DEBUG);
+				$datarray['owner-name']   = $importer['senderName'];
+				$datarray['owner-link']   = $importer['url'];
+				$datarray['owner-avatar'] = $importer['thumb'];
+			}
+
 			$r = item_store($datarray);
 			continue;
 		}
diff --git a/include/nav.php b/include/nav.php
index 511ca07fc..aadfa82fd 100755
--- a/include/nav.php
+++ b/include/nav.php
@@ -122,6 +122,9 @@ function nav(&$a) {
 		}
 
 		$nav['messages'] = array('message', t('Messages'), "", t('Private mail'));
+		$nav['messages']['inbox'] = array('message', t('Inbox'), "", t('Inbox'));
+		$nav['messages']['outbox']= array('message/sent', t('Outbox'), "", t('Outbox'));
+		$nav['messages']['new'] = array('message/new', t('New Message'), "", t('New Message'));
 		
 		if(is_array($a->identities) && count($a->identities) > 1) {
 			$nav['manage'] = array('manage', t('Manage'), "", t('Manage other pages'));
diff --git a/include/notifier.php b/include/notifier.php
index 4765cca06..5b23406fc 100755
--- a/include/notifier.php
+++ b/include/notifier.php
@@ -201,7 +201,7 @@ function notifier_run($argv, $argc){
 		// by stringing togther an array of retractions and sending them onward.
 		 
   	
-		$localhost = $a->get_hostname();
+		$localhost = str_replace('www.','',$a->get_hostname());
 		if(strpos($localhost,':'))
 			$localhost = substr($localhost,0,strpos($localhost,':'));
 
diff --git a/include/security.php b/include/security.php
index bc2c9f0bf..8c536b656 100755
--- a/include/security.php
+++ b/include/security.php
@@ -108,14 +108,18 @@ function can_write_wall(&$a,$owner) {
 
 	if(remote_user()) {
 
-		// user remembered decision and avoid a DB lookup for each and every display item
+		// use remembered decision and avoid a DB lookup for each and every display item
 		// DO NOT use this function if there are going to be multiple owners
 
+		// We have a contact-id for an authenticated remote user, this block determines if the contact
+		// belongs to this page owner, and has the necessary permissions to post content
+
 		if($verified === 2)
 			return true;
 		elseif($verified === 1)
 			return false;
 		else {
+
 			$r = q("SELECT `contact`.*, `user`.`page-flags` FROM `contact` LEFT JOIN `user` on `user`.`uid` = `contact`.`uid` 
 				WHERE `contact`.`uid` = %d AND `contact`.`id` = %d AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 
 				AND `user`.`blockwall` = 0 AND `readonly` = 0  AND ( `contact`.`rel` IN ( %d , %d ) OR `user`.`page-flags` = %d ) LIMIT 1",
@@ -125,6 +129,7 @@ function can_write_wall(&$a,$owner) {
 				intval(CONTACT_IS_FRIEND),
 				intval(PAGE_COMMUNITY)
 			);
+
 			if(count($r)) {
 				$verified = 2;
 				return true;
@@ -197,7 +202,7 @@ function permissions_sql($owner_id,$remote_verified = false,$groups = null) {
 				" AND ( allow_cid = '' OR allow_cid REGEXP '<%d>' ) 
 				  AND ( deny_cid  = '' OR  NOT deny_cid REGEXP '<%d>' ) 
 				  AND ( allow_gid = '' OR allow_gid REGEXP '%s' )
-				  AND ( deny_gid  = '' OR NOT deny_gid REGEXP '%s') 
+				  AND ( deny_gid  = '' OR NOT deny_gid REGEXP '%s')
 				",
 				intval($remote_user),
 				intval($remote_user),
@@ -207,4 +212,79 @@ function permissions_sql($owner_id,$remote_verified = false,$groups = null) {
 		}
 	}
 	return $sql;
-}
-\ No newline at end of file
+}
+
+
+function item_permissions_sql($owner_id,$remote_verified = false,$groups = null) {
+
+	$local_user = local_user();
+	$remote_user = remote_user();
+
+	/**
+	 * Construct permissions
+	 *
+	 * default permissions - anonymous user
+	 */
+
+	$sql = " AND allow_cid = '' 
+			 AND allow_gid = '' 
+			 AND deny_cid  = '' 
+			 AND deny_gid  = '' 
+			 AND private = 0
+	";
+
+	/**
+	 * Profile owner - everything is visible
+	 */
+
+	if(($local_user) && ($local_user == $owner_id)) {
+		$sql = ''; 
+	}
+
+	/**
+	 * Authenticated visitor. Unless pre-verified, 
+	 * check that the contact belongs to this $owner_id
+	 * and load the groups the visitor belongs to.
+	 * If pre-verified, the caller is expected to have already
+	 * done this and passed the groups into this function.
+	 */
+
+	elseif($remote_user) {
+
+		if(! $remote_verified) {
+			$r = q("SELECT id FROM contact WHERE id = %d AND uid = %d AND blocked = 0 LIMIT 1",
+				intval($remote_user),
+				intval($owner_id)
+			);
+			if(count($r)) {
+				$remote_verified = true;
+				$groups = init_groups_visitor($remote_user);
+			}
+		}
+		if($remote_verified) {
+		
+			$gs = '<<>>'; // should be impossible to match
+
+			if(is_array($groups) && count($groups)) {
+				foreach($groups as $g)
+					$gs .= '|<' . intval($g) . '>';
+			} 
+
+			$sql = sprintf(
+				" AND ( private = 0 OR ( private = 1 AND wall = 1 AND ( allow_cid = '' OR allow_cid REGEXP '<%d>' ) 
+				  AND ( deny_cid  = '' OR  NOT deny_cid REGEXP '<%d>' ) 
+				  AND ( allow_gid = '' OR allow_gid REGEXP '%s' )
+				  AND ( deny_gid  = '' OR NOT deny_gid REGEXP '%s'))) 
+				",
+				intval($remote_user),
+				intval($remote_user),
+				dbesc($gs),
+				dbesc($gs)
+			);
+		}
+	}
+
+	return $sql;
+}
+
+
diff --git a/include/template_processor.php b/include/template_processor.php
index 7a4cba64e..7f7b0b55b 100755
--- a/include/template_processor.php
+++ b/include/template_processor.php
@@ -1,5 +1,5 @@
 <?php
-
+	define ("KEY_NOT_EXISTS", '^R_key_not_Exists^');
 
 	class Template {
 		var $r;
@@ -28,30 +28,18 @@
 			die();
 		}
 		
-		private function _build_replace($r, $prefix){
-	
-			if(is_array($r) && count($r)) {
-				foreach ($r as $k => $v ) {
-					if (is_array($v)) {
-						$this->_build_replace($v, "$prefix$k.");
-					} else {
-						$this->search[] =  $prefix . $k;
-						$this->replace[] = $v;
-					}
-				}
-			}
-		} 
 		
 		private function _push_stack(){
-			$this->stack[] = array($this->r, $this->search, $this->replace, $this->nodes);
+			$this->stack[] = array($this->r, $this->nodes);
 		}
 		private function _pop_stack(){
-			list($this->r, $this->search, $this->replace, $this->nodes) = array_pop($this->stack);
+			list($this->r, $this->nodes) = array_pop($this->stack);
 			
 		}
 		
-		private function _get_var($name){
-			$keys = array_map('trim',explode(".",$name));		
+		private function _get_var($name, $retNoKey=false){
+			$keys = array_map('trim',explode(".",$name));
+			if ($retNoKey && !array_key_exists($keys[0], $this->r)) return KEY_NOT_EXISTS;
 			$val = $this->r;
 			foreach($keys as $k) {
 				$val = (isset($val[$k]) ? $val[$k] : null);
@@ -121,7 +109,15 @@
 		 * {{ inc <templatefile> [with $var1=$var2] }}{{ endinc }}
 		 */
 		private function _replcb_inc($args){
-			list($tplfile, $newctx) = array_map('trim', explode("with",$args[2]));
+			if (strpos($args[2],"with")) {
+				list($tplfile, $newctx) = array_map('trim', explode("with",$args[2]));
+			} else {
+				$tplfile = trim($args[2]);
+				$newctx = null;
+			}
+			
+			if ($tplfile[0]=="$") $tplfile = $this->_get_var($tplfile);
+			
 			$this->_push_stack();
 			$r = $this->r;
 			if (!is_null($newctx)) {
@@ -166,40 +162,33 @@
 			return $s;
 		}
 		
-        /*
-		private function _str_replace($str){
-			#$this->search,$this->replace,
-			$searchs = $this->search;
-			foreach($searchs as $search){
-				$search = "|".preg_quote($search)."(\|[a-zA-Z0-9_]*)*|";
-				$m = array();
-				if (preg_match_all($search, $str,$m)){
-					foreach ($m[0] as $match){
-						$toks = explode("|",$match);
-						$val = $this->_get_var($toks[0]);
-						for($k=1; $k<count($toks); $k++){
-							$func = $toks[$k];
-							if (function_exists($func)) $val = $func($val);
-						}
-						if (count($toks)>1){
-							$str = str_replace( $match, $val, $str);
-						} 
-					}
-				}
+
+		private function var_replace($s){
+			$m = array();
+			/** regexp:
+			 * \$ 						literal $
+			 * (\[)?					optional open square bracket
+			 * ([a-zA-Z0-9-_]+\.?)+		var name, followed by optional
+			 * 							dot, repeated at least 1 time
+			 * (?(1)\])					if there was opened square bracket
+			 * 							(subgrup 1), match close bracket
+			 */
+			if (preg_match_all('/\$(\[)?([a-zA-Z0-9-_]+\.?)+(?(1)\])/', $s,$m)){
 				
+				foreach($m[0] as $var){
+					$varn = str_replace(array("[","]"), array("",""), $var);
+					$val = $this->_get_var($varn, true);
+					if ($val!=KEY_NOT_EXISTS)
+						$s = str_replace($var, $val, $s);
+				}
 			}
-			return str_replace($this->search,$this->replace, $str);
-		}*/
-
+			
+			return $s;
+		}
 	
 		public function replace($s, $r) {
 			$this->r = $r;
-			$this->search = array();
-			$this->replace = array();
-
-			$this->_build_replace($r, "");
 			
-			#$s = str_replace(array("\n","\r"),array("§n§","§r§"),$s);
 			$s = $this->_build_nodes($s);
 
 			$s = preg_replace_callback('/\|\|([0-9]+)\|\|/', array($this, "_replcb_node"), $s);
@@ -207,12 +196,12 @@
 			
 			// remove comments block
 			$s = preg_replace('/{#[^#]*#}/', "" , $s);
+			
 			// replace strings recursively (limit to 10 loops)
 			$os = ""; $count=0;
 			while($os!=$s && $count<10){
 				$os=$s; $count++;
-				//$s = $this->_str_replace($s);
-				$s = str_replace($this->search, $this->replace, $s);
+				$s = $this->var_replace($s);
 			}
 			return template_unescape($s);
 		}
diff --git a/include/text.php b/include/text.php
index 1f5d4a3e1..5ad0154d7 100755..100644
--- a/include/text.php
+++ b/include/text.php
@@ -14,7 +14,13 @@ if(! function_exists('replace_macros')) {
 function replace_macros($s,$r) {
 	global $t;
 	
-	return $t->replace($s,$r);
+	//$ts = microtime();
+	$r =  $t->replace($s,$r);
+	//$tt = microtime() - $ts;
+	
+	//$a = get_app();
+	//$a->page['debug'] .= "$tt <br>\n";
+	return $r;
 
 }}
 
@@ -731,7 +737,10 @@ function smilies($s, $sample = false) {
 		':headdesk',
 		'~friendika', 
 		'~friendica', 
-		'Diaspora*' 
+//		'Diaspora*' 
+		':beard',
+		':whitebeard'
+
 	);
 
 	$icons = array(
@@ -772,8 +781,9 @@ function smilies($s, $sample = false) {
 		'<img src="' . $a->get_baseurl() . '/images/smiley-bangheaddesk.gif" alt=":headdesk" />',
 		'<a href="http://project.friendika.com">~friendika <img src="' . $a->get_baseurl() . '/images/friendika-16.png" alt="~friendika" /></a>',
 		'<a href="http://friendica.com">~friendica <img src="' . $a->get_baseurl() . '/images/friendica-16.png" alt="~friendica" /></a>',
-		'<a href="http://diasporafoundation.org">Diaspora<img src="' . $a->get_baseurl() . '/images/diaspora.png" alt="Diaspora*" /></a>',
-
+//		'<a href="http://diasporafoundation.org">Diaspora<img src="' . $a->get_baseurl() . '/images/diaspora.png" alt="Diaspora*" /></a>',
+		'<img src="' . $a->get_baseurl() . '/images/smiley-beard.png" alt=":beard" />',
+		'<img src="' . $a->get_baseurl() . '/images/smiley-whitebeard.png" alt=":whitebeard" />'
 	);
 
 	$params = array('texts' => $texts, 'icons' => $icons, 'string' => $s);
@@ -786,6 +796,7 @@ function smilies($s, $sample = false) {
 		}
 	}
 	else {
+		$params['string'] = preg_replace_callback('/&lt;(3+)/','preg_heart',$params['string']);
 		$s = str_replace($params['texts'],$params['icons'],$params['string']);
 	}
 
@@ -804,7 +815,18 @@ function smile_decode($m) {
 	return(str_replace($m[1],base64url_decode($m[1]),$m[0]));
 }
 
+// expand <3333 to the correct number of hearts
 
+function preg_heart($x) {
+	$a = get_app();
+	if(strlen($x[1]) == 1)
+		return $x[0];
+	$t = '';
+	for($cnt = 0; $cnt < strlen($x[1]); $cnt ++)
+		$t .= '<img src="' . $a->get_baseurl() . '/images/smiley-heart.gif" alt="<3" />';
+	$r =  str_replace($x[0],$t,$x[0]);
+	return $r;
+}
 
 
 if(! function_exists('day_translate')) {
@@ -1201,3 +1223,16 @@ function reltoabs($text, $base)
   return $text;
 }
 
+function item_post_type($item) {
+	if(intval($item['event-id']))
+		return t('event');
+	if(strlen($item['resource-id']))
+		return t('photo');
+	if(strlen($item['verb']) && $item['verb'] !== ACTIVITY_POST)
+		return t('activity');
+	if($item['id'] != $item['parent'])
+		return t('comment');
+	return t('post');
+}
+
+
diff --git a/js/fk.autocomplete.js b/js/fk.autocomplete.js
index 509466bd9..69fe77e8c 100755
--- a/js/fk.autocomplete.js
+++ b/js/fk.autocomplete.js
@@ -103,6 +103,7 @@ ACPopup.prototype._search = function(){
 		}
 		else {
 			txt = tinyMCE.activeEditor.getContent();
+			//			alert(that.searchText + ':' + t);
 			newtxt = txt.replace(that.searchText,t+' ');
 			tinyMCE.activeEditor.setContent(newtxt);
 			tinyMCE.activeEditor.focus();
diff --git a/js/main.js b/js/main.js
index a5d1214cb..c20455ad1 100755
--- a/js/main.js
+++ b/js/main.js
@@ -292,7 +292,7 @@
 				$('body').css('cursor', 'auto');
 			}
 			/* autocomplete @nicknames */
-			$(".comment-edit-wrapper  textarea").contact_autocomplete(baseurl+"/acl");
+			$(".comment-edit-form  textarea").contact_autocomplete(baseurl+"/acl");
 		});
 	}
 
diff --git a/library/phpsec/Net/SSH1.php b/library/phpsec/Net/SSH1.php
index 6986a8450..7220ee402 100755
--- a/library/phpsec/Net/SSH1.php
+++ b/library/phpsec/Net/SSH1.php
@@ -730,8 +730,8 @@ class Net_SSH1 {
     /**
      * Reads the output of an interactive shell.
      *
-     * Requires PHP 4.3.0 or later due to the use of the stream_select() function.  If you see stuff like
-     * "[00m", you're seeing ANSI escape codes.  According to
+     * Requires PHP 4.3.0 or later due to the use of the stream_select() function.  If you see crap, 
+     * you're seeing ANSI escape codes.  According to
      * {@link http://support.microsoft.com/kb/101875 How to Enable ANSI.SYS in a Command Window}, "Windows NT
      * does not support ANSI escape sequences in Win32 Console applications", so if you're a Windows user,
      * there's not going to be much recourse.
diff --git a/library/spam/b8/storage/storage_frndc.php b/library/spam/b8/storage/storage_frndc.php
index 7702c108b..62909d471 100644
--- a/library/spam/b8/storage/storage_frndc.php
+++ b/library/spam/b8/storage/storage_frndc.php
@@ -174,20 +174,44 @@ class b8_storage_frndc extends b8_storage_base
 				array_push($where, $token);
 			}
 
-			$where = 'token IN ("' . implode('", "', $where) . '")';
+			$where = 'term IN ("' . implode('", "', $where) . '")';
 		}
 
 		else {
 			$token = dbesc($token);
-			$where = 'token = "' . $token . '"';
+			$where = 'term = "' . $token . '"';
 		}
 
 		# ... and fetch the data
 
 		$result = q('
-			SELECT *
-			FROM ' . $this->config['table_name'] . '
-			WHERE ' . $where . ' AND uid = ' . $uid );
+			SELECT * FROM spam WHERE ' . $where . ' AND uid = ' . $uid );
+
+
+		$returned_tokens = array();
+		if(count($result)) {
+			foreach($result as $rr)
+				$returned_tokens[] = $rr['term'];
+		}
+		$to_create = array();
+
+		if(count($tokens) > 0) {
+			foreach($tokens as $token)
+				if(! in_array($token,$returned_tokens))
+					$to_create[] = str_tolower($token); 
+		}
+		if(count($to_create)) {
+			$sql = '';
+			foreach($to_create as $term) {
+				if(strlen($sql))
+					$sql .= ',';
+				$sql .= sprintf("(term,datetime,uid) values('%s','%s',%d)",
+					dbesc(str_tolower($term))
+					dbesc(datetime_convert()),
+					intval($uid)
+				);
+			q("insert into spam " . $sql);
+		}
 
 		return $result;
 
diff --git a/mod/admin.php b/mod/admin.php
index 0f600e312..93714bb5f 100755
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -145,9 +145,10 @@ function admin_page_summary(&$a) {
 		Array( t('Automatic Friend Account'), 0)
 	);
 	$users=0;
-	foreach ($r as $u){ $accounts[$u['page-flags']][1] = $u['count']; $users+=$u['count']; }
+	foreach ($r as $u){ $accounts[$u['page-flags']][1] = $u['count']; $users+= $u['count']; }
+
+	logger('accounts: ' . print_r($accounts,true));
 
-	
 	$r = q("SELECT COUNT(id) as `count` FROM `register`");
 	$pending = $r[0]['count'];
 	
@@ -320,32 +321,32 @@ function admin_page_site(&$a) {
 		'$sitename' 		=> array('sitename', t("Site name"), htmlentities($a->config['sitename'], ENT_QUOTES), ""),
 		'$banner'			=> array('banner', t("Banner/Logo"), $banner, ""),
 		'$language' 		=> array('language', t("System language"), get_config('system','language'), "", $lang_choices),
-		'$theme' 			=> array('theme', t("System theme"), get_config('system','theme'), "Default system theme (which may be over-ridden by user profiles)", $theme_choices),
+		'$theme' 			=> array('theme', t("System theme"), get_config('system','theme'), t("Default system theme - may be over-ridden by user profiles"), $theme_choices),
 
-		'$maximagesize'		=> array('maximagesize', t("Maximum image size"), get_config('system','maximagesize'), "Maximum size in bytes of uploaded images. Default is 0, which means no limits."),
+		'$maximagesize'		=> array('maximagesize', t("Maximum image size"), get_config('system','maximagesize'), t("Maximum size in bytes of uploaded images. Default is 0, which means no limits.")),
 
 		'$register_policy'	=> array('register_policy', t("Register policy"), $a->config['register_policy'], "", $register_choices),
-		'$register_text'	=> array('register_text', t("Register text"), htmlentities($a->config['register_text'], ENT_QUOTES), "Will be displayed prominently on the registration page."),
+		'$register_text'	=> array('register_text', t("Register text"), htmlentities($a->config['register_text'], ENT_QUOTES), t("Will be displayed prominently on the registration page.")),
 		'$abandon_days'     => array('abandon_days', t('Accounts abandoned after x days'), get_config('system','account_abandon_days'), t('Will not waste system resources polling external sites for abandonded accounts. Enter 0 for no time limit.')),
-		'$allowed_sites'	=> array('allowed_sites', t("Allowed friend domains"), get_config('system','allowed_sites'), "Comma separated list of domains which are allowed to establish friendships with this site. Wildcards are accepted. Empty to allow any domains"),
-		'$allowed_email'	=> array('allowed_email', t("Allowed email domains"), get_config('system','allowed_email'), "Comma separated list of domains which are allowed in email addresses for registrations to this site. Wildcards are accepted. Empty to allow any domains"),
-		'$block_public'		=> array('block_public', t("Block public"), get_config('system','block_public'), "Check to block public access to all otherwise public personal pages on this site unless you are currently logged in."),
-		'$force_publish'	=> array('publish_all', t("Force publish"), get_config('system','publish_all'), "Check to force all profiles on this site to be listed in the site directory."),
-		'$global_directory'	=> array('directory_submit_url', t("Global directory update URL"), get_config('system','directory_submit_url'), "URL to update the global directory. If this is not set, the global directory is completely unavailable to the application."),
+		'$allowed_sites'	=> array('allowed_sites', t("Allowed friend domains"), get_config('system','allowed_sites'), t("Comma separated list of domains which are allowed to establish friendships with this site. Wildcards are accepted. Empty to allow any domains")),
+		'$allowed_email'	=> array('allowed_email', t("Allowed email domains"), get_config('system','allowed_email'), t("Comma separated list of domains which are allowed in email addresses for registrations to this site. Wildcards are accepted. Empty to allow any domains")),
+		'$block_public'		=> array('block_public', t("Block public"), get_config('system','block_public'), t("Check to block public access to all otherwise public personal pages on this site unless you are currently logged in.")),
+		'$force_publish'	=> array('publish_all', t("Force publish"), get_config('system','publish_all'), t("Check to force all profiles on this site to be listed in the site directory.")),
+		'$global_directory'	=> array('directory_submit_url', t("Global directory update URL"), get_config('system','directory_submit_url'), t("URL to update the global directory. If this is not set, the global directory is completely unavailable to the application.")),
 			
-		'$no_multi_reg'		=> array('no_multi_reg', t("Block multiple registrations"),  get_config('system','block_extended_register'), "Disallow users to register additional accounts for use as pages."),
-		'$no_openid'		=> array('no_openid', t("OpenID support"), !get_config('system','no_openid'), "OpenID support for registration and logins."),
-		'$no_gravatar'		=> array('no_gravatar', t("Gravatar support"), !get_config('system','no_gravatar'), "Search new user's photo on Gravatar."),
-		'$no_regfullname'	=> array('no_regfullname', t("Fullname check"), !get_config('system','no_regfullname'), "Force users to register with a space between firstname and lastname in Full name, as an antispam measure"),
-		'$no_utf'			=> array('no_utf', t("UTF-8 Regular expressions"), !get_config('system','no_utf'), "Use PHP UTF8 regular expressions"),
-		'$no_community_page' => array('no_community_page', t("Show Community Page"), !get_config('system','no_community_page'), "Display a Community page showing all recent public postings on this site."),
-		'$ostatus_disabled' => array('ostatus_disabled', t("Enable OStatus support"), !get_config('system','ostatus_disable'), "Provide built-in OStatus \x28identi.ca, status.net, etc.\x29 compatibility. All communications in OStatus are public, so privacy warnings will be occasionally displayed."),	
-		'$diaspora_enabled' => array('diaspora_enabled', t("Enable Diaspora support"), get_config('system','diaspora_enabled'), "Provide built-in Diaspora network compatibility."),	
-		'$dfrn_only'        => array('dfrn_only', t('Only allow Friendica contacts'), get_config('system','dfrn_only'), "All contacts must use Friendica protocols. All other built-in communication protocols disabled."),
-		'$verifyssl' 		=> array('verifyssl', t("Verify SSL"), get_config('system','verifyssl'), "If you wish, you can turn on strict certificate checking. This will mean you cannot connect (at all) to self-signed SSL sites."),
+		'$no_multi_reg'		=> array('no_multi_reg', t("Block multiple registrations"),  get_config('system','block_extended_register'), t("Disallow users to register additional accounts for use as pages.")),
+		'$no_openid'		=> array('no_openid', t("OpenID support"), !get_config('system','no_openid'), t("OpenID support for registration and logins.")),
+		'$no_gravatar'		=> array('no_gravatar', t("Gravatar support"), !get_config('system','no_gravatar'), t("Search new user's photo on Gravatar.")),
+		'$no_regfullname'	=> array('no_regfullname', t("Fullname check"), !get_config('system','no_regfullname'), t("Force users to register with a space between firstname and lastname in Full name, as an antispam measure")),
+		'$no_utf'			=> array('no_utf', t("UTF-8 Regular expressions"), !get_config('system','no_utf'), t("Use PHP UTF8 regular expressions")),
+		'$no_community_page' => array('no_community_page', t("Show Community Page"), !get_config('system','no_community_page'), t("Display a Community page showing all recent public postings on this site.")),
+		'$ostatus_disabled' => array('ostatus_disabled', t("Enable OStatus support"), !get_config('system','ostatus_disable'), t("Provide built-in OStatus \x28identi.ca, status.net, etc.\x29 compatibility. All communications in OStatus are public, so privacy warnings will be occasionally displayed.")),	
+		'$diaspora_enabled' => array('diaspora_enabled', t("Enable Diaspora support"), get_config('system','diaspora_enabled'), t("Provide built-in Diaspora network compatibility.")),	
+		'$dfrn_only'        => array('dfrn_only', t('Only allow Friendica contacts'), get_config('system','dfrn_only'), t("All contacts must use Friendica protocols. All other built-in communication protocols disabled.")),
+		'$verifyssl' 		=> array('verifyssl', t("Verify SSL"), get_config('system','verifyssl'), t("If you wish, you can turn on strict certificate checking. This will mean you cannot connect (at all) to self-signed SSL sites.")),
 		'$proxyuser'		=> array('proxyuser', t("Proxy user"), get_config('system','proxyuser'), ""),
 		'$proxy'			=> array('proxy', t("Proxy URL"), get_config('system','proxy'), ""),
-		'$timeout'			=> array('timeout', t("Network timeout"), (x(get_config('system','curl_timeout'))?get_config('system','curl_timeout'):60), "Value is in seconds. Set to 0 for unlimited (not recommended)."),
+		'$timeout'			=> array('timeout', t("Network timeout"), (x(get_config('system','curl_timeout'))?get_config('system','curl_timeout'):60), t("Value is in seconds. Set to 0 for unlimited (not recommended).")),
 
 			
 	));
@@ -366,7 +367,7 @@ function admin_page_users_post(&$a){
 				intval( $uid )
 			);
 		}
-		notice( sprintf( tt("%s user blocked", "%s users blocked/unblocked", count($users)), count($users)) );
+		notice( sprintf( tt("%s user blocked/unblocked", "%s users blocked/unblocked", count($users)), count($users)) );
 	}
 	if (x($_POST,'page_users_delete')){
 		require_once("include/Contact.php");
@@ -428,6 +429,7 @@ function admin_page_users(&$a){
 				 LEFT JOIN `contact` ON `register`.`uid` = `contact`.`uid`
 				 LEFT JOIN `user` ON `register`.`uid` = `user`.`uid`;");
 	
+	
 	/* get users */
 
 	$total = q("SELECT count(*) as total FROM `user` where 1");
@@ -435,7 +437,8 @@ function admin_page_users(&$a){
 		$a->set_pager_total($total[0]['total']);
 		$a->set_pager_itemspage(100);
 	}
-
+	
+	
 	$users = q("SELECT `user` . * , `contact`.`name` , `contact`.`url` , `contact`.`micro`, `lastitem`.`lastitem_date`
 				FROM
 					(SELECT MAX(`item`.`changed`) as `lastitem_date`, `item`.`uid`
@@ -469,6 +472,7 @@ function admin_page_users(&$a){
 	}
 	$users = array_map("_setup_users", $users);
 	
+	
 	$t = get_markup_template("admin_users.tpl");
 	$o = replace_macros($t, array(
 		// strings //
@@ -571,6 +575,8 @@ function admin_page_plugins(&$a){
 			'$status' => $status,
 			'$action' => $action,
 			'$info' => get_plugin_info($plugin),
+			'$str_author' => t('Author: '),
+			'$str_maintainer' => t('Maintainer: '),			
 		
 			'$admin_form' => $admin_form,
 			'$function' => 'plugins',
@@ -744,7 +750,8 @@ function admin_page_themes(&$a){
 			'$info' => get_theme_info($theme),
 			'$function' => 'themes',		
 			'$admin_form' => $admin_form,
-			
+			'$str_author' => t('Author: '),
+			'$str_maintainer' => t('Maintainer: '),			
 			'$readme' => $readme
 		));
 	} 
diff --git a/mod/dfrn_confirm.php b/mod/dfrn_confirm.php
index 5a24f0089..0bc3ea7df 100644
--- a/mod/dfrn_confirm.php
+++ b/mod/dfrn_confirm.php
@@ -107,7 +107,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
 		 *
 		 */
 
-		$r = q("SELECT * FROM `contact` WHERE ( ( `issued-id` != '' AND `issued-id` = '%s' ) OR ( `id` = %d AND `id` != 0 ) ) AND `uid` = %d LIMIT 1",
+		$r = q("SELECT * FROM `contact` WHERE ( ( `issued-id` != '' AND `issued-id` = '%s' ) OR ( `id` = %d AND `id` != 0 ) ) AND `uid` = %d AND `duplex` = 0 LIMIT 1",
 			dbesc($dfrn_id),
 			intval($cid),
 			intval($uid)
@@ -116,6 +116,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
 		if(! count($r)) {
 			logger('dfrn_confirm: Contact not found in DB.'); 
 			notice( t('Contact not found.') . EOL );
+			notice( t('This may occasionally happen if contact was requested by both persons and it has already been approved.') . EOL );
 			return;
 		}
 
@@ -631,6 +632,15 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
 			xml_status(3,$message);
 		}
 
+		// It's possible that the other person also requested friendship.
+		// If it is a duplex relationship, ditch the issued-id if one exists. 
+
+		if($duplex) {
+			$r = q("UPDATE `contact` SET `issued-id` = '' WHERE `id` = %d LIMIT 1",
+				intval($dfrn_record)
+			);
+		}
+
 		// We're good but now we have to scrape the profile photo and send notifications.
 
 
diff --git a/mod/display.php b/mod/display.php
index d96be4333..f428149e8 100755
--- a/mod/display.php
+++ b/mod/display.php
@@ -74,18 +74,18 @@ function display_content(&$a) {
 		$x = array(
 			'is_owner' => true,
 			'allow_location' => $a->user['allow_location'],
-			'default_location' => $a->user['default_location'],
+			'default_location' => $a->user['default-location'],
 			'nickname' => $a->user['nickname'],
-			'lockstate' => ((($group) || (is_array($a->user) && ((strlen($a->user['allow_cid'])) || (strlen($a->user['allow_gid'])) || (strlen($a->user['deny_cid'])) || (strlen($a->user['deny_gid']))))) ? 'lock' : 'unlock'),
-			'acl' => populate_acl((($group || $cid) ? $def_acl : $a->user), $celeb),
-			'bang' => (($group || $cid) ? '!' : ''),
+			'lockstate' => ( (is_array($a->user)) && ((strlen($a->user['allow_cid'])) || (strlen($a->user['allow_gid'])) || (strlen($a->user['deny_cid'])) || (strlen($a->user['deny_gid']))) ? 'lock' : 'unlock'),
+			'acl' => populate_acl($a->user, $celeb),
+			'bang' => '',
 			'visitor' => 'block',
 			'profile_uid' => local_user()
 		);	
 		$o .= status_editor($a,$x,0,true);
 
 
-	$sql_extra = permissions_sql($a->profile['uid'],$remote_contact,$groups);
+	$sql_extra = item_permissions_sql($a->profile['uid'],$remote_contact,$groups);
 
 	$r = q("SELECT `item`.*, `item`.`id` AS `item_id`, 
 		`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,
diff --git a/mod/group.php b/mod/group.php
index c896362ca..13401ef0d 100755
--- a/mod/group.php
+++ b/mod/group.php
@@ -76,14 +76,18 @@ function group_content(&$a) {
 	if($switchtotext === false)
 		$switchtotext = 400;
 
+	$tpl = get_markup_template('group_edit.tpl');
+	$context = array('$submit' => t('Submit'));
+
 	if(($a->argc == 2) && ($a->argv[1] === 'new')) {
-		$tpl = get_markup_template('group_new.tpl');
-		$o .= replace_macros($tpl,array(
-			'$desc' => t('Create a group of contacts/friends.'),
-			'$name' => t('Group Name: '),
-			'$submit' => t('Submit')
-		 ));
-		return $o;
+		
+		return replace_macros($tpl, $context + array(
+			'$title' => t('Create a group of contacts/friends.'),
+			'$gname' => array('groupname',t('Group Name: '),$group['name'], ''),
+			'$gid' => 'new',
+		));
+
+
 	}
 
 	if(($a->argc == 3) && ($a->argv[1] === 'drop')) {
@@ -156,66 +160,61 @@ function group_content(&$a) {
 
 		$celeb = ((($a->user['page-flags'] == PAGE_SOAPBOX) || ($a->user['page-flags'] == PAGE_COMMUNITY)) ? true : false);
 
-		$tpl = get_markup_template('group_edit.tpl');
-		$o .= replace_macros($tpl, array(
+		
+		$context = $context + array(
+			'$title' => t('Group Editor'),
+			'$gname' => array('groupname',t('Group Name: '),$group['name'], ''),
 			'$gid' => $group['id'],
-			'$name' => $group['name'],
 			'$drop' => $drop_txt,
-			'$desc' => t('Click on a contact to add or remove.'),
-			'$title' => t('Group Editor'),
-			'$gname' => t('Group Name: '),
-			'$submit' => t('Submit')
-		));
+		);
 
 	}
 
 	if(! isset($group))
 		return;
 
-	$o .= '<div id="group-update-wrapper">';
-	if($change) 
-		$o = '';
+	$groupeditor = array(
+		'label_members' => t('Members'),
+		'members' => array(),
+		'label_contacts' => t('All Contacts'),
+		'contacts' => arraY(),
+	);
+		
 
-	$o .= '<h3>' . t('Members') . '</h3>';
-	$o .= '<div id="group-members">';
 	$textmode = (($switchtotext && (count($members) > $switchtotext)) ? true : false);
 	foreach($members as $member) {
 		if($member['url']) {
 			$member['click'] = 'groupChangeMember(' . $group['id'] . ',' . $member['id'] . '); return true;';
-			$o .= micropro($member,true,'mpgroup', $textmode);
+			$groupeditor['members'][] = micropro($member,true,'mpgroup', $textmode);
 		}
 		else
 			group_rmv_member(local_user(),$group['name'],$member['id']);
 	}
 
-	$o .= '</div><div id="group-members-end"></div>';
-	$o .= '<hr id="group-separator" />';
-	
-	$o .= '<h3>' . t('All Contacts') . '</h3>';
-	$o .= '<div id="group-all-contacts">';
+	$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `blocked` = 0 and `pending` = 0 and `self` = 0 ORDER BY `name` ASC",
+		intval(local_user())
+	);
 
-		$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `blocked` = 0 and `pending` = 0 and `self` = 0 ORDER BY `name` ASC",
-			intval(local_user())
-		);
-
-		if(count($r)) {
-			$textmode = (($switchtotext && (count($r) > $switchtotext)) ? true : false);
-			foreach($r as $member) {
-				if(! in_array($member['id'],$preselected)) {
-					$member['click'] = 'groupChangeMember(' . $group['id'] . ',' . $member['id'] . '); return true;';
-					$o .= micropro($member,true,'mpall', $textmode);
-				}
+	if(count($r)) {
+		$textmode = (($switchtotext && (count($r) > $switchtotext)) ? true : false);
+		foreach($r as $member) {
+			if(! in_array($member['id'],$preselected)) {
+				$member['click'] = 'groupChangeMember(' . $group['id'] . ',' . $member['id'] . '); return true;';
+				$groupeditor['contacts'][] = micropro($member,true,'mpall', $textmode);
 			}
 		}
+	}
 
-		$o .= '</div><div id="group-all-contacts-end"></div>';
+	$context['$groupeditor'] = $groupeditor;
+	$context['$desc'] = t('Click on a contact to add or remove.');
 
 	if($change) {
-		echo $o;
+		$tpl = get_markup_template('groupeditor.tpl');
+		echo replace_macros($tpl, $context);
 		killme();
 	}
-	$o .= '</div>';
-	return $o;
+	
+	return replace_macros($tpl, $context);
 
 }
 
diff --git a/mod/message.php b/mod/message.php
index e293d62d9..9226a68fb 100755
--- a/mod/message.php
+++ b/mod/message.php
@@ -129,10 +129,16 @@ function message_content(&$a) {
 		
 		$o .= $header;
 		
+		$plaintext = false;
+		if(intval(get_pconfig(local_user(),'system','plaintext')))
+			$plaintext = true;
+
+
 		$tpl = get_markup_template('msg-header.tpl');
 
 		$a->page['htmlhead'] .= replace_macros($tpl, array(
 			'$baseurl' => $a->get_baseurl(),
+			'$editselect' => (($plaintext) ? 'none' : '/(profile-jot-text|prvmail-text)/'),
 			'$nickname' => $a->user['nickname'],
 			'$linkurl' => t('Please enter a link URL:')
 		));
diff --git a/mod/network.php b/mod/network.php
index 26265f5a0..e65180222 100755
--- a/mod/network.php
+++ b/mod/network.php
@@ -51,14 +51,14 @@ function network_init(&$a) {
 
 function saved_searches($search) {
 
-	$srchurl = '/network' 
-		. ((x($_GET,'cid')) ? '?cid=' . $_GET['cid'] : '') 
-		. ((x($_GET,'star')) ? '?star=' . $_GET['star'] : '')
-		. ((x($_GET,'bmark')) ? '?bmark=' . $_GET['bmark'] : '')
-		. ((x($_GET,'conv')) ? '?conv=' . $_GET['conv'] : '')
-		. ((x($_GET,'nets')) ? '?nets=' . $_GET['nets'] : '')
-		. ((x($_GET,'cmin')) ? '?cmin=' . $_GET['cmin'] : '')
-		. ((x($_GET,'cmax')) ? '?cmax=' . $_GET['cmax'] : '');
+	$srchurl = '/network?f=' 
+		. ((x($_GET,'cid')) ? '&cid=' . $_GET['cid'] : '') 
+		. ((x($_GET,'star')) ? '&star=' . $_GET['star'] : '')
+		. ((x($_GET,'bmark')) ? '&bmark=' . $_GET['bmark'] : '')
+		. ((x($_GET,'conv')) ? '&conv=' . $_GET['conv'] : '')
+		. ((x($_GET,'nets')) ? '&nets=' . $_GET['nets'] : '')
+		. ((x($_GET,'cmin')) ? '&cmin=' . $_GET['cmin'] : '')
+		. ((x($_GET,'cmax')) ? '&cmax=' . $_GET['cmax'] : '');
 	
 	$o = '';
 
@@ -164,33 +164,33 @@ function network_content(&$a, $update = 0) {
 	$tabs = array(
 		array(
 			'label' => t('Commented Order'),
-			'url'=>$a->get_baseurl() . '/' . str_replace('/new', '', $a->cmd) . ((x($_GET,'cid')) ? '?cid=' . $_GET['cid'] : ''), 
+			'url'=>$a->get_baseurl() . '/' . str_replace('/new', '', $a->cmd) . ((x($_GET,'cid')) ? '?f=&cid=' . $_GET['cid'] : ''), 
 			'sel'=>$all_active,
 		),
 		array(
 			'label' => t('Posted Order'),
-			'url'=>$a->get_baseurl() . '/' . str_replace('/new', '', $a->cmd) . '?order=post' . ((x($_GET,'cid')) ? '&cid=' . $_GET['cid'] : ''), 
+			'url'=>$a->get_baseurl() . '/' . str_replace('/new', '', $a->cmd) . '?f=&order=post' . ((x($_GET,'cid')) ? '&cid=' . $_GET['cid'] : ''), 
 			'sel'=>$postord_active,
 		),
 
 		array(
 			'label' => t('Personal'),
-			'url' => $a->get_baseurl() . '/' . str_replace('/new', '', $a->cmd) . ((x($_GET,'cid')) ? '/?cid=' . $_GET['cid'] : '') . '&conv=1',
+			'url' => $a->get_baseurl() . '/' . str_replace('/new', '', $a->cmd) . ((x($_GET,'cid')) ? '/?f=&cid=' . $_GET['cid'] : '') . '&conv=1',
 			'sel' => $conv_active,
 		),
 		array(
 			'label' => t('New'),
-			'url' => $a->get_baseurl() . '/' . str_replace('/new', '', $a->cmd) . '/new' . ((x($_GET,'cid')) ? '/?cid=' . $_GET['cid'] : ''),
+			'url' => $a->get_baseurl() . '/' . str_replace('/new', '', $a->cmd) . '/new' . ((x($_GET,'cid')) ? '/?f=&cid=' . $_GET['cid'] : ''),
 			'sel' => $new_active,
 		),
 		array(
 			'label' => t('Starred'),
-			'url'=>$a->get_baseurl() . '/' . str_replace('/new', '', $a->cmd) . ((x($_GET,'cid')) ? '/?cid=' . $_GET['cid'] : '') . '&star=1',
+			'url'=>$a->get_baseurl() . '/' . str_replace('/new', '', $a->cmd) . ((x($_GET,'cid')) ? '/?f=&cid=' . $_GET['cid'] : '') . '&star=1',
 			'sel'=>$starred_active,
 		),
 		array(
 			'label' => t('Bookmarks'),
-			'url'=>$a->get_baseurl() . '/' . str_replace('/new', '', $a->cmd) . ((x($_GET,'cid')) ? '/?cid=' . $_GET['cid'] : '') . '&bmark=1',
+			'url'=>$a->get_baseurl() . '/' . str_replace('/new', '', $a->cmd) . ((x($_GET,'cid')) ? '/?f=&cid=' . $_GET['cid'] : '') . '&bmark=1',
 			'sel'=>$bookmarked_active,
 		),	
 //		array(
@@ -256,14 +256,12 @@ function network_content(&$a, $update = 0) {
 
 		nav_set_selected('network');
 
-		$_SESSION['return_url'] = $a->query_string;
-
 		$celeb = ((($a->user['page-flags'] == PAGE_SOAPBOX) || ($a->user['page-flags'] == PAGE_COMMUNITY)) ? true : false);
 
 		$x = array(
 			'is_owner' => true,
 			'allow_location' => $a->user['allow_location'],
-			'default_location' => $a->user['default_location'],
+			'default_location' => $a->user['default-location'],
 			'nickname' => $a->user['nickname'],
 			'lockstate' => ((($group) || (is_array($a->user) && ((strlen($a->user['allow_cid'])) || (strlen($a->user['allow_gid'])) || (strlen($a->user['deny_cid'])) || (strlen($a->user['deny_gid']))))) ? 'lock' : 'unlock'),
 			'acl' => populate_acl((($group || $cid) ? $def_acl : $a->user), $celeb),
@@ -472,7 +470,7 @@ function network_content(&$a, $update = 0) {
 
 		if(count($r)) {
 			foreach($r as $rr)
-				if(! array_key_exists($rr['item_id'],$parents_arr))
+				if(! in_array($rr['item_id'],$parents_arr))
 					$parents_arr[] = $rr['item_id'];
 			$parents_str = implode(', ', $parents_arr);
 
diff --git a/mod/notify.php b/mod/notify.php
index e6a7a8859..a572b1534 100644
--- a/mod/notify.php
+++ b/mod/notify.php
@@ -11,8 +11,10 @@ function notify_init(&$a) {
 			intval(local_user())
 		);
 		if(count($r)) {
-			q("update notify set seen = 1 where id = %d and uid = %d limit 1",
-				intval($a->argv[2]),
+			q("update notify set seen = 1 where ( link = '%s' or ( parent != 0 and parent = %d and otype = '%s' )) and uid = %d",
+				dbesc($r[0]['link']),
+				intval($r[0]['parent']),
+				dbesc($r[0]['otype']),
 				intval(local_user())
 			);
 			goaway($r[0]['link']);
diff --git a/mod/ping.php b/mod/ping.php
index 7380ff7d0..1562254b1 100644
--- a/mod/ping.php
+++ b/mod/ping.php
@@ -14,10 +14,29 @@ function ping_init(&$a) {
 
 		$firehose = intval(get_pconfig(local_user(),'system','notify_full'));
 
-		$z = q("select * from notify where uid = %d
-			order by seen asc, date desc limit 0, 50",
+		$t = q("select count(*) as total from notify where uid = %d and seen = 0",
 			intval(local_user())
 		);
+		if($t && intval($t[0]['total']) > 49) {
+			$z = q("select * from notify where uid = %d
+				and seen = 0 order by date desc limit 0, 50",
+				intval(local_user())
+			);
+		}
+		else {
+			$z1 = q("select * from notify where uid = %d
+				and seen = 0 order by date desc limit 0, 50",
+				intval(local_user())
+			);
+
+			$z2 = q("select * from notify where uid = %d
+				and seen = 1 order by date desc limit 0, %d",
+				intval(local_user()),
+				intval(50 - intval($t[0]['total']))
+			);
+			$z = array_merge($z1,$z2);
+		}
+
 
 
 		$tags = array();
diff --git a/mod/profile.php b/mod/profile.php
index 74e1a2302..1a701f407 100755
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -159,7 +159,7 @@ function profile_content(&$a, $update = 0) {
 	 * Get permissions SQL - if $remote_contact is true, our remote user has been pre-verified and we already have fetched his/her groups
 	 */
 
-	$sql_extra = permissions_sql($a->profile['profile_uid'],$remote_contact,$groups);
+	$sql_extra = item_permissions_sql($a->profile['profile_uid'],$remote_contact,$groups);
 
 
 	if($update) {
diff --git a/mod/search.php b/mod/search.php
index fe09b671f..386592ea1 100755
--- a/mod/search.php
+++ b/mod/search.php
@@ -127,7 +127,7 @@ function search_content(&$a) {
 		FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
 		LEFT JOIN `user` ON `user`.`uid` = `item`.`uid`
 		WHERE `item`.`visible` = 1 AND `item`.`deleted` = 0 and `item`.`moderated` = 0
-		AND (( `wall` = 1 AND `item`.`allow_cid` = ''  AND `item`.`allow_gid` = '' AND `item`.`deny_cid`  = '' AND `item`.`deny_gid`  = '' AND `user`.`hidewall` = 0 ) 
+		AND (( `wall` = 1 AND `item`.`allow_cid` = ''  AND `item`.`allow_gid` = '' AND `item`.`deny_cid`  = '' AND `item`.`deny_gid`  = '' AND `item`.`private` = 0 AND `user`.`hidewall` = 0 ) 
 			OR `item`.`uid` = %d )
 		AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
 		$search_alg
diff --git a/mod/share.php b/mod/share.php
index bba527342..f6c025e3c 100755
--- a/mod/share.php
+++ b/mod/share.php
@@ -16,10 +16,18 @@ function share_init(&$a) {
 
 	$o = '';
 
-	$o .= '&#x2672; <a href="' . $r[0]['author-link'] . '">' . $r[0]['author-name'] . '</a><br />';
-	if($r[0]['title'])
-		$o .= '<strong>' . $r[0]['title'] . '</strong><br />';
-	$o .= bbcode($r[0]['body'], true);
-	echo $o . '<br />';
+	if(local_user() && intval(get_pconfig(local_user(),'system','plaintext'))) {
+		$o .= '&#x2672; [url=' . $r[0]['author-link'] . ']' . $r[0]['author-name'] . '[/url]';
+		if($r[0]['title'])
+			$o .= '[b]' . $r[0]['title'] . '[/b]' . "\n";
+		$o .= $r[0]['body'] . "\n";
+	}
+	else {
+		$o .= '&#x2672; <a href="' . $r[0]['author-link'] . '">' . $r[0]['author-name'] . '</a><br />';
+		if($r[0]['title'])
+			$o .= '<strong>' . $r[0]['title'] . '</strong><br />';
+		$o .= bbcode($r[0]['body'], true) . '<br />';
+	}
+	echo $o;
 	killme();  
 }
diff --git a/update.php b/update.php
index 8ca5ef90b..c29394b48 100755
--- a/update.php
+++ b/update.php
@@ -1,6 +1,6 @@
 <?php
 
-define( 'UPDATE_VERSION' , 1129 );
+define( 'UPDATE_VERSION' , 1131 );
 
 /**
  *
@@ -1114,3 +1114,11 @@ function update_1128() {
 	q("alter table spam add `date` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00' AFTER `term` ");
 }
 
+function update_1129() {
+	q("ALTER TABLE `notify` ADD `parent` INT NOT NULL AFTER `link` , ADD INDEX ( `parent` ), ADD INDEX ( `link` ), ADD INDEX ( `otype` ) ");
+}
+
+function update_1130() {
+	q("ALTER TABLE `item` ADD `file` MEDIUMTEXT NOT NULL AFTER `inform`, ADD FULLTEXT KEY (`file`) ");
+}
+
diff --git a/util/db_update.php b/util/db_update.php
index 1da2a9909..a6177324a 100755
--- a/util/db_update.php
+++ b/util/db_update.php
@@ -1,5 +1,11 @@
 <?php
+/**
+* @package util
+*/
 
+/* 
+* require boot.php
+*/
 require_once("boot.php");
 
 $a = new App;
diff --git a/util/docblox_errorchecker.php b/util/docblox_errorchecker.php
new file mode 100644
index 000000000..af4c76444
--- /dev/null
+++ b/util/docblox_errorchecker.php
@@ -0,0 +1,145 @@
+<?php 
+/**
+ * When I installed docblox, I had the experience that it does not generate any output at all.
+ * This script may be used to find that kind of problems with the documentation build process.
+ * If docblox generates output, use another approach for debugging.
+ *
+ * Basically, docblox takes a list of files to build documentation from. This script assumes there is a file or set of files
+ * breaking the build when it is included in that list. It tries to calculate the smallest list containing these files.
+ * Unfortunatly, the original problem is NP-complete, so what the script does is a best guess only.
+ *
+ * So it starts with a list of all files in the project.
+ * If that list can't be build, it cuts it in two parts and tries both parts independently. If only one of them breaks,
+ * it takes that one and tries the same independently. If both break, it assumes this is the smallest set. This assumption
+ * is not necessarily true. Maybe the smallest set consists of two files and both of them were in different parts when
+ * the list was divided, but by now it is my best guess. To make this assumption better, the list is shuffled after every step. 
+ *
+ * After that, the script tries to remove a file from the list. It tests if the list breaks and if so, it
+ * assumes that the file it removed belongs to the set of errorneous files. 
+ * This is done for all files, so, in the end removing one file leads to a working doc build. 
+ *
+ * @package util
+ * @author Alexander Kampmann
+ */
+
+/**
+ * This function generates a comma seperated list of file names.
+ * 
+ * @package util
+ * 
+ * @param array $fileset Set of file names
+ * 
+ * @return string comma-seperated list of the file names
+ */
+function namesList($fileset) {
+	$fsparam="";
+	foreach($fileset as $file) {
+		$fsparam=$fsparam.",".$file;
+	}
+	return $fsparam;
+};
+
+/**
+ * This functions runs phpdoc on the provided list of files
+ * @package util
+ * 
+ * @param array $fileset Set of filenames
+ * 
+ * @return bool true, if that set can be built
+ */
+function runs($fileset) {
+	$fsParam=namesList($fileset);
+	exec('docblox -t phpdoc_out -f '.$fsParam);
+	if(file_exists("phpdoc_out/index.html")) {
+		echo "\n Subset ".$fsParam." is okay. \n";
+		exec('rm -r phpdoc_out');
+		return true;
+	} else {
+		echo "\n Subset ".$fsParam." failed. \n";
+		return false;
+	}
+};
+
+/**
+ * This functions cuts down a fileset by removing files until it finally works.
+ * it was meant to be recursive, but php's maximum stack size is to small. So it just simulates recursion.
+ *
+ * In that version, it does not necessarily generate the smallest set, because it may not alter the elements order enough.
+ * 
+ * @package util
+ * 
+ * @param array $fileset set of filenames
+ * @param int $ps number of files in subsets
+ * 
+ * @return array a part of $fileset, that crashes
+ */
+function reduce($fileset, $ps) {
+	//split array...
+	$parts=array_chunk($fileset, $ps);
+	//filter working subsets...
+	$parts=array_filter($parts, "runs");
+	//melt remaining parts together
+	if(is_array($parts)) {
+		return array_reduce($parts, "array_merge", array());
+	}
+	return array();
+};
+
+//return from util folder to frindica base dir
+$dir='..';
+
+//stack for dirs to search
+$dirstack=array();
+//list of source files
+$filelist=array();
+
+//loop over all files in $dir
+while($dh=opendir($dir)) {
+	while($file=readdir($dh)) {
+		if(is_dir($dir."/".$file)) {
+			//add to directory stack
+			if($file!=".." && $file!=".") {
+				array_push($dirstack, $dir."/".$file);
+				echo "dir ".$dir."/".$file."\n";
+			}
+		} else  {
+			//test if it is a source file and add to filelist
+			if(substr($file, strlen($file)-4)==".php") {
+				array_push($filelist, $dir."/".$file);
+				echo $dir."/".$file."\n";
+			}
+		}
+	}
+	//look at the next dir
+	$dir=array_pop($dirstack);
+}
+
+//check the entire set
+if(runs($filelist)) {
+	echo "I can not detect a problem. \n";
+	exit;
+}
+
+//check half of the set and discard if that half is okay
+$res=$filelist;
+$i=0;
+do {
+	$i=count($res);
+	echo $i."/".count($fileset)." elements remaining. \n";
+	$res=reduce($res, count($res)/2);
+	shuffle($res);
+} while(count($res)<$i);
+
+//check one file after another
+$needed=array();
+
+while(count($res)!=0) {
+	$file=array_pop($res);
+
+	if(runs(array_merge($res, $needed))) {
+		echo "needs: ".$file." and file count ".count($needed);
+		array_push($needed, $file);
+	}
+}
+
+echo "\nSmallest Set is: ".namesList($needed)." with ".count($needed)." files. ";
diff --git a/util/messages.po b/util/messages.po
index 1f2575603..7f88e2288 100755
--- a/util/messages.po
+++ b/util/messages.po
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: 2.3.1262\n"
+"Project-Id-Version: 2.3.1273\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-24 22:44-0800\n"
+"POT-Creation-Date: 2012-03-06 15:09-0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -39,8 +39,8 @@ msgstr ""
 #: ../../mod/api.php:31 ../../mod/photos.php:129 ../../mod/photos.php:865
 #: ../../mod/editpost.php:10 ../../mod/install.php:171
 #: ../../mod/notifications.php:62 ../../mod/contacts.php:125
-#: ../../mod/settings.php:49 ../../mod/settings.php:404
-#: ../../mod/settings.php:409 ../../mod/manage.php:86 ../../mod/network.php:6
+#: ../../mod/settings.php:49 ../../mod/settings.php:411
+#: ../../mod/settings.php:416 ../../mod/manage.php:86 ../../mod/network.php:6
 #: ../../mod/notes.php:20 ../../mod/attach.php:33 ../../mod/group.php:19
 #: ../../mod/viewcontacts.php:22 ../../mod/register.php:36
 #: ../../mod/regmod.php:111 ../../mod/item.php:124 ../../mod/item.php:140
@@ -48,11 +48,11 @@ msgstr ""
 #: ../../mod/profile_photo.php:148 ../../mod/profile_photo.php:159
 #: ../../mod/message.php:9 ../../mod/message.php:46 ../../mod/allfriends.php:9
 #: ../../mod/wall_upload.php:42 ../../mod/follow.php:8 ../../mod/common.php:9
-#: ../../mod/display.php:130 ../../mod/profiles.php:7
+#: ../../mod/display.php:133 ../../mod/profiles.php:7
 #: ../../mod/profiles.php:229 ../../mod/delegate.php:6
 #: ../../mod/suggest.php:28 ../../mod/invite.php:13 ../../mod/invite.php:81
 #: ../../mod/dfrn_confirm.php:53 ../../addon/facebook/facebook.php:332
-#: ../../include/items.php:2968 ../../index.php:288
+#: ../../include/items.php:3030 ../../index.php:288
 msgid "Permission denied."
 msgstr ""
 
@@ -81,8 +81,8 @@ msgstr ""
 msgid "Return to contact editor"
 msgstr ""
 
-#: ../../mod/crepair.php:148 ../../mod/settings.php:455
-#: ../../mod/settings.php:481 ../../mod/admin.php:480 ../../mod/admin.php:489
+#: ../../mod/crepair.php:148 ../../mod/settings.php:462
+#: ../../mod/settings.php:488 ../../mod/admin.php:484 ../../mod/admin.php:493
 msgid "Name"
 msgstr ""
 
@@ -124,18 +124,18 @@ msgstr ""
 #: ../../mod/photos.php:1262 ../../mod/photos.php:1293
 #: ../../mod/install.php:251 ../../mod/install.php:289
 #: ../../mod/localtime.php:45 ../../mod/contacts.php:319
-#: ../../mod/settings.php:453 ../../mod/settings.php:592
-#: ../../mod/settings.php:786 ../../mod/manage.php:109 ../../mod/group.php:84
-#: ../../mod/group.php:167 ../../mod/admin.php:312 ../../mod/admin.php:477
-#: ../../mod/admin.php:603 ../../mod/admin.php:769 ../../mod/admin.php:847
-#: ../../mod/profiles.php:375 ../../mod/invite.php:106
-#: ../../addon/facebook/facebook.php:411 ../../addon/yourls/yourls.php:76
+#: ../../mod/settings.php:460 ../../mod/settings.php:603
+#: ../../mod/settings.php:797 ../../mod/manage.php:109 ../../mod/group.php:80
+#: ../../mod/admin.php:313 ../../mod/admin.php:481 ../../mod/admin.php:609
+#: ../../mod/admin.php:776 ../../mod/admin.php:856 ../../mod/profiles.php:375
+#: ../../mod/invite.php:106 ../../addon/facebook/facebook.php:411
+#: ../../addon/yourls/yourls.php:76 ../../addon/ljpost/ljpost.php:92
 #: ../../addon/nsfw/nsfw.php:57
 #: ../../addon/uhremotestorage/uhremotestorage.php:89
-#: ../../addon/randplace/randplace.php:179 ../../addon/drpost/drpost.php:110
-#: ../../addon/geonames/geonames.php:187 ../../addon/oembed.old/oembed.php:41
-#: ../../addon/impressum/impressum.php:69 ../../addon/blockem/blockem.php:57
-#: ../../addon/qcomment/qcomment.php:60
+#: ../../addon/randplace/randplace.php:179 ../../addon/dwpost/dwpost.php:92
+#: ../../addon/drpost/drpost.php:110 ../../addon/geonames/geonames.php:187
+#: ../../addon/oembed.old/oembed.php:41 ../../addon/impressum/impressum.php:69
+#: ../../addon/blockem/blockem.php:57 ../../addon/qcomment/qcomment.php:61
 #: ../../addon/openstreetmap/openstreetmap.php:70
 #: ../../addon/editplain/editplain.php:84 ../../addon/blackout/blackout.php:94
 #: ../../addon/pageheader/pageheader.php:52
@@ -145,11 +145,12 @@ msgstr ""
 #: ../../addon/statusnet/statusnet.php:320
 #: ../../addon/statusnet/statusnet.php:345
 #: ../../addon/statusnet/statusnet.php:532 ../../addon/tumblr/tumblr.php:90
-#: ../../addon/numfriends/numfriends.php:85 ../../addon/wppost/wppost.php:102
-#: ../../addon/showmore/showmore.php:48 ../../addon/piwik/piwik.php:89
-#: ../../addon/twitter/twitter.php:175 ../../addon/twitter/twitter.php:201
-#: ../../addon/twitter/twitter.php:355 ../../addon/posterous/posterous.php:90
-#: ../../include/conversation.php:542
+#: ../../addon/numfriends/numfriends.php:85 ../../addon/gnot/gnot.php:88
+#: ../../addon/wppost/wppost.php:102 ../../addon/showmore/showmore.php:48
+#: ../../addon/piwik/piwik.php:89 ../../addon/twitter/twitter.php:175
+#: ../../addon/twitter/twitter.php:201 ../../addon/twitter/twitter.php:355
+#: ../../addon/posterous/posterous.php:90
+#: ../../view/theme/quattro/theme.php:15 ../../include/conversation.php:552
 msgid "Submit"
 msgstr ""
 
@@ -203,7 +204,7 @@ msgstr ""
 msgid "Edit event"
 msgstr ""
 
-#: ../../mod/events.php:272 ../../include/text.php:964
+#: ../../mod/events.php:272 ../../include/text.php:982
 msgid "link to source"
 msgstr ""
 
@@ -257,7 +258,7 @@ msgid "Description:"
 msgstr ""
 
 #: ../../mod/events.php:395 ../../include/event.php:37
-#: ../../include/bb2diaspora.php:290 ../../boot.php:980
+#: ../../include/bb2diaspora.php:260 ../../boot.php:980
 msgid "Location:"
 msgstr ""
 
@@ -266,8 +267,8 @@ msgid "Share this event"
 msgstr ""
 
 #: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94
-#: ../../mod/dfrn_request.php:686 ../../mod/settings.php:454
-#: ../../mod/settings.php:480 ../../addon/js_upload/js_upload.php:45
+#: ../../mod/dfrn_request.php:686 ../../mod/settings.php:461
+#: ../../mod/settings.php:487 ../../addon/js_upload/js_upload.php:45
 msgid "Cancel"
 msgstr ""
 
@@ -311,23 +312,23 @@ msgid ""
 msgstr ""
 
 #: ../../mod/api.php:105 ../../mod/dfrn_request.php:676
-#: ../../mod/settings.php:681 ../../mod/settings.php:687
-#: ../../mod/settings.php:695 ../../mod/settings.php:699
-#: ../../mod/settings.php:704 ../../mod/settings.php:710
-#: ../../mod/settings.php:716 ../../mod/settings.php:776
-#: ../../mod/settings.php:777 ../../mod/settings.php:778
-#: ../../mod/settings.php:779 ../../mod/register.php:524
+#: ../../mod/settings.php:692 ../../mod/settings.php:698
+#: ../../mod/settings.php:706 ../../mod/settings.php:710
+#: ../../mod/settings.php:715 ../../mod/settings.php:721
+#: ../../mod/settings.php:727 ../../mod/settings.php:787
+#: ../../mod/settings.php:788 ../../mod/settings.php:789
+#: ../../mod/settings.php:790 ../../mod/register.php:524
 #: ../../mod/profiles.php:357
 msgid "Yes"
 msgstr ""
 
 #: ../../mod/api.php:106 ../../mod/dfrn_request.php:677
-#: ../../mod/settings.php:681 ../../mod/settings.php:687
-#: ../../mod/settings.php:695 ../../mod/settings.php:699
-#: ../../mod/settings.php:704 ../../mod/settings.php:710
-#: ../../mod/settings.php:716 ../../mod/settings.php:776
-#: ../../mod/settings.php:777 ../../mod/settings.php:778
-#: ../../mod/settings.php:779 ../../mod/register.php:525
+#: ../../mod/settings.php:692 ../../mod/settings.php:698
+#: ../../mod/settings.php:706 ../../mod/settings.php:710
+#: ../../mod/settings.php:715 ../../mod/settings.php:721
+#: ../../mod/settings.php:727 ../../mod/settings.php:787
+#: ../../mod/settings.php:788 ../../mod/settings.php:789
+#: ../../mod/settings.php:790 ../../mod/register.php:525
 #: ../../mod/profiles.php:358
 msgid "No"
 msgstr ""
@@ -381,7 +382,7 @@ msgid "was tagged in a"
 msgstr ""
 
 #: ../../mod/photos.php:528 ../../mod/like.php:127 ../../mod/tagger.php:70
-#: ../../addon/communityhome/communityhome.php:163
+#: ../../addon/communityhome/communityhome.php:163 ../../include/text.php:1226
 #: ../../include/diaspora.php:1600 ../../include/conversation.php:53
 #: ../../include/conversation.php:126
 msgid "photo"
@@ -471,7 +472,7 @@ msgstr ""
 msgid "Use as profile photo"
 msgstr ""
 
-#: ../../mod/photos.php:1078 ../../include/conversation.php:472
+#: ../../mod/photos.php:1078 ../../include/conversation.php:482
 msgid "Private Message"
 msgstr ""
 
@@ -503,44 +504,44 @@ msgstr ""
 msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
 msgstr ""
 
-#: ../../mod/photos.php:1200 ../../include/conversation.php:519
+#: ../../mod/photos.php:1200 ../../include/conversation.php:529
 msgid "I like this (toggle)"
 msgstr ""
 
-#: ../../mod/photos.php:1201 ../../include/conversation.php:520
+#: ../../mod/photos.php:1201 ../../include/conversation.php:530
 msgid "I don't like this (toggle)"
 msgstr ""
 
-#: ../../mod/photos.php:1202 ../../include/conversation.php:914
+#: ../../mod/photos.php:1202 ../../include/conversation.php:933
 msgid "Share"
 msgstr ""
 
 #: ../../mod/photos.php:1203 ../../mod/editpost.php:104
 #: ../../mod/message.php:155 ../../mod/message.php:296
-#: ../../include/conversation.php:343 ../../include/conversation.php:677
-#: ../../include/conversation.php:931
+#: ../../include/conversation.php:348 ../../include/conversation.php:694
+#: ../../include/conversation.php:950
 msgid "Please wait"
 msgstr ""
 
 #: ../../mod/photos.php:1219 ../../mod/photos.php:1259
-#: ../../mod/photos.php:1290 ../../include/conversation.php:539
+#: ../../mod/photos.php:1290 ../../include/conversation.php:549
 msgid "This is you"
 msgstr ""
 
 #: ../../mod/photos.php:1221 ../../mod/photos.php:1261
-#: ../../mod/photos.php:1292 ../../include/conversation.php:541
+#: ../../mod/photos.php:1292 ../../include/conversation.php:551
 #: ../../boot.php:447
 msgid "Comment"
 msgstr ""
 
 #: ../../mod/photos.php:1223 ../../mod/editpost.php:123
-#: ../../include/conversation.php:543 ../../include/conversation.php:949
+#: ../../include/conversation.php:553 ../../include/conversation.php:968
 msgid "Preview"
 msgstr ""
 
-#: ../../mod/photos.php:1320 ../../mod/settings.php:513
-#: ../../mod/group.php:154 ../../mod/admin.php:484
-#: ../../include/conversation.php:302 ../../include/conversation.php:563
+#: ../../mod/photos.php:1320 ../../mod/settings.php:520
+#: ../../mod/settings.php:601 ../../mod/group.php:158 ../../mod/admin.php:488
+#: ../../include/conversation.php:304 ../../include/conversation.php:573
 msgid "Delete"
 msgstr ""
 
@@ -604,26 +605,26 @@ msgstr ""
 msgid "Edit post"
 msgstr ""
 
-#: ../../mod/editpost.php:80 ../../include/conversation.php:900
+#: ../../mod/editpost.php:80 ../../include/conversation.php:919
 msgid "Post to Email"
 msgstr ""
 
-#: ../../mod/editpost.php:95 ../../mod/settings.php:512
-#: ../../include/conversation.php:550
+#: ../../mod/editpost.php:95 ../../mod/settings.php:519
+#: ../../include/conversation.php:560
 msgid "Edit"
 msgstr ""
 
 #: ../../mod/editpost.php:96 ../../mod/message.php:153
-#: ../../mod/message.php:294 ../../include/conversation.php:915
+#: ../../mod/message.php:294 ../../include/conversation.php:934
 msgid "Upload photo"
 msgstr ""
 
-#: ../../mod/editpost.php:97 ../../include/conversation.php:917
+#: ../../mod/editpost.php:97 ../../include/conversation.php:936
 msgid "Attach file"
 msgstr ""
 
 #: ../../mod/editpost.php:98 ../../mod/message.php:154
-#: ../../mod/message.php:295 ../../include/conversation.php:919
+#: ../../mod/message.php:295 ../../include/conversation.php:938
 msgid "Insert web link"
 msgstr ""
 
@@ -639,31 +640,31 @@ msgstr ""
 msgid "Insert Vorbis [.ogg] audio"
 msgstr ""
 
-#: ../../mod/editpost.php:102 ../../include/conversation.php:925
+#: ../../mod/editpost.php:102 ../../include/conversation.php:944
 msgid "Set your location"
 msgstr ""
 
-#: ../../mod/editpost.php:103 ../../include/conversation.php:927
+#: ../../mod/editpost.php:103 ../../include/conversation.php:946
 msgid "Clear browser location"
 msgstr ""
 
-#: ../../mod/editpost.php:105 ../../include/conversation.php:932
+#: ../../mod/editpost.php:105 ../../include/conversation.php:951
 msgid "Permission settings"
 msgstr ""
 
-#: ../../mod/editpost.php:113 ../../include/conversation.php:941
+#: ../../mod/editpost.php:113 ../../include/conversation.php:960
 msgid "CC: email addresses"
 msgstr ""
 
-#: ../../mod/editpost.php:114 ../../include/conversation.php:942
+#: ../../mod/editpost.php:114 ../../include/conversation.php:961
 msgid "Public post"
 msgstr ""
 
-#: ../../mod/editpost.php:117 ../../include/conversation.php:930
+#: ../../mod/editpost.php:117 ../../include/conversation.php:949
 msgid "Set title"
 msgstr ""
 
-#: ../../mod/editpost.php:118 ../../include/conversation.php:944
+#: ../../mod/editpost.php:118 ../../include/conversation.php:963
 msgid "Example: bob@example.com, mary@example.com"
 msgstr ""
 
@@ -772,7 +773,7 @@ msgstr ""
 msgid "Confirm"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:582 ../../include/items.php:2504
+#: ../../mod/dfrn_request.php:582 ../../include/items.php:2566
 msgid "[Name Withheld]"
 msgstr ""
 
@@ -820,7 +821,7 @@ msgstr ""
 msgid "StatusNet/Federated Social Web"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:682 ../../mod/settings.php:548
+#: ../../mod/dfrn_request.php:682 ../../mod/settings.php:555
 #: ../../include/contact_selectors.php:80
 msgid "Diaspora"
 msgstr ""
@@ -1082,7 +1083,7 @@ msgid "Errors encountered creating database tables."
 msgstr ""
 
 #: ../../mod/localtime.php:12 ../../include/event.php:11
-#: ../../include/bb2diaspora.php:268
+#: ../../include/bb2diaspora.php:238
 msgid "l F d, Y \\@ g:i A"
 msgstr ""
 
@@ -1225,7 +1226,7 @@ msgid "if applicable"
 msgstr ""
 
 #: ../../mod/notifications.php:153 ../../mod/notifications.php:200
-#: ../../mod/admin.php:482
+#: ../../mod/admin.php:486
 msgid "Approve"
 msgstr ""
 
@@ -1310,11 +1311,11 @@ msgstr ""
 msgid "Network Notifications"
 msgstr ""
 
-#: ../../mod/notifications.php:324 ../../mod/notify.php:59
+#: ../../mod/notifications.php:324 ../../mod/notify.php:61
 msgid "No more system notifications."
 msgstr ""
 
-#: ../../mod/notifications.php:328 ../../mod/notify.php:63
+#: ../../mod/notifications.php:328 ../../mod/notify.php:65
 msgid "System Notifications"
 msgstr ""
 
@@ -1422,12 +1423,12 @@ msgid "View all contacts"
 msgstr ""
 
 #: ../../mod/contacts.php:297 ../../mod/contacts.php:344
-#: ../../mod/admin.php:486
+#: ../../mod/admin.php:490
 msgid "Unblock"
 msgstr ""
 
 #: ../../mod/contacts.php:297 ../../mod/contacts.php:344
-#: ../../mod/admin.php:485
+#: ../../mod/admin.php:489
 msgid "Block"
 msgstr ""
 
@@ -1496,7 +1497,7 @@ msgstr ""
 msgid "Update public posts"
 msgstr ""
 
-#: ../../mod/contacts.php:341 ../../mod/admin.php:896
+#: ../../mod/contacts.php:341 ../../mod/admin.php:905
 msgid "Update now"
 msgstr ""
 
@@ -1513,7 +1514,7 @@ msgid ""
 "Replies/likes to your public posts <strong>may</strong> still be visible"
 msgstr ""
 
-#: ../../mod/contacts.php:399 ../../mod/group.php:194
+#: ../../mod/contacts.php:399 ../../mod/group.php:179
 msgid "All Contacts"
 msgstr ""
 
@@ -1546,23 +1547,23 @@ msgid "you are a fan of"
 msgstr ""
 
 #: ../../mod/contacts.php:498 ../../include/Contact.php:135
-#: ../../include/conversation.php:773
+#: ../../include/conversation.php:792
 msgid "Edit contact"
 msgstr ""
 
-#: ../../mod/contacts.php:518 ../../include/nav.php:132
+#: ../../mod/contacts.php:519 ../../include/nav.php:132
 msgid "Contacts"
 msgstr ""
 
-#: ../../mod/contacts.php:522
+#: ../../mod/contacts.php:523
 msgid "Search your contacts"
 msgstr ""
 
-#: ../../mod/contacts.php:523 ../../mod/directory.php:67
+#: ../../mod/contacts.php:524 ../../mod/directory.php:67
 msgid "Finding: "
 msgstr ""
 
-#: ../../mod/contacts.php:524 ../../mod/directory.php:69
+#: ../../mod/contacts.php:525 ../../mod/directory.php:69
 #: ../../include/contact_widgets.php:34
 msgid "Find"
 msgstr ""
@@ -1582,8 +1583,8 @@ msgstr ""
 
 #: ../../mod/lostpass.php:44 ../../mod/lostpass.php:106
 #: ../../mod/register.php:380 ../../mod/register.php:434
-#: ../../mod/regmod.php:54 ../../mod/dfrn_confirm.php:716
-#: ../../include/items.php:2513
+#: ../../mod/regmod.php:54 ../../mod/dfrn_confirm.php:726
+#: ../../include/items.php:2575
 msgid "Administrator"
 msgstr ""
 
@@ -1637,428 +1638,444 @@ msgstr ""
 msgid "Reset"
 msgstr ""
 
-#: ../../mod/settings.php:70
+#: ../../mod/settings.php:72
 msgid "Missing some important data!"
 msgstr ""
 
-#: ../../mod/settings.php:73 ../../mod/settings.php:479 ../../mod/admin.php:75
+#: ../../mod/settings.php:75 ../../mod/settings.php:486 ../../mod/admin.php:75
 msgid "Update"
 msgstr ""
 
-#: ../../mod/settings.php:168
+#: ../../mod/settings.php:175
 msgid "Failed to connect with email account using the settings provided."
 msgstr ""
 
-#: ../../mod/settings.php:173
+#: ../../mod/settings.php:180
 msgid "Email settings updated."
 msgstr ""
 
-#: ../../mod/settings.php:191
+#: ../../mod/settings.php:198
 msgid "Passwords do not match. Password unchanged."
 msgstr ""
 
-#: ../../mod/settings.php:196
+#: ../../mod/settings.php:203
 msgid "Empty passwords are not allowed. Password unchanged."
 msgstr ""
 
-#: ../../mod/settings.php:207
+#: ../../mod/settings.php:214
 msgid "Password changed."
 msgstr ""
 
-#: ../../mod/settings.php:209
+#: ../../mod/settings.php:216
 msgid "Password update failed. Please try again."
 msgstr ""
 
-#: ../../mod/settings.php:273
+#: ../../mod/settings.php:280
 msgid " Please use a shorter name."
 msgstr ""
 
-#: ../../mod/settings.php:275
+#: ../../mod/settings.php:282
 msgid " Name too short."
 msgstr ""
 
-#: ../../mod/settings.php:281
+#: ../../mod/settings.php:288
 msgid " Not valid email."
 msgstr ""
 
-#: ../../mod/settings.php:283
+#: ../../mod/settings.php:290
 msgid " Cannot change to that email."
 msgstr ""
 
-#: ../../mod/settings.php:351 ../../addon/facebook/facebook.php:321
+#: ../../mod/settings.php:358 ../../addon/facebook/facebook.php:321
 #: ../../addon/impressum/impressum.php:64
 #: ../../addon/openstreetmap/openstreetmap.php:80
 #: ../../addon/piwik/piwik.php:105 ../../addon/twitter/twitter.php:350
 msgid "Settings updated."
 msgstr ""
 
-#: ../../mod/settings.php:415 ../../include/nav.php:130
+#: ../../mod/settings.php:422 ../../include/nav.php:130
 msgid "Account settings"
 msgstr ""
 
-#: ../../mod/settings.php:420
+#: ../../mod/settings.php:427
 msgid "Connector settings"
 msgstr ""
 
-#: ../../mod/settings.php:425
+#: ../../mod/settings.php:432
 msgid "Plugin settings"
 msgstr ""
 
-#: ../../mod/settings.php:430
+#: ../../mod/settings.php:437
 msgid "Connections"
 msgstr ""
 
-#: ../../mod/settings.php:435
+#: ../../mod/settings.php:442
 msgid "Export personal data"
 msgstr ""
 
-#: ../../mod/settings.php:452 ../../mod/settings.php:478
-#: ../../mod/settings.php:511
+#: ../../mod/settings.php:459 ../../mod/settings.php:485
+#: ../../mod/settings.php:518
 msgid "Add application"
 msgstr ""
 
-#: ../../mod/settings.php:456 ../../mod/settings.php:482
+#: ../../mod/settings.php:463 ../../mod/settings.php:489
 #: ../../addon/statusnet/statusnet.php:526
 msgid "Consumer Key"
 msgstr ""
 
-#: ../../mod/settings.php:457 ../../mod/settings.php:483
+#: ../../mod/settings.php:464 ../../mod/settings.php:490
 #: ../../addon/statusnet/statusnet.php:525
 msgid "Consumer Secret"
 msgstr ""
 
-#: ../../mod/settings.php:458 ../../mod/settings.php:484
+#: ../../mod/settings.php:465 ../../mod/settings.php:491
 msgid "Redirect"
 msgstr ""
 
-#: ../../mod/settings.php:459 ../../mod/settings.php:485
+#: ../../mod/settings.php:466 ../../mod/settings.php:492
 msgid "Icon url"
 msgstr ""
 
-#: ../../mod/settings.php:470
+#: ../../mod/settings.php:477
 msgid "You can't edit this application."
 msgstr ""
 
-#: ../../mod/settings.php:510
+#: ../../mod/settings.php:517
 msgid "Connected Apps"
 msgstr ""
 
-#: ../../mod/settings.php:514
+#: ../../mod/settings.php:521
 msgid "Client key starts with"
 msgstr ""
 
-#: ../../mod/settings.php:515
+#: ../../mod/settings.php:522
 msgid "No name"
 msgstr ""
 
-#: ../../mod/settings.php:516
+#: ../../mod/settings.php:523
 msgid "Remove authorization"
 msgstr ""
 
-#: ../../mod/settings.php:528
+#: ../../mod/settings.php:535
 msgid "No Plugin settings configured"
 msgstr ""
 
-#: ../../mod/settings.php:535 ../../addon/widgets/widgets.php:122
+#: ../../mod/settings.php:542 ../../addon/widgets/widgets.php:122
 msgid "Plugin Settings"
 msgstr ""
 
-#: ../../mod/settings.php:548 ../../mod/settings.php:549
+#: ../../mod/settings.php:555 ../../mod/settings.php:556
 #, php-format
 msgid "Built-in support for %s connectivity is %s"
 msgstr ""
 
-#: ../../mod/settings.php:548 ../../mod/settings.php:549
+#: ../../mod/settings.php:555 ../../mod/settings.php:556
 msgid "enabled"
 msgstr ""
 
-#: ../../mod/settings.php:548 ../../mod/settings.php:549
+#: ../../mod/settings.php:555 ../../mod/settings.php:556
 msgid "disabled"
 msgstr ""
 
-#: ../../mod/settings.php:549
+#: ../../mod/settings.php:556
 msgid "StatusNet"
 msgstr ""
 
-#: ../../mod/settings.php:575
+#: ../../mod/settings.php:584
 msgid "Connector Settings"
 msgstr ""
 
-#: ../../mod/settings.php:581
+#: ../../mod/settings.php:590
 msgid "Email/Mailbox Setup"
 msgstr ""
 
-#: ../../mod/settings.php:582
+#: ../../mod/settings.php:591
 msgid ""
 "If you wish to communicate with email contacts using this service "
 "(optional), please specify how to connect to your mailbox."
 msgstr ""
 
-#: ../../mod/settings.php:583
+#: ../../mod/settings.php:592
 msgid "Last successful email check:"
 msgstr ""
 
-#: ../../mod/settings.php:584
+#: ../../mod/settings.php:593
 msgid "Email access is disabled on this site."
 msgstr ""
 
-#: ../../mod/settings.php:585
+#: ../../mod/settings.php:594
 msgid "IMAP server name:"
 msgstr ""
 
-#: ../../mod/settings.php:586
+#: ../../mod/settings.php:595
 msgid "IMAP port:"
 msgstr ""
 
-#: ../../mod/settings.php:587
+#: ../../mod/settings.php:596
 msgid "Security:"
 msgstr ""
 
-#: ../../mod/settings.php:587
+#: ../../mod/settings.php:596 ../../mod/settings.php:601
 msgid "None"
 msgstr ""
 
-#: ../../mod/settings.php:588
+#: ../../mod/settings.php:597
 msgid "Email login name:"
 msgstr ""
 
-#: ../../mod/settings.php:589
+#: ../../mod/settings.php:598
 msgid "Email password:"
 msgstr ""
 
-#: ../../mod/settings.php:590
+#: ../../mod/settings.php:599
 msgid "Reply-to address:"
 msgstr ""
 
-#: ../../mod/settings.php:591
+#: ../../mod/settings.php:600
 msgid "Send public posts to all email contacts:"
 msgstr ""
 
-#: ../../mod/settings.php:648 ../../mod/admin.php:142 ../../mod/admin.php:459
+#: ../../mod/settings.php:601
+msgid "Action after import:"
+msgstr ""
+
+#: ../../mod/settings.php:601
+msgid "Mark as seen"
+msgstr ""
+
+#: ../../mod/settings.php:601
+msgid "Move to folder"
+msgstr ""
+
+#: ../../mod/settings.php:602
+msgid "Move to folder:"
+msgstr ""
+
+#: ../../mod/settings.php:659 ../../mod/admin.php:142 ../../mod/admin.php:462
 msgid "Normal Account"
 msgstr ""
 
-#: ../../mod/settings.php:649
+#: ../../mod/settings.php:660
 msgid "This account is a normal personal profile"
 msgstr ""
 
-#: ../../mod/settings.php:652 ../../mod/admin.php:143 ../../mod/admin.php:460
+#: ../../mod/settings.php:663 ../../mod/admin.php:143 ../../mod/admin.php:463
 msgid "Soapbox Account"
 msgstr ""
 
-#: ../../mod/settings.php:653
+#: ../../mod/settings.php:664
 msgid "Automatically approve all connection/friend requests as read-only fans"
 msgstr ""
 
-#: ../../mod/settings.php:656 ../../mod/admin.php:144 ../../mod/admin.php:461
+#: ../../mod/settings.php:667 ../../mod/admin.php:144 ../../mod/admin.php:464
 msgid "Community/Celebrity Account"
 msgstr ""
 
-#: ../../mod/settings.php:657
+#: ../../mod/settings.php:668
 msgid "Automatically approve all connection/friend requests as read-write fans"
 msgstr ""
 
-#: ../../mod/settings.php:660 ../../mod/admin.php:145 ../../mod/admin.php:462
+#: ../../mod/settings.php:671 ../../mod/admin.php:145 ../../mod/admin.php:465
 msgid "Automatic Friend Account"
 msgstr ""
 
-#: ../../mod/settings.php:661
+#: ../../mod/settings.php:672
 msgid "Automatically approve all connection/friend requests as friends"
 msgstr ""
 
-#: ../../mod/settings.php:671
+#: ../../mod/settings.php:682
 msgid "OpenID:"
 msgstr ""
 
-#: ../../mod/settings.php:671
+#: ../../mod/settings.php:682
 msgid "(Optional) Allow this OpenID to login to this account."
 msgstr ""
 
-#: ../../mod/settings.php:681
+#: ../../mod/settings.php:692
 msgid "Publish your default profile in your local site directory?"
 msgstr ""
 
-#: ../../mod/settings.php:687
+#: ../../mod/settings.php:698
 msgid "Publish your default profile in the global social directory?"
 msgstr ""
 
-#: ../../mod/settings.php:695
+#: ../../mod/settings.php:706
 msgid "Hide your contact/friend list from viewers of your default profile?"
 msgstr ""
 
-#: ../../mod/settings.php:699
+#: ../../mod/settings.php:710
 msgid "Hide your profile details from unknown viewers?"
 msgstr ""
 
-#: ../../mod/settings.php:704
+#: ../../mod/settings.php:715
 msgid "Allow friends to post to your profile page?"
 msgstr ""
 
-#: ../../mod/settings.php:710
+#: ../../mod/settings.php:721
 msgid "Allow friends to tag your posts?"
 msgstr ""
 
-#: ../../mod/settings.php:716
+#: ../../mod/settings.php:727
 msgid "Allow us to suggest you as a potential friend to new members?"
 msgstr ""
 
-#: ../../mod/settings.php:725
+#: ../../mod/settings.php:736
 msgid "Profile is <strong>not published</strong>."
 msgstr ""
 
-#: ../../mod/settings.php:757 ../../mod/profile_photo.php:206
+#: ../../mod/settings.php:768 ../../mod/profile_photo.php:206
 msgid "or"
 msgstr ""
 
-#: ../../mod/settings.php:762
+#: ../../mod/settings.php:773
 msgid "Your Identity Address is"
 msgstr ""
 
-#: ../../mod/settings.php:773
+#: ../../mod/settings.php:784
 msgid "Automatically expire posts after this many days:"
 msgstr ""
 
-#: ../../mod/settings.php:773
+#: ../../mod/settings.php:784
 msgid "If empty, posts will not expire. Expired posts will be deleted"
 msgstr ""
 
-#: ../../mod/settings.php:774
+#: ../../mod/settings.php:785
 msgid "Advanced expiration settings"
 msgstr ""
 
-#: ../../mod/settings.php:775
+#: ../../mod/settings.php:786
 msgid "Advanced Expiration"
 msgstr ""
 
-#: ../../mod/settings.php:776
+#: ../../mod/settings.php:787
 msgid "Expire posts:"
 msgstr ""
 
-#: ../../mod/settings.php:777
+#: ../../mod/settings.php:788
 msgid "Expire personal notes:"
 msgstr ""
 
-#: ../../mod/settings.php:778
+#: ../../mod/settings.php:789
 msgid "Expire starred posts:"
 msgstr ""
 
-#: ../../mod/settings.php:779
+#: ../../mod/settings.php:790
 msgid "Expire photos:"
 msgstr ""
 
-#: ../../mod/settings.php:784
+#: ../../mod/settings.php:795
 msgid "Account Settings"
 msgstr ""
 
-#: ../../mod/settings.php:792
+#: ../../mod/settings.php:803
 msgid "Password Settings"
 msgstr ""
 
-#: ../../mod/settings.php:793
+#: ../../mod/settings.php:804
 msgid "New Password:"
 msgstr ""
 
-#: ../../mod/settings.php:794
+#: ../../mod/settings.php:805
 msgid "Confirm:"
 msgstr ""
 
-#: ../../mod/settings.php:794
+#: ../../mod/settings.php:805
 msgid "Leave password fields blank unless changing"
 msgstr ""
 
-#: ../../mod/settings.php:798
+#: ../../mod/settings.php:809
 msgid "Basic Settings"
 msgstr ""
 
-#: ../../mod/settings.php:799 ../../include/profile_advanced.php:15
+#: ../../mod/settings.php:810 ../../include/profile_advanced.php:15
 msgid "Full Name:"
 msgstr ""
 
-#: ../../mod/settings.php:800
+#: ../../mod/settings.php:811
 msgid "Email Address:"
 msgstr ""
 
-#: ../../mod/settings.php:801
+#: ../../mod/settings.php:812
 msgid "Your Timezone:"
 msgstr ""
 
-#: ../../mod/settings.php:802
+#: ../../mod/settings.php:813
 msgid "Default Post Location:"
 msgstr ""
 
-#: ../../mod/settings.php:803
+#: ../../mod/settings.php:814
 msgid "Use Browser Location:"
 msgstr ""
 
-#: ../../mod/settings.php:804
+#: ../../mod/settings.php:815
 msgid "Display Theme:"
 msgstr ""
 
-#: ../../mod/settings.php:805
+#: ../../mod/settings.php:816
 msgid "Update browser every xx seconds"
 msgstr ""
 
-#: ../../mod/settings.php:805
+#: ../../mod/settings.php:816
 msgid "Minimum of 10 seconds, no maximum"
 msgstr ""
 
-#: ../../mod/settings.php:807
+#: ../../mod/settings.php:818
 msgid "Security and Privacy Settings"
 msgstr ""
 
-#: ../../mod/settings.php:809
+#: ../../mod/settings.php:820
 msgid "Maximum Friend Requests/Day:"
 msgstr ""
 
-#: ../../mod/settings.php:809
+#: ../../mod/settings.php:820
 msgid "(to prevent spam abuse)"
 msgstr ""
 
-#: ../../mod/settings.php:810
+#: ../../mod/settings.php:821
 msgid "Default Post Permissions"
 msgstr ""
 
-#: ../../mod/settings.php:811
+#: ../../mod/settings.php:822
 msgid "(click to open/close)"
 msgstr ""
 
-#: ../../mod/settings.php:826
+#: ../../mod/settings.php:837
 msgid "Notification Settings"
 msgstr ""
 
-#: ../../mod/settings.php:827
+#: ../../mod/settings.php:838
 msgid "Send a notification email when:"
 msgstr ""
 
-#: ../../mod/settings.php:828
+#: ../../mod/settings.php:839
 msgid "You receive an introduction"
 msgstr ""
 
-#: ../../mod/settings.php:829
+#: ../../mod/settings.php:840
 msgid "Your introductions are confirmed"
 msgstr ""
 
-#: ../../mod/settings.php:830
+#: ../../mod/settings.php:841
 msgid "Someone writes on your profile wall"
 msgstr ""
 
-#: ../../mod/settings.php:831
+#: ../../mod/settings.php:842
 msgid "Someone writes a followup comment"
 msgstr ""
 
-#: ../../mod/settings.php:832
+#: ../../mod/settings.php:843
 msgid "You receive a private message"
 msgstr ""
 
-#: ../../mod/settings.php:833
+#: ../../mod/settings.php:844
 msgid "You receive a friend suggestion"
 msgstr ""
 
-#: ../../mod/settings.php:834
+#: ../../mod/settings.php:845
 msgid "You are tagged in a post"
 msgstr ""
 
-#: ../../mod/settings.php:837
+#: ../../mod/settings.php:848
 msgid "Advanced Page Settings"
 msgstr ""
 
@@ -2124,27 +2141,27 @@ msgstr[1] ""
 msgid "Private messages to this group are at risk of public disclosure."
 msgstr ""
 
-#: ../../mod/network.php:300
+#: ../../mod/network.php:298
 msgid "No such group"
 msgstr ""
 
-#: ../../mod/network.php:311
+#: ../../mod/network.php:309
 msgid "Group is empty"
 msgstr ""
 
-#: ../../mod/network.php:315
+#: ../../mod/network.php:313
 msgid "Group: "
 msgstr ""
 
-#: ../../mod/network.php:325
+#: ../../mod/network.php:323
 msgid "Contact: "
 msgstr ""
 
-#: ../../mod/network.php:327
+#: ../../mod/network.php:325
 msgid "Private messages to this person are at risk of public disclosure."
 msgstr ""
 
-#: ../../mod/network.php:332
+#: ../../mod/network.php:330
 msgid "Invalid contact."
 msgstr ""
 
@@ -2152,7 +2169,7 @@ msgstr ""
 msgid "Personal Notes"
 msgstr ""
 
-#: ../../mod/notes.php:63 ../../include/text.php:639
+#: ../../mod/notes.php:63 ../../include/text.php:645
 msgid "Save"
 msgstr ""
 
@@ -2279,7 +2296,7 @@ msgstr ""
 msgid "Could not create group."
 msgstr ""
 
-#: ../../mod/group.php:43 ../../mod/group.php:123
+#: ../../mod/group.php:43 ../../mod/group.php:127
 msgid "Group not found."
 msgstr ""
 
@@ -2291,34 +2308,34 @@ msgstr ""
 msgid "Permission denied"
 msgstr ""
 
-#: ../../mod/group.php:82
+#: ../../mod/group.php:85
 msgid "Create a group of contacts/friends."
 msgstr ""
 
-#: ../../mod/group.php:83 ../../mod/group.php:166
+#: ../../mod/group.php:86 ../../mod/group.php:166
 msgid "Group Name: "
 msgstr ""
 
-#: ../../mod/group.php:98
+#: ../../mod/group.php:102
 msgid "Group removed."
 msgstr ""
 
-#: ../../mod/group.php:100
+#: ../../mod/group.php:104
 msgid "Unable to remove group."
 msgstr ""
 
-#: ../../mod/group.php:164 ../../mod/profperm.php:105
-msgid "Click on a contact to add or remove."
-msgstr ""
-
 #: ../../mod/group.php:165
 msgid "Group Editor"
 msgstr ""
 
-#: ../../mod/group.php:179
+#: ../../mod/group.php:177
 msgid "Members"
 msgstr ""
 
+#: ../../mod/group.php:209 ../../mod/profperm.php:105
+msgid "Click on a contact to add or remove."
+msgstr ""
+
 #: ../../mod/profperm.php:25 ../../mod/profperm.php:55
 msgid "Invalid profile identifier."
 msgstr ""
@@ -2345,7 +2362,7 @@ msgstr ""
 msgid "No contacts."
 msgstr ""
 
-#: ../../mod/viewcontacts.php:73 ../../include/text.php:578
+#: ../../mod/viewcontacts.php:74 ../../include/text.php:584
 msgid "View Contacts"
 msgstr ""
 
@@ -2472,7 +2489,7 @@ msgstr ""
 msgid "Your invitation ID: "
 msgstr ""
 
-#: ../../mod/register.php:540 ../../mod/admin.php:313
+#: ../../mod/register.php:540 ../../mod/admin.php:314
 msgid "Registration"
 msgstr ""
 
@@ -2526,9 +2543,9 @@ msgid "%1$s doesn't like %2$s's %3$s"
 msgstr ""
 
 #: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:127
-#: ../../mod/admin.php:518 ../../mod/admin.php:694 ../../mod/display.php:29
-#: ../../mod/display.php:134 ../../mod/viewd.php:14
-#: ../../include/items.php:2880
+#: ../../mod/admin.php:522 ../../mod/admin.php:700 ../../mod/display.php:29
+#: ../../mod/display.php:137 ../../mod/viewd.php:14
+#: ../../include/items.php:2942
 msgid "Item not found."
 msgstr ""
 
@@ -2563,28 +2580,28 @@ msgstr ""
 msgid "Wall Photos"
 msgstr ""
 
-#: ../../mod/item.php:830
+#: ../../mod/item.php:833
 msgid "System error. Post not saved."
 msgstr ""
 
-#: ../../mod/item.php:855
+#: ../../mod/item.php:858
 #, php-format
 msgid ""
 "This message was sent to you by %s, a member of the Friendica social network."
 msgstr ""
 
-#: ../../mod/item.php:857
+#: ../../mod/item.php:860
 #, php-format
 msgid "You may visit them online at %s"
 msgstr ""
 
-#: ../../mod/item.php:858
+#: ../../mod/item.php:861
 msgid ""
 "Please contact the sender by replying to this post if you do not wish to "
 "receive these messages."
 msgstr ""
 
-#: ../../mod/item.php:860
+#: ../../mod/item.php:863
 #, php-format
 msgid "%s posted an update."
 msgstr ""
@@ -2708,7 +2725,7 @@ msgstr ""
 msgid "Conversation removed."
 msgstr ""
 
-#: ../../mod/message.php:137 ../../include/conversation.php:868
+#: ../../mod/message.php:137 ../../include/conversation.php:887
 msgid "Please enter a link URL:"
 msgstr ""
 
@@ -2762,23 +2779,23 @@ msgstr ""
 msgid "No friends to display."
 msgstr ""
 
-#: ../../mod/admin.php:71 ../../mod/admin.php:311
+#: ../../mod/admin.php:71 ../../mod/admin.php:312
 msgid "Site"
 msgstr ""
 
-#: ../../mod/admin.php:72 ../../mod/admin.php:476 ../../mod/admin.php:488
+#: ../../mod/admin.php:72 ../../mod/admin.php:480 ../../mod/admin.php:492
 msgid "Users"
 msgstr ""
 
-#: ../../mod/admin.php:73 ../../mod/admin.php:565 ../../mod/admin.php:602
+#: ../../mod/admin.php:73 ../../mod/admin.php:569 ../../mod/admin.php:608
 msgid "Plugins"
 msgstr ""
 
-#: ../../mod/admin.php:74 ../../mod/admin.php:736 ../../mod/admin.php:768
+#: ../../mod/admin.php:74 ../../mod/admin.php:742 ../../mod/admin.php:775
 msgid "Themes"
 msgstr ""
 
-#: ../../mod/admin.php:89 ../../mod/admin.php:846
+#: ../../mod/admin.php:89 ../../mod/admin.php:855
 msgid "Logs"
 msgstr ""
 
@@ -2786,325 +2803,439 @@ msgstr ""
 msgid "User registrations waiting for confirmation"
 msgstr ""
 
-#: ../../mod/admin.php:160 ../../mod/admin.php:310 ../../mod/admin.php:475
-#: ../../mod/admin.php:564 ../../mod/admin.php:601 ../../mod/admin.php:735
-#: ../../mod/admin.php:767 ../../mod/admin.php:845
+#: ../../mod/admin.php:161 ../../mod/admin.php:311 ../../mod/admin.php:479
+#: ../../mod/admin.php:568 ../../mod/admin.php:607 ../../mod/admin.php:741
+#: ../../mod/admin.php:774 ../../mod/admin.php:854
 msgid "Administration"
 msgstr ""
 
-#: ../../mod/admin.php:161
+#: ../../mod/admin.php:162
 msgid "Summary"
 msgstr ""
 
-#: ../../mod/admin.php:162
+#: ../../mod/admin.php:163
 msgid "Registered users"
 msgstr ""
 
-#: ../../mod/admin.php:164
+#: ../../mod/admin.php:165
 msgid "Pending registrations"
 msgstr ""
 
-#: ../../mod/admin.php:165
+#: ../../mod/admin.php:166
 msgid "Version"
 msgstr ""
 
-#: ../../mod/admin.php:167
+#: ../../mod/admin.php:168
 msgid "Active plugins"
 msgstr ""
 
-#: ../../mod/admin.php:259
+#: ../../mod/admin.php:260
 msgid "Site settings updated."
 msgstr ""
 
-#: ../../mod/admin.php:303
+#: ../../mod/admin.php:304
 msgid "Closed"
 msgstr ""
 
-#: ../../mod/admin.php:304
+#: ../../mod/admin.php:305
 msgid "Requires approval"
 msgstr ""
 
-#: ../../mod/admin.php:305
+#: ../../mod/admin.php:306
 msgid "Open"
 msgstr ""
 
-#: ../../mod/admin.php:314
+#: ../../mod/admin.php:315
 msgid "File upload"
 msgstr ""
 
-#: ../../mod/admin.php:315
+#: ../../mod/admin.php:316
 msgid "Policies"
 msgstr ""
 
-#: ../../mod/admin.php:316
+#: ../../mod/admin.php:317
 msgid "Advanced"
 msgstr ""
 
-#: ../../mod/admin.php:320 ../../addon/statusnet/statusnet.php:523
+#: ../../mod/admin.php:321 ../../addon/statusnet/statusnet.php:523
 msgid "Site name"
 msgstr ""
 
-#: ../../mod/admin.php:321
+#: ../../mod/admin.php:322
 msgid "Banner/Logo"
 msgstr ""
 
-#: ../../mod/admin.php:322
+#: ../../mod/admin.php:323
 msgid "System language"
 msgstr ""
 
-#: ../../mod/admin.php:323
+#: ../../mod/admin.php:324
 msgid "System theme"
 msgstr ""
 
-#: ../../mod/admin.php:325
+#: ../../mod/admin.php:324
+msgid "Default system theme - may be over-ridden by user profiles"
+msgstr ""
+
+#: ../../mod/admin.php:326
 msgid "Maximum image size"
 msgstr ""
 
-#: ../../mod/admin.php:327
-msgid "Register policy"
+#: ../../mod/admin.php:326
+msgid ""
+"Maximum size in bytes of uploaded images. Default is 0, which means no "
+"limits."
 msgstr ""
 
 #: ../../mod/admin.php:328
+msgid "Register policy"
+msgstr ""
+
+#: ../../mod/admin.php:329
 msgid "Register text"
 msgstr ""
 
 #: ../../mod/admin.php:329
+msgid "Will be displayed prominently on the registration page."
+msgstr ""
+
+#: ../../mod/admin.php:330
 msgid "Accounts abandoned after x days"
 msgstr ""
 
-#: ../../mod/admin.php:329
+#: ../../mod/admin.php:330
 msgid ""
 "Will not waste system resources polling external sites for abandonded "
 "accounts. Enter 0 for no time limit."
 msgstr ""
 
-#: ../../mod/admin.php:330
+#: ../../mod/admin.php:331
 msgid "Allowed friend domains"
 msgstr ""
 
 #: ../../mod/admin.php:331
+msgid ""
+"Comma separated list of domains which are allowed to establish friendships "
+"with this site. Wildcards are accepted. Empty to allow any domains"
+msgstr ""
+
+#: ../../mod/admin.php:332
 msgid "Allowed email domains"
 msgstr ""
 
 #: ../../mod/admin.php:332
+msgid ""
+"Comma separated list of domains which are allowed in email addresses for "
+"registrations to this site. Wildcards are accepted. Empty to allow any "
+"domains"
+msgstr ""
+
+#: ../../mod/admin.php:333
 msgid "Block public"
 msgstr ""
 
 #: ../../mod/admin.php:333
+msgid ""
+"Check to block public access to all otherwise public personal pages on this "
+"site unless you are currently logged in."
+msgstr ""
+
+#: ../../mod/admin.php:334
 msgid "Force publish"
 msgstr ""
 
 #: ../../mod/admin.php:334
+msgid ""
+"Check to force all profiles on this site to be listed in the site directory."
+msgstr ""
+
+#: ../../mod/admin.php:335
 msgid "Global directory update URL"
 msgstr ""
 
-#: ../../mod/admin.php:336
+#: ../../mod/admin.php:335
+msgid ""
+"URL to update the global directory. If this is not set, the global directory "
+"is completely unavailable to the application."
+msgstr ""
+
+#: ../../mod/admin.php:337
 msgid "Block multiple registrations"
 msgstr ""
 
 #: ../../mod/admin.php:337
+msgid "Disallow users to register additional accounts for use as pages."
+msgstr ""
+
+#: ../../mod/admin.php:338
 msgid "OpenID support"
 msgstr ""
 
 #: ../../mod/admin.php:338
+msgid "OpenID support for registration and logins."
+msgstr ""
+
+#: ../../mod/admin.php:339
 msgid "Gravatar support"
 msgstr ""
 
 #: ../../mod/admin.php:339
+msgid "Search new user's photo on Gravatar."
+msgstr ""
+
+#: ../../mod/admin.php:340
 msgid "Fullname check"
 msgstr ""
 
 #: ../../mod/admin.php:340
+msgid ""
+"Force users to register with a space between firstname and lastname in Full "
+"name, as an antispam measure"
+msgstr ""
+
+#: ../../mod/admin.php:341
 msgid "UTF-8 Regular expressions"
 msgstr ""
 
 #: ../../mod/admin.php:341
+msgid "Use PHP UTF8 regular expressions"
+msgstr ""
+
+#: ../../mod/admin.php:342
 msgid "Show Community Page"
 msgstr ""
 
 #: ../../mod/admin.php:342
+msgid ""
+"Display a Community page showing all recent public postings on this site."
+msgstr ""
+
+#: ../../mod/admin.php:343
 msgid "Enable OStatus support"
 msgstr ""
 
 #: ../../mod/admin.php:343
+msgid ""
+"Provide built-in OStatus (identi.ca, status.net, etc.) compatibility. All "
+"communications in OStatus are public, so privacy warnings will be "
+"occasionally displayed."
+msgstr ""
+
+#: ../../mod/admin.php:344
 msgid "Enable Diaspora support"
 msgstr ""
 
 #: ../../mod/admin.php:344
+msgid "Provide built-in Diaspora network compatibility."
+msgstr ""
+
+#: ../../mod/admin.php:345
 msgid "Only allow Friendica contacts"
 msgstr ""
 
 #: ../../mod/admin.php:345
+msgid ""
+"All contacts must use Friendica protocols. All other built-in communication "
+"protocols disabled."
+msgstr ""
+
+#: ../../mod/admin.php:346
 msgid "Verify SSL"
 msgstr ""
 
 #: ../../mod/admin.php:346
-msgid "Proxy user"
+msgid ""
+"If you wish, you can turn on strict certificate checking. This will mean you "
+"cannot connect (at all) to self-signed SSL sites."
 msgstr ""
 
 #: ../../mod/admin.php:347
-msgid "Proxy URL"
+msgid "Proxy user"
 msgstr ""
 
 #: ../../mod/admin.php:348
+msgid "Proxy URL"
+msgstr ""
+
+#: ../../mod/admin.php:349
 msgid "Network timeout"
 msgstr ""
 
-#: ../../mod/admin.php:369
+#: ../../mod/admin.php:349
+msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
+msgstr ""
+
+#: ../../mod/admin.php:370
 #, php-format
-msgid "%s user blocked"
+msgid "%s user blocked/unblocked"
 msgid_plural "%s users blocked/unblocked"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../mod/admin.php:376
+#: ../../mod/admin.php:377
 #, php-format
 msgid "%s user deleted"
 msgid_plural "%s users deleted"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../mod/admin.php:410
+#: ../../mod/admin.php:411
 #, php-format
 msgid "User '%s' deleted"
 msgstr ""
 
-#: ../../mod/admin.php:417
+#: ../../mod/admin.php:418
 #, php-format
 msgid "User '%s' unblocked"
 msgstr ""
 
-#: ../../mod/admin.php:417
+#: ../../mod/admin.php:418
 #, php-format
 msgid "User '%s' blocked"
 msgstr ""
 
-#: ../../mod/admin.php:478
+#: ../../mod/admin.php:482
 msgid "select all"
 msgstr ""
 
-#: ../../mod/admin.php:479
+#: ../../mod/admin.php:483
 msgid "User registrations waiting for confirm"
 msgstr ""
 
-#: ../../mod/admin.php:480
+#: ../../mod/admin.php:484
 msgid "Request date"
 msgstr ""
 
-#: ../../mod/admin.php:480 ../../mod/admin.php:489
+#: ../../mod/admin.php:484 ../../mod/admin.php:493
 #: ../../include/contact_selectors.php:79
 msgid "Email"
 msgstr ""
 
-#: ../../mod/admin.php:481
+#: ../../mod/admin.php:485
 msgid "No registrations."
 msgstr ""
 
-#: ../../mod/admin.php:483
+#: ../../mod/admin.php:487
 msgid "Deny"
 msgstr ""
 
-#: ../../mod/admin.php:489
+#: ../../mod/admin.php:493
 msgid "Register date"
 msgstr ""
 
-#: ../../mod/admin.php:489
+#: ../../mod/admin.php:493
 msgid "Last login"
 msgstr ""
 
-#: ../../mod/admin.php:489
+#: ../../mod/admin.php:493
 msgid "Last item"
 msgstr ""
 
-#: ../../mod/admin.php:489
+#: ../../mod/admin.php:493
 msgid "Account"
 msgstr ""
 
-#: ../../mod/admin.php:491
+#: ../../mod/admin.php:495
 msgid ""
 "Selected users will be deleted!\\n\\nEverything these users had posted on "
 "this site will be permanently deleted!\\n\\nAre you sure?"
 msgstr ""
 
-#: ../../mod/admin.php:492
+#: ../../mod/admin.php:496
 msgid ""
 "The user {0} will be deleted!\\n\\nEverything this user has posted on this "
 "site will be permanently deleted!\\n\\nAre you sure?"
 msgstr ""
 
-#: ../../mod/admin.php:528
+#: ../../mod/admin.php:532
 #, php-format
 msgid "Plugin %s disabled."
 msgstr ""
 
-#: ../../mod/admin.php:532
+#: ../../mod/admin.php:536
 #, php-format
 msgid "Plugin %s enabled."
 msgstr ""
 
-#: ../../mod/admin.php:542 ../../mod/admin.php:718
+#: ../../mod/admin.php:546 ../../mod/admin.php:724
 msgid "Disable"
 msgstr ""
 
-#: ../../mod/admin.php:544 ../../mod/admin.php:720
+#: ../../mod/admin.php:548 ../../mod/admin.php:726
 msgid "Enable"
 msgstr ""
 
-#: ../../mod/admin.php:566 ../../mod/admin.php:737
+#: ../../mod/admin.php:570 ../../mod/admin.php:743
 msgid "Toggle"
 msgstr ""
 
-#: ../../mod/admin.php:567 ../../mod/admin.php:738 ../../include/nav.php:130
+#: ../../mod/admin.php:571 ../../mod/admin.php:744 ../../include/nav.php:130
 msgid "Settings"
 msgstr ""
 
-#: ../../mod/admin.php:683
+#: ../../mod/admin.php:578 ../../mod/admin.php:753
+msgid "Author: "
+msgstr ""
+
+#: ../../mod/admin.php:579 ../../mod/admin.php:754
+msgid "Maintainer: "
+msgstr ""
+
+#: ../../mod/admin.php:689
 msgid "No themes found."
 msgstr ""
 
-#: ../../mod/admin.php:795
+#: ../../mod/admin.php:780
+msgid "[Experimental]"
+msgstr ""
+
+#: ../../mod/admin.php:781
+msgid "[Unsupported]"
+msgstr ""
+
+#: ../../mod/admin.php:804
 msgid "Log settings updated."
 msgstr ""
 
-#: ../../mod/admin.php:848
+#: ../../mod/admin.php:857
 msgid "Clear"
 msgstr ""
 
-#: ../../mod/admin.php:854
+#: ../../mod/admin.php:863
 msgid "Debugging"
 msgstr ""
 
-#: ../../mod/admin.php:855
+#: ../../mod/admin.php:864
 msgid "Log file"
 msgstr ""
 
-#: ../../mod/admin.php:855
+#: ../../mod/admin.php:864
 msgid ""
 "Must be writable by web server. Relative to your Friendica top-level "
 "directory."
 msgstr ""
 
-#: ../../mod/admin.php:856
+#: ../../mod/admin.php:865
 msgid "Log level"
 msgstr ""
 
-#: ../../mod/admin.php:897
+#: ../../mod/admin.php:906
 msgid "Close"
 msgstr ""
 
-#: ../../mod/admin.php:903
+#: ../../mod/admin.php:912
 msgid "FTP Host"
 msgstr ""
 
-#: ../../mod/admin.php:904
+#: ../../mod/admin.php:913
 msgid "FTP Path"
 msgstr ""
 
-#: ../../mod/admin.php:905
+#: ../../mod/admin.php:914
 msgid "FTP User"
 msgstr ""
 
-#: ../../mod/admin.php:906
+#: ../../mod/admin.php:915
 msgid "FTP Password"
 msgstr ""
 
@@ -3120,48 +3251,48 @@ msgstr ""
 msgid "Tips for New Members"
 msgstr ""
 
-#: ../../mod/ping.php:146
+#: ../../mod/ping.php:174
 msgid "{0} wants to be your friend"
 msgstr ""
 
-#: ../../mod/ping.php:151
+#: ../../mod/ping.php:179
 msgid "{0} sent you a message"
 msgstr ""
 
-#: ../../mod/ping.php:156
+#: ../../mod/ping.php:184
 msgid "{0} requested registration"
 msgstr ""
 
-#: ../../mod/ping.php:162
+#: ../../mod/ping.php:190
 #, php-format
 msgid "{0} commented %s's post"
 msgstr ""
 
-#: ../../mod/ping.php:167
+#: ../../mod/ping.php:195
 #, php-format
 msgid "{0} liked %s's post"
 msgstr ""
 
-#: ../../mod/ping.php:172
+#: ../../mod/ping.php:200
 #, php-format
 msgid "{0} disliked %s's post"
 msgstr ""
 
-#: ../../mod/ping.php:177
+#: ../../mod/ping.php:205
 #, php-format
 msgid "{0} is now friends with %s"
 msgstr ""
 
-#: ../../mod/ping.php:182
+#: ../../mod/ping.php:210
 msgid "{0} posted"
 msgstr ""
 
-#: ../../mod/ping.php:187
+#: ../../mod/ping.php:215
 #, php-format
 msgid "{0} tagged %s's post with #%s"
 msgstr ""
 
-#: ../../mod/ping.php:193
+#: ../../mod/ping.php:221
 msgid "{0} mentioned you in a post"
 msgstr ""
 
@@ -3223,7 +3354,7 @@ msgstr ""
 msgid "No friends in common."
 msgstr ""
 
-#: ../../mod/display.php:127
+#: ../../mod/display.php:130
 msgid "Item has been removed."
 msgstr ""
 
@@ -3589,78 +3720,84 @@ msgid ""
 "Once you have registered, please connect with me via my profile page at:"
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:238
+#: ../../mod/dfrn_confirm.php:119
+msgid ""
+"This may occasionally happen if contact was requested by both persons and it "
+"has already been approved."
+msgstr ""
+
+#: ../../mod/dfrn_confirm.php:239
 msgid "Response from remote site was not understood."
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:247
+#: ../../mod/dfrn_confirm.php:248
 msgid "Unexpected response from remote site: "
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:255
+#: ../../mod/dfrn_confirm.php:256
 msgid "Confirmation completed successfully."
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:257 ../../mod/dfrn_confirm.php:271
-#: ../../mod/dfrn_confirm.php:278
+#: ../../mod/dfrn_confirm.php:258 ../../mod/dfrn_confirm.php:272
+#: ../../mod/dfrn_confirm.php:279
 msgid "Remote site reported: "
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:269
+#: ../../mod/dfrn_confirm.php:270
 msgid "Temporary failure. Please wait and try again."
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:276
+#: ../../mod/dfrn_confirm.php:277
 msgid "Introduction failed or was revoked."
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:421
+#: ../../mod/dfrn_confirm.php:422
 msgid "Unable to set contact photo."
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:473 ../../include/diaspora.php:495
+#: ../../mod/dfrn_confirm.php:474 ../../include/diaspora.php:495
 #: ../../include/conversation.php:101
 #, php-format
 msgid "%1$s is now friends with %2$s"
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:543
+#: ../../mod/dfrn_confirm.php:544
 #, php-format
 msgid "No user record found for '%s' "
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:553
+#: ../../mod/dfrn_confirm.php:554
 msgid "Our site encryption key is apparently messed up."
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:564
+#: ../../mod/dfrn_confirm.php:565
 msgid "Empty site URL was provided or URL could not be decrypted by us."
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:585
+#: ../../mod/dfrn_confirm.php:586
 msgid "Contact record was not found for you on our site."
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:599
+#: ../../mod/dfrn_confirm.php:600
 #, php-format
 msgid "Site public key not available in contact record for URL %s."
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:619
+#: ../../mod/dfrn_confirm.php:620
 msgid ""
 "The ID provided by your system is a duplicate on our system. It should work "
 "if you try again."
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:630
+#: ../../mod/dfrn_confirm.php:631
 msgid "Unable to set your contact credentials on our system."
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:684
+#: ../../mod/dfrn_confirm.php:694
 msgid "Unable to update your contact profile details on our system"
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:714
+#: ../../mod/dfrn_confirm.php:724
 #, php-format
 msgid "Connection accepted at %s"
 msgstr ""
@@ -3773,7 +3910,7 @@ msgid "Facebook post failed. Queued for retry."
 msgstr ""
 
 #: ../../addon/facebook/facebook.php:877 ../../addon/facebook/facebook.php:886
-#: ../../include/bb2diaspora.php:132
+#: ../../include/bb2diaspora.php:102
 msgid "link"
 msgstr ""
 
@@ -3831,6 +3968,30 @@ msgstr ""
 msgid "yourls Settings saved."
 msgstr ""
 
+#: ../../addon/ljpost/ljpost.php:38
+msgid "Post to LiveJournal"
+msgstr ""
+
+#: ../../addon/ljpost/ljpost.php:69
+msgid "LiveJournal Post Settings"
+msgstr ""
+
+#: ../../addon/ljpost/ljpost.php:71
+msgid "Enable LiveJournal Post Plugin"
+msgstr ""
+
+#: ../../addon/ljpost/ljpost.php:76
+msgid "LiveJournal username"
+msgstr ""
+
+#: ../../addon/ljpost/ljpost.php:81
+msgid "LiveJournal password"
+msgstr ""
+
+#: ../../addon/ljpost/ljpost.php:86
+msgid "Post to LiveJournal by default"
+msgstr ""
+
 #: ../../addon/nsfw/nsfw.php:47
 msgid "\"Not Safe For Work\" Settings"
 msgstr ""
@@ -3857,12 +4018,15 @@ msgid "%s - Click to open/close"
 msgstr ""
 
 #: ../../addon/communityhome/communityhome.php:28
-#: ../../addon/communityhome/communityhome.php:34 ../../include/nav.php:62
-#: ../../boot.php:710
+#: ../../addon/communityhome/communityhome.php:34
+#: ../../addon/communityhome/twillingham/communityhome.php:28
+#: ../../addon/communityhome/twillingham/communityhome.php:34
+#: ../../include/nav.php:62 ../../boot.php:710
 msgid "Login"
 msgstr ""
 
 #: ../../addon/communityhome/communityhome.php:29
+#: ../../addon/communityhome/twillingham/communityhome.php:29
 msgid "OpenID"
 msgstr ""
 
@@ -3871,6 +4035,7 @@ msgid "Last users"
 msgstr ""
 
 #: ../../addon/communityhome/communityhome.php:81
+#: ../../addon/communityhome/twillingham/communityhome.php:81
 msgid "Most active users"
 msgstr ""
 
@@ -3882,11 +4047,15 @@ msgstr ""
 msgid "Last likes"
 msgstr ""
 
-#: ../../addon/communityhome/communityhome.php:155
+#: ../../addon/communityhome/communityhome.php:155 ../../include/text.php:1224
 #: ../../include/conversation.php:45 ../../include/conversation.php:118
 msgid "event"
 msgstr ""
 
+#: ../../addon/communityhome/twillingham/communityhome.php:38
+msgid "Latest users"
+msgstr ""
+
 #: ../../addon/uhremotestorage/uhremotestorage.php:84
 #, php-format
 msgid ""
@@ -3973,6 +4142,30 @@ msgstr ""
 msgid "Enable Randplace Plugin"
 msgstr ""
 
+#: ../../addon/dwpost/dwpost.php:38
+msgid "Post to Dreamwidth"
+msgstr ""
+
+#: ../../addon/dwpost/dwpost.php:69
+msgid "Dreamwidth Post Settings"
+msgstr ""
+
+#: ../../addon/dwpost/dwpost.php:71
+msgid "Enable dreamwidth Post Plugin"
+msgstr ""
+
+#: ../../addon/dwpost/dwpost.php:76
+msgid "dreamwidth username"
+msgstr ""
+
+#: ../../addon/dwpost/dwpost.php:81
+msgid "dreamwidth password"
+msgstr ""
+
+#: ../../addon/dwpost/dwpost.php:86
+msgid "Post to dreamwidth by default"
+msgstr ""
+
 #: ../../addon/drpost/drpost.php:35
 msgid "Post to Drupal"
 msgstr ""
@@ -4151,10 +4344,16 @@ msgid "Quick Comment Settings"
 msgstr ""
 
 #: ../../addon/qcomment/qcomment.php:56
+msgid ""
+"Quick comments are found near comment boxes, sometimes hidden. Click them to "
+"provide simple replies."
+msgstr ""
+
+#: ../../addon/qcomment/qcomment.php:57
 msgid "Enter quick comments, one per line"
 msgstr ""
 
-#: ../../addon/qcomment/qcomment.php:74
+#: ../../addon/qcomment/qcomment.php:75
 msgid "Quick Comment settings saved."
 msgstr ""
 
@@ -4357,6 +4556,29 @@ msgstr ""
 msgid "How many contacts to display on profile sidebar"
 msgstr ""
 
+#: ../../addon/gnot/gnot.php:48
+msgid "Gnot settings updated."
+msgstr ""
+
+#: ../../addon/gnot/gnot.php:79
+msgid "Gnot Settings"
+msgstr ""
+
+#: ../../addon/gnot/gnot.php:81
+msgid ""
+"Allows threading of email comment notifications on Gmail and anonymising the "
+"subject line."
+msgstr ""
+
+#: ../../addon/gnot/gnot.php:82
+msgid "Enable this plugin/addon?"
+msgstr ""
+
+#: ../../addon/gnot/gnot.php:97
+#, php-format
+msgid "[Friendica:Notify] Comment to conversation #%d"
+msgstr ""
+
 #: ../../addon/wppost/wppost.php:42
 msgid "Post to Wordpress"
 msgstr ""
@@ -4507,6 +4729,10 @@ msgstr ""
 msgid "Consumer secret"
 msgstr ""
 
+#: ../../addon/irc/irc.php:20
+msgid "irc Chatroom"
+msgstr ""
+
 #: ../../addon/posterous/posterous.php:36
 msgid "Post to Posterous"
 msgstr ""
@@ -4531,6 +4757,22 @@ msgstr ""
 msgid "Post to Posterous by default"
 msgstr ""
 
+#: ../../view/theme/quattro/theme.php:17
+msgid "Theme settings"
+msgstr ""
+
+#: ../../view/theme/quattro/theme.php:18
+msgid "Alignment"
+msgstr ""
+
+#: ../../view/theme/quattro/theme.php:18
+msgid "Left"
+msgstr ""
+
+#: ../../view/theme/quattro/theme.php:18
+msgid "Center"
+msgstr ""
+
 #: ../../include/profile_advanced.php:17 ../../boot.php:982
 msgid "Gender:"
 msgstr ""
@@ -4892,142 +5134,154 @@ msgstr ""
 msgid "Ask me"
 msgstr ""
 
-#: ../../include/event.php:17 ../../include/bb2diaspora.php:274
+#: ../../include/event.php:17 ../../include/bb2diaspora.php:244
 msgid "Starts:"
 msgstr ""
 
-#: ../../include/event.php:27 ../../include/bb2diaspora.php:282
+#: ../../include/event.php:27 ../../include/bb2diaspora.php:252
 msgid "Finishes:"
 msgstr ""
 
-#: ../../include/delivery.php:424 ../../include/notifier.php:637
+#: ../../include/delivery.php:425 ../../include/notifier.php:638
 msgid "(no subject)"
 msgstr ""
 
-#: ../../include/delivery.php:431 ../../include/enotify.php:16
-#: ../../include/notifier.php:644
+#: ../../include/delivery.php:432 ../../include/enotify.php:17
+#: ../../include/notifier.php:645
 msgid "noreply"
 msgstr ""
 
-#: ../../include/text.php:232
+#: ../../include/text.php:238
 msgid "prev"
 msgstr ""
 
-#: ../../include/text.php:234
+#: ../../include/text.php:240
 msgid "first"
 msgstr ""
 
-#: ../../include/text.php:263
+#: ../../include/text.php:269
 msgid "last"
 msgstr ""
 
-#: ../../include/text.php:266
+#: ../../include/text.php:272
 msgid "next"
 msgstr ""
 
-#: ../../include/text.php:557
+#: ../../include/text.php:563
 msgid "No contacts"
 msgstr ""
 
-#: ../../include/text.php:566
+#: ../../include/text.php:572
 #, php-format
 msgid "%d Contact"
 msgid_plural "%d Contacts"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../include/text.php:637 ../../include/nav.php:87
+#: ../../include/text.php:643 ../../include/nav.php:87
 msgid "Search"
 msgstr ""
 
-#: ../../include/text.php:813
+#: ../../include/text.php:831
 msgid "Monday"
 msgstr ""
 
-#: ../../include/text.php:813
+#: ../../include/text.php:831
 msgid "Tuesday"
 msgstr ""
 
-#: ../../include/text.php:813
+#: ../../include/text.php:831
 msgid "Wednesday"
 msgstr ""
 
-#: ../../include/text.php:813
+#: ../../include/text.php:831
 msgid "Thursday"
 msgstr ""
 
-#: ../../include/text.php:813
+#: ../../include/text.php:831
 msgid "Friday"
 msgstr ""
 
-#: ../../include/text.php:813
+#: ../../include/text.php:831
 msgid "Saturday"
 msgstr ""
 
-#: ../../include/text.php:813
+#: ../../include/text.php:831
 msgid "Sunday"
 msgstr ""
 
-#: ../../include/text.php:817
+#: ../../include/text.php:835
 msgid "January"
 msgstr ""
 
-#: ../../include/text.php:817
+#: ../../include/text.php:835
 msgid "February"
 msgstr ""
 
-#: ../../include/text.php:817
+#: ../../include/text.php:835
 msgid "March"
 msgstr ""
 
-#: ../../include/text.php:817
+#: ../../include/text.php:835
 msgid "April"
 msgstr ""
 
-#: ../../include/text.php:817
+#: ../../include/text.php:835
 msgid "May"
 msgstr ""
 
-#: ../../include/text.php:817
+#: ../../include/text.php:835
 msgid "June"
 msgstr ""
 
-#: ../../include/text.php:817
+#: ../../include/text.php:835
 msgid "July"
 msgstr ""
 
-#: ../../include/text.php:817
+#: ../../include/text.php:835
 msgid "August"
 msgstr ""
 
-#: ../../include/text.php:817
+#: ../../include/text.php:835
 msgid "September"
 msgstr ""
 
-#: ../../include/text.php:817
+#: ../../include/text.php:835
 msgid "October"
 msgstr ""
 
-#: ../../include/text.php:817
+#: ../../include/text.php:835
 msgid "November"
 msgstr ""
 
-#: ../../include/text.php:817
+#: ../../include/text.php:835
 msgid "December"
 msgstr ""
 
-#: ../../include/text.php:887
+#: ../../include/text.php:905
 msgid "bytes"
 msgstr ""
 
-#: ../../include/text.php:982
+#: ../../include/text.php:1000
 msgid "Select an alternate language"
 msgstr ""
 
-#: ../../include/text.php:994
+#: ../../include/text.php:1012
 msgid "default"
 msgstr ""
 
+#: ../../include/text.php:1228
+msgid "activity"
+msgstr ""
+
+#: ../../include/text.php:1230
+msgid "comment"
+msgstr ""
+
+#: ../../include/text.php:1231
+msgid "post"
+msgstr ""
+
 #: ../../include/diaspora.php:570
 msgid "Sharing notification from Diaspora network"
 msgstr ""
@@ -5041,6 +5295,10 @@ msgstr ""
 msgid "[Relayed] Comment authored by %s from network %s"
 msgstr ""
 
+#: ../../include/network.php:814
+msgid "view full size"
+msgstr ""
+
 #: ../../include/oembed.php:128
 msgid "Embedded content"
 msgstr ""
@@ -5336,7 +5594,7 @@ msgstr ""
 msgid "%1$d %2$s ago"
 msgstr ""
 
-#: ../../include/poller.php:474
+#: ../../include/poller.php:513
 msgid "From: "
 msgstr ""
 
@@ -5357,15 +5615,15 @@ msgstr ""
 msgid "[no subject]"
 msgstr ""
 
-#: ../../include/acl_selectors.php:279
+#: ../../include/acl_selectors.php:284
 msgid "Visible to everybody"
 msgstr ""
 
-#: ../../include/acl_selectors.php:280
+#: ../../include/acl_selectors.php:285
 msgid "show"
 msgstr ""
 
-#: ../../include/acl_selectors.php:281
+#: ../../include/acl_selectors.php:286
 msgid "don't show"
 msgstr ""
 
@@ -5382,172 +5640,191 @@ msgstr ""
 msgid "%s Administrator"
 msgstr ""
 
-#: ../../include/enotify.php:28
+#: ../../include/enotify.php:29
+#, php-format
+msgid "%s <!item_type!>"
+msgstr ""
+
+#: ../../include/enotify.php:33
 #, php-format
-msgid "New mail received at %s"
+msgid "[Friendica:Notify] New mail received at %s"
 msgstr ""
 
-#: ../../include/enotify.php:30
+#: ../../include/enotify.php:35
 #, php-format
 msgid "%s sent you a new private message at %s."
 msgstr ""
 
-#: ../../include/enotify.php:31
+#: ../../include/enotify.php:36
 #, php-format
 msgid "%s sent you %s."
 msgstr ""
 
-#: ../../include/enotify.php:31
+#: ../../include/enotify.php:36
 msgid "a private message"
 msgstr ""
 
-#: ../../include/enotify.php:32
+#: ../../include/enotify.php:37
 #, php-format
 msgid "Please visit %s to view and/or reply to your private messages."
 msgstr ""
 
-#: ../../include/enotify.php:40
+#: ../../include/enotify.php:67
+#, php-format
+msgid "%s's"
+msgstr ""
+
+#: ../../include/enotify.php:71
+msgid "your"
+msgstr ""
+
+#: ../../include/enotify.php:78
 #, php-format
-msgid "%s commented on an item at %s"
+msgid "[Friendica:Notify] Comment to conversation #%d by %s"
 msgstr ""
 
-#: ../../include/enotify.php:41
+#: ../../include/enotify.php:79
 #, php-format
 msgid "%s commented on an item/conversation you have been following."
 msgstr ""
 
-#: ../../include/enotify.php:42
+#: ../../include/enotify.php:80
 #, php-format
-msgid "%s commented in %s."
+msgid "%s commented on %s."
 msgstr ""
 
-#: ../../include/enotify.php:42
-msgid "a watched conversation"
+#: ../../include/enotify.php:82 ../../include/enotify.php:95
+#: ../../include/enotify.php:106 ../../include/enotify.php:117
+#, php-format
+msgid "Please visit %s to view and/or reply to the conversation."
 msgstr ""
 
-#: ../../include/enotify.php:44 ../../include/enotify.php:54
-#: ../../include/enotify.php:64 ../../include/enotify.php:74
+#: ../../include/enotify.php:89
 #, php-format
-msgid "Please visit %s to view and/or reply to the conversation."
+msgid "[Friendica:Notify] %s posted to your profile wall"
 msgstr ""
 
-#: ../../include/enotify.php:51
+#: ../../include/enotify.php:91
 #, php-format
 msgid "%s posted to your profile wall at %s"
 msgstr ""
 
-#: ../../include/enotify.php:52
+#: ../../include/enotify.php:93
 #, php-format
 msgid "%s posted to %s"
 msgstr ""
 
-#: ../../include/enotify.php:52
+#: ../../include/enotify.php:93
 msgid "your profile wall."
 msgstr ""
 
-#: ../../include/enotify.php:61
+#: ../../include/enotify.php:102
+#, php-format
+msgid "[Friendica:Notify] %s tagged you"
+msgstr ""
+
+#: ../../include/enotify.php:103
 #, php-format
 msgid "%s tagged you at %s"
 msgstr ""
 
-#: ../../include/enotify.php:62
+#: ../../include/enotify.php:104
 #, php-format
 msgid "%s %s."
 msgstr ""
 
-#: ../../include/enotify.php:62
+#: ../../include/enotify.php:104
 msgid "tagged you"
 msgstr ""
 
-#: ../../include/enotify.php:71
+#: ../../include/enotify.php:113
+#, php-format
+msgid "[Friendica:Notify] %s tagged your post"
+msgstr ""
+
+#: ../../include/enotify.php:114
 #, php-format
 msgid "%s tagged your post at %s"
 msgstr ""
 
-#: ../../include/enotify.php:72
+#: ../../include/enotify.php:115
 #, php-format
 msgid "%s tagged %s"
 msgstr ""
 
-#: ../../include/enotify.php:72
+#: ../../include/enotify.php:115
 msgid "your post"
 msgstr ""
 
-#: ../../include/enotify.php:81
-#, php-format
-msgid "Introduction received at %s"
+#: ../../include/enotify.php:124
+msgid "[Friendica:Notify] Introduction received"
 msgstr ""
 
-#: ../../include/enotify.php:82
+#: ../../include/enotify.php:125
 #, php-format
 msgid "You've received an introduction from '%s' at %s"
 msgstr ""
 
-#: ../../include/enotify.php:83
+#: ../../include/enotify.php:126
 #, php-format
 msgid "You've received %s from %s."
 msgstr ""
 
-#: ../../include/enotify.php:83
+#: ../../include/enotify.php:126
 msgid "an introduction"
 msgstr ""
 
-#: ../../include/enotify.php:84 ../../include/enotify.php:101
+#: ../../include/enotify.php:127 ../../include/enotify.php:144
 #, php-format
 msgid "You may visit their profile at %s"
 msgstr ""
 
-#: ../../include/enotify.php:86
+#: ../../include/enotify.php:129
 #, php-format
 msgid "Please visit %s to approve or reject the introduction."
 msgstr ""
 
-#: ../../include/enotify.php:93
-#, php-format
-msgid "Friend suggestion received at %s"
+#: ../../include/enotify.php:136
+msgid "[Friendica:Notify] Friend suggestion received"
 msgstr ""
 
-#: ../../include/enotify.php:94
+#: ../../include/enotify.php:137
 #, php-format
 msgid "You've received a friend suggestion from '%s' at %s"
 msgstr ""
 
-#: ../../include/enotify.php:95
+#: ../../include/enotify.php:138
 #, php-format
 msgid "You've received %s for %s from %s."
 msgstr ""
 
-#: ../../include/enotify.php:96
+#: ../../include/enotify.php:139
 msgid "a friend suggestion"
 msgstr ""
 
-#: ../../include/enotify.php:99
+#: ../../include/enotify.php:142
 msgid "Name:"
 msgstr ""
 
-#: ../../include/enotify.php:100
+#: ../../include/enotify.php:143
 msgid "Photo:"
 msgstr ""
 
-#: ../../include/enotify.php:103
+#: ../../include/enotify.php:146
 #, php-format
 msgid "Please visit %s to approve or reject the suggestion."
 msgstr ""
 
-#: ../../include/items.php:2511
+#: ../../include/items.php:2573
 msgid "A new person is sharing with you at "
 msgstr ""
 
-#: ../../include/items.php:2511
+#: ../../include/items.php:2573
 msgid "You have a new follower at "
 msgstr ""
 
-#: ../../include/bb2diaspora.php:83
-msgid "view full size"
-msgstr ""
-
-#: ../../include/bb2diaspora.php:132 ../../include/bb2diaspora.php:142
-#: ../../include/bb2diaspora.php:143
+#: ../../include/bb2diaspora.php:102 ../../include/bb2diaspora.php:112
+#: ../../include/bb2diaspora.php:113
 msgid "image/photo"
 msgstr ""
 
@@ -5563,25 +5840,25 @@ msgstr ""
 msgid "Welcome back "
 msgstr ""
 
-#: ../../include/Contact.php:131 ../../include/conversation.php:769
+#: ../../include/Contact.php:131 ../../include/conversation.php:788
 msgid "View status"
 msgstr ""
 
-#: ../../include/Contact.php:132 ../../include/conversation.php:770
+#: ../../include/Contact.php:132 ../../include/conversation.php:789
 msgid "View profile"
 msgstr ""
 
-#: ../../include/Contact.php:133 ../../include/conversation.php:771
+#: ../../include/Contact.php:133 ../../include/conversation.php:790
 msgid "View photos"
 msgstr ""
 
 #: ../../include/Contact.php:134 ../../include/Contact.php:147
-#: ../../include/conversation.php:772
+#: ../../include/conversation.php:791
 msgid "View recent"
 msgstr ""
 
 #: ../../include/Contact.php:136 ../../include/Contact.php:147
-#: ../../include/conversation.php:774
+#: ../../include/conversation.php:793
 msgid "Send PM"
 msgstr ""
 
@@ -5594,188 +5871,188 @@ msgstr ""
 msgid "%1$s marked %2$s's %3$s as favorite"
 msgstr ""
 
-#: ../../include/conversation.php:301 ../../include/conversation.php:562
+#: ../../include/conversation.php:303 ../../include/conversation.php:572
 msgid "Select"
 msgstr ""
 
-#: ../../include/conversation.php:316 ../../include/conversation.php:648
-#: ../../include/conversation.php:649
+#: ../../include/conversation.php:320 ../../include/conversation.php:665
+#: ../../include/conversation.php:666
 #, php-format
 msgid "View %s's profile @ %s"
 msgstr ""
 
-#: ../../include/conversation.php:325 ../../include/conversation.php:660
+#: ../../include/conversation.php:330 ../../include/conversation.php:677
 #, php-format
 msgid "%s from %s"
 msgstr ""
 
-#: ../../include/conversation.php:341
+#: ../../include/conversation.php:346
 msgid "View in context"
 msgstr ""
 
-#: ../../include/conversation.php:456
+#: ../../include/conversation.php:467
 #, php-format
 msgid "%d comment"
 msgid_plural "%d comments"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../include/conversation.php:459 ../../boot.php:448
+#: ../../include/conversation.php:468 ../../boot.php:448
 msgid "show more"
 msgstr ""
 
-#: ../../include/conversation.php:519
+#: ../../include/conversation.php:529
 msgid "like"
 msgstr ""
 
-#: ../../include/conversation.php:520
+#: ../../include/conversation.php:530
 msgid "dislike"
 msgstr ""
 
-#: ../../include/conversation.php:522
+#: ../../include/conversation.php:532
 msgid "Share this"
 msgstr ""
 
-#: ../../include/conversation.php:522
+#: ../../include/conversation.php:532
 msgid "share"
 msgstr ""
 
-#: ../../include/conversation.php:572
+#: ../../include/conversation.php:582
 msgid "add star"
 msgstr ""
 
-#: ../../include/conversation.php:573
+#: ../../include/conversation.php:583
 msgid "remove star"
 msgstr ""
 
-#: ../../include/conversation.php:574
+#: ../../include/conversation.php:584
 msgid "toggle star status"
 msgstr ""
 
-#: ../../include/conversation.php:577
+#: ../../include/conversation.php:587
 msgid "starred"
 msgstr ""
 
-#: ../../include/conversation.php:578
+#: ../../include/conversation.php:588
 msgid "add tag"
 msgstr ""
 
-#: ../../include/conversation.php:650
+#: ../../include/conversation.php:667
 msgid "to"
 msgstr ""
 
-#: ../../include/conversation.php:651
+#: ../../include/conversation.php:668
 msgid "Wall-to-Wall"
 msgstr ""
 
-#: ../../include/conversation.php:652
+#: ../../include/conversation.php:669
 msgid "via Wall-To-Wall:"
 msgstr ""
 
-#: ../../include/conversation.php:694
+#: ../../include/conversation.php:713
 msgid "Delete Selected Items"
 msgstr ""
 
-#: ../../include/conversation.php:826
+#: ../../include/conversation.php:845
 #, php-format
 msgid "%s likes this."
 msgstr ""
 
-#: ../../include/conversation.php:826
+#: ../../include/conversation.php:845
 #, php-format
 msgid "%s doesn't like this."
 msgstr ""
 
-#: ../../include/conversation.php:830
+#: ../../include/conversation.php:849
 #, php-format
 msgid "<span  %1$s>%2$d people</span> like this."
 msgstr ""
 
-#: ../../include/conversation.php:832
+#: ../../include/conversation.php:851
 #, php-format
 msgid "<span  %1$s>%2$d people</span> don't like this."
 msgstr ""
 
-#: ../../include/conversation.php:838
+#: ../../include/conversation.php:857
 msgid "and"
 msgstr ""
 
-#: ../../include/conversation.php:841
+#: ../../include/conversation.php:860
 #, php-format
 msgid ", and %d other people"
 msgstr ""
 
-#: ../../include/conversation.php:842
+#: ../../include/conversation.php:861
 #, php-format
 msgid "%s like this."
 msgstr ""
 
-#: ../../include/conversation.php:842
+#: ../../include/conversation.php:861
 #, php-format
 msgid "%s don't like this."
 msgstr ""
 
-#: ../../include/conversation.php:867
+#: ../../include/conversation.php:886
 msgid "Visible to <strong>everybody</strong>"
 msgstr ""
 
-#: ../../include/conversation.php:869
+#: ../../include/conversation.php:888
 msgid "Please enter a video link/URL:"
 msgstr ""
 
-#: ../../include/conversation.php:870
+#: ../../include/conversation.php:889
 msgid "Please enter an audio link/URL:"
 msgstr ""
 
-#: ../../include/conversation.php:871
+#: ../../include/conversation.php:890
 msgid "Tag term:"
 msgstr ""
 
-#: ../../include/conversation.php:872
+#: ../../include/conversation.php:891
 msgid "Where are you right now?"
 msgstr ""
 
-#: ../../include/conversation.php:873
+#: ../../include/conversation.php:892
 msgid "Enter a title for this item"
 msgstr ""
 
-#: ../../include/conversation.php:916
+#: ../../include/conversation.php:935
 msgid "upload photo"
 msgstr ""
 
-#: ../../include/conversation.php:918
+#: ../../include/conversation.php:937
 msgid "attach file"
 msgstr ""
 
-#: ../../include/conversation.php:920
+#: ../../include/conversation.php:939
 msgid "web link"
 msgstr ""
 
-#: ../../include/conversation.php:921
+#: ../../include/conversation.php:940
 msgid "Insert video link"
 msgstr ""
 
-#: ../../include/conversation.php:922
+#: ../../include/conversation.php:941
 msgid "video link"
 msgstr ""
 
-#: ../../include/conversation.php:923
+#: ../../include/conversation.php:942
 msgid "Insert audio link"
 msgstr ""
 
-#: ../../include/conversation.php:924
+#: ../../include/conversation.php:943
 msgid "audio link"
 msgstr ""
 
-#: ../../include/conversation.php:926
+#: ../../include/conversation.php:945
 msgid "set location"
 msgstr ""
 
-#: ../../include/conversation.php:928
+#: ../../include/conversation.php:947
 msgid "clear location"
 msgstr ""
 
-#: ../../include/conversation.php:933
+#: ../../include/conversation.php:952
 msgid "permissions"
 msgstr ""
 
diff --git a/view/acl_selector.tpl b/view/acl_selector.tpl
index 3f8a9e7d2..655ea8980 100755..100644
--- a/view/acl_selector.tpl
+++ b/view/acl_selector.tpl
@@ -19,7 +19,7 @@ $(document).ready(function() {
 	if(typeof acl=="undefined"){
 		acl = new ACL(
 			baseurl+"/acl",
-			[$allowcid,$allowgid,$denycid,$denygid]
+			[ $allowcid,$allowgid,$denycid,$denygid ]
 		);
 	}
 });
diff --git a/view/admin_plugins_details.tpl b/view/admin_plugins_details.tpl
index d7147b20b..ead356f5b 100755
--- a/view/admin_plugins_details.tpl
+++ b/view/admin_plugins_details.tpl
@@ -4,13 +4,18 @@
 	<p><span class='toggleplugin icon $status'></span> $info.name - $info.version : <a href="$baseurl/admin/$function/$plugin/?a=t">$action</a></p>
 	<p>$info.description</p>
 	
-	<p class="author">
+	<p class="author">$str_author
 	{{ for $info.author as $a }}
 		{{ if $a.link }}<a href="$a.link">$a.name</a>{{ else }}$a.name{{ endif }},
 	{{ endfor }}
 	</p>
-	
 
+	<p class="maintainer">$str_maintainer
+	{{ for $info.maintainer as $a }}
+		{{ if $a.link }}<a href="$a.link">$a.name</a>{{ else }}$a.name{{ endif }},
+	{{ endfor }}
+	</p>
+	
 	{{ if $admin_form }}
 	<h3>$settings</h3>
 	<form method="post" action="$baseurl/admin/$function/$plugin/">
diff --git a/view/admin_summary.tpl b/view/admin_summary.tpl
index 59428986a..eed71fbe0 100755
--- a/view/admin_summary.tpl
+++ b/view/admin_summary.tpl
@@ -13,7 +13,7 @@
 	{{ for $accounts as $p }}
 		<dl>
 			<dt>$p.0</dt>
-			<dd>$p.1</dd>
+			<dd>{{ if $p.1 }}$p.1{{ else }}0{{ endif }}</dd>
 		</dl>
 	{{ endfor }}
 
diff --git a/view/ca/cmnt_received_eml.tpl b/view/ca/cmnt_received_eml.tpl
new file mode 100755
index 000000000..ca61ca492
--- /dev/null
+++ b/view/ca/cmnt_received_eml.tpl
@@ -0,0 +1,18 @@
+
+Apreciat/da $username,
+
+	'$from' ha comentat un element/conversació que estàs seguint.
+
+-----
+$body
+-----
+
+Accedeix a $siteurl per a veure la conversa completa:
+
+$display
+
+
+	$sitename
+
+ 
+
diff --git a/view/ca/follow_notify_eml.tpl b/view/ca/follow_notify_eml.tpl
new file mode 100755
index 000000000..ab5a4b371
--- /dev/null
+++ b/view/ca/follow_notify_eml.tpl
@@ -0,0 +1,13 @@
+
+Apreciat/da $myname,
+
+Tens un nou seguidor en $sitename -  '$requestor'.
+
+Pots visitar el seu perfil en $url.
+
+Iniciï sessió en el seu lloc per a aprovar o rebutjar/cancelar la sol·licitud.
+
+$siteurl
+
+
+	$sitename 
diff --git a/view/ca/friend_complete_eml.tpl b/view/ca/friend_complete_eml.tpl
new file mode 100755
index 000000000..539d9ff3d
--- /dev/null
+++ b/view/ca/friend_complete_eml.tpl
@@ -0,0 +1,19 @@
+
+Apreciat/da $username,
+
+	Grans noticies... '$fn' a '$dfrn_url' ha acceptat la teva sol·licitud de connexió en '$sitename'.
+
+Ara sous amics mutus i podreu intercanviar actualizacions de estatus, fotos, i correu electrónic
+sense cap restricció.
+
+Visita la teva pàgina de 'Contactes' en $sitename si desitja realizar qualsevol canvi en aquesta relació.
+
+$siteurl
+
+[Per exemple, pots crear un perfil independent amb informació que no esta disponible al públic en general 
+- i assignar drets de visualització a '$fn'].
+
+
+	$sitename
+
+ 
diff --git a/view/ca/htconfig.tpl b/view/ca/htconfig.tpl
new file mode 100755
index 000000000..28446f3df
--- /dev/null
+++ b/view/ca/htconfig.tpl
@@ -0,0 +1,68 @@
+<?php
+
+// Set the following for your MySQL installation
+// Copy or rename this file to .htconfig.php
+
+$db_host = '$dbhost';
+$db_user = '$dbuser';
+$db_pass = '$dbpass';
+$db_data = '$dbdata';
+
+// If you are using a subdirectory of your domain you will need to put the
+// relative path (from the root of your domain) here.
+// For instance if your URL is 'http://example.com/directory/subdirectory',
+// set $a->path to 'directory/subdirectory'. 
+
+$a->path = '$urlpath';
+ 
+// Choose a legal default timezone. If you are unsure, use "America/Los_Angeles".
+// It can be changed later and only applies to timestamps for anonymous viewers.
+
+$default_timezone = '$timezone';
+
+// What is your site name?
+
+$a->config['sitename'] = "La Meva Xarxa d'Amics";
+
+// Your choices are REGISTER_OPEN, REGISTER_APPROVE, or REGISTER_CLOSED.
+// Be certain to create your own personal account before setting 
+// REGISTER_CLOSED. 'register_text' (if set) will be displayed prominently on 
+// the registration page. REGISTER_APPROVE requires you set 'admin_email'
+// to the email address of an already registered person who can authorise
+// and/or approve/deny the request.
+
+$a->config['register_policy'] = REGISTER_OPEN;
+$a->config['register_text'] = '';
+$a->config['admin_email'] = '$adminmail';
+
+// Maximum size of an imported message, 0 is unlimited
+
+$a->config['max_import_size'] = 200000;
+
+// maximum size of uploaded photos
+
+$a->config['system']['maximagesize'] = 800000;
+
+// Location of PHP command line processor
+
+$a->config['php_path'] = '$phpath';
+
+// Location of global directory submission page.
+
+$a->config['system']['directory_submit_url'] = 'http://dir.friendika.com/submit';
+$a->config['system']['directory_search_url'] = 'http://dir.friendika.com/directory?search=';
+
+// PuSH - aka pubsubhubbub URL. This makes delivery of public posts as fast as private posts
+
+$a->config['system']['huburl'] = 'http://pubsubhubbub.appspot.com';
+
+// Server-to-server private message encryption (RINO) is allowed by default. 
+// Encryption will only be provided if this setting is true and the
+// PHP mcrypt extension is installed on both systems 
+
+$a->config['system']['rino_encrypt'] = true;
+
+// default system theme
+
+$a->config['system']['theme'] = 'duepuntozero';
+
diff --git a/view/ca/intro_complete_eml.tpl b/view/ca/intro_complete_eml.tpl
new file mode 100755
index 000000000..70507d71d
--- /dev/null
+++ b/view/ca/intro_complete_eml.tpl
@@ -0,0 +1,21 @@
+
+Apreciat/da $username,
+
+	'$fn' en '$dfrn_url' ha acceptat la teva petició
+connexió a '$sitename'.
+
+	'$fn' ha optat per acceptar-te com a "fan", que restringeix certes 
+formes de comunicació, com missatges privats i algunes interaccions 
+amb el perfil. Si ets una "celebritat" o una pàgina de comunitat, 
+aquests ajustos s'aplican automàticament 
+
+	'$fn' pot optar per extendre aixó en una relació més permisiva
+en el futur.
+
+	Començaràs a rebre les actualizacions públiques de estatus de '$fn', 
+que apareixeran a la teva pàgina "Xarxa" en
+
+$siteurl
+
+
+	$sitename
diff --git a/view/ca/lostpass_eml.tpl b/view/ca/lostpass_eml.tpl
new file mode 100755
index 000000000..eccf2050a
--- /dev/null
+++ b/view/ca/lostpass_eml.tpl
@@ -0,0 +1,35 @@
+
+Apreciat/da $username,
+	
+	S'ha rebut una sol·licitud en $sitename recentment per restablir
+la teva contrasenya. Per confirmar aquesta sol·licitud, per favor seleccioni l'enllaç de
+verificació sota o copia-ho i pega-ho en la barra d'adreces del teu navegador.
+
+Si NO has sol·licitat aquest canvi, per favor NO segueixis l'enllaç indicat i ignora
+i/o elimina aquest missatge.
+
+La teva contrasenya no es canviarà tret que puguem verificar que ets la teva qui
+va emetre aquesta sol·licitud.
+
+Segueix aquest enllaç per verificar la teva identitat:
+
+$reset_link
+
+A continuació rebràs un missatge amb la nova contrasenya.
+
+Després de accedir, podràs canviar la contrasenya del teu compte a la pàgina de
+configuració.
+
+Les dades d'accés són els següents:
+
+
+Lloc:	$siteurl
+Nom:	$email
+
+
+
+
+Salutacions,
+	L'administració de $sitename
+
+ 
diff --git a/view/ca/mail_received_html_body_eml.tpl b/view/ca/mail_received_html_body_eml.tpl
new file mode 100755
index 000000000..64eee0bf1
--- /dev/null
+++ b/view/ca/mail_received_html_body_eml.tpl
@@ -0,0 +1,24 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN">
+<html>
+<head>
+	<title>Mensaje de Friendica</title>
+	<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
+</head>
+<body>
+<table style="border:1px solid #ccc">
+	<tbody>
+	<tr><td colspan="2" style="background:#3b5998; color:#FFFFFF; font-weight:bold; font-family:'lucida grande', tahoma, verdana,arial, sans-serif; padding: 4px 8px; vertical-align: middle; font-size:16px; letter-spacing: -0.03em; text-align: left;"><img style="width:32px;height:32px;" src='$siteurl/images/friendika-32.png'><span style="padding:7px;">Friendica</span></td></tr>
+
+	<tr><td style="padding-top:22px;" colspan="2">Has rebut un nou missatge privat de '$from' en $siteName.</td></tr>
+
+
+	<tr><td style="padding-left:22px;padding-top:22px;width:60px;" valign="top" rowspan=3><a href="$url"><img style="border:0px;width:48px;height:48px;" src="$thumb"></a></td>
+		<td style="padding-top:22px;"><a href="$url">$from</a></td></tr>
+	<tr><td style="font-weight:bold;padding-bottom:5px;">$title</td></tr>
+	<tr><td style="padding-right:22px;">$htmlversion</td></tr>
+	<tr><td style="padding-top:11px;padding-bottom:11px;" colspan="2">Accedeix a <a href="$siteurl">$siteurl</a> per a llegir i respondre als teus missatges privats.</td></tr>
+	<tr><td></td><td>$siteName</td></tr>
+	</tbody>
+</table>
+</body>
+</html>
diff --git a/view/ca/mail_received_text_body_eml.tpl b/view/ca/mail_received_text_body_eml.tpl
new file mode 100755
index 000000000..b343c4e6d
--- /dev/null
+++ b/view/ca/mail_received_text_body_eml.tpl
@@ -0,0 +1,9 @@
+Has rebut un nou missatge privat de '$from' en $siteName.
+	
+$title
+
+$textversion
+				
+Accedeix a $siteurl per a llegir i respondre als teus missatges privats.
+
+	$siteName
diff --git a/view/ca/messages.po b/view/ca/messages.po
new file mode 100755
index 000000000..8463ceb12
--- /dev/null
+++ b/view/ca/messages.po
@@ -0,0 +1,6127 @@
+# FRIENDICA Distributed Social Network
+# Copyright (C) 2010, 2011 the Friendica Project
+# This file is distributed under the same license as the Friendica package.
+# 
+# Translators:
+# Rafael GARAU ESPINÓS <transifex@macadamia.es>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: http://bugs.friendica.com/\n"
+"POT-Creation-Date: 2012-03-06 15:09-0800\n"
+"PO-Revision-Date: 2012-03-08 21:58+0000\n"
+"Last-Translator: Rafael GARAU ESPINÓS <transifex@macadamia.es>\n"
+"Language-Team: Catalan (http://www.transifex.net/projects/p/friendica/language/ca/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ca\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: ../../mod/oexchange.php:25
+msgid "Post successful."
+msgstr "Publicat amb éxit."
+
+#: ../../mod/update_notes.php:41 ../../mod/update_community.php:18
+#: ../../mod/update_network.php:22 ../../mod/update_profile.php:41
+msgid "[Embedded content - reload page to view]"
+msgstr "[Contingut embegut - recarrega la pàgina per a veure-ho]"
+
+#: ../../mod/crepair.php:102
+msgid "Contact settings applied."
+msgstr "Ajustos de Contacte aplicats."
+
+#: ../../mod/crepair.php:104
+msgid "Contact update failed."
+msgstr "Fracassà l'actualització de Contacte"
+
+#: ../../mod/crepair.php:115 ../../mod/wall_attach.php:43
+#: ../../mod/fsuggest.php:78 ../../mod/events.php:110 ../../mod/api.php:26
+#: ../../mod/api.php:31 ../../mod/photos.php:129 ../../mod/photos.php:865
+#: ../../mod/editpost.php:10 ../../mod/install.php:171
+#: ../../mod/notifications.php:62 ../../mod/contacts.php:125
+#: ../../mod/settings.php:49 ../../mod/settings.php:411
+#: ../../mod/settings.php:416 ../../mod/manage.php:86 ../../mod/network.php:6
+#: ../../mod/notes.php:20 ../../mod/attach.php:33 ../../mod/group.php:19
+#: ../../mod/viewcontacts.php:22 ../../mod/register.php:36
+#: ../../mod/regmod.php:111 ../../mod/item.php:124 ../../mod/item.php:140
+#: ../../mod/profile_photo.php:19 ../../mod/profile_photo.php:137
+#: ../../mod/profile_photo.php:148 ../../mod/profile_photo.php:159
+#: ../../mod/message.php:9 ../../mod/message.php:46 ../../mod/allfriends.php:9
+#: ../../mod/wall_upload.php:42 ../../mod/follow.php:8 ../../mod/common.php:9
+#: ../../mod/display.php:133 ../../mod/profiles.php:7
+#: ../../mod/profiles.php:229 ../../mod/delegate.php:6
+#: ../../mod/suggest.php:28 ../../mod/invite.php:13 ../../mod/invite.php:81
+#: ../../mod/dfrn_confirm.php:53 ../../addon/facebook/facebook.php:332
+#: ../../include/items.php:3030 ../../index.php:288
+msgid "Permission denied."
+msgstr "Permís denegat."
+
+#: ../../mod/crepair.php:129 ../../mod/fsuggest.php:20
+#: ../../mod/fsuggest.php:92 ../../mod/dfrn_confirm.php:118
+msgid "Contact not found."
+msgstr "Contacte no trobat"
+
+#: ../../mod/crepair.php:135
+msgid "Repair Contact Settings"
+msgstr "Reposar els ajustos de Contacte"
+
+#: ../../mod/crepair.php:137
+msgid ""
+"<strong>WARNING: This is highly advanced</strong> and if you enter incorrect"
+" information your communications with this contact may stop working."
+msgstr "<strong>ADVERTÈNCIA: Això és molt avançat </strong> i si s'introdueix informació incorrecta la seva comunicació amb aquest contacte pot deixar de funcionar."
+
+#: ../../mod/crepair.php:138
+msgid ""
+"Please use your browser 'Back' button <strong>now</strong> if you are "
+"uncertain what to do on this page."
+msgstr "Si us plau, prem el botó 'Tornar' <strong>ara</strong> si no saps segur que has de fer aqui."
+
+#: ../../mod/crepair.php:144
+msgid "Return to contact editor"
+msgstr "Tornar al editor de contactes"
+
+#: ../../mod/crepair.php:148 ../../mod/settings.php:462
+#: ../../mod/settings.php:488 ../../mod/admin.php:484 ../../mod/admin.php:493
+msgid "Name"
+msgstr "Nom"
+
+#: ../../mod/crepair.php:149
+msgid "Account Nickname"
+msgstr "Malnom de Compte"
+
+#: ../../mod/crepair.php:150
+msgid "@Tagname - overrides Name/Nickname"
+msgstr "@Tagname - té prel·lació sobre Nom/Malnom"
+
+#: ../../mod/crepair.php:151
+msgid "Account URL"
+msgstr "Adreça URL del Compte"
+
+#: ../../mod/crepair.php:152
+msgid "Friend Request URL"
+msgstr "Adreça URL de sol·licitud d'Amistat"
+
+#: ../../mod/crepair.php:153
+msgid "Friend Confirm URL"
+msgstr "Adreça URL de confirmació d'Amic"
+
+#: ../../mod/crepair.php:154
+msgid "Notification Endpoint URL"
+msgstr "Adreça URL de Notificació"
+
+#: ../../mod/crepair.php:155
+msgid "Poll/Feed URL"
+msgstr "Adreça de Enquesta/Alimentador"
+
+#: ../../mod/crepair.php:156
+msgid "New photo from this URL"
+msgstr "Nova foto d'aquesta URL"
+
+#: ../../mod/crepair.php:166 ../../mod/fsuggest.php:107
+#: ../../mod/events.php:400 ../../mod/photos.php:900 ../../mod/photos.php:958
+#: ../../mod/photos.php:1182 ../../mod/photos.php:1222
+#: ../../mod/photos.php:1262 ../../mod/photos.php:1293
+#: ../../mod/install.php:251 ../../mod/install.php:289
+#: ../../mod/localtime.php:45 ../../mod/contacts.php:319
+#: ../../mod/settings.php:460 ../../mod/settings.php:603
+#: ../../mod/settings.php:797 ../../mod/manage.php:109 ../../mod/group.php:80
+#: ../../mod/admin.php:313 ../../mod/admin.php:481 ../../mod/admin.php:609
+#: ../../mod/admin.php:776 ../../mod/admin.php:856 ../../mod/profiles.php:375
+#: ../../mod/invite.php:106 ../../addon/facebook/facebook.php:411
+#: ../../addon/yourls/yourls.php:76 ../../addon/ljpost/ljpost.php:92
+#: ../../addon/nsfw/nsfw.php:57
+#: ../../addon/uhremotestorage/uhremotestorage.php:89
+#: ../../addon/randplace/randplace.php:179 ../../addon/dwpost/dwpost.php:92
+#: ../../addon/drpost/drpost.php:110 ../../addon/geonames/geonames.php:187
+#: ../../addon/oembed.old/oembed.php:41 ../../addon/impressum/impressum.php:69
+#: ../../addon/blockem/blockem.php:57 ../../addon/qcomment/qcomment.php:61
+#: ../../addon/openstreetmap/openstreetmap.php:70
+#: ../../addon/editplain/editplain.php:84 ../../addon/blackout/blackout.php:94
+#: ../../addon/pageheader/pageheader.php:52
+#: ../../addon/statusnet/statusnet.php:273
+#: ../../addon/statusnet/statusnet.php:287
+#: ../../addon/statusnet/statusnet.php:313
+#: ../../addon/statusnet/statusnet.php:320
+#: ../../addon/statusnet/statusnet.php:345
+#: ../../addon/statusnet/statusnet.php:532 ../../addon/tumblr/tumblr.php:90
+#: ../../addon/numfriends/numfriends.php:85 ../../addon/gnot/gnot.php:88
+#: ../../addon/wppost/wppost.php:102 ../../addon/showmore/showmore.php:48
+#: ../../addon/piwik/piwik.php:89 ../../addon/twitter/twitter.php:175
+#: ../../addon/twitter/twitter.php:201 ../../addon/twitter/twitter.php:355
+#: ../../addon/posterous/posterous.php:90
+#: ../../view/theme/quattro/theme.php:15 ../../include/conversation.php:552
+msgid "Submit"
+msgstr "Enviar"
+
+#: ../../mod/help.php:30
+msgid "Help:"
+msgstr "Ajuda:"
+
+#: ../../mod/help.php:34 ../../include/nav.php:82
+msgid "Help"
+msgstr "Ajuda"
+
+#: ../../mod/help.php:38 ../../index.php:221
+msgid "Not Found"
+msgstr "No trobat"
+
+#: ../../mod/help.php:41 ../../index.php:224
+msgid "Page not found."
+msgstr "Pàgina no trobada."
+
+#: ../../mod/wall_attach.php:57
+#, php-format
+msgid "File exceeds size limit of %d"
+msgstr "L'arxiu excedeix la mida límit de %d"
+
+#: ../../mod/wall_attach.php:85 ../../mod/wall_attach.php:96
+msgid "File upload failed."
+msgstr "La càrrega de fitxers ha fallat."
+
+#: ../../mod/fsuggest.php:63
+msgid "Friend suggestion sent."
+msgstr "Enviat suggeriment d'amic."
+
+#: ../../mod/fsuggest.php:97
+msgid "Suggest Friends"
+msgstr "Suggerir Amics"
+
+#: ../../mod/fsuggest.php:99
+#, php-format
+msgid "Suggest a friend for %s"
+msgstr "Suggerir una amic per a %s"
+
+#: ../../mod/events.php:62
+msgid "Event description and start time are required."
+msgstr "Es requereix descripció de l'esdeveniment i l'hora d'inici."
+
+#: ../../mod/events.php:230
+msgid "l, F j"
+msgstr "l, F j"
+
+#: ../../mod/events.php:252
+msgid "Edit event"
+msgstr "Editar esdeveniment"
+
+#: ../../mod/events.php:272 ../../include/text.php:982
+msgid "link to source"
+msgstr "Enllaç al origen"
+
+#: ../../mod/events.php:296 ../../include/nav.php:50 ../../boot.php:1349
+msgid "Events"
+msgstr "Esdeveniments"
+
+#: ../../mod/events.php:297
+msgid "Create New Event"
+msgstr "Crear un nou esdeveniment"
+
+#: ../../mod/events.php:298
+msgid "Previous"
+msgstr "Previ"
+
+#: ../../mod/events.php:299 ../../mod/install.php:210
+msgid "Next"
+msgstr "Proper"
+
+#: ../../mod/events.php:371
+msgid "hour:minute"
+msgstr "hora:minut"
+
+#: ../../mod/events.php:380
+msgid "Event details"
+msgstr "Detalls del esdeveniment"
+
+#: ../../mod/events.php:381
+#, php-format
+msgid "Format is %s %s. Starting date and Description are required."
+msgstr "El format és %s %s. Es requereix Data d'inici i Descripció."
+
+#: ../../mod/events.php:383
+msgid "Event Starts:"
+msgstr "Inici d'Esdeveniment:"
+
+#: ../../mod/events.php:386
+msgid "Finish date/time is not known or not relevant"
+msgstr "La data/hora de finalització no es coneixen o no són relevants"
+
+#: ../../mod/events.php:388
+msgid "Event Finishes:"
+msgstr "L'esdeveniment Finalitza:"
+
+#: ../../mod/events.php:391
+msgid "Adjust for viewer timezone"
+msgstr "Ajustar a la zona horaria de l'espectador"
+
+#: ../../mod/events.php:393
+msgid "Description:"
+msgstr "Descripció:"
+
+#: ../../mod/events.php:395 ../../include/event.php:37
+#: ../../include/bb2diaspora.php:260 ../../boot.php:980
+msgid "Location:"
+msgstr "Ubicació:"
+
+#: ../../mod/events.php:397
+msgid "Share this event"
+msgstr "Compartir aquest esdeveniment"
+
+#: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94
+#: ../../mod/dfrn_request.php:686 ../../mod/settings.php:461
+#: ../../mod/settings.php:487 ../../addon/js_upload/js_upload.php:45
+msgid "Cancel"
+msgstr "Cancel·lar"
+
+#: ../../mod/tagrm.php:41
+msgid "Tag removed"
+msgstr "Etiqueta eliminada"
+
+#: ../../mod/tagrm.php:79
+msgid "Remove Item Tag"
+msgstr "Esborrar etiqueta del element"
+
+#: ../../mod/tagrm.php:81
+msgid "Select a tag to remove: "
+msgstr "Selecciona etiqueta a esborrar:"
+
+#: ../../mod/tagrm.php:93 ../../mod/delegate.php:130
+msgid "Remove"
+msgstr "Esborrar"
+
+#: ../../mod/dfrn_poll.php:91 ../../mod/dfrn_poll.php:517
+#, php-format
+msgid "%s welcomes %s"
+msgstr "%s Benvingut %s"
+
+#: ../../mod/api.php:76 ../../mod/api.php:102
+msgid "Authorize application connection"
+msgstr "Autoritzi la connexió de aplicacions"
+
+#: ../../mod/api.php:77
+msgid "Return to your app and insert this Securty Code:"
+msgstr "Torni a la seva aplicació i inserti aquest Codi de Seguretat:"
+
+#: ../../mod/api.php:89
+msgid "Please login to continue."
+msgstr "Per favor, accedeixi per a continuar."
+
+#: ../../mod/api.php:104
+msgid ""
+"Do you want to authorize this application to access your posts and contacts,"
+" and/or create new posts for you?"
+msgstr "Vol autoritzar a aquesta aplicació per accedir als teus missatges i contactes, i/o crear nous enviaments per a vostè?"
+
+#: ../../mod/api.php:105 ../../mod/dfrn_request.php:676
+#: ../../mod/settings.php:692 ../../mod/settings.php:698
+#: ../../mod/settings.php:706 ../../mod/settings.php:710
+#: ../../mod/settings.php:715 ../../mod/settings.php:721
+#: ../../mod/settings.php:727 ../../mod/settings.php:787
+#: ../../mod/settings.php:788 ../../mod/settings.php:789
+#: ../../mod/settings.php:790 ../../mod/register.php:524
+#: ../../mod/profiles.php:357
+msgid "Yes"
+msgstr "Si"
+
+#: ../../mod/api.php:106 ../../mod/dfrn_request.php:677
+#: ../../mod/settings.php:692 ../../mod/settings.php:698
+#: ../../mod/settings.php:706 ../../mod/settings.php:710
+#: ../../mod/settings.php:715 ../../mod/settings.php:721
+#: ../../mod/settings.php:727 ../../mod/settings.php:787
+#: ../../mod/settings.php:788 ../../mod/settings.php:789
+#: ../../mod/settings.php:790 ../../mod/register.php:525
+#: ../../mod/profiles.php:358
+msgid "No"
+msgstr "No"
+
+#: ../../mod/photos.php:42
+msgid "Photo Albums"
+msgstr "Àlbum de Fotos"
+
+#: ../../mod/photos.php:50 ../../mod/photos.php:150 ../../mod/photos.php:879
+#: ../../mod/photos.php:950 ../../mod/photos.php:965 ../../mod/photos.php:1371
+#: ../../mod/photos.php:1383 ../../addon/communityhome/communityhome.php:110
+msgid "Contact Photos"
+msgstr "Fotos de Contacte"
+
+#: ../../mod/photos.php:57 ../../mod/photos.php:975 ../../mod/photos.php:1413
+msgid "Upload New Photos"
+msgstr "Actualitzar Noves Fotos"
+
+#: ../../mod/photos.php:68 ../../mod/settings.php:11
+msgid "everybody"
+msgstr "tothom"
+
+#: ../../mod/photos.php:139
+msgid "Contact information unavailable"
+msgstr "Informació del Contacte no disponible"
+
+#: ../../mod/photos.php:150 ../../mod/photos.php:597 ../../mod/photos.php:950
+#: ../../mod/photos.php:965 ../../mod/register.php:327
+#: ../../mod/register.php:334 ../../mod/register.php:341
+#: ../../mod/profile_photo.php:58 ../../mod/profile_photo.php:65
+#: ../../mod/profile_photo.php:72 ../../mod/profile_photo.php:170
+#: ../../mod/profile_photo.php:246 ../../mod/profile_photo.php:255
+#: ../../addon/communityhome/communityhome.php:111
+msgid "Profile Photos"
+msgstr "Fotos del Perfil"
+
+#: ../../mod/photos.php:160
+msgid "Album not found."
+msgstr "Àlbum no trobat."
+
+#: ../../mod/photos.php:178 ../../mod/photos.php:959
+msgid "Delete Album"
+msgstr "Eliminar Àlbum"
+
+#: ../../mod/photos.php:241 ../../mod/photos.php:1183
+msgid "Delete Photo"
+msgstr "Eliminar Foto"
+
+#: ../../mod/photos.php:528
+msgid "was tagged in a"
+msgstr "Fou etiquetat a un"
+
+#: ../../mod/photos.php:528 ../../mod/like.php:127 ../../mod/tagger.php:70
+#: ../../addon/communityhome/communityhome.php:163 ../../include/text.php:1226
+#: ../../include/diaspora.php:1600 ../../include/conversation.php:53
+#: ../../include/conversation.php:126
+msgid "photo"
+msgstr "foto"
+
+#: ../../mod/photos.php:528
+msgid "by"
+msgstr "per"
+
+#: ../../mod/photos.php:631 ../../addon/js_upload/js_upload.php:315
+msgid "Image exceeds size limit of "
+msgstr "La imatge excedeix el límit de "
+
+#: ../../mod/photos.php:639
+msgid "Image file is empty."
+msgstr "El fitxer de imatge és buit."
+
+#: ../../mod/photos.php:653 ../../mod/profile_photo.php:122
+#: ../../mod/wall_upload.php:65
+msgid "Unable to process image."
+msgstr "Incapaç de processar la imatge."
+
+#: ../../mod/photos.php:673 ../../mod/profile_photo.php:251
+#: ../../mod/wall_upload.php:84
+msgid "Image upload failed."
+msgstr "Actualització de la imatge fracassada."
+
+#: ../../mod/photos.php:759 ../../mod/community.php:16
+#: ../../mod/dfrn_request.php:625 ../../mod/viewcontacts.php:17
+#: ../../mod/display.php:7 ../../mod/search.php:71 ../../mod/directory.php:33
+msgid "Public access denied."
+msgstr "Accés públic denegat."
+
+#: ../../mod/photos.php:769
+msgid "No photos selected"
+msgstr "No s'han seleccionat fotos"
+
+#: ../../mod/photos.php:846
+msgid "Access to this item is restricted."
+msgstr "L'accés a aquest element està restringit."
+
+#: ../../mod/photos.php:907
+msgid "Upload Photos"
+msgstr "Carregar Fotos"
+
+#: ../../mod/photos.php:910 ../../mod/photos.php:954
+msgid "New album name: "
+msgstr "Nou nom d'àlbum:"
+
+#: ../../mod/photos.php:911
+msgid "or existing album name: "
+msgstr "o nom d'àlbum existent:"
+
+#: ../../mod/photos.php:912
+msgid "Do not show a status post for this upload"
+msgstr "No tornis a mostrar un missatge d'estat d'aquesta pujada"
+
+#: ../../mod/photos.php:914 ../../mod/photos.php:1178
+msgid "Permissions"
+msgstr "Permisos"
+
+#: ../../mod/photos.php:969
+msgid "Edit Album"
+msgstr "Editar Àlbum"
+
+#: ../../mod/photos.php:984 ../../mod/photos.php:1396
+msgid "View Photo"
+msgstr "Veure Foto"
+
+#: ../../mod/photos.php:1019
+msgid "Permission denied. Access to this item may be restricted."
+msgstr "Permís denegat. L'accés a aquest element pot estar restringit."
+
+#: ../../mod/photos.php:1021
+msgid "Photo not available"
+msgstr "Foto no disponible"
+
+#: ../../mod/photos.php:1071
+msgid "View photo"
+msgstr "Veure foto"
+
+#: ../../mod/photos.php:1071
+msgid "Edit photo"
+msgstr "Editar foto"
+
+#: ../../mod/photos.php:1072
+msgid "Use as profile photo"
+msgstr "Emprar com a foto del perfil"
+
+#: ../../mod/photos.php:1078 ../../include/conversation.php:482
+msgid "Private Message"
+msgstr "Missatge Privat"
+
+#: ../../mod/photos.php:1089
+msgid "View Full Size"
+msgstr "Veure'l a Mida Completa"
+
+#: ../../mod/photos.php:1157
+msgid "Tags: "
+msgstr "Etiquetes:"
+
+#: ../../mod/photos.php:1160
+msgid "[Remove any tag]"
+msgstr "Treure etiquetes"
+
+#: ../../mod/photos.php:1171
+msgid "New album name"
+msgstr "Nou nom d'àlbum"
+
+#: ../../mod/photos.php:1174
+msgid "Caption"
+msgstr "Títol"
+
+#: ../../mod/photos.php:1176
+msgid "Add a Tag"
+msgstr "Afegir una etiqueta"
+
+#: ../../mod/photos.php:1180
+msgid ""
+"Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
+msgstr "Exemple: @bob, @Barbara_jensen, @jim@example.com,  #California, #camping"
+
+#: ../../mod/photos.php:1200 ../../include/conversation.php:529
+msgid "I like this (toggle)"
+msgstr "M'agrada això (canviar)"
+
+#: ../../mod/photos.php:1201 ../../include/conversation.php:530
+msgid "I don't like this (toggle)"
+msgstr "No m'agrada això (canviar)"
+
+#: ../../mod/photos.php:1202 ../../include/conversation.php:933
+msgid "Share"
+msgstr "Compartir"
+
+#: ../../mod/photos.php:1203 ../../mod/editpost.php:104
+#: ../../mod/message.php:155 ../../mod/message.php:296
+#: ../../include/conversation.php:348 ../../include/conversation.php:694
+#: ../../include/conversation.php:950
+msgid "Please wait"
+msgstr "Si us plau esperi"
+
+#: ../../mod/photos.php:1219 ../../mod/photos.php:1259
+#: ../../mod/photos.php:1290 ../../include/conversation.php:549
+msgid "This is you"
+msgstr "Aquest ets tu"
+
+#: ../../mod/photos.php:1221 ../../mod/photos.php:1261
+#: ../../mod/photos.php:1292 ../../include/conversation.php:551
+#: ../../boot.php:447
+msgid "Comment"
+msgstr "Comentari"
+
+#: ../../mod/photos.php:1223 ../../mod/editpost.php:123
+#: ../../include/conversation.php:553 ../../include/conversation.php:968
+msgid "Preview"
+msgstr "Vista prèvia"
+
+#: ../../mod/photos.php:1320 ../../mod/settings.php:520
+#: ../../mod/settings.php:601 ../../mod/group.php:158 ../../mod/admin.php:488
+#: ../../include/conversation.php:304 ../../include/conversation.php:573
+msgid "Delete"
+msgstr "Esborrar"
+
+#: ../../mod/photos.php:1402
+msgid "View Album"
+msgstr "Veure Àlbum"
+
+#: ../../mod/photos.php:1411
+msgid "Recent Photos"
+msgstr "Fotos Recents"
+
+#: ../../mod/community.php:21
+msgid "Not available."
+msgstr "No disponible."
+
+#: ../../mod/community.php:30 ../../include/nav.php:97
+msgid "Community"
+msgstr "Comunitat"
+
+#: ../../mod/community.php:60 ../../mod/search.php:118
+msgid "No results."
+msgstr "Sense resultats."
+
+#: ../../mod/friendica.php:43
+msgid "This is Friendica, version"
+msgstr "Això és Friendica, versió"
+
+#: ../../mod/friendica.php:44
+msgid "running at web location"
+msgstr "funcionant en la ubicació web"
+
+#: ../../mod/friendica.php:46
+msgid ""
+"Please visit <a href=\"http://friendica.com\">Friendica.com</a> to learn "
+"more about the Friendica project."
+msgstr "Si us plau, visiteu <a href=\"http://friendica.com\">Friendica.com</a> per obtenir més informació sobre el projecte Friendica."
+
+#: ../../mod/friendica.php:48
+msgid "Bug reports and issues: please visit"
+msgstr "Pels informes d'error i problemes: si us plau, visiteu"
+
+#: ../../mod/friendica.php:49
+msgid ""
+"Suggestions, praise, donations, etc. - please email \"Info\" at Friendica - "
+"dot com"
+msgstr "Suggeriments, elogis, donacions, etc si us plau escrigui a \"Info\" en Friendica - dot com"
+
+#: ../../mod/friendica.php:54
+msgid "Installed plugins/addons/apps"
+msgstr "plugins/addons/apps instal·lats"
+
+#: ../../mod/friendica.php:62
+msgid "No installed plugins/addons/apps"
+msgstr "plugins/addons/apps no instal·lats"
+
+#: ../../mod/editpost.php:17 ../../mod/editpost.php:27
+msgid "Item not found"
+msgstr "Element no trobat"
+
+#: ../../mod/editpost.php:36
+msgid "Edit post"
+msgstr "Editar Enviament"
+
+#: ../../mod/editpost.php:80 ../../include/conversation.php:919
+msgid "Post to Email"
+msgstr "Correu per enviar"
+
+#: ../../mod/editpost.php:95 ../../mod/settings.php:519
+#: ../../include/conversation.php:560
+msgid "Edit"
+msgstr "Editar"
+
+#: ../../mod/editpost.php:96 ../../mod/message.php:153
+#: ../../mod/message.php:294 ../../include/conversation.php:934
+msgid "Upload photo"
+msgstr "Carregar foto"
+
+#: ../../mod/editpost.php:97 ../../include/conversation.php:936
+msgid "Attach file"
+msgstr "Adjunta fitxer"
+
+#: ../../mod/editpost.php:98 ../../mod/message.php:154
+#: ../../mod/message.php:295 ../../include/conversation.php:938
+msgid "Insert web link"
+msgstr "Inserir enllaç web"
+
+#: ../../mod/editpost.php:99
+msgid "Insert YouTube video"
+msgstr "Serà mostrat de forma preeminent a la pagina durant el procés de registre."
+
+#: ../../mod/editpost.php:100
+msgid "Insert Vorbis [.ogg] video"
+msgstr "Inserir video Vorbis [.ogg]"
+
+#: ../../mod/editpost.php:101
+msgid "Insert Vorbis [.ogg] audio"
+msgstr "Inserir audio Vorbis [.ogg]"
+
+#: ../../mod/editpost.php:102 ../../include/conversation.php:944
+msgid "Set your location"
+msgstr "Canvia la teva ubicació"
+
+#: ../../mod/editpost.php:103 ../../include/conversation.php:946
+msgid "Clear browser location"
+msgstr "neteja adreçes del navegador"
+
+#: ../../mod/editpost.php:105 ../../include/conversation.php:951
+msgid "Permission settings"
+msgstr "Configuració de permisos"
+
+#: ../../mod/editpost.php:113 ../../include/conversation.php:960
+msgid "CC: email addresses"
+msgstr "CC: Adreça de correu"
+
+#: ../../mod/editpost.php:114 ../../include/conversation.php:961
+msgid "Public post"
+msgstr "Enviament públic"
+
+#: ../../mod/editpost.php:117 ../../include/conversation.php:949
+msgid "Set title"
+msgstr "Canviar títol"
+
+#: ../../mod/editpost.php:118 ../../include/conversation.php:963
+msgid "Example: bob@example.com, mary@example.com"
+msgstr "Exemple: bob@example.com, mary@example.com"
+
+#: ../../mod/dfrn_request.php:92
+msgid "This introduction has already been accepted."
+msgstr "Aquesta presentació ha estat acceptada."
+
+#: ../../mod/dfrn_request.php:116 ../../mod/dfrn_request.php:381
+msgid "Profile location is not valid or does not contain profile information."
+msgstr "El perfil de situació no és vàlid o no contè informació de perfil"
+
+#: ../../mod/dfrn_request.php:121 ../../mod/dfrn_request.php:386
+msgid "Warning: profile location has no identifiable owner name."
+msgstr "Atenció: El perfil de situació no te nom de propietari identificable."
+
+#: ../../mod/dfrn_request.php:123 ../../mod/dfrn_request.php:388
+msgid "Warning: profile location has no profile photo."
+msgstr "Atenció: El perfil de situació no te foto de perfil"
+
+#: ../../mod/dfrn_request.php:126 ../../mod/dfrn_request.php:391
+#, php-format
+msgid "%d required parameter was not found at the given location"
+msgid_plural "%d required parameters were not found at the given location"
+msgstr[0] "%d el paràmetre requerit no es va trobar al lloc indicat"
+msgstr[1] "%d els paràmetres requerits no es van trobar allloc indicat"
+
+#: ../../mod/dfrn_request.php:167
+msgid "Introduction complete."
+msgstr "Completada la presentació."
+
+#: ../../mod/dfrn_request.php:191
+msgid "Unrecoverable protocol error."
+msgstr "Error de protocol irrecuperable."
+
+#: ../../mod/dfrn_request.php:219
+msgid "Profile unavailable."
+msgstr "Perfil no disponible"
+
+#: ../../mod/dfrn_request.php:244
+#, php-format
+msgid "%s has received too many connection requests today."
+msgstr "%s avui ha rebut excesives peticions de connexió. "
+
+#: ../../mod/dfrn_request.php:245
+msgid "Spam protection measures have been invoked."
+msgstr "Mesures de protecció contra spam han estat invocades."
+
+#: ../../mod/dfrn_request.php:246
+msgid "Friends are advised to please try again in 24 hours."
+msgstr "S'aconsellà els amics que probin pasades 24 hores."
+
+#: ../../mod/dfrn_request.php:306
+msgid "Invalid locator"
+msgstr "Localitzador no vàlid"
+
+#: ../../mod/dfrn_request.php:326
+msgid "Unable to resolve your name at the provided location."
+msgstr "Incapaç de resoldre el teu nom al lloc facilitat."
+
+#: ../../mod/dfrn_request.php:339
+msgid "You have already introduced yourself here."
+msgstr "Has fer la teva presentació aquí."
+
+#: ../../mod/dfrn_request.php:343
+#, php-format
+msgid "Apparently you are already friends with %s."
+msgstr "Aparentment, ja tens amistat amb %s"
+
+#: ../../mod/dfrn_request.php:364
+msgid "Invalid profile URL."
+msgstr "Perfil URL no vàlid."
+
+#: ../../mod/dfrn_request.php:370 ../../mod/follow.php:20
+msgid "Disallowed profile URL."
+msgstr "Perfil URL no permès."
+
+#: ../../mod/dfrn_request.php:439 ../../mod/contacts.php:102
+msgid "Failed to update contact record."
+msgstr "Error en actualitzar registre de contacte."
+
+#: ../../mod/dfrn_request.php:460
+msgid "Your introduction has been sent."
+msgstr "La teva presentació ha estat enviada."
+
+#: ../../mod/dfrn_request.php:513
+msgid "Please login to confirm introduction."
+msgstr "Si us plau, entri per confirmar la presentació."
+
+#: ../../mod/dfrn_request.php:527
+msgid ""
+"Incorrect identity currently logged in. Please login to "
+"<strong>this</strong> profile."
+msgstr "Sesió iniciada amb la identificació incorrecta. Entra en <strong>aquest</strong> perfil."
+
+#: ../../mod/dfrn_request.php:539
+#, php-format
+msgid "Welcome home %s."
+msgstr "Benvingut de nou %s"
+
+#: ../../mod/dfrn_request.php:540
+#, php-format
+msgid "Please confirm your introduction/connection request to %s."
+msgstr "Si us plau, confirmi la seva sol·licitud de Presentació/Amistat a %s."
+
+#: ../../mod/dfrn_request.php:541
+msgid "Confirm"
+msgstr "Confirmar"
+
+#: ../../mod/dfrn_request.php:582 ../../include/items.php:2566
+msgid "[Name Withheld]"
+msgstr "[Nom Amagat]"
+
+#: ../../mod/dfrn_request.php:666
+#, php-format
+msgid ""
+"Diaspora members: Please do not use this form. Instead, enter \"%s\" into "
+"your Diaspora search bar."
+msgstr "Membres de Diàspora: Si us plau, no utilitzi aquest formulari. Pel contrari, escriviu \"%s\" a la barra de cerca de Diàspora."
+
+#: ../../mod/dfrn_request.php:669
+msgid ""
+"Please enter your 'Identity Address' from one of the following supported "
+"social networks:"
+msgstr "Si us plau, introdueixi la seva \"Adreça Identificativa\" d'una de les següents xarxes socials suportades:"
+
+#: ../../mod/dfrn_request.php:672
+msgid "Friend/Connection Request"
+msgstr "Sol·licitud d'Amistat"
+
+#: ../../mod/dfrn_request.php:673
+msgid ""
+"Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, "
+"testuser@identi.ca"
+msgstr "Exemples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@identi.ca"
+
+#: ../../mod/dfrn_request.php:674
+msgid "Please answer the following:"
+msgstr "Si us plau, contesti les següents preguntes:"
+
+#: ../../mod/dfrn_request.php:675
+#, php-format
+msgid "Does %s know you?"
+msgstr "%s et coneix?"
+
+#: ../../mod/dfrn_request.php:678
+msgid "Add a personal note:"
+msgstr "Afegir una nota personal:"
+
+#: ../../mod/dfrn_request.php:680 ../../include/contact_selectors.php:76
+msgid "Friendica"
+msgstr "Friendica"
+
+#: ../../mod/dfrn_request.php:681
+msgid "StatusNet/Federated Social Web"
+msgstr "Web Social StatusNet/Federated "
+
+#: ../../mod/dfrn_request.php:682 ../../mod/settings.php:555
+#: ../../include/contact_selectors.php:80
+msgid "Diaspora"
+msgstr "Diaspora"
+
+#: ../../mod/dfrn_request.php:683
+msgid "- please share from your own site as noted above"
+msgstr "- si us plau, Comparteix des del teu propi lloc tal com s'ha dit abans."
+
+#: ../../mod/dfrn_request.php:684
+msgid "Your Identity Address:"
+msgstr "La Teva Adreça Identificativa:"
+
+#: ../../mod/dfrn_request.php:685
+msgid "Submit Request"
+msgstr "Sol·licitud Enviada"
+
+#: ../../mod/install.php:111
+msgid "Friendica Social Communications Server - Setup"
+msgstr "Friendica Social Communications Server - Ajustos"
+
+#: ../../mod/install.php:117 ../../mod/install.php:157
+#: ../../mod/install.php:230
+msgid "Database connection"
+msgstr "Conexió a la base de dades"
+
+#: ../../mod/install.php:124
+msgid "Could not connect to database."
+msgstr "No puc connectar a la base de dades."
+
+#: ../../mod/install.php:128
+msgid "Could not create table."
+msgstr "No puc creat taula."
+
+#: ../../mod/install.php:133
+msgid "Your Friendica site database has been installed."
+msgstr "La base de dades del teu lloc Friendica ha estat instal·lada."
+
+#: ../../mod/install.php:134
+msgid ""
+"IMPORTANT: You will need to [manually] setup a scheduled task for the "
+"poller."
+msgstr "IMPORTANT: necessitarà configurar [manualment] el programar una tasca pel sondejador (poller.php)"
+
+#: ../../mod/install.php:135 ../../mod/install.php:151
+#: ../../mod/install.php:209
+msgid "Please see the file \"INSTALL.txt\"."
+msgstr "Per favor, consulti l'arxiu \"INSTALL.txt\"."
+
+#: ../../mod/install.php:137
+msgid "Proceed to registration"
+msgstr "Procedir a la inscripció"
+
+#: ../../mod/install.php:143
+msgid "Proceed with Installation"
+msgstr "Procedeixi amb la Instal·lació"
+
+#: ../../mod/install.php:150
+msgid ""
+"You may need to import the file \"database.sql\" manually using phpmyadmin "
+"or mysql."
+msgstr "Pot ser que hagi d'importar l'arxiu \"database.sql\" manualment amb phpmyadmin o mysql."
+
+#: ../../mod/install.php:158
+msgid "Database import failed."
+msgstr "La importació de base de dades ha fallat."
+
+#: ../../mod/install.php:206
+msgid "System check"
+msgstr "Comprovació del Sistema"
+
+#: ../../mod/install.php:211
+msgid "Check again"
+msgstr "Comprovi de nou"
+
+#: ../../mod/install.php:231
+msgid ""
+"In order to install Friendica we need to know how to connect to your "
+"database."
+msgstr "Per a instal·lar Friendica necessitem conèixer com connectar amb la deva base de dades."
+
+#: ../../mod/install.php:232
+msgid ""
+"Please contact your hosting provider or site administrator if you have "
+"questions about these settings."
+msgstr "Per favor, posi's en contacte amb el seu proveïdor de hosting o administrador del lloc si té alguna pregunta sobre aquestes opcions."
+
+#: ../../mod/install.php:233
+msgid ""
+"The database you specify below should already exist. If it does not, please "
+"create it before continuing."
+msgstr "La base de dades que especifiques ja hauria d'existir. Si no és així, crea-la abans de continuar."
+
+#: ../../mod/install.php:237
+msgid "Database Server Name"
+msgstr "Nom del Servidor de base de Dades"
+
+#: ../../mod/install.php:238
+msgid "Database Login Name"
+msgstr "Nom d'Usuari de la base de Dades"
+
+#: ../../mod/install.php:239
+msgid "Database Login Password"
+msgstr "Contrasenya d'Usuari de la base de Dades"
+
+#: ../../mod/install.php:240
+msgid "Database Name"
+msgstr "Nom de la base de Dades"
+
+#: ../../mod/install.php:241 ../../mod/install.php:280
+msgid "Site administrator email address"
+msgstr "Adreça de correu del administrador del lloc"
+
+#: ../../mod/install.php:241 ../../mod/install.php:280
+msgid ""
+"Your account email address must match this in order to use the web admin "
+"panel."
+msgstr "El seu compte d'adreça electrònica ha de coincidir per tal d'utilitzar el panell d'administració web."
+
+#: ../../mod/install.php:245 ../../mod/install.php:283
+msgid "Please select a default timezone for your website"
+msgstr "Per favor, seleccioni una zona horària per defecte per al seu lloc web"
+
+#: ../../mod/install.php:270
+msgid "Site settings"
+msgstr "Configuracions del lloc"
+
+#: ../../mod/install.php:323
+msgid "Could not find a command line version of PHP in the web server PATH."
+msgstr "No es va poder trobar una versió de línia de comandos de PHP en la ruta del servidor web."
+
+#: ../../mod/install.php:326
+msgid "PHP executable path"
+msgstr "Direcció del executable PHP"
+
+#: ../../mod/install.php:326
+msgid "Enter full path to php executable"
+msgstr "Introdueixi el camí complet del executable php"
+
+#: ../../mod/install.php:331
+msgid "Command line PHP"
+msgstr "Linia de comandos PHP"
+
+#: ../../mod/install.php:340
+msgid ""
+"The command line version of PHP on your system does not have "
+"\"register_argc_argv\" enabled."
+msgstr "La versió de línia de comandos de PHP en el seu sistema no té \"register_argc_argv\" habilitat."
+
+#: ../../mod/install.php:341
+msgid "This is required for message delivery to work."
+msgstr "Això és necessari perquè funcioni el lliurament de missatges."
+
+#: ../../mod/install.php:343
+msgid "PHP \"register_argc_argv\""
+msgstr "PHP \"register_argc_argv\""
+
+#: ../../mod/install.php:364
+msgid ""
+"Error: the \"openssl_pkey_new\" function on this system is not able to "
+"generate encryption keys"
+msgstr "Error: la funció \"openssl_pkey_new\" en aquest sistema no és capaç de generar claus de xifrat"
+
+#: ../../mod/install.php:365
+msgid ""
+"If running under Windows, please see "
+"\"http://www.php.net/manual/en/openssl.installation.php\"."
+msgstr "Si s'executa en Windows, per favor consulti la secció \"http://www.php.net/manual/en/openssl.installation.php\"."
+
+#: ../../mod/install.php:367
+msgid "Generate encryption keys"
+msgstr "Generar claus d'encripció"
+
+#: ../../mod/install.php:374
+msgid "libCurl PHP module"
+msgstr "Mòdul libCurl de PHP"
+
+#: ../../mod/install.php:375
+msgid "GD graphics PHP module"
+msgstr "Mòdul GD de gràfics de PHP"
+
+#: ../../mod/install.php:376
+msgid "OpenSSL PHP module"
+msgstr "Mòdul OpenSSl de PHP"
+
+#: ../../mod/install.php:377
+msgid "mysqli PHP module"
+msgstr "Mòdul mysqli de PHP"
+
+#: ../../mod/install.php:378
+msgid "mb_string PHP module"
+msgstr "Mòdul mb_string de PHP"
+
+#: ../../mod/install.php:383 ../../mod/install.php:385
+msgid "Apace mod_rewrite module"
+msgstr "Mòdul mod_rewrite de Apache"
+
+#: ../../mod/install.php:383
+msgid ""
+"Error: Apache webserver mod-rewrite module is required but not installed."
+msgstr "Error: el mòdul mod-rewrite del servidor web Apache és necessari però no està instal·lat."
+
+#: ../../mod/install.php:390
+msgid "Error: libCURL PHP module required but not installed."
+msgstr "Error: El mòdul libCURL de PHP és necessari però no està instal·lat."
+
+#: ../../mod/install.php:394
+msgid ""
+"Error: GD graphics PHP module with JPEG support required but not installed."
+msgstr "Error: el mòdul gràfic GD de PHP amb support per JPEG és necessari però no està instal·lat."
+
+#: ../../mod/install.php:398
+msgid "Error: openssl PHP module required but not installed."
+msgstr "Error: El mòdul enssl de PHP és necessari però no està instal·lat."
+
+#: ../../mod/install.php:402
+msgid "Error: mysqli PHP module required but not installed."
+msgstr "Error: El mòdul mysqli de PHP és necessari però no està instal·lat."
+
+#: ../../mod/install.php:406
+msgid "Error: mb_string PHP module required but not installed."
+msgstr "Error: mòdul mb_string de PHP requerit però no instal·lat."
+
+#: ../../mod/install.php:423
+msgid ""
+"The web installer needs to be able to create a file called \".htconfig.php\""
+" in the top folder of your web server and it is unable to do so."
+msgstr "L'instal·lador web necessita crear un arxiu anomenat \".htconfig.php\" en la carpeta superior del seu servidor web però alguna cosa ho va impedir."
+
+#: ../../mod/install.php:424
+msgid ""
+"This is most often a permission setting, as the web server may not be able "
+"to write files in your folder - even if you can."
+msgstr "Això freqüentment és a causa d'una configuració de permisos; el servidor web no pot escriure arxius en la carpeta - encara que sigui possible."
+
+#: ../../mod/install.php:425
+msgid ""
+"Please check with your site documentation or support people to see if this "
+"situation can be corrected."
+msgstr "Per favor, consulti amb la documentació del seu lloc o persones de suport per veure si aquesta situació es pot corregir."
+
+#: ../../mod/install.php:426
+msgid ""
+"If not, you may be required to perform a manual installation. Please see the"
+" file \"INSTALL.txt\" for instructions."
+msgstr "Si no, vostè pot ser requerit per realitzar una instal·lació manual. Per favor, consulti l'arxiu \"INSTALL.txt\" per obtenir instruccions."
+
+#: ../../mod/install.php:429
+msgid ".htconfig.php is writable"
+msgstr ".htconfig.php és escribible"
+
+#: ../../mod/install.php:436
+msgid ""
+"The database configuration file \".htconfig.php\" could not be written. "
+"Please use the enclosed text to create a configuration file in your web "
+"server root."
+msgstr "L'arxiu per a la configuració de la base de dades \".htconfig.php\" no es pot escriure. Per favor, usi el text adjunt per crear un arxiu de configuració en l'arrel del servidor web."
+
+#: ../../mod/install.php:461
+msgid "Errors encountered creating database tables."
+msgstr "Trobats errors durant la creació de les taules de la base de dades."
+
+#: ../../mod/localtime.php:12 ../../include/event.php:11
+#: ../../include/bb2diaspora.php:238
+msgid "l F d, Y \\@ g:i A"
+msgstr "l F d, Y \\@ g:i A"
+
+#: ../../mod/localtime.php:24
+msgid "Time Conversion"
+msgstr "Temps de Conversió"
+
+#: ../../mod/localtime.php:26
+msgid ""
+"Friendika provides this service for sharing events with other networks and "
+"friends in unknown timezones."
+msgstr "Friendica ofereix aquest servei per compartir esdeveniments amb altres xarxes i amics a les zones horàries desconegudes."
+
+#: ../../mod/localtime.php:30
+#, php-format
+msgid "UTC time: %s"
+msgstr "hora UTC: %s"
+
+#: ../../mod/localtime.php:33
+#, php-format
+msgid "Current timezone: %s"
+msgstr "Zona horària actual: %s"
+
+#: ../../mod/localtime.php:36
+#, php-format
+msgid "Converted localtime: %s"
+msgstr "Conversión de hora local: %s"
+
+#: ../../mod/localtime.php:41
+msgid "Please select your timezone:"
+msgstr "Si us plau, seleccioneu la vostra zona horària:"
+
+#: ../../mod/match.php:12
+msgid "Profile Match"
+msgstr "Perfil Aconseguit"
+
+#: ../../mod/match.php:20
+msgid "No keywords to match. Please add keywords to your default profile."
+msgstr "No hi ha paraules clau que coincideixin. Si us plau, afegeixi paraules clau al teu perfil predeterminat."
+
+#: ../../mod/match.php:57
+msgid "is interested in:"
+msgstr "està interessat en:"
+
+#: ../../mod/match.php:58 ../../mod/suggest.php:59
+#: ../../include/contact_widgets.php:9 ../../boot.php:930
+msgid "Connect"
+msgstr "Connexió"
+
+#: ../../mod/match.php:65 ../../mod/dirfind.php:57
+msgid "No matches"
+msgstr "No hi ha coincidències"
+
+#: ../../mod/lockview.php:39
+msgid "Remote privacy information not available."
+msgstr "Informació de privacitat remota no disponible."
+
+#: ../../mod/lockview.php:43
+msgid "Visible to:"
+msgstr "Visible per a:"
+
+#: ../../mod/home.php:26 ../../addon/communityhome/communityhome.php:179
+#, php-format
+msgid "Welcome to %s"
+msgstr "Benvingut a %s"
+
+#: ../../mod/notifications.php:26
+msgid "Invalid request identifier."
+msgstr "Sol·licitud d'identificació no vàlida."
+
+#: ../../mod/notifications.php:35 ../../mod/notifications.php:157
+#: ../../mod/notifications.php:203
+msgid "Discard"
+msgstr "Descartar"
+
+#: ../../mod/notifications.php:47 ../../mod/notifications.php:156
+#: ../../mod/notifications.php:202 ../../mod/contacts.php:302
+#: ../../mod/contacts.php:345
+msgid "Ignore"
+msgstr "Ignorar"
+
+#: ../../mod/notifications.php:71
+msgid "System"
+msgstr "Sistema"
+
+#: ../../mod/notifications.php:76 ../../include/nav.php:109
+msgid "Network"
+msgstr "Xarxa"
+
+#: ../../mod/notifications.php:81 ../../mod/network.php:177
+msgid "Personal"
+msgstr "Personal"
+
+#: ../../mod/notifications.php:86 ../../include/nav.php:73
+#: ../../include/nav.php:111
+msgid "Home"
+msgstr "Inici"
+
+#: ../../mod/notifications.php:91 ../../include/nav.php:117
+msgid "Introductions"
+msgstr "Presentacions"
+
+#: ../../mod/notifications.php:96 ../../mod/message.php:76
+#: ../../include/nav.php:124
+msgid "Messages"
+msgstr "Missatges"
+
+#: ../../mod/notifications.php:115
+msgid "Show Ignored Requests"
+msgstr "Mostra les Sol·licituds Ignorades"
+
+#: ../../mod/notifications.php:115
+msgid "Hide Ignored Requests"
+msgstr "Amaga les Sol·licituds Ignorades"
+
+#: ../../mod/notifications.php:141 ../../mod/notifications.php:187
+msgid "Notification type: "
+msgstr "Tipus de Notificació:"
+
+#: ../../mod/notifications.php:142
+msgid "Friend Suggestion"
+msgstr "Amics Suggerits "
+
+#: ../../mod/notifications.php:144
+#, php-format
+msgid "suggested by %s"
+msgstr "sugerit per %s"
+
+#: ../../mod/notifications.php:149 ../../mod/notifications.php:196
+#: ../../mod/contacts.php:350
+msgid "Hide this contact from others"
+msgstr "Amaga aquest contacte dels altres"
+
+#: ../../mod/notifications.php:150 ../../mod/notifications.php:197
+msgid "Post a new friend activity"
+msgstr "Publica una activitat  d'amic nova"
+
+#: ../../mod/notifications.php:150 ../../mod/notifications.php:197
+msgid "if applicable"
+msgstr "si es pot aplicar"
+
+#: ../../mod/notifications.php:153 ../../mod/notifications.php:200
+#: ../../mod/admin.php:486
+msgid "Approve"
+msgstr "Aprovar"
+
+#: ../../mod/notifications.php:173
+msgid "Claims to be known to you: "
+msgstr "Diu que et coneix:"
+
+#: ../../mod/notifications.php:173
+msgid "yes"
+msgstr "sí"
+
+#: ../../mod/notifications.php:173
+msgid "no"
+msgstr "no"
+
+#: ../../mod/notifications.php:180
+msgid "Approve as: "
+msgstr "Aprovat com:"
+
+#: ../../mod/notifications.php:181
+msgid "Friend"
+msgstr "Amic"
+
+#: ../../mod/notifications.php:182
+msgid "Sharer"
+msgstr "Partícip"
+
+#: ../../mod/notifications.php:182
+msgid "Fan/Admirer"
+msgstr "Fan/Admirador"
+
+#: ../../mod/notifications.php:188
+msgid "Friend/Connect Request"
+msgstr "Sol·licitud d'Amistat/Connexió"
+
+#: ../../mod/notifications.php:188
+msgid "New Follower"
+msgstr "Nou Seguidor"
+
+#: ../../mod/notifications.php:209
+msgid "No introductions."
+msgstr "Sense presentacions."
+
+#: ../../mod/notifications.php:212 ../../include/nav.php:118
+msgid "Notifications"
+msgstr "Notificacions"
+
+#: ../../mod/notifications.php:249 ../../mod/notifications.php:374
+#: ../../mod/notifications.php:461
+#, php-format
+msgid "%s liked %s's post"
+msgstr "A %s li agrada l'enviament de %s"
+
+#: ../../mod/notifications.php:258 ../../mod/notifications.php:383
+#: ../../mod/notifications.php:470
+#, php-format
+msgid "%s disliked %s's post"
+msgstr "A %s no li agrada l'enviament de %s"
+
+#: ../../mod/notifications.php:272 ../../mod/notifications.php:397
+#: ../../mod/notifications.php:484
+#, php-format
+msgid "%s is now friends with %s"
+msgstr "%s es ara amic de %s"
+
+#: ../../mod/notifications.php:279 ../../mod/notifications.php:404
+#, php-format
+msgid "%s created a new post"
+msgstr "%s ha creat un enviament nou"
+
+#: ../../mod/notifications.php:280 ../../mod/notifications.php:405
+#: ../../mod/notifications.php:493
+#, php-format
+msgid "%s commented on %s's post"
+msgstr "%s va comentar en l'enviament de %s"
+
+#: ../../mod/notifications.php:294
+msgid "No more network notifications."
+msgstr "No més notificacions de xarxa."
+
+#: ../../mod/notifications.php:298
+msgid "Network Notifications"
+msgstr "Notificacions de la Xarxa"
+
+#: ../../mod/notifications.php:324 ../../mod/notify.php:61
+msgid "No more system notifications."
+msgstr "No més notificacions del sistema."
+
+#: ../../mod/notifications.php:328 ../../mod/notify.php:65
+msgid "System Notifications"
+msgstr "Notificacions del Sistema"
+
+#: ../../mod/notifications.php:419
+msgid "No more personal notifications."
+msgstr "No més notificacions personals."
+
+#: ../../mod/notifications.php:423
+msgid "Personal Notifications"
+msgstr "Notificacions Personals"
+
+#: ../../mod/notifications.php:500
+msgid "No more home notifications."
+msgstr "No més notificacions d'inici."
+
+#: ../../mod/notifications.php:504
+msgid "Home Notifications"
+msgstr "Notificacions d'Inici"
+
+#: ../../mod/contacts.php:63 ../../mod/contacts.php:143
+msgid "Could not access contact record."
+msgstr "No puc accedir al registre del contacte."
+
+#: ../../mod/contacts.php:77
+msgid "Could not locate selected profile."
+msgstr "No puc localitzar el perfil seleccionat."
+
+#: ../../mod/contacts.php:100
+msgid "Contact updated."
+msgstr "Contacte actualitzat."
+
+#: ../../mod/contacts.php:165
+msgid "Contact has been blocked"
+msgstr "Elcontacte ha estat bloquejat"
+
+#: ../../mod/contacts.php:165
+msgid "Contact has been unblocked"
+msgstr "El contacte ha estat desbloquejat"
+
+#: ../../mod/contacts.php:179
+msgid "Contact has been ignored"
+msgstr "El contacte ha estat ignorat"
+
+#: ../../mod/contacts.php:179
+msgid "Contact has been unignored"
+msgstr "El contacte ha estat recordat"
+
+#: ../../mod/contacts.php:200
+msgid "stopped following"
+msgstr "Deixar de seguir"
+
+#: ../../mod/contacts.php:221
+msgid "Contact has been removed."
+msgstr "El contacte ha estat tret"
+
+#: ../../mod/contacts.php:245
+#, php-format
+msgid "You are mutual friends with %s"
+msgstr "Ara te una amistat mutua amb %s"
+
+#: ../../mod/contacts.php:249
+#, php-format
+msgid "You are sharing with %s"
+msgstr "Estas compartint amb %s"
+
+#: ../../mod/contacts.php:254
+#, php-format
+msgid "%s is sharing with you"
+msgstr "%s esta compartint amb tú"
+
+#: ../../mod/contacts.php:271
+msgid "Private communications are not available for this contact."
+msgstr "Comunicacions privades no disponibles per aquest contacte."
+
+#: ../../mod/contacts.php:274
+msgid "Never"
+msgstr "Mai"
+
+#: ../../mod/contacts.php:278
+msgid "(Update was successful)"
+msgstr "(L'actualització fou exitosa)"
+
+#: ../../mod/contacts.php:278
+msgid "(Update was not successful)"
+msgstr "(L'actualització fracassà)"
+
+#: ../../mod/contacts.php:280
+msgid "Suggest friends"
+msgstr "Suggerir amics"
+
+#: ../../mod/contacts.php:284
+#, php-format
+msgid "Network type: %s"
+msgstr "Xarxa tipus: %s"
+
+#: ../../mod/contacts.php:287
+#, php-format
+msgid "%d contact in common"
+msgid_plural "%d contacts in common"
+msgstr[0] "%d contacte en comú"
+msgstr[1] "%d contactes en comú"
+
+#: ../../mod/contacts.php:292
+msgid "View all contacts"
+msgstr "Veure tots els contactes"
+
+#: ../../mod/contacts.php:297 ../../mod/contacts.php:344
+#: ../../mod/admin.php:490
+msgid "Unblock"
+msgstr "Desbloquejar"
+
+#: ../../mod/contacts.php:297 ../../mod/contacts.php:344
+#: ../../mod/admin.php:489
+msgid "Block"
+msgstr "Bloquejar"
+
+#: ../../mod/contacts.php:302 ../../mod/contacts.php:345
+msgid "Unignore"
+msgstr "Treure d'Ignorats"
+
+#: ../../mod/contacts.php:307
+msgid "Repair"
+msgstr "Reparar"
+
+#: ../../mod/contacts.php:317
+msgid "Contact Editor"
+msgstr "Editor de Contactes"
+
+#: ../../mod/contacts.php:320
+msgid "Profile Visibility"
+msgstr "Perfil de Visibilitat"
+
+#: ../../mod/contacts.php:321
+#, php-format
+msgid ""
+"Please choose the profile you would like to display to %s when viewing your "
+"profile securely."
+msgstr "Si us plau triï el perfil que voleu mostrar a %s quan estigui veient el teu de forma segura."
+
+#: ../../mod/contacts.php:322
+msgid "Contact Information / Notes"
+msgstr "Informació/Notes del contacte"
+
+#: ../../mod/contacts.php:323
+msgid "Edit contact notes"
+msgstr "Editar notes de contactes"
+
+#: ../../mod/contacts.php:328 ../../mod/contacts.php:497
+#: ../../mod/viewcontacts.php:60
+#, php-format
+msgid "Visit %s's profile [%s]"
+msgstr "Visitar perfil de %s [%s]"
+
+#: ../../mod/contacts.php:329
+msgid "Block/Unblock contact"
+msgstr "Bloquejar/Alliberar contacte"
+
+#: ../../mod/contacts.php:330
+msgid "Ignore contact"
+msgstr "Ignore contacte"
+
+#: ../../mod/contacts.php:331
+msgid "Repair URL settings"
+msgstr "Restablir configuració de URL"
+
+#: ../../mod/contacts.php:332
+msgid "View conversations"
+msgstr "Veient conversacions"
+
+#: ../../mod/contacts.php:334
+msgid "Delete contact"
+msgstr "Esborrar contacte"
+
+#: ../../mod/contacts.php:338
+msgid "Last update:"
+msgstr "Última actualització:"
+
+#: ../../mod/contacts.php:339
+msgid "Update public posts"
+msgstr "Actualitzar enviament públic"
+
+#: ../../mod/contacts.php:341 ../../mod/admin.php:905
+msgid "Update now"
+msgstr "Actualitza ara"
+
+#: ../../mod/contacts.php:348
+msgid "Currently blocked"
+msgstr "Bloquejat actualment"
+
+#: ../../mod/contacts.php:349
+msgid "Currently ignored"
+msgstr "Ignorat actualment"
+
+#: ../../mod/contacts.php:350
+msgid ""
+"Replies/likes to your public posts <strong>may</strong> still be visible"
+msgstr "Répliques/agraiments per als teus missatges públics <strong>poden</strong> romandre visibles"
+
+#: ../../mod/contacts.php:399 ../../mod/group.php:179
+msgid "All Contacts"
+msgstr "Tots els Contactes"
+
+#: ../../mod/contacts.php:404
+msgid "Unblocked Contacts"
+msgstr "Contactes Desbloquejats"
+
+#: ../../mod/contacts.php:410
+msgid "Blocked Contacts"
+msgstr "Contactes Bloquejats"
+
+#: ../../mod/contacts.php:416
+msgid "Ignored Contacts"
+msgstr "Contactes Ignorats"
+
+#: ../../mod/contacts.php:422
+msgid "Hidden Contacts"
+msgstr "Contactes Amagats"
+
+#: ../../mod/contacts.php:473
+msgid "Mutual Friendship"
+msgstr "Amistat Mutua"
+
+#: ../../mod/contacts.php:477
+msgid "is a fan of yours"
+msgstr "Es un fan teu"
+
+#: ../../mod/contacts.php:481
+msgid "you are a fan of"
+msgstr "ets fan de"
+
+#: ../../mod/contacts.php:498 ../../include/Contact.php:135
+#: ../../include/conversation.php:792
+msgid "Edit contact"
+msgstr "Editar contacte"
+
+#: ../../mod/contacts.php:519 ../../include/nav.php:132
+msgid "Contacts"
+msgstr "Contactes"
+
+#: ../../mod/contacts.php:523
+msgid "Search your contacts"
+msgstr "Cercant el seus contactes"
+
+#: ../../mod/contacts.php:524 ../../mod/directory.php:67
+msgid "Finding: "
+msgstr "Cercant:"
+
+#: ../../mod/contacts.php:525 ../../mod/directory.php:69
+#: ../../include/contact_widgets.php:34
+msgid "Find"
+msgstr "Cercar"
+
+#: ../../mod/lostpass.php:16
+msgid "No valid account found."
+msgstr "compte no vàlid trobat."
+
+#: ../../mod/lostpass.php:31
+msgid "Password reset request issued. Check your email."
+msgstr "Sol·licitut de restabliment de contrasenya enviat. Comprovi el seu correu."
+
+#: ../../mod/lostpass.php:42
+#, php-format
+msgid "Password reset requested at %s"
+msgstr "Contrasenya restablerta enviada a %s"
+
+#: ../../mod/lostpass.php:44 ../../mod/lostpass.php:106
+#: ../../mod/register.php:380 ../../mod/register.php:434
+#: ../../mod/regmod.php:54 ../../mod/dfrn_confirm.php:726
+#: ../../include/items.php:2575
+msgid "Administrator"
+msgstr "Administrador"
+
+#: ../../mod/lostpass.php:64
+msgid ""
+"Request could not be verified. (You may have previously submitted it.) "
+"Password reset failed."
+msgstr "La sol·licitut no pot ser verificada. (Hauries de presentar-la abans). Restabliment de contrasenya fracassat."
+
+#: ../../mod/lostpass.php:82 ../../boot.php:723
+msgid "Password Reset"
+msgstr "Restabliment de Contrasenya"
+
+#: ../../mod/lostpass.php:83
+msgid "Your password has been reset as requested."
+msgstr "La teva contrasenya fou restablerta com vas demanar."
+
+#: ../../mod/lostpass.php:84
+msgid "Your new password is"
+msgstr "La teva nova contrasenya es"
+
+#: ../../mod/lostpass.php:85
+msgid "Save or copy your new password - and then"
+msgstr "Guarda o copia la nova contrasenya - i llavors"
+
+#: ../../mod/lostpass.php:86
+msgid "click here to login"
+msgstr "clica aquí per identificarte"
+
+#: ../../mod/lostpass.php:87
+msgid ""
+"Your password may be changed from the <em>Settings</em> page after "
+"successful login."
+msgstr "Pots camviar la contrasenya des de la pàgina de <em>Configuración</em> desprès d'accedir amb èxit."
+
+#: ../../mod/lostpass.php:118
+msgid "Forgot your Password?"
+msgstr "Has Oblidat la Contrasenya?"
+
+#: ../../mod/lostpass.php:119
+msgid ""
+"Enter your email address and submit to have your password reset. Then check "
+"your email for further instructions."
+msgstr "Introdueixi la seva adreça de correu i enivii-la per restablir la seva contrasenya. Llavors comprovi el seu correu per a les següents instruccións. "
+
+#: ../../mod/lostpass.php:120
+msgid "Nickname or Email: "
+msgstr "Malnom o Correu:"
+
+#: ../../mod/lostpass.php:121
+msgid "Reset"
+msgstr "Restablir"
+
+#: ../../mod/settings.php:72
+msgid "Missing some important data!"
+msgstr "Perdudes algunes dades importants!"
+
+#: ../../mod/settings.php:75 ../../mod/settings.php:486 ../../mod/admin.php:75
+msgid "Update"
+msgstr "Actualitzar"
+
+#: ../../mod/settings.php:175
+msgid "Failed to connect with email account using the settings provided."
+msgstr "Connexió fracassada amb el compte de correu emprant la configuració proveïda."
+
+#: ../../mod/settings.php:180
+msgid "Email settings updated."
+msgstr "Configuració del correu electrònic actualitzada."
+
+#: ../../mod/settings.php:198
+msgid "Passwords do not match. Password unchanged."
+msgstr "Les contrasenyes no coincideixen. Contrasenya no canviada."
+
+#: ../../mod/settings.php:203
+msgid "Empty passwords are not allowed. Password unchanged."
+msgstr "No es permeten contasenyes buides. Contrasenya no canviada"
+
+#: ../../mod/settings.php:214
+msgid "Password changed."
+msgstr "Contrasenya canviada."
+
+#: ../../mod/settings.php:216
+msgid "Password update failed. Please try again."
+msgstr "Ha fallat l'actualització de la Contrasenya. Per favor, intenti-ho de nou."
+
+#: ../../mod/settings.php:280
+msgid " Please use a shorter name."
+msgstr "Si us plau, faci servir un nom més curt."
+
+#: ../../mod/settings.php:282
+msgid " Name too short."
+msgstr "Nom massa curt."
+
+#: ../../mod/settings.php:288
+msgid " Not valid email."
+msgstr "Correu no vàlid."
+
+#: ../../mod/settings.php:290
+msgid " Cannot change to that email."
+msgstr "No puc canviar a aquest correu."
+
+#: ../../mod/settings.php:358 ../../addon/facebook/facebook.php:321
+#: ../../addon/impressum/impressum.php:64
+#: ../../addon/openstreetmap/openstreetmap.php:80
+#: ../../addon/piwik/piwik.php:105 ../../addon/twitter/twitter.php:350
+msgid "Settings updated."
+msgstr "Ajustos actualitzats."
+
+#: ../../mod/settings.php:422 ../../include/nav.php:130
+msgid "Account settings"
+msgstr "Configuració del compte"
+
+#: ../../mod/settings.php:427
+msgid "Connector settings"
+msgstr "Configuració dels connectors"
+
+#: ../../mod/settings.php:432
+msgid "Plugin settings"
+msgstr "Configuració del plugin"
+
+#: ../../mod/settings.php:437
+msgid "Connections"
+msgstr "Connexions"
+
+#: ../../mod/settings.php:442
+msgid "Export personal data"
+msgstr "Exportar dades personals"
+
+#: ../../mod/settings.php:459 ../../mod/settings.php:485
+#: ../../mod/settings.php:518
+msgid "Add application"
+msgstr "Afegir aplicació"
+
+#: ../../mod/settings.php:463 ../../mod/settings.php:489
+#: ../../addon/statusnet/statusnet.php:526
+msgid "Consumer Key"
+msgstr "Consumer Key"
+
+#: ../../mod/settings.php:464 ../../mod/settings.php:490
+#: ../../addon/statusnet/statusnet.php:525
+msgid "Consumer Secret"
+msgstr "Consumer Secret"
+
+#: ../../mod/settings.php:465 ../../mod/settings.php:491
+msgid "Redirect"
+msgstr "Redirigir"
+
+#: ../../mod/settings.php:466 ../../mod/settings.php:492
+msgid "Icon url"
+msgstr "icona de url"
+
+#: ../../mod/settings.php:477
+msgid "You can't edit this application."
+msgstr "No pots editar aquesta aplicació."
+
+#: ../../mod/settings.php:517
+msgid "Connected Apps"
+msgstr "Aplicacions conectades"
+
+#: ../../mod/settings.php:521
+msgid "Client key starts with"
+msgstr "Les claus de client comançen amb"
+
+#: ../../mod/settings.php:522
+msgid "No name"
+msgstr "Sense nom"
+
+#: ../../mod/settings.php:523
+msgid "Remove authorization"
+msgstr "retirar l'autorització"
+
+#: ../../mod/settings.php:535
+msgid "No Plugin settings configured"
+msgstr "No s'han configurat ajustos de Plugin"
+
+#: ../../mod/settings.php:542 ../../addon/widgets/widgets.php:122
+msgid "Plugin Settings"
+msgstr "Ajustos de Plugin"
+
+#: ../../mod/settings.php:555 ../../mod/settings.php:556
+#, php-format
+msgid "Built-in support for %s connectivity is %s"
+msgstr "El suport integrat per a la connectivitat de %s és %s"
+
+#: ../../mod/settings.php:555 ../../mod/settings.php:556
+msgid "enabled"
+msgstr "habilitat"
+
+#: ../../mod/settings.php:555 ../../mod/settings.php:556
+msgid "disabled"
+msgstr "deshabilitat"
+
+#: ../../mod/settings.php:556
+msgid "StatusNet"
+msgstr "StatusNet"
+
+#: ../../mod/settings.php:584
+msgid "Connector Settings"
+msgstr "Configuració de connectors"
+
+#: ../../mod/settings.php:590
+msgid "Email/Mailbox Setup"
+msgstr "Preparació de Correu/Bústia"
+
+#: ../../mod/settings.php:591
+msgid ""
+"If you wish to communicate with email contacts using this service "
+"(optional), please specify how to connect to your mailbox."
+msgstr "Si vol comunicar-se amb els contactes de correu emprant aquest servei (opcional), Si us plau, especifiqui com connectar amb la seva bústia."
+
+#: ../../mod/settings.php:592
+msgid "Last successful email check:"
+msgstr "Última comprovació de correu amb èxit:"
+
+#: ../../mod/settings.php:593
+msgid "Email access is disabled on this site."
+msgstr "L'accés al correu està deshabilitat en aquest lloc."
+
+#: ../../mod/settings.php:594
+msgid "IMAP server name:"
+msgstr "Nom del servidor IMAP:"
+
+#: ../../mod/settings.php:595
+msgid "IMAP port:"
+msgstr "Port IMAP:"
+
+#: ../../mod/settings.php:596
+msgid "Security:"
+msgstr "Seguretat:"
+
+#: ../../mod/settings.php:596 ../../mod/settings.php:601
+msgid "None"
+msgstr "Cap"
+
+#: ../../mod/settings.php:597
+msgid "Email login name:"
+msgstr "Nom d'usuari del correu"
+
+#: ../../mod/settings.php:598
+msgid "Email password:"
+msgstr "Contrasenya del correu:"
+
+#: ../../mod/settings.php:599
+msgid "Reply-to address:"
+msgstr "Adreça de resposta:"
+
+#: ../../mod/settings.php:600
+msgid "Send public posts to all email contacts:"
+msgstr "Enviar correu públic a tots els contactes del correu:"
+
+#: ../../mod/settings.php:601
+msgid "Action after import:"
+msgstr "Acció després d'importar:"
+
+#: ../../mod/settings.php:601
+msgid "Mark as seen"
+msgstr "Marcar com a vist"
+
+#: ../../mod/settings.php:601
+msgid "Move to folder"
+msgstr "Moure a la carpeta"
+
+#: ../../mod/settings.php:602
+msgid "Move to folder:"
+msgstr "Moure a la carpeta:"
+
+#: ../../mod/settings.php:659 ../../mod/admin.php:142 ../../mod/admin.php:462
+msgid "Normal Account"
+msgstr "Compte Normal"
+
+#: ../../mod/settings.php:660
+msgid "This account is a normal personal profile"
+msgstr "Aques compte es un compte personal normal"
+
+#: ../../mod/settings.php:663 ../../mod/admin.php:143 ../../mod/admin.php:463
+msgid "Soapbox Account"
+msgstr "Compte Tribuna"
+
+#: ../../mod/settings.php:664
+msgid "Automatically approve all connection/friend requests as read-only fans"
+msgstr "Aprova automàticament totes les sol·licituds de amistat/connexió com a fans de només lectura."
+
+#: ../../mod/settings.php:667 ../../mod/admin.php:144 ../../mod/admin.php:464
+msgid "Community/Celebrity Account"
+msgstr "Compte de Comunitat/Celebritat"
+
+#: ../../mod/settings.php:668
+msgid ""
+"Automatically approve all connection/friend requests as read-write fans"
+msgstr "Aprova automàticament totes les sol·licituds de amistat/connexió com a fans de lectura-escriptura"
+
+#: ../../mod/settings.php:671 ../../mod/admin.php:145 ../../mod/admin.php:465
+msgid "Automatic Friend Account"
+msgstr "Compte d'Amistat Automàtic"
+
+#: ../../mod/settings.php:672
+msgid "Automatically approve all connection/friend requests as friends"
+msgstr "Aprova totes les sol·licituds de amistat/connexió com a amic automàticament"
+
+#: ../../mod/settings.php:682
+msgid "OpenID:"
+msgstr "OpenID:"
+
+#: ../../mod/settings.php:682
+msgid "(Optional) Allow this OpenID to login to this account."
+msgstr "(Opcional) Permetre a aquest OpenID iniciar sessió en aquest compte."
+
+#: ../../mod/settings.php:692
+msgid "Publish your default profile in your local site directory?"
+msgstr "Publicar el teu perfil predeterminat en el directori del lloc local?"
+
+#: ../../mod/settings.php:698
+msgid "Publish your default profile in the global social directory?"
+msgstr "Publicar el teu perfil predeterminat al directori social global?"
+
+#: ../../mod/settings.php:706
+msgid "Hide your contact/friend list from viewers of your default profile?"
+msgstr "Amaga la teva llista de contactes/amics dels espectadors del seu perfil per defecte?"
+
+#: ../../mod/settings.php:710
+msgid "Hide your profile details from unknown viewers?"
+msgstr "Amagar els detalls del seu perfil a espectadors desconeguts?"
+
+#: ../../mod/settings.php:715
+msgid "Allow friends to post to your profile page?"
+msgstr "Permet als amics publicar en la seva pàgina de perfil?"
+
+#: ../../mod/settings.php:721
+msgid "Allow friends to tag your posts?"
+msgstr "Permet als amics d'etiquetar els teus missatges?"
+
+#: ../../mod/settings.php:727
+msgid "Allow us to suggest you as a potential friend to new members?"
+msgstr "Permeteu-nos suggerir-li com un amic potencial dels nous membres?"
+
+#: ../../mod/settings.php:736
+msgid "Profile is <strong>not published</strong>."
+msgstr "El  Perfil <strong>no està publicat</strong>."
+
+#: ../../mod/settings.php:768 ../../mod/profile_photo.php:206
+msgid "or"
+msgstr "o"
+
+#: ../../mod/settings.php:773
+msgid "Your Identity Address is"
+msgstr "La seva Adreça d'Identitat és"
+
+#: ../../mod/settings.php:784
+msgid "Automatically expire posts after this many days:"
+msgstr "Després de aquests nombre de dies, els missatges caduquen automàticament:"
+
+#: ../../mod/settings.php:784
+msgid "If empty, posts will not expire. Expired posts will be deleted"
+msgstr "Si està buit, els missatges no caducarà. Missatges caducats s'eliminaran"
+
+#: ../../mod/settings.php:785
+msgid "Advanced expiration settings"
+msgstr "Configuració avançada d'expiració"
+
+#: ../../mod/settings.php:786
+msgid "Advanced Expiration"
+msgstr "Expiració Avançada"
+
+#: ../../mod/settings.php:787
+msgid "Expire posts:"
+msgstr "Expiració d'enviaments"
+
+#: ../../mod/settings.php:788
+msgid "Expire personal notes:"
+msgstr "Expiració de notes personals"
+
+#: ../../mod/settings.php:789
+msgid "Expire starred posts:"
+msgstr "Expiració de enviaments de favorits"
+
+#: ../../mod/settings.php:790
+msgid "Expire photos:"
+msgstr "Expiració de fotos"
+
+#: ../../mod/settings.php:795
+msgid "Account Settings"
+msgstr "Ajustos de Compte"
+
+#: ../../mod/settings.php:803
+msgid "Password Settings"
+msgstr "Ajustos de Contrasenya"
+
+#: ../../mod/settings.php:804
+msgid "New Password:"
+msgstr "Nova Contrasenya:"
+
+#: ../../mod/settings.php:805
+msgid "Confirm:"
+msgstr "Confirmar:"
+
+#: ../../mod/settings.php:805
+msgid "Leave password fields blank unless changing"
+msgstr "Deixi els camps de contrasenya buits per a no fer canvis"
+
+#: ../../mod/settings.php:809
+msgid "Basic Settings"
+msgstr "Ajustos Basics"
+
+#: ../../mod/settings.php:810 ../../include/profile_advanced.php:15
+msgid "Full Name:"
+msgstr "Nom Complet:"
+
+#: ../../mod/settings.php:811
+msgid "Email Address:"
+msgstr "Adreça de Correu:"
+
+#: ../../mod/settings.php:812
+msgid "Your Timezone:"
+msgstr "La teva zona Horària:"
+
+#: ../../mod/settings.php:813
+msgid "Default Post Location:"
+msgstr "Localització per Defecte del Missatge:"
+
+#: ../../mod/settings.php:814
+msgid "Use Browser Location:"
+msgstr "Ubicar-se amb el Navegador:"
+
+#: ../../mod/settings.php:815
+msgid "Display Theme:"
+msgstr "Visualitzar el Tema:"
+
+#: ../../mod/settings.php:816
+msgid "Update browser every xx seconds"
+msgstr "Actualitzar navegador cada xx segons"
+
+#: ../../mod/settings.php:816
+msgid "Minimum of 10 seconds, no maximum"
+msgstr "Mínim cada 10 segons, no hi ha màxim"
+
+#: ../../mod/settings.php:818
+msgid "Security and Privacy Settings"
+msgstr "Ajustos de Seguretat i Privacitat"
+
+#: ../../mod/settings.php:820
+msgid "Maximum Friend Requests/Day:"
+msgstr "Nombre Màxim de Sol·licituds per Dia"
+
+#: ../../mod/settings.php:820
+msgid "(to prevent spam abuse)"
+msgstr "(per a prevenir abusos de spam)"
+
+#: ../../mod/settings.php:821
+msgid "Default Post Permissions"
+msgstr "Permisos de Correu per Defecte"
+
+#: ../../mod/settings.php:822
+msgid "(click to open/close)"
+msgstr "(clicar per a obrir/tancar)"
+
+#: ../../mod/settings.php:837
+msgid "Notification Settings"
+msgstr "Ajustos de Notificació"
+
+#: ../../mod/settings.php:838
+msgid "Send a notification email when:"
+msgstr "Envia un correu notificant quan:"
+
+#: ../../mod/settings.php:839
+msgid "You receive an introduction"
+msgstr "Has rebut una presentació"
+
+#: ../../mod/settings.php:840
+msgid "Your introductions are confirmed"
+msgstr "La teva presentació està confirmada"
+
+#: ../../mod/settings.php:841
+msgid "Someone writes on your profile wall"
+msgstr "Algú ha escrit en el teu mur de perfil"
+
+#: ../../mod/settings.php:842
+msgid "Someone writes a followup comment"
+msgstr "Algú ha escrit un comentari de seguiment"
+
+#: ../../mod/settings.php:843
+msgid "You receive a private message"
+msgstr "Has rebut un missatge privat"
+
+#: ../../mod/settings.php:844
+msgid "You receive a friend suggestion"
+msgstr "Has rebut una suggerencia d'un amic"
+
+#: ../../mod/settings.php:845
+msgid "You are tagged in a post"
+msgstr "Estàs etiquetat en un enviament"
+
+#: ../../mod/settings.php:848
+msgid "Advanced Page Settings"
+msgstr "Ajustos Avançats de Pàgina"
+
+#: ../../mod/manage.php:90
+msgid "Manage Identities and/or Pages"
+msgstr "Administrar Identitats i/o  Pàgines"
+
+#: ../../mod/manage.php:93
+msgid ""
+"Toggle between different identities or community/group pages which share "
+"your account details or which you have been granted \"manage\" permissions"
+msgstr "Alternar entre les diferents identitats o les pàgines de comunitats/grups que comparteixen les dades del seu compte o que se li ha concedit els permisos de \"administrar\""
+
+#: ../../mod/manage.php:95
+msgid "Select an identity to manage: "
+msgstr "Seleccionar identitat a administrar:"
+
+#: ../../mod/network.php:43
+msgid "Search Results For:"
+msgstr "Resultats de la Cerca Per a:"
+
+#: ../../mod/network.php:77 ../../mod/search.php:16
+msgid "Remove term"
+msgstr "Traieu termini"
+
+#: ../../mod/network.php:86 ../../mod/search.php:13
+msgid "Saved Searches"
+msgstr "Cerques Guardades"
+
+#: ../../mod/network.php:87 ../../include/group.php:216
+msgid "add"
+msgstr "afegir"
+
+#: ../../mod/network.php:166
+msgid "Commented Order"
+msgstr "Ordre dels Comentaris"
+
+#: ../../mod/network.php:171
+msgid "Posted Order"
+msgstr "Ordre dels Enviaments"
+
+#: ../../mod/network.php:182
+msgid "New"
+msgstr "Nou"
+
+#: ../../mod/network.php:187
+msgid "Starred"
+msgstr "Favorits"
+
+#: ../../mod/network.php:192
+msgid "Bookmarks"
+msgstr "Marcadors"
+
+#: ../../mod/network.php:250
+#, php-format
+msgid "Warning: This group contains %s member from an insecure network."
+msgid_plural ""
+"Warning: This group contains %s members from an insecure network."
+msgstr[0] "Advertència: Aquest grup conté el membre %s en una xarxa insegura."
+msgstr[1] "Advertència: Aquest grup conté %s membres d'una xarxa insegura."
+
+#: ../../mod/network.php:253
+msgid "Private messages to this group are at risk of public disclosure."
+msgstr "Els missatges privats a aquest grup es troben en risc de divulgació pública."
+
+#: ../../mod/network.php:298
+msgid "No such group"
+msgstr "Cap grup com"
+
+#: ../../mod/network.php:309
+msgid "Group is empty"
+msgstr "El Grup es buit"
+
+#: ../../mod/network.php:313
+msgid "Group: "
+msgstr "Grup:"
+
+#: ../../mod/network.php:323
+msgid "Contact: "
+msgstr "Contacte:"
+
+#: ../../mod/network.php:325
+msgid "Private messages to this person are at risk of public disclosure."
+msgstr "Els missatges privats a aquesta persona es troben en risc de divulgació pública."
+
+#: ../../mod/network.php:330
+msgid "Invalid contact."
+msgstr "Contacte no vàlid."
+
+#: ../../mod/notes.php:44 ../../boot.php:1354
+msgid "Personal Notes"
+msgstr "Notes Personals"
+
+#: ../../mod/notes.php:63 ../../include/text.php:645
+msgid "Save"
+msgstr "Guardar"
+
+#: ../../mod/newmember.php:6
+msgid "Welcome to Friendica"
+msgstr "Benvingut a Friendica"
+
+#: ../../mod/newmember.php:8
+msgid "New Member Checklist"
+msgstr "Llista de Verificació dels Nous Membres"
+
+#: ../../mod/newmember.php:12
+msgid ""
+"We would like to offer some tips and links to help make your experience "
+"enjoyable. Click any item to visit the relevant page. A link to this page "
+"will be visible from your home page for two weeks after your initial "
+"registration and then will quietly disappear."
+msgstr "Ens agradaria oferir alguns consells i enllaços per ajudar a fer la seva experiència agradable. Feu clic a qualsevol element per visitar la pàgina corresponent. Un enllaç a aquesta pàgina serà visible des de la pàgina d'inici durant dues setmanes després de la seva inscripció inicial i després desapareixerà en silenci."
+
+#: ../../mod/newmember.php:16
+msgid ""
+"On your <em>Settings</em> page -  change your initial password. Also make a "
+"note of your Identity Address. This looks just like an email address - and "
+"will be useful in making friends on the free social web."
+msgstr "En la  de la seva <em>configuració</em> de la pàgina - canviï la contrasenya inicial. També prengui nota de la Adreça d'Identitat. Això s'assembla a una adreça de correu electrònic - i serà útil per fer amics a la xarxa social lliure."
+
+#: ../../mod/newmember.php:18
+msgid ""
+"Review the other settings, particularly the privacy settings. An unpublished"
+" directory listing is like having an unlisted phone number. In general, you "
+"should probably publish your listing - unless all of your friends and "
+"potential friends know exactly how to find you."
+msgstr "Reviseu les altres configuracions, en particular la configuració de privadesa. Una llista de directoris no publicada és com tenir un número de telèfon no llistat. Normalment, hauria de publicar la seva llista - a menys que tots els seus amics i els amics potencials sàpiguen exactament com trobar-li."
+
+#: ../../mod/newmember.php:20
+msgid ""
+"Upload a profile photo if you have not done so already. Studies have shown "
+"that people with real photos of themselves are ten times more likely to make"
+" friends than people who do not."
+msgstr "Puji una foto del seu perfil si encara no ho ha fet. Els estudis han demostrat que les persones amb fotos reals de ells mateixos tenen deu vegades més probabilitats de fer amics que les persones que no ho fan."
+
+#: ../../mod/newmember.php:23
+msgid ""
+"Authorise the Facebook Connector if you currently have a Facebook account "
+"and we will (optionally) import all your Facebook friends and conversations."
+msgstr "Autoritzi el connector de Facebook si vostè té un compte al Facebook i nosaltres (opcionalment) importarem tots els teus amics de Facebook i les converses."
+
+#: ../../mod/newmember.php:25
+msgid ""
+"<em>If</em> this is your own personal server, installing the Facebook addon "
+"may ease your transition to the free social web."
+msgstr "<em>Si </em> aquesta és el seu servidor personal, la instal·lació del complement de Facebook pot facilitar la transició a la web social lliure."
+
+#: ../../mod/newmember.php:30
+msgid ""
+"Enter your email access information on your Connector Settings page if you "
+"wish to import and interact with friends or mailing lists from your email "
+"INBOX"
+msgstr "Introduïu les dades d'accés al correu electrònic a la seva pàgina de configuració de connector, si es desitja importar i relacionar-se amb amics o llistes de correu de la seva bústia d'email"
+
+#: ../../mod/newmember.php:32
+msgid ""
+"Edit your <strong>default</strong> profile to your liking. Review the "
+"settings for hiding your list of friends and hiding the profile from unknown"
+" visitors."
+msgstr "Editi  el perfil per <strong>defecte</strong> al seu gust. Reviseu la configuració per ocultar la seva llista d'amics i ocultar el perfil dels visitants desconeguts."
+
+#: ../../mod/newmember.php:34
+msgid ""
+"Set some public keywords for your default profile which describe your "
+"interests. We may be able to find other people with similar interests and "
+"suggest friendships."
+msgstr "Estableix algunes paraules clau públiques al teu perfil predeterminat que descriguin els teus interessos. Podem ser capaços de trobar altres persones amb interessos similars i suggerir amistats."
+
+#: ../../mod/newmember.php:36
+msgid ""
+"Your Contacts page is your gateway to managing friendships and connecting "
+"with friends on other networks. Typically you enter their address or site "
+"URL in the <em>Add New Contact</em> dialog."
+msgstr "La seva pàgina de Contactes és la seva porta d'entrada a la gestió de l'amistat i la connexió amb amics d'altres xarxes. Normalment, vostè entrar en la seva direcció o URL del lloc al  diàleg <em>Afegir Nou Contacte</em>."
+
+#: ../../mod/newmember.php:38
+msgid ""
+"The Directory page lets you find other people in this network or other "
+"federated sites. Look for a <em>Connect</em> or <em>Follow</em> link on "
+"their profile page. Provide your own Identity Address if requested."
+msgstr "La pàgina del Directori li permet trobar altres persones en aquesta xarxa o altres llocs federats. Busqui un enllaç <em>Connectar</em> o <em>Seguir</em> a la seva pàgina de perfil. Proporcioni la seva pròpia Adreça de Identitat si així ho sol·licita."
+
+#: ../../mod/newmember.php:40
+msgid ""
+"On the side panel of the Contacts page are several tools to find new "
+"friends. We can match people by interest, look up people by name or "
+"interest, and provide suggestions based on network relationships. On a brand"
+" new site, friend suggestions will usually begin to be populated within 24 "
+"hours."
+msgstr "Al tauler lateral de la pàgina de contacte Hi ha diverses eines per trobar nous amics. Podem coincidir amb les persones per interesos, buscar persones pel nom o per interès, i oferir suggeriments basats en les relacions de la xarxa. En un nou lloc, els suggeriments d'amics, en general comencen a poblar el lloc a les 24 hores."
+
+#: ../../mod/newmember.php:42
+msgid ""
+"Once you have made some friends, organize them into private conversation "
+"groups from the sidebar of your Contacts page and then you can interact with"
+" each group privately on your Network page."
+msgstr "Una vegada que s'han fet alguns amics, organitzi'ls en grups de conversa privada a la barra lateral de la seva pàgina de contactes i després pot interactuar amb cada grup de forma privada a la pàgina de la xarxa."
+
+#: ../../mod/newmember.php:44
+msgid ""
+"Our <strong>help</strong> pages may be consulted for detail on other program"
+" features and resources."
+msgstr "A les nostres pàgines <strong>d'ajuda</strong> es poden consultar detalls sobre les característiques d'altres programes i recursos."
+
+#: ../../mod/attach.php:8
+msgid "Item not available."
+msgstr "Element no disponible"
+
+#: ../../mod/attach.php:20
+msgid "Item was not found."
+msgstr "Element no trobat."
+
+#: ../../mod/group.php:27
+msgid "Group created."
+msgstr "Grup creat."
+
+#: ../../mod/group.php:33
+msgid "Could not create group."
+msgstr "No puc crear grup."
+
+#: ../../mod/group.php:43 ../../mod/group.php:127
+msgid "Group not found."
+msgstr "Grup no trobat"
+
+#: ../../mod/group.php:56
+msgid "Group name changed."
+msgstr "Nom de Grup canviat."
+
+#: ../../mod/group.php:67 ../../mod/profperm.php:19 ../../index.php:287
+msgid "Permission denied"
+msgstr "Permís denegat"
+
+#: ../../mod/group.php:85
+msgid "Create a group of contacts/friends."
+msgstr "Crear un grup de contactes/amics."
+
+#: ../../mod/group.php:86 ../../mod/group.php:166
+msgid "Group Name: "
+msgstr "Nom del Grup:"
+
+#: ../../mod/group.php:102
+msgid "Group removed."
+msgstr "Grup esborrat."
+
+#: ../../mod/group.php:104
+msgid "Unable to remove group."
+msgstr "Incapaç de esborrar Grup."
+
+#: ../../mod/group.php:165
+msgid "Group Editor"
+msgstr "Editor de Grup:"
+
+#: ../../mod/group.php:177
+msgid "Members"
+msgstr "Membres"
+
+#: ../../mod/group.php:209 ../../mod/profperm.php:105
+msgid "Click on a contact to add or remove."
+msgstr "Clicar sobre el contacte per afegir o esborrar."
+
+#: ../../mod/profperm.php:25 ../../mod/profperm.php:55
+msgid "Invalid profile identifier."
+msgstr "Identificador del perfil no vàlid."
+
+#: ../../mod/profperm.php:101
+msgid "Profile Visibility Editor"
+msgstr "Editor de Visibilitat del Perfil"
+
+#: ../../mod/profperm.php:103 ../../include/profile_advanced.php:7
+#: ../../include/profile_advanced.php:76 ../../include/nav.php:48
+#: ../../boot.php:1336
+msgid "Profile"
+msgstr "Perfil"
+
+#: ../../mod/profperm.php:114
+msgid "Visible To"
+msgstr "Visible Per"
+
+#: ../../mod/profperm.php:130
+msgid "All Contacts (with secure profile access)"
+msgstr "Tots els Contactes (amb accés segur al perfil)"
+
+#: ../../mod/viewcontacts.php:39
+msgid "No contacts."
+msgstr "Sense Contactes"
+
+#: ../../mod/viewcontacts.php:74 ../../include/text.php:584
+msgid "View Contacts"
+msgstr "Veure Contactes"
+
+#: ../../mod/register.php:62
+msgid "An invitation is required."
+msgstr "Es requereix invitació."
+
+#: ../../mod/register.php:67
+msgid "Invitation could not be verified."
+msgstr "La invitació no ha pogut ser verificada."
+
+#: ../../mod/register.php:75
+msgid "Invalid OpenID url"
+msgstr "OpenID url no vàlid"
+
+#: ../../mod/register.php:90
+msgid "Please enter the required information."
+msgstr "Per favor, introdueixi la informació requerida."
+
+#: ../../mod/register.php:104
+msgid "Please use a shorter name."
+msgstr "Per favor, empri un nom més curt."
+
+#: ../../mod/register.php:106
+msgid "Name too short."
+msgstr "Nom massa curt."
+
+#: ../../mod/register.php:121
+msgid "That doesn't appear to be your full (First Last) name."
+msgstr "Això no sembla ser el teu nom complet."
+
+#: ../../mod/register.php:126
+msgid "Your email domain is not among those allowed on this site."
+msgstr "El seu domini de correu electrònic no es troba entre els permesos en aquest lloc."
+
+#: ../../mod/register.php:129
+msgid "Not a valid email address."
+msgstr "Adreça de correu no vàlida."
+
+#: ../../mod/register.php:139
+msgid "Cannot use that email."
+msgstr "No es pot utilitzar aquest correu electrònic."
+
+#: ../../mod/register.php:145
+msgid ""
+"Your \"nickname\" can only contain \"a-z\", \"0-9\", \"-\", and \"_\", and "
+"must also begin with a letter."
+msgstr "El teu sobrenom nomes pot contenir \"a-z\", \"0-9\", \"-\", i \"_\", i començar amb lletra."
+
+#: ../../mod/register.php:151 ../../mod/register.php:252
+msgid "Nickname is already registered. Please choose another."
+msgstr "malnom ja registrat. Tria un altre."
+
+#: ../../mod/register.php:170
+msgid "SERIOUS ERROR: Generation of security keys failed."
+msgstr "ERROR IMPORTANT: La generació de claus de seguretat ha fallat."
+
+#: ../../mod/register.php:238
+msgid "An error occurred during registration. Please try again."
+msgstr "Un error ha succeït durant el registre. Intenta-ho de nou."
+
+#: ../../mod/register.php:274
+msgid "An error occurred creating your default profile. Please try again."
+msgstr "Un error ha succeit durant la creació del teu perfil per defecte. Intenta-ho de nou."
+
+#: ../../mod/register.php:378 ../../mod/regmod.php:52
+#, php-format
+msgid "Registration details for %s"
+msgstr "Detalls del registre per a %s"
+
+#: ../../mod/register.php:386
+msgid ""
+"Registration successful. Please check your email for further instructions."
+msgstr "Registrat amb èxit. Per favor, comprovi el seu correu per a posteriors instruccions."
+
+#: ../../mod/register.php:390
+msgid "Failed to send email message. Here is the message that failed."
+msgstr "Error en enviar missatge de correu electrònic. Aquí està el missatge que ha fallat."
+
+#: ../../mod/register.php:395
+msgid "Your registration can not be processed."
+msgstr "El seu registre no pot ser processat."
+
+#: ../../mod/register.php:432
+#, php-format
+msgid "Registration request at %s"
+msgstr "Sol·licitud de registre a %s"
+
+#: ../../mod/register.php:441
+msgid "Your registration is pending approval by the site owner."
+msgstr "El seu registre està pendent d'aprovació pel propietari del lloc."
+
+#: ../../mod/register.php:479
+msgid ""
+"This site has exceeded the number of allowed daily account registrations. "
+"Please try again tomorrow."
+msgstr "Aquest lloc excedeix el nombre diari de registres de comptes. Per favor, provi de nou demà."
+
+#: ../../mod/register.php:505
+msgid ""
+"You may (optionally) fill in this form via OpenID by supplying your OpenID "
+"and clicking 'Register'."
+msgstr "Vostè pot (opcionalment), omplir aquest formulari a través de OpenID mitjançant el subministrament de la seva OpenID i fent clic a 'Registrar'."
+
+#: ../../mod/register.php:506
+msgid ""
+"If you are not familiar with OpenID, please leave that field blank and fill "
+"in the rest of the items."
+msgstr "Si vostè no està familiaritzat amb Twitter, si us plau deixi aquest camp en blanc i completi la resta dels elements."
+
+#: ../../mod/register.php:507
+msgid "Your OpenID (optional): "
+msgstr "El seu OpenID (opcional):"
+
+#: ../../mod/register.php:521
+msgid "Include your profile in member directory?"
+msgstr "Incloc el seu perfil al directori de membres?"
+
+#: ../../mod/register.php:536
+msgid "Membership on this site is by invitation only."
+msgstr "Lloc accesible mitjançant invitació."
+
+#: ../../mod/register.php:537
+msgid "Your invitation ID: "
+msgstr "El teu ID de invitació:"
+
+#: ../../mod/register.php:540 ../../mod/admin.php:314
+msgid "Registration"
+msgstr "Procés de Registre"
+
+#: ../../mod/register.php:548
+msgid "Your Full Name (e.g. Joe Smith): "
+msgstr "El seu nom complet (per exemple, Joan Ningú):"
+
+#: ../../mod/register.php:549
+msgid "Your Email Address: "
+msgstr "La Seva Adreça de Correu:"
+
+#: ../../mod/register.php:550
+msgid ""
+"Choose a profile nickname. This must begin with a text character. Your "
+"profile address on this site will then be "
+"'<strong>nickname@$sitename</strong>'."
+msgstr "Tria un nom de perfil. Això ha de començar amb un caràcter de text. La seva adreça de perfil en aquest lloc serà '<strong>malnom@$sitename</strong>'."
+
+#: ../../mod/register.php:551
+msgid "Choose a nickname: "
+msgstr "Tria un malnom:"
+
+#: ../../mod/register.php:554 ../../include/nav.php:77 ../../boot.php:693
+msgid "Register"
+msgstr "Registrar"
+
+#: ../../mod/dirfind.php:23
+msgid "People Search"
+msgstr "Cercant Gent"
+
+#: ../../mod/like.php:127 ../../mod/tagger.php:70
+#: ../../addon/facebook/facebook.php:1092
+#: ../../addon/communityhome/communityhome.php:158
+#: ../../addon/communityhome/communityhome.php:167
+#: ../../include/diaspora.php:1600 ../../include/conversation.php:48
+#: ../../include/conversation.php:57 ../../include/conversation.php:121
+#: ../../include/conversation.php:130
+msgid "status"
+msgstr "estatus"
+
+#: ../../mod/like.php:144 ../../addon/facebook/facebook.php:1096
+#: ../../addon/communityhome/communityhome.php:172
+#: ../../include/diaspora.php:1616 ../../include/conversation.php:65
+#, php-format
+msgid "%1$s likes %2$s's %3$s"
+msgstr "a %1$s agrada %2$s de %3$s"
+
+#: ../../mod/like.php:146 ../../include/conversation.php:68
+#, php-format
+msgid "%1$s doesn't like %2$s's %3$s"
+msgstr "a %1$s no agrada %2$s de %3$s"
+
+#: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:127
+#: ../../mod/admin.php:522 ../../mod/admin.php:700 ../../mod/display.php:29
+#: ../../mod/display.php:137 ../../mod/viewd.php:14
+#: ../../include/items.php:2942
+msgid "Item not found."
+msgstr "Article no trobat."
+
+#: ../../mod/viewsrc.php:7 ../../mod/viewd.php:6
+msgid "Access denied."
+msgstr "Accés denegat."
+
+#: ../../mod/regmod.php:61
+msgid "Account approved."
+msgstr "Compte aprovat."
+
+#: ../../mod/regmod.php:93
+#, php-format
+msgid "Registration revoked for %s"
+msgstr "Procés de Registre revocat per a %s"
+
+#: ../../mod/regmod.php:105
+msgid "Please login."
+msgstr "Si us plau, ingressa."
+
+#: ../../mod/item.php:89
+msgid "Unable to locate original post."
+msgstr "No es pot localitzar post original."
+
+#: ../../mod/item.php:249
+msgid "Empty post discarded."
+msgstr "Buidat després de rebutjar."
+
+#: ../../mod/item.php:351 ../../mod/wall_upload.php:81
+#: ../../mod/wall_upload.php:90 ../../mod/wall_upload.php:97
+#: ../../include/message.php:143
+msgid "Wall Photos"
+msgstr "Fotos del Mur"
+
+#: ../../mod/item.php:833
+msgid "System error. Post not saved."
+msgstr "Error del sistema. Publicació no guardada."
+
+#: ../../mod/item.php:858
+#, php-format
+msgid ""
+"This message was sent to you by %s, a member of the Friendica social "
+"network."
+msgstr "Aquest missatge va ser enviat a vostè per %s, un membre de la xarxa social Friendica."
+
+#: ../../mod/item.php:860
+#, php-format
+msgid "You may visit them online at %s"
+msgstr "El pot visitar en línia a %s"
+
+#: ../../mod/item.php:861
+msgid ""
+"Please contact the sender by replying to this post if you do not wish to "
+"receive these messages."
+msgstr "Si us plau, poseu-vos en contacte amb el remitent responent a aquest missatge si no voleu rebre aquests missatges."
+
+#: ../../mod/item.php:863
+#, php-format
+msgid "%s posted an update."
+msgstr "%s ha publicat una actualització."
+
+#: ../../mod/profile_photo.php:28
+msgid "Image uploaded but image cropping failed."
+msgstr "Imatge pujada però no es va poder retallar."
+
+#: ../../mod/profile_photo.php:61 ../../mod/profile_photo.php:68
+#: ../../mod/profile_photo.php:75 ../../mod/profile_photo.php:258
+#, php-format
+msgid "Image size reduction [%s] failed."
+msgstr "La reducció de la imatge [%s] va fracassar."
+
+#: ../../mod/profile_photo.php:89
+msgid ""
+"Shift-reload the page or clear browser cache if the new photo does not "
+"display immediately."
+msgstr "Recarregui la pàgina o netegi la caché del navegador si la nova foto no apareix immediatament."
+
+#: ../../mod/profile_photo.php:99
+msgid "Unable to process image"
+msgstr "No es pot processar la imatge"
+
+#: ../../mod/profile_photo.php:113 ../../mod/wall_upload.php:56
+#, php-format
+msgid "Image exceeds size limit of %d"
+msgstr "La imatge sobrepassa el límit de mida de %d"
+
+#: ../../mod/profile_photo.php:203
+msgid "Upload File:"
+msgstr "Pujar arxiu:"
+
+#: ../../mod/profile_photo.php:204
+msgid "Upload Profile Photo"
+msgstr "Pujar Foto del Perfil"
+
+#: ../../mod/profile_photo.php:205
+msgid "Upload"
+msgstr "Pujar"
+
+#: ../../mod/profile_photo.php:206
+msgid "skip this step"
+msgstr "saltar aquest pas"
+
+#: ../../mod/profile_photo.php:206
+msgid "select a photo from your photo albums"
+msgstr "tria una foto dels teus àlbums"
+
+#: ../../mod/profile_photo.php:219
+msgid "Crop Image"
+msgstr "retallar imatge"
+
+#: ../../mod/profile_photo.php:220
+msgid "Please adjust the image cropping for optimum viewing."
+msgstr "Per favor, ajusta la retallada d'imatge per a una optima visualització."
+
+#: ../../mod/profile_photo.php:221
+msgid "Done Editing"
+msgstr "Edició Feta"
+
+#: ../../mod/profile_photo.php:249
+msgid "Image uploaded successfully."
+msgstr "Carregada de la imatge amb èxit."
+
+#: ../../mod/hcard.php:10
+msgid "No profile"
+msgstr "Sense perfil"
+
+#: ../../mod/removeme.php:45 ../../mod/removeme.php:48
+msgid "Remove My Account"
+msgstr "Eliminar el Meu Compte"
+
+#: ../../mod/removeme.php:46
+msgid ""
+"This will completely remove your account. Once this has been done it is not "
+"recoverable."
+msgstr "Això eliminarà per complet el seu compte. Quan s'hagi fet això, no serà recuperable."
+
+#: ../../mod/removeme.php:47
+msgid "Please enter your password for verification:"
+msgstr "Si us plau, introduïu la contrasenya per a la verificació:"
+
+#: ../../mod/message.php:23
+msgid "No recipient selected."
+msgstr "No s'ha seleccionat destinatari."
+
+#: ../../mod/message.php:26
+msgid "Unable to locate contact information."
+msgstr "No es pot trobar informació de contacte."
+
+#: ../../mod/message.php:29
+msgid "Message could not be sent."
+msgstr "El Missatge no ha estat enviat."
+
+#: ../../mod/message.php:32
+msgid "Message collection failure."
+msgstr "Ha fallat la recollida del missatge."
+
+#: ../../mod/message.php:35
+msgid "Message sent."
+msgstr "Missatge enviat."
+
+#: ../../mod/message.php:55
+msgid "Inbox"
+msgstr "Safata d'entrada"
+
+#: ../../mod/message.php:60
+msgid "Outbox"
+msgstr "Safata de sortida"
+
+#: ../../mod/message.php:65
+msgid "New Message"
+msgstr "Nou Missatge"
+
+#: ../../mod/message.php:91
+msgid "Message deleted."
+msgstr "Missatge eliminat."
+
+#: ../../mod/message.php:121
+msgid "Conversation removed."
+msgstr "Conversació esborrada."
+
+#: ../../mod/message.php:137 ../../include/conversation.php:887
+msgid "Please enter a link URL:"
+msgstr "Sius plau, entri l'enllaç URL:"
+
+#: ../../mod/message.php:145
+msgid "Send Private Message"
+msgstr "Enviant Missatge Privat"
+
+#: ../../mod/message.php:146 ../../mod/message.php:287
+msgid "To:"
+msgstr "Per a:"
+
+#: ../../mod/message.php:147 ../../mod/message.php:288
+msgid "Subject:"
+msgstr "Assumpte::"
+
+#: ../../mod/message.php:150 ../../mod/message.php:291
+#: ../../mod/invite.php:101
+msgid "Your message:"
+msgstr "El teu missatge:"
+
+#: ../../mod/message.php:188
+msgid "No messages."
+msgstr "Sense missatges."
+
+#: ../../mod/message.php:201
+msgid "Delete conversation"
+msgstr "Esborrar conversació"
+
+#: ../../mod/message.php:204
+msgid "D, d M Y - g:i A"
+msgstr "D, d M Y - g:i A"
+
+#: ../../mod/message.php:239
+msgid "Message not available."
+msgstr "Missatge no disponible."
+
+#: ../../mod/message.php:276
+msgid "Delete message"
+msgstr "Esborra missatge"
+
+#: ../../mod/message.php:286
+msgid "Send Reply"
+msgstr "Enviar Resposta"
+
+#: ../../mod/allfriends.php:34
+#, php-format
+msgid "Friends of %s"
+msgstr "Amics de %s"
+
+#: ../../mod/allfriends.php:40
+msgid "No friends to display."
+msgstr "No hi ha amics que mostrar"
+
+#: ../../mod/admin.php:71 ../../mod/admin.php:312
+msgid "Site"
+msgstr "Lloc"
+
+#: ../../mod/admin.php:72 ../../mod/admin.php:480 ../../mod/admin.php:492
+msgid "Users"
+msgstr "Usuaris"
+
+#: ../../mod/admin.php:73 ../../mod/admin.php:569 ../../mod/admin.php:608
+msgid "Plugins"
+msgstr "Plugins"
+
+#: ../../mod/admin.php:74 ../../mod/admin.php:742 ../../mod/admin.php:775
+msgid "Themes"
+msgstr "Temes"
+
+#: ../../mod/admin.php:89 ../../mod/admin.php:855
+msgid "Logs"
+msgstr "Transcripcions"
+
+#: ../../mod/admin.php:94
+msgid "User registrations waiting for confirmation"
+msgstr "Registre d'usuari a l'espera de confirmació"
+
+#: ../../mod/admin.php:161 ../../mod/admin.php:311 ../../mod/admin.php:479
+#: ../../mod/admin.php:568 ../../mod/admin.php:607 ../../mod/admin.php:741
+#: ../../mod/admin.php:774 ../../mod/admin.php:854
+msgid "Administration"
+msgstr "Administració"
+
+#: ../../mod/admin.php:162
+msgid "Summary"
+msgstr "Sumari"
+
+#: ../../mod/admin.php:163
+msgid "Registered users"
+msgstr "Usuaris registrats"
+
+#: ../../mod/admin.php:165
+msgid "Pending registrations"
+msgstr "Registres d'usuari pendents"
+
+#: ../../mod/admin.php:166
+msgid "Version"
+msgstr "Versió"
+
+#: ../../mod/admin.php:168
+msgid "Active plugins"
+msgstr "Plugins actius"
+
+#: ../../mod/admin.php:260
+msgid "Site settings updated."
+msgstr "Ajustos del lloc actualitzats."
+
+#: ../../mod/admin.php:304
+msgid "Closed"
+msgstr "Tancat"
+
+#: ../../mod/admin.php:305
+msgid "Requires approval"
+msgstr "Requereix aprovació"
+
+#: ../../mod/admin.php:306
+msgid "Open"
+msgstr "Obert"
+
+#: ../../mod/admin.php:315
+msgid "File upload"
+msgstr "Fitxer carregat"
+
+#: ../../mod/admin.php:316
+msgid "Policies"
+msgstr "Polítiques"
+
+#: ../../mod/admin.php:317
+msgid "Advanced"
+msgstr "Avançat"
+
+#: ../../mod/admin.php:321 ../../addon/statusnet/statusnet.php:523
+msgid "Site name"
+msgstr "Nom del lloc"
+
+#: ../../mod/admin.php:322
+msgid "Banner/Logo"
+msgstr "Senyera/Logo"
+
+#: ../../mod/admin.php:323
+msgid "System language"
+msgstr "Idioma del Systema"
+
+#: ../../mod/admin.php:324
+msgid "System theme"
+msgstr "Tema del sistema"
+
+#: ../../mod/admin.php:324
+msgid "Default system theme - may be over-ridden by user profiles"
+msgstr "Tema per defecte del sitema - pot ser canviat als perfils dels usuaris"
+
+#: ../../mod/admin.php:326
+msgid "Maximum image size"
+msgstr "Mida màxima de les imatges"
+
+#: ../../mod/admin.php:326
+msgid ""
+"Maximum size in bytes of uploaded images. Default is 0, which means no "
+"limits."
+msgstr "Mida màxima en bytes de les imatges a pujar. Per defecte es 0, que vol dir sense límits."
+
+#: ../../mod/admin.php:328
+msgid "Register policy"
+msgstr "Política per a registrar"
+
+#: ../../mod/admin.php:329
+msgid "Register text"
+msgstr "Text al registrar"
+
+#: ../../mod/admin.php:329
+msgid "Will be displayed prominently on the registration page."
+msgstr "Sea mostrat de forma peminent a la pagina durant el procés de registre."
+
+#: ../../mod/admin.php:330
+msgid "Accounts abandoned after x days"
+msgstr "Comptes abandonats després de x dies"
+
+#: ../../mod/admin.php:330
+msgid ""
+"Will not waste system resources polling external sites for abandonded "
+"accounts. Enter 0 for no time limit."
+msgstr "No gastará recursos del sistema creant enquestes des de llocs externos per a comptes abandonats. Introdueixi 0 per a cap límit temporal."
+
+#: ../../mod/admin.php:331
+msgid "Allowed friend domains"
+msgstr "Dominis amics permesos"
+
+#: ../../mod/admin.php:331
+msgid ""
+"Comma separated list of domains which are allowed to establish friendships "
+"with this site. Wildcards are accepted. Empty to allow any domains"
+msgstr "Llista de dominis separada per comes, de adreçes de correu que són permeses per establir amistats. S'admeten comodins. Deixa'l buit per a acceptar tots els dominis."
+
+#: ../../mod/admin.php:332
+msgid "Allowed email domains"
+msgstr "Dominis de correu permesos"
+
+#: ../../mod/admin.php:332
+msgid ""
+"Comma separated list of domains which are allowed in email addresses for "
+"registrations to this site. Wildcards are accepted. Empty to allow any "
+"domains"
+msgstr "Llista de dominis separada per comes, de adreçes de correu que són permeses per registrtar-se. S'admeten comodins. Deixa'l buit per a acceptar tots els dominis."
+
+#: ../../mod/admin.php:333
+msgid "Block public"
+msgstr "Bloqueig públic"
+
+#: ../../mod/admin.php:333
+msgid ""
+"Check to block public access to all otherwise public personal pages on this "
+"site unless you are currently logged in."
+msgstr "Bloqueija l'accés públic a qualsevol pàgina del lloc fins que t'hagis identificat."
+
+#: ../../mod/admin.php:334
+msgid "Force publish"
+msgstr "Forçar publicació"
+
+#: ../../mod/admin.php:334
+msgid ""
+"Check to force all profiles on this site to be listed in the site directory."
+msgstr "Obliga a que tots el perfils en aquest lloc siguin mostrats en el directori del lloc."
+
+#: ../../mod/admin.php:335
+msgid "Global directory update URL"
+msgstr "Actualitzar URL del directori global"
+
+#: ../../mod/admin.php:335
+msgid ""
+"URL to update the global directory. If this is not set, the global directory"
+" is completely unavailable to the application."
+msgstr "URL per actualitzar el directori global. Si no es configura, el directori global serà completament inaccesible per a l'aplicació. "
+
+#: ../../mod/admin.php:337
+msgid "Block multiple registrations"
+msgstr "Bloquejar multiples registracions"
+
+#: ../../mod/admin.php:337
+msgid "Disallow users to register additional accounts for use as pages."
+msgstr "Inhabilita als usuaris el crear comptes adicionals per a usar com a pàgines."
+
+#: ../../mod/admin.php:338
+msgid "OpenID support"
+msgstr "Suport per a OpenID"
+
+#: ../../mod/admin.php:338
+msgid "OpenID support for registration and logins."
+msgstr "Suport per a registre i validació a OpenID."
+
+#: ../../mod/admin.php:339
+msgid "Gravatar support"
+msgstr "Suport per a gravatar"
+
+#: ../../mod/admin.php:339
+msgid "Search new user's photo on Gravatar."
+msgstr "Cerca la nova foto d'usuari a Gravatar."
+
+#: ../../mod/admin.php:340
+msgid "Fullname check"
+msgstr "Comprobació de nom complet"
+
+#: ../../mod/admin.php:340
+msgid ""
+"Force users to register with a space between firstname and lastname in Full "
+"name, as an antispam measure"
+msgstr "Obliga els usuaris a col·locar un espai en blanc entre nom i cognoms, com a mesura antifemater"
+
+#: ../../mod/admin.php:341
+msgid "UTF-8 Regular expressions"
+msgstr "expresions regulars UTF-8"
+
+#: ../../mod/admin.php:341
+msgid "Use PHP UTF8 regular expressions"
+msgstr "Empri expresions regulars de PHP amb format UTF8"
+
+#: ../../mod/admin.php:342
+msgid "Show Community Page"
+msgstr "Mostra la Pàgina de Comunitat"
+
+#: ../../mod/admin.php:342
+msgid ""
+"Display a Community page showing all recent public postings on this site."
+msgstr "Mostra a la pàgina de comunitat tots els missatges públics recents, d'aquest lloc."
+
+#: ../../mod/admin.php:343
+msgid "Enable OStatus support"
+msgstr "Activa el suport per a OStatus"
+
+#: ../../mod/admin.php:343
+msgid ""
+"Provide built-in OStatus (identi.ca, status.net, etc.) compatibility. All "
+"communications in OStatus are public, so privacy warnings will be "
+"occasionally displayed."
+msgstr "Proveeix de compatibilitat integrada amb OStatus (identi.ca, status.net, etc). Totes les comunicacions a OStatus són públiques amb el que ocasionalment pots veure advertències."
+
+#: ../../mod/admin.php:344
+msgid "Enable Diaspora support"
+msgstr "Habilitar suport per Diaspora"
+
+#: ../../mod/admin.php:344
+msgid "Provide built-in Diaspora network compatibility."
+msgstr "Proveeix compatibilitat integrada amb la xarxa Diaspora"
+
+#: ../../mod/admin.php:345
+msgid "Only allow Friendica contacts"
+msgstr "Només permetre contactes de Friendica"
+
+#: ../../mod/admin.php:345
+msgid ""
+"All contacts must use Friendica protocols. All other built-in communication "
+"protocols disabled."
+msgstr "Tots els contactes "
+
+#: ../../mod/admin.php:346
+msgid "Verify SSL"
+msgstr "Verificar SSL"
+
+#: ../../mod/admin.php:346
+msgid ""
+"If you wish, you can turn on strict certificate checking. This will mean you"
+" cannot connect (at all) to self-signed SSL sites."
+msgstr "Si ho vols, pots comprovar el certificat estrictament. Això farà que no puguis connectar (de cap manera) amb llocs amb certificats SSL autosignats."
+
+#: ../../mod/admin.php:347
+msgid "Proxy user"
+msgstr "proxy d'usuari"
+
+#: ../../mod/admin.php:348
+msgid "Proxy URL"
+msgstr "URL del proxy"
+
+#: ../../mod/admin.php:349
+msgid "Network timeout"
+msgstr "Temps excedit a la xarxa"
+
+#: ../../mod/admin.php:349
+msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
+msgstr "Valor en segons. Canviat a 0 es sense límits (no recomenat)"
+
+#: ../../mod/admin.php:370
+#, php-format
+msgid "%s user blocked/unblocked"
+msgid_plural "%s users blocked/unblocked"
+msgstr[0] "%s usuari bloquejar/desbloquejar"
+msgstr[1] "%s usuaris bloquejar/desbloquejar"
+
+#: ../../mod/admin.php:377
+#, php-format
+msgid "%s user deleted"
+msgid_plural "%s users deleted"
+msgstr[0] "%s usuari esborrat"
+msgstr[1] "%s usuaris esborrats"
+
+#: ../../mod/admin.php:411
+#, php-format
+msgid "User '%s' deleted"
+msgstr "Usuari %s' esborrat"
+
+#: ../../mod/admin.php:418
+#, php-format
+msgid "User '%s' unblocked"
+msgstr "Usuari %s' desbloquejat"
+
+#: ../../mod/admin.php:418
+#, php-format
+msgid "User '%s' blocked"
+msgstr "L'usuari '%s' és bloquejat"
+
+#: ../../mod/admin.php:482
+msgid "select all"
+msgstr "Seleccionar tot"
+
+#: ../../mod/admin.php:483
+msgid "User registrations waiting for confirm"
+msgstr "Registre d'usuari esperant confirmació"
+
+#: ../../mod/admin.php:484
+msgid "Request date"
+msgstr "Data de sol·licitud"
+
+#: ../../mod/admin.php:484 ../../mod/admin.php:493
+#: ../../include/contact_selectors.php:79
+msgid "Email"
+msgstr "Correu"
+
+#: ../../mod/admin.php:485
+msgid "No registrations."
+msgstr "Sense registres."
+
+#: ../../mod/admin.php:487
+msgid "Deny"
+msgstr "Denegar"
+
+#: ../../mod/admin.php:493
+msgid "Register date"
+msgstr "Data de registre"
+
+#: ../../mod/admin.php:493
+msgid "Last login"
+msgstr "Últim accés"
+
+#: ../../mod/admin.php:493
+msgid "Last item"
+msgstr "Últim element"
+
+#: ../../mod/admin.php:493
+msgid "Account"
+msgstr "Compte"
+
+#: ../../mod/admin.php:495
+msgid ""
+"Selected users will be deleted!\\n\\nEverything these users had posted on "
+"this site will be permanently deleted!\\n\\nAre you sure?"
+msgstr "Els usuaris seleccionats seran esborrats!\\n\\nqualsevol cosa que aquests usuaris hagin publicat en aquest lloc s'esborrarà!\\n\\nEsteu segur?"
+
+#: ../../mod/admin.php:496
+msgid ""
+"The user {0} will be deleted!\\n\\nEverything this user has posted on this "
+"site will be permanently deleted!\\n\\nAre you sure?"
+msgstr "L'usuari {0} s'eliminarà!\\n\\nQualsevol cosa que aquest usuari hagi publicat en aquest lloc s'esborrarà!\\n\\nEsteu segur?"
+
+#: ../../mod/admin.php:532
+#, php-format
+msgid "Plugin %s disabled."
+msgstr "Plugin %s deshabilitat."
+
+#: ../../mod/admin.php:536
+#, php-format
+msgid "Plugin %s enabled."
+msgstr "Plugin %s habilitat."
+
+#: ../../mod/admin.php:546 ../../mod/admin.php:724
+msgid "Disable"
+msgstr "Deshabilitar"
+
+#: ../../mod/admin.php:548 ../../mod/admin.php:726
+msgid "Enable"
+msgstr "Habilitar"
+
+#: ../../mod/admin.php:570 ../../mod/admin.php:743
+msgid "Toggle"
+msgstr "Canviar"
+
+#: ../../mod/admin.php:571 ../../mod/admin.php:744 ../../include/nav.php:130
+msgid "Settings"
+msgstr "Ajustos"
+
+#: ../../mod/admin.php:578 ../../mod/admin.php:753
+msgid "Author: "
+msgstr "Autor:"
+
+#: ../../mod/admin.php:579 ../../mod/admin.php:754
+msgid "Maintainer: "
+msgstr "Encarregat:"
+
+#: ../../mod/admin.php:689
+msgid "No themes found."
+msgstr "No s'ha trobat temes."
+
+#: ../../mod/admin.php:780
+msgid "[Experimental]"
+msgstr "[Experimental]"
+
+#: ../../mod/admin.php:781
+msgid "[Unsupported]"
+msgstr "[No soportat]"
+
+#: ../../mod/admin.php:804
+msgid "Log settings updated."
+msgstr "Configuració del transcriptor actualitzada."
+
+#: ../../mod/admin.php:857
+msgid "Clear"
+msgstr "Netejar"
+
+#: ../../mod/admin.php:863
+msgid "Debugging"
+msgstr "Esplugar"
+
+#: ../../mod/admin.php:864
+msgid "Log file"
+msgstr "Arxiu de transcripció"
+
+#: ../../mod/admin.php:864
+msgid ""
+"Must be writable by web server. Relative to your Friendica top-level "
+"directory."
+msgstr "Ha de tenir permisos d'escriptura pel servidor web. En relació amb el seu directori Friendica de nivell superior."
+
+#: ../../mod/admin.php:865
+msgid "Log level"
+msgstr "Nivell de transcripció"
+
+#: ../../mod/admin.php:906
+msgid "Close"
+msgstr "Tancar"
+
+#: ../../mod/admin.php:912
+msgid "FTP Host"
+msgstr "Amfitrió FTP"
+
+#: ../../mod/admin.php:913
+msgid "FTP Path"
+msgstr "Direcció FTP"
+
+#: ../../mod/admin.php:914
+msgid "FTP User"
+msgstr "Usuari FTP"
+
+#: ../../mod/admin.php:915
+msgid "FTP Password"
+msgstr "Contrasenya FTP"
+
+#: ../../mod/profile.php:15 ../../boot.php:845
+msgid "Requested profile is not available."
+msgstr "El perfil sol·licitat no està disponible."
+
+#: ../../mod/profile.php:111 ../../mod/display.php:67
+msgid "Access to this profile has been restricted."
+msgstr "L'accés a aquest perfil ha estat restringit."
+
+#: ../../mod/profile.php:131
+msgid "Tips for New Members"
+msgstr "Consells per a nous membres"
+
+#: ../../mod/ping.php:174
+msgid "{0} wants to be your friend"
+msgstr "{0} vol ser el teu amic"
+
+#: ../../mod/ping.php:179
+msgid "{0} sent you a message"
+msgstr "{0} t'ha enviat un missatge de"
+
+#: ../../mod/ping.php:184
+msgid "{0} requested registration"
+msgstr "{0} solicituts de registre"
+
+#: ../../mod/ping.php:190
+#, php-format
+msgid "{0} commented %s's post"
+msgstr "{0} va comentar l'enviament de %s"
+
+#: ../../mod/ping.php:195
+#, php-format
+msgid "{0} liked %s's post"
+msgstr "A {0} l'ha agradat l'enviament de %s"
+
+#: ../../mod/ping.php:200
+#, php-format
+msgid "{0} disliked %s's post"
+msgstr "A {0} no l'ha agradat l'enviament de %s"
+
+#: ../../mod/ping.php:205
+#, php-format
+msgid "{0} is now friends with %s"
+msgstr "{0} ara és amic de %s"
+
+#: ../../mod/ping.php:210
+msgid "{0} posted"
+msgstr "{0} publicat"
+
+#: ../../mod/ping.php:215
+#, php-format
+msgid "{0} tagged %s's post with #%s"
+msgstr "{0} va etiquetar la publicació de %s com #%s"
+
+#: ../../mod/ping.php:221
+msgid "{0} mentioned you in a post"
+msgstr "{0} et menciona en un missatge"
+
+#: ../../mod/openid.php:63 ../../mod/openid.php:77 ../../include/auth.php:90
+#: ../../include/auth.php:115 ../../include/auth.php:169
+msgid "Login failed."
+msgstr "Error d'accés."
+
+#: ../../mod/follow.php:27
+msgid "Connect URL missing."
+msgstr "URL del connector perduda."
+
+#: ../../mod/follow.php:47
+msgid ""
+"This site is not configured to allow communications with other networks."
+msgstr "Aquest lloc no està configurat per permetre les comunicacions amb altres xarxes."
+
+#: ../../mod/follow.php:48 ../../mod/follow.php:63
+msgid "No compatible communication protocols or feeds were discovered."
+msgstr "Protocol de comunnicació no compatible o alimentador descobert."
+
+#: ../../mod/follow.php:61
+msgid "The profile address specified does not provide adequate information."
+msgstr "L'adreça de perfil especificada no proveeix informació adient."
+
+#: ../../mod/follow.php:65
+msgid "An author or name was not found."
+msgstr "Un autor o nom no va ser trobat"
+
+#: ../../mod/follow.php:67
+msgid "No browser URL could be matched to this address."
+msgstr "Cap direcció URL del navegador coincideix amb aquesta adreça."
+
+#: ../../mod/follow.php:74
+msgid ""
+"The profile address specified belongs to a network which has been disabled "
+"on this site."
+msgstr "La direcció del perfil especificat pertany a una xarxa que ha estat desactivada en aquest lloc."
+
+#: ../../mod/follow.php:79
+msgid ""
+"Limited profile. This person will be unable to receive direct/personal "
+"notifications from you."
+msgstr "Perfil limitat. Aquesta persona no podrà rebre notificacions personals/directes de tu."
+
+#: ../../mod/follow.php:149
+msgid "Unable to retrieve contact information."
+msgstr "No es pot recuperar la informació de contacte."
+
+#: ../../mod/follow.php:195
+msgid "following"
+msgstr "seguint"
+
+#: ../../mod/common.php:34
+msgid "Common Friends"
+msgstr "Amics Comuns"
+
+#: ../../mod/common.php:42
+msgid "No friends in common."
+msgstr "No hi ha amics en comú."
+
+#: ../../mod/display.php:130
+msgid "Item has been removed."
+msgstr "El element ha estat esborrat."
+
+#: ../../mod/apps.php:4
+msgid "Applications"
+msgstr "Aplicacions"
+
+#: ../../mod/apps.php:7
+msgid "No installed applications."
+msgstr "Aplicacions no instal·lades."
+
+#: ../../mod/search.php:83
+msgid "Search This Site"
+msgstr "Cerca en Aquest Lloc"
+
+#: ../../mod/profiles.php:21 ../../mod/profiles.php:239
+#: ../../mod/profiles.php:344 ../../mod/dfrn_confirm.php:62
+msgid "Profile not found."
+msgstr "Perfil no trobat."
+
+#: ../../mod/profiles.php:28
+msgid "Profile Name is required."
+msgstr "Nom de perfil requerit."
+
+#: ../../mod/profiles.php:198
+msgid "Profile updated."
+msgstr "Perfil actualitzat."
+
+#: ../../mod/profiles.php:256
+msgid "Profile deleted."
+msgstr "Perfil esborrat."
+
+#: ../../mod/profiles.php:272 ../../mod/profiles.php:303
+msgid "Profile-"
+msgstr "Perfil-"
+
+#: ../../mod/profiles.php:291 ../../mod/profiles.php:330
+msgid "New profile created."
+msgstr "Nou perfil creat."
+
+#: ../../mod/profiles.php:309
+msgid "Profile unavailable to clone."
+msgstr "No es pot clonar el perfil."
+
+#: ../../mod/profiles.php:356
+msgid "Hide your contact/friend list from viewers of this profile?"
+msgstr "Amaga la llista de contactes/amics en la vista d'aquest perfil?"
+
+#: ../../mod/profiles.php:374
+msgid "Edit Profile Details"
+msgstr "Editor de Detalls del Perfil"
+
+#: ../../mod/profiles.php:376
+msgid "View this profile"
+msgstr "Veure aquest perfil"
+
+#: ../../mod/profiles.php:377
+msgid "Create a new profile using these settings"
+msgstr "Crear un nou perfil amb aquests ajustos"
+
+#: ../../mod/profiles.php:378
+msgid "Clone this profile"
+msgstr "Clonar aquest perfil"
+
+#: ../../mod/profiles.php:379
+msgid "Delete this profile"
+msgstr "Esborrar aquest perfil"
+
+#: ../../mod/profiles.php:380
+msgid "Profile Name:"
+msgstr "Nom de Perfil:"
+
+#: ../../mod/profiles.php:381
+msgid "Your Full Name:"
+msgstr "El Teu Nom Complet."
+
+#: ../../mod/profiles.php:382
+msgid "Title/Description:"
+msgstr "Títol/Descripció:"
+
+#: ../../mod/profiles.php:383
+msgid "Your Gender:"
+msgstr "Gènere:"
+
+#: ../../mod/profiles.php:384
+#, php-format
+msgid "Birthday (%s):"
+msgstr "Aniversari (%s)"
+
+#: ../../mod/profiles.php:385
+msgid "Street Address:"
+msgstr "Direcció:"
+
+#: ../../mod/profiles.php:386
+msgid "Locality/City:"
+msgstr "Localitat/Ciutat:"
+
+#: ../../mod/profiles.php:387
+msgid "Postal/Zip Code:"
+msgstr "Codi Postal:"
+
+#: ../../mod/profiles.php:388
+msgid "Country:"
+msgstr "País"
+
+#: ../../mod/profiles.php:389
+msgid "Region/State:"
+msgstr "Región/Estat:"
+
+#: ../../mod/profiles.php:390
+msgid "<span class=\"heart\">&hearts;</span> Marital Status:"
+msgstr "<span class=\"heart\">&hearts;</span> Estat Civil:"
+
+#: ../../mod/profiles.php:391
+msgid "Who: (if applicable)"
+msgstr "Qui? (si és aplicable)"
+
+#: ../../mod/profiles.php:392
+msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
+msgstr "Exemples: cathy123, Cathy Williams, cathy@example.com"
+
+#: ../../mod/profiles.php:393 ../../include/profile_advanced.php:43
+msgid "Sexual Preference:"
+msgstr "Preferència Sexual:"
+
+#: ../../mod/profiles.php:394
+msgid "Homepage URL:"
+msgstr "Pàgina web URL:"
+
+#: ../../mod/profiles.php:395 ../../include/profile_advanced.php:49
+msgid "Political Views:"
+msgstr "Idees Polítiques:"
+
+#: ../../mod/profiles.php:396
+msgid "Religious Views:"
+msgstr "Creencies Religioses:"
+
+#: ../../mod/profiles.php:397
+msgid "Public Keywords:"
+msgstr "Paraules Clau Públiques"
+
+#: ../../mod/profiles.php:398
+msgid "Private Keywords:"
+msgstr "Paraules Clau Privades:"
+
+#: ../../mod/profiles.php:399
+msgid "Example: fishing photography software"
+msgstr "Exemple: pesca fotografia programari"
+
+#: ../../mod/profiles.php:400
+msgid "(Used for suggesting potential friends, can be seen by others)"
+msgstr "(Emprat per suggerir potencials amics, Altres poden veure-ho)"
+
+#: ../../mod/profiles.php:401
+msgid "(Used for searching profiles, never shown to others)"
+msgstr "(Emprat durant la cerca de perfils, mai mostrat a ningú)"
+
+#: ../../mod/profiles.php:402
+msgid "Tell us about yourself..."
+msgstr "Parla'ns de tú....."
+
+#: ../../mod/profiles.php:403
+msgid "Hobbies/Interests"
+msgstr "Aficions/Interessos"
+
+#: ../../mod/profiles.php:404
+msgid "Contact information and Social Networks"
+msgstr "Informació de contacte i Xarxes Socials"
+
+#: ../../mod/profiles.php:405
+msgid "Musical interests"
+msgstr "Gustos musicals"
+
+#: ../../mod/profiles.php:406
+msgid "Books, literature"
+msgstr "Llibres, Literatura"
+
+#: ../../mod/profiles.php:407
+msgid "Television"
+msgstr "Televisió"
+
+#: ../../mod/profiles.php:408
+msgid "Film/dance/culture/entertainment"
+msgstr "Cinema/ball/cultura/entreteniments"
+
+#: ../../mod/profiles.php:409
+msgid "Love/romance"
+msgstr "Amor/sentiments"
+
+#: ../../mod/profiles.php:410
+msgid "Work/employment"
+msgstr "Treball/ocupació"
+
+#: ../../mod/profiles.php:411
+msgid "School/education"
+msgstr "Ensenyament/estudis"
+
+#: ../../mod/profiles.php:416
+msgid ""
+"This is your <strong>public</strong> profile.<br />It <strong>may</strong> "
+"be visible to anybody using the internet."
+msgstr "Aquest és el teu perfil <strong>públic</strong>.<br />El qual <strong>pot</strong> ser visible per qualsevol qui faci servir Internet."
+
+#: ../../mod/profiles.php:426 ../../mod/directory.php:124
+msgid "Age: "
+msgstr "Edat:"
+
+#: ../../mod/profiles.php:461
+msgid "Edit/Manage Profiles"
+msgstr "Editar/Gestionar Perfils"
+
+#: ../../mod/profiles.php:462 ../../boot.php:946
+msgid "Change profile photo"
+msgstr "Canviar la foto del perfil"
+
+#: ../../mod/profiles.php:463 ../../boot.php:947
+msgid "Create New Profile"
+msgstr "Crear un Nou Perfil"
+
+#: ../../mod/profiles.php:473 ../../boot.php:957
+msgid "Profile Image"
+msgstr "Imatge del Perfil"
+
+#: ../../mod/profiles.php:475 ../../boot.php:960
+msgid "visible to everybody"
+msgstr "Visible per tothom"
+
+#: ../../mod/profiles.php:476 ../../boot.php:961
+msgid "Edit visibility"
+msgstr "Editar visibilitat"
+
+#: ../../mod/tagger.php:103 ../../include/conversation.php:138
+#, php-format
+msgid "%1$s tagged %2$s's %3$s with %4$s"
+msgstr "%1$s etiquetats %2$s %3$s amb %4$s"
+
+#: ../../mod/delegate.php:95
+msgid "No potential page delegates located."
+msgstr "No es troben pàgines potencialment delegades."
+
+#: ../../mod/delegate.php:121
+msgid "Delegate Page Management"
+msgstr "Gestió de les Pàgines Delegades"
+
+#: ../../mod/delegate.php:123
+msgid ""
+"Delegates are able to manage all aspects of this account/page except for "
+"basic account settings. Please do not delegate your personal account to "
+"anybody that you do not trust completely."
+msgstr "Els delegats poden gestionar tots els aspectes d'aquest compte/pàgina, excepte per als ajustaments bàsics del compte. Si us plau, no deleguin el seu compte personal a ningú que no confiïn completament."
+
+#: ../../mod/delegate.php:124
+msgid "Existing Page Managers"
+msgstr "Actuals Administradors de Pàgina"
+
+#: ../../mod/delegate.php:126
+msgid "Existing Page Delegates"
+msgstr "Actuals Delegats de Pàgina"
+
+#: ../../mod/delegate.php:128
+msgid "Potential Delegates"
+msgstr "Delegats Potencials"
+
+#: ../../mod/delegate.php:131
+msgid "Add"
+msgstr "Afegir"
+
+#: ../../mod/delegate.php:132
+msgid "No entries."
+msgstr "Sense entrades"
+
+#: ../../mod/suggest.php:38 ../../include/contact_widgets.php:35
+msgid "Friend Suggestions"
+msgstr "Amics Suggerits"
+
+#: ../../mod/suggest.php:44
+msgid ""
+"No suggestions available. If this is a new site, please try again in 24 "
+"hours."
+msgstr "Cap suggeriment disponible. Si això és un nou lloc, si us plau torna a intentar en 24 hores."
+
+#: ../../mod/suggest.php:61
+msgid "Ignore/Hide"
+msgstr "Ignorar/Amagar"
+
+#: ../../mod/directory.php:51
+msgid "Global Directory"
+msgstr "Directori Global"
+
+#: ../../mod/directory.php:57
+msgid "Normal site view"
+msgstr "Vista normal del lloc"
+
+#: ../../mod/directory.php:59
+msgid "Admin - View all site entries"
+msgstr "Admin- Veure totes les entrades del lloc"
+
+#: ../../mod/directory.php:65
+msgid "Find on this site"
+msgstr "Trobat en aquest lloc"
+
+#: ../../mod/directory.php:68
+msgid "Site Directory"
+msgstr "Directori Local"
+
+#: ../../mod/directory.php:127
+msgid "Gender: "
+msgstr "Gènere:"
+
+#: ../../mod/directory.php:153
+msgid "No entries (some entries may be hidden)."
+msgstr "No hi ha entrades (algunes de les entrades poden estar amagades)."
+
+#: ../../mod/invite.php:35
+#, php-format
+msgid "%s : Not a valid email address."
+msgstr "%s : No es una adreça de correu vàlida"
+
+#: ../../mod/invite.php:59
+#, php-format
+msgid "Please join my network on %s"
+msgstr "Si us plau, uneix-te a la meva xarxa en %s"
+
+#: ../../mod/invite.php:69
+#, php-format
+msgid "%s : Message delivery failed."
+msgstr "%s : Ha fallat l'entrega del missatge."
+
+#: ../../mod/invite.php:73
+#, php-format
+msgid "%d message sent."
+msgid_plural "%d messages sent."
+msgstr[0] "%d missatge enviat"
+msgstr[1] "%d missatges enviats."
+
+#: ../../mod/invite.php:92
+msgid "You have no more invitations available"
+msgstr "No te més invitacions disponibles"
+
+#: ../../mod/invite.php:99
+msgid "Send invitations"
+msgstr "Enviant Invitacions"
+
+#: ../../mod/invite.php:100
+msgid "Enter email addresses, one per line:"
+msgstr "Entri adreçes de correu, una per línia:"
+
+#: ../../mod/invite.php:102
+#, php-format
+msgid "Please join my social network on %s"
+msgstr "Per favor, uneix-te a la meva xarxa social en %s"
+
+#: ../../mod/invite.php:103
+msgid "To accept this invitation, please visit:"
+msgstr "Per acceptar aquesta invitació, si us plau, visiti:"
+
+#: ../../mod/invite.php:104
+msgid "You will need to supply this invitation code: $invite_code"
+msgstr "Vostè haurà de proporcionar aquest codi d'invitació: $invite_code"
+
+#: ../../mod/invite.php:104
+msgid ""
+"Once you have registered, please connect with me via my profile page at:"
+msgstr "Un cop registrat, si us plau contactar amb mi a través de la meva pàgina de perfil a:"
+
+#: ../../mod/dfrn_confirm.php:119
+msgid ""
+"This may occasionally happen if contact was requested by both persons and it"
+" has already been approved."
+msgstr "Això pot ocorre ocasionalment si el contacte fa una petició per ambdues persones i ja han estat aprovades."
+
+#: ../../mod/dfrn_confirm.php:239
+msgid "Response from remote site was not understood."
+msgstr "La resposta des del lloc remot no s'entenia."
+
+#: ../../mod/dfrn_confirm.php:248
+msgid "Unexpected response from remote site: "
+msgstr "Resposta inesperada de lloc remot:"
+
+#: ../../mod/dfrn_confirm.php:256
+msgid "Confirmation completed successfully."
+msgstr "La confirmació s'ha completat correctament."
+
+#: ../../mod/dfrn_confirm.php:258 ../../mod/dfrn_confirm.php:272
+#: ../../mod/dfrn_confirm.php:279
+msgid "Remote site reported: "
+msgstr "El lloc remot informa:"
+
+#: ../../mod/dfrn_confirm.php:270
+msgid "Temporary failure. Please wait and try again."
+msgstr "Fallada temporal. Si us plau, espereu i torneu a intentar."
+
+#: ../../mod/dfrn_confirm.php:277
+msgid "Introduction failed or was revoked."
+msgstr "La presentació va fallar o va ser revocada."
+
+#: ../../mod/dfrn_confirm.php:422
+msgid "Unable to set contact photo."
+msgstr "No es pot canviar la foto de contacte."
+
+#: ../../mod/dfrn_confirm.php:474 ../../include/diaspora.php:495
+#: ../../include/conversation.php:101
+#, php-format
+msgid "%1$s is now friends with %2$s"
+msgstr "%1$s és ara amic amb %2$s"
+
+#: ../../mod/dfrn_confirm.php:544
+#, php-format
+msgid "No user record found for '%s' "
+msgstr "No es troben registres d'usuari per a '%s'"
+
+#: ../../mod/dfrn_confirm.php:554
+msgid "Our site encryption key is apparently messed up."
+msgstr "La nostra clau de xifrat del lloc pel que sembla en mal estat."
+
+#: ../../mod/dfrn_confirm.php:565
+msgid "Empty site URL was provided or URL could not be decrypted by us."
+msgstr "Es va proporcionar una URL del lloc buida o la URL no va poder ser desxifrada per nosaltres."
+
+#: ../../mod/dfrn_confirm.php:586
+msgid "Contact record was not found for you on our site."
+msgstr "No s'han trobat registres del contacte al nostre lloc."
+
+#: ../../mod/dfrn_confirm.php:600
+#, php-format
+msgid "Site public key not available in contact record for URL %s."
+msgstr "la clau pública del lloc no disponible en les dades del contacte per URL %s."
+
+#: ../../mod/dfrn_confirm.php:620
+msgid ""
+"The ID provided by your system is a duplicate on our system. It should work "
+"if you try again."
+msgstr "La ID proporcionada pel seu sistema és un duplicat en el nostre sistema. Hauria de treballar si intenta de nou."
+
+#: ../../mod/dfrn_confirm.php:631
+msgid "Unable to set your contact credentials on our system."
+msgstr "No es pot canviar les seves credencials de contacte en el nostre sistema."
+
+#: ../../mod/dfrn_confirm.php:694
+msgid "Unable to update your contact profile details on our system"
+msgstr "No es pot actualitzar els detalls del seu perfil de contacte en el nostre sistema"
+
+#: ../../mod/dfrn_confirm.php:724
+#, php-format
+msgid "Connection accepted at %s"
+msgstr "Connexió acceptada en %s"
+
+#: ../../addon/facebook/facebook.php:338
+msgid "Facebook disabled"
+msgstr "Facebook deshabilitat"
+
+#: ../../addon/facebook/facebook.php:343
+msgid "Updating contacts"
+msgstr "Actualitzant contactes"
+
+#: ../../addon/facebook/facebook.php:352
+msgid "Facebook API key is missing."
+msgstr "La clau del API de Facebook s'ha perdut."
+
+#: ../../addon/facebook/facebook.php:359
+msgid "Facebook Connect"
+msgstr "Facebook Connectat"
+
+#: ../../addon/facebook/facebook.php:365
+msgid "Install Facebook connector for this account."
+msgstr "Instal·lar el connector de Facebook per aquest compte."
+
+#: ../../addon/facebook/facebook.php:372
+msgid "Remove Facebook connector"
+msgstr "Eliminar el connector de Faceboook"
+
+#: ../../addon/facebook/facebook.php:377
+msgid ""
+"Re-authenticate [This is necessary whenever your Facebook password is "
+"changed.]"
+msgstr "Re-autentificar [Això és necessari cada vegada que la contrasenya de Facebook canvia.]"
+
+#: ../../addon/facebook/facebook.php:384
+msgid "Post to Facebook by default"
+msgstr "Enviar a Facebook per defecte"
+
+#: ../../addon/facebook/facebook.php:388
+msgid "Link all your Facebook friends and conversations on this website"
+msgstr "Enllaça tots els teus amics i les converses de Facebook en aquest lloc web"
+
+#: ../../addon/facebook/facebook.php:390
+msgid ""
+"Facebook conversations consist of your <em>profile wall</em> and your friend"
+" <em>stream</em>."
+msgstr "Les converses de Facebook consisteixen en el <em>perfil del mur</em> i en el<em> stream </em> del seu amic."
+
+#: ../../addon/facebook/facebook.php:391
+msgid "On this website, your Facebook friend stream is only visible to you."
+msgstr "En aquesta pàgina web, el stream del seu amic a Facebook només és visible per a vostè."
+
+#: ../../addon/facebook/facebook.php:392
+msgid ""
+"The following settings determine the privacy of your Facebook profile wall "
+"on this website."
+msgstr "Les següents opcions determinen la privacitat del mur del seu perfil de Facebook en aquest lloc web."
+
+#: ../../addon/facebook/facebook.php:396
+msgid ""
+"On this website your Facebook profile wall conversations will only be "
+"visible to you"
+msgstr "En aquesta pàgina web les seves converses al mur del perfil de Facebook només seran visible per a vostè"
+
+#: ../../addon/facebook/facebook.php:401
+msgid "Do not import your Facebook profile wall conversations"
+msgstr "No importi les seves converses del mur del perfil de Facebook"
+
+#: ../../addon/facebook/facebook.php:403
+msgid ""
+"If you choose to link conversations and leave both of these boxes unchecked,"
+" your Facebook profile wall will be merged with your profile wall on this "
+"website and your privacy settings on this website will be used to determine "
+"who may see the conversations."
+msgstr "Si opta per vincular les converses i deixar ambdues caselles sense marcar, el mur del seu perfil de Facebook es fusionarà amb el mur del seu perfil en aquest lloc web i la seva configuració de privacitat en aquest website serà utilitzada per determinar qui pot veure les converses."
+
+#: ../../addon/facebook/facebook.php:408
+msgid "Comma separated applications to ignore"
+msgstr "Separats per comes les aplicacions a ignorar"
+
+#: ../../addon/facebook/facebook.php:476
+#: ../../include/contact_selectors.php:81
+msgid "Facebook"
+msgstr "Facebook"
+
+#: ../../addon/facebook/facebook.php:477
+msgid "Facebook Connector Settings"
+msgstr "Ajustos del Connector de Facebook"
+
+#: ../../addon/facebook/facebook.php:491
+msgid "Post to Facebook"
+msgstr "Enviament a Facebook"
+
+#: ../../addon/facebook/facebook.php:582
+msgid ""
+"Post to Facebook cancelled because of multi-network access permission "
+"conflict."
+msgstr "Enviament a Facebook cancel·lat perque hi ha un conflicte de permisos d'accés multi-xarxa."
+
+#: ../../addon/facebook/facebook.php:651
+msgid "Image: "
+msgstr "Imatge:"
+
+#: ../../addon/facebook/facebook.php:728
+msgid "View on Friendica"
+msgstr "Vist en Friendica"
+
+#: ../../addon/facebook/facebook.php:752
+msgid "Facebook post failed. Queued for retry."
+msgstr "Enviament a Facebook fracassat. En cua per a reintent."
+
+#: ../../addon/facebook/facebook.php:877 ../../addon/facebook/facebook.php:886
+#: ../../include/bb2diaspora.php:102
+msgid "link"
+msgstr "enllaç"
+
+#: ../../addon/widgets/widget_like.php:58
+#, php-format
+msgid "%d person likes this"
+msgid_plural "%d people like this"
+msgstr[0] "%d persona li agrada això"
+msgstr[1] "%d persones els agrada això"
+
+#: ../../addon/widgets/widget_like.php:61
+#, php-format
+msgid "%d person doesn't like this"
+msgid_plural "%d people don't like this"
+msgstr[0] "%d persona no li agrada això"
+msgstr[1] "%d persones no els agrada això"
+
+#: ../../addon/widgets/widgets.php:55
+msgid "Generate new key"
+msgstr "Generar nova clau"
+
+#: ../../addon/widgets/widgets.php:58
+msgid "Widgets key"
+msgstr "Ginys clau"
+
+#: ../../addon/widgets/widgets.php:60
+msgid "Widgets available"
+msgstr "Ginys disponibles"
+
+#: ../../addon/widgets/widget_friends.php:40
+msgid "Connect on Friendica!"
+msgstr "Connectar en Friendica"
+
+#: ../../addon/yourls/yourls.php:55
+msgid "YourLS Settings"
+msgstr "La Teva Configuració de LS"
+
+#: ../../addon/yourls/yourls.php:57
+msgid "URL: http://"
+msgstr "URL: http://"
+
+#: ../../addon/yourls/yourls.php:62
+msgid "Username:"
+msgstr "Nom d'usuari:"
+
+#: ../../addon/yourls/yourls.php:67
+msgid "Password:"
+msgstr "Contrasenya:"
+
+#: ../../addon/yourls/yourls.php:72
+msgid "Use SSL "
+msgstr "Emprar SSL"
+
+#: ../../addon/yourls/yourls.php:92
+msgid "yourls Settings saved."
+msgstr "Guardar la seva configuració."
+
+#: ../../addon/ljpost/ljpost.php:38
+msgid "Post to LiveJournal"
+msgstr "Missatge a Livejournal"
+
+#: ../../addon/ljpost/ljpost.php:69
+msgid "LiveJournal Post Settings"
+msgstr "Configuració d'enviaments a Livejournal"
+
+#: ../../addon/ljpost/ljpost.php:71
+msgid "Enable LiveJournal Post Plugin"
+msgstr "Habilitat el plugin d'enviaments a Livejournal"
+
+#: ../../addon/ljpost/ljpost.php:76
+msgid "LiveJournal username"
+msgstr "Nom d'usuari a Livejournal"
+
+#: ../../addon/ljpost/ljpost.php:81
+msgid "LiveJournal password"
+msgstr "Contrasenya a Livejournal"
+
+#: ../../addon/ljpost/ljpost.php:86
+msgid "Post to LiveJournal by default"
+msgstr "Enviar per defecte a Livejournal"
+
+#: ../../addon/nsfw/nsfw.php:47
+msgid "\"Not Safe For Work\" Settings"
+msgstr "Configuració de \"Not Safe For Work\""
+
+#: ../../addon/nsfw/nsfw.php:50
+msgid "Enable NSFW filter"
+msgstr "Habilitar el filtre NSFW"
+
+#: ../../addon/nsfw/nsfw.php:53
+msgid "Comma separated words to treat as NSFW"
+msgstr "Tractar com NSFW les paraules separades per comes  "
+
+#: ../../addon/nsfw/nsfw.php:58
+msgid "Use /expression/ to provide regular expressions"
+msgstr "Emprar /expressió/  per a proporcionar expressions regulars"
+
+#: ../../addon/nsfw/nsfw.php:74
+msgid "NSFW Settings saved."
+msgstr "Configuració NSFW guardada."
+
+#: ../../addon/nsfw/nsfw.php:120
+#, php-format
+msgid "%s - Click to open/close"
+msgstr "%s - Clicar per obrir/tancar"
+
+#: ../../addon/communityhome/communityhome.php:28
+#: ../../addon/communityhome/communityhome.php:34
+#: ../../addon/communityhome/twillingham/communityhome.php:28
+#: ../../addon/communityhome/twillingham/communityhome.php:34
+#: ../../include/nav.php:62 ../../boot.php:710
+msgid "Login"
+msgstr "Identifica't"
+
+#: ../../addon/communityhome/communityhome.php:29
+#: ../../addon/communityhome/twillingham/communityhome.php:29
+msgid "OpenID"
+msgstr "OpenID"
+
+#: ../../addon/communityhome/communityhome.php:38
+msgid "Last users"
+msgstr "Últims usuaris"
+
+#: ../../addon/communityhome/communityhome.php:81
+#: ../../addon/communityhome/twillingham/communityhome.php:81
+msgid "Most active users"
+msgstr "Usuaris més actius"
+
+#: ../../addon/communityhome/communityhome.php:98
+msgid "Last photos"
+msgstr "Últimes fotos"
+
+#: ../../addon/communityhome/communityhome.php:133
+msgid "Last likes"
+msgstr "Últims \"m'agrada\""
+
+#: ../../addon/communityhome/communityhome.php:155 ../../include/text.php:1224
+#: ../../include/conversation.php:45 ../../include/conversation.php:118
+msgid "event"
+msgstr "esdeveniment"
+
+#: ../../addon/communityhome/twillingham/communityhome.php:38
+msgid "Latest users"
+msgstr "Últims usuaris"
+
+#: ../../addon/uhremotestorage/uhremotestorage.php:84
+#, php-format
+msgid ""
+"Allow to use your friendica id (%s) to connecto to external unhosted-enabled"
+" storage (like ownCloud). See <a "
+"href=\"http://www.w3.org/community/unhosted/wiki/RemoteStorage#WebFinger\">RemoteStorage"
+" WebFinger</a>"
+msgstr "Permetre l'ús del seu ID de friendica (%s) per Connectar a l'emmagatzematge extern (com ownCloud). Veure <a href=\"http://www.w3.org/community/unhosted/wiki/RemoteStorage#WebFinger\"> WebFinger RemoteStorage </a>"
+
+#: ../../addon/uhremotestorage/uhremotestorage.php:85
+msgid "Template URL (with {category})"
+msgstr "Plantilles de URL (amb {categoria})"
+
+#: ../../addon/uhremotestorage/uhremotestorage.php:86
+msgid "OAuth end-point"
+msgstr "OAuth end-point"
+
+#: ../../addon/uhremotestorage/uhremotestorage.php:87
+msgid "Api"
+msgstr "Api"
+
+#: ../../addon/membersince/membersince.php:18
+msgid "Member since:"
+msgstr "Membre des de:"
+
+#: ../../addon/tictac/tictac.php:20
+msgid "Three Dimensional Tic-Tac-Toe"
+msgstr "Tres en línia Tridimensional"
+
+#: ../../addon/tictac/tictac.php:53
+msgid "3D Tic-Tac-Toe"
+msgstr "Tres en línia 3D"
+
+#: ../../addon/tictac/tictac.php:58
+msgid "New game"
+msgstr "Nou joc"
+
+#: ../../addon/tictac/tictac.php:59
+msgid "New game with handicap"
+msgstr "Nou joc modificat"
+
+#: ../../addon/tictac/tictac.php:60
+msgid ""
+"Three dimensional tic-tac-toe is just like the traditional game except that "
+"it is played on multiple levels simultaneously. "
+msgstr "El joc del tres en línia tridimensional és com el joc tradicional, excepte que es juga en diversos nivells simultàniament."
+
+#: ../../addon/tictac/tictac.php:61
+msgid ""
+"In this case there are three levels. You win by getting three in a row on "
+"any level, as well as up, down, and diagonally across the different levels."
+msgstr "En aquest cas hi ha tres nivells. Vostè guanya per aconseguir tres en una fila en qualsevol nivell, així com dalt, baix i en diagonal a través dels diferents nivells."
+
+#: ../../addon/tictac/tictac.php:63
+msgid ""
+"The handicap game disables the center position on the middle level because "
+"the player claiming this square often has an unfair advantage."
+msgstr "El joc modificat desactiva la posició central en el nivell mitjà perquè el jugador en aquesta posició té sovint un avantatge injust."
+
+#: ../../addon/tictac/tictac.php:182
+msgid "You go first..."
+msgstr "Vostè va primer ..."
+
+#: ../../addon/tictac/tictac.php:187
+msgid "I'm going first this time..."
+msgstr "Vaig primer aquesta vegada ..."
+
+#: ../../addon/tictac/tictac.php:193
+msgid "You won!"
+msgstr "Has guanyat!"
+
+#: ../../addon/tictac/tictac.php:199 ../../addon/tictac/tictac.php:224
+msgid "\"Cat\" game!"
+msgstr "Empat!"
+
+#: ../../addon/tictac/tictac.php:222
+msgid "I won!"
+msgstr "Vaig guanyar!"
+
+#: ../../addon/randplace/randplace.php:171
+msgid "Randplace Settings"
+msgstr "Configuració de Randplace"
+
+#: ../../addon/randplace/randplace.php:173
+msgid "Enable Randplace Plugin"
+msgstr "Habilitar el Plugin de Randplace"
+
+#: ../../addon/dwpost/dwpost.php:38
+msgid "Post to Dreamwidth"
+msgstr "Missatge a Dreamwidth"
+
+#: ../../addon/dwpost/dwpost.php:69
+msgid "Dreamwidth Post Settings"
+msgstr "Configuració d'enviaments a Dreamwidth"
+
+#: ../../addon/dwpost/dwpost.php:71
+msgid "Enable dreamwidth Post Plugin"
+msgstr "Habilitat el plugin d'enviaments a Dreamwidth"
+
+#: ../../addon/dwpost/dwpost.php:76
+msgid "dreamwidth username"
+msgstr "Nom d'usuari a Dreamwidth"
+
+#: ../../addon/dwpost/dwpost.php:81
+msgid "dreamwidth password"
+msgstr "Contrasenya a Dreamwidth"
+
+#: ../../addon/dwpost/dwpost.php:86
+msgid "Post to dreamwidth by default"
+msgstr "Enviar per defecte a Dreamwidth"
+
+#: ../../addon/drpost/drpost.php:35
+msgid "Post to Drupal"
+msgstr "Missatge a Drupal"
+
+#: ../../addon/drpost/drpost.php:72
+msgid "Drupal Post Settings"
+msgstr "Configuració d'enviaments a Drupal"
+
+#: ../../addon/drpost/drpost.php:74
+msgid "Enable Drupal Post Plugin"
+msgstr "Habilitar el Plugin d'Enviaments de Drupal"
+
+#: ../../addon/drpost/drpost.php:79
+msgid "Drupal username"
+msgstr "Nom d'usuari de Drupal"
+
+#: ../../addon/drpost/drpost.php:84
+msgid "Drupal password"
+msgstr "Contrasenya de Drupal"
+
+#: ../../addon/drpost/drpost.php:89
+msgid "Post Type - article,page,or blog"
+msgstr "Tipus d'Enviament- article,pàgina, o blog"
+
+#: ../../addon/drpost/drpost.php:94
+msgid "Drupal site URL"
+msgstr "URL del lloc Drupal"
+
+#: ../../addon/drpost/drpost.php:99
+msgid "Drupal site uses clean URLS"
+msgstr "el Lloc Drupal empra URLS netes"
+
+#: ../../addon/drpost/drpost.php:104
+msgid "Post to Drupal by default"
+msgstr "Enviar a Drupal per defecte"
+
+#: ../../addon/drpost/drpost.php:184 ../../addon/wppost/wppost.php:172
+#: ../../addon/posterous/posterous.php:173
+msgid "Post from Friendica"
+msgstr "Enviament des de Friendica"
+
+#: ../../addon/geonames/geonames.php:143
+msgid "Geonames settings updated."
+msgstr "Actualitzada la configuració de Geonames."
+
+#: ../../addon/geonames/geonames.php:179
+msgid "Geonames Settings"
+msgstr "Configuració de Geonames"
+
+#: ../../addon/geonames/geonames.php:181
+msgid "Enable Geonames Plugin"
+msgstr "Habilitar Plugin de Geonames"
+
+#: ../../addon/js_upload/js_upload.php:43
+msgid "Upload a file"
+msgstr "Carrega un arxiu"
+
+#: ../../addon/js_upload/js_upload.php:44
+msgid "Drop files here to upload"
+msgstr "Deixa aquí el arxiu a carregar"
+
+#: ../../addon/js_upload/js_upload.php:46
+msgid "Failed"
+msgstr "Fracassar"
+
+#: ../../addon/js_upload/js_upload.php:297
+msgid "No files were uploaded."
+msgstr "No hi ha arxius carregats."
+
+#: ../../addon/js_upload/js_upload.php:303
+msgid "Uploaded file is empty"
+msgstr "L'arxiu carregat està buit"
+
+#: ../../addon/js_upload/js_upload.php:326
+msgid "File has an invalid extension, it should be one of "
+msgstr "Arxiu té una extensió no vàlida, ha de ser una de"
+
+#: ../../addon/js_upload/js_upload.php:337
+msgid "Upload was cancelled, or server error encountered"
+msgstr "La pujada va ser cancel.lada, o es va trobar un error de servidor"
+
+#: ../../addon/oembed.old/oembed.php:30
+msgid "OEmbed settings updated"
+msgstr "Actualitzar la configuració OEmbed"
+
+#: ../../addon/oembed.old/oembed.php:43
+msgid "Use OEmbed for YouTube videos"
+msgstr "Empreu OEmbed per videos YouTube"
+
+#: ../../addon/oembed.old/oembed.php:71
+msgid "URL to embed:"
+msgstr "Adreça URL del recurs"
+
+#: ../../addon/impressum/impressum.php:25
+msgid "Impressum"
+msgstr "Impressum"
+
+#: ../../addon/impressum/impressum.php:38
+#: ../../addon/impressum/impressum.php:40
+#: ../../addon/impressum/impressum.php:70
+msgid "Site Owner"
+msgstr "Propietari del lloc"
+
+#: ../../addon/impressum/impressum.php:38
+#: ../../addon/impressum/impressum.php:74
+msgid "Email Address"
+msgstr "Adreça de correu"
+
+#: ../../addon/impressum/impressum.php:43
+#: ../../addon/impressum/impressum.php:72
+msgid "Postal Address"
+msgstr "Adreça postal"
+
+#: ../../addon/impressum/impressum.php:49
+msgid ""
+"The impressum addon needs to be configured!<br />Please add at least the "
+"<tt>owner</tt> variable to your config file. For other variables please "
+"refer to the README file of the addon."
+msgstr "El complement impressum s'ha de configurar!<br />Si us plau afegiu almenys la variable <tt>propietari </tt> al fitxer de configuració. Per a les altres variables, consulteu el fitxer README del complement."
+
+#: ../../addon/impressum/impressum.php:71
+msgid "Site Owners Profile"
+msgstr "Perfil del Propietari del Lloc"
+
+#: ../../addon/impressum/impressum.php:73
+msgid "Notes"
+msgstr "Notes"
+
+#: ../../addon/buglink/buglink.php:15
+msgid "Report Bug"
+msgstr "Informar de problema"
+
+#: ../../addon/blockem/blockem.php:51
+msgid "\"Blockem\" Settings"
+msgstr "Configuració de \"Bloqueig\""
+
+#: ../../addon/blockem/blockem.php:53
+msgid "Comma separated profile URLS to block"
+msgstr "URLS dels perfils a bloquejar, separats per comes"
+
+#: ../../addon/blockem/blockem.php:70
+msgid "BLOCKEM Settings saved."
+msgstr "Guardada la configuració de BLOQUEIG."
+
+#: ../../addon/blockem/blockem.php:105
+#, php-format
+msgid "Blocked %s - Click to open/close"
+msgstr "Bloquejar %s - Clica per obrir/tancar"
+
+#: ../../addon/blockem/blockem.php:160
+msgid "Unblock Author"
+msgstr "Desbloquejar Autor"
+
+#: ../../addon/blockem/blockem.php:162
+msgid "Block Author"
+msgstr "Bloquejar Autor"
+
+#: ../../addon/blockem/blockem.php:194
+msgid "blockem settings updated"
+msgstr "Actualitzar la Configuració de bloqueig"
+
+#: ../../addon/qcomment/qcomment.php:51
+msgid ":-)"
+msgstr ":-)"
+
+#: ../../addon/qcomment/qcomment.php:51
+msgid ":-("
+msgstr ":-("
+
+#: ../../addon/qcomment/qcomment.php:51
+msgid "lol"
+msgstr "lol"
+
+#: ../../addon/qcomment/qcomment.php:54
+msgid "Quick Comment Settings"
+msgstr "Configuració Ràpida dels Comentaris"
+
+#: ../../addon/qcomment/qcomment.php:56
+msgid ""
+"Quick comments are found near comment boxes, sometimes hidden. Click them to"
+" provide simple replies."
+msgstr "Comentaris ràpids es troben prop de les caixes de comentaris, de vegades ocults. Feu clic a ells per donar respostes simples."
+
+#: ../../addon/qcomment/qcomment.php:57
+msgid "Enter quick comments, one per line"
+msgstr "Introduïu els comentaris ràpids, un per línia"
+
+#: ../../addon/qcomment/qcomment.php:75
+msgid "Quick Comment settings saved."
+msgstr "Guardada la configuració de comentaris ràpids."
+
+#: ../../addon/openstreetmap/openstreetmap.php:71
+msgid "Tile Server URL"
+msgstr "URL del servidor, del mosaico de servidores"
+
+#: ../../addon/openstreetmap/openstreetmap.php:71
+msgid ""
+"A list of <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" "
+"target=\"_blank\">public tile servers</a>"
+msgstr "Una llista de  <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" target=\"_blank\"> un mosaic de servidors públics</a>"
+
+#: ../../addon/openstreetmap/openstreetmap.php:72
+msgid "Default zoom"
+msgstr "Zoom per defecte"
+
+#: ../../addon/openstreetmap/openstreetmap.php:72
+msgid "The default zoom level. (1:world, 18:highest)"
+msgstr "Nivell de zoom per defecte. (1: el món, 18: el més alt)"
+
+#: ../../addon/editplain/editplain.php:46
+msgid "Editplain settings updated."
+msgstr "Actualitzar la configuració de Editplain."
+
+#: ../../addon/editplain/editplain.php:76
+msgid "Editplain Settings"
+msgstr "Configuració de Editplain"
+
+#: ../../addon/editplain/editplain.php:78
+msgid "Disable richtext status editor"
+msgstr "Deshabilitar l'editor d'estatus de texte enriquit"
+
+#: ../../addon/pageheader/pageheader.php:47
+msgid "\"pageheader\" Settings"
+msgstr "Configuració de la capçalera de pàgina."
+
+#: ../../addon/pageheader/pageheader.php:65
+msgid "pageheader Settings saved."
+msgstr "guardada la configuració de la capçalera de pàgina."
+
+#: ../../addon/viewsrc/viewsrc.php:25
+msgid "View Source"
+msgstr "Veure les Fonts"
+
+#: ../../addon/statusnet/statusnet.php:134
+msgid "Post to StatusNet"
+msgstr "Publica-ho a StatusNet"
+
+#: ../../addon/statusnet/statusnet.php:175
+msgid ""
+"Please contact your site administrator.<br />The provided API URL is not "
+"valid."
+msgstr "Si us plau, poseu-vos en contacte amb l'administrador del lloc. <br /> L'adreça URL de l'API proporcionada no és vàlida."
+
+#: ../../addon/statusnet/statusnet.php:203
+msgid "We could not contact the StatusNet API with the Path you entered."
+msgstr "No hem pogut posar-nos en contacte amb l'API StatusNet amb la ruta que has introduït."
+
+#: ../../addon/statusnet/statusnet.php:229
+msgid "StatusNet settings updated."
+msgstr "La configuració StatusNet actualitzada."
+
+#: ../../addon/statusnet/statusnet.php:252
+msgid "StatusNet Posting Settings"
+msgstr "Configuració d'Enviaments per a StatusNet"
+
+#: ../../addon/statusnet/statusnet.php:266
+msgid "Globally Available StatusNet OAuthKeys"
+msgstr "OAuthKeys de StatusNet Globalment Disponible"
+
+#: ../../addon/statusnet/statusnet.php:267
+msgid ""
+"There are preconfigured OAuth key pairs for some StatusNet servers "
+"available. If you are useing one of them, please use these credentials. If "
+"not feel free to connect to any other StatusNet instance (see below)."
+msgstr "Hi ha preconfigurats parells clau OAuth per a alguns servidors StatusNet disponibles. Si està emprant un d'ells, utilitzi aquestes credencials. Si no és així no dubteu a connectar-se a qualsevol altra instància StatusNet (veure a baix)."
+
+#: ../../addon/statusnet/statusnet.php:275
+msgid "Provide your own OAuth Credentials"
+msgstr "Proporcioneu les vostres credencials de OAuth"
+
+#: ../../addon/statusnet/statusnet.php:276
+msgid ""
+"No consumer key pair for StatusNet found. Register your Friendica Account as"
+" an desktop client on your StatusNet account, copy the consumer key pair "
+"here and enter the API base root.<br />Before you register your own OAuth "
+"key pair ask the administrator if there is already a key pair for this "
+"Friendica installation at your favorited StatusNet installation."
+msgstr "no s'ha trobat cap parell \"consumer key\" per StatusNet. Registra el teu compte Friendica com un client d'escriptori en el seu compte StatusNet, copieu el parell de \"consumer key\" aquí i entri a l'arrel de la base de l'API. <br /> Abans de registrar el seu parell de claus OAuth demani a l'administrador si ja hi ha un parell de claus per a aquesta instal·lació de Friendica en la instal·lació del teu favorit StatusNet."
+
+#: ../../addon/statusnet/statusnet.php:278
+msgid "OAuth Consumer Key"
+msgstr "OAuth Consumer Key"
+
+#: ../../addon/statusnet/statusnet.php:281
+msgid "OAuth Consumer Secret"
+msgstr "OAuth Consumer Secret"
+
+#: ../../addon/statusnet/statusnet.php:284
+msgid "Base API Path (remember the trailing /)"
+msgstr "Base API Path (recorda deixar / al final)"
+
+#: ../../addon/statusnet/statusnet.php:305
+msgid ""
+"To connect to your StatusNet account click the button below to get a "
+"security code from StatusNet which you have to copy into the input box below"
+" and submit the form. Only your <strong>public</strong> posts will be posted"
+" to StatusNet."
+msgstr "Per connectar al seu compte StatusNet, feu clic al botó de sota per obtenir un codi de seguretat StatusNet, que has de copiar a la casella de sota, i enviar el formulari. Només els missatges <strong> públics </strong> es publicaran en StatusNet."
+
+#: ../../addon/statusnet/statusnet.php:306
+msgid "Log in with StatusNet"
+msgstr "Accedeixi com en  StatusNet"
+
+#: ../../addon/statusnet/statusnet.php:308
+msgid "Copy the security code from StatusNet here"
+msgstr "Copieu el codi de seguretat StatusNet aquí"
+
+#: ../../addon/statusnet/statusnet.php:314
+msgid "Cancel Connection Process"
+msgstr "Cancel·lar el procés de connexió"
+
+#: ../../addon/statusnet/statusnet.php:316
+msgid "Current StatusNet API is"
+msgstr "L'Actual StatusNet API és"
+
+#: ../../addon/statusnet/statusnet.php:317
+msgid "Cancel StatusNet Connection"
+msgstr "Cancel·lar la connexió amb StatusNet"
+
+#: ../../addon/statusnet/statusnet.php:328 ../../addon/twitter/twitter.php:184
+msgid "Currently connected to: "
+msgstr "Actualment connectat a: "
+
+#: ../../addon/statusnet/statusnet.php:329
+msgid ""
+"If enabled all your <strong>public</strong> postings can be posted to the "
+"associated StatusNet account. You can choose to do so by default (here) or "
+"for every posting separately in the posting options when writing the entry."
+msgstr "Si està activat, tots els seus anuncis <strong>públics</strong> poden ser publicats en el compte StatusNet associat. Vostè pot optar per fer-ho per defecte (en aquest cas) o per cada missatge per separat en les opcions de comptabilització en escriure l'entrada."
+
+#: ../../addon/statusnet/statusnet.php:331
+msgid ""
+"<strong>Note</strong>: Due your privacy settings (<em>Hide your profile "
+"details from unknown viewers?</em>) the link potentially included in public "
+"postings relayed to StatusNet will lead the visitor to a blank page "
+"informing the visitor that the access to your profile has been restricted."
+msgstr "<strong>Nota</strong>: A causa de les seves opcions de privacitat (<em>Amaga els detalls del teu perfil dels espectadors desconeguts? </em>)  el vincle potencialment inclòs en anuncis públics transmesos a StatusNet conduirà el visitant a una pàgina en blanc en la que informarà al visitants que l'accés al seu perfil s'ha restringit."
+
+#: ../../addon/statusnet/statusnet.php:334
+msgid "Allow posting to StatusNet"
+msgstr "Permetre enviaments a StatusNet"
+
+#: ../../addon/statusnet/statusnet.php:337
+msgid "Send public postings to StatusNet by default"
+msgstr "Enviar missatges públics a StatusNet per defecte"
+
+#: ../../addon/statusnet/statusnet.php:342 ../../addon/twitter/twitter.php:198
+msgid "Clear OAuth configuration"
+msgstr "Esborrar configuració de OAuth"
+
+#: ../../addon/statusnet/statusnet.php:524
+msgid "API URL"
+msgstr "API URL"
+
+#: ../../addon/tumblr/tumblr.php:36
+msgid "Post to Tumblr"
+msgstr "Publica-ho al Tumblr"
+
+#: ../../addon/tumblr/tumblr.php:67
+msgid "Tumblr Post Settings"
+msgstr "Configuració d'Enviaments de Tumblr"
+
+#: ../../addon/tumblr/tumblr.php:69
+msgid "Enable Tumblr Post Plugin"
+msgstr "Habilita el plugin de enviaments de Tumblr"
+
+#: ../../addon/tumblr/tumblr.php:74
+msgid "Tumblr login"
+msgstr "Inici de sessió de Tumblr"
+
+#: ../../addon/tumblr/tumblr.php:79
+msgid "Tumblr password"
+msgstr "Caontrasenya de Tumblr"
+
+#: ../../addon/tumblr/tumblr.php:84
+msgid "Post to Tumblr by default"
+msgstr "Enviar a Tumblr per defecte"
+
+#: ../../addon/numfriends/numfriends.php:46
+msgid "Numfriends settings updated."
+msgstr "Actualitzar la configuració de Numfriends."
+
+#: ../../addon/numfriends/numfriends.php:77
+msgid "Numfriends Settings"
+msgstr "Configuració de Numfriends"
+
+#: ../../addon/numfriends/numfriends.php:79
+msgid "How many contacts to display on profile sidebar"
+msgstr "Quants contactes per mostrar a la barra lateral el perfil"
+
+#: ../../addon/gnot/gnot.php:48
+msgid "Gnot settings updated."
+msgstr "Configuració de Gnot actualitzada"
+
+#: ../../addon/gnot/gnot.php:79
+msgid "Gnot Settings"
+msgstr "Configuració de Gnot"
+
+#: ../../addon/gnot/gnot.php:81
+msgid ""
+"Allows threading of email comment notifications on Gmail and anonymising the"
+" subject line."
+msgstr "Permet crear fils de les notificacions de comentaris de correu electrònic a Gmail i anonimat de la línia d'assumpte."
+
+#: ../../addon/gnot/gnot.php:82
+msgid "Enable this plugin/addon?"
+msgstr "Activar aquest plugin/aplicació?"
+
+#: ../../addon/gnot/gnot.php:97
+#, php-format
+msgid "[Friendica:Notify] Comment to conversation #%d"
+msgstr "[Friendica: Notifica] Conversació comentada #%d"
+
+#: ../../addon/wppost/wppost.php:42
+msgid "Post to Wordpress"
+msgstr "Publica-ho al Wordpress"
+
+#: ../../addon/wppost/wppost.php:74
+msgid "WordPress Post Settings"
+msgstr "Configuració d'enviaments a WordPress"
+
+#: ../../addon/wppost/wppost.php:76
+msgid "Enable WordPress Post Plugin"
+msgstr "Habilitar Configuració d'Enviaments a WordPress"
+
+#: ../../addon/wppost/wppost.php:81
+msgid "WordPress username"
+msgstr "Nom d'usuari de WordPress"
+
+#: ../../addon/wppost/wppost.php:86
+msgid "WordPress password"
+msgstr "Contrasenya de WordPress"
+
+#: ../../addon/wppost/wppost.php:91
+msgid "WordPress API URL"
+msgstr "WordPress API URL"
+
+#: ../../addon/wppost/wppost.php:96
+msgid "Post to WordPress by default"
+msgstr "Enviar a WordPress per defecte"
+
+#: ../../addon/showmore/showmore.php:38
+msgid "\"Show more\" Settings"
+msgstr "Configuració de \"Mostrar més\""
+
+#: ../../addon/showmore/showmore.php:41
+msgid "Enable Show More"
+msgstr "Habilita Mostrar Més"
+
+#: ../../addon/showmore/showmore.php:44
+msgid "Cutting posts after how much characters"
+msgstr "Tallar els missatges després de quants caràcters"
+
+#: ../../addon/showmore/showmore.php:64
+msgid "Show More Settings saved."
+msgstr "Guardada la configuració de \"Mostra Més\"."
+
+#: ../../addon/showmore/showmore.php:86
+msgid "Show More"
+msgstr "Mostra Més"
+
+#: ../../addon/piwik/piwik.php:79
+msgid ""
+"This website is tracked using the <a href='http://www.piwik.org'>Piwik</a> "
+"analytics tool."
+msgstr "Aquest lloc web realitza un seguiment mitjançant la eina d'anàlisi <a href='http://www.piwik.org'>Piwik</a>."
+
+#: ../../addon/piwik/piwik.php:82
+#, php-format
+msgid ""
+"If you do not want that your visits are logged this way you <a href='%s'>can"
+" set a cookie to prevent Piwik from tracking further visits of the site</a> "
+"(opt-out)."
+msgstr "Si no vol que les seves visites es transcribin d'aquesta manera vostè <a href='%s'> pot establir una cookie per evitar a Piwik a partir de noves visites del lloc web </a> (opt-out)."
+
+#: ../../addon/piwik/piwik.php:90
+msgid "Piwik Base URL"
+msgstr "URL Piwik Base"
+
+#: ../../addon/piwik/piwik.php:90
+msgid ""
+"Absolute path to your Piwik installation. (without protocol (http/s), with "
+"trailing slash)"
+msgstr "Trajectoria absoluta per a la instal·lació de Piwik (sense el protocol (http/s), amb la barra final )"
+
+#: ../../addon/piwik/piwik.php:91
+msgid "Site ID"
+msgstr "Lloc ID"
+
+#: ../../addon/piwik/piwik.php:92
+msgid "Show opt-out cookie link?"
+msgstr "Mostra l'enllaç cookie opt-out?"
+
+#: ../../addon/piwik/piwik.php:93
+msgid "Asynchronous tracking"
+msgstr "Seguiment asíncrono"
+
+#: ../../addon/twitter/twitter.php:73
+msgid "Post to Twitter"
+msgstr "Publica-ho al Twitter"
+
+#: ../../addon/twitter/twitter.php:119
+msgid "Twitter settings updated."
+msgstr "La configuració de Twitter actualitzada."
+
+#: ../../addon/twitter/twitter.php:141
+msgid "Twitter Posting Settings"
+msgstr "Configuració d'Enviaments per a Twitter"
+
+#: ../../addon/twitter/twitter.php:148
+msgid ""
+"No consumer key pair for Twitter found. Please contact your site "
+"administrator."
+msgstr "No s'ha pogut emparellar cap clau \"consumer key\" per a Twitter. Si us plau, poseu-vos en contacte amb l'administrador del lloc."
+
+#: ../../addon/twitter/twitter.php:167
+msgid ""
+"At this Friendica instance the Twitter plugin was enabled but you have not "
+"yet connected your account to your Twitter account. To do so click the "
+"button below to get a PIN from Twitter which you have to copy into the input"
+" box below and submit the form. Only your <strong>public</strong> posts will"
+" be posted to Twitter."
+msgstr "En aquesta instància Friendica el plugin Twitter va ser habilitat, però encara no ha connectat el compte al seu compte de Twitter. Per a això feu clic al botó de sota per obtenir un PIN de Twitter que ha de copiar a la casella de sota i enviar el formulari. Només els missatges <strong> públics </strong> es publicaran a Twitter."
+
+#: ../../addon/twitter/twitter.php:168
+msgid "Log in with Twitter"
+msgstr "Accedeixi com en  Twitter"
+
+#: ../../addon/twitter/twitter.php:170
+msgid "Copy the PIN from Twitter here"
+msgstr "Copieu el codi PIN de Twitter aquí"
+
+#: ../../addon/twitter/twitter.php:185
+msgid ""
+"If enabled all your <strong>public</strong> postings can be posted to the "
+"associated Twitter account. You can choose to do so by default (here) or for"
+" every posting separately in the posting options when writing the entry."
+msgstr "Si està activat, tots els seus anuncis <strong> públics </strong> poden ser publicats en el corresponent compte de Twitter. Vostè pot optar per fer-ho per defecte (en aquest cas) o per cada missatge per separat en les opcions de comptabilització en escriure l'entrada."
+
+#: ../../addon/twitter/twitter.php:187
+msgid ""
+"<strong>Note</strong>: Due your privacy settings (<em>Hide your profile "
+"details from unknown viewers?</em>) the link potentially included in public "
+"postings relayed to Twitter will lead the visitor to a blank page informing "
+"the visitor that the access to your profile has been restricted."
+msgstr "<strong>Nota</strong>: donada la seva configuració de privacitat (<em> Amaga els detalls del teu perfil dels espectadors desconeguts? </em>) el vincle potencialment inclòs en anuncis públics retransmesos a Twitter conduirà al visitant a una pàgina en blanc informar als visitants que l'accés al seu perfil s'ha restringit."
+
+#: ../../addon/twitter/twitter.php:190
+msgid "Allow posting to Twitter"
+msgstr "Permetre anunci a Twitter"
+
+#: ../../addon/twitter/twitter.php:193
+msgid "Send public postings to Twitter by default"
+msgstr "Enviar anuncis públics a Twitter per defecte"
+
+#: ../../addon/twitter/twitter.php:357
+msgid "Consumer key"
+msgstr "Consumer key"
+
+#: ../../addon/twitter/twitter.php:358
+msgid "Consumer secret"
+msgstr "Consumer secret"
+
+#: ../../addon/irc/irc.php:20
+msgid "irc Chatroom"
+msgstr "irc Chatroom"
+
+#: ../../addon/posterous/posterous.php:36
+msgid "Post to Posterous"
+msgstr "enviament a Posterous"
+
+#: ../../addon/posterous/posterous.php:67
+msgid "Posterous Post Settings"
+msgstr "Configuració d'Enviaments a Posterous"
+
+#: ../../addon/posterous/posterous.php:69
+msgid "Enable Posterous Post Plugin"
+msgstr "Habilitar plugin d'Enviament de Posterous"
+
+#: ../../addon/posterous/posterous.php:74
+msgid "Posterous login"
+msgstr "Inici de sessió a Posterous"
+
+#: ../../addon/posterous/posterous.php:79
+msgid "Posterous password"
+msgstr "Contrasenya a Posterous"
+
+#: ../../addon/posterous/posterous.php:84
+msgid "Post to Posterous by default"
+msgstr "Enviar a Posterous per defecte"
+
+#: ../../view/theme/quattro/theme.php:17
+msgid "Theme settings"
+msgstr "Configuració de Temes"
+
+#: ../../view/theme/quattro/theme.php:18
+msgid "Alignment"
+msgstr "Adaptació"
+
+#: ../../view/theme/quattro/theme.php:18
+msgid "Left"
+msgstr "Esquerra"
+
+#: ../../view/theme/quattro/theme.php:18
+msgid "Center"
+msgstr "Centre"
+
+#: ../../include/profile_advanced.php:17 ../../boot.php:982
+msgid "Gender:"
+msgstr "Gènere:"
+
+#: ../../include/profile_advanced.php:22
+msgid "j F, Y"
+msgstr "j F, Y"
+
+#: ../../include/profile_advanced.php:23
+msgid "j F"
+msgstr "j F"
+
+#: ../../include/profile_advanced.php:30 ../../include/datetime.php:438
+#: ../../include/items.php:1349
+msgid "Birthday:"
+msgstr "Aniversari:"
+
+#: ../../include/profile_advanced.php:34
+msgid "Age:"
+msgstr "Edat:"
+
+#: ../../include/profile_advanced.php:37 ../../boot.php:985
+msgid "Status:"
+msgstr "Estatus:"
+
+#: ../../include/profile_advanced.php:45 ../../boot.php:987
+msgid "Homepage:"
+msgstr "Pàgina web:"
+
+#: ../../include/profile_advanced.php:47
+msgid "Tags:"
+msgstr "Etiquetes:"
+
+#: ../../include/profile_advanced.php:51
+msgid "Religion:"
+msgstr "Religió:"
+
+#: ../../include/profile_advanced.php:53
+msgid "About:"
+msgstr "Acerca de:"
+
+#: ../../include/profile_advanced.php:55
+msgid "Hobbies/Interests:"
+msgstr "Aficiones/Intereses:"
+
+#: ../../include/profile_advanced.php:57
+msgid "Contact information and Social Networks:"
+msgstr "Informació de contacte i Xarxes Socials:"
+
+#: ../../include/profile_advanced.php:59
+msgid "Musical interests:"
+msgstr "Gustos musicals:"
+
+#: ../../include/profile_advanced.php:61
+msgid "Books, literature:"
+msgstr "Llibres, literatura:"
+
+#: ../../include/profile_advanced.php:63
+msgid "Television:"
+msgstr "Televisió:"
+
+#: ../../include/profile_advanced.php:65
+msgid "Film/dance/culture/entertainment:"
+msgstr "Cinema/ball/cultura/entreteniments:"
+
+#: ../../include/profile_advanced.php:67
+msgid "Love/Romance:"
+msgstr "Amor/sentiments:"
+
+#: ../../include/profile_advanced.php:69
+msgid "Work/employment:"
+msgstr "Treball/ocupació:"
+
+#: ../../include/profile_advanced.php:71
+msgid "School/education:"
+msgstr "Escola/formació"
+
+#: ../../include/contact_selectors.php:32
+msgid "Unknown | Not categorised"
+msgstr "Desconegut/No categoritzat"
+
+#: ../../include/contact_selectors.php:33
+msgid "Block immediately"
+msgstr "Bloquejar immediatament"
+
+#: ../../include/contact_selectors.php:34
+msgid "Shady, spammer, self-marketer"
+msgstr "Sospitós, Femater, auto-publicitat"
+
+#: ../../include/contact_selectors.php:35
+msgid "Known to me, but no opinion"
+msgstr "Conegut per mi, però sense opinió"
+
+#: ../../include/contact_selectors.php:36
+msgid "OK, probably harmless"
+msgstr "Bé, probablement inofensiu"
+
+#: ../../include/contact_selectors.php:37
+msgid "Reputable, has my trust"
+msgstr "Bona reputació, té la meva confiança"
+
+#: ../../include/contact_selectors.php:56
+msgid "Frequently"
+msgstr "Freqüentment"
+
+#: ../../include/contact_selectors.php:57
+msgid "Hourly"
+msgstr "Cada hora"
+
+#: ../../include/contact_selectors.php:58
+msgid "Twice daily"
+msgstr "Dues vegades al dia"
+
+#: ../../include/contact_selectors.php:59
+msgid "Daily"
+msgstr "Diari"
+
+#: ../../include/contact_selectors.php:60
+msgid "Weekly"
+msgstr "Setmanal"
+
+#: ../../include/contact_selectors.php:61
+msgid "Monthly"
+msgstr "Mensual"
+
+#: ../../include/contact_selectors.php:77
+msgid "OStatus"
+msgstr "OStatus"
+
+#: ../../include/contact_selectors.php:78
+msgid "RSS/Atom"
+msgstr "RSS/Atom"
+
+#: ../../include/contact_selectors.php:82
+msgid "Zot!"
+msgstr "Zot!"
+
+#: ../../include/contact_selectors.php:83
+msgid "LinkedIn"
+msgstr "LinkedIn"
+
+#: ../../include/contact_selectors.php:84
+msgid "XMPP/IM"
+msgstr "XMPP/IM"
+
+#: ../../include/contact_selectors.php:85
+msgid "MySpace"
+msgstr "MySpace"
+
+#: ../../include/profile_selectors.php:6
+msgid "Male"
+msgstr "Home"
+
+#: ../../include/profile_selectors.php:6
+msgid "Female"
+msgstr "Dona"
+
+#: ../../include/profile_selectors.php:6
+msgid "Currently Male"
+msgstr "Actualment Home"
+
+#: ../../include/profile_selectors.php:6
+msgid "Currently Female"
+msgstr "Actualment Dona"
+
+#: ../../include/profile_selectors.php:6
+msgid "Mostly Male"
+msgstr "Habitualment Home"
+
+#: ../../include/profile_selectors.php:6
+msgid "Mostly Female"
+msgstr "Habitualment Dona"
+
+#: ../../include/profile_selectors.php:6
+msgid "Transgender"
+msgstr "Transgènere"
+
+#: ../../include/profile_selectors.php:6
+msgid "Intersex"
+msgstr "Bisexual"
+
+#: ../../include/profile_selectors.php:6
+msgid "Transsexual"
+msgstr "Transexual"
+
+#: ../../include/profile_selectors.php:6
+msgid "Hermaphrodite"
+msgstr "Hermafrodita"
+
+#: ../../include/profile_selectors.php:6
+msgid "Neuter"
+msgstr "Neutre"
+
+#: ../../include/profile_selectors.php:6
+msgid "Non-specific"
+msgstr "No específicat"
+
+#: ../../include/profile_selectors.php:6
+msgid "Other"
+msgstr "Altres"
+
+#: ../../include/profile_selectors.php:6
+msgid "Undecided"
+msgstr "No Decidit"
+
+#: ../../include/profile_selectors.php:19
+msgid "Males"
+msgstr "Home"
+
+#: ../../include/profile_selectors.php:19
+msgid "Females"
+msgstr "Dona"
+
+#: ../../include/profile_selectors.php:19
+msgid "Gay"
+msgstr "Gay"
+
+#: ../../include/profile_selectors.php:19
+msgid "Lesbian"
+msgstr "Lesbiana"
+
+#: ../../include/profile_selectors.php:19
+msgid "No Preference"
+msgstr "Sense Preferències"
+
+#: ../../include/profile_selectors.php:19
+msgid "Bisexual"
+msgstr "Bisexual"
+
+#: ../../include/profile_selectors.php:19
+msgid "Autosexual"
+msgstr "Autosexual"
+
+#: ../../include/profile_selectors.php:19
+msgid "Abstinent"
+msgstr "Abstinent/a"
+
+#: ../../include/profile_selectors.php:19
+msgid "Virgin"
+msgstr "Verge"
+
+#: ../../include/profile_selectors.php:19
+msgid "Deviant"
+msgstr "Desviat/da"
+
+#: ../../include/profile_selectors.php:19
+msgid "Fetish"
+msgstr "Fetixiste"
+
+#: ../../include/profile_selectors.php:19
+msgid "Oodles"
+msgstr "Orgies"
+
+#: ../../include/profile_selectors.php:19
+msgid "Nonsexual"
+msgstr "Asexual"
+
+#: ../../include/profile_selectors.php:33
+msgid "Single"
+msgstr "Solter/a"
+
+#: ../../include/profile_selectors.php:33
+msgid "Lonely"
+msgstr "Solitari"
+
+#: ../../include/profile_selectors.php:33
+msgid "Available"
+msgstr "Disponible"
+
+#: ../../include/profile_selectors.php:33
+msgid "Unavailable"
+msgstr "No Disponible"
+
+#: ../../include/profile_selectors.php:33
+msgid "Dating"
+msgstr "De cites"
+
+#: ../../include/profile_selectors.php:33
+msgid "Unfaithful"
+msgstr "Infidel"
+
+#: ../../include/profile_selectors.php:33
+msgid "Sex Addict"
+msgstr "Adicte al sexe"
+
+#: ../../include/profile_selectors.php:33
+msgid "Friends"
+msgstr "Amics/Amigues"
+
+#: ../../include/profile_selectors.php:33
+msgid "Friends/Benefits"
+msgstr "Amics íntims"
+
+#: ../../include/profile_selectors.php:33
+msgid "Casual"
+msgstr "Oportunista"
+
+#: ../../include/profile_selectors.php:33
+msgid "Engaged"
+msgstr "Promès"
+
+#: ../../include/profile_selectors.php:33
+msgid "Married"
+msgstr "Casat"
+
+#: ../../include/profile_selectors.php:33
+msgid "Partners"
+msgstr "Socis"
+
+#: ../../include/profile_selectors.php:33
+msgid "Cohabiting"
+msgstr "Cohabitant"
+
+#: ../../include/profile_selectors.php:33
+msgid "Happy"
+msgstr "Feliç"
+
+#: ../../include/profile_selectors.php:33
+msgid "Not Looking"
+msgstr "No Cerco"
+
+#: ../../include/profile_selectors.php:33
+msgid "Swinger"
+msgstr "Parella Liberal"
+
+#: ../../include/profile_selectors.php:33
+msgid "Betrayed"
+msgstr "Traït/da"
+
+#: ../../include/profile_selectors.php:33
+msgid "Separated"
+msgstr "Separat/da"
+
+#: ../../include/profile_selectors.php:33
+msgid "Unstable"
+msgstr "Inestable"
+
+#: ../../include/profile_selectors.php:33
+msgid "Divorced"
+msgstr "Divorciat/da"
+
+#: ../../include/profile_selectors.php:33
+msgid "Widowed"
+msgstr "Vidu/a"
+
+#: ../../include/profile_selectors.php:33
+msgid "Uncertain"
+msgstr "Incert"
+
+#: ../../include/profile_selectors.php:33
+msgid "Complicated"
+msgstr "Complicat"
+
+#: ../../include/profile_selectors.php:33
+msgid "Don't care"
+msgstr "No t'interessa"
+
+#: ../../include/profile_selectors.php:33
+msgid "Ask me"
+msgstr "Pregunta'm"
+
+#: ../../include/event.php:17 ../../include/bb2diaspora.php:244
+msgid "Starts:"
+msgstr "Inici:"
+
+#: ../../include/event.php:27 ../../include/bb2diaspora.php:252
+msgid "Finishes:"
+msgstr "Acaba:"
+
+#: ../../include/delivery.php:425 ../../include/notifier.php:638
+msgid "(no subject)"
+msgstr "(sense assumpte)"
+
+#: ../../include/delivery.php:432 ../../include/enotify.php:17
+#: ../../include/notifier.php:645
+msgid "noreply"
+msgstr "no contestar"
+
+#: ../../include/text.php:238
+msgid "prev"
+msgstr "Prev"
+
+#: ../../include/text.php:240
+msgid "first"
+msgstr "primer"
+
+#: ../../include/text.php:269
+msgid "last"
+msgstr "Últim"
+
+#: ../../include/text.php:272
+msgid "next"
+msgstr "Proper"
+
+#: ../../include/text.php:563
+msgid "No contacts"
+msgstr "Sense contactes"
+
+#: ../../include/text.php:572
+#, php-format
+msgid "%d Contact"
+msgid_plural "%d Contacts"
+msgstr[0] "%d Contacte"
+msgstr[1] "%d Contactes"
+
+#: ../../include/text.php:643 ../../include/nav.php:87
+msgid "Search"
+msgstr "Cercar"
+
+#: ../../include/text.php:831
+msgid "Monday"
+msgstr "Dilluns"
+
+#: ../../include/text.php:831
+msgid "Tuesday"
+msgstr "Dimarts"
+
+#: ../../include/text.php:831
+msgid "Wednesday"
+msgstr "Dimecres"
+
+#: ../../include/text.php:831
+msgid "Thursday"
+msgstr "Dijous"
+
+#: ../../include/text.php:831
+msgid "Friday"
+msgstr "Divendres"
+
+#: ../../include/text.php:831
+msgid "Saturday"
+msgstr "Dissabte"
+
+#: ../../include/text.php:831
+msgid "Sunday"
+msgstr "Diumenge"
+
+#: ../../include/text.php:835
+msgid "January"
+msgstr "Gener"
+
+#: ../../include/text.php:835
+msgid "February"
+msgstr "Febrer"
+
+#: ../../include/text.php:835
+msgid "March"
+msgstr "Març"
+
+#: ../../include/text.php:835
+msgid "April"
+msgstr "Abril"
+
+#: ../../include/text.php:835
+msgid "May"
+msgstr "Maig"
+
+#: ../../include/text.php:835
+msgid "June"
+msgstr "Juny"
+
+#: ../../include/text.php:835
+msgid "July"
+msgstr "Juliol"
+
+#: ../../include/text.php:835
+msgid "August"
+msgstr "Agost"
+
+#: ../../include/text.php:835
+msgid "September"
+msgstr "Setembre"
+
+#: ../../include/text.php:835
+msgid "October"
+msgstr "Octubre"
+
+#: ../../include/text.php:835
+msgid "November"
+msgstr "Novembre"
+
+#: ../../include/text.php:835
+msgid "December"
+msgstr "Desembre"
+
+#: ../../include/text.php:905
+msgid "bytes"
+msgstr "bytes"
+
+#: ../../include/text.php:1000
+msgid "Select an alternate language"
+msgstr "Sel·lecciona un idioma alternatiu"
+
+#: ../../include/text.php:1012
+msgid "default"
+msgstr "per defecte"
+
+#: ../../include/text.php:1228
+msgid "activity"
+msgstr "activitat"
+
+#: ../../include/text.php:1230
+msgid "comment"
+msgstr "comentari"
+
+#: ../../include/text.php:1231
+msgid "post"
+msgstr "missatge"
+
+#: ../../include/diaspora.php:570
+msgid "Sharing notification from Diaspora network"
+msgstr "Compartint la notificació de la xarxa Diàspora"
+
+#: ../../include/diaspora.php:1911
+msgid "Attachments:"
+msgstr "Adjunts:"
+
+#: ../../include/diaspora.php:2094
+#, php-format
+msgid "[Relayed] Comment authored by %s from network %s"
+msgstr "[Retransmès] Comentari escrit per %s  des de la xarxa %s"
+
+#: ../../include/network.php:814
+msgid "view full size"
+msgstr "Veure a mida completa"
+
+#: ../../include/oembed.php:128
+msgid "Embedded content"
+msgstr "Contingut incrustat"
+
+#: ../../include/oembed.php:137
+msgid "Embedding disabled"
+msgstr "Incrustacions deshabilitades"
+
+#: ../../include/group.php:25
+msgid ""
+"A deleted group with this name was revived. Existing item permissions "
+"<strong>may</strong> apply to this group and any future members. If this is "
+"not what you intended, please create another group with a different name."
+msgstr "Un grup eliminat amb aquest nom va ser restablert. Els permisos dels elements existents <strong>poden</strong> aplicar-se a aquest grup i tots els futurs membres. Si això no és el que pretén, si us plau, crei un altre grup amb un nom diferent."
+
+#: ../../include/group.php:168
+msgid "Everybody"
+msgstr "Tothom"
+
+#: ../../include/group.php:191
+msgid "edit"
+msgstr "editar"
+
+#: ../../include/group.php:212
+msgid "Groups"
+msgstr "Grups"
+
+#: ../../include/group.php:213
+msgid "Edit group"
+msgstr "Editar grup"
+
+#: ../../include/group.php:214
+msgid "Create a new group"
+msgstr "Crear un nou grup"
+
+#: ../../include/nav.php:44 ../../boot.php:709
+msgid "Logout"
+msgstr "Sortir"
+
+#: ../../include/nav.php:44
+msgid "End this session"
+msgstr "Termina sessió"
+
+#: ../../include/nav.php:47 ../../boot.php:1331
+msgid "Status"
+msgstr "Estatus"
+
+#: ../../include/nav.php:47 ../../include/nav.php:111
+msgid "Your posts and conversations"
+msgstr "Els teus anuncis i converses"
+
+#: ../../include/nav.php:48
+msgid "Your profile page"
+msgstr "La seva pàgina de perfil"
+
+#: ../../include/nav.php:49 ../../boot.php:1341
+msgid "Photos"
+msgstr "Fotos"
+
+#: ../../include/nav.php:49
+msgid "Your photos"
+msgstr "Les seves fotos"
+
+#: ../../include/nav.php:50
+msgid "Your events"
+msgstr "Els seus esdeveniments"
+
+#: ../../include/nav.php:51
+msgid "Personal notes"
+msgstr "Notes personals"
+
+#: ../../include/nav.php:51
+msgid "Your personal photos"
+msgstr "Les seves fotos personals"
+
+#: ../../include/nav.php:62
+msgid "Sign in"
+msgstr "Accedeix"
+
+#: ../../include/nav.php:73
+msgid "Home Page"
+msgstr "Pàgina d'Inici"
+
+#: ../../include/nav.php:77
+msgid "Create an account"
+msgstr "Crear un compte"
+
+#: ../../include/nav.php:82
+msgid "Help and documentation"
+msgstr "Ajuda i documentació"
+
+#: ../../include/nav.php:85
+msgid "Apps"
+msgstr "Aplicacions"
+
+#: ../../include/nav.php:85
+msgid "Addon applications, utilities, games"
+msgstr "Afegits: aplicacions, utilitats, jocs"
+
+#: ../../include/nav.php:87
+msgid "Search site content"
+msgstr "Busca contingut en el lloc"
+
+#: ../../include/nav.php:97
+msgid "Conversations on this site"
+msgstr "Converses en aquest lloc"
+
+#: ../../include/nav.php:99
+msgid "Directory"
+msgstr "Directori"
+
+#: ../../include/nav.php:99
+msgid "People directory"
+msgstr "Directori de gent"
+
+#: ../../include/nav.php:109
+msgid "Conversations from your friends"
+msgstr "Converses dels teus amics"
+
+#: ../../include/nav.php:117
+msgid "Friend Requests"
+msgstr "Sol·licitud d'Amistat"
+
+#: ../../include/nav.php:119
+msgid "See all notifications"
+msgstr "Veure totes les notificacions"
+
+#: ../../include/nav.php:120
+msgid "Mark all system notifications seen"
+msgstr "Marcar totes les notificacions del sistema com a vistes"
+
+#: ../../include/nav.php:124
+msgid "Private mail"
+msgstr "Correu privat"
+
+#: ../../include/nav.php:127
+msgid "Manage"
+msgstr "Gestionar"
+
+#: ../../include/nav.php:127
+msgid "Manage other pages"
+msgstr "Gestiona altres pàgines"
+
+#: ../../include/nav.php:131 ../../boot.php:940
+msgid "Profiles"
+msgstr "Perfils"
+
+#: ../../include/nav.php:131 ../../boot.php:940
+msgid "Manage/edit profiles"
+msgstr "Gestiona/edita perfils"
+
+#: ../../include/nav.php:132
+msgid "Manage/edit friends and contacts"
+msgstr "Gestiona/edita amics i contactes"
+
+#: ../../include/nav.php:139
+msgid "Admin"
+msgstr "Admin"
+
+#: ../../include/nav.php:139
+msgid "Site setup and configuration"
+msgstr "Ajustos i configuració del lloc"
+
+#: ../../include/nav.php:162
+msgid "Nothing new here"
+msgstr "Res nou aquí"
+
+#: ../../include/contact_widgets.php:6
+msgid "Add New Contact"
+msgstr "Afegir Nou Contacte"
+
+#: ../../include/contact_widgets.php:7
+msgid "Enter address or web location"
+msgstr "Introdueixi adreça o ubicació web"
+
+#: ../../include/contact_widgets.php:8
+msgid "Example: bob@example.com, http://example.com/barbara"
+msgstr "Exemple: bob@example.com, http://example.com/barbara"
+
+#: ../../include/contact_widgets.php:18
+msgid "Invite Friends"
+msgstr "Invita Amics"
+
+#: ../../include/contact_widgets.php:24
+#, php-format
+msgid "%d invitation available"
+msgid_plural "%d invitations available"
+msgstr[0] "%d invitació disponible"
+msgstr[1] "%d invitacions disponibles"
+
+#: ../../include/contact_widgets.php:30
+msgid "Find People"
+msgstr "Trobar Gent"
+
+#: ../../include/contact_widgets.php:31
+msgid "Enter name or interest"
+msgstr "Introdueixi nom o aficions"
+
+#: ../../include/contact_widgets.php:32
+msgid "Connect/Follow"
+msgstr "Connectar/Seguir"
+
+#: ../../include/contact_widgets.php:33
+msgid "Examples: Robert Morgenstein, Fishing"
+msgstr "Exemples: Robert Morgenstein, Pescar"
+
+#: ../../include/contact_widgets.php:36
+msgid "Similar Interests"
+msgstr "Aficions Similars"
+
+#: ../../include/contact_widgets.php:68
+msgid "Networks"
+msgstr "Xarxes"
+
+#: ../../include/contact_widgets.php:71
+msgid "All Networks"
+msgstr "totes les Xarxes"
+
+#: ../../include/auth.php:29
+msgid "Logged out."
+msgstr "Has sortit"
+
+#: ../../include/datetime.php:43 ../../include/datetime.php:45
+msgid "Miscellaneous"
+msgstr "Miscel·lania"
+
+#: ../../include/datetime.php:121 ../../include/datetime.php:253
+msgid "year"
+msgstr "any"
+
+#: ../../include/datetime.php:126 ../../include/datetime.php:254
+msgid "month"
+msgstr "mes"
+
+#: ../../include/datetime.php:131 ../../include/datetime.php:256
+msgid "day"
+msgstr "dia"
+
+#: ../../include/datetime.php:244
+msgid "never"
+msgstr "mai"
+
+#: ../../include/datetime.php:250
+msgid "less than a second ago"
+msgstr "Fa menys d'un segon"
+
+#: ../../include/datetime.php:253
+msgid "years"
+msgstr "anys"
+
+#: ../../include/datetime.php:254
+msgid "months"
+msgstr "mesos"
+
+#: ../../include/datetime.php:255
+msgid "week"
+msgstr "setmana"
+
+#: ../../include/datetime.php:255
+msgid "weeks"
+msgstr "setmanes"
+
+#: ../../include/datetime.php:256
+msgid "days"
+msgstr "dies"
+
+#: ../../include/datetime.php:257
+msgid "hour"
+msgstr "hora"
+
+#: ../../include/datetime.php:257
+msgid "hours"
+msgstr "hores"
+
+#: ../../include/datetime.php:258
+msgid "minute"
+msgstr "minut"
+
+#: ../../include/datetime.php:258
+msgid "minutes"
+msgstr "minuts"
+
+#: ../../include/datetime.php:259
+msgid "second"
+msgstr "segon"
+
+#: ../../include/datetime.php:259
+msgid "seconds"
+msgstr "segons"
+
+#: ../../include/datetime.php:267
+#, php-format
+msgid "%1$d %2$s ago"
+msgstr " fa %1$d %2$s"
+
+#: ../../include/poller.php:513
+msgid "From: "
+msgstr "Des de:"
+
+#: ../../include/bbcode.php:202
+msgid "$1 wrote:"
+msgstr "$1 va escrivir:"
+
+#: ../../include/bbcode.php:216 ../../include/bbcode.php:282
+msgid "Image/photo"
+msgstr "Imatge/foto"
+
+#: ../../include/dba.php:39
+#, php-format
+msgid "Cannot locate DNS info for database server '%s'"
+msgstr "No put trobar informació de DNS  del servidor de base de dades '%s'"
+
+#: ../../include/message.php:14
+msgid "[no subject]"
+msgstr "[Sense assumpte]"
+
+#: ../../include/acl_selectors.php:284
+msgid "Visible to everybody"
+msgstr "Visible per tothom"
+
+#: ../../include/acl_selectors.php:285
+msgid "show"
+msgstr "mostra"
+
+#: ../../include/acl_selectors.php:286
+msgid "don't show"
+msgstr "no mostris"
+
+#: ../../include/enotify.php:8
+msgid "Friendica Notification"
+msgstr "Notificacions de Friendica"
+
+#: ../../include/enotify.php:11
+msgid "Thank You,"
+msgstr "Gràcies,"
+
+#: ../../include/enotify.php:13
+#, php-format
+msgid "%s Administrator"
+msgstr "%s Administrador"
+
+#: ../../include/enotify.php:29
+#, php-format
+msgid "%s <!item_type!>"
+msgstr "%s <!item_type!>"
+
+#: ../../include/enotify.php:33
+#, php-format
+msgid "[Friendica:Notify] New mail received at %s"
+msgstr "[Friendica: Notifica] nou correu rebut a %s"
+
+#: ../../include/enotify.php:35
+#, php-format
+msgid "%s sent you a new private message at %s."
+msgstr "%s t'ha enviat un nou missatge privat en %s"
+
+#: ../../include/enotify.php:36
+#, php-format
+msgid "%s sent you %s."
+msgstr "%s t'ha enviat %s."
+
+#: ../../include/enotify.php:36
+msgid "a private message"
+msgstr "un missatge privat"
+
+#: ../../include/enotify.php:37
+#, php-format
+msgid "Please visit %s to view and/or reply to your private messages."
+msgstr "Per favor, visiteu %s per a veure i/o respondre els teus missatges privats."
+
+#: ../../include/enotify.php:67
+#, php-format
+msgid "%s's"
+msgstr "%s's"
+
+#: ../../include/enotify.php:71
+msgid "your"
+msgstr "tu"
+
+#: ../../include/enotify.php:78
+#, php-format
+msgid "[Friendica:Notify] Comment to conversation #%d by %s"
+msgstr "[Friendica:Notifica] Conversació comentada #%d per %s"
+
+#: ../../include/enotify.php:79
+#, php-format
+msgid "%s commented on an item/conversation you have been following."
+msgstr "%s ha comentat un element/conversació que estas seguint."
+
+#: ../../include/enotify.php:80
+#, php-format
+msgid "%s commented on %s."
+msgstr "%s comentat a %s."
+
+#: ../../include/enotify.php:82 ../../include/enotify.php:95
+#: ../../include/enotify.php:106 ../../include/enotify.php:117
+#, php-format
+msgid "Please visit %s to view and/or reply to the conversation."
+msgstr "Si us pau, visiteu %s per a veure i/o respondre la conversació."
+
+#: ../../include/enotify.php:89
+#, php-format
+msgid "[Friendica:Notify] %s posted to your profile wall"
+msgstr "[Friendica:Notifica] %s enviat al teu mur del perfil"
+
+#: ../../include/enotify.php:91
+#, php-format
+msgid "%s posted to your profile wall at %s"
+msgstr "%s enviat al teu mur de perfil %s"
+
+#: ../../include/enotify.php:93
+#, php-format
+msgid "%s posted to %s"
+msgstr "%s enviat a %s"
+
+#: ../../include/enotify.php:93
+msgid "your profile wall."
+msgstr "El teu perfil del mur."
+
+#: ../../include/enotify.php:102
+#, php-format
+msgid "[Friendica:Notify] %s tagged you"
+msgstr "[Friendica:Notifica] %s t'ha etiquetat"
+
+#: ../../include/enotify.php:103
+#, php-format
+msgid "%s tagged you at %s"
+msgstr "%s t'ha etiquetat en %s"
+
+#: ../../include/enotify.php:104
+#, php-format
+msgid "%s %s."
+msgstr "%s %s."
+
+#: ../../include/enotify.php:104
+msgid "tagged you"
+msgstr "Etiquetat"
+
+#: ../../include/enotify.php:113
+#, php-format
+msgid "[Friendica:Notify] %s tagged your post"
+msgstr "[Friendica:Notifica] %s ha etiquetat el teu missatge"
+
+#: ../../include/enotify.php:114
+#, php-format
+msgid "%s tagged your post at %s"
+msgstr "%s Ha etiquetat un missatge teu en %s"
+
+#: ../../include/enotify.php:115
+#, php-format
+msgid "%s tagged %s"
+msgstr "%s etiquetat %s"
+
+#: ../../include/enotify.php:115
+msgid "your post"
+msgstr "El teu missatge"
+
+#: ../../include/enotify.php:124
+msgid "[Friendica:Notify] Introduction received"
+msgstr "[Friendica:Notifica] Presentacio rebuda"
+
+#: ../../include/enotify.php:125
+#, php-format
+msgid "You've received an introduction from '%s' at %s"
+msgstr "Has rebut una presentació de %s en %s"
+
+#: ../../include/enotify.php:126
+#, php-format
+msgid "You've received %s from %s."
+msgstr "Has rebut %s de %s"
+
+#: ../../include/enotify.php:126
+msgid "an introduction"
+msgstr "Una presentació"
+
+#: ../../include/enotify.php:127 ../../include/enotify.php:144
+#, php-format
+msgid "You may visit their profile at %s"
+msgstr "Pot visitar el seu perfil en %s"
+
+#: ../../include/enotify.php:129
+#, php-format
+msgid "Please visit %s to approve or reject the introduction."
+msgstr "Si us plau visiteu %s per aprovar o rebutjar la presentació."
+
+#: ../../include/enotify.php:136
+msgid "[Friendica:Notify] Friend suggestion received"
+msgstr "[Friendica:Notifica] Suggerencia d'amistat rebuda"
+
+#: ../../include/enotify.php:137
+#, php-format
+msgid "You've received a friend suggestion from '%s' at %s"
+msgstr "Has rebut una suggerencia d'amistat de %s en %s"
+
+#: ../../include/enotify.php:138
+#, php-format
+msgid "You've received %s for %s from %s."
+msgstr "Has rebut %s per %s de %s."
+
+#: ../../include/enotify.php:139
+msgid "a friend suggestion"
+msgstr "Un suggerencia d'amistat"
+
+#: ../../include/enotify.php:142
+msgid "Name:"
+msgstr "Nom:"
+
+#: ../../include/enotify.php:143
+msgid "Photo:"
+msgstr "Foto:"
+
+#: ../../include/enotify.php:146
+#, php-format
+msgid "Please visit %s to approve or reject the suggestion."
+msgstr "Si us plau, visiteu %s per aprovar o rebutjar la suggerencia."
+
+#: ../../include/items.php:2573
+msgid "A new person is sharing with you at "
+msgstr "Una persona nova està compartint amb tú en"
+
+#: ../../include/items.php:2573
+msgid "You have a new follower at "
+msgstr "Tens un nou seguidor a "
+
+#: ../../include/bb2diaspora.php:102 ../../include/bb2diaspora.php:112
+#: ../../include/bb2diaspora.php:113
+msgid "image/photo"
+msgstr "Imatge/foto"
+
+#: ../../include/security.php:20
+msgid "Welcome "
+msgstr "Benvingut"
+
+#: ../../include/security.php:21
+msgid "Please upload a profile photo."
+msgstr "Per favor, carrega una foto per al perfil"
+
+#: ../../include/security.php:24
+msgid "Welcome back "
+msgstr "Benvingut de nou "
+
+#: ../../include/Contact.php:131 ../../include/conversation.php:788
+msgid "View status"
+msgstr "Veure estatus"
+
+#: ../../include/Contact.php:132 ../../include/conversation.php:789
+msgid "View profile"
+msgstr "Veure perfil"
+
+#: ../../include/Contact.php:133 ../../include/conversation.php:790
+msgid "View photos"
+msgstr "Veure fotos"
+
+#: ../../include/Contact.php:134 ../../include/Contact.php:147
+#: ../../include/conversation.php:791
+msgid "View recent"
+msgstr "Veure recent"
+
+#: ../../include/Contact.php:136 ../../include/Contact.php:147
+#: ../../include/conversation.php:793
+msgid "Send PM"
+msgstr "Enviar Missatge Privat"
+
+#: ../../include/conversation.php:163
+msgid "post/item"
+msgstr "anunci/element"
+
+#: ../../include/conversation.php:164
+#, php-format
+msgid "%1$s marked %2$s's %3$s as favorite"
+msgstr "%1$s marcat %2$s's %3$s com favorit"
+
+#: ../../include/conversation.php:303 ../../include/conversation.php:572
+msgid "Select"
+msgstr "Selecionar"
+
+#: ../../include/conversation.php:320 ../../include/conversation.php:665
+#: ../../include/conversation.php:666
+#, php-format
+msgid "View %s's profile @ %s"
+msgstr "Veure perfil de %s @ %s"
+
+#: ../../include/conversation.php:330 ../../include/conversation.php:677
+#, php-format
+msgid "%s from %s"
+msgstr "%s des de %s"
+
+#: ../../include/conversation.php:346
+msgid "View in context"
+msgstr "Veure en context"
+
+#: ../../include/conversation.php:467
+#, php-format
+msgid "%d comment"
+msgid_plural "%d comments"
+msgstr[0] "%d comentari"
+msgstr[1] "%d comentaris"
+
+#: ../../include/conversation.php:468 ../../boot.php:448
+msgid "show more"
+msgstr "Mostrar més"
+
+#: ../../include/conversation.php:529
+msgid "like"
+msgstr "Agrada"
+
+#: ../../include/conversation.php:530
+msgid "dislike"
+msgstr "Desagrada"
+
+#: ../../include/conversation.php:532
+msgid "Share this"
+msgstr "Compartir això"
+
+#: ../../include/conversation.php:532
+msgid "share"
+msgstr "Compartir"
+
+#: ../../include/conversation.php:582
+msgid "add star"
+msgstr "Afegir a favorits"
+
+#: ../../include/conversation.php:583
+msgid "remove star"
+msgstr "Esborrar favorit"
+
+#: ../../include/conversation.php:584
+msgid "toggle star status"
+msgstr "Canviar estatus de favorit"
+
+#: ../../include/conversation.php:587
+msgid "starred"
+msgstr "favorit"
+
+#: ../../include/conversation.php:588
+msgid "add tag"
+msgstr "afegir etiqueta"
+
+#: ../../include/conversation.php:667
+msgid "to"
+msgstr "a"
+
+#: ../../include/conversation.php:668
+msgid "Wall-to-Wall"
+msgstr "Mur-a-Mur"
+
+#: ../../include/conversation.php:669
+msgid "via Wall-To-Wall:"
+msgstr "via Mur-a-Mur"
+
+#: ../../include/conversation.php:713
+msgid "Delete Selected Items"
+msgstr "Esborra els Elements Seleccionats"
+
+#: ../../include/conversation.php:845
+#, php-format
+msgid "%s likes this."
+msgstr "a %s agrada això."
+
+#: ../../include/conversation.php:845
+#, php-format
+msgid "%s doesn't like this."
+msgstr "a %s desagrada això."
+
+#: ../../include/conversation.php:849
+#, php-format
+msgid "<span  %1$s>%2$d people</span> like this."
+msgstr "Li agrada a<span  %1$s>%2$d persones</span> ."
+
+#: ../../include/conversation.php:851
+#, php-format
+msgid "<span  %1$s>%2$d people</span> don't like this."
+msgstr "No li agrada<span  %1$s>%2$d persones</span> ."
+
+#: ../../include/conversation.php:857
+msgid "and"
+msgstr "i"
+
+#: ../../include/conversation.php:860
+#, php-format
+msgid ", and %d other people"
+msgstr ", i altres %d persones"
+
+#: ../../include/conversation.php:861
+#, php-format
+msgid "%s like this."
+msgstr "a %s le gusta esto."
+
+#: ../../include/conversation.php:861
+#, php-format
+msgid "%s don't like this."
+msgstr "a %s no le gusta esto."
+
+#: ../../include/conversation.php:886
+msgid "Visible to <strong>everybody</strong>"
+msgstr "Visible per a <strong>tothom</strong>"
+
+#: ../../include/conversation.php:888
+msgid "Please enter a video link/URL:"
+msgstr "Per favor , introdueixi el enllaç/URL del video"
+
+#: ../../include/conversation.php:889
+msgid "Please enter an audio link/URL:"
+msgstr "Per favor , introdueixi el enllaç/URL del audio:"
+
+#: ../../include/conversation.php:890
+msgid "Tag term:"
+msgstr "Terminis de l'etiqueta:"
+
+#: ../../include/conversation.php:891
+msgid "Where are you right now?"
+msgstr "On ets ara?"
+
+#: ../../include/conversation.php:892
+msgid "Enter a title for this item"
+msgstr "Escriviu un títol per a aquest article"
+
+#: ../../include/conversation.php:935
+msgid "upload photo"
+msgstr "carregar fotos"
+
+#: ../../include/conversation.php:937
+msgid "attach file"
+msgstr "adjuntar arxiu"
+
+#: ../../include/conversation.php:939
+msgid "web link"
+msgstr "enllaç de web"
+
+#: ../../include/conversation.php:940
+msgid "Insert video link"
+msgstr "Insertar enllaç de video"
+
+#: ../../include/conversation.php:941
+msgid "video link"
+msgstr "enllaç de video"
+
+#: ../../include/conversation.php:942
+msgid "Insert audio link"
+msgstr "Insertar enllaç de audio"
+
+#: ../../include/conversation.php:943
+msgid "audio link"
+msgstr "enllaç de audio"
+
+#: ../../include/conversation.php:945
+msgid "set location"
+msgstr "establir la ubicació"
+
+#: ../../include/conversation.php:947
+msgid "clear location"
+msgstr "netejar ubicació"
+
+#: ../../include/conversation.php:952
+msgid "permissions"
+msgstr "Permissos"
+
+#: ../../boot.php:446
+msgid "Delete this item?"
+msgstr "Esborrar aquest element?"
+
+#: ../../boot.php:449
+msgid "show fewer"
+msgstr "Mostrar menys"
+
+#: ../../boot.php:692
+msgid "Create a New Account"
+msgstr "Crear un Nou Compte"
+
+#: ../../boot.php:712
+msgid "Nickname or Email address: "
+msgstr "Malnom o Adreça de correu:"
+
+#: ../../boot.php:713
+msgid "Password: "
+msgstr "Contrasenya:"
+
+#: ../../boot.php:716
+msgid "Or login using OpenID: "
+msgstr "O accedixi emprant OpenID:"
+
+#: ../../boot.php:722
+msgid "Forgot your password?"
+msgstr "Oblidà la contrasenya?"
+
+#: ../../boot.php:879
+msgid "Edit profile"
+msgstr "Editar perfil"
+
+#: ../../boot.php:1046 ../../boot.php:1117
+msgid "g A l F d"
+msgstr "g A l F d"
+
+#: ../../boot.php:1047 ../../boot.php:1118
+msgid "F d"
+msgstr "F d"
+
+#: ../../boot.php:1072
+msgid "Birthday Reminders"
+msgstr "Recordatori d'Aniversaris"
+
+#: ../../boot.php:1073
+msgid "Birthdays this week:"
+msgstr "Aniversari aquesta setmana"
+
+#: ../../boot.php:1096 ../../boot.php:1160
+msgid "[today]"
+msgstr "[avui]"
+
+#: ../../boot.php:1141
+msgid "Event Reminders"
+msgstr "Recordatori d'Esdeveniments"
+
+#: ../../boot.php:1142
+msgid "Events this week:"
+msgstr "Esdeveniments aquesta setmana"
+
+#: ../../boot.php:1154
+msgid "[No description]"
+msgstr "[sense descripció]"
diff --git a/view/ca/passchanged_eml.tpl b/view/ca/passchanged_eml.tpl
new file mode 100755
index 000000000..22e54b8c0
--- /dev/null
+++ b/view/ca/passchanged_eml.tpl
@@ -0,0 +1,19 @@
+
+Apreciat/da $username,
+
+    La teva contrasenya ha estat modificada com has sol·licitat. Pren nota d'aquesta informació
+(o canvía immediatament la contrasenya amb quelcom que recordis).
+
+
+Les teves dades d'accés son les següents:
+
+Lloc:	$siteurl
+Nom:	$email
+Contrasenya:	$new_password
+
+Després d'accedir pots canviar la contrasenya des de la pàgina de configuració del teu perfil.
+
+
+	$sitename
+
+ 
diff --git a/view/ca/register_open_eml.tpl b/view/ca/register_open_eml.tpl
new file mode 100755
index 000000000..0170c98e3
--- /dev/null
+++ b/view/ca/register_open_eml.tpl
@@ -0,0 +1,22 @@
+
+Apreciat/da $username,
+
+	Gràcies per registrar-te en $sitename. El teu compte ha estat creat.
+
+
+Les dades d'accés són les següents:
+
+
+Lloc:	$siteurl
+Nom:	$email
+Contrasenya:	$password
+
+
+Després d'accedir pots canviar la teva contrasenya a la pàgina de "Configuració".
+
+Pren un moment per revisar les altres configuracions del compte en aquesta pàgina.
+
+
+Gràcies i benvingut/da $sitename.
+
+ 
diff --git a/view/ca/register_verify_eml.tpl b/view/ca/register_verify_eml.tpl
new file mode 100755
index 000000000..3dd966e0a
--- /dev/null
+++ b/view/ca/register_verify_eml.tpl
@@ -0,0 +1,23 @@
+
+S'ha rebut la sol·licitud de registre d'un nou usuari en
+$sitename que requereix la teva aprovació.
+
+Les dades d'accés són els següents:
+
+Nom Complet: $username
+Lloc: $siteurl
+Nom: $email
+
+
+Per aprovar aquesta sol·licitud, visita el següent enllaç:
+
+$siteurl/regmod/allow/$hash
+
+Per denegar la sol·licitud i eliminar el compte, per favor visita:
+
+$siteurl/regmod/deny/$hash
+
+
+Gràcies.
+
+
diff --git a/view/ca/request_notify_eml.tpl b/view/ca/request_notify_eml.tpl
new file mode 100755
index 000000000..276624aae
--- /dev/null
+++ b/view/ca/request_notify_eml.tpl
@@ -0,0 +1,13 @@
+
+Apreciat/da $myname,
+
+Acabes de rebre una sol·licitud de connexió de '$requestor' en $sitename.
+
+Pots visitar el seu perfil en $url.
+
+Accedeix al teu lloc per a veure la presentació completa i acceptar o ignorar/cancel·lar la sol·licitud.
+
+$siteurl
+
+
+	$sitename
diff --git a/view/ca/strings.php b/view/ca/strings.php
new file mode 100755
index 000000000..e5aed8be6
--- /dev/null
+++ b/view/ca/strings.php
@@ -0,0 +1,1425 @@
+<?php
+
+function string_plural_select_ca($n){
+	return ($n != 1);
+}
+;
+$a->strings["Post successful."] = "Publicat amb éxit.";
+$a->strings["[Embedded content - reload page to view]"] = "[Contingut embegut - recarrega la pàgina per a veure-ho]";
+$a->strings["Contact settings applied."] = "Ajustos de Contacte aplicats.";
+$a->strings["Contact update failed."] = "Fracassà l'actualització de Contacte";
+$a->strings["Permission denied."] = "Permís denegat.";
+$a->strings["Contact not found."] = "Contacte no trobat";
+$a->strings["Repair Contact Settings"] = "Reposar els ajustos de Contacte";
+$a->strings["<strong>WARNING: This is highly advanced</strong> and if you enter incorrect information your communications with this contact may stop working."] = "<strong>ADVERTÈNCIA: Això és molt avançat </strong> i si s'introdueix informació incorrecta la seva comunicació amb aquest contacte pot deixar de funcionar.";
+$a->strings["Please use your browser 'Back' button <strong>now</strong> if you are uncertain what to do on this page."] = "Si us plau, prem el botó 'Tornar' <strong>ara</strong> si no saps segur que has de fer aqui.";
+$a->strings["Return to contact editor"] = "Tornar al editor de contactes";
+$a->strings["Name"] = "Nom";
+$a->strings["Account Nickname"] = "Malnom de Compte";
+$a->strings["@Tagname - overrides Name/Nickname"] = "@Tagname - té prel·lació sobre Nom/Malnom";
+$a->strings["Account URL"] = "Adreça URL del Compte";
+$a->strings["Friend Request URL"] = "Adreça URL de sol·licitud d'Amistat";
+$a->strings["Friend Confirm URL"] = "Adreça URL de confirmació d'Amic";
+$a->strings["Notification Endpoint URL"] = "Adreça URL de Notificació";
+$a->strings["Poll/Feed URL"] = "Adreça de Enquesta/Alimentador";
+$a->strings["New photo from this URL"] = "Nova foto d'aquesta URL";
+$a->strings["Submit"] = "Enviar";
+$a->strings["Help:"] = "Ajuda:";
+$a->strings["Help"] = "Ajuda";
+$a->strings["Not Found"] = "No trobat";
+$a->strings["Page not found."] = "Pàgina no trobada.";
+$a->strings["File exceeds size limit of %d"] = "L'arxiu excedeix la mida límit de %d";
+$a->strings["File upload failed."] = "La càrrega de fitxers ha fallat.";
+$a->strings["Friend suggestion sent."] = "Enviat suggeriment d'amic.";
+$a->strings["Suggest Friends"] = "Suggerir Amics";
+$a->strings["Suggest a friend for %s"] = "Suggerir una amic per a %s";
+$a->strings["Event description and start time are required."] = "Es requereix descripció de l'esdeveniment i l'hora d'inici.";
+$a->strings["l, F j"] = "l, F j";
+$a->strings["Edit event"] = "Editar esdeveniment";
+$a->strings["link to source"] = "Enllaç al origen";
+$a->strings["Events"] = "Esdeveniments";
+$a->strings["Create New Event"] = "Crear un nou esdeveniment";
+$a->strings["Previous"] = "Previ";
+$a->strings["Next"] = "Proper";
+$a->strings["hour:minute"] = "hora:minut";
+$a->strings["Event details"] = "Detalls del esdeveniment";
+$a->strings["Format is %s %s. Starting date and Description are required."] = "El format és %s %s. Es requereix Data d'inici i Descripció.";
+$a->strings["Event Starts:"] = "Inici d'Esdeveniment:";
+$a->strings["Finish date/time is not known or not relevant"] = "La data/hora de finalització no es coneixen o no són relevants";
+$a->strings["Event Finishes:"] = "L'esdeveniment Finalitza:";
+$a->strings["Adjust for viewer timezone"] = "Ajustar a la zona horaria de l'espectador";
+$a->strings["Description:"] = "Descripció:";
+$a->strings["Location:"] = "Ubicació:";
+$a->strings["Share this event"] = "Compartir aquest esdeveniment";
+$a->strings["Cancel"] = "Cancel·lar";
+$a->strings["Tag removed"] = "Etiqueta eliminada";
+$a->strings["Remove Item Tag"] = "Esborrar etiqueta del element";
+$a->strings["Select a tag to remove: "] = "Selecciona etiqueta a esborrar:";
+$a->strings["Remove"] = "Esborrar";
+$a->strings["%s welcomes %s"] = "%s Benvingut %s";
+$a->strings["Authorize application connection"] = "Autoritzi la connexió de aplicacions";
+$a->strings["Return to your app and insert this Securty Code:"] = "Torni a la seva aplicació i inserti aquest Codi de Seguretat:";
+$a->strings["Please login to continue."] = "Per favor, accedeixi per a continuar.";
+$a->strings["Do you want to authorize this application to access your posts and contacts, and/or create new posts for you?"] = "Vol autoritzar a aquesta aplicació per accedir als teus missatges i contactes, i/o crear nous enviaments per a vostè?";
+$a->strings["Yes"] = "Si";
+$a->strings["No"] = "No";
+$a->strings["Photo Albums"] = "Àlbum de Fotos";
+$a->strings["Contact Photos"] = "Fotos de Contacte";
+$a->strings["Upload New Photos"] = "Actualitzar Noves Fotos";
+$a->strings["everybody"] = "tothom";
+$a->strings["Contact information unavailable"] = "Informació del Contacte no disponible";
+$a->strings["Profile Photos"] = "Fotos del Perfil";
+$a->strings["Album not found."] = "Àlbum no trobat.";
+$a->strings["Delete Album"] = "Eliminar Àlbum";
+$a->strings["Delete Photo"] = "Eliminar Foto";
+$a->strings["was tagged in a"] = "Fou etiquetat a un";
+$a->strings["photo"] = "foto";
+$a->strings["by"] = "per";
+$a->strings["Image exceeds size limit of "] = "La imatge excedeix el límit de ";
+$a->strings["Image file is empty."] = "El fitxer de imatge és buit.";
+$a->strings["Unable to process image."] = "Incapaç de processar la imatge.";
+$a->strings["Image upload failed."] = "Actualització de la imatge fracassada.";
+$a->strings["Public access denied."] = "Accés públic denegat.";
+$a->strings["No photos selected"] = "No s'han seleccionat fotos";
+$a->strings["Access to this item is restricted."] = "L'accés a aquest element està restringit.";
+$a->strings["Upload Photos"] = "Carregar Fotos";
+$a->strings["New album name: "] = "Nou nom d'àlbum:";
+$a->strings["or existing album name: "] = "o nom d'àlbum existent:";
+$a->strings["Do not show a status post for this upload"] = "No tornis a mostrar un missatge d'estat d'aquesta pujada";
+$a->strings["Permissions"] = "Permisos";
+$a->strings["Edit Album"] = "Editar Àlbum";
+$a->strings["View Photo"] = "Veure Foto";
+$a->strings["Permission denied. Access to this item may be restricted."] = "Permís denegat. L'accés a aquest element pot estar restringit.";
+$a->strings["Photo not available"] = "Foto no disponible";
+$a->strings["View photo"] = "Veure foto";
+$a->strings["Edit photo"] = "Editar foto";
+$a->strings["Use as profile photo"] = "Emprar com a foto del perfil";
+$a->strings["Private Message"] = "Missatge Privat";
+$a->strings["View Full Size"] = "Veure'l a Mida Completa";
+$a->strings["Tags: "] = "Etiquetes:";
+$a->strings["[Remove any tag]"] = "Treure etiquetes";
+$a->strings["New album name"] = "Nou nom d'àlbum";
+$a->strings["Caption"] = "Títol";
+$a->strings["Add a Tag"] = "Afegir una etiqueta";
+$a->strings["Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"] = "Exemple: @bob, @Barbara_jensen, @jim@example.com,  #California, #camping";
+$a->strings["I like this (toggle)"] = "M'agrada això (canviar)";
+$a->strings["I don't like this (toggle)"] = "No m'agrada això (canviar)";
+$a->strings["Share"] = "Compartir";
+$a->strings["Please wait"] = "Si us plau esperi";
+$a->strings["This is you"] = "Aquest ets tu";
+$a->strings["Comment"] = "Comentari";
+$a->strings["Preview"] = "Vista prèvia";
+$a->strings["Delete"] = "Esborrar";
+$a->strings["View Album"] = "Veure Àlbum";
+$a->strings["Recent Photos"] = "Fotos Recents";
+$a->strings["Not available."] = "No disponible.";
+$a->strings["Community"] = "Comunitat";
+$a->strings["No results."] = "Sense resultats.";
+$a->strings["This is Friendica, version"] = "Això és Friendica, versió";
+$a->strings["running at web location"] = "funcionant en la ubicació web";
+$a->strings["Please visit <a href=\"http://friendica.com\">Friendica.com</a> to learn more about the Friendica project."] = "Si us plau, visiteu <a href=\"http://friendica.com\">Friendica.com</a> per obtenir més informació sobre el projecte Friendica.";
+$a->strings["Bug reports and issues: please visit"] = "Pels informes d'error i problemes: si us plau, visiteu";
+$a->strings["Suggestions, praise, donations, etc. - please email \"Info\" at Friendica - dot com"] = "Suggeriments, elogis, donacions, etc si us plau escrigui a \"Info\" en Friendica - dot com";
+$a->strings["Installed plugins/addons/apps"] = "plugins/addons/apps instal·lats";
+$a->strings["No installed plugins/addons/apps"] = "plugins/addons/apps no instal·lats";
+$a->strings["Item not found"] = "Element no trobat";
+$a->strings["Edit post"] = "Editar Enviament";
+$a->strings["Post to Email"] = "Correu per enviar";
+$a->strings["Edit"] = "Editar";
+$a->strings["Upload photo"] = "Carregar foto";
+$a->strings["Attach file"] = "Adjunta fitxer";
+$a->strings["Insert web link"] = "Inserir enllaç web";
+$a->strings["Insert YouTube video"] = "Serà mostrat de forma preeminent a la pagina durant el procés de registre.";
+$a->strings["Insert Vorbis [.ogg] video"] = "Inserir video Vorbis [.ogg]";
+$a->strings["Insert Vorbis [.ogg] audio"] = "Inserir audio Vorbis [.ogg]";
+$a->strings["Set your location"] = "Canvia la teva ubicació";
+$a->strings["Clear browser location"] = "neteja adreçes del navegador";
+$a->strings["Permission settings"] = "Configuració de permisos";
+$a->strings["CC: email addresses"] = "CC: Adreça de correu";
+$a->strings["Public post"] = "Enviament públic";
+$a->strings["Set title"] = "Canviar títol";
+$a->strings["Example: bob@example.com, mary@example.com"] = "Exemple: bob@example.com, mary@example.com";
+$a->strings["This introduction has already been accepted."] = "Aquesta presentació ha estat acceptada.";
+$a->strings["Profile location is not valid or does not contain profile information."] = "El perfil de situació no és vàlid o no contè informació de perfil";
+$a->strings["Warning: profile location has no identifiable owner name."] = "Atenció: El perfil de situació no te nom de propietari identificable.";
+$a->strings["Warning: profile location has no profile photo."] = "Atenció: El perfil de situació no te foto de perfil";
+$a->strings["%d required parameter was not found at the given location"] = array(
+	0 => "%d el paràmetre requerit no es va trobar al lloc indicat",
+	1 => "%d els paràmetres requerits no es van trobar allloc indicat",
+);
+$a->strings["Introduction complete."] = "Completada la presentació.";
+$a->strings["Unrecoverable protocol error."] = "Error de protocol irrecuperable.";
+$a->strings["Profile unavailable."] = "Perfil no disponible";
+$a->strings["%s has received too many connection requests today."] = "%s avui ha rebut excesives peticions de connexió. ";
+$a->strings["Spam protection measures have been invoked."] = "Mesures de protecció contra spam han estat invocades.";
+$a->strings["Friends are advised to please try again in 24 hours."] = "S'aconsellà els amics que probin pasades 24 hores.";
+$a->strings["Invalid locator"] = "Localitzador no vàlid";
+$a->strings["Unable to resolve your name at the provided location."] = "Incapaç de resoldre el teu nom al lloc facilitat.";
+$a->strings["You have already introduced yourself here."] = "Has fer la teva presentació aquí.";
+$a->strings["Apparently you are already friends with %s."] = "Aparentment, ja tens amistat amb %s";
+$a->strings["Invalid profile URL."] = "Perfil URL no vàlid.";
+$a->strings["Disallowed profile URL."] = "Perfil URL no permès.";
+$a->strings["Failed to update contact record."] = "Error en actualitzar registre de contacte.";
+$a->strings["Your introduction has been sent."] = "La teva presentació ha estat enviada.";
+$a->strings["Please login to confirm introduction."] = "Si us plau, entri per confirmar la presentació.";
+$a->strings["Incorrect identity currently logged in. Please login to <strong>this</strong> profile."] = "Sesió iniciada amb la identificació incorrecta. Entra en <strong>aquest</strong> perfil.";
+$a->strings["Welcome home %s."] = "Benvingut de nou %s";
+$a->strings["Please confirm your introduction/connection request to %s."] = "Si us plau, confirmi la seva sol·licitud de Presentació/Amistat a %s.";
+$a->strings["Confirm"] = "Confirmar";
+$a->strings["[Name Withheld]"] = "[Nom Amagat]";
+$a->strings["Diaspora members: Please do not use this form. Instead, enter \"%s\" into your Diaspora search bar."] = "Membres de Diàspora: Si us plau, no utilitzi aquest formulari. Pel contrari, escriviu \"%s\" a la barra de cerca de Diàspora.";
+$a->strings["Please enter your 'Identity Address' from one of the following supported social networks:"] = "Si us plau, introdueixi la seva \"Adreça Identificativa\" d'una de les següents xarxes socials suportades:";
+$a->strings["Friend/Connection Request"] = "Sol·licitud d'Amistat";
+$a->strings["Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@identi.ca"] = "Exemples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@identi.ca";
+$a->strings["Please answer the following:"] = "Si us plau, contesti les següents preguntes:";
+$a->strings["Does %s know you?"] = "%s et coneix?";
+$a->strings["Add a personal note:"] = "Afegir una nota personal:";
+$a->strings["Friendica"] = "Friendica";
+$a->strings["StatusNet/Federated Social Web"] = "Web Social StatusNet/Federated ";
+$a->strings["Diaspora"] = "Diaspora";
+$a->strings["- please share from your own site as noted above"] = "- si us plau, Comparteix des del teu propi lloc tal com s'ha dit abans.";
+$a->strings["Your Identity Address:"] = "La Teva Adreça Identificativa:";
+$a->strings["Submit Request"] = "Sol·licitud Enviada";
+$a->strings["Friendica Social Communications Server - Setup"] = "Friendica Social Communications Server - Ajustos";
+$a->strings["Database connection"] = "Conexió a la base de dades";
+$a->strings["Could not connect to database."] = "No puc connectar a la base de dades.";
+$a->strings["Could not create table."] = "No puc creat taula.";
+$a->strings["Your Friendica site database has been installed."] = "La base de dades del teu lloc Friendica ha estat instal·lada.";
+$a->strings["IMPORTANT: You will need to [manually] setup a scheduled task for the poller."] = "IMPORTANT: necessitarà configurar [manualment] el programar una tasca pel sondejador (poller.php)";
+$a->strings["Please see the file \"INSTALL.txt\"."] = "Per favor, consulti l'arxiu \"INSTALL.txt\".";
+$a->strings["Proceed to registration"] = "Procedir a la inscripció";
+$a->strings["Proceed with Installation"] = "Procedeixi amb la Instal·lació";
+$a->strings["You may need to import the file \"database.sql\" manually using phpmyadmin or mysql."] = "Pot ser que hagi d'importar l'arxiu \"database.sql\" manualment amb phpmyadmin o mysql.";
+$a->strings["Database import failed."] = "La importació de base de dades ha fallat.";
+$a->strings["System check"] = "Comprovació del Sistema";
+$a->strings["Check again"] = "Comprovi de nou";
+$a->strings["In order to install Friendica we need to know how to connect to your database."] = "Per a instal·lar Friendica necessitem conèixer com connectar amb la deva base de dades.";
+$a->strings["Please contact your hosting provider or site administrator if you have questions about these settings."] = "Per favor, posi's en contacte amb el seu proveïdor de hosting o administrador del lloc si té alguna pregunta sobre aquestes opcions.";
+$a->strings["The database you specify below should already exist. If it does not, please create it before continuing."] = "La base de dades que especifiques ja hauria d'existir. Si no és així, crea-la abans de continuar.";
+$a->strings["Database Server Name"] = "Nom del Servidor de base de Dades";
+$a->strings["Database Login Name"] = "Nom d'Usuari de la base de Dades";
+$a->strings["Database Login Password"] = "Contrasenya d'Usuari de la base de Dades";
+$a->strings["Database Name"] = "Nom de la base de Dades";
+$a->strings["Site administrator email address"] = "Adreça de correu del administrador del lloc";
+$a->strings["Your account email address must match this in order to use the web admin panel."] = "El seu compte d'adreça electrònica ha de coincidir per tal d'utilitzar el panell d'administració web.";
+$a->strings["Please select a default timezone for your website"] = "Per favor, seleccioni una zona horària per defecte per al seu lloc web";
+$a->strings["Site settings"] = "Configuracions del lloc";
+$a->strings["Could not find a command line version of PHP in the web server PATH."] = "No es va poder trobar una versió de línia de comandos de PHP en la ruta del servidor web.";
+$a->strings["PHP executable path"] = "Direcció del executable PHP";
+$a->strings["Enter full path to php executable"] = "Introdueixi el camí complet del executable php";
+$a->strings["Command line PHP"] = "Linia de comandos PHP";
+$a->strings["The command line version of PHP on your system does not have \"register_argc_argv\" enabled."] = "La versió de línia de comandos de PHP en el seu sistema no té \"register_argc_argv\" habilitat.";
+$a->strings["This is required for message delivery to work."] = "Això és necessari perquè funcioni el lliurament de missatges.";
+$a->strings["PHP \"register_argc_argv\""] = "PHP \"register_argc_argv\"";
+$a->strings["Error: the \"openssl_pkey_new\" function on this system is not able to generate encryption keys"] = "Error: la funció \"openssl_pkey_new\" en aquest sistema no és capaç de generar claus de xifrat";
+$a->strings["If running under Windows, please see \"http://www.php.net/manual/en/openssl.installation.php\"."] = "Si s'executa en Windows, per favor consulti la secció \"http://www.php.net/manual/en/openssl.installation.php\".";
+$a->strings["Generate encryption keys"] = "Generar claus d'encripció";
+$a->strings["libCurl PHP module"] = "Mòdul libCurl de PHP";
+$a->strings["GD graphics PHP module"] = "Mòdul GD de gràfics de PHP";
+$a->strings["OpenSSL PHP module"] = "Mòdul OpenSSl de PHP";
+$a->strings["mysqli PHP module"] = "Mòdul mysqli de PHP";
+$a->strings["mb_string PHP module"] = "Mòdul mb_string de PHP";
+$a->strings["Apace mod_rewrite module"] = "Mòdul mod_rewrite de Apache";
+$a->strings["Error: Apache webserver mod-rewrite module is required but not installed."] = "Error: el mòdul mod-rewrite del servidor web Apache és necessari però no està instal·lat.";
+$a->strings["Error: libCURL PHP module required but not installed."] = "Error: El mòdul libCURL de PHP és necessari però no està instal·lat.";
+$a->strings["Error: GD graphics PHP module with JPEG support required but not installed."] = "Error: el mòdul gràfic GD de PHP amb support per JPEG és necessari però no està instal·lat.";
+$a->strings["Error: openssl PHP module required but not installed."] = "Error: El mòdul enssl de PHP és necessari però no està instal·lat.";
+$a->strings["Error: mysqli PHP module required but not installed."] = "Error: El mòdul mysqli de PHP és necessari però no està instal·lat.";
+$a->strings["Error: mb_string PHP module required but not installed."] = "Error: mòdul mb_string de PHP requerit però no instal·lat.";
+$a->strings["The web installer needs to be able to create a file called \".htconfig.php\ in the top folder of your web server and it is unable to do so."] = "L'instal·lador web necessita crear un arxiu anomenat \".htconfig.php\" en la carpeta superior del seu servidor web però alguna cosa ho va impedir.";
+$a->strings["This is most often a permission setting, as the web server may not be able to write files in your folder - even if you can."] = "Això freqüentment és a causa d'una configuració de permisos; el servidor web no pot escriure arxius en la carpeta - encara que sigui possible.";
+$a->strings["Please check with your site documentation or support people to see if this situation can be corrected."] = "Per favor, consulti amb la documentació del seu lloc o persones de suport per veure si aquesta situació es pot corregir.";
+$a->strings["If not, you may be required to perform a manual installation. Please see the file \"INSTALL.txt\" for instructions."] = "Si no, vostè pot ser requerit per realitzar una instal·lació manual. Per favor, consulti l'arxiu \"INSTALL.txt\" per obtenir instruccions.";
+$a->strings[".htconfig.php is writable"] = ".htconfig.php és escribible";
+$a->strings["The database configuration file \".htconfig.php\" could not be written. Please use the enclosed text to create a configuration file in your web server root."] = "L'arxiu per a la configuració de la base de dades \".htconfig.php\" no es pot escriure. Per favor, usi el text adjunt per crear un arxiu de configuració en l'arrel del servidor web.";
+$a->strings["Errors encountered creating database tables."] = "Trobats errors durant la creació de les taules de la base de dades.";
+$a->strings["l F d, Y \\@ g:i A"] = "l F d, Y \\@ g:i A";
+$a->strings["Time Conversion"] = "Temps de Conversió";
+$a->strings["Friendika provides this service for sharing events with other networks and friends in unknown timezones."] = "Friendica ofereix aquest servei per compartir esdeveniments amb altres xarxes i amics a les zones horàries desconegudes.";
+$a->strings["UTC time: %s"] = "hora UTC: %s";
+$a->strings["Current timezone: %s"] = "Zona horària actual: %s";
+$a->strings["Converted localtime: %s"] = "Conversión de hora local: %s";
+$a->strings["Please select your timezone:"] = "Si us plau, seleccioneu la vostra zona horària:";
+$a->strings["Profile Match"] = "Perfil Aconseguit";
+$a->strings["No keywords to match. Please add keywords to your default profile."] = "No hi ha paraules clau que coincideixin. Si us plau, afegeixi paraules clau al teu perfil predeterminat.";
+$a->strings["is interested in:"] = "està interessat en:";
+$a->strings["Connect"] = "Connexió";
+$a->strings["No matches"] = "No hi ha coincidències";
+$a->strings["Remote privacy information not available."] = "Informació de privacitat remota no disponible.";
+$a->strings["Visible to:"] = "Visible per a:";
+$a->strings["Welcome to %s"] = "Benvingut a %s";
+$a->strings["Invalid request identifier."] = "Sol·licitud d'identificació no vàlida.";
+$a->strings["Discard"] = "Descartar";
+$a->strings["Ignore"] = "Ignorar";
+$a->strings["System"] = "Sistema";
+$a->strings["Network"] = "Xarxa";
+$a->strings["Personal"] = "Personal";
+$a->strings["Home"] = "Inici";
+$a->strings["Introductions"] = "Presentacions";
+$a->strings["Messages"] = "Missatges";
+$a->strings["Show Ignored Requests"] = "Mostra les Sol·licituds Ignorades";
+$a->strings["Hide Ignored Requests"] = "Amaga les Sol·licituds Ignorades";
+$a->strings["Notification type: "] = "Tipus de Notificació:";
+$a->strings["Friend Suggestion"] = "Amics Suggerits ";
+$a->strings["suggested by %s"] = "sugerit per %s";
+$a->strings["Hide this contact from others"] = "Amaga aquest contacte dels altres";
+$a->strings["Post a new friend activity"] = "Publica una activitat  d'amic nova";
+$a->strings["if applicable"] = "si es pot aplicar";
+$a->strings["Approve"] = "Aprovar";
+$a->strings["Claims to be known to you: "] = "Diu que et coneix:";
+$a->strings["yes"] = "sí";
+$a->strings["no"] = "no";
+$a->strings["Approve as: "] = "Aprovat com:";
+$a->strings["Friend"] = "Amic";
+$a->strings["Sharer"] = "Partícip";
+$a->strings["Fan/Admirer"] = "Fan/Admirador";
+$a->strings["Friend/Connect Request"] = "Sol·licitud d'Amistat/Connexió";
+$a->strings["New Follower"] = "Nou Seguidor";
+$a->strings["No introductions."] = "Sense presentacions.";
+$a->strings["Notifications"] = "Notificacions";
+$a->strings["%s liked %s's post"] = "A %s li agrada l'enviament de %s";
+$a->strings["%s disliked %s's post"] = "A %s no li agrada l'enviament de %s";
+$a->strings["%s is now friends with %s"] = "%s es ara amic de %s";
+$a->strings["%s created a new post"] = "%s ha creat un enviament nou";
+$a->strings["%s commented on %s's post"] = "%s va comentar en l'enviament de %s";
+$a->strings["No more network notifications."] = "No més notificacions de xarxa.";
+$a->strings["Network Notifications"] = "Notificacions de la Xarxa";
+$a->strings["No more system notifications."] = "No més notificacions del sistema.";
+$a->strings["System Notifications"] = "Notificacions del Sistema";
+$a->strings["No more personal notifications."] = "No més notificacions personals.";
+$a->strings["Personal Notifications"] = "Notificacions Personals";
+$a->strings["No more home notifications."] = "No més notificacions d'inici.";
+$a->strings["Home Notifications"] = "Notificacions d'Inici";
+$a->strings["Could not access contact record."] = "No puc accedir al registre del contacte.";
+$a->strings["Could not locate selected profile."] = "No puc localitzar el perfil seleccionat.";
+$a->strings["Contact updated."] = "Contacte actualitzat.";
+$a->strings["Contact has been blocked"] = "Elcontacte ha estat bloquejat";
+$a->strings["Contact has been unblocked"] = "El contacte ha estat desbloquejat";
+$a->strings["Contact has been ignored"] = "El contacte ha estat ignorat";
+$a->strings["Contact has been unignored"] = "El contacte ha estat recordat";
+$a->strings["stopped following"] = "Deixar de seguir";
+$a->strings["Contact has been removed."] = "El contacte ha estat tret";
+$a->strings["You are mutual friends with %s"] = "Ara te una amistat mutua amb %s";
+$a->strings["You are sharing with %s"] = "Estas compartint amb %s";
+$a->strings["%s is sharing with you"] = "%s esta compartint amb tú";
+$a->strings["Private communications are not available for this contact."] = "Comunicacions privades no disponibles per aquest contacte.";
+$a->strings["Never"] = "Mai";
+$a->strings["(Update was successful)"] = "(L'actualització fou exitosa)";
+$a->strings["(Update was not successful)"] = "(L'actualització fracassà)";
+$a->strings["Suggest friends"] = "Suggerir amics";
+$a->strings["Network type: %s"] = "Xarxa tipus: %s";
+$a->strings["%d contact in common"] = array(
+	0 => "%d contacte en comú",
+	1 => "%d contactes en comú",
+);
+$a->strings["View all contacts"] = "Veure tots els contactes";
+$a->strings["Unblock"] = "Desbloquejar";
+$a->strings["Block"] = "Bloquejar";
+$a->strings["Unignore"] = "Treure d'Ignorats";
+$a->strings["Repair"] = "Reparar";
+$a->strings["Contact Editor"] = "Editor de Contactes";
+$a->strings["Profile Visibility"] = "Perfil de Visibilitat";
+$a->strings["Please choose the profile you would like to display to %s when viewing your profile securely."] = "Si us plau triï el perfil que voleu mostrar a %s quan estigui veient el teu de forma segura.";
+$a->strings["Contact Information / Notes"] = "Informació/Notes del contacte";
+$a->strings["Edit contact notes"] = "Editar notes de contactes";
+$a->strings["Visit %s's profile [%s]"] = "Visitar perfil de %s [%s]";
+$a->strings["Block/Unblock contact"] = "Bloquejar/Alliberar contacte";
+$a->strings["Ignore contact"] = "Ignore contacte";
+$a->strings["Repair URL settings"] = "Restablir configuració de URL";
+$a->strings["View conversations"] = "Veient conversacions";
+$a->strings["Delete contact"] = "Esborrar contacte";
+$a->strings["Last update:"] = "Última actualització:";
+$a->strings["Update public posts"] = "Actualitzar enviament públic";
+$a->strings["Update now"] = "Actualitza ara";
+$a->strings["Currently blocked"] = "Bloquejat actualment";
+$a->strings["Currently ignored"] = "Ignorat actualment";
+$a->strings["Replies/likes to your public posts <strong>may</strong> still be visible"] = "Répliques/agraiments per als teus missatges públics <strong>poden</strong> romandre visibles";
+$a->strings["All Contacts"] = "Tots els Contactes";
+$a->strings["Unblocked Contacts"] = "Contactes Desbloquejats";
+$a->strings["Blocked Contacts"] = "Contactes Bloquejats";
+$a->strings["Ignored Contacts"] = "Contactes Ignorats";
+$a->strings["Hidden Contacts"] = "Contactes Amagats";
+$a->strings["Mutual Friendship"] = "Amistat Mutua";
+$a->strings["is a fan of yours"] = "Es un fan teu";
+$a->strings["you are a fan of"] = "ets fan de";
+$a->strings["Edit contact"] = "Editar contacte";
+$a->strings["Contacts"] = "Contactes";
+$a->strings["Search your contacts"] = "Cercant el seus contactes";
+$a->strings["Finding: "] = "Cercant:";
+$a->strings["Find"] = "Cercar";
+$a->strings["No valid account found."] = "compte no vàlid trobat.";
+$a->strings["Password reset request issued. Check your email."] = "Sol·licitut de restabliment de contrasenya enviat. Comprovi el seu correu.";
+$a->strings["Password reset requested at %s"] = "Contrasenya restablerta enviada a %s";
+$a->strings["Administrator"] = "Administrador";
+$a->strings["Request could not be verified. (You may have previously submitted it.) Password reset failed."] = "La sol·licitut no pot ser verificada. (Hauries de presentar-la abans). Restabliment de contrasenya fracassat.";
+$a->strings["Password Reset"] = "Restabliment de Contrasenya";
+$a->strings["Your password has been reset as requested."] = "La teva contrasenya fou restablerta com vas demanar.";
+$a->strings["Your new password is"] = "La teva nova contrasenya es";
+$a->strings["Save or copy your new password - and then"] = "Guarda o copia la nova contrasenya - i llavors";
+$a->strings["click here to login"] = "clica aquí per identificarte";
+$a->strings["Your password may be changed from the <em>Settings</em> page after successful login."] = "Pots camviar la contrasenya des de la pàgina de <em>Configuración</em> desprès d'accedir amb èxit.";
+$a->strings["Forgot your Password?"] = "Has Oblidat la Contrasenya?";
+$a->strings["Enter your email address and submit to have your password reset. Then check your email for further instructions."] = "Introdueixi la seva adreça de correu i enivii-la per restablir la seva contrasenya. Llavors comprovi el seu correu per a les següents instruccións. ";
+$a->strings["Nickname or Email: "] = "Malnom o Correu:";
+$a->strings["Reset"] = "Restablir";
+$a->strings["Missing some important data!"] = "Perdudes algunes dades importants!";
+$a->strings["Update"] = "Actualitzar";
+$a->strings["Failed to connect with email account using the settings provided."] = "Connexió fracassada amb el compte de correu emprant la configuració proveïda.";
+$a->strings["Email settings updated."] = "Configuració del correu electrònic actualitzada.";
+$a->strings["Passwords do not match. Password unchanged."] = "Les contrasenyes no coincideixen. Contrasenya no canviada.";
+$a->strings["Empty passwords are not allowed. Password unchanged."] = "No es permeten contasenyes buides. Contrasenya no canviada";
+$a->strings["Password changed."] = "Contrasenya canviada.";
+$a->strings["Password update failed. Please try again."] = "Ha fallat l'actualització de la Contrasenya. Per favor, intenti-ho de nou.";
+$a->strings[" Please use a shorter name."] = "Si us plau, faci servir un nom més curt.";
+$a->strings[" Name too short."] = "Nom massa curt.";
+$a->strings[" Not valid email."] = "Correu no vàlid.";
+$a->strings[" Cannot change to that email."] = "No puc canviar a aquest correu.";
+$a->strings["Settings updated."] = "Ajustos actualitzats.";
+$a->strings["Account settings"] = "Configuració del compte";
+$a->strings["Connector settings"] = "Configuració dels connectors";
+$a->strings["Plugin settings"] = "Configuració del plugin";
+$a->strings["Connections"] = "Connexions";
+$a->strings["Export personal data"] = "Exportar dades personals";
+$a->strings["Add application"] = "Afegir aplicació";
+$a->strings["Consumer Key"] = "Consumer Key";
+$a->strings["Consumer Secret"] = "Consumer Secret";
+$a->strings["Redirect"] = "Redirigir";
+$a->strings["Icon url"] = "icona de url";
+$a->strings["You can't edit this application."] = "No pots editar aquesta aplicació.";
+$a->strings["Connected Apps"] = "Aplicacions conectades";
+$a->strings["Client key starts with"] = "Les claus de client comançen amb";
+$a->strings["No name"] = "Sense nom";
+$a->strings["Remove authorization"] = "retirar l'autorització";
+$a->strings["No Plugin settings configured"] = "No s'han configurat ajustos de Plugin";
+$a->strings["Plugin Settings"] = "Ajustos de Plugin";
+$a->strings["Built-in support for %s connectivity is %s"] = "El suport integrat per a la connectivitat de %s és %s";
+$a->strings["enabled"] = "habilitat";
+$a->strings["disabled"] = "deshabilitat";
+$a->strings["StatusNet"] = "StatusNet";
+$a->strings["Connector Settings"] = "Configuració de connectors";
+$a->strings["Email/Mailbox Setup"] = "Preparació de Correu/Bústia";
+$a->strings["If you wish to communicate with email contacts using this service (optional), please specify how to connect to your mailbox."] = "Si vol comunicar-se amb els contactes de correu emprant aquest servei (opcional), Si us plau, especifiqui com connectar amb la seva bústia.";
+$a->strings["Last successful email check:"] = "Última comprovació de correu amb èxit:";
+$a->strings["Email access is disabled on this site."] = "L'accés al correu està deshabilitat en aquest lloc.";
+$a->strings["IMAP server name:"] = "Nom del servidor IMAP:";
+$a->strings["IMAP port:"] = "Port IMAP:";
+$a->strings["Security:"] = "Seguretat:";
+$a->strings["None"] = "Cap";
+$a->strings["Email login name:"] = "Nom d'usuari del correu";
+$a->strings["Email password:"] = "Contrasenya del correu:";
+$a->strings["Reply-to address:"] = "Adreça de resposta:";
+$a->strings["Send public posts to all email contacts:"] = "Enviar correu públic a tots els contactes del correu:";
+$a->strings["Action after import:"] = "Acció després d'importar:";
+$a->strings["Mark as seen"] = "Marcar com a vist";
+$a->strings["Move to folder"] = "Moure a la carpeta";
+$a->strings["Move to folder:"] = "Moure a la carpeta:";
+$a->strings["Normal Account"] = "Compte Normal";
+$a->strings["This account is a normal personal profile"] = "Aques compte es un compte personal normal";
+$a->strings["Soapbox Account"] = "Compte Tribuna";
+$a->strings["Automatically approve all connection/friend requests as read-only fans"] = "Aprova automàticament totes les sol·licituds de amistat/connexió com a fans de només lectura.";
+$a->strings["Community/Celebrity Account"] = "Compte de Comunitat/Celebritat";
+$a->strings["Automatically approve all connection/friend requests as read-write fans"] = "Aprova automàticament totes les sol·licituds de amistat/connexió com a fans de lectura-escriptura";
+$a->strings["Automatic Friend Account"] = "Compte d'Amistat Automàtic";
+$a->strings["Automatically approve all connection/friend requests as friends"] = "Aprova totes les sol·licituds de amistat/connexió com a amic automàticament";
+$a->strings["OpenID:"] = "OpenID:";
+$a->strings["(Optional) Allow this OpenID to login to this account."] = "(Opcional) Permetre a aquest OpenID iniciar sessió en aquest compte.";
+$a->strings["Publish your default profile in your local site directory?"] = "Publicar el teu perfil predeterminat en el directori del lloc local?";
+$a->strings["Publish your default profile in the global social directory?"] = "Publicar el teu perfil predeterminat al directori social global?";
+$a->strings["Hide your contact/friend list from viewers of your default profile?"] = "Amaga la teva llista de contactes/amics dels espectadors del seu perfil per defecte?";
+$a->strings["Hide your profile details from unknown viewers?"] = "Amagar els detalls del seu perfil a espectadors desconeguts?";
+$a->strings["Allow friends to post to your profile page?"] = "Permet als amics publicar en la seva pàgina de perfil?";
+$a->strings["Allow friends to tag your posts?"] = "Permet als amics d'etiquetar els teus missatges?";
+$a->strings["Allow us to suggest you as a potential friend to new members?"] = "Permeteu-nos suggerir-li com un amic potencial dels nous membres?";
+$a->strings["Profile is <strong>not published</strong>."] = "El  Perfil <strong>no està publicat</strong>.";
+$a->strings["or"] = "o";
+$a->strings["Your Identity Address is"] = "La seva Adreça d'Identitat és";
+$a->strings["Automatically expire posts after this many days:"] = "Després de aquests nombre de dies, els missatges caduquen automàticament:";
+$a->strings["If empty, posts will not expire. Expired posts will be deleted"] = "Si està buit, els missatges no caducarà. Missatges caducats s'eliminaran";
+$a->strings["Advanced expiration settings"] = "Configuració avançada d'expiració";
+$a->strings["Advanced Expiration"] = "Expiració Avançada";
+$a->strings["Expire posts:"] = "Expiració d'enviaments";
+$a->strings["Expire personal notes:"] = "Expiració de notes personals";
+$a->strings["Expire starred posts:"] = "Expiració de enviaments de favorits";
+$a->strings["Expire photos:"] = "Expiració de fotos";
+$a->strings["Account Settings"] = "Ajustos de Compte";
+$a->strings["Password Settings"] = "Ajustos de Contrasenya";
+$a->strings["New Password:"] = "Nova Contrasenya:";
+$a->strings["Confirm:"] = "Confirmar:";
+$a->strings["Leave password fields blank unless changing"] = "Deixi els camps de contrasenya buits per a no fer canvis";
+$a->strings["Basic Settings"] = "Ajustos Basics";
+$a->strings["Full Name:"] = "Nom Complet:";
+$a->strings["Email Address:"] = "Adreça de Correu:";
+$a->strings["Your Timezone:"] = "La teva zona Horària:";
+$a->strings["Default Post Location:"] = "Localització per Defecte del Missatge:";
+$a->strings["Use Browser Location:"] = "Ubicar-se amb el Navegador:";
+$a->strings["Display Theme:"] = "Visualitzar el Tema:";
+$a->strings["Update browser every xx seconds"] = "Actualitzar navegador cada xx segons";
+$a->strings["Minimum of 10 seconds, no maximum"] = "Mínim cada 10 segons, no hi ha màxim";
+$a->strings["Security and Privacy Settings"] = "Ajustos de Seguretat i Privacitat";
+$a->strings["Maximum Friend Requests/Day:"] = "Nombre Màxim de Sol·licituds per Dia";
+$a->strings["(to prevent spam abuse)"] = "(per a prevenir abusos de spam)";
+$a->strings["Default Post Permissions"] = "Permisos de Correu per Defecte";
+$a->strings["(click to open/close)"] = "(clicar per a obrir/tancar)";
+$a->strings["Notification Settings"] = "Ajustos de Notificació";
+$a->strings["Send a notification email when:"] = "Envia un correu notificant quan:";
+$a->strings["You receive an introduction"] = "Has rebut una presentació";
+$a->strings["Your introductions are confirmed"] = "La teva presentació està confirmada";
+$a->strings["Someone writes on your profile wall"] = "Algú ha escrit en el teu mur de perfil";
+$a->strings["Someone writes a followup comment"] = "Algú ha escrit un comentari de seguiment";
+$a->strings["You receive a private message"] = "Has rebut un missatge privat";
+$a->strings["You receive a friend suggestion"] = "Has rebut una suggerencia d'un amic";
+$a->strings["You are tagged in a post"] = "Estàs etiquetat en un enviament";
+$a->strings["Advanced Page Settings"] = "Ajustos Avançats de Pàgina";
+$a->strings["Manage Identities and/or Pages"] = "Administrar Identitats i/o  Pàgines";
+$a->strings["Toggle between different identities or community/group pages which share your account details or which you have been granted \"manage\" permissions"] = "Alternar entre les diferents identitats o les pàgines de comunitats/grups que comparteixen les dades del seu compte o que se li ha concedit els permisos de \"administrar\"";
+$a->strings["Select an identity to manage: "] = "Seleccionar identitat a administrar:";
+$a->strings["Search Results For:"] = "Resultats de la Cerca Per a:";
+$a->strings["Remove term"] = "Traieu termini";
+$a->strings["Saved Searches"] = "Cerques Guardades";
+$a->strings["add"] = "afegir";
+$a->strings["Commented Order"] = "Ordre dels Comentaris";
+$a->strings["Posted Order"] = "Ordre dels Enviaments";
+$a->strings["New"] = "Nou";
+$a->strings["Starred"] = "Favorits";
+$a->strings["Bookmarks"] = "Marcadors";
+$a->strings["Warning: This group contains %s member from an insecure network."] = array(
+	0 => "Advertència: Aquest grup conté el membre %s en una xarxa insegura.",
+	1 => "Advertència: Aquest grup conté %s membres d'una xarxa insegura.",
+);
+$a->strings["Private messages to this group are at risk of public disclosure."] = "Els missatges privats a aquest grup es troben en risc de divulgació pública.";
+$a->strings["No such group"] = "Cap grup com";
+$a->strings["Group is empty"] = "El Grup es buit";
+$a->strings["Group: "] = "Grup:";
+$a->strings["Contact: "] = "Contacte:";
+$a->strings["Private messages to this person are at risk of public disclosure."] = "Els missatges privats a aquesta persona es troben en risc de divulgació pública.";
+$a->strings["Invalid contact."] = "Contacte no vàlid.";
+$a->strings["Personal Notes"] = "Notes Personals";
+$a->strings["Save"] = "Guardar";
+$a->strings["Welcome to Friendica"] = "Benvingut a Friendica";
+$a->strings["New Member Checklist"] = "Llista de Verificació dels Nous Membres";
+$a->strings["We would like to offer some tips and links to help make your experience enjoyable. Click any item to visit the relevant page. A link to this page will be visible from your home page for two weeks after your initial registration and then will quietly disappear."] = "Ens agradaria oferir alguns consells i enllaços per ajudar a fer la seva experiència agradable. Feu clic a qualsevol element per visitar la pàgina corresponent. Un enllaç a aquesta pàgina serà visible des de la pàgina d'inici durant dues setmanes després de la seva inscripció inicial i després desapareixerà en silenci.";
+$a->strings["On your <em>Settings</em> page -  change your initial password. Also make a note of your Identity Address. This looks just like an email address - and will be useful in making friends on the free social web."] = "En la  de la seva <em>configuració</em> de la pàgina - canviï la contrasenya inicial. També prengui nota de la Adreça d'Identitat. Això s'assembla a una adreça de correu electrònic - i serà útil per fer amics a la xarxa social lliure.";
+$a->strings["Review the other settings, particularly the privacy settings. An unpublished directory listing is like having an unlisted phone number. In general, you should probably publish your listing - unless all of your friends and potential friends know exactly how to find you."] = "Reviseu les altres configuracions, en particular la configuració de privadesa. Una llista de directoris no publicada és com tenir un número de telèfon no llistat. Normalment, hauria de publicar la seva llista - a menys que tots els seus amics i els amics potencials sàpiguen exactament com trobar-li.";
+$a->strings["Upload a profile photo if you have not done so already. Studies have shown that people with real photos of themselves are ten times more likely to make friends than people who do not."] = "Puji una foto del seu perfil si encara no ho ha fet. Els estudis han demostrat que les persones amb fotos reals de ells mateixos tenen deu vegades més probabilitats de fer amics que les persones que no ho fan.";
+$a->strings["Authorise the Facebook Connector if you currently have a Facebook account and we will (optionally) import all your Facebook friends and conversations."] = "Autoritzi el connector de Facebook si vostè té un compte al Facebook i nosaltres (opcionalment) importarem tots els teus amics de Facebook i les converses.";
+$a->strings["<em>If</em> this is your own personal server, installing the Facebook addon may ease your transition to the free social web."] = "<em>Si </em> aquesta és el seu servidor personal, la instal·lació del complement de Facebook pot facilitar la transició a la web social lliure.";
+$a->strings["Enter your email access information on your Connector Settings page if you wish to import and interact with friends or mailing lists from your email INBOX"] = "Introduïu les dades d'accés al correu electrònic a la seva pàgina de configuració de connector, si es desitja importar i relacionar-se amb amics o llistes de correu de la seva bústia d'email";
+$a->strings["Edit your <strong>default</strong> profile to your liking. Review the settings for hiding your list of friends and hiding the profile from unknown visitors."] = "Editi  el perfil per <strong>defecte</strong> al seu gust. Reviseu la configuració per ocultar la seva llista d'amics i ocultar el perfil dels visitants desconeguts.";
+$a->strings["Set some public keywords for your default profile which describe your interests. We may be able to find other people with similar interests and suggest friendships."] = "Estableix algunes paraules clau públiques al teu perfil predeterminat que descriguin els teus interessos. Podem ser capaços de trobar altres persones amb interessos similars i suggerir amistats.";
+$a->strings["Your Contacts page is your gateway to managing friendships and connecting with friends on other networks. Typically you enter their address or site URL in the <em>Add New Contact</em> dialog."] = "La seva pàgina de Contactes és la seva porta d'entrada a la gestió de l'amistat i la connexió amb amics d'altres xarxes. Normalment, vostè entrar en la seva direcció o URL del lloc al  diàleg <em>Afegir Nou Contacte</em>.";
+$a->strings["The Directory page lets you find other people in this network or other federated sites. Look for a <em>Connect</em> or <em>Follow</em> link on their profile page. Provide your own Identity Address if requested."] = "La pàgina del Directori li permet trobar altres persones en aquesta xarxa o altres llocs federats. Busqui un enllaç <em>Connectar</em> o <em>Seguir</em> a la seva pàgina de perfil. Proporcioni la seva pròpia Adreça de Identitat si així ho sol·licita.";
+$a->strings["On the side panel of the Contacts page are several tools to find new friends. We can match people by interest, look up people by name or interest, and provide suggestions based on network relationships. On a brand new site, friend suggestions will usually begin to be populated within 24 hours."] = "Al tauler lateral de la pàgina de contacte Hi ha diverses eines per trobar nous amics. Podem coincidir amb les persones per interesos, buscar persones pel nom o per interès, i oferir suggeriments basats en les relacions de la xarxa. En un nou lloc, els suggeriments d'amics, en general comencen a poblar el lloc a les 24 hores.";
+$a->strings["Once you have made some friends, organize them into private conversation groups from the sidebar of your Contacts page and then you can interact with each group privately on your Network page."] = "Una vegada que s'han fet alguns amics, organitzi'ls en grups de conversa privada a la barra lateral de la seva pàgina de contactes i després pot interactuar amb cada grup de forma privada a la pàgina de la xarxa.";
+$a->strings["Our <strong>help</strong> pages may be consulted for detail on other program features and resources."] = "A les nostres pàgines <strong>d'ajuda</strong> es poden consultar detalls sobre les característiques d'altres programes i recursos.";
+$a->strings["Item not available."] = "Element no disponible";
+$a->strings["Item was not found."] = "Element no trobat.";
+$a->strings["Group created."] = "Grup creat.";
+$a->strings["Could not create group."] = "No puc crear grup.";
+$a->strings["Group not found."] = "Grup no trobat";
+$a->strings["Group name changed."] = "Nom de Grup canviat.";
+$a->strings["Permission denied"] = "Permís denegat";
+$a->strings["Create a group of contacts/friends."] = "Crear un grup de contactes/amics.";
+$a->strings["Group Name: "] = "Nom del Grup:";
+$a->strings["Group removed."] = "Grup esborrat.";
+$a->strings["Unable to remove group."] = "Incapaç de esborrar Grup.";
+$a->strings["Group Editor"] = "Editor de Grup:";
+$a->strings["Members"] = "Membres";
+$a->strings["Click on a contact to add or remove."] = "Clicar sobre el contacte per afegir o esborrar.";
+$a->strings["Invalid profile identifier."] = "Identificador del perfil no vàlid.";
+$a->strings["Profile Visibility Editor"] = "Editor de Visibilitat del Perfil";
+$a->strings["Profile"] = "Perfil";
+$a->strings["Visible To"] = "Visible Per";
+$a->strings["All Contacts (with secure profile access)"] = "Tots els Contactes (amb accés segur al perfil)";
+$a->strings["No contacts."] = "Sense Contactes";
+$a->strings["View Contacts"] = "Veure Contactes";
+$a->strings["An invitation is required."] = "Es requereix invitació.";
+$a->strings["Invitation could not be verified."] = "La invitació no ha pogut ser verificada.";
+$a->strings["Invalid OpenID url"] = "OpenID url no vàlid";
+$a->strings["Please enter the required information."] = "Per favor, introdueixi la informació requerida.";
+$a->strings["Please use a shorter name."] = "Per favor, empri un nom més curt.";
+$a->strings["Name too short."] = "Nom massa curt.";
+$a->strings["That doesn't appear to be your full (First Last) name."] = "Això no sembla ser el teu nom complet.";
+$a->strings["Your email domain is not among those allowed on this site."] = "El seu domini de correu electrònic no es troba entre els permesos en aquest lloc.";
+$a->strings["Not a valid email address."] = "Adreça de correu no vàlida.";
+$a->strings["Cannot use that email."] = "No es pot utilitzar aquest correu electrònic.";
+$a->strings["Your \"nickname\" can only contain \"a-z\", \"0-9\", \"-\", and \"_\", and must also begin with a letter."] = "El teu sobrenom nomes pot contenir \"a-z\", \"0-9\", \"-\", i \"_\", i començar amb lletra.";
+$a->strings["Nickname is already registered. Please choose another."] = "malnom ja registrat. Tria un altre.";
+$a->strings["SERIOUS ERROR: Generation of security keys failed."] = "ERROR IMPORTANT: La generació de claus de seguretat ha fallat.";
+$a->strings["An error occurred during registration. Please try again."] = "Un error ha succeït durant el registre. Intenta-ho de nou.";
+$a->strings["An error occurred creating your default profile. Please try again."] = "Un error ha succeit durant la creació del teu perfil per defecte. Intenta-ho de nou.";
+$a->strings["Registration details for %s"] = "Detalls del registre per a %s";
+$a->strings["Registration successful. Please check your email for further instructions."] = "Registrat amb èxit. Per favor, comprovi el seu correu per a posteriors instruccions.";
+$a->strings["Failed to send email message. Here is the message that failed."] = "Error en enviar missatge de correu electrònic. Aquí està el missatge que ha fallat.";
+$a->strings["Your registration can not be processed."] = "El seu registre no pot ser processat.";
+$a->strings["Registration request at %s"] = "Sol·licitud de registre a %s";
+$a->strings["Your registration is pending approval by the site owner."] = "El seu registre està pendent d'aprovació pel propietari del lloc.";
+$a->strings["This site has exceeded the number of allowed daily account registrations. Please try again tomorrow."] = "Aquest lloc excedeix el nombre diari de registres de comptes. Per favor, provi de nou demà.";
+$a->strings["You may (optionally) fill in this form via OpenID by supplying your OpenID and clicking 'Register'."] = "Vostè pot (opcionalment), omplir aquest formulari a través de OpenID mitjançant el subministrament de la seva OpenID i fent clic a 'Registrar'.";
+$a->strings["If you are not familiar with OpenID, please leave that field blank and fill in the rest of the items."] = "Si vostè no està familiaritzat amb Twitter, si us plau deixi aquest camp en blanc i completi la resta dels elements.";
+$a->strings["Your OpenID (optional): "] = "El seu OpenID (opcional):";
+$a->strings["Include your profile in member directory?"] = "Incloc el seu perfil al directori de membres?";
+$a->strings["Membership on this site is by invitation only."] = "Lloc accesible mitjançant invitació.";
+$a->strings["Your invitation ID: "] = "El teu ID de invitació:";
+$a->strings["Registration"] = "Procés de Registre";
+$a->strings["Your Full Name (e.g. Joe Smith): "] = "El seu nom complet (per exemple, Joan Ningú):";
+$a->strings["Your Email Address: "] = "La Seva Adreça de Correu:";
+$a->strings["Choose a profile nickname. This must begin with a text character. Your profile address on this site will then be '<strong>nickname@\$sitename</strong>'."] = "Tria un nom de perfil. Això ha de començar amb un caràcter de text. La seva adreça de perfil en aquest lloc serà '<strong>malnom@\$sitename</strong>'.";
+$a->strings["Choose a nickname: "] = "Tria un malnom:";
+$a->strings["Register"] = "Registrar";
+$a->strings["People Search"] = "Cercant Gent";
+$a->strings["status"] = "estatus";
+$a->strings["%1\$s likes %2\$s's %3\$s"] = "a %1\$s agrada %2\$s de %3\$s";
+$a->strings["%1\$s doesn't like %2\$s's %3\$s"] = "a %1\$s no agrada %2\$s de %3\$s";
+$a->strings["Item not found."] = "Article no trobat.";
+$a->strings["Access denied."] = "Accés denegat.";
+$a->strings["Account approved."] = "Compte aprovat.";
+$a->strings["Registration revoked for %s"] = "Procés de Registre revocat per a %s";
+$a->strings["Please login."] = "Si us plau, ingressa.";
+$a->strings["Unable to locate original post."] = "No es pot localitzar post original.";
+$a->strings["Empty post discarded."] = "Buidat després de rebutjar.";
+$a->strings["Wall Photos"] = "Fotos del Mur";
+$a->strings["System error. Post not saved."] = "Error del sistema. Publicació no guardada.";
+$a->strings["This message was sent to you by %s, a member of the Friendica social network."] = "Aquest missatge va ser enviat a vostè per %s, un membre de la xarxa social Friendica.";
+$a->strings["You may visit them online at %s"] = "El pot visitar en línia a %s";
+$a->strings["Please contact the sender by replying to this post if you do not wish to receive these messages."] = "Si us plau, poseu-vos en contacte amb el remitent responent a aquest missatge si no voleu rebre aquests missatges.";
+$a->strings["%s posted an update."] = "%s ha publicat una actualització.";
+$a->strings["Image uploaded but image cropping failed."] = "Imatge pujada però no es va poder retallar.";
+$a->strings["Image size reduction [%s] failed."] = "La reducció de la imatge [%s] va fracassar.";
+$a->strings["Shift-reload the page or clear browser cache if the new photo does not display immediately."] = "Recarregui la pàgina o netegi la caché del navegador si la nova foto no apareix immediatament.";
+$a->strings["Unable to process image"] = "No es pot processar la imatge";
+$a->strings["Image exceeds size limit of %d"] = "La imatge sobrepassa el límit de mida de %d";
+$a->strings["Upload File:"] = "Pujar arxiu:";
+$a->strings["Upload Profile Photo"] = "Pujar Foto del Perfil";
+$a->strings["Upload"] = "Pujar";
+$a->strings["skip this step"] = "saltar aquest pas";
+$a->strings["select a photo from your photo albums"] = "tria una foto dels teus àlbums";
+$a->strings["Crop Image"] = "retallar imatge";
+$a->strings["Please adjust the image cropping for optimum viewing."] = "Per favor, ajusta la retallada d'imatge per a una optima visualització.";
+$a->strings["Done Editing"] = "Edició Feta";
+$a->strings["Image uploaded successfully."] = "Carregada de la imatge amb èxit.";
+$a->strings["No profile"] = "Sense perfil";
+$a->strings["Remove My Account"] = "Eliminar el Meu Compte";
+$a->strings["This will completely remove your account. Once this has been done it is not recoverable."] = "Això eliminarà per complet el seu compte. Quan s'hagi fet això, no serà recuperable.";
+$a->strings["Please enter your password for verification:"] = "Si us plau, introduïu la contrasenya per a la verificació:";
+$a->strings["No recipient selected."] = "No s'ha seleccionat destinatari.";
+$a->strings["Unable to locate contact information."] = "No es pot trobar informació de contacte.";
+$a->strings["Message could not be sent."] = "El Missatge no ha estat enviat.";
+$a->strings["Message collection failure."] = "Ha fallat la recollida del missatge.";
+$a->strings["Message sent."] = "Missatge enviat.";
+$a->strings["Inbox"] = "Safata d'entrada";
+$a->strings["Outbox"] = "Safata de sortida";
+$a->strings["New Message"] = "Nou Missatge";
+$a->strings["Message deleted."] = "Missatge eliminat.";
+$a->strings["Conversation removed."] = "Conversació esborrada.";
+$a->strings["Please enter a link URL:"] = "Sius plau, entri l'enllaç URL:";
+$a->strings["Send Private Message"] = "Enviant Missatge Privat";
+$a->strings["To:"] = "Per a:";
+$a->strings["Subject:"] = "Assumpte::";
+$a->strings["Your message:"] = "El teu missatge:";
+$a->strings["No messages."] = "Sense missatges.";
+$a->strings["Delete conversation"] = "Esborrar conversació";
+$a->strings["D, d M Y - g:i A"] = "D, d M Y - g:i A";
+$a->strings["Message not available."] = "Missatge no disponible.";
+$a->strings["Delete message"] = "Esborra missatge";
+$a->strings["Send Reply"] = "Enviar Resposta";
+$a->strings["Friends of %s"] = "Amics de %s";
+$a->strings["No friends to display."] = "No hi ha amics que mostrar";
+$a->strings["Site"] = "Lloc";
+$a->strings["Users"] = "Usuaris";
+$a->strings["Plugins"] = "Plugins";
+$a->strings["Themes"] = "Temes";
+$a->strings["Logs"] = "Transcripcions";
+$a->strings["User registrations waiting for confirmation"] = "Registre d'usuari a l'espera de confirmació";
+$a->strings["Administration"] = "Administració";
+$a->strings["Summary"] = "Sumari";
+$a->strings["Registered users"] = "Usuaris registrats";
+$a->strings["Pending registrations"] = "Registres d'usuari pendents";
+$a->strings["Version"] = "Versió";
+$a->strings["Active plugins"] = "Plugins actius";
+$a->strings["Site settings updated."] = "Ajustos del lloc actualitzats.";
+$a->strings["Closed"] = "Tancat";
+$a->strings["Requires approval"] = "Requereix aprovació";
+$a->strings["Open"] = "Obert";
+$a->strings["File upload"] = "Fitxer carregat";
+$a->strings["Policies"] = "Polítiques";
+$a->strings["Advanced"] = "Avançat";
+$a->strings["Site name"] = "Nom del lloc";
+$a->strings["Banner/Logo"] = "Senyera/Logo";
+$a->strings["System language"] = "Idioma del Systema";
+$a->strings["System theme"] = "Tema del sistema";
+$a->strings["Default system theme - may be over-ridden by user profiles"] = "Tema per defecte del sitema - pot ser canviat als perfils dels usuaris";
+$a->strings["Maximum image size"] = "Mida màxima de les imatges";
+$a->strings["Maximum size in bytes of uploaded images. Default is 0, which means no limits."] = "Mida màxima en bytes de les imatges a pujar. Per defecte es 0, que vol dir sense límits.";
+$a->strings["Register policy"] = "Política per a registrar";
+$a->strings["Register text"] = "Text al registrar";
+$a->strings["Will be displayed prominently on the registration page."] = "Sea mostrat de forma peminent a la pagina durant el procés de registre.";
+$a->strings["Accounts abandoned after x days"] = "Comptes abandonats després de x dies";
+$a->strings["Will not waste system resources polling external sites for abandonded accounts. Enter 0 for no time limit."] = "No gastará recursos del sistema creant enquestes des de llocs externos per a comptes abandonats. Introdueixi 0 per a cap límit temporal.";
+$a->strings["Allowed friend domains"] = "Dominis amics permesos";
+$a->strings["Comma separated list of domains which are allowed to establish friendships with this site. Wildcards are accepted. Empty to allow any domains"] = "Llista de dominis separada per comes, de adreçes de correu que són permeses per establir amistats. S'admeten comodins. Deixa'l buit per a acceptar tots els dominis.";
+$a->strings["Allowed email domains"] = "Dominis de correu permesos";
+$a->strings["Comma separated list of domains which are allowed in email addresses for registrations to this site. Wildcards are accepted. Empty to allow any domains"] = "Llista de dominis separada per comes, de adreçes de correu que són permeses per registrtar-se. S'admeten comodins. Deixa'l buit per a acceptar tots els dominis.";
+$a->strings["Block public"] = "Bloqueig públic";
+$a->strings["Check to block public access to all otherwise public personal pages on this site unless you are currently logged in."] = "Bloqueija l'accés públic a qualsevol pàgina del lloc fins que t'hagis identificat.";
+$a->strings["Force publish"] = "Forçar publicació";
+$a->strings["Check to force all profiles on this site to be listed in the site directory."] = "Obliga a que tots el perfils en aquest lloc siguin mostrats en el directori del lloc.";
+$a->strings["Global directory update URL"] = "Actualitzar URL del directori global";
+$a->strings["URL to update the global directory. If this is not set, the global directory is completely unavailable to the application."] = "URL per actualitzar el directori global. Si no es configura, el directori global serà completament inaccesible per a l'aplicació. ";
+$a->strings["Block multiple registrations"] = "Bloquejar multiples registracions";
+$a->strings["Disallow users to register additional accounts for use as pages."] = "Inhabilita als usuaris el crear comptes adicionals per a usar com a pàgines.";
+$a->strings["OpenID support"] = "Suport per a OpenID";
+$a->strings["OpenID support for registration and logins."] = "Suport per a registre i validació a OpenID.";
+$a->strings["Gravatar support"] = "Suport per a gravatar";
+$a->strings["Search new user's photo on Gravatar."] = "Cerca la nova foto d'usuari a Gravatar.";
+$a->strings["Fullname check"] = "Comprobació de nom complet";
+$a->strings["Force users to register with a space between firstname and lastname in Full name, as an antispam measure"] = "Obliga els usuaris a col·locar un espai en blanc entre nom i cognoms, com a mesura antifemater";
+$a->strings["UTF-8 Regular expressions"] = "expresions regulars UTF-8";
+$a->strings["Use PHP UTF8 regular expressions"] = "Empri expresions regulars de PHP amb format UTF8";
+$a->strings["Show Community Page"] = "Mostra la Pàgina de Comunitat";
+$a->strings["Display a Community page showing all recent public postings on this site."] = "Mostra a la pàgina de comunitat tots els missatges públics recents, d'aquest lloc.";
+$a->strings["Enable OStatus support"] = "Activa el suport per a OStatus";
+$a->strings["Provide built-in OStatus (identi.ca, status.net, etc.) compatibility. All communications in OStatus are public, so privacy warnings will be occasionally displayed."] = "Proveeix de compatibilitat integrada amb OStatus (identi.ca, status.net, etc). Totes les comunicacions a OStatus són públiques amb el que ocasionalment pots veure advertències.";
+$a->strings["Enable Diaspora support"] = "Habilitar suport per Diaspora";
+$a->strings["Provide built-in Diaspora network compatibility."] = "Proveeix compatibilitat integrada amb la xarxa Diaspora";
+$a->strings["Only allow Friendica contacts"] = "Només permetre contactes de Friendica";
+$a->strings["All contacts must use Friendica protocols. All other built-in communication protocols disabled."] = "Tots els contactes ";
+$a->strings["Verify SSL"] = "Verificar SSL";
+$a->strings["If you wish, you can turn on strict certificate checking. This will mean you cannot connect (at all) to self-signed SSL sites."] = "Si ho vols, pots comprovar el certificat estrictament. Això farà que no puguis connectar (de cap manera) amb llocs amb certificats SSL autosignats.";
+$a->strings["Proxy user"] = "proxy d'usuari";
+$a->strings["Proxy URL"] = "URL del proxy";
+$a->strings["Network timeout"] = "Temps excedit a la xarxa";
+$a->strings["Value is in seconds. Set to 0 for unlimited (not recommended)."] = "Valor en segons. Canviat a 0 es sense límits (no recomenat)";
+$a->strings["%s user blocked/unblocked"] = array(
+	0 => "%s usuari bloquejar/desbloquejar",
+	1 => "%s usuaris bloquejar/desbloquejar",
+);
+$a->strings["%s user deleted"] = array(
+	0 => "%s usuari esborrat",
+	1 => "%s usuaris esborrats",
+);
+$a->strings["User '%s' deleted"] = "Usuari %s' esborrat";
+$a->strings["User '%s' unblocked"] = "Usuari %s' desbloquejat";
+$a->strings["User '%s' blocked"] = "L'usuari '%s' és bloquejat";
+$a->strings["select all"] = "Seleccionar tot";
+$a->strings["User registrations waiting for confirm"] = "Registre d'usuari esperant confirmació";
+$a->strings["Request date"] = "Data de sol·licitud";
+$a->strings["Email"] = "Correu";
+$a->strings["No registrations."] = "Sense registres.";
+$a->strings["Deny"] = "Denegar";
+$a->strings["Register date"] = "Data de registre";
+$a->strings["Last login"] = "Últim accés";
+$a->strings["Last item"] = "Últim element";
+$a->strings["Account"] = "Compte";
+$a->strings["Selected users will be deleted!\\n\\nEverything these users had posted on this site will be permanently deleted!\\n\\nAre you sure?"] = "Els usuaris seleccionats seran esborrats!\\n\\nqualsevol cosa que aquests usuaris hagin publicat en aquest lloc s'esborrarà!\\n\\nEsteu segur?";
+$a->strings["The user {0} will be deleted!\\n\\nEverything this user has posted on this site will be permanently deleted!\\n\\nAre you sure?"] = "L'usuari {0} s'eliminarà!\\n\\nQualsevol cosa que aquest usuari hagi publicat en aquest lloc s'esborrarà!\\n\\nEsteu segur?";
+$a->strings["Plugin %s disabled."] = "Plugin %s deshabilitat.";
+$a->strings["Plugin %s enabled."] = "Plugin %s habilitat.";
+$a->strings["Disable"] = "Deshabilitar";
+$a->strings["Enable"] = "Habilitar";
+$a->strings["Toggle"] = "Canviar";
+$a->strings["Settings"] = "Ajustos";
+$a->strings["Author: "] = "Autor:";
+$a->strings["Maintainer: "] = "Encarregat:";
+$a->strings["No themes found."] = "No s'ha trobat temes.";
+$a->strings["[Experimental]"] = "[Experimental]";
+$a->strings["[Unsupported]"] = "[No soportat]";
+$a->strings["Log settings updated."] = "Configuració del transcriptor actualitzada.";
+$a->strings["Clear"] = "Netejar";
+$a->strings["Debugging"] = "Esplugar";
+$a->strings["Log file"] = "Arxiu de transcripció";
+$a->strings["Must be writable by web server. Relative to your Friendica top-level directory."] = "Ha de tenir permisos d'escriptura pel servidor web. En relació amb el seu directori Friendica de nivell superior.";
+$a->strings["Log level"] = "Nivell de transcripció";
+$a->strings["Close"] = "Tancar";
+$a->strings["FTP Host"] = "Amfitrió FTP";
+$a->strings["FTP Path"] = "Direcció FTP";
+$a->strings["FTP User"] = "Usuari FTP";
+$a->strings["FTP Password"] = "Contrasenya FTP";
+$a->strings["Requested profile is not available."] = "El perfil sol·licitat no està disponible.";
+$a->strings["Access to this profile has been restricted."] = "L'accés a aquest perfil ha estat restringit.";
+$a->strings["Tips for New Members"] = "Consells per a nous membres";
+$a->strings["{0} wants to be your friend"] = "{0} vol ser el teu amic";
+$a->strings["{0} sent you a message"] = "{0} t'ha enviat un missatge de";
+$a->strings["{0} requested registration"] = "{0} solicituts de registre";
+$a->strings["{0} commented %s's post"] = "{0} va comentar l'enviament de %s";
+$a->strings["{0} liked %s's post"] = "A {0} l'ha agradat l'enviament de %s";
+$a->strings["{0} disliked %s's post"] = "A {0} no l'ha agradat l'enviament de %s";
+$a->strings["{0} is now friends with %s"] = "{0} ara és amic de %s";
+$a->strings["{0} posted"] = "{0} publicat";
+$a->strings["{0} tagged %s's post with #%s"] = "{0} va etiquetar la publicació de %s com #%s";
+$a->strings["{0} mentioned you in a post"] = "{0} et menciona en un missatge";
+$a->strings["Login failed."] = "Error d'accés.";
+$a->strings["Connect URL missing."] = "URL del connector perduda.";
+$a->strings["This site is not configured to allow communications with other networks."] = "Aquest lloc no està configurat per permetre les comunicacions amb altres xarxes.";
+$a->strings["No compatible communication protocols or feeds were discovered."] = "Protocol de comunnicació no compatible o alimentador descobert.";
+$a->strings["The profile address specified does not provide adequate information."] = "L'adreça de perfil especificada no proveeix informació adient.";
+$a->strings["An author or name was not found."] = "Un autor o nom no va ser trobat";
+$a->strings["No browser URL could be matched to this address."] = "Cap direcció URL del navegador coincideix amb aquesta adreça.";
+$a->strings["The profile address specified belongs to a network which has been disabled on this site."] = "La direcció del perfil especificat pertany a una xarxa que ha estat desactivada en aquest lloc.";
+$a->strings["Limited profile. This person will be unable to receive direct/personal notifications from you."] = "Perfil limitat. Aquesta persona no podrà rebre notificacions personals/directes de tu.";
+$a->strings["Unable to retrieve contact information."] = "No es pot recuperar la informació de contacte.";
+$a->strings["following"] = "seguint";
+$a->strings["Common Friends"] = "Amics Comuns";
+$a->strings["No friends in common."] = "No hi ha amics en comú.";
+$a->strings["Item has been removed."] = "El element ha estat esborrat.";
+$a->strings["Applications"] = "Aplicacions";
+$a->strings["No installed applications."] = "Aplicacions no instal·lades.";
+$a->strings["Search This Site"] = "Cerca en Aquest Lloc";
+$a->strings["Profile not found."] = "Perfil no trobat.";
+$a->strings["Profile Name is required."] = "Nom de perfil requerit.";
+$a->strings["Profile updated."] = "Perfil actualitzat.";
+$a->strings["Profile deleted."] = "Perfil esborrat.";
+$a->strings["Profile-"] = "Perfil-";
+$a->strings["New profile created."] = "Nou perfil creat.";
+$a->strings["Profile unavailable to clone."] = "No es pot clonar el perfil.";
+$a->strings["Hide your contact/friend list from viewers of this profile?"] = "Amaga la llista de contactes/amics en la vista d'aquest perfil?";
+$a->strings["Edit Profile Details"] = "Editor de Detalls del Perfil";
+$a->strings["View this profile"] = "Veure aquest perfil";
+$a->strings["Create a new profile using these settings"] = "Crear un nou perfil amb aquests ajustos";
+$a->strings["Clone this profile"] = "Clonar aquest perfil";
+$a->strings["Delete this profile"] = "Esborrar aquest perfil";
+$a->strings["Profile Name:"] = "Nom de Perfil:";
+$a->strings["Your Full Name:"] = "El Teu Nom Complet.";
+$a->strings["Title/Description:"] = "Títol/Descripció:";
+$a->strings["Your Gender:"] = "Gènere:";
+$a->strings["Birthday (%s):"] = "Aniversari (%s)";
+$a->strings["Street Address:"] = "Direcció:";
+$a->strings["Locality/City:"] = "Localitat/Ciutat:";
+$a->strings["Postal/Zip Code:"] = "Codi Postal:";
+$a->strings["Country:"] = "País";
+$a->strings["Region/State:"] = "Región/Estat:";
+$a->strings["<span class=\"heart\">&hearts;</span> Marital Status:"] = "<span class=\"heart\">&hearts;</span> Estat Civil:";
+$a->strings["Who: (if applicable)"] = "Qui? (si és aplicable)";
+$a->strings["Examples: cathy123, Cathy Williams, cathy@example.com"] = "Exemples: cathy123, Cathy Williams, cathy@example.com";
+$a->strings["Sexual Preference:"] = "Preferència Sexual:";
+$a->strings["Homepage URL:"] = "Pàgina web URL:";
+$a->strings["Political Views:"] = "Idees Polítiques:";
+$a->strings["Religious Views:"] = "Creencies Religioses:";
+$a->strings["Public Keywords:"] = "Paraules Clau Públiques";
+$a->strings["Private Keywords:"] = "Paraules Clau Privades:";
+$a->strings["Example: fishing photography software"] = "Exemple: pesca fotografia programari";
+$a->strings["(Used for suggesting potential friends, can be seen by others)"] = "(Emprat per suggerir potencials amics, Altres poden veure-ho)";
+$a->strings["(Used for searching profiles, never shown to others)"] = "(Emprat durant la cerca de perfils, mai mostrat a ningú)";
+$a->strings["Tell us about yourself..."] = "Parla'ns de tú.....";
+$a->strings["Hobbies/Interests"] = "Aficions/Interessos";
+$a->strings["Contact information and Social Networks"] = "Informació de contacte i Xarxes Socials";
+$a->strings["Musical interests"] = "Gustos musicals";
+$a->strings["Books, literature"] = "Llibres, Literatura";
+$a->strings["Television"] = "Televisió";
+$a->strings["Film/dance/culture/entertainment"] = "Cinema/ball/cultura/entreteniments";
+$a->strings["Love/romance"] = "Amor/sentiments";
+$a->strings["Work/employment"] = "Treball/ocupació";
+$a->strings["School/education"] = "Ensenyament/estudis";
+$a->strings["This is your <strong>public</strong> profile.<br />It <strong>may</strong> be visible to anybody using the internet."] = "Aquest és el teu perfil <strong>públic</strong>.<br />El qual <strong>pot</strong> ser visible per qualsevol qui faci servir Internet.";
+$a->strings["Age: "] = "Edat:";
+$a->strings["Edit/Manage Profiles"] = "Editar/Gestionar Perfils";
+$a->strings["Change profile photo"] = "Canviar la foto del perfil";
+$a->strings["Create New Profile"] = "Crear un Nou Perfil";
+$a->strings["Profile Image"] = "Imatge del Perfil";
+$a->strings["visible to everybody"] = "Visible per tothom";
+$a->strings["Edit visibility"] = "Editar visibilitat";
+$a->strings["%1\$s tagged %2\$s's %3\$s with %4\$s"] = "%1\$s etiquetats %2\$s %3\$s amb %4\$s";
+$a->strings["No potential page delegates located."] = "No es troben pàgines potencialment delegades.";
+$a->strings["Delegate Page Management"] = "Gestió de les Pàgines Delegades";
+$a->strings["Delegates are able to manage all aspects of this account/page except for basic account settings. Please do not delegate your personal account to anybody that you do not trust completely."] = "Els delegats poden gestionar tots els aspectes d'aquest compte/pàgina, excepte per als ajustaments bàsics del compte. Si us plau, no deleguin el seu compte personal a ningú que no confiïn completament.";
+$a->strings["Existing Page Managers"] = "Actuals Administradors de Pàgina";
+$a->strings["Existing Page Delegates"] = "Actuals Delegats de Pàgina";
+$a->strings["Potential Delegates"] = "Delegats Potencials";
+$a->strings["Add"] = "Afegir";
+$a->strings["No entries."] = "Sense entrades";
+$a->strings["Friend Suggestions"] = "Amics Suggerits";
+$a->strings["No suggestions available. If this is a new site, please try again in 24 hours."] = "Cap suggeriment disponible. Si això és un nou lloc, si us plau torna a intentar en 24 hores.";
+$a->strings["Ignore/Hide"] = "Ignorar/Amagar";
+$a->strings["Global Directory"] = "Directori Global";
+$a->strings["Normal site view"] = "Vista normal del lloc";
+$a->strings["Admin - View all site entries"] = "Admin- Veure totes les entrades del lloc";
+$a->strings["Find on this site"] = "Trobat en aquest lloc";
+$a->strings["Site Directory"] = "Directori Local";
+$a->strings["Gender: "] = "Gènere:";
+$a->strings["No entries (some entries may be hidden)."] = "No hi ha entrades (algunes de les entrades poden estar amagades).";
+$a->strings["%s : Not a valid email address."] = "%s : No es una adreça de correu vàlida";
+$a->strings["Please join my network on %s"] = "Si us plau, uneix-te a la meva xarxa en %s";
+$a->strings["%s : Message delivery failed."] = "%s : Ha fallat l'entrega del missatge.";
+$a->strings["%d message sent."] = array(
+	0 => "%d missatge enviat",
+	1 => "%d missatges enviats.",
+);
+$a->strings["You have no more invitations available"] = "No te més invitacions disponibles";
+$a->strings["Send invitations"] = "Enviant Invitacions";
+$a->strings["Enter email addresses, one per line:"] = "Entri adreçes de correu, una per línia:";
+$a->strings["Please join my social network on %s"] = "Per favor, uneix-te a la meva xarxa social en %s";
+$a->strings["To accept this invitation, please visit:"] = "Per acceptar aquesta invitació, si us plau, visiti:";
+$a->strings["You will need to supply this invitation code: \$invite_code"] = "Vostè haurà de proporcionar aquest codi d'invitació: \$invite_code";
+$a->strings["Once you have registered, please connect with me via my profile page at:"] = "Un cop registrat, si us plau contactar amb mi a través de la meva pàgina de perfil a:";
+$a->strings["This may occasionally happen if contact was requested by both persons and it has already been approved."] = "Això pot ocorre ocasionalment si el contacte fa una petició per ambdues persones i ja han estat aprovades.";
+$a->strings["Response from remote site was not understood."] = "La resposta des del lloc remot no s'entenia.";
+$a->strings["Unexpected response from remote site: "] = "Resposta inesperada de lloc remot:";
+$a->strings["Confirmation completed successfully."] = "La confirmació s'ha completat correctament.";
+$a->strings["Remote site reported: "] = "El lloc remot informa:";
+$a->strings["Temporary failure. Please wait and try again."] = "Fallada temporal. Si us plau, espereu i torneu a intentar.";
+$a->strings["Introduction failed or was revoked."] = "La presentació va fallar o va ser revocada.";
+$a->strings["Unable to set contact photo."] = "No es pot canviar la foto de contacte.";
+$a->strings["%1\$s is now friends with %2\$s"] = "%1\$s és ara amic amb %2\$s";
+$a->strings["No user record found for '%s' "] = "No es troben registres d'usuari per a '%s'";
+$a->strings["Our site encryption key is apparently messed up."] = "La nostra clau de xifrat del lloc pel que sembla en mal estat.";
+$a->strings["Empty site URL was provided or URL could not be decrypted by us."] = "Es va proporcionar una URL del lloc buida o la URL no va poder ser desxifrada per nosaltres.";
+$a->strings["Contact record was not found for you on our site."] = "No s'han trobat registres del contacte al nostre lloc.";
+$a->strings["Site public key not available in contact record for URL %s."] = "la clau pública del lloc no disponible en les dades del contacte per URL %s.";
+$a->strings["The ID provided by your system is a duplicate on our system. It should work if you try again."] = "La ID proporcionada pel seu sistema és un duplicat en el nostre sistema. Hauria de treballar si intenta de nou.";
+$a->strings["Unable to set your contact credentials on our system."] = "No es pot canviar les seves credencials de contacte en el nostre sistema.";
+$a->strings["Unable to update your contact profile details on our system"] = "No es pot actualitzar els detalls del seu perfil de contacte en el nostre sistema";
+$a->strings["Connection accepted at %s"] = "Connexió acceptada en %s";
+$a->strings["Facebook disabled"] = "Facebook deshabilitat";
+$a->strings["Updating contacts"] = "Actualitzant contactes";
+$a->strings["Facebook API key is missing."] = "La clau del API de Facebook s'ha perdut.";
+$a->strings["Facebook Connect"] = "Facebook Connectat";
+$a->strings["Install Facebook connector for this account."] = "Instal·lar el connector de Facebook per aquest compte.";
+$a->strings["Remove Facebook connector"] = "Eliminar el connector de Faceboook";
+$a->strings["Re-authenticate [This is necessary whenever your Facebook password is changed.]"] = "Re-autentificar [Això és necessari cada vegada que la contrasenya de Facebook canvia.]";
+$a->strings["Post to Facebook by default"] = "Enviar a Facebook per defecte";
+$a->strings["Link all your Facebook friends and conversations on this website"] = "Enllaça tots els teus amics i les converses de Facebook en aquest lloc web";
+$a->strings["Facebook conversations consist of your <em>profile wall</em> and your friend <em>stream</em>."] = "Les converses de Facebook consisteixen en el <em>perfil del mur</em> i en el<em> stream </em> del seu amic.";
+$a->strings["On this website, your Facebook friend stream is only visible to you."] = "En aquesta pàgina web, el stream del seu amic a Facebook només és visible per a vostè.";
+$a->strings["The following settings determine the privacy of your Facebook profile wall on this website."] = "Les següents opcions determinen la privacitat del mur del seu perfil de Facebook en aquest lloc web.";
+$a->strings["On this website your Facebook profile wall conversations will only be visible to you"] = "En aquesta pàgina web les seves converses al mur del perfil de Facebook només seran visible per a vostè";
+$a->strings["Do not import your Facebook profile wall conversations"] = "No importi les seves converses del mur del perfil de Facebook";
+$a->strings["If you choose to link conversations and leave both of these boxes unchecked, your Facebook profile wall will be merged with your profile wall on this website and your privacy settings on this website will be used to determine who may see the conversations."] = "Si opta per vincular les converses i deixar ambdues caselles sense marcar, el mur del seu perfil de Facebook es fusionarà amb el mur del seu perfil en aquest lloc web i la seva configuració de privacitat en aquest website serà utilitzada per determinar qui pot veure les converses.";
+$a->strings["Comma separated applications to ignore"] = "Separats per comes les aplicacions a ignorar";
+$a->strings["Facebook"] = "Facebook";
+$a->strings["Facebook Connector Settings"] = "Ajustos del Connector de Facebook";
+$a->strings["Post to Facebook"] = "Enviament a Facebook";
+$a->strings["Post to Facebook cancelled because of multi-network access permission conflict."] = "Enviament a Facebook cancel·lat perque hi ha un conflicte de permisos d'accés multi-xarxa.";
+$a->strings["Image: "] = "Imatge:";
+$a->strings["View on Friendica"] = "Vist en Friendica";
+$a->strings["Facebook post failed. Queued for retry."] = "Enviament a Facebook fracassat. En cua per a reintent.";
+$a->strings["link"] = "enllaç";
+$a->strings["%d person likes this"] = array(
+	0 => "%d persona li agrada això",
+	1 => "%d persones els agrada això",
+);
+$a->strings["%d person doesn't like this"] = array(
+	0 => "%d persona no li agrada això",
+	1 => "%d persones no els agrada això",
+);
+$a->strings["Generate new key"] = "Generar nova clau";
+$a->strings["Widgets key"] = "Ginys clau";
+$a->strings["Widgets available"] = "Ginys disponibles";
+$a->strings["Connect on Friendica!"] = "Connectar en Friendica";
+$a->strings["YourLS Settings"] = "La Teva Configuració de LS";
+$a->strings["URL: http://"] = "URL: http://";
+$a->strings["Username:"] = "Nom d'usuari:";
+$a->strings["Password:"] = "Contrasenya:";
+$a->strings["Use SSL "] = "Emprar SSL";
+$a->strings["yourls Settings saved."] = "Guardar la seva configuració.";
+$a->strings["Post to LiveJournal"] = "Missatge a Livejournal";
+$a->strings["LiveJournal Post Settings"] = "Configuració d'enviaments a Livejournal";
+$a->strings["Enable LiveJournal Post Plugin"] = "Habilitat el plugin d'enviaments a Livejournal";
+$a->strings["LiveJournal username"] = "Nom d'usuari a Livejournal";
+$a->strings["LiveJournal password"] = "Contrasenya a Livejournal";
+$a->strings["Post to LiveJournal by default"] = "Enviar per defecte a Livejournal";
+$a->strings["\"Not Safe For Work\" Settings"] = "Configuració de \"Not Safe For Work\"";
+$a->strings["Enable NSFW filter"] = "Habilitar el filtre NSFW";
+$a->strings["Comma separated words to treat as NSFW"] = "Tractar com NSFW les paraules separades per comes  ";
+$a->strings["Use /expression/ to provide regular expressions"] = "Emprar /expressió/  per a proporcionar expressions regulars";
+$a->strings["NSFW Settings saved."] = "Configuració NSFW guardada.";
+$a->strings["%s - Click to open/close"] = "%s - Clicar per obrir/tancar";
+$a->strings["Login"] = "Identifica't";
+$a->strings["OpenID"] = "OpenID";
+$a->strings["Last users"] = "Últims usuaris";
+$a->strings["Most active users"] = "Usuaris més actius";
+$a->strings["Last photos"] = "Últimes fotos";
+$a->strings["Last likes"] = "Últims \"m'agrada\"";
+$a->strings["event"] = "esdeveniment";
+$a->strings["Latest users"] = "Últims usuaris";
+$a->strings["Allow to use your friendica id (%s) to connecto to external unhosted-enabled storage (like ownCloud). See <a href=\"http://www.w3.org/community/unhosted/wiki/RemoteStorage#WebFinger\">RemoteStorage WebFinger</a>"] = "Permetre l'ús del seu ID de friendica (%s) per Connectar a l'emmagatzematge extern (com ownCloud). Veure <a href=\"http://www.w3.org/community/unhosted/wiki/RemoteStorage#WebFinger\"> WebFinger RemoteStorage </a>";
+$a->strings["Template URL (with {category})"] = "Plantilles de URL (amb {categoria})";
+$a->strings["OAuth end-point"] = "OAuth end-point";
+$a->strings["Api"] = "Api";
+$a->strings["Member since:"] = "Membre des de:";
+$a->strings["Three Dimensional Tic-Tac-Toe"] = "Tres en línia Tridimensional";
+$a->strings["3D Tic-Tac-Toe"] = "Tres en línia 3D";
+$a->strings["New game"] = "Nou joc";
+$a->strings["New game with handicap"] = "Nou joc modificat";
+$a->strings["Three dimensional tic-tac-toe is just like the traditional game except that it is played on multiple levels simultaneously. "] = "El joc del tres en línia tridimensional és com el joc tradicional, excepte que es juga en diversos nivells simultàniament.";
+$a->strings["In this case there are three levels. You win by getting three in a row on any level, as well as up, down, and diagonally across the different levels."] = "En aquest cas hi ha tres nivells. Vostè guanya per aconseguir tres en una fila en qualsevol nivell, així com dalt, baix i en diagonal a través dels diferents nivells.";
+$a->strings["The handicap game disables the center position on the middle level because the player claiming this square often has an unfair advantage."] = "El joc modificat desactiva la posició central en el nivell mitjà perquè el jugador en aquesta posició té sovint un avantatge injust.";
+$a->strings["You go first..."] = "Vostè va primer ...";
+$a->strings["I'm going first this time..."] = "Vaig primer aquesta vegada ...";
+$a->strings["You won!"] = "Has guanyat!";
+$a->strings["\"Cat\" game!"] = "Empat!";
+$a->strings["I won!"] = "Vaig guanyar!";
+$a->strings["Randplace Settings"] = "Configuració de Randplace";
+$a->strings["Enable Randplace Plugin"] = "Habilitar el Plugin de Randplace";
+$a->strings["Post to Dreamwidth"] = "Missatge a Dreamwidth";
+$a->strings["Dreamwidth Post Settings"] = "Configuració d'enviaments a Dreamwidth";
+$a->strings["Enable dreamwidth Post Plugin"] = "Habilitat el plugin d'enviaments a Dreamwidth";
+$a->strings["dreamwidth username"] = "Nom d'usuari a Dreamwidth";
+$a->strings["dreamwidth password"] = "Contrasenya a Dreamwidth";
+$a->strings["Post to dreamwidth by default"] = "Enviar per defecte a Dreamwidth";
+$a->strings["Post to Drupal"] = "Missatge a Drupal";
+$a->strings["Drupal Post Settings"] = "Configuració d'enviaments a Drupal";
+$a->strings["Enable Drupal Post Plugin"] = "Habilitar el Plugin d'Enviaments de Drupal";
+$a->strings["Drupal username"] = "Nom d'usuari de Drupal";
+$a->strings["Drupal password"] = "Contrasenya de Drupal";
+$a->strings["Post Type - article,page,or blog"] = "Tipus d'Enviament- article,pàgina, o blog";
+$a->strings["Drupal site URL"] = "URL del lloc Drupal";
+$a->strings["Drupal site uses clean URLS"] = "el Lloc Drupal empra URLS netes";
+$a->strings["Post to Drupal by default"] = "Enviar a Drupal per defecte";
+$a->strings["Post from Friendica"] = "Enviament des de Friendica";
+$a->strings["Geonames settings updated."] = "Actualitzada la configuració de Geonames.";
+$a->strings["Geonames Settings"] = "Configuració de Geonames";
+$a->strings["Enable Geonames Plugin"] = "Habilitar Plugin de Geonames";
+$a->strings["Upload a file"] = "Carrega un arxiu";
+$a->strings["Drop files here to upload"] = "Deixa aquí el arxiu a carregar";
+$a->strings["Failed"] = "Fracassar";
+$a->strings["No files were uploaded."] = "No hi ha arxius carregats.";
+$a->strings["Uploaded file is empty"] = "L'arxiu carregat està buit";
+$a->strings["File has an invalid extension, it should be one of "] = "Arxiu té una extensió no vàlida, ha de ser una de";
+$a->strings["Upload was cancelled, or server error encountered"] = "La pujada va ser cancel.lada, o es va trobar un error de servidor";
+$a->strings["OEmbed settings updated"] = "Actualitzar la configuració OEmbed";
+$a->strings["Use OEmbed for YouTube videos"] = "Empreu OEmbed per videos YouTube";
+$a->strings["URL to embed:"] = "Adreça URL del recurs";
+$a->strings["Impressum"] = "Impressum";
+$a->strings["Site Owner"] = "Propietari del lloc";
+$a->strings["Email Address"] = "Adreça de correu";
+$a->strings["Postal Address"] = "Adreça postal";
+$a->strings["The impressum addon needs to be configured!<br />Please add at least the <tt>owner</tt> variable to your config file. For other variables please refer to the README file of the addon."] = "El complement impressum s'ha de configurar!<br />Si us plau afegiu almenys la variable <tt>propietari </tt> al fitxer de configuració. Per a les altres variables, consulteu el fitxer README del complement.";
+$a->strings["Site Owners Profile"] = "Perfil del Propietari del Lloc";
+$a->strings["Notes"] = "Notes";
+$a->strings["Report Bug"] = "Informar de problema";
+$a->strings["\"Blockem\" Settings"] = "Configuració de \"Bloqueig\"";
+$a->strings["Comma separated profile URLS to block"] = "URLS dels perfils a bloquejar, separats per comes";
+$a->strings["BLOCKEM Settings saved."] = "Guardada la configuració de BLOQUEIG.";
+$a->strings["Blocked %s - Click to open/close"] = "Bloquejar %s - Clica per obrir/tancar";
+$a->strings["Unblock Author"] = "Desbloquejar Autor";
+$a->strings["Block Author"] = "Bloquejar Autor";
+$a->strings["blockem settings updated"] = "Actualitzar la Configuració de bloqueig";
+$a->strings[":-)"] = ":-)";
+$a->strings[":-("] = ":-(";
+$a->strings["lol"] = "lol";
+$a->strings["Quick Comment Settings"] = "Configuració Ràpida dels Comentaris";
+$a->strings["Quick comments are found near comment boxes, sometimes hidden. Click them to provide simple replies."] = "Comentaris ràpids es troben prop de les caixes de comentaris, de vegades ocults. Feu clic a ells per donar respostes simples.";
+$a->strings["Enter quick comments, one per line"] = "Introduïu els comentaris ràpids, un per línia";
+$a->strings["Quick Comment settings saved."] = "Guardada la configuració de comentaris ràpids.";
+$a->strings["Tile Server URL"] = "URL del servidor, del mosaico de servidores";
+$a->strings["A list of <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" target=\"_blank\">public tile servers</a>"] = "Una llista de  <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" target=\"_blank\"> un mosaic de servidors públics</a>";
+$a->strings["Default zoom"] = "Zoom per defecte";
+$a->strings["The default zoom level. (1:world, 18:highest)"] = "Nivell de zoom per defecte. (1: el món, 18: el més alt)";
+$a->strings["Editplain settings updated."] = "Actualitzar la configuració de Editplain.";
+$a->strings["Editplain Settings"] = "Configuració de Editplain";
+$a->strings["Disable richtext status editor"] = "Deshabilitar l'editor d'estatus de texte enriquit";
+$a->strings["\"pageheader\" Settings"] = "Configuració de la capçalera de pàgina.";
+$a->strings["pageheader Settings saved."] = "guardada la configuració de la capçalera de pàgina.";
+$a->strings["View Source"] = "Veure les Fonts";
+$a->strings["Post to StatusNet"] = "Publica-ho a StatusNet";
+$a->strings["Please contact your site administrator.<br />The provided API URL is not valid."] = "Si us plau, poseu-vos en contacte amb l'administrador del lloc. <br /> L'adreça URL de l'API proporcionada no és vàlida.";
+$a->strings["We could not contact the StatusNet API with the Path you entered."] = "No hem pogut posar-nos en contacte amb l'API StatusNet amb la ruta que has introduït.";
+$a->strings["StatusNet settings updated."] = "La configuració StatusNet actualitzada.";
+$a->strings["StatusNet Posting Settings"] = "Configuració d'Enviaments per a StatusNet";
+$a->strings["Globally Available StatusNet OAuthKeys"] = "OAuthKeys de StatusNet Globalment Disponible";
+$a->strings["There are preconfigured OAuth key pairs for some StatusNet servers available. If you are useing one of them, please use these credentials. If not feel free to connect to any other StatusNet instance (see below)."] = "Hi ha preconfigurats parells clau OAuth per a alguns servidors StatusNet disponibles. Si està emprant un d'ells, utilitzi aquestes credencials. Si no és així no dubteu a connectar-se a qualsevol altra instància StatusNet (veure a baix).";
+$a->strings["Provide your own OAuth Credentials"] = "Proporcioneu les vostres credencials de OAuth";
+$a->strings["No consumer key pair for StatusNet found. Register your Friendica Account as an desktop client on your StatusNet account, copy the consumer key pair here and enter the API base root.<br />Before you register your own OAuth key pair ask the administrator if there is already a key pair for this Friendica installation at your favorited StatusNet installation."] = "no s'ha trobat cap parell \"consumer key\" per StatusNet. Registra el teu compte Friendica com un client d'escriptori en el seu compte StatusNet, copieu el parell de \"consumer key\" aquí i entri a l'arrel de la base de l'API. <br /> Abans de registrar el seu parell de claus OAuth demani a l'administrador si ja hi ha un parell de claus per a aquesta instal·lació de Friendica en la instal·lació del teu favorit StatusNet.";
+$a->strings["OAuth Consumer Key"] = "OAuth Consumer Key";
+$a->strings["OAuth Consumer Secret"] = "OAuth Consumer Secret";
+$a->strings["Base API Path (remember the trailing /)"] = "Base API Path (recorda deixar / al final)";
+$a->strings["To connect to your StatusNet account click the button below to get a security code from StatusNet which you have to copy into the input box below and submit the form. Only your <strong>public</strong> posts will be posted to StatusNet."] = "Per connectar al seu compte StatusNet, feu clic al botó de sota per obtenir un codi de seguretat StatusNet, que has de copiar a la casella de sota, i enviar el formulari. Només els missatges <strong> públics </strong> es publicaran en StatusNet.";
+$a->strings["Log in with StatusNet"] = "Accedeixi com en  StatusNet";
+$a->strings["Copy the security code from StatusNet here"] = "Copieu el codi de seguretat StatusNet aquí";
+$a->strings["Cancel Connection Process"] = "Cancel·lar el procés de connexió";
+$a->strings["Current StatusNet API is"] = "L'Actual StatusNet API és";
+$a->strings["Cancel StatusNet Connection"] = "Cancel·lar la connexió amb StatusNet";
+$a->strings["Currently connected to: "] = "Actualment connectat a: ";
+$a->strings["If enabled all your <strong>public</strong> postings can be posted to the associated StatusNet account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry."] = "Si està activat, tots els seus anuncis <strong>públics</strong> poden ser publicats en el compte StatusNet associat. Vostè pot optar per fer-ho per defecte (en aquest cas) o per cada missatge per separat en les opcions de comptabilització en escriure l'entrada.";
+$a->strings["<strong>Note</strong>: Due your privacy settings (<em>Hide your profile details from unknown viewers?</em>) the link potentially included in public postings relayed to StatusNet will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "<strong>Nota</strong>: A causa de les seves opcions de privacitat (<em>Amaga els detalls del teu perfil dels espectadors desconeguts? </em>)  el vincle potencialment inclòs en anuncis públics transmesos a StatusNet conduirà el visitant a una pàgina en blanc en la que informarà al visitants que l'accés al seu perfil s'ha restringit.";
+$a->strings["Allow posting to StatusNet"] = "Permetre enviaments a StatusNet";
+$a->strings["Send public postings to StatusNet by default"] = "Enviar missatges públics a StatusNet per defecte";
+$a->strings["Clear OAuth configuration"] = "Esborrar configuració de OAuth";
+$a->strings["API URL"] = "API URL";
+$a->strings["Post to Tumblr"] = "Publica-ho al Tumblr";
+$a->strings["Tumblr Post Settings"] = "Configuració d'Enviaments de Tumblr";
+$a->strings["Enable Tumblr Post Plugin"] = "Habilita el plugin de enviaments de Tumblr";
+$a->strings["Tumblr login"] = "Inici de sessió de Tumblr";
+$a->strings["Tumblr password"] = "Caontrasenya de Tumblr";
+$a->strings["Post to Tumblr by default"] = "Enviar a Tumblr per defecte";
+$a->strings["Numfriends settings updated."] = "Actualitzar la configuració de Numfriends.";
+$a->strings["Numfriends Settings"] = "Configuració de Numfriends";
+$a->strings["How many contacts to display on profile sidebar"] = "Quants contactes per mostrar a la barra lateral el perfil";
+$a->strings["Gnot settings updated."] = "Configuració de Gnot actualitzada";
+$a->strings["Gnot Settings"] = "Configuració de Gnot";
+$a->strings["Allows threading of email comment notifications on Gmail and anonymising the subject line."] = "Permet crear fils de les notificacions de comentaris de correu electrònic a Gmail i anonimat de la línia d'assumpte.";
+$a->strings["Enable this plugin/addon?"] = "Activar aquest plugin/aplicació?";
+$a->strings["[Friendica:Notify] Comment to conversation #%d"] = "[Friendica: Notifica] Conversació comentada #%d";
+$a->strings["Post to Wordpress"] = "Publica-ho al Wordpress";
+$a->strings["WordPress Post Settings"] = "Configuració d'enviaments a WordPress";
+$a->strings["Enable WordPress Post Plugin"] = "Habilitar Configuració d'Enviaments a WordPress";
+$a->strings["WordPress username"] = "Nom d'usuari de WordPress";
+$a->strings["WordPress password"] = "Contrasenya de WordPress";
+$a->strings["WordPress API URL"] = "WordPress API URL";
+$a->strings["Post to WordPress by default"] = "Enviar a WordPress per defecte";
+$a->strings["\"Show more\" Settings"] = "Configuració de \"Mostrar més\"";
+$a->strings["Enable Show More"] = "Habilita Mostrar Més";
+$a->strings["Cutting posts after how much characters"] = "Tallar els missatges després de quants caràcters";
+$a->strings["Show More Settings saved."] = "Guardada la configuració de \"Mostra Més\".";
+$a->strings["Show More"] = "Mostra Més";
+$a->strings["This website is tracked using the <a href='http://www.piwik.org'>Piwik</a> analytics tool."] = "Aquest lloc web realitza un seguiment mitjançant la eina d'anàlisi <a href='http://www.piwik.org'>Piwik</a>.";
+$a->strings["If you do not want that your visits are logged this way you <a href='%s'>can set a cookie to prevent Piwik from tracking further visits of the site</a> (opt-out)."] = "Si no vol que les seves visites es transcribin d'aquesta manera vostè <a href='%s'> pot establir una cookie per evitar a Piwik a partir de noves visites del lloc web </a> (opt-out).";
+$a->strings["Piwik Base URL"] = "URL Piwik Base";
+$a->strings["Absolute path to your Piwik installation. (without protocol (http/s), with trailing slash)"] = "Trajectoria absoluta per a la instal·lació de Piwik (sense el protocol (http/s), amb la barra final )";
+$a->strings["Site ID"] = "Lloc ID";
+$a->strings["Show opt-out cookie link?"] = "Mostra l'enllaç cookie opt-out?";
+$a->strings["Asynchronous tracking"] = "Seguiment asíncrono";
+$a->strings["Post to Twitter"] = "Publica-ho al Twitter";
+$a->strings["Twitter settings updated."] = "La configuració de Twitter actualitzada.";
+$a->strings["Twitter Posting Settings"] = "Configuració d'Enviaments per a Twitter";
+$a->strings["No consumer key pair for Twitter found. Please contact your site administrator."] = "No s'ha pogut emparellar cap clau \"consumer key\" per a Twitter. Si us plau, poseu-vos en contacte amb l'administrador del lloc.";
+$a->strings["At this Friendica instance the Twitter plugin was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your <strong>public</strong> posts will be posted to Twitter."] = "En aquesta instància Friendica el plugin Twitter va ser habilitat, però encara no ha connectat el compte al seu compte de Twitter. Per a això feu clic al botó de sota per obtenir un PIN de Twitter que ha de copiar a la casella de sota i enviar el formulari. Només els missatges <strong> públics </strong> es publicaran a Twitter.";
+$a->strings["Log in with Twitter"] = "Accedeixi com en  Twitter";
+$a->strings["Copy the PIN from Twitter here"] = "Copieu el codi PIN de Twitter aquí";
+$a->strings["If enabled all your <strong>public</strong> postings can be posted to the associated Twitter account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry."] = "Si està activat, tots els seus anuncis <strong> públics </strong> poden ser publicats en el corresponent compte de Twitter. Vostè pot optar per fer-ho per defecte (en aquest cas) o per cada missatge per separat en les opcions de comptabilització en escriure l'entrada.";
+$a->strings["<strong>Note</strong>: Due your privacy settings (<em>Hide your profile details from unknown viewers?</em>) the link potentially included in public postings relayed to Twitter will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "<strong>Nota</strong>: donada la seva configuració de privacitat (<em> Amaga els detalls del teu perfil dels espectadors desconeguts? </em>) el vincle potencialment inclòs en anuncis públics retransmesos a Twitter conduirà al visitant a una pàgina en blanc informar als visitants que l'accés al seu perfil s'ha restringit.";
+$a->strings["Allow posting to Twitter"] = "Permetre anunci a Twitter";
+$a->strings["Send public postings to Twitter by default"] = "Enviar anuncis públics a Twitter per defecte";
+$a->strings["Consumer key"] = "Consumer key";
+$a->strings["Consumer secret"] = "Consumer secret";
+$a->strings["irc Chatroom"] = "irc Chatroom";
+$a->strings["Post to Posterous"] = "enviament a Posterous";
+$a->strings["Posterous Post Settings"] = "Configuració d'Enviaments a Posterous";
+$a->strings["Enable Posterous Post Plugin"] = "Habilitar plugin d'Enviament de Posterous";
+$a->strings["Posterous login"] = "Inici de sessió a Posterous";
+$a->strings["Posterous password"] = "Contrasenya a Posterous";
+$a->strings["Post to Posterous by default"] = "Enviar a Posterous per defecte";
+$a->strings["Theme settings"] = "Configuració de Temes";
+$a->strings["Alignment"] = "Adaptació";
+$a->strings["Left"] = "Esquerra";
+$a->strings["Center"] = "Centre";
+$a->strings["Gender:"] = "Gènere:";
+$a->strings["j F, Y"] = "j F, Y";
+$a->strings["j F"] = "j F";
+$a->strings["Birthday:"] = "Aniversari:";
+$a->strings["Age:"] = "Edat:";
+$a->strings["Status:"] = "Estatus:";
+$a->strings["Homepage:"] = "Pàgina web:";
+$a->strings["Tags:"] = "Etiquetes:";
+$a->strings["Religion:"] = "Religió:";
+$a->strings["About:"] = "Acerca de:";
+$a->strings["Hobbies/Interests:"] = "Aficiones/Intereses:";
+$a->strings["Contact information and Social Networks:"] = "Informació de contacte i Xarxes Socials:";
+$a->strings["Musical interests:"] = "Gustos musicals:";
+$a->strings["Books, literature:"] = "Llibres, literatura:";
+$a->strings["Television:"] = "Televisió:";
+$a->strings["Film/dance/culture/entertainment:"] = "Cinema/ball/cultura/entreteniments:";
+$a->strings["Love/Romance:"] = "Amor/sentiments:";
+$a->strings["Work/employment:"] = "Treball/ocupació:";
+$a->strings["School/education:"] = "Escola/formació";
+$a->strings["Unknown | Not categorised"] = "Desconegut/No categoritzat";
+$a->strings["Block immediately"] = "Bloquejar immediatament";
+$a->strings["Shady, spammer, self-marketer"] = "Sospitós, Femater, auto-publicitat";
+$a->strings["Known to me, but no opinion"] = "Conegut per mi, però sense opinió";
+$a->strings["OK, probably harmless"] = "Bé, probablement inofensiu";
+$a->strings["Reputable, has my trust"] = "Bona reputació, té la meva confiança";
+$a->strings["Frequently"] = "Freqüentment";
+$a->strings["Hourly"] = "Cada hora";
+$a->strings["Twice daily"] = "Dues vegades al dia";
+$a->strings["Daily"] = "Diari";
+$a->strings["Weekly"] = "Setmanal";
+$a->strings["Monthly"] = "Mensual";
+$a->strings["OStatus"] = "OStatus";
+$a->strings["RSS/Atom"] = "RSS/Atom";
+$a->strings["Zot!"] = "Zot!";
+$a->strings["LinkedIn"] = "LinkedIn";
+$a->strings["XMPP/IM"] = "XMPP/IM";
+$a->strings["MySpace"] = "MySpace";
+$a->strings["Male"] = "Home";
+$a->strings["Female"] = "Dona";
+$a->strings["Currently Male"] = "Actualment Home";
+$a->strings["Currently Female"] = "Actualment Dona";
+$a->strings["Mostly Male"] = "Habitualment Home";
+$a->strings["Mostly Female"] = "Habitualment Dona";
+$a->strings["Transgender"] = "Transgènere";
+$a->strings["Intersex"] = "Bisexual";
+$a->strings["Transsexual"] = "Transexual";
+$a->strings["Hermaphrodite"] = "Hermafrodita";
+$a->strings["Neuter"] = "Neutre";
+$a->strings["Non-specific"] = "No específicat";
+$a->strings["Other"] = "Altres";
+$a->strings["Undecided"] = "No Decidit";
+$a->strings["Males"] = "Home";
+$a->strings["Females"] = "Dona";
+$a->strings["Gay"] = "Gay";
+$a->strings["Lesbian"] = "Lesbiana";
+$a->strings["No Preference"] = "Sense Preferències";
+$a->strings["Bisexual"] = "Bisexual";
+$a->strings["Autosexual"] = "Autosexual";
+$a->strings["Abstinent"] = "Abstinent/a";
+$a->strings["Virgin"] = "Verge";
+$a->strings["Deviant"] = "Desviat/da";
+$a->strings["Fetish"] = "Fetixiste";
+$a->strings["Oodles"] = "Orgies";
+$a->strings["Nonsexual"] = "Asexual";
+$a->strings["Single"] = "Solter/a";
+$a->strings["Lonely"] = "Solitari";
+$a->strings["Available"] = "Disponible";
+$a->strings["Unavailable"] = "No Disponible";
+$a->strings["Dating"] = "De cites";
+$a->strings["Unfaithful"] = "Infidel";
+$a->strings["Sex Addict"] = "Adicte al sexe";
+$a->strings["Friends"] = "Amics/Amigues";
+$a->strings["Friends/Benefits"] = "Amics íntims";
+$a->strings["Casual"] = "Oportunista";
+$a->strings["Engaged"] = "Promès";
+$a->strings["Married"] = "Casat";
+$a->strings["Partners"] = "Socis";
+$a->strings["Cohabiting"] = "Cohabitant";
+$a->strings["Happy"] = "Feliç";
+$a->strings["Not Looking"] = "No Cerco";
+$a->strings["Swinger"] = "Parella Liberal";
+$a->strings["Betrayed"] = "Traït/da";
+$a->strings["Separated"] = "Separat/da";
+$a->strings["Unstable"] = "Inestable";
+$a->strings["Divorced"] = "Divorciat/da";
+$a->strings["Widowed"] = "Vidu/a";
+$a->strings["Uncertain"] = "Incert";
+$a->strings["Complicated"] = "Complicat";
+$a->strings["Don't care"] = "No t'interessa";
+$a->strings["Ask me"] = "Pregunta'm";
+$a->strings["Starts:"] = "Inici:";
+$a->strings["Finishes:"] = "Acaba:";
+$a->strings["(no subject)"] = "(sense assumpte)";
+$a->strings["noreply"] = "no contestar";
+$a->strings["prev"] = "Prev";
+$a->strings["first"] = "primer";
+$a->strings["last"] = "Últim";
+$a->strings["next"] = "Proper";
+$a->strings["No contacts"] = "Sense contactes";
+$a->strings["%d Contact"] = array(
+	0 => "%d Contacte",
+	1 => "%d Contactes",
+);
+$a->strings["Search"] = "Cercar";
+$a->strings["Monday"] = "Dilluns";
+$a->strings["Tuesday"] = "Dimarts";
+$a->strings["Wednesday"] = "Dimecres";
+$a->strings["Thursday"] = "Dijous";
+$a->strings["Friday"] = "Divendres";
+$a->strings["Saturday"] = "Dissabte";
+$a->strings["Sunday"] = "Diumenge";
+$a->strings["January"] = "Gener";
+$a->strings["February"] = "Febrer";
+$a->strings["March"] = "Març";
+$a->strings["April"] = "Abril";
+$a->strings["May"] = "Maig";
+$a->strings["June"] = "Juny";
+$a->strings["July"] = "Juliol";
+$a->strings["August"] = "Agost";
+$a->strings["September"] = "Setembre";
+$a->strings["October"] = "Octubre";
+$a->strings["November"] = "Novembre";
+$a->strings["December"] = "Desembre";
+$a->strings["bytes"] = "bytes";
+$a->strings["Select an alternate language"] = "Sel·lecciona un idioma alternatiu";
+$a->strings["default"] = "per defecte";
+$a->strings["activity"] = "activitat";
+$a->strings["comment"] = "comentari";
+$a->strings["post"] = "missatge";
+$a->strings["Sharing notification from Diaspora network"] = "Compartint la notificació de la xarxa Diàspora";
+$a->strings["Attachments:"] = "Adjunts:";
+$a->strings["[Relayed] Comment authored by %s from network %s"] = "[Retransmès] Comentari escrit per %s  des de la xarxa %s";
+$a->strings["view full size"] = "Veure a mida completa";
+$a->strings["Embedded content"] = "Contingut incrustat";
+$a->strings["Embedding disabled"] = "Incrustacions deshabilitades";
+$a->strings["A deleted group with this name was revived. Existing item permissions <strong>may</strong> apply to this group and any future members. If this is not what you intended, please create another group with a different name."] = "Un grup eliminat amb aquest nom va ser restablert. Els permisos dels elements existents <strong>poden</strong> aplicar-se a aquest grup i tots els futurs membres. Si això no és el que pretén, si us plau, crei un altre grup amb un nom diferent.";
+$a->strings["Everybody"] = "Tothom";
+$a->strings["edit"] = "editar";
+$a->strings["Groups"] = "Grups";
+$a->strings["Edit group"] = "Editar grup";
+$a->strings["Create a new group"] = "Crear un nou grup";
+$a->strings["Logout"] = "Sortir";
+$a->strings["End this session"] = "Termina sessió";
+$a->strings["Status"] = "Estatus";
+$a->strings["Your posts and conversations"] = "Els teus anuncis i converses";
+$a->strings["Your profile page"] = "La seva pàgina de perfil";
+$a->strings["Photos"] = "Fotos";
+$a->strings["Your photos"] = "Les seves fotos";
+$a->strings["Your events"] = "Els seus esdeveniments";
+$a->strings["Personal notes"] = "Notes personals";
+$a->strings["Your personal photos"] = "Les seves fotos personals";
+$a->strings["Sign in"] = "Accedeix";
+$a->strings["Home Page"] = "Pàgina d'Inici";
+$a->strings["Create an account"] = "Crear un compte";
+$a->strings["Help and documentation"] = "Ajuda i documentació";
+$a->strings["Apps"] = "Aplicacions";
+$a->strings["Addon applications, utilities, games"] = "Afegits: aplicacions, utilitats, jocs";
+$a->strings["Search site content"] = "Busca contingut en el lloc";
+$a->strings["Conversations on this site"] = "Converses en aquest lloc";
+$a->strings["Directory"] = "Directori";
+$a->strings["People directory"] = "Directori de gent";
+$a->strings["Conversations from your friends"] = "Converses dels teus amics";
+$a->strings["Friend Requests"] = "Sol·licitud d'Amistat";
+$a->strings["See all notifications"] = "Veure totes les notificacions";
+$a->strings["Mark all system notifications seen"] = "Marcar totes les notificacions del sistema com a vistes";
+$a->strings["Private mail"] = "Correu privat";
+$a->strings["Manage"] = "Gestionar";
+$a->strings["Manage other pages"] = "Gestiona altres pàgines";
+$a->strings["Profiles"] = "Perfils";
+$a->strings["Manage/edit profiles"] = "Gestiona/edita perfils";
+$a->strings["Manage/edit friends and contacts"] = "Gestiona/edita amics i contactes";
+$a->strings["Admin"] = "Admin";
+$a->strings["Site setup and configuration"] = "Ajustos i configuració del lloc";
+$a->strings["Nothing new here"] = "Res nou aquí";
+$a->strings["Add New Contact"] = "Afegir Nou Contacte";
+$a->strings["Enter address or web location"] = "Introdueixi adreça o ubicació web";
+$a->strings["Example: bob@example.com, http://example.com/barbara"] = "Exemple: bob@example.com, http://example.com/barbara";
+$a->strings["Invite Friends"] = "Invita Amics";
+$a->strings["%d invitation available"] = array(
+	0 => "%d invitació disponible",
+	1 => "%d invitacions disponibles",
+);
+$a->strings["Find People"] = "Trobar Gent";
+$a->strings["Enter name or interest"] = "Introdueixi nom o aficions";
+$a->strings["Connect/Follow"] = "Connectar/Seguir";
+$a->strings["Examples: Robert Morgenstein, Fishing"] = "Exemples: Robert Morgenstein, Pescar";
+$a->strings["Similar Interests"] = "Aficions Similars";
+$a->strings["Networks"] = "Xarxes";
+$a->strings["All Networks"] = "totes les Xarxes";
+$a->strings["Logged out."] = "Has sortit";
+$a->strings["Miscellaneous"] = "Miscel·lania";
+$a->strings["year"] = "any";
+$a->strings["month"] = "mes";
+$a->strings["day"] = "dia";
+$a->strings["never"] = "mai";
+$a->strings["less than a second ago"] = "Fa menys d'un segon";
+$a->strings["years"] = "anys";
+$a->strings["months"] = "mesos";
+$a->strings["week"] = "setmana";
+$a->strings["weeks"] = "setmanes";
+$a->strings["days"] = "dies";
+$a->strings["hour"] = "hora";
+$a->strings["hours"] = "hores";
+$a->strings["minute"] = "minut";
+$a->strings["minutes"] = "minuts";
+$a->strings["second"] = "segon";
+$a->strings["seconds"] = "segons";
+$a->strings["%1\$d %2\$s ago"] = " fa %1\$d %2\$s";
+$a->strings["From: "] = "Des de:";
+$a->strings["$1 wrote:"] = "$1 va escrivir:";
+$a->strings["Image/photo"] = "Imatge/foto";
+$a->strings["Cannot locate DNS info for database server '%s'"] = "No put trobar informació de DNS  del servidor de base de dades '%s'";
+$a->strings["[no subject]"] = "[Sense assumpte]";
+$a->strings["Visible to everybody"] = "Visible per tothom";
+$a->strings["show"] = "mostra";
+$a->strings["don't show"] = "no mostris";
+$a->strings["Friendica Notification"] = "Notificacions de Friendica";
+$a->strings["Thank You,"] = "Gràcies,";
+$a->strings["%s Administrator"] = "%s Administrador";
+$a->strings["%s <!item_type!>"] = "%s <!item_type!>";
+$a->strings["[Friendica:Notify] New mail received at %s"] = "[Friendica: Notifica] nou correu rebut a %s";
+$a->strings["%s sent you a new private message at %s."] = "%s t'ha enviat un nou missatge privat en %s";
+$a->strings["%s sent you %s."] = "%s t'ha enviat %s.";
+$a->strings["a private message"] = "un missatge privat";
+$a->strings["Please visit %s to view and/or reply to your private messages."] = "Per favor, visiteu %s per a veure i/o respondre els teus missatges privats.";
+$a->strings["%s's"] = "%s's";
+$a->strings["your"] = "tu";
+$a->strings["[Friendica:Notify] Comment to conversation #%d by %s"] = "[Friendica:Notifica] Conversació comentada #%d per %s";
+$a->strings["%s commented on an item/conversation you have been following."] = "%s ha comentat un element/conversació que estas seguint.";
+$a->strings["%s commented on %s."] = "%s comentat a %s.";
+$a->strings["Please visit %s to view and/or reply to the conversation."] = "Si us pau, visiteu %s per a veure i/o respondre la conversació.";
+$a->strings["[Friendica:Notify] %s posted to your profile wall"] = "[Friendica:Notifica] %s enviat al teu mur del perfil";
+$a->strings["%s posted to your profile wall at %s"] = "%s enviat al teu mur de perfil %s";
+$a->strings["%s posted to %s"] = "%s enviat a %s";
+$a->strings["your profile wall."] = "El teu perfil del mur.";
+$a->strings["[Friendica:Notify] %s tagged you"] = "[Friendica:Notifica] %s t'ha etiquetat";
+$a->strings["%s tagged you at %s"] = "%s t'ha etiquetat en %s";
+$a->strings["%s %s."] = "%s %s.";
+$a->strings["tagged you"] = "Etiquetat";
+$a->strings["[Friendica:Notify] %s tagged your post"] = "[Friendica:Notifica] %s ha etiquetat el teu missatge";
+$a->strings["%s tagged your post at %s"] = "%s Ha etiquetat un missatge teu en %s";
+$a->strings["%s tagged %s"] = "%s etiquetat %s";
+$a->strings["your post"] = "El teu missatge";
+$a->strings["[Friendica:Notify] Introduction received"] = "[Friendica:Notifica] Presentacio rebuda";
+$a->strings["You've received an introduction from '%s' at %s"] = "Has rebut una presentació de %s en %s";
+$a->strings["You've received %s from %s."] = "Has rebut %s de %s";
+$a->strings["an introduction"] = "Una presentació";
+$a->strings["You may visit their profile at %s"] = "Pot visitar el seu perfil en %s";
+$a->strings["Please visit %s to approve or reject the introduction."] = "Si us plau visiteu %s per aprovar o rebutjar la presentació.";
+$a->strings["[Friendica:Notify] Friend suggestion received"] = "[Friendica:Notifica] Suggerencia d'amistat rebuda";
+$a->strings["You've received a friend suggestion from '%s' at %s"] = "Has rebut una suggerencia d'amistat de %s en %s";
+$a->strings["You've received %s for %s from %s."] = "Has rebut %s per %s de %s.";
+$a->strings["a friend suggestion"] = "Un suggerencia d'amistat";
+$a->strings["Name:"] = "Nom:";
+$a->strings["Photo:"] = "Foto:";
+$a->strings["Please visit %s to approve or reject the suggestion."] = "Si us plau, visiteu %s per aprovar o rebutjar la suggerencia.";
+$a->strings["A new person is sharing with you at "] = "Una persona nova està compartint amb tú en";
+$a->strings["You have a new follower at "] = "Tens un nou seguidor a ";
+$a->strings["image/photo"] = "Imatge/foto";
+$a->strings["Welcome "] = "Benvingut";
+$a->strings["Please upload a profile photo."] = "Per favor, carrega una foto per al perfil";
+$a->strings["Welcome back "] = "Benvingut de nou ";
+$a->strings["View status"] = "Veure estatus";
+$a->strings["View profile"] = "Veure perfil";
+$a->strings["View photos"] = "Veure fotos";
+$a->strings["View recent"] = "Veure recent";
+$a->strings["Send PM"] = "Enviar Missatge Privat";
+$a->strings["post/item"] = "anunci/element";
+$a->strings["%1\$s marked %2\$s's %3\$s as favorite"] = "%1\$s marcat %2\$s's %3\$s com favorit";
+$a->strings["Select"] = "Selecionar";
+$a->strings["View %s's profile @ %s"] = "Veure perfil de %s @ %s";
+$a->strings["%s from %s"] = "%s des de %s";
+$a->strings["View in context"] = "Veure en context";
+$a->strings["%d comment"] = array(
+	0 => "%d comentari",
+	1 => "%d comentaris",
+);
+$a->strings["show more"] = "Mostrar més";
+$a->strings["like"] = "Agrada";
+$a->strings["dislike"] = "Desagrada";
+$a->strings["Share this"] = "Compartir això";
+$a->strings["share"] = "Compartir";
+$a->strings["add star"] = "Afegir a favorits";
+$a->strings["remove star"] = "Esborrar favorit";
+$a->strings["toggle star status"] = "Canviar estatus de favorit";
+$a->strings["starred"] = "favorit";
+$a->strings["add tag"] = "afegir etiqueta";
+$a->strings["to"] = "a";
+$a->strings["Wall-to-Wall"] = "Mur-a-Mur";
+$a->strings["via Wall-To-Wall:"] = "via Mur-a-Mur";
+$a->strings["Delete Selected Items"] = "Esborra els Elements Seleccionats";
+$a->strings["%s likes this."] = "a %s agrada això.";
+$a->strings["%s doesn't like this."] = "a %s desagrada això.";
+$a->strings["<span  %1\$s>%2\$d people</span> like this."] = "Li agrada a<span  %1\$s>%2\$d persones</span> .";
+$a->strings["<span  %1\$s>%2\$d people</span> don't like this."] = "No li agrada<span  %1\$s>%2\$d persones</span> .";
+$a->strings["and"] = "i";
+$a->strings[", and %d other people"] = ", i altres %d persones";
+$a->strings["%s like this."] = "a %s le gusta esto.";
+$a->strings["%s don't like this."] = "a %s no le gusta esto.";
+$a->strings["Visible to <strong>everybody</strong>"] = "Visible per a <strong>tothom</strong>";
+$a->strings["Please enter a video link/URL:"] = "Per favor , introdueixi el enllaç/URL del video";
+$a->strings["Please enter an audio link/URL:"] = "Per favor , introdueixi el enllaç/URL del audio:";
+$a->strings["Tag term:"] = "Terminis de l'etiqueta:";
+$a->strings["Where are you right now?"] = "On ets ara?";
+$a->strings["Enter a title for this item"] = "Escriviu un títol per a aquest article";
+$a->strings["upload photo"] = "carregar fotos";
+$a->strings["attach file"] = "adjuntar arxiu";
+$a->strings["web link"] = "enllaç de web";
+$a->strings["Insert video link"] = "Insertar enllaç de video";
+$a->strings["video link"] = "enllaç de video";
+$a->strings["Insert audio link"] = "Insertar enllaç de audio";
+$a->strings["audio link"] = "enllaç de audio";
+$a->strings["set location"] = "establir la ubicació";
+$a->strings["clear location"] = "netejar ubicació";
+$a->strings["permissions"] = "Permissos";
+$a->strings["Delete this item?"] = "Esborrar aquest element?";
+$a->strings["show fewer"] = "Mostrar menys";
+$a->strings["Create a New Account"] = "Crear un Nou Compte";
+$a->strings["Nickname or Email address: "] = "Malnom o Adreça de correu:";
+$a->strings["Password: "] = "Contrasenya:";
+$a->strings["Or login using OpenID: "] = "O accedixi emprant OpenID:";
+$a->strings["Forgot your password?"] = "Oblidà la contrasenya?";
+$a->strings["Edit profile"] = "Editar perfil";
+$a->strings["g A l F d"] = "g A l F d";
+$a->strings["F d"] = "F d";
+$a->strings["Birthday Reminders"] = "Recordatori d'Aniversaris";
+$a->strings["Birthdays this week:"] = "Aniversari aquesta setmana";
+$a->strings["[today]"] = "[avui]";
+$a->strings["Event Reminders"] = "Recordatori d'Esdeveniments";
+$a->strings["Events this week:"] = "Esdeveniments aquesta setmana";
+$a->strings["[No description]"] = "[sense descripció]";
diff --git a/view/ca/wall_received_eml.tpl b/view/ca/wall_received_eml.tpl
new file mode 100755
index 000000000..0b5c150fd
--- /dev/null
+++ b/view/ca/wall_received_eml.tpl
@@ -0,0 +1,18 @@
+
+Apreciat/da $username,
+
+	'$from' ha escrit quelcom en el mur del teu perfil.
+
+-----
+$body
+-----
+
+Accedeix a  $siteurl per a veure o esborrar l'element:
+
+$display
+
+
+	$sitename
+
+ 
+
diff --git a/view/comment_item.tpl b/view/comment_item.tpl
index c992593f8..cde4ca3ca 100755
--- a/view/comment_item.tpl
+++ b/view/comment_item.tpl
@@ -1,4 +1,4 @@
-		<div class="comment-$wwedit-wrapper" id="comment-edit-wrapper-$id" style="display: block;">
+		<div class="comment-wwedit-wrapper" id="comment-edit-wrapper-$id" style="display: block;">
 			<form class="comment-edit-form" id="comment-edit-form-$id" action="item" method="post" onsubmit="post_comment($id); return false;">
 				<input type="hidden" name="type" value="$type" />
 				<input type="hidden" name="profile_uid" value="$profile_uid" />
diff --git a/view/contact_block.tpl b/view/contact_block.tpl
index eb46c6c43..df5614398 100755..100644
--- a/view/contact_block.tpl
+++ b/view/contact_block.tpl
@@ -1,7 +1,7 @@
 <div id="contact-block">
 <h4 class="contact-block-h4">$contacts</h4>
 {{ if $micropro }}
-		<a class="allcontact-link" href="viewcontacts/$nickname">$viewcontacts</a>
+		<a class="allcontact-link" href="contacts/$nickname">$viewcontacts</a>
 		<div class='contact-block-content'>
 		{{ for $micropro as $m }}
 			$m
diff --git a/view/contact_template.tpl b/view/contact_template.tpl
index f4c0670bf..b826acc65 100755
--- a/view/contact_template.tpl
+++ b/view/contact_template.tpl
@@ -17,6 +17,7 @@
 			
 	</div>
 	<div class="contact-name" id="contact-entry-name-$contact.id" >$contact.name</div>
+	{{ if $contact.alt_text }}<div class="contact-details" id="contact-entry-rel-$contact.id" >$contact.alt_text</div>{{ endif }}
 	<div class="contact-details" id="contact-entry-url-$contact.id" >$contact.itemurl</div>
 	<div class="contact-details" id="contact-entry-network-$contact.id" >$contact.network</div>
 
diff --git a/view/conversation.tpl b/view/conversation.tpl
index 7d4e7d262..ff202bbe4 100755
--- a/view/conversation.tpl
+++ b/view/conversation.tpl
@@ -1,6 +1,18 @@
 {{ for $threads as $thread }}
 <div id="tread-wrapper-$thread.id" class="tread-wrapper">
-	$thread.html
+	{{ for $thread.items as $item }}
+		{{if $item.comment_firstcollapsed}}
+			<div class="hide-comments-outer">
+			<span id="hide-comments-total-$thread.id" class="hide-comments-total">$thread.num_comments</span> <span id="hide-comments-$thread.id" class="hide-comments fakelink" onclick="showHideComments($thread.id);">$thread.hide_text</span>
+			</div>
+			<div id="collapsed-comments-$thread.id" class="collapsed-comments" style="display: none;">
+		{{endif}}
+		{{if $item.comment_lastcollapsed}}</div>{{endif}}
+		
+		{{ inc $item.template }}{{ endinc }}
+		
+		
+	{{ endfor }}
 </div>
 {{ endfor }}
 
diff --git a/view/de/messages.po b/view/de/messages.po
index 5573ddca0..33adc8c76 100644
--- a/view/de/messages.po
+++ b/view/de/messages.po
@@ -17,8 +17,8 @@ msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: http://bugs.friendica.com/\n"
 "POT-Creation-Date: 2012-02-24 22:44-0800\n"
-"PO-Revision-Date: 2012-02-26 15:58+0000\n"
-"Last-Translator: marmor <marmor69@web.de>\n"
+"PO-Revision-Date: 2012-02-28 20:51+0000\n"
+"Last-Translator: greeneyedred <greeneyedred@googlemail.com>\n"
 "Language-Team: German (http://www.transifex.net/projects/p/friendica/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -78,13 +78,13 @@ msgstr "Kontakt-Einstellungen reparieren"
 msgid ""
 "<strong>WARNING: This is highly advanced</strong> and if you enter incorrect"
 " information your communications with this contact may stop working."
-msgstr "<strong>ACHTUNG: Das sind Experten-Einstellungen!</strong> Wenn Du etwas falsches eingibst, funktioniert die Kommunikation mit diesem Kontakt evtl. nicht mehr."
+msgstr "<strong>ACHTUNG: Das sind Experten-Einstellungen!</strong> Wenn Du etwas Falsches eingibst, funktioniert die Kommunikation mit diesem Kontakt evtl. nicht mehr."
 
 #: ../../mod/crepair.php:138
 msgid ""
 "Please use your browser 'Back' button <strong>now</strong> if you are "
 "uncertain what to do on this page."
-msgstr "Bitte nutze den Zurück-Button deines Browsers <strong>jetzt</strong>, wenn du dir unsicher bist, was auf dieser Seite gemacht wird."
+msgstr "Bitte nutze den Zurück-Button deines Browsers <strong>jetzt</strong>, wenn du dir unsicher bist, was du tun willst."
 
 #: ../../mod/crepair.php:144
 msgid "Return to contact editor"
@@ -303,7 +303,7 @@ msgstr "%s heißt %s herzlich willkommen"
 
 #: ../../mod/api.php:76 ../../mod/api.php:102
 msgid "Authorize application connection"
-msgstr "Verbindung der Applikation authorisieren"
+msgstr "Verbindung der Applikation autorisieren"
 
 #: ../../mod/api.php:77
 msgid "Return to your app and insert this Securty Code:"
@@ -317,7 +317,7 @@ msgstr "Bitte melde dich an um fortzufahren."
 msgid ""
 "Do you want to authorize this application to access your posts and contacts,"
 " and/or create new posts for you?"
-msgstr "Möchtest du dieser Anwendung den Zugriff auf deine Beiträge und Kontakte sowie die Erstellung neuer Beiträge in deinem Namen gestatten?"
+msgstr "Möchtest du dieser Anwendung den Zugriff auf deine Beiträge und Kontakte, sowie das Erstellen neuer Beiträge in deinem Namen gestatten?"
 
 #: ../../mod/api.php:105 ../../mod/dfrn_request.php:676
 #: ../../mod/settings.php:681 ../../mod/settings.php:687
@@ -576,7 +576,7 @@ msgstr "Keine Ergebnisse."
 
 #: ../../mod/friendica.php:43
 msgid "This is Friendica, version"
-msgstr "Dies ist Friendica version"
+msgstr "Dies ist Friendica, Version"
 
 #: ../../mod/friendica.php:44
 msgid "running at web location"
@@ -740,7 +740,7 @@ msgstr "Du hast dich hier bereits vorgestellt."
 #: ../../mod/dfrn_request.php:343
 #, php-format
 msgid "Apparently you are already friends with %s."
-msgstr "Es scheint so, als ob du bereits ein Freund von %s bist."
+msgstr "Es scheint so, als ob du bereits mit %s befreundet bist."
 
 #: ../../mod/dfrn_request.php:364
 msgid "Invalid profile URL."
@@ -766,7 +766,7 @@ msgstr "Bitte melde dich an, um die Kontaktanfrage zu bestätigen."
 msgid ""
 "Incorrect identity currently logged in. Please login to "
 "<strong>this</strong> profile."
-msgstr "Incorrect identity currently logged in. Please login to <strong>this</strong> profile."
+msgstr "Momentan bist du mit einer anderen Identität angemeldet. Bitte melde Dich mit <strong>diesem</strong> Profil an."
 
 #: ../../mod/dfrn_request.php:539
 #, php-format
@@ -784,7 +784,7 @@ msgstr "Bestätigen"
 
 #: ../../mod/dfrn_request.php:582 ../../include/items.php:2504
 msgid "[Name Withheld]"
-msgstr "[Name Zurückgehalten]"
+msgstr "[Name unterdrückt]"
 
 #: ../../mod/dfrn_request.php:666
 #, php-format
@@ -811,7 +811,7 @@ msgstr "Beispiele: jojo@demo.friendica.com, http://demo.friendica.com/profile/jo
 
 #: ../../mod/dfrn_request.php:674
 msgid "Please answer the following:"
-msgstr "Bitte beantworte folgende Fragen:"
+msgstr "Bitte beantworte Folgendes:"
 
 #: ../../mod/dfrn_request.php:675
 #, php-format
@@ -820,7 +820,7 @@ msgstr "Kennt %s dich?"
 
 #: ../../mod/dfrn_request.php:678
 msgid "Add a personal note:"
-msgstr "Eine persönliche Notiz anfügen:"
+msgstr "Eine persönliche Notiz beifügen:"
 
 #: ../../mod/dfrn_request.php:680 ../../include/contact_selectors.php:76
 msgid "Friendica"
@@ -909,7 +909,7 @@ msgstr "Noch einmal testen"
 msgid ""
 "In order to install Friendica we need to know how to connect to your "
 "database."
-msgstr "Um Friendica installieren zu können müssen wir wissen wie wir zu deiner Datenbank Kontakt aufnehmen können."
+msgstr "Um Friendica installieren zu können, müssen wir wissen, wie wir zu deiner Datenbank Kontakt aufnehmen können."
 
 #: ../../mod/install.php:232
 msgid ""
@@ -947,7 +947,7 @@ msgstr "E-Mail-Adresse des Administrators"
 msgid ""
 "Your account email address must match this in order to use the web admin "
 "panel."
-msgstr "Die E-Mail-Adresse, die in deinem Friendica-Account eingetragen, muss mit dieser Adresse übereinstimmen, damit du das Admin-Panel benutzen kannst."
+msgstr "Die E-Mail-Adresse, die in deinem Friendica-Account eingetragen ist, muss mit dieser Adresse übereinstimmen, damit du das Admin-Panel benutzen kannst."
 
 #: ../../mod/install.php:245 ../../mod/install.php:283
 msgid "Please select a default timezone for your website"
@@ -971,7 +971,7 @@ msgstr "Kompletter Pfad zum PHP-Executable"
 
 #: ../../mod/install.php:331
 msgid "Command line PHP"
-msgstr "Kommadozeilen-PHP"
+msgstr "Kommandozeilen-PHP"
 
 #: ../../mod/install.php:340
 msgid ""
@@ -1105,7 +1105,7 @@ msgstr "Zeitumrechnung"
 msgid ""
 "Friendika provides this service for sharing events with other networks and "
 "friends in unknown timezones."
-msgstr "Friendica bietet diese Funktion an, um das teilen von Events mit Kontakten zu vereinfachen, deren Zeitzone nicht ermittelt werden kann."
+msgstr "Friendica bietet diese Funktion an, um das Teilen von Events mit den Kontakten zu vereinfachen, deren Zeitzone nicht ermittelt werden kann."
 
 #: ../../mod/localtime.php:30
 #, php-format
@@ -1602,7 +1602,7 @@ msgstr "Administrator"
 msgid ""
 "Request could not be verified. (You may have previously submitted it.) "
 "Password reset failed."
-msgstr "Anfrage konnte nicht verifiziert werden. (Eventuell hast du bereits ähnliche Anfrage gestellt.) Zurücksetzen des Passworts gescheitert."
+msgstr "Anfrage konnte nicht verifiziert werden. (Eventuell hast du bereits eine ähnliche Anfrage gestellt.) Zurücksetzen des Passworts gescheitert."
 
 #: ../../mod/lostpass.php:82 ../../boot.php:723
 msgid "Password Reset"
@@ -1628,7 +1628,7 @@ msgstr "hier klicken, um dich anzumelden"
 msgid ""
 "Your password may be changed from the <em>Settings</em> page after "
 "successful login."
-msgstr "Du kannst das Passwort in den <em>Einstellungen</em> ändern sobald du dich erfolgreich angemeldet hast."
+msgstr "Du kannst das Passwort in den <em>Einstellungen</em> ändern, sobald du dich erfolgreich angemeldet hast."
 
 #: ../../mod/lostpass.php:118
 msgid "Forgot your Password?"
@@ -1764,7 +1764,7 @@ msgstr "Kein Name"
 
 #: ../../mod/settings.php:516
 msgid "Remove authorization"
-msgstr "Authorisierung entziehen"
+msgstr "Autorisierung entziehen"
 
 #: ../../mod/settings.php:528
 msgid "No Plugin settings configured"
@@ -2044,31 +2044,31 @@ msgstr "Benachrichtigungs-E-Mail senden wenn:"
 
 #: ../../mod/settings.php:828
 msgid "You receive an introduction"
-msgstr "Du eine Kontaktanfrage erhältst"
+msgstr "- du eine Kontaktanfrage erhältst"
 
 #: ../../mod/settings.php:829
 msgid "Your introductions are confirmed"
-msgstr "Eine deiner Kontaktanfragen akzeptiert wurde"
+msgstr "- eine deiner Kontaktanfragen akzeptiert wurde"
 
 #: ../../mod/settings.php:830
 msgid "Someone writes on your profile wall"
-msgstr "Jemand schreibt etwas auf deine Pinnwand"
+msgstr "- jemand etwas auf deine Pinnwand schreibt"
 
 #: ../../mod/settings.php:831
 msgid "Someone writes a followup comment"
-msgstr "Jemand verfasst auch einen Kommentar"
+msgstr "- jemand auch einen Kommentar verfasst"
 
 #: ../../mod/settings.php:832
 msgid "You receive a private message"
-msgstr "Du erhältst eine private Nachricht"
+msgstr "- du eine private Nachricht erhältst"
 
 #: ../../mod/settings.php:833
 msgid "You receive a friend suggestion"
-msgstr "Du eine Empfehlung erhältst"
+msgstr "- du eine Empfehlung erhältst"
 
 #: ../../mod/settings.php:834
 msgid "You are tagged in a post"
-msgstr "Du wurdest in einem Beitrag erwähnt"
+msgstr "- du in einem Beitrag erwähnt wurdest"
 
 #: ../../mod/settings.php:837
 msgid "Advanced Page Settings"
@@ -2082,7 +2082,7 @@ msgstr "Verwalte Identitäten und/oder Seiten"
 msgid ""
 "Toggle between different identities or community/group pages which share "
 "your account details or which you have been granted \"manage\" permissions"
-msgstr "Wechsle zwischen verschiedenen Identitäten oder Gemeinschafts-/Gruppen Seiten die deine Zugangsdetails teilen oder zu denen du \"Manage\" Befugnisse bekommen hast."
+msgstr "Wechsle zwischen verschiedenen Identitäten oder Gemeinschafts-/Gruppen-Seiten, die deine Zugangsdetails teilen oder zu denen du \"Manage\" Befugnisse bekommen hast."
 
 #: ../../mod/manage.php:95
 msgid "Select an identity to manage: "
@@ -2182,14 +2182,14 @@ msgid ""
 "enjoyable. Click any item to visit the relevant page. A link to this page "
 "will be visible from your home page for two weeks after your initial "
 "registration and then will quietly disappear."
-msgstr "Wir möchten Dir einige Tipps und Links anbieten, die Dir helfen könnten, den Einstieg angenehmer zu machen. Klicke auf ein Element, um die entsprechende Seite zu besuchen. Ein Link zu dieser Seite hier bleibt sichtbar über Deine Pinnwand für zwei Wochen nach dem Registrierungsdatum und wird dann verschwinden."
+msgstr "Wir möchten Dir einige Tipps und Links anbieten, die Dir helfen könnten, den Einstieg angenehmer zu machen. Klicke auf ein Element, um die entsprechende Seite zu besuchen. Ein Link zu dieser Seite hier bleibt für Dich an Deiner Pinnwand für zwei Wochen nach dem Registrierungsdatum sichtbar und wird dann verschwinden."
 
 #: ../../mod/newmember.php:16
 msgid ""
 "On your <em>Settings</em> page -  change your initial password. Also make a "
 "note of your Identity Address. This looks just like an email address - and "
 "will be useful in making friends on the free social web."
-msgstr "Ändere bitte unter <em>Einstellungen</em> Dein Passwort. Außerdem merke Dir Deine Indentifikations Adresse. Diese sieht aus wie eine E-Mail Adresse und wird benötig um Freunschaften mit anderen im Friendica Netzwerk zu schliessen."
+msgstr "Ändere bitte unter <em>Einstellungen</em> Dein Passwort. Außerdem merke Dir Deine Indentifikations-Adresse. Diese sieht aus wie eine E-Mail-Adresse und wird benötigt, um Freundschaften mit anderen im Friendica Netzwerk zu schliessen."
 
 #: ../../mod/newmember.php:18
 msgid ""
@@ -2197,14 +2197,14 @@ msgid ""
 " directory listing is like having an unlisted phone number. In general, you "
 "should probably publish your listing - unless all of your friends and "
 "potential friends know exactly how to find you."
-msgstr "Überprüfe die restlichen Einstellungen, insbesondere die Einstellungen zur Privatsphäre. Wenn du dein Profil nicht veröffentlichst ist das wie wenn niemand deine Telefonnummer kennt. Im Allgemeinen solltest du es veröffentlichen - außer all deine Freunde und potentiellen Freunde wissen wie man dich findet."
+msgstr "Überprüfe die restlichen Einstellungen, insbesondere die Einstellungen zur Privatsphäre. Wenn du dein Profil nicht veröffentlichst, ist das als wenn Du Deine Telefonnummer nicht ins Telefonbuch einträgst. Im Allgemeinen solltest du es veröffentlichen - außer all deine Freunde und potentiellen Freunde wissen genau, wie sie dich finden können."
 
 #: ../../mod/newmember.php:20
 msgid ""
 "Upload a profile photo if you have not done so already. Studies have shown "
 "that people with real photos of themselves are ten times more likely to make"
 " friends than people who do not."
-msgstr "Lade ein Profilbild hoch falls du es noch nicht getan hast. Studien haben gezeigt, dass es zehnmal wahrscheinlicher ist neue Freunde zu finden, wenn du ein Bild von dir selbst verwendest als wenn du dies nicht tust."
+msgstr "Lade ein Profilbild hoch falls du es noch nicht getan hast. Studien haben gezeigt, dass es zehnmal wahrscheinlicher ist neue Freunde zu finden, wenn du ein Bild von dir selbst verwendest, als wenn du dies nicht tust."
 
 #: ../../mod/newmember.php:23
 msgid ""
@@ -2216,7 +2216,7 @@ msgstr "Richte die Verbindung zu Facebook ein, wenn du im Augenblick ein Faceboo
 msgid ""
 "<em>If</em> this is your own personal server, installing the Facebook addon "
 "may ease your transition to the free social web."
-msgstr "<em>Wenn</em> dies dein privater Server ist könnte die Installation des Facebook Connectors deinen Umzug ins freie Soziale Netz angenehmer gestalten."
+msgstr "<em>Wenn</em> dies dein privater Server ist, könnte die Installation des Facebook Connectors deinen Umzug ins freie soziale Netz angenehmer gestalten."
 
 #: ../../mod/newmember.php:30
 msgid ""
@@ -2251,7 +2251,7 @@ msgid ""
 "The Directory page lets you find other people in this network or other "
 "federated sites. Look for a <em>Connect</em> or <em>Follow</em> link on "
 "their profile page. Provide your own Identity Address if requested."
-msgstr "Über die Verzeichnisseite kannst du andere Personen auf diesem Server oder anderen verteilten Seiten finden. Halte nach einem <em>Verbinden</em> oder <em>Folgen</em> Link auf deren Profilseiten Ausschau und gib deine eigene Profiladresse an falls du danach gefragt wirst."
+msgstr "Über die Verzeichnisseite kannst du andere Personen auf diesem Server oder anderen verknüpften Seiten finden. Halte nach einem <em>Verbinden</em> oder <em>Folgen</em> Link auf deren Profilseiten Ausschau und gib deine eigene Profiladresse an, falls du danach gefragt wirst."
 
 #: ../../mod/newmember.php:40
 msgid ""
@@ -2835,7 +2835,7 @@ msgstr "Geschlossen"
 
 #: ../../mod/admin.php:304
 msgid "Requires approval"
-msgstr "Bedarf Zustimmung"
+msgstr "Bedarf der Zustimmung"
 
 #: ../../mod/admin.php:305
 msgid "Open"
@@ -2889,7 +2889,7 @@ msgstr "Accounts gelten nach x Tagen als unbenutzt"
 msgid ""
 "Will not waste system resources polling external sites for abandonded "
 "accounts. Enter 0 for no time limit."
-msgstr "Verschwende keine System-Ressourcen fürs Pollen externer Seiten, wenn Accounts nicht mehr benutzt werden. 0 eingeben für kein Limit."
+msgstr "Verschwende keine System-Ressourcen auf das Pollen externer Seiten, wenn Accounts nicht mehr benutzt werden. 0 eingeben für kein Limit."
 
 #: ../../mod/admin.php:330
 msgid "Allowed friend domains"
@@ -2925,7 +2925,7 @@ msgstr "Gravatar Unterstützung"
 
 #: ../../mod/admin.php:339
 msgid "Fullname check"
-msgstr "Name auf Vollständigkeit überprüfen"
+msgstr "Namen auf Vollständigkeit überprüfen"
 
 #: ../../mod/admin.php:340
 msgid "UTF-8 Regular expressions"
@@ -3095,11 +3095,11 @@ msgstr "Protokolldatei"
 msgid ""
 "Must be writable by web server. Relative to your Friendica top-level "
 "directory."
-msgstr "Webserver muss Schreibrechte besitzen. Relativ zum Friendica-Installationsverzeichnis."
+msgstr "Webserver muss Schreibrechte besitzen. Abhängig vom Friendica-Installationsverzeichnis."
 
 #: ../../mod/admin.php:856
 msgid "Log level"
-msgstr "Protokollevel"
+msgstr "Protokoll-Level"
 
 #: ../../mod/admin.php:897
 msgid "Close"
@@ -3123,7 +3123,7 @@ msgstr "FTP Passwort"
 
 #: ../../mod/profile.php:15 ../../boot.php:845
 msgid "Requested profile is not available."
-msgstr "Profil nicht vorhanden."
+msgstr "Das angefragte Profil ist nicht vorhanden."
 
 #: ../../mod/profile.php:111 ../../mod/display.php:67
 msgid "Access to this profile has been restricted."
@@ -3212,7 +3212,7 @@ msgstr "Zu dieser Adresse konnte keine passende Browser URL gefunden werden."
 msgid ""
 "The profile address specified belongs to a network which has been disabled "
 "on this site."
-msgstr "Die Adresse dieses Profils gehört zu einem Netzwerk mit dem die Kommunikation auf dieser Seite ausgeschaltet wurde."
+msgstr "Die Adresse dieses Profils gehört zu einem Netzwerk, mit dem die Kommunikation auf dieser Seite ausgeschaltet wurde."
 
 #: ../../mod/follow.php:79
 msgid ""
@@ -3475,7 +3475,7 @@ msgstr "%1$s hat %2$ss %3$s mit %4$s getaggt"
 
 #: ../../mod/delegate.php:95
 msgid "No potential page delegates located."
-msgstr "Keine potentiellen Bevollmächtigte für die Seite gefunden."
+msgstr "Keine potentiellen Bevollmächtigten für die Seite gefunden."
 
 #: ../../mod/delegate.php:121
 msgid "Delegate Page Management"
@@ -3486,7 +3486,7 @@ msgid ""
 "Delegates are able to manage all aspects of this account/page except for "
 "basic account settings. Please do not delegate your personal account to "
 "anybody that you do not trust completely."
-msgstr "Bevollmächtigte sind in der Lage alle Aspekte dieses Accounts/dieser Seite zu verwalten, abgesehen von den Grundeinstellungen des Accounts. Bitte gib Niemandem eine Bevollmächtigung für deinen privaten Account dem du nicht absolut vertraust."
+msgstr "Bevollmächtigte sind in der Lage alle Aspekte dieses Accounts/dieser Seite zu verwalten, abgesehen von den Grundeinstellungen des Accounts. Bitte gib niemandem eine Bevollmächtigung für deinen privaten Account, dem du nicht absolut vertraust."
 
 #: ../../mod/delegate.php:124
 msgid "Existing Page Managers"
@@ -3595,7 +3595,7 @@ msgstr "Um diese Einladung anzunehmen besuche bitte:"
 
 #: ../../mod/invite.php:104
 msgid "You will need to supply this invitation code: $invite_code"
-msgstr "Du benötigst den folgenden Einladungs Code: $invite_code"
+msgstr "Du benötigst den folgenden Einladungscode: $invite_code"
 
 #: ../../mod/invite.php:104
 msgid ""
@@ -3604,7 +3604,7 @@ msgstr "Sobald du registriert bist, kontaktiere mich bitte auf meiner Profilseit
 
 #: ../../mod/dfrn_confirm.php:238
 msgid "Response from remote site was not understood."
-msgstr "Antwort der entfernten Gegenstelle unverständlich."
+msgstr "Antwort der Gegenstelle unverständlich."
 
 #: ../../mod/dfrn_confirm.php:247
 msgid "Unexpected response from remote site: "
@@ -3617,7 +3617,7 @@ msgstr "Bestätigung erfolgreich abgeschlossen."
 #: ../../mod/dfrn_confirm.php:257 ../../mod/dfrn_confirm.php:271
 #: ../../mod/dfrn_confirm.php:278
 msgid "Remote site reported: "
-msgstr "Entfernte Seite meldet: "
+msgstr "Gegenstelle meldet: "
 
 #: ../../mod/dfrn_confirm.php:269
 msgid "Temporary failure. Please wait and try again."
@@ -3663,7 +3663,7 @@ msgstr "Die Kontaktdaten für URL %s enthalten keinen Public Key für den Server
 msgid ""
 "The ID provided by your system is a duplicate on our system. It should work "
 "if you try again."
-msgstr "Die ID die uns dein System angeboten hat ist hier bereits vergeben. Bitte versuche es noch einmal."
+msgstr "Die ID, die uns dein System angeboten hat, ist hier bereits vergeben. Bitte versuche es noch einmal."
 
 #: ../../mod/dfrn_confirm.php:630
 msgid "Unable to set your contact credentials on our system."
@@ -3720,7 +3720,7 @@ msgstr "All meine Facebook-Kontakte und -Konversationen hier auf diese Website i
 msgid ""
 "Facebook conversations consist of your <em>profile wall</em> and your friend"
 " <em>stream</em>."
-msgstr "Facebook-Konversationen sind alles, was auf deiner <em>Pinnwand</em> erscheint, und die Beiträge deiner Freunde <em>(Stream).</em>"
+msgstr "Facebook-Konversationen bestehen aus deinen Beiträgen auf deiner<em>Pinnwand</em>, sowie den Beiträgen deiner Freunde <em>Stream</em>."
 
 #: ../../addon/facebook/facebook.php:391
 msgid "On this website, your Facebook friend stream is only visible to you."
@@ -3752,7 +3752,7 @@ msgstr "Wenn Du Facebook-Konversationen importierst und diese beiden Häkchen ni
 
 #: ../../addon/facebook/facebook.php:408
 msgid "Comma separated applications to ignore"
-msgstr "Komma separierte Liste von Anwendungen die ignoriert werden sollen"
+msgstr "Komma separiert Anwendungen, die ignoriert werden sollen"
 
 #: ../../addon/facebook/facebook.php:476
 #: ../../include/contact_selectors.php:81
@@ -3858,7 +3858,7 @@ msgstr "Wörter, die gefiltert werden sollen (durch Kommas getrennt)"
 
 #: ../../addon/nsfw/nsfw.php:58
 msgid "Use /expression/ to provide regular expressions"
-msgstr "Verwende /expression/ um Reguläre Ausdrücke zu verwenden"
+msgstr "Verwende /expression/ um reguläre Ausdrücke zu verwenden"
 
 #: ../../addon/nsfw/nsfw.php:74
 msgid "NSFW Settings saved."
@@ -3907,7 +3907,7 @@ msgid ""
 " storage (like ownCloud). See <a "
 "href=\"http://www.w3.org/community/unhosted/wiki/RemoteStorage#WebFinger\">RemoteStorage"
 " WebFinger</a>"
-msgstr "Ermöglicht es deine friendica id (%s) mit externen unhosted-fähigen Speichern (z.B. ownCloud) zu verbinden. Siehe <a href=\"http://www.w3.org/community/unhosted/wiki/RemoteStorage#WebFinger\">RemoteStorage WebFinger</a>"
+msgstr "Ermöglicht dir, deine friendica id (%s) mit externen unhosted-fähigen Speichern (z.B. ownCloud) zu verbinden. Siehe <a href=\"http://www.w3.org/community/unhosted/wiki/RemoteStorage#WebFinger\">RemoteStorage WebFinger</a>"
 
 #: ../../addon/uhremotestorage/uhremotestorage.php:85
 msgid "Template URL (with {category})"
@@ -3957,7 +3957,7 @@ msgstr "In diesem Fall sind es drei Ebenen. Man gewinnt indem man drei in einer
 msgid ""
 "The handicap game disables the center position on the middle level because "
 "the player claiming this square often has an unfair advantage."
-msgstr "Beim Handicap-Spiel wird die zentrale Position der mittleren Ebene gesperrt da der Spieler der diese Ebene besitzt oft einen unfairen Vorteil genießt."
+msgstr "Beim Handicap-Spiel wird die zentrale Position der mittleren Ebene gesperrt, da der Spieler, der diese Ebene besitzt, oft einen unfairen Vorteil genießt."
 
 #: ../../addon/tictac/tictac.php:182
 msgid "You go first..."
@@ -4046,7 +4046,7 @@ msgstr "Datei hochladen"
 
 #: ../../addon/js_upload/js_upload.php:44
 msgid "Drop files here to upload"
-msgstr "Ziehe die Dateien hierher die du hochladen willst"
+msgstr "Ziehe Dateien hierher, um sie hochzuladen"
 
 #: ../../addon/js_upload/js_upload.php:46
 msgid "Failed"
@@ -4166,7 +4166,7 @@ msgstr "Schnell-Kommentar Einstellungen"
 
 #: ../../addon/qcomment/qcomment.php:56
 msgid "Enter quick comments, one per line"
-msgstr "Gibt ein Schnell-Kommentar pro Zeile ein"
+msgstr "Gib einen Schnell-Kommentar pro Zeile ein"
 
 #: ../../addon/qcomment/qcomment.php:74
 msgid "Quick Comment settings saved."
@@ -4188,7 +4188,7 @@ msgstr "Standard Zoom"
 
 #: ../../addon/openstreetmap/openstreetmap.php:72
 msgid "The default zoom level. (1:world, 18:highest)"
-msgstr "Standard Zoo,level (1: Welt; 18: höchstes)"
+msgstr "Standard Zoomlevel (1: Welt; 18: höchstes)"
 
 #: ../../addon/editplain/editplain.php:46
 msgid "Editplain settings updated."
@@ -4245,7 +4245,7 @@ msgid ""
 "There are preconfigured OAuth key pairs for some StatusNet servers "
 "available. If you are useing one of them, please use these credentials. If "
 "not feel free to connect to any other StatusNet instance (see below)."
-msgstr "Für einige StatusNet Server sind OAuth Schlüsselpaare verfügbar. Solltest du einen dieser Server benutzen, dann verwende doch bitte diese Schlüssel. Falls nicht kannst du weiter unten deine eigenen OAuth Schlüssel eintragen."
+msgstr "Für einige StatusNet Server sind voreingestellt OAuth Schlüsselpaare verfügbar. Solltest du einen dieser Server benutzen, dann verwende bitte diese Schlüssel. Falls nicht, stellen stattdessen eine Verbindung zu irgend einem anderen StatusNet Server her (siehe unten)."
 
 #: ../../addon/statusnet/statusnet.php:275
 msgid "Provide your own OAuth Credentials"
@@ -4309,7 +4309,7 @@ msgid ""
 "If enabled all your <strong>public</strong> postings can be posted to the "
 "associated StatusNet account. You can choose to do so by default (here) or "
 "for every posting separately in the posting options when writing the entry."
-msgstr "Wenn aktiviert können all deine <strong>öffentlichen</strong> Einträge auf dem verbundenen StatusNet Konto veröffentlicht werden. Du kannst das (hier) als Standardverhalten einstellen oder beim Schreiben eines Beitrags in den Beitragsoptionen festlegen."
+msgstr "Wenn aktiviert, so können all deine <strong>öffentlichen</strong> Einträge auf dem verbundenen StatusNet Konto veröffentlicht werden. Du kannst das (hier) als Standardverhalten einstellen oder beim Schreiben eines Beitrags in den Beitragsoptionen festlegen."
 
 #: ../../addon/statusnet/statusnet.php:331
 msgid ""
@@ -4317,7 +4317,7 @@ msgid ""
 "details from unknown viewers?</em>) the link potentially included in public "
 "postings relayed to StatusNet will lead the visitor to a blank page "
 "informing the visitor that the access to your profile has been restricted."
-msgstr "<strong>Hinweis</strong>: Aufgrund deiner Privatsphären Einstellungen (<em>Profil-Details vor unbekannten Betrachtern verbergen?</em>) wird der Link der eventuell an an deinen StatusNet Account weitergeleitete angehangen wird um auf den original Artikel zu verweisen den Betrachter auf eine leere Seite führen, auf der er darüber informiert wird, dass der Zugriff eingeschränkt wurde."
+msgstr "<strong>Hinweis</strong>: Aufgrund deiner Privatsphären-Einstellungen (<em>Profil-Details vor unbekannten Betrachtern verbergen?</em>) wird der Link, der eventuell an deinen StatusNet Account angehängt wird, um auf den original Artikel zu verweisen, den Betrachter auf eine leere Seite führen, die ihn darüber informiert, dass der Zugriff eingeschränkt wurde."
 
 #: ../../addon/statusnet/statusnet.php:334
 msgid "Allow posting to StatusNet"
@@ -4409,7 +4409,7 @@ msgstr "Aktiviere \"Mehr zeigen\""
 
 #: ../../addon/showmore/showmore.php:44
 msgid "Cutting posts after how much characters"
-msgstr "Begrenze Beiträge nach der Anzahl der Buchstaben"
+msgstr "Begrenze Beiträge nach einer bestimmten Anzahl an Buchstaben"
 
 #: ../../addon/showmore/showmore.php:64
 msgid "Show More Settings saved."
@@ -4441,7 +4441,7 @@ msgstr "Piwik Basis URL"
 msgid ""
 "Absolute path to your Piwik installation. (without protocol (http/s), with "
 "trailing slash)"
-msgstr "Absoluter Pfad zu deiner Piwik Installation (ohen Protokoll (http/s) und mit abschließendem Schrägstrich)"
+msgstr "Absoluter Pfad zu deiner Piwik Installation (ohne Protokoll (http/s) und mit abschließendem Schrägstrich)"
 
 #: ../../addon/piwik/piwik.php:91
 msgid "Site ID"
@@ -4453,7 +4453,7 @@ msgstr "Link zum Setzen des Opt-Out Cookies anzeigen?"
 
 #: ../../addon/piwik/piwik.php:93
 msgid "Asynchronous tracking"
-msgstr "Asynchroned Tracken"
+msgstr "Asynchrones Tracken"
 
 #: ../../addon/twitter/twitter.php:73
 msgid "Post to Twitter"
@@ -4480,7 +4480,7 @@ msgid ""
 "button below to get a PIN from Twitter which you have to copy into the input"
 " box below and submit the form. Only your <strong>public</strong> posts will"
 " be posted to Twitter."
-msgstr "Auf diesem Friendica-Server wurde das Twitter-Plugin aktiviert, aber du hast deinen Account noch nicht mit deinem Twitter-Account verbunden. Klicke dazu die Schaltfläche unten. Du erhältst dann eine PIN von Twitter, die du in das Eingabefeld unten kopieren musst. Nicht vergessen, den Senden-Knopf zu drücken! Nur <strong>öffentliche</strong> Beiträge werden bei Twitter veröffentlicht."
+msgstr "Auf diesem Friendica-Server wurde das Twitter-Plugin aktiviert, aber du hast deinen Account noch nicht mit deinem Twitter-Account verbunden. Klicke dazu auf die Schaltfläche unten. Du erhältst dann eine PIN von Twitter, die du dann in das Eingabefeld unten einfügst. Denk daran, den Senden-Knopf zu drücken! Nur <strong>öffentliche</strong> Beiträge werden bei Twitter veröffentlicht."
 
 #: ../../addon/twitter/twitter.php:168
 msgid "Log in with Twitter"
@@ -4495,7 +4495,7 @@ msgid ""
 "If enabled all your <strong>public</strong> postings can be posted to the "
 "associated Twitter account. You can choose to do so by default (here) or for"
 " every posting separately in the posting options when writing the entry."
-msgstr "Wenn aktiviert können all deine <strong>öffentlichen</strong> Einträge auf dem verbundenen Twitter Konto veröffentlicht werden. Du kannst dies (hier) als Standardverhalten einstellen oder beim Schreiben eines Beitrags in den Beitragsoptionen festlegen."
+msgstr "Wenn aktiviert, so können all deine <strong>öffentlichen</strong> Einträge auf dem verbundenen Twitter Konto veröffentlicht werden. Du kannst dies (hier) als Standardverhalten einstellen oder beim Schreiben eines Beitrags in den Beitragsoptionen festlegen."
 
 #: ../../addon/twitter/twitter.php:187
 msgid ""
@@ -4503,7 +4503,7 @@ msgid ""
 "details from unknown viewers?</em>) the link potentially included in public "
 "postings relayed to Twitter will lead the visitor to a blank page informing "
 "the visitor that the access to your profile has been restricted."
-msgstr "<strong>Hinweis</strong>: Aufgrund deiner Privatsphären Einstellungen (<em>Profil-Details vor unbekannten Betrachtern verbergen?</em>) wird der Link der eventuell an an deinen Twitter Account weitergeleitete angehangen wird um auf den original Artikel zu verweisen den Betrachter auf eine leere Seite führen, auf der er darüber informiert wird, dass der Zugriff eingeschränkt wurde."
+msgstr "<strong>Hinweis</strong>: Aufgrund deiner Privatsphären-Einstellungen (<em>Profil-Details vor unbekannten Betrachtern verbergen?</em>) wird der Link, der eventuell an an deinen Twitter Account angehängt wird, um auf den original Artikel zu verweisen, den Betrachter auf eine leere Seite führen, die ihn darüber informiert, dass der Zugriff eingeschränkt wurde."
 
 #: ../../addon/twitter/twitter.php:190
 msgid "Allow posting to Twitter"
@@ -4648,7 +4648,7 @@ msgstr "Seriös, hat mein Vertrauen"
 
 #: ../../include/contact_selectors.php:56
 msgid "Frequently"
-msgstr "Häufig"
+msgstr "immer wieder"
 
 #: ../../include/contact_selectors.php:57
 msgid "Hourly"
@@ -4656,7 +4656,7 @@ msgstr "Stündlich"
 
 #: ../../include/contact_selectors.php:58
 msgid "Twice daily"
-msgstr "Zweimal Täglich"
+msgstr "Zweimal täglich"
 
 #: ../../include/contact_selectors.php:59
 msgid "Daily"
@@ -4856,7 +4856,7 @@ msgstr "Partner"
 
 #: ../../include/profile_selectors.php:33
 msgid "Cohabiting"
-msgstr "kohabitierend"
+msgstr "zusammenlebend"
 
 #: ../../include/profile_selectors.php:33
 msgid "Happy"
@@ -5068,7 +5068,7 @@ msgid ""
 "A deleted group with this name was revived. Existing item permissions "
 "<strong>may</strong> apply to this group and any future members. If this is "
 "not what you intended, please create another group with a different name."
-msgstr "Eine gelöschte Gruppe mit diesem Namen wurde wiederbelebt. Bestehende Berechtigungseinstellungen <strong>könnten</strong> auf diese Gruppe oder zukünftige Mitglieder angewandt werden. Falls du dies nicht möchtest erstelle bitte eine andere Gruppe mit einem anderen Namen."
+msgstr "Eine gelöschte Gruppe mit diesem Namen wurde wiederbelebt. Bestehende Berechtigungseinstellungen <strong>könnten</strong> auf diese Gruppe oder zukünftige Mitglieder angewandt werden. Falls du dies nicht möchtest, erstelle bitte eine andere Gruppe mit einem anderen Namen."
 
 #: ../../include/group.php:168
 msgid "Everybody"
@@ -5184,7 +5184,7 @@ msgstr "Alle Benachrichtigungen anzeigen"
 
 #: ../../include/nav.php:120
 msgid "Mark all system notifications seen"
-msgstr "Markiere alle System Benachrichtigungen als gelesen"
+msgstr "Markiere alle System-Benachrichtigungen als gelesen"
 
 #: ../../include/nav.php:124
 msgid "Private mail"
@@ -5356,7 +5356,7 @@ msgstr "Von: "
 
 #: ../../include/bbcode.php:202
 msgid "$1 wrote:"
-msgstr "$1 geschrieben:"
+msgstr "$1 hat geschrieben:"
 
 #: ../../include/bbcode.php:216 ../../include/bbcode.php:282
 msgid "Image/photo"
@@ -5648,7 +5648,7 @@ msgstr "mag ich nicht"
 
 #: ../../include/conversation.php:522
 msgid "Share this"
-msgstr "Teilen"
+msgstr "Teile dieses"
 
 #: ../../include/conversation.php:522
 msgid "share"
@@ -5676,7 +5676,7 @@ msgstr "Tag hinzufügen"
 
 #: ../../include/conversation.php:650
 msgid "to"
-msgstr "to"
+msgstr "zu"
 
 #: ../../include/conversation.php:651
 msgid "Wall-to-Wall"
@@ -5731,7 +5731,7 @@ msgstr "%s mögen das nicht."
 
 #: ../../include/conversation.php:867
 msgid "Visible to <strong>everybody</strong>"
-msgstr "Für <strong>Jedermann</strong> sichtbar"
+msgstr "Für <strong>jedermann</strong> sichtbar"
 
 #: ../../include/conversation.php:869
 msgid "Please enter a video link/URL:"
diff --git a/view/de/strings.php b/view/de/strings.php
index 284c87f2f..a093b7068 100755
--- a/view/de/strings.php
+++ b/view/de/strings.php
@@ -11,8 +11,8 @@ $a->strings["Contact update failed."] = "Konnte den Kontakt nicht aktualisieren.
 $a->strings["Permission denied."] = "Zugriff verweigert.";
 $a->strings["Contact not found."] = "Kontakt nicht gefunden.";
 $a->strings["Repair Contact Settings"] = "Kontakt-Einstellungen reparieren";
-$a->strings["<strong>WARNING: This is highly advanced</strong> and if you enter incorrect information your communications with this contact may stop working."] = "<strong>ACHTUNG: Das sind Experten-Einstellungen!</strong> Wenn Du etwas falsches eingibst, funktioniert die Kommunikation mit diesem Kontakt evtl. nicht mehr.";
-$a->strings["Please use your browser 'Back' button <strong>now</strong> if you are uncertain what to do on this page."] = "Bitte nutze den Zurück-Button deines Browsers <strong>jetzt</strong>, wenn du dir unsicher bist, was auf dieser Seite gemacht wird.";
+$a->strings["<strong>WARNING: This is highly advanced</strong> and if you enter incorrect information your communications with this contact may stop working."] = "<strong>ACHTUNG: Das sind Experten-Einstellungen!</strong> Wenn Du etwas Falsches eingibst, funktioniert die Kommunikation mit diesem Kontakt evtl. nicht mehr.";
+$a->strings["Please use your browser 'Back' button <strong>now</strong> if you are uncertain what to do on this page."] = "Bitte nutze den Zurück-Button deines Browsers <strong>jetzt</strong>, wenn du dir unsicher bist, was du tun willst.";
 $a->strings["Return to contact editor"] = "Zurück zum Kontakteditor";
 $a->strings["Name"] = "Name";
 $a->strings["Account Nickname"] = "Account-Spitzname";
@@ -57,10 +57,10 @@ $a->strings["Remove Item Tag"] = "Gegenstands-Tag entfernen";
 $a->strings["Select a tag to remove: "] = "Wähle ein Tag zum Entfernen aus: ";
 $a->strings["Remove"] = "Entfernen";
 $a->strings["%s welcomes %s"] = "%s heißt %s herzlich willkommen";
-$a->strings["Authorize application connection"] = "Verbindung der Applikation authorisieren";
+$a->strings["Authorize application connection"] = "Verbindung der Applikation autorisieren";
 $a->strings["Return to your app and insert this Securty Code:"] = "Gehe zu deiner Anwendung zurück und trage dort folgenden Sicherheitscode ein:";
 $a->strings["Please login to continue."] = "Bitte melde dich an um fortzufahren.";
-$a->strings["Do you want to authorize this application to access your posts and contacts, and/or create new posts for you?"] = "Möchtest du dieser Anwendung den Zugriff auf deine Beiträge und Kontakte sowie die Erstellung neuer Beiträge in deinem Namen gestatten?";
+$a->strings["Do you want to authorize this application to access your posts and contacts, and/or create new posts for you?"] = "Möchtest du dieser Anwendung den Zugriff auf deine Beiträge und Kontakte, sowie das Erstellen neuer Beiträge in deinem Namen gestatten?";
 $a->strings["Yes"] = "Ja";
 $a->strings["No"] = "Nein";
 $a->strings["Photo Albums"] = "Fotoalben";
@@ -115,7 +115,7 @@ $a->strings["Recent Photos"] = "Neueste Fotos";
 $a->strings["Not available."] = "Nicht verfügbar.";
 $a->strings["Community"] = "Gemeinschaft";
 $a->strings["No results."] = "Keine Ergebnisse.";
-$a->strings["This is Friendica, version"] = "Dies ist Friendica version";
+$a->strings["This is Friendica, version"] = "Dies ist Friendica, Version";
 $a->strings["running at web location"] = "die unter folgender Webadresse zu finden ist";
 $a->strings["Please visit <a href=\"http://friendica.com\">Friendica.com</a> to learn more about the Friendica project."] = "Bitte besuche <a href=\"http://friendica.com\">Friendica.com</a> um mehr über das Friendica Projekt zu erfahren.";
 $a->strings["Bug reports and issues: please visit"] = "Probleme oder Fehler gefunden? Bitte besuche";
@@ -156,24 +156,24 @@ $a->strings["Friends are advised to please try again in 24 hours."] = "Freunde s
 $a->strings["Invalid locator"] = "Ungültiger Locator";
 $a->strings["Unable to resolve your name at the provided location."] = "Konnte deinen Namen an der angegebenen Stelle nicht finden.";
 $a->strings["You have already introduced yourself here."] = "Du hast dich hier bereits vorgestellt.";
-$a->strings["Apparently you are already friends with %s."] = "Es scheint so, als ob du bereits ein Freund von %s bist.";
+$a->strings["Apparently you are already friends with %s."] = "Es scheint so, als ob du bereits mit %s befreundet bist.";
 $a->strings["Invalid profile URL."] = "Ungültige Profil-URL.";
 $a->strings["Disallowed profile URL."] = "Nicht erlaubte Profil-URL.";
 $a->strings["Failed to update contact record."] = "Aktualisierung der Kontaktdaten fehlgeschlagen.";
 $a->strings["Your introduction has been sent."] = "Deine Kontaktanfrage wurde gesendet.";
 $a->strings["Please login to confirm introduction."] = "Bitte melde dich an, um die Kontaktanfrage zu bestätigen.";
-$a->strings["Incorrect identity currently logged in. Please login to <strong>this</strong> profile."] = "Incorrect identity currently logged in. Please login to <strong>this</strong> profile.";
+$a->strings["Incorrect identity currently logged in. Please login to <strong>this</strong> profile."] = "Momentan bist du mit einer anderen Identität angemeldet. Bitte melde Dich mit <strong>diesem</strong> Profil an.";
 $a->strings["Welcome home %s."] = "Willkommen zurück %s.";
 $a->strings["Please confirm your introduction/connection request to %s."] = "Bitte bestätige deine Kontaktanfrage bei %s.";
 $a->strings["Confirm"] = "Bestätigen";
-$a->strings["[Name Withheld]"] = "[Name Zurückgehalten]";
+$a->strings["[Name Withheld]"] = "[Name unterdrückt]";
 $a->strings["Diaspora members: Please do not use this form. Instead, enter \"%s\" into your Diaspora search bar."] = "Diaspora-User: Bitte nicht dieses Formular benutzen! Gebt statt dessen \"%s\" in der Diaspora-Suchleiste ein.";
 $a->strings["Please enter your 'Identity Address' from one of the following supported social networks:"] = "Bitte gib die Adresse deines Profils in einem der unterstützten sozialen Netzwerke an:";
 $a->strings["Friend/Connection Request"] = "Freundschafts-/Kontaktanfrage";
 $a->strings["Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@identi.ca"] = "Beispiele: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@identi.ca";
-$a->strings["Please answer the following:"] = "Bitte beantworte folgende Fragen:";
+$a->strings["Please answer the following:"] = "Bitte beantworte Folgendes:";
 $a->strings["Does %s know you?"] = "Kennt %s dich?";
-$a->strings["Add a personal note:"] = "Eine persönliche Notiz anfügen:";
+$a->strings["Add a personal note:"] = "Eine persönliche Notiz beifügen:";
 $a->strings["Friendica"] = "Friendica";
 $a->strings["StatusNet/Federated Social Web"] = "StatusNet/Federated Social Web";
 $a->strings["Diaspora"] = "Diaspora";
@@ -193,7 +193,7 @@ $a->strings["You may need to import the file \"database.sql\" manually using php
 $a->strings["Database import failed."] = "Import der Datenbank schlug fehl.";
 $a->strings["System check"] = "Systemtest";
 $a->strings["Check again"] = "Noch einmal testen";
-$a->strings["In order to install Friendica we need to know how to connect to your database."] = "Um Friendica installieren zu können müssen wir wissen wie wir zu deiner Datenbank Kontakt aufnehmen können.";
+$a->strings["In order to install Friendica we need to know how to connect to your database."] = "Um Friendica installieren zu können, müssen wir wissen, wie wir zu deiner Datenbank Kontakt aufnehmen können.";
 $a->strings["Please contact your hosting provider or site administrator if you have questions about these settings."] = "Bitte kontaktiere den Hosting Provider oder den Administrator der Seite, falls du Fragen zu diesen Einstellungen haben solltest.";
 $a->strings["The database you specify below should already exist. If it does not, please create it before continuing."] = "Die Datenbank, die du unten angibst, sollte bereits existieren. Ist dies noch nicht der Fall, erzeuge sie bitte bevor du mit der Installation fortfährst.";
 $a->strings["Database Server Name"] = "Datenbank-Server";
@@ -201,13 +201,13 @@ $a->strings["Database Login Name"] = "Datenbank-Nutzer";
 $a->strings["Database Login Password"] = "Datenbank-Passwort";
 $a->strings["Database Name"] = "Datenbank-Name";
 $a->strings["Site administrator email address"] = "E-Mail-Adresse des Administrators";
-$a->strings["Your account email address must match this in order to use the web admin panel."] = "Die E-Mail-Adresse, die in deinem Friendica-Account eingetragen, muss mit dieser Adresse übereinstimmen, damit du das Admin-Panel benutzen kannst.";
+$a->strings["Your account email address must match this in order to use the web admin panel."] = "Die E-Mail-Adresse, die in deinem Friendica-Account eingetragen ist, muss mit dieser Adresse übereinstimmen, damit du das Admin-Panel benutzen kannst.";
 $a->strings["Please select a default timezone for your website"] = "Bitte wähle die Standardzeitzone deiner Webseite";
 $a->strings["Site settings"] = "Server-Einstellungen";
 $a->strings["Could not find a command line version of PHP in the web server PATH."] = "Konnte keine Kommandozeilenversion von PHP im PATH des Servers finden.";
 $a->strings["PHP executable path"] = "Pfad zu PHP";
 $a->strings["Enter full path to php executable"] = "Kompletter Pfad zum PHP-Executable";
-$a->strings["Command line PHP"] = "Kommadozeilen-PHP";
+$a->strings["Command line PHP"] = "Kommandozeilen-PHP";
 $a->strings["The command line version of PHP on your system does not have \"register_argc_argv\" enabled."] = "Die Kommandozeilenversion von PHP auf deinem System hat \"register_argc_argv\" nicht aktiviert.";
 $a->strings["This is required for message delivery to work."] = "Dies wird für die Auslieferung von Nachrichten benötigt.";
 $a->strings["PHP \"register_argc_argv\""] = "PHP \"register_argc_argv\"";
@@ -235,7 +235,7 @@ $a->strings["The database configuration file \".htconfig.php\" could not be writ
 $a->strings["Errors encountered creating database tables."] = "Fehler aufgetreten während der Erzeugung der Datenbanktabellen.";
 $a->strings["l F d, Y \\@ g:i A"] = "l F d, Y \\@ g:i A";
 $a->strings["Time Conversion"] = "Zeitumrechnung";
-$a->strings["Friendika provides this service for sharing events with other networks and friends in unknown timezones."] = "Friendica bietet diese Funktion an, um das teilen von Events mit Kontakten zu vereinfachen, deren Zeitzone nicht ermittelt werden kann.";
+$a->strings["Friendika provides this service for sharing events with other networks and friends in unknown timezones."] = "Friendica bietet diese Funktion an, um das Teilen von Events mit den Kontakten zu vereinfachen, deren Zeitzone nicht ermittelt werden kann.";
 $a->strings["UTC time: %s"] = "UTC Zeit: %s";
 $a->strings["Current timezone: %s"] = "Aktuelle Zeitzone: %s";
 $a->strings["Converted localtime: %s"] = "Umgerechnete lokale Zeit: %s";
@@ -351,13 +351,13 @@ $a->strings["No valid account found."] = "Kein gültiger Account gefunden.";
 $a->strings["Password reset request issued. Check your email."] = "Zurücksetzen des Passworts eingeleitet. Bitte überprüfe deine E-Mail.";
 $a->strings["Password reset requested at %s"] = "Anfrage zum Zurücksetzen des Passworts auf %s erhalten";
 $a->strings["Administrator"] = "Administrator";
-$a->strings["Request could not be verified. (You may have previously submitted it.) Password reset failed."] = "Anfrage konnte nicht verifiziert werden. (Eventuell hast du bereits ähnliche Anfrage gestellt.) Zurücksetzen des Passworts gescheitert.";
+$a->strings["Request could not be verified. (You may have previously submitted it.) Password reset failed."] = "Anfrage konnte nicht verifiziert werden. (Eventuell hast du bereits eine ähnliche Anfrage gestellt.) Zurücksetzen des Passworts gescheitert.";
 $a->strings["Password Reset"] = "Passwort zurücksetzen";
 $a->strings["Your password has been reset as requested."] = "Dein Passwort wurde wie gewünscht zurückgesetzt.";
 $a->strings["Your new password is"] = "Dein neues Passwort lautet";
 $a->strings["Save or copy your new password - and then"] = "Speichere oder kopiere dein neues Passwort - und dann";
 $a->strings["click here to login"] = "hier klicken, um dich anzumelden";
-$a->strings["Your password may be changed from the <em>Settings</em> page after successful login."] = "Du kannst das Passwort in den <em>Einstellungen</em> ändern sobald du dich erfolgreich angemeldet hast.";
+$a->strings["Your password may be changed from the <em>Settings</em> page after successful login."] = "Du kannst das Passwort in den <em>Einstellungen</em> ändern, sobald du dich erfolgreich angemeldet hast.";
 $a->strings["Forgot your Password?"] = "Hast du dein Passwort vergessen?";
 $a->strings["Enter your email address and submit to have your password reset. Then check your email for further instructions."] = "Gib deine Email-Adresse an und fordere ein neues Passwort an. Es werden dir dann weitere Informationen per Mail zugesendet.";
 $a->strings["Nickname or Email: "] = "Spitzname oder Email:";
@@ -389,7 +389,7 @@ $a->strings["You can't edit this application."] = "Du kannst dieses Programm nic
 $a->strings["Connected Apps"] = "Verbundene Programme";
 $a->strings["Client key starts with"] = "Anwender Schlüssel beginnt mit";
 $a->strings["No name"] = "Kein Name";
-$a->strings["Remove authorization"] = "Authorisierung entziehen";
+$a->strings["Remove authorization"] = "Autorisierung entziehen";
 $a->strings["No Plugin settings configured"] = "Keine Plugin-Einstellungen konfiguriert";
 $a->strings["Plugin Settings"] = "Plugin-Einstellungen";
 $a->strings["Built-in support for %s connectivity is %s"] = "Eingebaute Unterstützung für Verbindungen zu %s ist %s";
@@ -458,16 +458,16 @@ $a->strings["Default Post Permissions"] = "Standard-Zugriffsrechte für Beiträg
 $a->strings["(click to open/close)"] = "(klicke zum öffnen/schließen)";
 $a->strings["Notification Settings"] = "Benachrichtigungseinstellungen";
 $a->strings["Send a notification email when:"] = "Benachrichtigungs-E-Mail senden wenn:";
-$a->strings["You receive an introduction"] = "Du eine Kontaktanfrage erhältst";
-$a->strings["Your introductions are confirmed"] = "Eine deiner Kontaktanfragen akzeptiert wurde";
-$a->strings["Someone writes on your profile wall"] = "Jemand schreibt etwas auf deine Pinnwand";
-$a->strings["Someone writes a followup comment"] = "Jemand verfasst auch einen Kommentar";
-$a->strings["You receive a private message"] = "Du erhältst eine private Nachricht";
-$a->strings["You receive a friend suggestion"] = "Du eine Empfehlung erhältst";
-$a->strings["You are tagged in a post"] = "Du wurdest in einem Beitrag erwähnt";
+$a->strings["You receive an introduction"] = "- du eine Kontaktanfrage erhältst";
+$a->strings["Your introductions are confirmed"] = "- eine deiner Kontaktanfragen akzeptiert wurde";
+$a->strings["Someone writes on your profile wall"] = "- jemand etwas auf deine Pinnwand schreibt";
+$a->strings["Someone writes a followup comment"] = "- jemand auch einen Kommentar verfasst";
+$a->strings["You receive a private message"] = "- du eine private Nachricht erhältst";
+$a->strings["You receive a friend suggestion"] = "- du eine Empfehlung erhältst";
+$a->strings["You are tagged in a post"] = "- du in einem Beitrag erwähnt wurdest";
 $a->strings["Advanced Page Settings"] = "Erweiterte Seiten-Einstellungen";
 $a->strings["Manage Identities and/or Pages"] = "Verwalte Identitäten und/oder Seiten";
-$a->strings["Toggle between different identities or community/group pages which share your account details or which you have been granted \"manage\" permissions"] = "Wechsle zwischen verschiedenen Identitäten oder Gemeinschafts-/Gruppen Seiten die deine Zugangsdetails teilen oder zu denen du \"Manage\" Befugnisse bekommen hast.";
+$a->strings["Toggle between different identities or community/group pages which share your account details or which you have been granted \"manage\" permissions"] = "Wechsle zwischen verschiedenen Identitäten oder Gemeinschafts-/Gruppen-Seiten, die deine Zugangsdetails teilen oder zu denen du \"Manage\" Befugnisse bekommen hast.";
 $a->strings["Select an identity to manage: "] = "Wähle eine Identität zum Verwalten: ";
 $a->strings["Search Results For:"] = "Suchergebnisse für:";
 $a->strings["Remove term"] = "Begriff entfernen";
@@ -493,17 +493,17 @@ $a->strings["Personal Notes"] = "Persönliche Notizen";
 $a->strings["Save"] = "Speichern";
 $a->strings["Welcome to Friendica"] = "Willkommen bei Friendica";
 $a->strings["New Member Checklist"] = "Checkliste für neue Mitglieder";
-$a->strings["We would like to offer some tips and links to help make your experience enjoyable. Click any item to visit the relevant page. A link to this page will be visible from your home page for two weeks after your initial registration and then will quietly disappear."] = "Wir möchten Dir einige Tipps und Links anbieten, die Dir helfen könnten, den Einstieg angenehmer zu machen. Klicke auf ein Element, um die entsprechende Seite zu besuchen. Ein Link zu dieser Seite hier bleibt sichtbar über Deine Pinnwand für zwei Wochen nach dem Registrierungsdatum und wird dann verschwinden.";
-$a->strings["On your <em>Settings</em> page -  change your initial password. Also make a note of your Identity Address. This looks just like an email address - and will be useful in making friends on the free social web."] = "Ändere bitte unter <em>Einstellungen</em> Dein Passwort. Außerdem merke Dir Deine Indentifikations Adresse. Diese sieht aus wie eine E-Mail Adresse und wird benötig um Freunschaften mit anderen im Friendica Netzwerk zu schliessen.";
-$a->strings["Review the other settings, particularly the privacy settings. An unpublished directory listing is like having an unlisted phone number. In general, you should probably publish your listing - unless all of your friends and potential friends know exactly how to find you."] = "Überprüfe die restlichen Einstellungen, insbesondere die Einstellungen zur Privatsphäre. Wenn du dein Profil nicht veröffentlichst ist das wie wenn niemand deine Telefonnummer kennt. Im Allgemeinen solltest du es veröffentlichen - außer all deine Freunde und potentiellen Freunde wissen wie man dich findet.";
-$a->strings["Upload a profile photo if you have not done so already. Studies have shown that people with real photos of themselves are ten times more likely to make friends than people who do not."] = "Lade ein Profilbild hoch falls du es noch nicht getan hast. Studien haben gezeigt, dass es zehnmal wahrscheinlicher ist neue Freunde zu finden, wenn du ein Bild von dir selbst verwendest als wenn du dies nicht tust.";
+$a->strings["We would like to offer some tips and links to help make your experience enjoyable. Click any item to visit the relevant page. A link to this page will be visible from your home page for two weeks after your initial registration and then will quietly disappear."] = "Wir möchten Dir einige Tipps und Links anbieten, die Dir helfen könnten, den Einstieg angenehmer zu machen. Klicke auf ein Element, um die entsprechende Seite zu besuchen. Ein Link zu dieser Seite hier bleibt für Dich an Deiner Pinnwand für zwei Wochen nach dem Registrierungsdatum sichtbar und wird dann verschwinden.";
+$a->strings["On your <em>Settings</em> page -  change your initial password. Also make a note of your Identity Address. This looks just like an email address - and will be useful in making friends on the free social web."] = "Ändere bitte unter <em>Einstellungen</em> Dein Passwort. Außerdem merke Dir Deine Indentifikations-Adresse. Diese sieht aus wie eine E-Mail-Adresse und wird benötigt, um Freundschaften mit anderen im Friendica Netzwerk zu schliessen.";
+$a->strings["Review the other settings, particularly the privacy settings. An unpublished directory listing is like having an unlisted phone number. In general, you should probably publish your listing - unless all of your friends and potential friends know exactly how to find you."] = "Überprüfe die restlichen Einstellungen, insbesondere die Einstellungen zur Privatsphäre. Wenn du dein Profil nicht veröffentlichst, ist das als wenn Du Deine Telefonnummer nicht ins Telefonbuch einträgst. Im Allgemeinen solltest du es veröffentlichen - außer all deine Freunde und potentiellen Freunde wissen genau, wie sie dich finden können.";
+$a->strings["Upload a profile photo if you have not done so already. Studies have shown that people with real photos of themselves are ten times more likely to make friends than people who do not."] = "Lade ein Profilbild hoch falls du es noch nicht getan hast. Studien haben gezeigt, dass es zehnmal wahrscheinlicher ist neue Freunde zu finden, wenn du ein Bild von dir selbst verwendest, als wenn du dies nicht tust.";
 $a->strings["Authorise the Facebook Connector if you currently have a Facebook account and we will (optionally) import all your Facebook friends and conversations."] = "Richte die Verbindung zu Facebook ein, wenn du im Augenblick ein Facebook Konto hast und (optional) deine Facebook Freunde und Unterhaltungen importieren willst.";
-$a->strings["<em>If</em> this is your own personal server, installing the Facebook addon may ease your transition to the free social web."] = "<em>Wenn</em> dies dein privater Server ist könnte die Installation des Facebook Connectors deinen Umzug ins freie Soziale Netz angenehmer gestalten.";
+$a->strings["<em>If</em> this is your own personal server, installing the Facebook addon may ease your transition to the free social web."] = "<em>Wenn</em> dies dein privater Server ist, könnte die Installation des Facebook Connectors deinen Umzug ins freie soziale Netz angenehmer gestalten.";
 $a->strings["Enter your email access information on your Connector Settings page if you wish to import and interact with friends or mailing lists from your email INBOX"] = "Gib deine E-Mail-Zugangsinformationen auf der Connector-Einstellungsseite ein, falls du E-Mails aus deinem Posteingang importieren und mit Freunden und Mailinglisten interagieren willlst.";
 $a->strings["Edit your <strong>default</strong> profile to your liking. Review the settings for hiding your list of friends and hiding the profile from unknown visitors."] = "Editiere dein <strong>Standard</strong> Profil nach deinen Vorlieben. Überprüfe die Einstellungen zum Verbergen deiner Freundesliste vor unbekannten Betrachtern des Profils.";
 $a->strings["Set some public keywords for your default profile which describe your interests. We may be able to find other people with similar interests and suggest friendships."] = "Trage ein paar öffentliche Stichwörter in dein Standardprofil ein, die deine Interessen beschreiben. Eventuell sind wir in der Lage Leute zu finden, die deine Interessen teilen und können dir dann Kontakte vorschlagen.";
 $a->strings["Your Contacts page is your gateway to managing friendships and connecting with friends on other networks. Typically you enter their address or site URL in the <em>Add New Contact</em> dialog."] = "Die Kontakte-Seite ist die Einstiegsseite, von der aus du Kontakte verwalten und dich mit Freunden in anderen Netzwerken verbinden kannst. Normalerweise gibst du dazu einfach ihre Adresse oder die URL der Seite im Kasten <em>Neuen Kontakt hinzufügen</em> ein.";
-$a->strings["The Directory page lets you find other people in this network or other federated sites. Look for a <em>Connect</em> or <em>Follow</em> link on their profile page. Provide your own Identity Address if requested."] = "Über die Verzeichnisseite kannst du andere Personen auf diesem Server oder anderen verteilten Seiten finden. Halte nach einem <em>Verbinden</em> oder <em>Folgen</em> Link auf deren Profilseiten Ausschau und gib deine eigene Profiladresse an falls du danach gefragt wirst.";
+$a->strings["The Directory page lets you find other people in this network or other federated sites. Look for a <em>Connect</em> or <em>Follow</em> link on their profile page. Provide your own Identity Address if requested."] = "Über die Verzeichnisseite kannst du andere Personen auf diesem Server oder anderen verknüpften Seiten finden. Halte nach einem <em>Verbinden</em> oder <em>Folgen</em> Link auf deren Profilseiten Ausschau und gib deine eigene Profiladresse an, falls du danach gefragt wirst.";
 $a->strings["On the side panel of the Contacts page are several tools to find new friends. We can match people by interest, look up people by name or interest, and provide suggestions based on network relationships. On a brand new site, friend suggestions will usually begin to be populated within 24 hours."] = "Im seitlichen Bedienfeld der Kontakte-Seite gibt es diverse Werkzeuge, um neue Freunde zu finden. Wir können Menschen mit den gleichen Interessen finden, anhand von Namen oder Interessen suchen oder aber aufgrund vorhandener Kontakte neue Freunde vorschlagen.\nAuf einer brandneuen - soeben erstellten - Seite starten die Kontaktvorschläge innerhalb von 24 Stunden.";
 $a->strings["Once you have made some friends, organize them into private conversation groups from the sidebar of your Contacts page and then you can interact with each group privately on your Network page."] = "Sobald du einige Freunde gefunden hast, organisiere sie in Gruppen zur privaten Kommunikation im Seitenmenü der Kontakte-Seite. Du kannst dann mit jeder dieser Gruppen von der Netzwerkseite aus privat interagieren.";
 $a->strings["Our <strong>help</strong> pages may be consulted for detail on other program features and resources."] = "Unsere <strong>Hilfe</strong> Seiten können herangezogen werden, um weitere Einzelheiten zu andern Programm Features zu erhalten.";
@@ -634,7 +634,7 @@ $a->strings["Version"] = "Version";
 $a->strings["Active plugins"] = "Aktive Plugins";
 $a->strings["Site settings updated."] = "Seiteneinstellungen aktualisiert.";
 $a->strings["Closed"] = "Geschlossen";
-$a->strings["Requires approval"] = "Bedarf Zustimmung";
+$a->strings["Requires approval"] = "Bedarf der Zustimmung";
 $a->strings["Open"] = "Offen";
 $a->strings["File upload"] = "Datei hochladen";
 $a->strings["Policies"] = "Regeln";
@@ -647,7 +647,7 @@ $a->strings["Maximum image size"] = "Maximale Größe von Bildern";
 $a->strings["Register policy"] = "Registrierungsmethode";
 $a->strings["Register text"] = "Registrierungstext";
 $a->strings["Accounts abandoned after x days"] = "Accounts gelten nach x Tagen als unbenutzt";
-$a->strings["Will not waste system resources polling external sites for abandonded accounts. Enter 0 for no time limit."] = "Verschwende keine System-Ressourcen fürs Pollen externer Seiten, wenn Accounts nicht mehr benutzt werden. 0 eingeben für kein Limit.";
+$a->strings["Will not waste system resources polling external sites for abandonded accounts. Enter 0 for no time limit."] = "Verschwende keine System-Ressourcen auf das Pollen externer Seiten, wenn Accounts nicht mehr benutzt werden. 0 eingeben für kein Limit.";
 $a->strings["Allowed friend domains"] = "Erlaubte Domains für Kontakte";
 $a->strings["Allowed email domains"] = "Erlaubte Domains für Emails";
 $a->strings["Block public"] = "Öffentlichen Zugriff blockieren";
@@ -656,7 +656,7 @@ $a->strings["Global directory update URL"] = "URL für Updates beim weltweiten V
 $a->strings["Block multiple registrations"] = "Unterbinde Mehrfachregistrierung";
 $a->strings["OpenID support"] = "OpenID Unterstützung";
 $a->strings["Gravatar support"] = "Gravatar Unterstützung";
-$a->strings["Fullname check"] = "Name auf Vollständigkeit überprüfen";
+$a->strings["Fullname check"] = "Namen auf Vollständigkeit überprüfen";
 $a->strings["UTF-8 Regular expressions"] = "UTF-8 Reguläre Ausdrücke";
 $a->strings["Show Community Page"] = "Gemeinschaftsseite anzeigen";
 $a->strings["Enable OStatus support"] = "OStatus Unterstützung aktivieren";
@@ -700,14 +700,14 @@ $a->strings["Log settings updated."] = "Protokolleinstellungen aktualisiert.";
 $a->strings["Clear"] = "löschen";
 $a->strings["Debugging"] = "Protokoll führen";
 $a->strings["Log file"] = "Protokolldatei";
-$a->strings["Must be writable by web server. Relative to your Friendica top-level directory."] = "Webserver muss Schreibrechte besitzen. Relativ zum Friendica-Installationsverzeichnis.";
-$a->strings["Log level"] = "Protokollevel";
+$a->strings["Must be writable by web server. Relative to your Friendica top-level directory."] = "Webserver muss Schreibrechte besitzen. Abhängig vom Friendica-Installationsverzeichnis.";
+$a->strings["Log level"] = "Protokoll-Level";
 $a->strings["Close"] = "Schließen";
 $a->strings["FTP Host"] = "FTP Host";
 $a->strings["FTP Path"] = "FTP Pfad";
 $a->strings["FTP User"] = "FTP Nutzername";
 $a->strings["FTP Password"] = "FTP Passwort";
-$a->strings["Requested profile is not available."] = "Profil nicht vorhanden.";
+$a->strings["Requested profile is not available."] = "Das angefragte Profil ist nicht vorhanden.";
 $a->strings["Access to this profile has been restricted."] = "Der Zugriff zu diesem Profil wurde eingeschränkt.";
 $a->strings["Tips for New Members"] = "Tipps für neue Nutzer";
 $a->strings["{0} wants to be your friend"] = "{0} möchte mit dir in Kontakt treten";
@@ -727,7 +727,7 @@ $a->strings["No compatible communication protocols or feeds were discovered."] =
 $a->strings["The profile address specified does not provide adequate information."] = "Die angegebene Profiladresse liefert unzureichende Informationen.";
 $a->strings["An author or name was not found."] = "Es wurde kein Autor oder Name gefunden.";
 $a->strings["No browser URL could be matched to this address."] = "Zu dieser Adresse konnte keine passende Browser URL gefunden werden.";
-$a->strings["The profile address specified belongs to a network which has been disabled on this site."] = "Die Adresse dieses Profils gehört zu einem Netzwerk mit dem die Kommunikation auf dieser Seite ausgeschaltet wurde.";
+$a->strings["The profile address specified belongs to a network which has been disabled on this site."] = "Die Adresse dieses Profils gehört zu einem Netzwerk, mit dem die Kommunikation auf dieser Seite ausgeschaltet wurde.";
 $a->strings["Limited profile. This person will be unable to receive direct/personal notifications from you."] = "Eingeschränktes Profil. Diese Person wird keine direkten/privaten Nachrichten von dir erhalten können.";
 $a->strings["Unable to retrieve contact information."] = "Konnte die Kontaktinformationen nicht empfangen.";
 $a->strings["following"] = "folgen";
@@ -791,9 +791,9 @@ $a->strings["Profile Image"] = "Profilbild";
 $a->strings["visible to everybody"] = "sichtbar für jeden";
 $a->strings["Edit visibility"] = "Sichtbarkeit bearbeiten";
 $a->strings["%1\$s tagged %2\$s's %3\$s with %4\$s"] = "%1\$s hat %2\$ss %3\$s mit %4\$s getaggt";
-$a->strings["No potential page delegates located."] = "Keine potentiellen Bevollmächtigte für die Seite gefunden.";
+$a->strings["No potential page delegates located."] = "Keine potentiellen Bevollmächtigten für die Seite gefunden.";
 $a->strings["Delegate Page Management"] = "Delegiere das Management für die Seite";
-$a->strings["Delegates are able to manage all aspects of this account/page except for basic account settings. Please do not delegate your personal account to anybody that you do not trust completely."] = "Bevollmächtigte sind in der Lage alle Aspekte dieses Accounts/dieser Seite zu verwalten, abgesehen von den Grundeinstellungen des Accounts. Bitte gib Niemandem eine Bevollmächtigung für deinen privaten Account dem du nicht absolut vertraust.";
+$a->strings["Delegates are able to manage all aspects of this account/page except for basic account settings. Please do not delegate your personal account to anybody that you do not trust completely."] = "Bevollmächtigte sind in der Lage alle Aspekte dieses Accounts/dieser Seite zu verwalten, abgesehen von den Grundeinstellungen des Accounts. Bitte gib niemandem eine Bevollmächtigung für deinen privaten Account, dem du nicht absolut vertraust.";
 $a->strings["Existing Page Managers"] = "Vorhandene Seiten Manager";
 $a->strings["Existing Page Delegates"] = "Vorhandene Bevollmächtigte für die Seite";
 $a->strings["Potential Delegates"] = "Potentielle Bevollmächtigte";
@@ -821,12 +821,12 @@ $a->strings["Send invitations"] = "Einladungen senden";
 $a->strings["Enter email addresses, one per line:"] = "E-Mail-Adressen eingeben, eine pro Zeile:";
 $a->strings["Please join my social network on %s"] = "Bitte trete meinem Sozialen Netzwerk auf %s bei";
 $a->strings["To accept this invitation, please visit:"] = "Um diese Einladung anzunehmen besuche bitte:";
-$a->strings["You will need to supply this invitation code: \$invite_code"] = "Du benötigst den folgenden Einladungs Code: \$invite_code";
+$a->strings["You will need to supply this invitation code: \$invite_code"] = "Du benötigst den folgenden Einladungscode: \$invite_code";
 $a->strings["Once you have registered, please connect with me via my profile page at:"] = "Sobald du registriert bist, kontaktiere mich bitte auf meiner Profilseite:";
-$a->strings["Response from remote site was not understood."] = "Antwort der entfernten Gegenstelle unverständlich.";
+$a->strings["Response from remote site was not understood."] = "Antwort der Gegenstelle unverständlich.";
 $a->strings["Unexpected response from remote site: "] = "Unerwartete Antwort der Gegenstelle: ";
 $a->strings["Confirmation completed successfully."] = "Bestätigung erfolgreich abgeschlossen.";
-$a->strings["Remote site reported: "] = "Entfernte Seite meldet: ";
+$a->strings["Remote site reported: "] = "Gegenstelle meldet: ";
 $a->strings["Temporary failure. Please wait and try again."] = "Zeitweiser Fehler. Bitte warte einige Momente und versuche es dann noch einmal.";
 $a->strings["Introduction failed or was revoked."] = "Kontaktanfrage schlug fehl oder wurde zurück gezogen.";
 $a->strings["Unable to set contact photo."] = "Konnte das Bild des Kontakts nicht speichern.";
@@ -836,7 +836,7 @@ $a->strings["Our site encryption key is apparently messed up."] = "Der Verschlü
 $a->strings["Empty site URL was provided or URL could not be decrypted by us."] = "Leere URL für die Seite erhalten oder die URL konnte nicht entschlüsselt werden.";
 $a->strings["Contact record was not found for you on our site."] = "Für diesen Kontakt wurde auf unserer Seite kein Eintrag gefunden.";
 $a->strings["Site public key not available in contact record for URL %s."] = "Die Kontaktdaten für URL %s enthalten keinen Public Key für den Server.";
-$a->strings["The ID provided by your system is a duplicate on our system. It should work if you try again."] = "Die ID die uns dein System angeboten hat ist hier bereits vergeben. Bitte versuche es noch einmal.";
+$a->strings["The ID provided by your system is a duplicate on our system. It should work if you try again."] = "Die ID, die uns dein System angeboten hat, ist hier bereits vergeben. Bitte versuche es noch einmal.";
 $a->strings["Unable to set your contact credentials on our system."] = "Deine Kontaktreferenzen konnten nicht in unserem System gespeichert werden.";
 $a->strings["Unable to update your contact profile details on our system"] = "Die Updates für dein Profil konnten nicht gespeichert werden";
 $a->strings["Connection accepted at %s"] = "Auf %s wurde die Verbindung akzeptiert";
@@ -849,13 +849,13 @@ $a->strings["Remove Facebook connector"] = "Facebook-Connector entfernen";
 $a->strings["Re-authenticate [This is necessary whenever your Facebook password is changed.]"] = "Neu authentifizieren [Das ist immer dann nötig, wenn Du Dein Facebook-Passwort geändert hast.]";
 $a->strings["Post to Facebook by default"] = "Veröffentliche standardmäßig bei Facebook";
 $a->strings["Link all your Facebook friends and conversations on this website"] = "All meine Facebook-Kontakte und -Konversationen hier auf diese Website importieren";
-$a->strings["Facebook conversations consist of your <em>profile wall</em> and your friend <em>stream</em>."] = "Facebook-Konversationen sind alles, was auf deiner <em>Pinnwand</em> erscheint, und die Beiträge deiner Freunde <em>(Stream).</em>";
+$a->strings["Facebook conversations consist of your <em>profile wall</em> and your friend <em>stream</em>."] = "Facebook-Konversationen bestehen aus deinen Beiträgen auf deiner<em>Pinnwand</em>, sowie den Beiträgen deiner Freunde <em>Stream</em>.";
 $a->strings["On this website, your Facebook friend stream is only visible to you."] = "Hier auf dieser Webseite kannst nur du die Beiträge Deiner Facebook-Freunde (Stream) sehen.";
 $a->strings["The following settings determine the privacy of your Facebook profile wall on this website."] = "Mit den folgenden Einstellungen kannst Du die Privatsphäre der Kopie Deiner Facebook-Pinnwand hier auf dieser Seite einstellen.";
 $a->strings["On this website your Facebook profile wall conversations will only be visible to you"] = "Meine Facebook-Pinnwand hier auf dieser Webseite nur für mich sichtbar machen";
 $a->strings["Do not import your Facebook profile wall conversations"] = "Facebook-Pinnwand nicht importieren";
 $a->strings["If you choose to link conversations and leave both of these boxes unchecked, your Facebook profile wall will be merged with your profile wall on this website and your privacy settings on this website will be used to determine who may see the conversations."] = "Wenn Du Facebook-Konversationen importierst und diese beiden Häkchen nicht setzt, wird Deine Facebook-Pinnwand mit der Pinnwand hier auf dieser Webseite vereinigt. Die Privatsphäre-Einstellungen für Deine Pinnwand auf dieser Webseite geben dann an, wer die Konversationen sehen kann.";
-$a->strings["Comma separated applications to ignore"] = "Komma separierte Liste von Anwendungen die ignoriert werden sollen";
+$a->strings["Comma separated applications to ignore"] = "Komma separiert Anwendungen, die ignoriert werden sollen";
 $a->strings["Facebook"] = "Facebook";
 $a->strings["Facebook Connector Settings"] = "Facebook-Verbindungseinstellungen";
 $a->strings["Post to Facebook"] = "Bei Facebook veröffentlichen";
@@ -885,7 +885,7 @@ $a->strings["yourls Settings saved."] = "yourls Einstellungen gespeichert";
 $a->strings["\"Not Safe For Work\" Settings"] = "\"Not Safe For Work\"-Einstellungen";
 $a->strings["Enable NSFW filter"] = "NSFW Filter aktivieren";
 $a->strings["Comma separated words to treat as NSFW"] = "Wörter, die gefiltert werden sollen (durch Kommas getrennt)";
-$a->strings["Use /expression/ to provide regular expressions"] = "Verwende /expression/ um Reguläre Ausdrücke zu verwenden";
+$a->strings["Use /expression/ to provide regular expressions"] = "Verwende /expression/ um reguläre Ausdrücke zu verwenden";
 $a->strings["NSFW Settings saved."] = "NSFW-Einstellungen gespeichert";
 $a->strings["%s - Click to open/close"] = "%s – Zum Öffnen/Schließen klicken";
 $a->strings["Login"] = "Anmeldung";
@@ -895,7 +895,7 @@ $a->strings["Most active users"] = "Aktivste Nutzer";
 $a->strings["Last photos"] = "Letzte Fotos";
 $a->strings["Last likes"] = "Zuletzt gemocht";
 $a->strings["event"] = "Veranstaltung";
-$a->strings["Allow to use your friendica id (%s) to connecto to external unhosted-enabled storage (like ownCloud). See <a href=\"http://www.w3.org/community/unhosted/wiki/RemoteStorage#WebFinger\">RemoteStorage WebFinger</a>"] = "Ermöglicht es deine friendica id (%s) mit externen unhosted-fähigen Speichern (z.B. ownCloud) zu verbinden. Siehe <a href=\"http://www.w3.org/community/unhosted/wiki/RemoteStorage#WebFinger\">RemoteStorage WebFinger</a>";
+$a->strings["Allow to use your friendica id (%s) to connecto to external unhosted-enabled storage (like ownCloud). See <a href=\"http://www.w3.org/community/unhosted/wiki/RemoteStorage#WebFinger\">RemoteStorage WebFinger</a>"] = "Ermöglicht dir, deine friendica id (%s) mit externen unhosted-fähigen Speichern (z.B. ownCloud) zu verbinden. Siehe <a href=\"http://www.w3.org/community/unhosted/wiki/RemoteStorage#WebFinger\">RemoteStorage WebFinger</a>";
 $a->strings["Template URL (with {category})"] = "Vorlagen URL (mit {Kategorie})";
 $a->strings["OAuth end-point"] = "OAuth end-point";
 $a->strings["Api"] = "Api";
@@ -906,7 +906,7 @@ $a->strings["New game"] = "Neues Spiel";
 $a->strings["New game with handicap"] = "Neues Handicap Spiel";
 $a->strings["Three dimensional tic-tac-toe is just like the traditional game except that it is played on multiple levels simultaneously. "] = "3D-Tic-Tac-Toe ist genauso wie das herkömmliche Spiel, nur dass man es auf mehreren Ebenen gleichzeitig spielt.";
 $a->strings["In this case there are three levels. You win by getting three in a row on any level, as well as up, down, and diagonally across the different levels."] = "In diesem Fall sind es drei Ebenen. Man gewinnt indem man drei in einer Reihe auf einer beliebigen Reihe schafft, oder drei übereinander oder diagonal auf verschiedenen Ebenen.";
-$a->strings["The handicap game disables the center position on the middle level because the player claiming this square often has an unfair advantage."] = "Beim Handicap-Spiel wird die zentrale Position der mittleren Ebene gesperrt da der Spieler der diese Ebene besitzt oft einen unfairen Vorteil genießt.";
+$a->strings["The handicap game disables the center position on the middle level because the player claiming this square often has an unfair advantage."] = "Beim Handicap-Spiel wird die zentrale Position der mittleren Ebene gesperrt, da der Spieler, der diese Ebene besitzt, oft einen unfairen Vorteil genießt.";
 $a->strings["You go first..."] = "Du fängst an...";
 $a->strings["I'm going first this time..."] = "Diesmal fange ich an...";
 $a->strings["You won!"] = "Du gewinnst!";
@@ -928,7 +928,7 @@ $a->strings["Geonames settings updated."] = "Geonames Einstellungen aktualisiert
 $a->strings["Geonames Settings"] = "Geonames Einstellungen";
 $a->strings["Enable Geonames Plugin"] = "Geonames Plugin aktivieren";
 $a->strings["Upload a file"] = "Datei hochladen";
-$a->strings["Drop files here to upload"] = "Ziehe die Dateien hierher die du hochladen willst";
+$a->strings["Drop files here to upload"] = "Ziehe Dateien hierher, um sie hochzuladen";
 $a->strings["Failed"] = "Fehlgeschlagen";
 $a->strings["No files were uploaded."] = "Keine Dateien hochgeladen.";
 $a->strings["Uploaded file is empty"] = "Hochgeladene Datei ist leer";
@@ -956,12 +956,12 @@ $a->strings[":-)"] = ":-)";
 $a->strings[":-("] = ":-(";
 $a->strings["lol"] = "lol";
 $a->strings["Quick Comment Settings"] = "Schnell-Kommentar Einstellungen";
-$a->strings["Enter quick comments, one per line"] = "Gibt ein Schnell-Kommentar pro Zeile ein";
+$a->strings["Enter quick comments, one per line"] = "Gib einen Schnell-Kommentar pro Zeile ein";
 $a->strings["Quick Comment settings saved."] = "Schnell-Kommentare Einstellungen gespeichert";
 $a->strings["Tile Server URL"] = "Tile Server URL";
 $a->strings["A list of <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" target=\"_blank\">public tile servers</a>"] = "Eine Liste <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" target=\"_blank\">öffentlicher Tile Server</a>";
 $a->strings["Default zoom"] = "Standard Zoom";
-$a->strings["The default zoom level. (1:world, 18:highest)"] = "Standard Zoo,level (1: Welt; 18: höchstes)";
+$a->strings["The default zoom level. (1:world, 18:highest)"] = "Standard Zoomlevel (1: Welt; 18: höchstes)";
 $a->strings["Editplain settings updated."] = "Editplain Einstellungen aktualisiert";
 $a->strings["Editplain Settings"] = "Editplain Einstellungen";
 $a->strings["Disable richtext status editor"] = "RichText Editor deaktivieren";
@@ -974,7 +974,7 @@ $a->strings["We could not contact the StatusNet API with the Path you entered."]
 $a->strings["StatusNet settings updated."] = "StatusNet Einstellungen aktualisiert.";
 $a->strings["StatusNet Posting Settings"] = "StatusNet-Beitragseinstellungen";
 $a->strings["Globally Available StatusNet OAuthKeys"] = "Verfügbare OAuth Schlüssel für StatusNet";
-$a->strings["There are preconfigured OAuth key pairs for some StatusNet servers available. If you are useing one of them, please use these credentials. If not feel free to connect to any other StatusNet instance (see below)."] = "Für einige StatusNet Server sind OAuth Schlüsselpaare verfügbar. Solltest du einen dieser Server benutzen, dann verwende doch bitte diese Schlüssel. Falls nicht kannst du weiter unten deine eigenen OAuth Schlüssel eintragen.";
+$a->strings["There are preconfigured OAuth key pairs for some StatusNet servers available. If you are useing one of them, please use these credentials. If not feel free to connect to any other StatusNet instance (see below)."] = "Für einige StatusNet Server sind voreingestellt OAuth Schlüsselpaare verfügbar. Solltest du einen dieser Server benutzen, dann verwende bitte diese Schlüssel. Falls nicht, stellen stattdessen eine Verbindung zu irgend einem anderen StatusNet Server her (siehe unten).";
 $a->strings["Provide your own OAuth Credentials"] = "Eigene OAuth Schlüssel eintragen";
 $a->strings["No consumer key pair for StatusNet found. Register your Friendica Account as an desktop client on your StatusNet account, copy the consumer key pair here and enter the API base root.<br />Before you register your own OAuth key pair ask the administrator if there is already a key pair for this Friendica installation at your favorited StatusNet installation."] = "Kein Consumer-Schlüsselpaar für StatusNet gefunden. Registriere deinen Friendica-Account als Desktop-Client, kopiere das Consumer-Schlüsselpaar hierher und gib die API-URL ein.<br />Bevor du dein eigenes Consumer-Schlüsselpaar registrierst, frage den Administrator dieses Friendica-Servers, ob schon ein Schlüsselpaar für diesen Friendica-Server auf diesem StatusNet-Server existiert.";
 $a->strings["OAuth Consumer Key"] = "OAuth Consumer Key";
@@ -987,8 +987,8 @@ $a->strings["Cancel Connection Process"] = "Verbindungsprozess abbrechen";
 $a->strings["Current StatusNet API is"] = "Derzeitige StatusNet-API-URL lautet";
 $a->strings["Cancel StatusNet Connection"] = "Verbindung zum StatusNet Server abbrechen";
 $a->strings["Currently connected to: "] = "Momentan verbunden mit: ";
-$a->strings["If enabled all your <strong>public</strong> postings can be posted to the associated StatusNet account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry."] = "Wenn aktiviert können all deine <strong>öffentlichen</strong> Einträge auf dem verbundenen StatusNet Konto veröffentlicht werden. Du kannst das (hier) als Standardverhalten einstellen oder beim Schreiben eines Beitrags in den Beitragsoptionen festlegen.";
-$a->strings["<strong>Note</strong>: Due your privacy settings (<em>Hide your profile details from unknown viewers?</em>) the link potentially included in public postings relayed to StatusNet will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "<strong>Hinweis</strong>: Aufgrund deiner Privatsphären Einstellungen (<em>Profil-Details vor unbekannten Betrachtern verbergen?</em>) wird der Link der eventuell an an deinen StatusNet Account weitergeleitete angehangen wird um auf den original Artikel zu verweisen den Betrachter auf eine leere Seite führen, auf der er darüber informiert wird, dass der Zugriff eingeschränkt wurde.";
+$a->strings["If enabled all your <strong>public</strong> postings can be posted to the associated StatusNet account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry."] = "Wenn aktiviert, so können all deine <strong>öffentlichen</strong> Einträge auf dem verbundenen StatusNet Konto veröffentlicht werden. Du kannst das (hier) als Standardverhalten einstellen oder beim Schreiben eines Beitrags in den Beitragsoptionen festlegen.";
+$a->strings["<strong>Note</strong>: Due your privacy settings (<em>Hide your profile details from unknown viewers?</em>) the link potentially included in public postings relayed to StatusNet will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "<strong>Hinweis</strong>: Aufgrund deiner Privatsphären-Einstellungen (<em>Profil-Details vor unbekannten Betrachtern verbergen?</em>) wird der Link, der eventuell an deinen StatusNet Account angehängt wird, um auf den original Artikel zu verweisen, den Betrachter auf eine leere Seite führen, die ihn darüber informiert, dass der Zugriff eingeschränkt wurde.";
 $a->strings["Allow posting to StatusNet"] = "Veröffentlichung bei StatusNet erlauben";
 $a->strings["Send public postings to StatusNet by default"] = "Veröffentliche öffentliche Beiträge standardmäßig bei StatusNet";
 $a->strings["Clear OAuth configuration"] = "OAuth-Konfiguration löschen";
@@ -1011,25 +1011,25 @@ $a->strings["WordPress API URL"] = "WordPress-API-URL";
 $a->strings["Post to WordPress by default"] = "Standardmäßig auf WordPress veröffentlichen";
 $a->strings["\"Show more\" Settings"] = "\"Mehr zeigen\" Einstellungen";
 $a->strings["Enable Show More"] = "Aktiviere \"Mehr zeigen\"";
-$a->strings["Cutting posts after how much characters"] = "Begrenze Beiträge nach der Anzahl der Buchstaben";
+$a->strings["Cutting posts after how much characters"] = "Begrenze Beiträge nach einer bestimmten Anzahl an Buchstaben";
 $a->strings["Show More Settings saved."] = "\"Mehr zeigen\" Einstellungen gesichert.";
 $a->strings["Show More"] = "\"Mehr zeigen\"";
 $a->strings["This website is tracked using the <a href='http://www.piwik.org'>Piwik</a> analytics tool."] = "Diese Website benutzt <a href='http://www.piwik.org'>Piwik</a>, eine Open Source-Software zur statistischen Auswertung der Besucherzugriffe.";
 $a->strings["If you do not want that your visits are logged this way you <a href='%s'>can set a cookie to prevent Piwik from tracking further visits of the site</a> (opt-out)."] = "Wenn Du nicht willst, dass Deine Besuche auf diese Weise gespeichert werden, kannst Du <a href='%s'>ein Cookie setzen</a>. Dann wird Piwik Dich auf dieser Website nicht mehr verfolgen (opt-out).";
 $a->strings["Piwik Base URL"] = "Piwik Basis URL";
-$a->strings["Absolute path to your Piwik installation. (without protocol (http/s), with trailing slash)"] = "Absoluter Pfad zu deiner Piwik Installation (ohen Protokoll (http/s) und mit abschließendem Schrägstrich)";
+$a->strings["Absolute path to your Piwik installation. (without protocol (http/s), with trailing slash)"] = "Absoluter Pfad zu deiner Piwik Installation (ohne Protokoll (http/s) und mit abschließendem Schrägstrich)";
 $a->strings["Site ID"] = "Seiten ID";
 $a->strings["Show opt-out cookie link?"] = "Link zum Setzen des Opt-Out Cookies anzeigen?";
-$a->strings["Asynchronous tracking"] = "Asynchroned Tracken";
+$a->strings["Asynchronous tracking"] = "Asynchrones Tracken";
 $a->strings["Post to Twitter"] = "Bei Twitter veröffentlichen";
 $a->strings["Twitter settings updated."] = "Twitter Einstellungen aktualisiert.";
 $a->strings["Twitter Posting Settings"] = "Twitter-Beitragseinstellungen";
 $a->strings["No consumer key pair for Twitter found. Please contact your site administrator."] = "Kein Consumer-Schlüsselpaar für Twitter gefunden. Bitte wende dich an den Administrator der Seite.";
-$a->strings["At this Friendica instance the Twitter plugin was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your <strong>public</strong> posts will be posted to Twitter."] = "Auf diesem Friendica-Server wurde das Twitter-Plugin aktiviert, aber du hast deinen Account noch nicht mit deinem Twitter-Account verbunden. Klicke dazu die Schaltfläche unten. Du erhältst dann eine PIN von Twitter, die du in das Eingabefeld unten kopieren musst. Nicht vergessen, den Senden-Knopf zu drücken! Nur <strong>öffentliche</strong> Beiträge werden bei Twitter veröffentlicht.";
+$a->strings["At this Friendica instance the Twitter plugin was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your <strong>public</strong> posts will be posted to Twitter."] = "Auf diesem Friendica-Server wurde das Twitter-Plugin aktiviert, aber du hast deinen Account noch nicht mit deinem Twitter-Account verbunden. Klicke dazu auf die Schaltfläche unten. Du erhältst dann eine PIN von Twitter, die du dann in das Eingabefeld unten einfügst. Denk daran, den Senden-Knopf zu drücken! Nur <strong>öffentliche</strong> Beiträge werden bei Twitter veröffentlicht.";
 $a->strings["Log in with Twitter"] = "bei Twitter anmelden";
 $a->strings["Copy the PIN from Twitter here"] = "Kopiere die Twitter-PIN hier her";
-$a->strings["If enabled all your <strong>public</strong> postings can be posted to the associated Twitter account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry."] = "Wenn aktiviert können all deine <strong>öffentlichen</strong> Einträge auf dem verbundenen Twitter Konto veröffentlicht werden. Du kannst dies (hier) als Standardverhalten einstellen oder beim Schreiben eines Beitrags in den Beitragsoptionen festlegen.";
-$a->strings["<strong>Note</strong>: Due your privacy settings (<em>Hide your profile details from unknown viewers?</em>) the link potentially included in public postings relayed to Twitter will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "<strong>Hinweis</strong>: Aufgrund deiner Privatsphären Einstellungen (<em>Profil-Details vor unbekannten Betrachtern verbergen?</em>) wird der Link der eventuell an an deinen Twitter Account weitergeleitete angehangen wird um auf den original Artikel zu verweisen den Betrachter auf eine leere Seite führen, auf der er darüber informiert wird, dass der Zugriff eingeschränkt wurde.";
+$a->strings["If enabled all your <strong>public</strong> postings can be posted to the associated Twitter account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry."] = "Wenn aktiviert, so können all deine <strong>öffentlichen</strong> Einträge auf dem verbundenen Twitter Konto veröffentlicht werden. Du kannst dies (hier) als Standardverhalten einstellen oder beim Schreiben eines Beitrags in den Beitragsoptionen festlegen.";
+$a->strings["<strong>Note</strong>: Due your privacy settings (<em>Hide your profile details from unknown viewers?</em>) the link potentially included in public postings relayed to Twitter will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "<strong>Hinweis</strong>: Aufgrund deiner Privatsphären-Einstellungen (<em>Profil-Details vor unbekannten Betrachtern verbergen?</em>) wird der Link, der eventuell an an deinen Twitter Account angehängt wird, um auf den original Artikel zu verweisen, den Betrachter auf eine leere Seite führen, die ihn darüber informiert, dass der Zugriff eingeschränkt wurde.";
 $a->strings["Allow posting to Twitter"] = "Veröffentlichung bei Twitter erlauben";
 $a->strings["Send public postings to Twitter by default"] = "Veröffentliche öffentliche Beiträge standardmäßig bei Twitter";
 $a->strings["Consumer key"] = "Consumer Key";
@@ -1065,9 +1065,9 @@ $a->strings["Shady, spammer, self-marketer"] = "Zwielichtig, Spammer, Selbstdars
 $a->strings["Known to me, but no opinion"] = "Ist mir bekannt, hab aber keine Meinung";
 $a->strings["OK, probably harmless"] = "OK, wahrscheinlich harmlos";
 $a->strings["Reputable, has my trust"] = "Seriös, hat mein Vertrauen";
-$a->strings["Frequently"] = "Häufig";
+$a->strings["Frequently"] = "immer wieder";
 $a->strings["Hourly"] = "Stündlich";
-$a->strings["Twice daily"] = "Zweimal Täglich";
+$a->strings["Twice daily"] = "Zweimal täglich";
 $a->strings["Daily"] = "Täglich";
 $a->strings["Weekly"] = "Wöchentlich";
 $a->strings["Monthly"] = "Monatlich";
@@ -1117,7 +1117,7 @@ $a->strings["Casual"] = "Casual";
 $a->strings["Engaged"] = "Verlobt";
 $a->strings["Married"] = "Verheiratet";
 $a->strings["Partners"] = "Partner";
-$a->strings["Cohabiting"] = "kohabitierend";
+$a->strings["Cohabiting"] = "zusammenlebend";
 $a->strings["Happy"] = "Glücklich";
 $a->strings["Not Looking"] = "Nicht auf der Suche";
 $a->strings["Swinger"] = "Swinger";
@@ -1171,7 +1171,7 @@ $a->strings["Attachments:"] = "Anhänge:";
 $a->strings["[Relayed] Comment authored by %s from network %s"] = "[Weitergeleitet] Kommentar von %s aus dem %s Netzwerk";
 $a->strings["Embedded content"] = "Eingebetteter Inhalt";
 $a->strings["Embedding disabled"] = "Einbettungen deaktiviert";
-$a->strings["A deleted group with this name was revived. Existing item permissions <strong>may</strong> apply to this group and any future members. If this is not what you intended, please create another group with a different name."] = "Eine gelöschte Gruppe mit diesem Namen wurde wiederbelebt. Bestehende Berechtigungseinstellungen <strong>könnten</strong> auf diese Gruppe oder zukünftige Mitglieder angewandt werden. Falls du dies nicht möchtest erstelle bitte eine andere Gruppe mit einem anderen Namen.";
+$a->strings["A deleted group with this name was revived. Existing item permissions <strong>may</strong> apply to this group and any future members. If this is not what you intended, please create another group with a different name."] = "Eine gelöschte Gruppe mit diesem Namen wurde wiederbelebt. Bestehende Berechtigungseinstellungen <strong>könnten</strong> auf diese Gruppe oder zukünftige Mitglieder angewandt werden. Falls du dies nicht möchtest, erstelle bitte eine andere Gruppe mit einem anderen Namen.";
 $a->strings["Everybody"] = "Alle Kontakte";
 $a->strings["edit"] = "bearbeiten";
 $a->strings["Groups"] = "Gruppen";
@@ -1200,7 +1200,7 @@ $a->strings["People directory"] = "Nutzerverzeichnis";
 $a->strings["Conversations from your friends"] = "Unterhaltungen deiner Kontakte";
 $a->strings["Friend Requests"] = "Kontaktanfragen";
 $a->strings["See all notifications"] = "Alle Benachrichtigungen anzeigen";
-$a->strings["Mark all system notifications seen"] = "Markiere alle System Benachrichtigungen als gelesen";
+$a->strings["Mark all system notifications seen"] = "Markiere alle System-Benachrichtigungen als gelesen";
 $a->strings["Private mail"] = "Private Email";
 $a->strings["Manage"] = "Verwalten";
 $a->strings["Manage other pages"] = "Andere Seiten verwalten";
@@ -1245,7 +1245,7 @@ $a->strings["second"] = "Sekunde";
 $a->strings["seconds"] = "Sekunden";
 $a->strings["%1\$d %2\$s ago"] = "%1\$d %2\$s her";
 $a->strings["From: "] = "Von: ";
-$a->strings["$1 wrote:"] = "$1 geschrieben:";
+$a->strings["$1 wrote:"] = "$1 hat geschrieben:";
 $a->strings["Image/photo"] = "Bild/Foto";
 $a->strings["Cannot locate DNS info for database server '%s'"] = "Kann die DNS Informationen für den Datenbanken Server '%s' nicht ermitteln.";
 $a->strings["[no subject]"] = "[kein Betreff]";
@@ -1312,14 +1312,14 @@ $a->strings["%d comment"] = array(
 $a->strings["show more"] = "mehr anzeigen";
 $a->strings["like"] = "mag ich";
 $a->strings["dislike"] = "mag ich nicht";
-$a->strings["Share this"] = "Teilen";
+$a->strings["Share this"] = "Teile dieses";
 $a->strings["share"] = "Teilen";
 $a->strings["add star"] = "markieren";
 $a->strings["remove star"] = "Markierung entfernen";
 $a->strings["toggle star status"] = "Markierung umschalten";
 $a->strings["starred"] = "markiert";
 $a->strings["add tag"] = "Tag hinzufügen";
-$a->strings["to"] = "to";
+$a->strings["to"] = "zu";
 $a->strings["Wall-to-Wall"] = "Wall-to-Wall";
 $a->strings["via Wall-To-Wall:"] = "via Wall-To-Wall:";
 $a->strings["Delete Selected Items"] = "Lösche die markierten Beiträge";
@@ -1331,7 +1331,7 @@ $a->strings["and"] = "und";
 $a->strings[", and %d other people"] = " und %d andere";
 $a->strings["%s like this."] = "%s mögen das.";
 $a->strings["%s don't like this."] = "%s mögen das nicht.";
-$a->strings["Visible to <strong>everybody</strong>"] = "Für <strong>Jedermann</strong> sichtbar";
+$a->strings["Visible to <strong>everybody</strong>"] = "Für <strong>jedermann</strong> sichtbar";
 $a->strings["Please enter a video link/URL:"] = "Bitte Link/URL zum Video einfügen:";
 $a->strings["Please enter an audio link/URL:"] = "Bitte Link/URL zum Audio einfügen:";
 $a->strings["Tag term:"] = "Tag:";
diff --git a/view/group_edit.tpl b/view/group_edit.tpl
index 51782ab95..3689db753 100755
--- a/view/group_edit.tpl
+++ b/view/group_edit.tpl
@@ -2,17 +2,21 @@
 
 
 <div id="group-edit-wrapper" >
-<form action="group/$gid" id="group-edit-form" method="post" >
-<div id="group-edit-name-wrapper" >
-<label id="group-edit-name-label" for="group-edit-name" >$gname</label>
-<input type="text" id="group-edit-name" name="groupname" value="$name" />
-</div>
-<div id="group-edit-name-end"></div>
-$drop
-<div id="group-edit-submit-wrapper" >
-<input type="submit" name="submit" value="$submit" >
-</div>
-<div id="group-edit-desc">$desc</div>
-<div id="group-edit-select-end" ></div>
-</form>
+	<form action="group/$gid" id="group-edit-form" method="post" >
+		
+		{{ inc field_input.tpl with $field=$gname }}{{ endinc }}
+		{{ if $drop }}$drop{{ endif }}
+		<div id="group-edit-submit-wrapper" >
+			<input type="submit" name="submit" value="$submit" >
+		</div>
+		<div id="group-edit-select-end" ></div>
+	</form>
 </div>
+
+
+{{ if $groupeditor }}
+	<div id="group-update-wrapper">
+		{{ inc groupeditor.tpl }}{{ endinc }}
+	</div>
+{{ endif }}
+{{ if $desc }}<div id="group-edit-desc">$desc</div>{{ endif }}
diff --git a/view/group_new.tpl b/view/group_new.tpl
deleted file mode 100755
index 735b51634..000000000
--- a/view/group_new.tpl
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-<div id="group-new-wrapper" >
-<form action="group/new" method="post">
-
-<div id="group-new-text">
-<p>
-$desc
-
-<div id="group-new-input-wrapper">
-<label id="group-new-label" for="group-new-name" >$name</label>
-<input name="groupname" id="group-new-name" />
-</div>
-<div id="group-new-input-end" ></div>
-
-<div id="group-new-submit-wrapper" >
-<input type="submit" name="submit" value="$submit" />
-</form>
-</div>
-<div id="group-new-end"></div>
-
- 
-\ No newline at end of file
diff --git a/view/groupeditor.tpl b/view/groupeditor.tpl
new file mode 100644
index 000000000..755985eb3
--- /dev/null
+++ b/view/groupeditor.tpl
@@ -0,0 +1,16 @@
+<div id="group">
+<h3>$groupeditor.label_members</h3>
+<div id="group-members" class="contact_list">
+{{ for $groupeditor.members as $c}} $c {{ endfor }}
+</div>
+<div id="group-members-end"></div>
+<hr id="group-separator" />
+</div>
+
+<div id="contacts">
+<h3>$groupeditor.label_contacts</h3>
+<div id="group-all-contacts" class="contact_list">
+{{ for $groupeditor.contacts as $m}} $m {{ endfor }}
+</div>
+<div id="group-all-contacts-end"></div>
+</div>
diff --git a/view/jot.tpl b/view/jot.tpl
index 2c1ce5ae1..2f89d4372 100755
--- a/view/jot.tpl
+++ b/view/jot.tpl
@@ -1,9 +1,9 @@
 <form id="profile-jot-form" action="$action" method="post">
 	<div id="jot">
-		<div id="profile-jot-desc" class="jothidden" >&nbsp;</div>
-		<input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" style="display:none">
+		<div id="profile-jot-desc" class="jothidden">&nbsp;</div>
+		<input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" style="display:none" />
 		<div id="character-counter" class="grey jothidden"></div>
-		
+
 		<input type="hidden" name="type" value="$ptyp" />
 		<input type="hidden" name="profile_uid" value="$profile_uid" />
 		<input type="hidden" name="return" value="$return_path" />
@@ -11,9 +11,9 @@
 		<input type="hidden" name="coord" id="jot-coord" value="" />
 		<input type="hidden" name="post_id" value="$post_id" />
 		<input type="hidden" name="preview" id="jot-preview" value="0" />
-		
-		<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" >{{ if $content }}$content{{ else }}$share{{ endif }}</textarea>		
-				
+
+		<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" >{{ if $content }}$content{{ else }}$share{{ endif }}</textarea>
+
 		<ul id="jot-tools" class="jothidden" style="display:none">
 			<li><a href="#" onclick="return false;" id="wall-image-upload" title="$upload">$shortupload</a></a></li>
 			<li><a href="#" onclick="return false;" id="wall-file-upload"  title="$attach">$shortattach</a></li>
@@ -41,13 +41,8 @@
 			<div id="profile-jot-email-end"></div>
 			$jotnets
 		</div>
-	</div>	
+	</div>
 
-	
 </form>
 
 {{ if $content }}<script>initEditor();</script>{{ endif }}
-
-
-
-
diff --git a/view/msg-header.tpl b/view/msg-header.tpl
index a74154c19..b5c78345a 100755
--- a/view/msg-header.tpl
+++ b/view/msg-header.tpl
@@ -2,55 +2,38 @@
 <script language="javascript" type="text/javascript" src="$baseurl/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script>
 <script language="javascript" type="text/javascript">
 
-tinyMCE.init({
-	theme : "advanced",
-	mode : "specific_textareas",
-	editor_selector: /(profile-jot-text|prvmail-text)/,
-	plugins : "bbcode,paste",
-	theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor",
-	theme_advanced_buttons2 : "",
-	theme_advanced_buttons3 : "",
-	theme_advanced_toolbar_location : "top",
-	theme_advanced_toolbar_align : "center",
-	theme_advanced_blockformats : "blockquote,code",
-	paste_text_sticky : true,
-	entity_encoding : "raw",
-	add_unload_trigger : false,
-	remove_linebreaks : false,
-	force_p_newlines : false,
-	force_br_newlines : true,
-	forced_root_block : '',
-	convert_urls: false,
-	content_css: "$baseurl/view/custom_tinymce.css",
-	     //Character count
-	theme_advanced_path : false,
-	setup : function(ed) {
-		ed.onKeyUp.add(function(ed, e) {
-			var txt = tinyMCE.activeEditor.getContent();
-			var text = txt.length;
-			if(txt.length <= 140) {
-				$('#character-counter').removeClass('red');
-				$('#character-counter').removeClass('orange');
-				$('#character-counter').addClass('grey');
-			}
-			if((txt.length > 140) && (txt .length <= 420)) {
-				$('#character-counter').removeClass('grey');
-				$('#character-counter').removeClass('red');
-				$('#character-counter').addClass('orange');
-			}
-			if(txt.length > 420) {
-				$('#character-counter').removeClass('grey');
-				$('#character-counter').removeClass('orange');
-				$('#character-counter').addClass('red');
-			}
-			$('#character-counter').text(text);
-    	});
+var plaintext = '$editselect';
 
-		ed.onInit.add(function(ed) {
-			ed.pasteAsPlainText = true;
-		});
-	}
-});
+if(plaintext != 'none') {
+	tinyMCE.init({
+		theme : "advanced",
+		mode : "specific_textareas",
+		editor_selector: /(profile-jot-text|prvmail-text)/,
+		plugins : "bbcode,paste",
+		theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor",
+		theme_advanced_buttons2 : "",
+		theme_advanced_buttons3 : "",
+		theme_advanced_toolbar_location : "top",
+		theme_advanced_toolbar_align : "center",
+		theme_advanced_blockformats : "blockquote,code",
+		paste_text_sticky : true,
+		entity_encoding : "raw",
+		add_unload_trigger : false,
+		remove_linebreaks : false,
+		force_p_newlines : false,
+		force_br_newlines : true,
+		forced_root_block : '',
+		convert_urls: false,
+		content_css: "$baseurl/view/custom_tinymce.css",
+		     //Character count
+		theme_advanced_path : false,
+		setup : function(ed) {
+			ed.onInit.add(function(ed) {
+				ed.pasteAsPlainText = true;
+			});
+		}
+	});
+}
 
 </script>
 <script type="text/javascript" src="js/ajaxupload.js" ></script>
diff --git a/view/nets.tpl b/view/nets.tpl
index 0953e66a6..cbadf1361 100755
--- a/view/nets.tpl
+++ b/view/nets.tpl
@@ -5,7 +5,7 @@
 	<ul class="nets-ul">
 		<li class="tool {{ if $sel_all }}selected{{ endif }}"><a href="$base" class="nets-link nets-all">$all</a>
 		{{ for $nets as $net }}
-			<li class="tool {{ if $net.selected }}selected{{ endif }}"><a href="$base?nets=$net.ref" class="nets-link">$net.name</a></li>
+			<li class="tool {{ if $net.selected }}selected{{ endif }}"><a href="$base?f=&nets=$net.ref" class="nets-link">$net.name</a></li>
 		{{ endfor }}
 	</ul>
 	
diff --git a/view/search_item.tpl b/view/search_item.tpl
index de8bd2396..80d6678fb 100755
--- a/view/search_item.tpl
+++ b/view/search_item.tpl
@@ -1,75 +1,75 @@
 
 <div class="wall-item-decor">
-	<span class="icon s22 star $isstarred" id="starred-$id" title="$star.starred">$star.starred</span>
-	{{ if $lock }}<span class="icon s22 lock fakelink" onclick="lockview(event,$id);" title="$lock">$lock</span>{{ endif }}	
-	<img id="like-rotator-$id" class="like-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
+	<span class="icon s22 star $item.isstarred" id="starred-$item.id" title="$item.star.starred">$item.star.starred</span>
+	{{ if $item.lock }}<span class="icon s22 lock fakelink" onclick="lockview(event,$item.id);" title="$item.lock">$item.lock</span>{{ endif }}	
+	<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
 </div>
 
-<div class="wall-item-container $indent">
+<div class="wall-item-container $item.indent">
 	<div class="wall-item-item">
 		<div class="wall-item-info">
 			<div class="contact-photo-wrapper"
-				onmouseover="if (typeof t$id != 'undefined') clearTimeout(t$id); openMenu('wall-item-photo-menu-button-$id')" 
-				onmouseout="t$id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$id\'); closeMenu(\'wall-item-photo-menu-$id\');',200)">
-				<a href="$profile_url" target="redir" title="$linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$id">
-					<img src="$thumb" class="contact-photo$sparkle" id="wall-item-photo-$id" alt="$name" />
+				onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')" 
+				onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)">
+				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id">
+					<img src="$item.thumb" class="contact-photo$item.sparkle" id="wall-item-photo-$item.id" alt="$item.name" />
 				</a>
-				<a href="#" rel="#wall-item-photo-menu-$id" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-$id">menu</a>
-				<ul class="wall-item-menu menu-popup" id="wall-item-photo-menu-$id">
-				$item_photo_menu
+				<a href="#" rel="#wall-item-photo-menu-$item.id" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-$item.id">menu</a>
+				<ul class="wall-item-menu menu-popup" id="wall-item-photo-menu-$item.id">
+				$item.item_photo_menu
 				</ul>
 				
 			</div>
-			<div class="wall-item-location">$location</div>	
+			<div class="wall-item-location">$item.location</div>	
 		</div>
 		<div class="wall-item-content">
-			{{ if $title }}<h2><a href="$plink.href">$title</a></h2>{{ endif }}
-			$body
+			{{ if $item.title }}<h2><a href="$item.plink.href">$item.title</a></h2>{{ endif }}
+			$item.body
 		</div>
 	</div>
 	<div class="wall-item-bottom">
 		<div class="wall-item-links">
 		</div>
 		<div class="wall-item-tags">
-			{{ for $tags as $tag }}
+			{{ for $item.tags as $tag }}
 				<span class='tag'>$tag</span>
 			{{ endfor }}
 		</div>
 	</div>
 	<div class="wall-item-bottom">
 		<div class="">
-			{{ if $plink }}<a class="icon s16 link" title="$plink.title" href="$plink.href">$plink.title</a>{{ endif }}
+			{{ if $item.plink }}<a class="icon s16 link" title="$item.plink.title" href="$item.plink.href">$item.plink.title</a>{{ endif }}
 		</div>
 		<div class="wall-item-actions">
 			<div class="wall-item-actions-author">
-				<a href="$profile_url" target="redir" title="$linktitle" class="wall-item-name-link"><span class="wall-item-name$sparkle">$name</span></a> <span class="wall-item-ago">$ago</span>
+				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle">$item.name</span></a> <span class="wall-item-ago">$item.ago</span>
 			</div>
 			
 			<div class="wall-item-actions-social">
-			{{ if $star }}
-				<a href="#" id="star-$id" onclick="dostar($id); return false;"  class="$star.classdo"  title="$star.do">$star.do</a>
-				<a href="#" id="unstar-$id" onclick="dostar($id); return false;"  class="$star.classundo"  title="$star.undo">$star.undo</a>
-				<a href="#" id="tagger-$id" onclick="itemTag($id); return false;" class="$star.classtagger" title="$star.tagger">$star.tagger</a>
+			{{ if $item.star }}
+				<a href="#" id="star-$item.id" onclick="dostar($item.id); return false;"  class="$item.star.classdo"  title="$item.star.do">$item.star.do</a>
+				<a href="#" id="unstar-$item.id" onclick="dostar($item.id); return false;"  class="$item.star.classundo"  title="$item.star.undo">$item.star.undo</a>
+				<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="$item.star.classtagger" title="$item.star.tagger">$item.star.tagger</a>
 			{{ endif }}
 			
-			{{ if $vote }}
-				<a href="#" id="like-$id" title="$vote.like.0" onclick="dolike($id,'like'); return false">$vote.like.1</a>
-				<a href="#" id="dislike-$id" title="$vote.dislike.0" onclick="dolike($id,'dislike'); return false">$vote.dislike.1</a>
+			{{ if $item.vote }}
+				<a href="#" id="like-$item.id" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false">$item.vote.like.1</a>
+				<a href="#" id="dislike-$item.id" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false">$item.vote.dislike.1</a>
 			{{ endif }}
 						
-			{{ if $vote.share }}
-				<a href="#" id="share-$id" title="$vote.share.0" onclick="jotShare($id); return false">$vote.share.1</a>
+			{{ if $item.vote.share }}
+				<a href="#" id="share-$item.id" title="$item.vote.share.0" onclick="jotShare($item.id); return false">$item.vote.share.1</a>
 			{{ endif }}			
 			</div>
 			
 			<div class="wall-item-actions-tools">
 
-				{{ if $drop.dropping }}
-					<input type="checkbox" title="$drop.select" name="itemselected[]" class="item-select" value="$id" />
-					<a href="item/drop/$id" onclick="return confirmDelete();" class="icon delete s16" title="$drop.delete">$drop.delete</a>
+				{{ if $item.drop.dropping }}
+					<input type="checkbox" title="$item.drop.select" name="itemselected[]" class="item-select" value="$item.id" />
+					<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon delete s16" title="$item.drop.delete">$item.drop.delete</a>
 				{{ endif }}
-				{{ if $edpost }}
-					<a class="icon edit s16" href="$edpost.0" title="$edpost.1"></a>
+				{{ if $item.edpost }}
+					<a class="icon edit s16" href="$item.edpost.0" title="$item.edpost.1"></a>
 				{{ endif }}
 			</div>
 			
@@ -77,11 +77,11 @@
 	</div>
 	<div class="wall-item-bottom">
 		<div class="wall-item-links"></div>
-		<div class="wall-item-like" id="wall-item-like-$id">$like</div>
-		<div class="wall-item-dislike" id="wall-item-dislike-$id">$dislike</div>
-		{{ if $conv }}
-		<div class="wall-item-conv" id="wall-item-conv-$id" >
-			<a href='$conv.href' id='context-$id' title='$conv.title'>$conv.title</a>
+		<div class="wall-item-like" id="wall-item-like-$item.id">$item.like</div>
+		<div class="wall-item-dislike" id="wall-item-dislike-$item.id">$item.dislike</div>
+		{{ if $item.conv }}
+		<div class="wall-item-conv" id="wall-item-conv-$item.id" >
+			<a href='$item.conv.href' id='context-$item.id' title='$item.conv.title'>$item.conv.title</a>
 		{{ endif }}
 		</div>
 	</div>
diff --git a/view/settings.tpl b/view/settings.tpl
index 1172df8b9..b7f427b32 100755
--- a/view/settings.tpl
+++ b/view/settings.tpl
@@ -60,9 +60,9 @@ $suggestme
 
 {{inc field_input.tpl with $field=$expire.days }}{{endinc}}
 <div class="field input">
-	<span class="field_help"><a href="#advaced-expire-popup" id="advenced-expire" class='popupbox' title="$expire.advanced">$expire.label</a></span>
+	<span class="field_help"><a href="#advanced-expire-popup" id="advanced-expire" class='popupbox' title="$expire.advanced">$expire.label</a></span>
 	<div style="display: none;">
-		<div id="advaced-expire-popup" style="width:auto;height:auto;overflow:auto;">
+		<div id="advanced-expire-popup" style="width:auto;height:auto;overflow:auto;">
 			<h3>$expire.advanced</h3>
 			{{ inc field_yesno.tpl with $field=$expire.items }}{{endinc}}
 			{{ inc field_yesno.tpl with $field=$expire.notes }}{{endinc}}
diff --git a/view/theme/darkzero/style.css b/view/theme/darkzero/style.css
index fdaf26f19..3b395ff2a 100755
--- a/view/theme/darkzero/style.css
+++ b/view/theme/darkzero/style.css
@@ -24,7 +24,8 @@ nav #banner #logo-text a { color: #ffffff; }
 
 .wall-item-content-wrapper { border: 1px solid #444444; }
 .wall-item-tools {	background-color: #444444;   background-image: none;}
-.comment-edit-wrapper{ background-color: #333333; }
+.comment-wwedit-wrapper{ background-color: #333333; }
+.comment-edit-preview{ color: #000000; }
 .wall-item-content-wrapper.comment { background-color: #444444; border: 0px;}
 .photo-top-album-name{ background-color: #333333; }
 .photo-album-image-wrapper .caption { background-color: rgba(51, 51, 51, 0.8); color: #FFFFFF; }
@@ -92,3 +93,11 @@ blockquote {
 	background: #ddd;
 	color: #000;
 }
+
+.acl-list-item p, #profile-jot-email-label, div#jot-preview-content, div.profile-jot-net {
+        color: #000000;
+}
+
+input#acl-search {
+        background-color: #aaa;
+}
diff --git a/view/theme/darkzero/theme.php b/view/theme/darkzero/theme.php
index 37632c4b5..839d862a1 100755
--- a/view/theme/darkzero/theme.php
+++ b/view/theme/darkzero/theme.php
@@ -4,6 +4,8 @@
  * Name: Darkzero
  * Version: 1.0
  * Author: Fabio Communi <fabrix.xm@gmail.com>
+ * Maintainer: Fabio Communi <fabrix.xm@gmail.com>
+ * Maintainer: Mike Macgirvin <mike@macgirvin.com>
  */
 
 $a->theme_info = array(
diff --git a/view/theme/diabook-blue/comment_item.tpl b/view/theme/diabook-blue/comment_item.tpl
new file mode 100644
index 000000000..85176732b
--- /dev/null
+++ b/view/theme/diabook-blue/comment_item.tpl
@@ -0,0 +1,35 @@
+		<div class="comment-wwedit-wrapper" id="comment-edit-wrapper-$id" style="display: block;">
+			<form class="comment-edit-form" id="comment-edit-form-$id" action="item" method="post" onsubmit="post_comment($id); return false;">
+				<input type="hidden" name="type" value="$type" />
+				<input type="hidden" name="profile_uid" value="$profile_uid" />
+				<input type="hidden" name="parent" value="$parent" />
+				<input type="hidden" name="return" value="$return_path" />
+				<input type="hidden" name="jsreload" value="$jsreload" />
+				<input type="hidden" name="preview" id="comment-preview-inp-$id" value="0" />
+
+				<div class="comment-edit-photo" id="comment-edit-photo-$id" >
+					<a class="comment-edit-photo-link" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a>
+				</div>
+				<div class="comment-edit-photo-end"></div>
+				<textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);" onBlur="commentClose(this,$id);" >$comment</textarea>
+
+				{{ if $qcomment }}
+                <ul class="qcomment-wrapper">
+				{{ for $qcomment as $qc }}				
+					<li class="fakelink qcomment"
+                    onclick="commentInsert(this,$id); return false;">$qc</li>
+				{{ endfor }}
+                </ul>
+				{{ endif }}
+
+				<div class="comment-edit-text-end"></div>
+				<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-$id" style="display: none;">
+					<input type="submit" onclick="post_comment($id); return false;" id="comment-edit-submit-$id" class="comment-edit-submit" name="submit" value="$submit" />
+					<span onclick="preview_comment($id);" id="comment-edit-preview-link-$id" class="fakelink">$preview</span>
+					<div id="comment-edit-preview-$id" class="comment-edit-preview" style="display:none;"></div>
+				</div>
+
+				<div class="comment-edit-end"></div>
+			</form>
+
+		</div>
diff --git a/view/theme/diabook-blue/contact_template.tpl b/view/theme/diabook-blue/contact_template.tpl
new file mode 100755
index 000000000..48930b48a
--- /dev/null
+++ b/view/theme/diabook-blue/contact_template.tpl
@@ -0,0 +1,25 @@
+
+<div class="contact-entry-wrapper" id="contact-entry-wrapper-$contact.id" >
+	<div class="contact-entry-photo-wrapper" >
+		<div class="contact-entry-photo mframe" id="contact-entry-photo-$contact.id"
+		onmouseover="if (typeof t$contact.id != 'undefined') clearTimeout(t$contact.id); openMenu('contact-photo-menu-button-$contact.id')" 
+		onmouseout="t$contact.id=setTimeout('closeMenu(\'contact-photo-menu-button-$contact.id\'); closeMenu(\'contact-photo-menu-$contact.id\');',200)" >
+
+			<a href="$contact.url" title="$contact.img_hover" /><img src="$contact.thumb" $contact.sparkle alt="$contact.name" /></a>
+
+			{{ if $contact.photo_menu }}
+			<span onclick="openClose('contact-photo-menu-$contact.id');" class="fakelink contact-photo-menu-button" id="contact-photo-menu-button-$contact.id">menu</span>
+                <div class="contact-photo-menu" id="contact-photo-menu-$contact.id">
+                    <ul>
+                        $contact.photo_menu
+                    </ul>
+                </div>
+			{{ endif }}
+		</div>
+			
+	</div>
+	<div class="contact-entry-photo-end" ></div>
+		<div class="contact-entry-name" id="contact-entry-name-$contact.id" >$contact.name</div>
+
+	<div class="contact-entry-end" ></div>
+</div>
diff --git a/view/theme/ghost/unsupported b/view/theme/diabook-blue/experimental
index e69de29bb..e69de29bb 100644..100755
--- a/view/theme/ghost/unsupported
+++ b/view/theme/diabook-blue/experimental
diff --git a/view/theme/diabook-blue/icons/attach.png b/view/theme/diabook-blue/icons/attach.png
new file mode 100755
index 000000000..1958041cf
--- /dev/null
+++ b/view/theme/diabook-blue/icons/attach.png
diff --git a/view/theme/diabook-blue/icons/audio.png b/view/theme/diabook-blue/icons/audio.png
new file mode 100755
index 000000000..8d779a409
--- /dev/null
+++ b/view/theme/diabook-blue/icons/audio.png
diff --git a/view/theme/diabook-blue/icons/bluebug.png b/view/theme/diabook-blue/icons/bluebug.png
new file mode 100644
index 000000000..3979e7d8e
--- /dev/null
+++ b/view/theme/diabook-blue/icons/bluebug.png
diff --git a/view/theme/diabook-blue/icons/camera.png b/view/theme/diabook-blue/icons/camera.png
new file mode 100755
index 000000000..a5c7f1236
--- /dev/null
+++ b/view/theme/diabook-blue/icons/camera.png
diff --git a/view/theme/diabook-blue/icons/community.png b/view/theme/diabook-blue/icons/community.png
new file mode 100644
index 000000000..7c91e8b75
--- /dev/null
+++ b/view/theme/diabook-blue/icons/community.png
diff --git a/view/theme/diabook-blue/icons/contacts.png b/view/theme/diabook-blue/icons/contacts.png
new file mode 100644
index 000000000..ca714acaf
--- /dev/null
+++ b/view/theme/diabook-blue/icons/contacts.png
diff --git a/view/theme/diabook-blue/icons/contacts2.png b/view/theme/diabook-blue/icons/contacts2.png
new file mode 100755
index 000000000..7817279f4
--- /dev/null
+++ b/view/theme/diabook-blue/icons/contacts2.png
diff --git a/view/theme/diabook-blue/icons/dislike.png b/view/theme/diabook-blue/icons/dislike.png
new file mode 100644
index 000000000..23de426c5
--- /dev/null
+++ b/view/theme/diabook-blue/icons/dislike.png
diff --git a/view/theme/diabook-blue/icons/drop.png b/view/theme/diabook-blue/icons/drop.png
new file mode 100755
index 000000000..2abb82ef2
--- /dev/null
+++ b/view/theme/diabook-blue/icons/drop.png
diff --git a/view/theme/diabook-blue/icons/ftdevs.gif b/view/theme/diabook-blue/icons/ftdevs.gif
new file mode 100644
index 000000000..e0fc25743
--- /dev/null
+++ b/view/theme/diabook-blue/icons/ftdevs.gif
diff --git a/view/theme/diabook-blue/icons/globe.png b/view/theme/diabook-blue/icons/globe.png
new file mode 100644
index 000000000..6bb9bc09d
--- /dev/null
+++ b/view/theme/diabook-blue/icons/globe.png
diff --git a/view/theme/diabook-blue/icons/head.jpg b/view/theme/diabook-blue/icons/head.jpg
new file mode 100644
index 000000000..6210b76be
--- /dev/null
+++ b/view/theme/diabook-blue/icons/head.jpg
diff --git a/view/theme/diabook-blue/icons/isstar.png b/view/theme/diabook-blue/icons/isstar.png
new file mode 100644
index 000000000..c955b25b5
--- /dev/null
+++ b/view/theme/diabook-blue/icons/isstar.png
diff --git a/view/theme/diabook-blue/icons/language.png b/view/theme/diabook-blue/icons/language.png
new file mode 100644
index 000000000..8029c0155
--- /dev/null
+++ b/view/theme/diabook-blue/icons/language.png
diff --git a/view/theme/diabook-blue/icons/like.png b/view/theme/diabook-blue/icons/like.png
new file mode 100644
index 000000000..b65edccc0
--- /dev/null
+++ b/view/theme/diabook-blue/icons/like.png
diff --git a/view/theme/diabook-blue/icons/link.png b/view/theme/diabook-blue/icons/link.png
new file mode 100755
index 000000000..0ef666a67
--- /dev/null
+++ b/view/theme/diabook-blue/icons/link.png
diff --git a/view/theme/diabook-blue/icons/lock.png b/view/theme/diabook-blue/icons/lock.png
new file mode 100755
index 000000000..7e34bf279
--- /dev/null
+++ b/view/theme/diabook-blue/icons/lock.png
diff --git a/view/theme/diabook-blue/icons/lupe.png b/view/theme/diabook-blue/icons/lupe.png
new file mode 100755
index 000000000..f8b228347
--- /dev/null
+++ b/view/theme/diabook-blue/icons/lupe.png
diff --git a/view/theme/diabook-blue/icons/messages.png b/view/theme/diabook-blue/icons/messages.png
new file mode 100755
index 000000000..f7010c98c
--- /dev/null
+++ b/view/theme/diabook-blue/icons/messages.png
diff --git a/view/theme/diabook-blue/icons/messages2.png b/view/theme/diabook-blue/icons/messages2.png
new file mode 100644
index 000000000..54b68e7f7
--- /dev/null
+++ b/view/theme/diabook-blue/icons/messages2.png
diff --git a/view/theme/diabook-blue/icons/notifications.png b/view/theme/diabook-blue/icons/notifications.png
new file mode 100755
index 000000000..33ae95c6a
--- /dev/null
+++ b/view/theme/diabook-blue/icons/notifications.png
diff --git a/view/theme/diabook-blue/icons/notify.png b/view/theme/diabook-blue/icons/notify.png
new file mode 100755
index 000000000..8a7bdc38f
--- /dev/null
+++ b/view/theme/diabook-blue/icons/notify.png
diff --git a/view/theme/diabook-blue/icons/notify2.png b/view/theme/diabook-blue/icons/notify2.png
new file mode 100644
index 000000000..407e2dbb4
--- /dev/null
+++ b/view/theme/diabook-blue/icons/notify2.png
diff --git a/view/theme/diabook-blue/icons/pencil.png b/view/theme/diabook-blue/icons/pencil.png
new file mode 100755
index 000000000..772e49b17
--- /dev/null
+++ b/view/theme/diabook-blue/icons/pencil.png
diff --git a/view/theme/diabook-blue/icons/pencil2.png b/view/theme/diabook-blue/icons/pencil2.png
new file mode 100644
index 000000000..3b47d1864
--- /dev/null
+++ b/view/theme/diabook-blue/icons/pencil2.png
diff --git a/view/theme/diabook-blue/icons/recycle.png b/view/theme/diabook-blue/icons/recycle.png
new file mode 100755
index 000000000..c3b8d2bf4
--- /dev/null
+++ b/view/theme/diabook-blue/icons/recycle.png
diff --git a/view/theme/diabook-blue/icons/remote.png b/view/theme/diabook-blue/icons/remote.png
new file mode 100755
index 000000000..a560cc55e
--- /dev/null
+++ b/view/theme/diabook-blue/icons/remote.png
diff --git a/view/theme/diabook-blue/icons/scroll_top.png b/view/theme/diabook-blue/icons/scroll_top.png
new file mode 100755
index 000000000..0e7f7ae6a
--- /dev/null
+++ b/view/theme/diabook-blue/icons/scroll_top.png
diff --git a/view/theme/diabook-blue/icons/selected.png b/view/theme/diabook-blue/icons/selected.png
new file mode 100755
index 000000000..2a30ae252
--- /dev/null
+++ b/view/theme/diabook-blue/icons/selected.png
diff --git a/view/theme/diabook-blue/icons/star.png b/view/theme/diabook-blue/icons/star.png
new file mode 100755
index 000000000..0b00cb189
--- /dev/null
+++ b/view/theme/diabook-blue/icons/star.png
diff --git a/view/theme/diabook-blue/icons/star_dummy.png b/view/theme/diabook-blue/icons/star_dummy.png
new file mode 100644
index 000000000..ce11f30d4
--- /dev/null
+++ b/view/theme/diabook-blue/icons/star_dummy.png
diff --git a/view/theme/diabook-blue/icons/starred.png b/view/theme/diabook-blue/icons/starred.png
new file mode 100755
index 000000000..72a49c157
--- /dev/null
+++ b/view/theme/diabook-blue/icons/starred.png
diff --git a/view/theme/diabook-blue/icons/tagged.png b/view/theme/diabook-blue/icons/tagged.png
new file mode 100755
index 000000000..144649ef8
--- /dev/null
+++ b/view/theme/diabook-blue/icons/tagged.png
diff --git a/view/theme/diabook-blue/icons/toogle_off.png b/view/theme/diabook-blue/icons/toogle_off.png
new file mode 100755
index 000000000..99490bcd9
--- /dev/null
+++ b/view/theme/diabook-blue/icons/toogle_off.png
diff --git a/view/theme/diabook-blue/icons/toogle_on.png b/view/theme/diabook-blue/icons/toogle_on.png
new file mode 100755
index 000000000..81e8f9120
--- /dev/null
+++ b/view/theme/diabook-blue/icons/toogle_on.png
diff --git a/view/theme/diabook-blue/icons/unglobe.png b/view/theme/diabook-blue/icons/unglobe.png
new file mode 100755
index 000000000..aa9b0e189
--- /dev/null
+++ b/view/theme/diabook-blue/icons/unglobe.png
diff --git a/view/theme/diabook-blue/icons/unlock.png b/view/theme/diabook-blue/icons/unlock.png
new file mode 100755
index 000000000..a0cda0ae5
--- /dev/null
+++ b/view/theme/diabook-blue/icons/unlock.png
diff --git a/view/theme/diabook-blue/icons/unstarred.png b/view/theme/diabook-blue/icons/unstarred.png
new file mode 100755
index 000000000..ba3183f5c
--- /dev/null
+++ b/view/theme/diabook-blue/icons/unstarred.png
diff --git a/view/theme/diabook-blue/icons/video.png b/view/theme/diabook-blue/icons/video.png
new file mode 100755
index 000000000..a03d1d818
--- /dev/null
+++ b/view/theme/diabook-blue/icons/video.png
diff --git a/view/theme/diabook-blue/icons/weblink.png b/view/theme/diabook-blue/icons/weblink.png
new file mode 100755
index 000000000..216e78344
--- /dev/null
+++ b/view/theme/diabook-blue/icons/weblink.png
diff --git a/view/theme/diabook-blue/jot.tpl b/view/theme/diabook-blue/jot.tpl
new file mode 100755
index 000000000..387eb1f91
--- /dev/null
+++ b/view/theme/diabook-blue/jot.tpl
@@ -0,0 +1,84 @@
+
+<div id="profile-jot-wrapper" >
+	<div id="profile-jot-banner-wrapper">
+		<div id="profile-jot-desc" >&nbsp;</div>
+		<div id="character-counter" class="grey"></div>
+	</div>
+	<div id="profile-jot-banner-end"></div>
+
+	<form id="profile-jot-form" action="$action" method="post" >
+		<input type="hidden" name="type" value="$ptyp" />
+		<input type="hidden" name="profile_uid" value="$profile_uid" />
+		<input type="hidden" name="return" value="$return_path" />
+		<input type="hidden" name="location" id="jot-location" value="$defloc" />
+		<input type="hidden" name="coord" id="jot-coord" value="" />
+		<input type="hidden" name="post_id" value="$post_id" />
+		<input type="hidden" name="preview" id="jot-preview" value="0" />
+		<input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" style="display:none">
+		<img id="profile-jot-text-loading" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
+		<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" >{{ if $content }}$content{{ else }}$share{{ endif }}</textarea>
+
+
+<div id="profile-jot-submit-wrapper" class="jothidden">
+	
+	<div id="profile-upload-wrapper" style="/*display: $visitor;*/" >
+		<div id="wall-image-upload-div" ><a href="#" onclick="return false;" id="wall-image-upload" class="camera" title="$upload"></a></div>
+	</div> 
+	<div id="profile-attach-wrapper" style="/*display: $visitor;*/" >
+		<div id="wall-file-upload-div" ><a href="#" onclick="return false;" id="wall-file-upload" class="attach" title="$attach"></a></div>
+	</div> 
+
+	<div id="profile-link-wrapper" style="/*display: $visitor;*/" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" >
+		<a id="profile-link" class="weblink" title="$weblink" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;"></a>
+	</div> 
+	<div id="profile-video-wrapper" style="/*display: $visitor;*/" >
+		<a id="profile-video" class="video2" title="$video" onclick="jotVideoURL();return false;"></a>
+	</div> 
+	<div id="profile-audio-wrapper" style="/*display: $visitor;*/" >
+		<a id="profile-audio" class="audio2" title="$audio" onclick="jotAudioURL();return false;"></a>
+	</div> 
+	<div id="profile-location-wrapper" style="/*display: $visitor;*/" >
+		<a id="profile-location" class="globe" title="$setloc" onclick="jotGetLocation();return false;"></a>
+	</div> 
+	<div id="profile-nolocation-wrapper" style="/*display: none;*/" >
+		<a id="profile-nolocation" class="noglobe" title="$noloc" onclick="jotClearLocation();return false;"></a>
+	</div> 
+
+	<input type="submit" id="profile-jot-submit" class="button creation2" name="submit" value="$share" />
+  
+   <span onclick="preview_post();" id="jot-preview-link" class="tab button">$preview</span>
+   
+	<div id="profile-jot-perms" class="profile-jot-perms" style="display: $pvisit;" >
+		<a href="#profile-jot-acl-wrapper" id="jot-perms-icon" class="icon $lockstate"  title="$permset" ></a>$bang
+	</div>
+
+
+	<div id="profile-jot-plugin-wrapper">
+  	$jotplugins
+	</div>
+	
+	<div id="profile-rotator-wrapper" style="display: $visitor;" >
+		<img id="profile-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
+	</div> 
+	
+	</div>
+   <div id="profile-jot-perms-end"></div>
+	
+	<div id="jot-preview-content" style="display:none;"></div>
+
+	<div style="display: none;">
+		<div id="profile-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;">
+			$acl
+			<hr style="clear:both"/>
+			<div id="profile-jot-email-label">$emailcc</div><input type="text" name="emailcc" id="profile-jot-email" title="$emtitle" />
+			<div id="profile-jot-email-end"></div>
+			$jotnets
+		</div>
+	</div>
+
+
+
+
+</form>
+</div>
+		{{ if $content }}<script>initEditor();</script>{{ endif }}
diff --git a/view/theme/diabook-blue/nav.tpl b/view/theme/diabook-blue/nav.tpl
new file mode 100644
index 000000000..d0ff06673
--- /dev/null
+++ b/view/theme/diabook-blue/nav.tpl
@@ -0,0 +1,190 @@
+<header>
+	<div id="site-location">$sitelocation</div>
+	<div id="banner">$banner</div>
+</header>
+<nav>
+			
+			
+	<ul>
+			
+			
+			{{ if $nav.network }}
+			<li id="nav-network-link" class="nav-menu-icon">
+				<a class="$nav.network.2" href="$nav.network.0" title="$nav.network.3" >
+				<span class="icon notifications">Benachrichtigungen</span></a>
+				<span id="net-update" class="nav-notify"></span>
+			</li>
+		    {{ endif }}
+	
+			{{ if $nav.contacts }}
+			<li class="nav-menu-icon" id="nav-contacts-linkmenu">
+				<a href="$nav.contacts.0" rel="#nav-contacts-menu" title="$nav.contacts.1">
+				<span class="icon contacts">$nav.contacts.1</span></a>
+				<span id="intro-update" class="nav-notify"></span>
+				<ul id="nav-contacts-menu" class="menu-popup">
+					<li id="nav-contacts-see-intro"><a href="$nav.notifications.0">$nav.introductions.1</a><span id="intro-update" class="nav-notify"></span></li>
+					<li id="nav-contacts-all"><a href="contacts">$nav.contacts.1</a></li> 
+				</ul>
+			</li>	
+			{{ endif }}
+			
+			{{ if $nav.messages }}
+			<li  id="nav-messages-linkmenu" class="nav-menu-icon">
+			  <a href="$nav.messages.0" rel="#nav-messages-menu" title="$nav.messages.1">
+			  <span class="icon messages">$nav.messages.1</span></a>
+				<span id="mail-update" class="nav-notify"></span>
+				<ul id="nav-messages-menu" class="menu-popup">
+					<li id="nav-messages-see-all"><a href="$nav.messages.0">$nav.messages.1</a></li>
+					<li id="nav-messages-see-all"><a href="$nav.messages.inbox.0">$nav.messages.inbox.1</a></li>
+					<li id="nav-messages-see-all"><a href="$nav.messages.outbox.0">$nav.messages.outbox.1</a></li>
+					<li id="nav-messages-see-all"><a href="$nav.messages.new.0">$nav.messages.new.1</a></li>
+				</ul>
+			</li>		
+			{{ endif }}
+		
+      {{ if $nav.notifications }}
+			<li  id="nav-notifications-linkmenu" class="nav-menu-icon"><a href="$nav.notifications.0" rel="#nav-notifications-menu" title="$nav.notifications.1"><span class="icon notify">$nav.notifications.1</span></a>
+				<span id="notify-update" class="nav-notify"></span>
+				<ul id="nav-notifications-menu" class="menu-popup">
+					<li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">$nav.notifications.mark.1</a></li>
+					<li id="nav-notifications-see-all"><a href="$nav.notifications.all.0">$nav.notifications.all.1</a></li>
+					<li class="empty">$emptynotifications</li>
+				</ul>
+			</li>		
+		{{ endif }}	
+			
+		{{ if $nav.search}}
+		<li id="search-box">
+			<form method="get" action="$nav.search.0">
+				<input id="search-text" class="nav-menu-search" type="text" value="" name="search">
+			</form>
+		</li>		
+		{{ endif }}	
+		
+		<li id="nav-site-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-site-menu"><span class="icon s22 gear">Site</span></a>
+			<ul id="nav-site-menu" class="menu-popup">
+				{{ if $nav.manage }}<li><a class="$nav.manage.2" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a></li>{{ endif }}				
+
+				{{ if $nav.help }} <li><a class="$nav.help.2" target="friendika-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a></li>{{ endif }}
+
+
+										<li ><a class="$nav.community.2" href="$nav.community.0" title="$nav.community.3" >$nav.community.1</a></li>
+
+
+										<li><a class="$nav.search.2" href="$nav.search.0" title="$nav.search.3" >$nav.search.1</a></li>
+										
+										<li><a class="$nav.search.2" href="friendica" title="Site Info / Impressum" >Info/Impressum</a></li>
+
+				{{ if $nav.settings }}<li><a class="menu-sep $nav.settings.2" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a></li>{{ endif }}
+				{{ if $nav.admin }}<li><a class="$nav.admin.2" href="$nav.admin.0" title="$nav.admin.3" >$nav.admin.1</a></li>{{ endif }}
+
+				{{ if $nav.logout }}<li><a class="menu-sep $nav.logout.2" href="$nav.logout.0" title="$nav.logout.3" >$nav.logout.1</a></li>{{ endif }}
+
+				
+			</ul>		
+		</li>
+		
+		
+		{{ if $nav.directory }}
+		<li id="nav-directory-link" class="nav-menu $sel.directory">
+			<a class="$nav.directory.2" href="$nav.directory.0" title="$nav.directory.3" >$nav.directory.1</a>
+		</li>
+		{{ endif }}
+		
+		{{ if $nav.apps }}
+			<li id="nav-apps-link" class="nav-menu $sel.apps">
+				<a class=" $nav.apps.2" href="#" rel="#nav-apps-menu" title="$nav.apps.3" >$nav.apps.1</a>
+				<ul id="nav-apps-menu" class="menu-popup">
+					{{ for $apps as $ap }}
+					<li>$ap</li>
+					{{ endfor }}
+				</ul>
+			</li>	
+		{{ endif }}		
+		
+      {{ if $nav.home }}
+			<li id="nav-home-link" class="nav-menu $sel.home">
+				<a class="$nav.home.2" href="$nav.home.0" title="$nav.home.3" >$nav.home.1</a>
+				<span id="home-update" class="nav-notify"></span>
+			</li>
+		{{ endif }}		
+		
+		{{ if $userinfo }}
+			<li id="nav-user-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-user-menu" title="$sitelocation"><img src="$userinfo.icon" alt="$userinfo.name"></a>
+				<ul id="nav-user-menu" class="menu-popup">
+					{{ for $nav.usermenu as $usermenu }}
+						<li><a class="$usermenu.2" href="$usermenu.0" title="$usermenu.3">$usermenu.1</a></li>
+					{{ endfor }}
+					
+					{{ if $nav.profiles }}<li><a class="menu-sep $nav.profiles.2" href="$nav.profiles.0" title="$nav.profiles.3" >$nav.profiles.3</a></li>{{ endif }}
+					{{ if $nav.notifications }}<li><a class="$nav.notifications.2" href="$nav.notifications.0" title="$nav.notifications.3" >$nav.notifications.1</a></li>{{ endif }}
+					{{ if $nav.messages }}<li><a class="$nav.messages.2" href="$nav.messages.0" title="$nav.messages.3" >$nav.messages.1</a></li>{{ endif }}
+					{{ if $nav.contacts }}<li><a class="$nav.contacts.2" href="$nav.contacts.0" title="$nav.contacts.3" >$nav.contacts.1</a></li>{{ endif }}	
+				</ul>
+			</li>
+		{{ endif }}
+		
+					{{ if $nav.login }}
+					<li id="nav-home-link" class="nav-menu $sel.home">
+						<a class="$nav.login.2" href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a>
+					<li>
+					{{ endif }}
+		
+		
+		
+	</ul>	
+
+
+	
+</nav>
+
+
+<div style="position: fixed; bottom: 5px; right: 10px;"><a href="javascript:scroll(0,0); "><img src="view/theme/diabook/icons/scroll_top.png" title="scroll to top"></a></div>
+<div style="position: fixed; bottom: 5px; left: 25px;">$langselector</div>
+<div style="position: fixed; bottom: 25px; left: 5px;"><a href="http://pad.toktan.org/p/diabook" target="blank" ><img src="view/theme/diabook/icons/bluebug.png" title="report bugs for the theme diabook"/></a></div>
+
+
+
+<ul id="nav-notifications-template" style="display:none;" rel="template">
+	<li class="{4}"><a href="{0}"><img src="{1}">{2} <span class="notif-when">{3}</span></a></li>
+</ul>
+
+
+
+{#
+
+{{ if $nav.logout }}<a id="nav-logout-link" class="nav-link $nav.logout.2" href="$nav.logout.0" title="$nav.logout.3" >$nav.logout.1</a> {{ endif }}
+{{ if $nav.login }}<a id="nav-login-link" class="nav-login-link $nav.login.2" href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a> {{ endif }}
+
+<span id="nav-link-wrapper" >
+
+{{ if $nav.register }}<a id="nav-register-link" class="nav-commlink $nav.register.2" href="$nav.register.0" title="$nav.register.3" >$nav.register.1</a>{{ endif }}
+	
+<a id="nav-help-link" class="nav-link $nav.help.2" target="friendika-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a>
+	
+{{ if $nav.apps }}<a id="nav-apps-link" class="nav-link $nav.apps.2" href="$nav.apps.0" title="$nav.apps.3" >$nav.apps.1</a>{{ endif }}
+
+<a id="nav-search-link" class="nav-link $nav.search.2" href="$nav.search.0" title="$nav.search.3" >$nav.search.1</a>
+<a id="nav-directory-link" class="nav-link $nav.directory.2" href="$nav.directory.0" title="$nav.directory.3" >$nav.directory.1</a>
+
+{{ if $nav.admin }}<a id="nav-admin-link" class="nav-link $nav.admin.2" href="$nav.admin.0" title="$nav.admin.3" >$nav.admin.1</a>{{ endif }}
+
+{{ if $nav.notifications }}
+<a id="nav-notify-link" class="nav-commlink $nav.notifications.2" href="$nav.notifications.0" title="$nav.notifications.3" >$nav.notifications.1</a>
+<span id="notify-update" class="nav-ajax-left"></span>
+{{ endif }}
+{{ if $nav.messages }}
+<a id="nav-messages-link" class="nav-commlink $nav.messages.2" href="$nav.messages.0" title="$nav.messages.3" >$nav.messages.1</a>
+<span id="mail-update" class="nav-ajax-left"></span>
+{{ endif }}
+
+{{ if $nav.manage }}<a id="nav-manage-link" class="nav-commlink $nav.manage.2" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a>{{ endif }}
+
+{{ if $nav.settings }}<a id="nav-settings-link" class="nav-link $nav.settings.2" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a>{{ endif }}
+{{ if $nav.profiles }}<a id="nav-profiles-link" class="nav-link $nav.profiles.2" href="$nav.profiles.0" title="$nav.profiles.3" >$nav.profiles.1</a>{{ endif }}
+
+
+</span>
+<span id="nav-end"></span>
+<span id="banner">$banner</span>
+#}
diff --git a/view/theme/diabook-blue/profile_vcard.tpl b/view/theme/diabook-blue/profile_vcard.tpl
new file mode 100644
index 000000000..3a545f9ba
--- /dev/null
+++ b/view/theme/diabook-blue/profile_vcard.tpl
@@ -0,0 +1,64 @@
+<div class="vcard">
+
+	<div class="tool">
+		<div class="fn label">$profile.name</div>
+		{{ if $profile.edit }}
+			<div class="action">
+			<a class="icon s16 edit ttright" href="#" rel="#profiles-menu" title="$profile.edit.3"><span>$profile.edit.1</span></a>
+			<ul id="profiles-menu" class="menu-popup">
+				{{ for $profile.menu.entries as $e }}
+				<li>
+					<a href="profiles/$e.id"><img src='$e.photo'>$e.profile_name</a>
+				</li>
+				{{ endfor }}
+				<li><a href="profile_photo" >$profile.menu.chg_photo</a></li>
+				<li><a href="profiles/new" id="profile-listing-new-link">$profile.menu.cr_new</a></li>
+				<li><a href="profiles" >$profile.edit.3</a></li>
+								
+			</ul>
+			</div>
+		{{ endif }}
+	</div>
+				
+	
+	{{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }}
+	<div id="profile-photo-wrapper"><img class="photo" width="175" height="175" src="$profile.photo?rev=$profile.picdate" alt="$profile.name" /></div>
+
+
+
+	{{ if $location }}
+		<dl class="location"><dt class="location-label">$location</dt><br> 
+		<dd class="adr">
+			{{ if $profile.address }}<div class="street-address">$profile.address</div>{{ endif }}
+			<span class="city-state-zip">
+				<span class="locality">$profile.locality</span>{{ if $profile.locality }}, {{ endif }}
+				<span class="region">$profile.region</span>
+				<span class="postal-code">$profile.postal-code</span>
+			</span>
+			{{ if $profile.country-name }}<span class="country-name">$profile.country-name</span>{{ endif }}
+		</dd>
+		</dl>
+	{{ endif }}
+
+	{{ if $gender }}<dl class="mf"><dt class="gender-label">$gender</dt> <dd class="x-gender">$profile.gender</dd></dl>{{ endif }}
+	
+	{{ if $profile.pubkey }}<div class="key" style="display:none;">$profile.pubkey</div>{{ endif }}
+
+	{{ if $marital }}<dl class="marital"><dt class="marital-label"><span class="heart">&hearts;</span>$marital</dt><dd class="marital-text">$profile.marital</dd></dl>{{ endif }}
+
+	{{ if $homepage }}<dl class="homepage"><dt class="homepage-label">$homepage</dt><dd class="homepage-url"><a href="$profile.homepage" target="external-link">$profile.homepage</a></dd></dl>{{ endif }}
+
+	{{ inc diaspora_vcard.tpl }}{{ endinc }}
+	
+	<div id="profile-extra-links">
+		<ul>
+			{{ if $connect }}
+				<li><a id="dfrn-request-link" href="dfrn_request/$profile.nickname">$connect</a></li>
+			{{ endif }}
+		</ul>
+	</div>
+</div>
+
+$contact_block
+
+
diff --git a/view/theme/diabook-blue/style.css b/view/theme/diabook-blue/style.css
new file mode 100644
index 000000000..5b7a3f3d6
--- /dev/null
+++ b/view/theme/diabook-blue/style.css
@@ -0,0 +1,2301 @@
+/**
+ * Fabio Comuni <http://kirgroup.com/profile/fabrixxm>
+ * Additional Changes: Michael Vogel <icarus@dabo.de>
+ **/
+
+/* ========= */
+/* = Admin = */
+/* ========= */
+
+#adminpage {
+/*        width: 80%;*/
+}
+
+#pending-update {
+        float:right;
+        color: #ffffff;
+        font-weight: bold;
+        background-color: #FF0000;
+        padding: 0em 0.3em;
+}
+
+.admin.linklist {
+        border: 0px; padding: 0px;
+}
+
+.admin.link {
+        list-style-position: inside;
+        font-size: 1em;
+        padding: 5px;
+        width: 100px;
+        margin: 5px;
+}
+
+#adminpage dl {
+        clear: left;
+        margin-bottom: 2px;
+        padding-bottom: 2px;
+        border-bottom: 1px solid black;
+}
+
+#adminpage dt {
+        width: 200px;
+        float: left;
+        font-weight: bold;
+}
+
+#adminpage dd {
+        margin-left: 200px;
+}
+#adminpage h3 {
+        border-bottom: 1px solid #898989;
+        margin-bottom: 5px;
+        margin-top: 10px;
+}
+
+#adminpage .submit {
+        clear:left;
+}
+
+#adminpage #pluginslist {
+        margin: 0px; padding: 0px;
+}
+
+#adminpage .plugin {
+        list-style: none;
+        display: block;
+	/* border: 1px solid #888888; */
+        padding: 1em;
+        margin-bottom: 5px;
+        clear: left;
+}
+
+#adminpage .toggleplugin {
+        float:left;
+        margin-right: 1em;
+}
+
+#adminpage table {width:100%; border-bottom: 1p solid #000000; margin: 5px 0px;}
+#adminpage table th { text-align: left;}
+#adminpage td .icon { float: left;}
+#adminpage table#users img { width: 16px; height: 16px; }
+#adminpage table tr:hover { background-color: #eeeeee; }
+#adminpage .selectall { text-align: right; }
+/* icons */
+
+.icon.contacts {
+  background-image: url("../../../view/theme/diabook-blue/icons/contacts.png");}
+.icon.notifications {
+  background-image: url("../../../view/theme/diabook-blue/icons/notifications.png");}
+.icon.notify {
+  background-image: url("../../../view/theme/diabook-blue/icons/notify.png");}
+.icon.messages {
+  background-image: url("../../../view/theme/diabook-blue/icons/messages.png");}
+.icon.community {
+  background-image: url("../../../view/theme/diabook-blue/icons/community.png");}
+  
+.icon.drop 	{ background-image: url("../../../view/theme/diabook-blue/icons/drop.png");}
+.icon.drophide 	{ background-image: url("../../../view/theme/diabook-blue/icons/drop.png");}
+.icon.dislike 	{ background-image: url("../../../view/theme/diabook-blue/icons/dislike.png");}
+.icon.like 	{ background-image: url("../../../view/theme/diabook-blue/icons/like.png");}
+.icon.pencil 	{ background-image: url("../../../view/theme/diabook-blue/icons/pencil.png");}
+.icon.recycle 	{ background-image: url("../../../view/theme/diabook-blue/icons/recycle.png");}
+.icon.remote-link { background-image: url("../../../view/theme/diabook-blue/icons/remote.png");}
+.icon.tagged    { background-image: url("../../../view/theme/diabook-blue/icons/tagged.png");}
+.star-item.icon.unstarred { background-image: url("../../../view/theme/diabook-blue/icons/unstarred.png");}
+.star-item.icon.starred { background-image: url("../../../view/theme/diabook-blue/icons/starred.png");}
+.icon.link		{ background-image: url("../../../view/theme/diabook-blue/icons/link.png");}
+.icon.lock		{ background-image: url("../../../view/theme/diabook-blue/icons/lock.png");}
+.icon.unlock		{ background-image: url("../../../view/theme/diabook-blue/icons/unlock.png");}
+.icon.language    { background-image: url("../../../view/theme/diabook-blue/icons/language.png");}
+
+
+.camera 	{ background-image: url("../../../view/theme/diabook-blue/icons/camera.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.attach 	{ background-image: url("../../../view/theme/diabook-blue/icons/attach.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.video2 	{ background-image: url("../../../view/theme/diabook-blue/icons/video.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }	
+.video 	{ background-image: url("../../../view/theme/diabook-blue/icons/video.png"); 
+			  display: block; width: 100%; height: 28px; background-repeat: no-repeat;
+			  }
+.audio2 	{ background-image: url("../../../view/theme/diabook-blue/icons/audio.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.audio 	{ background-image: url("../../../view/theme/diabook-blue/icons/audio.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.weblink 	{ background-image: url("../../../view/theme/diabook-blue/icons/weblink.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.globe 	{ background-image: url("../../../view/theme/diabook-blue/icons/globe.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.unglobe 	{ background-image: url("../../../view/theme/diabook-blue/icons/unglobe.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.edit    {background-image: url("../../../view/theme/diabook-blue/icons/pencil2.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;}
+			  
+			  
+
+
+.article	{ background-position: -50px  0px;}
+/*.audio 		{ background-position: -70px  0px;}*/
+.block 		{ background-position: -90px  0px;}
+/*.drop 		{ background-position: -110px 0px;}*/
+/*.drophide 	{ background-position: -130px 0px;}*/
+/*.edit 		{ background-position: -150px 0px;}*/
+/*.camera 	{ background-position: -170px 0px;}*/
+/*.dislike 	{ background-position: -190px 0px;}*/
+/*.like 		{ background-position: -210px 0px;}*/
+/*.link 		{ background-position: -230px 0px;}*/
+
+/*.globe 		{ background-position: -50px  -20px;}*/
+/*.noglobe 	{ background-position: -70px  -20px;}*/
+.no 		{ background-position: -90px  -20px;}
+.pause 		{ background-position: -110px -20px;}
+.play 		{ background-position: -130px -20px;}
+/*.pencil 	{ background-position: -150px -20px;}*/
+.small-pencil	{ background-position: -170px -20px;}
+/*.recycle 	{ background-position: -190px -20px;}*/
+/*.remote-link	{ background-position: -210px -20px;}*/
+.share 		{ background-position: -230px -20px;}
+
+.tools 		{ background-position: -50px  -40px;}
+/*.lock 		{ background-position: -70px  -40px;}*/
+
+/*.video          { background-position: -110px -40px;}*/
+.youtube        { background-position: -130px -40px;}
+
+/*.attach         { background-position: -190px -40px;}*/
+/*.language       { background-position: -210px -40px;}*/
+
+
+.icon.on             { background-image: url("../../../view/theme/diabook-blue/icons/toogle_on.png"); background-repeat: no-repeat;}
+.icon.off            { background-image: url("../../../view/theme/diabook-blue/icons/toogle_off.png"); background-repeat: no-repeat;}
+.prev           { background-position: -90px  -60px;}
+.next           { background-position: -110px -60px;}
+/*.tagged     { background-position: -130px -60px;}*/
+
+.attachtype {
+        display: block; width: 20px; height: 23px;
+        background-image: url('../../../images/content-types.png');
+}
+
+.type-video { background-position: 0px 0px; }
+.type-image { background-position: -20px 0px; }
+.type-audio { background-position: -40px 0px; }
+.type-text  { background-position: -60px 0px; }
+.type-unkn  { background-position: -80px 0px; }
+
+.icon.drop, .icon.drophide {
+ float: left;
+}
+
+.icon {
+  display: block;
+  width: 20px;
+  height: 20px;
+  /*background-image: url('icons.png');*/
+}
+
+.icon {
+  background-color: transparent ;
+  background-repeat: no-repeat;
+  /* background-position: left center; */
+  display: block;
+  overflow: hidden;
+  text-indent: -9999px;
+  padding: 1px;
+}
+
+.icon.border.camera{
+  background-image: url("../../../view/theme/diabook-blue/icons/camera.png"); 
+  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+	}
+	
+.icon.border.link{
+  background-image: url("../../../view/theme/diabook-blue/icons/weblink.png"); 
+  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+  margin-left: 10px;
+	}
+
+.icon.text {
+  text-indent: 0px;
+}
+.icon.s10 {
+  min-width: 10px;
+  height: 10px;
+}
+.icon.s10.notify {
+  background-image: url("../../../images/icons/10/notify_off.png");
+}
+.icon.s10.gear {
+  background-image: url("../../../images/icons/10/gear.png");
+}
+.icon.s10.add {
+  background-image: url("../../../images/icons/10/add.png");
+}
+.icon.s10.delete {
+  background-image: url("../../../images/icons/10/delete.png");
+}
+.icon.s10.edit {
+  background-image: url("../../../images/icons/10/edit.png");
+}
+.icon.s10.star {
+  background-image: url("../../../images/icons/10/star.png");
+}
+.icon.s10.menu {
+  background-image: url("../../../images/icons/10/menu.png");
+}
+.icon.s10.link {
+  background-image: url("../../../images/icons/10/link.png");
+}
+.icon.s10.lock {
+  background-image: url("../../../images/icons/10/lock.png");
+}
+.icon.s10.unlock {
+  background-image: url("../../../images/icons/10/unlock.png");
+}
+.icon.s10.text {
+  padding: 2px 0px 0px 15px;
+  font-size: 10px;
+}
+.icon.s16 {
+  min-width: 16px;
+  height: 16px;
+}
+.icon.s16.notify {
+  background-image: url("../../../images/icons/16/notify_off.png");
+}
+.icon.s16.gear {
+  background-image: url("../../../images/icons/16/gear.png");
+}
+.icon.s16.add {
+  background-image: url("../../../images/icons/16/add.png");
+}
+.icon.s16.delete {
+  background-image: url("../../../images/icons/16/delete.png");
+}
+/*.icon.s16.edit {
+  background-image: url("../../../images/icons/16/edit.png");
+}*/
+.icon.s16.star {
+  background-image: url("../../../images/icons/16/star.png");
+}
+.icon.s16.menu {
+  background-image: url("../../../images/icons/16/menu.png");
+}
+/*.icon.s16.link {
+  background-image: url("../../../images/icons/16/link.png");
+}*/
+.icon.s16.lock {
+  background-image: url("../../../images/icons/16/lock.png");
+}
+.icon.s16.unlock {
+  background-image: url("../../../images/icons/16/unlock.png");
+}
+.icon.s16.text {
+  padding: 4px 0px 0px 20px;
+  font-size: 10px;
+}
+.icon.s22 {
+  min-width: 22px;
+  height: 22px;
+}
+.icon.s22.notify {
+  background-image: url("../../../images/icons/22/notify_off.png");
+}
+.icon.s22.gear {
+  background-image: url("../../../images/icons/22/gear.png");
+}
+.icon.s22.add {
+  background-image: url("../../../images/icons/22/add.png");
+}
+.icon.s22.delete {
+  background-image: url("../../../images/icons/22/delete.png");
+}
+.icon.s22.edit {
+  background-image: url("../../../images/icons/22/edit.png");
+}
+.icon.s22.star {
+  background-image: url("../../../images/icons/22/star.png");
+}
+.icon.s22.menu {
+  background-image: url("../../../images/icons/22/menu.png");
+}
+.icon.s22.link {
+  background-image: url("../../../images/icons/22/link.png");
+}
+.icon.s22.lock {
+  background-image: url("../../../images/icons/22/lock.png");
+}
+.icon.s22.unlock {
+  background-image: url("../../../images/icons/22/unlock.png");
+}
+.icon.s22.text {
+  padding: 10px 0px 0px 25px;
+  width: 200px;
+}
+.icon.s48 {
+  width: 48px;
+  height: 48px;
+}
+.icon.s48.notify {
+  background-image: url("../../../images/icons/48/notify_off.png");
+}
+.icon.s48.gear {
+  background-image: url("../../../images/icons/48/gear.png");
+}
+.icon.s48.add {
+  background-image: url("../../../images/icons/48/add.png");
+}
+.icon.s48.delete {
+  background-image: url("../../../images/icons/48/delete.png");
+}
+.icon.s48.edit {
+  background-image: url("../../../images/icons/48/edit.png");
+}
+.icon.s48.star {
+  background-image: url("../../../images/icons/48/star.png");
+}
+.icon.s48.menu {
+  background-image: url("../../../images/icons/48/menu.png");
+}
+.icon.s48.link {
+  background-image: url("../../../images/icons/48/link.png");
+}
+.icon.s48.lock {
+  background-image: url("../../../images/icons/48/lock.png");
+}
+.icon.s48.unlock {
+  background-image: url("../../../images/icons/48/unlock.png");
+}
+
+#contact-edit-links ul {
+  list-style: none;
+  list-style-type: none;
+}
+
+.hide-comments-outer {
+  margin-left: 80px;
+  margin-bottom: 5px;
+  width: 684px;
+  border-bottom: 1px solid #BDCDD4;
+  border-top: 1px solid #BDCDD4;
+
+  padding: 8px;
+}
+
+/* global */
+body {
+  font-family: 'Lato', "Helvetica Neue", Helvetica, Arial, sans-serif;
+  font-size: 13px;
+  background-color: #ffffff;
+  color: #2d2d2d;
+  margin: 50px auto auto;
+  display: table;
+}
+h4 {
+  font-size: 1.1em;
+}
+
+a {
+	color: #333333;
+	/* color: #3e3e8c; */
+	text-decoration: none;
+}
+a:hover {
+	/* color: blue; */
+	text-decoration: underline
+}
+
+.wall-item-name-link {
+/*  float: left;*/
+}
+
+.wall-item-photo {
+  width: 48px;
+  height: 48px;
+  overflow: hidden;
+  display: block;
+}
+
+.left {
+  float: left;
+}
+.right {
+  float: right;
+}
+.hidden {
+  display: none;
+}
+.clear {
+  clear: both;
+}
+.fakelink {
+  color: #3465A4;
+  /* color: #3e3e8c; */
+  text-decoration: none;
+  cursor: pointer;
+}
+.fakelink:hover {
+  /* color: blue; */
+  /*color: #005c94; */
+  text-decoration: underline;
+}
+code {
+  font-family: Courier, monospace;
+  white-space: pre;
+  display: block;
+  overflow: auto;
+  border: 1px solid #444;
+  background: #EEE;
+  color: #444;
+  padding: 10px;
+  margin-top: 20px;
+}
+#panel {
+  position: absolute;
+  width: 10em;
+  background: #ffffff;
+  color: #2d2d2d;
+  margin: 0px;
+  padding: 1em;
+  list-style: none;
+  border: 3px solid #364e59;
+  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);
+  box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+}
+/* tool */
+.tool {
+  height: auto;
+  overflow: auto;
+  padding: 3px;
+}
+#saved-search-ul .tool:hover,
+#nets-sidebar .tool:hover,
+#sidebar-group-list .tool:hover {
+	background: #EEE;
+}
+.tool .label {
+  float: left;
+}
+.tool .action {
+  float: right;
+}
+.tool a {
+  color: ##3F8FBA;
+}
+.tool a:hover {
+  text-decoration: none;
+}
+/* popup notifications */
+div.jGrowl div.notice {
+  background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center;
+  color: #ffffff;
+  padding-left: 58px;
+}
+div.jGrowl div.info {
+  background: #364e59 url("../../../images/icons/48/info.png") no-repeat 5px center;
+  color: #ffffff;
+  padding-left: 58px;
+}
+/* header */
+header {
+  position: fixed;
+  left: 0%;
+  right: 80%;
+  top: 0px;
+  margin: 0px;
+  padding: 0px;
+  width: 20%;
+  height: 32px;
+  background: #1872a2;
+  background-color: #1872a2;
+  z-index: 100;
+  border-bottom: 1px;
+  border-bottom-color: black;
+  border-bottom-style: inset;
+}
+header #site-location {
+  display: none;
+}
+header #banner {
+  overflow: hidden;
+  text-align: center;
+  width: 100%;
+}
+header #banner a,
+header #banner a:active,
+header #banner a:visited,
+header #banner a:link,
+header #banner a:hover {
+  color: #ffffff;
+  text-decoration: none;
+  outline: none;
+  vertical-align: middle;
+}
+header #banner #logo-img {
+  height: 25px;
+  margin-top: 5px;
+}
+header #banner #logo-text {
+  font-size: 22px;
+  position: absolute;
+  top: 15%;
+}
+/* nav */
+nav {
+  width: 80%;
+  height: 32px;
+  position: fixed;
+  left: 20%;
+  top: 0px;
+  padding: 0px;
+  background: #1872a2;
+  color: #1872a2;
+  z-index: 100;
+  border-bottom: 1px;
+  border-bottom-color: black;
+  border-bottom-style: inset;
+}
+nav a,
+nav a:active,
+nav a:visited,
+nav a:link,
+nav a:hover {
+  color: #ffffff;
+  text-decoration: none;
+  outline: none;
+}
+nav #banner {
+  overflow: hidden;
+  /*text-align: center;*/
+  width: 100%;
+}
+nav #banner a,
+nav #banner a:active,
+nav #banner a:visited,
+nav #banner a:link,
+nav #banner a:hover {
+  color: #ffffff;
+  text-decoration: none;
+  outline: none;
+  vertical-align: bottom;
+}
+nav #banner #logo-img {
+  height: 22px;
+  margin-top: 5px;
+}
+nav #banner #logo-text {
+  font-size: 22px;
+}
+nav #navbar{
+	}
+nav ul {
+  margin: 0px;
+  padding: 0px 20px;
+}
+nav ul li {
+  list-style: none;
+  margin: 0px;
+  /* padding: 1px 1px 3px 1px; */
+  float: left;
+}
+nav ul li .menu-popup {
+  left: 0px;
+  right: auto;
+}
+
+nav #logo-img {
+  height: 25px;
+  margin-top: 4px;
+  margin-left: 30px;
+}
+
+nav #logo-text {
+    font-size: 22px;
+    margin-top: 3px;
+    margin-right: 15px;
+}
+nav .nav-menu-search {
+  position: relative;
+
+  margin: 3px 17px;
+  margin-right: 0px;
+  height: 17px;
+  width: 180px;
+  
+}
+
+nav #search-box #search-text {
+  background-image:  url('icons/lupe.png');
+  background-repeat:no-repeat;
+  padding-left:20px;
+	}
+
+
+nav .nav-menu-icon {
+  position: relative;
+  height: 22px;
+  padding: 5px;
+  margin: 0px 7px;
+  -moz-border-radius: 5px 5px 0 0;
+  -webkit-border-radius: 5px 5px 0 0;
+  border-radius: 5px 5px 0 0;
+}
+nav .nav-menu-icon.selected {
+  background-color: #fff;
+}
+nav .nav-menu-icon img {
+  width: 22px;
+  height: 22px;
+}
+nav .nav-menu-icon .nav-notify {
+  top: 3px;
+}
+nav .nav-menu {
+  position: relative;
+  height: 16px;
+  padding: 5px;
+  margin: 3px 15px 0px;
+  font-size: 13px;
+  /*border-bottom: 3px solid #364A84;*/
+}
+nav .nav-menu.selected {
+  /*border-bottom: 3px solid #9eabb0;*/
+}
+nav .nav-notify {
+  display: none;
+  position: absolute;
+  background-color: #ff0000;
+  /* background-color: #19aeff; */
+  -moz-border-radius: 5px 5px 5px 5px;
+  -webkit-border-radius: 5px 5px 5px 5px;
+  border-radius: 5px 5px 5px 5px;
+  font-size: 10px;
+  font-weight: 900;
+  padding: 1px 4px;
+  top: 0px;
+  right: -6px;
+  min-width: 10px;
+  text-align: center;
+}
+nav .nav-notify.show {
+  display: block;
+}
+nav #nav-help-link,
+nav #nav-search-link,
+nav #nav-directory-link,
+nav #nav-apps-link,
+nav #nav-site-linkmenu, 
+nav #nav-home-link,
+nav #nav-user-linkmenu
+{
+  float: right;
+}
+nav #nav-user-linkmenu{
+	margin-right: 0px;
+	}
+nav #nav-home-link{
+	margin-left: 0px;
+	font-weight: bold;
+	}
+nav #nav-directory-link{
+	margin-left: 0px;
+	margin-right: 0px;
+	font-weight: bold;
+	margin: 3px 15px;
+	}
+nav #nav-apps-link{
+	margin-left: 0px;
+	margin-right: 0px;
+	font-weight: bold;
+	margin: 3px 15px;
+	}
+nav #nav-help-link .menu-popup,
+nav #nav-search-link .menu-popup,
+nav #nav-directory-link .menu-popup,
+nav #nav-apps-link .menu-popup,
+nav #nav-site-linkmenu .menu-popup {
+  right: 0px;
+  left: auto;
+}
+
+nav #nav-messages-linkmenu.on .icon.messages, nav #nav-messages-linkmenu.selected .icon.messages{
+	background-image: url("../../../view/theme/diabook-blue/icons/messages2.png");
+	}
+	
+/*nav #nav-notifications-linkmenu.on .icon.notify,*/ nav #nav-notifications-linkmenu.selected .icon.notify{
+	background-image: url("../../../view/theme/diabook-blue/icons/notify2.png");
+	}
+	
+nav #nav-contacts-linkmenu.on .icon.contacts, nav #nav-contacts-linkmenu.selected .icon.contacts{
+	background-image: url("../../../view/theme/diabook-blue/icons/contacts2.png");
+	}
+	
+nav #nav-apps-link.selected {
+  background-color: #364e59;
+}
+
+#nav-notifications-mark-all {
+	/* padding: 1px 1px 2px 26px; */
+	/* border-bottom: 1px solid #364E59; */
+	/* margin: 0px 0px 2px 0px;
+	padding: 5px 10px; */
+}
+
+#nav-notifications-see-all {
+	/* padding: 1px 1px 2px 26px; */
+	/* border-bottom: 1px solid #364E59; */
+	/* margin: 0px 0px 2px 0px;
+	padding: 5px 10px; */
+}
+
+.notify-seen {
+	background: none repeat scroll 0 0 #DDDDDD;
+	}
+
+ul.menu-popup {
+  position: absolute;
+  display: none;
+  width: 11em;
+  background: #ffffff;
+  color: #2d2d2d;
+  margin: 0px;
+  padding: 0px;
+  list-style: none;
+  border: 1px solid #364e59;
+  border-top-color: transparent;
+  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);
+  box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+}
+ul.menu-popup a {
+  display: block;
+  color: #2d2d2d;
+  padding: 5px 10px;
+  text-decoration: none;
+}
+ul.menu-popup a:hover {
+  background-color: #14618a; /*bdcdd4;*/
+  color: #fff;
+}
+ul.menu-popup .menu-sep {
+  border-top: 1px solid #9eabb0;
+}
+ul.menu-popup li {
+  float: none;
+  overflow: auto;
+  height: auto;
+  display: block;
+}
+ul.menu-popup li img {
+  float: left;
+  width: 16px;
+  height: 16px;
+  padding-right: 5px;
+}
+ul.menu-popup .empty {
+  padding: 5px;
+  text-align: center;
+  color: #9eabb0;
+}
+/* autocomplete popup */
+.acpopup {
+  max-height: 150px;
+  background-color: #ffffff;
+  color: #2d2d2d;
+  border: 1px solid #MenuBorder;
+  overflow: auto;
+  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);
+  box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+}
+.acpopupitem {
+  color: #2d2d2d;
+  padding: 4px;
+  clear: left;
+}
+.acpopupitem img {
+  float: left;
+  margin-right: 4px;
+}
+.acpopupitem.selected {
+  background-color: #bdcdd4;
+}
+#nav-notifications-menu {
+  width: 400px;
+  max-height: 550px;
+  overflow: auto;
+}
+/* #nav-notifications-menu a {
+	display: inline;
+	padding: 5px 0px;
+	margin: 0px 0px 2px 0px;
+}
+#nav-notifications-menu li:hover {
+  background-color: #bdcdd4;
+}*/
+
+#nav-notifications-menu img {
+  float: left;
+  margin-right: 5px;
+}
+#nav-notifications-menu .contactname {
+  font-weight: bold;
+}
+#nav-notifications-menu .notif-when {
+  font-size: 10px;
+  color: #9eabb0;
+  display: block;
+}
+
+.notif-image {
+        width: 32px;
+        height: 32px;
+        padding: 7px 7px 0px 0px;
+}
+
+/* aside */
+aside {
+  display: table-cell;
+  vertical-align: top;
+  width: 180px;
+  padding: 0px 10px 0px 20px;
+  border-right: 1px solid #D2D2D2;
+  float: left;
+  /* background: #F1F1F1; */
+}
+aside .vcard .fn {
+  font-size: 18px;
+  font-weight: bold;
+  margin-bottom: 5px;
+}
+aside .vcard .title {
+  margin-bottom: 5px;
+}
+aside .vcard dl {
+  height: auto;
+  overflow: auto;
+}
+aside .vcard dt {
+  float: left;
+  margin-left: 0px;
+  /*width: 35%;*/
+  text-align: right;
+  color: #999999;
+}
+aside .vcard dd {
+  float: left;
+  margin-left: 5px;
+  /*width: 60%;*/
+}
+aside #profile-extra-links ul {
+  padding: 0px;
+  margin: 0px;
+}
+aside #profile-extra-links li {
+  padding: 0px;
+  margin: 0px;
+  list-style: none;
+}
+aside #dfrn-request-link {
+  display: block;
+  -moz-border-radius: 5px 5px 5px 5px;
+  -webkit-border-radius: 5px 5px 5px 5px;
+  border-radius: 5px 5px 5px 5px;
+  color: #ffffff;
+  background: #005c94 url('../../../images/connect-bg.png') no-repeat left center;
+  font-weight: bold;
+  text-transform: uppercase;
+  padding: 4px 2px 2px 35px;
+}
+aside #dfrn-request-link:hover {
+  text-decoration: none;
+  background-color: #36c;
+  /* background-color: #19aeff; */
+}
+aside #profiles-menu {
+  width: 20em;
+}
+aside #search-text {
+	width: 173px;
+}
+aside #side-follow-url {
+	width: 173px;
+	}
+aside #side-peoplefind-url {
+	width: 173px;
+	}
+#contact-block {
+  overflow: auto;
+  height: auto;
+}
+#contact-block .contact-block-h4 {
+  float: left;
+  margin: 5px 0px;
+}
+#contact-block .allcontact-link {
+  float: right;
+  margin: 5px 0px;
+}
+#contact-block .contact-block-content {
+  clear: both;
+  overflow: auto;
+  height: auto;
+}
+#contact-block .contact-block-link {
+  float: left;
+  margin: 0px 2px 2px 0px;
+}
+#contact-block .contact-block-link img {
+  widht: 55px;
+  height: 55px;
+}
+/* widget */
+.widget {
+  margin-bottom: 2em;
+  /*.action .s10 { width: 10px; overflow: hidden; padding: 0px;}
+	.action .s16 { width: 16px; overflow: hidden; padding: 0px;}*/
+/*  font-size: 12px; */
+}
+.widget h3 {
+  padding: 0px;
+  margin: 2px;
+}
+.widget .action {
+  opacity: 0.1;
+  -webkit-transition: all 0.2s ease-in-out;
+  -moz-transition: all 0.2s ease-in-out;
+  -o-transition: all 0.2s ease-in-out;
+  -ms-transition: all 0.2s ease-in-out;
+  transition: all 0.2s ease-in-out;
+}
+.widget input.action {
+  opacity: 0.5;
+  -webkit-transition: all 0.2s ease-in-out;
+  -moz-transition: all 0.2s ease-in-out;
+  -o-transition: all 0.2s ease-in-out;
+  -ms-transition: all 0.2s ease-in-out;
+  transition: all 0.2s ease-in-out;
+}
+.widget:hover .title .action {
+  opacity: 1;
+  -webkit-transition: all 0.2s ease-in-out;
+  -moz-transition: all 0.2s ease-in-out;
+  -o-transition: all 0.2s ease-in-out;
+  -ms-transition: all 0.2s ease-in-out;
+  transition: all 0.2s ease-in-out;
+}
+.widget .tool:hover .action {
+  opacity: 1;
+  -webkit-transition: all 0.2s ease-in-out;
+  -moz-transition: all 0.2s ease-in-out;
+  -o-transition: all 0.2s ease-in-out;
+  -ms-transition: all 0.2s ease-in-out;
+  transition: all 0.2s ease-in-out;
+}
+.widget .tool:hover .action.ticked {
+  opacity: 1;
+  -webkit-transition: all 0.2s ease-in-out;
+  -moz-transition: all 0.2s ease-in-out;
+  -o-transition: all 0.2s ease-in-out;
+  -ms-transition: all 0.2s ease-in-out;
+  transition: all 0.2s ease-in-out;
+}
+.widget ul {
+  padding: 0px;
+}
+.widget ul li {
+  padding-left: 16px;
+  min-height: 16px;
+  list-style: none;
+}
+.widget .tool.selected {
+  background: url("../../../view/theme/diabook-blue/icons/selected.png") no-repeat left center;
+}
+/* widget: search */
+#add-search-popup {
+  width: 200px;
+  top: 18px;
+}
+/* section */
+section {
+  display: table-cell;
+  vertical-align: top;
+  width: 800px;
+  padding: 0px 0px 0px 12px;
+}
+.pager {
+   padding: 10px;
+	text-align: center;
+	font-size: 1.0em;
+}	
+
+.tabs {
+    
+    background-position: 0 -20px;
+    background-repeat: repeat-x;
+    height: 27px;
+    padding: 0;
+ }
+.tab.button {
+    margin-right: 5px; 
+    margin-left: 5px;	
+    /*background: none repeat scroll 0 0 #F8F8F8;*/
+    border: 1px solid #CCCCCC;
+    border-radius: 3px 3px 3px 3px;
+    font-weight: normal;
+    padding: 3px;
+    color:  #333333;
+	}
+	
+#birthday-notice, #event-notice, #birthday-wrapper, #event-wrapper{
+	margin-bottom: 10px;
+	}
+/* wall item */
+.tread-wrapper {
+  border-bottom: 1px solid #D2D2D2;
+  position: relative;
+  padding: 5px;
+  margin-bottom: 0px;
+  width: 775px;
+}
+.wall-item-decor {
+  position: absolute;
+  left: 790px;
+  top: -10px;
+  width: 16px;
+}
+
+.wall-item-container {
+  display: table;
+  width: 780px;
+}
+
+
+.wall-item-container .wall-item-item, .wall-item-container .wall-item-bottom {
+  display: table-row;
+}
+.wall-item-bottom {
+  font-size: 13px;
+}
+.wall-item-container .wall-item-bottom {
+/*  opacity: 0.5;
+  -webkit-transition: all 0.2s ease-in-out;
+  -moz-transition: all 0.2s ease-in-out;
+  -o-transition: all 0.2s ease-in-out;
+  -ms-transition: all 0.2s ease-in-out;
+  transition: all 0.2s ease-in-out; */
+}
+.wall-item-container:hover .wall-item-bottom {
+/*  opacity: 1;
+  -webkit-transition: all 0.2s ease-in-out;
+  -moz-transition: all 0.2s ease-in-out;
+  -o-transition: all 0.2s ease-in-out;
+  -ms-transition: all 0.2s ease-in-out;
+  transition: all 0.2s ease-in-out; */
+}
+.wall-item-container .wall-item-info {
+  display: table-cell;
+  vertical-align: top;
+  text-align: left;
+  width: 80px;
+}
+.wall-item-container .wall-item-location {
+  padding-right: 40px;
+}
+.wall-item-container .wall-item-ago {
+  word-wrap: break-word;
+  width: 50px;
+  margin-left: 10px;
+  color: #999;
+}
+.wall-item-location {
+  
+  clear: both;
+  overflow: hidden;
+  
+  margin-bottom: 5px;
+}
+
+.wall-item-container .wall-item-content {
+  font-size: 13px;
+  max-width: 720px;
+  word-wrap: break-word;
+  line-height: 1.4;
+}
+
+.wall-item-container .wall-item-content img {
+  max-width: 700px;
+}
+.wall-item-container .wall-item-links, .wall-item-container .wall-item-actions {
+  display: table-cell;
+  vertical-align: middle;
+}
+.wall-item-container .wall-item-links .icon, .wall-item-container .wall-item-actions .icon {
+  opacity: 0.5;
+  -webkit-transition: all 0.2s ease-in-out;
+  -moz-transition: all 0.2s ease-in-out;
+  -o-transition: all 0.2s ease-in-out;
+  -ms-transition: all 0.2s ease-in-out;
+  transition: all 0.2s ease-in-out;
+}
+.wall-item-container .wall-item-links .icon:hover, .wall-item-container .wall-item-actions .icon:hover {
+  opacity: 1;
+  -webkit-transition: all 0.2s ease-in-out;
+  -moz-transition: all 0.2s ease-in-out;
+  -o-transition: all 0.2s ease-in-out;
+  -ms-transition: all 0.2s ease-in-out;
+  transition: all 0.2s ease-in-out;
+}
+.wall-item-container .wall-item-name {
+  font-weight: bold;
+}
+.wall-item-container .wall-item-actions-author {
+  width: 100%;
+  margin-bottom: 0.3em;
+}
+.wall-item-container .wall-item-actions-social {
+  float: left;
+  margin-bottom: 1px;
+}
+.wall-item-container .wall-item-actions-social a {
+  margin-right: 1em;
+}
+.wall-item-actions-social a {
+  float: left;
+}
+.wall-item-container .wall-item-actions-tools {
+  float: right;
+  width: 80px;
+}
+.wall-item-container .wall-item-actions-tools a {
+  float: right;
+}
+.wall-item-container .wall-item-actions-tools input {
+  float: right;
+}
+.wall-item-container.comment {
+  margin-top: 5px;
+  margin-bottom: 5px;
+  margin-left: 80px;
+  width: 700px;
+  border-bottom: 1px solid hsl(198, 21%, 79%);
+}
+.wall-item-container.comment .contact-photo {
+  width: 32px;
+  height: 32px;
+  margin-left: 16px;
+  /*background: url(../../../images/icons/22/user.png) no-repeat center center;*/
+
+}
+.wall-item-container.comment {
+  top: 15px !important;
+  left: 15px !important;
+}
+.wall-item-container.comment .wall-item-links {
+  padding-left: 12px;
+}
+.wall-item-comment-wrapper {
+  margin: 1px 5px 1px 80px;
+}
+.wall-item-comment-wrapper .comment-edit-photo {
+  display: none;
+}
+.wall-item-comment-wrapper textarea {
+  height: 2.0em;
+  width: 100%;
+  font-size: 10px;
+  color: #999999;
+  border: 1px solid #DDD;
+  padding: 0.3em;
+  font-size: 14px;
+}
+.wall-item-comment-wrapper .comment-edit-text-full {
+  font-size: 14px;
+  height: 4em;
+  color: #2d2d2d;
+  border: 1px solid #2d2d2d;
+}
+.comment-edit-preview {
+  width: 710px;
+  border: 1px solid #2d2d2d;
+  margin-top: 10px;
+}
+.comment-edit-preview .contact-photo {
+  width: 32px;
+  height: 32px;
+  margin-left: 16px;
+  /*background: url(../../../images/icons/22/user.png) no-repeat center center;*/
+
+}
+.comment-edit-preview {
+  top: 15px !important;
+  left: 15px !important;
+}
+.comment-edit-preview .wall-item-links {
+  padding-left: 12px;
+}
+.comment-edit-preview .wall-item-container {
+  width: 700px;
+}
+.comment-edit-preview .tread-wrapper {
+  width: 700px;
+  padding: 0;
+  margin: 10px 0;
+}
+
+.shiny {
+  /* border-right: 10px solid #fce94f; */
+	border-right: 1px solid #A7C7F7;
+	padding-right: 12px;
+}
+
+#jot-preview-content{
+	margin-top: 30px;}
+	
+#jot-preview-content .tread-wrapper {
+  background-color: #fff797;
+}
+
+.wall-item-tags {
+  padding-top: 1px;
+  padding-bottom: 2px;
+}
+.tag {
+  /*background: url("../../../images/tag_b.png") repeat-x center left;*/
+  color: #3465A4;
+  padding-left: 3px;
+  font-size: 12px;
+}
+.tag a {
+  padding-right: 5px;
+  /*background: url("../../../images/tag.png") no-repeat center right;*/
+  color: #3465A4;
+}
+.wwto {
+  position: absolute !important;
+  width: 25px;
+  height: 25px;
+  background: #FFFFFF;
+  border: 2px solid #364e59;
+  height: 25px;
+  width: 25px;
+  overflow: hidden;
+  padding: 1px;
+  position: absolute !important;
+  top: 40px;
+  left: 30px;
+  -webkit-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+}
+.wwto .contact-photo {
+  width: auto;
+  height: 25px;
+}
+/* contacts menu */
+.contact-photo-wrapper {
+  position: relative;
+  width: 80px;
+}
+
+.contact-photo-wrapper.wwto {
+  width: 25px;
+}
+
+.contact-photo {
+  width: 48px;
+  height: 48px;
+  overflow: hidden;
+  display: block;
+}
+.contact-photo img {
+  width: 48px;
+  height: 48px;
+}
+
+.contact-wrapper {
+  float: left;
+  width: 90px;
+  height: 90px;
+  margin-bottom: 15px;
+}
+.contact-wrapper .contact-photo {
+  width: 80px;
+  height: 80px;
+}
+.contact-wrapper .contact-photo img {
+  width: 80px;
+  height: 80px;
+}
+.contact-wrapper {
+  left: 0px;
+  top: 63px;
+}
+.contact-photo {
+  width: 48px;
+  height: 48px;
+}
+.contact-photo img {
+  width: 48px;
+  height: 48px;
+}
+.contact-name {
+  /* text-align: center; */
+  /*font-weight: bold;*/
+  font-size: 12px;
+}
+.contact-details {
+  color: #999999;
+}
+/* editor */
+.jothidden {
+  display: none;
+}
+#jot {
+  width: 785px;
+  margin: 0px 2em 20px 0px;
+}
+#profile-jot-form #profile-jot-text {
+  height: 2.0em;
+  width: 99%;
+  font-size: 15px;
+  color: #999999;
+  border: 1px solid #DDD;
+  padding: 0.3em;
+  margin-bottom: 10px;
+}
+#jot #jot-tools {
+  margin: 0px;
+  padding: 0px;
+  height: 40px;
+  overflow: none;
+  width: 783px;
+  background-color: #fff;
+  border-bottom: 2px solid #9eabb0;
+}
+
+#jot #jot-tools li {
+  list-style: none;
+  float: left;
+  width: 80px;
+  height: 40px;
+  border-bottom: 2px solid #9eabb0;
+}
+#jot #jot-tools li a {
+  display: block;
+  color: #cccccc;
+  width: 100%;
+  height: 40px;
+  text-align: center;
+  line-height: 40px;
+  overflow: hidden;
+}
+#jot #jot-tools li:hover {
+  background-color: #364e59;
+  border-bottom: 2px solid #bdcdd4;
+}
+#jot #jot-tools li.perms {
+  float: right;
+  width: 40px;
+}
+#jot #jot-tools li.perms a.unlock {
+  width: 30px;
+  border-left: 10px solid #cccccc;
+  background-color: #cccccc;
+  background-position: left center;
+}
+#jot #jot-tools li.perms a.lock {
+  width: 30px;
+  border-left: 10px solid #666666;
+  background-color: #666666;
+}
+#jot #jot-tools li.submit {
+  float: right;
+  background-color: #cccccc;
+  border-bottom: 2px solid #cccccc;
+  border-right: 1px solid #666666;
+  border-left: 1px solid #666666;
+}
+#jot #jot-tools li.submit input {
+  border: 0px;
+  margin: 0px;
+  padding: 0px;
+  background-color: #cccccc;
+  color: #666666;
+  width: 80px;
+  height: 40px;
+  line-height: 40px;
+}
+#jot #jot-tools li.submit input:hover {
+  background-color: #bdcdd4;
+  color: #666666;
+}
+#jot #jot-tools li.loading {
+  float: right;
+  background-color: #ffffff;
+  width: 20px;
+  vertical-align: center;
+  text-align: center;
+  border-top: 2px solid #9eabb0;
+  height: 38px;
+}
+#jot #jot-tools li.loading img {
+  margin-top: 10px;
+}
+#profile-jot-form #jot-title {
+    
+  	 border-radius: 5px 5px 5px 5px;
+    font-weight: bold;
+    height: 20px;
+    margin: 0 0 5px;
+    width: 60%;
+    border: 1px solid #ffffff;
+}
+#profile-jot-form #jot-title:-webkit-input-placeholder {
+  font-weight: normal;
+}
+#profile-jot-form #jot-title:-moz-placeholder {
+  font-weight: normal;
+}
+#profile-jot-form #profile-jot-text_parent #profile-jot-text_tbl{
+	width: 785px;
+	height: 100px;
+	}
+#jot #jot-title:hover {
+  border: 1px solid #999999;
+}
+#jot #jot-title:focus {
+  border: 1px solid #999999;
+}
+#jot #character-counter {
+  width: 80px;
+  float: right;
+  text-align: right;
+  height: 20px;
+  line-height: 20px;
+  padding-right: 20px;
+}
+#jot-perms-icon, 
+#profile-location,
+#profile-nolocation,
+#profile-youtube, 
+#profile-video, 
+#profile-audio,
+#profile-link,
+#profile-title, 
+#wall-image-upload,
+#wall-file-upload,
+#wall-image-upload-div,
+#wall-file-upload-div,
+.hover, .focus {
+	cursor: pointer;
+	margin-top: 2px;
+}
+#profile-jot-wrapper{
+	margin: 0 2em 20px 0;
+   width: 785px;
+	}
+
+#profile-jot-submit-wrapper {
+	margin-bottom: 50px;
+	width: 785px;
+}
+
+#profile-jot-submit {
+	float: right;
+	margin-top: 2px;
+	
+}
+#profile-upload-wrapper {
+	float: left;
+	margin-top: 2px;
+	margin-left: 10px;
+	
+}
+#profile-attach-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-rotator {
+	float: left;
+	margin-left: 30px;
+	margin-top: 2px;
+}
+#profile-link-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-youtube-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-video-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-audio-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-location-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-jot-perms {
+	float: left;
+	margin-left: 45px;
+	margin-top: 2px;
+}
+#jot-preview-link {
+	float: right;
+	margin-left: 10px;
+	margin-top: 2px;
+	font-size: 10px;
+}
+#profile-jot-perms{
+   float: right;
+	margin-left: 10px;
+	margin-top: 2px;	
+	}
+/** buttons **/
+.button.creation1 {
+    background-color: #fff;
+    border: 1px solid #777777;
+    background-image: -moz-linear-gradient(center top , white 0%, #DDDDDD 100%);
+    border-radius: 3px 3px 3px 3px;
+    box-shadow: 0 1px 1px #CFCFCF;
+}
+.button.creation2 {
+    background-color: #33ACFF;
+    background-image: -moz-linear-gradient(center top , #66C1FF 0%, #0097FF 100%);
+    border: 1px solid #777777;
+    color: white;
+    border-radius: 3px 3px 3px 3px;
+    box-shadow: 0 1px 1px #CFCFCF;
+    margin-left: 5px;
+}
+/*input[type="submit"] {
+	border: 0px;
+    background-color: @ButtonBackgroundColor;
+    color: @ButtonColor;
+    padding: 0px 10px;
+	.rounded(5px);
+    height: 18px;
+}*/
+/** acl **/
+#photo-edit-perms-select, #photos-upload-permissions-wrapper, #profile-jot-acl-wrapper {
+  display: block!important;
+}
+#acl-wrapper {
+  width: 690px;
+  float: left;
+}
+#acl-search {
+  float: right;
+  background: #ffffff url("../../../images/search_18.png") no-repeat right center;
+  padding-right: 20px;
+}
+#acl-showall {
+  float: left;
+  display: block;
+  width: auto;
+  height: 18px;
+  background-color: #cccccc;
+  background-image: url("../../../images/show_all_off.png");
+  background-position: 7px 7px;
+  background-repeat: no-repeat;
+  padding: 7px 5px 0px 30px;
+  color: #999999;
+  -moz-border-radius: 5px 5px 5px 5px;
+  -webkit-border-radius: 5px 5px 5px 5px;
+  border-radius: 5px 5px 5px 5px;
+}
+#acl-showall.selected {
+  color: #000000;
+  background-color: #ff9900;
+  background-image: url("../../../images/show_all_on.png");
+}
+#acl-list {
+  height: 210px;
+  border: 1px solid #cccccc;
+  clear: both;
+  margin-top: 30px;
+  overflow: auto;
+}
+.acl-list-item {
+  display: block;
+  width: 150px;
+  height: 30px;
+  border: 1px solid #cccccc;
+  margin: 5px;
+  float: left;
+}
+.acl-list-item img {
+  width: 22px;
+  height: 22px;
+  float: left;
+  margin: 4px;
+}
+.acl-list-item p {
+  height: 12px;
+  font-size: 10px;
+  margin: 0px;
+  padding: 2px 0px 1px;
+  overflow: hidden;
+}
+.acl-list-item a {
+  font-size: 8px;
+  display: block;
+  width: 40px;
+  height: 10px;
+  float: left;
+  color: #999999;
+  background-color: #cccccc;
+  background-position: 3px 3px;
+  background-repeat: no-repeat;
+  margin-right: 5px;
+  -webkit-border-radius: 2px ;
+  -moz-border-radius: 2px;
+  border-radius: 2px;
+  padding-left: 15px;
+}
+#acl-wrapper a:hover {
+  text-decoration: none;
+  color: #000000;
+}
+.acl-button-show {
+  background-image: url("../../../images/show_off.png");
+}
+.acl-button-hide {
+  background-image: url("../../../images/hide_off.png");
+}
+.acl-button-show.selected {
+  color: #000000;
+  background-color: #9ade00;
+  background-image: url("../../../images/show_on.png");
+}
+.acl-button-hide.selected {
+  color: #000000;
+  background-color: #ff4141;
+  background-image: url("../../../images/hide_on.png");
+}
+.acl-list-item.groupshow {
+  border-color: #9ade00;
+}
+.acl-list-item.grouphide {
+  border-color: #ff4141;
+}
+/** /acl **/
+/** tab buttons 14618a**/
+ul.tabs {
+  list-style-type: none;
+  padding-bottom: 10px;
+  font-size: 13px;
+}
+ul.tabs li {
+  float: left;
+  margin-left: 5px;
+}
+ul.tabs li .active {
+    background-color: #055580;
+    border: 1px solid #777777;
+    color: white;
+    border-radius: 3px 3px 3px 3px;
+    box-shadow: 0 1px 1px #CFCFCF;
+    margin-left: 5px;
+}
+/**
+ * Form fields
+ */
+.field {
+  margin-bottom: 10px;
+  padding-bottom: 10px;
+  overflow: auto;
+  width: 100%;
+}
+.field label {
+  float: left;
+  width: 200px;
+}
+.field input, .field textarea {
+  width: 400px;
+}
+.field textarea {
+  height: 100px;
+}
+.field .field_help {
+  display: block;
+  margin-left: 200px;
+  color: #666666;
+}
+.field .onoff {
+  float: left;
+  width: 80px;
+}
+.field .onoff a {
+  display: block;
+  border: 1px solid #666666;
+  background-image: url("../../../images/onoff.jpg");
+  background-repeat: no-repeat;
+  padding: 4px 2px 2px 2px;
+  height: 16px;
+  text-decoration: none;
+}
+.field .onoff .off {
+  border-color: #666666;
+  padding-left: 40px;
+  background-position: left center;
+  background-color: #cccccc;
+  color: #666666;
+  text-align: right;
+}
+.field .onoff .on {
+  border-color: #204A87;
+  padding-right: 40px;
+  background-position: right center;
+  background-color: #D7E3F1;
+  color: #204A87;
+  text-align: left;
+}
+.field .hidden {
+  display: none!important;
+}
+.field.radio .field_help {
+  margin-left: 0px;
+}
+#directory-search-form{
+	margin-bottom: 50px;
+	}
+#profile-edit-links-end {
+        clear: both;
+        margin-bottom: 15px;
+}
+
+#profile-edit-links ul { margin: 20px; padding-bottom: 20px; list-style: none; }
+
+#profile-edit-links li {
+  float: left;
+  list-style: none;
+  margin-left: 10px;
+}
+
+.profile-edit-side-div {
+  display: none;
+}
+
+#register-form label,
+#profile-edit-form label {
+        width: 300px; float: left;
+}
+
+.required {
+  display: inline;
+  color: #B20202;
+}
+
+/* oauth */
+.oauthapp {
+  height: auto;
+  overflow: auto;
+  border-bottom: 2px solid #cccccc;
+  padding-bottom: 1em;
+  margin-bottom: 1em;
+}
+.oauthapp img {
+  float: left;
+  width: 48px;
+  height: 48px;
+  margin: 10px;
+}
+.oauthapp img.noicon {
+  background-image: url("../../../images/icons/48/plugin.png");
+  background-position: center center;
+  background-repeat: no-repeat;
+}
+.oauthapp a {
+  float: left;
+}
+/* contacts */
+.contact-entry-wrapper {
+  width: 120px;
+  height: 120px;
+  float: left;
+}
+/* photo */
+.lframe {
+  float: left;
+  margin: 0px 10px 10px 0px;
+}
+/* profile match wrapper */
+.profile-match-wrapper {
+  float: left;
+  width: 90px;
+  height: 90px;
+  margin-bottom: 20px;
+}
+.profile-match-wrapper .contact-photo {
+  width: 80px;
+  height: 80px;
+}
+.profile-match-wrapper .contact-photo img {
+  width: 80px;
+  height: 80px;
+}
+.profile-match-wrapper {
+  left: 0px;
+  top: 63px;
+}
+
+.contact-photo-menu-button {
+        position: relative;
+        background-image: url("../../../images/icons/16/menu.png");
+        background-position: top left; 
+        background-repeat: no-repeat;
+        margin: 0px 0px -16px 0px; 
+	padding: 0px;
+        width: 16px;
+        height: 16px;
+        top: -20px; left:0px;
+        overflow: hidden;
+        text-indent: 40px;
+        display: none;
+        
+}
+.contact-photo-menu {
+        width: 11em;
+        border: 3px solid #364e59;
+	color: #2d2d2d;
+        background: #FFFFFF;
+/*        position: absolute;*/
+        position: relative;
+        left: 0px; top: 0px;
+        display: none;
+        z-index: 10000;
+}
+.contact-photo-menu ul { margin:0px; padding: 0px; list-style: none }
+.contact-photo-menu li a {
+	display: block; 
+	padding: 5px 10px; 
+	color: #2d2d2d;
+	text-decoration: none;
+}
+.contact-photo-menu li a:hover {
+	background-color: #bdcdd4; 
+}
+
+/* page footer */
+footer {
+  height: 100px;
+  display: table-row;
+}
+
+blockquote {
+    border-left: 1px solid #D2D2D2;
+    padding-left: 9px;
+    margin: 0 0 0 .8ex;
+}
+.aprofile dt{
+box-shadow: 1px 1px 5px 0;
+    color: #666666;
+    margin: 15px 0 5px;
+    padding-left: 5px;	
+	}
+/* ================== */
+/* = Contacts Block = */
+/* ================== */
+
+.contact-block-img {
+        width: 55px;
+        height: 55px;
+        padding-right: 3px;
+}
+.contact-block-div {
+        float: left;
+}
+
+.contact-block-textdiv { width: 150px; height: 34px; float: left; }
+#contact-block-end { clear: both; } 
+
+#group-edit-wrapper {
+        margin-bottom: 10px;
+}
+
+#group-members-end {
+        clear: both;
+}
+#group-edit-desc {
+ margin-top: 15px;
+}
+
+/*
+#group-separator,
+#prof-separator { display: none;}
+*/
+
+#prvmail-to-label, #prvmail-subject-label, #prvmail-message-label {
+	margin-bottom: 10px;
+	margin-top: 20px;
+}
+
+#prvmail-submit {
+	float: left;
+	margin-top: 10px;
+	margin-right: 30px;
+}
+#prvmail-upload-wrapper,
+#prvmail-link-wrapper,
+#prvmail-rotator-wrapper {
+	float: left;
+	margin-top: 10px;
+	margin-right: 10px;
+	width: 24px;
+}
+
+#prvmail-end {
+	clear: both;
+}
+
+.mail-list-sender,
+.mail-list-detail {
+	float: left;
+}
+.mail-list-detail {
+	margin-left: 20px;
+}
+
+.mail-list-subject {
+	font-size: 1.1em;
+	margin-top: 10px;
+}
+a.mail-list-link {
+    display: block;
+    font-size: 1.3em;
+    padding: 4px 0;
+}
+
+/*
+*a.mail-list-link:hover {
+*	background-color: #15607B;
+*	color: #F5F6FB;
+*}
+*/
+
+.mail-list-outside-wrapper-end {
+	clear: both;
+}
+
+.mail-list-outside-wrapper {
+	margin-top: 30px;
+}
+
+.mail-list-delete-wrapper {
+	float: right;
+	margin-right: 30px;
+	margin-top: 15px;
+}
+
+.mail-list-delete-icon {
+	border: none;
+}
+
+.mail-conv-sender,
+.mail-conv-detail {
+	float: left;
+}
+.mail-conv-detail {
+	margin-left: 20px;
+	width: 500px;
+}
+
+.mail-conv-subject {
+    font-size: 1.4em;
+    margin: 10px 0;
+}
+
+.mail-conv-outside-wrapper-end {
+	clear: both;
+}
+
+.mail-conv-outside-wrapper {
+	margin-top: 30px;
+}
+
+.mail-conv-delete-wrapper {
+	float: right;
+	margin-right: 30px;
+	margin-top: 15px;
+}
+.mail-conv-break {
+	clear: both;
+}
+
+.mail-conv-delete-icon {
+	border: none;
+}
+
+/* ========== */
+/* = Events = */
+/* ========== */
+.eventcal {
+        float: left;
+        font-size: 20px;
+}
+
+.vevent {
+        border: 1px solid #CCCCCC;
+}
+.vevent .event-description, .vevent .event-location {
+        margin-left: 10px;
+        margin-right: 10px;
+}
+.vevent .event-start {
+        margin-left: 10px;
+        margin-right: 10px;
+}
+
+#new-event-link {
+        margin-bottom: 10px;
+}
+
+.edit-event-link, .plink-event-link {
+        float: left;
+        margin-top: 4px;
+        margin-right: 4px;
+        margin-bottom: 15px;
+}
+
+.event-description:before {
+        content: url('../../../images/calendar.png');
+        margin-right: 15px;
+}
+
+.event-start, .event-end {
+        margin-left: 10px;
+        width: 330px;
+        clear: both;
+}
+
+.event-start .dtstart, .event-end .dtend {
+        float: right;
+}
+
+.event-list-date {
+        margin-bottom: 10px;
+}
+
+.prevcal, .nextcal {
+        float: left;
+        margin-left: 32px;
+        margin-right: 32px;
+        margin-top: 64px;
+}
+.event-calendar-end {
+        clear: both;
+}
+
+ 
+.calendar {
+        font-family: Courier, monospace;
+}
+.today {
+        font-weight: bold;
+        color: #FF0000;
+}
+
+.settings-block {
+        border: 1px solid #AAA;
+        margin: 10px;
+        padding: 10px;
+}
+
+.app-title {
+        margin: 10px;
+}
+
+#identity-manage-desc {
+        margin-top:15px;
+        margin-bottom: 15px;
+}
+
+#identity-manage-choose {
+        margin-bottom: 15px;
+}
+
+#identity-submit {
+        margin-top: 20px;
+}
+
+#photo-prev-link, #photo-next-link {
+        padding: 10px;
+        float: left;
+}
+
+#photo-photo {
+        float: left;
+}
+#photo-like-div .wall-item-like-buttons {
+	float: left;
+   margin-right: 10px;
+	}
+.wall-item-like-buttons .icon.like {
+float: left;
+}
+
+#photo-photo-end {
+        clear: both;
+}
+
+.tabs .comment-wwedit-wrapper {
+	display: block;
+   margin-top: 30px;
+   margin-left: 50px;
+	}
+
+.profile-match-photo {
+        float: left;
+        text-align: center;
+        width: 120px;
+}
+
+.profile-match-name {
+        float: left;
+        text-align: center;
+        width: 120px;
+        overflow: hidden;
+}
+
+.profile-match-break,
+.profile-match-end {
+        clear: both;
+}
+
+.profile-match-connect {
+        text-align: center;
+        font-weight: bold;
+}
+
+.profile-match-wrapper {
+        float: left;
+        padding: 10px;
+        width: 120px;
+        height: 120px;
+        scroll: auto;
+}
+#profile-match-wrapper-end {
+        clear: both;
+}
+
+/* ============= */
+/* = Directory = */
+/* ============= */
+/* contacts menu */
+.contact-photo-wrapper {
+  position: relative;
+}
+.contact-photo {
+  width: 48px;
+  height: 48px;
+  overflow: hidden;
+  display: block;
+}
+.contact-photo img {
+  width: 48px;
+  height: 48px;
+}
+.contact-photo-menu-button {
+  display: none;
+  /* position: absolute; */
+  /* position: absolute; */
+  left: -2px;
+  top: -20px;
+}
+.contact-wrapper {
+  float: left;
+  width: 90px;
+  height: 90px;
+  margin-bottom: 15px;
+}
+.contact-wrapper .contact-photo {
+  width: 80px;
+  height: 80px;
+}
+.contact-wrapper .contact-photo img {
+  width: 80px;
+  height: 80px;
+}
+.contact-wrapper .contact-photo-menu-button {
+  left: 0px;
+  top: 63px;
+}
+.directory-item {
+  float: left;
+  width: 200px;
+  height: 200px;
+}
+.directory-item .contact-photo {
+  width: 175px;
+  height: 175px;
+}
+.directory-item .contact-photo img {
+  width: 175px;
+  height: 175px;
+}
+.contact-name {
+  text-align: left;
+  font-weight: bold;
+  font-size: 12px;
+}
+.contact-details {
+  color: #999999;
+}
+
+.photo-top-image-wrapper {
+        position: relative;
+        float: left;
+        margin-top: 15px;
+        margin-right: 15px;
+        width: 200px; height: 200px; 
+        overflow: hidden; 
+}
+.photo-top-album-name {
+        width: 100%;
+        min-height: 2em;
+        position: absolute; 
+        bottom: 0px; 
+        padding: 0px 3px;
+        padding-top: 0.5em;
+        background-color: rgb(255, 255, 255);
+}
+#photo-top-end {
+        clear: both;
+}
+
+#photo-top-links {
+        margin-bottom: 30px;
+        margin-left: 30px;
+}
+
+#photos-upload-newalbum-div {
+        float: left;
+        width: 175px;
+}
+
diff --git a/view/theme/diabook-blue/wall_item.tpl b/view/theme/diabook-blue/wall_item.tpl
new file mode 100644
index 000000000..b1a014949
--- /dev/null
+++ b/view/theme/diabook-blue/wall_item.tpl
@@ -0,0 +1,97 @@
+{{ if $item.indent }}{{ else }}
+<div class="wall-item-decor">
+	{{ if $item.lock }}<span class="icon lock fakelink" onclick="lockview(event,$item.id);" title="$item.lock">$item.lock</span>{{ endif }}	
+	<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
+</div>
+{{ endif }}
+<div class="wall-item-container $item.indent">
+	<div class="wall-item-item">
+		<div class="wall-item-info">
+			<div class="contact-photo-wrapper"
+				onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')" 
+				onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)">
+				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="contact-photo-link" id="wall-item-photo-link-$item.id">
+					<img src="$item.thumb" class="contact-photo$item.sparkle" id="wall-item-photo-$item.id" alt="$item.name" />
+				</a>
+				<a href="#" rel="#wall-item-photo-menu-$item.id" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-$item.id">menu</a>
+				<ul class="contact-menu menu-popup" id="wall-item-photo-menu-$item.id">
+				$item.item_photo_menu
+				</ul>
+				
+			</div>
+		</div>
+			<div class="wall-item-actions-author">
+				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle">$item.name</span></a> 
+			<span class="wall-item-ago">-
+			{{ if $item.plink }}<a class="link" title="$item.plink.title" href="$item.plink.href" style="color: #999">$item.ago</a>{{ else }} $item.ago {{ endif }}
+			{{ if $item.lock }} - <span class="fakelink" style="color: #999" onclick="lockview(event,$item.id);">$item.lock</span> {{ endif }}
+			</span>
+			</div>
+		<div class="wall-item-content">
+			{{ if $item.title }}<h2><a href="$item.plink.href">$item.title</a></h2>{{ endif }}
+			$item.body
+		</div>
+	</div>
+	<div class="wall-item-bottom">
+		<div class="wall-item-links">
+		</div>
+		<div class="wall-item-tags">
+			{{ for $item.tags as $tag }}
+				<span class='tag'>$tag</span>
+			{{ endfor }}
+		</div>
+	</div>
+	<div class="wall-item-bottom">
+		<div class="">
+
+		</div>
+		<div class="wall-item-actions">
+			<div class="wall-item-location">$item.location&nbsp;</div>
+			<div class="wall-item-actions-social">
+			
+			
+			{{ if $item.vote }}
+				<a href="#" id="like-$item.id" class="icon like" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false">$item.vote.like.1</a>
+				<a href="#" id="dislike-$item.id" class="icon dislike" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false"></a>
+			{{ endif }}
+						
+			{{ if $item.vote.share }}
+				<a href="#" id="share-$item.id" class="icon recycle" title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a>
+			{{ endif }}	
+
+
+			{{ if $item.star }}
+				<a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle">
+				<img src="images/star_dummy.png" class="icon star" alt="$item.star.do" /> </a>
+				<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a>					  
+			{{ endif }}	
+			
+			{{ if $item.plink }}<a class="icon link" title="$item.plink.title" href="$item.plink.href">$item.plink.title</a>{{ endif }}
+			
+					
+					
+			</div>
+			
+			<div class="wall-item-actions-tools">
+
+				{{ if $item.drop.dropping }}
+					<input type="checkbox" title="$item.drop.select" name="itemselected[]" class="item-select" value="$item.id" />
+					<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drop" title="$item.drop.delete">$item.drop.delete</a>
+				{{ endif }}
+				{{ if $item.edpost }}
+					<a class="icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>
+				{{ endif }}
+			</div>
+			
+		</div>
+	</div>
+	<div class="wall-item-bottom">
+		<div class="wall-item-links"></div>
+		<div class="wall-item-like" id="wall-item-like-$item.id">$item.like</div>
+		<div class="wall-item-dislike" id="wall-item-dislike-$item.id">$item.dislike</div>	
+	</div>
+</div>
+
+<div class="wall-item-comment-wrapper" >
+	$item.comment
+</div>
diff --git a/view/theme/diabook-blue/wallwall_item.tpl b/view/theme/diabook-blue/wallwall_item.tpl
new file mode 100644
index 000000000..603a908c5
--- /dev/null
+++ b/view/theme/diabook-blue/wallwall_item.tpl
@@ -0,0 +1,103 @@
+{{ if $item.indent }}{{ else }}
+<div class="wall-item-decor">
+	{{ if $item.lock }}<span class="icon lock fakelink" onclick="lockview(event,$item.id);" title="$item.lock">$item.lock</span>{{ endif }}	
+	<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
+</div>
+{{ endif }}
+<div class="wall-item-container $item.indent">
+	<div class="wall-item-item">
+		<div class="wall-item-info">
+			<div class="contact-photo-wrapper mframe wwto" id="wall-item-ownerphoto-wrapper-$item.id" >
+				<a href="$item.owner_url" target="redir" title="$item.olinktitle" class="contact-photo-link" id="wall-item-ownerphoto-link-$item.id">
+					<img src="$item.owner_photo" class="contact-photo $item.osparkle" id="wall-item-ownerphoto-$item.id" alt="$item.owner_name" />
+				</a>
+			</div>
+			<div class="contact-photo-wrapper mframe wwfrom"
+				onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')" 
+				onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)">
+				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="contact-photo-link" id="wall-item-photo-link-$item.id">
+					<img src="$item.thumb" class="contact-photo$item.sparkle" id="wall-item-photo-$item.id" alt="$item.name" />
+				</a>
+				<a href="#" rel="#wall-item-photo-menu-$item.id" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-$item.id">menu</a>
+				<ul class="contact-menu menu-popup" id="wall-item-photo-menu-$item.id">
+				$item.item_photo_menu
+				</ul>
+				
+			</div>
+		</div>
+			<div class="wall-item-actions-author">
+				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle">$item.name</span></a>
+				$item.to <a href="$item.owner_url" target="redir" title="$item.olinktitle" class="wall-item-name-link"><span class="wall-item-name$item.osparkle" id="wall-item-ownername-$item.id">$item.owner_name</span></a>
+				 $item.vwall <span class="wall-item-ago">- &nbsp;
+			{{ if $item.plink }}<a class="link" title="$item.plink.title" href="$item.plink.href" style="color: #999">$item.ago</a>{{ else }} $item.ago {{ endif }}
+			{{ if $item.lock }} - <span class="fakelink" style="color: #999" onclick="lockview(event,$item.id);">$item.lock</span> {{ endif }}
+			</span>
+			</div>
+		<div class="wall-item-content">
+			{{ if $item.title }}<h2><a href="$item.plink.href">$item.title</a></h2>{{ endif }}
+			$item.body
+		</div>
+	</div>
+	<div class="wall-item-bottom">
+		<div class="wall-item-links">
+		</div>
+		<div class="wall-item-tags">
+			{{ for $item.tags as $tag }}
+				<span class='tag'>$tag</span>
+			{{ endfor }}
+		</div>
+	</div>
+	<div class="wall-item-bottom">
+		<div class="">
+
+		</div>
+		<div class="wall-item-actions">
+			<div class="wall-item-location">$item.location&nbsp;</div>
+			<div class="wall-item-actions-social">
+			
+			
+			{{ if $item.vote }}
+				<a href="#" id="like-$item.id" class="icon like" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false">$item.vote.like.1</a>
+				<a href="#" id="dislike-$item.id" class="icon dislike" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false"></a>
+			{{ endif }}
+						
+			{{ if $item.vote.share }}
+				<a href="#" id="share-$item.id" class="icon recycle" title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a>
+			{{ endif }}	
+
+
+			{{ if $item.star }}
+				<a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle">
+				<img src="images/star_dummy.png" class="icon star" alt="$item.star.do" /> </a>
+				<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a>
+			{{ endif }}	
+			
+			{{ if $item.plink }}<a class="icon link" title="$item.plink.title" href="$item.plink.href">$item.plink.title</a>{{ endif }}
+			
+					
+					
+			</div>
+			
+			<div class="wall-item-actions-tools">
+
+				{{ if $item.drop.dropping }}
+					<input type="checkbox" title="$item.drop.select" name="itemselected[]" class="item-select" value="$item.id" />
+					<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drop" title="$item.drop.delete">$item.drop.delete</a>
+				{{ endif }}
+				{{ if $item.edpost }}
+					<a class="icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>
+				{{ endif }}
+			</div>
+			
+		</div>
+	</div>
+	<div class="wall-item-bottom">
+		<div class="wall-item-links"></div>
+		<div class="wall-item-like" id="wall-item-like-$item.id">$item.like</div>
+		<div class="wall-item-dislike" id="wall-item-dislike-$item.id">$item.dislike</div>	
+	</div>
+</div>
+
+<div class="wall-item-comment-wrapper" >
+	$item.comment
+</div>
+\ No newline at end of file
diff --git a/view/theme/diabook/comment_item.tpl b/view/theme/diabook/comment_item.tpl
new file mode 100644
index 000000000..85176732b
--- /dev/null
+++ b/view/theme/diabook/comment_item.tpl
@@ -0,0 +1,35 @@
+		<div class="comment-wwedit-wrapper" id="comment-edit-wrapper-$id" style="display: block;">
+			<form class="comment-edit-form" id="comment-edit-form-$id" action="item" method="post" onsubmit="post_comment($id); return false;">
+				<input type="hidden" name="type" value="$type" />
+				<input type="hidden" name="profile_uid" value="$profile_uid" />
+				<input type="hidden" name="parent" value="$parent" />
+				<input type="hidden" name="return" value="$return_path" />
+				<input type="hidden" name="jsreload" value="$jsreload" />
+				<input type="hidden" name="preview" id="comment-preview-inp-$id" value="0" />
+
+				<div class="comment-edit-photo" id="comment-edit-photo-$id" >
+					<a class="comment-edit-photo-link" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a>
+				</div>
+				<div class="comment-edit-photo-end"></div>
+				<textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);" onBlur="commentClose(this,$id);" >$comment</textarea>
+
+				{{ if $qcomment }}
+                <ul class="qcomment-wrapper">
+				{{ for $qcomment as $qc }}				
+					<li class="fakelink qcomment"
+                    onclick="commentInsert(this,$id); return false;">$qc</li>
+				{{ endfor }}
+                </ul>
+				{{ endif }}
+
+				<div class="comment-edit-text-end"></div>
+				<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-$id" style="display: none;">
+					<input type="submit" onclick="post_comment($id); return false;" id="comment-edit-submit-$id" class="comment-edit-submit" name="submit" value="$submit" />
+					<span onclick="preview_comment($id);" id="comment-edit-preview-link-$id" class="fakelink">$preview</span>
+					<div id="comment-edit-preview-$id" class="comment-edit-preview" style="display:none;"></div>
+				</div>
+
+				<div class="comment-edit-end"></div>
+			</form>
+
+		</div>
diff --git a/view/theme/diabook/contact_template.tpl b/view/theme/diabook/contact_template.tpl
new file mode 100755
index 000000000..48930b48a
--- /dev/null
+++ b/view/theme/diabook/contact_template.tpl
@@ -0,0 +1,25 @@
+
+<div class="contact-entry-wrapper" id="contact-entry-wrapper-$contact.id" >
+	<div class="contact-entry-photo-wrapper" >
+		<div class="contact-entry-photo mframe" id="contact-entry-photo-$contact.id"
+		onmouseover="if (typeof t$contact.id != 'undefined') clearTimeout(t$contact.id); openMenu('contact-photo-menu-button-$contact.id')" 
+		onmouseout="t$contact.id=setTimeout('closeMenu(\'contact-photo-menu-button-$contact.id\'); closeMenu(\'contact-photo-menu-$contact.id\');',200)" >
+
+			<a href="$contact.url" title="$contact.img_hover" /><img src="$contact.thumb" $contact.sparkle alt="$contact.name" /></a>
+
+			{{ if $contact.photo_menu }}
+			<span onclick="openClose('contact-photo-menu-$contact.id');" class="fakelink contact-photo-menu-button" id="contact-photo-menu-button-$contact.id">menu</span>
+                <div class="contact-photo-menu" id="contact-photo-menu-$contact.id">
+                    <ul>
+                        $contact.photo_menu
+                    </ul>
+                </div>
+			{{ endif }}
+		</div>
+			
+	</div>
+	<div class="contact-entry-photo-end" ></div>
+		<div class="contact-entry-name" id="contact-entry-name-$contact.id" >$contact.name</div>
+
+	<div class="contact-entry-end" ></div>
+</div>
diff --git a/view/theme/diabook/experimental b/view/theme/diabook/experimental
new file mode 100755
index 000000000..e69de29bb
--- /dev/null
+++ b/view/theme/diabook/experimental
diff --git a/view/theme/diabook/icons/attach.png b/view/theme/diabook/icons/attach.png
new file mode 100755
index 000000000..1958041cf
--- /dev/null
+++ b/view/theme/diabook/icons/attach.png
diff --git a/view/theme/diabook/icons/audio.png b/view/theme/diabook/icons/audio.png
new file mode 100755
index 000000000..8d779a409
--- /dev/null
+++ b/view/theme/diabook/icons/audio.png
diff --git a/view/theme/diabook/icons/bluebug.png b/view/theme/diabook/icons/bluebug.png
new file mode 100644
index 000000000..3979e7d8e
--- /dev/null
+++ b/view/theme/diabook/icons/bluebug.png
diff --git a/view/theme/diabook/icons/camera.png b/view/theme/diabook/icons/camera.png
new file mode 100755
index 000000000..a5c7f1236
--- /dev/null
+++ b/view/theme/diabook/icons/camera.png
diff --git a/view/theme/diabook/icons/community.png b/view/theme/diabook/icons/community.png
new file mode 100644
index 000000000..7c91e8b75
--- /dev/null
+++ b/view/theme/diabook/icons/community.png
diff --git a/view/theme/diabook/icons/contacts.png b/view/theme/diabook/icons/contacts.png
new file mode 100644
index 000000000..8a3e69ec1
--- /dev/null
+++ b/view/theme/diabook/icons/contacts.png
diff --git a/view/theme/diabook/icons/contacts2.png b/view/theme/diabook/icons/contacts2.png
new file mode 100755
index 000000000..7817279f4
--- /dev/null
+++ b/view/theme/diabook/icons/contacts2.png
diff --git a/view/theme/diabook/icons/dislike.png b/view/theme/diabook/icons/dislike.png
new file mode 100644
index 000000000..23de426c5
--- /dev/null
+++ b/view/theme/diabook/icons/dislike.png
diff --git a/view/theme/diabook/icons/drop.png b/view/theme/diabook/icons/drop.png
new file mode 100755
index 000000000..2abb82ef2
--- /dev/null
+++ b/view/theme/diabook/icons/drop.png
diff --git a/view/theme/diabook/icons/ftdevs.gif b/view/theme/diabook/icons/ftdevs.gif
new file mode 100644
index 000000000..e0fc25743
--- /dev/null
+++ b/view/theme/diabook/icons/ftdevs.gif
diff --git a/view/theme/diabook/icons/globe.png b/view/theme/diabook/icons/globe.png
new file mode 100644
index 000000000..6bb9bc09d
--- /dev/null
+++ b/view/theme/diabook/icons/globe.png
diff --git a/view/theme/diabook/icons/head.jpg b/view/theme/diabook/icons/head.jpg
new file mode 100644
index 000000000..6210b76be
--- /dev/null
+++ b/view/theme/diabook/icons/head.jpg
diff --git a/view/theme/diabook/icons/isstar.png b/view/theme/diabook/icons/isstar.png
new file mode 100644
index 000000000..c955b25b5
--- /dev/null
+++ b/view/theme/diabook/icons/isstar.png
diff --git a/view/theme/diabook/icons/language.png b/view/theme/diabook/icons/language.png
new file mode 100644
index 000000000..8029c0155
--- /dev/null
+++ b/view/theme/diabook/icons/language.png
diff --git a/view/theme/diabook/icons/like.png b/view/theme/diabook/icons/like.png
new file mode 100644
index 000000000..b65edccc0
--- /dev/null
+++ b/view/theme/diabook/icons/like.png
diff --git a/view/theme/diabook/icons/link.png b/view/theme/diabook/icons/link.png
new file mode 100755
index 000000000..0ef666a67
--- /dev/null
+++ b/view/theme/diabook/icons/link.png
diff --git a/view/theme/diabook/icons/lock.png b/view/theme/diabook/icons/lock.png
new file mode 100755
index 000000000..7e34bf279
--- /dev/null
+++ b/view/theme/diabook/icons/lock.png
diff --git a/view/theme/diabook/icons/lupe.png b/view/theme/diabook/icons/lupe.png
new file mode 100755
index 000000000..f8b228347
--- /dev/null
+++ b/view/theme/diabook/icons/lupe.png
diff --git a/view/theme/diabook/icons/messages.png b/view/theme/diabook/icons/messages.png
new file mode 100755
index 000000000..38e11ef88
--- /dev/null
+++ b/view/theme/diabook/icons/messages.png
diff --git a/view/theme/diabook/icons/messages2.png b/view/theme/diabook/icons/messages2.png
new file mode 100644
index 000000000..54b68e7f7
--- /dev/null
+++ b/view/theme/diabook/icons/messages2.png
diff --git a/view/theme/diabook/icons/notifications.png b/view/theme/diabook/icons/notifications.png
new file mode 100755
index 000000000..5bdc34f76
--- /dev/null
+++ b/view/theme/diabook/icons/notifications.png
diff --git a/view/theme/diabook/icons/notify.png b/view/theme/diabook/icons/notify.png
new file mode 100755
index 000000000..9b852d05b
--- /dev/null
+++ b/view/theme/diabook/icons/notify.png
diff --git a/view/theme/diabook/icons/notify2.png b/view/theme/diabook/icons/notify2.png
new file mode 100644
index 000000000..407e2dbb4
--- /dev/null
+++ b/view/theme/diabook/icons/notify2.png
diff --git a/view/theme/diabook/icons/pencil.png b/view/theme/diabook/icons/pencil.png
new file mode 100755
index 000000000..772e49b17
--- /dev/null
+++ b/view/theme/diabook/icons/pencil.png
diff --git a/view/theme/diabook/icons/pencil2.png b/view/theme/diabook/icons/pencil2.png
new file mode 100644
index 000000000..3b47d1864
--- /dev/null
+++ b/view/theme/diabook/icons/pencil2.png
diff --git a/view/theme/diabook/icons/recycle.png b/view/theme/diabook/icons/recycle.png
new file mode 100755
index 000000000..c3b8d2bf4
--- /dev/null
+++ b/view/theme/diabook/icons/recycle.png
diff --git a/view/theme/diabook/icons/remote.png b/view/theme/diabook/icons/remote.png
new file mode 100755
index 000000000..a560cc55e
--- /dev/null
+++ b/view/theme/diabook/icons/remote.png
diff --git a/view/theme/diabook/icons/scroll_top.png b/view/theme/diabook/icons/scroll_top.png
new file mode 100755
index 000000000..0e7f7ae6a
--- /dev/null
+++ b/view/theme/diabook/icons/scroll_top.png
diff --git a/view/theme/diabook/icons/selected.png b/view/theme/diabook/icons/selected.png
new file mode 100755
index 000000000..2a30ae252
--- /dev/null
+++ b/view/theme/diabook/icons/selected.png
diff --git a/view/theme/diabook/icons/star.png b/view/theme/diabook/icons/star.png
new file mode 100755
index 000000000..0b00cb189
--- /dev/null
+++ b/view/theme/diabook/icons/star.png
diff --git a/view/theme/diabook/icons/star_dummy.png b/view/theme/diabook/icons/star_dummy.png
new file mode 100644
index 000000000..ce11f30d4
--- /dev/null
+++ b/view/theme/diabook/icons/star_dummy.png
diff --git a/view/theme/diabook/icons/starred.png b/view/theme/diabook/icons/starred.png
new file mode 100755
index 000000000..72a49c157
--- /dev/null
+++ b/view/theme/diabook/icons/starred.png
diff --git a/view/theme/diabook/icons/tagged.png b/view/theme/diabook/icons/tagged.png
new file mode 100755
index 000000000..144649ef8
--- /dev/null
+++ b/view/theme/diabook/icons/tagged.png
diff --git a/view/theme/diabook/icons/toogle_off.png b/view/theme/diabook/icons/toogle_off.png
new file mode 100755
index 000000000..99490bcd9
--- /dev/null
+++ b/view/theme/diabook/icons/toogle_off.png
diff --git a/view/theme/diabook/icons/toogle_on.png b/view/theme/diabook/icons/toogle_on.png
new file mode 100755
index 000000000..81e8f9120
--- /dev/null
+++ b/view/theme/diabook/icons/toogle_on.png
diff --git a/view/theme/diabook/icons/unglobe.png b/view/theme/diabook/icons/unglobe.png
new file mode 100755
index 000000000..aa9b0e189
--- /dev/null
+++ b/view/theme/diabook/icons/unglobe.png
diff --git a/view/theme/diabook/icons/unlock.png b/view/theme/diabook/icons/unlock.png
new file mode 100755
index 000000000..a0cda0ae5
--- /dev/null
+++ b/view/theme/diabook/icons/unlock.png
diff --git a/view/theme/diabook/icons/unstarred.png b/view/theme/diabook/icons/unstarred.png
new file mode 100755
index 000000000..ba3183f5c
--- /dev/null
+++ b/view/theme/diabook/icons/unstarred.png
diff --git a/view/theme/diabook/icons/video.png b/view/theme/diabook/icons/video.png
new file mode 100755
index 000000000..a03d1d818
--- /dev/null
+++ b/view/theme/diabook/icons/video.png
diff --git a/view/theme/diabook/icons/weblink.png b/view/theme/diabook/icons/weblink.png
new file mode 100755
index 000000000..216e78344
--- /dev/null
+++ b/view/theme/diabook/icons/weblink.png
diff --git a/view/theme/diabook/jot.tpl b/view/theme/diabook/jot.tpl
new file mode 100755
index 000000000..387eb1f91
--- /dev/null
+++ b/view/theme/diabook/jot.tpl
@@ -0,0 +1,84 @@
+
+<div id="profile-jot-wrapper" >
+	<div id="profile-jot-banner-wrapper">
+		<div id="profile-jot-desc" >&nbsp;</div>
+		<div id="character-counter" class="grey"></div>
+	</div>
+	<div id="profile-jot-banner-end"></div>
+
+	<form id="profile-jot-form" action="$action" method="post" >
+		<input type="hidden" name="type" value="$ptyp" />
+		<input type="hidden" name="profile_uid" value="$profile_uid" />
+		<input type="hidden" name="return" value="$return_path" />
+		<input type="hidden" name="location" id="jot-location" value="$defloc" />
+		<input type="hidden" name="coord" id="jot-coord" value="" />
+		<input type="hidden" name="post_id" value="$post_id" />
+		<input type="hidden" name="preview" id="jot-preview" value="0" />
+		<input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" style="display:none">
+		<img id="profile-jot-text-loading" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
+		<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" >{{ if $content }}$content{{ else }}$share{{ endif }}</textarea>
+
+
+<div id="profile-jot-submit-wrapper" class="jothidden">
+	
+	<div id="profile-upload-wrapper" style="/*display: $visitor;*/" >
+		<div id="wall-image-upload-div" ><a href="#" onclick="return false;" id="wall-image-upload" class="camera" title="$upload"></a></div>
+	</div> 
+	<div id="profile-attach-wrapper" style="/*display: $visitor;*/" >
+		<div id="wall-file-upload-div" ><a href="#" onclick="return false;" id="wall-file-upload" class="attach" title="$attach"></a></div>
+	</div> 
+
+	<div id="profile-link-wrapper" style="/*display: $visitor;*/" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" >
+		<a id="profile-link" class="weblink" title="$weblink" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;"></a>
+	</div> 
+	<div id="profile-video-wrapper" style="/*display: $visitor;*/" >
+		<a id="profile-video" class="video2" title="$video" onclick="jotVideoURL();return false;"></a>
+	</div> 
+	<div id="profile-audio-wrapper" style="/*display: $visitor;*/" >
+		<a id="profile-audio" class="audio2" title="$audio" onclick="jotAudioURL();return false;"></a>
+	</div> 
+	<div id="profile-location-wrapper" style="/*display: $visitor;*/" >
+		<a id="profile-location" class="globe" title="$setloc" onclick="jotGetLocation();return false;"></a>
+	</div> 
+	<div id="profile-nolocation-wrapper" style="/*display: none;*/" >
+		<a id="profile-nolocation" class="noglobe" title="$noloc" onclick="jotClearLocation();return false;"></a>
+	</div> 
+
+	<input type="submit" id="profile-jot-submit" class="button creation2" name="submit" value="$share" />
+  
+   <span onclick="preview_post();" id="jot-preview-link" class="tab button">$preview</span>
+   
+	<div id="profile-jot-perms" class="profile-jot-perms" style="display: $pvisit;" >
+		<a href="#profile-jot-acl-wrapper" id="jot-perms-icon" class="icon $lockstate"  title="$permset" ></a>$bang
+	</div>
+
+
+	<div id="profile-jot-plugin-wrapper">
+  	$jotplugins
+	</div>
+	
+	<div id="profile-rotator-wrapper" style="display: $visitor;" >
+		<img id="profile-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
+	</div> 
+	
+	</div>
+   <div id="profile-jot-perms-end"></div>
+	
+	<div id="jot-preview-content" style="display:none;"></div>
+
+	<div style="display: none;">
+		<div id="profile-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;">
+			$acl
+			<hr style="clear:both"/>
+			<div id="profile-jot-email-label">$emailcc</div><input type="text" name="emailcc" id="profile-jot-email" title="$emtitle" />
+			<div id="profile-jot-email-end"></div>
+			$jotnets
+		</div>
+	</div>
+
+
+
+
+</form>
+</div>
+		{{ if $content }}<script>initEditor();</script>{{ endif }}
diff --git a/view/theme/diabook/nav.tpl b/view/theme/diabook/nav.tpl
new file mode 100644
index 000000000..a098ae8b7
--- /dev/null
+++ b/view/theme/diabook/nav.tpl
@@ -0,0 +1,194 @@
+<header>
+	<div id="site-location">$sitelocation</div>
+	<div id="banner">$banner</div>
+</header>
+<nav>
+			
+			
+	<ul>
+			
+			
+			{{ if $nav.network }}
+			<li id="nav-network-link" class="nav-menu-icon">
+				<a class="$nav.network.2" href="$nav.network.0" title="$nav.network.3" >
+				<span class="icon notifications">Benachrichtigungen</span></a>
+				<span id="net-update" class="nav-notify"></span>
+			</li>
+		    {{ endif }}
+	
+			{{ if $nav.contacts }}
+			<li class="nav-menu-icon" id="nav-contacts-linkmenu">
+				<a href="$nav.contacts.0" rel="#nav-contacts-menu" title="$nav.contacts.1">
+				<span class="icon contacts">$nav.contacts.1</span></a>
+				<span id="intro-update" class="nav-notify"></span>
+				<ul id="nav-contacts-menu" class="menu-popup">
+					<li id="nav-contacts-see-intro"><a href="$nav.notifications.0">$nav.introductions.1</a><span id="intro-update" class="nav-notify"></span></li>
+					<li id="nav-contacts-all"><a href="contacts">$nav.contacts.1</a></li> 
+				</ul>
+			</li>	
+			{{ endif }}
+			
+			{{ if $nav.messages }}
+			<li  id="nav-messages-linkmenu" class="nav-menu-icon">
+			  <a href="$nav.messages.0" rel="#nav-messages-menu" title="$nav.messages.1">
+			  <span class="icon messages">$nav.messages.1</span></a>
+				<span id="mail-update" class="nav-notify"></span>
+				<ul id="nav-messages-menu" class="menu-popup">
+					<li id="nav-messages-see-all"><a href="$nav.messages.0">$nav.messages.1</a></li>
+					<li id="nav-messages-see-all"><a href="$nav.messages.inbox.0">$nav.messages.inbox.1</a></li>
+					<li id="nav-messages-see-all"><a href="$nav.messages.outbox.0">$nav.messages.outbox.1</a></li>
+					<li id="nav-messages-see-all"><a href="$nav.messages.new.0">$nav.messages.new.1</a></li>
+				</ul>
+			</li>		
+			{{ endif }}
+		
+      {{ if $nav.notifications }}
+			<li  id="nav-notifications-linkmenu" class="nav-menu-icon"><a href="$nav.notifications.0" rel="#nav-notifications-menu" title="$nav.notifications.1"><span class="icon notify">$nav.notifications.1</span></a>
+				<span id="notify-update" class="nav-notify"></span>
+				<ul id="nav-notifications-menu" class="menu-popup">
+					<li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">$nav.notifications.mark.1</a></li>
+					<li id="nav-notifications-see-all"><a href="$nav.notifications.all.0">$nav.notifications.all.1</a></li>
+					<li class="empty">$emptynotifications</li>
+				</ul>
+			</li>		
+		{{ endif }}	
+			
+		{{ if $nav.search}}
+		<li id="search-box">
+			<form method="get" action="$nav.search.0">
+				<input id="search-text" class="nav-menu-search" type="text" value="" name="search">
+			</form>
+		</li>		
+		{{ endif }}	
+		
+		<li id="nav-site-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-site-menu"><span class="icon s22 gear">Site</span></a>
+			<ul id="nav-site-menu" class="menu-popup">
+				{{ if $nav.manage }}<li><a class="$nav.manage.2" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a></li>{{ endif }}				
+
+				{{ if $nav.help }} <li><a class="$nav.help.2" target="friendika-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a></li>{{ endif }}
+
+
+										<li ><a class="$nav.community.2" href="$nav.community.0" title="$nav.community.3" >$nav.community.1</a></li>
+
+
+										<li><a class="$nav.search.2" href="$nav.search.0" title="$nav.search.3" >$nav.search.1</a></li>
+										
+										<li><a class="$nav.search.2" href="friendica" title="Site Info / Impressum" >Info/Impressum</a></li>
+
+				{{ if $nav.settings }}<li><a class="menu-sep $nav.settings.2" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a></li>{{ endif }}
+				{{ if $nav.admin }}<li><a class="$nav.admin.2" href="$nav.admin.0" title="$nav.admin.3" >$nav.admin.1</a></li>{{ endif }}
+
+				{{ if $nav.logout }}<li><a class="menu-sep $nav.logout.2" href="$nav.logout.0" title="$nav.logout.3" >$nav.logout.1</a></li>{{ endif }}
+
+				
+			</ul>		
+		</li>
+		
+		
+		{{ if $nav.directory }}
+		<li id="nav-directory-link" class="nav-menu $sel.directory">
+			<a class="$nav.directory.2" href="$nav.directory.0" title="$nav.directory.3" >$nav.directory.1</a>
+		</li>
+		{{ endif }}
+		
+		{{ if $nav.apps }}
+			<li id="nav-apps-link" class="nav-menu $sel.apps">
+				<a class=" $nav.apps.2" href="#" rel="#nav-apps-menu" title="$nav.apps.3" >$nav.apps.1</a>
+				<ul id="nav-apps-menu" class="menu-popup">
+					{{ for $apps as $ap }}
+					<li>$ap</li>
+					{{ endfor }}
+				</ul>
+			</li>	
+		{{ endif }}		
+		
+      {{ if $nav.home }}
+			<li id="nav-home-link" class="nav-menu $sel.home">
+				<a class="$nav.home.2" href="$nav.home.0" title="$nav.home.3" >$nav.home.1</a>
+				<span id="home-update" class="nav-notify"></span>
+			</li>
+		{{ endif }}		
+		
+		{{ if $userinfo }}
+			<li id="nav-user-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-user-menu" title="$sitelocation"><img src="$userinfo.icon" alt="$userinfo.name"></a>
+				<ul id="nav-user-menu" class="menu-popup">
+					{{ for $nav.usermenu as $usermenu }}
+						<li><a class="$usermenu.2" href="$usermenu.0" title="$usermenu.3">$usermenu.1</a></li>
+					{{ endfor }}
+					
+					{{ if $nav.profiles }}<li><a class="menu-sep $nav.profiles.2" href="$nav.profiles.0" title="$nav.profiles.3" >$nav.profiles.3</a></li>{{ endif }}
+					{{ if $nav.notifications }}<li><a class="$nav.notifications.2" href="$nav.notifications.0" title="$nav.notifications.3" >$nav.notifications.1</a></li>{{ endif }}
+					{{ if $nav.messages }}<li><a class="$nav.messages.2" href="$nav.messages.0" title="$nav.messages.3" >$nav.messages.1</a></li>{{ endif }}
+					{{ if $nav.contacts }}<li><a class="$nav.contacts.2" href="$nav.contacts.0" title="$nav.contacts.3" >$nav.contacts.1</a></li>{{ endif }}	
+				</ul>
+			</li>
+		{{ endif }}
+		
+					{{ if $nav.login }}
+					<li id="nav-home-link" class="nav-menu $sel.home">
+						<a class="$nav.login.2" href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a>
+					<li>
+					{{ endif }}
+		
+		
+		
+	</ul>	
+
+
+	
+</nav>
+
+
+<div style="position: fixed; bottom: 5px; right: 10px;"><a href="javascript:scroll(0,0); "><img src="view/theme/diabook/icons/scroll_top.png" title="scroll to top"></a></div>
+<div style="position: fixed; bottom: 5px; left: 25px;">$langselector</div>
+<div style="position: fixed; bottom: 25px; left: 5px;"><a href="http://pad.toktan.org/p/diabook" target="blank" ><img src="view/theme/diabook/icons/bluebug.png" title="report bugs for the theme diabook"/></a></div>
+
+
+
+<ul id="nav-notifications-template" style="display:none;" rel="template">
+	<li class="{4}"><a href="{0}"><img src="{1}">{2} <span class="notif-when">{3}</span></a></li>
+</ul>
+
+
+<ul id="nav-notifications-template" style="display:none;" rel="template">
+	<li><a href="{0}"><img src="{1}">{2} <span class="notif-when">{3}</span></a></li>
+</ul>
+
+
+{#
+
+{{ if $nav.logout }}<a id="nav-logout-link" class="nav-link $nav.logout.2" href="$nav.logout.0" title="$nav.logout.3" >$nav.logout.1</a> {{ endif }}
+{{ if $nav.login }}<a id="nav-login-link" class="nav-login-link $nav.login.2" href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a> {{ endif }}
+
+<span id="nav-link-wrapper" >
+
+{{ if $nav.register }}<a id="nav-register-link" class="nav-commlink $nav.register.2" href="$nav.register.0" title="$nav.register.3" >$nav.register.1</a>{{ endif }}
+	
+<a id="nav-help-link" class="nav-link $nav.help.2" target="friendika-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a>
+	
+{{ if $nav.apps }}<a id="nav-apps-link" class="nav-link $nav.apps.2" href="$nav.apps.0" title="$nav.apps.3" >$nav.apps.1</a>{{ endif }}
+
+<a id="nav-search-link" class="nav-link $nav.search.2" href="$nav.search.0" title="$nav.search.3" >$nav.search.1</a>
+<a id="nav-directory-link" class="nav-link $nav.directory.2" href="$nav.directory.0" title="$nav.directory.3" >$nav.directory.1</a>
+
+{{ if $nav.admin }}<a id="nav-admin-link" class="nav-link $nav.admin.2" href="$nav.admin.0" title="$nav.admin.3" >$nav.admin.1</a>{{ endif }}
+
+{{ if $nav.notifications }}
+<a id="nav-notify-link" class="nav-commlink $nav.notifications.2" href="$nav.notifications.0" title="$nav.notifications.3" >$nav.notifications.1</a>
+<span id="notify-update" class="nav-ajax-left"></span>
+{{ endif }}
+{{ if $nav.messages }}
+<a id="nav-messages-link" class="nav-commlink $nav.messages.2" href="$nav.messages.0" title="$nav.messages.3" >$nav.messages.1</a>
+<span id="mail-update" class="nav-ajax-left"></span>
+{{ endif }}
+
+{{ if $nav.manage }}<a id="nav-manage-link" class="nav-commlink $nav.manage.2" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a>{{ endif }}
+
+{{ if $nav.settings }}<a id="nav-settings-link" class="nav-link $nav.settings.2" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a>{{ endif }}
+{{ if $nav.profiles }}<a id="nav-profiles-link" class="nav-link $nav.profiles.2" href="$nav.profiles.0" title="$nav.profiles.3" >$nav.profiles.1</a>{{ endif }}
+
+
+</span>
+<span id="nav-end"></span>
+<span id="banner">$banner</span>
+#}
diff --git a/view/theme/diabook/profile_vcard.tpl b/view/theme/diabook/profile_vcard.tpl
new file mode 100644
index 000000000..3a545f9ba
--- /dev/null
+++ b/view/theme/diabook/profile_vcard.tpl
@@ -0,0 +1,64 @@
+<div class="vcard">
+
+	<div class="tool">
+		<div class="fn label">$profile.name</div>
+		{{ if $profile.edit }}
+			<div class="action">
+			<a class="icon s16 edit ttright" href="#" rel="#profiles-menu" title="$profile.edit.3"><span>$profile.edit.1</span></a>
+			<ul id="profiles-menu" class="menu-popup">
+				{{ for $profile.menu.entries as $e }}
+				<li>
+					<a href="profiles/$e.id"><img src='$e.photo'>$e.profile_name</a>
+				</li>
+				{{ endfor }}
+				<li><a href="profile_photo" >$profile.menu.chg_photo</a></li>
+				<li><a href="profiles/new" id="profile-listing-new-link">$profile.menu.cr_new</a></li>
+				<li><a href="profiles" >$profile.edit.3</a></li>
+								
+			</ul>
+			</div>
+		{{ endif }}
+	</div>
+				
+	
+	{{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }}
+	<div id="profile-photo-wrapper"><img class="photo" width="175" height="175" src="$profile.photo?rev=$profile.picdate" alt="$profile.name" /></div>
+
+
+
+	{{ if $location }}
+		<dl class="location"><dt class="location-label">$location</dt><br> 
+		<dd class="adr">
+			{{ if $profile.address }}<div class="street-address">$profile.address</div>{{ endif }}
+			<span class="city-state-zip">
+				<span class="locality">$profile.locality</span>{{ if $profile.locality }}, {{ endif }}
+				<span class="region">$profile.region</span>
+				<span class="postal-code">$profile.postal-code</span>
+			</span>
+			{{ if $profile.country-name }}<span class="country-name">$profile.country-name</span>{{ endif }}
+		</dd>
+		</dl>
+	{{ endif }}
+
+	{{ if $gender }}<dl class="mf"><dt class="gender-label">$gender</dt> <dd class="x-gender">$profile.gender</dd></dl>{{ endif }}
+	
+	{{ if $profile.pubkey }}<div class="key" style="display:none;">$profile.pubkey</div>{{ endif }}
+
+	{{ if $marital }}<dl class="marital"><dt class="marital-label"><span class="heart">&hearts;</span>$marital</dt><dd class="marital-text">$profile.marital</dd></dl>{{ endif }}
+
+	{{ if $homepage }}<dl class="homepage"><dt class="homepage-label">$homepage</dt><dd class="homepage-url"><a href="$profile.homepage" target="external-link">$profile.homepage</a></dd></dl>{{ endif }}
+
+	{{ inc diaspora_vcard.tpl }}{{ endinc }}
+	
+	<div id="profile-extra-links">
+		<ul>
+			{{ if $connect }}
+				<li><a id="dfrn-request-link" href="dfrn_request/$profile.nickname">$connect</a></li>
+			{{ endif }}
+		</ul>
+	</div>
+</div>
+
+$contact_block
+
+
diff --git a/view/theme/diabook/style.css b/view/theme/diabook/style.css
new file mode 100644
index 000000000..bccfea149
--- /dev/null
+++ b/view/theme/diabook/style.css
@@ -0,0 +1,2300 @@
+/**
+ * Fabio Comuni <http://kirgroup.com/profile/fabrixxm>
+ * Additional Changes: Michael Vogel <icarus@dabo.de>
+ **/
+
+/* ========= */
+/* = Admin = */
+/* ========= */
+
+#adminpage {
+/*        width: 80%;*/
+}
+
+#pending-update {
+        float:right;
+        color: #ffffff;
+        font-weight: bold;
+        background-color: #FF0000;
+        padding: 0em 0.3em;
+}
+
+.admin.linklist {
+        border: 0px; padding: 0px;
+}
+
+.admin.link {
+        list-style-position: inside;
+        font-size: 1em;
+        padding: 5px;
+        width: 100px;
+        margin: 5px;
+}
+
+#adminpage dl {
+        clear: left;
+        margin-bottom: 2px;
+        padding-bottom: 2px;
+        border-bottom: 1px solid black;
+}
+
+#adminpage dt {
+        width: 200px;
+        float: left;
+        font-weight: bold;
+}
+
+#adminpage dd {
+        margin-left: 200px;
+}
+#adminpage h3 {
+        border-bottom: 1px solid #898989;
+        margin-bottom: 5px;
+        margin-top: 10px;
+}
+
+#adminpage .submit {
+        clear:left;
+}
+
+#adminpage #pluginslist {
+        margin: 0px; padding: 0px;
+}
+
+#adminpage .plugin {
+        list-style: none;
+        display: block;
+	/* border: 1px solid #888888; */
+        padding: 1em;
+        margin-bottom: 5px;
+        clear: left;
+}
+
+#adminpage .toggleplugin {
+        float:left;
+        margin-right: 1em;
+}
+
+#adminpage table {width:100%; border-bottom: 1p solid #000000; margin: 5px 0px;}
+#adminpage table th { text-align: left;}
+#adminpage td .icon { float: left;}
+#adminpage table#users img { width: 16px; height: 16px; }
+#adminpage table tr:hover { background-color: #eeeeee; }
+#adminpage .selectall { text-align: right; }
+/* icons */
+
+.icon.contacts {
+  background-image: url("../../../view/theme/diabook/icons/contacts.png");}
+.icon.notifications {
+  background-image: url("../../../view/theme/diabook/icons/notifications.png");}
+.icon.notify {
+  background-image: url("../../../view/theme/diabook/icons/notify.png");}
+.icon.messages {
+  background-image: url("../../../view/theme/diabook/icons/messages.png");}
+.icon.community {
+  background-image: url("../../../view/theme/diabook/icons/community.png");}
+  
+.icon.drop 	{ background-image: url("../../../view/theme/diabook/icons/drop.png");}
+.icon.drophide 	{ background-image: url("../../../view/theme/diabook/icons/drop.png");}
+.icon.dislike 	{ background-image: url("../../../view/theme/diabook/icons/dislike.png");}
+.icon.like 	{ background-image: url("../../../view/theme/diabook/icons/like.png");}
+.icon.pencil 	{ background-image: url("../../../view/theme/diabook/icons/pencil.png");}
+.icon.recycle 	{ background-image: url("../../../view/theme/diabook/icons/recycle.png");}
+.icon.remote-link { background-image: url("../../../view/theme/diabook/icons/remote.png");}
+.icon.tagged    { background-image: url("../../../view/theme/diabook/icons/tagged.png");}  
+.star-item.icon.unstarred { background-image: url("../../../view/theme/diabook/icons/unstarred.png");}
+.star-item.icon.starred { background-image: url("../../../view/theme/diabook/icons/starred.png");}
+.icon.link		{ background-image: url("../../../view/theme/diabook/icons/link.png");}
+.icon.lock		{ background-image: url("../../../view/theme/diabook/icons/lock.png");}
+.icon.unlock		{ background-image: url("../../../view/theme/diabook/icons/unlock.png");}
+.icon.language    { background-image: url("../../../view/theme/diabook/icons/language.png");}
+
+
+.camera 	{ background-image: url("../../../view/theme/diabook/icons/camera.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.attach 	{ background-image: url("../../../view/theme/diabook/icons/attach.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.video2 	{ background-image: url("../../../view/theme/diabook/icons/video.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }	
+.video 	{ background-image: url("../../../view/theme/diabook/icons/video.png"); 
+			  display: block; width: 100%; height: 28px; background-repeat: no-repeat;
+			  }
+.audio2 	{ background-image: url("../../../view/theme/diabook/icons/audio.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.audio 	{ background-image: url("../../../view/theme/diabook/icons/audio.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.weblink 	{ background-image: url("../../../view/theme/diabook/icons/weblink.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.globe 	{ background-image: url("../../../view/theme/diabook/icons/globe.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.unglobe 	{ background-image: url("../../../view/theme/diabook/icons/unglobe.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.edit    {background-image: url("../../../view/theme/diabook/icons/pencil2.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;}
+			  
+			  
+
+
+.article	{ background-position: -50px  0px;}
+/*.audio 		{ background-position: -70px  0px;}*/
+.block 		{ background-position: -90px  0px;}
+/*.drop 		{ background-position: -110px 0px;}*/
+/*.drophide 	{ background-position: -130px 0px;}*/
+/*.edit 		{ background-position: -150px 0px;}*/
+/*.camera 	{ background-position: -170px 0px;}*/
+/*.dislike 	{ background-position: -190px 0px;}*/
+/*.like 		{ background-position: -210px 0px;}*/
+/*.link 		{ background-position: -230px 0px;}*/
+
+/*.globe 		{ background-position: -50px  -20px;}*/
+/*.noglobe 	{ background-position: -70px  -20px;}*/
+.no 		{ background-position: -90px  -20px;}
+.pause 		{ background-position: -110px -20px;}
+.play 		{ background-position: -130px -20px;}
+/*.pencil 	{ background-position: -150px -20px;}*/
+.small-pencil	{ background-position: -170px -20px;}
+/*.recycle 	{ background-position: -190px -20px;}*/
+/*.remote-link	{ background-position: -210px -20px;}*/
+.share 		{ background-position: -230px -20px;}
+
+.tools 		{ background-position: -50px  -40px;}
+/*.lock 		{ background-position: -70px  -40px;}*/
+
+/*.video          { background-position: -110px -40px;}*/
+.youtube        { background-position: -130px -40px;}
+
+/*.attach         { background-position: -190px -40px;}*/
+/*.language       { background-position: -210px -40px;}*/
+
+
+.icon.on             { background-image: url("../../../view/theme/diabook/icons/toogle_on.png"); background-repeat: no-repeat;}
+.icon.off            { background-image: url("../../../view/theme/diabook/icons/toogle_off.png"); background-repeat: no-repeat;}
+.prev           { background-position: -90px  -60px;}
+.next           { background-position: -110px -60px;}
+/*.tagged     { background-position: -130px -60px;}*/
+
+.attachtype {
+        display: block; width: 20px; height: 23px;
+        background-image: url('../../../images/content-types.png');
+}
+
+.type-video { background-position: 0px 0px; }
+.type-image { background-position: -20px 0px; }
+.type-audio { background-position: -40px 0px; }
+.type-text  { background-position: -60px 0px; }
+.type-unkn  { background-position: -80px 0px; }
+
+.icon.drop, .icon.drophide {
+ float: left;
+}
+
+.icon {
+  display: block;
+  width: 20px;
+  height: 20px;
+  /*background-image: url('icons.png');*/
+}
+
+.icon {
+  background-color: transparent ;
+  background-repeat: no-repeat;
+  /* background-position: left center; */
+  display: block;
+  overflow: hidden;
+  text-indent: -9999px;
+  padding: 1px;
+}
+
+.icon.border.camera{
+  background-image: url("../../../view/theme/diabook/icons/camera.png"); 
+  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+	}
+	
+.icon.border.link{
+  background-image: url("../../../view/theme/diabook/icons/weblink.png"); 
+  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+  margin-left: 10px;
+	}
+
+.icon.text {
+  text-indent: 0px;
+}
+.icon.s10 {
+  min-width: 10px;
+  height: 10px;
+}
+.icon.s10.notify {
+  background-image: url("../../../images/icons/10/notify_off.png");
+}
+.icon.s10.gear {
+  background-image: url("../../../images/icons/10/gear.png");
+}
+.icon.s10.add {
+  background-image: url("../../../images/icons/10/add.png");
+}
+.icon.s10.delete {
+  background-image: url("../../../images/icons/10/delete.png");
+}
+.icon.s10.edit {
+  background-image: url("../../../images/icons/10/edit.png");
+}
+.icon.s10.star {
+  background-image: url("../../../images/icons/10/star.png");
+}
+.icon.s10.menu {
+  background-image: url("../../../images/icons/10/menu.png");
+}
+.icon.s10.link {
+  background-image: url("../../../images/icons/10/link.png");
+}
+.icon.s10.lock {
+  background-image: url("../../../images/icons/10/lock.png");
+}
+.icon.s10.unlock {
+  background-image: url("../../../images/icons/10/unlock.png");
+}
+.icon.s10.text {
+  padding: 2px 0px 0px 15px;
+  font-size: 10px;
+}
+.icon.s16 {
+  min-width: 16px;
+  height: 16px;
+}
+.icon.s16.notify {
+  background-image: url("../../../images/icons/16/notify_off.png");
+}
+.icon.s16.gear {
+  background-image: url("../../../images/icons/16/gear.png");
+}
+.icon.s16.add {
+  background-image: url("../../../images/icons/16/add.png");
+}
+.icon.s16.delete {
+  background-image: url("../../../images/icons/16/delete.png");
+}
+/*.icon.s16.edit {
+  background-image: url("../../../images/icons/16/edit.png");
+}*/
+.icon.s16.star {
+  background-image: url("../../../images/icons/16/star.png");
+}
+.icon.s16.menu {
+  background-image: url("../../../images/icons/16/menu.png");
+}
+/*.icon.s16.link {
+  background-image: url("../../../images/icons/16/link.png");
+}*/
+.icon.s16.lock {
+  background-image: url("../../../images/icons/16/lock.png");
+}
+.icon.s16.unlock {
+  background-image: url("../../../images/icons/16/unlock.png");
+}
+.icon.s16.text {
+  padding: 4px 0px 0px 20px;
+  font-size: 10px;
+}
+.icon.s22 {
+  min-width: 22px;
+  height: 22px;
+}
+.icon.s22.notify {
+  background-image: url("../../../images/icons/22/notify_off.png");
+}
+.icon.s22.gear {
+  background-image: url("../../../images/icons/22/gear.png");
+}
+.icon.s22.add {
+  background-image: url("../../../images/icons/22/add.png");
+}
+.icon.s22.delete {
+  background-image: url("../../../images/icons/22/delete.png");
+}
+.icon.s22.edit {
+  background-image: url("../../../images/icons/22/edit.png");
+}
+.icon.s22.star {
+  background-image: url("../../../images/icons/22/star.png");
+}
+.icon.s22.menu {
+  background-image: url("../../../images/icons/22/menu.png");
+}
+.icon.s22.link {
+  background-image: url("../../../images/icons/22/link.png");
+}
+.icon.s22.lock {
+  background-image: url("../../../images/icons/22/lock.png");
+}
+.icon.s22.unlock {
+  background-image: url("../../../images/icons/22/unlock.png");
+}
+.icon.s22.text {
+  padding: 10px 0px 0px 25px;
+  width: 200px;
+}
+.icon.s48 {
+  width: 48px;
+  height: 48px;
+}
+.icon.s48.notify {
+  background-image: url("../../../images/icons/48/notify_off.png");
+}
+.icon.s48.gear {
+  background-image: url("../../../images/icons/48/gear.png");
+}
+.icon.s48.add {
+  background-image: url("../../../images/icons/48/add.png");
+}
+.icon.s48.delete {
+  background-image: url("../../../images/icons/48/delete.png");
+}
+.icon.s48.edit {
+  background-image: url("../../../images/icons/48/edit.png");
+}
+.icon.s48.star {
+  background-image: url("../../../images/icons/48/star.png");
+}
+.icon.s48.menu {
+  background-image: url("../../../images/icons/48/menu.png");
+}
+.icon.s48.link {
+  background-image: url("../../../images/icons/48/link.png");
+}
+.icon.s48.lock {
+  background-image: url("../../../images/icons/48/lock.png");
+}
+.icon.s48.unlock {
+  background-image: url("../../../images/icons/48/unlock.png");
+}
+
+#contact-edit-links ul {
+  list-style: none;
+  list-style-type: none;
+}
+
+.hide-comments-outer {
+  margin-left: 80px;
+  margin-bottom: 5px;
+  width: 684px;
+  border-bottom: 1px solid #BDCDD4;
+  border-top: 1px solid #BDCDD4;
+
+  padding: 8px;
+}
+
+/* global */
+body {
+  font-family: 'Lato', "Helvetica Neue", Helvetica, Arial, sans-serif;
+  font-size: 13px;
+  background-color: #ffffff;
+  color: #2d2d2d;
+  margin: 50px auto auto;
+  display: table;
+}
+h4 {
+  font-size: 1.1em;
+}
+
+a {
+	color: #3465A4;
+	/* color: #3e3e8c; */
+	text-decoration: none;
+}
+a:hover {
+	/* color: blue; */
+	text-decoration: underline
+}
+
+.wall-item-name-link {
+/*  float: left;*/
+}
+
+.wall-item-photo {
+  width: 48px;
+  height: 48px;
+  overflow: hidden;
+  display: block;
+}
+
+.left {
+  float: left;
+}
+.right {
+  float: right;
+}
+.hidden {
+  display: none;
+}
+.clear {
+  clear: both;
+}
+.fakelink {
+  color: #3465A4;
+  /* color: #3e3e8c; */
+  text-decoration: none;
+  cursor: pointer;
+}
+.fakelink:hover {
+  /* color: blue; */
+  /*color: #005c94; */
+  text-decoration: underline;
+}
+code {
+  font-family: Courier, monospace;
+  white-space: pre;
+  display: block;
+  overflow: auto;
+  border: 1px solid #444;
+  background: #EEE;
+  color: #444;
+  padding: 10px;
+  margin-top: 20px;
+}
+#panel {
+  position: absolute;
+  width: 10em;
+  background: #ffffff;
+  color: #2d2d2d;
+  margin: 0px;
+  padding: 1em;
+  list-style: none;
+  border: 3px solid #364e59;
+  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);
+  box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+}
+/* tool */
+.tool {
+  height: auto;
+  overflow: auto;
+  padding: 3px;
+}
+#saved-search-ul .tool:hover,
+#nets-sidebar .tool:hover,
+#sidebar-group-list .tool:hover {
+	background: #EEE;
+}
+.tool .label {
+  float: left;
+}
+.tool .action {
+  float: right;
+}
+.tool a {
+  color: ##3F8FBA;
+}
+.tool a:hover {
+  text-decoration: none;
+}
+/* popup notifications */
+div.jGrowl div.notice {
+  background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center;
+  color: #ffffff;
+  padding-left: 58px;
+}
+div.jGrowl div.info {
+  background: #364e59 url("../../../images/icons/48/info.png") no-repeat 5px center;
+  color: #ffffff;
+  padding-left: 58px;
+}
+/* header */
+header {
+  position: fixed;
+  left: 0%;
+  right: 80%;
+  top: 0px;
+  margin: 0px;
+  padding: 0px;
+  width: 20%;
+  height: 32px;
+  background: #000;
+  z-index: 100;
+  -webkit-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+}
+header #site-location {
+  display: none;
+}
+header #banner {
+  overflow: hidden;
+  text-align: center;
+  width: 100%;
+}
+header #banner a,
+header #banner a:active,
+header #banner a:visited,
+header #banner a:link,
+header #banner a:hover {
+  color: #ffffff;
+  text-decoration: none;
+  outline: none;
+  vertical-align: middle;
+}
+header #banner #logo-img {
+  height: 25px;
+  margin-top: 5px;
+}
+header #banner #logo-text {
+  font-size: 22px;
+  position: absolute;
+  top: 15%;
+}
+/* nav */
+nav {
+  width: 80%;
+  height: 32px;
+  position: fixed;
+  left: 20%;
+  top: 0px;
+  padding: 0px;
+  background: #000;
+  color: #ffffff;
+  z-index: 100;
+  -webkit-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+}
+nav a,
+nav a:active,
+nav a:visited,
+nav a:link,
+nav a:hover {
+  color: #ffffff;
+  text-decoration: none;
+  outline: none;
+}
+nav #banner {
+  overflow: hidden;
+  /*text-align: center;*/
+  width: 100%;
+}
+nav #banner a,
+nav #banner a:active,
+nav #banner a:visited,
+nav #banner a:link,
+nav #banner a:hover {
+  color: #ffffff;
+  text-decoration: none;
+  outline: none;
+  vertical-align: bottom;
+}
+nav #banner #logo-img {
+  height: 22px;
+  margin-top: 5px;
+}
+nav #banner #logo-text {
+  font-size: 22px;
+}
+nav #navbar{
+	}
+nav ul {
+  margin: 0px;
+  padding: 0px 20px;
+}
+nav ul li {
+  list-style: none;
+  margin: 0px;
+  /* padding: 1px 1px 3px 1px; */
+  float: left;
+}
+nav ul li .menu-popup {
+  left: 0px;
+  right: auto;
+}
+
+nav #logo-img {
+  height: 25px;
+  margin-top: 4px;
+  margin-left: 30px;
+}
+
+nav #logo-text {
+    font-size: 22px;
+    margin-top: 3px;
+    margin-right: 15px;
+}
+nav .nav-menu-search {
+  position: relative;
+
+  margin: 3px 17px;
+  margin-right: 0px;
+  height: 17px;
+  width: 180px;
+  
+}
+
+nav #search-box #search-text {
+  background-image:  url('icons/lupe.png');
+  background-repeat:no-repeat;
+  padding-left:20px;
+	}
+
+
+nav .nav-menu-icon {
+  position: relative;
+  height: 22px;
+  padding: 5px;
+  margin: 0px 7px;
+  -moz-border-radius: 5px 5px 0 0;
+  -webkit-border-radius: 5px 5px 0 0;
+  border-radius: 5px 5px 0 0;
+}
+nav .nav-menu-icon.selected {
+  background-color: #fff;
+}
+nav .nav-menu-icon img {
+  width: 22px;
+  height: 22px;
+}
+nav .nav-menu-icon .nav-notify {
+  top: 3px;
+}
+nav .nav-menu {
+  position: relative;
+  height: 16px;
+  padding: 5px;
+  margin: 3px 15px 0px;
+  font-size: 13px;
+  /*border-bottom: 3px solid #364A84;*/
+}
+nav .nav-menu.selected {
+  /*border-bottom: 3px solid #9eabb0;*/
+}
+nav .nav-notify {
+  display: none;
+  position: absolute;
+  background-color: #ff0000;
+  /* background-color: #19aeff; */
+  -moz-border-radius: 5px 5px 5px 5px;
+  -webkit-border-radius: 5px 5px 5px 5px;
+  border-radius: 5px 5px 5px 5px;
+  font-size: 10px;
+  font-weight: 900;
+  padding: 1px 4px;
+  top: 0px;
+  right: -6px;
+  min-width: 10px;
+  text-align: center;
+}
+nav .nav-notify.show {
+  display: block;
+}
+nav #nav-help-link,
+nav #nav-search-link,
+nav #nav-directory-link,
+nav #nav-apps-link,
+nav #nav-site-linkmenu, 
+nav #nav-home-link,
+nav #nav-user-linkmenu
+{
+  float: right;
+}
+nav #nav-user-linkmenu{
+	margin-right: 0px;
+	}
+nav #nav-home-link{
+	margin-left: 0px;
+	font-weight: bold;
+	}
+nav #nav-directory-link{
+	margin-left: 0px;
+	margin-right: 0px;
+	font-weight: bold;
+	margin: 3px 15px;
+	}
+nav #nav-apps-link{
+	margin-left: 0px;
+	margin-right: 0px;
+	font-weight: bold;
+	margin: 3px 15px;
+	}
+nav #nav-help-link .menu-popup,
+nav #nav-search-link .menu-popup,
+nav #nav-directory-link .menu-popup,
+nav #nav-apps-link .menu-popup,
+nav #nav-site-linkmenu .menu-popup {
+  right: 0px;
+  left: auto;
+}
+
+nav #nav-messages-linkmenu.on .icon.messages, nav #nav-messages-linkmenu.selected .icon.messages{
+	background-image: url("../../../view/theme/diabook/icons/messages2.png");
+	}
+	
+/*nav #nav-notifications-linkmenu.on .icon.notify,*/ nav #nav-notifications-linkmenu.selected .icon.notify{
+	background-image: url("../../../view/theme/diabook/icons/notify2.png");
+	}
+	
+nav #nav-contacts-linkmenu.on .icon.contacts, nav #nav-contacts-linkmenu.selected .icon.contacts{
+	background-image: url("../../../view/theme/diabook/icons/contacts2.png");
+	}
+	
+nav #nav-apps-link.selected {
+  background-color: #364e59;
+}
+
+#nav-notifications-mark-all {
+	/* padding: 1px 1px 2px 26px; */
+	/* border-bottom: 1px solid #364E59; */
+	/* margin: 0px 0px 2px 0px;
+	padding: 5px 10px; */
+}
+
+#nav-notifications-see-all {
+	/* padding: 1px 1px 2px 26px; */
+	/* border-bottom: 1px solid #364E59; */
+	/* margin: 0px 0px 2px 0px;
+	padding: 5px 10px; */
+}
+
+.notify-seen {
+	background: none repeat scroll 0 0 #DDDDDD;
+	}
+
+ul.menu-popup {
+  position: absolute;
+  display: none;
+  width: 11em;
+  background: #ffffff;
+  color: #2d2d2d;
+  margin: 0px;
+  padding: 0px;
+  list-style: none;
+  border: 1px solid #364e59;
+  border-top-color: transparent;
+  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);
+  box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+}
+ul.menu-popup a {
+  display: block;
+  color: #2d2d2d;
+  padding: 5px 10px;
+  text-decoration: none;
+}
+ul.menu-popup a:hover {
+  background-color: #fff797; /*bdcdd4;*/
+  color: #000;
+}
+ul.menu-popup .menu-sep {
+  border-top: 1px solid #9eabb0;
+}
+ul.menu-popup li {
+  float: none;
+  overflow: auto;
+  height: auto;
+  display: block;
+}
+ul.menu-popup li img {
+  float: left;
+  width: 16px;
+  height: 16px;
+  padding-right: 5px;
+}
+ul.menu-popup .empty {
+  padding: 5px;
+  text-align: center;
+  color: #9eabb0;
+}
+/* autocomplete popup */
+.acpopup {
+  max-height: 150px;
+  background-color: #ffffff;
+  color: #2d2d2d;
+  border: 1px solid #MenuBorder;
+  overflow: auto;
+  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);
+  box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+}
+.acpopupitem {
+  color: #2d2d2d;
+  padding: 4px;
+  clear: left;
+}
+.acpopupitem img {
+  float: left;
+  margin-right: 4px;
+}
+.acpopupitem.selected {
+  background-color: #bdcdd4;
+}
+#nav-notifications-menu {
+  width: 400px;
+  max-height: 550px;
+  overflow: auto;
+}
+/* #nav-notifications-menu a {
+	display: inline;
+	padding: 5px 0px;
+	margin: 0px 0px 2px 0px;
+}
+#nav-notifications-menu li:hover {
+  background-color: #bdcdd4;
+}*/
+
+#nav-notifications-menu img {
+  float: left;
+  margin-right: 5px;
+}
+#nav-notifications-menu .contactname {
+  font-weight: bold;
+}
+#nav-notifications-menu .notif-when {
+  font-size: 10px;
+  color: #9eabb0;
+  display: block;
+}
+
+.notif-image {
+        width: 32px;
+        height: 32px;
+        padding: 7px 7px 0px 0px;
+}
+
+/* aside */
+aside {
+  display: table-cell;
+  vertical-align: top;
+  width: 180px;
+  padding: 0px 10px 0px 20px;
+  border-right: 1px solid #D2D2D2;
+  float: left;
+  /* background: #F1F1F1; */
+}
+aside .vcard .fn {
+  font-size: 18px;
+  font-weight: bold;
+  margin-bottom: 5px;
+}
+aside .vcard .title {
+  margin-bottom: 5px;
+}
+aside .vcard dl {
+  height: auto;
+  overflow: auto;
+}
+aside .vcard dt {
+  float: left;
+  margin-left: 0px;
+  /*width: 35%;*/
+  text-align: right;
+  color: #999999;
+}
+aside .vcard dd {
+  float: left;
+  margin-left: 5px;
+  /*width: 60%;*/
+}
+aside #profile-extra-links ul {
+  padding: 0px;
+  margin: 0px;
+}
+aside #profile-extra-links li {
+  padding: 0px;
+  margin: 0px;
+  list-style: none;
+}
+aside #dfrn-request-link {
+  display: block;
+  -moz-border-radius: 5px 5px 5px 5px;
+  -webkit-border-radius: 5px 5px 5px 5px;
+  border-radius: 5px 5px 5px 5px;
+  color: #ffffff;
+  background: #005c94 url('../../../images/connect-bg.png') no-repeat left center;
+  font-weight: bold;
+  text-transform: uppercase;
+  padding: 4px 2px 2px 35px;
+}
+aside #dfrn-request-link:hover {
+  text-decoration: none;
+  background-color: #36c;
+  /* background-color: #19aeff; */
+}
+aside #profiles-menu {
+  width: 20em;
+}
+aside #search-text {
+	width: 173px;
+}
+aside #side-follow-url {
+	width: 173px;
+	}
+aside #side-peoplefind-url {
+	width: 173px;
+	}
+#contact-block {
+  overflow: auto;
+  height: auto;
+}
+#contact-block .contact-block-h4 {
+  float: left;
+  margin: 5px 0px;
+}
+#contact-block .allcontact-link {
+  float: right;
+  margin: 5px 0px;
+}
+#contact-block .contact-block-content {
+  clear: both;
+  overflow: auto;
+  height: auto;
+}
+#contact-block .contact-block-link {
+  float: left;
+  margin: 0px 2px 2px 0px;
+}
+#contact-block .contact-block-link img {
+  widht: 55px;
+  height: 55px;
+}
+/* widget */
+.widget {
+  margin-bottom: 2em;
+  /*.action .s10 { width: 10px; overflow: hidden; padding: 0px;}
+	.action .s16 { width: 16px; overflow: hidden; padding: 0px;}*/
+/*  font-size: 12px; */
+}
+.widget h3 {
+  padding: 0px;
+  margin: 2px;
+}
+.widget .action {
+  opacity: 0.1;
+  -webkit-transition: all 0.2s ease-in-out;
+  -moz-transition: all 0.2s ease-in-out;
+  -o-transition: all 0.2s ease-in-out;
+  -ms-transition: all 0.2s ease-in-out;
+  transition: all 0.2s ease-in-out;
+}
+.widget input.action {
+  opacity: 0.5;
+  -webkit-transition: all 0.2s ease-in-out;
+  -moz-transition: all 0.2s ease-in-out;
+  -o-transition: all 0.2s ease-in-out;
+  -ms-transition: all 0.2s ease-in-out;
+  transition: all 0.2s ease-in-out;
+}
+.widget:hover .title .action {
+  opacity: 1;
+  -webkit-transition: all 0.2s ease-in-out;
+  -moz-transition: all 0.2s ease-in-out;
+  -o-transition: all 0.2s ease-in-out;
+  -ms-transition: all 0.2s ease-in-out;
+  transition: all 0.2s ease-in-out;
+}
+.widget .tool:hover .action {
+  opacity: 1;
+  -webkit-transition: all 0.2s ease-in-out;
+  -moz-transition: all 0.2s ease-in-out;
+  -o-transition: all 0.2s ease-in-out;
+  -ms-transition: all 0.2s ease-in-out;
+  transition: all 0.2s ease-in-out;
+}
+.widget .tool:hover .action.ticked {
+  opacity: 1;
+  -webkit-transition: all 0.2s ease-in-out;
+  -moz-transition: all 0.2s ease-in-out;
+  -o-transition: all 0.2s ease-in-out;
+  -ms-transition: all 0.2s ease-in-out;
+  transition: all 0.2s ease-in-out;
+}
+.widget ul {
+  padding: 0px;
+}
+.widget ul li {
+  padding-left: 16px;
+  min-height: 16px;
+  list-style: none;
+}
+.widget .tool.selected {
+  background: url("../../../view/theme/diabook/icons/selected.png") no-repeat left center;
+}
+/* widget: search */
+#add-search-popup {
+  width: 200px;
+  top: 18px;
+}
+/* section */
+section {
+  display: table-cell;
+  vertical-align: top;
+  width: 800px;
+  padding: 0px 0px 0px 12px;
+}
+.pager {
+   padding: 10px;
+	text-align: center;
+	font-size: 1.0em;
+}	
+
+.tabs {
+    
+    background-position: 0 -20px;
+    background-repeat: repeat-x;
+    height: 27px;
+    padding: 0;
+ }
+.tab.button {
+    margin-right: 5px; 
+    margin-left: 5px;	
+    /*background: none repeat scroll 0 0 #F8F8F8;*/
+    border: 1px solid #CCCCCC;
+    border-radius: 3px 3px 3px 3px;
+    font-weight: normal;
+    padding: 3px;
+    color:  #333333;
+	}
+	
+#birthday-notice, #event-notice, #birthday-wrapper, #event-wrapper{
+	margin-bottom: 10px;
+	}
+/* wall item */
+.tread-wrapper {
+  border-bottom: 1px solid #D2D2D2;
+  position: relative;
+  padding: 5px;
+  margin-bottom: 0px;
+  width: 775px;
+}
+.wall-item-decor {
+  position: absolute;
+  left: 790px;
+  top: -10px;
+  width: 16px;
+}
+
+.wall-item-container {
+  display: table;
+  width: 780px;
+}
+
+
+.wall-item-container .wall-item-item, .wall-item-container .wall-item-bottom {
+  display: table-row;
+}
+.wall-item-bottom {
+  font-size: 13px;
+}
+.wall-item-container .wall-item-bottom {
+/*  opacity: 0.5;
+  -webkit-transition: all 0.2s ease-in-out;
+  -moz-transition: all 0.2s ease-in-out;
+  -o-transition: all 0.2s ease-in-out;
+  -ms-transition: all 0.2s ease-in-out;
+  transition: all 0.2s ease-in-out; */
+}
+.wall-item-container:hover .wall-item-bottom {
+/*  opacity: 1;
+  -webkit-transition: all 0.2s ease-in-out;
+  -moz-transition: all 0.2s ease-in-out;
+  -o-transition: all 0.2s ease-in-out;
+  -ms-transition: all 0.2s ease-in-out;
+  transition: all 0.2s ease-in-out; */
+}
+.wall-item-container .wall-item-info {
+  display: table-cell;
+  vertical-align: top;
+  text-align: left;
+  width: 80px;
+}
+.wall-item-container .wall-item-location {
+  padding-right: 40px;
+}
+.wall-item-container .wall-item-ago {
+  word-wrap: break-word;
+  width: 50px;
+  margin-left: 10px;
+  color: #999;
+}
+.wall-item-location {
+  
+  clear: both;
+  overflow: hidden;
+  
+  margin-bottom: 5px;
+}
+
+.wall-item-container .wall-item-content {
+  font-size: 13px;
+  max-width: 720px;
+  word-wrap: break-word;
+  line-height: 1.4;
+}
+
+.wall-item-container .wall-item-content img {
+  max-width: 700px;
+}
+.wall-item-container .wall-item-links, .wall-item-container .wall-item-actions {
+  display: table-cell;
+  vertical-align: middle;
+}
+.wall-item-container .wall-item-links .icon, .wall-item-container .wall-item-actions .icon {
+  opacity: 0.5;
+  -webkit-transition: all 0.2s ease-in-out;
+  -moz-transition: all 0.2s ease-in-out;
+  -o-transition: all 0.2s ease-in-out;
+  -ms-transition: all 0.2s ease-in-out;
+  transition: all 0.2s ease-in-out;
+}
+.wall-item-container .wall-item-links .icon:hover, .wall-item-container .wall-item-actions .icon:hover {
+  opacity: 1;
+  -webkit-transition: all 0.2s ease-in-out;
+  -moz-transition: all 0.2s ease-in-out;
+  -o-transition: all 0.2s ease-in-out;
+  -ms-transition: all 0.2s ease-in-out;
+  transition: all 0.2s ease-in-out;
+}
+.wall-item-container .wall-item-name {
+  font-weight: bold;
+}
+.wall-item-container .wall-item-actions-author {
+  width: 100%;
+  margin-bottom: 0.3em;
+}
+.wall-item-container .wall-item-actions-social {
+  float: left;
+  margin-bottom: 1px;
+}
+.wall-item-container .wall-item-actions-social a {
+  margin-right: 1em;
+}
+.wall-item-actions-social a {
+  float: left;
+}
+.wall-item-container .wall-item-actions-tools {
+  float: right;
+  width: 80px;
+}
+.wall-item-container .wall-item-actions-tools a {
+  float: right;
+}
+.wall-item-container .wall-item-actions-tools input {
+  float: right;
+}
+.wall-item-container.comment {
+  margin-top: 5px;
+  margin-bottom: 5px;
+  margin-left: 80px;
+  width: 700px;
+  border-bottom: 1px solid hsl(198, 21%, 79%);
+}
+.wall-item-container.comment .contact-photo {
+  width: 32px;
+  height: 32px;
+  margin-left: 16px;
+  /*background: url(../../../images/icons/22/user.png) no-repeat center center;*/
+
+}
+.wall-item-container.comment {
+  top: 15px !important;
+  left: 15px !important;
+}
+.wall-item-container.comment .wall-item-links {
+  padding-left: 12px;
+}
+.wall-item-comment-wrapper {
+  margin: 1px 5px 1px 80px;
+}
+.wall-item-comment-wrapper .comment-edit-photo {
+  display: none;
+}
+.wall-item-comment-wrapper textarea {
+  height: 2.0em;
+  width: 100%;
+  font-size: 10px;
+  color: #999999;
+  border: 1px solid #DDD;
+  padding: 0.3em;
+  font-size: 14px;
+}
+.wall-item-comment-wrapper .comment-edit-text-full {
+  font-size: 14px;
+  height: 4em;
+  color: #2d2d2d;
+  border: 1px solid #2d2d2d;
+}
+.comment-edit-preview {
+  width: 710px;
+  border: 1px solid #2d2d2d;
+  margin-top: 10px;
+}
+.comment-edit-preview .contact-photo {
+  width: 32px;
+  height: 32px;
+  margin-left: 16px;
+  /*background: url(../../../images/icons/22/user.png) no-repeat center center;*/
+
+}
+.comment-edit-preview {
+  top: 15px !important;
+  left: 15px !important;
+}
+.comment-edit-preview .wall-item-links {
+  padding-left: 12px;
+}
+.comment-edit-preview .wall-item-container {
+  width: 700px;
+}
+.comment-edit-preview .tread-wrapper {
+  width: 700px;
+  padding: 0;
+  margin: 10px 0;
+}
+
+.shiny {
+  /* border-right: 10px solid #fce94f; */
+	border-right: 1px solid #A7C7F7;
+	padding-right: 12px;
+}
+
+#jot-preview-content{
+	margin-top: 30px;}
+	
+#jot-preview-content .tread-wrapper {
+  background-color: #fff797;
+}
+
+.wall-item-tags {
+  padding-top: 1px;
+  padding-bottom: 2px;
+}
+.tag {
+  /*background: url("../../../images/tag_b.png") repeat-x center left;*/
+  color: #3465A4;
+  padding-left: 3px;
+  font-size: 12px;
+}
+.tag a {
+  padding-right: 5px;
+  /*background: url("../../../images/tag.png") no-repeat center right;*/
+  color: #3465A4;
+}
+.wwto {
+  position: absolute !important;
+  width: 25px;
+  height: 25px;
+  background: #FFFFFF;
+  border: 2px solid #364e59;
+  height: 25px;
+  width: 25px;
+  overflow: hidden;
+  padding: 1px;
+  position: absolute !important;
+  top: 40px;
+  left: 30px;
+  -webkit-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+}
+.wwto .contact-photo {
+  width: auto;
+  height: 25px;
+}
+/* contacts menu */
+.contact-photo-wrapper {
+  position: relative;
+  width: 80px;
+}
+
+.contact-photo-wrapper.wwto {
+  width: 25px;
+}
+
+.contact-photo {
+  width: 48px;
+  height: 48px;
+  overflow: hidden;
+  display: block;
+}
+.contact-photo img {
+  width: 48px;
+  height: 48px;
+}
+
+.contact-wrapper {
+  float: left;
+  width: 90px;
+  height: 90px;
+  margin-bottom: 15px;
+}
+.contact-wrapper .contact-photo {
+  width: 80px;
+  height: 80px;
+}
+.contact-wrapper .contact-photo img {
+  width: 80px;
+  height: 80px;
+}
+.contact-wrapper {
+  left: 0px;
+  top: 63px;
+}
+.contact-photo {
+  width: 48px;
+  height: 48px;
+}
+.contact-photo img {
+  width: 48px;
+  height: 48px;
+}
+.contact-name {
+  /* text-align: center; */
+  /*font-weight: bold;*/
+  font-size: 12px;
+}
+.contact-details {
+  color: #999999;
+}
+/* editor */
+.jothidden {
+  display: none;
+}
+#jot {
+  width: 785px;
+  margin: 0px 2em 20px 0px;
+}
+#profile-jot-form #profile-jot-text {
+  height: 2.0em;
+  width: 99%;
+  font-size: 15px;
+  color: #999999;
+  border: 1px solid #DDD;
+  padding: 0.3em;
+  margin-bottom: 10px;
+}
+#jot #jot-tools {
+  margin: 0px;
+  padding: 0px;
+  height: 40px;
+  overflow: none;
+  width: 783px;
+  background-color: #fff;
+  border-bottom: 2px solid #9eabb0;
+}
+
+#jot #jot-tools li {
+  list-style: none;
+  float: left;
+  width: 80px;
+  height: 40px;
+  border-bottom: 2px solid #9eabb0;
+}
+#jot #jot-tools li a {
+  display: block;
+  color: #cccccc;
+  width: 100%;
+  height: 40px;
+  text-align: center;
+  line-height: 40px;
+  overflow: hidden;
+}
+#jot #jot-tools li:hover {
+  background-color: #364e59;
+  border-bottom: 2px solid #bdcdd4;
+}
+#jot #jot-tools li.perms {
+  float: right;
+  width: 40px;
+}
+#jot #jot-tools li.perms a.unlock {
+  width: 30px;
+  border-left: 10px solid #cccccc;
+  background-color: #cccccc;
+  background-position: left center;
+}
+#jot #jot-tools li.perms a.lock {
+  width: 30px;
+  border-left: 10px solid #666666;
+  background-color: #666666;
+}
+#jot #jot-tools li.submit {
+  float: right;
+  background-color: #cccccc;
+  border-bottom: 2px solid #cccccc;
+  border-right: 1px solid #666666;
+  border-left: 1px solid #666666;
+}
+#jot #jot-tools li.submit input {
+  border: 0px;
+  margin: 0px;
+  padding: 0px;
+  background-color: #cccccc;
+  color: #666666;
+  width: 80px;
+  height: 40px;
+  line-height: 40px;
+}
+#jot #jot-tools li.submit input:hover {
+  background-color: #bdcdd4;
+  color: #666666;
+}
+#jot #jot-tools li.loading {
+  float: right;
+  background-color: #ffffff;
+  width: 20px;
+  vertical-align: center;
+  text-align: center;
+  border-top: 2px solid #9eabb0;
+  height: 38px;
+}
+#jot #jot-tools li.loading img {
+  margin-top: 10px;
+}
+#profile-jot-form #jot-title {
+    
+  	 border-radius: 5px 5px 5px 5px;
+    font-weight: bold;
+    height: 20px;
+    margin: 0 0 5px;
+    width: 60%;
+    border: 1px solid #ffffff;
+}
+#profile-jot-form #jot-title:-webkit-input-placeholder {
+  font-weight: normal;
+}
+#profile-jot-form #jot-title:-moz-placeholder {
+  font-weight: normal;
+}
+#profile-jot-form #profile-jot-text_parent #profile-jot-text_tbl{
+	width: 785px;
+	height: 100px;
+	}
+#jot #jot-title:hover {
+  border: 1px solid #999999;
+}
+#jot #jot-title:focus {
+  border: 1px solid #999999;
+}
+#jot #character-counter {
+  width: 80px;
+  float: right;
+  text-align: right;
+  height: 20px;
+  line-height: 20px;
+  padding-right: 20px;
+}
+#jot-perms-icon, 
+#profile-location,
+#profile-nolocation,
+#profile-youtube, 
+#profile-video, 
+#profile-audio,
+#profile-link,
+#profile-title, 
+#wall-image-upload,
+#wall-file-upload,
+#wall-image-upload-div,
+#wall-file-upload-div,
+.hover, .focus {
+	cursor: pointer;
+	margin-top: 2px;
+}
+#profile-jot-wrapper{
+	margin: 0 2em 20px 0;
+   width: 785px;
+	}
+
+#profile-jot-submit-wrapper {
+	margin-bottom: 50px;
+	width: 785px;
+}
+
+#profile-jot-submit {
+	float: right;
+	margin-top: 2px;
+	
+}
+#profile-upload-wrapper {
+	float: left;
+	margin-top: 2px;
+	margin-left: 10px;
+	
+}
+#profile-attach-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-rotator {
+	float: left;
+	margin-left: 30px;
+	margin-top: 2px;
+}
+#profile-link-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-youtube-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-video-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-audio-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-location-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-jot-perms {
+	float: left;
+	margin-left: 45px;
+	margin-top: 2px;
+}
+#jot-preview-link {
+	float: right;
+	margin-left: 10px;
+	margin-top: 2px;
+	font-size: 10px;
+}
+#profile-jot-perms{
+   float: right;
+	margin-left: 10px;
+	margin-top: 2px;	
+	}
+/** buttons **/
+.button.creation1 {
+    background-color: #fff;
+    border: 1px solid #777777;
+    background-image: -moz-linear-gradient(center top , white 0%, #DDDDDD 100%);
+    border-radius: 3px 3px 3px 3px;
+    box-shadow: 0 1px 1px #CFCFCF;
+}
+.button.creation2 {
+    background-color: #33ACFF;
+    background-image: -moz-linear-gradient(center top , #66C1FF 0%, #0097FF 100%);
+    border: 1px solid #777777;
+    color: white;
+    border-radius: 3px 3px 3px 3px;
+    box-shadow: 0 1px 1px #CFCFCF;
+    margin-left: 5px;
+}
+/*input[type="submit"] {
+	border: 0px;
+    background-color: @ButtonBackgroundColor;
+    color: @ButtonColor;
+    padding: 0px 10px;
+	.rounded(5px);
+    height: 18px;
+}*/
+/** acl **/
+#photo-edit-perms-select, #photos-upload-permissions-wrapper, #profile-jot-acl-wrapper {
+  display: block!important;
+}
+#acl-wrapper {
+  width: 690px;
+  float: left;
+}
+#acl-search {
+  float: right;
+  background: #ffffff url("../../../images/search_18.png") no-repeat right center;
+  padding-right: 20px;
+}
+#acl-showall {
+  float: left;
+  display: block;
+  width: auto;
+  height: 18px;
+  background-color: #cccccc;
+  background-image: url("../../../images/show_all_off.png");
+  background-position: 7px 7px;
+  background-repeat: no-repeat;
+  padding: 7px 5px 0px 30px;
+  color: #999999;
+  -moz-border-radius: 5px 5px 5px 5px;
+  -webkit-border-radius: 5px 5px 5px 5px;
+  border-radius: 5px 5px 5px 5px;
+}
+#acl-showall.selected {
+  color: #000000;
+  background-color: #ff9900;
+  background-image: url("../../../images/show_all_on.png");
+}
+#acl-list {
+  height: 210px;
+  border: 1px solid #cccccc;
+  clear: both;
+  margin-top: 30px;
+  overflow: auto;
+}
+.acl-list-item {
+  display: block;
+  width: 150px;
+  height: 30px;
+  border: 1px solid #cccccc;
+  margin: 5px;
+  float: left;
+}
+.acl-list-item img {
+  width: 22px;
+  height: 22px;
+  float: left;
+  margin: 4px;
+}
+.acl-list-item p {
+  height: 12px;
+  font-size: 10px;
+  margin: 0px;
+  padding: 2px 0px 1px;
+  overflow: hidden;
+}
+.acl-list-item a {
+  font-size: 8px;
+  display: block;
+  width: 40px;
+  height: 10px;
+  float: left;
+  color: #999999;
+  background-color: #cccccc;
+  background-position: 3px 3px;
+  background-repeat: no-repeat;
+  margin-right: 5px;
+  -webkit-border-radius: 2px ;
+  -moz-border-radius: 2px;
+  border-radius: 2px;
+  padding-left: 15px;
+}
+#acl-wrapper a:hover {
+  text-decoration: none;
+  color: #000000;
+}
+.acl-button-show {
+  background-image: url("../../../images/show_off.png");
+}
+.acl-button-hide {
+  background-image: url("../../../images/hide_off.png");
+}
+.acl-button-show.selected {
+  color: #000000;
+  background-color: #9ade00;
+  background-image: url("../../../images/show_on.png");
+}
+.acl-button-hide.selected {
+  color: #000000;
+  background-color: #ff4141;
+  background-image: url("../../../images/hide_on.png");
+}
+.acl-list-item.groupshow {
+  border-color: #9ade00;
+}
+.acl-list-item.grouphide {
+  border-color: #ff4141;
+}
+/** /acl **/
+/** tab buttons **/
+ul.tabs {
+  list-style-type: none;
+  padding-bottom: 10px;
+  font-size: 13px;
+}
+ul.tabs li {
+  float: left;
+  margin-left: 5px;
+}
+ul.tabs li .active {
+    background-color: #333333;
+    border: 1px solid #777777;
+    color: white;
+    border-radius: 3px 3px 3px 3px;
+    box-shadow: 0 1px 1px #CFCFCF;
+    margin-left: 5px;
+}
+/**
+ * Form fields
+ */
+.field {
+  margin-bottom: 10px;
+  padding-bottom: 10px;
+  overflow: auto;
+  width: 100%;
+}
+.field label {
+  float: left;
+  width: 200px;
+}
+.field input, .field textarea {
+  width: 400px;
+}
+.field textarea {
+  height: 100px;
+}
+.field .field_help {
+  display: block;
+  margin-left: 200px;
+  color: #666666;
+}
+.field .onoff {
+  float: left;
+  width: 80px;
+}
+.field .onoff a {
+  display: block;
+  border: 1px solid #666666;
+  background-image: url("../../../images/onoff.jpg");
+  background-repeat: no-repeat;
+  padding: 4px 2px 2px 2px;
+  height: 16px;
+  text-decoration: none;
+}
+.field .onoff .off {
+  border-color: #666666;
+  padding-left: 40px;
+  background-position: left center;
+  background-color: #cccccc;
+  color: #666666;
+  text-align: right;
+}
+.field .onoff .on {
+  border-color: #204A87;
+  padding-right: 40px;
+  background-position: right center;
+  background-color: #D7E3F1;
+  color: #204A87;
+  text-align: left;
+}
+.field .hidden {
+  display: none!important;
+}
+.field.radio .field_help {
+  margin-left: 0px;
+}
+#directory-search-form{
+	margin-bottom: 50px;
+	}
+#profile-edit-links-end {
+        clear: both;
+        margin-bottom: 15px;
+}
+
+#profile-edit-links ul { margin: 20px; padding-bottom: 20px; list-style: none; }
+
+#profile-edit-links li {
+  float: left;
+  list-style: none;
+  margin-left: 10px;
+}
+
+.profile-edit-side-div {
+  display: none;
+}
+
+#register-form label,
+#profile-edit-form label {
+        width: 300px; float: left;
+}
+
+.required {
+  display: inline;
+  color: #B20202;
+}
+
+/* oauth */
+.oauthapp {
+  height: auto;
+  overflow: auto;
+  border-bottom: 2px solid #cccccc;
+  padding-bottom: 1em;
+  margin-bottom: 1em;
+}
+.oauthapp img {
+  float: left;
+  width: 48px;
+  height: 48px;
+  margin: 10px;
+}
+.oauthapp img.noicon {
+  background-image: url("../../../images/icons/48/plugin.png");
+  background-position: center center;
+  background-repeat: no-repeat;
+}
+.oauthapp a {
+  float: left;
+}
+/* contacts */
+.contact-entry-wrapper {
+  width: 120px;
+  height: 120px;
+  float: left;
+}
+/* photo */
+.lframe {
+  float: left;
+  margin: 0px 10px 10px 0px;
+}
+/* profile match wrapper */
+.profile-match-wrapper {
+  float: left;
+  width: 90px;
+  height: 90px;
+  margin-bottom: 20px;
+}
+.profile-match-wrapper .contact-photo {
+  width: 80px;
+  height: 80px;
+}
+.profile-match-wrapper .contact-photo img {
+  width: 80px;
+  height: 80px;
+}
+.profile-match-wrapper {
+  left: 0px;
+  top: 63px;
+}
+
+.contact-photo-menu-button {
+        position: relative;
+        background-image: url("../../../images/icons/16/menu.png");
+        background-position: top left; 
+        background-repeat: no-repeat;
+        margin: 0px 0px -16px 0px; 
+	padding: 0px;
+        width: 16px;
+        height: 16px;
+        top: -20px; left:0px;
+        overflow: hidden;
+        text-indent: 40px;
+        display: none;
+        
+}
+.contact-photo-menu {
+        width: 11em;
+        border: 3px solid #364e59;
+	color: #2d2d2d;
+        background: #FFFFFF;
+/*        position: absolute;*/
+        position: relative;
+        left: 0px; top: 0px;
+        display: none;
+        z-index: 10000;
+}
+.contact-photo-menu ul { margin:0px; padding: 0px; list-style: none }
+.contact-photo-menu li a {
+	display: block; 
+	padding: 5px 10px; 
+	color: #2d2d2d;
+	text-decoration: none;
+}
+.contact-photo-menu li a:hover {
+	background-color: #bdcdd4; 
+}
+
+/* page footer */
+footer {
+  height: 100px;
+  display: table-row;
+}
+
+blockquote {
+    border-left: 1px solid #D2D2D2;
+    padding-left: 9px;
+    margin: 0 0 0 .8ex;
+}
+.aprofile dt{
+box-shadow: 1px 1px 5px 0;
+    color: #666666;
+    margin: 15px 0 5px;
+    padding-left: 5px;	
+	}
+/* ================== */
+/* = Contacts Block = */
+/* ================== */
+
+.contact-block-img {
+        width: 55px;
+        height: 55px;
+        padding-right: 3px;
+}
+.contact-block-div {
+        float: left;
+}
+
+.contact-block-textdiv { width: 150px; height: 34px; float: left; }
+#contact-block-end { clear: both; } 
+
+#group-edit-wrapper {
+        margin-bottom: 10px;
+}
+
+#group-members-end {
+        clear: both;
+}
+#group-edit-desc {
+ margin-top: 15px;
+}
+
+/*
+#group-separator,
+#prof-separator { display: none;}
+*/
+
+#prvmail-to-label, #prvmail-subject-label, #prvmail-message-label {
+	margin-bottom: 10px;
+	margin-top: 20px;
+}
+
+#prvmail-submit {
+	float: left;
+	margin-top: 10px;
+	margin-right: 30px;
+}
+#prvmail-upload-wrapper,
+#prvmail-link-wrapper,
+#prvmail-rotator-wrapper {
+	float: left;
+	margin-top: 10px;
+	margin-right: 10px;
+	width: 24px;
+}
+
+#prvmail-end {
+	clear: both;
+}
+
+.mail-list-sender,
+.mail-list-detail {
+	float: left;
+}
+.mail-list-detail {
+	margin-left: 20px;
+}
+
+.mail-list-subject {
+	font-size: 1.1em;
+	margin-top: 10px;
+}
+a.mail-list-link {
+    display: block;
+    font-size: 1.3em;
+    padding: 4px 0;
+}
+
+/*
+*a.mail-list-link:hover {
+*	background-color: #15607B;
+*	color: #F5F6FB;
+*}
+*/
+
+.mail-list-outside-wrapper-end {
+	clear: both;
+}
+
+.mail-list-outside-wrapper {
+	margin-top: 30px;
+}
+
+.mail-list-delete-wrapper {
+	float: right;
+	margin-right: 30px;
+	margin-top: 15px;
+}
+
+.mail-list-delete-icon {
+	border: none;
+}
+
+.mail-conv-sender,
+.mail-conv-detail {
+	float: left;
+}
+.mail-conv-detail {
+	margin-left: 20px;
+	width: 500px;
+}
+
+.mail-conv-subject {
+    font-size: 1.4em;
+    margin: 10px 0;
+}
+
+.mail-conv-outside-wrapper-end {
+	clear: both;
+}
+
+.mail-conv-outside-wrapper {
+	margin-top: 30px;
+}
+
+.mail-conv-delete-wrapper {
+	float: right;
+	margin-right: 30px;
+	margin-top: 15px;
+}
+.mail-conv-break {
+	clear: both;
+}
+
+.mail-conv-delete-icon {
+	border: none;
+}
+
+/* ========== */
+/* = Events = */
+/* ========== */
+.eventcal {
+        float: left;
+        font-size: 20px;
+}
+
+.vevent {
+        border: 1px solid #CCCCCC;
+}
+.vevent .event-description, .vevent .event-location {
+        margin-left: 10px;
+        margin-right: 10px;
+}
+.vevent .event-start {
+        margin-left: 10px;
+        margin-right: 10px;
+}
+
+#new-event-link {
+        margin-bottom: 10px;
+}
+
+.edit-event-link, .plink-event-link {
+        float: left;
+        margin-top: 4px;
+        margin-right: 4px;
+        margin-bottom: 15px;
+}
+
+.event-description:before {
+        content: url('../../../images/calendar.png');
+        margin-right: 15px;
+}
+
+.event-start, .event-end {
+        margin-left: 10px;
+        width: 330px;
+        clear: both;
+}
+
+.event-start .dtstart, .event-end .dtend {
+        float: right;
+}
+
+.event-list-date {
+        margin-bottom: 10px;
+}
+
+.prevcal, .nextcal {
+        float: left;
+        margin-left: 32px;
+        margin-right: 32px;
+        margin-top: 64px;
+}
+.event-calendar-end {
+        clear: both;
+}
+
+ 
+.calendar {
+        font-family: Courier, monospace;
+}
+.today {
+        font-weight: bold;
+        color: #FF0000;
+}
+
+.settings-block {
+        border: 1px solid #AAA;
+        margin: 10px;
+        padding: 10px;
+}
+
+.app-title {
+        margin: 10px;
+}
+
+#identity-manage-desc {
+        margin-top:15px;
+        margin-bottom: 15px;
+}
+
+#identity-manage-choose {
+        margin-bottom: 15px;
+}
+
+#identity-submit {
+        margin-top: 20px;
+}
+
+#photo-prev-link, #photo-next-link {
+        padding: 10px;
+        float: left;
+}
+
+#photo-photo {
+        float: left;
+}
+#photo-like-div .wall-item-like-buttons {
+	float: left;
+   margin-right: 10px;
+	}
+.wall-item-like-buttons .icon.like {
+float: left;
+}
+
+#photo-photo-end {
+        clear: both;
+}
+
+.tabs .comment-wwedit-wrapper {
+	display: block;
+   margin-top: 30px;
+   margin-left: 50px;
+	}
+
+.profile-match-photo {
+        float: left;
+        text-align: center;
+        width: 120px;
+}
+
+.profile-match-name {
+        float: left;
+        text-align: center;
+        width: 120px;
+        overflow: hidden;
+}
+
+.profile-match-break,
+.profile-match-end {
+        clear: both;
+}
+
+.profile-match-connect {
+        text-align: center;
+        font-weight: bold;
+}
+
+.profile-match-wrapper {
+        float: left;
+        padding: 10px;
+        width: 120px;
+        height: 120px;
+        scroll: auto;
+}
+#profile-match-wrapper-end {
+        clear: both;
+}
+
+/* ============= */
+/* = Directory = */
+/* ============= */
+/* contacts menu */
+.contact-photo-wrapper {
+  position: relative;
+}
+.contact-photo {
+  width: 48px;
+  height: 48px;
+  overflow: hidden;
+  display: block;
+}
+.contact-photo img {
+  width: 48px;
+  height: 48px;
+}
+.contact-photo-menu-button {
+  display: none;
+  /* position: absolute; */
+  /* position: absolute; */
+  left: -2px;
+  top: -20px;
+}
+.contact-wrapper {
+  float: left;
+  width: 90px;
+  height: 90px;
+  margin-bottom: 15px;
+}
+.contact-wrapper .contact-photo {
+  width: 80px;
+  height: 80px;
+}
+.contact-wrapper .contact-photo img {
+  width: 80px;
+  height: 80px;
+}
+.contact-wrapper .contact-photo-menu-button {
+  left: 0px;
+  top: 63px;
+}
+.directory-item {
+  float: left;
+  width: 200px;
+  height: 200px;
+}
+.directory-item .contact-photo {
+  width: 175px;
+  height: 175px;
+}
+.directory-item .contact-photo img {
+  width: 175px;
+  height: 175px;
+}
+.contact-name {
+  text-align: left;
+  font-weight: bold;
+  font-size: 12px;
+}
+.contact-details {
+  color: #999999;
+}
+
+.photo-top-image-wrapper {
+        position: relative;
+        float: left;
+        margin-top: 15px;
+        margin-right: 15px;
+        width: 200px; height: 200px; 
+        overflow: hidden; 
+}
+.photo-top-album-name {
+        width: 100%;
+        min-height: 2em;
+        position: absolute; 
+        bottom: 0px; 
+        padding: 0px 3px;
+        padding-top: 0.5em;
+        background-color: rgb(255, 255, 255);
+}
+#photo-top-end {
+        clear: both;
+}
+
+#photo-top-links {
+        margin-bottom: 30px;
+        margin-left: 30px;
+}
+
+#photos-upload-newalbum-div {
+        float: left;
+        width: 175px;
+}
+
diff --git a/view/theme/diabook/wall_item.tpl b/view/theme/diabook/wall_item.tpl
new file mode 100644
index 000000000..b1a014949
--- /dev/null
+++ b/view/theme/diabook/wall_item.tpl
@@ -0,0 +1,97 @@
+{{ if $item.indent }}{{ else }}
+<div class="wall-item-decor">
+	{{ if $item.lock }}<span class="icon lock fakelink" onclick="lockview(event,$item.id);" title="$item.lock">$item.lock</span>{{ endif }}	
+	<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
+</div>
+{{ endif }}
+<div class="wall-item-container $item.indent">
+	<div class="wall-item-item">
+		<div class="wall-item-info">
+			<div class="contact-photo-wrapper"
+				onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')" 
+				onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)">
+				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="contact-photo-link" id="wall-item-photo-link-$item.id">
+					<img src="$item.thumb" class="contact-photo$item.sparkle" id="wall-item-photo-$item.id" alt="$item.name" />
+				</a>
+				<a href="#" rel="#wall-item-photo-menu-$item.id" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-$item.id">menu</a>
+				<ul class="contact-menu menu-popup" id="wall-item-photo-menu-$item.id">
+				$item.item_photo_menu
+				</ul>
+				
+			</div>
+		</div>
+			<div class="wall-item-actions-author">
+				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle">$item.name</span></a> 
+			<span class="wall-item-ago">-
+			{{ if $item.plink }}<a class="link" title="$item.plink.title" href="$item.plink.href" style="color: #999">$item.ago</a>{{ else }} $item.ago {{ endif }}
+			{{ if $item.lock }} - <span class="fakelink" style="color: #999" onclick="lockview(event,$item.id);">$item.lock</span> {{ endif }}
+			</span>
+			</div>
+		<div class="wall-item-content">
+			{{ if $item.title }}<h2><a href="$item.plink.href">$item.title</a></h2>{{ endif }}
+			$item.body
+		</div>
+	</div>
+	<div class="wall-item-bottom">
+		<div class="wall-item-links">
+		</div>
+		<div class="wall-item-tags">
+			{{ for $item.tags as $tag }}
+				<span class='tag'>$tag</span>
+			{{ endfor }}
+		</div>
+	</div>
+	<div class="wall-item-bottom">
+		<div class="">
+
+		</div>
+		<div class="wall-item-actions">
+			<div class="wall-item-location">$item.location&nbsp;</div>
+			<div class="wall-item-actions-social">
+			
+			
+			{{ if $item.vote }}
+				<a href="#" id="like-$item.id" class="icon like" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false">$item.vote.like.1</a>
+				<a href="#" id="dislike-$item.id" class="icon dislike" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false"></a>
+			{{ endif }}
+						
+			{{ if $item.vote.share }}
+				<a href="#" id="share-$item.id" class="icon recycle" title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a>
+			{{ endif }}	
+
+
+			{{ if $item.star }}
+				<a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle">
+				<img src="images/star_dummy.png" class="icon star" alt="$item.star.do" /> </a>
+				<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a>					  
+			{{ endif }}	
+			
+			{{ if $item.plink }}<a class="icon link" title="$item.plink.title" href="$item.plink.href">$item.plink.title</a>{{ endif }}
+			
+					
+					
+			</div>
+			
+			<div class="wall-item-actions-tools">
+
+				{{ if $item.drop.dropping }}
+					<input type="checkbox" title="$item.drop.select" name="itemselected[]" class="item-select" value="$item.id" />
+					<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drop" title="$item.drop.delete">$item.drop.delete</a>
+				{{ endif }}
+				{{ if $item.edpost }}
+					<a class="icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>
+				{{ endif }}
+			</div>
+			
+		</div>
+	</div>
+	<div class="wall-item-bottom">
+		<div class="wall-item-links"></div>
+		<div class="wall-item-like" id="wall-item-like-$item.id">$item.like</div>
+		<div class="wall-item-dislike" id="wall-item-dislike-$item.id">$item.dislike</div>	
+	</div>
+</div>
+
+<div class="wall-item-comment-wrapper" >
+	$item.comment
+</div>
diff --git a/view/theme/diabook/wallwall_item.tpl b/view/theme/diabook/wallwall_item.tpl
new file mode 100644
index 000000000..603a908c5
--- /dev/null
+++ b/view/theme/diabook/wallwall_item.tpl
@@ -0,0 +1,103 @@
+{{ if $item.indent }}{{ else }}
+<div class="wall-item-decor">
+	{{ if $item.lock }}<span class="icon lock fakelink" onclick="lockview(event,$item.id);" title="$item.lock">$item.lock</span>{{ endif }}	
+	<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
+</div>
+{{ endif }}
+<div class="wall-item-container $item.indent">
+	<div class="wall-item-item">
+		<div class="wall-item-info">
+			<div class="contact-photo-wrapper mframe wwto" id="wall-item-ownerphoto-wrapper-$item.id" >
+				<a href="$item.owner_url" target="redir" title="$item.olinktitle" class="contact-photo-link" id="wall-item-ownerphoto-link-$item.id">
+					<img src="$item.owner_photo" class="contact-photo $item.osparkle" id="wall-item-ownerphoto-$item.id" alt="$item.owner_name" />
+				</a>
+			</div>
+			<div class="contact-photo-wrapper mframe wwfrom"
+				onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')" 
+				onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)">
+				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="contact-photo-link" id="wall-item-photo-link-$item.id">
+					<img src="$item.thumb" class="contact-photo$item.sparkle" id="wall-item-photo-$item.id" alt="$item.name" />
+				</a>
+				<a href="#" rel="#wall-item-photo-menu-$item.id" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-$item.id">menu</a>
+				<ul class="contact-menu menu-popup" id="wall-item-photo-menu-$item.id">
+				$item.item_photo_menu
+				</ul>
+				
+			</div>
+		</div>
+			<div class="wall-item-actions-author">
+				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle">$item.name</span></a>
+				$item.to <a href="$item.owner_url" target="redir" title="$item.olinktitle" class="wall-item-name-link"><span class="wall-item-name$item.osparkle" id="wall-item-ownername-$item.id">$item.owner_name</span></a>
+				 $item.vwall <span class="wall-item-ago">- &nbsp;
+			{{ if $item.plink }}<a class="link" title="$item.plink.title" href="$item.plink.href" style="color: #999">$item.ago</a>{{ else }} $item.ago {{ endif }}
+			{{ if $item.lock }} - <span class="fakelink" style="color: #999" onclick="lockview(event,$item.id);">$item.lock</span> {{ endif }}
+			</span>
+			</div>
+		<div class="wall-item-content">
+			{{ if $item.title }}<h2><a href="$item.plink.href">$item.title</a></h2>{{ endif }}
+			$item.body
+		</div>
+	</div>
+	<div class="wall-item-bottom">
+		<div class="wall-item-links">
+		</div>
+		<div class="wall-item-tags">
+			{{ for $item.tags as $tag }}
+				<span class='tag'>$tag</span>
+			{{ endfor }}
+		</div>
+	</div>
+	<div class="wall-item-bottom">
+		<div class="">
+
+		</div>
+		<div class="wall-item-actions">
+			<div class="wall-item-location">$item.location&nbsp;</div>
+			<div class="wall-item-actions-social">
+			
+			
+			{{ if $item.vote }}
+				<a href="#" id="like-$item.id" class="icon like" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false">$item.vote.like.1</a>
+				<a href="#" id="dislike-$item.id" class="icon dislike" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false"></a>
+			{{ endif }}
+						
+			{{ if $item.vote.share }}
+				<a href="#" id="share-$item.id" class="icon recycle" title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a>
+			{{ endif }}	
+
+
+			{{ if $item.star }}
+				<a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle">
+				<img src="images/star_dummy.png" class="icon star" alt="$item.star.do" /> </a>
+				<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a>
+			{{ endif }}	
+			
+			{{ if $item.plink }}<a class="icon link" title="$item.plink.title" href="$item.plink.href">$item.plink.title</a>{{ endif }}
+			
+					
+					
+			</div>
+			
+			<div class="wall-item-actions-tools">
+
+				{{ if $item.drop.dropping }}
+					<input type="checkbox" title="$item.drop.select" name="itemselected[]" class="item-select" value="$item.id" />
+					<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drop" title="$item.drop.delete">$item.drop.delete</a>
+				{{ endif }}
+				{{ if $item.edpost }}
+					<a class="icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>
+				{{ endif }}
+			</div>
+			
+		</div>
+	</div>
+	<div class="wall-item-bottom">
+		<div class="wall-item-links"></div>
+		<div class="wall-item-like" id="wall-item-like-$item.id">$item.like</div>
+		<div class="wall-item-dislike" id="wall-item-dislike-$item.id">$item.dislike</div>	
+	</div>
+</div>
+
+<div class="wall-item-comment-wrapper" >
+	$item.comment
+</div>
+\ No newline at end of file
diff --git a/view/theme/dispy/comment_item.tpl b/view/theme/dispy/comment_item.tpl
new file mode 100644
index 000000000..85176732b
--- /dev/null
+++ b/view/theme/dispy/comment_item.tpl
@@ -0,0 +1,35 @@
+		<div class="comment-wwedit-wrapper" id="comment-edit-wrapper-$id" style="display: block;">
+			<form class="comment-edit-form" id="comment-edit-form-$id" action="item" method="post" onsubmit="post_comment($id); return false;">
+				<input type="hidden" name="type" value="$type" />
+				<input type="hidden" name="profile_uid" value="$profile_uid" />
+				<input type="hidden" name="parent" value="$parent" />
+				<input type="hidden" name="return" value="$return_path" />
+				<input type="hidden" name="jsreload" value="$jsreload" />
+				<input type="hidden" name="preview" id="comment-preview-inp-$id" value="0" />
+
+				<div class="comment-edit-photo" id="comment-edit-photo-$id" >
+					<a class="comment-edit-photo-link" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a>
+				</div>
+				<div class="comment-edit-photo-end"></div>
+				<textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);" onBlur="commentClose(this,$id);" >$comment</textarea>
+
+				{{ if $qcomment }}
+                <ul class="qcomment-wrapper">
+				{{ for $qcomment as $qc }}				
+					<li class="fakelink qcomment"
+                    onclick="commentInsert(this,$id); return false;">$qc</li>
+				{{ endfor }}
+                </ul>
+				{{ endif }}
+
+				<div class="comment-edit-text-end"></div>
+				<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-$id" style="display: none;">
+					<input type="submit" onclick="post_comment($id); return false;" id="comment-edit-submit-$id" class="comment-edit-submit" name="submit" value="$submit" />
+					<span onclick="preview_comment($id);" id="comment-edit-preview-link-$id" class="fakelink">$preview</span>
+					<div id="comment-edit-preview-$id" class="comment-edit-preview" style="display:none;"></div>
+				</div>
+
+				<div class="comment-edit-end"></div>
+			</form>
+
+		</div>
diff --git a/view/theme/dispy/contact_template.tpl b/view/theme/dispy/contact_template.tpl
index 48930b48a..fbf354b47 100755..100644
--- a/view/theme/dispy/contact_template.tpl
+++ b/view/theme/dispy/contact_template.tpl
@@ -1,9 +1,9 @@
 
 <div class="contact-entry-wrapper" id="contact-entry-wrapper-$contact.id" >
-	<div class="contact-entry-photo-wrapper" >
+	<div class="contact-entry-photo-wrapper">
 		<div class="contact-entry-photo mframe" id="contact-entry-photo-$contact.id"
 		onmouseover="if (typeof t$contact.id != 'undefined') clearTimeout(t$contact.id); openMenu('contact-photo-menu-button-$contact.id')" 
-		onmouseout="t$contact.id=setTimeout('closeMenu(\'contact-photo-menu-button-$contact.id\'); closeMenu(\'contact-photo-menu-$contact.id\');',200)" >
+		onmouseout="t$contact.id=setTimeout('closeMenu(\'contact-photo-menu-button-$contact.id\'); closeMenu(\'contact-photo-menu-$contact.id\');',200)">
 
 			<a href="$contact.url" title="$contact.img_hover" /><img src="$contact.thumb" $contact.sparkle alt="$contact.name" /></a>
 
@@ -20,6 +20,9 @@
 	</div>
 	<div class="contact-entry-photo-end" ></div>
 		<div class="contact-entry-name" id="contact-entry-name-$contact.id" >$contact.name</div>
+	<div class="contact-entry-details" id="contact-entry-url-$contact.id" >
+		<a href="$contact.itemurl" title="$contact.itemurl">Profile URL</a></div>
+	<div class="contact-entry-details" id="contact-entry-network-$contact.id" >$contact.network</div>
 
 	<div class="contact-entry-end" ></div>
 </div>
diff --git a/view/theme/dispy/conversation.tpl b/view/theme/dispy/conversation.tpl
new file mode 100644
index 000000000..41b6aeadf
--- /dev/null
+++ b/view/theme/dispy/conversation.tpl
@@ -0,0 +1,23 @@
+{{ for $threads as $thread }}
+<div id="tread-wrapper-$thread.id" class="tread-wrapper">
+	{{ for $thread.items as $item }}
+		{{if $item.comment_firstcollapsed}}
+			<div class="hide-comments-outer">
+			<span id="hide-comments-total-$thread.id" class="hide-comments-total">$thread.num_comments</span> <span id="hide-comments-$thread.id" class="hide-comments fakelink" onclick="showHideComments($thread.id);">$thread.hide_text</span>
+			</div>
+			<div id="collapsed-comments-$thread.id" class="collapsed-comments" style="display: none;">
+		{{endif}}
+		{{if $item.comment_lastcollapsed}}</div>{{endif}}
+		
+		{{ inc $item.template }}{{ endinc }}
+		
+		
+	{{ endfor }}
+</div>
+{{ endfor }}
+
+{{ if $dropping }}
+<div class="delete-checked">
+<a href="#" onclick="deleteCheckedItems();return false;"><span class="icon delete"></span><span class="s22 text">$dropping</span></a>
+</div>
+{{ endif }}
diff --git a/view/theme/dispy/group_side.tpl b/view/theme/dispy/group_side.tpl
index a1fc70a22..516d70d5b 100755..100644
--- a/view/theme/dispy/group_side.tpl
+++ b/view/theme/dispy/group_side.tpl
@@ -5,23 +5,25 @@
 	<ul id="sidebar-group-ul">
 		{{ for $groups as $group }}
 			<li class="sidebar-group-li">
+				<a href="$group.href" class="sidebar-group-element {{ if $group.selected }}group-selected{{ endif }}">$group.text</a>
+				{{ if $group.edit }}
+					<a 
+                        class="groupsideedit"
+                        href="$group.edit.href" title="$edittext"><span class="icon small-pencil"></span></a>
+				{{ endif }}
 				{{ if $group.cid }}
 					<input type="checkbox" 
 						class="{{ if $group.selected }}ticked{{ else }}unticked {{ endif }} action" 
 						onclick="contactgroupChangeMember('$group.id','$group.cid');return true;"
 						{{ if $group.ismember }}checked="checked"{{ endif }}
 					/>
-				{{ endif }}			
-				{{ if $group.edit }}
-					<a class="groupsideedit" href="$group.edit.href"><span class="icon small-pencil"></span></a>
 				{{ endif }}
-				<a class="sidebar-group-element {{ if $group.selected }}group-selected{{ endif }}" href="$group.href">$group.text</a>
 			</li>
 		{{ endfor }}
 	</ul>
 	</div>
   <div id="sidebar-new-group">
-  <a href="group/new">$createtext</a>
+  <a href="group/new" title="$createtext"><span class="action text add">$createtext</span></a>
   </div>
 </div>
 
diff --git a/view/theme/dispy/head.tpl b/view/theme/dispy/head.tpl
new file mode 100644
index 000000000..793af6fd2
--- /dev/null
+++ b/view/theme/dispy/head.tpl
@@ -0,0 +1,99 @@
+<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
+<base href="$baseurl/" />
+<meta name="generator" content="$generator" />
+<link rel="stylesheet" href="$baseurl/library/fancybox/jquery.fancybox-1.3.4.css" type="text/css" media="screen" />
+<link rel="stylesheet" href="$baseurl/library/tiptip/tipTip.css" type="text/css" media="screen" />
+<link rel="stylesheet" href="$baseurl/library/jgrowl/jquery.jgrowl.css" type="text/css" media="screen" />
+
+<link rel="stylesheet" type="text/css" href="$stylesheet" media="all" />
+
+<link rel="shortcut icon" href="$baseurl/images/friendika-32.png" />
+<link rel="search"
+         href="$baseurl/opensearch" 
+         type="application/opensearchdescription+xml" 
+         title="Search in Friendica" />
+
+<!--[if IE]>
+<script type="text/javascript" src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+<![endif]-->
+<script type="text/javascript" src="$baseurl/js/jquery.js" ></script>
+<script type="text/javascript" src="$baseurl/js/jquery.textinputs.js" ></script>
+<script type="text/javascript" src="$baseurl/js/fk.autocomplete.js" ></script>
+<script type="text/javascript" src="$baseurl/library/fancybox/jquery.fancybox-1.3.4.pack.js"></script>
+<script type="text/javascript" src="$baseurl/library/tiptip/jquery.tipTip.minified.js"></script>
+<script type="text/javascript" src="$baseurl/library/jgrowl/jquery.jgrowl_minimized.js"></script>
+<script type="text/javascript" src="$baseurl/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js" ></script>
+<script type="text/javascript" src="$baseurl/js/acl.js" ></script>
+<script type="text/javascript" src="$baseurl/js/webtoolkit.base64.js" ></script>
+<script type="text/javascript" src="$baseurl/js/main.js" ></script>
+<script>
+
+	var updateInterval = $update_interval;
+
+	function confirmDelete() { return confirm("$delitem"); }
+	function commentOpen(obj,id) {
+		if(obj.value == '$comment') {
+			obj.value = '';
+			obj.className = "comment-edit-text-full";
+			openMenu("comment-edit-submit-wrapper-" + id);
+		}
+	}
+	function commentClose(obj,id) {
+		if(obj.value == '') {
+			obj.value = '$comment';
+			obj.className="comment-edit-text-empty";
+			closeMenu("comment-edit-submit-wrapper-" + id);
+		}
+	}
+
+
+	function commentInsert(obj,id) {
+		var tmpStr = $("#comment-edit-text-" + id).val();
+		if(tmpStr == '$comment') {
+			tmpStr = '';
+			$("#comment-edit-text-" + id).addClass("comment-edit-text-full");
+			$("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
+			openMenu("comment-edit-submit-wrapper-" + id);
+		}
+		var ins = $(obj).html();
+		ins = ins.replace('&lt;','<');
+		ins = ins.replace('&gt;','>');
+		ins = ins.replace('&amp;','&');
+		ins = ins.replace('&quot;','"');
+		$("#comment-edit-text-" + id).val(tmpStr + ins);
+	}
+
+	function showHideComments(id) {
+		if( $('#collapsed-comments-' + id).is(':visible')) {
+			$('#collapsed-comments-' + id).hide();
+			$('#hide-comments-' + id).html('$showmore');
+		}
+		else {
+			$('#collapsed-comments-' + id).show();
+			$('#hide-comments-' + id).html('$showfewer');
+		}
+	}
+
+    $(document).ready(function() {
+        function toggleToolbar() {
+            if ( $('#nav-floater').is(':visible') ) {
+                $('#nav-floater').slideUp('fast');
+                $('.floaterflip').css({
+                    backgroundPosition: '-210px -60px' 
+                });
+            } else {
+                $('#nav-floater').slideDown('fast');
+                $('.floaterflip').css({
+                    backgroundPosition: '-190px -60px'
+                });
+            }
+        };
+        $('.floaterflip').click(function() {
+            toggleToolbar();
+            return false;
+        });
+    });
+
+</script>
+
+
diff --git a/view/theme/dispy/icons.png b/view/theme/dispy/icons.png
index bd52b62c8..2f0459bd3 100755..100644
--- a/view/theme/dispy/icons.png
+++ b/view/theme/dispy/icons.png
diff --git a/view/theme/dispy/icons.svg b/view/theme/dispy/icons.svg
index b435ba665..998e2641f 100755..100644
--- a/view/theme/dispy/icons.svg
+++ b/view/theme/dispy/icons.svg
@@ -7,15 +7,16 @@
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="250"
    height="200"
    id="svg3403"
    version="1.1"
-   inkscape:version="0.48.1 r9760"
+   inkscape:version="0.48+devel r"
    sodipodi:docname="icons.svg"
-   inkscape:export-filename="/home/fabio/public_html/friendika/view/theme/dispy/icons.png"
+   inkscape:export-filename="/var/www3/kisikew.org/portal/pub/fd/view/theme/dispy/icons.png"
    inkscape:export-xdpi="90"
    inkscape:export-ydpi="90">
   <defs
@@ -50,19 +51,19 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="0.9899495"
-     inkscape:cx="43.010429"
-     inkscape:cy="-67.661177"
+     inkscape:zoom="1.9403009"
+     inkscape:cx="73.744486"
+     inkscape:cy="108.36719"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="true"
      showguides="true"
      inkscape:guide-bbox="true"
      inkscape:snap-global="false"
-     inkscape:window-width="1534"
-     inkscape:window-height="1067"
-     inkscape:window-x="104"
-     inkscape:window-y="63"
+     inkscape:window-width="1065"
+     inkscape:window-height="742"
+     inkscape:window-x="40"
+     inkscape:window-y="61"
      inkscape:window-maximized="0">
     <inkscape:grid
        type="xygrid"
@@ -100,12 +101,12 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Livello 1"
+     inkscape:label="Layer1"
      inkscape:groupmode="layer"
      id="layer1"
      transform="translate(0,-852.36218)">
@@ -118,11 +119,12 @@
        y="852.36218"
        inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons.png"
        inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
+       inkscape:export-ydpi="90"
+       transform="matrix(1,0,0,1.5151515,0,-439.09566)" />
     <g
        id="ico_dir"
        transform="matrix(0.43114968,0,0,0.43114968,-178.47604,867.63556)"
-       style="stroke:#888a85;display:inline"
+       style="fill:#333333;stroke:#e6e6e6;display:inline"
        inkscape:label="#g3846">
       <rect
          ry="6"
@@ -132,30 +134,30 @@
          height="44.285713"
          width="44.285713"
          id="rect3820"
-         style="fill:none;stroke:#888a85;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+         style="fill:#333333;stroke:#e6e6e6;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
       <path
          inkscape:connector-curvature="0"
-         style="fill:#2e3436;stroke:#888a85;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         style="fill:#333333;stroke:#e6e6e6;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
          d="m 449.12191,27.281249 c -2.07646,0 -3.76352,1.688406 -3.76352,3.766518 0,2.078113 1.68706,3.766518 3.76352,3.766518 2.07646,0 3.76351,-1.688405 3.76351,-3.766518 0,-2.078112 -1.68705,-3.766518 -3.76351,-3.766518 z m 0,7.533036 c -5.23267,0 -9.47459,5.783883 -9.47459,12.932589 0,0.201529 0.0196,0.406525 0.0264,0.605804 l 18.89654,0 c 0.007,-0.199279 0.0264,-0.404275 0.0264,-0.605804 0,-7.148706 -4.24192,-12.932589 -9.47459,-12.932589 z"
          id="path3830" />
       <path
          id="path3832"
          d="m 431.26477,26.924106 c -2.07646,0 -3.76352,1.688406 -3.76352,3.766518 0,2.078113 1.68706,3.766518 3.76352,3.766518 2.07646,0 3.76351,-1.688405 3.76351,-3.766518 0,-2.078112 -1.68705,-3.766518 -3.76351,-3.766518 z m 0,7.533036 c -5.23267,0 -9.47459,5.783883 -9.47459,12.932589 0,0.201529 0.0196,0.406525 0.0264,0.605804 l 18.89654,0 c 0.007,-0.199279 0.0264,-0.404275 0.0264,-0.605804 0,-7.148706 -4.24192,-12.932589 -9.47459,-12.932589 z"
-         style="fill:#2e3436;stroke:#888a85;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         style="fill:#333333;stroke:#e6e6e6;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
          inkscape:connector-curvature="0" />
       <path
          inkscape:connector-curvature="0"
          id="path3822"
          d="M 439.46875,29.78125 C 437.00319,29.78125 435,31.784443 435,34.25 c 0,2.465557 2.00319,4.46875 4.46875,4.46875 2.46556,0 4.46875,-2.003193 4.46875,-4.46875 0,-2.465557 -2.00319,-4.46875 -4.46875,-4.46875 z m 0,8.9375 c -6.2132,0 -11.25,6.862234 -11.25,15.34375 0,0.239102 0.0233,0.482318 0.0313,0.71875 l 22.4375,0 c 0.008,-0.236432 0.0313,-0.479648 0.0313,-0.71875 0,-8.481516 -5.0368,-15.34375 -11.25,-15.34375 z"
-         style="fill:#2e3436;stroke:#888a85;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+         style="fill:#333333;stroke:#e6e6e6;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
     </g>
     <g
        id="ico_search"
        transform="matrix(0.43114968,0,0,0.43114968,-201.41936,889.63556)"
-       style="stroke:#888a85;display:inline"
+       style="fill:#333333;stroke:#e6e6e6;display:inline"
        inkscape:label="#g3852">
       <rect
-         style="fill:none;stroke:#888a85;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         style="fill:#333333;stroke:#e6e6e6;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
          id="rect3837"
          width="44.285713"
          height="44.285713"
@@ -167,7 +169,7 @@
          inkscape:connector-curvature="0"
          id="path3839"
          d="m 477.97758,26.469174 c -3.64342,3.88426 -3.47037,9.984211 0.41389,13.627637 3.52011,3.301856 8.87059,3.441123 12.55302,0.54905 -0.17428,0.682501 0.0188,1.431563 0.57086,1.949383 l 13.7666,12.913032 c 0.80813,0.75802 2.06896,0.717682 2.82698,-0.09044 l 0.68414,-0.729357 c 0.75802,-0.808126 0.71768,-2.06896 -0.0904,-2.82698 l -13.7666,-12.913032 c -0.55205,-0.51782 -1.31192,-0.66264 -1.98188,-0.445086 2.65077,-3.859767 2.16978,-9.190402 -1.35033,-12.492258 -3.88426,-3.643426 -9.9828,-3.426204 -13.62623,0.458055 z"
-         style="fill:#2e3436;fill-opacity:1;stroke:#888a85;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+         style="fill:none;fill-opacity:1;stroke:#e6e6e6;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
       <path
          transform="translate(-0.21428562,-0.35714286)"
          d="m 492.49999,33.612183 c 0,4.043513 -3.27792,7.321428 -7.32143,7.321428 -4.04352,0 -7.32143,-3.277915 -7.32143,-7.321428 0,-4.043514 3.27791,-7.321429 7.32143,-7.321429 4.04351,0 7.32143,3.277915 7.32143,7.321429 z"
@@ -176,12 +178,12 @@
          sodipodi:cy="33.612183"
          sodipodi:cx="485.17856"
          id="path3844"
-         style="fill:#2e3436;fill-opacity:1;stroke:#888a85;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         style="fill:none;fill-opacity:1;stroke:#e6e6e6;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
          sodipodi:type="arc" />
     </g>
     <g
        inkscape:label="#g3852"
-       style="stroke:#888a85;display:inline"
+       style="fill:#333333;stroke:#e6e6e6;display:inline"
        transform="matrix(0.43114968,0,0,0.43114968,-201.41936,845.63556)"
        id="ico_logout">
       <rect
@@ -192,9 +194,9 @@
          height="44.285713"
          width="44.285713"
          id="rect3995"
-         style="fill:none;stroke:#888a85;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+         style="fill:#333333;stroke:#e6e6e6;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
       <path
-         style="fill:#555753;fill-opacity:1;stroke:#888a85;stroke-width:2.31938004"
+         style="fill:#333333;fill-opacity:1;stroke:#e6e6e6;stroke-width:2.31938004"
          d="M 504.69787,28.735741 480.30214,53.131477"
          id="path4003"
          inkscape:connector-curvature="0" />
@@ -202,15 +204,15 @@
          inkscape:connector-curvature="0"
          id="path4005"
          d="M 504.69787,53.131473 480.30214,28.735746"
-         style="fill:#555753;fill-opacity:1;stroke:#888a85;stroke-width:2.31938004" />
+         style="fill:#333333;fill-opacity:1;stroke:#e6e6e6;stroke-width:2.31938004" />
     </g>
     <g
        inkscape:label="#g3846"
-       style="stroke:#d3d7cf;display:inline"
+       style="fill:#1a1a1a;stroke:#d3d7cf;display:inline"
        transform="matrix(0.43114968,0,0,0.43114968,-156.47604,867.63556)"
        id="ico_dir_on">
       <rect
-         style="fill:none;stroke:#d3d7cf;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         style="fill:#1a1a1a;stroke:#d3d7cf;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
          id="rect4011"
          width="44.285713"
          height="44.285713"
@@ -221,22 +223,22 @@
       <path
          id="path4013"
          d="m 449.12191,27.281249 c -2.07646,0 -3.76352,1.688406 -3.76352,3.766518 0,2.078113 1.68706,3.766518 3.76352,3.766518 2.07646,0 3.76351,-1.688405 3.76351,-3.766518 0,-2.078112 -1.68705,-3.766518 -3.76351,-3.766518 z m 0,7.533036 c -5.23267,0 -9.47459,5.783883 -9.47459,12.932589 0,0.201529 0.0196,0.406525 0.0264,0.605804 l 18.89654,0 c 0.007,-0.199279 0.0264,-0.404275 0.0264,-0.605804 0,-7.148706 -4.24192,-12.932589 -9.47459,-12.932589 z"
-         style="fill:#2e3436;stroke:#d3d7cf;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         style="fill:#1a1a1a;stroke:#d3d7cf;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
          inkscape:connector-curvature="0" />
       <path
          inkscape:connector-curvature="0"
-         style="fill:#2e3436;stroke:#d3d7cf;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         style="fill:#1a1a1a;stroke:#d3d7cf;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
          d="m 431.26477,26.924106 c -2.07646,0 -3.76352,1.688406 -3.76352,3.766518 0,2.078113 1.68706,3.766518 3.76352,3.766518 2.07646,0 3.76351,-1.688405 3.76351,-3.766518 0,-2.078112 -1.68705,-3.766518 -3.76351,-3.766518 z m 0,7.533036 c -5.23267,0 -9.47459,5.783883 -9.47459,12.932589 0,0.201529 0.0196,0.406525 0.0264,0.605804 l 18.89654,0 c 0.007,-0.199279 0.0264,-0.404275 0.0264,-0.605804 0,-7.148706 -4.24192,-12.932589 -9.47459,-12.932589 z"
          id="path4015" />
       <path
-         style="fill:#2e3436;stroke:#d3d7cf;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         style="fill:#1a1a1a;stroke:#d3d7cf;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
          d="M 439.46875,29.78125 C 437.00319,29.78125 435,31.784443 435,34.25 c 0,2.465557 2.00319,4.46875 4.46875,4.46875 2.46556,0 4.46875,-2.003193 4.46875,-4.46875 0,-2.465557 -2.00319,-4.46875 -4.46875,-4.46875 z m 0,8.9375 c -6.2132,0 -11.25,6.862234 -11.25,15.34375 0,0.239102 0.0233,0.482318 0.0313,0.71875 l 22.4375,0 c 0.008,-0.236432 0.0313,-0.479648 0.0313,-0.71875 0,-8.481516 -5.0368,-15.34375 -11.25,-15.34375 z"
          id="path4017"
          inkscape:connector-curvature="0" />
     </g>
     <g
        inkscape:label="#g3852"
-       style="stroke:#d3d7cf;display:inline"
+       style="fill:#1a1a1a;stroke:#d3d7cf;display:inline"
        transform="matrix(0.43114968,0,0,0.43114968,-179.41936,889.63556)"
        id="ico_search_on">
       <rect
@@ -247,15 +249,15 @@
          height="44.285713"
          width="44.285713"
          id="rect4021"
-         style="fill:none;stroke:#d3d7cf;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+         style="fill:#1a1a1a;stroke:#d3d7cf;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
       <path
-         style="fill:#2e3436;fill-opacity:1;stroke:#d3d7cf;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         style="fill:none;fill-opacity:1;stroke:#d3d7cf;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
          d="m 477.97758,26.469174 c -3.64342,3.88426 -3.47037,9.984211 0.41389,13.627637 3.52011,3.301856 8.87059,3.441123 12.55302,0.54905 -0.17428,0.682501 0.0188,1.431563 0.57086,1.949383 l 13.7666,12.913032 c 0.80813,0.75802 2.06896,0.717682 2.82698,-0.09044 l 0.68414,-0.729357 c 0.75802,-0.808126 0.71768,-2.06896 -0.0904,-2.82698 l -13.7666,-12.913032 c -0.55205,-0.51782 -1.31192,-0.66264 -1.98188,-0.445086 2.65077,-3.859767 2.16978,-9.190402 -1.35033,-12.492258 -3.88426,-3.643426 -9.9828,-3.426204 -13.62623,0.458055 z"
          id="path4023"
          inkscape:connector-curvature="0" />
       <path
          sodipodi:type="arc"
-         style="fill:#2e3436;fill-opacity:1;stroke:#d3d7cf;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         style="fill:none;fill-opacity:1;stroke:#d3d7cf;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
          id="path4025"
          sodipodi:cx="485.17856"
          sodipodi:cy="33.612183"
@@ -267,10 +269,10 @@
     <g
        id="ico_logout_on"
        transform="matrix(0.43114968,0,0,0.43114968,-179.41936,845.63556)"
-       style="stroke:#d3d7cf;display:inline"
+       style="fill:#1a1a1a;stroke:#d3d7cf;display:inline"
        inkscape:label="#g3852">
       <rect
-         style="fill:none;stroke:#d3d7cf;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         style="fill:#1a1a1a;stroke:#d3d7cf;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
          id="rect4029"
          width="44.285713"
          height="44.285713"
@@ -282,16 +284,16 @@
          inkscape:connector-curvature="0"
          id="path4031"
          d="M 504.69787,28.735741 480.30214,53.131477"
-         style="fill:#555753;fill-opacity:1;stroke:#d3d7cf;stroke-width:2.31938004" />
+         style="fill:#1a1a1a;fill-opacity:1;stroke:#d3d7cf;stroke-width:2.31938004" />
       <path
-         style="fill:#555753;fill-opacity:1;stroke:#d3d7cf;stroke-width:2.31938004"
+         style="fill:#1a1a1a;fill-opacity:1;stroke:#d3d7cf;stroke-width:2.31938004"
          d="M 504.69787,53.131473 480.30214,28.735746"
          id="path4033"
          inkscape:connector-curvature="0" />
     </g>
     <g
        inkscape:label="#g3852"
-       style="stroke:#888a85;display:inline;filter:url(#filter4064)"
+       style="fill:#333333;stroke:#e6e6e6;display:inline;filter:url(#filter4064)"
        transform="matrix(0.43114968,0,0,0.43114968,-201.41936,911.63556)"
        id="g4040">
       <rect
@@ -302,9 +304,9 @@
          height="44.285713"
          width="44.285713"
          id="rect4042"
-         style="fill:none;stroke:#888a85;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+         style="fill:#333333;stroke:#e6e6e6;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
       <path
-         style="fill:#2e3436;fill-opacity:1;stroke:#888a85;stroke-width:1.66475451;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+         style="fill:#333333;fill-opacity:1;stroke:#e6e6e6;stroke-width:1.66475451;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
          d="m 484.90604,52.679071 c 0,0 -0.72327,1.028211 -2.88202,1.697409 -0.63474,-0.494653 -1.23439,-1.034334 -1.79294,-1.613646 0.43889,-2.217071 1.3855,-3.044283 1.3855,-3.044283 l 2.04237,-1.648571 c -0.73879,-0.915258 -1.3342,-1.946011 -1.75793,-3.043257 l -2.44847,0.945549 c 0,0 -1.18951,0.40671 -3.32932,-0.320779 -0.22277,-0.773276 -0.39067,-1.56235 -0.50204,-2.359331 1.65823,-1.535673 2.91028,-1.648499 2.91028,-1.648499 l 2.62132,-0.133248 c -0.0597,-1.174706 0.0645,-2.358577 0.36658,-3.495332 l -2.53663,-0.674208 c 0,0 -1.20139,-0.37014 -2.50493,-2.216441 0.2743,-0.756533 0.60227,-1.4936 0.98062,-2.20383 2.24419,-0.267701 3.32343,0.376954 3.32343,0.376954 l 2.19901,1.432971 c 0.64217,-0.985455 1.43848,-1.870246 2.35108,-2.612309 l -1.65589,-2.03644 c 0,0 -0.75438,-1.005609 -0.72373,-3.265497 0.66659,-0.45082 1.36515,-0.854347 2.08871,-1.206542 1.97294,1.102524 2.46715,2.258424 2.46715,2.258424 l 0.93675,2.451844 c 1.09876,-0.419794 2.26306,-0.667544 3.43754,-0.731472 l -0.14265,-2.620822 c 0,0 -0.0192,-1.25697 1.3339,-3.067245 0.80426,0.02709 1.6066,0.111239 2.39899,0.251604 0.94809,2.051624 0.66849,3.277254 0.66849,3.277254 l -0.6833,2.534196 c 1.13566,0.306213 2.22322,0.790136 3.21097,1.428761 l 1.42508,-2.204138 c 0,0 0.72327,-1.028211 2.88202,-1.697409 0.63474,0.494653 1.23439,1.034334 1.79294,1.613646 -0.43889,2.217071 -1.3855,3.044283 -1.3855,3.044283 l -2.04237,1.648571 c 0.73879,0.915258 1.3342,1.946011 1.75793,3.043257 l 2.44847,-0.945549 c 0,0 1.18951,-0.40671 3.32932,0.320779 0.22277,0.773276 0.39067,1.56235 0.50204,2.359331 -1.65823,1.535673 -2.91028,1.648499 -2.91028,1.648499 l -2.62132,0.133248 c 0.0597,1.174706 -0.0645,2.358577 -0.36658,3.495332 l 2.53663,0.674208 c 0,0 1.20139,0.37014 2.50493,2.216441 -0.2743,0.756533 -0.60227,1.4936 -0.98062,2.20383 -2.24419,0.267701 -3.32343,-0.376954 -3.32343,-0.376954 l -2.19901,-1.432971 c -0.64217,0.985455 -1.43848,1.870246 -2.35108,2.612309 l 1.65589,2.03644 c 0,0 0.75438,1.005609 0.72373,3.265497 -0.66659,0.45082 -1.36515,0.854347 -2.08871,1.206542 -1.97294,-1.102524 -2.46715,-2.258424 -2.46715,-2.258424 l -0.93675,-2.451844 c -1.09876,0.419794 -2.26306,0.667544 -3.43754,0.731472 l 0.14265,2.620822 c 0,0 0.0192,1.25697 -1.3339,3.067245 -0.80426,-0.02709 -1.6066,-0.111239 -2.39899,-0.251604 -0.94809,-2.051624 -0.66849,-3.277254 -0.66849,-3.277254 l 0.6833,-2.534196 c -1.13566,-0.306213 -2.22322,-0.790136 -3.21097,-1.428761 l -1.42508,2.204138"
          id="path4048"
          inkscape:connector-curvature="0"
@@ -314,10 +316,10 @@
     <g
        id="g4068"
        transform="matrix(0.43114968,0,0,0.43114968,-179.41936,911.63556)"
-       style="stroke:#d3d7cf;display:inline;filter:url(#filter4064)"
+       style="fill:#1a1a1a;stroke:#d3d7cf;display:inline;filter:url(#filter4064)"
        inkscape:label="#g3852">
       <rect
-         style="fill:none;stroke:#d3d7cf;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         style="fill:#1a1a1a;stroke:#d3d7cf;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
          id="rect4070"
          width="44.285713"
          height="44.285713"
@@ -331,15 +333,15 @@
          inkscape:connector-curvature="0"
          id="path4072"
          d="m 484.90604,52.679071 c 0,0 -0.72327,1.028211 -2.88202,1.697409 -0.63474,-0.494653 -1.23439,-1.034334 -1.79294,-1.613646 0.43889,-2.217071 1.3855,-3.044283 1.3855,-3.044283 l 2.04237,-1.648571 c -0.73879,-0.915258 -1.3342,-1.946011 -1.75793,-3.043257 l -2.44847,0.945549 c 0,0 -1.18951,0.40671 -3.32932,-0.320779 -0.22277,-0.773276 -0.39067,-1.56235 -0.50204,-2.359331 1.65823,-1.535673 2.91028,-1.648499 2.91028,-1.648499 l 2.62132,-0.133248 c -0.0597,-1.174706 0.0645,-2.358577 0.36658,-3.495332 l -2.53663,-0.674208 c 0,0 -1.20139,-0.37014 -2.50493,-2.216441 0.2743,-0.756533 0.60227,-1.4936 0.98062,-2.20383 2.24419,-0.267701 3.32343,0.376954 3.32343,0.376954 l 2.19901,1.432971 c 0.64217,-0.985455 1.43848,-1.870246 2.35108,-2.612309 l -1.65589,-2.03644 c 0,0 -0.75438,-1.005609 -0.72373,-3.265497 0.66659,-0.45082 1.36515,-0.854347 2.08871,-1.206542 1.97294,1.102524 2.46715,2.258424 2.46715,2.258424 l 0.93675,2.451844 c 1.09876,-0.419794 2.26306,-0.667544 3.43754,-0.731472 l -0.14265,-2.620822 c 0,0 -0.0192,-1.25697 1.3339,-3.067245 0.80426,0.02709 1.6066,0.111239 2.39899,0.251604 0.94809,2.051624 0.66849,3.277254 0.66849,3.277254 l -0.6833,2.534196 c 1.13566,0.306213 2.22322,0.790136 3.21097,1.428761 l 1.42508,-2.204138 c 0,0 0.72327,-1.028211 2.88202,-1.697409 0.63474,0.494653 1.23439,1.034334 1.79294,1.613646 -0.43889,2.217071 -1.3855,3.044283 -1.3855,3.044283 l -2.04237,1.648571 c 0.73879,0.915258 1.3342,1.946011 1.75793,3.043257 l 2.44847,-0.945549 c 0,0 1.18951,-0.40671 3.32932,0.320779 0.22277,0.773276 0.39067,1.56235 0.50204,2.359331 -1.65823,1.535673 -2.91028,1.648499 -2.91028,1.648499 l -2.62132,0.133248 c 0.0597,1.174706 -0.0645,2.358577 -0.36658,3.495332 l 2.53663,0.674208 c 0,0 1.20139,0.37014 2.50493,2.216441 -0.2743,0.756533 -0.60227,1.4936 -0.98062,2.20383 -2.24419,0.267701 -3.32343,-0.376954 -3.32343,-0.376954 l -2.19901,-1.432971 c -0.64217,0.985455 -1.43848,1.870246 -2.35108,2.612309 l 1.65589,2.03644 c 0,0 0.75438,1.005609 0.72373,3.265497 -0.66659,0.45082 -1.36515,0.854347 -2.08871,1.206542 -1.97294,-1.102524 -2.46715,-2.258424 -2.46715,-2.258424 l -0.93675,-2.451844 c -1.09876,0.419794 -2.26306,0.667544 -3.43754,0.731472 l 0.14265,2.620822 c 0,0 0.0192,1.25697 -1.3339,3.067245 -0.80426,-0.02709 -1.6066,-0.111239 -2.39899,-0.251604 -0.94809,-2.051624 -0.66849,-3.277254 -0.66849,-3.277254 l 0.6833,-2.534196 c -1.13566,-0.306213 -2.22322,-0.790136 -3.21097,-1.428761 l -1.42508,2.204138"
-         style="fill:#2e3436;fill-opacity:1;stroke:#d3d7cf;stroke-width:1.66475451;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+         style="fill:#1a1a1a;fill-opacity:1;stroke:#d3d7cf;stroke-width:1.66475451;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
     </g>
     <g
        id="g4074"
        transform="matrix(0.43114968,0,0,0.43114968,-201.41936,933.6356)"
-       style="stroke:#888a85;display:inline;filter:url(#filter4064)"
+       style="fill:#333333;stroke:#e6e6e6;display:inline;filter:url(#filter4064)"
        inkscape:label="#g3852">
       <rect
-         style="fill:none;stroke:#888a85;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         style="fill:#333333;stroke:#e6e6e6;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
          id="rect4076"
          width="44.285713"
          height="44.285713"
@@ -348,33 +350,28 @@
          rx="6"
          ry="6" />
       <path
-         style="fill:#2e3436;fill-opacity:1;stroke:#888a85;stroke-width:0.79446769;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+         style="fill:none;fill-opacity:1;stroke:#e6e6e6;stroke-width:0.79446769;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
          d="m 871.875,46.1875 c -1.86715,0.0095 -3.39179,1.39545 -3.65625,3.1875 -0.13267,-0.238038 -0.39472,-0.407705 -0.6875,-0.40625 L 860.21875,49 c -0.42864,0.0022 -0.75216,0.352585 -0.75,0.78125 l 0,0.375 c 0.002,0.428643 0.35273,0.783324 0.78125,0.78125 l 0.71875,0 c -0.017,0.04029 -0.0313,0.109644 -0.0313,0.15625 l 0,1.90625 c 0,0.186425 0.15733,0.34375 0.34375,0.34375 l 0.9375,0 c 0.18642,0 0.34375,-0.157325 0.34375,-0.34375 l 0,-1.90625 c 0,-0.04661 -0.0143,-0.115964 -0.0313,-0.15625 l 1.25,0 c -0.017,0.04029 -0.0313,0.109644 -0.0313,0.15625 l 0,1.90625 c 0,0.186425 0.15733,0.34375 0.34375,0.34375 l 0.9375,0 c 0.18642,0 0.34375,-0.157325 0.34375,-0.34375 l 0,-1.90625 c 0,-0.05736 -0.006,-0.140333 -0.0313,-0.1875 l 2.1875,0 c 0.29284,-0.0015 0.55725,-0.166865 0.6875,-0.40625 0.28274,1.789274 1.85161,3.165775 3.71875,3.15625 2.0603,-0.01052 3.69802,-1.720959 3.6875,-3.78125 -0.0105,-2.060291 -1.68969,-3.698024 -3.75,-3.6875 z"
          transform="matrix(2.3193801,0,0,2.3193801,-1519.671,-74.824492)"
          id="path3839-4"
          inkscape:connector-curvature="0" />
     </g>
-    <g
-       inkscape:label="#g3852"
-       style="stroke:#d3d7cf;display:inline;filter:url(#filter4064)"
-       transform="matrix(0.43114968,0,0,0.43114968,-179.41936,933.6356)"
-       id="g4106">
-      <rect
-         ry="6"
-         rx="6"
-         y="18.790752"
-         x="470.35715"
-         height="44.285713"
-         width="44.285713"
-         id="rect4108"
-         style="fill:none;stroke:#d3d7cf;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <path
-         id="path4110"
-         transform="matrix(2.3193801,0,0,2.3193801,-1519.671,-74.824492)"
-         d="m 871.875,46.1875 c -1.86715,0.0095 -3.39179,1.39545 -3.65625,3.1875 -0.13267,-0.238038 -0.39472,-0.407705 -0.6875,-0.40625 L 860.21875,49 c -0.42864,0.0022 -0.75216,0.352585 -0.75,0.78125 l 0,0.375 c 0.002,0.428643 0.35273,0.783324 0.78125,0.78125 l 0.71875,0 c -0.017,0.04029 -0.0313,0.109644 -0.0313,0.15625 l 0,1.90625 c 0,0.186425 0.15733,0.34375 0.34375,0.34375 l 0.9375,0 c 0.18642,0 0.34375,-0.157325 0.34375,-0.34375 l 0,-1.90625 c 0,-0.04661 -0.0143,-0.115964 -0.0313,-0.15625 l 1.25,0 c -0.017,0.04029 -0.0313,0.109644 -0.0313,0.15625 l 0,1.90625 c 0,0.186425 0.15733,0.34375 0.34375,0.34375 l 0.9375,0 c 0.18642,0 0.34375,-0.157325 0.34375,-0.34375 l 0,-1.90625 c 0,-0.05736 -0.006,-0.140333 -0.0313,-0.1875 l 2.1875,0 c 0.29284,-0.0015 0.55725,-0.166865 0.6875,-0.40625 0.28274,1.789274 1.85161,3.165775 3.71875,3.15625 2.0603,-0.01052 3.69802,-1.720959 3.6875,-3.78125 -0.0105,-2.060291 -1.68969,-3.698024 -3.75,-3.6875 z"
-         style="fill:#2e3436;fill-opacity:1;stroke:#d3d7cf;stroke-width:0.79446769;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-         inkscape:connector-curvature="0" />
-    </g>
+    <rect
+       style="fill:#1a1a1a;stroke:#d3d7cf;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;filter:url(#filter4064)"
+       id="rect4108"
+       width="44.285713"
+       height="44.285713"
+       x="470.35715"
+       y="18.790752"
+       rx="6"
+       ry="6"
+       transform="matrix(0.43114968,0,0,0.43114968,-179.41936,933.6356)" />
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:none;fill-opacity:1;stroke:#d3d7cf;stroke-width:0.794;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline;filter:url(#filter4064)"
+       d="m 871.875,46.1875 c -1.86715,0.0095 -3.39179,1.39545 -3.65625,3.1875 -0.13267,-0.238038 -0.39472,-0.407705 -0.6875,-0.40625 L 860.21875,49 c -0.42864,0.0022 -0.75216,0.352585 -0.75,0.78125 l 0,0.375 c 0.002,0.428643 0.35273,0.783324 0.78125,0.78125 l 0.71875,0 c -0.017,0.04029 -0.0313,0.109644 -0.0313,0.15625 l 0,1.90625 c 0,0.186425 0.15733,0.34375 0.34375,0.34375 l 0.9375,0 c 0.18642,0 0.34375,-0.157325 0.34375,-0.34375 l 0,-1.90625 c 0,-0.04661 -0.0143,-0.115964 -0.0313,-0.15625 l 1.25,0 c -0.017,0.04029 -0.0313,0.109644 -0.0313,0.15625 l 0,1.90625 c 0,0.186425 0.15733,0.34375 0.34375,0.34375 l 0.9375,0 c 0.18642,0 0.34375,-0.157325 0.34375,-0.34375 l 0,-1.90625 c 0,-0.05736 -0.006,-0.140333 -0.0313,-0.1875 l 2.1875,0 c 0.29284,-0.0015 0.55725,-0.166865 0.6875,-0.40625 0.28274,1.789274 1.85161,3.165775 3.71875,3.15625 2.0603,-0.01052 3.69802,-1.720959 3.6875,-3.78125 -0.0105,-2.060291 -1.68969,-3.698024 -3.75,-3.6875 z"
+       transform="translate(-834.62503,901.37504)"
+       id="path4110" />
     <g
        id="g4031-9"
        transform="matrix(0.45818575,0.68148541,-0.68148541,0.45818575,-2.7897502,485.71067)"
@@ -384,7 +381,7 @@
        inkscape:export-ydpi="90">
       <path
          sodipodi:type="arc"
-         style="fill:#555753;fill-opacity:1;stroke:none"
+         style="fill:#1a1a1a;fill-opacity:1;stroke:none"
          id="path4002-3"
          sodipodi:cx="559.67499"
          sodipodi:cy="21.754047"
@@ -400,11 +397,11 @@
          sodipodi:cy="21.754047"
          sodipodi:cx="559.67499"
          id="path4004-9"
-         style="fill:#555753;fill-opacity:1;stroke:none"
+         style="fill:#1a1a1a;fill-opacity:1;stroke:none"
          sodipodi:type="arc" />
       <path
          sodipodi:type="arc"
-         style="fill:#555753;fill-opacity:1;stroke:none"
+         style="fill:#1a1a1a;fill-opacity:1;stroke:none"
          id="path4006-4"
          sodipodi:cx="559.67499"
          sodipodi:cy="21.754047"
@@ -413,7 +410,7 @@
          d="m 560.55887,21.754047 c 0,0.488156 -0.39573,0.883884 -0.88388,0.883884 -0.48816,0 -0.88389,-0.395728 -0.88389,-0.883884 0,-0.488155 0.39573,-0.883883 0.88389,-0.883883 0.48815,0 0.88388,0.395728 0.88388,0.883883 z"
          transform="matrix(2.2,0,0,2.2,-671.07968,-28.226177)" />
       <path
-         style="fill:none;stroke:#555753;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         style="fill:none;stroke:#1a1a1a;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
          d="m 563.21055,31.653543 4.41942,-6.187185 -7.6014,-6.187184"
          id="path4010-56"
          inkscape:connector-curvature="0" />
@@ -425,16 +422,16 @@
          sodipodi:cy="21.754047"
          sodipodi:cx="559.67499"
          id="path4008-8"
-         style="fill:#555753;fill-opacity:1;stroke:none"
+         style="fill:#1a1a1a;fill-opacity:1;stroke:none"
          sodipodi:type="arc" />
       <path
-         style="fill:none;stroke:#555753;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         style="fill:none;stroke:#1a1a1a;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
          d="m 567.45319,25.466358 7.6014,-4.065864"
          id="path4012-5"
          inkscape:connector-curvature="0" />
     </g>
     <path
-       style="fill:none;stroke:#555753;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline"
+       style="fill:none;stroke:#1a1a1a;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline"
        d="m 218.00001,881.25007 -5.8125,0 0,9.1875 10.53125,0 0,-5.2187"
        id="rect4432"
        inkscape:connector-curvature="0"
@@ -443,7 +440,7 @@
        inkscape:export-xdpi="90"
        inkscape:export-ydpi="90" />
     <rect
-       style="fill:none;stroke:#555753;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       style="fill:#666666;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
        id="rect4387-8"
        width="14.5"
        height="9"
@@ -456,19 +453,19 @@
        inkscape:export-ydpi="90" />
     <path
        sodipodi:type="arc"
-       style="fill:none;stroke:#555753;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       style="fill:#e6e6e6;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
        id="path4391-3"
        sodipodi:cx="408.8125"
        sodipodi:cy="220.26843"
        sodipodi:rx="2.6875"
        sodipodi:ry="2.71875"
-       d="m 411.5,220.26843 a 2.6875,2.71875 0 1 1 -5.375,0 2.6875,2.71875 0 1 1 5.375,0 z"
+       d="m 411.5,220.26843 c 0,1.50153 -1.20323,2.71875 -2.6875,2.71875 -1.48427,0 -2.6875,-1.21722 -2.6875,-2.71875 0,-1.50152 1.20323,-2.71875 2.6875,-2.71875 1.48427,0 2.6875,1.21723 2.6875,2.71875 z"
        transform="matrix(1.1489362,0,0,1.1489362,-286.13697,609.51131)"
        inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
        inkscape:export-xdpi="90"
        inkscape:export-ydpi="90" />
     <path
-       style="fill:#ffffff;fill-opacity:1;stroke:#555753;stroke-width:0.47366244;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       style="fill:#ffffff;fill-opacity:1;stroke:#1a1a1a;stroke-width:0.47366244;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
        d="m 242.44524,860.13287 c -0.98011,0 -1.77562,0.6006 -1.77562,1.3586 l 0,1.5632 c 0,0.7581 0.79551,1.3733 1.77562,1.3733 l 4.53349,0 c 0.98012,0 1.77562,-0.6152 1.77562,-1.3733 l 0,-1.5632 c 0,-0.758 -0.7955,-1.3586 -1.77562,-1.3586 l -4.53349,0 z m 0.41557,1.0372 3.70235,0 c 0.51967,0 0.94448,0.2879 0.94448,0.6574 l 0,0.8912 c 0,0.3695 -0.42481,0.672 -0.94448,0.672 l -3.70235,0 c -0.51966,0 -0.94447,-0.3025 -0.94447,-0.672 l 0,-0.8912 c 0,-0.3695 0.42481,-0.6574 0.94447,-0.6574 z"
        id="rect4397-0"
        inkscape:connector-curvature="0"
@@ -479,12 +476,12 @@
        inkscape:connector-curvature="0"
        id="path4418-4"
        d="m 232.97199,860.13287 c -0.98011,0 -1.77562,0.6006 -1.77562,1.3586 l 0,1.5632 c 0,0.7581 0.79551,1.3733 1.77562,1.3733 l 4.53349,0 c 0.98012,0 1.77562,-0.6152 1.77562,-1.3733 l 0,-1.5632 c 0,-0.758 -0.7955,-1.3586 -1.77562,-1.3586 l -4.53349,0 z m 0.41557,1.0372 3.70236,0 c 0.51966,0 0.94447,0.2879 0.94447,0.6574 l 0,0.8912 c 0,0.3695 -0.42481,0.672 -0.94447,0.672 l -3.70236,0 c -0.51966,0 -0.94447,-0.3025 -0.94447,-0.672 l 0,-0.8912 c 0,-0.3695 0.42481,-0.6574 0.94447,-0.6574 z"
-       style="fill:#ffffff;fill-opacity:1;stroke:#555753;stroke-width:0.47366244;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       style="fill:#ffffff;fill-opacity:1;stroke:#1a1a1a;stroke-width:0.47366244;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
        inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
        inkscape:export-xdpi="90"
        inkscape:export-ydpi="90" />
     <rect
-       style="fill:#ffffff;fill-opacity:1;stroke:#555753;stroke-width:0.47366244;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       style="fill:#ffffff;fill-opacity:1;stroke:#1a1a1a;stroke-width:0.47366244;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
        id="rect4395-0"
        width="6.7246785"
        height="1.6362466"
@@ -495,243 +492,217 @@
        inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
        inkscape:export-xdpi="90"
        inkscape:export-ydpi="90" />
-    <rect
-       style="fill:#555753;fill-opacity:1;stroke:none;display:inline"
-       id="rect4416-1"
-       width="14.495689"
-       height="6.5407376"
-       x="132.5179"
-       y="901.32971"
-       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <text
-       xml:space="preserve"
-       style="font-size:5.54432058px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:100%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;display:inline;font-family:Liberation Sans;-inkscape-font-specification:Liberation Sans"
-       x="139.36653"
-       y="900.60059"
-       id="text4406-9"
-       sodipodi:linespacing="100%"
-       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90"><tspan
-         sodipodi:role="line"
-         id="tspan4408-6"
-         x="139.36653"
-         y="900.60059">You</tspan><tspan
-         sodipodi:role="line"
-         x="139.36653"
-         y="906.1449"
-         id="tspan4410-2"
-         style="fill:#eeeeec">Tube</tspan></text>
-    <path
-       style="fill:none;stroke:#555753;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-       d="m 118.03127,895.15627 0,0.3125 c 0,1.2601 -0.0643,3.4345 -0.35937,5.75 l -1.5625,1e-4 c -0.80183,0.011 -1.64766,4.0737 -1.60938,8.0625 l 8.25,0 c -0.057,-5.5479 1.56902,-11.5211 1.75,-5.6563 0.21453,6.9525 1.74237,-5.1823 1.75,-8.4687 z"
-       id="rect4428-4"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="csccccscc"
-       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <path
-       style="fill:none;stroke:#555753;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-       d="m 124.78127,905.73727 -1.9375,-0.063"
-       id="path4440-4"
-       inkscape:connector-curvature="0"
-       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <path
-       style="fill:none;stroke:#555753;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-       d="m 117.59377,901.20597 6.4375,0"
-       id="path4442-9"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc"
-       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <rect
-       style="fill:none;stroke:#555753;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-       id="rect4446-9"
-       width="1.0625"
-       height="0.375"
-       x="115.28126"
-       y="908.11218"
-       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <rect
-       y="906.51843"
-       x="115.34376"
-       height="0.375"
-       width="1.0625"
-       id="rect4448-3"
-       style="fill:none;stroke:#555753;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <rect
-       style="fill:none;stroke:#555753;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-       id="rect4450-6"
-       width="1.0625"
-       height="0.375"
-       x="115.50001"
-       y="904.89343"
-       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <rect
-       y="903.42468"
-       x="115.81251"
-       height="0.375"
-       width="1.0625"
-       id="rect4452-0"
-       style="fill:none;stroke:#555753;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <rect
-       style="fill:none;stroke:#555753;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-       id="rect4454-5"
-       width="1.0625"
-       height="0.375"
-       x="116.21876"
-       y="902.17468"
-       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <rect
-       y="900.17468"
-       x="118.50001"
-       height="0.375"
-       width="1.0625"
-       id="rect4456-0"
-       style="fill:none;stroke:#555753;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <rect
-       style="fill:none;stroke:#555753;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-       id="rect4458-2"
-       width="1.0625"
-       height="0.375"
-       x="118.68751"
-       y="898.70593"
-       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <rect
-       y="897.20593"
-       x="118.75001"
-       height="0.375"
-       width="1.0625"
-       id="rect4460-9"
-       style="fill:none;stroke:#555753;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <rect
-       style="fill:none;stroke:#555753;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-       id="rect4462-4"
-       width="1.0625"
-       height="0.375"
-       x="118.75001"
-       y="895.79968"
-       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <rect
-       y="908.11218"
-       x="120.84376"
-       height="0.375"
-       width="1.0625"
-       id="rect4464-3"
-       style="fill:none;stroke:#555753;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <rect
-       style="fill:none;stroke:#555753;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-       id="rect4466-5"
-       width="1.0625"
-       height="0.375"
-       x="120.90627"
-       y="906.51843"
-       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <rect
-       y="904.89343"
-       x="121.06252"
-       height="0.375"
-       width="1.0625"
-       id="rect4468-1"
-       style="fill:none;stroke:#555753;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <rect
-       style="fill:none;stroke:#555753;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-       id="rect4470-7"
-       width="1.0625"
-       height="0.375"
-       x="121.37502"
-       y="903.42468"
-       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <rect
-       y="902.17468"
-       x="121.78127"
-       height="0.375"
-       width="1.0625"
-       id="rect4472-4"
-       style="fill:none;stroke:#555753;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <rect
-       style="fill:none;stroke:#555753;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-       id="rect4474-3"
-       width="1.0625"
-       height="0.375"
-       x="124.06252"
-       y="900.17468"
-       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <rect
-       y="898.70593"
-       x="124.25002"
-       height="0.375"
-       width="1.0625"
-       id="rect4476-1"
-       style="fill:none;stroke:#555753;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <rect
-       style="fill:none;stroke:#555753;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-       id="rect4478-4"
-       width="1.0625"
-       height="0.375"
-       x="124.31252"
-       y="897.20593"
-       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <rect
-       y="895.79968"
-       x="124.31252"
-       height="0.375"
-       width="1.0625"
-       id="rect4480-6"
-       style="fill:none;stroke:#555753;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
     <g
-       style="display:inline"
+       id="g1037">
+      <path
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         sodipodi:nodetypes="csccccscc"
+         inkscape:connector-curvature="0"
+         id="rect4428-4"
+         d="m 118.03127,895.15627 0,0.3125 c 0,1.2601 -0.0643,3.4345 -0.35937,5.75 l -1.5625,1e-4 c -0.80183,0.011 -1.64766,4.0737 -1.60938,8.0625 l 8.25,0 c -0.057,-5.5479 1.56902,-11.5211 1.75,-5.6563 0.21453,6.9525 1.74237,-5.1823 1.75,-8.4687 z"
+         style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+      <path
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         inkscape:connector-curvature="0"
+         id="path4440-4"
+         d="m 124.78127,905.73727 -1.9375,-0.063"
+         style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+      <path
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         sodipodi:nodetypes="cc"
+         inkscape:connector-curvature="0"
+         id="path4442-9"
+         d="m 117.59377,901.20597 6.4375,0"
+         style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+      <rect
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         y="908.11218"
+         x="115.28126"
+         height="0.375"
+         width="1.0625"
+         id="rect4446-9"
+         style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+      <rect
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+         id="rect4448-3"
+         width="1.0625"
+         height="0.375"
+         x="115.34376"
+         y="906.51843" />
+      <rect
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         y="904.89343"
+         x="115.50001"
+         height="0.375"
+         width="1.0625"
+         id="rect4450-6"
+         style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+      <rect
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+         id="rect4452-0"
+         width="1.0625"
+         height="0.375"
+         x="115.81251"
+         y="903.42468" />
+      <rect
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         y="902.17468"
+         x="116.21876"
+         height="0.375"
+         width="1.0625"
+         id="rect4454-5"
+         style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+      <rect
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+         id="rect4456-0"
+         width="1.0625"
+         height="0.375"
+         x="118.50001"
+         y="900.17468" />
+      <rect
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         y="898.70593"
+         x="118.68751"
+         height="0.375"
+         width="1.0625"
+         id="rect4458-2"
+         style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+      <rect
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+         id="rect4460-9"
+         width="1.0625"
+         height="0.375"
+         x="118.75001"
+         y="897.20593" />
+      <rect
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         y="895.79968"
+         x="118.75001"
+         height="0.375"
+         width="1.0625"
+         id="rect4462-4"
+         style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+      <rect
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+         id="rect4464-3"
+         width="1.0625"
+         height="0.375"
+         x="120.84376"
+         y="908.11218" />
+      <rect
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         y="906.51843"
+         x="120.90627"
+         height="0.375"
+         width="1.0625"
+         id="rect4466-5"
+         style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+      <rect
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+         id="rect4468-1"
+         width="1.0625"
+         height="0.375"
+         x="121.06252"
+         y="904.89343" />
+      <rect
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         y="903.42468"
+         x="121.37502"
+         height="0.375"
+         width="1.0625"
+         id="rect4470-7"
+         style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+      <rect
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+         id="rect4472-4"
+         width="1.0625"
+         height="0.375"
+         x="121.78127"
+         y="902.17468" />
+      <rect
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         y="900.17468"
+         x="124.06252"
+         height="0.375"
+         width="1.0625"
+         id="rect4474-3"
+         style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+      <rect
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+         id="rect4476-1"
+         width="1.0625"
+         height="0.375"
+         x="124.25002"
+         y="898.70593" />
+      <rect
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         y="897.20593"
+         x="124.31252"
+         height="0.375"
+         width="1.0625"
+         id="rect4478-4"
+         style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+      <rect
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+         id="rect4480-6"
+         width="1.0625"
+         height="0.375"
+         x="124.31252"
+         y="895.79968" />
+    </g>
+    <g
+       style="stroke:#1a1a1a;display:inline"
        id="g4507-4"
        transform="matrix(0.92823291,-0.48059851,0.48059851,0.92823291,-312.89954,806.76727)"
        inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
@@ -742,9 +713,9 @@
          inkscape:connector-curvature="0"
          id="path4491-2"
          d="m 310.75659,223.79453 c 0.76095,-0.8373 1.2453,-2.02269 1.2453,-3.35786 0,-1.33796 -0.48156,-2.54257 -1.2453,-3.38009"
-         style="fill:none;stroke:#555753;stroke-width:0.35579938;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+         style="fill:none;stroke:#1a1a1a;stroke-width:0.35579938;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
       <path
-         style="fill:none;stroke:#555753;stroke-width:0.47089946;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         style="fill:none;stroke:#1a1a1a;stroke-width:0.47089946;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
          d="m 311.49266,224.75938 c 1.00712,-1.10816 1.64816,-2.67702 1.64816,-4.44411 0,-1.77079 -0.63735,-3.36509 -1.64816,-4.47354"
          id="path4496-2"
          inkscape:connector-curvature="0"
@@ -754,48 +725,52 @@
          inkscape:connector-curvature="0"
          id="path4498-6"
          d="m 312.78041,226.18348 c 1.3429,-1.47763 2.19766,-3.56956 2.19766,-5.9258 0,-2.36118 -0.84984,-4.48703 -2.19766,-5.96505"
-         style="fill:none;stroke:#555753;stroke-width:0.62789989;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+         style="fill:none;stroke:#1a1a1a;stroke-width:0.62789989;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
       <path
          sodipodi:nodetypes="ccccccc"
          inkscape:connector-curvature="0"
          id="path4500-4"
          d="m 309.34375,224.125 0,-7.375 -3.78125,2.07812 -3.4375,-0.10937 0,3.46875 3.4375,-0.125 z"
-         style="fill:none;stroke:#555753;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+         style="fill:none;stroke:#1a1a1a;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    </g>
+    <g
+       id="g1373"
+       style="stroke:#1a1a1a">
+      <path
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         transform="translate(-224.73743,661.76263)"
+         d="m 292.21188,220.62782 c 0,4.10051 -3.32411,7.42462 -7.42462,7.42462 -4.1005,0 -7.42462,-3.32411 -7.42462,-7.42462 0,-4.1005 3.32412,-7.42462 7.42462,-7.42462 4.10051,0 7.42462,3.32412 7.42462,7.42462 z"
+         sodipodi:ry="7.4246211"
+         sodipodi:rx="7.4246211"
+         sodipodi:cy="220.62782"
+         sodipodi:cx="284.78726"
+         id="path4515-2"
+         style="fill:none;stroke:#1a1a1a;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+         sodipodi:type="arc" />
+      <path
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         sodipodi:nodetypes="csc"
+         inkscape:connector-curvature="0"
+         id="path4517-8"
+         d="m 53.15626,883.15627 c 1.94168,0.712 4.31843,1.1563 6.90625,1.1563 2.58782,0 4.96457,-0.4443 6.90625,-1.1563"
+         style="fill:none;stroke:#1a1a1a;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:1, 2;stroke-dashoffset:0;display:inline" />
+      <path
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         style="fill:none;stroke:#1a1a1a;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:1, 2;stroke-dashoffset:0;display:inline"
+         d="m 60.45665,888.82867 c 0.71191,-1.9416 1.15625,-4.3184 1.15625,-6.9062 0,-2.5878 -0.44434,-4.9646 -1.15625,-6.9063"
+         id="path4528-8"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="csc" />
     </g>
-    <path
-       sodipodi:type="arc"
-       style="fill:none;stroke:#555753;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-       id="path4515-2"
-       sodipodi:cx="284.78726"
-       sodipodi:cy="220.62782"
-       sodipodi:rx="7.4246211"
-       sodipodi:ry="7.4246211"
-       d="m 292.21188,220.62782 a 7.4246211,7.4246211 0 1 1 -14.84924,0 7.4246211,7.4246211 0 1 1 14.84924,0 z"
-       transform="translate(-224.73743,661.76263)"
-       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <path
-       style="fill:none;stroke:#555753;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:1, 2;stroke-dashoffset:0;display:inline"
-       d="m 53.15626,883.15627 c 1.94168,0.712 4.31843,1.1563 6.90625,1.1563 2.58782,0 4.96457,-0.4443 6.90625,-1.1563"
-       id="path4517-8"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="csc"
-       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <path
-       sodipodi:nodetypes="csc"
-       inkscape:connector-curvature="0"
-       id="path4528-8"
-       d="m 60.45665,888.82867 c 0.71191,-1.9416 1.15625,-4.3184 1.15625,-6.9062 0,-2.5878 -0.44434,-4.9646 -1.15625,-6.9063"
-       style="fill:none;stroke:#555753;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:1, 2;stroke-dashoffset:0;display:inline"
-       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
     <text
        xml:space="preserve"
-       style="font-size:3.72799897px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#555753;fill-opacity:1;stroke:none;display:inline;font-family:Liberation Sans;-inkscape-font-specification:Liberation Sans"
+       style="font-size:3.72799897px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#1a1a1a;fill-opacity:1;stroke:none;display:inline;font-family:Liberation Sans;-inkscape-font-specification:Liberation Sans"
        x="51.803352"
        y="859.21899"
        id="text4532-2"
@@ -807,9 +782,9 @@
          id="tspan4534-8"
          x="51.803352"
          y="859.21899"
-         style="font-weight:bold;fill:#555753;-inkscape-font-specification:Liberation Sans Bold">Lorem Ip</tspan></text>
+         style="font-weight:bold;fill:#1a1a1a;-inkscape-font-specification:Liberation Sans Bold">Lorem Ip</tspan></text>
     <path
-       style="fill:#555753;fill-opacity:1;stroke:#555753;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:1, 2;stroke-dashoffset:0;display:inline"
+       style="fill:#1a1a1a;fill-opacity:1;stroke:#1a1a1a;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:1, 2;stroke-dashoffset:0;display:inline"
        d="m 52.25001,862.61227 15.25,0"
        id="path4536-8"
        inkscape:connector-curvature="0"
@@ -820,12 +795,12 @@
        inkscape:connector-curvature="0"
        id="path4538-8"
        d="m 52.25001,864.86227 15.25,0"
-       style="fill:#555753;fill-opacity:1;stroke:#555753;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:1, 2;stroke-dashoffset:0;display:inline"
+       style="fill:#1a1a1a;fill-opacity:1;stroke:#1a1a1a;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:1, 2;stroke-dashoffset:0;display:inline"
        inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
        inkscape:export-xdpi="90"
        inkscape:export-ydpi="90" />
     <path
-       style="fill:#555753;fill-opacity:1;stroke:#555753;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:1, 2;stroke-dashoffset:0;display:inline"
+       style="fill:#1a1a1a;fill-opacity:1;stroke:#1a1a1a;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:1, 2;stroke-dashoffset:0;display:inline"
        d="m 52.25001,867.11227 15.25,0"
        id="path4540-6"
        inkscape:connector-curvature="0"
@@ -833,7 +808,7 @@
        inkscape:export-xdpi="90"
        inkscape:export-ydpi="90" />
     <path
-       style="fill:none;stroke:#555753;stroke-width:0.82322329;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline"
+       style="fill:none;stroke:#1a1a1a;stroke-width:0.82322329;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline"
        d="m 242.49116,907.21887 5.125,-5.125 -5.125,-5.0937"
        id="rect4544-3"
        inkscape:connector-curvature="0"
@@ -846,20 +821,15 @@
        inkscape:connector-curvature="0"
        id="path4549-8"
        d="m 237.98183,907.21887 -5.125,-5.125 5.125,-5.0937"
-       style="fill:none;stroke:#555753;stroke-width:0.82322329;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline"
+       style="fill:none;stroke:#1a1a1a;stroke-width:0.82322329;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline"
        inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
        inkscape:export-xdpi="90"
        inkscape:export-ydpi="90" />
     <g
-       style="display:inline"
-       id="g4213"
-       transform="translate(49.48448,-140.79121)"
-       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90">
+       id="g4173">
       <path
          sodipodi:type="star"
-         style="fill:#555753;fill-opacity:1;stroke:none"
+         style="fill:#1a1a1a;fill-opacity:1;stroke:#1a1a1a"
          id="path4802"
          sodipodi:sides="8"
          sodipodi:cx="98.48214"
@@ -872,9 +842,9 @@
          inkscape:rounded="0"
          inkscape:randomized="0"
          d="m 98.48214,-19.375 6.43972,2.66742 2.66742,6.439723 -2.66742,6.4397218 -6.439721,2.6674201 -6.439722,-2.6674204 -2.66742,-6.4397225 2.667421,-6.439722 z"
-         transform="matrix(0.92307692,0.3846154,-0.3846154,0.92307692,-44.340246,974.7537)" />
+         transform="matrix(0.92307692,0.3846154,-0.3846154,0.92307692,5.144234,833.96249)" />
       <path
-         transform="matrix(0.74691191,0.31121331,-0.31121331,0.74691191,-26.237457,980.1736)"
+         transform="matrix(0.74691191,0.31121331,-0.31121331,0.74691191,23.247023,839.38239)"
          d="m 98.48214,-19.375 6.43972,2.66742 2.66742,6.439723 -2.66742,6.4397218 -6.439721,2.6674201 -6.439722,-2.6674204 -2.66742,-6.4397225 2.667421,-6.439722 z"
          inkscape:randomized="0"
          inkscape:rounded="0"
@@ -889,21 +859,23 @@
          id="path4804"
          style="fill:none;stroke:#d3d7cf;stroke-width:2.47171569;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
          sodipodi:type="star" />
-      <path
-         style="fill:none;stroke:#555753;stroke-width:1.99999988;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
-         d="m 53.26552,1056.9525 -5.5,6.2008 5.5,6.2009"
-         id="rect4806"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccc" />
-      <path
-         id="path4812"
-         d="m 67.781143,1069.3407 5.46875,-6.2009 -5.46875,-6.1736"
-         style="fill:none;stroke:#555753;stroke-width:1.99999988;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccc" />
     </g>
     <path
-       style="fill:#555753;fill-opacity:1;stroke:none;display:inline"
+       sodipodi:nodetypes="ccc"
+       inkscape:connector-curvature="0"
+       id="rect4806"
+       d="m 53.26552,1056.9525 -5.5,6.2008 5.5,6.2009"
+       style="fill:none;stroke:#1a1a1a;stroke-width:1.99999988;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+       transform="translate(49.48448,-140.79121)" />
+    <path
+       sodipodi:nodetypes="ccc"
+       inkscape:connector-curvature="0"
+       style="fill:none;stroke:#1a1a1a;stroke-width:1.99999988;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+       d="m 67.781143,1069.3407 5.46875,-6.2009 -5.46875,-6.1736"
+       id="path4812"
+       transform="translate(49.48448,-140.79121)" />
+    <path
+       style="fill:#1a1a1a;fill-opacity:1;stroke:none;display:inline"
        id="path4257"
        d="m 115.39024,855.00555 c 0.0904,0.0266 0.18708,0.0371 0.27111,0.0797 0.24682,0.12501 0.80382,0.53514 1.00046,0.67918 0.72548,0.53142 1.43751,1.08068 2.14837,1.63134 1.22364,0.99003 2.36274,2.09287 3.41202,3.2665 0.43117,0.4822 1.01205,1.207 1.42675,1.7166 0.97898,1.2314 2.022,2.4234 2.86791,3.7533 0.20576,0.2994 0.39551,0.6797 0.65579,0.9028 -0.10862,-0.1107 -0.10877,-0.099 0.0344,-0.01 0.19118,0.1291 -1.63528,2.8328 -1.82646,2.7036 l 0,0 c -0.18814,-0.022 -0.0511,0 -0.37755,-0.1793 -0.55628,-0.365 -1.09599,-0.7525 -1.61517,-1.1691 -1.27322,-1.0021 -2.36476,-2.2048 -3.47982,-3.3749 -1.53016,-1.5621 -3.0115,-3.1717 -4.57958,-4.6966 -0.94249,-1.01074 -1.92636,-2.0326 -2.54392,-3.28422 -0.14292,-0.18424 2.46273,-2.20539 2.60565,-2.02115 z"
        inkscape:connector-curvature="0"
@@ -911,7 +883,7 @@
        inkscape:export-xdpi="90"
        inkscape:export-ydpi="90" />
     <path
-       style="fill:#555753;fill-opacity:1;stroke:none;display:inline"
+       style="fill:#1a1a1a;fill-opacity:1;stroke:none;display:inline"
        id="path4259"
        d="m 112.109,867.43007 c 0.0548,-0.091 0.10266,-0.1866 0.16432,-0.2731 0.23235,-0.3261 0.52565,-0.6137 0.79275,-0.9102 0.42229,-0.4689 0.38553,-0.4337 0.82852,-0.9537 1.44214,-1.6363 3.06836,-3.0981 4.69856,-4.5425 1.63203,-1.40989 3.17698,-2.9167 4.78859,-4.3486 0.46305,-0.4369 0.97793,-0.80137 1.52221,-1.12653 0.15824,-0.21119 3.14491,2.0267 2.98666,2.23789 l 0,0 c -0.2952,0.52243 -0.62275,1.02042 -1.01852,1.47475 -0.88192,1.11919 -1.78212,2.22369 -2.79371,3.23049 -0.29346,0.2921 -0.60222,0.5684 -0.90606,0.8497 -0.31321,0.2899 -0.63003,0.5759 -0.94504,0.8639 -1.67153,1.4209 -3.37366,2.8163 -5.22715,3.9963 -0.49876,0.3405 -0.57121,0.3777 -1.0203,0.7266 -0.39341,0.3057 -0.75974,0.6889 -1.26518,0.7962 -0.14292,0.1842 -2.74857,-1.8369 -2.60565,-2.0212 z"
        inkscape:connector-curvature="0"
@@ -922,7 +894,7 @@
        inkscape:connector-curvature="0"
        d="m 135.39024,855.00555 c 0.0904,0.027 0.18708,0.037 0.27111,0.08 0.24682,0.125 0.80382,0.5352 1.00046,0.6792 0.72548,0.5314 1.43751,1.0807 2.14837,1.6314 1.22364,0.99 2.36274,2.0928 3.41202,3.26652 0.43117,0.4822 1.01205,1.207 1.42675,1.7166 0.97898,1.2314 2.022,2.4234 2.86791,3.7533 0.20576,0.2994 0.39551,0.6797 0.65579,0.9028 -0.10862,-0.1107 -0.10877,-0.099 0.0344,-0.01 0.19118,0.1291 -1.63528,2.8328 -1.82646,2.7036 l 0,0 c -0.18814,-0.022 -0.0511,0 -0.37755,-0.1793 -0.55628,-0.365 -1.09599,-0.7525 -1.61517,-1.1691 -1.27322,-1.0021 -2.36476,-2.2048 -3.47982,-3.3749 -1.53016,-1.5621 -3.0115,-3.1717 -4.57958,-4.6966 -0.94249,-1.01082 -1.92636,-2.03262 -2.54392,-3.28432 -0.14292,-0.1842 2.46273,-2.2054 2.60565,-2.0211 z"
        id="path4263"
-       style="fill:#d3d7cf;fill-opacity:1;stroke:none;display:inline"
+       style="fill:#666666;fill-opacity:1;stroke:none;display:inline"
        inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
        inkscape:export-xdpi="90"
        inkscape:export-ydpi="90" />
@@ -930,12 +902,12 @@
        inkscape:connector-curvature="0"
        d="m 132.109,867.43017 c 0.0548,-0.091 0.10266,-0.1866 0.16432,-0.2731 0.23235,-0.3261 0.52565,-0.6137 0.79275,-0.9102 0.42229,-0.4689 0.38553,-0.4337 0.82852,-0.9537 1.44214,-1.6363 3.06836,-3.0981 4.69856,-4.5425 1.63203,-1.40992 3.17698,-2.91672 4.78859,-4.34862 0.46305,-0.4369 0.97793,-0.8014 1.52221,-1.1266 0.15824,-0.2112 3.14491,2.0267 2.98666,2.2379 l 0,0 c -0.2952,0.5224 -0.62275,1.0204 -1.01852,1.4748 -0.88192,1.11922 -1.78212,2.22372 -2.79371,3.23052 -0.29346,0.2921 -0.60222,0.5684 -0.90606,0.8497 -0.31321,0.2899 -0.63003,0.5759 -0.94504,0.8639 -1.67153,1.4209 -3.37366,2.8163 -5.22715,3.9963 -0.49876,0.3405 -0.57121,0.3777 -1.0203,0.7266 -0.39341,0.3057 -0.75974,0.6889 -1.26518,0.7962 -0.14292,0.1842 -2.74857,-1.8369 -2.60565,-2.0212 z"
        id="path4265"
-       style="fill:#d3d7cf;fill-opacity:1;stroke:none;display:inline"
+       style="fill:#666666;fill-opacity:1;stroke:none;display:inline"
        inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
        inkscape:export-xdpi="90"
        inkscape:export-ydpi="90" />
     <g
-       style="display:inline"
+       style="stroke:#1a1a1a;display:inline"
        id="g4283"
        transform="matrix(0.52823691,0.52823691,-0.52823691,0.52823691,773.22931,294.0656)"
        inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
@@ -946,14 +918,14 @@
          inkscape:connector-curvature="0"
          id="path4269"
          d="m -44.467884,1107.2152 0,17.7252 1.161165,3.7983 c 1.200046,4.2782 1.065706,4.1105 2.322331,0 l 1.161165,-3.7983 0,-17.7252 z"
-         style="fill:none;stroke:#555753;stroke-width:0.66930836;stroke-miterlimit:4;stroke-dasharray:none" />
+         style="fill:none;stroke:#1a1a1a;stroke-width:0.66930836;stroke-miterlimit:4;stroke-dasharray:none" />
       <path
          inkscape:connector-curvature="0"
          id="path4271"
          d="m -44.467884,1124.9404 4.644661,0"
-         style="fill:none;stroke:#555753;stroke-width:0.66930836;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+         style="fill:none;stroke:#1a1a1a;stroke-width:0.66930836;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
       <path
-         style="fill:none;stroke:#555753;stroke-width:0.66930836;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+         style="fill:none;stroke:#1a1a1a;stroke-width:0.66930836;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
          d="m -42.239747,1107.2336 0,17.6813"
          id="path4275"
          inkscape:connector-curvature="0" />
@@ -962,7 +934,7 @@
          inkscape:connector-curvature="0"
          id="path4279"
          d="m -43.348187,1128.4959 c 1.108441,-0.8952 1.929509,-0.3581 2.381097,0.045 -0.328428,1.1191 -1.190549,3.9391 -1.190549,3.9391 z"
-         style="fill:#555753;stroke:#555753;stroke-width:0.66930836;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" />
+         style="fill:#1a1a1a;stroke:#1a1a1a;stroke-width:0.66930836;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" />
       <rect
          ry="0.42804927"
          rx="0.37616169"
@@ -971,10 +943,10 @@
          height="1.8614606"
          width="5.1800866"
          id="rect4281"
-         style="fill:#555753;fill-opacity:1;stroke:none" />
+         style="fill:#1a1a1a;fill-opacity:1;stroke:#1a1a1a" />
     </g>
     <rect
-       style="fill:none;stroke:#555753;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline"
+       style="fill:#e6e6e6;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline"
        id="rect4290"
        width="3.5355339"
        height="1.8561553"
@@ -986,7 +958,7 @@
        inkscape:export-xdpi="90"
        inkscape:export-ydpi="90" />
     <path
-       style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
+       style="fill:none;stroke:#1a1a1a;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
        d="m 214.75589,862.65317 c 3.31942,-0.632 4.06019,-2.1721 5.3033,-4.08897 0.42304,-0.6524 -0.64726,-2.63586 0,-3.13491 0.10703,-0.0825 0.93192,0 1.06066,0 2.52315,0 1.41421,3.50161 1.41421,4.77048 0,0.2317 -0.47723,0.6815 -0.17677,0.6815 2.44972,0 2.94209,0.3603 4.41942,1.4993 0.0697,0.054 0.31741,3.8443 0.17677,3.9527 -0.26074,0.201 -0.49042,0.5145 -0.7071,0.6815 -0.13627,0.105 0.38563,0.7684 0.17677,1.0904 -0.17664,0.2724 -0.85358,0.8061 -1.23743,0.9541 -0.36233,0.1398 -0.89015,0 -1.23744,0.1363 -1.96875,0.759 -2.1166,-0.9523 -3.18198,-1.363 -0.34866,-0.1344 -0.63592,-0.1088 -1.06066,-0.2726 -0.99671,-0.3842 -3.88909,0.6704 -3.88909,-0.2726 0,-1.2852 -0.2556,-3.5996 -1.06066,-4.6342 z"
        id="path4292"
        inkscape:connector-curvature="0"
@@ -997,84 +969,93 @@
        inkscape:connector-curvature="0"
        id="path4294"
        d="m 205.42921,862.12677 c -3.31942,0.632 -4.06019,2.1721 -5.3033,4.089 -0.42304,0.6524 0.64726,2.6358 0,3.1349 -0.10703,0.082 -0.93192,0 -1.06066,0 -2.52315,0 -1.41421,-3.5016 -1.41421,-4.7705 0,-0.2317 0.47723,-0.6815 0.17677,-0.6815 -2.44972,0 -2.94209,-0.3603 -4.41942,-1.4993 -0.0697,-0.054 -0.31741,-3.84428 -0.17677,-3.95268 0.26074,-0.201 0.49042,-0.5145 0.7071,-0.6815 0.13627,-0.105 -0.38563,-0.7684 -0.17677,-1.0904 0.17664,-0.2724 0.85358,-0.8061 1.23743,-0.9541 0.36233,-0.1398 0.89015,0 1.23744,-0.1363 1.96875,-0.759 2.1166,0.9523 3.18198,1.363 0.34866,0.1344 0.63592,0.1088 1.06066,0.2726 0.99671,0.3842 3.88909,-0.6704 3.88909,0.2726 0,1.2852 0.2556,3.59958 1.06066,4.63418 z"
-       style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <path
-       transform="translate(-204.73743,661.76269)"
-       d="m 292.21188,220.62782 a 7.4246211,7.4246211 0 1 1 -14.84924,0 7.4246211,7.4246211 0 1 1 14.84924,0 z"
-       sodipodi:ry="7.4246211"
-       sodipodi:rx="7.4246211"
-       sodipodi:cy="220.62782"
-       sodipodi:cx="284.78726"
-       id="path4298"
-       style="fill:none;stroke:#d3d7cf;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-       sodipodi:type="arc"
-       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <path
-       sodipodi:nodetypes="csc"
-       inkscape:connector-curvature="0"
-       id="path4300"
-       d="m 73.15626,883.15627 c 1.94168,0.712 4.31843,1.1563 6.90625,1.1563 2.58782,0 4.96457,-0.4443 6.90625,-1.1563"
-       style="fill:none;stroke:#d3d7cf;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:1, 2;stroke-dashoffset:0;display:inline"
-       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <path
-       style="fill:none;stroke:#d3d7cf;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:1, 2;stroke-dashoffset:0;display:inline"
-       d="m 80.45665,888.82867 c 0.71191,-1.9416 1.15625,-4.3184 1.15625,-6.9062 0,-2.5878 -0.44434,-4.9646 -1.15625,-6.9063"
-       id="path4302"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="csc"
-       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <path
-       transform="translate(-184.73743,661.76263)"
-       d="m 292.21188,220.62782 a 7.4246211,7.4246211 0 1 1 -14.84924,0 7.4246211,7.4246211 0 1 1 14.84924,0 z"
-       sodipodi:ry="7.4246211"
-       sodipodi:rx="7.4246211"
-       sodipodi:cy="220.62782"
-       sodipodi:cx="284.78726"
-       id="path4306"
-       style="fill:none;stroke:#555753;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-       sodipodi:type="arc"
-       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <path
-       style="fill:none;stroke:#555753;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline"
-       d="m 94.285536,887.89997 11.048544,-11.0485"
-       id="path4308"
-       inkscape:connector-curvature="0"
-       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <rect
-       style="fill:#555753;stroke:none;display:inline"
-       id="rect4310"
-       width="3.3587573"
-       height="12.020815"
-       x="115.93771"
-       y="876.12292"
-       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <rect
-       y="876.12292"
-       x="120.53392"
-       height="12.020815"
-       width="3.3587573"
-       id="rect4312"
-       style="fill:#555753;stroke:none;display:inline"
+       style="fill:none;stroke:#1a1a1a;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
        inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
        inkscape:export-xdpi="90"
        inkscape:export-ydpi="90" />
+    <g
+       id="g1378">
+      <path
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         sodipodi:type="arc"
+         style="fill:none;stroke:#666666;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+         id="path4298"
+         sodipodi:cx="284.78726"
+         sodipodi:cy="220.62782"
+         sodipodi:rx="7.4246211"
+         sodipodi:ry="7.4246211"
+         d="m 292.21188,220.62782 c 0,4.10051 -3.32411,7.42462 -7.42462,7.42462 -4.1005,0 -7.42462,-3.32411 -7.42462,-7.42462 0,-4.1005 3.32412,-7.42462 7.42462,-7.42462 4.10051,0 7.42462,3.32412 7.42462,7.42462 z"
+         transform="translate(-204.73743,661.76269)" />
+      <path
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         style="fill:none;stroke:#666666;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:1, 2;stroke-dashoffset:0;display:inline"
+         d="m 73.15626,883.15627 c 1.94168,0.712 4.31843,1.1563 6.90625,1.1563 2.58782,0 4.96457,-0.4443 6.90625,-1.1563"
+         id="path4300"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="csc" />
+      <path
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         sodipodi:nodetypes="csc"
+         inkscape:connector-curvature="0"
+         id="path4302"
+         d="m 80.45665,888.82867 c 0.71191,-1.9416 1.15625,-4.3184 1.15625,-6.9062 0,-2.5878 -0.44434,-4.9646 -1.15625,-6.9063"
+         style="fill:none;stroke:#666666;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:1, 2;stroke-dashoffset:0;display:inline" />
+    </g>
+    <g
+       id="g277">
+      <path
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         sodipodi:type="arc"
+         style="fill:none;stroke:#1a1a1a;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+         id="path4306"
+         sodipodi:cx="284.78726"
+         sodipodi:cy="220.62782"
+         sodipodi:rx="7.4246211"
+         sodipodi:ry="7.4246211"
+         d="m 292.21188,220.62782 c 0,4.10051 -3.32411,7.42462 -7.42462,7.42462 -4.1005,0 -7.42462,-3.32411 -7.42462,-7.42462 0,-4.1005 3.32412,-7.42462 7.42462,-7.42462 4.10051,0 7.42462,3.32412 7.42462,7.42462 z"
+         transform="translate(-184.73743,661.76263)" />
+      <path
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         inkscape:connector-curvature="0"
+         id="path4308"
+         d="m 94.285536,887.89997 11.048544,-11.0485"
+         style="fill:none;stroke:#1a1a1a;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline" />
+    </g>
+    <g
+       id="g273">
+      <rect
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         y="876.12292"
+         x="115.93771"
+         height="12.020815"
+         width="3.3587573"
+         id="rect4310"
+         style="fill:#1a1a1a;stroke:none;display:inline" />
+      <rect
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         style="fill:#1a1a1a;stroke:none;display:inline"
+         id="rect4312"
+         width="3.3587573"
+         height="12.020815"
+         x="120.53392"
+         y="876.12292" />
+    </g>
     <path
-       style="fill:#555753;stroke:none;display:inline"
+       style="fill:#1a1a1a;stroke:none;display:inline"
        d="m 134.32248,876.12297 11.31371,6.0104 -11.31371,6.0104 z"
        id="rect4314"
        inkscape:connector-curvature="0"
@@ -1083,20 +1064,20 @@
        inkscape:export-xdpi="90"
        inkscape:export-ydpi="90" />
     <g
-       style="display:inline"
+       style="stroke:#1a1a1a;display:inline"
        transform="matrix(0.52823691,0.52823691,-0.52823691,0.52823691,773.22931,313.68781)"
        id="g4317"
        inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
        inkscape:export-xdpi="90"
        inkscape:export-ydpi="90">
       <path
-         style="fill:none;stroke:#555753;stroke-width:0.66930836;stroke-miterlimit:4;stroke-dasharray:none"
+         style="fill:none;stroke:#1a1a1a;stroke-width:0.66930836;stroke-miterlimit:4;stroke-dasharray:none"
          d="m -44.467884,1107.2152 0,17.7252 1.161165,3.7983 c 1.200046,4.2782 1.065706,4.1105 2.322331,0 l 1.161165,-3.7983 0,-17.7252 z"
          id="path4319"
          inkscape:connector-curvature="0"
          sodipodi:nodetypes="ccccccc" />
       <path
-         style="fill:none;stroke:#555753;stroke-width:0.66930836;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+         style="fill:none;stroke:#1a1a1a;stroke-width:0.66930836;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
          d="m -44.467884,1124.9404 4.644661,0"
          id="path4321"
          inkscape:connector-curvature="0" />
@@ -1104,15 +1085,15 @@
          inkscape:connector-curvature="0"
          id="path4323"
          d="m -42.239747,1107.2336 0,17.6813"
-         style="fill:none;stroke:#555753;stroke-width:0.66930836;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+         style="fill:none;stroke:#1a1a1a;stroke-width:0.66930836;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
       <path
-         style="fill:#555753;stroke:#555753;stroke-width:0.66930836;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
+         style="fill:#1a1a1a;stroke:#1a1a1a;stroke-width:0.66930836;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
          d="m -43.348187,1128.4959 c 1.108441,-0.8952 1.929509,-0.3581 2.381097,0.045 -0.328428,1.1191 -1.190549,3.9391 -1.190549,3.9391 z"
          id="path4325"
          inkscape:connector-curvature="0"
          sodipodi:nodetypes="cccc" />
       <rect
-         style="fill:#555753;fill-opacity:1;stroke:none"
+         style="fill:#1a1a1a;fill-opacity:1;stroke:#1a1a1a"
          id="rect4327"
          width="5.1800866"
          height="1.8614606"
@@ -1122,9 +1103,9 @@
          ry="0.42804927" />
     </g>
     <g
-       style="display:inline"
+       style="stroke:#1a1a1a;display:inline"
        id="g4329"
-       transform="matrix(0.24508333,0.24508333,-0.24508333,0.24508333,458.00011,612.37085)"
+       transform="matrix(0.24508333,0.24508333,-0.24508333,0.24508333,461.00011,612.37085)"
        inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
        inkscape:export-xdpi="90"
        inkscape:export-ydpi="90">
@@ -1133,14 +1114,14 @@
          inkscape:connector-curvature="0"
          id="path4331"
          d="m -44.467884,1107.2152 0,17.7252 1.161165,3.7983 c 1.200046,4.2782 1.065706,4.1105 2.322331,0 l 1.161165,-3.7983 0,-17.7252 z"
-         style="fill:none;stroke:#555753;stroke-width:0.66930836;stroke-miterlimit:4;stroke-dasharray:none" />
+         style="fill:none;stroke:#1a1a1a;stroke-width:0.66930836;stroke-miterlimit:4;stroke-dasharray:none" />
       <path
          inkscape:connector-curvature="0"
          id="path4333"
          d="m -44.467884,1124.9404 4.644661,0"
-         style="fill:none;stroke:#555753;stroke-width:0.66930836;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+         style="fill:none;stroke:#1a1a1a;stroke-width:0.66930836;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
       <path
-         style="fill:none;stroke:#555753;stroke-width:0.66930836;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+         style="fill:none;stroke:#1a1a1a;stroke-width:0.66930836;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
          d="m -42.239747,1107.2336 0,17.6813"
          id="path4335"
          inkscape:connector-curvature="0" />
@@ -1149,7 +1130,7 @@
          inkscape:connector-curvature="0"
          id="path4337"
          d="m -43.348187,1128.4959 c 1.108441,-0.8952 1.929509,-0.3581 2.381097,0.045 -0.328428,1.1191 -1.190549,3.9391 -1.190549,3.9391 z"
-         style="fill:#555753;stroke:#555753;stroke-width:0.66930836;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" />
+         style="fill:#1a1a1a;stroke:#1a1a1a;stroke-width:0.66930836;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" />
       <rect
          ry="0.42804927"
          rx="0.37616169"
@@ -1158,23 +1139,23 @@
          height="1.8614606"
          width="5.1800866"
          id="rect4339"
-         style="fill:#555753;fill-opacity:1;stroke:none" />
+         style="fill:#1a1a1a;fill-opacity:1;stroke:#1a1a1a" />
     </g>
     <g
        id="layer1-2"
        transform="matrix(0.03334717,0,0,0.03334717,191.57984,885.59897)"
-       style="fill:#555753;display:inline"
+       style="fill:#1a1a1a;display:inline"
        inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
        inkscape:export-xdpi="90"
        inkscape:export-ydpi="90">
       <path
          id="path11522"
-         style="fill:#555753;fill-opacity:1"
+         style="fill:#1a1a1a;fill-opacity:1"
          d="m 264.62704,45.67985 56.31152,-101.021534 0.2677,36.946034 118.51291,-0.267671 c 21.1765,-2.244605 39.74272,-10.852596 53.18801,-27.040291 C 449.99593,42.074998 437.6363,104.18491 348.60347,104.22236 l -27.39721,0 -0.2677,41.05114 -56.31152,-99.59365 z M 128.9798,105.11479 C 65.618201,85.84639 36.055796,7.7860213 7.07577,-47.220709 c 13.282679,12.076484 38.139773,29.363022 52.577167,29.364467 27.689982,0.06456 55.380063,0.116317 83.070083,0.174562 l 83.88712,0 -0.26776,122.43949 -0.26771,0.35698 -97.09487,0 z M 2.5,-79.206629 42.995596,-161.8012 3.5060915,-183.49253 l 118.3343785,0 57.2039,103.877161 -38.79429,-23.228801 c -12.44295,26.27544 -24.88589,52.550878 -37.32884,78.826316 C 88.601045,-24.268303 74.280847,-24.518751 59.960649,-24.769199 32.037317,-31.279427 12.61125,-53.254123 2.5,-79.206629 z m 395.45406,53.939396 -52.29561,-96.380927 105.66215,-63.98618 51.13531,102.449252 c 1.54832,24.517706 -38.03694,58.635841 -62.6066,58.370427 l -41.89525,-0.452572 z M 88.64259,-250.78088 l 53.98405,-80.90589 c 52.35957,-19.50079 82.68955,22.59846 101.8318,49.13587 l -50.86768,97.63029 -104.94817,-65.86027 z m 204.54178,43.54987 c -10.85783,-25.59753 -25.36515,-54.87764 -43.50654,-80.336 -16.24176,-22.7925 -35.86597,-42.67852 -50.7326,-51.5631 l 136.53974,-0.26767 c 24.52088,2.20137 36.43539,16.49668 49.43976,36.05358 l 19.63307,34.53651 30.34224,-19.3654 -57.11457,101.73554 -123.15347,0.26768 38.55237,-21.06114 z"
          inkscape:connector-curvature="0" />
     </g>
     <path
-       style="fill:none;stroke:#555753;display:inline"
+       style="fill:none;stroke:#1a1a1a;display:inline"
        d="m 219.92452,876.86347 1.33532,1.5307 -5.05101,4.4063 4.00584,4.592 5.05101,-4.4063 1.29423,1.4837 1.19091,-7.757 z"
        id="rect4425"
        inkscape:connector-curvature="0"
@@ -1182,122 +1163,134 @@
        inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
        inkscape:export-xdpi="90"
        inkscape:export-ydpi="90" />
-    <rect
-       style="fill:#555753;fill-opacity:1;stroke:none;display:inline"
-       id="rect4564-9"
-       width="10.935946"
-       height="7.925663"
-       x="71.833412"
-       y="900.66992"
-       rx="1.9019035"
-       ry="2.3056474"
-       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <rect
-       style="fill:none;stroke:#555753;stroke-width:0.69802254;display:inline"
-       id="rect4566-9"
-       width="7.7661061"
-       height="7.5413885"
-       x="73.447395"
-       y="896.3468"
-       rx="1.9019035"
-       ry="2.3056474"
-       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <rect
-       ry="2.3056474"
-       rx="1.9019035"
-       y="900.66992"
-       x="92.208412"
-       height="7.925663"
-       width="10.935946"
-       id="rect4506"
-       style="fill:#555753;fill-opacity:1;stroke:none;display:inline"
-       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <path
-       style="fill:none;stroke:#555753;stroke-width:0.69802254;display:inline"
-       d="m 108.78126,899.75007 0,-1.0938 c 0,-1.2773 -0.8526,-2.3124 -1.90625,-2.3124 l -3.96875,0 c -1.05366,0 -1.90625,1.0351 -1.90625,2.3124 l 0,2.9376"
-       id="rect4508"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cssssc"
-       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <rect
-       style="fill:#555753;stroke:none;display:inline"
-       id="rect4514"
-       width="19.512196"
-       height="19.512196"
-       x="150.24391"
-       y="892.60608"
-       rx="2.9268293"
-       ry="2.9268293"
-       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <rect
-       ry="2.9268293"
-       rx="2.9268293"
-       y="892.60608"
-       x="170.24391"
-       height="19.512196"
-       width="19.512196"
-       id="rect4516"
-       style="fill:#555753;stroke:none;display:inline"
-       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <rect
-       ry="2.3056474"
-       rx="1.9019035"
-       y="900.66992"
-       x="151.83342"
-       height="7.925663"
-       width="10.935946"
-       id="rect4518"
-       style="fill:#eeeeec;fill-opacity:1;stroke:none;display:inline"
-       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <rect
-       ry="2.3056474"
-       rx="1.9019035"
-       y="896.3468"
-       x="153.4474"
-       height="7.5413885"
-       width="7.7661061"
-       id="rect4520"
-       style="fill:none;stroke:#eeeeec;stroke-width:0.69802254;display:inline"
-       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <rect
-       style="fill:#eeeeec;fill-opacity:1;stroke:none;display:inline"
-       id="rect4522"
-       width="10.935946"
-       height="7.925663"
-       x="172.20842"
-       y="900.66992"
-       rx="1.9019035"
-       ry="2.3056474"
-       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <path
-       sodipodi:nodetypes="cssssc"
-       inkscape:connector-curvature="0"
-       id="path4524"
-       d="m 188.78127,899.75007 0,-1.0938 c 0,-1.2773 -0.85259,-2.3124 -1.90625,-2.3124 l -3.96875,0 c -1.05365,0 -1.90625,1.0351 -1.90625,2.3124 l 0,2.9376"
-       style="fill:none;stroke:#eeeeec;stroke-width:0.69802254;display:inline"
-       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
+    <g
+       id="g269">
+      <rect
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         ry="2.3056474"
+         rx="1.9019035"
+         y="900.66992"
+         x="71.833412"
+         height="7.925663"
+         width="10.935946"
+         id="rect4564-9"
+         style="fill:#1a1a1a;fill-opacity:1;stroke:#1a1a1a;display:inline" />
+      <rect
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         ry="2.3056474"
+         rx="1.9019035"
+         y="896.3468"
+         x="73.447395"
+         height="7.5413885"
+         width="7.7661061"
+         id="rect4566-9"
+         style="fill:none;stroke:#1a1a1a;stroke-width:0.69802254;display:inline" />
+    </g>
+    <g
+       id="g265">
+      <rect
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         style="fill:#1a1a1a;fill-opacity:1;stroke:#1a1a1a;display:inline"
+         id="rect4506"
+         width="10.935946"
+         height="7.925663"
+         x="92.208412"
+         y="900.66992"
+         rx="1.9019035"
+         ry="2.3056474" />
+      <path
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         sodipodi:nodetypes="cssssc"
+         inkscape:connector-curvature="0"
+         id="rect4508"
+         d="m 108.78126,899.75007 0,-1.0938 c 0,-1.2773 -0.8526,-2.3124 -1.90625,-2.3124 l -3.96875,0 c -1.05366,0 -1.90625,1.0351 -1.90625,2.3124 l 0,2.9376"
+         style="fill:none;stroke:#1a1a1a;stroke-width:0.69802254;display:inline" />
+    </g>
+    <g
+       id="g1060">
+      <rect
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         ry="2.9268293"
+         rx="2.9268293"
+         y="892.60608"
+         x="150.24391"
+         height="19.512196"
+         width="19.512196"
+         id="rect4514"
+         style="fill:#1a1a1a;stroke:none;display:inline" />
+      <rect
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         style="fill:#eeeeec;fill-opacity:1;stroke:none;display:inline"
+         id="rect4518"
+         width="10.935946"
+         height="7.925663"
+         x="151.83342"
+         y="900.66992"
+         rx="1.9019035"
+         ry="2.3056474" />
+      <rect
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         style="fill:none;stroke:#eeeeec;stroke-width:0.69802254;display:inline"
+         id="rect4520"
+         width="7.7661061"
+         height="7.5413885"
+         x="153.4474"
+         y="896.3468"
+         rx="1.9019035"
+         ry="2.3056474" />
+    </g>
+    <g
+       id="g1065">
+      <rect
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         style="fill:#1a1a1a;stroke:none;display:inline"
+         id="rect4516"
+         width="19.512196"
+         height="19.512196"
+         x="170.24391"
+         y="892.60608"
+         rx="2.9268293"
+         ry="2.9268293" />
+      <rect
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         ry="2.3056474"
+         rx="1.9019035"
+         y="900.66992"
+         x="172.20842"
+         height="7.925663"
+         width="10.935946"
+         id="rect4522"
+         style="fill:#eeeeec;fill-opacity:1;stroke:none;display:inline" />
+      <path
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         style="fill:none;stroke:#eeeeec;stroke-width:0.69802254;display:inline"
+         d="m 188.78127,899.75007 0,-1.0938 c 0,-1.2773 -0.85259,-2.3124 -1.90625,-2.3124 l -3.96875,0 c -1.05365,0 -1.90625,1.0351 -1.90625,2.3124 l 0,2.9376"
+         id="path4524"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cssssc" />
+    </g>
     <path
-       style="fill:none;stroke:#555753;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline"
+       style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline"
        d="m 61.2575,895.73577 c -0.85405,0.9453 -1.14575,2.2161 -0.88721,3.3884 l -8.17918,8.1791 c -0.14244,0.1425 -0.12201,0.3935 0.0507,0.5661 l 2.21807,2.2181 c 0.17268,0.1727 0.42791,0.1974 0.57035,0.055 l 8.13693,-8.1369 c 1.26093,0.3161 2.65155,-0.016 3.63762,-1.0013 0.66189,-0.6619 1.02334,-1.5095 1.09849,-2.3744 l -2.11666,2.1167 -3.2405,-0.8746 -0.87454,-3.2405 2.14201,-2.1419 c -0.88104,0.066 -1.74292,0.4331 -2.41663,1.1068 -0.0467,0.047 -0.0968,0.09 -0.13942,0.1395 z"
        id="path4529"
        inkscape:connector-curvature="0"
@@ -1306,7 +1299,7 @@
        inkscape:export-xdpi="90"
        inkscape:export-ydpi="90" />
     <path
-       style="fill:none;stroke:#555753;stroke-width:0.80000001;stroke-miterlimit:4;stroke-dasharray:none;display:inline"
+       style="fill:none;stroke:#1a1a1a;stroke-width:0.80000001;stroke-miterlimit:4;stroke-dasharray:none;display:inline"
        d="m 201.14016,895.80807 -8.25003,8.25 -0.94202,3.5156 2.58822,2.5882 3.10935,-0.8332 10.50754,-10.5075 -2e-5,-2.3881 -1.69404,-1.694 -1.94401,0 -9.97205,9.972 3e-5,1.972 0.61101,0.611 1.73597,0 9.36804,-9.368"
        id="path3395"
        inkscape:connector-curvature="0"
@@ -1315,7 +1308,7 @@
        inkscape:export-xdpi="90"
        inkscape:export-ydpi="90" />
     <rect
-       style="fill:#555753;stroke:none;display:inline"
+       style="fill:#333333;stroke:none;display:inline"
        id="rect3397"
        width="19.512196"
        height="19.512196"
@@ -1352,23 +1345,23 @@
        inkscape:export-xdpi="90"
        inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
        transform="translate(-224.73743,701.76263)"
-       d="m 292.21188,220.62782 a 7.4246211,7.4246211 0 1 1 -14.84924,0 7.4246211,7.4246211 0 1 1 14.84924,0 z"
+       d="m 292.21188,220.62782 c 0,4.10051 -3.32411,7.42462 -7.42462,7.42462 -4.1005,0 -7.42462,-3.32411 -7.42462,-7.42462 0,-4.1005 3.32412,-7.42462 7.42462,-7.42462 4.10051,0 7.42462,3.32412 7.42462,7.42462 z"
        sodipodi:ry="7.4246211"
        sodipodi:rx="7.4246211"
        sodipodi:cy="220.62782"
        sodipodi:cx="284.78726"
        id="path4020"
-       style="fill:none;stroke:#555753;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       style="fill:none;stroke:#1a1a1a;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
        sodipodi:type="arc" />
     <path
        sodipodi:type="arc"
-       style="fill:#555753;fill-opacity:1;stroke:#555753;stroke-width:1.62554049;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       style="fill:#1a1a1a;fill-opacity:1;stroke:#1a1a1a;stroke-width:1.62554049;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
        id="path4022"
        sodipodi:cx="284.78726"
        sodipodi:cy="220.62782"
        sodipodi:rx="7.4246211"
        sodipodi:ry="7.4246211"
-       d="m 292.21188,220.62782 a 7.4246211,7.4246211 0 1 1 -14.84924,0 7.4246211,7.4246211 0 1 1 14.84924,0 z"
+       d="m 292.21188,220.62782 c 0,4.10051 -3.32411,7.42462 -7.42462,7.42462 -4.1005,0 -7.42462,-3.32411 -7.42462,-7.42462 0,-4.1005 3.32412,-7.42462 7.42462,-7.42462 4.10051,0 7.42462,3.32412 7.42462,7.42462 z"
        transform="matrix(0.61517998,0,0,0.61517998,-115.14559,786.66463)"
        inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
        inkscape:export-xdpi="90"
@@ -1378,20 +1371,18 @@
        inkscape:export-xdpi="90"
        inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
        sodipodi:type="arc"
-       style="fill:none;stroke:#d3d7cf;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       style="fill:none;stroke:#1a1a1a;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
        id="path4024"
        sodipodi:cx="284.78726"
        sodipodi:cy="220.62782"
        sodipodi:rx="7.4246211"
        sodipodi:ry="7.4246211"
-       d="m 292.21188,220.62782 a 7.4246211,7.4246211 0 1 1 -14.84924,0 7.4246211,7.4246211 0 1 1 14.84924,0 z"
+       d="m 292.21188,220.62782 c 0,4.10051 -3.32411,7.42462 -7.42462,7.42462 -4.1005,0 -7.42462,-3.32411 -7.42462,-7.42462 0,-4.1005 3.32412,-7.42462 7.42462,-7.42462 4.10051,0 7.42462,3.32412 7.42462,7.42462 z"
        transform="translate(-204.73743,701.76269)" />
     <g
-       inkscape:label="#g3852"
-       style="stroke:#888a85;display:inline;filter:url(#filter4064)"
-       transform="matrix(0.43114968,0,0,0.43114968,-201.41936,955.6356)"
-       id="g3139">
+       id="g226">
       <rect
+         transform="matrix(0.43114968,0,0,0.43114968,-201.41936,955.6356)"
          ry="6"
          rx="6"
          y="18.790752"
@@ -1399,15 +1390,24 @@
          height="44.285713"
          width="44.285713"
          id="rect3141"
-         style="fill:none;stroke:#888a85;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+         style="fill:#333333;stroke:#e6e6e6;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;filter:url(#filter4064)" />
+      <text
+         sodipodi:linespacing="100%"
+         id="text3151"
+         y="979.64215"
+         x="5.6234956"
+         style="font-size:17.09149551px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:100%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#f2f2f2;fill-opacity:1;stroke:none;font-family:FreeSans;-inkscape-font-specification:FreeSans Bold"
+         xml:space="preserve"><tspan
+           y="979.64215"
+           x="5.6234956"
+           id="tspan3153"
+           sodipodi:role="line">?</tspan></text>
     </g>
     <g
-       id="g3145"
-       transform="matrix(0.43114968,0,0,0.43114968,-179.41936,955.6356)"
-       style="stroke:#d3d7cf;display:inline;filter:url(#filter4064)"
-       inkscape:label="#g3852">
+       id="g204">
       <rect
-         style="fill:none;stroke:#d3d7cf;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         transform="matrix(0.43114968,0,0,0.43114968,-179.41936,955.6356)"
+         style="fill:#1a1a1a;stroke:#d3d7cf;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;filter:url(#filter4064)"
          id="rect3147"
          width="44.285713"
          height="44.285713"
@@ -1415,28 +1415,758 @@
          y="18.790752"
          rx="6"
          ry="6" />
-    </g>
-    <text
-       xml:space="preserve"
-       style="font-size:17.09149551px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:100%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#888a85;fill-opacity:1;stroke:none;font-family:FreeSans;-inkscape-font-specification:FreeSans Bold"
-       x="5.6234956"
-       y="979.64215"
-       id="text3151"
-       sodipodi:linespacing="100%"><tspan
-         sodipodi:role="line"
-         id="tspan3153"
-         x="5.6234956"
-         y="979.64215">?</tspan></text>
-    <text
-       sodipodi:linespacing="100%"
-       id="text3155"
-       y="979.64215"
-       x="27.623495"
-       style="font-size:17.09149551000000145px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:100%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#d3d7cf;fill-opacity:1;stroke:none;font-family:FreeSans;-inkscape-font-specification:FreeSans Bold"
-       xml:space="preserve"><tspan
-         y="979.64215"
+      <text
+         xml:space="preserve"
+         style="font-size:17.09149551px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:100%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#d3d7cf;fill-opacity:1;stroke:none;font-family:FreeSans;-inkscape-font-specification:FreeSans Bold"
          x="27.623495"
-         id="tspan3157"
-         sodipodi:role="line">?</tspan></text>
+         y="979.64215"
+         id="text3155"
+         sodipodi:linespacing="100%"><tspan
+           sodipodi:role="line"
+           id="tspan3157"
+           x="27.623495"
+           y="979.64215">?</tspan></text>
+    </g>
+    <path
+       sodipodi:type="star"
+       style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:#b3b3b3;stroke-width:1.20000005;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+       id="path4061"
+       sodipodi:sides="5"
+       sodipodi:cx="133.6317"
+       sodipodi:cy="61.950726"
+       sodipodi:r1="8.4750214"
+       sodipodi:r2="4.2375107"
+       sodipodi:arg1="0.97074611"
+       sodipodi:arg2="1.5990646"
+       inkscape:flatsided="false"
+       inkscape:rounded="0"
+       inkscape:randomized="0"
+       d="m 138.41741,68.945222 -4.90548,-2.758679 -5.05353,2.47708 1.10779,-5.517867 -3.91747,-4.040728 5.59012,-0.651551 2.6324,-4.974387 2.34711,5.115187 5.54438,0.966388 -4.13954,3.812909 z"
+       transform="matrix(0.86880929,0,0,0.9052037,23.373259,866.40571)"
+       inkscape:transform-center-x="-0.064310184"
+       inkscape:transform-center-y="-0.6685783" />
+    <path
+       inkscape:transform-center-y="-0.6685783"
+       inkscape:transform-center-x="-0.064310184"
+       transform="matrix(0.86880929,0,0,0.9052037,43.373259,866.40571)"
+       d="m 138.41741,68.945222 -4.90548,-2.758679 -5.05353,2.47708 1.10779,-5.517867 -3.91747,-4.040728 5.59012,-0.651551 2.6324,-4.974387 2.34711,5.115187 5.54438,0.966388 -4.13954,3.812909 z"
+       inkscape:randomized="0"
+       inkscape:rounded="0"
+       inkscape:flatsided="false"
+       sodipodi:arg2="1.5990646"
+       sodipodi:arg1="0.97074611"
+       sodipodi:r2="4.2375107"
+       sodipodi:r1="8.4750214"
+       sodipodi:cy="61.950726"
+       sodipodi:cx="133.6317"
+       sodipodi:sides="5"
+       id="path4063"
+       style="fill:#cccccc;fill-opacity:1;fill-rule:nonzero;stroke:#b3b3b3;stroke-width:1.19979274;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+       sodipodi:type="star" />
+    <g
+       id="g4177"
+       transform="translate(0,0.22992881)">
+      <path
+         sodipodi:nodetypes="cccccc"
+         style="fill:#cccccc;fill-opacity:1"
+         d="m 53.921057,63.979016 -5.615027,-6.233401 9.206725,-9.241692 5.744016,0.08696 -0.101757,6.527264 z"
+         id="path4152"
+         inkscape:connector-curvature="0"
+         transform="matrix(0.83907455,0,0,0.82021694,132.45839,876.23647)" />
+      <path
+         sodipodi:nodetypes="cccccccccccccccccccccc"
+         inkscape:connector-curvature="0"
+         d="m 54.67642,55.699012 2.077304,-0.01567 -0.06764,2.127228 -2.053363,0.03612 z m 3.043854,-0.97892 -5.97358,0.0021 -8.473421,8.656992 5.643707,5.967988 8.731922,-8.826384 z m 1.047484,5.977035 -9.907739,10.059911 -6.759792,-7.448518 9.288198,-9.605297 7.396851,-0.01484 z m -13.590285,2.754701 5.185415,-5.323903 3.948418,3.90828 -5.336087,5.379274 z"
+         style="fill:#1a1a1a;fill-opacity:1"
+         transform="matrix(0.83907455,0,0,0.82021694,136.85379,871.59613)"
+         id="path4166" />
+    </g>
+    <rect
+       transform="matrix(1,0,0,0.84848485,44,217.14578)"
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons.png"
+       y="852.36218"
+       x="1.5883562e-17"
+       height="132"
+       width="44"
+       id="rect185"
+       style="fill:#2e3436;fill-opacity:1;stroke:none;display:inline" />
+    <rect
+       transform="matrix(0.43114968,0,0,0.43114968,-179.41936,1022.6356)"
+       style="fill:#1a1a1a;stroke:#d3d7cf;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;filter:url(#filter4064)"
+       id="rect192"
+       width="44.285713"
+       height="44.285713"
+       x="470.35715"
+       y="18.790752"
+       rx="6"
+       ry="6" />
+    <rect
+       ry="6"
+       rx="6"
+       y="18.790752"
+       x="470.35715"
+       height="44.285713"
+       width="44.285713"
+       id="rect194"
+       style="fill:#1a1a1a;stroke:#d3d7cf;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;filter:url(#filter4064)"
+       transform="matrix(0.43114968,0,0,0.43114968,-135.41936,1022.6356)" />
+    <rect
+       transform="matrix(0.43114968,0,0,0.43114968,-135.41936,999.6356)"
+       style="fill:#1a1a1a;stroke:#d3d7cf;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;filter:url(#filter4064)"
+       id="rect196"
+       width="44.285713"
+       height="44.285713"
+       x="470.35715"
+       y="18.790752"
+       rx="6"
+       ry="6" />
+    <rect
+       ry="6"
+       rx="6"
+       y="18.790752"
+       x="470.35715"
+       height="44.285713"
+       width="44.285713"
+       id="rect202"
+       style="fill:#1a1a1a;stroke:#d3d7cf;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;filter:url(#filter4064)"
+       transform="matrix(0.43114968,0,0,0.43114968,-135.41936,933.6356)" />
+    <rect
+       transform="matrix(0.43114968,0,0,0.43114968,-201.41936,1022.6356)"
+       ry="6"
+       rx="6"
+       y="18.790752"
+       x="470.35715"
+       height="44.285713"
+       width="44.285713"
+       id="rect214"
+       style="fill:#333333;stroke:#e6e6e6;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;filter:url(#filter4064)" />
+    <rect
+       style="fill:#333333;stroke:#e6e6e6;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;filter:url(#filter4064)"
+       id="rect216"
+       width="44.285713"
+       height="44.285713"
+       x="470.35715"
+       y="18.790752"
+       rx="6"
+       ry="6"
+       transform="matrix(0.43114968,0,0,0.43114968,-157.41936,1022.6356)" />
+    <rect
+       transform="matrix(0.43114968,0,0,0.43114968,-157.41936,999.6356)"
+       ry="6"
+       rx="6"
+       y="18.790752"
+       x="470.35715"
+       height="44.285713"
+       width="44.285713"
+       id="rect218"
+       style="fill:#333333;stroke:#e6e6e6;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;filter:url(#filter4064)" />
+    <rect
+       style="fill:#333333;stroke:#e6e6e6;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;filter:url(#filter4064)"
+       id="rect224"
+       width="44.285713"
+       height="44.285713"
+       x="470.35715"
+       y="18.790752"
+       rx="6"
+       ry="6"
+       transform="matrix(0.43114968,0,0,0.43114968,-157.41936,933.6356)" />
+    <g
+       id="g1005">
+      <desc
+         id="desc1016">alternate housing ;)</desc>
+      <title
+         id="title1014">wikuom/wigwam</title>
+      <rect
+         transform="matrix(0.43114968,0,0,0.43114968,-157.41936,977.6356)"
+         ry="6"
+         rx="6"
+         y="18.790752"
+         x="470.35715"
+         height="44.285713"
+         width="44.285713"
+         id="rect220"
+         style="fill:#333333;stroke:#e6e6e6;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;filter:url(#filter4064)" />
+      <path
+         sodipodi:end="6.2831853"
+         sodipodi:start="3.1415927"
+         transform="matrix(1.2380952,0,0,1.675,-15.523193,759.33575)"
+         d="m 51.275442,143.46553 c 0,-2.90448 2.472271,-5.25902 5.521971,-5.25902 3.0497,0 5.521971,2.35454 5.521971,5.25902 l -5.521971,0 z"
+         sodipodi:ry="5.2590199"
+         sodipodi:rx="5.5219707"
+         sodipodi:cy="143.46553"
+         sodipodi:cx="56.797413"
+         id="path231"
+         style="fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#f2f2f2;stroke-width:0.5555275;stroke-miterlimit:4;stroke-dasharray:none"
+         sodipodi:type="arc" />
+      <path
+         sodipodi:type="arc"
+         style="fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#f2f2f2;stroke-width:0.55552751;stroke-miterlimit:4;stroke-dasharray:none"
+         id="path1003"
+         sodipodi:cx="56.797413"
+         sodipodi:cy="143.46553"
+         sodipodi:rx="5.5219707"
+         sodipodi:ry="5.2590199"
+         d="m 51.275442,143.46553 c 0,-2.90448 2.472271,-5.25902 5.521971,-5.25902 3.0497,0 5.521971,2.35454 5.521971,5.25902 l -5.521971,0 z"
+         transform="matrix(0.4523809,0,0,0.775,29.234821,888.45473)"
+         sodipodi:start="3.1415927"
+         sodipodi:end="6.2831853" />
+    </g>
+    <g
+       id="g1018"
+       transform="translate(22,0)"
+       style="fill:#1a1a1a">
+      <desc
+         id="desc1020">alternate housing ;)</desc>
+      <title
+         id="title1022">wikuom/wigwam</title>
+      <rect
+         style="fill:#1a1a1a;stroke:#e6e6e6;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;filter:url(#filter4064)"
+         id="rect1024"
+         width="44.285713"
+         height="44.285713"
+         x="470.35715"
+         y="18.790752"
+         rx="6"
+         ry="6"
+         transform="matrix(0.43114968,0,0,0.43114968,-157.41936,977.6356)" />
+      <path
+         sodipodi:type="arc"
+         style="fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#f2f2f2;stroke-width:0.55552751;stroke-miterlimit:4;stroke-dasharray:none"
+         id="path1026"
+         sodipodi:cx="56.797413"
+         sodipodi:cy="143.46553"
+         sodipodi:rx="5.5219707"
+         sodipodi:ry="5.2590199"
+         d="m 51.275442,143.46553 c 0,-2.90448 2.472271,-5.25902 5.521971,-5.25902 3.0497,0 5.521971,2.35454 5.521971,5.25902 l -5.521971,0 z"
+         transform="matrix(1.2380952,0,0,1.675,-15.523193,759.33575)"
+         sodipodi:start="3.1415927"
+         sodipodi:end="6.2831853" />
+      <path
+         sodipodi:end="6.2831853"
+         sodipodi:start="3.1415927"
+         transform="matrix(0.4523809,0,0,0.775,29.234821,888.45473)"
+         d="m 51.275442,143.46553 c 0,-2.90448 2.472271,-5.25902 5.521971,-5.25902 3.0497,0 5.521971,2.35454 5.521971,5.25902 l -5.521971,0 z"
+         sodipodi:ry="5.2590199"
+         sodipodi:rx="5.5219707"
+         sodipodi:cy="143.46553"
+         sodipodi:cx="56.797413"
+         id="path1028"
+         style="fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#f2f2f2;stroke-width:0.55552751;stroke-miterlimit:4;stroke-dasharray:none"
+         sodipodi:type="arc" />
+    </g>
+    <g
+       id="g4160">
+      <rect
+         style="fill:#333333;stroke:#e6e6e6;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;filter:url(#filter4064)"
+         id="rect210"
+         width="44.285713"
+         height="44.285713"
+         x="470.35715"
+         y="18.790752"
+         rx="6"
+         ry="6"
+         transform="matrix(0.43114968,0,0,0.43114968,-201.41936,977.6356)" />
+      <path
+         sodipodi:nodetypes="cccccccc"
+         inkscape:connector-curvature="0"
+         d="m 14.756588,131.15925 0,9.60545 -11.6032194,-0.0118 0,-9.58225 -2.73319221,0.79047 8.57645441,-3.98976 8.4702832,3.97497 z"
+         style="font-size:16px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#f2f2f2;stroke-width:0.80000001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;font-family:Verdana;-inkscape-font-specification:Verdana"
+         transform="matrix(0.83752627,0,0,0.92659378,3.4546476,870.69518)"
+         id="path1037" />
+    </g>
+    <g
+       id="g4164">
+      <rect
+         ry="6"
+         rx="6"
+         y="18.790752"
+         x="470.35715"
+         height="44.285713"
+         width="44.285713"
+         id="rect188"
+         style="fill:#1a1a1a;stroke:#d3d7cf;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;filter:url(#filter4064)"
+         transform="matrix(0.43114968,0,0,0.43114968,-179.41936,977.6356)" />
+      <path
+         id="path4158"
+         transform="matrix(0.83752627,0,0,0.92659378,25.454648,870.69518)"
+         style="font-size:16px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#f2f2f2;stroke-width:0.80000001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;font-family:Verdana;-inkscape-font-specification:Verdana"
+         d="m 14.756588,131.15925 0,9.60545 -11.6032194,-0.0118 0,-9.58225 -2.73319221,0.79047 8.57645441,-3.98976 8.4702832,3.97497 z"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cccccccc" />
+    </g>
+    <g
+       id="g4210">
+      <rect
+         transform="matrix(0.43114968,0,0,0.43114968,-201.41936,999.6356)"
+         ry="6"
+         rx="6"
+         y="18.790752"
+         x="470.35715"
+         height="44.285713"
+         width="44.285713"
+         id="rect212"
+         style="fill:#333333;stroke:#e6e6e6;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;filter:url(#filter4064)" />
+      <path
+         sodipodi:nodetypes="cccccccccccccccccc"
+         transform="matrix(0.90433934,-0.00156352,-0.00156352,0.90433934,0.70503743,868.45488)"
+         inkscape:connector-curvature="0"
+         id="path4206"
+         d="m 4.1190936,170.87651 1.316683,1.26576 1.7540206,0.003 5.5819788,-5.57043 3.523532,0.006 2.853557,-2.81689 0.0014,-1.68321 -1.169094,-1.16909 -2.365502,2.3822 -2.63185,-0.005 0.09078,-2.55314 2.365531,-2.36552 -1.277858,-1.27786 -1.648714,0.0359 -2.8505569,2.8535 0.00598,3.45613 -5.5530909,5.58201 z"
+         style="fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#f2f2f2;stroke-width:0.80000001;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+    </g>
+    <g
+       id="g4214">
+      <rect
+         transform="matrix(0.43114968,0,0,0.43114968,-179.41936,999.6356)"
+         style="fill:#1a1a1a;stroke:#d3d7cf;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;filter:url(#filter4064)"
+         id="rect190"
+         width="44.285713"
+         height="44.285713"
+         x="470.35715"
+         y="18.790752"
+         rx="6"
+         ry="6" />
+      <path
+         style="fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#f2f2f2;stroke-width:0.80000001;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+         d="m 4.1190936,170.87651 1.316683,1.26576 1.7540206,0.003 5.5819788,-5.57043 3.523532,0.006 2.853557,-2.81689 0.0014,-1.68321 -1.169094,-1.16909 -2.365502,2.3822 -2.63185,-0.005 0.09078,-2.55314 2.365531,-2.36552 -1.277858,-1.27786 -1.648714,0.0359 -2.8505569,2.8535 0.00598,3.45613 -5.5530909,5.58201 z"
+         id="path4208"
+         inkscape:connector-curvature="0"
+         transform="matrix(0.90433934,-0.00156352,-0.00156352,0.90433934,22.705037,868.45488)"
+         sodipodi:nodetypes="cccccccccccccccccc" />
+    </g>
+    <g
+       id="g4242"
+       transform="matrix(0.93050058,0,0,0.90640134,0.75846434,97.446032)">
+      <path
+         transform="translate(0,852.36218)"
+         d="m 7.3250635,194.45924 c 0,0.88172 -0.9249993,1.59649 -2.0660436,1.59649 -1.1410444,0 -2.0660437,-0.71477 -2.0660437,-1.59649 0,-0.88171 0.9249993,-1.59648 2.0660437,-1.59648 1.1410443,0 2.0660436,0.71477 2.0660436,1.59648 z"
+         sodipodi:ry="1.5964882"
+         sodipodi:rx="2.0660436"
+         sodipodi:cy="194.45924"
+         sodipodi:cx="5.2590199"
+         id="path4218"
+         style="fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:#f2f2f2;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+         sodipodi:type="arc" />
+      <use
+         height="200"
+         width="250"
+         transform="translate(5.698452,-13)"
+         id="use4224"
+         xlink:href="#path4218"
+         y="0"
+         x="0" />
+      <use
+         height="200"
+         width="250"
+         transform="translate(5.6280407,13)"
+         id="use4226"
+         xlink:href="#use4224"
+         y="0"
+         x="0" />
+      <path
+         sodipodi:type="arc"
+         style="fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:#f2f2f2;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+         id="path4228"
+         sodipodi:cx="5.2590199"
+         sodipodi:cy="194.45924"
+         sodipodi:rx="2.0660436"
+         sodipodi:ry="1.5964882"
+         d="m 7.3250635,194.45924 c 0,0.88172 -0.9249993,1.59649 -2.0660436,1.59649 -1.1410444,0 -2.0660437,-0.71477 -2.0660437,-1.59649 0,-0.88171 0.9249993,-1.59648 2.0660437,-1.59648 1.1410443,0 2.0660436,0.71477 2.0660436,1.59648 z"
+         transform="translate(5.684483,846.36218)" />
+      <path
+         transform="translate(0,852.36218)"
+         inkscape:connector-curvature="0"
+         id="path4230"
+         d="m 10.902837,183.0346 0,3.66687"
+         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:#f2f2f2;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+         sodipodi:nodetypes="cc" />
+      <path
+         sodipodi:nodetypes="cc"
+         transform="translate(0,852.36218)"
+         inkscape:connector-curvature="0"
+         id="path4232"
+         d="m 9.2894123,189.68386 -2.3956906,3.56909"
+         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:#f2f2f2;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+      <path
+         sodipodi:nodetypes="cc"
+         transform="translate(0,852.36218)"
+         inkscape:connector-curvature="0"
+         id="path4234"
+         d="m 12.46737,189.68386 2.493472,3.5202"
+         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:#f2f2f2;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+      <path
+         sodipodi:nodetypes="cc"
+         transform="translate(0,852.36218)"
+         inkscape:connector-curvature="0"
+         id="path4236"
+         d="m 12.467368,182.74125 4.009116,9.925"
+         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:#f2f2f2;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+      <path
+         sodipodi:nodetypes="cc"
+         transform="translate(0,852.36218)"
+         inkscape:connector-curvature="0"
+         id="path4238"
+         d="m 9.4849789,182.83904 -4.2046813,9.87611"
+         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:#f2f2f2;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+      <path
+         sodipodi:nodetypes="cc"
+         transform="translate(0,852.36218)"
+         inkscape:connector-curvature="0"
+         id="path4240"
+         d="m 7.4315299,194.71969 7.0403961,0"
+         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:#f2f2f2;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+    </g>
+    <g
+       transform="matrix(0.93050058,0,0,0.90640134,22.758464,97.446032)"
+       id="g4280"
+       style="fill:#1a1a1a">
+      <path
+         sodipodi:type="arc"
+         style="fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:#f2f2f2;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+         id="path4282"
+         sodipodi:cx="5.2590199"
+         sodipodi:cy="194.45924"
+         sodipodi:rx="2.0660436"
+         sodipodi:ry="1.5964882"
+         d="m 7.3250635,194.45924 c 0,0.88172 -0.9249993,1.59649 -2.0660436,1.59649 -1.1410444,0 -2.0660437,-0.71477 -2.0660437,-1.59649 0,-0.88171 0.9249993,-1.59648 2.0660437,-1.59648 1.1410443,0 2.0660436,0.71477 2.0660436,1.59648 z"
+         transform="translate(0,852.36218)" />
+      <use
+         x="0"
+         y="0"
+         xlink:href="#path4282"
+         id="use4284"
+         transform="translate(5.698452,-13)"
+         width="250"
+         height="200"
+         style="fill:#1a1a1a" />
+      <use
+         x="0"
+         y="0"
+         xlink:href="#use4284"
+         id="use4286"
+         transform="translate(5.6280407,13)"
+         width="250"
+         height="200"
+         style="fill:#1a1a1a" />
+      <path
+         transform="translate(5.684483,846.36218)"
+         d="m 7.3250635,194.45924 c 0,0.88172 -0.9249993,1.59649 -2.0660436,1.59649 -1.1410444,0 -2.0660437,-0.71477 -2.0660437,-1.59649 0,-0.88171 0.9249993,-1.59648 2.0660437,-1.59648 1.1410443,0 2.0660436,0.71477 2.0660436,1.59648 z"
+         sodipodi:ry="1.5964882"
+         sodipodi:rx="2.0660436"
+         sodipodi:cy="194.45924"
+         sodipodi:cx="5.2590199"
+         id="path4288"
+         style="fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:#f2f2f2;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+         sodipodi:type="arc" />
+      <path
+         sodipodi:nodetypes="cc"
+         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:#f2f2f2;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+         d="m 10.902837,183.0346 0,3.66687"
+         id="path4290"
+         inkscape:connector-curvature="0"
+         transform="translate(0,852.36218)" />
+      <path
+         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:#f2f2f2;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+         d="m 9.2894123,189.68386 -2.3956906,3.56909"
+         id="path4293"
+         inkscape:connector-curvature="0"
+         transform="translate(0,852.36218)"
+         sodipodi:nodetypes="cc" />
+      <path
+         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:#f2f2f2;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+         d="m 12.46737,189.68386 2.493472,3.5202"
+         id="path4295"
+         inkscape:connector-curvature="0"
+         transform="translate(0,852.36218)"
+         sodipodi:nodetypes="cc" />
+      <path
+         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:#f2f2f2;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+         d="m 12.467368,182.74125 4.009116,9.925"
+         id="path4297"
+         inkscape:connector-curvature="0"
+         transform="translate(0,852.36218)"
+         sodipodi:nodetypes="cc" />
+      <path
+         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:#f2f2f2;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+         d="m 9.4849789,182.83904 -4.2046813,9.87611"
+         id="path4299"
+         inkscape:connector-curvature="0"
+         transform="translate(0,852.36218)"
+         sodipodi:nodetypes="cc" />
+      <path
+         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:#f2f2f2;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+         d="m 7.4315299,194.71969 7.0403961,0"
+         id="path4301"
+         inkscape:connector-curvature="0"
+         transform="translate(0,852.36218)"
+         sodipodi:nodetypes="cc" />
+    </g>
+    <g
+       id="g4309"
+       transform="matrix(0.95268982,0,0,1.0934812,2.5939281,-88.949056)">
+      <path
+         id="rect4303"
+         d="m 47.594131,94.030746 14.462306,0 0,10.255094 -14.462306,0 z"
+         style="fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#f2f2f2;stroke-width:0.80000001;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
+         transform="translate(0,852.36218)"
+         inkscape:connector-curvature="0" />
+      <path
+         sodipodi:nodetypes="cccc"
+         transform="translate(0,852.36218)"
+         inkscape:connector-curvature="0"
+         id="path4305"
+         d="m 47.666782,94.03851 7.145333,5.307564 7.035032,-5.261579 z"
+         style="fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#f2f2f2;stroke-width:0.80000001;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+    </g>
+    <g
+       transform="matrix(0.95268982,0,0,1.0934812,24.593928,-88.949056)"
+       id="g4313"
+       style="fill:#1a1a1a">
+      <path
+         inkscape:connector-curvature="0"
+         transform="translate(0,852.36218)"
+         style="fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#f2f2f2;stroke-width:0.80000001;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
+         d="m 47.594131,94.030746 14.462306,0 0,10.255094 -14.462306,0 z"
+         id="path4315" />
+      <path
+         style="fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#f2f2f2;stroke-width:0.80000001;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+         d="m 47.666782,94.03851 7.145333,5.307564 7.035032,-5.261579 z"
+         id="path4317"
+         inkscape:connector-curvature="0"
+         transform="translate(0,852.36218)"
+         sodipodi:nodetypes="cccc" />
+    </g>
+    <g
+       id="g257">
+      <rect
+         style="fill:#333333;stroke:#e6e6e6;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;filter:url(#filter4064)"
+         id="rect222"
+         width="44.285713"
+         height="44.285713"
+         x="470.35715"
+         y="18.790752"
+         rx="6"
+         ry="6"
+         transform="matrix(0.43114968,0,0,0.43114968,-157.41936,955.6356)" />
+      <text
+         transform="translate(5.2683173,850.36218)"
+         id="text247"
+         y="129.16422"
+         x="49.504551"
+         style="font-size:17px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:none;font-family:Verdana;-inkscape-font-specification:Verdana Bold"
+         xml:space="preserve"><tspan
+           style="font-weight:bold;-inkscape-font-specification:Verdana Bold"
+           y="129.16422"
+           x="49.504551"
+           id="tspan249"
+           sodipodi:role="line">!</tspan></text>
+    </g>
+    <g
+       id="g253">
+      <rect
+         ry="6"
+         rx="6"
+         y="18.790752"
+         x="470.35715"
+         height="44.285713"
+         width="44.285713"
+         id="rect200"
+         style="fill:#1a1a1a;stroke:#d3d7cf;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;filter:url(#filter4064)"
+         transform="matrix(0.43114968,0,0,0.43114968,-135.41936,955.6356)" />
+      <use
+         height="200"
+         width="250"
+         transform="translate(22.268317,0)"
+         id="use251"
+         xlink:href="#text247"
+         y="0"
+         x="0" />
+    </g>
+    <path
+       sodipodi:type="star"
+       style="fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.80864763;stroke-miterlimit:4;stroke-dasharray:none"
+       id="path252"
+       sodipodi:sides="3"
+       sodipodi:cx="195.63554"
+       sodipodi:cy="63.26548"
+       sodipodi:r1="7.7793064"
+       sodipodi:r2="15.558613"
+       sodipodi:arg1="2.1025204"
+       sodipodi:arg2="3.1497179"
+       inkscape:flatsided="true"
+       inkscape:rounded="0.2"
+       inkscape:randomized="0"
+       d="m 191.69128,69.97073 c -2.32277,-1.366333 -2.23518,-12.1453 0.10948,-13.473709 2.34466,-1.328408 11.63573,4.136926 11.61383,6.831668 -0.0219,2.694741 -9.40054,8.008375 -11.72331,6.642041 z"
+       transform="matrix(1.043244,0,0,0.93815683,-5.0151639,863.01152)"
+       inkscape:transform-center-x="-4.0006141"
+       inkscape:transform-center-y="-0.059313251" />
+    <path
+       inkscape:transform-center-y="0.059308319"
+       inkscape:transform-center-x="4.0006111"
+       transform="matrix(-1.043244,0,0,-0.93815683,425.4058,981.67309)"
+       d="m 191.69128,69.97073 c -2.32277,-1.366333 -2.23518,-12.1453 0.10948,-13.473709 2.34466,-1.328408 11.63573,4.136926 11.61383,6.831668 -0.0219,2.694741 -9.40054,8.008375 -11.72331,6.642041 z"
+       inkscape:randomized="0"
+       inkscape:rounded="0.2"
+       inkscape:flatsided="true"
+       sodipodi:arg2="3.1497179"
+       sodipodi:arg1="2.1025204"
+       sodipodi:r2="15.558613"
+       sodipodi:r1="7.7793064"
+       sodipodi:cy="63.26548"
+       sodipodi:cx="195.63554"
+       sodipodi:sides="3"
+       id="path254"
+       style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:#e6e6e6;stroke-width:0.80864763;stroke-miterlimit:4;stroke-dasharray:none"
+       sodipodi:type="star" />
+    <g
+       id="g1070"
+       transform="matrix(1.1035285,0,0,1.1035285,-14.308807,-95.610044)">
+      <path
+         sodipodi:nodetypes="cscsc"
+         inkscape:connector-curvature="0"
+         id="path262"
+         d="m 148.82687,49.85498 c 0,0 -3.94234,5.723921 -8.80546,5.723921 -4.86313,0 -8.80547,-5.723921 -8.80547,-5.723921 0,0 3.94234,-5.72392 8.80547,-5.72392 4.86312,0 8.80546,5.72392 8.80546,5.72392 z"
+         style="fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.94912058;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+         transform="matrix(0.79496097,0,0,0.9062729,26.90439,859.01012)" />
+      <path
+         transform="matrix(0.89659499,0,0,0.89659499,12.90165,857.69139)"
+         d="m 144.56282,51.877872 c 0,2.665109 -2.1605,4.825606 -4.82561,4.825606 -2.66511,0 -4.8256,-2.160497 -4.8256,-4.825606 0,-2.665108 2.16049,-4.825605 4.8256,-4.825605 2.66511,0 4.82561,2.160497 4.82561,4.825605 z"
+         sodipodi:ry="4.8256054"
+         sodipodi:rx="4.8256054"
+         sodipodi:cy="51.877872"
+         sodipodi:cx="139.73721"
+         id="path1033"
+         style="fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.86699998;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+         sodipodi:type="arc" />
+      <path
+         sodipodi:type="arc"
+         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
+         id="path1035"
+         sodipodi:cx="139.73721"
+         sodipodi:cy="51.877872"
+         sodipodi:rx="4.8256054"
+         sodipodi:ry="4.8256054"
+         d="m 144.56282,51.877872 c 0,2.665109 -2.1605,4.825606 -4.82561,4.825606 -2.66511,0 -4.8256,-2.160497 -4.8256,-4.825606 0,-2.665108 2.16049,-4.825605 4.8256,-4.825605 2.66511,0 4.82561,2.160497 4.82561,4.825605 z"
+         transform="matrix(0.37382862,0,0,0.37382862,85.950326,884.7403)" />
+    </g>
+    <g
+       id="g321">
+      <g
+         id="g315">
+        <path
+           sodipodi:nodetypes="ccccc"
+           inkscape:connector-curvature="0"
+           d="m 51.71875,158.125 0,7.65625 10.1875,0 0,-7.65625 z"
+           style="fill:#333333"
+           transform="translate(1,852.36218)"
+           id="path293" />
+        <path
+           id="path278"
+           transform="translate(1,852.36218)"
+           style="fill:#e6e6e6"
+           d="m 51.71875,158.125 0,7.65625 10.1875,0 0,-7.65625 z m 0.53125,0.625 9.03125,0 -0.03125,6.4375 -9,0 z m 0.71875,0.65625 0,5.03125 4.4375,0 -0.0625,-5.03125 z m 0.59375,0.625 3.25,0 0,2.5625 -0.8125,0 0,-1.9375 -1.727964,0 0,1.9375 -0.709536,0 z"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cccccccccccccccccccccccc" />
+      </g>
+      <use
+         height="200"
+         width="250"
+         transform="translate(-6,6)"
+         id="use319"
+         xlink:href="#g315"
+         y="0"
+         x="0" />
+    </g>
+    <g
+       id="g353">
+      <path
+         sodipodi:nodetypes="ccccc"
+         inkscape:connector-curvature="0"
+         d="m 51.71875,158.125 0,7.65625 10.1875,0 0,-7.65625 z"
+         style="fill:#1a1a1a"
+         transform="translate(23,852.36218)"
+         id="path333" />
+      <path
+         id="path335"
+         transform="translate(23,852.36218)"
+         style="fill:#e6e6e6"
+         d="m 51.71875,158.125 0,7.65625 10.1875,0 0,-7.65625 z m 0.53125,0.625 9.03125,0 -0.03125,6.4375 -9,0 z m 0.71875,0.65625 0,5.03125 4.4375,0 -0.0625,-5.03125 z m 0.59375,0.625 3.25,0 0,2.5625 -0.8125,0 0,-1.9375 -1.727964,0 0,1.9375 -0.709536,0 z"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cccccccccccccccccccccccc" />
+    </g>
+    <use
+       x="0"
+       y="0"
+       xlink:href="#g353"
+       id="use357"
+       transform="translate(-6,6)"
+       width="250"
+       height="200" />
+    <g
+       id="g293"
+       transform="translate(-54.726207,8)">
+      <path
+         transform="matrix(1.2829201,1.9081591,-1.9081591,1.2829201,-566.65386,-61.76762)"
+         d="m 560.55887,21.754047 c 0,0.488156 -0.39573,0.883884 -0.88388,0.883884 -0.48816,0 -0.88389,-0.395728 -0.88389,-0.883884 0,-0.488155 0.39573,-0.883883 0.88389,-0.883883 0.48815,0 0.88388,0.395728 0.88388,0.883883 z"
+         sodipodi:ry="0.88388348"
+         sodipodi:rx="0.88388348"
+         sodipodi:cy="21.754047"
+         sodipodi:cx="559.67499"
+         id="path274"
+         style="fill:#e6e6e6;fill-opacity:1;stroke:none"
+         sodipodi:type="arc" />
+      <path
+         sodipodi:type="arc"
+         style="fill:#e6e6e6;fill-opacity:1;stroke:none"
+         id="path276"
+         sodipodi:cx="559.67499"
+         sodipodi:cy="21.754047"
+         sodipodi:rx="0.88388348"
+         sodipodi:ry="0.88388348"
+         d="m 560.55887,21.754047 c 0,0.488156 -0.39573,0.883884 -0.88388,0.883884 -0.48816,0 -0.88389,-0.395728 -0.88389,-0.883884 0,-0.488155 0.39573,-0.883883 0.88389,-0.883883 0.48815,0 0.88388,0.395728 0.88388,0.883883 z"
+         transform="matrix(0.96219008,1.4311194,-1.4311194,0.96219008,-391.29289,215.61485)" />
+      <path
+         transform="matrix(1.0080086,1.4992679,-1.4992679,1.0080086,-421.03317,165.44683)"
+         d="m 560.55887,21.754047 c 0,0.488156 -0.39573,0.883884 -0.88388,0.883884 -0.48816,0 -0.88389,-0.395728 -0.88389,-0.883884 0,-0.488155 0.39573,-0.883883 0.88389,-0.883883 0.48815,0 0.88388,0.395728 0.88388,0.883883 z"
+         sodipodi:ry="0.88388348"
+         sodipodi:rx="0.88388348"
+         sodipodi:cy="21.754047"
+         sodipodi:cx="559.67499"
+         id="path279"
+         style="fill:#e6e6e6;fill-opacity:1;stroke:none"
+         sodipodi:type="arc" />
+      <path
+         transform="matrix(0.45818575,0.68148541,-0.68148541,0.45818575,-132.78975,635.71067)"
+         inkscape:connector-curvature="0"
+         id="path281"
+         d="m 563.21055,31.653543 4.41942,-6.187185 -7.6014,-6.187184"
+         style="fill:none;stroke:#e6e6e6;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         sodipodi:type="arc"
+         style="fill:#e6e6e6;fill-opacity:1;stroke:none"
+         id="path283"
+         sodipodi:cx="559.67499"
+         sodipodi:cy="21.754047"
+         sodipodi:rx="0.88388348"
+         sodipodi:ry="0.88388348"
+         d="m 560.55887,21.754047 c 0,0.488156 -0.39573,0.883884 -0.88388,0.883884 -0.48816,0 -0.88389,-0.395728 -0.88389,-0.883884 0,-0.488155 0.39573,-0.883883 0.88389,-0.883883 0.48815,0 0.88388,0.395728 0.88388,0.883883 z"
+         transform="matrix(1.0996458,1.635565,-1.635565,1.0996458,-476.37171,94.687576)" />
+      <path
+         transform="matrix(0.45818575,0.68148541,-0.68148541,0.45818575,-132.78975,635.71067)"
+         inkscape:connector-curvature="0"
+         id="path285"
+         d="m 567.45319,25.466358 7.6014,-4.065864"
+         style="fill:none;stroke:#e6e6e6;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    </g>
+    <use
+       x="0"
+       y="0"
+       xlink:href="#g293"
+       id="use301"
+       transform="translate(22,0)"
+       width="250"
+       height="200" />
   </g>
 </svg>
diff --git a/view/theme/dispy/jot-header.tpl b/view/theme/dispy/jot-header.tpl
index 8dccf71ed..43dcdbb84 100755..100644
--- a/view/theme/dispy/jot-header.tpl
+++ b/view/theme/dispy/jot-header.tpl
@@ -1,157 +1,132 @@
-
-<script language="javascript" type="text/javascript" src="$baseurl/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script>
-<script language="javascript" type="text/javascript">
-
-var editor=false;
+<script type="text/javascript">
+var editor = false;
 var textlen = 0;
+var plaintext = '$editselect';
 
 function initEditor(cb) {
-    if (editor==false) {
-        $("#profile-jot-text-loading").show();
-		$("#jot-title-desc").show();
- if(plaintext == 'none') {
-            $("#profile-jot-text-loading").hide();
-            $("#profile-jot-text").css({ 'height': 200, 'color': '#000' });
-            $(".jothidden").show();
-            editor = true;
-            $("a#jot-perms-icon").fancybox({
-                'transitionIn' : 'elastic',
-                'transitionOut' : 'elastic'
-            });
-	                            $("#profile-jot-submit-wrapper").show();
-								{{ if $newpost }}
-    	                            $("#profile-upload-wrapper").show();
-        	                        $("#profile-attach-wrapper").show();
-            	                    $("#profile-link-wrapper").show();
-                	                $("#profile-video-wrapper").show();
-                    	            $("#profile-audio-wrapper").show();
-                        	        $("#profile-location-wrapper").show();
-                            	    $("#profile-nolocation-wrapper").show();
-                                	$("#profile-title-wrapper").show();
-	                                $("#profile-jot-plugin-wrapper").show();
-	                                $("#jot-preview-link").show();
-								{{ endif }}   
-
-
-            if (typeof cb!="undefined") cb();
-            return;
-        }
-        tinyMCE.init({
-                theme : "advanced",
-                mode : "specific_textareas",
-                editor_selector: /(profile-jot-text|prvmail-text)/,
-                plugins : "bbcode,paste,fullscreen,autoresize",
-                theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code,fullscreen",
-                theme_advanced_buttons2 : "",
-                theme_advanced_buttons3 : "",
-                theme_advanced_toolbar_location : "top",
-                theme_advanced_toolbar_align : "center",
-                theme_advanced_blockformats : "blockquote,code",
-                //theme_advanced_resizing : true,
-                //theme_advanced_statusbar_location : "bottom",
-                paste_text_sticky : true,
-                entity_encoding : "raw",
-                add_unload_trigger : false,
-                remove_linebreaks : false,
-                force_p_newlines : false,
-                force_br_newlines : true,
-                forced_root_block : '',
-                convert_urls: false,
-                content_css: "$baseurl/view/custom_tinymce.css",
-                theme_advanced_path : false,
-                setup : function(ed) {
-                     //Character count
-                        ed.onKeyUp.add(function(ed, e) {
-                                var txt = tinyMCE.activeEditor.getContent();
-                                textlen = txt.length;
-                                if(textlen != 0 && $('#jot-perms-icon').is('.unlock')) {
-                                        $('#profile-jot-desc').html(ispublic);
-                                }
-                                else {
-                                        $('#profile-jot-desc').html('&nbsp;');
-                                }
-
-                                if(textlen <= 140) {
-                                        $('#character-counter').removeClass('red');
-                                        $('#character-counter').removeClass('orange');
-                                        $('#character-counter').addClass('grey');
-                                }
-                                if((textlen > 140) && (textlen <= 420)) {
-                                        $('#character-counter').removeClass('grey');
-                                        $('#character-counter').removeClass('red');
-                                        $('#character-counter').addClass('orange');
-                                }
-                                if(textlen > 420) {
-                                        $('#character-counter').removeClass('grey');
-                                        $('#character-counter').removeClass('orange');
-                                        $('#character-counter').addClass('red');
-                                }
-                                $('#character-counter').text(textlen);
-                        });
-                        ed.onInit.add(function(ed) {
-                                ed.pasteAsPlainText = true;
-                                $("#profile-jot-text-loading").hide();
-                                $("#profile-jot-submit-wrapper").show();
-                                $("#profile-upload-wrapper").show();
-                                $("#profile-attach-wrapper").show();
-                                $("#profile-link-wrapper").show();
-                                $("#profile-youtube-wrapper").show();
-                                $("#profile-video-wrapper").show();
-                                $("#profile-audio-wrapper").show();
-                                $("#profile-location-wrapper").show();
-                                $("#profile-nolocation-wrapper").show();
-                                $("#profile-title-wrapper").show();
-                                $("#profile-jot-plugin-wrapper").show();
-                                $("#character-counter").show();
-                                if (typeof cb!="undefined") cb();
-                        });
-                }
-        });
-        editor = true;
-        // setup acl popup
-        $("a#jot-perms-icon").fancybox({
-            'transitionIn' : 'none',
-            'transitionOut' : 'none'
-        }); 
-    } else {
-        if (typeof cb!="undefined") cb();
-    }
-} // initEditor
-</script>
-<script type="text/javascript" src="js/ajaxupload.js" ></script>
-<script>
-    var ispublic = '$ispublic';
-	$(document).ready(function() {
-                /* enable tinymce on focus */
-                $("#profile-jot-text").focus(function(){
-                    if (editor) return;
-                    $(this).val("");
-                    initEditor();
-                }); 
-
-		$("#jot-title").mouseout(function() {
-			$("#jot-title").hide();
-			var ttl = $("#jot-title").val();
-			$('#jot-title-display').html(ttl);
-			if(ttl.length) {
-				$("#jot-title-display").show();
-			}
-			else {
-				$("#jot-title-desc").show();
+	if (editor==false) {
+		$("#profile-jot-text-loading").show();
+		if(plaintext == 'none') {
+			$("#profile-jot-text-loading").hide();
+			$("#profile-jot-text").css({ 'height': 200, 'color': '#000' });
+			editor = true;
+			$("a#jot-perms-icon").fancybox({
+				'transitionIn' : 'elastic',
+				'transitionOut' : 'elastic'
+			});
+			$(".jothidden").show();
+			if (typeof cb!="undefined") cb();
+			return;
+		}
+		tinyMCE.init({
+			theme : "advanced",
+			mode : "specific_textareas",
+			editor_selector: $editselect,
+			auto_focus: "profile-jot-text",
+			plugins : "bbcode,paste,fullscreen,autoresize",
+			theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code,fullscreen",
+			theme_advanced_buttons2 : "",
+			theme_advanced_buttons3 : "",
+			theme_advanced_toolbar_location : "top",
+			theme_advanced_toolbar_align : "center",
+			theme_advanced_blockformats : "blockquote,code",
+			paste_text_sticky : true,
+			entity_encoding : "raw",
+			add_unload_trigger : false,
+			remove_linebreaks : false,
+			force_p_newlines : false,
+			force_br_newlines : true,
+			forced_root_block : '',
+			convert_urls: false,
+			content_css: "$baseurl/view/custom_tinymce.css",
+			theme_advanced_path : false,
+			setup : function(ed) {
+				cPopup = null;
+				ed.onKeyDown.add(function(ed,e) {
+					if(cPopup !== null)
+						cPopup.onkey(e);
+				});
+
+				ed.onKeyUp.add(function(ed, e) {
+					var txt = tinyMCE.activeEditor.getContent();
+					match = txt.match(/@([^ \n]+)$/);
+					if(match!==null) {
+						if(cPopup === null) {
+							cPopup = new ACPopup(this,baseurl+"/acl");
+						}
+						if(cPopup.ready && match[1]!==cPopup.searchText) cPopup.search(match[1]);
+						if(! cPopup.ready) cPopup = null;
+					}
+					else {
+						if(cPopup !== null) { cPopup.close(); cPopup = null; }
+					}
+
+					textlen = txt.length;
+					if(textlen != 0 && $('#jot-perms-icon').is('.unlock')) {
+						$('#profile-jot-desc').html(ispublic);
+					}
+					else {
+						$('#profile-jot-desc').html('&#160;');
+					}	 
+
+				 //Character count
+
+					if(textlen <= 140) {
+						$('#character-counter').removeClass('red');
+						$('#character-counter').removeClass('orange');
+						$('#character-counter').addClass('grey');
+					}
+					if((textlen > 140) && (textlen <= 420)) {
+						$('#character-counter').removeClass('grey');
+						$('#character-counter').removeClass('red');
+						$('#character-counter').addClass('orange');
+					}
+					if(textlen > 420) {
+						$('#character-counter').removeClass('grey');
+						$('#character-counter').removeClass('orange');
+						$('#character-counter').addClass('red');
+					}
+					$('#character-counter').text(textlen);
+				});
+
+				ed.onInit.add(function(ed) {
+					ed.pasteAsPlainText = true;
+					$("#profile-jot-text-loading").hide();
+					$(".jothidden").show();
+					if (typeof cb!="undefined") cb();
+				});
+
 			}
 		});
+		editor = true;
+		// setup acl popup
+		$("a#jot-perms-icon").fancybox({
+			'transitionIn' : 'elastic',
+			'transitionOut' : 'elastic'
+		}); 
+	} else {
+		if (typeof cb!="undefined") cb();
+	}
+}
 
-		$("#jot-title-display").hover(function() {
-			$("#jot-title-display").hide();
-			$("#jot-title").show();
-			$("#jot-title").focus();
-		});		
+function enableOnUser(){
+	if (editor) return;
+	$(this).val("");
+	initEditor();
+}
+</script>
+<script type="text/javascript" src="$baseurl/js/ajaxupload.js"></script>
+<script type="text/javascript">
+	var ispublic = '$ispublic';
+	var addtitle = '$addtitle';
 
-		$("#jot-title-desc").click(function() {
-			$("#jot-title-desc").hide();
-			$("#jot-title").show();
-			$("#jot-title").focus();
-		});		
+	$(document).ready(function() {
+		/* enable tinymce on focus and click */
+		$("#profile-jot-text").focus(enableOnUser);
+		$("#profile-jot-text").click(enableOnUser);
+		/* enable character counter */
+		$("#profile-jot-text").focus(charCounter);
+		$("#profile-jot-text").click(charCounter);
 
 		var uploader = new window.AjaxUpload(
 			'wall-image-upload',
@@ -174,22 +149,8 @@ function initEditor(cb) {
 					$('#profile-rotator').hide();
 				}				 
 			}
-		);		
-		$('#contact_allow, #contact_deny, #group_allow, #group_deny').change(function() {
-			var selstr;
-			$('#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected').each( function() {
-				selstr = $(this).text();
-				$('#jot-perms-icon').removeClass('unlock').addClass('lock');
-				$('#jot-public').hide();
-				$('.profile-jot-net input').attr('disabled', 'disabled');
-			});
-			if(selstr == null) { 
-				$('#jot-perms-icon').removeClass('lock').addClass('unlock');
-				$('#jot-public').show();
-				$('.profile-jot-net input').attr('disabled', false);
-			}
+		);
 
-		}).trigger('change');
 
 	});
 
@@ -223,13 +184,6 @@ function initEditor(cb) {
 		}
 	}
 
-	function jotGetVideo() {
-		reply = prompt("$utubeurl");
-		if(reply && reply.length) {
-			addeditortext('[youtube]' + reply + '[/youtube]');
-		}
-	}
-
 	function jotVideoURL() {
 		reply = prompt("$vidurl");
 		if(reply && reply.length) {
@@ -252,22 +206,18 @@ function initEditor(cb) {
 		}
 	}
 
-	function jotTitle() {
-		reply = prompt("$title", $('#jot-title').val());
-		if(reply && reply.length) {
-			$('#jot-title').val(reply);
-		}
-	}
-
 	function jotShare(id) {
+		if ($('#jot-popup').length != 0) $('#jot-popup').show();
+
 		$('#like-rotator-' + id).show();
 		$.get('share/' + id, function(data) {
-				if (!editor) $("#profile-jot-text").val("");
-				initEditor(function(){
-					addeditortext(data);
-					$('#like-rotator-' + id).hide();
-					$(window).scrollTop(0);
-				});
+			if (!editor) $("#profile-jot-text").val("");
+			initEditor(function(){
+				addeditortext(data);
+				$('#like-rotator-' + id).hide();
+				$(window).scrollTop(0);
+			});
+
 		});
 	}
 
@@ -294,21 +244,69 @@ function initEditor(cb) {
 		}
 	}
 
+	function itemTag(id) {
+		reply = prompt("$term");
+		if(reply && reply.length) {
+			reply = reply.replace('#','');
+			if(reply.length) {
+
+				commentBusy = true;
+				$('body').css('cursor', 'wait');
+
+				$.get('tagger/' + id + '?term=' + reply);
+				if(timer) clearTimeout(timer);
+				timer = setTimeout(NavUpdate,3000);
+				liking = 1;
+			}
+		}
+	}
+
 	function jotClearLocation() {
 		$('#jot-coord').val('');
 		$('#profile-nolocation-wrapper').hide();
 	}
 
-  function addeditortext(data) {
-        if(plaintext == 'none') {
-            var currentText = $("#profile-jot-text").val();
-            $("#profile-jot-text").val(currentText + data);
-        }
-        else
-            tinyMCE.execCommand('mceInsertRawHTML',false,data);
-    }
+	function addeditortext(data) {
+		if(plaintext == 'none') {
+			var currentText = $("#profile-jot-text").val();
+			$("#profile-jot-text").val(currentText + data);
+		}
+		else
+			tinyMCE.execCommand('mceInsertRawHTML',false,data);
+	}	
 
 	$geotag
 
+	function charCounter() {
+		// character count part deux
+		//$(this).val().length is not a function Line 282(3)
+		$('#profile-jot-text').keyup(function() {
+			var textlen = 0;
+			var maxLen1 = 140;
+			var maxLen2 = 420;
+
+			$('#character-counter').removeClass('jothidden');
+
+			textLen = $(this).val().length;
+			if(textLen <= maxLen1) {
+				$('#character-counter').removeClass('red');
+				$('#character-counter').removeClass('orange');
+				$('#character-counter').addClass('grey');
+			}
+			if((textLen > maxLen1) && (textlen <= maxLen2)) {
+				$('#character-counter').removeClass('grey');
+				$('#character-counter').removeClass('red');
+				$('#character-counter').addClass('orange');
+			}
+			if(textLen > maxLen2) {
+				$('#character-counter').removeClass('grey');
+				$('#character-counter').removeClass('orange');
+				$('#character-counter').addClass('red');
+			}
+			$('#character-counter').text( textLen );
+		});
+		$('#profile-jot-text').keyup();
+	}
+
 </script>
 
diff --git a/view/theme/dispy/jot.tpl b/view/theme/dispy/jot.tpl
index c312d221a..94c31da23 100755..100644
--- a/view/theme/dispy/jot.tpl
+++ b/view/theme/dispy/jot.tpl
@@ -1,14 +1,9 @@
+<form id="profile-jot-form" action="$action" method="post">
+	<div id="jot">
+		<div id="profile-jot-desc" class="jothidden">&#160;</div>
+		<input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" style="display:none" />
+		<div id="character-counter" class="grey jothidden"></div>
 
-<div id="profile-jot-wrapper" > 
-	<div id="profile-jot-banner-wrapper">
-		<div id="profile-jot-desc" >&nbsp;</div>
-		<div id="character-counter" class="grey" style="display: none;">0</div>
-		<div id="profile-rotator-wrapper" style="display: $visitor;" >
-			<img id="profile-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display:none;"  />
-		</div> 		
-	</div>
-
-	<form id="profile-jot-form" action="$action" method="post" >
 		<input type="hidden" name="type" value="$ptyp" />
 		<input type="hidden" name="profile_uid" value="$profile_uid" />
 		<input type="hidden" name="return" value="$return_path" />
@@ -16,60 +11,62 @@
 		<input type="hidden" name="coord" id="jot-coord" value="" />
 		<input type="hidden" name="post_id" value="$post_id" />
 		<input type="hidden" name="preview" id="jot-preview" value="0" />
-		<div id="jot-title-wrapper">
-		<span id="jot-title-desc" style="display: none;">$addtitle</span>
-		<span id="jot-title-display" style="display: none;"></span>
-		<input type="text" name="title" id="jot-title" value="" style="display: none;" />
-		</div>
 
-                <img id="profile-jot-text-loading" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
-                <textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" >{{ if $content }}$content{{ else }}$share{{ endif }}</textarea>
+		<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body">{{ if $content }}$content{{ else }}$share{{ endif }}
+		</textarea>
 
 
-<div id="profile-jot-submit-wrapper" style="display:none">
-	<div id="profile-jot-perms" class="profile-jot-perms" style="display: $visitor;" >
-            <a href="#profile-jot-acl-wrapper" id="jot-perms-icon" class="icon $lockstate"  title="$permset" ></a>$bang</div>
-	<input type="submit" id="profile-jot-submit" name="submit" value="$share" />
-</div>
+<div id="jot-tools" class="jothidden" style="display:none">
+	<div id="profile-jot-submit-wrapper" class="jothidden">
 
-	<div id="profile-upload-wrapper" class="jot-tool" style="display: none;" >
-		<div id="wall-image-upload-div" ><a onclick="return false;" id="wall-image-upload" class="icon border camera" title="$upload"></a></div>
-	</div>
-	<div id="profile-attach-wrapper" class="jot-tool" style="display: none;" >
-		<div id="wall-file-upload-div" ><a href="#" onclick="return false;" id="wall-file-upload" class="icon border attach" title="$attach"></a></div>
-	</div>  
-	<div id="profile-link-wrapper" class="jot-tool" style="display: none;" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" >
-		<a id="profile-link" class="icon border  link" title="$weblink" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;"></a>
-	</div> 
-	<div id="profile-video-wrapper" class="jot-tool" style="display: none;" >
-		<a id="profile-video" class="icon border  video" title="$video" onclick="jotVideoURL(); return false;"></a>
-	</div> 
-	<div id="profile-audio-wrapper" class="jot-tool" style="display: none;" >
-		<a id="profile-audio" class="icon border  audio" title="$audio" onclick="jotAudioURL(); return false;"></a>
-	</div> 
-	<div id="profile-location-wrapper" class="jot-tool" style="display: none;" >
-		<a id="profile-location" class="icon border  globe" title="$setloc" onclick="jotGetLocation(); return false;"></a>
-	</div> 
-	<div id="profile-nolocation-wrapper" class="jot-tool" style="display: none;" >
-		<a id="profile-nolocation" class="icon border  noglobe" title="$noloc" onclick="jotClearLocation(); return false;"></a>
-	</div> 
+		<div id="profile-upload-wrapper" style="display: $visitor;">
+			<div id="wall-image-upload-div"><a class="icon border camera" href="#" onclick="return false;" id="wall-image-upload" title="$upload"></a></div>
+		</div>
+		<div id="profile-attach-wrapper" style="display: $visitor;">
+			<div id="wall-file-upload-div"><a class="icon border attach" href="#" onclick="return false;" id="wall-file-upload" title="$attach"></a></div>
+		</div>
+		<div id="profile-link-wrapper" style="display: $visitor;" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);">
+			<a class="icon border link" id="profile-link" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;" title="$weblink"></a>
+		</div>
+		<div id="profile-video-wrapper" style="display: $visitor;">
+			<a class="icon border video" id="profile-video" onclick="jotVideoURL();return false;" title="$video"></a>
+		</div>
+		<div id="profile-audio-wrapper" style="display: $visitor;">
+			<a class="icon border audio" id="profile-audio" onclick="jotAudioURL();return false;" title="$audio"></a>
+		</div>
+		<div id="profile-location-wrapper" style="display: $visitor;">
+			<a class="icon border globe" id="profile-location" onclick="jotGetLocation();return false;" title="$setloc"></a>
+		</div>
+		<div id="profile-nolocation-wrapper" style="display: none;">
+			<a class="icon border noglobe" id="profile-nolocation" onclick="jotClearLocation();return false;" title="$noloc"></a>
+		</div>
 
-	<div id="profile-jot-plugin-wrapper" style="display: none;">
-  	$jotplugins
+		<div id="profile-jot-plugin-wrapper">
+		$jotplugins
+		</div>
+
+	<a class="icon-text-preview pointer"></a><a id="jot-preview-link" class="pointer" onclick="preview_post(); return false;" title="$preview">$preview</a>
+	<input type="submit" id="profile-jot-submit" name="submit" value="$share" />
+	<div id="profile-jot-perms" class="profile-jot-perms">
+		<a id="jot-perms-icon" href="#profile-jot-acl-wrapper" class="icon $lockstate $bang" title="$permset"></a>
 	</div>
-	<div id="profile-jot-tools-end"></div>
+	<span id="profile-rotator" class="loading" style="display: none"><img src="images/rotator.gif" alt="$wait" title="$wait" /></span>
+	</div>
+
+	</div> <!-- /#profile-jot-submit-wrapper -->
+</div> <!-- /#jot-tools -->
 	
-        <div style="display: none;">
-            <div id="profile-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;">
-                $acl
-                <hr style="clear:both"/>
-                <div id="profile-jot-email-label">$emailcc</div><input type="text" name="emailcc" id="profile-jot-email" title="$emtitle" />
-                <div id="profile-jot-email-end"></div>
-                $jotnets
-            </div>
-        </div>
+	<div id="jot-preview-content" style="display:none;"></div>
+	<div style="display: none;">
+		<div id="profile-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;">
+			$acl
+			<hr style="clear:both" />
+			<div id="profile-jot-email-label">$emailcc</div>
+			<input type="text" name="emailcc" id="profile-jot-email" title="$emtitle" />
+			<div id="profile-jot-email-end"></div>
+			$jotnets
+		</div>
+	</div>
 
-<div id="profile-jot-end"></div>
 </form>
-</div>
-                {{ if $content }}<script>initEditor();</script>{{ endif }}
+{{ if $content }}<script>initEditor();</script>{{ endif }}
diff --git a/view/theme/dispy/mail_head.tpl b/view/theme/dispy/mail_head.tpl
index 89615cbd0..d49d7c1af 100755..100644
--- a/view/theme/dispy/mail_head.tpl
+++ b/view/theme/dispy/mail_head.tpl
@@ -1,7 +1,5 @@
 <h3>$messages</h3>
 
-<ul class="tabs-wrapper">
-<li><a href="message" class="tabs">$inbox</a></li>
-<li><a href="message/sent" class="tabs">$outbox</a></li>
-<li><a href="message/new" class="tabs">$new</a></li>
-</ul>
+<div class="tabs-wrapper">
+$tab_content
+</div>
diff --git a/view/theme/dispy/nav.tpl b/view/theme/dispy/nav.tpl
index 79852217f..4a030e7ae 100755..100644
--- a/view/theme/dispy/nav.tpl
+++ b/view/theme/dispy/nav.tpl
@@ -1,57 +1,123 @@
 <nav>
-  $langselector
-
-  <span id="banner">$banner</span>
-
-  {{ if $nav.help }}<a id="nav-help-link" class="nav-link $nav.help.2" href="$nav.help.0" title="$nav.help.1">$nav.help.1</a>{{ endif }}
-  {{ if $nav.login }}<a id="nav-login-link" class="nav-link $nav.login.2" href="$nav.login.0" title="$nav.login.1">$nav.login.1</a> {{ endif }}
-  <a id="nav-search-link" class="nav-link $nav.search.2" href="$nav.search.0" title="$nav.search.1">$nav.search.1</a>
-  <a id="nav-directory-link" class="nav-link $nav.directory.2" href="$nav.directory.0" title="$nav.directory.1">$nav.directory.1</a>
-
-  <div id="user-menu" >
-	  <a id="user-menu-label" onclick="openClose('user-menu-popup'); return false" href="$nav.home.0">$sitelocation</a>
-      
-      <ul id="user-menu-popup" 
-           onmouseover="if (typeof tmenu != 'undefined') clearTimeout(tmenu); openMenu('user-menu-popup')" 
-           onmouseout="tmenu=setTimeout('closeMenu(\'user-menu-popup\');',200)">
-
-
-		  {{ if $nav.register }}<li><a id="nav-register-link" class="nav-commlink $nav.register.2" href="$nav.register.0"  title="$nav.register.1">$nav.register.1</a></li>{{ endif }}
-	      
-	      {{ if $nav.home }}<li><a id="nav-home-link" class="nav-commlink $nav.home.2" href="$nav.home.0">$nav.home.1</a></li>{{ endif }}
-	
-	      {{ if $nav.network }}<li><a id="nav-network-link" class="nav-commlink $nav.network.2" href="$nav.network.0">$nav.network.1</a></li>{{ endif }}
-	
-              {{ if $nav.community }}
-              <li><a id="nav-community-link" class="nav-commlink $nav.community.2" href="$nav.community.0" title="$nav.community.3" >$nav.community.1</a></li>
-              {{ endif }}
-	
-	      {{ if $nav.notifications }}<li><a id="nav-notify-link" class="nav-commlink $nav.notifications.2" href="$nav.notifications.0">$nav.notifications.1</a></li>{{ endif }}
-	      {{ if $nav.messages }}<li><a id="nav-messages-link" class="nav-commlink $nav.messages.2" href="$nav.messages.0">$nav.messages.1</a></li>{{ endif }}
-	      {{ if $nav.contacts }}<li><a id="nav-contacts-link" class="nav-commlink $nav.contacts.2" href="$nav.contacts.0">$nav.contacts.1</a></li>{{ endif }}
-	
-	      {{ if $nav.profiles }}<li><a id="nav-profiles-link" class="nav-commlink nav-sep $nav.profiles.2" href="$nav.profiles.0">$nav.profiles.1</a></li>{{ endif }}
-	      {{ if $nav.settings }}<li><a id="nav-settings-link" class="nav-commlink $nav.settings.2" href="$nav.settings.0">$nav.settings.1</a></li>{{ endif }}
-	      
-	      {{ if $nav.manage }}<li><a id="nav-manage-link" class="nav-commlink $nav.manage.2" href="$nav.manage.0">$nav.manage.1</a></li>{{ endif }}
-	
-		  {{ if $nav.admin }}<li><a id="nav-admin-link" class="nav-commlink $nav.admin.2" href="$nav.admin.0">$nav.admin.1</a></li>{{ endif }}
-	
-
-	      {{ if $nav.logout }}<li><a id="nav-logout-link" class="nav-commlink nav-sep $nav.logout.2" href="$nav.logout.0">$nav.logout.1</a></li> {{ endif }}
-      </ul>
-
-	  <div id="notifications">
-      {{ if $nav.network }}<a id="net-update" class="nav-ajax-update" href="$nav.network.0" title="$nav.network.1"></a>{{ endif }}
-      {{ if $nav.home }}<a id="home-update" class="nav-ajax-update" href="$nav.home.0" title="$nav.home.1"></a>{{ endif }}
-      {{ if $nav.notifications }}<a id="notify-update" class="nav-ajax-update" href="$nav.notifications.0" title="$nav.notifications.1"></a>{{ endif }}
-      {{ if $nav.messages }}<a id="mail-update" class="nav-ajax-update" href="$nav.messages.0" title="$nav.messages.1"></a>{{ endif }}
-	  </div>
-
-  </div>
-
-
-  {{ if $nav.apps }}<a id="nav-apps-link" class="nav-link $nav.apps.2" href="$nav.apps.0" title="$nav.apps.1">$nav.apps.1</a>{{ endif }}
+$langselector
+
+<span id="banner">$banner</span>
+
+<!-- yes, they're going the other way. seems that's how the template renderer
+works -->
+
+    <div id="nav-floater">
+    <div id="nav-buttons">
+    {{ if $nav.help }}
+    <a id="nav-help-link" class="nav-link $nav.help.2" href="$nav.help.0" title="$nav.help.1">$nav.help.1</a>
+    {{ endif }}
+    {{ if $nav.community }}
+    <a id="nav-community-link" class="nav-link $nav.community.2"
+    href="$nav.community.0" title="$nav.community.1">$nav.community.1</a>
+    {{ endif }}
+    {{ if $nav.apps }}
+    <a id="nav-apps-link" class="nav-link $nav.apps.2" href="$nav.apps.0" title="$nav.apps.1">$nav.apps.1</a>
+    {{ endif }}
+    <a id="nav-directory-link" class="nav-link $nav.directory.2" href="$nav.directory.0" title="$nav.directory.1">$nav.directory.1</a>
+    <a id="nav-search-link" class="nav-link $nav.search.2" href="$nav.search.0" title="$nav.search.1">$nav.search.1</a>
+    {{ if $nav.messages }}
+    <a id="nav-messages-link" class="nav-link $nav.messages.2"
+    href="$nav.messages.0" title="$nav.messages.1">$nav.messages.1</a>
+    {{ endif }}
+    {{ if $nav.notifications }}
+    <a id="nav-notifications-linkmenu" class="nav-link $nav.notifications.2" href="$nav.notifications.0" rel="#nav-notifications-menu" title="$nav.notifications.1">$nav.notifications.1</a>
+    <ul id="nav-notifications-menu" class="menu-popup">
+        <li id="nav-notifications-see-all"><a href="$nav.notifications.all.0">$nav.notifications.all.1</a></li>
+        <li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">$nav.notifications.mark.1</a></li>
+        <li class="empty">$emptynotifications</li>
+    </ul>
+    {{ endif }}
+    {{ if $nav.network }}
+    <a id="nav-network-link" class="nav-link $nav.network.2"
+    href="$nav.network.0" title="$nav.network.1">$nav.network.1</a>
+    {{ endif }}
+    {{ if $nav.home }}
+    <a id="nav-home-link" class="nav-link $nav.home.2"
+    href="$nav.home.0" title="$nav.home.1">$nav.home.1</a>
+    {{ endif }}
+    {{ if $nav.login }}
+    <a id="nav-login-link" class="nav-login-link $nav.login.2"
+    href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a>
+    {{ endif }}
+    </div>
+
+    <div id="user-menu">
+        <a id="user-menu-label" onclick="openClose('user-menu-popup'); return false" href="$nav.home.0">$sitelocation</a>
+        <ul id="user-menu-popup"
+            onmouseover="if (typeof tmenu != 'undefined') clearTimeout(tmenu); openMenu('user-menu-popup')"
+            onmouseout="tmenu=setTimeout('closeMenu(\'user-menu-popup\');',200)">
+
+        {{ if $nav.register }}
+        <li>
+        <a id="nav-register-link" class="nav-commlink $nav.register.2" href="$nav.register.0" title="$nav.register.1"></a>
+        </li>
+        {{ endif }}
+
+{{ if $userinfo }}
+        <ul id="nav-user-menu" class="menu-popup">
+            {{ for $nav.usermenu as $usermenu }}
+                <li><a class="$usermenu.2" href="$usermenu.0" title="$usermenu.3">$usermenu.1</a></li>
+            {{ endfor }}
+        </ul>
+{{ endif }}
+
+        {{ if $nav.contacts }}
+        <li><a id="nav-contacts-link" class="nav-commlink $nav.contacts.2" href="$nav.contacts.0" title="$nav.contacts.1">$nav.contacts.1</a></li>
+        {{ endif }}
+		{{ if $nav.introductions }}
+	    <li><a id="nav-intro-link" class="nav-commlink $nav.introductions.2 $sel.introductions" href="$nav.introductions.0" title="$nav.introductions.3" >$nav.introductions.1</a></li>
+		{{ endif }}
+        {{ if $nav.profiles }}
+        <li><a id="nav-profiles-link" class="nav-commlink $nav.profiles.2" href="$nav.profiles.0" title="$nav.profiles.1">$nav.profiles.1</a></li>
+        {{ endif }}
+        {{ if $nav.settings }}
+        <li><a id="nav-settings-link" class="nav-commlink $nav.settings.2" href="$nav.settings.0" title="$nav.settings.1">$nav.settings.1</a></li>
+        {{ endif }}
+        {{ if $nav.manage }}
+        <li><a id="nav-manage-link" class="nav-commlink $nav.manage.2" href="$nav.manage.0" title="$nav.manage.1">$nav.manage.1</a></li>
+        {{ endif }}
+        {{ if $nav.admin }}
+        <li><a id="nav-admin-link" class="nav-commlink $nav.admin.2" href="$nav.admin.0" title="$nav.admin.1">$nav.admin.1</a></li>
+        {{ endif }}
+
+        {{ if $nav.login }}
+        <li><a id="nav-login-link" class="nav-commlink $nav.login.2" href="$nav.login.0" title="$nav.login.1">$nav.login.1</a></li>
+        {{ endif }}
+
+        {{ if $nav.logout }}
+        <li><a id="nav-logout-link" class="nav-commlink $nav.logout.2" href="$nav.logout.0" title="$nav.logout.3" >$nav.logout.1</a></li>
+        {{ endif }}
+        </ul>
+    </div>
+
+    <div id="notifications">
+        {{ if $nav.home }}
+        <a id="home-update" class="nav-ajax-left" href="$nav.home.0" title="$nav.home.1"></a>
+        {{ endif }}
+        {{ if $nav.network }}
+        <a id="net-update" class="nav-ajax-left" href="$nav.network.0" title="$nav.network.1"></a>
+        {{ endif }}
+        {{ if $nav.notifications }}
+        <a id="notify-update" class="nav-ajax-left" href="$nav.notifications.0" title="$nav.notifications.1"></a>
+        {{ endif }}
+        {{ if $nav.messages }}
+        <a id="mail-update" class="nav-ajax-left" href="$nav.messages.0" title="$nav.messages.1"></a>
+        {{ endif }}
+		{{if $nav.introductions }}
+		<a id="intro-update" class="nav-ajax-left" href="$nav.introductions.0"></a>
+		{{ endif }}
+    </div>
+
+</div>
+    <a href="#" class="floaterflip"></a>
 </nav>
 
+<ul id="nav-notifications-template" style="display:none;" rel="template">
+	<li class="{4}"><a href="{0}"><img src="{1}" height="24" width="24" alt="" />{2} <span class="notif-when">{3}</span></a></li>
+</ul>
 
diff --git a/view/theme/dispy/next.png b/view/theme/dispy/next.png
index 353e2e72a..5e0067c4b 100755..100644
--- a/view/theme/dispy/next.png
+++ b/view/theme/dispy/next.png
diff --git a/view/theme/dispy/notifications.png b/view/theme/dispy/notifications.png
index f0f6a90e8..66c432eac 100755..100644
--- a/view/theme/dispy/notifications.png
+++ b/view/theme/dispy/notifications.png
diff --git a/view/theme/dispy/notifications.svg b/view/theme/dispy/notifications.svg
new file mode 100644
index 000000000..eccc54457
--- /dev/null
+++ b/view/theme/dispy/notifications.svg
@@ -0,0 +1,273 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg3486"
+   version="1.1"
+   inkscape:version="0.48+devel r"
+   width="148"
+   height="19"
+   sodipodi:docname="notifications.svg"
+   inkscape:export-filename="/var/www3/kisikew.org/portal/pub/fd/view/theme/dispy/notifications.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <metadata
+     id="metadata3492">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs3490" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1041"
+     inkscape:window-height="643"
+     id="namedview3488"
+     showgrid="false"
+     inkscape:zoom="4.2687885"
+     inkscape:cx="64.235788"
+     inkscape:cy="18.27268"
+     inkscape:window-x="0"
+     inkscape:window-y="48"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg3486"
+     width="0px"
+     height="0px"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0" />
+  <g
+     id="g4437"
+     transform="translate(0,-44)">
+    <path
+       sodipodi:nodetypes="ccccc"
+       transform="translate(0,44)"
+       style="fill:#6c99c9"
+       d="M 34.398531,19 30.225818,10.411298 47.864407,1.3368391 57.625819,19.010154 z"
+       id="path3506"
+       inkscape:connector-curvature="0" />
+    <path
+       sodipodi:nodetypes="ccccccccccccccc"
+       transform="translate(0,44)"
+       style="fill:#4e7db5"
+       d="m 45.148088,5.1797115 -9.353484,4.7866764 6.895762,1.5144501 z m -2.0018,7.2466465 -8.105899,-1.97793 3.232895,6.44678 11.074578,-5.648894 -3.366977,-6.4432724 z M 46.4192,3.6690997 50.56253,11.552848 38.044003,18.006578 33.98857,10.057271 z"
+       id="path3502"
+       inkscape:connector-curvature="0" />
+  </g>
+  <g
+     id="g4441"
+     transform="translate(0,-44)">
+    <path
+       sodipodi:nodetypes="ccccc"
+       transform="translate(0,44)"
+       style="fill:#aa7ca5"
+       d="M 64.398531,19 60.225818,10.411298 77.725,2.013353 87.084493,18.988196 z"
+       id="path3504"
+       inkscape:connector-curvature="0" />
+    <path
+       sodipodi:nodetypes="sssssccccc"
+       transform="translate(-0.88048036,44.641441)"
+       style="fill:#75507b"
+       d="m 75,16 c -0.55,0 -1,-0.45 -1,-1 0,-0.55 0.45,-1 1,-1 0.55,0 1,0.45 1,1 0,0.55 -0.45,1 -1,1 z m -1.441718,-2.172038 c 0,0 -2.448135,-3.9460956 -3.558282,-6.0504682 0,-0.4276216 1.043961,-0.9072067 1.57461,-0.9072067 1.48457,2.2735627 3.276272,6.3043659 3.276272,6.3043659 -0.823179,-0.104873 -0.90154,-0.01483 -1.2926,0.653309 z"
+       id="path3498"
+       inkscape:connector-curvature="0" />
+  </g>
+  <g
+     id="g4453"
+     transform="translate(0,-24)">
+    <path
+       sodipodi:nodetypes="ccccc"
+       transform="translate(0,24)"
+       style="fill:#f4ac42;fill-opacity:1"
+       d="M 4.3985314,19 0.19544564,10.348783 18,1.8695178 27,19 z"
+       id="path3508"
+       inkscape:connector-curvature="0" />
+    <g
+       transform="translate(0,-20)"
+       id="g4361">
+      <path
+         sodipodi:type="arc"
+         style="fill:#e98007;fill-opacity:1;stroke:none"
+         id="path274"
+         sodipodi:cx="559.67499"
+         sodipodi:cy="21.754047"
+         sodipodi:rx="0.88388348"
+         sodipodi:ry="0.88388348"
+         d="m 560.55887,21.754047 a 0.88388348,0.88388348 0 1 1 -1.76777,0 0.88388348,0.88388348 0 1 1 1.76777,0 z"
+         transform="matrix(1.0481621,1.5589904,-1.5589904,1.0481621,-539.42292,-838.01094)" />
+      <path
+         transform="matrix(0.78612158,1.1692428,-1.1692428,0.78612158,-396.15077,-611.38593)"
+         d="m 560.55887,21.754047 a 0.88388348,0.88388348 0 1 1 -1.76777,0 0.88388348,0.88388348 0 1 1 1.76777,0 z"
+         sodipodi:ry="0.88388348"
+         sodipodi:rx="0.88388348"
+         sodipodi:cy="21.754047"
+         sodipodi:cx="559.67499"
+         id="path276"
+         style="fill:#e98007;fill-opacity:1;stroke:none"
+         sodipodi:type="arc" />
+      <path
+         sodipodi:type="arc"
+         style="fill:#e98007;fill-opacity:1;stroke:none"
+         id="path279"
+         sodipodi:cx="559.67499"
+         sodipodi:cy="21.754047"
+         sodipodi:rx="0.88388348"
+         sodipodi:ry="0.88388348"
+         d="m 560.55887,21.754047 a 0.88388348,0.88388348 0 1 1 -1.76777,0 0.88388348,0.88388348 0 1 1 1.76777,0 z"
+         transform="matrix(0.8235559,1.224921,-1.224921,0.8235559,-420.44896,-652.37384)" />
+      <path
+         style="fill:none;stroke:#e98007;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 563.21055,31.653543 4.41942,-6.187185 -7.6014,-6.187184"
+         id="path281"
+         inkscape:connector-curvature="0"
+         transform="matrix(0.37434361,0.55678228,-0.55678228,0.37434361,-184.9504,-268.16228)" />
+      <path
+         transform="matrix(0.89842466,1.3362775,-1.3362775,0.89842466,-465.66125,-710.18506)"
+         d="m 560.55887,21.754047 a 0.88388348,0.88388348 0 1 1 -1.76777,0 0.88388348,0.88388348 0 1 1 1.76777,0 z"
+         sodipodi:ry="0.88388348"
+         sodipodi:rx="0.88388348"
+         sodipodi:cy="21.754047"
+         sodipodi:cx="559.67499"
+         id="path283"
+         style="fill:#e98007;fill-opacity:1;stroke:none"
+         sodipodi:type="arc" />
+      <path
+         style="fill:none;stroke:#e98007;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 567.45319,25.466358 7.6014,-4.065864"
+         id="path285"
+         inkscape:connector-curvature="0"
+         transform="matrix(0.37434361,0.55678228,-0.55678228,0.37434361,-184.9504,-268.16228)" />
+    </g>
+  </g>
+  <g
+     id="g4566"
+     transform="translate(0,-24)">
+    <path
+       sodipodi:nodetypes="ccccc"
+       transform="translate(0,24)"
+       style="fill:#6fcb15"
+       d="M 94.398531,19 90.225818,10.411298 108.5,1.9724323 117,19 z"
+       id="path3500"
+       inkscape:connector-curvature="0" />
+    <path
+       sodipodi:nodetypes="cccccccc"
+       inkscape:connector-curvature="0"
+       d="m 14.756588,131.15925 0,9.60545 -11.6032194,-0.0118 0,-9.58225 m -0.039261,-0.0651 5.8825232,-3.13423 5.9219702,3.25106 z"
+       style="font-size:16px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;fill:none;stroke:#428107;stroke-width:0.80000001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;font-family:Verdana;-inkscape-font-specification:Verdana"
+       transform="matrix(0.55727141,-0.25996788,0.2876144,0.61653494,59.024831,-44.715085)"
+       id="path1037" />
+  </g>
+  <g
+     id="g4553"
+     transform="translate(0,-24)">
+    <path
+       inkscape:connector-curvature="0"
+       id="path4471"
+       d="M 94.398531,19 90.225818,10.411298 108.5,1.9724323 117,19 z"
+       style="fill:#fb7b62;fill-opacity:1"
+       transform="translate(31,24)"
+       sodipodi:nodetypes="ccccc" />
+    <path
+       transform="matrix(0.59287153,-0.28418321,0.25089012,0.52341448,79.780054,-59.357394)"
+       d="m 7.3250635,194.45924 a 2.0660436,1.5964882 0 1 1 -4.1320873,0 2.0660436,1.5964882 0 1 1 4.1320873,0 z"
+       sodipodi:ry="1.5964882"
+       sodipodi:rx="2.0660436"
+       sodipodi:cy="194.45924"
+       sodipodi:cx="5.2590199"
+       id="path4218"
+       style="fill:#c32405;fill-opacity:1;fill-rule:nonzero;stroke:#c32405;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+       sodipodi:type="arc" />
+    <use
+       height="200"
+       width="250"
+       transform="translate(0.11687856,-8.4237924)"
+       id="use4224"
+       xlink:href="#path4218"
+       y="0"
+       x="0"
+       style="fill:#999999;stroke:#666666" />
+    <use
+       height="200"
+       width="250"
+       transform="translate(6.5982765,5.2049933)"
+       id="use4226"
+       xlink:href="#use4224"
+       y="0"
+       x="0"
+       style="fill:#999999;stroke:#c32405;stroke-opacity:1" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#c32405;fill-opacity:1;fill-rule:nonzero;stroke:#c32405;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+       id="path4228"
+       sodipodi:cx="5.2590199"
+       sodipodi:cy="194.45924"
+       sodipodi:rx="2.0660436"
+       sodipodi:ry="1.5964882"
+       d="m 7.3250635,194.45924 a 2.0660436,1.5964882 0 1 1 -4.1320873,0 2.0660436,1.5964882 0 1 1 4.1320873,0 z"
+       transform="matrix(0.59287153,-0.28418321,0.25089012,0.52341448,81.644877,-64.113316)" />
+    <path
+       transform="matrix(0.59287153,-0.28418321,0.25089012,0.52341448,79.780054,-59.357394)"
+       inkscape:connector-curvature="0"
+       id="path4230"
+       d="m 10.902837,183.0346 0,3.66687"
+       style="fill:none;stroke:#c32405;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+       sodipodi:nodetypes="cc" />
+    <path
+       sodipodi:nodetypes="cc"
+       transform="matrix(0.59287153,-0.28418321,0.25089012,0.52341448,79.780054,-59.357394)"
+       inkscape:connector-curvature="0"
+       id="path4232"
+       d="m 9.2894123,189.68386 -2.3956906,3.56909"
+       style="fill:none;stroke:#c32405;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+    <path
+       sodipodi:nodetypes="cc"
+       transform="matrix(0.59287153,-0.28418321,0.25089012,0.52341448,79.780054,-59.357394)"
+       inkscape:connector-curvature="0"
+       id="path4234"
+       d="m 12.46737,189.68386 2.493472,3.5202"
+       style="fill:none;stroke:#c32405;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+    <path
+       sodipodi:nodetypes="cc"
+       transform="matrix(0.59287153,-0.28418321,0.25089012,0.52341448,79.780054,-59.357394)"
+       inkscape:connector-curvature="0"
+       id="path4236"
+       d="m 12.467368,182.74125 4.009116,9.925"
+       style="fill:none;stroke:#c32405;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+    <path
+       sodipodi:nodetypes="cc"
+       transform="matrix(0.59287153,-0.28418321,0.25089012,0.52341448,79.780054,-59.357394)"
+       inkscape:connector-curvature="0"
+       id="path4238"
+       d="m 9.4849789,182.83904 -4.2046813,9.87611"
+       style="fill:none;stroke:#c32405;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+    <path
+       sodipodi:nodetypes="cc"
+       transform="matrix(0.59287153,-0.28418321,0.25089012,0.52341448,79.780054,-59.357394)"
+       inkscape:connector-curvature="0"
+       id="path4240"
+       d="m 7.4315299,194.71969 7.0403961,0"
+       style="fill:none;stroke:#c32405;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+  </g>
+</svg>
diff --git a/view/theme/dispy/premium.png b/view/theme/dispy/premium.png
index 1ad601c0f..d2855a4f5 100755..100644
--- a/view/theme/dispy/premium.png
+++ b/view/theme/dispy/premium.png
diff --git a/view/theme/dispy/prev.png b/view/theme/dispy/prev.png
index 0ae6022af..10b10d74f 100755..100644
--- a/view/theme/dispy/prev.png
+++ b/view/theme/dispy/prev.png
diff --git a/view/theme/dispy/profile_vcard.tpl b/view/theme/dispy/profile_vcard.tpl
index b3f5cc50d..0c289d982 100755..100644
--- a/view/theme/dispy/profile_vcard.tpl
+++ b/view/theme/dispy/profile_vcard.tpl
@@ -2,34 +2,53 @@
 
 	<div class="fn label">$profile.name</div>
 	
-				
-	
-	{{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }}
-	<div id="profile-photo-wrapper"><img class="photo" width="175" height="175" src="$profile.photo" alt="$profile.name"></div>
-
-
+	{{ if $pdesc }}
+    <div class="title">$profile.pdesc</div>
+    {{ endif }}
+	<div id="profile-photo-wrapper">
+    <img class="photo" width="175" height="175" src="$profile.photo" alt="$profile.name" />
+    </div>
 
 	{{ if $location }}
-		<dl class="location"><dt class="location-label">$location</dt> 
-		<dd class="adr">
-			{{ if $profile.address }}<div class="street-address">$profile.address</div>{{ endif }}
-			<span class="city-state-zip">
-				<span class="locality">$profile.locality</span>{{ if $profile.locality }}, {{ endif }}
-				<span class="region">$profile.region</span>
-				<span class="postal-code">$profile.postal-code</span>
-			</span>
+		<div class="location">
+        <span class="location-label">$location</span>
+		<div class="adr">
+			{{ if $profile.address }}
+            <div class="street-address">$profile.address</div>{{ endif }}
+			<span class="city-state-zip">$profile.zip</span>
+            <span class="locality">$profile.locality</span>{{ if $profile.locality }}, {{ endif }}
+            <span class="region">$profile.region</span>
+            <span class="postal-code">$profile.postal-code</span>
 			{{ if $profile.country-name }}<span class="country-name">$profile.country-name</span>{{ endif }}
-		</dd>
-		</dl>
+		</div>
+		</div>
 	{{ endif }}
 
-	{{ if $gender }}<dl class="mf"><dt class="gender-label">$gender</dt> <dd class="x-gender">$profile.gender</dd></dl>{{ endif }}
+	{{ if $gender }}
+    <div class="mf">
+        <span class="gender-label">$gender</span>
+        <span class="x-gender">$profile.gender</span>
+    </div>
+    {{ endif }}
 	
-	{{ if $profile.pubkey }}<div class="key" style="display:none;">$profile.pubkey</div>{{ endif }}
+	{{ if $profile.pubkey }}
+    <div class="key" style="display:none;">$profile.pubkey</div>
+    {{ endif }}
 
-	{{ if $marital }}<dl class="marital"><dt class="marital-label"><span class="heart">&hearts;</span>$marital</dt><dd class="marital-text">$profile.marital</dd></dl>{{ endif }}
+	{{ if $marital }}
+    <div class="marital">
+    <span class="marital-label">
+    <span class="heart">&hearts;</span>$marital</span>
+    <span class="marital-text">$profile.marital</span>
+    </div>
+    {{ endif }}
 
-	{{ if $homepage }}<dl class="homepage"><dt class="homepage-label">$homepage</dt><dd class="homepage-url"><a href="$profile.homepage" target="external-link">$profile.homepage</a></dd></dl>{{ endif }}
+	{{ if $homepage }}
+    <div class="homepage">
+    <span class="homepage-label">$homepage</span>
+    <span class="homepage-url"><a href="$profile.homepage"
+    target="external-link">$profile.homepage</a></span>
+    </div>{{ endif }}
 
 	{{ inc diaspora_vcard.tpl }}{{ endinc }}
 	
diff --git a/view/theme/dispy/search_item.tpl b/view/theme/dispy/search_item.tpl
index 3d841ab08..54c3e389c 100755
--- a/view/theme/dispy/search_item.tpl
+++ b/view/theme/dispy/search_item.tpl
@@ -1,40 +1,40 @@
-<div class="wall-item-outside-wrapper$indent" id="wall-item-outside-wrapper-$id" >
-	<div class="wall-item-content-wrapper$indent" id="wall-item-content-wrapper-$id" >
-		<div class="wall-item-info" id="wall-item-info-$id">
-			<div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-$id" 
-				 onmouseover="if (typeof t$id != 'undefined') clearTimeout(t$id); openMenu('wall-item-photo-menu-button-$id')" 
-				 onmouseout="t$id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$id\'); closeMenu(\'wall-item-photo-menu-$id\');',200)">
-				<a href="$profile_url" title="$linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$id">
-				<img src="$thumb" class="wall-item-photo$sparkle" id="wall-item-photo-$id" style="height: 80px; width: 80px;" alt="$name" /></a>
-				<span onclick="openClose('wall-item-photo-menu-$id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$id">menu</span>
-				<div class="wall-item-photo-menu" id="wall-item-photo-menu-$id">
+<div class="wall-item-outside-wrapper$item.indent" id="wall-item-outside-wrapper-$item.id" >
+	<div class="wall-item-content-wrapper$item.indent" id="wall-item-content-wrapper-$item.id" >
+		<div class="wall-item-info" id="wall-item-info-$item.id">
+			<div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-$item.id" 
+				 onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')" 
+				 onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)">
+				<a href="$item.profile_url" title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id">
+				<img src="$item.thumb" class="wall-item-photo$item.sparkle" id="wall-item-photo-$item.id" style="height: 80px; width: 80px;" alt="$item.name" /></a>
+				<span onclick="openClose('wall-item-photo-menu-$item.id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$item.id">menu</span>
+				<div class="wall-item-photo-menu" id="wall-item-photo-menu-$item.id">
 					<ul>
-						$item_photo_menu
+						$item.item_photo_menu
 					</ul>
 				</div>
 			</div>
 			<div class="wall-item-photo-end"></div>	
-			<div class="wall-item-location" id="wall-item-location-$id">{{ if $location }}<span class="icon globe"></span>$location {{ endif }}</div>
+			<div class="wall-item-location" id="wall-item-location-$item.id">{{ if $item.location }}<span class="icon globe"></span>$item.location {{ endif }}</div>
 		</div>
 		<div class="wall-item-lock-wrapper">
-			{{ if $lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$lock" onclick="lockview(event,$id);" /></div>
+			{{ if $item.lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$item.lock" onclick="lockview(event,$item.id);" /></div>
 			{{ else }}<div class="wall-item-lock"></div>{{ endif }}	
 		</div>
-		<div class="wall-item-tools" id="wall-item-tools-$id">
-			<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$id" >
-				{{ if $drop.dropping }}<a href="item/drop/$id" onclick="return confirmDelete();" class="icon drophide" title="$drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
+		<div class="wall-item-tools" id="wall-item-tools-$item.id">
+			<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" >
+				{{ if $item.drop.dropping }}<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drophide" title="$item.drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
 			</div>
-				{{ if $drop.dropping }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$drop.select" class="item-select" name="itemselected[]" value="$id" />{{ endif }}
+				{{ if $item.drop.dropping }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" />{{ endif }}
 			<div class="wall-item-delete-end"></div>
 		</div>
-		<div class="wall-item-content" id="wall-item-content-$id" >
-			<div class="wall-item-title" id="wall-item-title-$id">$title</div>
+		<div class="wall-item-content" id="wall-item-content-$item.id" >
+			<div class="wall-item-title" id="wall-item-title-$item.id">$item.title</div>
 			<div class="wall-item-title-end"></div>
-			<div class="wall-item-body" id="wall-item-body-$id" >$body</div>
+			<div class="wall-item-body" id="wall-item-body-$item.id" >$item.body</div>
 		</div>
 		<div class="wall-item-author">
-				<a href="$profile_url" title="$linktitle" class="wall-item-name-link"><span class="wall-item-name$sparkle" id="wall-item-name-$id" >$name</span></a>
-				<div class="wall-item-ago"  id="wall-item-ago-$id">$ago</div>
+				<a href="$item.profile_url" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle" id="wall-item-name-$item.id" >$item.name</span></a>
+				<div class="wall-item-ago"  id="wall-item-ago-$item.id">$item.ago</div>
 				
 		</div>			
 		
@@ -42,10 +42,10 @@
 	<div class="wall-item-wrapper-end"></div>
 </div>
 
-<div class="wall-item-outside-wrapper-end$indent" ></div>
-	<div class="wall-item-conv" id="wall-item-conv-$id" >
-	{{ if $conv }}
-		<a href='$conv.href' id='context-$id' title='$conv.title'>$conv.title</a>
+<div class="wall-item-outside-wrapper-end$item.indent" ></div>
+	<div class="wall-item-conv" id="wall-item-conv-$item.id" >
+	{{ if $item.conv }}
+		<a href='$item.conv.href' id='context-$item.id' title='$item.conv.title'>$item.conv.title</a>
 	{{ endif }}
 	</div>
 
diff --git a/view/theme/dispy/style.css b/view/theme/dispy/style.css
index 7f563293a..0977d5fcb 100755..100644
--- a/view/theme/dispy/style.css
+++ b/view/theme/dispy/style.css
@@ -1,101 +1,266 @@
-body {
-	margin: 0px;
-	padding: 0px;
-	font-family: freesans,helvetica,arial,clean,sans-serif;
-	font-size: 16px;
-}
-img {  border: 0 none; }
+/*
+ * dispy
+ *
+ * modernised, sort of, by simon <http://simon.kisikew.org/>
+ *
+ */
 
-a { color: #3465a4; text-decoration: none; margin-bottom:1px;}
-a:hover { color: #729fcf; padding-bottom: 0px; border-bottom: 1px dotted #729fcf;}
+/* from html5boilerplate */
 
+/* these are to tell browsers they should be displayed a certain way */
+article, aside, details, figcaption, figure, footer,
+header, hgroup, nav, section {
+    display: block;
+}
+audio, canvas, video, time {
+    display: inline-block;
+    *display: inline;
+    *zoom: 1;
+}
+audio:not([controls]) {
+    display: none;
+}
+[hidden] {
+    display: none;
+}
 
-.required { display: inline; color: #ff0000;}
-.fakelink { color: #3465a4; cursor: pointer; }
-.fakelink :hover{ color: #729fcf; }
+/* 
+ *  Base
+ */
 
+/*
+ * 1. Correct text resizing oddly in IE6/7 when body font-size is set using em units
+ * 2. Force vertical scrollbar in non-IE
+ * 3. Prevent iOS text size adjust on device orientation change, without disabling user zoom: h5bp.com/g
+ */
+
+html {
+    font-size: 100%;
+    overflow-y: scroll;
+    -webkit-text-size-adjust: 100%;
+    -ms-text-size-adjust: 100%;
+}
+body {
+    margin: 0;
+    font-size: 16px;
+    line-height: 1.1em;
+}
+body, button, input, select, textarea {
+    font-family: sans-serif;
+    color: #222;
+    background-color: rgb(254,254,254);
+}
+select {
+	border: 1px #555 dotted;
+	padding: 3px;
+	margin: 2px;
+}
+option {
+	padding: 3px;
+}
+/* remember to define focus styles! */
+:focus {
+    outline: 0;
+}
+
+/* remember to highlight inserts somehow! */
+ins {
+    background-color: #ff9;
+    color: #000;
+    text-decoration: none;
+}
+mark {
+    background-color: #ff9;
+    color: #000;
+    font-style: italic;
+    font-weight: bold;
+}
+ins {
+    background: #ff9;
+    color: #000;
+    text-decoration: none;
+}
+mark {
+    background: #ff0;
+    color: #000;
+    font-style: italic;
+    font-weight: bold;
+}
+/* Redeclare monospace font family: h5bp.com/j */
+pre, code, kbd, samp, .wall-item-body code {
+    font-family: monospace, monospace;
+    _font-family: 'courier new', monospace;
+    font-size: 1em; }
+
+/* Improve readability of pre-formatted text in all browsers */
+pre, .wall-item-body code {
+    white-space: pre;
+    white-space: pre-wrap;
+    word-wrap: break-word;
+}
+
+q {
+    quotes: none;
+}
+q:before, q:after {
+    content: "";
+    content: none;
+}
+small {
+    font-size: 85%;
+}
+
+/* Position subscript and superscript content without affecting line-height: h5bp.com/k */
+sub, sup {
+    font-size: 75%;
+    line-height: 0;
+    position: relative;
+    vertical-align: baseline;
+}
+sup {
+    top: -0.5em;
+}
+sub {
+    bottom: -0.25em;
+}
+img {
+    border: 0 none;
+    /*vertical-align: middle;*/
+}
+a {
+    color: #3465a4;
+    text-decoration: none;
+    margin-bottom: 1px;
+}
+a:hover img {
+    text-decoration: none;
+}
+blockquote {
+    background: #eee;
+    text-indent: 5px;
+    padding: 5px;
+    border: 1px #aaa solid;
+    border-radius: 5px;
+}
+a:hover {
+    color: #729fcf;
+    padding-bottom: 0;
+    border-bottom: 1px dotted #729fcf;
+}
+.required {
+    display: inline;
+    color: #ff0;
+    font-size: 16px;
+    font-weight: bold;
+    margin: 3px;
+}
+.fakelink, .lockview {
+    color: #3465a4;
+    cursor: pointer;
+}
+.fakelink:hover {
+    color: #729fcf;
+}
 input[type=submit] {
-	margin-top: 20px;
-	height: 22px;
-	background-color: #555753;
-	color: #eeeeec;
-	-webkit-border-radius: 5px ;
-	-moz-border-radius: 5px;
-	border-radius: 5px;
-	border: 0px;	
+    margin-top: 10px;
+    height: 22px;
+    background-color: #555753;
+    color: #eeeeec;
+    -webkit-border-radius: 5px;
+    -moz-border-radius: 5px;
+    border-radius: 5px;
+    border: 0;
+}
+.smalltext {
+    font-size: 0.7em;
 }
-
-.smalltext { font-size: 0.7em }
-
 #panel {
 	position: absolute;
-	font-size:0.8em;
-	-webkit-border-radius: 5px ;
+	font-size: 0.8em;
+	-webkit-border-radius: 5px;
 	-moz-border-radius: 5px;
 	border-radius: 5px;
-	border: 1px solid #ffffff;
+	border: 1px solid #fff;
 	background-color: #2e3436;
 	color: #eeeeec;
-	padding:1em;
+	padding: 1em;
 }
-
 .pager {
-	padding-top: 30px;
-	display:block;
+	margin-top: 60px;
+	display: block;
 	clear: both;
 	text-align: center;
 }
+.pager span {
+    padding: 4px;
+    margin: 4px;
+}
+.pager_current {
+    background-color: #729fcf;
+    color: #fff;
+}
 
-.pager span { padding: 4px; margin:4px; }
-.pager_current { background-color: #729fcf; color: #ffffff; }
+/**
+ * global
+ */
+/* .tool .action */
+.action {
+    float: right;
+}
 
 /**
  * 	login
  */
-#login-extra-links a { margin-right: 20px; }
+#login-extra-links a {
+    margin-right: 20px;
+}
 
 /*********
 * nav
 *********/
-
 nav {
-	height: 50px;
+	height: 60px;
 	display: block;
 	background-color: #2e3436;
 	color: #eeeeec;
 	position: relative;
-	padding: 0px 10%;
+	padding: 20px 20px 10px 95px;
+    margin-left: auto;
+    margin-right: auto;
+}
+nav a {
+	text-decoration: none;
+	color: #eeeeec;
+	border: 0px;
+}
+nav a:hover {
+	text-decoration: none;
+	color: #eeeeec;
+    border: 0px;
 }
-nav a { text-decoration: none;	color: #eeeeec; border:0px;}
-nav a:hover { text-decoration: none;	color: #eeeeec; border:0px;}
-
 nav #banner {
 	display: block;
 	position: absolute;
-	margin-left: 20px;	
+	left: 51px;
+	top: 25px;
 }
 nav #banner #logo-text a {
 	font-size: 40px;
 	font-weight: bold;
 	margin-left: 3px;
 }
-
 nav #user-menu {
     display: block;	
-	width: auto;
+    width: auto;
     float: right;
-    margin-top: 22px;
-    margin-right: 10px;
+    margin: 3px 68px 0 0;
     position: relative;
-    vertical-align: middle;
-
 	background-color: #555753;
-
     -webkit-border-radius: 5px;
     -moz-border-radius: 5px;
     border-radius: 5px;
-    
     background: #555753 url("menu-user-pin.jpg") 98% center no-repeat;
+    clear: both;
 }
 nav #user-menu-label {
 	float: left;
@@ -103,377 +268,900 @@ nav #user-menu-label {
     padding: 3px 20px 9px 5px;
     height: 10px;
 }
-
 ul#user-menu-popup {
-    display: none;
-    position: absolute;
-    background-color: #555753;
-    width: 100%;
+	display: none;
+	position: absolute;
+	background-color: #555753;
+	width: 100%;
     padding: 10px 0px;
     margin: 0px;
-    top: 20px;
-	left: 0px;
-
-    -webkit-border-radius: 0px 0px 5px 5px;
-    -moz-border-radius: 0px 0px 5px 5px;    
-    border-radius: 0px 0px 5px 5px;
-    
-    z-index: 10000;
+	top: 20px;
+	left: 0;
+	-webkit-border-radius: 0 0 5px 5px;
+	-moz-border-radius: 0 0 5px 5px;
+	border-radius: 0 0 5px 5px;
+	z-index: 10000;
+}
+ul#user-menu-popup li {
+	display: block;
+}
+ul#user-menu-popup li a {
+	display: block;
+	padding: 5px;
+}
+ul#user-menu-popup li a:hover {
+	color: #2e3436;
+	background-color: #eeeeec;
+}
+ul#user-menu-popup li a.nav-sep {
+	border-top: 1px solid #eeeeec;
+}
+#nav-buttons {
+    clear: both;
+	list-style: none;
+	padding: 0px;
+}
+#nav-buttons li {
+	padding: 0;
 }
-
-ul#user-menu-popup li { display: block; }
-ul#user-menu-popup li a { display: block; padding: 5px; }
-ul#user-menu-popup li a:hover { color: #2e3436; background-color: #eeeeec; }
-ul#user-menu-popup li a.nav-sep { border-top: 1px solid #eeeeec; }
 nav .nav-link {
-    float: right;
-    display: block;
-    width: 22px;
-    height: 22px;
-    /*border: 1px solid #eeeeec;*/
-    overflow: hidden;
-    margin-top: 22px;
-    margin-right: 10px;
-    text-indent: 50px;
-    background: transparent url('icons.png') 0px 0px no-repeat; 
+	float: right;
+	display: block;
+	width: 22px;
+	height: 22px;
+	overflow: hidden;
+	margin: 0px 5px 5px;
+	text-indent: 50px;
+	background: transparent url(icons.png) 0 0 no-repeat;
+}
+#nav-apps-link {
+	background-position: 0 -66px;
+}
+#nav-apps-link:hover {
+	background-position: -22px -66px;
+}
+#nav-community-link {
+    background-position: 0 -22px;
+}
+#nav-community-link:hover {
+    background-position: -22px -22px;
+}
+#nav-contacts-link {
+    background-position: 0 -22px;
+}
+#nav-contacts-link:hover {
+    background-position: -22px -22px;
+}
+#nav-directory-link {
+	background-position: -44px -154px;
+}
+#nav-directory-link:hover {
+	background-position: -66px -154px;
+}
+#nav-help-link {
+	background-position: 0 -110px;
+}
+#nav-help-link:hover {
+	background-position: -22px -110px;
+}
+#nav-home-link {
+    background-position: -44px -132px;
+}
+#nav-home-link:hover {
+    background-position: -66px -132px;
+}
+#nav-intro-link {
+	background-position: 0px -190px;
+}
+#nav-intro-link:hover {
+	background-position: -44px -190px;
+}
+#nav-login-link {
+	background-position: 0 -88px;
+}
+#nav-login-link:hover {
+	background-position: -22px -88px;
+}
+#nav-logout-link {
+	background-position: 0 -88px;
+}
+#nav-logout-link:hover {
+	background-position: -22px -88px;
+}
+#nav-messages-link {
+    background-position: -44px -88px;
+}
+#nav-messages-link:hover {
+    background-position: -66px -88px;
+}
+#nav-notify-link, #nav-notifications-linkmenu {
+    background-position: -44px -110px;
+}
+#nav-notify-link:hover {
+    background-position: -66px -110px;
+}
+#nav-network-link {
+    background-position: 0px -177px;
+}
+#nav-network-link:hover {
+    background-position: -22px -177px;
+}
+#nav-search-link {
+	background-position: 0 -44px;
+}
+#nav-search-link:hover {
+	background-position: -22px -44px;
+}
+#profile-link,
+#profile-title, 
+#wall-image-upload,
+#wall-file-upload,
+#profile-attach-wrapper,
+#profile-audio,
+#profile-link,
+#profile-location,
+#profile-nolocation,
+#profile-title,
+#jot-title,
+#profile-upload-wrapper,
+#profile-video,
+#profile-jot-submit,
+#wall-image-upload-div,
+#wall-file-upload-div,
+.icon, .hover, .focus, .pointer {
+    cursor: pointer;
 }
-
-#nav-directory-link 		{ background-position: 0px -22px }
-#nav-directory-link:hover	{ background-position: -22px -22px;}
-#nav-search-link 			{ background-position: 0px -44px }
-#nav-search-link:hover 		{ background-position: -22px -44px;}
-#nav-apps-link 				{ background-position: 0px -66px }
-#nav-apps-link:hover		{ background-position: -22px -66px;}
-#nav-login-link 			{ background-position: 0px -88px }
-#nav-login-link:hover 		{ background-position: -22px -88px;}
-#nav-help-link 				{ background-position: 0px -110px }
-#nav-help-link:hover 		{ background-position: -22px -110px;}
-
-
 #notifications {
-	height: 20px; width: 100%;
+	height: 20px;
+	width: 100%;
 	position: absolute;
-	top:-19px; left: 0px;
+	top: -19px;
+	left: 0;
+}
+/* popup notifications */
+div.jGrowl div.notice {
+    background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center;
+    color: #ffffff;
+    padding-left: 58px;
+}
+div.jGrowl div.info {
+    background: #364e59 url("../../../images/icons/48/info.png") no-repeat 5px center;
+    color: #ffffff;
+    padding-left: 58px;
+}
+#nav-notifications-menu {
+    margin: 30px 0 0 -45px;
+    width: 300px;
+    max-height: 400px;
+    overflow: auto;
+    font-size: 9pt;
+}
+#nav-notifications-menu .contactname {
+    font-weight: bold;
+    font-size: 0.9em;
+}
+#nav-notifications-menu img {
+    float: left;
+    margin-right: 5px;
+}
+#nav-notifications-menu .notif-when {
+    font-size: 0.8em;
+    display: block;
+}
+#nav-notifications-menu li {
+    padding: 7px 0px 7px 10px;
+    word-wrap: normal;
+    border-bottom: 1px solid #000;
+}
+#nav-notifications-menu li:hover {
+    color: black;
+}
+#nav-notifications-menu a:hover {
+    color: black;
+    text-decoration: underline;
+}
+nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-linkmenu.selected .icon.s22.notify {
+  background-image: url("../../../images/icons/22/notify_on.png");
+}
+.show {
+    display: block;
+}
+#nav-floater {
+    position: fixed;
+    top: 20px;
+    right: 1%;
+    padding: 5px;
+    background: #2e3436;
+    border-radius: 5px;
+    z-index: 100;
 }
-.nav-ajax-update {
+.floaterflip {
+	display: block;
+    position: fixed;
+    z-index: 110;
+    top: 53px;
+    right: 19px;
+	width: 22px;
+	height: 22px;
+	overflow: hidden;
+	margin: 0px;
+	background: transparent url(icons.png) -190px -60px no-repeat;
+}
+.nav-ajax-update, .nav-ajax-left {
 	width: 30px;
 	height: 19px;
-	background: transparent url('notifications.png') 0px 0px no-repeat; 
-	color: #ffffff;
+	background: transparent url(notifications.png) 0 0 no-repeat;
+	color: #222;
 	font-weight: bold;
 	font-size: 0.8em;
 	padding-top: 0.2em;
 	text-align: center;
 	float: left;
-	margin-right: -4px;
-    display: none;
+	margin: 0 -1px 0 3px;
+	display: block;
+	visibility: hidden;
+}
+.nav-ajax-update.show, .nav-ajax-left.show {
+    visibility: visible;
+}
+#net-update {
+	background-position: 0px 0px;
+}
+#mail-update {
+	background-position: -30px 0;
+}
+#notify-update {
+	background-position: -60px 0px;
+}
+#home-update {
+	background-position: -90px 0px;
+}
+#intro-update {
+	background-position: -120px 0px;
 }
-#net-update { background-position: 0px 0px; }
-#mail-update { background-position: -30px 0px; }
-#notify-update { background-position: -60px 0px; }
-#home-update { background-position: -90px 0px; }
-
 #lang-select-icon {
 	cursor: pointer;
 	position: absolute;
-	left: 0px;
-	top: 0px;
+	left: 0;
+	top: 0;
 }
-
 #language-selector {
-	position: absolute;
-	top: 0;
-	left: 16px;
+    position: absolute;
+    top: 0;
+    left: 16px;
+}
+.menu-popup {
+    position: absolute;
+    display: none;
+    width: 11em;
+    background: #ffffff;
+    color: #2d2d2d;
+    margin: 0px;
+    padding: 0px;
+    list-style: none;
+    border: 3px solid #364e59;
+    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);
+    box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+}
+.menu-popup a {
+    display: block;
+    color: #2d2d2d;
+    padding: 5px 10px;
+    text-decoration: none;
+}
+.menu-popup a:hover {
+    background-color: #bdcdd4;
+}
+.menu-popup .menu-sep {
+    border-top: 1px solid #9eabb0;
+}
+.menu-popup li {
+    float: none;
+    overflow: auto;
+    height: auto;
+    display: block;
+}
+.menu-popup li img {
+    float: left;
+    width: 16px;
+    height: 16px;
+    padding-right: 5px;
+}
+.menu-popup .empty {
+    padding: 5px;
+    text-align: center;
+    color: #9eabb0;
+}
+.notif-item {
+    font-size: small;
+}
+.notif-item a {
+    vertical-align: middle;
+}
+.notif-image {
+    width: 32px;
+    height: 32px;
+    padding: 7px 7px 0px 0px;
+}
+.notify-seen {
+    background: #ddd;
 }
-
 
 /** sysmsg **/
-#sysmsg_info{
-	position:fixed; 
-	bottom: 0px; right:20%; 
-	-moz-box-shadow: 0px 0px 5px #888;
-	-webkit-box-shadow: 0px 0px 5px #888;
-	box-shadow: 0px 0px 5px #888;
-	padding: 10px; 
-	background-color: #fcaf3e; border:2px solid #f8911b;
-	border-bottom:0px;
-	padding-bottom: 50px;	
+#sysmsg_info {
+	position:fixed;
+	bottom:0;
+	-moz-box-shadow:0 0 5px #888;
+	-webkit-box-shadow:0 0 5px #888;
+	box-shadow:0 0 5px #888;
+    padding: 10px;
+	background-color:#fcaf3e;
+	border:2px solid #f8911b;
+	border-bottom:0;
+	padding-bottom: 50px;
 	z-index: 1000;
 }
-#sysmsg { 
-	position:fixed; 
-	bottom: 0px; right:10%; 
-	-moz-box-shadow: 0px 0px 5px #888;
-	-webkit-box-shadow: 0px 0px 5px #888;
-	box-shadow: 0px 0px 5px #888;
-	padding: 10px; 
-	background-color: #fcaf3e; border:2px solid #f8911b;
-	border-bottom:0px;
-	padding-bottom: 50px;	
+#sysmsg {
+	position: fixed;
+	bottom: 0;
+	-moz-box-shadow: 0 0 5px #888;
+	-webkit-box-shadow: 0 0 5px #888;
+	box-shadow: 0 0 5px #888;
+    padding: 10px;
+	background-color: #fcaf3e;
+	border: 2px solid #f8911b;
+	border-bottom: 0;
+	padding-bottom: 50px;
 	z-index: 1000;
 }
 #sysmsg_info br,
 #sysmsg br {
-	display:block;
-	margin:2px 0px;
+	display: block;
+	margin: 2px 0px;
 	border-top: 1px solid #ccccce;
 }
 
 
-
 /**
 * aside
 **/
-
 aside {
     position: absolute;
-    right: 11%;
-    width: 200px;
-    font-size: 0.7em;
-
+    right: 15px;
+    width: 245px;
+	padding-top: 15px;
+    font-size: smaller;
+}
+.vcard .fn {
+	font-size: 1.7em;
+	font-weight: bold;
+	border-bottom: 1px solid #729fcf;
+	padding-bottom: 3px;
+}
+.vcard #profile-photo-wrapper {
+	margin: 20px;
+}
+.vcard #profile-photo-wrapper img {
+	box-shadow: 3px 3px 10px 0;
+}
+aside h4 {
+	font-size: 1.2em;
+}
+aside #viewcontacts {
+	text-align: right;
+}
+.aprofile dt {
+    box-shadow: 1px 1px 5px 0;
+    color: #666666;
+    margin: 15px 0 5px;
+    padding-left: 5px;
+}
+#profile-extra-links ul {
+	margin-left: 0px;
+    padding-left: 0px;
+    list-style: none;
 }
-.vcard .fn { font-size: 1.7em; font-weight: bold; border-bottom: 1px solid #729fcf; padding-top: 1px;}
-
-.vcard #profile-photo-wrapper { margin: 10px 0px }
-
-aside h4 { font-size: 1.2em; }
-
-aside #viewcontacts { text-align: right;}
-
-#profile-extra-links ul { margin-left: 0px; padding-left: 0px; list-style: none; }
-
 #dfrn-request-link {
-    background: #3465A4 url('connect.png') no-repeat 95% center;
-    border-radius: 5px 5px 5px 5px;
-    color: #FFFFFF;
-    display: block;
-    font-size: 1.2em;
-    padding: 0.2em 0.5em;
+	background:#3465A4 url(connect.png) no-repeat 95% center;
+	border-radius:5px 5px 5px 5px;
+	color:#fff;
+	display:block;
+	font-size:1.2em;
+	padding:.2em .5em;
 }
-
-
 #netsearch-box {
 	margin: 30px 0px;
 }
 
+
 /**
 * contacts block
 */
-.contact-block-div { width: 50px; height: 50px; float: left; }
-.contact-block-textdiv { width: 150px; height: 34px; float: left; }
-#contact-block-end { clear: both; }
+.contact-block-div {
+    width: 50px;
+    height: 50px;
+    float: left;
+}
+.contact-block-textdiv {
+    width: 150px;
+    height: 34px;
+    float: left;
+}
+#contact-block-end {
+    clear: both;
+}
+
 
 /**
  * jot
- **/ 
-#profile-jot-text_tbl { margin-bottom: 10px; }
-#profile-jot-text_ifr { width: 99.9%!important }
-#profile-jot-submit-wrapper { float: right;}
-#profile-jot-perms { 
- 	float: right;
- 	background-color: #555753;
- 	height: 22px; width: 20px;
-    -webkit-border-radius: 0px 5px 5px 0px;
-    -moz-border-radius: 0px 5px 5px 0px;
-    border-radius: 0px 5px 5px 0px; 	
- 	overflow: hidden;
- 	border: 0px;
- 	margin-left:2px;
-}
-#profile-jot-submit { 
+ **/
+#jot {
+  /*width: 785px;*/
+  margin: 10px 0 20px 0px;
+  width: 100%;
+}
+#jot #jot-tools {
+  margin: 0px;
+  padding: 0px;
+  height: 35px;
+  overflow: none;
+  width: 100%;
+  /*background-color: #0e232e;*/
+  /*border-bottom: 2px solid #9eabb0;*/
+}
+#jot #jot-tools span {
+    float: left;
+    margin: 10px 20px 2px 0px;
+}
+#jot #jot-tools span a {
+    display: block;
+    /*color: #cccccc;    */
+    /*width: 100%;       */
+    /*height: 40px;      */
+    /*text-align: center;*/
+    /*line-height: 40px; */
+    /*overflow: hidden;*/
+}
+/*#jot #jot-tools li:hover {*/
+    /*background-color: #364e59;*/
+/*}*/
+#jot #jot-tools .perms {
+    float: right;
+    width: 40px;
+}
+/*#jot #jot-tools .perms a.unlock {*/
+/*    width: 30px;                    */
+/*    border-left: 10px solid #cccccc;*/
+/*    background-color: #cccccc;      */
+/*}*/
+/*#jot #jot-tools .perms a.lock {*/
+/*    width: 30px;                    */
+/*    border-left: 10px solid #666666;*/
+/*    background-color: #666666;      */
+/*}*/
+/*#jot #jot-tools li.submit {            */
+/*    float: right;                      */
+/*    background-color: #cccccc;         */
+/*    border-bottom: 2px solid #cccccc;  */
+/*    border-right: 1px solid #666666;   */
+/*    border-left: 1px solid #666666;    */
+/*}                                      */
+/*#jot #jot-tools li.submit input {      */
+/*    border: 0px;                       */
+/*    margin: 0px;                       */
+/*    padding: 0px;                      */
+/*    background-color: #cccccc;         */
+/*    color: #666666;                    */
+/*    width: 80px;                       */
+/*    height: 40px;                      */
+/*    line-height: 40px;                 */
+/*}                                      */
+/*#jot #jot-tools li.submit input:hover {*/
+/*    background-color: #bdcdd4;         */
+/*    color: #666666;                    */
+/*}                                      */
+#jot #jot-tools li.loading {
+    float: right;
+    background-color: #ffffff;
+    width: 20px;
+    vertical-align: center;
+    text-align: center;
+    border-top: 2px solid #9eabb0;
+    height: 38px;
+}
+#jot #jot-tools li.loading img {
+    margin-top: 10px;
+}
+#jot #jot-title {
+	border: 1px solid #ccc;
+    margin: 0 0 5px;
+    height: 20px;
+    width: 90%;
+    font-weight: bold;
+    border-radius: 5px;
+	vertical-align: middle;
+}
+#jot #character-counter {
+	width: 6%;
 	float: right;
-	height: 22px;
-	background-color: #555753;
-	color: #eeeeec;
-	-webkit-border-radius: 5px 0px 0px  5px;
-	-moz-border-radius: 5px 0px 0px  5px;
-	border-radius: 5px 0px 0px  5px;
-	border: 0px;
-	margin-top: 0px;
+	text-align: right;
+	height: 15px;
+	line-height: 20px;
+	padding: 2px 20px 5px 0;
 }
-#character-counter {
- float: right; padding: 8px 10px; 
+#profile-jot-text_tbl {
+	margin-bottom: 10px;
 }
-#profile-rotator-wrapper {
- float: right; 
+#profile-jot-text_ifr {
+	width:99.900002% !important;
 }
-
-.jot-tool {
-	float: left;
-	margin-right: 5px;
+#profile-attach-wrapper,
+#profile-audio-wrapper,
+#profile-link-wrapper,
+#profile-location-wrapper,
+#profile-nolocation-wrapper,
+#profile-title-wrapper,
+#profile-upload-wrapper,
+#profile-video-wrapper {
+    float: left;
+	margin: 0 20px 0 0;
+}
+#profile-rotator-wrapper {
+	float: right; 
 }
 #profile-jot-tools-end,
-#profile-jot-banner-end { clear: both; }
-
+#profile-jot-banner-end {
+	clear: both;
+}
 #profile-jot-email-wrapper {
-	margin: 10px 10% 0px 10%;
-	border: 1px solid #555753;
-	border-bottom: 0px;
+	margin:10px 10% 0;
+	border:1px solid #555753;
+	border-bottom:0;
+}
+#profile-jot-email-label {
+	background-color:#555753;
+	color:#ccccce;
+	padding:5px;
+}
+#profile-jot-email {
+	width:90%;
+	margin:5px;
 }
-#profile-jot-email-label { background-color: #555753; color: #ccccce; 	padding: 5px;}
-#profile-jot-email { margin: 5px; width: 90%; }
-	
 #profile-jot-networks {
-	margin: 0px 10%;
+	margin: 0 10%;
 	border: 1px solid #555753;
-	border-top: 0px;
-	border-bottom: 0px;
+	border-top: 0;
+	border-bottom: 0;
 	padding: 5px;
 }
+#jot-preview-link {
+    margin: 0 0 0 10px;
+    border: 0;
+    text-decoration: none;
+	float: right;
+}
+.icon-text-preview {
+	margin: 0 0 -18px 0;
+	display: block;
+    width: 20px;
+    height: 20px;
+    background: url(icons.png) no-repeat -128px -40px;
+    border: 0;
+    text-decoration: none;
+	float: right;
+}
+#profile-jot-perms { 
+	float: right;
+    background-color: #555753;
+    height: 22px;
+    width: 20px;
+    -webkit-border-radius: 5px 0px 0px 5px;
+    -moz-border-radius: 5px 0px 0px 5px;
+    border-radius: 5px 0px 0px 5px;     
+    overflow: hidden;
+    border: 0px;
+    margin: 0 -4px 0 10px;
+}
+#profile-jot-plugin-wrapper {
+	width: 1px;
+	margin: 10px 0 0 0;
+	float: right;
+}
+#profile-jot-submit-wrapper {
+	float: right;
+	width: 100%;
+	list-style: none;
+	margin: 10px 0 0 0;
+	padding: 0;
+}
+#profile-jot-submit {
+	height: 22px;
+	background-color: #555753;
+	color: #eeeeec;
+	-webkit-border-radius: 0 5px 5px 0;
+	-moz-border-radius: 0 5px 5px 0;
+	border-radius: 0 5px 5px 0;
+	border: 0;
+	margin: 0;
+	float: right;
+}
+#jot-perms-icons {
+	background-color: #555753;
+	height: 22px;
+	width: 20px;
+	-webkit-border-radius: 0 5px 5px 0;
+	-moz-border-radius: 0 5px 5px 0;
+	border-radius: 0 5px 5px 0;
+	overflow: hidden;
+	border: 0;
+	margin: 0 0 0 94.4%;
+}
 #profile-jot-acl-wrapper {
-	margin: 0px 10px;
+	margin: 0 10px;
 	border: 1px solid #555753;
-	border-top: 0px;
-        display:block!important;
+	border-top: 0;
+	display: block !important;
 }
 #group_allow_wrapper,
 #group_deny_wrapper,
-#acl-permit-outer-wrapper { width: 47%; float: left; }
-
+#acl-permit-outer-wrapper {
+	width:47%;
+	float:left;
+}
 #contact_allow_wrapper,
 #contact_deny_wrapper,
-#acl-deny-outer-wrapper { width: 47%; float: right; }
-
-#acl-permit-text {background-color: #555753; color: #ccccce; padding: 5px; float: left;}
-#jot-public {background-color: #555753; color: #ff0000; padding: 5px; float: left;}
-#acl-deny-text {background-color: #555753; color: #ccccce; padding: 5px; float: left;}
-
+#acl-deny-outer-wrapper {
+	width:47%;
+	float:right;
+}
+#acl-permit-text {
+	background-color: #555753;
+	color: #ccccce;
+	padding: 5px;
+	float: left;
+}
+#jot-public {
+	background-color: #555753;
+	color: #ff0000;
+	padding: 5px;
+	float: left;
+}
+#acl-deny-text {
+	background-color: #555753;
+	color: #ccccce;
+	padding: 5px;
+	float: left;
+}
 #acl-permit-text-end,
-#acl-deny-text-end { clear: both; }
-
-
+#acl-deny-text-end {
+	clear: both;
+}
 #jot-title-desc {
 	color: #cccccc;
 }
-
+#profile-jot-desc {
+	color: #a00;
+}
 #jot-title-wrapper {
 	margin-bottom: 5px;
 }
-
-#jot-title {
-	border: 1px solid #cccccc;
-	width: 530px;
-}
 #jot-title-display {
 	font-weight: bold;
 }
+.jothidden {
+    display: none;
+}
+#jot-preview-content {
+    background-color: #ffffe0;
+    border: 1px #aaaa00 solid;
+    border-radius: 3px;
+    padding: 3px 3px 6px 10px;
+}
 
 
 /**
  * section
  */
-section { margin: 10px 11% 0px 11%; font-size: 0.8em; padding-right: 230px;}
+section {
+    margin: 20px 6% 0 4%;
+    font-size: 0.8em;
+    padding-right: 230px;
+	min-width: 475px;
+}
 
 /** tabs **/
-.tabs {list-style: none; padding: 0px; margin: 0px; border-bottom: 1px solid #729fcf; }
-.tabs li { display: inline;}
-.tab { padding: 0px 5px; margin-right: 10px; }
-.tab:hover { background-color: #729fcf; color: #eeeeec; border: 0px; }
-.tab.active { background-color: #729fcf; color: #eeeeec; border: 0px; }
+.tabs {
+    list-style: none;
+    margin: 10px 0 10px;
+    padding: 0;
+    border-bottom: 1px solid #729fcf;
+    font-size: 14px;
+}
+.tabs li {
+    display: inline;
+}
+.tab {
+    padding: 0 5px;
+}
+.tab:hover {
+    background-color: #729fcf;
+    color: #eeeeec;
+    border: 0px;
+}
+.tab:active {
+    background-color: #729fcf;
+    color: #eeeeec;
+    border: 0px;
+}
 
 
 /**
  * 	items
  */
-.wall-item-outside-wrapper { 
-	margin-top: 50px;
+.wall-item-outside-wrapper {
+	border: 1px solid #aaa;
+	border-radius: 5px;
+}
+.wall-item-outside-wrapper.comment {
+	margin-top: 5px;
+}
+.wall-item-outside-wrapper-end {
+    clear: both;
+}
+.wall-item-content-wrapper {
+    position: relative;
+	padding: 10px;
+	width: auto;
+}
+.wall-item-outside-wrapper .wall-item-comment-wrapper {
+    /*margin-left: 90px;*/
+}
+.shiny {
+    background: #efefdf;
+}
+.wall-item-content {
+	overflow-x: auto;
+}
+/* removing it from here, vs. putting it in .wall-item-content
+ * might break things for people. we shall see ;) */
+[id^="tread-wrapper"], [class^="tread-wrapper"] {
+    margin: 15px 0 0 0;
+    padding: 0px;
+	/*overflow-x: auto;*/
+}
+.wall-item-photo-menu {
+    display: none;
 }
-.wall-item-outside-wrapper-end { clear: both;}
-.wall-item-content-wrapper { position: relative; }
-.wall-item-photo-menu { display: none;}
 .wall-item-photo-menu-button {
-	display:none;
-	text-indent: -99999px;
-	background: #555753 url("menu-user-pin.jpg") no-repeat 75px center;
-	position: absolute;
-	overflow: hidden;
-	height: 20px; width: 90px; 
-	top: 85px;	left: 0px;
-	-webkit-border-radius: 0px 0px 5px  5px;
-	-moz-border-radius: 0px 0px 5px  5px;
-	border-radius: 0px 0px 5px  5px;
-	
-	
-}
-
-.wall-item-info { float: left; width: 140px; }
-.wall-item-photo-wrapper { 
-	width: 80px; height: 80px;  
-	position: relative;
-	padding: 5px;
-	background-color: #555753;
-	-webkit-border-radius: 5px;
-	-moz-border-radius: 5px;
-	border-radius: 5px;	
+    display:none;
+    text-indent:-99999px;
+    background:#555753 url(menu-user-pin.jpg) no-repeat 75px center;
+    position:absolute;
+    overflow:hidden;
+    height:20px;
+    width:90px;
+    top:85px;
+    left:0;
+    -webkit-border-radius:0 0 5px 5px;
+    -moz-border-radius:0 0 5px 5px;
+    border-radius:0 0 5px 5px;
+}
+.wall-item-info {
+    float: left;
+    width: 110px;
+}
+.wall-item-photo-wrapper {
+    width: 80px;
+    height: 80px;
+    position: relative;
+    padding: 5px;
+    background-color: #555753;
+    -webkit-border-radius: 5px;
+    -moz-border-radius: 5px;
+    border-radius: 5px;
 }
-
-
-.wall-item-tools { 
-	float: right; 
-	/*height: 0px;
-	padding-top: 20px;
-	overflow:hidden;
-	background: #ffffff url("icons.png") no-repeat  -50px  -40px;*/
-	filter: alpha(opacity=20);
-	opacity: 0.2;
-	-webkit-transition: all 1s ease-in-out;
-	-moz-transition: all 1s ease-in-out;
-	-o-transition: all 1s ease-in-out;
-	-ms-transition: all 1s ease-in-out;
-	transition: all 1s ease-in-out;	
+[class^="wall-item-tools"] > *, [class^="wall-item-tools"] > * > * {
+	margin: 0 0 5px 0;
+}
+.wall-item-tools {
+    float: right;
+    filter: alpha(opacity=35);
+    opacity: 0.4;
+    -webkit-transition: all 1s ease-in-out;
+    -moz-transition: all 1s ease-in-out;
+    -o-transition: all 1s ease-in-out;
+    -ms-transition: all 1s ease-in-out;
+    transition: all 1s ease-in-out;
 }
 .wall-item-tools:hover {
-	/*height:auto;*/
-	filter: alpha(opacity=100);
-	opacity: 1;
-	-webkit-transition: all 1s ease-in-out;
-	-moz-transition: all 1s ease-in-out;
-	-o-transition: all 1s ease-in-out;
-	-ms-transition: all 1s ease-in-out;
-	transition: all 1s ease-in-out;	
-	
+    filter: alpha(opacity=100);
+    opacity: 1;
+    -webkit-transition: all 1s ease-in-out;
+    -moz-transition: all 1s ease-in-out;
+    -o-transition: all 1s ease-in-out;
+    -ms-transition: all 1s ease-in-out;
+    transition: all 1s ease-in-out;
+}
+.wall-item-title {
+	font-size: 1.2em;
+	font-weight: bold;
+    margin-bottom: 1em;
+}
+.wall-item-body {
+	margin: 10px 10px 10px 0px;
+    text-align: left;
+}
+.wall-item-lock-wrapper {
+	float: right;
 }
-
-.wall-item-title { font-size: 1.2em; font-weight: bold;}
-.wall-item-body { margin-left: 140px;}
-.wall-item-lock-wrapper { float: right; }
 .wall-item-dislike,
-.wall-item-like,
-.wall-item-author { clear: left; font-size: 0.8em; margin: 10px 0px 0px 140px; color: #babdb6;}
-.wall-item-ago { display: inline; padding-left: 10px;} 
-.wall-item-wrapper-end { clear:both; }
+.wall-item-like {
+	clear: left;
+	font-size: 0.8em;
+	color: #878883;
+	margin: 5px 0 5px 120px;
+}
+.wall-item-author, .wall-item-actions-author {
+	clear: left;
+	font-size: 0.8em;
+	color: #878883;
+	margin: 20px 0 0 110px;
+}
+.wall-item-ago {
+	display: inline;
+	padding-left: 10px;
+}
+.wall-item-wrapper-end {
+	clear:both;
+}
 .wall-item-location {
-	margin-top:5px;
-	width: 100px;
-	overflow: hidden;
-	text-overflow: ellipsis;
-	-o-text-overflow: ellipsis;
+    margin-top: 15px;
+    width: 100px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    -o-text-overflow: ellipsis;
+}
+.wall-item-location .icon {
+    float: left;
+}
+.wall-item-location > a {
+    margin-left: 25px;
+    font-size: 0.7em;
+    display: block;
+}
+.wall-item-location .smalltext {
+    margin-left: 25px;
+    font-size: 0.7em;
+    display: block;
+}
+.wall-item-location > br {
+    display: none;
 }
-.wall-item-location .icon { float: left; }
-.wall-item-location > a { margin-left: 25px;  font-size: 0.7em; display: block;}
-.wall-item-location .smalltext { margin-left: 25px;  font-size: 0.7em; display: block;}
-.wall-item-location > br { display: none; }
-
 .wallwall .wwto {
-    left: -10px;
+    left: 5px;
     margin: 0;
     position: absolute;
-    top: 65px;
+    top: 75px;
     width: 30px;
     z-index: 10001;
-	width: 30px;
-	height: 30px;
-    
+    width: 30px;
+    height: 30px;
+}
+.wallwall .wwto img {
+    width: 30px !important;
+    height: 30px !important;
+}
+.wallwall .wall-item-photo-end {
+    clear: both;
 }
-.wallwall .wwto img { width: 30px!important; height: 30px!important;}
-.wallwall .wall-item-photo-end { clear: both; }
 .wall-item-arrowphoto-wrapper {
     position: absolute;
-    left: 20px;
-    top: 70px;
+    left: 35px;
+    top: 80px;
     z-index: 10002;
 }
-
 .wall-item-photo-menu {
 	min-width: 92px;
 	border: 2px solid #FFFFFF;
@@ -482,90 +1170,165 @@ section { margin: 10px 11% 0px 11%; font-size: 0.8em; padding-right: 230px;}
 	position: absolute;
 	left: -2px; top: 101px;
 	display: none;
-	z-index: 10000;
+	z-index: 10003;
 	-webkit-border-radius: 0px 5px 5px 5px;
 	-moz-border-radius: 0px 5px 5px 5px;
 	border-radius: 0px 5px 5px 5px;
 }
-.wall-item-photo-menu ul { margin:0px; padding: 0px; list-style: none }
-.wall-item-photo-menu li a { white-space: nowrap;  display: block; padding: 5px 2px; 	color: #eeeeec;	 }
-.wall-item-photo-menu li a:hover { color: #555753; background: #eeeeec; }
+.wall-item-photo-menu ul {
+    margin:0px;
+    padding: 0px;
+    list-style: none;
+}
+.wall-item-photo-menu li a {
+    white-space: nowrap;
+    display: block;
+    padding: 5px 2px;
+    color: #eeeeec;
+}
+.wall-item-photo-menu li a:hover {
+    color: #555753;
+    background: #eeeeec;
+}
+#item-delete-selected {
+    overflow: auto;
+    width: 100%;
+}
+
 
-.icon.drop,
-.icon.drophide { float: left; }
-#item-delete-selected {	overflow: auto;	width: 100%}
 /**
  * 	comment
  */
- 
- .ccollapse-wrapper { font-size: 0.9em; margin-left: 80px; }
- 
-.wall-item-outside-wrapper.comment { margin-left: 80px; }
-.wall-item-outside-wrapper.comment .wall-item-photo { width: 40px!important; height: 40px!important;}
-.wall-item-outside-wrapper.comment .wall-item-photo-wrapper {width: 40px; height: 40px; }
+.ccollapse-wrapper {
+    font-size: 0.9em;
+    margin-left: 80px;
+}
+
+.wall-item-outside-wrapper.comment {
+    margin-left: 80px;
+}
+.wall-item-outside-wrapper.comment .wall-item-photo {
+    width: 40px!important;
+    height: 40px!important;
+}
+.wall-item-outside-wrapper.comment .wall-item-photo-wrapper {
+    width: 40px;
+    height: 40px;
+}
 .wall-item-outside-wrapper.comment .wall-item-photo-menu-button {
-	width: 50px; top: 45px; background-position: 35px center;
+	width: 50px;
+    top: 45px;
+    background-position: 35px center;
+}
+.wall-item-outside-wrapper.comment .wall-item-info {
+    width: 60px;
+}
+.wall-item-outside-wrapper.comment .wall-item-body {
+    margin-left: 10px;
+}
+.wall-item-outside-wrapper.comment .wall-item-author {
+    margin-left: 50px;
 }
-.wall-item-outside-wrapper.comment .wall-item-info { width: 60px; }
-.wall-item-outside-wrapper.comment .wall-item-body { margin-left: 60px;}
-.wall-item-outside-wrapper.comment .wall-item-author { margin-left: 60px;}
 
 .wall-item-outside-wrapper.comment .wall-item-photo-menu {
-	min-width: 50px;
-	top: 60px;
+    min-width: 50px;
+    top: 60px;
+}
+.comment-wwedit-wrapper {
+    /*margin: 30px 0px 0px 80px;*/
+}
+.comment-edit-wrapper {
+    border-top: 1px #aaa solid;
 }
-
-
-.comment-wwedit-wrapper,
-.comment-edit-wrapper { margin: 30px 0px 0px 80px;}
 .comment-wwedit-wrapper img,
-.comment-edit-wrapper img { width: 20px; height: 20px; }
-.comment-edit-photo-link { float: left; width: 40px;}
-.comment-edit-text-empty {  width: 80%; height: 20px; border: 0px; color: #babdb6;
+.comment-edit-wrapper img {
+	width: 20px;
+	height: 20px;
+}
+.comment-edit-photo-link, .comment-edit-photo {
+	float: left;
+	margin-left: 10px;
+}
+.my-comment-photo {
+    width: 40px;
+    height: 40px;
+    padding: 5px;
+}
+[class^="comment-edit-text"] {
+    margin: 5px 0 10px 20px;
+    width: 86.5%;
+}
+.comment-edit-text-empty {
+	height: 20px;
+	border: 2px #babdd6 solid;
+	border-radius: 5px;
+	color: #babdb6;
 	-webkit-transition: all 0.5s ease-in-out;
 	-moz-transition: all 0.5s ease-in-out;
 	-o-transition: all 0.5s ease-in-out;
 	-ms-transition: all 0.5s ease-in-out;
 	transition: all 0.5s ease-in-out;	
 }
-.comment-edit-text-empty:hover { color: #999999;}
-.comment-edit-text-full { width: 80%; height: 6em;
+.comment-edit-text-empty:hover {
+	color: #999999;
+}
+.comment-edit-text-full {
+	height: 10em;
+    border-radius: 5px;
 	-webkit-transition: all 0.5s ease-in-out;
 	-moz-transition: all 0.5s ease-in-out;
 	-o-transition: all 0.5s ease-in-out;
 	-ms-transition: all 0.5s ease-in-out;
 	transition: all 0.5s ease-in-out;	
 }
-.comment-edit-submit-wrapper { width: 80%; margin-left: 40px; text-align: right; }
+.comment-edit-submit-wrapper {
+	width: 90%;
+	margin: 5px 5px 10px 50px;
+	text-align: right;
+}
 .comment-edit-submit {
-	height: 22px;
-	background-color: #555753;
-	color: #eeeeec;
-	-webkit-border-radius: 5px;
-	-moz-border-radius: 5px;
-	border-radius: 5px;
-	border: 0px;
+    height: 22px;
+    background-color: #555753;
+    color: #eeeeec;
+    -webkit-border-radius: 5px;
+    -moz-border-radius: 5px;
+    border-radius: 5px;
+    border: 0;
 }
 
+
 /**
  * item text style
  **/
 .wall-item-body code {
-    border-color: #CCCCCC;
-    border-style: solid;
-    border-width: 1px 1px 1px 10px;
-    display: block;
-    padding-left: 10px;
+	display: block;
+	padding-left: 10px;
+	border-color: #ccc;
+	border-style: solid;
+	border-width: 1px 1px 1px 10px;
+	background: #eee;
+	width: 95%;
 }
 
+
 /**
  * profile
  **/
- 
-div[id$="text"] { font-weight: bold; border-bottom: 1px solid #cccccc; } 
-div[id$="wrapper"] { height: 100%; margin-bottom: 1em; } 
-div[id$="wrapper"] br { clear: left; }
-#advanced-profile-with { margin-left: 200px; }
+div[id$="text"] {
+    font-weight: bold;
+    border-bottom: 1px solid #ccc;
+}
+div[id$="wrapper"] {
+    height: 100%;
+    margin-bottom: 1em;
+}
+div[id$="wrapper"] br {
+    clear: left;
+}
+#advanced-profile-with {
+    margin-left: 200px;
+}
+
 
 /**
  * photos
@@ -575,202 +1338,365 @@ div[id$="wrapper"] br { clear: left; }
 	overflow: auto;
 }
 #photo-top-links {
-	margin-bottom:30px;
+    margin-bottom: 30px;
 }
 .photo-album-image-wrapper,
-.photo-top-image-wrapper { 
-	float: left; 
-	margin: 0px 10px 10px 0px;
-	-moz-box-shadow: 0px 0px 5px #888;
-	-webkit-box-shadow: 0px 0px 5px #888;
-	box-shadow: 0px 0px 5px #888;
-	background-color: #eeeeee;
-	-webkit-border-radius: 5px;
-	-moz-border-radius: 5px;
-	border-radius: 5px;
-
-	padding-bottom: 30px; 
-	position:relative;
-	
+.photo-top-image-wrapper {
+    float: left;
+    -moz-box-shadow: 0 0 5px #888;
+    -webkit-box-shadow: 0 0 5px #888;
+    box-shadow: 0 0 5px #888;
+    background-color: #eee;
+    -webkit-border-radius: 5px;
+    -moz-border-radius: 5px;
+    border-radius: 5px;
+    padding-bottom: 30px;
+    position: relative;
+    margin: 0 10px 10px 0;
 }
 
-#photo-photo { max-width: 100% }
-#photo-photo img { max-width: 100% }
-
+#photo-photo {
+    max-width: 100%;
+}
+#photo-photo img {
+    max-width: 100%;
+}
 .photo-top-image-wrapper a:hover,
 #photo-photo a:hover,
-.photo-album-image-wrapper a:hover { 
-	border-bottom: 0px; 
+.photo-album-image-wrapper a:hover {
+    border-bottom: 0;
 }
-
-.photo-top-photo,
-.photo-album-photo {
-    -webkit-border-radius: 5px 5px 0px 0px;
-    -moz-border-radius: 5px 5px 0px 0px;
-    border-radius: 5px 5px 0px 0px;
- } 
-
-.photo-top-album-name { position: absolute; bottom: 0px; padding: 0px 5px;} 
-.caption { position: absolute; bottom: 0px; margin: 0px 5px}
-
-
-#photo-photo{
+.photo-top-photo,.photo-album-photo {
+    -webkit-border-radius:5px 5px 0 0;
+    -moz-border-radius:5px 5px 0 0;
+    border-radius:5px 5px 0 0;
+}
+.photo-top-album-name {
+    position: absolute;
+    bottom: 0;
+    padding: 0 5px;
+}
+.caption {
+    position: absolute;
+    bottom: 0;
+    margin: 0 5px;
+}
+#photo-photo {
 	position: relative;
 	float:left;
 }
-#photo-photo-end { clear: both; }
-#photo-prev-link,
-#photo-next-link{
-	position: absolute;
-	width:30%;
-	height: 100%;
-	background-color: rgba(255,255,255,0.5);
-	opacity: 0;
-	-webkit-transition: all 0.2s ease-in-out;
-	-moz-transition: all 0.2s ease-in-out;
-	-o-transition: all 0.2s ease-in-out;
-	-ms-transition: all 0.2s ease-in-out;
-	transition: all 0.2s ease-in-out;
-	background-position: center center;
-	background-repeat: no-repeat;
-	
+#photo-photo-end {
+    clear: both;
 }
-#photo-prev-link { left:0px; top:0px; background-image: url('prev.png'); }
-#photo-next-link { right:0px; top:0px; background-image: url('next.png');}
-
-#photo-prev-link a,
-#photo-next-link a{
- display: block; width: 100%; height: 100%;
- overflow: hidden;
- text-indent: -900000px;		 
+#photo-prev-link,
+#photo-next-link {
+    position:absolute;
+    width:30%;
+    height:100%;
+    background-color:rgba(255,255,255,0.5);
+    opacity:0;
+    -webkit-transition:all .2s ease-in-out;
+    -moz-transition:all .2s ease-in-out;
+    -o-transition:all .2s ease-in-out;
+    -ms-transition:all .2s ease-in-out;
+    transition:all .2s ease-in-out;
+    background-position:center center;
+    background-repeat:no-repeat;
+}
+#photo-prev-link {
+    left:0;
+    top:0;
+    background-image:url(prev.png);
+}
+#photo-next-link {
+    right:0;
+    top:0;
+    background-image:url(next.png);
+}
+
+#photo-prev-link a,#photo-next-link a {
+    display:block;
+    width:100%;
+    height:100%;
+    overflow:hidden;
+    text-indent:-900000px;
 }
-
 #photo-prev-link:hover,
-#photo-next-link:hover{
-	opacity: 1;
-	-webkit-transition: all 0.2s ease-in-out;
-	-moz-transition: all 0.2s ease-in-out;
-	-o-transition: all 0.2s ease-in-out;
-	-ms-transition: all 0.2s ease-in-out;
-	transition: all 0.2s ease-in-out;		
+#photo-next-link:hover {
+    opacity:1;
+    -webkit-transition:all .2s ease-in-out;
+    -moz-transition:all .2s ease-in-out;
+    -o-transition:all .2s ease-in-out;
+    -ms-transition:all .2s ease-in-out;
+    transition:all .2s ease-in-out;
 }
-
 #photo-next-link .icon,
-#photo-prev-link .icon { display: none }
-
+#photo-prev-link .icon {
+    display: none;
+}
 #photos-upload-spacer,
 #photos-upload-new-wrapper,
-#photos-upload-exist-wrapper { margin-bottom: 1em; }
+#photos-upload-exist-wrapper {
+    margin-bottom: 1em;
+}
 #photos-upload-existing-album-text,
-#photos-upload-newalbum-div { 
-	background-color: #555753;
-	color: #eeeeec;
-	padding: 1px;
+#photos-upload-newalbum-div {
+    background-color:#555753;
+    color:#eeeeec;
+    padding:1px;
 }
 #photos-upload-album-select,
-#photos-upload-newalbum { width: 99% }
-#photos-upload-perms-menu { text-align: right; }
+#photos-upload-newalbum {
+    width: 99%;
+}
+#photos-upload-perms-menu {
+    text-align: right;
+}
+#photo-edit-caption, #photo-edit-newtag, #photo-edit-albumname {
+    float: left;
+    margin-bottom: 25px;
+}
+#photo-edit-link-wrap {
+    margin-bottom: 15px;
+}
+#photo-edit-caption {
+	width: 100%;
+}
+#photo-edit-newtag {
+	width: 100%;
+}
+#photo-like-div {
+    margin-bottom: 25px;
+}
+#photo-edit-caption-end, #photo-edit-tags-end, #photo-edit-albumname-end {
+    clear: both;
+}
+#photo-edit-delete-button {
+    margin-left: 200px;
+}
+#photo-edit-end {
+    margin-bottom: 35px;
+}
+#photo-caption {
+    font-size: 110%;
+    font-weight: bold;
+    margin-top: 15px;
+    margin-bottom: 15px;
+}
 
 /**
  * 	message
  */
-.prvmail-text { width: 100%;}
-#prvmail-subject { width: 100%;}
-#prvmail-submit-wrapper { margin-top: 10px; }
+.prvmail-text {
+    width: 100%;
+}
+#prvmail-subject {
+    width: 100%;
+}
+#prvmail-submit-wrapper {
+    margin-top: 10px;
+}
 #prvmail-submit {
-	float: right;
-	margin-top: 0px;
+    float:right;
+    margin-top: 0;
 }
 #prvmail-submit-wrapper > div {
-	margin-right: 5px;
-	float: left;
+    margin-right:5px;
+    float:left;
+}
+.mail-list-outside-wrapper {
+    margin-top: 20px;
+}
+.mail-list-sender {
+    float: left;
+}
+.mail-list-detail {
+    margin-left: 90px;
+}
+.mail-list-sender-name {
+    display: inline;
+}
+.mail-list-date {
+    display: inline;
+    font-size: 0.8em;
+    padding-left: 10px;
+}
+.mail-list-subject {
+    font-size: 1.5em;
+}
+.mail-list-delete-wrapper {
+    float: right;
+}
+.mail-list-outside-wrapper-end {
+    clear: both;
+}
+.mail-conv-sender {
+    float: left;
+    margin: 0px 5px 5px 0px;
+}
+.mail-conv-sender-photo {
+    width: 32px;
+    height: 32px;
+}
+.mail-conv-sender-name {
+    float: left;
+}
+.mail-conv-date {
+    float: right;
+}
+.mail-conv-subject {
+    clear: right;
+    font-weight: bold;
+    font-size: 1.2em;
+}
+.mail-conv-body {
+    clear: both;
+}
+.mail-conv-delete-wrapper {
+    margin-top: 5px;
 }
-.mail-list-outside-wrapper { margin-top: 20px;}
-.mail-list-sender {	float: left; }
-.mail-list-detail {	margin-left: 90px; }
-.mail-list-sender-name { display: inline; }
-.mail-list-date { display: inline; font-size: 0.8em; padding-left: 10px;}
-.mail-list-subject { font-size: 1.5em;}
-.mail-list-delete-wrapper { float: right; }
-.mail-list-outside-wrapper-end { clear: both;}
-
-.mail-conv-sender {float: left; margin: 0px 5px 5px 0px }
-.mail-conv-sender-photo { width: 32px; height: 32px }
-.mail-conv-sender-name { float: left }
-.mail-conv-date { float: right }
-.mail-conv-subject { clear: right; font-weight: bold; font-size: 1.2em }
-.mail-conv-body { clear: both; }
-.mail-conv-delete-wrapper { margin-top: 5px; }
 
 
 /**
  * 	contacts
  */
-
 .view-contact-wrapper,
-.contact-entry-wrapper { float: left; margin-right: 20px; margin-bottom: 20px; width: 120px; height: 120px; position: relative;}
-.contact-entry-direction-wrapper {position: absolute; top: 20px;}
-.contact-entry-edit-links { position: absolute; top: 60px; }
+.contact-entry-wrapper {
+    float: left;
+    margin-right: 5px;
+    margin-bottom: 40px;
+    width: 120px;
+	height: 120px;
+	padding: 3px;
+    position: relative;
+}
+.contact-direction-wrapper {
+    position: absolute;
+    top: 20px;
+}
+.contact-edit-links {
+    position: absolute;
+    top: 60px;
+}
+.contact-entry-photo-wrapper {
+
+}
 .contact-entry-photo {
-	margin-left:20px;
+	margin-left: 20px;
+}
+.contact-entry-name {
+    width: 120px;
+    font-weight: bold;
+    /*overflow: hidden;*/
 }
-.contact-entry-name { width: 120px; overflow: hidden; }
 .contact-entry-photo {
 	position: relative;
 }
-
-.contact-entry-edit-links .icon {	
-	border: 1px solid #babdb6;
+.contact-entry-edit-links .icon {
+    border: 1px solid #babdb6;
     -webkit-border-radius: 3px;
     -moz-border-radius: 3px;
-    border-radius: 3px;	
-	background-color: #ffffff;
+    border-radius: 3px;
+    background-color: #fff;
+}
+#contact-entry-url, [id^="contact-entry-url"] {
+    font-size: smaller;
+    /*overflow: scroll;*/
+}
+#contact-entry-network, [id^="contact-entry-network"] {
+    font-size: smaller;
+    font-style: italic;
+}
+#contact-edit-banner-name {
+    font-size: 1.5em;
+}
+#contact-edit-photo-wrapper {
+    position: relative;
+    float: left;
+    padding: 20px;
+}
+#contact-edit-direction-icon {
+    position:absolute;
+    top:60px;
+    left:0;
+}
+#contact-edit-nav-wrapper {
+    margin-left: 0px;
+}
+#contact-edit-links {
+    margin-top: 23px;
+}
+#contact-edit-links ul {
+    list-style-type: none;
+}
+#contact-drop-links {
+    margin-left:5px;
 }
-
-#contact-edit-banner-name { font-size: 1.5em; }
-#contact-edit-photo-wrapper {position: relative; float: left; padding: 20px;}
-#contact-edit-direction-icon { position: absolute; top: 60px; left:0px;}
-#contact-edit-nav-wrapper { margin-left: 210px; }
-#contact-edit-links { float: left; margin-top: 23px; }
-#contact-drop-links { margin-left: 5px; }
 #contact-edit-nav-wrapper .icon {
 	border: 1px solid #babdb6;
     -webkit-border-radius: 3px;
     -moz-border-radius: 3px;
     border-radius: 3px;	
 }
-#contact-edit-poll-wrapper { margin-left: 50px; }
-#contact-edit-last-update-text { margin-bottom: 15px; }
-#contact-edit-last-updated { font-weight: bold; }
-#contact-edit-poll-text { display: inline; }
-#contact-edit-end { clear: both; margin-bottom: 65px;}
+#contact-edit-poll-wrapper {
+    margin-left: 0px;
+}
+#contact-edit-last-update-text {
+    margin-bottom: 15px;
+}
+#contact-edit-last-updated {
+    font-weight: bold;
+}
+#contact-edit-poll-text {
+    display: inline;
+}
+#contact-edit-info_tbl, #contact-edit-info_parent {
+    width: 100%;
+}
+.mceLayout {
+    width: 100%;
+}
+#contact-edit-end {
+    clear: both;
+    margin-bottom: 65px;
+}
 
 .contact-photo-menu-button {
-       position: absolute;
-       background-image: url("photo-menu.jpg");
-       background-position: top left; 
-       background-repeat: no-repeat;
-       margin: 0px; padding: 0px;
-       width: 16px;
-       height: 16px;
-       top: 64px; left:0px;
-       overflow: hidden;
-       text-indent: 40px;
-       display: none;
-       
+    position: absolute;
+    background-image: url("photo-menu.jpg");
+    background-position: top left; 
+    background-repeat: no-repeat;
+    margin: 0px; padding: 0px;
+    width: 16px;
+    height: 16px;
+    top: 64px; left:0px;
+    overflow: hidden;
+    text-indent: 40px;
+    display: none;
 }
 .contact-photo-menu {
-       width: auto;
-       border: 2px solid #444444;
-       background: #FFFFFF;
-       position: absolute;
-       left: 0px; top: 90px;
-       display: none;
-       z-index: 10000;
+    width: auto;
+    border: 2px solid #444444;
+    background: #FFFFFF;
+    position: absolute;
+    left: 0px; top: 90px;
+    display: none;
+    z-index: 10000;
+}
+.contact-photo-menu ul {
+    margin:0px;
+    padding: 0px;
+    list-style: none;
+}
+.contact-photo-menu li a {
+    display: block;
+    padding: 2px;
+}
+.contact-photo-menu li a:hover {
+    color: #fff;
+    background: #3465A4;
+    text-decoration: none;
 }
-.contact-photo-menu ul { margin:0px; padding: 0px; list-style: none }
-.contact-photo-menu li a { display: block; padding: 2px; }
-.contact-photo-menu li a:hover { color: #FFFFFF; background: #3465A4; text-decoration: none; }
 
 
 
@@ -779,96 +1705,131 @@ div[id$="wrapper"] br { clear: left; }
  */
 #id_openid_url,
 .openid {
-   background: url(login-bg.gif) no-repeat;
-   background-position: 0 50%;
-   padding-left: 18px;
+    background:url(login-bg.gif) no-repeat;
+    background-position:0 50%;
+    padding-left:18px;
 }
- 
+
 #settings-nickname-desc {
-	background-color: #DDEFFF;
-	-webkit-border-radius: 5px;
-	-moz-border-radius: 5px;
+    background-color: #eee;
+    -webkit-border-radius: 5px;
+    -moz-border-radius: 5px;
     border-radius: 5px;
     padding: 5px;
 }
-
+#settings-default-perms {
+    margin-bottom: 20px;
+}
 #register-form div,
-#profile-edit-form div { 
-	clear: both;
+#profile-edit-form div {
+    clear: both;
 }
 
 #register-form label,
 #profile-edit-form label {
-	width: 300px; float: left;
+	width: 300px;
+    float: left;
 }
 
 #register-form span,
-#profile-edit-form span  {
-	color: #555753;
-	display:block;
-	margin-bottom: 20px;
+#profile-edit-form span {
+    color:#555753;
+    display:block;
+    margin-bottom:20px;
 }
 .settings-submit-wrapper,
-.profile-edit-submit-wrapper { margin: 30px 0px;}
-.profile-listing { float: left; margin: 20px 20px 0px 0px}
-
-#profile-edit-links ul { margin: 20px 0px; padding: 0px; list-style: none; }
+.profile-edit-submit-wrapper {
+    margin: 30px 0px;
+}
+.profile-edit-side-div {
+    margin: 5px 2px 0 0;
+}
+.profile-edit-side-link {
+	margin: 0 20px -18px 0;
+    float: right;
+}
+.profile-listing {
+    float: left;
+    margin: 20px 20px 0px 0px;
+}
 
+#profile-edit-links ul {
+    margin: 20px 0;
+    padding: 0;
+    list-style: none;
+}
 
-#register-sitename { display: inline; font-weight: bold;}
+#register-sitename {
+    display: inline;
+    font-weight: bold;
+}
 
 /**
  * 	contacts selector
  */
-#group-edit-desc { margin: 10px 0xp; }
+.group-delete-wrapper {
+	margin: -28px 150px 0 0;
+    float: right;
+}
+#group-edit-submit-wrapper {
+    margin: 0 0 10px 0;
+    display: inline;
+}
+#group-edit-desc {
+    margin: 10px 0px;
+}
 #group-members,
 #prof-members {
-	height: 200px; 
-	overflow: auto;
-	border: 1px solid #555753;
-    -webkit-border-radius: 5px 5px 0px 0px;
-    -moz-border-radius: 5px 5px 0px 0px;
-    border-radius: 5px 5px 0px 0px;
+    height:200px;
+    overflow:auto;
+    border:1px solid #555753;
+    -webkit-border-radius:5px 5px 0 0;
+    -moz-border-radius:5px 5px 0 0;
+    border-radius:5px 5px 0 0;
 }
 #group-all-contacts,
-#prof-all-contacts { 
-	height: 200px;
-    overflow: auto;	
-	border: 1px solid #555753;
-    -webkit-border-radius: 0px 0px 5px 5px;
-    -moz-border-radius: 0px 0px 5px 5px;
-    border-radius: 0px 0px 5px 5px;
+#prof-all-contacts {
+    height:200px;
+    overflow:auto;
+    border:1px solid #555753;
+    -webkit-border-radius:0 0 5px 5px;
+    -moz-border-radius:0 0 5px 5px;
+    border-radius:0 0 5px 5px;
 }
 #group-members h3,
 #group-all-contacts h3,
 #prof-members h3,
-#prof-all-contacts h3{
-	color: #eeeeec;
-	background-color: #555753;
-	margin: 0px;
-	padding: 5px;
+#prof-all-contacts h3 {
+    color:#eeeeec;
+    background-color:#555753;
+    margin:0;
+    padding:5px;
 }
 #group-separator,
-#prof-separator { display: none;}
+#prof-separator {
+    display: none;
+}
 
 /**
  * profile
  */
-#cropimage-wrapper { float:left; }
-#crop-image-form { clear:both; }
+#cropimage-wrapper {
+    float:left;
+}
+#crop-image-form {
+    clear:both;
+}
 
 /**
  * events
  **/
- 
 .clear { clear: both; }
 .eventcal {
-	float: left;
-	font-size: 20px;
+    float:left;
+    font-size:20px;
 }
-
 .vevent {
-	border: 1px solid #CCCCCC;
+    border:1px solid #ccc;
 }
 .vevent .event-description, .vevent .event-location {
 	margin-left: 10px;
@@ -882,32 +1843,26 @@ div[id$="wrapper"] br { clear: left; }
 #new-event-link {
 	margin-bottom: 10px;
 }
-
 .edit-event-link, .plink-event-link {
 	float: left;
 	margin-top: 4px;
 	margin-right: 4px;
 	margin-bottom: 15px;
 }
-
 .event-description:before {
 	content: url('../../../images/calendar.png');
 	margin-right: 15px;
 }
-
 .event-start, .event-end {
 	margin-left: 10px;
 	width: 330px;
 }
-
 .event-start .dtstart, .event-end .dtend {
 	float: right;
 }
-
 .event-list-date {
 	margin-bottom: 10px;
 }
-
 .prevcal, .nextcal {
 	float: left;
 	margin-left: 32px;
@@ -917,40 +1872,33 @@ div[id$="wrapper"] br { clear: left; }
 .event-calendar-end {
 	clear: both;
 }
-
- 
 .calendar {
-	font-family: Courier, monospace;
+    font-family: monospace;
 }
 .today {
 	font-weight: bold;
 	color: #FF0000;
 } 
- 
 #event-start-text, 
 #event-finish-text {
 	margin-top: 10px;
 	margin-bottom: 5px;
 }
-
-#event-nofinish-checkbox, 
-#event-nofinish-text, 
-#event-adjust-checkbox, 
+#event-nofinish-checkbox,
+#event-nofinish-text,
+#event-adjust-checkbox,
 #event-adjust-text,
-#event-share-checkbox
-{
-	float: left;
+#event-share-checkbox {
+    float:left;
 }
 #event-datetime-break {
 	margin-bottom: 10px;
 }
-
-#event-nofinish-break, 
+#event-nofinish-break,
 #event-adjust-break,
 #event-share-break {
 	clear: both;
 }
-
 #event-desc-text, 
 #event-location-text {
 	margin-top: 10px;
@@ -959,45 +1907,176 @@ div[id$="wrapper"] br { clear: left; }
 #event-submit {
 	margin-top: 10px;
 }
+.body-tag {
+	margin: 10px 0;
+	opacity: 0.5;
+	filter:alpha(opacity=50);
+}
+.body-tag:hover {
+	opacity: 1.0 !important;
+	filter:alpha(opacity=100) !important;
+}
+.item-select {
+	opacity: 0.1;
+	filter:alpha(opacity=10);
+	float: right;
+	margin-right: 10px;
+
+}
+.item-select:hover, .checkeditem {
+	opacity: 1;
+	filter:alpha(opacity=100);
+}
+#item-delete-selected {
+	margin-top: 30px;
+}
+/* was tired of having no way of moving it around, so
+ * here's a little 'hook' to do so */
+.delete-checked {
+	position: absolute;
+	left: 35px;
+	margin-top: 20px;
+}
+#item-delete-selected-end {
+	clear: both;
+}
+#item-delete-selected-icon, #item-delete-selected-desc {
+	float: left;
+	margin-right: 5px;
+}
+#item-delete-selected-desc:hover {
+	text-decoration: underline;
+}
+
 
 /**
  * 	directory
  */
-.directory-item {float: left; margin: 50px 50px 0px 0px;}
+.directory-item {
+    float: left;
+    margin: 50px 50px 0px 0px;
+}
+
+
+/**
+ * sidebar
+ */
+#group-sidebar {
+    margin-bottom: 10px;
+}
+.group-selected, .nets-selected {
+    padding: 3px;
+    border: 1px solid #CCCCCC;
+    background: #F8F8F8;
+    font-weight: bold;
+}
+.groupsideedit {
+    margin-right: 10px;
+}
+#sidebar-group-ul {
+    padding-left: 0;
+}
+#sidebar-group-list {
+    margin: 0 0 5px 0;
+}
+#sidebar-group-list ul {
+    list-style-type: none;
+    list-style-position: inside;
+}
+#sidebar-group-list li {
+    margin-top: 10px;
+}
+#sidebar-group-list .icon {
+    display: inline-block;
+    height: 12px;
+    width: 12px;
+}
+#sidebar-new-group {
+    margin: auto;
+    display: inline-block;
+    color: #efefef;
+    text-decoration: none;
+    text-align: center;
+}
+#peoplefind-sidebar form {
+	margin-bottom: 10px;
+}
+#sidebar-new-group:hover {
+    /*background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #b20202), color-stop(1, #d60808) );*/
+    /*background: -moz-linear-gradient( center top, #b20202 5%, #d60808 100% );*/
+    /*background-color: #b20202;*/
+}
+
+#sidebar-new-group:active {
+    position: relative;
+    top: 1px;
+}
+#side-peoplefind-url {
+    background-color: #e5e0cf;
+    color: #666;
+	border: 1px 666 solid;
+	margin-right: 3px;
+	width: 75%;
+}
+#side-peoplefind-url:hover, #side-peoplefind-url:focus {
+    background-color: #efefef;
+    color: #222;
+	border: 1px 333 solid;
+}
+.nets-ul {
+    list-style-type: none;
+    padding-left: 0px;
+}
+.nets-ul li {
+    margin: 10px 0 0;
+}
+
+.nets-link {
+    margin-left: 0px;
+}
+.nets-all {
+    margin-left: 0px;
+}
+#netsearch-box {
+    margin-top: 20px;
+    width: 150px;   
+}
+#netsearch-box #search-submit {
+    margin: 5px 0px 0px 0px;
+}
 
 /**
  * ADMIN
  */
 #pending-update {
-	float:right;
-	color: #ffffff;
-	font-weight: bold;
-	background-color: #FF0000;
-	padding: 0em 0.3em;
+    float:right;
+    color: #fff;
+    font-weight: bold;
+    background-color: #ff0000;
+    padding: 0 .3em;
 }
 .admin.linklist {
-	border: 0px; padding: 0px;
+    border: 0; padding: 0;
 }
 .admin.link {
-	list-style-position: inside;
+    list-style-position: inside;
 }
-
 #adminpage dl {
-	clear: left;
-	margin-bottom: 2px;
-	padding-bottom: 2px;
-	border-bottom: 1px solid black;
+    clear:left;
+    margin-bottom: 2px;
+    padding-bottom: 2px;
+    border-bottom: 1px solid #000;
 }
 #adminpage dt {
-	width: 200px;
-	float: left;
-	font-weight: bold;
+    width: 200px;
+    float: left;
+    font-weight: bold;
 }
 #adminpage dd {
 	margin-left: 200px;
 }
 #adminpage h3 {
-	border-bottom: 1px solid #cccccc;
+    border-bottom:1px solid #ccc;
 }
 
 #adminpage .submit {
@@ -1005,312 +2084,571 @@ div[id$="wrapper"] br { clear: left; }
 }
 
 #adminpage #pluginslist {
-	margin: 0px; padding: 0px;
+    margin: 0;
+    padding: 0;
 }
 #adminpage .plugin {
-	list-style: none;
-	display: block;
-	border: 1px solid #888888;
-	padding: 1em;
-	margin-bottom: 5px;
-	clear: left;
+    list-style: none;
+    display: block;
+    border: 1px solid #888;
+    padding: 1em;
+    margin-bottom: 5px;
+    clear: left;
 }
 #adminpage .toggleplugin {
 	float:left;
 	margin-right: 1em;
 }
 
-#adminpage table {width:100%; border-bottom: 1p solid #000000; margin: 5px 0px;}
-#adminpage table th { text-align: left;}
-#adminpage td .icon { float: left;}
-#adminpage table#users img { width: 16px; height: 16px; }
-#adminpage table tr:hover { background-color: #bbc7d7; }
-#adminpage .selectall { text-align: right; }
+#adminpage table {
+    width: 100%;
+    border-bottom: 1px solid #000;
+    margin: 5px 0;
+}
+#adminpage table th {
+    text-align: left;
+}
+#adminpage td .icon {
+    float: left;
+}
+#adminpage table#users img {
+    width: 16px; height: 16px;
+}
+#adminpage table tr:hover {
+    background-color:#bbc7d7;
+}
+#adminpage .selectall {
+    text-align: right;
+}
 
 /**
  * Form fields
  */
 .field {
-	margin-bottom: 10px;
-	padding-bottom: 10px;
-	overflow: auto;
-	width: 100%
+	/*margin-bottom: 10px;*/
+	/*padding-bottom: 10px;*/
+    overflow: auto;
+    width: 100%;
 }
-
-.field label {
-	float: left;
-	width: 200px;
+.field label, label {
+    float: left;
+    width: 275px;
+	display: block;
+	font-size: 1.077em;
+	/*font-weight: bold;*/
+	margin: 0 10px 0.5em 0;
+	border: 1px #999 solid;
+	padding: 5px;
+	background: #eee;
+	vertical-align: middle;
+}
+.field input, input[type="text"] {
+	width: 250px;
+	height: 25px;
+	border: 1px #999 solid;
 }
-
-.field input,
 .field textarea {
-	width: 400px;
+    width: 80%;
+    height: 100px;
 }
-.field textarea { height: 100px; }
 .field_help {
-	display: block;
-	margin-left: 200px;
-	color: #666666;
-	
+    display: block;
+    margin-left: 297px;
+    color: #666;
 }
-
-
 .field .onoff {
-	float: left;
-	width: 80px;
+    float: left;
+    width: 80px;
 }
 .field .onoff a {
-	display: block;
-	border:1px solid #666666;
-	background-image:url("../../../images/onoff.jpg");
-	background-repeat: no-repeat;
-	padding: 4px 2px 2px 2px;
-	height: 16px;
-	text-decoration: none;
+    display: block;
+    border: 1px solid #666;
+    padding: 3px 6px 4px 10px;
+    height: 16px;
+    text-decoration: none;
+}
+.field .onoff .on {
+	background: url("../../../images/onoff.jpg") no-repeat 42px 1px #999;
+    color: #111;
+    text-align: left;
 }
 .field .onoff .off {
-	border-color:#666666;
-	padding-left: 40px;
-	background-position: left center;
-	background-color: #cccccc;
-	color: #666666;
-	text-align: right;
+	background: url("../../../images/onoff.jpg") no-repeat 2px 1px #ccc;
+    color: #333;
+    text-align: right;
 }
-.field .onoff .on {
-	border-color:#204A87;
-	padding-right: 40px;
-	background-position: right center;
-	background-color: #3465A4;
-	color: #FFFFFF;
-	text-align: left;
+.hidden {
+    display:none !important;
+}
+.field.radio .field_help {
+    margin-left: 0;
+}
+
+
+/*
+ * UPDATE
+ */
+.popup { 	
+	width: 100%;
+    height: 100%;
+	top:0px;
+    left:0px;
+	position: absolute;
+	display: none;
+}
+.popup .background {
+	background-color: rgba(0,0,0,128);
+	opacity: 0.5;
+	width: 100%;
+    height: 100%;
+	position: absolute;
+	top:0px;
+    left:0px;
+}
+.popup .panel {
+	top: 25%;
+    left: 25%;
+    width: 50%;
+    height: 50%;
+	padding: 1em;
+	position: absolute;
+	border: 4px solid #000000;
+	background-color: #FFFFFF;
+}
+#panel {
+    z-index: 100;
+}
+.grey {
+    color: grey;
+}
+.orange {
+    color: orange;
+}
+.red {
+    color: red;
+}
+.popup .panel .panel_text {
+    display: block;
+    overflow: auto;
+    height: 80%;
+} 
+.popup .panel .panel_in {
+    width: 100%;
+    height: 100%;
+    position: relative;
+}
+.popup .panel .panel_actions {
+    width: 100%;
+    bottom: 4px;
+    left: 0px;
+    position: absolute;
+}
+.panel_text .progress {
+    width: 50%;
+    overflow: hidden;
+    height: auto;
+    border: 1px solid #cccccc;
+    margin-bottom: 5px;
+}
+.panel_text .progress span {
+    float: right;
+    display: block;
+    width: 25%;
+    background-color: #eeeeee;
+    text-align: right;
+}
+
+/**
+ * OAuth
+ */
+.oauthapp {
+	height: auto;
+    overflow: auto;
+	border-bottom: 2px solid #cccccc;
+	padding-bottom: 1em;
+	margin-bottom: 1em;	
+}
+.oauthapp img {
+	float: left;
+	width: 48px; height: 48px;
+	margin: 10px;
+}
+.oauthapp img.noicon {
+	background-image: url("../../../images/icons/48/plugin.png");
+	background-position: center center;
+	background-repeat: no-repeat;
+}
+.oauthapp a {
+	float: left;
 }
-.hidden { display: none!important; }
 
-.field.radio .field_help { margin-left: 0px; }
 
 /**
  * ICONS
  */
+.iconspacer {
+	display: block;
+    width: 16px;
+    height: 16px;
+}
 .icon {
-	display: block; width: 20px; height: 20px;
-	background-image: url('icons.png');
+    display: block;
+    width: 20px;
+    height: 20px;
+    background: url(icons.png) no-repeat;
+    border: 0;
+    text-decoration: none;
 }
-/*.icon:hover {
-	border-bottom: 0px;
+.icon:hover {
+    border: 0;
+    text-decoration: none;
+}
+.icon.drop,
+.icon.drophide, .icon.delete {
+    float: left;
+}
+/*.icon.s22 {
+	display: block;
+	background: url(icons.png) no-repeat;
+	width: 22px;
+	height: 22px;
 }*/
-
-.starred { 
-	background-image: url("star.png"); 
-	repeat: no-repeat;
+.icon.s22.delete {
+	display: block;
+	background-position: -110px 0;
 }
-.unstarred { 
-	background-image: url("premium.png");
-	repeat: no-repeat;
+.icon.s22.text {
+	padding: 10px 0px 0px 25px;
+	width: 200px;
+}
+.icon.text {
+    text-indent: 0px;
+}
+.icon.s16 {
+    min-width: 16px;
+    height: 16px;
+}
+.s16 .add {
+    background: url("../../../images/icons/16/add.png") no-repeat;
+}
+.add {
+    margin: 0px 5px;    
+}
+.article {
+	background-position: -50px 0;
+}
+.audio {
+	background-position: -70px 0;
+}
+.block {
+	background-position: -90px 0px;
+}
+.drop, .delete {
+	background-position: -110px 0;
+}
+.drophide {
+	background-position: -130px 0;
+}
+.edit {
+	background-position: -150px 0;
+}
+.camera {
+	background-position: -170px 0;
+}
+.dislike {
+	background-position: -190px 0;
+}
+.like {
+	background-position: -211px 0;
+}
+.link {
+	background-position: -230px 0;
+}
+.globe, .location {
+	background-position: -50px -20px;
+}
+.noglobe, .nolocation {
+	background-position: -70px -20px;
+}
+.no {
+	background-position: -90px -20px;
+}
+.pause {
+	background-position: -110px -20px;
+}
+.play {
+	background-position: -130px -20px;
+}
+.pencil {
+	background-position: -151px -18px;
+}
+.small-pencil {
+	background-position: -170px -20px;
+}
+.recycle {
+	background-position: -190px -20px;
+}
+.remote-link {
+	background-position: -210px -20px;
+}
+.share {
+	background-position: -230px -20px;
+}
+.tools {
+	background-position: -50px -40px;
+}
+.lock {
+	background-position: -70px -40px;
+}
+.unlock {
+	background-position: -90px -40px;
+}
+.video {
+	background-position: -110px -40px;
+}
+.attach {
+	background-position: -190px -40px;
+}
+.language {
+	background-position: -210px -40px;
+}
+.starred {
+	background-position: -130px -60px;
+}
+.unstarred {
+	background-position: -150px -60px;
 }
-
 .tagged {
-	background-image: url("tag.png");
-	repeat: no-repeat;
+	background-position: -170px -60px;
 }
-
-
-
-.border {
+.on {
+	background-position: -50px  -60px;
+}
+.off {
+	background-position: -70px  -60px;
+}
+.prev {
+	background-position: -90px  -60px;
+}
+.next {
+	background-position: -110px  -60px;
+}
+.icon.dim {
+	opacity: 0.3;
+	filter: alpha(opacity=30);
+}
+#pause {
+	position: fixed;
+	bottom: 5px;
+	right: 5px;
+}
+.border, .border:hover {
 	border: 1px solid #babdb6;
     -webkit-border-radius: 3px;
     -moz-border-radius: 3px;
     border-radius: 3px;	
 }
-
-.article	{ background-position: -50px  0px;}
-.audio 		{ background-position: -70px  0px;}
-.block 		{ background-position: -90px  0px;}
-.drop 		{ background-position: -110px 0px;}
-.drophide 	{ background-position: -130px 0px;}
-.edit 		{ background-position: -150px 0px;}
-.camera 	{ background-position: -170px 0px;}
-.dislike 	{ background-position: -190px 0px;}
-.like 		{ background-position: -210px 0px;}
-.link 		{ background-position: -230px 0px;}
-
-.globe 		{ background-position: -50px  -20px;}
-.noglobe 	{ background-position: -70px  -20px;}
-.no 		{ background-position: -90px  -20px;}
-.pause 		{ background-position: -110px -20px;}
-.play 		{ background-position: -130px -20px;}
-.pencil 	{ background-position: -150px -20px;}
-.small-pencil	{ background-position: -170px -20px;}
-.recycle 	{ background-position: -190px -20px;}
-.remote-link	{ background-position: -210px -20px;}
-.share 		{ background-position: -230px -20px;}
-
-.tools 		{ background-position: -50px  -40px;}
-.lock 		{ background-position: -70px  -40px;}
-.unlock 	{ background-position: -90px  -40px;}
-.video 		{ background-position: -110px -40px;}
-.youtube 	{ background-position: -130px -40px;}
-
-.attach 	{ background-position: -190px -40px;}
-.language 	{ background-position: -210px -40px;}
-
-
-.on 		{ background-position: -50px  -60px;}
-.off 		{ background-position: -70px  -60px;}
-.prev 		{ background-position: -90px  -60px;}
-.next 		{ background-position: -110px  -60px;}
-
-
-.icon.dim { opacity: 0.3;filter:alpha(opacity=30); }
-
 .attachtype {
-	display: block; width: 20px; height: 23px;
-	background-image: url('../../../images/content-types.png');
+    display: block;
+    width: 20px;
+    height: 23px;
+    background-image: url(../../../images/content-types.png);
+}
+.type-video {
+    background-position: 0px 0px;
+}
+.type-image {
+    background-position: -20px 0;
+}
+.type-audio {
+    background-position: -40px 0;
+}
+.type-text {
+    background-position: -60px 0px;
+}
+.type-unkn {
+    background-position: -80px 0;
 }
-
-.type-video { background-position: 0px 0px; }
-.type-image { background-position: -20px 0px; }
-.type-audio { background-position: -40px 0px; }
-.type-text  { background-position: -60px 0px; }
-.type-unkn  { background-position: -80px 0px; }
-
 
 
 /**
  * 	footer
- */                                  
- .cc-license { margin-top: 100px; font-size: 0.7em; }                                  
-footer { display: block; margin: 50px 20%; clear: both; }
-                                  
+ */
+.cc-license {
+    margin-top: 100px;
+    font-size: 0.7em;
+}
+footer {
+    display: block;
+    margin: 50px 20%;
+    clear: both;
+}
 #profile-jot-text {
     height: 20px;
-    color:#cccccc;
-    border: 1px solid #cccccc;
+    color: #666;
+    border: 1px solid #ccc;
+    border-radius: 5px;
+    width: 99.5%;
 }
+
+
 /** acl **/
 #photo-edit-perms-select,
 #photos-upload-permissions-wrapper,
-#profile-jot-acl-wrapper{
-	display:block!important;
+#profile-jot-acl-wrapper {
+    display: block !important;
 }
-
 #acl-wrapper {
-	width: 690px;
-	float:left;
+    width: 690px;
+    float: left;
 }
 #acl-search {
-	float:right;
-	background: #ffffff url("../../../images/search_18.png") no-repeat right center;
-	padding-right:20px;
+    float: right;
+    background: #fff url("../../../images/search_18.png") no-repeat right center;
+    padding-right: 20px;
 }
 #acl-showall {
-	float: left;
-	display: block;
-	width: auto;
-	height: 18px;
-	background-color: #cccccc;
-	background-image: url("../../../images/show_all_off.png");
-	background-position: 7px 7px;
-	background-repeat: no-repeat;
-	padding: 7px 10px 7px 30px;
-	-webkit-border-radius: 5px ;
-	-moz-border-radius: 5px;
-	border-radius: 5px;
-	color: #999999;
+    float:left;
+    display:block;
+    width:auto;
+    height:18px;
+    background-color:#CCC;
+    background-image:url("../../../images/show_all_off.png");
+    background-position:7px 7px;
+    background-repeat:no-repeat;
+    padding:7px 10px 7px 30px;
+    -webkit-border-radius:5px;
+    -moz-border-radius:5px;
+    border-radius:5px;
+    color:#999;
 }
 #acl-showall.selected {
-	color: #000000;
-	background-color: #ff9900;
-	background-image: url("../../../images/show_all_on.png");
+    color:#000;
+    background-color:#F90;
+    background-image:url(../../../images/show_all_on.png);
 }
-
 #acl-list {
-	height: 210px;
-	border: 1px solid #cccccc;
-	clear: both;
-	margin-top: 30px;
-	overflow: auto;
+    height:210px;
+    border:1px solid #ccc;
+    clear:both;
+    margin-top:30px;
+    overflow:auto;
 }
 #acl-list-content {
 }
 .acl-list-item {
-	display: block;
-	width: 150px;
-	height: 30px;
-	border: 1px solid #cccccc;
-	margin: 5px;
-	float: left;
+    display:block;
+    width:150px;
+    height:30px;
+    border:1px solid #ccc;
+    margin:5px;
+    float:left;
+}
+.acl-list-item img {
+    width:22px;
+    height:22px;
+    float:left;
+    margin:4px;
+}
+.acl-list-item p {
+    height: 12px;
+    font-size: 10px;
+    margin: 0;
+    padding: 2px 0 1px;
+}
+.acl-list-item a {
+    font-size:8px;
+    display:block;
+    width:40px;
+    height:10px;
+    float:left;
+    color:#999;
+    background-color:#CCC;
+    background-position:3px 3px;
+    background-repeat:no-repeat;
+    margin-right:5px;
+    -webkit-border-radius:2px;
+    -moz-border-radius:2px;
+    border-radius:2px;
+    padding-left:15px;
 }
-.acl-list-item img{
-	width:22px;
-	height: 22px;
-	float: left;
-	margin: 4px;
+#acl-wrapper a:hover {
+    text-decoration:none;
+    color:#000;
 }
-.acl-list-item p { height: 12px; font-size: 10px; margin: 0px; padding: 2px 0px 1px; overflow: hidden;}
-.acl-list-item a { 
-	font-size: 8px;
-	display: block;
-	width: 40px;
-	height: 10px;
-	float: left;
-	color: #999999;
-	background-color: #cccccc;
-	background-position: 3px 3px;
-	background-repeat: no-repeat;
-	margin-right: 5px;
-	-webkit-border-radius: 2px ;
-	-moz-border-radius: 2px;
-	border-radius: 2px;
-	padding-left: 15px;
+.acl-button-show {
+    background-image:url('../../../images/show_off.png');
 }
-#acl-wrapper a:hover {
-	text-decoration: none;
-	color:#000000;
+.acl-button-hide {
+    background-image:url('../../../images/hide_off.png');
 }
-.acl-button-show { background-image: url("../../../images/show_off.png"); }
-.acl-button-hide { background-image: url("../../../images/hide_off.png"); }
-
 .acl-button-show.selected {
-	color: #000000;
-	background-color: #9ade00;
-	background-image: url("../../../images/show_on.png");
+    color:#000;
+    background-color:#9ade00;
+    background-image:url(../../../images/show_on.png);
 }
 .acl-button-hide.selected {
-	color: #000000;
-	background-color: #ff4141;
-	background-image: url("../../../images/hide_on.png");
+    color:#000;
+    background-color:#ff4141;
+    background-image:url(../../../images/hide_on.png);
+}
+.acl-list-item.groupshow {
+    border-color:#9ade00;
+}
+.acl-list-item.grouphide {
+    border-color:#ff4141;
 }
-.acl-list-item.groupshow { border-color: #9ade00; }
-.acl-list-item.grouphide { border-color: #ff4141; }
 /** /acl **/
 
 
 /* autocomplete popup */
 .acpopup {
-	max-height:150px;
-	background-color:#555753;
-	color: #FFFFFF;
-	overflow:auto;
-	z-index:100000;
-	border:1px solid #cccccc;
+	max-height: 150px;
+	background-color: #555753;
+	color: #fff;
+	overflow: auto;
+	z-index: 100000;
+	border: 1px solid #cccccc;
 }
 .acpopupitem {
-	background-color:#555753; padding: 4px;
-	clear:left;
+	background-color: #555753;
+    padding: 4px;
+	clear: left;
 }
 .acpopupitem img {
 	float: left;
 	margin-right: 4px;
 }
-
 .acpopupitem.selected {
-	color: #2e3436; background-color: #eeeeec;
+	color: #2e3436;
+    background-color: #eeeeec;
+}
+.qcomment-wrapper {
+    padding: 0px;
+    margin: 2px;
+    list-style-type: none;
+}
+.qcomment, .qcomment:hover {
+    display: inline;
+    padding: 5px;
+    margin: 5px;
 }
 .qcomment {
-	opacity: 0;
-	filter:alpha(opacity=0);
+	opacity: 0.5;
+	filter:alpha(opacity=50);
 }
 .qcomment:hover {
 	opacity: 1.0;
 	filter:alpha(opacity=100);
 }
+#network-star-link {
+    margin-top: 10px;
+}
+.network-star {
+    float: left;
+    margin-right: 5px;
+}
+.network-star.icon.starred {
+    display: inline-block;
+}
+
diff --git a/view/theme/dispy/tag.png b/view/theme/dispy/tag.png
index aca10707a..9b5a7223e 100644
--- a/view/theme/dispy/tag.png
+++ b/view/theme/dispy/tag.png
diff --git a/view/theme/dispy/theme.php b/view/theme/dispy/theme.php
new file mode 100644
index 000000000..c72884f1a
--- /dev/null
+++ b/view/theme/dispy/theme.php
@@ -0,0 +1,74 @@
+<?php
+$a->theme_info = array();
+
+$a->page['htmlhead'] .= <<< EOT
+<script>
+$(document).ready(function() {
+    $('.group-edit-icon').hover(
+        function() {
+            $(this).addClass('icon');
+            $(this).removeClass('iconspacer'); },
+
+        function() {
+            $(this).removeClass('icon');
+            $(this).addClass('iconspacer'); }
+    );
+
+    $('.sidebar-group-element').hover(
+        function() {
+            id = $(this).attr('id');
+            $('#edit-' + id).addClass('icon');
+            $('#edit-' + id).removeClass('iconspacer'); },
+
+        function() {
+            id = $(this).attr('id');
+            $('#edit-' + id).removeClass('icon');
+            $('#edit-' + id).addClass('iconspacer'); }
+    );
+
+    $('.savedsearchdrop').hover(
+        function() {
+            $(this).addClass('drop');
+            $(this).addClass('icon');
+            $(this).removeClass('iconspacer'); },
+
+        function() {
+            $(this).removeClass('drop');
+            $(this).removeClass('icon');
+            $(this).addClass('iconspacer'); }
+    );
+
+    $('.savedsearchterm').hover(
+        function() {
+            id = $(this).attr('id');
+            $('#drop-' + id).addClass('icon');
+            $('#drop-' + id).addClass('drophide');
+            $('#drop-' + id).removeClass('iconspacer'); },
+
+        function() {
+            id = $(this).attr('id');
+            $('#drop-' + id).removeClass('icon');
+            $('#drop-' + id).removeClass('drophide');
+            $('#drop-' + id).addClass('iconspacer'); }
+        );
+
+    function toggleToolbar() {
+        if ( $('#nav-floater').is(':visible') ) {
+            $('#nav-floater').slideUp('fast');
+            $('.floaterflip').css({
+                backgroundPosition: '-210px -60px' 
+            });
+        } else {
+            $('#nav-floater').slideDown('fast');
+            $('.floaterflip').css({
+                backgroundPosition: '-190px -60px'
+            });
+        }
+    };
+    $('.floaterflip').click(function() {
+        toggleToolbar();
+        return false;
+    });
+});
+</script>
+EOT;
diff --git a/view/theme/dispy/wall_item.tpl b/view/theme/dispy/wall_item.tpl
index 882843a09..b013cfeef 100755..100644
--- a/view/theme/dispy/wall_item.tpl
+++ b/view/theme/dispy/wall_item.tpl
@@ -1,77 +1,77 @@
-<div class="wall-item-outside-wrapper$indent" id="wall-item-outside-wrapper-$id" >
-	<div class="wall-item-content-wrapper$indent" id="wall-item-content-wrapper-$id" >
-		<div class="wall-item-info" id="wall-item-info-$id">
-			<div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-$id" 
-				 onmouseover="if (typeof t$id != 'undefined') clearTimeout(t$id); openMenu('wall-item-photo-menu-button-$id')" 
-				 onmouseout="t$id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$id\'); closeMenu(\'wall-item-photo-menu-$id\');',200)">
-				<a href="$profile_url" title="$linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$id">
-					<img src="$thumb" class="wall-item-photo$sparkle" id="wall-item-photo-$id" style="height: 80px; width: 80px;" alt="$name" />
+<div class="wall-item-outside-wrapper$item.indent" id="wall-item-outside-wrapper-$item.id" >
+	<div class="wall-item-content-wrapper$item.indent" id="wall-item-content-wrapper-$item.id" >
+		<div class="wall-item-info" id="wall-item-info-$item.id">
+			<div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-$item.id" 
+				 onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')" 
+				 onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)">
+				<a href="$item.profile_url" title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id">
+					<img src="$item.thumb" class="wall-item-photo$item.sparkle" id="wall-item-photo-$item.id" style="height: 80px; width: 80px;" alt="$item.name" />
 				</a>
-				<span onclick="openClose('wall-item-photo-menu-$id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$id">menu</span>
-				<div class="wall-item-photo-menu" id="wall-item-photo-menu-$id">
+				<span onclick="openClose('wall-item-photo-menu-$item.id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$item.id">menu</span>
+				<div class="wall-item-photo-menu" id="wall-item-photo-menu-$item.id">
 					<ul>
-						$item_photo_menu
+						$item.item_photo_menu
 					</ul>
 				</div>
 			</div>
 			<div class="wall-item-photo-end"></div>
-			<div class="wall-item-location" id="wall-item-location-$id">{{ if $location }}<span class="icon globe"></span>$location {{ endif }}</div>				
+			<div class="wall-item-location" id="wall-item-location-$item.id">{{ if $item.location }}<span class="icon globe"></span>$item.location {{ endif }}</div>				
 		</div>
 		<div class="wall-item-lock-wrapper">
-			{{ if $lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$lock" onclick="lockview(event,$id);" /></div>
+			{{ if $item.lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$item.lock" onclick="lockview(event,$item.id);" /></div>
 			{{ else }}<div class="wall-item-lock"></div>{{ endif }}
 		</div>
-		<div class="wall-item-tools" id="wall-item-tools-$id">
-			{{ if $star }}
-				<a href="#" id="starred-$id" onclick="dostar($id); return false;" class="star-item icon $isstarred" title="$star.toggle"></a>
-				<a href="#" id="tagger-$id" onclick="itemTag($id); return false;" class="tag-item icon tagged" title="$star.tagger"></a>
+		<div class="wall-item-tools" id="wall-item-tools-$item.id">
+			{{ if $item.star }}
+				<a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle"></a>
+				<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a>
 			{{ endif }}
-			{{ if $vote }}
-			<div class="wall-item-like-buttons" id="wall-item-like-buttons-$id">
-				<a href="#" class="icon like" title="$vote.like.0" onclick="dolike($id,'like'); return false"></a>
-				<a href="#" class="icon dislike" title="$vote.dislike.0" onclick="dolike($id,'dislike'); return false"></a>
-				{{ if $vote.share }}<a href="#" class="icon recycle wall-item-share-buttons" title="$vote.share.0" onclick="jotShare($id); return false"></a>{{ endif }}
-				<img id="like-rotator-$id" class="like-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
+			{{ if $item.vote }}
+			<div class="wall-item-like-buttons" id="wall-item-like-buttons-$item.id">
+				<a href="#" class="icon like" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false"></a>
+				<a href="#" class="icon dislike" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false"></a>
+				{{ if $item.vote.share }}<a href="#" class="icon recycle wall-item-share-buttons" title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a>{{ endif }}
+				<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
 			</div>
 			{{ endif }}
-			{{ if $plink }}
-				<div class="wall-item-links-wrapper"><a href="$plink.href" title="$plink.title" target="external-link" class="icon remote-link"></a></div>
+			{{ if $item.plink }}
+				<div class="wall-item-links-wrapper"><a href="$item.plink.href" title="$item.plink.title" target="external-link" class="icon remote-link"></a></div>
 			{{ endif }}
-			{{ if $edpost }}
-				<a class="editpost icon pencil" href="$edpost.0" title="$edpost.1"></a>'
+			{{ if $item.edpost }}
+				<a class="editpost icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>
 			{{ endif }}
 		
-			<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$id" >
-				{{ if $drop.dropping }}<a href="item/drop/$id" onclick="return confirmDelete();" class="icon drophide" title="$drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
+			<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" >
+				{{ if $item.drop.dropping }}<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drophide" title="$item.drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
 			</div>
-				{{ if $drop.dropping }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$drop.select" class="item-select" name="itemselected[]" value="$id" />{{ endif }}
+				{{ if $item.drop.dropping }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" />{{ endif }}
 			<div class="wall-item-delete-end"></div>
 		
 		</div>
-		<div class="wall-item-content" id="wall-item-content-$id" >
-			<div class="wall-item-title" id="wall-item-title-$id">$title</div>
+		<div class="wall-item-content" id="wall-item-content-$item.id" >
+			<div class="wall-item-title" id="wall-item-title-$item.id">$item.title</div>
 			<div class="wall-item-title-end"></div>
-			<div class="wall-item-body" id="wall-item-body-$id" >$body
+			<div class="wall-item-body" id="wall-item-body-$item.id" >$item.body
 					<div class="body-tag">
-						{{ for $tags as $tag }}
+						{{ for $item.tags as $tag }}
 							<span class='tag'>$tag</span>
 						{{ endfor }}
 					</div>
 			</div>
 		</div>
 		<div class="wall-item-author">
-				<a href="$profile_url" title="$linktitle" class="wall-item-name-link"><span class="wall-item-name$sparkle" id="wall-item-name-$id" >$name</span></a>
-				<div class="wall-item-ago"  id="wall-item-ago-$id">$ago</div>
+				<a href="$item.profile_url" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle" id="wall-item-name-$item.id" >$item.name</span></a>
+				<div class="wall-item-ago"  id="wall-item-ago-$item.id">$item.ago</div>
 				
 		</div>	
 	</div>
 	<div class="wall-item-wrapper-end"></div>
-	<div class="wall-item-like" id="wall-item-like-$id">$like</div>
-	<div class="wall-item-dislike" id="wall-item-dislike-$id">$dislike</div>
-	<div class="wall-item-comment-wrapper" >
-	$comment
+	<div class="wall-item-like" id="wall-item-like-$item.id">$item.like</div>
+	<div class="wall-item-dislike" id="wall-item-dislike-$item.id">$item.dislike</div>
+	<div class="wall-item-comment-wrapper">
+	$item.comment
 	</div>
 </div>
 
-<div class="wall-item-outside-wrapper-end$indent" ></div>
+<div class="wall-item-outside-wrapper-end$item.indent"></div>
 
diff --git a/view/theme/dispy/wallwall_item.tpl b/view/theme/dispy/wallwall_item.tpl
index 57c6600b7..86453fad2 100755..100644
--- a/view/theme/dispy/wallwall_item.tpl
+++ b/view/theme/dispy/wallwall_item.tpl
@@ -1,81 +1,81 @@
-<div class="wall-item-outside-wrapper$indent wallwall" id="wall-item-outside-wrapper-$id" >
-	<div class="wall-item-content-wrapper$indent" id="wall-item-content-wrapper-$id" >
-		<div class="wall-item-info wallwall" id="wall-item-info-$id">
-			<div class="wall-item-photo-wrapper wwto" id="wall-item-ownerphoto-wrapper-$id" >
-				<a href="$owner_url" title="$olinktitle" class="wall-item-photo-link" id="wall-item-ownerphoto-link-$id">
-				<img src="$owner_photo" class="wall-item-photo$osparkle" id="wall-item-ownerphoto-$id" style="height: 80px; width: 80px;" alt="$owner_name" /></a>
+<div class="wall-item-outside-wrapper$item.indent wallwall" id="wall-item-outside-wrapper-$item.id" >
+	<div class="wall-item-content-wrapper$item.indent" id="wall-item-content-wrapper-$item.id" >
+		<div class="wall-item-info wallwall" id="wall-item-info-$item.id">
+			<div class="wall-item-photo-wrapper wwto" id="wall-item-ownerphoto-wrapper-$item.id" >
+				<a href="$item.owner_url" title="$item.olinktitle" class="wall-item-photo-link" id="wall-item-ownerphoto-link-$item.id">
+				<img src="$item.owner_photo" class="wall-item-photo$item.osparkle" id="wall-item-ownerphoto-$item.id" style="height: 80px; width: 80px;" alt="$item.owner_name" /></a>
 			</div>
-			<div class="wall-item-arrowphoto-wrapper" ><img src="images/larrow.gif" alt="$wall" /></div>
-			<div class="wall-item-photo-wrapper wwfrom" id="wall-item-photo-wrapper-$id" 
-				onmouseover="if (typeof t$id != 'undefined') clearTimeout(t$id); openMenu('wall-item-photo-menu-button-$id')"
-                onmouseout="t$id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$id\'); closeMenu(\'wall-item-photo-menu-$id\');',200)">
-				<a href="$profile_url" title="$linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$id">
-				<img src="$thumb" class="wall-item-photo$sparkle" id="wall-item-photo-$id" style="height: 80px; width: 80px;" alt="$name" /></a>
-				<span onclick="openClose('wall-item-photo-menu-$id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$id">menu</span>
-                <div class="wall-item-photo-menu" id="wall-item-photo-menu-$id">
+			<div class="wall-item-arrowphoto-wrapper" ><img src="images/larrow.gif" alt="$item.wall" /></div>
+			<div class="wall-item-photo-wrapper wwfrom" id="wall-item-photo-wrapper-$item.id" 
+				onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')"
+                onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)">
+				<a href="$item.profile_url" title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id">
+				<img src="$item.thumb" class="wall-item-photo$item.sparkle" id="wall-item-photo-$item.id" style="height: 80px; width: 80px;" alt="$item.name" /></a>
+				<span onclick="openClose('wall-item-photo-menu-$item.id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$item.id">menu</span>
+                <div class="wall-item-photo-menu" id="wall-item-photo-menu-$item.id">
                     <ul>
-                        $item_photo_menu
+                        $item.item_photo_menu
                     </ul>
                 </div>
 
 			</div>
 			<div class="wall-item-photo-end"></div>
-			<div class="wall-item-location" id="wall-item-location-$id">{{ if $location }}<span class="icon globe"></span>$location {{ endif }}</div>				
+			<div class="wall-item-location" id="wall-item-location-$item.id">{{ if $item.location }}<span class="icon globe"></span>$item.location {{ endif }}</div>				
 		</div>
 		<div class="wall-item-lock-wrapper">
-				{{ if $lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$lock" onclick="lockview(event,$id);" /></div>
+				{{ if $item.lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$item.lock" onclick="lockview(event,$item.id);" /></div>
 				{{ else }}<div class="wall-item-lock"></div>{{ endif }}
 		</div>
-		<div class="wall-item-tools" id="wall-item-tools-$id">
-			{{ if $star }}
-				<a href="#" id="starred-$id" onclick="dostar($id); return false;" class="star-item icon $isstarred" title="$star.toggle"></a>
-				<a href="#" id="tagger-$id" onclick="itemTag($id); return false;" class="tag-item icon tagged" title="$star.tagger"></a>
+		<div class="wall-item-tools" id="wall-item-tools-$item.id">
+			{{ if $item.star }}
+				<a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle"></a>
+				<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a>
 			{{ endif }}
-			{{ if $vote }}
-			<div class="wall-item-like-buttons" id="wall-item-like-buttons-$id">
-				<a href="#" class="icon like" title="$vote.like.0" onclick="dolike($id,'like'); return false"></a>
-				<a href="#" class="icon dislike" title="$vote.dislike.0" onclick="dolike($id,'dislike'); return false"></a>
-				{{ if $vote.share }}<a href="#" class="icon recycle wall-item-share-buttons" title="$vote.share.0" onclick="jotShare($id); return false"></a>{{ endif }}
-				<img id="like-rotator-$id" class="like-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
+			{{ if $item.vote }}
+			<div class="wall-item-like-buttons" id="wall-item-like-buttons-$item.id">
+				<a href="#" class="icon like" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false"></a>
+				<a href="#" class="icon dislike" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false"></a>
+				{{ if $item.vote.share }}<a href="#" class="icon recycle wall-item-share-buttons" title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a>{{ endif }}
+				<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
 			</div>
 			{{ endif }}
-			{{ if $plink }}
-				<div class="wall-item-links-wrapper"><a href="$plink.href" title="$plink.title" target="external-link" class="icon remote-link"></a></div>
+			{{ if $item.plink }}
+				<div class="wall-item-links-wrapper"><a href="$item.plink.href" title="$item.plink.title" target="external-link" class="icon remote-link"></a></div>
 			{{ endif }}
-			{{ if $edpost }}
-				<a class="editpost icon pencil" href="$edpost.0" title="$edpost.1"></a>'
+			{{ if $item.edpost }}
+				<a class="editpost icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>
 			{{ endif }}
 		
-			<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$id" >
-				{{ if $drop.dropping }}<a href="item/drop/$id" onclick="return confirmDelete();" class="icon drophide" title="$drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
+			<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" >
+				{{ if $item.drop.dropping }}<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drophide" title="$item.drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
 			</div>
-				{{ if $drop.dropping }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$drop.select" class="item-select" name="itemselected[]" value="$id" />{{ endif }}
+				{{ if $item.drop.dropping }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" />{{ endif }}
 			<div class="wall-item-delete-end"></div>
 
 		</div>
-		<div class="wall-item-content" id="wall-item-content-$id" >
-			<div class="wall-item-title" id="wall-item-title-$id">$title</div>
+		<div class="wall-item-content" id="wall-item-content-$item.id" >
+			<div class="wall-item-title" id="wall-item-title-$item.id">$item.title</div>
 			<div class="wall-item-title-end"></div>
-			<div class="wall-item-body" id="wall-item-body-$id" >$body
+			<div class="wall-item-body" id="wall-item-body-$item.id" >$item.body
 					<div class="body-tag">
-						{{ for $tags as $tag }}
-							<span class='tag'>$tag</span>
+						{{ for $item.tags as $tag }}
+							<span class="tag">$tag</span>
 						{{ endfor }}
 					</div>			
 			</div>
 		</div>
 		<div class="wall-item-author">
-			<a href="$profile_url" title="$linktitle" class="wall-item-name-link"><span class="wall-item-name$sparkle" id="wall-item-name-$id" >$name</span></a>
-			<div class="wall-item-ago"  id="wall-item-ago-$id">$ago</div>
+			<a href="$item.profile_url" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle" id="wall-item-name-$item.id" >$item.name</span></a>
+			<div class="wall-item-ago"  id="wall-item-ago-$item.id">$item.ago</div>
 		</div>	
 	</div>	
 	<div class="wall-item-wrapper-end"></div>
-	<div class="wall-item-like" id="wall-item-like-$id">$like</div>
-	<div class="wall-item-dislike" id="wall-item-dislike-$id">$dislike</div>
-	<div class="wall-item-comment-wrapper" >
-	$comment
+	<div class="wall-item-like" id="wall-item-like-$item.id">$item.like</div>
+	<div class="wall-item-dislike" id="wall-item-dislike-$item.id">$item.dislike</div>
+	<div class="wall-item-comment-wrapper">
+	$item.comment
 	</div>
 </div>
 
-<div class="wall-item-outside-wrapper-end$indent" ></div>
+<div class="wall-item-outside-wrapper-end$item.indent" ></div>
 
diff --git a/view/theme/duepuntozero/comment_item.tpl b/view/theme/duepuntozero/comment_item.tpl
index b29735227..3503c3843 100755
--- a/view/theme/duepuntozero/comment_item.tpl
+++ b/view/theme/duepuntozero/comment_item.tpl
@@ -1,4 +1,4 @@
-		<div class="comment-$wwedit-wrapper" id="comment-edit-wrapper-$id" style="display: block;">
+		<div class="comment-wwedit-wrapper" id="comment-edit-wrapper-$id" style="display: block;">
 			<form class="comment-edit-form" id="comment-edit-form-$id" action="item" method="post" onsubmit="post_comment($id); return false;">
 				<input type="hidden" name="type" value="$type" />
 				<input type="hidden" name="profile_uid" value="$profile_uid" />
diff --git a/view/theme/duepuntozero/conversation.tpl b/view/theme/duepuntozero/conversation.tpl
index 33cedfb1e..43bb1dd47 100755
--- a/view/theme/duepuntozero/conversation.tpl
+++ b/view/theme/duepuntozero/conversation.tpl
@@ -1,6 +1,18 @@
 {{ for $threads as $thread }}
 <div id="tread-wrapper-$thread.id" class="tread-wrapper">
-	$thread.html
+	{{ for $thread.items as $item }}
+		{{if $item.comment_firstcollapsed}}
+			<div class="hide-comments-outer">
+			<span id="hide-comments-total-$thread.id" class="hide-comments-total">$thread.num_comments</span> <span id="hide-comments-$thread.id" class="hide-comments fakelink" onclick="showHideComments($thread.id);">$thread.hide_text</span>
+			</div>
+			<div id="collapsed-comments-$thread.id" class="collapsed-comments" style="display: none;">
+		{{endif}}
+		{{if $item.comment_lastcollapsed}}</div>{{endif}}
+		
+		{{ inc $item.template }}{{ endinc }}
+		
+		
+	{{ endfor }}
 </div>
 {{ endfor }}
 
diff --git a/view/theme/duepuntozero/jot.tpl b/view/theme/duepuntozero/jot.tpl
index e356d1d8f..5fe1f954e 100755
--- a/view/theme/duepuntozero/jot.tpl
+++ b/view/theme/duepuntozero/jot.tpl
@@ -14,10 +14,11 @@
 		<input type="hidden" name="coord" id="jot-coord" value="" />
 		<input type="hidden" name="post_id" value="$post_id" />
 		<input type="hidden" name="preview" id="jot-preview" value="0" />
-		<input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" style="display:none">
+		<div id="jot-title-wrap"><input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" style="display:none"></div>
+		<div id="jot-text-wrap">
 		<img id="profile-jot-text-loading" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
 		<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" >{{ if $content }}$content{{ else }}$share{{ endif }}</textarea>
-
+		</div>
 
 <div id="profile-jot-submit-wrapper" class="jothidden">
 	<input type="submit" id="profile-jot-submit" name="submit" value="$share" />
diff --git a/view/theme/duepuntozero/search_item.tpl b/view/theme/duepuntozero/search_item.tpl
index f046e41ec..bfad1b7b7 100755
--- a/view/theme/duepuntozero/search_item.tpl
+++ b/view/theme/duepuntozero/search_item.tpl
@@ -1,53 +1,53 @@
-<div class="wall-item-outside-wrapper$indent$previewing" id="wall-item-outside-wrapper-$id" >
-	<div class="wall-item-content-wrapper$indent" id="wall-item-content-wrapper-$id" >
-		<div class="wall-item-info" id="wall-item-info-$id">
-			<div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-$id" 
-				 onmouseover="if (typeof t$id != 'undefined') clearTimeout(t$id); openMenu('wall-item-photo-menu-button-$id')" 
-				 onmouseout="t$id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$id\'); closeMenu(\'wall-item-photo-menu-$id\');',200)">
-				<a href="$profile_url" target="redir" title="$linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$id">
-				<img src="$thumb" class="wall-item-photo$sparkle" id="wall-item-photo-$id" style="height: 80px; width: 80px;" alt="$name" /></a>
-				<span onclick="openClose('wall-item-photo-menu-$id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$id">menu</span>
-				<div class="wall-item-photo-menu" id="wall-item-photo-menu-$id">
+<div class="wall-item-outside-wrapper$item.indent$item.previewing" id="wall-item-outside-wrapper-$item.id" >
+	<div class="wall-item-content-wrapper$item.indent" id="wall-item-content-wrapper-$item.id" >
+		<div class="wall-item-info" id="wall-item-info-$item.id">
+			<div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-$item.id" 
+				 onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')" 
+				 onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)">
+				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id">
+				<img src="$item.thumb" class="wall-item-photo$item.sparkle" id="wall-item-photo-$item.id" style="height: 80px; width: 80px;" alt="$item.name" /></a>
+				<span onclick="openClose('wall-item-photo-menu-$item.id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$item.id">menu</span>
+				<div class="wall-item-photo-menu" id="wall-item-photo-menu-$item.id">
 					<ul>
-						$item_photo_menu
+						$item.item_photo_menu
 					</ul>
 				</div>
 			</div>
 			<div class="wall-item-photo-end"></div>	
-			<div class="wall-item-wrapper" id="wall-item-wrapper-$id" >
-				{{ if $lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$lock" onclick="lockview(event,$id);" /></div>
+			<div class="wall-item-wrapper" id="wall-item-wrapper-$item.id" >
+				{{ if $item.lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$item.lock" onclick="lockview(event,$item.id);" /></div>
 				{{ else }}<div class="wall-item-lock"></div>{{ endif }}	
-				<div class="wall-item-location" id="wall-item-location-$id">$location</div>
+				<div class="wall-item-location" id="wall-item-location-$item.id">$item.location</div>
 			</div>
 		</div>
 		<div class="wall-item-author">
-				<a href="$profile_url" target="redir" title="$linktitle" class="wall-item-name-link"><span class="wall-item-name$sparkle" id="wall-item-name-$id" >$name</span></a>
-				<div class="wall-item-ago"  id="wall-item-ago-$id">$ago</div>
+				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle" id="wall-item-name-$item.id" >$item.name</span></a>
+				<div class="wall-item-ago"  id="wall-item-ago-$item.id">$item.ago</div>
 				
 		</div>			
-		<div class="wall-item-content" id="wall-item-content-$id" >
-			<div class="wall-item-title" id="wall-item-title-$id">$title</div>
+		<div class="wall-item-content" id="wall-item-content-$item.id" >
+			<div class="wall-item-title" id="wall-item-title-$item.id">$item.title</div>
 			<div class="wall-item-title-end"></div>
-			<div class="wall-item-body" id="wall-item-body-$id" >$body</div>
+			<div class="wall-item-body" id="wall-item-body-$item.id" >$item.body</div>
 		</div>
-		<div class="wall-item-tools" id="wall-item-tools-$id">
-			<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$id" >
-				{{ if $drop.dropping }}<a href="item/drop/$id" onclick="return confirmDelete();" class="icon drophide" title="$drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
+		<div class="wall-item-tools" id="wall-item-tools-$item.id">
+			<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" >
+				{{ if $item.drop.dropping }}<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drophide" title="$item.drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
 			</div>
-				{{ if $drop.dropping }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$drop.select" class="item-select" name="itemselected[]" value="$id" />{{ endif }}
+				{{ if $item.drop.dropping }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" />{{ endif }}
 			<div class="wall-item-delete-end"></div>
 		</div>
 	</div>
 	<div class="wall-item-wrapper-end"></div>
 
 
-	<div class="wall-item-conv" id="wall-item-conv-$id" >
-	{{ if $conv }}
-			<a href='$conv.href' id='context-$id' title='$conv.title'>$conv.title</a>
+	<div class="wall-item-conv" id="wall-item-conv-$item.id" >
+	{{ if $item.conv }}
+			<a href='$item.conv.href' id='context-$item.id' title='$item.conv.title'>$item.conv.title</a>
 	{{ endif }}
 	</div>
 
-<div class="wall-item-outside-wrapper-end$indent" ></div>
+<div class="wall-item-outside-wrapper-end$item.indent" ></div>
 
 </div>
 
diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css
index 938fbe471..acd97eb94 100755
--- a/view/theme/duepuntozero/style.css
+++ b/view/theme/duepuntozero/style.css
@@ -3036,4 +3036,4 @@ ul.menu-popup {
 
 .notify-seen {
 	background: #DDDDDD;
-}
-\ No newline at end of file
+}
diff --git a/view/theme/duepuntozero/wall_item.tpl b/view/theme/duepuntozero/wall_item.tpl
index a5136eed3..51e36b6f4 100755
--- a/view/theme/duepuntozero/wall_item.tpl
+++ b/view/theme/duepuntozero/wall_item.tpl
@@ -1,76 +1,76 @@
-<div class="wall-item-outside-wrapper$indent$previewing" id="wall-item-outside-wrapper-$id" >
-	<div class="wall-item-content-wrapper$indent" id="wall-item-content-wrapper-$id" >
-		<div class="wall-item-info" id="wall-item-info-$id">
-			<div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-$id" 
-				 onmouseover="if (typeof t$id != 'undefined') clearTimeout(t$id); openMenu('wall-item-photo-menu-button-$id')" 
-				 onmouseout="t$id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$id\'); closeMenu(\'wall-item-photo-menu-$id\');',200)">
-				<a href="$profile_url" target="redir" title="$linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$id">
-					<img src="$thumb" class="wall-item-photo$sparkle" id="wall-item-photo-$id" style="height: 80px; width: 80px;" alt="$name" />
+<div class="wall-item-outside-wrapper$item.indent$item.previewing" id="wall-item-outside-wrapper-$item.id" >
+	<div class="wall-item-content-wrapper$item.indent" id="wall-item-content-wrapper-$item.id" >
+		<div class="wall-item-info" id="wall-item-info-$item.id">
+			<div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-$item.id" 
+				 onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')" 
+				 onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)">
+				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id">
+					<img src="$item.thumb" class="wall-item-photo$item.sparkle" id="wall-item-photo-$item.id" style="height: 80px; width: 80px;" alt="$item.name" />
 				</a>
-				<span onclick="openClose('wall-item-photo-menu-$id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$id">menu</span>
-				<div class="wall-item-photo-menu" id="wall-item-photo-menu-$id">
+				<span onclick="openClose('wall-item-photo-menu-$item.id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$item.id">menu</span>
+				<div class="wall-item-photo-menu" id="wall-item-photo-menu-$item.id">
 					<ul>
-						$item_photo_menu
+						$item.item_photo_menu
 					</ul>
 				</div>
 			</div>
 			<div class="wall-item-photo-end"></div>
-			<div class="wall-item-wrapper" id="wall-item-wrapper-$id" >
-				{{ if $lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$lock" onclick="lockview(event,$id);" /></div>
+			<div class="wall-item-wrapper" id="wall-item-wrapper-$item.id" >
+				{{ if $item.lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$item.lock" onclick="lockview(event,$item.id);" /></div>
 				{{ else }}<div class="wall-item-lock"></div>{{ endif }}	
-				<div class="wall-item-location" id="wall-item-location-$id">$location</div>				
+				<div class="wall-item-location" id="wall-item-location-$item.id">$item.location</div>				
 			</div>
 		</div>
 		<div class="wall-item-author">
-				<a href="$profile_url" target="redir" title="$linktitle" class="wall-item-name-link"><span class="wall-item-name$sparkle" id="wall-item-name-$id" >$name</span></a>
-				<div class="wall-item-ago"  id="wall-item-ago-$id">$ago</div>
+				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle" id="wall-item-name-$item.id" >$item.name</span></a>
+				<div class="wall-item-ago"  id="wall-item-ago-$item.id">$item.ago</div>
 				
 		</div>	
-		<div class="wall-item-content" id="wall-item-content-$id" >
-			<div class="wall-item-title" id="wall-item-title-$id">$title</div>
+		<div class="wall-item-content" id="wall-item-content-$item.id" >
+			<div class="wall-item-title" id="wall-item-title-$item.id">$item.title</div>
 			<div class="wall-item-title-end"></div>
-			<div class="wall-item-body" id="wall-item-body-$id" >$body
+			<div class="wall-item-body" id="wall-item-body-$item.id" >$item.body
 					<div class="body-tag">
-						{{ for $tags as $tag }}
+						{{ for $item.tags as $tag }}
 							<span class='tag'>$tag</span>
 						{{ endfor }}
 					</div>
 			</div>
 		</div>
-		<div class="wall-item-tools" id="wall-item-tools-$id">
-			{{ if $vote }}
-			<div class="wall-item-like-buttons" id="wall-item-like-buttons-$id">
-				<a href="#" class="icon like" title="$vote.like.0" onclick="dolike($id,'like'); return false"></a>
-				<a href="#" class="icon dislike" title="$vote.dislike.0" onclick="dolike($id,'dislike'); return false"></a>
-				{{ if $vote.share }}<a href="#" class="icon recycle wall-item-share-buttons" title="$vote.share.0" onclick="jotShare($id); return false"></a>{{ endif }}
-				<img id="like-rotator-$id" class="like-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
+		<div class="wall-item-tools" id="wall-item-tools-$item.id">
+			{{ if $item.vote }}
+			<div class="wall-item-like-buttons" id="wall-item-like-buttons-$item.id">
+				<a href="#" class="icon like" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false"></a>
+				<a href="#" class="icon dislike" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false"></a>
+				{{ if $item.vote.share }}<a href="#" class="icon recycle wall-item-share-buttons" title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a>{{ endif }}
+				<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
 			</div>
 			{{ endif }}
-			{{ if $plink }}
-				<div class="wall-item-links-wrapper"><a href="$plink.href" title="$plink.title" target="external-link" class="icon remote-link"></a></div>
+			{{ if $item.plink }}
+				<div class="wall-item-links-wrapper"><a href="$item.plink.href" title="$item.plink.title" target="external-link" class="icon remote-link"></a></div>
 			{{ endif }}
-			{{ if $edpost }}
-				<a class="editpost icon pencil" href="$edpost.0" title="$edpost.1"></a>
+			{{ if $item.edpost }}
+				<a class="editpost icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>
 			{{ endif }}
 			 
-			{{ if $star }}
-			<a href="#" id="starred-$id" onclick="dostar($id); return false;" class="star-item icon $isstarred" title="$star.toggle"></a>
-			<a href="#" id="tagger-$id" onclick="itemTag($id); return false;" class="tag-item icon tagged" title="$star.tagger"></a>
+			{{ if $item.star }}
+			<a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle"></a>
+			<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a>
 			{{ endif }}
 			
-			<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$id" >
-				{{ if $drop.dropping }}<a href="item/drop/$id" onclick="return confirmDelete();" class="icon drophide" title="$drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
+			<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" >
+				{{ if $item.drop.dropping }}<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drophide" title="$item.drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
 			</div>
-				{{ if $drop.dropping }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$drop.select" class="item-select" name="itemselected[]" value="$id" />{{ endif }}
+				{{ if $item.drop.dropping }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" />{{ endif }}
 			<div class="wall-item-delete-end"></div>
 		</div>
 	</div>
 	<div class="wall-item-wrapper-end"></div>
-	<div class="wall-item-like" id="wall-item-like-$id">$like</div>
-	<div class="wall-item-dislike" id="wall-item-dislike-$id">$dislike</div>
+	<div class="wall-item-like" id="wall-item-like-$item.id">$item.like</div>
+	<div class="wall-item-dislike" id="wall-item-dislike-$item.id">$item.dislike</div>
 	<div class="wall-item-comment-wrapper" >
-	$comment
+	$item.comment
 	</div>
 
-<div class="wall-item-outside-wrapper-end$indent" ></div>
+<div class="wall-item-outside-wrapper-end$item.indent" ></div>
 </div>
diff --git a/view/theme/duepuntozero/wallwall_item.tpl b/view/theme/duepuntozero/wallwall_item.tpl
index 4675f1e00..211906c93 100755
--- a/view/theme/duepuntozero/wallwall_item.tpl
+++ b/view/theme/duepuntozero/wallwall_item.tpl
@@ -1,82 +1,82 @@
-<div class="wall-item-outside-wrapper$indent$previewing wallwall" id="wall-item-outside-wrapper-$id" >
-	<div class="wall-item-content-wrapper$indent" id="wall-item-content-wrapper-$id" >
-		<div class="wall-item-info wallwall" id="wall-item-info-$id">
-			<div class="wall-item-photo-wrapper wwto" id="wall-item-ownerphoto-wrapper-$id" >
-				<a href="$owner_url" target="redir" title="$olinktitle" class="wall-item-photo-link" id="wall-item-ownerphoto-link-$id">
-				<img src="$owner_photo" class="wall-item-photo$osparkle" id="wall-item-ownerphoto-$id" style="height: 80px; width: 80px;" alt="$owner_name" /></a>
+<div class="wall-item-outside-wrapper$item.indent$item.previewing wallwall" id="wall-item-outside-wrapper-$item.id" >
+	<div class="wall-item-content-wrapper$item.indent" id="wall-item-content-wrapper-$item.id" >
+		<div class="wall-item-info wallwall" id="wall-item-info-$item.id">
+			<div class="wall-item-photo-wrapper wwto" id="wall-item-ownerphoto-wrapper-$item.id" >
+				<a href="$item.owner_url" target="redir" title="$item.olinktitle" class="wall-item-photo-link" id="wall-item-ownerphoto-link-$item.id">
+				<img src="$item.owner_photo" class="wall-item-photo$item.osparkle" id="wall-item-ownerphoto-$item.id" style="height: 80px; width: 80px;" alt="$item.owner_name" /></a>
 			</div>
-			<div class="wall-item-arrowphoto-wrapper" ><img src="images/larrow.gif" alt="$wall" /></div>
-			<div class="wall-item-photo-wrapper wwfrom" id="wall-item-photo-wrapper-$id" 
-				onmouseover="if (typeof t$id != 'undefined') clearTimeout(t$id); openMenu('wall-item-photo-menu-button-$id')"
-                onmouseout="t$id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$id\'); closeMenu(\'wall-item-photo-menu-$id\');',200)">
-				<a href="$profile_url" target="redir" title="$linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$id">
-				<img src="$thumb" class="wall-item-photo$sparkle" id="wall-item-photo-$id" style="height: 80px; width: 80px;" alt="$name" /></a>
-				<span onclick="openClose('wall-item-photo-menu-$id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$id">menu</span>
-                <div class="wall-item-photo-menu" id="wall-item-photo-menu-$id">
+			<div class="wall-item-arrowphoto-wrapper" ><img src="images/larrow.gif" alt="$item.wall" /></div>
+			<div class="wall-item-photo-wrapper wwfrom" id="wall-item-photo-wrapper-$item.id" 
+				onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')"
+                onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)">
+				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id">
+				<img src="$item.thumb" class="wall-item-photo$item.sparkle" id="wall-item-photo-$item.id" style="height: 80px; width: 80px;" alt="$item.name" /></a>
+				<span onclick="openClose('wall-item-photo-menu-$item.id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$item.id">menu</span>
+                <div class="wall-item-photo-menu" id="wall-item-photo-menu-$item.id">
                     <ul>
-                        $item_photo_menu
+                        $item.item_photo_menu
                     </ul>
                 </div>
 
 			</div>
 			<div class="wall-item-photo-end"></div>
-			<div class="wall-item-wrapper" id="wall-item-wrapper-$id" >
-				{{ if $lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$lock" onclick="lockview(event,$id);" /></div>
+			<div class="wall-item-wrapper" id="wall-item-wrapper-$item.id" >
+				{{ if $item.lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$item.lock" onclick="lockview(event,$item.id);" /></div>
 				{{ else }}<div class="wall-item-lock"></div>{{ endif }}	
-				<div class="wall-item-location" id="wall-item-location-$id">$location</div>
+				<div class="wall-item-location" id="wall-item-location-$item.id">$item.location</div>
 			</div>
 		</div>
 		<div class="wall-item-author">
-				<a href="$profile_url" target="redir" title="$linktitle" class="wall-item-name-link"><span class="wall-item-name$sparkle" id="wall-item-name-$id" >$name</span></a> $to <a href="$owner_url" target="redir" title="$olinktitle" class="wall-item-name-link"><span class="wall-item-name$osparkle" id="wall-item-ownername-$id">$owner_name</span></a> $vwall<br />
-				<div class="wall-item-ago"  id="wall-item-ago-$id">$ago</div>				
+				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle" id="wall-item-name-$item.id" >$item.name</span></a> $item.to <a href="$item.owner_url" target="redir" title="$item.olinktitle" class="wall-item-name-link"><span class="wall-item-name$item.osparkle" id="wall-item-ownername-$item.id">$item.owner_name</span></a> $item.vwall<br />
+				<div class="wall-item-ago"  id="wall-item-ago-$item.id">$item.ago</div>				
 		</div>			
-		<div class="wall-item-content" id="wall-item-content-$id" >
-			<div class="wall-item-title" id="wall-item-title-$id">$title</div>
+		<div class="wall-item-content" id="wall-item-content-$item.id" >
+			<div class="wall-item-title" id="wall-item-title-$item.id">$item.title</div>
 			<div class="wall-item-title-end"></div>
-			<div class="wall-item-body" id="wall-item-body-$id" >$body
+			<div class="wall-item-body" id="wall-item-body-$item.id" >$item.body
 					<div class="body-tag">
-						{{ for $tags as $tag }}
+						{{ for $item.tags as $tag }}
 							<span class='tag'>$tag</span>
 						{{ endfor }}
 					</div>
 			</div>
 		</div>
-		<div class="wall-item-tools" id="wall-item-tools-$id">
-			{{ if $vote }}
-			<div class="wall-item-like-buttons" id="wall-item-like-buttons-$id">
-				<a href="#" class="icon like" title="$vote.like.0" onclick="dolike($id,'like'); return false"></a>
-				<a href="#" class="icon dislike" title="$vote.dislike.0" onclick="dolike($id,'dislike'); return false"></a>
-				{{ if $vote.share }}<a href="#" class="icon recycle wall-item-share-buttons" title="$vote.share.0" onclick="jotShare($id); return false"></a>{{ endif }}
-				<img id="like-rotator-$id" class="like-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
+		<div class="wall-item-tools" id="wall-item-tools-$item.id">
+			{{ if $item.vote }}
+			<div class="wall-item-like-buttons" id="wall-item-like-buttons-$item.id">
+				<a href="#" class="icon like" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false"></a>
+				<a href="#" class="icon dislike" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false"></a>
+				{{ if $item.vote.share }}<a href="#" class="icon recycle wall-item-share-buttons" title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a>{{ endif }}
+				<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
 			</div>
 			{{ endif }}
-			{{ if $plink }}
-				<div class="wall-item-links-wrapper"><a href="$plink.href" title="$plink.title" target="external-link" class="icon remote-link"></a></div>
+			{{ if $item.plink }}
+				<div class="wall-item-links-wrapper"><a href="$item.plink.href" title="$item.plink.title" target="external-link" class="icon remote-link"></a></div>
 			{{ endif }}
-			{{ if $edpost }}
-				<a class="editpost icon pencil" href="$edpost.0" title="$edpost.1"></a>
+			{{ if $item.edpost }}
+				<a class="editpost icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>
 			{{ endif }}
 			 
-			{{ if $star }}
-			<a href="#" id="starred-$id" onclick="dostar($id); return false;" class="star-item icon $isstarred" title="$star.toggle"></a>
-			<a href="#" id="tagger-$id" onclick="itemTag($id); return false;" class="tag-item icon tagged" title="$star.tagger"></a>
+			{{ if $item.star }}
+			<a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle"></a>
+			<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a>
 			{{ endif }}
 			
-			<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$id" >
-				{{ if $drop.dropping }}<a href="item/drop/$id" onclick="return confirmDelete();" class="icon drophide" title="$drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
+			<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" >
+				{{ if $item.drop.dropping }}<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drophide" title="$item.drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
 			</div>
-				{{ if $drop.dropping }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$drop.select" class="item-select" name="itemselected[]" value="$id" />{{ endif }}
+				{{ if $item.drop.dropping }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" />{{ endif }}
 			<div class="wall-item-delete-end"></div>
 		</div>
 	</div>	
 	<div class="wall-item-wrapper-end"></div>
-	<div class="wall-item-like" id="wall-item-like-$id">$like</div>
-	<div class="wall-item-dislike" id="wall-item-dislike-$id">$dislike</div>
+	<div class="wall-item-like" id="wall-item-like-$item.id">$item.like</div>
+	<div class="wall-item-dislike" id="wall-item-dislike-$item.id">$item.dislike</div>
 	<div class="wall-item-comment-separator"></div>
 	<div class="wall-item-comment-wrapper" >
-	$comment
+	$item.comment
 	</div>
 
-<div class="wall-item-outside-wrapper-end$indent" ></div>
+<div class="wall-item-outside-wrapper-end$item.indent" ></div>
 </div>
 
diff --git a/view/theme/loozah/comment_item.tpl b/view/theme/loozah/comment_item.tpl
index b29735227..3503c3843 100755
--- a/view/theme/loozah/comment_item.tpl
+++ b/view/theme/loozah/comment_item.tpl
@@ -1,4 +1,4 @@
-		<div class="comment-$wwedit-wrapper" id="comment-edit-wrapper-$id" style="display: block;">
+		<div class="comment-wwedit-wrapper" id="comment-edit-wrapper-$id" style="display: block;">
 			<form class="comment-edit-form" id="comment-edit-form-$id" action="item" method="post" onsubmit="post_comment($id); return false;">
 				<input type="hidden" name="type" value="$type" />
 				<input type="hidden" name="profile_uid" value="$profile_uid" />
diff --git a/view/theme/quattro/colors.less b/view/theme/quattro/colors.less
index 18d0fc620..9183b2e77 100755
--- a/view/theme/quattro/colors.less
+++ b/view/theme/quattro/colors.less
@@ -71,6 +71,8 @@
 @NoticeColor: @Grey1;
 @NoticeBackgroundColor: #511919;
 
+@FieldHelpColor: @Grey3;
+
 @ThreadBackgroundColor: #f6f7f8;
 @ShinyBorderColor: @Yellow1;
 
diff --git a/view/theme/quattro/quattro.less b/view/theme/quattro/quattro.less
index 9d2608261..27c48f195 100755
--- a/view/theme/quattro/quattro.less
+++ b/view/theme/quattro/quattro.less
@@ -890,6 +890,31 @@ ul.tabs {
 }
 
 
+/** group editor **/
+#group-edit-desc { margin-top: 1em; color: @FieldHelpColor; }
+#group-update-wrapper{
+	height: auto; overflow: auto;
+	#group {
+		width:300px; 
+		float:left;
+		margin-right:20px;
+	}
+	#contacts {
+		width:300px;
+		float:left;
+	}
+	#group-separator { display: none; }
+	.contact_list {
+		height: 300px;
+		border: 1px solid @MenuBorder;
+		overflow: auto;
+		.contact-block-div  {
+			width: 50px; height: 50px;
+			float: left;
+		}
+	}
+}
+
 /**
  * Form fields
  */
@@ -913,7 +938,7 @@ ul.tabs {
 	.field_help {
 		display: block;
 		margin-left: 200px;
-		color: #666666;
+		color: @FieldHelpColor;
 		
 	}
 
diff --git a/view/theme/quattro/style.css b/view/theme/quattro/style.css
index b728023c9..6087e4cd1 100755
--- a/view/theme/quattro/style.css
+++ b/view/theme/quattro/style.css
@@ -1304,6 +1304,37 @@ ul.tabs li {
 ul.tabs li .active {
   border-bottom: 1px solid #005c94;
 }
+/** group editor **/
+#group-edit-desc {
+  margin-top: 1em;
+  color: #999999;
+}
+#group-update-wrapper {
+  height: auto;
+  overflow: auto;
+}
+#group-update-wrapper #group {
+  width: 300px;
+  float: left;
+  margin-right: 20px;
+}
+#group-update-wrapper #contacts {
+  width: 300px;
+  float: left;
+}
+#group-update-wrapper #group-separator {
+  display: none;
+}
+#group-update-wrapper .contact_list {
+  height: 300px;
+  border: 1px solid #364e59;
+  overflow: auto;
+}
+#group-update-wrapper .contact_list .contact-block-div {
+  width: 50px;
+  height: 50px;
+  float: left;
+}
 /**
  * Form fields
  */
@@ -1326,7 +1357,7 @@ ul.tabs li .active {
 .field .field_help {
   display: block;
   margin-left: 200px;
-  color: #666666;
+  color: #999999;
 }
 .field .onoff {
   float: left;
diff --git a/view/theme/quattro/theme.php b/view/theme/quattro/theme.php
new file mode 100644
index 000000000..7e5ab1e62
--- /dev/null
+++ b/view/theme/quattro/theme.php
@@ -0,0 +1,46 @@
+<?php
+
+$a->hooks[] = array('plugin_settings', 'view/theme/quattro/theme.php', 'quattro_settings');
+$a->hooks[] = array('plugin_settings_post', 'view/theme/quattro/theme.php', 'quattro_settings_post');
+
+
+function quattro_settings(&$a, &$o){
+	if(!local_user())
+		return;		
+	
+	$align = get_pconfig(local_user(), 'quattro', 'align' );
+	
+	$t = file_get_contents( dirname(__file__). "/theme_settings.tpl" );
+	$o .= replace_macros($t, array(
+		'$submit' => t('Submit'),
+		'$baseurl' => $a->get_baseurl(),
+		'$title' => t("Theme settings"),
+		'$align' => array('quattro_align', t('Alignment'), $align, '', array('left'=>t('Left'), 'center'=>t('Center'))),
+	));
+}
+
+function quattro_settings_post(&$a){
+	if(! local_user())
+		return;
+	if (isset($_POST['quattro-settings-submit'])){
+		set_pconfig(local_user(), 'quattro', 'align', $_POST['quattro_align']);
+	}
+	goaway($a->get_baseurl()."/settings/addon");
+}
+
+
+$quattro_align = get_pconfig(local_user(), 'quattro', 'align' );
+
+if(local_user() && $quattro_align=="center"){
+	
+	$a->page['htmlhead'].="
+	<style>
+		html { width: 100%; margin:0px; padding:0px; }
+		body {
+			margin: 50px auto;
+			width: 900px;
+		}
+	</style>
+	";
+	
+}
diff --git a/view/theme/quattro/theme_settings.tpl b/view/theme/quattro/theme_settings.tpl
new file mode 100644
index 000000000..25af04253
--- /dev/null
+++ b/view/theme/quattro/theme_settings.tpl
@@ -0,0 +1,11 @@
+<div class="settings-block">
+	<h3 class="settings-heading">$title</h3>
+	
+	{{inc field_select.tpl with $field=$align}}{{endinc}}
+	
+	<div class="settings-submit-wrapper">
+		<input type="submit" value="$submit" class="settings-submit" name="quattro-settings-submit" />
+	</div>
+
+	
+</div>
diff --git a/view/theme/testbubble/comment_item.tpl b/view/theme/testbubble/comment_item.tpl
index bc75eb1a6..6d9230dbf 100755
--- a/view/theme/testbubble/comment_item.tpl
+++ b/view/theme/testbubble/comment_item.tpl
@@ -1,4 +1,4 @@
-		<div class="comment-$wwedit-wrapper" id="comment-edit-wrapper-$id" style="display: block;">
+		<div class="comment-wwedit-wrapper" id="comment-edit-wrapper-$id" style="display: block;">
 			<form class="comment-edit-form" id="comment-edit-form-$id" action="item" method="post" onsubmit="post_comment($id); return false;">
 				<input type="hidden" name="type" value="$type" />
 				<input type="hidden" name="profile_uid" value="$profile_uid" />
@@ -11,6 +11,7 @@
 					<a class="comment-edit-photo-link" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a>
 				</div>
 				<div class="comment-edit-photo-end"></div>
+				<textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);" onBlur="commentClose(this,$id);" >$comment</textarea>
 				{{ if $qcomment }}
 				{{ for $qcomment as $qc }}				
 					<span class="fakelink qcomment" onclick="commentInsert(this,$id); return false;" >$qc</span>
@@ -18,14 +19,12 @@
 				{{ endfor }}
 				{{ endif }}
 
-				<textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);" onBlur="commentClose(this,$id);" >$comment</textarea>
-
 				<div class="comment-edit-text-end"></div>
 				<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-$id" style="display: none;" >
 					<input type="submit" onclick="post_comment($id); return false;" id="comment-edit-submit-$id" class="comment-edit-submit" name="submit" value="$submit" />
 					<span onclick="preview_comment($id);" id="comment-edit-preview-link-$id" class="fakelink">$preview</span>
 				</div>
-	
+
 				<div class="comment-edit-end"></div>
 			</form>
 
diff --git a/view/theme/testbubble/conversation.tpl b/view/theme/testbubble/conversation.tpl
index 33cedfb1e..43bb1dd47 100755
--- a/view/theme/testbubble/conversation.tpl
+++ b/view/theme/testbubble/conversation.tpl
@@ -1,6 +1,18 @@
 {{ for $threads as $thread }}
 <div id="tread-wrapper-$thread.id" class="tread-wrapper">
-	$thread.html
+	{{ for $thread.items as $item }}
+		{{if $item.comment_firstcollapsed}}
+			<div class="hide-comments-outer">
+			<span id="hide-comments-total-$thread.id" class="hide-comments-total">$thread.num_comments</span> <span id="hide-comments-$thread.id" class="hide-comments fakelink" onclick="showHideComments($thread.id);">$thread.hide_text</span>
+			</div>
+			<div id="collapsed-comments-$thread.id" class="collapsed-comments" style="display: none;">
+		{{endif}}
+		{{if $item.comment_lastcollapsed}}</div>{{endif}}
+		
+		{{ inc $item.template }}{{ endinc }}
+		
+		
+	{{ endfor }}
 </div>
 {{ endfor }}
 
diff --git a/view/theme/testbubble/jot.tpl b/view/theme/testbubble/jot.tpl
index 5bb5b4673..45d206d57 100755
--- a/view/theme/testbubble/jot.tpl
+++ b/view/theme/testbubble/jot.tpl
@@ -16,11 +16,11 @@
 		<input type="hidden" name="coord" id="jot-coord" value="" />
 		<input type="hidden" name="post_id" value="$post_id" />
 		<input type="hidden" name="preview" id="jot-preview" value="0" />
-		<input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" style="display:none">
-
+		<div id="jot-title-wrap"><input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" style="display:none"></div>
+		<div id="jot-text-wrap">
                 <img id="profile-jot-text-loading" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
                 <textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" >{{ if $content }}$content{{ else }}$share{{ endif }}</textarea>
-
+		</div>
 	<div id="profile-upload-wrapper" class="jot-tool" style="display: none;" >
 		<div id="wall-image-upload-div" ><a onclick="return false;" id="wall-image-upload" class="icon border camera" title="$upload"></a></div>
 	</div>
diff --git a/view/theme/testbubble/nav.tpl b/view/theme/testbubble/nav.tpl
index d657a11c5..43cc7bca0 100755
--- a/view/theme/testbubble/nav.tpl
+++ b/view/theme/testbubble/nav.tpl
@@ -4,11 +4,13 @@
 	<span id="banner">$banner</span>
 
 	<div id="notifications">	
-		{{ if $nav.network }}<a rel="#nav-notifications-menu" id="net-update" class="nav-ajax-update" href="$nav.network.0" title="$nav.network.1"></a>{{ endif }}
-		{{ if $nav.home }}<a rel="#nav-notifications-menu" id="home-update" class="nav-ajax-update" href="$nav.home.0" title="$nav.home.1"></a>{{ endif }}
-<!--		{{ if $nav.notifications }}<a rel="#nav-notifications-menu" id="intro-update" class="nav-ajax-update" href="$nav.notifications.0" title="$nav.notifications.1"></a>{{ endif }} -->
-		{{ if $nav.introductions }}<a rel="#nav-notifications-menu" id="intro-update" class="nav-ajax-update" href="$nav.introductions.0" title="$nav.introductions.1"></a>{{ endif }}
-		{{ if $nav.messages }}<a rel="#nav-notifications-menu" id="mail-update" class="nav-ajax-update" href="$nav.messages.0" title="$nav.messages.1"></a>{{ endif }}
+		{{ if $nav.network }}<a id="net-update" class="nav-ajax-update" href="$nav.network.0" title="$nav.network.1"></a>{{ endif }}
+		{{ if $nav.home }}<a id="home-update" class="nav-ajax-update" href="$nav.home.0" title="$nav.home.1"></a>{{ endif }}
+<!--		{{ if $nav.notifications }}<a id="intro-update" class="nav-ajax-update" href="$nav.notifications.0" title="$nav.notifications.1"></a>{{ endif }} -->
+		{{ if $nav.introductions }}<a id="intro-update" class="nav-ajax-update" href="$nav.introductions.0" title="$nav.introductions.1"></a>{{ endif }}
+		{{ if $nav.messages }}<a id="mail-update" class="nav-ajax-update" href="$nav.messages.0" title="$nav.messages.1"></a>{{ endif }}
+		{{ if $nav.notifications }}<a rel="#nav-notifications-menu" id="notify-update" class="nav-ajax-update" href="$nav.notifications.0"  title="$nav.notifications.1"></a>{{ endif }}
+
 		<ul id="nav-notifications-menu" class="menu-popup">
 			<li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">$nav.notifications.mark.1</a></li>
 			<li id="nav-notifications-see-all"><a href="$nav.notifications.all.0">$nav.notifications.all.1</a></li>
@@ -56,6 +58,9 @@
 	</div>
 </nav>
 
+
 <ul id="nav-notifications-template" style="display:none;" rel="template">
-	<li><a href="{0}">{2} <span class="notif-when">{3}</span></a></li>
+	<li class="{4}"><a href="{0}"><img src="{1}" height="24" width="24" alt="" />{2} <span class="notif-when">{3}</span></a></li>
 </ul>
+
+
diff --git a/view/theme/testbubble/notifications.png b/view/theme/testbubble/notifications.png
index 803257fec..f0e24a15b 100755
--- a/view/theme/testbubble/notifications.png
+++ b/view/theme/testbubble/notifications.png
diff --git a/view/theme/testbubble/search_item.tpl b/view/theme/testbubble/search_item.tpl
index 27a08e4eb..a0a4ef393 100755
--- a/view/theme/testbubble/search_item.tpl
+++ b/view/theme/testbubble/search_item.tpl
@@ -1,48 +1,53 @@
-<div class="wall-item-outside-wrapper$indent$previewing" id="wall-item-outside-wrapper-$id" >
-	<div class="wall-item-content-wrapper$indent" id="wall-item-content-wrapper-$id" >
-		<div class="wall-item-info" id="wall-item-info-$id">
-			<div class="wall-item-photo-wrapper mframe" id="wall-item-photo-wrapper-$id" 
-				 onmouseover="if (typeof t$id != 'undefined') clearTimeout(t$id); openMenu('wall-item-photo-menu-button-$id')" 
-				 onmouseout="t$id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$id\'); closeMenu(\'wall-item-photo-menu-$id\');',200)">
-				<a href="$profile_url" title="$linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$id">
-				<img src="$thumb" class="wall-item-photo$sparkle" id="wall-item-photo-$id" style="height: 80px; width: 80px;" alt="$name" /></a>
-				<span onclick="openClose('wall-item-photo-menu-$id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$id">menu</span>
-				<div class="wall-item-photo-menu" id="wall-item-photo-menu-$id">
+<div class="wall-item-outside-wrapper$item.indent$item.previewing" id="wall-item-outside-wrapper-$item.id" >
+	<div class="wall-item-content-wrapper$item.indent" id="wall-item-content-wrapper-$item.id" >
+		<div class="wall-item-info" id="wall-item-info-$item.id">
+			<div class="wall-item-photo-wrapper mframe" id="wall-item-photo-wrapper-$item.id" 
+				 onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')" 
+				 onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)">
+				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id">
+				<img src="$item.thumb" class="wall-item-photo$item.sparkle" id="wall-item-photo-$item.id" style="height: 80px; width: 80px;" alt="$item.name" /></a>
+				<span onclick="openClose('wall-item-photo-menu-$item.id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$item.id">menu</span>
+				<div class="wall-item-photo-menu" id="wall-item-photo-menu-$item.id">
 					<ul>
-						$item_photo_menu
+						$item.item_photo_menu
 					</ul>
 				</div>
 			</div>
 			<div class="wall-item-photo-end"></div>	
-			<div class="wall-item-location" id="wall-item-location-$id">{{ if $location }}<span class="icon globe"></span>$location {{ endif }}</div>
+			<div class="wall-item-location" id="wall-item-location-$item.id">{{ if $item.location }}<span class="icon globe"></span>$item.location {{ endif }}</div>
 		</div>
 		<div class="wall-item-lock-wrapper">
-				{{ if $lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$lock" onclick="lockview(event,$id);" /></div>
+				{{ if $item.lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$item.lock" onclick="lockview(event,$item.id);" /></div>
 				{{ else }}<div class="wall-item-lock"></div>{{ endif }}			
 		</div>
-		<div class="wall-item-tools" id="wall-item-tools-$id">
-			<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$id" >
-				{{ if $drop.dropping }}<a href="item/drop/$id" onclick="return confirmDelete();" class="icon drophide" title="$drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
+		<div class="wall-item-tools" id="wall-item-tools-$item.id">
+			<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" >
+				{{ if $item.drop.dropping }}<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drophide" title="$item.drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
 			</div>
-				{{ if $drop.dropping }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$drop.select" class="item-select" name="itemselected[]" value="$id" />{{ endif }}
+				{{ if $item.drop.dropping }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" />{{ endif }}
 			<div class="wall-item-delete-end"></div>
 		</div>
-		<div class="wall-item-content" id="wall-item-content-$id" >
-			<div class="wall-item-title" id="wall-item-title-$id">$title</div>
+		<div class="wall-item-content" id="wall-item-content-$item.id" >
+			<div class="wall-item-title" id="wall-item-title-$item.id">$item.title</div>
 			<div class="wall-item-title-end"></div>
-			<div class="wall-item-body" id="wall-item-body-$id" >$body</div>
+			<div class="wall-item-body" id="wall-item-body-$item.id" >$item.body</div>
 		</div>
 		<div class="wall-item-author">
-				<a href="$profile_url" title="$linktitle" class="wall-item-name-link"><span class="wall-item-name$sparkle" id="wall-item-name-$id" >$name</span></a>
-				<div class="wall-item-ago"  id="wall-item-ago-$id">$ago</div>
+				<a href="$item.profile_url" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle" id="wall-item-name-$item.id" >$item.name</span></a>
+				<div class="wall-item-ago"  id="wall-item-ago-$item.id">$item.ago</div>
 				
 		</div>			
 		
 	</div>
-	<div class="wall-item-conv" id="wall-item-conv-$id" >
-	{{ if $conv }}<a href='$conv.href' id='context-$id' title='$conv.title'>$conv.title</a>{{ endif }}
+	<div class="wall-item-wrapper-end"></div>
+
+
+	<div class="wall-item-conv" id="wall-item-conv-$item.id" >
+	{{ if $item.conv }}
+			<a href='$item.conv.href' id='context-$item.id' title='$item.conv.title'>$item.conv.title</a>
+	{{ endif }}
 	</div>
 	<div class="wall-item-wrapper-end"></div>
 </div>
 
-<div class="wall-item-outside-wrapper-end$indent" ></div>
+<div class="wall-item-outside-wrapper-end$item.indent" ></div>
diff --git a/view/theme/testbubble/style.css b/view/theme/testbubble/style.css
index c6f66d5ad..1e63c7ef6 100755
--- a/view/theme/testbubble/style.css
+++ b/view/theme/testbubble/style.css
@@ -55,7 +55,7 @@ p {
 }
 
 label {
-	font-variant:small-caps;
+/*	font-variant:small-caps; */
 }
 
 li {
@@ -382,7 +382,8 @@ ul#user-menu-popup li a.nav-sep { border-top: 1px solid #989898; border-style:in
 	padding-left: 11px;
     /*display: none;*/
 }
-#net-update { background-position: 0px -126px; }
+#notify-update { background-position: 0px -168px; }
+#net-update { background-position: 0px -126px }
 #mail-update { background-position: 0px -40px; }
 #intro-update { background-position: 0px -84px; }
 #home-update { background-position: 0px 0px; }
@@ -454,7 +455,7 @@ aside a{
 
 .vcard {
 	font-size: 1em;
-	font-variant:small-caps;
+/*	font-variant:small-caps; */
 }
 
 .vcard dd {
@@ -487,7 +488,7 @@ aside h4 { font-size: 1.3em; }
 	color: #626262;
 	text-align: center;
 	font-weight: bold;
-	font-variant:small-caps;
+/*	font-variant:small-caps; */
 	font-size: 1.1em;
 }
 .allcontact-link a {
@@ -1040,7 +1041,7 @@ profile-jot-banner-wrapper {
 	font-size: 0.9em;
 	margin: 4px 0px 0px 140px;
 	padding-left: 10px;
-	font-variant:small-caps;
+/*	font-variant:small-caps; */
 }
 
 .wall-item-author a {
@@ -1062,7 +1063,7 @@ profile-jot-banner-wrapper {
 	margin-left: 25px;
 	font-size: 0.9em;
 	display: block;
-	font-variant:small-caps;
+/*	font-variant:small-caps; */
 	color: #898989;
 }
 
@@ -1071,7 +1072,7 @@ profile-jot-banner-wrapper {
 .wall-item-conv a{
 	font-size: 0.9em;
 	color: #898989;
-	font-variant:small-caps;
+/*	font-variant:small-caps; */
 }
 
 .wallwall .wwto {
@@ -1156,7 +1157,7 @@ profile-jot-banner-wrapper {
 	font-size: 0.9em;
 	color: #898989;
 	margin-left: 60px;
-	font-variant:small-caps;
+/*	font-variant:small-caps; */
 }
  
 .wall-item-outside-wrapper.comment { margin-left: 70px; }
@@ -1188,7 +1189,7 @@ profile-jot-banner-wrapper {
 .icollapse-wrapper {
 	font-size: 0.9em;
 	color: #898989;
-	font-variant:small-caps;	
+/*	font-variant:small-caps;	*/
 }
 
 .comment-wwedit-wrapper,
@@ -1265,7 +1266,7 @@ profile-jot-banner-wrapper {
 	margin-bottom: 0px;
 	padding-bottom: 5px;
 	font-size: 18px;
-	font-variant:small-caps;
+/*	font-variant:small-caps; */
 }
  
 div[id$="wrapper"] { height: 100%;} 
@@ -1297,7 +1298,7 @@ div[id$="wrapper"] br { clear: left; }
 
 .profile-listing-name {
 	font-size: 1em;
-	font-variant: small-caps;
+/*	font-variant: small-caps;*/
 }
 .profile-listing-name a {
 	color: #898989;
@@ -1341,7 +1342,7 @@ div[id$="wrapper"] br { clear: left; }
 
 .profile-match-name a{
 	color: #999;
-	font-variant: small-caps;
+/*	font-variant: small-caps; */
 	font-size: 1em;
 }
 
@@ -1461,7 +1462,7 @@ div[id$="wrapper"] br { clear: left; }
 	padding: 0px 5px;
 	font-weight: bold;
 	font-stretch:semi-expanded;
-	font-variant:small-caps;
+/*	font-variant:small-caps; */
 } 
 
 .photo-top-album-name a{
@@ -1475,7 +1476,7 @@ div[id$="wrapper"] br { clear: left; }
 	text-align: center;
 	color: #6e6e6e;
 	font-size: 0.9em;
-	font-variant: small-caps;
+/*	font-variant: small-caps; */
 }
 
 #photo-photo{
@@ -1486,7 +1487,7 @@ div[id$="wrapper"] br { clear: left; }
 #photo-caption {
 	margin-top: 10px;
 	color: #6E6E6E;
-	font-variant:small-caps;
+/*	font-variant:small-caps; */
 	font-size: 1.1em;
 }
 
@@ -1711,18 +1712,18 @@ input#photo_edit_form {
 }
 
 #prvmail-subject-label {
-	font-variant:small-caps;
+/*	font-variant:small-caps; */
 }
 
 #prvmail-to {
 	padding-left: 10px;
 }
 #prvmail-to-label {
-	font-variant:small-caps;
+/*	font-variant:small-caps; */
 }
 
 #prvmail-message-label {
-	font-variant:small-caps;
+/*	font-variant:small-caps; */
 	font-size: 1em;	
 }
 
@@ -1768,7 +1769,7 @@ margin-left: 0px;
 .mail-list-sender-name {
 	font-size: 1.1em;
 	display: inline;
-	font-variant:small-caps;
+/*	font-variant:small-caps; */
 }
 
 .mail-list-date {
@@ -1778,7 +1779,7 @@ margin-left: 0px;
 	font-size: 0.9em;
 	padding-left: 10px;
 	font-stretch:ultra-condensed;
-	font-variant:small-caps;
+/*	font-variant:small-caps; */
 }
 
 .mail-list-subject {
@@ -1807,8 +1808,8 @@ margin-left: 0px;
 	height: 64px;
 }
 
-.mail-conv-sender-name { float: left; font-variant:small-caps; font-style: bold; }
-.mail-conv-date { float: right; font-variant:small-caps; }
+.mail-conv-sender-name { float: left; font-style: bold; }
+.mail-conv-date { float: right; }
 .mail-conv-subject { clear: right; font-weight: bold; font-size: 1.2em }
 .mail-conv-body {
 	clear: both;
@@ -1902,7 +1903,7 @@ margin-left: 0px;
 	font: #999;
 	font-size: 12px;
 	text-align:center;
-	font-variant:small-caps;
+/*	font-variant:small-caps; */
 	font-weight: bold;
 	margin-top:5px;
 }
@@ -1919,7 +1920,7 @@ margin-left: 0px;
 	background-color: #ffffff;
 }
 
-#contact-edit-banner-name { font-size: 1.5em; margin-left: 30px; font-variant: small-caps; }
+#contact-edit-banner-name { font-size: 1.5em; margin-left: 30px; }
 
 
 #contact-edit-update-now {
@@ -2002,7 +2003,7 @@ margin-left: 0px;
 }
 
 .view-contact-name {
-	font-variant: small-caps;
+/*	font-variant: small-caps; */
 }
 
 #div.side-link {
@@ -2539,7 +2540,7 @@ margin-left: 0px;
 	margin-bottom: 2px;
 	margin-top: 2px;
 	font-size: 0.9em;
-	font-variant: small-caps;
+/*	font-variant: small-caps; */
 	text-align: left;
 }
 
@@ -2605,7 +2606,7 @@ margin-left: 0px;
 .event-list-date {
 	color: #626262;
 	margin-bottom: 10px;
-	font-variant:small-caps;
+/*	font-variant:small-caps; */
 	font-stretch:condensed;
 }
 
@@ -2641,7 +2642,7 @@ margin-left: 0px;
 	color: #ffffff;
 	font-weight: bold;
 	text-align:center;
-	font-variant:small-caps;
+/*	font-variant:small-caps; */
 	-moz-box-shadow: 5px 2px 8px #959494;
 	-webkit-box-shadow: 5px 2px 8px #959494;
 	box-shadow: 5px 2px 8px #959494;
@@ -2719,13 +2720,13 @@ tr {
 
 .directory-details {
 	font-size: 0.9em;
-	font-variant: small-caps;
+/*	font-variant: small-caps; */
 	width: 160px;
 }
 
 .directory-name {
 	font-size: 1em;
-	font-variant: small-caps;
+/*	font-variant: small-caps; */
 	width: 150px;	
 }
 
@@ -2887,6 +2888,10 @@ tr {
 	repeat: no-repeat;
 }
 
+.notify {
+  background-image: url("notify.png");}
+  repeat: no-repeat;
+}
 
 .border {
 	border: 1px solid #c1c1c1;
@@ -3272,3 +3277,6 @@ ul.menu-popup {
 	opacity: 1.0;
 	filter:alpha(opacity=100);
 }
+.notify-seen {
+	background: #000;
+}
diff --git a/view/theme/testbubble/theme.php b/view/theme/testbubble/theme.php
new file mode 100644
index 000000000..87ce4dd73
--- /dev/null
+++ b/view/theme/testbubble/theme.php
@@ -0,0 +1,9 @@
+<?php
+
+/*
+ * Name: Test Bubble
+ * Version: 1.1
+ * Author: Anne Walk
+ * Author: Devlon Duthied
+ * Maintainer: Mike Macgirvin <mike@macgirvin.com>
+ */
diff --git a/view/theme/testbubble/wall_item.tpl b/view/theme/testbubble/wall_item.tpl
index 2b0e6740a..44491d967 100755
--- a/view/theme/testbubble/wall_item.tpl
+++ b/view/theme/testbubble/wall_item.tpl
@@ -1,82 +1,78 @@
-<!-- test -->
-<div class="wall-item-outside-wrapper$indent" id="wall-item-outside-wrapper-$id" >
-	<div class="wall-item-content-wrapper$indent" id="wall-item-content-wrapper-$id" >
-		<div class="wall-item-info" id="wall-item-info-$id">
-			<div class="wall-item-photo-wrapper mframe" id="wall-item-photo-wrapper-$id" 
-				 onmouseover="if (typeof t$id != 'undefined') clearTimeout(t$id); openMenu('wall-item-photo-menu-button-$id')" 
-				 onmouseout="t$id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$id\'); closeMenu(\'wall-item-photo-menu-$id\');',200)">
-				<a href="$profile_url" title="$linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$id">
-					<img src="$thumb" class="wall-item-photo$sparkle" id="wall-item-photo-$id" style="height: 80px; width: 80px;" alt="$name" />
+<div class="wall-item-outside-wrapper$item.indent" id="wall-item-outside-wrapper-$item.id" >
+	<div class="wall-item-content-wrapper$item.indent" id="wall-item-content-wrapper-$item.id" >
+		<div class="wall-item-info" id="wall-item-info-$item.id">
+			<div class="wall-item-photo-wrapper mframe" id="wall-item-photo-wrapper-$item.id" 
+				 onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')" 
+				 onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)">
+				<a href="$item.profile_url" title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id">
+					<img src="$item.thumb" class="wall-item-photo$item.sparkle" id="wall-item-photo-$item.id" style="height: 80px; width: 80px;" alt="$item.name" />
 				</a>
-				<span onclick="openClose('wall-item-photo-menu-$id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$id">menu</span>
-				<div class="wall-item-photo-menu" id="wall-item-photo-menu-$id">
+				<span onclick="openClose('wall-item-photo-menu-$item.id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$item.id">menu</span>
+				<div class="wall-item-photo-menu" id="wall-item-photo-menu-$item.id">
 					<ul>
-						$item_photo_menu
+						$item.item_photo_menu
 					</ul>
 				</div>
 			</div>
 			<div class="wall-item-photo-end"></div>
-			<div class="wall-item-location" id="wall-item-location-$id">{{ if $location }}<span class="icon globe"></span>$location {{ endif }}</div>				
+			<div class="wall-item-location" id="wall-item-location-$item.id">{{ if $item.location }}<span class="icon globe"></span>$item.location {{ endif }}</div>				
 		</div>
 		<div class="wall-item-lock-wrapper">
-				{{ if $lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$lock" onclick="lockview(event,$id);" /></div>
+				{{ if $item.lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$item.lock" onclick="lockview(event,$item.id);" /></div>
 				{{ else }}<div class="wall-item-lock"></div>{{ endif }}
 		</div>
-		<div class="wall-item-content" id="wall-item-content-$id" >
-			<div class="wall-item-title" id="wall-item-title-$id">$title</div>
+		<div class="wall-item-content" id="wall-item-content-$item.id" >
+			<div class="wall-item-title" id="wall-item-title-$item.id">$item.title</div>
 			<div class="wall-item-title-end"></div>
-			<div class="wall-item-body" id="wall-item-body-$id" >$body
-				<div class="body-tag">
-					{{ for $tags as $tag }}
-						<span class='tag'>$tag</span>
-					{{ endfor }}
-				</div>
+			<div class="wall-item-body" id="wall-item-body-$item.id" >$item.body
+					<div class="body-tag">
+						{{ for $item.tags as $tag }}
+							<span class='tag'>$tag</span>
+						{{ endfor }}
+					</div>
 			</div>
 		</div>
-
-		<div class="wall-item-tools" id="wall-item-tools-$id">
-			{{ if $vote }}
-			<div class="wall-item-like-buttons" id="wall-item-like-buttons-$id">
-				<a href="#" class="icon like" title="$vote.like.0" onclick="dolike($id,'like'); return false"></a>
-				<a href="#" class="icon dislike" title="$vote.dislike.0" onclick="dolike($id,'dislike'); return false"></a>
-				{{ if $vote.share }}<a href="#" class="icon recycle wall-item-share-buttons" title="$vote.share.0" onclick="jotShare($id); return false"></a>{{ endif }}
-				<img id="like-rotator-$id" class="like-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
+		<div class="wall-item-tools" id="wall-item-tools-$item.id">
+			{{ if $item.vote }}
+			<div class="wall-item-like-buttons" id="wall-item-like-buttons-$item.id">
+				<a href="#" class="icon like" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false"></a>
+				<a href="#" class="icon dislike" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false"></a>
+				{{ if $item.vote.share }}<a href="#" class="icon recycle wall-item-share-buttons" title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a>{{ endif }}
+				<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
 			</div>
 			{{ endif }}
-			{{ if $plink }}
-				<div class="wall-item-links-wrapper"><a href="$plink.href" title="$plink.title" target="external-link" class="icon remote-link"></a></div>
+			{{ if $item.plink }}
+				<div class="wall-item-links-wrapper"><a href="$item.plink.href" title="$item.plink.title" target="external-link" class="icon remote-link"></a></div>
 			{{ endif }}
-			{{ if $edpost }}
-				<a class="editpost icon pencil" href="$edpost.0" title="$edpost.1"></a>
+			{{ if $item.edpost }}
+				<a class="editpost icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>
 			{{ endif }}
 			 
-			{{ if $star }}
-			<a href="#" id="starred-$id" onclick="dostar($id); return false;" class="star-item icon $isstarred" title="$star.toggle"></a>
-			<a href="#" id="tagger-$id" onclick="itemTag($id); return false;" class="tag-item icon tagged" title="$star.tagger"></a>
+			{{ if $item.star }}
+			<a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle"></a>
+			<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a>
 			{{ endif }}
 			
-			<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$id" >
-				{{ if $drop.dropping }}<a href="item/drop/$id" onclick="return confirmDelete();" class="icon drophide" title="$drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
+			<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" >
+				{{ if $item.drop.dropping }}<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drophide" title="$item.drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
 			</div>
-				{{ if $drop.dropping }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$drop.select" class="item-select" name="itemselected[]" value="$id" />{{ endif }}
+				{{ if $item.drop.dropping }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" />{{ endif }}
 			<div class="wall-item-delete-end"></div>
-
-			
 		</div>
 		
 		<div class="wall-item-author">
-				<a href="$profile_url" title="$linktitle" class="wall-item-name-link"><span class="wall-item-name$sparkle" id="wall-item-name-$id" >$name</span></a>
-				<div class="wall-item-ago"  id="wall-item-ago-$id">$ago</div>
+				<a href="$item.profile_url" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle" id="wall-item-name-$item.id" >$item.name</span></a>
+				<div class="wall-item-ago"  id="wall-item-ago-$item.id">$item.ago</div>
 				
 		</div>	
 	</div>
 	<div class="wall-item-wrapper-end"></div>
-	<div class="wall-item-like" id="wall-item-like-$id">$like</div>
-	<div class="wall-item-dislike" id="wall-item-dislike-$id">$dislike</div>
+	<div class="wall-item-like" id="wall-item-like-$item.id">$item.like</div>
+	<div class="wall-item-dislike" id="wall-item-dislike-$item.id">$item.dislike</div>
 	<div class="wall-item-comment-wrapper" >
-	$comment
+	$item.comment
 	</div>
 </div>
 
-<div class="wall-item-outside-wrapper-end$indent" ></div>
+<div class="wall-item-outside-wrapper-end$item.indent" ></div>
 
diff --git a/view/theme/testbubble/wallwall_item.tpl b/view/theme/testbubble/wallwall_item.tpl
index cd4def7fc..eb7c3ddba 100755
--- a/view/theme/testbubble/wallwall_item.tpl
+++ b/view/theme/testbubble/wallwall_item.tpl
@@ -1,81 +1,81 @@
-<div class="wall-item-outside-wrapper$indent wallwall" id="wall-item-outside-wrapper-$id" >
-	<div class="wall-item-content-wrapper$indent" id="wall-item-content-wrapper-$id" >
-		<div class="wall-item-info wallwall" id="wall-item-info-$id">
-			<div class="wall-item-photo-wrapper mframe wwto" id="wall-item-ownerphoto-wrapper-$id" >
-				<a href="$owner_url" title="$olinktitle" class="wall-item-photo-link" id="wall-item-ownerphoto-link-$id">
-				<img src="$owner_photo" class="wall-item-photo$osparkle" id="wall-item-ownerphoto-$id" style="height: 80px; width: 80px;" alt="$owner_name" /></a>
+<div class="wall-item-outside-wrapper$item.indent wallwall" id="wall-item-outside-wrapper-$item.id" >
+	<div class="wall-item-content-wrapper$item.indent" id="wall-item-content-wrapper-$item.id" >
+		<div class="wall-item-info wallwall" id="wall-item-info-$item.id">
+			<div class="wall-item-photo-wrapper mframe wwto" id="wall-item-ownerphoto-wrapper-$item.id" >
+				<a href="$item.owner_url" title="$item.olinktitle" class="wall-item-photo-link" id="wall-item-ownerphoto-link-$item.id">
+				<img src="$item.owner_photo" class="wall-item-photo$item.osparkle" id="wall-item-ownerphoto-$item.id" style="height: 80px; width: 80px;" alt="$item.owner_name" /></a>
 			</div>
-			<div class="wall-item-arrowphoto-wrapper" ><img src="images/larrow.gif" alt="$wall" /></div>
-			<div class="wall-item-photo-wrapper mframe wwfrom" id="wall-item-photo-wrapper-$id" 
-				onmouseover="if (typeof t$id != 'undefined') clearTimeout(t$id); openMenu('wall-item-photo-menu-button-$id')"
-                onmouseout="t$id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$id\'); closeMenu(\'wall-item-photo-menu-$id\');',200)">
-				<a href="$profile_url" title="$linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$id">
-				<img src="$thumb" class="wall-item-photo$sparkle" id="wall-item-photo-$id" style="height: 80px; width: 80px;" alt="$name" /></a>
-				<span onclick="openClose('wall-item-photo-menu-$id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$id">menu</span>
-                <div class="wall-item-photo-menu" id="wall-item-photo-menu-$id">
+			<div class="wall-item-arrowphoto-wrapper" ><img src="images/larrow.gif" alt="$item.wall" /></div>
+			<div class="wall-item-photo-wrapper mframe wwfrom" id="wall-item-photo-wrapper-$item.id" 
+				onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')"
+                onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)">
+				<a href="$item.profile_url" title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id">
+				<img src="$item.thumb" class="wall-item-photo$item.sparkle" id="wall-item-photo-$item.id" style="height: 80px; width: 80px;" alt="$item.name" /></a>
+				<span onclick="openClose('wall-item-photo-menu-$item.id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$item.id">menu</span>
+                <div class="wall-item-photo-menu" id="wall-item-photo-menu-$item.id">
                     <ul>
-                        $item_photo_menu
+                        $item.item_photo_menu
                     </ul>
                 </div>
 
 			</div>
 			<div class="wall-item-photo-end"></div>
-			<div class="wall-item-location" id="wall-item-location-$id">{{ if $location }}<span class="icon globe"></span>$location {{ endif }}</div>				
+			<div class="wall-item-location" id="wall-item-location-$item.id">{{ if $item.location }}<span class="icon globe"></span>$item.location {{ endif }}</div>
 		</div>
 		<div class="wall-item-lock-wrapper">
-				{{ if $lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$lock" onclick="lockview(event,$id);" /></div>
+				{{ if $item.lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$item.lock" onclick="lockview(event,$item.id);" /></div>
 				{{ else }}<div class="wall-item-lock"></div>{{ endif }}
 		</div>
-		<div class="wall-item-content" id="wall-item-content-$id" >
-			<div class="wall-item-title" id="wall-item-title-$id">$title</div>
+		<div class="wall-item-content" id="wall-item-content-$item.id" >
+			<div class="wall-item-title" id="wall-item-title-$item.id">$item.title</div>
 			<div class="wall-item-title-end"></div>
-			<div class="wall-item-body" id="wall-item-body-$id" >$body
+			<div class="wall-item-body" id="wall-item-body-$item.id" >$item.body
 					<div class="body-tag">
-						{{ for $tags as $tag }}
+						{{ for $item.tags as $tag }}
 							<span class='tag'>$tag</span>
 						{{ endfor }}
 					</div>
 			</div>
 		</div>
-		<div class="wall-item-tools" id="wall-item-tools-$id">
-			{{ if $vote }}
-			<div class="wall-item-like-buttons" id="wall-item-like-buttons-$id">
-				<a href="#" class="icon like" title="$vote.like.0" onclick="dolike($id,'like'); return false"></a>
-				<a href="#" class="icon dislike" title="$vote.dislike.0" onclick="dolike($id,'dislike'); return false"></a>
-				{{ if $vote.share }}<a href="#" class="icon recycle wall-item-share-buttons" title="$vote.share.0" onclick="jotShare($id); return false"></a>{{ endif }}
-				<img id="like-rotator-$id" class="like-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
+		<div class="wall-item-tools" id="wall-item-tools-$item.id">
+			{{ if $item.vote }}
+			<div class="wall-item-like-buttons" id="wall-item-like-buttons-$item.id">
+				<a href="#" class="icon like" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false"></a>
+				<a href="#" class="icon dislike" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false"></a>
+				{{ if $item.vote.share }}<a href="#" class="icon recycle wall-item-share-buttons" title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a>{{ endif }}
+				<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
 			</div>
 			{{ endif }}
-			{{ if $plink }}
-				<div class="wall-item-links-wrapper"><a href="$plink.href" title="$plink.title" target="external-link" class="icon remote-link"></a></div>
+			{{ if $item.plink }}
+				<div class="wall-item-links-wrapper"><a href="$item.plink.href" title="$item.plink.title" target="external-link" class="icon remote-link"></a></div>
 			{{ endif }}
-			{{ if $edpost }}
-				<a class="editpost icon pencil" href="$edpost.0" title="$edpost.1"></a>
+			{{ if $item.edpost }}
+				<a class="editpost icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>
 			{{ endif }}
 			 
-			{{ if $star }}
-			<a href="#" id="starred-$id" onclick="dostar($id); return false;" class="star-item icon $isstarred" title="$star.toggle"></a>
-			<a href="#" id="tagger-$id" onclick="itemTag($id); return false;" class="tag-item icon tagged" title="$star.tagger"></a>
+			{{ if $item.star }}
+			<a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle"></a>
+			<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a>
 			{{ endif }}
 			
-			<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$id" >
-				{{ if $drop.dropping }}<a href="item/drop/$id" onclick="return confirmDelete();" class="icon drophide" title="$drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
+			<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" >
+				{{ if $item.drop.dropping }}<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drophide" title="$item.drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
 			</div>
-				{{ if $drop.dropping }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$drop.select" class="item-select" name="itemselected[]" value="$id" />{{ endif }}
+				{{ if $item.drop.dropping }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" />{{ endif }}
 			<div class="wall-item-delete-end"></div>
 		</div>
 		<div class="wall-item-author">
-			<a href="$profile_url" title="$linktitle" class="wall-item-name-link"><span class="wall-item-name$sparkle" id="wall-item-name-$id" >$name</span></a>
-			<div class="wall-item-ago"  id="wall-item-ago-$id">$ago</div>
+			<a href="$item.profile_url" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle" id="wall-item-name-$item.id" >$item.name</span></a>
+			<div class="wall-item-ago"  id="wall-item-ago-$item.id">$item.ago</div>
 		</div>	
 	</div>	
 	<div class="wall-item-wrapper-end"></div>
-	<div class="wall-item-like" id="wall-item-like-$id">$like</div>
-	<div class="wall-item-dislike" id="wall-item-dislike-$id">$dislike</div>
+	<div class="wall-item-like" id="wall-item-like-$item.id">$item.like</div>
+	<div class="wall-item-dislike" id="wall-item-dislike-$item.id">$item.dislike</div>
 	<div class="wall-item-comment-wrapper" >
-	$comment
+	$item.comment
 	</div>
 </div>
 
-<div class="wall-item-outside-wrapper-end$indent" ></div>
+<div class="wall-item-outside-wrapper-end$item.indent" ></div>
 
diff --git a/view/theme/vier/search_item.tpl b/view/theme/vier/search_item.tpl
index 372e0d034..fb87d7661 100755
--- a/view/theme/vier/search_item.tpl
+++ b/view/theme/vier/search_item.tpl
@@ -1,80 +1,81 @@
 
 <div class="wall-item-decor">
-	<span class="icon star $isstarred" id="starred-$id" title="$star.starred">$star.starred</span>
-	{{ if $lock }}<span class="icon lock fakelink" onclick="lockview(event,$id);" title="$lock">$lock</span>{{ endif }}	
-	<img id="like-rotator-$id" class="like-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
+	<span class="icon star $item.isstarred" id="starred-$item.id" title="$item.star.starred">$item.star.starred</span>
+	{{ if $item.lock }}<span class="icon lock fakelink" onclick="lockview(event,$item.id);" title="$item.lock">$item.lock</span>{{ endif }}	
+	<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
 </div>
 
-<div class="wall-item-container $indent">
+<div class="wall-item-container $item.indent">
 	<div class="wall-item-item">
 		<div class="wall-item-info">
 			<div class="contact-photo-wrapper"
-				onmouseover="if (typeof t$id != 'undefined') clearTimeout(t$id); openMenu('wall-item-photo-menu-button-$id')" 
-				onmouseout="t$id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$id\'); closeMenu(\'wall-item-photo-menu-$id\');',200)">
-				<a href="$profile_url" target="redir" title="$linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$id">
-					<img src="$thumb" class="contact-photo$sparkle" id="wall-item-photo-$id" alt="$name" />
+				onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')" 
+				onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)">
+				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id">
+					<img src="$item.thumb" class="contact-photo$item.sparkle" id="wall-item-photo-$item.id" alt="$item.name" />
 				</a>
-				<a href="#" rel="#wall-item-photo-menu-$id" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-$id">menu</a>
-				<ul class="wall-item-menu menu-popup" id="wall-item-photo-menu-$id">
-				$item_photo_menu
+				<a href="#" rel="#wall-item-photo-menu-$item.id" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-$item.id">menu</a>
+				<ul class="wall-item-menu menu-popup" id="wall-item-photo-menu-$item.id">
+				$item.item_photo_menu
 				</ul>
 				
 			</div>
 		</div>
 		<div class="wall-item-actions-author">
-			<a href="$profile_url" target="redir" title="$linktitle" class="wall-item-name-link"><span class="wall-item-name$sparkle">$name</span></a> 
+			<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle">$item.name</span></a> 
 			<span class="wall-item-ago">- &nbsp;
-				{{ if $plink }}<a class="link" title="$plink.title" href="$plink.href" style="color: #999">$ago</a>{{ else }} $ago {{ endif }}
-				{{ if $lock }} - <span class="fakelink" style="color: #999" onclick="lockview(event,$id);">$lock</span> {{ endif }}
+				{{ if $item.plink }}<a class="link" title="$item.plink.title" href="$item.plink.href" style="color: #999">$item.ago</a>{{ else }} $item.ago {{ endif }}
+				{{ if $item.lock }} - <span class="fakelink" style="color: #999" onclick="lockview(event,$item.id);">$item.lock</span> {{ endif }}
 			</span>
 		</div>
 		<div class="wall-item-content">
-			{{ if $title }}<h2><a href="$plink.href">$title</a></h2>{{ endif }}
-			$body
+			{{ if $item.title }}<h2><a href="$item.plink.href">$item.title</a></h2>{{ endif }}
+			$item.body
 		</div>
 	</div>
 	<div class="wall-item-bottom">
 		<div class="wall-item-links">
 		</div>
 		<div class="wall-item-tags">
-			{{ for $tags as $tag }}
+			{{ for $item.tags as $tag }}
 				<span class='tag'>$tag</span>
 			{{ endfor }}
+
 		</div>
 	</div>
 	<div class="wall-item-bottom">
 		<div class="">
-			{{ if $plink }}<a class="icon s16 link" title="$plink.title" href="$plink.href">$plink.title</a>{{ endif }}
+			{{ if $item.plink }}<a class="icon s16 link" title="$item.plink.title" href="$item.plink.href">$item.plink.title</a>{{ endif }}
 		</div>
 		<div class="wall-item-actions">
 
-			<div class="wall-item-location">$location&nbsp;</div>	
+			<div class="wall-item-location">$item.location&nbsp;</div>	
 			
 			<div class="wall-item-actions-social">
-			{{ if $star }}
-				<a href="#" id="star-$id" onclick="dostar($id); return false;"  class="$star.classdo"  title="$star.do">$star.do</a>
-				<a href="#" id="unstar-$id" onclick="dostar($id); return false;"  class="$star.classundo"  title="$star.undo">$star.undo</a>
-				<a href="#" id="tagger-$id" onclick="itemTag($id); return false;" class="$star.classtagger" title="$star.tagger">$star.tagger</a>
+			{{ if $item.star }}
+				<a href="#" id="star-$item.id" onclick="dostar($item.id); return false;"  class="$item.star.classdo"  title="$item.star.do">$item.star.do</a>
+				<a href="#" id="unstar-$item.id" onclick="dostar($item.id); return false;"  class="$item.star.classundo"  title="$item.star.undo">$item.star.undo</a>
+				<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="$item.star.classtagger" title="$item.star.tagger">$item.star.tagger</a>
 			{{ endif }}
 			
-			{{ if $vote }}
-				<a href="#" id="like-$id" title="$vote.like.0" onclick="dolike($id,'like'); return false">$vote.like.1</a>
-				<a href="#" id="dislike-$id" title="$vote.dislike.0" onclick="dolike($id,'dislike'); return false">$vote.dislike.1</a>
+			{{ if $item.vote }}
+				<a href="#" id="like-$item.id" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false">$item.vote.like.1</a>
+				<a href="#" id="dislike-$item.id" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false">$item.vote.dislike.1</a>
 			{{ endif }}
 						
-			{{ if $vote.share }}
-				<a href="#" id="share-$id" title="$vote.share.0" onclick="jotShare($id); return false">$vote.share.1</a>
+			{{ if $item.vote.share }}
+				<a href="#" id="share-$item.id" title="$item.vote.share.0" onclick="jotShare($item.id); return false">$item.vote.share.1</a>
 			{{ endif }}			
 			</div>
 			
 			<div class="wall-item-actions-tools">
 
-				{{ if $drop.dropping }}
-					<input type="checkbox" title="$drop.select" name="itemselected[]" class="item-select" value="$id" />
-					<a href="item/drop/$id" onclick="return confirmDelete();" class="icon delete s16" title="$drop.delete">$drop.delete</a>
+				{{ if $item.drop.dropping }}
+					<input type="checkbox" title="$item.drop.select" name="itemselected[]" class="item-select" value="$item.id" />
+					<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon delete s16" title="$item.drop.delete">$item.drop.delete</a>
 				{{ endif }}
-				{{ if $edpost }}
-					<a class="icon edit s16" href="$edpost.0" title="$edpost.1"></a>
+				{{ if $item.edpost }}
+					<a class="icon edit s16" href="$item.edpost.0" title="$item.edpost.1"></a>
 				{{ endif }}
 			</div>
 			
@@ -82,7 +83,7 @@
 	</div>
 	<div class="wall-item-bottom">
 		<div class="wall-item-links"></div>
-		<div class="wall-item-like" id="wall-item-like-$id">$like</div>
-		<div class="wall-item-dislike" id="wall-item-dislike-$id">$dislike</div>	
+		<div class="wall-item-like" id="wall-item-like-$item.id">$item.like</div>
+		<div class="wall-item-dislike" id="wall-item-dislike-$item.id">$item.dislike</div>	
 	</div>
 </div>
diff --git a/view/theme/vier/wall_item.tpl b/view/theme/vier/wall_item.tpl
index abd2862a1..aa972937d 100644
--- a/view/theme/vier/wall_item.tpl
+++ b/view/theme/vier/wall_item.tpl
@@ -1,79 +1,80 @@
-{{ if $indent }}{{ else }}
+{{ if $item.indent }}{{ else }}
 <div class="wall-item-decor">
-	<span class="icon star $isstarred" id="starred-$id" title="$star.starred">$star.starred</span>
-	{{ if $lock }}<span class="icon lock fakelink" onclick="lockview(event,$id);" title="$lock">$lock</span>{{ endif }}	
-	<img id="like-rotator-$id" class="like-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
+	<span class="icon star $item.isstarred" id="starred-$item.id" title="$item.star.starred">$item.star.starred</span>
+	{{ if $item.lock }}<span class="icon lock fakelink" onclick="lockview(event,$item.id);" title="$item.lock">$item.lock</span>{{ endif }}	
+	<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
 </div>
 {{ endif }}
-<div class="wall-item-container $indent">
+<div class="wall-item-container $item.indent">
 	<div class="wall-item-item">
 		<div class="wall-item-info">
 			<div class="contact-photo-wrapper"
-				onmouseover="if (typeof t$id != 'undefined') clearTimeout(t$id); openMenu('wall-item-photo-menu-button-$id')" 
-				onmouseout="t$id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$id\'); closeMenu(\'wall-item-photo-menu-$id\');',200)">
-				<a href="$profile_url" target="redir" title="$linktitle" class="contact-photo-link" id="wall-item-photo-link-$id">
-					<img src="$thumb" class="contact-photo$sparkle" id="wall-item-photo-$id" alt="$name" />
+				onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')" 
+				onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)">
+				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="contact-photo-link" id="wall-item-photo-link-$item.id">
+					<img src="$item.thumb" class="contact-photo$item.sparkle" id="wall-item-photo-$item.id" alt="$item.name" />
 				</a>
-				<a href="#" rel="#wall-item-photo-menu-$id" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-$id">menu</a>
-				<ul class="contact-menu menu-popup" id="wall-item-photo-menu-$id">
-				$item_photo_menu
+				<a href="#" rel="#wall-item-photo-menu-$item.id" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-$item.id">menu</a>
+				<ul class="contact-menu menu-popup" id="wall-item-photo-menu-$item.id">
+				$item.item_photo_menu
 				</ul>
 				
 			</div>
 		</div>
 			<div class="wall-item-actions-author">
-				<a href="$profile_url" target="redir" title="$linktitle" class="wall-item-name-link"><span class="wall-item-name$sparkle">$name</span></a> 
+				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle">$item.name</span></a> 
 			<span class="wall-item-ago">-
-			{{ if $plink }}<a class="link" title="$plink.title" href="$plink.href" style="color: #999">$ago</a>{{ else }} $ago {{ endif }}
-			{{ if $lock }} - <span class="fakelink" style="color: #999" onclick="lockview(event,$id);">$lock</span> {{ endif }}
+			{{ if $item.plink }}<a class="link" title="$item.plink.title" href="$item.plink.href" style="color: #999">$item.ago</a>{{ else }} $item.ago {{ endif }}
+			{{ if $item.lock }} - <span class="fakelink" style="color: #999" onclick="lockview(event,$item.id);">$item.lock</span> {{ endif }}
 			</span>
 			</div>
 		<div class="wall-item-content">
 
-			{{ if $title }}<h2><a href="$plink.href">$title</a></h2>{{ endif }}
-			$body
+			{{ if $item.title }}<h2><a href="$item.plink.href">$item.title</a></h2>{{ endif }}
+			$item.body
 		</div>
 	</div>
 	<div class="wall-item-bottom">
 		<div class="wall-item-links">
 		</div>
 		<div class="wall-item-tags">
-			{{ for $tags as $tag }}
+			{{ for $item.tags as $tag }}
 				<span class='tag'>$tag</span>
 			{{ endfor }}
+
 		</div>
 	</div>
 	<div class="wall-item-bottom">
 		<div class="">
-			{{ if $plink }}<a class="icon s16 link" title="$plink.title" href="$plink.href">$plink.title</a>{{ endif }}
+			{{ if $item.plink }}<a class="icon s16 link" title="$item.plink.title" href="$item.plink.href">$item.plink.title</a>{{ endif }}
 		</div>
 		<div class="wall-item-actions">
-			<div class="wall-item-location">$location&nbsp;</div>
+			<div class="wall-item-location">$item.location&nbsp;</div>
 			<div class="wall-item-actions-social">
-			{{ if $star }}
-				<a href="#" id="star-$id" onclick="dostar($id); return false;"  class="$star.classdo"  title="$star.do">$star.do</a>
-				<a href="#" id="unstar-$id" onclick="dostar($id); return false;"  class="$star.classundo"  title="$star.undo">$star.undo</a>
-				<a href="#" id="tagger-$id" onclick="itemTag($id); return false;" class="$star.classtagger" title="$star.tagger">$star.tagger</a>
+			{{ if $item.star }}
+				<a href="#" id="star-$item.id" onclick="dostar($item.id); return false;"  class="$item.star.classdo"  title="$item.star.do">$item.star.do</a>
+				<a href="#" id="unstar-$item.id" onclick="dostar($item.id); return false;"  class="$item.star.classundo"  title="$item.star.undo">$item.star.undo</a>
+				<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="$item.star.classtagger" title="$item.star.tagger">$item.star.tagger</a>
 			{{ endif }}
 			
-			{{ if $vote }}
-				<a href="#" id="like-$id" title="$vote.like.0" onclick="dolike($id,'like'); return false">$vote.like.1</a>
-				<a href="#" id="dislike-$id" title="$vote.dislike.0" onclick="dolike($id,'dislike'); return false">$vote.dislike.1</a>
+			{{ if $item.vote }}
+				<a href="#" id="like-$item.id" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false">$item.vote.like.1</a>
+				<a href="#" id="dislike-$item.id" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false">$item.vote.dislike.1</a>
 			{{ endif }}
 						
-			{{ if $vote.share }}
-				<a href="#" id="share-$id" title="$vote.share.0" onclick="jotShare($id); return false">$vote.share.1</a>
+			{{ if $item.vote.share }}
+				<a href="#" id="share-$item.id" title="$item.vote.share.0" onclick="jotShare($item.id); return false">$item.vote.share.1</a>
 			{{ endif }}			
 			</div>
 			
 			<div class="wall-item-actions-tools">
 
-				{{ if $drop.dropping }}
-					<input type="checkbox" title="$drop.select" name="itemselected[]" class="item-select" value="$id" />
-					<a href="item/drop/$id" onclick="return confirmDelete();" class="icon delete s16" title="$drop.delete">$drop.delete</a>
+				{{ if $item.drop.dropping }}
+					<input type="checkbox" title="$item.drop.select" name="itemselected[]" class="item-select" value="$item.id" />
+					<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon delete s16" title="$item.drop.delete">$item.drop.delete</a>
 				{{ endif }}
-				{{ if $edpost }}
-					<a class="icon edit" href="$edpost.0" title="$edpost.1"></a>
+				{{ if $item.edpost }}
+					<a class="icon edit" href="$item.edpost.0" title="$item.edpost.1"></a>
 				{{ endif }}
 			</div>
 			
@@ -81,11 +82,11 @@
 	</div>
 	<div class="wall-item-bottom">
 		<div class="wall-item-links"></div>
-		<div class="wall-item-like" id="wall-item-like-$id">$like</div>
-		<div class="wall-item-dislike" id="wall-item-dislike-$id">$dislike</div>	
+		<div class="wall-item-like" id="wall-item-like-$item.id">$item.like</div>
+		<div class="wall-item-dislike" id="wall-item-dislike-$item.id">$item.dislike</div>	
 	</div>
 </div>
 
 <div class="wall-item-comment-wrapper" >
-	$comment
+	$item.comment
 </div>
diff --git a/view/theme/vier/wallwall_item.tpl b/view/theme/vier/wallwall_item.tpl
index 8e452f4f6..c557b33f1 100644
--- a/view/theme/vier/wallwall_item.tpl
+++ b/view/theme/vier/wallwall_item.tpl
@@ -1,88 +1,88 @@
-{{ if $indent }}{{ else }}
+{{ if $item.indent }}{{ else }}
 <div class="wall-item-decor">
-	<span class="icon star $isstarred" id="starred-$id" title="$star.starred">$star.starred</span>
-	{{ if $lock }}<span class="icon lock fakelink" onclick="lockview(event,$id);" title="$lock">$lock</span>{{ endif }}	
-	<img id="like-rotator-$id" class="like-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
+	<span class="icon star $item.isstarred" id="starred-$item.id" title="$item.star.starred">$item.star.starred</span>
+	{{ if $item.lock }}<span class="icon lock fakelink" onclick="lockview(event,$item.id);" title="$item.lock">$item.lock</span>{{ endif }}	
+	<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
 </div>
 {{ endif }}
-<div class="wall-item-container $indent">
+<div class="wall-item-container $item.indent">
 	<div class="wall-item-item">
 		<div class="wall-item-info">
-			<div class="contact-photo-wrapper mframe wwto" id="wall-item-ownerphoto-wrapper-$id" >
-				<a href="$owner_url" target="redir" title="$olinktitle" class="contact-photo-link" id="wall-item-ownerphoto-link-$id">
-					<img src="$owner_photo" class="contact-photo $osparkle" id="wall-item-ownerphoto-$id" alt="$owner_name" />
+			<div class="contact-photo-wrapper mframe wwto" id="wall-item-ownerphoto-wrapper-$item.id" >
+				<a href="$item.owner_url" target="redir" title="$item.olinktitle" class="contact-photo-link" id="wall-item-ownerphoto-link-$item.id">
+					<img src="$item.owner_photo" class="contact-photo $item.osparkle" id="wall-item-ownerphoto-$item.id" alt="$item.owner_name" />
 				</a>
 			</div>
 			<div class="contact-photo-wrapper mframe wwfrom"
-				onmouseover="if (typeof t$id != 'undefined') clearTimeout(t$id); openMenu('wall-item-photo-menu-button-$id')" 
-				onmouseout="t$id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$id\'); closeMenu(\'wall-item-photo-menu-$id\');',200)">
-				<a href="$profile_url" target="redir" title="$linktitle" class="contact-photo-link" id="wall-item-photo-link-$id">
-					<img src="$thumb" class="contact-photo $sparkle" id="wall-item-photo-$id" alt="$name" />
+				onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')" 
+				onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)">
+				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="contact-photo-link" id="wall-item-photo-link-$item.id">
+					<img src="$item.thumb" class="contact-photo $item.sparkle" id="wall-item-photo-$item.id" alt="$item.name" />
 				</a>
-				<a href="#" rel="#wall-item-photo-menu-$id" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-$id">menu</a>
-				<ul class="contact-menu menu-popup" id="wall-item-photo-menu-$id">
-				$item_photo_menu
+				<a href="#" rel="#wall-item-photo-menu-$item.id" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-$item.id">menu</a>
+				<ul class="contact-menu menu-popup" id="wall-item-photo-menu-$item.id">
+				$item.item_photo_menu
 				</ul>
 				
 			</div>	
 		</div>
 
 			<div class="wall-item-actions-author">
-				<a href="$profile_url" target="redir" title="$linktitle" class="wall-item-name-link"><span class="wall-item-name$sparkle">$name</span></a>
-				$to <a href="$owner_url" target="redir" title="$olinktitle" class="wall-item-name-link"><span class="wall-item-name$osparkle" id="wall-item-ownername-$id">$owner_name</span></a>
-				 $vwall <span class="wall-item-ago">- &nbsp;
-					{{ if $plink }}<a class="link" title="$plink.title" href="$plink.href" style="color: #999">$ago</a>{{ else }} $ago {{ endif }}
-					{{ if $lock }} - <span class="fakelink" style="color: #999" onclick="lockview(event,$id);">$lock</span> {{ endif }}
+				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle">$item.name</span></a>
+				$item.to <a href="$item.owner_url" target="redir" title="$item.olinktitle" class="wall-item-name-link"><span class="wall-item-name$item.osparkle" id="wall-item-ownername-$item.id">$item.owner_name</span></a>
+				 $item.vwall <span class="wall-item-ago">- &nbsp;
+					{{ if $item.plink }}<a class="link" title="$item.plink.title" href="$item.plink.href" style="color: #999">$item.ago</a>{{ else }} $item.ago {{ endif }}
+					{{ if $item.lock }} - <span class="fakelink" style="color: #999" onclick="lockview(event,$item.id);">$item.lock</span> {{ endif }}
 				</span>
 			</div>
 
 		<div class="wall-item-content">
-			{{ if $title }}<h2><a href="$plink.href">$title</a></h2>{{ endif }}
-			$body
+			{{ if $item.title }}<h2><a href="$item.plink.href">$item.title</a></h2>{{ endif }}
+			$item.body
 		</div>
 	</div>
 	<div class="wall-item-bottom">
 		<div class="wall-item-links">
 		</div>
 		<div class="wall-item-tags">
-			{{ for $tags as $tag }}
+			{{ for $item.tags as $tag }}
 				<span class='tag'>$tag</span>
 			{{ endfor }}
 		</div>
 	</div>	
 	<div class="wall-item-bottom">
 		<div class="wall-item-links">
-			{{ if $plink }}<a class="icon s16 link" title="$plink.title" href="$plink.href">$plink.title</a>{{ endif }}
+			{{ if $item.plink }}<a class="icon s16 link" title="$item.plink.title" href="$item.plink.href">$item.plink.title</a>{{ endif }}
 		</div>
 		<div class="wall-item-actions">
 
-			<div class="wall-item-location">$location&nbsp;</div>	
+			<div class="wall-item-location">$item.location&nbsp;</div>	
 			
 			<div class="wall-item-actions-social">
-			{{ if $star }}
-				<a href="#" id="star-$id" onclick="dostar($id); return false;"  class="$star.classdo"  title="$star.do">$star.do</a>
-				<a href="#" id="unstar-$id" onclick="dostar($id); return false;"  class="$star.classundo"  title="$star.undo">$star.undo</a>
-				<a href="#" id="tagger-$id" onclick="itemTag($id); return false;" class="$star.classtagger" title="$star.tagger">$star.tagger</a>
+			{{ if $item.star }}
+				<a href="#" id="star-$item.id" onclick="dostar($item.id); return false;"  class="$item.star.classdo"  title="$item.star.do">$item.star.do</a>
+				<a href="#" id="unstar-$item.id" onclick="dostar($item.id); return false;"  class="$item.star.classundo"  title="$item.star.undo">$item.star.undo</a>
+				<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="$item.star.classtagger" title="$item.star.tagger">$item.star.tagger</a>
 			{{ endif }}
 			
-			{{ if $vote }}
-				<a href="#" id="like-$id" title="$vote.like.0" onclick="dolike($id,'like'); return false">$vote.like.1</a>
-				<a href="#" id="dislike-$id" title="$vote.dislike.0" onclick="dolike($id,'dislike'); return false">$vote.dislike.1</a>
+			{{ if $item.vote }}
+				<a href="#" id="like-$item.id" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false">$item.vote.like.1</a>
+				<a href="#" id="dislike-$item.id" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false">$item.vote.dislike.1</a>
 			{{ endif }}
 						
-			{{ if $vote.share }}
-				<a href="#" id="share-$id" title="$vote.share.0" onclick="jotShare($id); return false">$vote.share.1</a>
+			{{ if $item.vote.share }}
+				<a href="#" id="share-$item.id" title="$item.vote.share.0" onclick="jotShare($item.id); return false">$item.vote.share.1</a>
 			{{ endif }}			
 			</div>
 			
 			<div class="wall-item-actions-tools">
 
-				{{ if $drop.dropping }}
-					<input type="checkbox" title="$drop.select" name="itemselected[]" class="item-select" value="$id" />
-					<a href="item/drop/$id" onclick="return confirmDelete();" class="icon delete s16" title="$drop.delete">$drop.delete</a>
+				{{ if $item.drop.dropping }}
+					<input type="checkbox" title="$item.drop.select" name="itemselected[]" class="item-select" value="$item.id" />
+					<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon delete s16" title="$item.drop.delete">$item.drop.delete</a>
 				{{ endif }}
-				{{ if $edpost }}
-					<a class="icon edit s16" href="$edpost.0" title="$edpost.1"></a>
+				{{ if $item.edpost }}
+					<a class="icon edit s16" href="$item.edpost.0" title="$item.edpost.1"></a>
 				{{ endif }}
 			</div>
 			
@@ -90,10 +90,10 @@
 	</div>
 	<div class="wall-item-bottom">
 		<div class="wall-item-links"></div>
-		<div class="wall-item-like" id="wall-item-like-$id">$like</div>
-		<div class="wall-item-dislike" id="wall-item-dislike-$id">$dislike</div>	
+		<div class="wall-item-like" id="wall-item-like-$item.id">$item.like</div>
+		<div class="wall-item-dislike" id="wall-item-dislike-$item.id">$item.dislike</div>	
 	</div>	
 </div>
 <div class="wall-item-comment-wrapper" >
-	$comment
+	$item.comment
 </div>
diff --git a/view/wall_item.tpl b/view/wall_item.tpl
index 83e6dd361..c99077510 100755
--- a/view/wall_item.tpl
+++ b/view/wall_item.tpl
@@ -1,75 +1,75 @@
 
 <div class="wall-item-decor">
-	<span class="icon s22 star $isstarred" id="starred-$id" title="$star.starred">$star.starred</span>
-	{{ if $lock }}<span class="icon s22 lock fakelink" onclick="lockview(event,$id);" title="$lock">$lock</span>{{ endif }}	
-	<img id="like-rotator-$id" class="like-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
+	<span class="icon s22 star $item.isstarred" id="starred-$item.id" title="$item.star.starred">$item.star.starred</span>
+	{{ if $item.lock }}<span class="icon s22 lock fakelink" onclick="lockview(event,$item.id);" title="$item.lock">$item.lock</span>{{ endif }}	
+	<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
 </div>
 
-<div class="wall-item-container $indent">
+<div class="wall-item-container $item.indent">
 	<div class="wall-item-item">
 		<div class="wall-item-info">
 			<div class="contact-photo-wrapper"
-				onmouseover="if (typeof t$id != 'undefined') clearTimeout(t$id); openMenu('wall-item-photo-menu-button-$id')" 
-				onmouseout="t$id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$id\'); closeMenu(\'wall-item-photo-menu-$id\');',200)">
-				<a href="$profile_url" target="redir" title="$linktitle" class="contact-photo-link" id="wall-item-photo-link-$id">
-					<img src="$thumb" class="contact-photo$sparkle" id="wall-item-photo-$id" alt="$name" />
+				onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')" 
+				onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)">
+				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="contact-photo-link" id="wall-item-photo-link-$item.id">
+					<img src="$item.thumb" class="contact-photo$item.sparkle" id="wall-item-photo-$item.id" alt="$item.name" />
 				</a>
-				<a href="#" rel="#wall-item-photo-menu-$id" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-$id">menu</a>
-				<ul class="contact-menu menu-popup" id="wall-item-photo-menu-$id">
-				$item_photo_menu
+				<a href="#" rel="#wall-item-photo-menu-$item.id" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-$item.id">menu</a>
+				<ul class="contact-menu menu-popup" id="wall-item-photo-menu-$item.id">
+				$item.item_photo_menu
 				</ul>
 				
 			</div>
-			<div class="wall-item-location">$location</div>	
+			<div class="wall-item-location">$item.location</div>	
 		</div>
 		<div class="wall-item-content">
-			{{ if $title }}<h2><a href="$plink.href">$title</a></h2>{{ endif }}
-			$body
+			{{ if $item.title }}<h2><a href="$item.plink.href">$item.title</a></h2>{{ endif }}
+			$item.body
 		</div>
 	</div>
 	<div class="wall-item-bottom">
 		<div class="wall-item-links">
 		</div>
 		<div class="wall-item-tags">
-			{{ for $tags as $tag }}
+			{{ for $item.tags as $tag }}
 				<span class='tag'>$tag</span>
 			{{ endfor }}
 		</div>
 	</div>
 	<div class="wall-item-bottom">
 		<div class="">
-			{{ if $plink }}<a class="icon s16 link" title="$plink.title" href="$plink.href">$plink.title</a>{{ endif }}
+			{{ if $item.plink }}<a class="icon s16 link" title="$item.plink.title" href="$item.plink.href">$item.plink.title</a>{{ endif }}
 		</div>
 		<div class="wall-item-actions">
 			<div class="wall-item-actions-author">
-				<a href="$profile_url" target="redir" title="$linktitle" class="wall-item-name-link"><span class="wall-item-name$sparkle">$name</span></a> <span class="wall-item-ago">$ago</span>
+				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle">$item.name</span></a> <span class="wall-item-ago">$item.ago</span>
 			</div>
 			
 			<div class="wall-item-actions-social">
-			{{ if $star }}
-				<a href="#" id="star-$id" onclick="dostar($id); return false;"  class="$star.classdo"  title="$star.do">$star.do</a>
-				<a href="#" id="unstar-$id" onclick="dostar($id); return false;"  class="$star.classundo"  title="$star.undo">$star.undo</a>
-				<a href="#" id="tagger-$id" onclick="itemTag($id); return false;" class="$star.classtagger" title="$star.tagger">$star.tagger</a>
+			{{ if $item.star }}
+				<a href="#" id="star-$item.id" onclick="dostar($item.id); return false;"  class="$item.star.classdo"  title="$item.star.do">$item.star.do</a>
+				<a href="#" id="unstar-$item.id" onclick="dostar($item.id); return false;"  class="$item.star.classundo"  title="$item.star.undo">$item.star.undo</a>
+				<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="$item.star.classtagger" title="$item.star.tagger">$item.star.tagger</a>
 			{{ endif }}
 			
-			{{ if $vote }}
-				<a href="#" id="like-$id" title="$vote.like.0" onclick="dolike($id,'like'); return false">$vote.like.1</a>
-				<a href="#" id="dislike-$id" title="$vote.dislike.0" onclick="dolike($id,'dislike'); return false">$vote.dislike.1</a>
+			{{ if $item.vote }}
+				<a href="#" id="like-$item.id" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false">$item.vote.like.1</a>
+				<a href="#" id="dislike-$item.id" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false">$item.vote.dislike.1</a>
 			{{ endif }}
 						
-			{{ if $vote.share }}
-				<a href="#" id="share-$id" title="$vote.share.0" onclick="jotShare($id); return false">$vote.share.1</a>
+			{{ if $item.vote.share }}
+				<a href="#" id="share-$item.id" title="$item.vote.share.0" onclick="jotShare($item.id); return false">$item.vote.share.1</a>
 			{{ endif }}			
 			</div>
 			
 			<div class="wall-item-actions-tools">
 
-				{{ if $drop.dropping }}
-					<input type="checkbox" title="$drop.select" name="itemselected[]" class="item-select" value="$id" />
-					<a href="item/drop/$id" onclick="return confirmDelete();" class="icon delete s16" title="$drop.delete">$drop.delete</a>
+				{{ if $item.drop.dropping }}
+					<input type="checkbox" title="$item.drop.select" name="itemselected[]" class="item-select" value="$item.id" />
+					<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon delete s16" title="$item.drop.delete">$item.drop.delete</a>
 				{{ endif }}
-				{{ if $edpost }}
-					<a class="icon edit s16" href="$edpost.0" title="$edpost.1"></a>
+				{{ if $item.edpost }}
+					<a class="icon edit s16" href="$item.edpost.0" title="$item.edpost.1"></a>
 				{{ endif }}
 			</div>
 			
@@ -77,11 +77,11 @@
 	</div>
 	<div class="wall-item-bottom">
 		<div class="wall-item-links"></div>
-		<div class="wall-item-like" id="wall-item-like-$id">$like</div>
-		<div class="wall-item-dislike" id="wall-item-dislike-$id">$dislike</div>	
+		<div class="wall-item-like" id="wall-item-like-$item.id">$item.like</div>
+		<div class="wall-item-dislike" id="wall-item-dislike-$item.id">$item.dislike</div>	
 	</div>
 </div>
 
 <div class="wall-item-comment-wrapper" >
-	$comment
+	$item.comment
 </div>
diff --git a/view/wallwall_item.tpl b/view/wallwall_item.tpl
index 61a248135..be942f261 100755
--- a/view/wallwall_item.tpl
+++ b/view/wallwall_item.tpl
@@ -1,82 +1,82 @@
 <div class="wall-item-decor">
-	<span class="icon s22 star $isstarred" id="starred-$id" title="$star.starred">$star.starred</span>
-	{{ if $lock }}<span class="icon s22 lock fakelink" onclick="lockview(event,$id);" title="$lock">$lock</span>{{ endif }}	
-	<img id="like-rotator-$id" class="like-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
+	<span class="icon s22 star $item.isstarred" id="starred-$item.id" title="$item.star.starred">$item.star.starred</span>
+	{{ if $item.lock }}<span class="icon s22 lock fakelink" onclick="lockview(event,$item.id);" title="$item.lock">$item.lock</span>{{ endif }}	
+	<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
 </div>
 
-<div class="wall-item-container $indent">
+<div class="wall-item-container $item.indent">
 	<div class="wall-item-item">
 		<div class="wall-item-info">
 			<div class="contact-photo-wrapper mframe wwfrom"
-				onmouseover="if (typeof t$id != 'undefined') clearTimeout(t$id); openMenu('wall-item-photo-menu-button-$id')" 
-				onmouseout="t$id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$id\'); closeMenu(\'wall-item-photo-menu-$id\');',200)">
-				<a href="$profile_url" target="redir" title="$linktitle" class="contact-photo-link" id="wall-item-photo-link-$id">
-					<img src="$thumb" class="contact-photo $sparkle" id="wall-item-photo-$id" alt="$name" />
+				onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')" 
+				onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)">
+				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="contact-photo-link" id="wall-item-photo-link-$item.id">
+					<img src="$item.thumb" class="contact-photo $item.sparkle" id="wall-item-photo-$item.id" alt="$item.name" />
 				</a>
-				<a href="#" rel="#wall-item-photo-menu-$id" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-$id">menu</a>
-				<ul class="contact-menu menu-popup" id="wall-item-photo-menu-$id">
-				$item_photo_menu
+				<a href="#" rel="#wall-item-photo-menu-$item.id" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-$item.id">menu</a>
+				<ul class="contact-menu menu-popup" id="wall-item-photo-menu-$item.id">
+				$item.item_photo_menu
 				</ul>
 				
 			</div>	
-			<div class="contact-photo-wrapper mframe wwto" id="wall-item-ownerphoto-wrapper-$id" >
-				<a href="$owner_url" target="redir" title="$olinktitle" class="contact-photo-link" id="wall-item-ownerphoto-link-$id">
-					<img src="$owner_photo" class="contact-photo $osparkle" id="wall-item-ownerphoto-$id" alt="$owner_name" />
+			<div class="contact-photo-wrapper mframe wwto" id="wall-item-ownerphoto-wrapper-$item.id" >
+				<a href="$item.owner_url" target="redir" title="$item.olinktitle" class="contact-photo-link" id="wall-item-ownerphoto-link-$item.id">
+					<img src="$item.owner_photo" class="contact-photo $item.osparkle" id="wall-item-ownerphoto-$item.id" alt="$item.owner_name" />
 				</a>
 			</div>			
-			<div class="wall-item-location">$location</div>	
+			<div class="wall-item-location">$item.location</div>	
 		</div>
 		<div class="wall-item-content">
-			{{ if $title }}<h2><a href="$plink.href">$title</a></h2>{{ endif }}
-			$body
+			{{ if $item.title }}<h2><a href="$item.plink.href">$item.title</a></h2>{{ endif }}
+			$item.body
 		</div>
 	</div>
 	<div class="wall-item-bottom">
 		<div class="wall-item-links">
 		</div>
 		<div class="wall-item-tags">
-			{{ for $tags as $tag }}
+			{{ for $item.tags as $tag }}
 				<span class='tag'>$tag</span>
 			{{ endfor }}
 		</div>
 	</div>	
 	<div class="wall-item-bottom">
 		<div class="wall-item-links">
-			{{ if $plink }}<a class="icon s16 link" title="$plink.title" href="$plink.href">$plink.title</a>{{ endif }}
+			{{ if $item.plink }}<a class="icon s16 link" title="$item.plink.title" href="$item.plink.href">$item.plink.title</a>{{ endif }}
 		</div>
 		<div class="wall-item-actions">
 			<div class="wall-item-actions-author">
-				<a href="$profile_url" target="redir" title="$linktitle" class="wall-item-name-link"><span class="wall-item-name$sparkle">$name</span></a> <span class="wall-item-ago">$ago</span>
-				 <br/>$to <a href="$owner_url" target="redir" title="$olinktitle" class="wall-item-name-link"><span class="wall-item-name$osparkle" id="wall-item-ownername-$id">$owner_name</span></a> $vwall
+				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle">$item.name</span></a> <span class="wall-item-ago">$item.ago</span>
+				 <br/>$item.to <a href="$item.owner_url" target="redir" title="$item.olinktitle" class="wall-item-name-link"><span class="wall-item-name$item.osparkle" id="wall-item-ownername-$item.id">$item.owner_name</span></a> $item.vwall
 				 
 			</div>
 			
 			<div class="wall-item-actions-social">
-			{{ if $star }}
-				<a href="#" id="star-$id" onclick="dostar($id); return false;"  class="$star.classdo"  title="$star.do">$star.do</a>
-				<a href="#" id="unstar-$id" onclick="dostar($id); return false;"  class="$star.classundo"  title="$star.undo">$star.undo</a>
-				<a href="#" id="tagger-$id" onclick="itemTag($id); return false;" class="$star.classtagger" title="$star.tagger">$star.tagger</a>
+			{{ if $item.star }}
+				<a href="#" id="star-$item.id" onclick="dostar($item.id); return false;"  class="$item.star.classdo"  title="$item.star.do">$item.star.do</a>
+				<a href="#" id="unstar-$item.id" onclick="dostar($item.id); return false;"  class="$item.star.classundo"  title="$item.star.undo">$item.star.undo</a>
+				<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="$item.star.classtagger" title="$item.star.tagger">$item.star.tagger</a>
 
 			{{ endif }}
 			
-			{{ if $vote }}
-				<a href="#" id="like-$id" title="$vote.like.0" onclick="dolike($id,'like'); return false">$vote.like.1</a>
-				<a href="#" id="dislike-$id" title="$vote.dislike.0" onclick="dolike($id,'dislike'); return false">$vote.dislike.1</a>
+			{{ if $item.vote }}
+				<a href="#" id="like-$item.id" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false">$item.vote.like.1</a>
+				<a href="#" id="dislike-$item.id" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false">$item.vote.dislike.1</a>
 			{{ endif }}
 						
-			{{ if $vote.share }}
-				<a href="#" id="share-$id" title="$vote.share.0" onclick="jotShare($id); return false">$vote.share.1</a>
+			{{ if $item.vote.share }}
+				<a href="#" id="share-$item.id" title="$item.vote.share.0" onclick="jotShare($item.id); return false">$item.vote.share.1</a>
 			{{ endif }}			
 			</div>
 			
 			<div class="wall-item-actions-tools">
 
-				{{ if $drop.dropping }}
-					<input type="checkbox" title="$drop.select" name="itemselected[]" class="item-select" value="$id" />
-					<a href="item/drop/$id" onclick="return confirmDelete();" class="icon delete s16" title="$drop.delete">$drop.delete</a>
+				{{ if $item.drop.dropping }}
+					<input type="checkbox" title="$item.drop.select" name="itemselected[]" class="item-select" value="$item.id" />
+					<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon delete s16" title="$item.drop.delete">$item.drop.delete</a>
 				{{ endif }}
-				{{ if $edpost }}
-					<a class="icon edit s16" href="$edpost.0" title="$edpost.1"></a>
+				{{ if $item.edpost }}
+					<a class="icon edit s16" href="$item.edpost.0" title="$item.edpost.1"></a>
 				{{ endif }}
 			</div>
 			
@@ -84,10 +84,10 @@
 	</div>
 	<div class="wall-item-bottom">
 		<div class="wall-item-links"></div>
-		<div class="wall-item-like" id="wall-item-like-$id">$like</div>
-		<div class="wall-item-dislike" id="wall-item-dislike-$id">$dislike</div>	
+		<div class="wall-item-like" id="wall-item-like-$item.id">$item.like</div>
+		<div class="wall-item-dislike" id="wall-item-dislike-$item.id">$item.dislike</div>	
 	</div>	
 </div>
 <div class="wall-item-comment-wrapper" >
-	$comment
+	$item.comment
 </div>