Merge remote branch 'mike/master'

24 files changed, 80 insertions, 244 deletions

diff --git a/view/de/head.tpl b/view/de/head.tpl
index c3ec3d2c9..17b7706f8 100644
--- a/view/de/head.tpl
+++ b/view/de/head.tpl
@@ -1,7 +1,7 @@
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
 <base href="$baseurl" />
 <link rel="stylesheet" type="text/css" href="$stylesheet" media="all" />
-<link rel="shortcut icon" href="$baseurl/images/ff-32.jpg" />
+<link rel="shortcut icon" href="$baseurl/images/friendika-32.png" />
 
 <!--[if IE]>
 <script type="text/javascript" src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
diff --git a/view/de/jot.tpl b/view/de/jot.tpl
deleted file mode 100644
index db73b17a6..000000000
--- a/view/de/jot.tpl
+++ /dev/null
@@ -1,60 +0,0 @@
-
-<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="item" method="post" >
-		<input type="hidden" name="type" value="wall" />
-		<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="" />
-
-
-		<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" ></textarea>
-
-<div id="profile-jot-submit-wrapper" >
-<input type="submit" id="profile-jot-submit" name="submit" value="Share" />
-	<div id="profile-upload-wrapper" style="display: $visitor;" >
-		<div id="wall-image-upload-div" ><img id="wall-image-upload" src="images/camera-icon.gif" alt="Foto hochladen" title="Foto hochladen"  /></div>
-	</div> 
-	<div id="profile-link-wrapper" style="display: $visitor;" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" >
-		<img id="profile-link" src="images/link-icon.gif" alt="Weblink einfügen" title="Weblink einfügen" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink();" />
-	</div> 
-	<div id="profile-youtube-wrapper" style="display: $visitor;" >
-		<img id="profile-video" src="images/youtube_icon.gif" alt="YouTube Video einfügen" title="YouTube Video einfügen" onclick="jotGetVideo();" />
-	</div> 
-	<div id="profile-location-wrapper" style="display: $visitor;" >
-		<img id="profile-location" src="images/globe.gif" alt="Deinen Standort festlegen" title="Deinen Standort festlegen" onclick="jotGetLocation();" />
-	</div> 
-	<div id="profile-nolocation-wrapper" style="display: none;" >
-		<img id="profile-nolocation" src="images/noglobe.gif" alt="Browser Standort leeren" title="Browser Standort leeren" onclick="jotClearLocation();" />
-	</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="Bitte warten" title="Bitte warten" style="display: none;" />
-	</div> 
-	<div id="profile-jot-perms" class="profile-jot-perms" style="display: $visitor;" ><img id="jot-perms-icon" src="images/$lockstate_icon.gif"  alt="Berechtigungseinstellungen" title="Berechtigungseinstellungen" onClick="openClose('profile-jot-acl-wrapper'); openClose('profile-jot-email-wrapper'); openClose('profile-jot-networks');" />$bang</div>
-	<div id="profile-jot-perms-end"></div>
-	<div id="profile-jot-email-wrapper" style="display: none;" >
-	<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>
-	</div>
-	<div id="profile-jot-networks" style="display: none;" >
-	$jotnets
-	</div>
-	<div id="profile-jot-networks-end"></div>
-	<div id="profile-jot-acl-wrapper" style="display: none;" >$acl</div>
-</div>
-
-<div id="profile-jot-end"></div>
-</form>
-</div>
diff --git a/view/de/mail_received_html_body_eml.tpl b/view/de/mail_received_html_body_eml.tpl
index 32c5a651a..9d0ecf7ae 100644
--- a/view/de/mail_received_html_body_eml.tpl
+++ b/view/de/mail_received_html_body_eml.tpl
@@ -7,7 +7,7 @@
 <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/ff-32.jpg'><span style="padding:7px;">Friendika</span></td></tr>
+	<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/freindika-32.png'><span style="padding:7px;">Friendika</span></td></tr>
 
 	<tr><td style="padding-top:22px;" colspan="2">Du hast eine neue private Nachricht von '$from' auf '$siteName' erhhalten.</td></tr>
 
diff --git a/view/de/profile_advanced.php b/view/de/profile_advanced.php
index d2b9d0612..ec6eb6e3a 100644
--- a/view/de/profile_advanced.php
+++ b/view/de/profile_advanced.php
@@ -113,7 +113,7 @@ $o .= <<< EOT
 EOT;
 }
 
-if($txt = bbcode($a->profile['about'])) {
+if($txt = prepare_text($a->profile['about'])) {
 $o .= <<< EOT
 <div id="advanced-profile-about-wrapper" >
 <div id="advanced-profile-about-text">About:</div>
@@ -124,7 +124,7 @@ $o .= <<< EOT
 EOT;
 }
 
-if($txt = bbcode($a->profile['interest'])) {
+if($txt = prepare_text($a->profile['interest'])) {
 $o .= <<< EOT
 <div id="advanced-profile-interest-wrapper" >
 <div id="advanced-profile-interest-text">Hobbies/Interests:</div>
@@ -135,7 +135,7 @@ $o .= <<< EOT
 EOT;
 }
 
-if($txt = bbcode($a->profile['contact'])) {
+if($txt = prepare_text($a->profile['contact'])) {
 $o .= <<< EOT
 <div id="advanced-profile-contact-wrapper" >
 <div id="advanced-profile-contact-text">Contact information and Social Networks:</div>
@@ -146,7 +146,7 @@ $o .= <<< EOT
 EOT;
 }
 
-if($txt = bbcode($a->profile['music'])) {
+if($txt = prepare_text($a->profile['music'])) {
 $o .= <<< EOT
 <div id="advanced-profile-music-wrapper" >
 <div id="advanced-profile-music-text">Musical interests:</div>
@@ -157,7 +157,7 @@ $o .= <<< EOT
 EOT;
 }
 
-if($txt = bbcode($a->profile['book'])) {
+if($txt = prepare_text($a->profile['book'])) {
 $o .= <<< EOT
 <div id="advanced-profile-book-wrapper" >
 <div id="advanced-profile-book-text">Books, literature:</div>
@@ -168,7 +168,7 @@ $o .= <<< EOT
 EOT;
 }
 
-if($txt = bbcode($a->profile['tv'])) {
+if($txt = prepare_text($a->profile['tv'])) {
 $o .= <<< EOT
 <div id="advanced-profile-tv-wrapper" >
 <div id="advanced-profile-tv-text">Television:</div>
@@ -179,7 +179,7 @@ $o .= <<< EOT
 EOT;
 }
 
-if($txt = bbcode($a->profile['film'])) {
+if($txt = prepare_text($a->profile['film'])) {
 $o .= <<< EOT
 <div id="advanced-profile-film-wrapper" >
 <div id="advanced-profile-film-text">Film/dance/culture/entertainment:</div>
@@ -190,7 +190,7 @@ $o .= <<< EOT
 EOT;
 }
 
-if($txt = bbcode($a->profile['romance'])) {
+if($txt = prepare_text($a->profile['romance'])) {
 $o .= <<< EOT
 <div id="advanced-profile-romance-wrapper" >
 <div id="advanced-profile-romance-text">Love/romance:</div>
@@ -201,7 +201,7 @@ $o .= <<< EOT
 EOT;
 }
 
-if($txt = bbcode($a->profile['work'])) {
+if($txt = prepare_text($a->profile['work'])) {
 $o .= <<< EOT
 <div id="advanced-profile-work-wrapper" >
 <div id="advanced-profile-work-text">Work/employment:</div>
@@ -212,7 +212,7 @@ $o .= <<< EOT
 EOT;
 }
 
-if($txt = bbcode($a->profile['education'])) {
+if($txt = prepare_text($a->profile['education'])) {
 $o .= <<< EOT
 <div id="advanced-profile-education-wrapper" >
 <div id="advanced-profile-education-text">School/education:</div>
diff --git a/view/de/strings.php b/view/de/strings.php
index 4d291d544..002749df9 100644
--- a/view/de/strings.php
+++ b/view/de/strings.php
@@ -263,6 +263,11 @@ $a->strings['Delete message'] = 'Nachricht löschen';
 $a->strings['Send Reply'] = 'Antwort senden';
 $a->strings['Normal View'] = 'Normale Ansicht';
 $a->strings['New Item View'] = 'Neue Einträge';
+$a->strings['Share'] = 'Share';
+$a->strings['Insert YouTube video'] = 'YouTube Video einfügen';
+$a->strings['Set your location'] = 'Deinen Standort festlegen';
+$a->strings['Clear browser location'] = 'Browser Standort leeren';
+$a->strings['Permission settings'] = 'Berechtigungseinstellungen';
 $a->strings['CC: email addresses'] = 'CC: EMail Addresse';
 $a->strings['Example: bob@example.com, mary@example.com'] = 'Z.B.: bob@example.com, mary@example.com';
 $a->strings['No such group'] = 'Es gibt keine solche Gruppe';
diff --git a/view/en/head.tpl b/view/en/head.tpl
index ce141b251..8f97a11e5 100644
--- a/view/en/head.tpl
+++ b/view/en/head.tpl
@@ -2,7 +2,7 @@
 <base href="$baseurl" />
 <meta name="generator" content="$generator" />
 <link rel="stylesheet" type="text/css" href="$stylesheet" media="all" />
-<link rel="shortcut icon" href="$baseurl/images/ff-32.jpg" />
+<link rel="shortcut icon" href="$baseurl/images/friendika-32.png" />
 
 <!--[if IE]>
 <script type="text/javascript" src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
diff --git a/view/en/mail_received_html_body_eml.tpl b/view/en/mail_received_html_body_eml.tpl
index 56cbf1d7c..6b7eb8873 100644
--- a/view/en/mail_received_html_body_eml.tpl
+++ b/view/en/mail_received_html_body_eml.tpl
@@ -7,7 +7,7 @@
 <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/ff-32.jpg'><span style="padding:7px;">Friendika</span></td></tr>
+	<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;">Friendika</span></td></tr>
 
 	<tr><td style="padding-top:22px;" colspan="2">$from sent you a new private message at $siteName.</td></tr>
 
diff --git a/view/en/profile_advanced.php b/view/en/profile_advanced.php
index d2b9d0612..6d2ecba4d 100644
--- a/view/en/profile_advanced.php
+++ b/view/en/profile_advanced.php
@@ -112,8 +112,7 @@ $o .= <<< EOT
 <div id="advanced-profile-religion-end"></div>
 EOT;
 }
-
-if($txt = bbcode($a->profile['about'])) {
+if($txt = prepare_text($a->profile['about'])) {
 $o .= <<< EOT
 <div id="advanced-profile-about-wrapper" >
 <div id="advanced-profile-about-text">About:</div>
@@ -124,7 +123,7 @@ $o .= <<< EOT
 EOT;
 }
 
-if($txt = bbcode($a->profile['interest'])) {
+if($txt = prepare_text($a->profile['interest'])) {
 $o .= <<< EOT
 <div id="advanced-profile-interest-wrapper" >
 <div id="advanced-profile-interest-text">Hobbies/Interests:</div>
@@ -135,7 +134,7 @@ $o .= <<< EOT
 EOT;
 }
 
-if($txt = bbcode($a->profile['contact'])) {
+if($txt = prepare_text($a->profile['contact'])) {
 $o .= <<< EOT
 <div id="advanced-profile-contact-wrapper" >
 <div id="advanced-profile-contact-text">Contact information and Social Networks:</div>
@@ -146,7 +145,7 @@ $o .= <<< EOT
 EOT;
 }
 
-if($txt = bbcode($a->profile['music'])) {
+if($txt = prepare_text($a->profile['music'])) {
 $o .= <<< EOT
 <div id="advanced-profile-music-wrapper" >
 <div id="advanced-profile-music-text">Musical interests:</div>
@@ -157,7 +156,7 @@ $o .= <<< EOT
 EOT;
 }
 
-if($txt = bbcode($a->profile['book'])) {
+if($txt = prepare_text($a->profile['book'])) {
 $o .= <<< EOT
 <div id="advanced-profile-book-wrapper" >
 <div id="advanced-profile-book-text">Books, literature:</div>
@@ -168,7 +167,7 @@ $o .= <<< EOT
 EOT;
 }
 
-if($txt = bbcode($a->profile['tv'])) {
+if($txt = prepare_text($a->profile['tv'])) {
 $o .= <<< EOT
 <div id="advanced-profile-tv-wrapper" >
 <div id="advanced-profile-tv-text">Television:</div>
@@ -179,7 +178,7 @@ $o .= <<< EOT
 EOT;
 }
 
-if($txt = bbcode($a->profile['film'])) {
+if($txt = prepare_text($a->profile['film'])) {
 $o .= <<< EOT
 <div id="advanced-profile-film-wrapper" >
 <div id="advanced-profile-film-text">Film/dance/culture/entertainment:</div>
@@ -190,7 +189,7 @@ $o .= <<< EOT
 EOT;
 }
 
-if($txt = bbcode($a->profile['romance'])) {
+if($txt = prepare_text($a->profile['romance'])) {
 $o .= <<< EOT
 <div id="advanced-profile-romance-wrapper" >
 <div id="advanced-profile-romance-text">Love/romance:</div>
@@ -201,7 +200,7 @@ $o .= <<< EOT
 EOT;
 }
 
-if($txt = bbcode($a->profile['work'])) {
+if($txt = prepare_text($a->profile['work'])) {
 $o .= <<< EOT
 <div id="advanced-profile-work-wrapper" >
 <div id="advanced-profile-work-text">Work/employment:</div>
@@ -212,7 +211,7 @@ $o .= <<< EOT
 EOT;
 }
 
-if($txt = bbcode($a->profile['education'])) {
+if($txt = prepare_text($a->profile['education'])) {
 $o .= <<< EOT
 <div id="advanced-profile-education-wrapper" >
 <div id="advanced-profile-education-text">School/education:</div>
diff --git a/view/fr/head.tpl b/view/fr/head.tpl
index 75da8a924..4636b542c 100644
--- a/view/fr/head.tpl
+++ b/view/fr/head.tpl
@@ -2,7 +2,7 @@
 <base href="$baseurl" />
 <meta name="generator" content="$generator" />
 <link rel="stylesheet" type="text/css" href="$stylesheet" media="all" />
-<link rel="shortcut icon" href="$baseurl/images/ff-32.jpg" />
+<link rel="shortcut icon" href="$baseurl/images/friendika-32.png" />
 
 <!--[if IE]>
 <script type="text/javascript" src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
diff --git a/view/fr/jot.tpl b/view/fr/jot.tpl
deleted file mode 100644
index d64632da0..000000000
--- a/view/fr/jot.tpl
+++ /dev/null
@@ -1,60 +0,0 @@
-
-<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="item" method="post" >
-		<input type="hidden" name="type" value="wall" />
-		<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="" />
-
-		<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" ></textarea>
-
-
-
-<div id="profile-jot-submit-wrapper" >
-<input type="submit" id="profile-jot-submit" name="submit" value="Share" />
-	<div id="profile-upload-wrapper" style="display: $visitor;" >
-		<div id="wall-image-upload-div" ><img id="wall-image-upload" src="images/camera-icon.gif" alt="Upload Photo" title="Upload Photo"  /></div>
-	</div> 
-	<div id="profile-link-wrapper" style="display: $visitor;" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" >
-		<img id="profile-link" src="images/link-icon.gif" alt="Insert web link" title="Insert web link" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink();" />
-	</div> 
-	<div id="profile-youtube-wrapper" style="display: $visitor;" >
-		<img id="profile-video" src="images/youtube_icon.gif" alt="Insert YouTube video" title="Insert YouTube video" onclick="jotGetVideo();" />
-	</div> 
-	<div id="profile-location-wrapper" style="display: $visitor;" >
-		<img id="profile-location" src="images/globe.gif" alt="Set your location" title="Set your location" onclick="jotGetLocation();" />
-	</div> 
-	<div id="profile-nolocation-wrapper" style="display: none;" >
-		<img id="profile-nolocation" src="images/noglobe.gif" alt="Clear Browser Location" title="Clear Browser Location" onclick="jotClearLocation();" />
-	</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="Please wait" title="Please wait" style="display: none;" />
-	</div> 
-	<div id="profile-jot-perms" class="profile-jot-perms" style="display: $visitor;" ><img id="jot-perms-icon" src="images/$lockstate_icon.gif"  alt="Permission Settings" title="Permission Settings" onClick="openClose('profile-jot-acl-wrapper'); openClose('profile-jot-email-wrapper'); openClose('profile-jot-networks');" />$bang</div>
-	<div id="profile-jot-perms-end"></div>
-	<div id="profile-jot-email-wrapper" style="display: none;" >
-	<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>
-	</div>
-	<div id="profile-jot-networks" style="display: none;" >
-	$jotnets
-	</div>
-	<div id="profile-jot-networks-end"></div>
-	<div id="profile-jot-acl-wrapper" style="display: none;" >$acl</div>
-</div>
-
-<div id="profile-jot-end"></div>
-</form>
-</div>
diff --git a/view/fr/mail_received_html_body_eml.tpl b/view/fr/mail_received_html_body_eml.tpl
index d60bbe70c..55e8b8a73 100644
--- a/view/fr/mail_received_html_body_eml.tpl
+++ b/view/fr/mail_received_html_body_eml.tpl
@@ -7,7 +7,7 @@
 <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/ff-32.jpg'><span style="padding:7px;">Friendika</span></td></tr>
+	<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;">Friendika</span></td></tr>
 
 	<tr><td style="padding-top:22px;" colspan="2">$from t'a envoyŽ un message ˆ $siteName.</td></tr>
 
diff --git a/view/fr/profile_advanced.php b/view/fr/profile_advanced.php
index f2c891383..73f7f135e 100644
--- a/view/fr/profile_advanced.php
+++ b/view/fr/profile_advanced.php
@@ -113,7 +113,7 @@ $o .= <<< EOT
 EOT;
 }
 
-if($txt = bbcode($a->profile['about'])) {
+if($txt = prepare_text($a->profile['about'])) {
 $o .= <<< EOT
 <div id="advanced-profile-about-wrapper" >
 <div id="advanced-profile-about-text">About:</div>
@@ -124,7 +124,7 @@ $o .= <<< EOT
 EOT;
 }
 
-if($txt = bbcode($a->profile['interest'])) {
+if($txt = prepare_text($a->profile['interest'])) {
 $o .= <<< EOT
 <div id="advanced-profile-interest-wrapper" >
 <div id="advanced-profile-interest-text">Hobbies/Interests:</div>
@@ -135,7 +135,7 @@ $o .= <<< EOT
 EOT;
 }
 
-if($txt = bbcode($a->profile['contact'])) {
+if($txt = prepare_text($a->profile['contact'])) {
 $o .= <<< EOT
 <div id="advanced-profile-contact-wrapper" >
 <div id="advanced-profile-contact-text">Contact information and Social Networks:</div>
@@ -146,7 +146,7 @@ $o .= <<< EOT
 EOT;
 }
 
-if($txt = bbcode($a->profile['music'])) {
+if($txt = prepare_text($a->profile['music'])) {
 $o .= <<< EOT
 <div id="advanced-profile-music-wrapper" >
 <div id="advanced-profile-music-text">Musical interests:</div>
@@ -157,7 +157,7 @@ $o .= <<< EOT
 EOT;
 }
 
-if($txt = bbcode($a->profile['book'])) {
+if($txt = prepare_text($a->profile['book'])) {
 $o .= <<< EOT
 <div id="advanced-profile-book-wrapper" >
 <div id="advanced-profile-book-text">Books, literature:</div>
@@ -168,7 +168,7 @@ $o .= <<< EOT
 EOT;
 }
 
-if($txt = bbcode($a->profile['tv'])) {
+if($txt = prepare_text($a->profile['tv'])) {
 $o .= <<< EOT
 <div id="advanced-profile-tv-wrapper" >
 <div id="advanced-profile-tv-text">Television:</div>
@@ -179,7 +179,7 @@ $o .= <<< EOT
 EOT;
 }
 
-if($txt = bbcode($a->profile['film'])) {
+if($txt = prepare_text($a->profile['film'])) {
 $o .= <<< EOT
 <div id="advanced-profile-film-wrapper" >
 <div id="advanced-profile-film-text">Film/dance/culture/entertainment:</div>
@@ -190,7 +190,7 @@ $o .= <<< EOT
 EOT;
 }
 
-if($txt = bbcode($a->profile['romance'])) {
+if($txt = prepare_text($a->profile['romance'])) {
 $o .= <<< EOT
 <div id="advanced-profile-romance-wrapper" >
 <div id="advanced-profile-romance-text">Love/romance:</div>
@@ -201,7 +201,7 @@ $o .= <<< EOT
 EOT;
 }
 
-if($txt = bbcode($a->profile['work'])) {
+if($txt = prepare_text($a->profile['work'])) {
 $o .= <<< EOT
 <div id="advanced-profile-work-wrapper" >
 <div id="advanced-profile-work-text">Work/employment:</div>
@@ -212,7 +212,7 @@ $o .= <<< EOT
 EOT;
 }
 
-if($txt = bbcode($a->profile['education'])) {
+if($txt = prepare_text($a->profile['education'])) {
 $o .= <<< EOT
 <div id="advanced-profile-education-wrapper" >
 <div id="advanced-profile-education-text">School/education:</div>
diff --git a/view/fr/strings.php b/view/fr/strings.php
index 9115af770..a4704b289 100644
--- a/view/fr/strings.php
+++ b/view/fr/strings.php
@@ -250,6 +250,11 @@ $a->strings['Delete message'] = 'Effacer message';
 $a->strings['Send Reply'] = 'Répondre';
 $a->strings['Normal View'] = 'Vue normale';
 $a->strings['New Item View'] = 'Vue des nouveautés';
+$a->strings['Share'] = 'Share';
+$a->strings['Insert YouTube video'] = 'Insert YouTube video';
+$a->strings['Set your location'] = 'Set your location';
+$a->strings['Clear browser location'] = 'Clear browser location';
+$a->strings['Permission settings'] = 'Permission settings';
 $a->strings['No such group'] = 'Groupe inexistant';
 $a->strings['Group is empty'] = 'Groupe vide';
 $a->strings['Group: '] = 'Groupe: ';
diff --git a/view/it/head.tpl b/view/it/head.tpl
index 071c8fa91..8e4e0ccd7 100644
--- a/view/it/head.tpl
+++ b/view/it/head.tpl
@@ -2,7 +2,7 @@
 <base href="$baseurl" />
 <meta name="generator" content="$generator" />
 <link rel="stylesheet" type="text/css" href="$stylesheet" media="all" />
-<link rel="shortcut icon" href="$baseurl/images/ff-32.jpg" />
+<link rel="shortcut icon" href="$baseurl/images/friendika-32.png" />
 
 <!--[if IE]>
 <script type="text/javascript" src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
diff --git a/view/it/jot.tpl b/view/it/jot.tpl
deleted file mode 100644
index c4b63eb01..000000000
--- a/view/it/jot.tpl
+++ /dev/null
@@ -1,61 +0,0 @@
-
-<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="item" method="post" >
-		<input type="hidden" name="type" value="wall" />
-		<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="" />
-
-		<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" ></textarea>
-
-
-<div id="profile-jot-submit-wrapper" >
-<input type="submit" id="profile-jot-submit" name="submit" value="Condividi" />
-	<div id="profile-upload-wrapper" style="display: $visitor;" >
-		<div id="wall-image-upload-div" ><img id="wall-image-upload" src="images/camera-icon.gif" alt="Carica foto" title="Carica foto"  /></div>
-	</div> 
-	<div id="profile-link-wrapper" style="display: $visitor;" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" >
-		<img id="profile-link" src="images/link-icon.gif" alt="Inserisci collegamento" title="Inserisci collegamento" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink();" />
-	</div> 
-	<div id="profile-youtube-wrapper" style="display: $visitor;" >
-		<img id="profile-video" src="images/youtube_icon.gif" alt="Inserisci video da YouTube" title="Inserisci video da YouTube" onclick="jotGetVideo();" />
-	</div> 
-	<div id="profile-location-wrapper" style="display: $visitor;" >
-		<img id="profile-location" src="images/globe.gif" alt="Imposta la tua posizione" title="Imposta la tua posizione" onclick="jotGetLocation();" />
-	</div> 
-	<div id="profile-nolocation-wrapper" style="display: none;" >
-		<img id="profile-nolocation" src="images/noglobe.gif" alt="Cancella la tua posizione data dal browser" title="Cancella la tua posizione data dal browser" onclick="jotClearLocation();" />
-	</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="Attendi" title="Attendi" style="display: none;" />
-	</div> 
-	<div id="profile-jot-perms" class="profile-jot-perms" style="display: $visitor;" ><img id="jot-perms-icon" src="images/$lockstate_icon.gif"  alt="Impostazione permessi" title="Impostazione permessi" onClick="openClose('profile-jot-acl-wrapper'); openClose('profile-jot-email-wrapper'); openClose('profile-jot-networks');" />$bang</div>
-	<div id="profile-jot-perms-end"></div>
-	<div id="profile-jot-email-wrapper" style="display: none;" >
-	<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>
-	</div>
-	<div id="profile-jot-networks" style="display: none;" >
-	$jotnets
-	</div>
-	<div id="profile-jot-networks-end"></div>
-	<div id="profile-jot-acl-wrapper" style="display: none;" >$acl</div>
-</div>
-
-
-
-<div id="profile-jot-end"></div>
-</form>
-</div>
diff --git a/view/it/mail_received_html_body_eml.tpl b/view/it/mail_received_html_body_eml.tpl
index 7510f2b30..847954550 100644
--- a/view/it/mail_received_html_body_eml.tpl
+++ b/view/it/mail_received_html_body_eml.tpl
@@ -7,7 +7,7 @@
 <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/ff-32.jpg'><span style="padding:7px;">Friendika</span></td></tr>
+	<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;">Friendika</span></td></tr>
 
 	<tr><td style="padding-top:22px;" colspan="2">Hai ricevuto un nuovo messsaggio privato su $siteName da '$from'.</td></tr>
 
diff --git a/view/it/profile_advanced.php b/view/it/profile_advanced.php
index 44327f6a6..fe065d46f 100644
--- a/view/it/profile_advanced.php
+++ b/view/it/profile_advanced.php
@@ -113,7 +113,7 @@ $o .= <<< EOT
 EOT;
 }
 
-if($txt = bbcode($a->profile['about'])) {
+if($txt = prepare_text($a->profile['about'])) {
 $o .= <<< EOT
 <div id="advanced-profile-about-wrapper" >
 <div id="advanced-profile-about-text">Informazioni varie:</div>
@@ -124,7 +124,7 @@ $o .= <<< EOT
 EOT;
 }
 
-if($txt = bbcode($a->profile['interest'])) {
+if($txt = prepare_text($a->profile['interest'])) {
 $o .= <<< EOT
 <div id="advanced-profile-interest-wrapper" >
 <div id="advanced-profile-interest-text">Hobbie/Interessi:</div>
@@ -135,7 +135,7 @@ $o .= <<< EOT
 EOT;
 }
 
-if($txt = bbcode($a->profile['contact'])) {
+if($txt = prepare_text($a->profile['contact'])) {
 $o .= <<< EOT
 <div id="advanced-profile-contact-wrapper" >
 <div id="advanced-profile-contact-text">Informazioni su contatti e Social Networks:</div>
@@ -146,7 +146,7 @@ $o .= <<< EOT
 EOT;
 }
 
-if($txt = bbcode($a->profile['music'])) {
+if($txt = prepare_text($a->profile['music'])) {
 $o .= <<< EOT
 <div id="advanced-profile-music-wrapper" >
 <div id="advanced-profile-music-text">Interessi musicali:</div>
@@ -157,7 +157,7 @@ $o .= <<< EOT
 EOT;
 }
 
-if($txt = bbcode($a->profile['book'])) {
+if($txt = prepare_text($a->profile['book'])) {
 $o .= <<< EOT
 <div id="advanced-profile-book-wrapper" >
 <div id="advanced-profile-book-text">Libri, letteratura:</div>
@@ -168,7 +168,7 @@ $o .= <<< EOT
 EOT;
 }
 
-if($txt = bbcode($a->profile['tv'])) {
+if($txt = prepare_text($a->profile['tv'])) {
 $o .= <<< EOT
 <div id="advanced-profile-tv-wrapper" >
 <div id="advanced-profile-tv-text">Televisione:</div>
@@ -179,7 +179,7 @@ $o .= <<< EOT
 EOT;
 }
 
-if($txt = bbcode($a->profile['film'])) {
+if($txt = prepare_text($a->profile['film'])) {
 $o .= <<< EOT
 <div id="advanced-profile-film-wrapper" >
 <div id="advanced-profile-film-text">Film/danza/cultura/intrattenimento:</div>
@@ -190,7 +190,7 @@ $o .= <<< EOT
 EOT;
 }
 
-if($txt = bbcode($a->profile['romance'])) {
+if($txt = prepare_text($a->profile['romance'])) {
 $o .= <<< EOT
 <div id="advanced-profile-romance-wrapper" >
 <div id="advanced-profile-romance-text">Amore/romanticismo:</div>
@@ -201,7 +201,7 @@ $o .= <<< EOT
 EOT;
 }
 
-if($txt = bbcode($a->profile['work'])) {
+if($txt = prepare_text($a->profile['work'])) {
 $o .= <<< EOT
 <div id="advanced-profile-work-wrapper" >
 <div id="advanced-profile-work-text">Lavoro/impiego:</div>
@@ -212,7 +212,7 @@ $o .= <<< EOT
 EOT;
 }
 
-if($txt = bbcode($a->profile['education'])) {
+if($txt = prepare_text($a->profile['education'])) {
 $o .= <<< EOT
 <div id="advanced-profile-education-wrapper" >
 <div id="advanced-profile-education-text">Scuola/educazione:</div>
diff --git a/view/it/strings.php b/view/it/strings.php
index 7f4b3eddd..25439d8d5 100644
--- a/view/it/strings.php
+++ b/view/it/strings.php
@@ -1038,6 +1038,11 @@ $a->strings['Invalid OpenID url'] = 'Url OpenID non valido';
 $a->strings['Cannot use that email.'] = 'Questa email non si puo\' usare.';
 $a->strings['Normal View'] = 'Vista normale';
 $a->strings['New Item View'] = 'Vista Nuovi Elementi';
+$a->strings['Share'] = 'Condividi';
+$a->strings['Insert YouTube video'] = 'Inserisci video da YouTube';
+$a->strings['Set your location'] = 'Imposta la tua posizione';
+$a->strings['Clear browser location'] = 'Cancella la tua posizione data dal browser';
+$a->strings['Permission settings'] = 'Impostazione permessi';
 $a->strings[' Cannot change to that email.'] = 'Non puoi cambiare a quella email.';
 $a->strings['Birthday:'] = 'Compleanno:';
 $a->strings['Update now'] = 'Aggiorna adesso';
diff --git a/view/en/jot.tpl b/view/jot.tpl
index 7c6a857e8..68139ddc0 100644
--- a/view/en/jot.tpl
+++ b/view/jot.tpl
@@ -6,41 +6,42 @@
 	</div>
 	<div id="profile-jot-banner-end"></div>
 
-	<form id="profile-jot-form" action="item" method="post" >
+	<form id="profile-jot-form" action="$action" method="post" >
 		<input type="hidden" name="type" value="wall" />
 		<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" />
 
-		<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" ></textarea>
+		<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" >$content</textarea>
 
 
 <div id="profile-jot-submit-wrapper" >
-<input type="submit" id="profile-jot-submit" name="submit" value="Share" />
+<input type="submit" id="profile-jot-submit" name="submit" value="$share" />
 	<div id="profile-upload-wrapper" style="display: $visitor;" >
-		<div id="wall-image-upload-div" ><img id="wall-image-upload" src="images/camera-icon.gif" alt="Upload Photo" title="Upload Photo"  /></div>
+		<div id="wall-image-upload-div" ><img id="wall-image-upload" src="images/camera-icon.gif" alt="$upload" title="$upload" /></div>
 	</div> 
 	<div id="profile-link-wrapper" style="display: $visitor;" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" >
-		<img id="profile-link" src="images/link-icon.gif" alt="Insert web link" title="Insert web link" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink();" />
+		<img id="profile-link" src="images/link-icon.gif" alt="$weblink" title="$weblink" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink();" />
 	</div> 
 	<div id="profile-youtube-wrapper" style="display: $visitor;" >
-		<img id="profile-video" src="images/youtube_icon.gif" alt="Insert YouTube video" title="Insert YouTube video" onclick="jotGetVideo();" />
+		<img id="profile-video" src="images/youtube_icon.gif" alt="$youtube" title="$youtube" onclick="jotGetVideo();" />
 	</div> 
 	<div id="profile-location-wrapper" style="display: $visitor;" >
-		<img id="profile-location" src="images/globe.gif" alt="Set your location" title="Set your location" onclick="jotGetLocation();" />
+		<img id="profile-location" src="images/globe.gif" alt="$setloc" title="$setloc" onclick="jotGetLocation();" />
 	</div> 
 	<div id="profile-nolocation-wrapper" style="display: none;" >
-		<img id="profile-nolocation" src="images/noglobe.gif" alt="Clear Browser Location" title="Clear Browser Location" onclick="jotClearLocation();" />
+		<img id="profile-nolocation" src="images/noglobe.gif" alt="$noloc" title="$noloc" onclick="jotClearLocation();" />
 	</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="Please wait" title="Please wait" style="display: none;" />
+		<img id="profile-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
 	</div> 
-	<div id="profile-jot-perms" class="profile-jot-perms" style="display: $visitor;" ><img id="jot-perms-icon" src="images/$lockstate_icon.gif"  alt="Permission Settings" title="Permission Settings" onClick="openClose('profile-jot-acl-wrapper'); openClose('profile-jot-email-wrapper'); openClose('profile-jot-networks');" />$bang</div>
+	<div id="profile-jot-perms" class="profile-jot-perms" style="display: $visitor;" ><img id="jot-perms-icon" src="images/$lockstate_icon.gif"  alt="$permset" title="$permset" onClick="openClose('profile-jot-acl-wrapper'); openClose('profile-jot-email-wrapper'); openClose('profile-jot-networks');" />$bang</div>
 	<div id="profile-jot-perms-end"></div>
 	<div id="profile-jot-email-wrapper" style="display: none;" >
 	<div id="profile-jot-email-label">$emailcc</div><input type="text" name="emailcc" id="profile-jot-email" title="$emtitle">
diff --git a/view/register.tpl b/view/register.tpl
index 3f57994ed..131460828 100644
--- a/view/register.tpl
+++ b/view/register.tpl
@@ -6,6 +6,7 @@
 
 	$registertext
 
+	<p id="register-realpeople">$realpeople</p>
 
 	<p id="register-fill-desc">$fillwith</p>
 	<p id="register-fill-ext">$fillext</p>
diff --git a/view/theme/duepuntozero/friendika-16.png b/view/theme/duepuntozero/friendika-16.png
new file mode 100644
index 000000000..1a742ecdc
--- /dev/null
+++ b/view/theme/duepuntozero/friendika-16.png
diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css
index 158649933..bfe524b01 100644
--- a/view/theme/duepuntozero/style.css
+++ b/view/theme/duepuntozero/style.css
@@ -91,12 +91,13 @@ nav #site-location {
 
 nav #banner {
 	display: block;
-    padding-top: 10px;
+    padding-top: 14px;
 	position: absolute;
 }
 nav #banner #logo-text a {
-	font-size: 44px;
+	font-size: 40px;
 	font-weight: bold;
+	margin-left: 3px;
  	color: #000000;
 
 }
@@ -318,7 +319,7 @@ div.wall-item-content-wrapper.shiny {
 
 input#dfrn-url {
 	float: left;
-	background: url(ff-16.jpg) no-repeat;
+	background: url(friendika-16.png) no-repeat;
 	background-position: 2px center;
 	font-size: 17px;
 	padding-left: 21px;
diff --git a/view/theme/loozah/friendika-16.png b/view/theme/loozah/friendika-16.png
new file mode 100644
index 000000000..1a742ecdc
--- /dev/null
+++ b/view/theme/loozah/friendika-16.png
diff --git a/view/theme/loozah/style.css b/view/theme/loozah/style.css
index 902e71be8..662df2528 100644
--- a/view/theme/loozah/style.css
+++ b/view/theme/loozah/style.css
@@ -452,7 +452,7 @@ nav {
 
 input#dfrn-url {
 	float: left;
-	background: url(ff-16.jpg) no-repeat;
+	background: url(friendika-16.png) no-repeat;
 	background-position: 2px center;
 	font-size: 17px;
 	padding-left: 21px;