Merge remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master: (23 commits) modified: view/theme/smoothly/style.css modified: view/theme/smoothly/css/typography.css modified: view/theme/smoothly/style.css modified: view/theme/smoothly/theme.php Diabook - a bit more cleanup, plus mark as experimental (there's so much heavy lifting, things are bound to break). Diabook - first part of clean-up to make the theme maintainable. modified: view/theme/smoothly/css/typography.css modified: view/theme/smoothly/style.css modified: view/theme/smoothly/profile_vcard.tpl modified: view/theme/smoothly/style.css modified: view/theme/smoothly/theme.php new file: view/theme/smoothly/vcard-widget.tpl rev update modified: view/theme/smoothly/css/typography.css modified: view/theme/smoothly/style.css modified: view/theme/smoothly/default.php modified: view/theme/smoothly/nav.tpl modified: view/theme/smoothly/style.css new file: view/theme/smoothly/tobottom.png modified: view/theme/smoothly/style.css modified: view/theme/smoothly/theme.php IT: update to the strings DE: update to the strings new file: view/theme/smoothly/css/typography.css modified: view/theme/smoothly/style.css modified: view/theme/smoothly/theme.php DarkZero - no changes, just move things around to sort by where on a page they apply to in order to (hopefully) make a bit more sense to anyone maintaining it who isn't me. Friendicaland undefined fn: init_groups_visitor in mod_profile, rev update Diabook - remove redundant TPL to bring back all admin settings CS: update to the strings ES: update to the strings FR: update to the strings ...
2012-10-24 05:41:11 -04:00 · 2012-10-24 05:41:11 -04:00 · cf42b6f78d
commit cf42b6f78d
parent 6ee4e4a93d cc59cb2755
97 changed files with 7226 additions and 4450 deletions
--- a/boot.php
+++ b/boot.php
@ -11,7 +11,7 @@ require_once('include/cache.php');
 require_once('library/Mobile_Detect/Mobile_Detect.php');

 define ( 'FRIENDICA_PLATFORM',     'Friendica');
-define ( 'FRIENDICA_VERSION',      '3.0.1499' );
+define ( 'FRIENDICA_VERSION',      '3.0.1504' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
 define ( 'DB_UPDATE_VERSION',      1156      );

--- a/htconfig.php
+++ b/htconfig.php
@ -54,8 +54,8 @@ $a->config['php_path'] = 'php';
 // You shouldn't need to change anything else.
 // 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=';
+$a->config['system']['directory_submit_url'] = 'http://dir.friendica.com/submit';
+$a->config['system']['directory_search_url'] = 'http://dir.friendica.com/directory?search=';

 // PuSH - aka pubsubhubbub URL. This makes delivery of public posts as fast as private posts

--- a/images/friendika-128.jpg
+++ b/images/friendika-128.jpg
--- a/images/friendika-128.png
+++ b/images/friendika-128.png
--- a/images/friendika-16.jpg
+++ b/images/friendika-16.jpg
--- a/images/friendika-16.png
+++ b/images/friendika-16.png
--- a/images/friendika-1600.png
+++ b/images/friendika-1600.png
--- a/images/friendika-256.jpg
+++ b/images/friendika-256.jpg
--- a/images/friendika-256.png
+++ b/images/friendika-256.png
--- a/images/friendika-32.jpg
+++ b/images/friendika-32.jpg
--- a/images/friendika-32.png
+++ b/images/friendika-32.png
--- a/images/friendika-48.png
+++ b/images/friendika-48.png
--- a/images/friendika-64.jpg
+++ b/images/friendika-64.jpg
--- a/images/friendika-64.png
+++ b/images/friendika-64.png
--- a/images/friendika-96.png
+++ b/images/friendika-96.png
--- a/images/friendika.svg
+++ b/images/friendika.svg
@ -1,240 +0,0 @@
-<?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"
-   width="96"
-   height="96"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.0 r9654"
-   sodipodi:docname="friendika.svg"
-   inkscape:export-filename="/home/meta/Documents/My random images/friendika.png"
-   inkscape:export-xdpi="80.552788"
-   inkscape:export-ydpi="80.552788">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="highlightgradient">
-      <stop
-         id="stop3833"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.74374998;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop3829" />
-    </linearGradient>
-    <linearGradient
-       id="shadowgradient">
-      <stop
-         id="stop3833-5"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.5;" />
-      <stop
-         style="stop-color:#818080;stop-opacity:0;"
-         offset="1"
-         id="stop3829-9" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#highlightgradient"
-       id="linearGradient4011"
-       x1="44.948269"
-       y1="0"
-       x2="54.103466"
-       y2="46.797421"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="scale(1,0.54545455)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#shadowgradient"
-       id="linearGradient4021"
-       x1="52.016712"
-       y1="96"
-       x2="42.867535"
-       y2="41.837971"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.5,0,48)" />
-    <filter
-       inkscape:collect="always"
-       id="filter4055"
-       x="-0.03"
-       width="1.06"
-       y="-0.12"
-       height="1.24">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="1.2"
-         id="feGaussianBlur4057" />
-    </filter>
-    <filter
-       inkscape:collect="always"
-       id="filter4059"
-       x="-0.029877551"
-       width="1.0597551"
-       y="-0.122"
-       height="1.244">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="1.22"
-         id="feGaussianBlur4061" />
-    </filter>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="2.9132799"
-     inkscape:cx="53.033009"
-     inkscape:cy="2.8284271"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     width="256px"
-     inkscape:snap-global="true"
-     inkscape:window-width="1680"
-     inkscape:window-height="1010"
-     inkscape:window-x="194"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="3"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       spacingx="2px"
-       spacingy="2px" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Colors"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-956.3622)"
-     style="display:inline">
-    <path
-       style="fill:#ffc019;fill-opacity:1;stroke:none"
-       d="M 16,0 C 7.0091019,0.04308252 0,7.0521845 0,16 0,16 0,57.499123 0,80 0,89.120146 7.0091019,96 16,96 L 32,96 32,70 64,70 63.916016,46.068359 32,46.236328 32,26 64,26 64,0 C 64,0 24,0 16,0 z"
-       transform="translate(0,956.3622)"
-       id="rect2993"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccsccccccccc" />
-    <path
-       style="fill:#1872a2;fill-opacity:1;stroke:none"
-       d="m 80,1052.3622 c 8.990898,0 16.086165,-6.966 16,-16 0,0 0,-41.4991 0,-64 0.07767,-9.01639 -7.067354,-16 -16,-16 l -16,0 0,26 -32,0 0,22 32,0 0,22 -32,0 0,26 c 0,0 32,0 48,0 z"
-       id="rect2993-6"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccsccccccccc" />
-  </g>
-  <g
-     style="display:inline"
-     inkscape:label="Lines as original logo"
-     id="g3997"
-     inkscape:groupmode="layer">
-    <path
-       sodipodi:nodetypes="cccccccc"
-       inkscape:connector-curvature="0"
-       id="path3999"
-       d="m 64,0 0,26 -32,0 0,22 m 32,0 0,22 -32,0 0,26"
-       style="fill:none;stroke:#000000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-    <rect
-       ry="16"
-       rx="16"
-       y="0"
-       x="0"
-       height="96"
-       width="96"
-       id="rect4001"
-       style="fill:none;stroke:#000000;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="Lines with center break"
-     style="display:none">
-    <path
-       style="fill:none;stroke:#000000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 64,0 0,26 -32,0 0,22 32,0 0,22 -32,0 0,26"
-       id="path3926"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccccc" />
-    <rect
-       style="fill:none;stroke:#000000;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       id="rect3928"
-       width="96"
-       height="96"
-       x="0"
-       y="0"
-       rx="16"
-       ry="16" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Effects"
-     style="display:inline">
-    <rect
-       style="fill:url(#linearGradient3930);fill-opacity:1;stroke:none"
-       id="rect3823"
-       width="96"
-       height="48.04369"
-       x="-3.1086245e-15"
-       y="1.8024861e-14"
-       ry="15.215644"
-       rx="15.214664" />
-    <rect
-       style="fill:url(#linearGradient3904);fill-opacity:1;stroke:none"
-       id="rect3823-8"
-       width="96"
-       height="47.86721"
-       x="1.5376101e-14"
-       y="-96"
-       ry="15.159752"
-       rx="15.214664"
-       transform="scale(1,-1)" />
-    <rect
-       style="fill:url(#linearGradient4011);fill-opacity:1;stroke:none;filter:url(#filter4059)"
-       id="rect4003"
-       width="98"
-       height="24"
-       x="0"
-       y="0"
-       rx="15.214664"
-       ry="8.2994423"
-       transform="matrix(1.0296115,0,0,1.1963836,-2.901924,-4.7132067)" />
-    <rect
-       style="opacity:0.56746030000000003;fill:url(#linearGradient4021);fill-opacity:1;stroke:none;filter:url(#filter4055)"
-       id="rect4013"
-       width="96"
-       height="24"
-       x="0"
-       y="72"
-       rx="14.008356"
-       ry="12"
-       transform="matrix(0.9768331,0,0,0.91974646,1.1649641,8.098115)" />
-  </g>
-</svg>
--- a/include/auth.php
+++ b/include/auth.php
@ -168,23 +168,4 @@ else {
 	}
 }

-// Returns an array of group id's this contact is a member of.
-// This array will only contain group id's related to the uid of this
-// DFRN contact. They are *not* neccessarily unique across the entire site. 
-
-
-if(! function_exists('init_groups_visitor')) {
-function init_groups_visitor($contact_id) {
-	$groups = array();
-	$r = q("SELECT `gid` FROM `group_member` 
-		WHERE `contact-id` = %d ",
-		intval($contact_id)
-	);
-	if(count($r)) {
-		foreach($r as $rr)
-			$groups[] = $rr['gid'];
-	}
-	return $groups;
-}}
-

--- a/include/items.php
+++ b/include/items.php
@ -76,6 +76,7 @@ function get_feed_for(&$a, $dfrn_id, $owner_nick, $last_update, $direction = 0)
 			killme();

 		$contact = $r[0];
+		require_once('include/security.php');
 		$groups = init_groups_visitor($contact['id']);

 		if(count($groups)) {
--- a/include/security.php
+++ b/include/security.php
@ -371,3 +371,23 @@ function check_form_security_token_ForbiddenOnErr($typename = '', $formname = 'f
 		killme();
 	}
 }
+
+// Returns an array of group id's this contact is a member of.
+// This array will only contain group id's related to the uid of this
+// DFRN contact. They are *not* neccessarily unique across the entire site. 
+
+
+if(! function_exists('init_groups_visitor')) {
+function init_groups_visitor($contact_id) {
+	$groups = array();
+	$r = q("SELECT `gid` FROM `group_member` 
+		WHERE `contact-id` = %d ",
+		intval($contact_id)
+	);
+	if(count($r)) {
+		foreach($r as $rr)
+			$groups[] = $rr['gid'];
+	}
+	return $groups;
+}}
+
--- a/include/text.php
+++ b/include/text.php
@ -826,7 +826,6 @@ function smilies($s, $sample = false) {
 		':facepalm',
 		':like',
 		':dislike',
-		'~friendika', 
 		'~friendica'

 	);
@ -864,7 +863,6 @@ function smilies($s, $sample = false) {
 		'<img class="smiley" src="' . $a->get_baseurl() . '/images/smiley-facepalm.gif" alt=":facepalm" />',
 		'<img class="smiley" src="' . $a->get_baseurl() . '/images/like.gif" alt=":like" />',
 		'<img class="smiley" src="' . $a->get_baseurl() . '/images/dislike.gif" alt=":dislike" />',
-		'<a href="http://project.friendika.com">~friendika <img class="smiley" src="' . $a->get_baseurl() . '/images/friendika-16.png" alt="~friendika" /></a>',
 		'<a href="http://friendica.com">~friendica <img class="smiley" src="' . $a->get_baseurl() . '/images/friendica-16.png" alt="~friendica" /></a>'
 	);

--- a/js/country.js
+++ b/js/country.js
@ -275,7 +275,7 @@ aStates[249]="|'Adan|'Ataq|Abyan|Al Bayda'|Al Hudaydah|Al Jawf|Al Mahrah|Al Mahw
 aStates[250]="|Kosovo|Montenegro|Serbia|Vojvodina";
 aStates[251]="|Central|Copperbelt|Eastern|Luapula|Lusaka|North-Western|Northern|Southern|Western";
 aStates[252]="|Bulawayo|Harare|ManicalandMashonaland Central|Mashonaland East|Mashonaland West|Masvingo|Matabeleland North|Matabeleland South|Midlands";
-aStates[253]="|Self Hosted|Private Server|Architects Of Sleep|DFRN|Distributed Friend Network|ErrLock|Free-Beer.ch|Foojbook|Free-Haven|Friendica.eu|Friendika.me.4.it|Friendika - I Ask Questions|Frndc.com|Hikado|Hipatia|Hungerfreunde|Kaluguran Community|Kak Ste|Karl.Markx.pm|Loozah Social Club|MyFriendica.net|MyFriendNetwork|Oi!|OpenMindSpace|Optimistisch|Pplsnet|Recolutionari.es|SilverLips|Sparkling Network|SPRACI|Styliztique|Sysfu Social Club|Trevena|theshi.re|Tumpambae|Uzmiac|Other";
+aStates[253]="|Self Hosted|Private Server|Architects Of Sleep|Chaos Friends|DFRN|Distributed Friend Network|ErrLock|Free-Beer.ch|Foojbook|Free-Haven|Friendica.eu|Friendika.me.4.it|Friendika - I Ask Questions|Frndc.com|Hikado|Hipatia|Hungerfreunde|Kaluguran Community|Kak Ste|Karl.Markx.pm|Loozah Social Club|MyFriendica.net|MyFriendNetwork|Oi!|OpenMindSpace|Optimistisch|Pplsnet|Recolutionari.es|SilverLips|Sparkling Network|SPRACI|Styliztique|Sysfu Social Club|Trevena|theshi.re|Tumpambae|Uzmiac|Other";
 /* 
 * gArCountryInfo
 * (0) Country name
--- a/mod/friendika.php
+++ b/mod/friendika.php
@ -1,11 +0,0 @@
-<?php
-
-require_once('mod/friendica.php');
-
-function friendika_init(&$a) {
-	friendica_init($a);
-}
-
-function friendika_content(&$a) {
-	return friendica_content($a);
-}
--- a/mod/localtime.php
+++ b/mod/localtime.php
@ -23,7 +23,7 @@ function localtime_content(&$a) {

 	$o .= '<h3>' . t('Time Conversion') . '</h3>';

-	$o .= '<p>' . t('Friendika provides this service for sharing events with other networks and friends in unknown timezones.') . '</p>';
+	$o .= '<p>' . t('Friendica provides this service for sharing events with other networks and friends in unknown timezones.') . '</p>';



--- a/mod/rsd_xml.php
+++ b/mod/rsd_xml.php
@ -7,8 +7,8 @@ function rsd_xml_content(&$a) {
 	echo '<?xml version="1.0" encoding="UTF-8"?>
 <rsd version="1.0" xmlns="http://archipelago.phrasewise.com/rsd">
   <service>
-     <engineName>Friendika</engineName>
-     <engineLink>http://friendika.com/</engineLink>
+     <engineName>Friendica</engineName>
+     <engineLink>http://friendica.com/</engineLink>
     <apis>
       <api name="Twitter" preferred="true" apiLink="'.$a->get_baseurl().'/api/" blogID="">
         <settings>
--- a/util/fpostit/fpostit.php
+++ b/util/fpostit/fpostit.php
@ -1,8 +1,8 @@
 <?php

-if (($_POST["friendika_acct_name"] != '') && ($_POST["friendika_password"] != '')) {
-	setcookie("username", $_POST["friendika_acct_name"], time()+60*60*24*300);
-	setcookie("password", $_POST["friendika_password"], time()+60*60*24*300);
+if (($_POST["friendica_acct_name"] != '') && ($_POST["friendica_password"] != '')) {
+	setcookie("username", $_POST["friendica_acct_name"], time()+60*60*24*300);
+	setcookie("password", $_POST["friendica_password"], time()+60*60*24*300);
 }

 ?>
@ -59,14 +59,14 @@ if ((isset($title)) && (isset($text)) && (isset($url))) {

 if (isset($_POST['submit'])) {
 	
-	if (($_POST["friendika_acct_name"] != '') && ($_POST["friendika_password"] != '')) {
-		$acctname = $_POST["friendika_acct_name"];
+	if (($_POST["friendica_acct_name"] != '') && ($_POST["friendica_password"] != '')) {
+		$acctname = $_POST["friendica_acct_name"];
 		$tmp_account_array = explode("@", $acctname);
 		if (isset($tmp_account_array[1])) {
 			$username = $tmp_account_array[0];
 			$hostname = $tmp_account_array[1];
 		}
-		$password = $_POST["friendika_password"];
+		$password = $_POST["friendica_password"];
 		$content = $_POST["content"];

 		$url = "http://" . $hostname . '/api/statuses/update';
@ -106,15 +106,15 @@ function showForm($error, $content) {
 	
 	echo <<<EOF
 	<div class='wrap1'>
-		<h2><img class='logo' src='friendika-32.png' align='middle';/>
-		Friendika Bookmarklet</h2>
+		<h2><img class='logo' src='friendica-32.png' align='middle';/>
+		Friendica Bookmarklet</h2>
 	</div>

 	<div class="wrap2">
 		<form method="post" action="{$_SERVER['PHP_SELF']}">
-			Enter the email address of the Friendika Account that you want to cross-post to:(example: user@friendika.org)<br /><br />
-			Account ID: <input type="text" name="friendika_acct_name" value="{$username_cookie}" size="50"/><br />
-			Password: <input type="password" name="friendika_password" value="{$password_cookie}" size="50"/><br />
+			Enter the email address of the Friendica Account that you want to cross-post to:(example: user@friendica.org)<br /><br />
+			Account ID: <input type="text" name="friendica_acct_name" value="{$username_cookie}" size="50"/><br />
+			Password: <input type="password" name="friendica_password" value="{$password_cookie}" size="50"/><br />
 			<textarea name="content" id="content" rows="6" cols="70">{$content}</textarea><br />
 			<input type="submit" value="PostIt!" name="submit" />&nbsp;&nbsp;<span class='error'>$error</span>
 		</form>
--- a/util/messages.po
+++ b/util/messages.po
@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: 3.0.1499\n"
+"Project-Id-Version: 3.0.1504\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-17 10:03-0700\n"
+"POT-Creation-Date: 2012-10-22 10:00-0700\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"
@ -58,7 +58,7 @@ msgstr ""
 #: ../../mod/dfrn_confirm.php:53 ../../addon/facebook/facebook.php:510
 #: ../../addon/facebook/facebook.php:516 ../../addon/fbpost/fbpost.php:159
 #: ../../addon/fbpost/fbpost.php:165
-#: ../../addon/dav/friendica/layout.fnk.php:354 ../../include/items.php:3913
+#: ../../addon/dav/friendica/layout.fnk.php:354 ../../include/items.php:3914
 #: ../../index.php:319 ../../addon.old/facebook/facebook.php:510
 #: ../../addon.old/facebook/facebook.php:516
 #: ../../addon.old/fbpost/fbpost.php:159 ../../addon.old/fbpost/fbpost.php:165
@ -178,8 +178,8 @@ msgstr ""
 #: ../../addon/irc/irc.php:55 ../../addon/fromapp/fromapp.php:77
 #: ../../addon/blogger/blogger.php:102 ../../addon/posterous/posterous.php:103
 #: ../../view/theme/cleanzero/config.php:80
-#: ../../view/theme/diabook/theme.php:757
-#: ../../view/theme/diabook/config.php:190
+#: ../../view/theme/diabook/theme.php:642
+#: ../../view/theme/diabook/config.php:152
 #: ../../view/theme/quattro/config.php:64 ../../view/theme/dispy/config.php:70
 #: ../../object/Item.php:558 ../../addon.old/fromgplus/fromgplus.php:40
 #: ../../addon.old/facebook/facebook.php:619
@ -281,11 +281,11 @@ msgstr ""
 msgid "Edit event"
 msgstr ""

-#: ../../mod/events.php:323 ../../include/text.php:1187
+#: ../../mod/events.php:323 ../../include/text.php:1185
 msgid "link to source"
 msgstr ""

-#: ../../mod/events.php:347 ../../view/theme/diabook/theme.php:131
+#: ../../mod/events.php:347 ../../view/theme/diabook/theme.php:91
 #: ../../include/nav.php:52 ../../boot.php:1701
 msgid "Events"
 msgstr ""
@ -437,7 +437,7 @@ msgstr ""
 #: ../../mod/photos.php:1095 ../../mod/photos.php:1110
 #: ../../mod/photos.php:1562 ../../mod/photos.php:1574
 #: ../../addon/communityhome/communityhome.php:110
-#: ../../view/theme/diabook/theme.php:598
+#: ../../view/theme/diabook/theme.php:492
 #: ../../addon.old/communityhome/communityhome.php:110
 msgid "Contact Photos"
 msgstr ""
@ -460,7 +460,7 @@ msgstr ""
 #: ../../mod/profile_photo.php:204 ../../mod/profile_photo.php:296
 #: ../../mod/profile_photo.php:305
 #: ../../addon/communityhome/communityhome.php:111
-#: ../../view/theme/diabook/theme.php:599 ../../include/user.php:324
+#: ../../view/theme/diabook/theme.php:493 ../../include/user.php:324
 #: ../../include/user.php:331 ../../include/user.php:338
 #: ../../addon.old/communityhome/communityhome.php:111
 msgid "Profile Photos"
@ -484,7 +484,7 @@ msgstr ""

 #: ../../mod/photos.php:606 ../../mod/like.php:145 ../../mod/subthread.php:87
 #: ../../mod/tagger.php:62 ../../addon/communityhome/communityhome.php:163
-#: ../../view/theme/diabook/theme.php:570 ../../include/text.php:1439
+#: ../../view/theme/diabook/theme.php:464 ../../include/text.php:1437
 #: ../../include/diaspora.php:1835 ../../include/conversation.php:125
 #: ../../include/conversation.php:253
 #: ../../addon.old/communityhome/communityhome.php:163
@ -695,7 +695,7 @@ msgstr ""
 msgid "Not available."
 msgstr ""

-#: ../../mod/community.php:32 ../../view/theme/diabook/theme.php:133
+#: ../../mod/community.php:32 ../../view/theme/diabook/theme.php:93
 #: ../../include/nav.php:101
 msgid "Community"
 msgstr ""
@ -955,7 +955,7 @@ msgstr ""
 msgid "Confirm"
 msgstr ""

-#: ../../mod/dfrn_request.php:715 ../../include/items.php:3292
+#: ../../mod/dfrn_request.php:715 ../../include/items.php:3293
 msgid "[Name Withheld]"
 msgstr ""

@ -1291,7 +1291,7 @@ msgstr ""

 #: ../../mod/localtime.php:26
 msgid ""
-"Friendika provides this service for sharing events with other networks and "
+"Friendica provides this service for sharing events with other networks and "
 "friends in unknown timezones."
 msgstr ""

@ -1405,7 +1405,7 @@ msgid_plural "%d comments"
 msgstr[0] ""
 msgstr[1] ""

-#: ../../mod/content.php:588 ../../include/text.php:1443
+#: ../../mod/content.php:588 ../../include/text.php:1441
 #: ../../object/Item.php:279 ../../object/Item.php:292
 msgid "comment"
 msgid_plural "comments"
@ -1537,7 +1537,7 @@ msgstr ""
 msgid "Personal"
 msgstr ""

-#: ../../mod/notifications.php:93 ../../view/theme/diabook/theme.php:127
+#: ../../mod/notifications.php:93 ../../view/theme/diabook/theme.php:87
 #: ../../include/nav.php:77 ../../include/nav.php:115
 msgid "Home"
 msgstr ""
@ -1982,7 +1982,7 @@ msgstr ""
 msgid "Edit contact"
 msgstr ""

-#: ../../mod/contacts.php:571 ../../view/theme/diabook/theme.php:129
+#: ../../mod/contacts.php:571 ../../view/theme/diabook/theme.php:89
 #: ../../include/nav.php:139
 msgid "Contacts"
 msgstr ""
@ -2019,7 +2019,7 @@ msgstr ""
 #: ../../addon/facebook/facebook.php:702
 #: ../../addon/facebook/facebook.php:1200 ../../addon/fbpost/fbpost.php:661
 #: ../../addon/public_server/public_server.php:62
-#: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:3301
+#: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:3302
 #: ../../boot.php:799 ../../addon.old/facebook/facebook.php:702
 #: ../../addon.old/facebook/facebook.php:1200
 #: ../../addon.old/fbpost/fbpost.php:661
@ -2109,8 +2109,8 @@ msgstr ""
 #: ../../mod/settings.php:69 ../../mod/newmember.php:22
 #: ../../mod/admin.php:785 ../../mod/admin.php:990
 #: ../../addon/dav/friendica/layout.fnk.php:225
-#: ../../addon/mathjax/mathjax.php:36 ../../view/theme/diabook/theme.php:643
-#: ../../view/theme/diabook/theme.php:773 ../../include/nav.php:137
+#: ../../addon/mathjax/mathjax.php:36 ../../view/theme/diabook/theme.php:537
+#: ../../view/theme/diabook/theme.php:658 ../../include/nav.php:137
 #: ../../addon.old/dav/friendica/layout.fnk.php:225
 #: ../../addon.old/mathjax/mathjax.php:36
 msgid "Settings"
@ -2855,7 +2855,7 @@ msgid ""
 msgstr ""

 #: ../../mod/newmember.php:32 ../../mod/profperm.php:103
-#: ../../view/theme/diabook/theme.php:128 ../../include/profile_advanced.php:7
+#: ../../view/theme/diabook/theme.php:88 ../../include/profile_advanced.php:7
 #: ../../include/profile_advanced.php:84 ../../include/nav.php:50
 #: ../../boot.php:1684
 msgid "Profile"
@ -3180,8 +3180,8 @@ msgstr ""
 #: ../../mod/tagger.php:62 ../../addon/facebook/facebook.php:1598
 #: ../../addon/communityhome/communityhome.php:158
 #: ../../addon/communityhome/communityhome.php:167
-#: ../../view/theme/diabook/theme.php:565
-#: ../../view/theme/diabook/theme.php:574 ../../include/diaspora.php:1835
+#: ../../view/theme/diabook/theme.php:459
+#: ../../view/theme/diabook/theme.php:468 ../../include/diaspora.php:1835
 #: ../../include/conversation.php:120 ../../include/conversation.php:129
 #: ../../include/conversation.php:248 ../../include/conversation.php:257
 #: ../../addon.old/facebook/facebook.php:1598
@ -3192,7 +3192,7 @@ msgstr ""

 #: ../../mod/like.php:162 ../../addon/facebook/facebook.php:1602
 #: ../../addon/communityhome/communityhome.php:172
-#: ../../view/theme/diabook/theme.php:579 ../../include/diaspora.php:1851
+#: ../../view/theme/diabook/theme.php:473 ../../include/diaspora.php:1851
 #: ../../include/conversation.php:136
 #: ../../addon.old/facebook/facebook.php:1602
 #: ../../addon.old/communityhome/communityhome.php:172
@ -3207,7 +3207,7 @@ msgstr ""

 #: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:159
 #: ../../mod/admin.php:734 ../../mod/admin.php:933 ../../mod/display.php:29
-#: ../../mod/display.php:145 ../../include/items.php:3779
+#: ../../mod/display.php:145 ../../include/items.php:3780
 msgid "Item not found."
 msgstr ""

@ -3215,7 +3215,7 @@ msgstr ""
 msgid "Access denied."
 msgstr ""

-#: ../../mod/fbrowser.php:25 ../../view/theme/diabook/theme.php:130
+#: ../../mod/fbrowser.php:25 ../../view/theme/diabook/theme.php:90
 #: ../../include/nav.php:51 ../../boot.php:1691
 msgid "Photos"
 msgstr ""
@ -4607,7 +4607,7 @@ msgstr ""
 msgid "diaspora2bb: "
 msgstr ""

-#: ../../mod/suggest.php:38 ../../view/theme/diabook/theme.php:626
+#: ../../mod/suggest.php:38 ../../view/theme/diabook/theme.php:520
 #: ../../include/contact_widgets.php:34
 msgid "Friend Suggestions"
 msgstr ""
@ -4622,7 +4622,7 @@ msgstr ""
 msgid "Ignore/Hide"
 msgstr ""

-#: ../../mod/directory.php:49 ../../view/theme/diabook/theme.php:624
+#: ../../mod/directory.php:49 ../../view/theme/diabook/theme.php:518
 msgid "Global Directory"
 msgstr ""

@ -5560,7 +5560,7 @@ msgid "Latest likes"
 msgstr ""

 #: ../../addon/communityhome/communityhome.php:155
-#: ../../view/theme/diabook/theme.php:562 ../../include/text.php:1437
+#: ../../view/theme/diabook/theme.php:456 ../../include/text.php:1435
 #: ../../include/conversation.php:117 ../../include/conversation.php:245
 #: ../../addon.old/communityhome/communityhome.php:155
 msgid "event"
@ -5714,7 +5714,7 @@ msgstr ""
 #: ../../addon/dav/common/wdcal_edit.inc.php:254
 #: ../../addon/dav/common/wdcal_edit.inc.php:270
 #: ../../addon/dav/common/wdcal_edit.inc.php:293
-#: ../../addon/dav/common/wdcal_edit.inc.php:305 ../../include/text.php:917
+#: ../../addon/dav/common/wdcal_edit.inc.php:305 ../../include/text.php:915
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:231
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:254
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:270
@ -5725,7 +5725,7 @@ msgstr ""

 #: ../../addon/dav/common/wdcal_edit.inc.php:235
 #: ../../addon/dav/common/wdcal_edit.inc.php:274
-#: ../../addon/dav/common/wdcal_edit.inc.php:308 ../../include/text.php:917
+#: ../../addon/dav/common/wdcal_edit.inc.php:308 ../../include/text.php:915
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:235
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:274
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:308
@ -5733,35 +5733,35 @@ msgid "Monday"
 msgstr ""

 #: ../../addon/dav/common/wdcal_edit.inc.php:238
-#: ../../addon/dav/common/wdcal_edit.inc.php:277 ../../include/text.php:917
+#: ../../addon/dav/common/wdcal_edit.inc.php:277 ../../include/text.php:915
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:238
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:277
 msgid "Tuesday"
 msgstr ""

 #: ../../addon/dav/common/wdcal_edit.inc.php:241
-#: ../../addon/dav/common/wdcal_edit.inc.php:280 ../../include/text.php:917
+#: ../../addon/dav/common/wdcal_edit.inc.php:280 ../../include/text.php:915
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:241
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:280
 msgid "Wednesday"
 msgstr ""

 #: ../../addon/dav/common/wdcal_edit.inc.php:244
-#: ../../addon/dav/common/wdcal_edit.inc.php:283 ../../include/text.php:917
+#: ../../addon/dav/common/wdcal_edit.inc.php:283 ../../include/text.php:915
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:244
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:283
 msgid "Thursday"
 msgstr ""

 #: ../../addon/dav/common/wdcal_edit.inc.php:247
-#: ../../addon/dav/common/wdcal_edit.inc.php:286 ../../include/text.php:917
+#: ../../addon/dav/common/wdcal_edit.inc.php:286 ../../include/text.php:915
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:247
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:286
 msgid "Friday"
 msgstr ""

 #: ../../addon/dav/common/wdcal_edit.inc.php:250
-#: ../../addon/dav/common/wdcal_edit.inc.php:289 ../../include/text.php:917
+#: ../../addon/dav/common/wdcal_edit.inc.php:289 ../../include/text.php:915
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:250
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:289
 msgid "Saturday"
@ -7554,7 +7554,7 @@ msgid "Post to Posterous by default"
 msgstr ""

 #: ../../view/theme/cleanzero/config.php:82
-#: ../../view/theme/diabook/config.php:192
+#: ../../view/theme/diabook/config.php:154
 #: ../../view/theme/quattro/config.php:66 ../../view/theme/dispy/config.php:72
 msgid "Theme settings"
 msgstr ""
@ -7564,7 +7564,7 @@ msgid "Set resize level for images in posts and comments (width and height)"
 msgstr ""

 #: ../../view/theme/cleanzero/config.php:84
-#: ../../view/theme/diabook/config.php:193
+#: ../../view/theme/diabook/config.php:155
 #: ../../view/theme/dispy/config.php:73
 msgid "Set font-size for posts and comments"
 msgstr ""
@ -7578,174 +7578,158 @@ msgstr ""
 msgid "Color scheme"
 msgstr ""

-#: ../../view/theme/diabook/theme.php:127 ../../include/nav.php:49
+#: ../../view/theme/diabook/theme.php:87 ../../include/nav.php:49
 #: ../../include/nav.php:115
 msgid "Your posts and conversations"
 msgstr ""

-#: ../../view/theme/diabook/theme.php:128 ../../include/nav.php:50
+#: ../../view/theme/diabook/theme.php:88 ../../include/nav.php:50
 msgid "Your profile page"
 msgstr ""

-#: ../../view/theme/diabook/theme.php:129
+#: ../../view/theme/diabook/theme.php:89
 msgid "Your contacts"
 msgstr ""

-#: ../../view/theme/diabook/theme.php:130 ../../include/nav.php:51
+#: ../../view/theme/diabook/theme.php:90 ../../include/nav.php:51
 msgid "Your photos"
 msgstr ""

-#: ../../view/theme/diabook/theme.php:131 ../../include/nav.php:52
+#: ../../view/theme/diabook/theme.php:91 ../../include/nav.php:52
 msgid "Your events"
 msgstr ""

-#: ../../view/theme/diabook/theme.php:132 ../../include/nav.php:53
+#: ../../view/theme/diabook/theme.php:92 ../../include/nav.php:53
 msgid "Personal notes"
 msgstr ""

-#: ../../view/theme/diabook/theme.php:132 ../../include/nav.php:53
+#: ../../view/theme/diabook/theme.php:92 ../../include/nav.php:53
 msgid "Your personal photos"
 msgstr ""

-#: ../../view/theme/diabook/theme.php:134
-#: ../../view/theme/diabook/theme.php:643
-#: ../../view/theme/diabook/theme.php:747
-#: ../../view/theme/diabook/config.php:201
+#: ../../view/theme/diabook/theme.php:94
+#: ../../view/theme/diabook/theme.php:537
+#: ../../view/theme/diabook/theme.php:632
+#: ../../view/theme/diabook/config.php:163
 msgid "Community Pages"
 msgstr ""

-#: ../../view/theme/diabook/theme.php:490
-#: ../../view/theme/diabook/theme.php:749
-#: ../../view/theme/diabook/config.php:203
+#: ../../view/theme/diabook/theme.php:384
+#: ../../view/theme/diabook/theme.php:634
+#: ../../view/theme/diabook/config.php:165
 msgid "Community Profiles"
 msgstr ""

-#: ../../view/theme/diabook/theme.php:511
-#: ../../view/theme/diabook/theme.php:754
-#: ../../view/theme/diabook/config.php:208
+#: ../../view/theme/diabook/theme.php:405
+#: ../../view/theme/diabook/theme.php:639
+#: ../../view/theme/diabook/config.php:170
 msgid "Last users"
 msgstr ""

-#: ../../view/theme/diabook/theme.php:540
-#: ../../view/theme/diabook/theme.php:756
-#: ../../view/theme/diabook/config.php:210
+#: ../../view/theme/diabook/theme.php:434
+#: ../../view/theme/diabook/theme.php:641
+#: ../../view/theme/diabook/config.php:172
 msgid "Last likes"
 msgstr ""

-#: ../../view/theme/diabook/theme.php:585
-#: ../../view/theme/diabook/theme.php:755
-#: ../../view/theme/diabook/config.php:209
+#: ../../view/theme/diabook/theme.php:479
+#: ../../view/theme/diabook/theme.php:640
+#: ../../view/theme/diabook/config.php:171
 msgid "Last photos"
 msgstr ""

-#: ../../view/theme/diabook/theme.php:622
-#: ../../view/theme/diabook/theme.php:752
-#: ../../view/theme/diabook/config.php:206
+#: ../../view/theme/diabook/theme.php:516
+#: ../../view/theme/diabook/theme.php:637
+#: ../../view/theme/diabook/config.php:168
 msgid "Find Friends"
 msgstr ""

-#: ../../view/theme/diabook/theme.php:623
+#: ../../view/theme/diabook/theme.php:517
 msgid "Local Directory"
 msgstr ""

-#: ../../view/theme/diabook/theme.php:625 ../../include/contact_widgets.php:35
+#: ../../view/theme/diabook/theme.php:519 ../../include/contact_widgets.php:35
 msgid "Similar Interests"
 msgstr ""

-#: ../../view/theme/diabook/theme.php:627 ../../include/contact_widgets.php:37
+#: ../../view/theme/diabook/theme.php:521 ../../include/contact_widgets.php:37
 msgid "Invite Friends"
 msgstr ""

-#: ../../view/theme/diabook/theme.php:678
-#: ../../view/theme/diabook/theme.php:748
-#: ../../view/theme/diabook/config.php:202
+#: ../../view/theme/diabook/theme.php:572
+#: ../../view/theme/diabook/theme.php:633
+#: ../../view/theme/diabook/config.php:164
 msgid "Earth Layers"
 msgstr ""

-#: ../../view/theme/diabook/theme.php:683
+#: ../../view/theme/diabook/theme.php:577
 msgid "Set zoomfactor for Earth Layers"
 msgstr ""

-#: ../../view/theme/diabook/theme.php:684
-#: ../../view/theme/diabook/config.php:199
+#: ../../view/theme/diabook/theme.php:578
+#: ../../view/theme/diabook/config.php:161
 msgid "Set longitude (X) for Earth Layers"
 msgstr ""

-#: ../../view/theme/diabook/theme.php:685
-#: ../../view/theme/diabook/config.php:200
+#: ../../view/theme/diabook/theme.php:579
+#: ../../view/theme/diabook/config.php:162
 msgid "Set latitude (Y) for Earth Layers"
 msgstr ""

-#: ../../view/theme/diabook/theme.php:698
-#: ../../view/theme/diabook/theme.php:750
-#: ../../view/theme/diabook/config.php:204
+#: ../../view/theme/diabook/theme.php:592
+#: ../../view/theme/diabook/theme.php:635
+#: ../../view/theme/diabook/config.php:166
 msgid "Help or @NewHere ?"
 msgstr ""

-#: ../../view/theme/diabook/theme.php:705
-#: ../../view/theme/diabook/theme.php:751
-#: ../../view/theme/diabook/config.php:205
+#: ../../view/theme/diabook/theme.php:599
+#: ../../view/theme/diabook/theme.php:636
+#: ../../view/theme/diabook/config.php:167
 msgid "Connect Services"
 msgstr ""

-#: ../../view/theme/diabook/theme.php:712
-#: ../../view/theme/diabook/theme.php:753
+#: ../../view/theme/diabook/theme.php:606
+#: ../../view/theme/diabook/theme.php:638
 msgid "Last Tweets"
 msgstr ""

-#: ../../view/theme/diabook/theme.php:715
-#: ../../view/theme/diabook/config.php:197
+#: ../../view/theme/diabook/theme.php:609
+#: ../../view/theme/diabook/config.php:159
 msgid "Set twitter search term"
 msgstr ""

-#: ../../view/theme/diabook/theme.php:735
-#: ../../view/theme/diabook/theme.php:736
-#: ../../view/theme/diabook/theme.php:737
-#: ../../view/theme/diabook/theme.php:738
-#: ../../view/theme/diabook/theme.php:739
-#: ../../view/theme/diabook/theme.php:740
-#: ../../view/theme/diabook/theme.php:741
-#: ../../view/theme/diabook/theme.php:742
-#: ../../view/theme/diabook/theme.php:743
-#: ../../view/theme/diabook/theme.php:744 ../../include/acl_selectors.php:288
+#: ../../view/theme/diabook/theme.php:629
+#: ../../view/theme/diabook/config.php:146 ../../include/acl_selectors.php:288
 msgid "don't show"
 msgstr ""

-#: ../../view/theme/diabook/theme.php:735
-#: ../../view/theme/diabook/theme.php:736
-#: ../../view/theme/diabook/theme.php:737
-#: ../../view/theme/diabook/theme.php:738
-#: ../../view/theme/diabook/theme.php:739
-#: ../../view/theme/diabook/theme.php:740
-#: ../../view/theme/diabook/theme.php:741
-#: ../../view/theme/diabook/theme.php:742
-#: ../../view/theme/diabook/theme.php:743
-#: ../../view/theme/diabook/theme.php:744 ../../include/acl_selectors.php:287
+#: ../../view/theme/diabook/theme.php:629
+#: ../../view/theme/diabook/config.php:146 ../../include/acl_selectors.php:287
 msgid "show"
 msgstr ""

-#: ../../view/theme/diabook/theme.php:745
+#: ../../view/theme/diabook/theme.php:630
 msgid "Show/hide boxes at right-hand column:"
 msgstr ""

-#: ../../view/theme/diabook/config.php:194
+#: ../../view/theme/diabook/config.php:156
 #: ../../view/theme/dispy/config.php:74
 msgid "Set line-height for posts and comments"
 msgstr ""

-#: ../../view/theme/diabook/config.php:195
+#: ../../view/theme/diabook/config.php:157
 msgid "Set resolution for middle column"
 msgstr ""

-#: ../../view/theme/diabook/config.php:196
+#: ../../view/theme/diabook/config.php:158
 msgid "Set color scheme"
 msgstr ""

-#: ../../view/theme/diabook/config.php:198
+#: ../../view/theme/diabook/config.php:160
 msgid "Set zoomfactor for Earth Layer"
 msgstr ""

-#: ../../view/theme/diabook/config.php:207
+#: ../../view/theme/diabook/config.php:169
 msgid "Last tweets"
 msgstr ""

@ -8310,79 +8294,79 @@ msgstr ""
 msgid "surprised"
 msgstr ""

-#: ../../include/text.php:921
+#: ../../include/text.php:919
 msgid "January"
 msgstr ""

-#: ../../include/text.php:921
+#: ../../include/text.php:919
 msgid "February"
 msgstr ""

-#: ../../include/text.php:921
+#: ../../include/text.php:919
 msgid "March"
 msgstr ""

-#: ../../include/text.php:921
+#: ../../include/text.php:919
 msgid "April"
 msgstr ""

-#: ../../include/text.php:921
+#: ../../include/text.php:919
 msgid "May"
 msgstr ""

-#: ../../include/text.php:921
+#: ../../include/text.php:919
 msgid "June"
 msgstr ""

-#: ../../include/text.php:921
+#: ../../include/text.php:919
 msgid "July"
 msgstr ""

-#: ../../include/text.php:921
+#: ../../include/text.php:919
 msgid "August"
 msgstr ""

-#: ../../include/text.php:921
+#: ../../include/text.php:919
 msgid "September"
 msgstr ""

-#: ../../include/text.php:921
+#: ../../include/text.php:919
 msgid "October"
 msgstr ""

-#: ../../include/text.php:921
+#: ../../include/text.php:919
 msgid "November"
 msgstr ""

-#: ../../include/text.php:921
+#: ../../include/text.php:919
 msgid "December"
 msgstr ""

-#: ../../include/text.php:1007
+#: ../../include/text.php:1005
 msgid "bytes"
 msgstr ""

-#: ../../include/text.php:1034 ../../include/text.php:1046
+#: ../../include/text.php:1032 ../../include/text.php:1044
 msgid "Click to open/close"
 msgstr ""

-#: ../../include/text.php:1219 ../../include/user.php:236
+#: ../../include/text.php:1217 ../../include/user.php:236
 msgid "default"
 msgstr ""

-#: ../../include/text.php:1231
+#: ../../include/text.php:1229
 msgid "Select an alternate language"
 msgstr ""

-#: ../../include/text.php:1441
+#: ../../include/text.php:1439
 msgid "activity"
 msgstr ""

-#: ../../include/text.php:1444
+#: ../../include/text.php:1442
 msgid "post"
 msgstr ""

-#: ../../include/text.php:1599
+#: ../../include/text.php:1597
 msgid "Item filed"
 msgstr ""

@ -8675,12 +8659,12 @@ msgstr ""
 msgid "%1$d %2$s ago"
 msgstr ""

-#: ../../include/datetime.php:472 ../../include/items.php:1688
+#: ../../include/datetime.php:472 ../../include/items.php:1689
 #, php-format
 msgid "%s's birthday"
 msgstr ""

-#: ../../include/datetime.php:473 ../../include/items.php:1689
+#: ../../include/datetime.php:473 ../../include/items.php:1690
 #, php-format
 msgid "Happy Birthday %s"
 msgstr ""
@ -8954,15 +8938,15 @@ msgstr ""
 msgid "following"
 msgstr ""

-#: ../../include/items.php:3299
+#: ../../include/items.php:3300
 msgid "A new person is sharing with you at "
 msgstr ""

-#: ../../include/items.php:3299
+#: ../../include/items.php:3300
 msgid "You have a new follower at "
 msgstr ""

-#: ../../include/items.php:3980
+#: ../../include/items.php:3981
 msgid "Archives"
 msgstr ""

--- a/view/api_timeline_atom.tpl
+++ b/view/api_timeline_atom.tpl
@ -1,8 +1,8 @@
 <feed xml:lang="en-US" xmlns="http://www.w3.org/2005/Atom" xmlns:thr="http://purl.org/syndication/thread/1.0" xmlns:georss="http://www.georss.org/georss" xmlns:activity="http://activitystrea.ms/spec/1.0/" xmlns:media="http://purl.org/syndication/atommedia" xmlns:poco="http://portablecontacts.net/spec/1.0" xmlns:ostatus="http://ostatus.org/schema/1.0" xmlns:statusnet="http://status.net/schema/api/1/">
 <generator uri="http://status.net" version="0.9.7">StatusNet</generator>
 <id>$rss.self</id>
- <title>Friendika</title>
- <subtitle>Friendika API feed</subtitle>
+ <title>Friendica</title>
+ <subtitle>Friendica API feed</subtitle>
 <logo>$rss.logo</logo>
 <updated>$rss.atom_updated</updated>
 <link type="text/html" rel="alternate" href="$rss.alternate"/>
--- a/view/api_timeline_rss.tpl
+++ b/view/api_timeline_rss.tpl
@ -1,9 +1,9 @@
 <rss xmlns:atom="http://www.w3.org/2005/Atom" version="2.0" xmlns:georss="http://www.georss.org/georss" xmlns:twitter="http://api.twitter.com">
  <channel>
-    <title>Friendika</title>
+    <title>Friendica</title>
    <link>$rss.alternate</link>
    <atom:link type="application/rss+xml" rel="self" href="$rss.self"/>
-    <description>Friendika timeline</description>
+    <description>Friendica timeline</description>
    <language>$rss.language</language>
    <ttl>40</ttl>
 	<image>
--- a/view/ca/htconfig.tpl
+++ b/view/ca/htconfig.tpl
@ -49,8 +49,8 @@ $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=';
+$a->config['system']['directory_submit_url'] = 'http://dir.friendica.com/submit';
+$a->config['system']['directory_search_url'] = 'http://dir.friendica.com/directory?search=';

 // PuSH - aka pubsubhubbub URL. This makes delivery of public posts as fast as private posts

--- a/view/ca/mail_received_html_body_eml.tpl
+++ b/view/ca/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/friendika-32.png'><span style="padding:7px;">Friendica</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/friendica-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>

--- a/view/ca/messages.po
+++ b/view/ca/messages.po
@ -1216,7 +1216,7 @@ msgstr "Temps de Conversió"

 #: ../../mod/localtime.php:26
 msgid ""
-"Friendika provides this service for sharing events with other networks and "
+"Friendica 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."

--- a/view/ca/strings.php
+++ b/view/ca/strings.php
@ -249,7 +249,7 @@ $a->strings["<h1>What next</h1>"] = "<h1>Que es següent</h1>";
 $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["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["Friendica 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/view/cs/cmnt_received_html_body_eml.tpl
+++ b/view/cs/cmnt_received_html_body_eml.tpl
@ -1,13 +1,13 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN">
 <html>
 <head>
-	<title>Friendika zpráva</title>
+	<title>Friendica zpráva</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:#084769; 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; float:left;" src='$siteurl/images/friendika-32.png'><div style="padding:7px; margin-left: 5px; float:left; font-size:18px;letter-spacing:1px;">Friendika</div><div style="clear: both;"></div></td></tr>
+	<tr><td colspan="2" style="background:#084769; 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; float:left;" src='$siteurl/images/friendica-32.png'><div style="padding:7px; margin-left: 5px; float:left; font-size:18px;letter-spacing:1px;">Friendica</div><div style="clear: both;"></div></td></tr>

 	<tr><td style="padding-top:22px;" colspan="2">$from okomentoval položku/konverzaci, kterou následujete.</td></tr>

--- a/view/cs/mail_received_html_body_eml.tpl
+++ b/view/cs/mail_received_html_body_eml.tpl
@ -1,13 +1,13 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN">
 <html>
 <head>
-	<title>Friendika Zpráva</title>
+	<title>Friendica Zpráva</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:#084769; 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; float:left;" src='$siteurl/images/friendika-32.png'><div style="padding:7px; margin-left: 5px; float:left; font-size:18px;letter-spacing:1px;">Friendika</div><div style="clear: both;"></div></td></tr>
+	<tr><td colspan="2" style="background:#084769; 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; float:left;" src='$siteurl/images/friendica-32.png'><div style="padding:7px; margin-left: 5px; float:left; font-size:18px;letter-spacing:1px;">Friendica</div><div style="clear: both;"></div></td></tr>

        <tr><td style="padding-top:22px;" colspan="2">$from Vám poslal(a) novou soukromou zprávu na $siteName.</td></tr>

--- a/view/cs/messages.po
+++ b/view/cs/messages.po
--- a/view/cs/strings.php
+++ b/view/cs/strings.php
@ -1129,9 +1129,6 @@ $a->strings["Hi %1\$s,\n\nThe connection between your accounts on %2\$s and Face
 $a->strings["StatusNet AutoFollow settings updated."] = "Nastavení automatického následování na StatusNet  aktualizováno.";
 $a->strings["StatusNet AutoFollow Settings"] = "Nastavení StatusNet automatického následování (AutoFollow)";
 $a->strings["Automatically follow any StatusNet followers/mentioners"] = "Automaticky následovat jakékoliv StatusNet následníky/přispivatele";
-$a->strings["Bg settings updated."] = "Nastavení Bg aktualizováno.";
-$a->strings["Bg Settings"] = "Nastavení Bg";
-$a->strings["How many contacts to display on profile sidebar"] = "Kolik kontaktů zobrazit na profilovém bočním menu";
 $a->strings["Lifetime of the cache (in hours)"] = "Životnost vyrovnávací paměti (v hodinách)";
 $a->strings["Cache Statistics"] = "Statistika vyrovnávací paměti";
 $a->strings["Number of items"] = "Počet položek";
@ -1161,8 +1158,8 @@ $a->strings["bitchslap"] = "";
 $a->strings["bitchslapped"] = "";
 $a->strings["shag"] = "";
 $a->strings["shagged"] = "";
-$a->strings["do something obscenely biological to"] = "";
-$a->strings["did something obscenely biological to"] = "";
+$a->strings["do something obscenely biological to"] = "udělat něco obscéně biologického uživateli";
+$a->strings["did something obscenely biological to"] = "udělal něco obscéně biologického uživateli";
 $a->strings["point out the poke feature to"] = "upozornit na poke funkci uživatele";
 $a->strings["pointed out the poke feature to"] = "upozorněn na poke funkci ";
 $a->strings["declare undying love for"] = "vyjadřit nehynoucí lásku ke";
@ -1190,7 +1187,7 @@ $a->strings["ate"] = "snězen";
 $a->strings["giggle and fawn at"] = "hihňat se";
 $a->strings["giggled and fawned at"] = "hihňá se";
 $a->strings["doubt"] = "pochybovat";
-$a->strings["doubted"] = "";
+$a->strings["doubted"] = "pochybující";
 $a->strings["glare"] = "zabodáván pohledem";
 $a->strings["glared at"] = "zabodávat pohledem ";
 $a->strings["YourLS Settings"] = "YourLS nastavení";
@ -1376,16 +1373,15 @@ $a->strings["Enable dreamwidth Post Plugin"] = "Povolit dreamwidth Plugin";
 $a->strings["dreamwidth username"] = "dreamwidth uživatelské jméno";
 $a->strings["dreamwidth password"] = "dreamwidth heslo";
 $a->strings["Post to dreamwidth by default"] = "Defaultně umístit na dreamwidth";
-$a->strings["Post to Drupal"] = "Zveřejnit na Drupal";
-$a->strings["Drupal Post Settings"] = "Nastavení příspěvků Drupal";
-$a->strings["Enable Drupal Post Plugin"] = "Aktivovat Drupal Plugin";
-$a->strings["Drupal username"] = "Drupal uživatelské jméno ";
-$a->strings["Drupal password"] = "Drupal heslo";
-$a->strings["Post Type - article,page,or blog"] = "Typ příspěvku - článek, stránka nebo blog";
-$a->strings["Drupal site URL"] = "Drupal adresa webu";
-$a->strings["Drupal site uses clean URLS"] = "Drupal server používá čisté URLS";
-$a->strings["Post to Drupal by default"] = "Defaultní umístění na Drupal ";
-$a->strings["Post from Friendica"] = "Příspěvek z Friendica";
+$a->strings["Remote Permissions Settings"] = "Nastavení Vzdálených oprávnění";
+$a->strings["Allow recipients of your private posts to see the other recipients of the posts"] = "Umožnit příjemcům Vašich soukromých příspěvků vidět ostatní příjemce příspěvků";
+$a->strings["Remote Permissions settings updated."] = "Nastavení Vzdálených opravnění aktualizováno.";
+$a->strings["Visible to"] = "Viditelné pro";
+$a->strings["may only be a partial list"] = "pouze pro část seznamu";
+$a->strings["Global"] = "Globální";
+$a->strings["The posts of every user on this server show the post recipients"] = "Příspěvek každého uživatele na tomto serveru zobrazuje příjemce příspěvků";
+$a->strings["Individual"] = "Individuálové";
+$a->strings["Each user chooses whether his/her posts show the post recipients"] = "Každý uživatel si zvolí, zda-li jeho/její příspěvek zobrazí příjemce příspěvku.";
 $a->strings["Startpage Settings"] = "Nastavení úvodní stránky";
 $a->strings["Home page to load after login  - leave blank for profile wall"] = "Domácí stránka k načtení po přihlášení  - pro profilovou zeď ponechejte prázdné";
 $a->strings["Examples: &quot;network&quot; or &quot;notifications/system&quot;"] = "Příklady: \"síť\" nebo \"notifikace systému\"";
@ -1402,15 +1398,13 @@ $a->strings["No files were uploaded."] = "Žádné soubory nebyly nahrány.";
 $a->strings["Uploaded file is empty"] = "Nahraný soubor je prázdný";
 $a->strings["File has an invalid extension, it should be one of "] = "Soubor má neplatnou příponu, ta by měla být jednou z";
 $a->strings["Upload was cancelled, or server error encountered"] = "Nahrávání bylo zrušeno nebo došlo k chybě na serveru";
-$a->strings["OEmbed settings updated"] = "OEmbed nastavení aktualizováno";
-$a->strings["Use OEmbed for YouTube videos"] = "Použití OEmbed pro videa na YouTube";
-$a->strings["URL to embed:"] = "URL adresa k vložení:";
 $a->strings["show/hide"] = "zobrazit/skrýt";
 $a->strings["No forum subscriptions"] = "Žádné registrace k fórům";
 $a->strings["Forumlist settings updated."] = "Nastavení Forumlist aktualizováno.";
 $a->strings["Forumlist Settings"] = "Nastavení Forumlist";
 $a->strings["Randomise forum list"] = "Zamíchat list fór";
 $a->strings["Show forums on profile page"] = "Zobrazit fóra na profilové stránce";
+$a->strings["Show forums on network page"] = "Zobrazit fóra na stránce Síť";
 $a->strings["Impressum"] = "Impressum";
 $a->strings["Site Owner"] = "Vlastník webu";
 $a->strings["Email Address"] = "E-mailová adresa";
@ -1542,6 +1536,7 @@ $a->strings["Tumblr password"] = "Tumbir heslo";
 $a->strings["Post to Tumblr by default"] = "Standardně posílat příspěvky na Tumbir";
 $a->strings["Numfriends settings updated."] = "Numfriends nastavení aktualizováno";
 $a->strings["Numfriends Settings"] = "Nastavení Numfriends";
+$a->strings["How many contacts to display on profile sidebar"] = "Kolik kontaktů zobrazit na profilovém bočním menu";
 $a->strings["Gnot settings updated."] = "Nastavení Gnot aktualizováno.";
 $a->strings["Gnot Settings"] = "Nastavení Gnot";
 $a->strings["Allows threading of email comment notifications on Gmail and anonymising the subject line."] = "Umožnit řetězení emailových komentářových notifikací na Gmailu a anonymizací řádky předmětu.";
@ -1555,6 +1550,7 @@ $a->strings["WordPress password"] = "WordPress heslo";
 $a->strings["WordPress API URL"] = "URL adresa API WordPress";
 $a->strings["Post to WordPress by default"] = "standardně posílat příspěvky na WordPress";
 $a->strings["Provide a backlink to the Friendica post"] = "Poskytuje zpětný link na Friendica příspěvek";
+$a->strings["Post from Friendica"] = "Příspěvek z Friendica";
 $a->strings["Read the original post and comment stream on Friendica"] = "Přečíst si originální příspěvek a komentáře na Friendica";
 $a->strings["\"Show more\" Settings"] = "\"Show more\" nastavení";
 $a->strings["Enable Show More"] = "Povolit Show more";
@ -1754,8 +1750,8 @@ $a->strings["%d Contact"] = array(
 	1 => "%d kontaktů",
 	2 => "%d kontaktů",
 );
-$a->strings["poke"] = "";
-$a->strings["poked"] = "";
+$a->strings["poke"] = "šťouchnout";
+$a->strings["poked"] = "šťouchnut";
 $a->strings["ping"] = "cinknout";
 $a->strings["pinged"] = "cinkut";
 $a->strings["prod"] = "pobídnout";
@ -2018,4 +2014,18 @@ $a->strings["Status Messages and Posts"] = "Statusové zprávy a příspěvky ";
 $a->strings["Profile Details"] = "Detaily profilu";
 $a->strings["Events and Calendar"] = "Události a kalendář";
 $a->strings["Only You Can See This"] = "Toto můžete vidět jen Vy";
-$a->strings["toggle mobile"] = "";
+$a->strings["toggle mobile"] = "přepnout mobil";
+$a->strings["Bg settings updated."] = "Nastavení Bg aktualizováno.";
+$a->strings["Bg Settings"] = "Nastavení Bg";
+$a->strings["Post to Drupal"] = "Zveřejnit na Drupal";
+$a->strings["Drupal Post Settings"] = "Nastavení příspěvků Drupal";
+$a->strings["Enable Drupal Post Plugin"] = "Aktivovat Drupal Plugin";
+$a->strings["Drupal username"] = "Drupal uživatelské jméno ";
+$a->strings["Drupal password"] = "Drupal heslo";
+$a->strings["Post Type - article,page,or blog"] = "Typ příspěvku - článek, stránka nebo blog";
+$a->strings["Drupal site URL"] = "Drupal adresa webu";
+$a->strings["Drupal site uses clean URLS"] = "Drupal server používá čisté URLS";
+$a->strings["Post to Drupal by default"] = "Defaultní umístění na Drupal ";
+$a->strings["OEmbed settings updated"] = "OEmbed nastavení aktualizováno";
+$a->strings["Use OEmbed for YouTube videos"] = "Použití OEmbed pro videa na YouTube";
+$a->strings["URL to embed:"] = "URL adresa k vložení:";
--- a/view/cs/wall_received_html_body_eml.tpl
+++ b/view/cs/wall_received_html_body_eml.tpl
@ -1,13 +1,13 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN">
 <html>
 <head>
-	<title>Friendika zpráva</title>
+	<title>Friendica zpráva</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:#084769; 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; float:left;" src='$siteurl/images/friendika-32.png'><div style="padding:7px; margin-left: 5px; float:left; font-size:18px;letter-spacing:1px;">Friendika</div><div style="clear: both;"></div></td></tr>
+	<tr><td colspan="2" style="background:#084769; 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; float:left;" src='$siteurl/images/friendica-32.png'><div style="padding:7px; margin-left: 5px; float:left; font-size:18px;letter-spacing:1px;">Friendica</div><div style="clear: both;"></div></td></tr>

 	<tr><td style="padding-top:22px;" colspan="2">$from obohatil Vaši profilovou zeď.</td></tr>

--- a/view/de/messages.po
+++ b/view/de/messages.po
--- a/view/de/strings.php
+++ b/view/de/strings.php
@ -255,7 +255,7 @@ $a->strings["<h1>What next</h1>"] = "<h1>Wie geht es weiter?</h1>";
 $a->strings["IMPORTANT: You will need to [manually] setup a scheduled task for the poller."] = "WICHTIG: Du musst [manuell] einen Cronjob (o.ä.) für den Poller einrichten.";
 $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 den Kontakten zu vereinfachen, deren Zeitzone nicht ermittelt werden kann.";
+$a->strings["Friendica 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["UTC time: %s"] = "UTC Zeit: %s";
 $a->strings["Current timezone: %s"] = "Aktuelle Zeitzone: %s";
 $a->strings["Converted localtime: %s"] = "Umgerechnete lokale Zeit: %s";
@ -1120,9 +1120,6 @@ $a->strings["Hi %1\$s,\n\nThe connection between your accounts on %2\$s and Face
 $a->strings["StatusNet AutoFollow settings updated."] = "StatusNet AutoFollow Einstellungen aktualisiert.";
 $a->strings["StatusNet AutoFollow Settings"] = "StatusNet AutoFollow Einstellungen";
 $a->strings["Automatically follow any StatusNet followers/mentioners"] = "Automatisch allen StatusNet Followern/Erwähnungen folgen";
-$a->strings["Bg settings updated."] = "Bg Einstellungen sind aktualisiert.";
-$a->strings["Bg Settings"] = "Bg Einstellungen";
-$a->strings["How many contacts to display on profile sidebar"] = "Wie viele Kontakte sollen in der Seitenleiste angezeigt werden";
 $a->strings["Lifetime of the cache (in hours)"] = "Lebenszeit des Caches (in Stunden)";
 $a->strings["Cache Statistics"] = "Cache Statistik";
 $a->strings["Number of items"] = "Anzahl der Einträge";
@ -1365,16 +1362,15 @@ $a->strings["Enable dreamwidth Post Plugin"] = "Dreamwidth Post Plugin aktiviere
 $a->strings["dreamwidth username"] = "Dreamwidth Benutzername";
 $a->strings["dreamwidth password"] = "Dreamwidth Passwort";
 $a->strings["Post to dreamwidth by default"] = "Standardmäßig bei Dreamwidth veröffentlichen";
-$a->strings["Post to Drupal"] = "Bei Drupal veröffentlichen";
-$a->strings["Drupal Post Settings"] = "Drupal-Beitragseinstellungen";
-$a->strings["Enable Drupal Post Plugin"] = "Veröffentlichung bei Drupal erlauben";
-$a->strings["Drupal username"] = "Drupal Nutzername";
-$a->strings["Drupal password"] = "Drupal Passwort";
-$a->strings["Post Type - article,page,or blog"] = "Beitragstyp - Artikel, Seite oder Blog";
-$a->strings["Drupal site URL"] = "URL der Drupal Seite";
-$a->strings["Drupal site uses clean URLS"] = "Drupal Seite verwendet bereinigte URLs";
-$a->strings["Post to Drupal by default"] = "Veröffentliche öffentliche Beiträge standardmäßig bei Drupal";
-$a->strings["Post from Friendica"] = "Beitrag via Friendica";
+$a->strings["Remote Permissions Settings"] = "Entfernte Privatsphäreneinstellungen";
+$a->strings["Allow recipients of your private posts to see the other recipients of the posts"] = "Erlaube Empfängern von privaten Nachrichten zu sehen wer die anderen Empfänger sind";
+$a->strings["Remote Permissions settings updated."] = "Entfernte Privatsphäreneinstellungen aktualisiert.";
+$a->strings["Visible to"] = "Sichtbar für";
+$a->strings["may only be a partial list"] = "könnte nur ein Teil der Liste sein";
+$a->strings["Global"] = "Global";
+$a->strings["The posts of every user on this server show the post recipients"] = "Die Beiträge jedes Nutzers dieses Servers werden die Empfänger des Beitrags anzeigen";
+$a->strings["Individual"] = "Individuell";
+$a->strings["Each user chooses whether his/her posts show the post recipients"] = "Jede/r Nutzer/in kann wählen ob die Empfänger der Beiträge angezeigt werden sollen oder nicht";
 $a->strings["Startpage Settings"] = "Startseiten-Einstellungen";
 $a->strings["Home page to load after login  - leave blank for profile wall"] = "Seite, die nach dem Anmelden geladen werden soll. Leer = Pinnwand";
 $a->strings["Examples: &quot;network&quot; or &quot;notifications/system&quot;"] = "Beispiele: network, notifications/system";
@ -1391,9 +1387,6 @@ $a->strings["No files were uploaded."] = "Keine Dateien hochgeladen.";
 $a->strings["Uploaded file is empty"] = "Hochgeladene Datei ist leer";
 $a->strings["File has an invalid extension, it should be one of "] = "Die Dateierweiterung ist nicht erlaubt, sie muss eine der folgenden sein ";
 $a->strings["Upload was cancelled, or server error encountered"] = "Upload abgebrochen oder Serverfehler aufgetreten";
-$a->strings["OEmbed settings updated"] = "OEmbed Einstellungen aktualisiert.";
-$a->strings["Use OEmbed for YouTube videos"] = "OEmbed für Youtube Videos verwenden";
-$a->strings["URL to embed:"] = "URL zum Einbetten:";
 $a->strings["show/hide"] = "anzeigen/verbergen";
 $a->strings["No forum subscriptions"] = "Keine Foren-Mitgliedschaften.";
 $a->strings["Forumlist settings updated."] = "Einstellungen zur Foren-Liste aktualisiert.";
@ -1532,6 +1525,7 @@ $a->strings["Tumblr password"] = "Tumblr Passwort";
 $a->strings["Post to Tumblr by default"] = "Standardmäßig bei Tumblr veröffentlichen";
 $a->strings["Numfriends settings updated."] = "Numfriends Einstellungen aktualisiert";
 $a->strings["Numfriends Settings"] = "Numfriends Einstellungen";
+$a->strings["How many contacts to display on profile sidebar"] = "Wie viele Kontakte sollen in der Seitenleiste angezeigt werden";
 $a->strings["Gnot settings updated."] = "Gnot Einstellungen aktualisiert.";
 $a->strings["Gnot Settings"] = "Gnot Einstellungen";
 $a->strings["Allows threading of email comment notifications on Gmail and anonymising the subject line."] = "Erlaubt das Veröffentlichen von E-Mail Kommentar Benachrichtigungen bei Gmail mit anonymisiertem Betreff";
@ -1545,6 +1539,7 @@ $a->strings["WordPress password"] = "WordPress-Passwort";
 $a->strings["WordPress API URL"] = "WordPress-API-URL";
 $a->strings["Post to WordPress by default"] = "Standardmäßig auf WordPress veröffentlichen";
 $a->strings["Provide a backlink to the Friendica post"] = "Einen Link zurück zum Friendica-Beitrag hinzufügen";
+$a->strings["Post from Friendica"] = "Beitrag via Friendica";
 $a->strings["Read the original post and comment stream on Friendica"] = "Den Originalbeitrag samt Kommentaren bei Friendica lesen";
 $a->strings["\"Show more\" Settings"] = "\"Mehr zeigen\" Einstellungen";
 $a->strings["Enable Show More"] = "Aktiviere \"Mehr zeigen\"";
@ -2007,3 +2002,17 @@ $a->strings["Profile Details"] = "Profildetails";
 $a->strings["Events and Calendar"] = "Ereignisse und Kalender";
 $a->strings["Only You Can See This"] = "Nur du kannst das sehen";
 $a->strings["toggle mobile"] = "auf/von Mobile Ansicht wechseln";
+$a->strings["Bg settings updated."] = "Bg Einstellungen sind aktualisiert.";
+$a->strings["Bg Settings"] = "Bg Einstellungen";
+$a->strings["Post to Drupal"] = "Bei Drupal veröffentlichen";
+$a->strings["Drupal Post Settings"] = "Drupal-Beitragseinstellungen";
+$a->strings["Enable Drupal Post Plugin"] = "Veröffentlichung bei Drupal erlauben";
+$a->strings["Drupal username"] = "Drupal Nutzername";
+$a->strings["Drupal password"] = "Drupal Passwort";
+$a->strings["Post Type - article,page,or blog"] = "Beitragstyp - Artikel, Seite oder Blog";
+$a->strings["Drupal site URL"] = "URL der Drupal Seite";
+$a->strings["Drupal site uses clean URLS"] = "Drupal Seite verwendet bereinigte URLs";
+$a->strings["Post to Drupal by default"] = "Veröffentliche öffentliche Beiträge standardmäßig bei Drupal";
+$a->strings["OEmbed settings updated"] = "OEmbed Einstellungen aktualisiert.";
+$a->strings["Use OEmbed for YouTube videos"] = "OEmbed für Youtube Videos verwenden";
+$a->strings["URL to embed:"] = "URL zum Einbetten:";
--- a/view/eo/messages.po
+++ b/view/eo/messages.po
@ -1216,7 +1216,7 @@ msgstr "Konverto de tempo"

 #: ../../mod/localtime.php:26
 msgid ""
-"Friendika provides this service for sharing events with other networks and "
+"Friendica provides this service for sharing events with other networks and "
 "friends in unknown timezones."
 msgstr "Friendica provizas tiun servon por kunhavigi okazojn kun aliaj retoj kaj amikoj en aliaj horzonoj."

--- a/view/eo/strings.php
+++ b/view/eo/strings.php
@ -249,7 +249,7 @@ $a->strings["<h1>What next</h1>"] = "<h1>Kio sekvas nun?</h1>";
 $a->strings["IMPORTANT: You will need to [manually] setup a scheduled task for the poller."] = "GRAVA: Vi bezonas [mane] agordi planitan taskon por la Friendica poller.";
 $a->strings["l F d, Y \\@ g:i A"] = "l F d, Y \\@ g:i A";
 $a->strings["Time Conversion"] = "Konverto de tempo";
-$a->strings["Friendika provides this service for sharing events with other networks and friends in unknown timezones."] = "Friendica provizas tiun servon por kunhavigi okazojn kun aliaj retoj kaj amikoj en aliaj horzonoj.";
+$a->strings["Friendica provides this service for sharing events with other networks and friends in unknown timezones."] = "Friendica provizas tiun servon por kunhavigi okazojn kun aliaj retoj kaj amikoj en aliaj horzonoj.";
 $a->strings["UTC time: %s"] = "UTC horo: %s";
 $a->strings["Current timezone: %s"] = "Aktuala horzono: %s";
 $a->strings["Converted localtime: %s"] = "Konvertita loka horo: %s";
--- a/view/es/mail_received_html_body_eml.tpl
+++ b/view/es/mail_received_html_body_eml.tpl
@ -1,13 +1,13 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN">
 <html>
 <head>
-	<title>Mensaje de Friendika</title>
+	<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;">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/friendica-32.png'><span style="padding:7px;">Friendica</span></td></tr>

 	<tr><td style="padding-top:22px;" colspan="2">Has recibido un nuevo mensaje privado de '$from' en $siteName.</td></tr>

--- a/view/es/messages.po
+++ b/view/es/messages.po
--- a/view/es/strings.php
+++ b/view/es/strings.php
@ -135,13 +135,19 @@ $a->strings["Edit post"] = "Editar publicación";
 $a->strings["Post to Email"] = "Publicar mediante correo electrónico";
 $a->strings["Edit"] = "Editar";
 $a->strings["Upload photo"] = "Subir foto";
+$a->strings["upload photo"] = "subir imagen";
 $a->strings["Attach file"] = "Adjuntar archivo";
+$a->strings["attach file"] = "adjuntar archivo";
 $a->strings["Insert web link"] = "Insertar enlace";
-$a->strings["Insert YouTube video"] = "Insertar vídeo de YouTube";
-$a->strings["Insert Vorbis [.ogg] video"] = "Insertar vídeo Vorbis [.ogg]";
-$a->strings["Insert Vorbis [.ogg] audio"] = "Insertar audio Vorbis [.ogg]";
+$a->strings["web link"] = "enlace web";
+$a->strings["Insert video link"] = "Insertar enlace del vídeo";
+$a->strings["video link"] = "enlace de video";
+$a->strings["Insert audio link"] = "Insertar vínculo del audio";
+$a->strings["audio link"] = "enlace de audio";
 $a->strings["Set your location"] = "Configurar tu localización";
+$a->strings["set location"] = "establecer tu ubicación";
 $a->strings["Clear browser location"] = "Borrar la localización del navegador";
+$a->strings["clear location"] = "limpiar la localización";
 $a->strings["Permission settings"] = "Configuración de permisos";
 $a->strings["CC: email addresses"] = "CC: dirección de correo electrónico";
 $a->strings["Public post"] = "Publicación pública";
@ -913,6 +919,7 @@ $a->strings["Login failed."] = "Accesso fallido.";
 $a->strings["Contact added"] = "Contacto añadido";
 $a->strings["Common Friends"] = "Amigos comunes";
 $a->strings["No contacts in common."] = "Sin contactos en común.";
+$a->strings["%1\$s is following %2\$s's %3\$s"] = "";
 $a->strings["link"] = "enlace";
 $a->strings["Item has been removed."] = "El elemento ha sido eliminado.";
 $a->strings["Applications"] = "Aplicaciones";
@ -1113,9 +1120,6 @@ $a->strings["Hi %1\$s,\n\nThe connection between your accounts on %2\$s and Face
 $a->strings["StatusNet AutoFollow settings updated."] = "Configuración para seguir automáticamente en StatusNet actualizada.";
 $a->strings["StatusNet AutoFollow Settings"] = "Configuración para el seguimiento automático en StatusNet";
 $a->strings["Automatically follow any StatusNet followers/mentioners"] = "Seguir automáticamente a cualquiera que me siga/mencione en StatusNet";
-$a->strings["Bg settings updated."] = "Ajustes de fondo actualizados.";
-$a->strings["Bg Settings"] = "Ajustes de fondo";
-$a->strings["How many contacts to display on profile sidebar"] = "¿Cuántos contactos quieres mostrar en la barra lateral de tu perfil?";
 $a->strings["Lifetime of the cache (in hours)"] = "Vida útil de la caché (en horas)";
 $a->strings["Cache Statistics"] = "Estadísticas de la caché";
 $a->strings["Number of items"] = "Número de ítems";
@ -1358,16 +1362,15 @@ $a->strings["Enable dreamwidth Post Plugin"] = "Activar el módulo de publicaci
 $a->strings["dreamwidth username"] = "Nombre de usuario de Dreamwidth";
 $a->strings["dreamwidth password"] = "Contraseña de Dreamwidth";
 $a->strings["Post to dreamwidth by default"] = "Publicar en Dreamwidth por defecto";
-$a->strings["Post to Drupal"] = "Publicar en Drupal";
-$a->strings["Drupal Post Settings"] = "Configuración de las publicaciones en Drupal";
-$a->strings["Enable Drupal Post Plugin"] = "Activar el módulo de publicación en Drupal";
-$a->strings["Drupal username"] = "Nombre de usuario de Drupal";
-$a->strings["Drupal password"] = "Contraseña de Drupal";
-$a->strings["Post Type - article,page,or blog"] = "Tipo de publicación: artículo, página o blog";
-$a->strings["Drupal site URL"] = "Dirección de Drupal";
-$a->strings["Drupal site uses clean URLS"] = "El sitio de Drupal usa direcciones URL simples";
-$a->strings["Post to Drupal by default"] = "Publicar en Drupal por defecto";
-$a->strings["Post from Friendica"] = "Publicado desde Friendica";
+$a->strings["Remote Permissions Settings"] = "";
+$a->strings["Allow recipients of your private posts to see the other recipients of the posts"] = "";
+$a->strings["Remote Permissions settings updated."] = "";
+$a->strings["Visible to"] = "";
+$a->strings["may only be a partial list"] = "";
+$a->strings["Global"] = "";
+$a->strings["The posts of every user on this server show the post recipients"] = "";
+$a->strings["Individual"] = "";
+$a->strings["Each user chooses whether his/her posts show the post recipients"] = "";
 $a->strings["Startpage Settings"] = "Configuración de página inicial";
 $a->strings["Home page to load after login  - leave blank for profile wall"] = "Página por defecto, dejálo en blanco para cargar tu perfil";
 $a->strings["Examples: &quot;network&quot; or &quot;notifications/system&quot;"] = "Ejemplos: &quot;red&quot; o &quot;notificaciones/sistema&quot;";
@ -1384,15 +1387,13 @@ $a->strings["No files were uploaded."] = "No se han subido archivos aún.";
 $a->strings["Uploaded file is empty"] = "El archivo subido está vacío";
 $a->strings["File has an invalid extension, it should be one of "] = "El archivo tiene una extensión no válida, debería ser una de ";
 $a->strings["Upload was cancelled, or server error encountered"] = "La subida ha sido cancelada, o se encontró un error del servidor";
-$a->strings["OEmbed settings updated"] = "Actualizar la configuración de OEmbed";
-$a->strings["Use OEmbed for YouTube videos"] = "Usar OEmbed para los vídeos de YouTube";
-$a->strings["URL to embed:"] = "Dirección del recurso:";
 $a->strings["show/hide"] = "mostrar/ocultar";
 $a->strings["No forum subscriptions"] = "Foro sin suscrpciones";
 $a->strings["Forumlist settings updated."] = "Ajustes de lista de foros actualizados.";
 $a->strings["Forumlist Settings"] = "Ajustes de lista de foros";
-$a->strings["Randomise Forumlist/Forum list"] = "Aleatorizar lista de foros";
-$a->strings["Show forumlists/forums on profile forumlist"] = "Mostrar lista de foros en perfil forumlist";
+$a->strings["Randomise forum list"] = "";
+$a->strings["Show forums on profile page"] = "";
+$a->strings["Show forums on network page"] = "";
 $a->strings["Impressum"] = "Términos y Política del sitio";
 $a->strings["Site Owner"] = "Propietario";
 $a->strings["Email Address"] = "Dirección de correo";
@ -1524,6 +1525,7 @@ $a->strings["Tumblr password"] = "Tumblr - contraseña";
 $a->strings["Post to Tumblr by default"] = "Publicar en Tumblr por defecto";
 $a->strings["Numfriends settings updated."] = "Configuración del Contador de contactos actualizada";
 $a->strings["Numfriends Settings"] = "Configuración del Contador de contactos";
+$a->strings["How many contacts to display on profile sidebar"] = "¿Cuántos contactos quieres mostrar en la barra lateral de tu perfil?";
 $a->strings["Gnot settings updated."] = "Configuración de Gnot actualizada.";
 $a->strings["Gnot Settings"] = "Configuración de Gnot";
 $a->strings["Allows threading of email comment notifications on Gmail and anonymising the subject line."] = "Permitir el enhebrado en las notificaciones de comentarios de correo en Gmail y hacer anónima la línea de \"Asunto\".";
@ -1537,6 +1539,7 @@ $a->strings["WordPress password"] = "WordPress - contraseña";
 $a->strings["WordPress API URL"] = "WordPress - dirección API";
 $a->strings["Post to WordPress by default"] = "Publicar a WordPress por defecto";
 $a->strings["Provide a backlink to the Friendica post"] = "Añade un enlace de vuelta a la publicación de Friendica";
+$a->strings["Post from Friendica"] = "Publicado desde Friendica";
 $a->strings["Read the original post and comment stream on Friendica"] = "Leer la publicación original y los comentarios en Friendica";
 $a->strings["\"Show more\" Settings"] = "Configuración de \"Muéstrame más\"";
 $a->strings["Enable Show More"] = "Activar Muéstrame más";
@ -1628,6 +1631,8 @@ $a->strings["Last tweets"] = "Últimos tweets";
 $a->strings["Alignment"] = "Alineación";
 $a->strings["Left"] = "Izquierda";
 $a->strings["Center"] = "Centrado";
+$a->strings["Posts font size"] = "";
+$a->strings["Textareas font size"] = "";
 $a->strings["Set colour scheme"] = "Configurar esquema de color";
 $a->strings["j F, Y"] = "j F, Y";
 $a->strings["j F"] = "j F";
@ -1954,6 +1959,7 @@ $a->strings["Categories:"] = "";
 $a->strings["Filed under:"] = "";
 $a->strings["remove"] = "eliminar";
 $a->strings["Delete Selected Items"] = "Eliminar el elemento seleccionado";
+$a->strings["Follow Thread"] = "";
 $a->strings["%s likes this."] = "A %s le gusta esto.";
 $a->strings["%s doesn't like this."] = "A %s no le gusta esto.";
 $a->strings["<span  %1\$s>%2\$d people</span> like this."] = "Le gusta a <span %1\$s>%2\$d personas</span>.";
@ -1967,15 +1973,6 @@ $a->strings["Please enter a video link/URL:"] = "Por favor, introduce la URL/enl
 $a->strings["Please enter an audio link/URL:"] = "Por favor, introduce la URL/enlace del audio:";
 $a->strings["Tag term:"] = "Etiquetar:";
 $a->strings["Where are you right now?"] = "¿Dónde estás ahora?";
-$a->strings["upload photo"] = "subir imagen";
-$a->strings["attach file"] = "adjuntar archivo";
-$a->strings["web link"] = "enlace web";
-$a->strings["Insert video link"] = "Insertar enlace del vídeo";
-$a->strings["video link"] = "enlace de video";
-$a->strings["Insert audio link"] = "Insertar vínculo del audio";
-$a->strings["audio link"] = "enlace de audio";
-$a->strings["set location"] = "establecer tu ubicación";
-$a->strings["clear location"] = "limpiar la localización";
 $a->strings["permissions"] = "permisos";
 $a->strings["Click here to upgrade."] = "Pulsa aquí para actualizar.";
 $a->strings["This action exceeds the limits set by your subscription plan."] = "Esta acción excede los límites permitidos por tu subscripción.";
@ -2004,3 +2001,18 @@ $a->strings["Status Messages and Posts"] = "Mensajes de Estado y Publicaciones";
 $a->strings["Profile Details"] = "Detalles del Perfil";
 $a->strings["Events and Calendar"] = "Eventos y Calendario";
 $a->strings["Only You Can See This"] = "Únicamente tú puedes ver esto";
+$a->strings["toggle mobile"] = "";
+$a->strings["Bg settings updated."] = "Ajustes de fondo actualizados.";
+$a->strings["Bg Settings"] = "Ajustes de fondo";
+$a->strings["Post to Drupal"] = "Publicar en Drupal";
+$a->strings["Drupal Post Settings"] = "Configuración de las publicaciones en Drupal";
+$a->strings["Enable Drupal Post Plugin"] = "Activar el módulo de publicación en Drupal";
+$a->strings["Drupal username"] = "Nombre de usuario de Drupal";
+$a->strings["Drupal password"] = "Contraseña de Drupal";
+$a->strings["Post Type - article,page,or blog"] = "Tipo de publicación: artículo, página o blog";
+$a->strings["Drupal site URL"] = "Dirección de Drupal";
+$a->strings["Drupal site uses clean URLS"] = "El sitio de Drupal usa direcciones URL simples";
+$a->strings["Post to Drupal by default"] = "Publicar en Drupal por defecto";
+$a->strings["OEmbed settings updated"] = "Actualizar la configuración de OEmbed";
+$a->strings["Use OEmbed for YouTube videos"] = "Usar OEmbed para los vídeos de YouTube";
+$a->strings["URL to embed:"] = "Dirección del recurso:";
--- a/view/fr/cmnt_received_html_body_eml.tpl
+++ b/view/fr/cmnt_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/friendika-32.png'><span style="padding:7px;">Friendica</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/friendica-32.png'><span style="padding:7px;">Friendica</span></td></tr>

 	<tr><td style="padding-top:22px;" colspan="2">$from a commenté un élément ou une conversation que vous suivez.</td></tr>

--- 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/friendika-32.png'><span style="padding:7px;">Friendica</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/friendica-32.png'><span style="padding:7px;">Friendica</span></td></tr>

 	<tr><td style="padding-top:22px;" colspan="2">$from vous a envoyé un message à $siteName.</td></tr>

--- a/view/fr/messages.po
+++ b/view/fr/messages.po
--- a/view/fr/strings.php
+++ b/view/fr/strings.php
@ -618,7 +618,7 @@ $a->strings["New Member Checklist"] = "Checklist du nouvel utilisateur";
 $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."] = "Nous souhaiterions vous donner quelques astuces et ressources pour rendre votre expérience la plus agréable possible. Cliquez sur n'importe lequel de ces éléments pour visiter la page correspondante. Un lien vers cette page restera visible sur votre page d'accueil pendant les deux semaines qui suivent votre inscription initiale, puis disparaîtra silencieusement.";
 $a->strings["Getting Started"] = "Bien démarrer";
 $a->strings["Friendica Walk-Through"] = "Friendica pas-à-pas";
-$a->strings["On your <em>Quick Start</em> page - find a brief introduction to your profile and network tabs, make some new connections, and find some groups to join."] = "";
+$a->strings["On your <em>Quick Start</em> page - find a brief introduction to your profile and network tabs, make some new connections, and find some groups to join."] = "Sur votre page d'accueil, dans <em>Conseils aux nouveaux venus</em> - vous trouverez une rapide introduction aux onglets Profil et Réseau, pourrez vous connecter à Facebook, établir de nouvelles relations, et choisir des groupes à rejoindre.";
 $a->strings["Go to Your Settings"] = "Éditer vos Réglages";
 $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."] = "Sur la page des <em>Réglages</em> -     changez votre mot de passe initial. Notez bien votre Identité. Elle ressemble à une adresse de courriel - et vous sera utile pour vous faire des amis dans le web social libre.";
 $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."] = "Vérifiez les autres réglages, tout particulièrement ceux liés à la vie privée. Un profil non listé, c'est un peu comme un numéro sur liste rouge. En général, vous devriez probablement publier votre profil - à moins que tous vos amis (potentiels) sachent déjà comment vous trouver.";
@ -633,7 +633,7 @@ $a->strings["Connecting"] = "";
 $a->strings["Facebook"] = "Facebook";
 $a->strings["Authorise the Facebook Connector if you currently have a Facebook account and we will (optionally) import all your Facebook friends and conversations."] = "Activez et paramétrez le connecteur Facebook si vous avez un compte Facebook et nous pourrons (de manière facultative) importer tous vos amis et conversations Facebook.";
 $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> ceci est votre propre serveur, installer le connecteur Facebook peut adoucir votre transition vers le web social libre.";
-$a->strings["Importing Emails"] = "";
+$a->strings["Importing Emails"] = "Importer courriels";
 $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"] = "Entrez vos paramètres de courriel dans les Réglages des connecteurs si vous souhaitez importer et interagir avec des amis ou des listes venant de votre Boîte de Réception.";
 $a->strings["Go to Your Contacts Page"] = "Consulter vos Contacts";
 $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."] = "Votre page Contacts est le point d'entrée vers la gestion de vos amitiés/relations et la connexion à des amis venant d'autres réseaux. Typiquement, vous pourrez y rentrer leur adresse d'Identité ou l'URL de leur site dans le formulaire <em>Ajouter un nouveau contact</em>.";
@ -1120,19 +1120,16 @@ $a->strings["Hi %1\$s,\n\nThe connection between your accounts on %2\$s and Face
 $a->strings["StatusNet AutoFollow settings updated."] = "Réglages de suivi automatique sur StatusNet mis à jour.";
 $a->strings["StatusNet AutoFollow Settings"] = "Réglages de suivi automatique sur StatusNet";
 $a->strings["Automatically follow any StatusNet followers/mentioners"] = "Suivre automatiquement les personnes qui vous suivent ou vous mentionnent sur Statusnet";
-$a->strings["Bg settings updated."] = "Réglages d'arrière-plan mis à jour.";
-$a->strings["Bg Settings"] = "Réglages d'arrière-plan";
-$a->strings["How many contacts to display on profile sidebar"] = "Nombre de contacts à montrer sur le panneau latéral du profil";
 $a->strings["Lifetime of the cache (in hours)"] = "Durée de vie du cache (en heures)";
 $a->strings["Cache Statistics"] = "Statistiques du cache";
 $a->strings["Number of items"] = "Nombre d'éléments";
 $a->strings["Size of the cache"] = "Taille du cache";
 $a->strings["Delete the whole cache"] = "Vider le cache";
-$a->strings["Facebook Post disabled"] = "";
-$a->strings["Facebook Post"] = "";
-$a->strings["Install Facebook Post connector for this account."] = "";
-$a->strings["Remove Facebook Post connector"] = "";
-$a->strings["Facebook Post Settings"] = "";
+$a->strings["Facebook Post disabled"] = "Publications Facebook désactivées";
+$a->strings["Facebook Post"] = "Publications Facebook";
+$a->strings["Install Facebook Post connector for this account."] = "Installer le connecteur Facebook pour ce compte.";
+$a->strings["Remove Facebook Post connector"] = "Retirer le connecteur Facebook";
+$a->strings["Facebook Post Settings"] = "Réglages Facebook";
 $a->strings["%d person likes this"] = array(
 	0 => "%d personne aime ça",
 	1 => "%d personnes aiment ça",
@ -1146,42 +1143,42 @@ $a->strings["Generate new key"] = "Générer une nouvelle clé";
 $a->strings["Widgets key"] = "Clé des widgets";
 $a->strings["Widgets available"] = "Widgets disponibles";
 $a->strings["Connect on Friendica!"] = "Se connecter sur Friendica!";
-$a->strings["bitchslap"] = "";
-$a->strings["bitchslapped"] = "";
-$a->strings["shag"] = "";
-$a->strings["shagged"] = "";
+$a->strings["bitchslap"] = "faire un coup de pute";
+$a->strings["bitchslapped"] = "a fait un coup de pute à";
+$a->strings["shag"] = "niquer";
+$a->strings["shagged"] = "a niqué";
 $a->strings["do something obscenely biological to"] = "";
 $a->strings["did something obscenely biological to"] = "";
-$a->strings["point out the poke feature to"] = "";
-$a->strings["pointed out the poke feature to"] = "";
-$a->strings["declare undying love for"] = "";
-$a->strings["declared undying love for"] = "";
-$a->strings["patent"] = "";
-$a->strings["patented"] = "";
-$a->strings["stroke beard"] = "";
-$a->strings["stroked their beard at"] = "";
-$a->strings["bemoan the declining standards of modern secondary and tertiary education to"] = "";
-$a->strings["bemoans the declining standards of modern secondary and tertiary education to"] = "";
-$a->strings["hug"] = "";
-$a->strings["hugged"] = "";
-$a->strings["kiss"] = "";
-$a->strings["kissed"] = "";
-$a->strings["raise eyebrows at"] = "";
-$a->strings["raised their eyebrows at"] = "";
-$a->strings["insult"] = "";
-$a->strings["insulted"] = "";
-$a->strings["praise"] = "";
-$a->strings["praised"] = "";
-$a->strings["be dubious of"] = "";
-$a->strings["was dubious of"] = "";
-$a->strings["eat"] = "";
-$a->strings["ate"] = "";
-$a->strings["giggle and fawn at"] = "";
-$a->strings["giggled and fawned at"] = "";
-$a->strings["doubt"] = "";
-$a->strings["doubted"] = "";
-$a->strings["glare"] = "";
-$a->strings["glared at"] = "";
+$a->strings["point out the poke feature to"] = "indiquer les sollicitations";
+$a->strings["pointed out the poke feature to"] = "a indiqué les sollicitations à";
+$a->strings["declare undying love for"] = "déclarer sa flamme";
+$a->strings["declared undying love for"] = "a déclaré sa flamme à";
+$a->strings["patent"] = "faire breveter";
+$a->strings["patented"] = "a fait breveter";
+$a->strings["stroke beard"] = "frotter sa barbe";
+$a->strings["stroked their beard at"] = "a frotté sa barbe sur";
+$a->strings["bemoan the declining standards of modern secondary and tertiary education to"] = "se lamenter sur les valeurs qui se perdent";
+$a->strings["bemoans the declining standards of modern secondary and tertiary education to"] = "s'est lamenté du lent déclin des valeurs auprès de";
+$a->strings["hug"] = "faire un calin";
+$a->strings["hugged"] = "a fait un câlin à";
+$a->strings["kiss"] = "embrasser";
+$a->strings["kissed"] = "a embrassé";
+$a->strings["raise eyebrows at"] = "hausser le sourcil";
+$a->strings["raised their eyebrows at"] = "a haussé le sourcil à ";
+$a->strings["insult"] = "insulter";
+$a->strings["insulted"] = "a insulté";
+$a->strings["praise"] = "louer";
+$a->strings["praised"] = "a loué";
+$a->strings["be dubious of"] = "trouver douteux";
+$a->strings["was dubious of"] = "a trouvé douteux ";
+$a->strings["eat"] = "manger";
+$a->strings["ate"] = "a mangé ";
+$a->strings["giggle and fawn at"] = "se payer la tête";
+$a->strings["giggled and fawned at"] = "s'est payé la tête de";
+$a->strings["doubt"] = "mettre en doute";
+$a->strings["doubted"] = "a mis en doute ";
+$a->strings["glare"] = "fixer";
+$a->strings["glared at"] = "a fixé";
 $a->strings["YourLS Settings"] = "Réglages de YourLS";
 $a->strings["URL: http://"] = "URL: http://";
 $a->strings["Username:"] = "Nom d'utilisateur";
@ -1365,16 +1362,15 @@ $a->strings["Enable dreamwidth Post Plugin"] = "Activer \"Poster vers Dreamwidth
 $a->strings["dreamwidth username"] = "Nom d'utilisateur Dreamwidth";
 $a->strings["dreamwidth password"] = "Mot de passe";
 $a->strings["Post to dreamwidth by default"] = "Poster vers Dreamwidth par défaut";
-$a->strings["Post to Drupal"] = "Poster vers Drupal";
-$a->strings["Drupal Post Settings"] = "Réglages Drupal";
-$a->strings["Enable Drupal Post Plugin"] = "Activer \"Poster vers Drupal\"";
-$a->strings["Drupal username"] = "Nom d'utilisateur Drupal";
-$a->strings["Drupal password"] = "Mot de passe Drupal";
-$a->strings["Post Type - article,page,or blog"] = "Type de publication - article, page ou blog";
-$a->strings["Drupal site URL"] = "URL du site Drupal";
-$a->strings["Drupal site uses clean URLS"] = "Ce site utilise des URLs propres";
-$a->strings["Post to Drupal by default"] = "Poster vers Drupal par défaut";
-$a->strings["Post from Friendica"] = "Publier depuis Friendica";
+$a->strings["Remote Permissions Settings"] = "Permissions distantes";
+$a->strings["Allow recipients of your private posts to see the other recipients of the posts"] = "";
+$a->strings["Remote Permissions settings updated."] = "Permissions distantes mises-à-jour.";
+$a->strings["Visible to"] = "Visibilité";
+$a->strings["may only be a partial list"] = "";
+$a->strings["Global"] = "Global";
+$a->strings["The posts of every user on this server show the post recipients"] = "Les publications de tous les utilisateurs de ce serveur afficheront leurs destinataires";
+$a->strings["Individual"] = "Individuel";
+$a->strings["Each user chooses whether his/her posts show the post recipients"] = "Chaque utilisateur du serveur pourra choisir si ses publications affichent leurs destinataires";
 $a->strings["Startpage Settings"] = "Paramètres de la page d'accueil";
 $a->strings["Home page to load after login  - leave blank for profile wall"] = "Page d'accueil à charger après authentification - laisser ce champ vide pour charger votre mur";
 $a->strings["Examples: &quot;network&quot; or &quot;notifications/system&quot;"] = "Exemples : &quot;network&quot; ou &quot;notifications/system&quot;";
@ -1391,9 +1387,6 @@ $a->strings["No files were uploaded."] = "Aucun fichier n'a été téléversé."
 $a->strings["Uploaded file is empty"] = "Le fichier téléversé est vide";
 $a->strings["File has an invalid extension, it should be one of "] = "Le fichier a une extension invalide, elle devrait être parmi ";
 $a->strings["Upload was cancelled, or server error encountered"] = "Téléversement annulé, ou erreur de serveur";
-$a->strings["OEmbed settings updated"] = "Réglage OEmbed mis-à-jour";
-$a->strings["Use OEmbed for YouTube videos"] = "Utiliser OEmbed pour les vidéos Youtube";
-$a->strings["URL to embed:"] = "URL à incorporer:";
 $a->strings["show/hide"] = "Montrer/cacher";
 $a->strings["No forum subscriptions"] = "Pas d'abonnement au forum";
 $a->strings["Forumlist settings updated."] = "Paramètres de la liste des forums mis à jour.";
@ -1438,8 +1431,8 @@ $a->strings["A list of <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" target
 $a->strings["Default zoom"] = "Zoom par défaut";
 $a->strings["The default zoom level. (1:world, 18:highest)"] = "Le niveau de zoom affiché par défaut. (1: monde entier, 18: détail maximum)";
 $a->strings["Editplain settings updated."] = "Réglages editplain sauvés.";
-$a->strings["Group Text"] = "";
-$a->strings["Use a text only (non-image) group selector in the \"group edit\" menu"] = "";
+$a->strings["Group Text"] = "Affichage textuel des groupes";
+$a->strings["Use a text only (non-image) group selector in the \"group edit\" menu"] = "Utilisez un sélecteur de groupe purement textuel (sans image) dans le menu d'édition des groupes";
 $a->strings["Could NOT install Libravatar successfully.<br>It requires PHP >= 5.3"] = "Libravatar n'a PAS pu être installé. <br>Il nécessite PHP >= 5.3";
 $a->strings["generic profile image"] = "image de profil générique";
 $a->strings["random geometric pattern"] = "motif géométrique aléatoire";
@ -1532,6 +1525,7 @@ $a->strings["Tumblr password"] = "Mot de passe Tumblr";
 $a->strings["Post to Tumblr by default"] = "Publier sur Tumblr par défaut";
 $a->strings["Numfriends settings updated."] = "Réglages numfriends sauvés.";
 $a->strings["Numfriends Settings"] = "Réglages de numfriends";
+$a->strings["How many contacts to display on profile sidebar"] = "Nombre de contacts à montrer sur le panneau latéral du profil";
 $a->strings["Gnot settings updated."] = "Réglages Gnot sauvés.";
 $a->strings["Gnot Settings"] = "Réglages Gnot";
 $a->strings["Allows threading of email comment notifications on Gmail and anonymising the subject line."] = "Autorise l'arborescence des notifications de commentaires sur GMail, et rend la ligne 'Sujet' anonyme.";
@ -1545,6 +1539,7 @@ $a->strings["WordPress password"] = "Mot de passe WordPress";
 $a->strings["WordPress API URL"] = "URL de l'API WordPress";
 $a->strings["Post to WordPress by default"] = "Publier sur WordPress par défaut";
 $a->strings["Provide a backlink to the Friendica post"] = "Fournir un rétrolien vers le message sur Friendica";
+$a->strings["Post from Friendica"] = "Publier depuis Friendica";
 $a->strings["Read the original post and comment stream on Friendica"] = "Lire le message d'origine et le flux des commentaires sur Friendica";
 $a->strings["\"Show more\" Settings"] = "Réglages de \"Show more\"";
 $a->strings["Enable Show More"] = "Activer \"Show more\"";
@ -1743,18 +1738,18 @@ $a->strings["%d Contact"] = array(
 	0 => "%d contact",
 	1 => "%d contacts",
 );
-$a->strings["poke"] = "titille";
+$a->strings["poke"] = "titiller";
 $a->strings["poked"] = "a titillé";
-$a->strings["ping"] = "";
-$a->strings["pinged"] = "";
-$a->strings["prod"] = "";
-$a->strings["prodded"] = "";
-$a->strings["slap"] = "";
-$a->strings["slapped"] = "";
-$a->strings["finger"] = "";
-$a->strings["fingered"] = "";
-$a->strings["rebuff"] = "";
-$a->strings["rebuffed"] = "";
+$a->strings["ping"] = "attirer l'attention";
+$a->strings["pinged"] = "a attiré l'attention de";
+$a->strings["prod"] = "aiguillonner";
+$a->strings["prodded"] = "a aiguillonné";
+$a->strings["slap"] = "gifler";
+$a->strings["slapped"] = "a giflé";
+$a->strings["finger"] = "tripoter";
+$a->strings["fingered"] = "a tripoté";
+$a->strings["rebuff"] = "rabrouer";
+$a->strings["rebuffed"] = "a rabroué";
 $a->strings["happy"] = "heureuse";
 $a->strings["sad"] = "triste";
 $a->strings["mellow"] = "suave";
@ -1897,9 +1892,9 @@ $a->strings["%1\$s posted to [url=%2\$s]your wall[/url]"] = "%1\$s a posté sur
 $a->strings["[Friendica:Notify] %s tagged you"] = "[Friendica:Notification] %s vous a repéré";
 $a->strings["%1\$s tagged you at %2\$s"] = "%1\$s vous parle sur %2\$s";
 $a->strings["%1\$s [url=%2\$s]tagged you[/url]."] = "%1\$s [url=%2\$s]vous a taggé[/url].";
-$a->strings["[Friendica:Notify] %1\$s poked you"] = "";
-$a->strings["%1\$s poked you at %2\$s"] = "";
-$a->strings["%1\$s [url=%2\$s]poked you[/url]."] = "";
+$a->strings["[Friendica:Notify] %1\$s poked you"] = "[Friendica:Notify] %1\$s vous a sollicité";
+$a->strings["%1\$s poked you at %2\$s"] = "%1\$s vous a sollicité via %2\$s";
+$a->strings["%1\$s [url=%2\$s]poked you[/url]."] = "%1\$s vous a [url=%2\$s]sollicité[/url].";
 $a->strings["[Friendica:Notify] %s tagged your post"] = "[Friendica:Notification] %s a repéré votre publication";
 $a->strings["%1\$s tagged your post at %2\$s"] = "%1\$s a tagué votre contenu sur %2\$s";
 $a->strings["%1\$s tagged [url=%2\$s]your post[/url]"] = "%1\$s a tagué [url=%2\$s]votre contenu[/url]";
@ -1950,14 +1945,14 @@ $a->strings["Please upload a profile photo."] = "Merci d'illustrer votre profil
 $a->strings["Welcome back "] = "Bienvenue à nouveau, ";
 $a->strings["The form security token was not correct. This probably happened because the form has been opened for too long (>3 hours) before submitting it."] = "Le jeton de sécurité du formulaire n'est pas correct. Ceci veut probablement dire que le formulaire est resté ouvert trop longtemps (plus de 3 heures) avant d'être validé.";
 $a->strings["stopped following"] = "retiré de la liste de suivi";
-$a->strings["Poke"] = "";
+$a->strings["Poke"] = "Sollicitations (pokes)";
 $a->strings["View Status"] = "Voir les statuts";
 $a->strings["View Profile"] = "Voir le profil";
 $a->strings["View Photos"] = "Voir les photos";
 $a->strings["Network Posts"] = "Posts du Réseau";
 $a->strings["Edit Contact"] = "Éditer le contact";
 $a->strings["Send PM"] = "Message privé";
-$a->strings["%1\$s poked %2\$s"] = "";
+$a->strings["%1\$s poked %2\$s"] = "%1\$s a sollicité %2\$s";
 $a->strings["post/item"] = "publication/élément";
 $a->strings["%1\$s marked %2\$s's %3\$s as favorite"] = "%1\$s a marqué le %3\$s de %2\$s comme favori";
 $a->strings["Categories:"] = "Catégories:";
@ -2006,4 +2001,18 @@ $a->strings["Status Messages and Posts"] = "Messages d'état et publications";
 $a->strings["Profile Details"] = "Détails du profil";
 $a->strings["Events and Calendar"] = "Événements et agenda";
 $a->strings["Only You Can See This"] = "Vous seul pouvez voir ça";
-$a->strings["toggle mobile"] = "";
+$a->strings["toggle mobile"] = "activ. mobile";
+$a->strings["Bg settings updated."] = "Réglages d'arrière-plan mis à jour.";
+$a->strings["Bg Settings"] = "Réglages d'arrière-plan";
+$a->strings["Post to Drupal"] = "Poster vers Drupal";
+$a->strings["Drupal Post Settings"] = "Réglages Drupal";
+$a->strings["Enable Drupal Post Plugin"] = "Activer \"Poster vers Drupal\"";
+$a->strings["Drupal username"] = "Nom d'utilisateur Drupal";
+$a->strings["Drupal password"] = "Mot de passe Drupal";
+$a->strings["Post Type - article,page,or blog"] = "Type de publication - article, page ou blog";
+$a->strings["Drupal site URL"] = "URL du site Drupal";
+$a->strings["Drupal site uses clean URLS"] = "Ce site utilise des URLs propres";
+$a->strings["Post to Drupal by default"] = "Poster vers Drupal par défaut";
+$a->strings["OEmbed settings updated"] = "Réglage OEmbed mis-à-jour";
+$a->strings["Use OEmbed for YouTube videos"] = "Utiliser OEmbed pour les vidéos Youtube";
+$a->strings["URL to embed:"] = "URL à incorporer:";
--- a/view/is/messages.po
+++ b/view/is/messages.po
@ -1218,7 +1218,7 @@ msgstr "Tíma leiðréttir"

 #: ../../mod/localtime.php:26
 msgid ""
-"Friendika provides this service for sharing events with other networks and "
+"Friendica provides this service for sharing events with other networks and "
 "friends in unknown timezones."
 msgstr "Friendica veitir þessa þjónustu til að deila atburðum milli neta og vina í óþekktum tímabeltum."

--- a/view/is/strings.php
+++ b/view/is/strings.php
@ -249,7 +249,7 @@ $a->strings["<h1>What next</h1>"] = "";
 $a->strings["IMPORTANT: You will need to [manually] setup a scheduled task for the poller."] = "MIKILVÆGT: Þú þarft að [handvirkt] setja upp sjálfvirka keyrslu á poller.";
 $a->strings["l F d, Y \\@ g:i A"] = "";
 $a->strings["Time Conversion"] = "Tíma leiðréttir";
-$a->strings["Friendika provides this service for sharing events with other networks and friends in unknown timezones."] = "Friendica veitir þessa þjónustu til að deila atburðum milli neta og vina í óþekktum tímabeltum.";
+$a->strings["Friendica provides this service for sharing events with other networks and friends in unknown timezones."] = "Friendica veitir þessa þjónustu til að deila atburðum milli neta og vina í óþekktum tímabeltum.";
 $a->strings["UTC time: %s"] = "Máltími: %s";
 $a->strings["Current timezone: %s"] = "Núverandi tímabelti: %s";
 $a->strings["Converted localtime: %s"] = "Umbreyttur staðartími: %s";
--- a/view/it/cmnt_received_html_body_eml.tpl
+++ b/view/it/cmnt_received_html_body_eml.tpl
@ -1,13 +1,13 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN">
 <html>
 <head>
-	<title>Friendika Messaggio</title>
+	<title>Friendica Messaggio</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;">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/friendica-32.png'><span style="padding:7px;">Friendica</span></td></tr>

 	<tr><td style="padding-top:22px;" colspan="2">$from ha commentato un elemeto/conversazione che stai seguendo.</td></tr>

--- a/view/it/mail_received_html_body_eml.tpl
+++ b/view/it/mail_received_html_body_eml.tpl
@ -1,13 +1,13 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN">
 <html>
 <head>
-	<title>Friendika Messsaggio</title>
+	<title>Friendica Messsaggio</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;">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/friendica-32.png'><span style="padding:7px;">Friendica</span></td></tr>

 	<tr><td style="padding-top:22px;" colspan="2">Hai ricevuto un nuovo messsaggio privato su $siteName da '$from'.</td></tr>

--- a/view/it/messages.po
+++ b/view/it/messages.po
--- a/view/it/strings.php
+++ b/view/it/strings.php
@ -124,7 +124,7 @@ $a->strings["Not available."] = "Non disponibile.";
 $a->strings["Community"] = "Comunità";
 $a->strings["No results."] = "Nessun risultato.";
 $a->strings["This is Friendica, version"] = "Questo è Friendica, versione";
-$a->strings["running at web location"] = "in esecuzione sull'indirizzo web";
+$a->strings["running at web location"] = "in esecuzione all'indirizzo web";
 $a->strings["Please visit <a href=\"http://friendica.com\">Friendica.com</a> to learn more about the Friendica project."] = "Visita <a href=\"http://friendica.com\">Friendica.com</a> per saperne di più sul progetto Friendica.";
 $a->strings["Bug reports and issues: please visit"] = "Segnalazioni di bug e problemi: visita";
 $a->strings["Suggestions, praise, donations, etc. - please email \"Info\" at Friendica - dot com"] = "Suggerimenti, lodi, donazioni, ecc -  e-mail a  \"Info\" at Friendica punto com";
@ -135,13 +135,19 @@ $a->strings["Edit post"] = "Modifica messaggio";
 $a->strings["Post to Email"] = "Invia a email";
 $a->strings["Edit"] = "Modifica";
 $a->strings["Upload photo"] = "Carica foto";
+$a->strings["upload photo"] = "carica foto";
 $a->strings["Attach file"] = "Allega file";
+$a->strings["attach file"] = "allega file";
 $a->strings["Insert web link"] = "Inserisci link";
-$a->strings["Insert YouTube video"] = "Inserisci video da YouTube";
-$a->strings["Insert Vorbis [.ogg] video"] = "Inserisci video Vorbis [.ogg]";
-$a->strings["Insert Vorbis [.ogg] audio"] = "Inserisci audio Vorbis [.ogg]";
+$a->strings["web link"] = "link web";
+$a->strings["Insert video link"] = "Inserire collegamento video";
+$a->strings["video link"] = "link video";
+$a->strings["Insert audio link"] = "Inserisci collegamento audio";
+$a->strings["audio link"] = "link audio";
 $a->strings["Set your location"] = "La tua posizione";
+$a->strings["set location"] = "posizione";
 $a->strings["Clear browser location"] = "Rimuovi la localizzazione data dal browser";
+$a->strings["clear location"] = "canc. pos.";
 $a->strings["Permission settings"] = "Impostazioni permessi";
 $a->strings["CC: email addresses"] = "CC: indirizzi email";
 $a->strings["Public post"] = "Messaggio pubblico";
@ -230,26 +236,26 @@ $a->strings["OpenSSL PHP module"] = "modulo PHP OpenSSL";
 $a->strings["mysqli PHP module"] = "modulo PHP mysqli";
 $a->strings["mb_string PHP module"] = "modulo PHP mb_string";
 $a->strings["Apache mod_rewrite module"] = "";
-$a->strings["Error: Apache webserver mod-rewrite module is required but not installed."] = "Errore: il modulo mod-rewrite di Apache è richiesto ma non installato";
-$a->strings["Error: libCURL PHP module required but not installed."] = "Errore: il modulo libCURL di PHP è richiesto ma non installato.";
-$a->strings["Error: GD graphics PHP module with JPEG support required but not installed."] = "Errore: Il modulo GD graphics di PHP con supporto a JPEG è richiesto ma non installato.";
-$a->strings["Error: openssl PHP module required but not installed."] = "Errore: il modulo openssl di PHP è richiesto ma non installato.";
-$a->strings["Error: mysqli PHP module required but not installed."] = "Errore: il modulo mysqli di PHP è richiesto ma non installato";
-$a->strings["Error: mb_string PHP module required but not installed."] = "Errore: il modulo PHP mb_string è richiesto ma non installato.";
+$a->strings["Error: Apache webserver mod-rewrite module is required but not installed."] = "Errore: E' il modulo mod-rewrite di Apache è richiesto, ma non risulta installato";
+$a->strings["Error: libCURL PHP module required but not installed."] = "Errore: il modulo libCURL di PHP è richiesto, ma non risulta installato.";
+$a->strings["Error: GD graphics PHP module with JPEG support required but not installed."] = "Errore: Il modulo GD graphics di PHP con supporto a JPEG è richiesto, ma non risulta installato.";
+$a->strings["Error: openssl PHP module required but not installed."] = "Errore: il modulo openssl di PHP è richiesto, ma non risulta installato.";
+$a->strings["Error: mysqli PHP module required but not installed."] = "Errore: il modulo mysqli di PHP è richiesto, ma non risulta installato";
+$a->strings["Error: mb_string PHP module required but not installed."] = "Errore: il modulo PHP mb_string è richiesto, ma non risulta installato.";
 $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'installazione web deve poter creare un file chiamato \".htconfig.php\" nella cartella principale del tuo web server ma non è in grado di farlo.";
-$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."] = "Ciò è dovuto spesso a impostazioni di permessi, dato che il web server puo' scrivere il file nella tua cartella, anche se tu puoi.";
+$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."] = "Ciò è dovuto spesso a impostazioni di permessi, dato che il web server può non essere in grado di scrivere il file nella tua cartella, anche se tu puoi.";
 $a->strings["At the end of this procedure, we will give you a text to save in a file named .htconfig.php in your Friendica top folder."] = "";
 $a->strings["You can alternatively skip this procedure and perform a manual installation. Please see the file \"INSTALL.txt\" for instructions."] = "";
 $a->strings[".htconfig.php is writable"] = ".htconfig.php è scrivibile";
 $a->strings["Url rewrite in .htaccess is not working. Check your server configuration."] = "";
 $a->strings["Url rewrite is working"] = "";
-$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."] = "Il file di configurazione del database \".htconfig.php\" non puo' essere scritto. Usa il testo qui di seguito per creare un file di configurazione nella cartella principale del tuo sito.";
+$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."] = "Il file di configurazione del database \".htconfig.php\" non può essere scritto. Usa il testo qui di seguito per creare un file di configurazione nella cartella principale del tuo sito.";
 $a->strings["Errors encountered creating database tables."] = "La creazione delle tabelle del database ha generato errori.";
 $a->strings["<h1>What next</h1>"] = "";
 $a->strings["IMPORTANT: You will need to [manually] setup a scheduled task for the poller."] = "IMPORTANTE: Devi impostare [manualmente] la pianificazione del poller.";
 $a->strings["l F d, Y \\@ g:i A"] = "l d F Y \\@ G:i";
 $a->strings["Time Conversion"] = "Conversione Ora";
-$a->strings["Friendika provides this service for sharing events with other networks and friends in unknown timezones."] = "Friendika fornisce questo servizio per la condivisione di eventi con altre reti e contatti in fusi orari sconosciuti.";
+$a->strings["Friendica provides this service for sharing events with other networks and friends in unknown timezones."] = "";
 $a->strings["UTC time: %s"] = "Ora UTC: %s";
 $a->strings["Current timezone: %s"] = "Fuso orario corrente: %s";
 $a->strings["Converted localtime: %s"] = "Ora locale convertita: %s";
@ -870,7 +876,7 @@ $a->strings["Last login"] = "Ultimo accesso";
 $a->strings["Last item"] = "Ultimo elemento";
 $a->strings["Account"] = "Account";
 $a->strings["Selected users will be deleted!\\n\\nEverything these users had posted on this site will be permanently deleted!\\n\\nAre you sure?"] = "Gli utenti selezionati saranno cancellati!\\n\\nTutto quello che gli utenti hanno inviato su questo sito sarà permanentemente canellato!\\n\\nSei sicuro?";
-$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'utente {0} sarà cancellato!\\n\\nTutto quello che ha inviato su questo sito sarà permanentemente canellato!\\n\\nSei sicuro?";
+$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'utente {0} sarà cancellato!\\n\\nTutto quello che ha inviato su questo sito sarà permanentemente cancellato!\\n\\nSei sicuro?";
 $a->strings["Plugin %s disabled."] = "Plugin %s disabilitato.";
 $a->strings["Plugin %s enabled."] = "Plugin %s abilitato.";
 $a->strings["Disable"] = "Disabilita";
@ -913,6 +919,7 @@ $a->strings["Login failed."] = "Accesso fallito.";
 $a->strings["Contact added"] = "";
 $a->strings["Common Friends"] = "Amici in comune";
 $a->strings["No contacts in common."] = "";
+$a->strings["%1\$s is following %2\$s's %3\$s"] = "";
 $a->strings["link"] = "";
 $a->strings["Item has been removed."] = "L'oggetto è stato rimosso.";
 $a->strings["Applications"] = "Applicazioni";
@ -1113,9 +1120,6 @@ $a->strings["Hi %1\$s,\n\nThe connection between your accounts on %2\$s and Face
 $a->strings["StatusNet AutoFollow settings updated."] = "";
 $a->strings["StatusNet AutoFollow Settings"] = "";
 $a->strings["Automatically follow any StatusNet followers/mentioners"] = "";
-$a->strings["Bg settings updated."] = "";
-$a->strings["Bg Settings"] = "";
-$a->strings["How many contacts to display on profile sidebar"] = "Quanti contatti visualizzare nella barra laterale del profilo";
 $a->strings["Lifetime of the cache (in hours)"] = "";
 $a->strings["Cache Statistics"] = "";
 $a->strings["Number of items"] = "";
@ -1358,16 +1362,15 @@ $a->strings["Enable dreamwidth Post Plugin"] = "Abilita il plugin dreamwidth";
 $a->strings["dreamwidth username"] = "dreamwidth username";
 $a->strings["dreamwidth password"] = "Password dreamwidth";
 $a->strings["Post to dreamwidth by default"] = "Invia a dreamwidth per impostazione predefinita";
-$a->strings["Post to Drupal"] = "Invia a Drupal";
-$a->strings["Drupal Post Settings"] = "Impostazioni invio a Drupal";
-$a->strings["Enable Drupal Post Plugin"] = "Abilita il plugin di invio a Drupal";
-$a->strings["Drupal username"] = "Drupal username";
-$a->strings["Drupal password"] = "Drupal password";
-$a->strings["Post Type - article,page,or blog"] = "Tipo di post - article,page o blog";
-$a->strings["Drupal site URL"] = "Indirizzo del sito Drupal";
-$a->strings["Drupal site uses clean URLS"] = "Il sito Drupal usa URL puliti";
-$a->strings["Post to Drupal by default"] = "Invia a Drupal per impostazione predefinita";
-$a->strings["Post from Friendica"] = "Messaggio da Friendica";
+$a->strings["Remote Permissions Settings"] = "";
+$a->strings["Allow recipients of your private posts to see the other recipients of the posts"] = "";
+$a->strings["Remote Permissions settings updated."] = "";
+$a->strings["Visible to"] = "";
+$a->strings["may only be a partial list"] = "";
+$a->strings["Global"] = "";
+$a->strings["The posts of every user on this server show the post recipients"] = "";
+$a->strings["Individual"] = "";
+$a->strings["Each user chooses whether his/her posts show the post recipients"] = "";
 $a->strings["Startpage Settings"] = "";
 $a->strings["Home page to load after login  - leave blank for profile wall"] = "";
 $a->strings["Examples: &quot;network&quot; or &quot;notifications/system&quot;"] = "";
@ -1384,15 +1387,13 @@ $a->strings["No files were uploaded."] = "Nessun file è stato caricato.";
 $a->strings["Uploaded file is empty"] = "Il file caricato è vuoto";
 $a->strings["File has an invalid extension, it should be one of "] = "Il file ha un'estensione non valida, dovrebbe essere una tra ";
 $a->strings["Upload was cancelled, or server error encountered"] = "Il caricamento è stato cancellato, o si è verificato un errore sul server";
-$a->strings["OEmbed settings updated"] = "Impostazioni OEmbed aggiornate";
-$a->strings["Use OEmbed for YouTube videos"] = "Usa OEmbed per i video di YouTube";
-$a->strings["URL to embed:"] = "URL da incorporare:";
 $a->strings["show/hide"] = "";
 $a->strings["No forum subscriptions"] = "";
 $a->strings["Forumlist settings updated."] = "";
 $a->strings["Forumlist Settings"] = "";
 $a->strings["Randomise forum list"] = "";
 $a->strings["Show forums on profile page"] = "";
+$a->strings["Show forums on network page"] = "";
 $a->strings["Impressum"] = "Impressum";
 $a->strings["Site Owner"] = "Proprietario del sito";
 $a->strings["Email Address"] = "Indirizzo email";
@ -1524,6 +1525,7 @@ $a->strings["Tumblr password"] = "Tumblr password";
 $a->strings["Post to Tumblr by default"] = "Pubblica su Tumblr di default";
 $a->strings["Numfriends settings updated."] = "Impostazioni \"Numfriends' aggiornate.";
 $a->strings["Numfriends Settings"] = "Impostazioni Numfriends";
+$a->strings["How many contacts to display on profile sidebar"] = "Quanti contatti visualizzare nella barra laterale del profilo";
 $a->strings["Gnot settings updated."] = "Impostazioni di \"Gnot\" aggiornate.";
 $a->strings["Gnot Settings"] = "Impostazioni Gnot";
 $a->strings["Allows threading of email comment notifications on Gmail and anonymising the subject line."] = "Permetti di raggruppare le notifiche dei commenti in thread su Gmail e anonimizza l'oggetto";
@ -1537,6 +1539,7 @@ $a->strings["WordPress password"] = "password WordPress";
 $a->strings["WordPress API URL"] = "WordPress API URL";
 $a->strings["Post to WordPress by default"] = "Pubblica su WordPress di default";
 $a->strings["Provide a backlink to the Friendica post"] = "";
+$a->strings["Post from Friendica"] = "Messaggio da Friendica";
 $a->strings["Read the original post and comment stream on Friendica"] = "";
 $a->strings["\"Show more\" Settings"] = "Impostazioni \"Mostra altro\"";
 $a->strings["Enable Show More"] = "Abilita \"Mostra altro\"";
@ -1628,6 +1631,8 @@ $a->strings["Last tweets"] = "";
 $a->strings["Alignment"] = "Allineamento";
 $a->strings["Left"] = "Sinistra";
 $a->strings["Center"] = "Centrato";
+$a->strings["Posts font size"] = "";
+$a->strings["Textareas font size"] = "";
 $a->strings["Set colour scheme"] = "";
 $a->strings["j F, Y"] = "j F Y";
 $a->strings["j F"] = "j F";
@ -1954,6 +1959,7 @@ $a->strings["Categories:"] = "";
 $a->strings["Filed under:"] = "";
 $a->strings["remove"] = "rimuovi";
 $a->strings["Delete Selected Items"] = "Cancella elementi selezionati";
+$a->strings["Follow Thread"] = "";
 $a->strings["%s likes this."] = "Piace a %s.";
 $a->strings["%s doesn't like this."] = "Non piace a %s.";
 $a->strings["<span  %1\$s>%2\$d people</span> like this."] = "Piace a <span %1\$s>%2\$d persone</span>.";
@ -1967,15 +1973,6 @@ $a->strings["Please enter a video link/URL:"] = "Inserisci un collegamento video
 $a->strings["Please enter an audio link/URL:"] = "Inserisci un collegamento audio / URL:";
 $a->strings["Tag term:"] = "Tag:";
 $a->strings["Where are you right now?"] = "Dove sei ora?";
-$a->strings["upload photo"] = "carica foto";
-$a->strings["attach file"] = "allega file";
-$a->strings["web link"] = "link web";
-$a->strings["Insert video link"] = "Inserire collegamento video";
-$a->strings["video link"] = "link video";
-$a->strings["Insert audio link"] = "Inserisci collegamento audio";
-$a->strings["audio link"] = "link audio";
-$a->strings["set location"] = "posizione";
-$a->strings["clear location"] = "canc. pos.";
 $a->strings["permissions"] = "permessi";
 $a->strings["Click here to upgrade."] = "";
 $a->strings["This action exceeds the limits set by your subscription plan."] = "";
@ -2004,3 +2001,18 @@ $a->strings["Status Messages and Posts"] = "";
 $a->strings["Profile Details"] = "";
 $a->strings["Events and Calendar"] = "";
 $a->strings["Only You Can See This"] = "";
+$a->strings["toggle mobile"] = "";
+$a->strings["Bg settings updated."] = "";
+$a->strings["Bg Settings"] = "";
+$a->strings["Post to Drupal"] = "Invia a Drupal";
+$a->strings["Drupal Post Settings"] = "Impostazioni invio a Drupal";
+$a->strings["Enable Drupal Post Plugin"] = "Abilita il plugin di invio a Drupal";
+$a->strings["Drupal username"] = "Drupal username";
+$a->strings["Drupal password"] = "Drupal password";
+$a->strings["Post Type - article,page,or blog"] = "Tipo di post - article,page o blog";
+$a->strings["Drupal site URL"] = "Indirizzo del sito Drupal";
+$a->strings["Drupal site uses clean URLS"] = "Il sito Drupal usa URL puliti";
+$a->strings["Post to Drupal by default"] = "Invia a Drupal per impostazione predefinita";
+$a->strings["OEmbed settings updated"] = "Impostazioni OEmbed aggiornate";
+$a->strings["Use OEmbed for YouTube videos"] = "Usa OEmbed per i video di YouTube";
+$a->strings["URL to embed:"] = "URL da incorporare:";
--- a/view/it/wall_received_html_body_eml.tpl
+++ b/view/it/wall_received_html_body_eml.tpl
@ -1,13 +1,13 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN">
 <html>
 <head>
-	<title>Messaggio da Friendika</title>
+	<title>Messaggio da 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:#084769; 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; float:left;" src='$siteurl/images/friendika-32.png'><div style="padding:7px; margin-left: 5px; float:left; font-size:18px;letter-spacing:1px;">Friendika</div><div style="clear: both;"></div></td></tr>
+	<tr><td colspan="2" style="background:#084769; 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; float:left;" src='$siteurl/images/friendica-32.png'><div style="padding:7px; margin-left: 5px; float:left; font-size:18px;letter-spacing:1px;">Friendica</div><div style="clear: both;"></div></td></tr>

 	<tr><td style="padding-top:22px;" colspan="2">$from ha scritto sulla tua bacheca.</td></tr>

--- a/view/nav.tpl
+++ b/view/nav.tpl
@ -10,7 +10,7 @@

 	{{ if $nav.register }}<a id="nav-register-link" class="nav-commlink $nav.register.2 $sel.register" href="$nav.register.0" title="$nav.register.3" >$nav.register.1</a>{{ endif }}
 		
-	{{ if $nav.help }} <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>{{ endif }}
+	{{ if $nav.help }} <a id="nav-help-link" class="nav-link $nav.help.2" target="friendica-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a>{{ endif }}
 		
 	{{ 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/view/nb-no/messages.po
+++ b/view/nb-no/messages.po
@ -1211,7 +1211,7 @@ msgstr "Tidskonvertering"

 #: ../../mod/localtime.php:26
 msgid ""
-"Friendika provides this service for sharing events with other networks and "
+"Friendica provides this service for sharing events with other networks and "
 "friends in unknown timezones."
 msgstr "Friendica har denne tjenesten for å dele hendelser med andre nettverk og venner i ukjente tidssoner."

--- a/view/nb-no/strings.php
+++ b/view/nb-no/strings.php
@ -249,7 +249,7 @@ $a->strings["<h1>What next</h1>"] = "";
 $a->strings["IMPORTANT: You will need to [manually] setup a scheduled task for the poller."] = "VIKTIG: Du må [manuelt] sette opp en planlagt oppgave for oppdatering.";
 $a->strings["l F d, Y \\@ g:i A"] = "";
 $a->strings["Time Conversion"] = "Tidskonvertering";
-$a->strings["Friendika provides this service for sharing events with other networks and friends in unknown timezones."] = "Friendica har denne tjenesten for å dele hendelser med andre nettverk og venner i ukjente tidssoner.";
+$a->strings["Friendica provides this service for sharing events with other networks and friends in unknown timezones."] = "Friendica har denne tjenesten for å dele hendelser med andre nettverk og venner i ukjente tidssoner.";
 $a->strings["UTC time: %s"] = "UTC tid: %s";
 $a->strings["Current timezone: %s"] = "Gjeldende tidssone: %s";
 $a->strings["Converted localtime: %s"] = "Konvertert lokaltid: %s";
--- a/view/oexchange_xrd.tpl
+++ b/view/oexchange_xrd.tpl
@ -4,23 +4,23 @@
    <Subject>$base</Subject>

    <Property 
-        type="http://www.oexchange.org/spec/0.8/prop/vendor">Friendika</Property>
+        type="http://www.oexchange.org/spec/0.8/prop/vendor">Friendica</Property>
    <Property 
-        type="http://www.oexchange.org/spec/0.8/prop/title">Friendika Social Network</Property>
+        type="http://www.oexchange.org/spec/0.8/prop/title">Friendica Social Network</Property>
    <Property 
-        type="http://www.oexchange.org/spec/0.8/prop/name">Friendika</Property>
+        type="http://www.oexchange.org/spec/0.8/prop/name">Friendica</Property>
    <Property 
-        type="http://www.oexchange.org/spec/0.8/prop/prompt">Send to Friendika</Property>
+        type="http://www.oexchange.org/spec/0.8/prop/prompt">Send to Friendica</Property>

    <Link 
        rel="icon" 
-        href="$base/images/friendika-16.png"
+        href="$base/images/friendica-16.png"
        type="image/png" 
        />

    <Link 
        rel="icon32" 
-        href="$base/images/friendika-32.png"
+        href="$base/images/friendica-32.png"
        type="image/png" 
        />

--- a/view/pt-br/messages.po
+++ b/view/pt-br/messages.po
@ -1216,7 +1216,7 @@ 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 "Não foi possível gravar o arquivo de configuração \".htconfig.php\". Por favor, use o texto incluso para criar um arquivo de configuração na raiz da instalação do Friendika em seu servidor web."
+msgstr "Não foi possível gravar o arquivo de configuração \".htconfig.php\". Por favor, use o texto incluso para criar um arquivo de configuração na raiz da instalação do Friendica em seu servidor web."

 #: ../../mod/install.php:475
 msgid "Errors encountered creating database tables."
@ -1243,7 +1243,7 @@ msgstr "Conversão de tempo"

 #: ../../mod/localtime.php:26
 msgid ""
-"Friendika provides this service for sharing events with other networks and "
+"Friendica provides this service for sharing events with other networks and "
 "friends in unknown timezones."
 msgstr "Friendica fornece este serviço para compartilhar eventos com outras redes e amigos em fusos horários diferentes."

--- a/view/pt-br/strings.php
+++ b/view/pt-br/strings.php
@ -249,13 +249,13 @@ $a->strings["You can alternatively skip this procedure and perform a manual inst
 $a->strings[".htconfig.php is writable"] = ".htconfig.php tem permissão de escrita";
 $a->strings["Url rewrite in .htaccess is not working. Check your server configuration."] = "A reescrita de URLs definida no .htaccess não está funcionando. Por favor, verifique as configurações do seu servidor.";
 $a->strings["Url rewrite is working"] = "A reescrita de URLs está funcionando";
-$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."] = "Não foi possível gravar o arquivo de configuração \".htconfig.php\". Por favor, use o texto incluso para criar um arquivo de configuração na raiz da instalação do Friendika em seu servidor web.";
+$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."] = "Não foi possível gravar o arquivo de configuração \".htconfig.php\". Por favor, use o texto incluso para criar um arquivo de configuração na raiz da instalação do Friendica em seu servidor web.";
 $a->strings["Errors encountered creating database tables."] = "Foram encontrados erros durante a criação das tabelas do banco de dados.";
 $a->strings["<h1>What next</h1>"] = "<h1>A seguir</h1>";
 $a->strings["IMPORTANT: You will need to [manually] setup a scheduled task for the poller."] = "IMPORTANTE: Você deve configurar [manualmente] uma tarefa agendada para o captador.";
 $a->strings["l F d, Y \\@ g:i A"] = "l F d, Y \\@ H:i";
 $a->strings["Time Conversion"] = "Conversão de tempo";
-$a->strings["Friendika provides this service for sharing events with other networks and friends in unknown timezones."] = "Friendica fornece este serviço para compartilhar eventos com outras redes e amigos em fusos horários diferentes.";
+$a->strings["Friendica provides this service for sharing events with other networks and friends in unknown timezones."] = "Friendica fornece este serviço para compartilhar eventos com outras redes e amigos em fusos horários diferentes.";
 $a->strings["UTC time: %s"] = "Hora UTC: %s";
 $a->strings["Current timezone: %s"] = "Fuso horário atual: %s";
 $a->strings["Converted localtime: %s"] = "Horário local convertido: %s";
--- a/view/ru/messages.po
+++ b/view/ru/messages.po
@ -906,7 +906,7 @@ msgstr "Запрос в друзья / на подключение"
 msgid ""
 "Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, "
 "testuser@identi.ca"
-msgstr "Примеры: jojo@demo.friendika.com, http://demo.friendika.com/profile/jojo, testuser@identi.ca"
+msgstr "Примеры: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@identi.ca"

 #: ../../mod/dfrn_request.php:833
 msgid "Please answer the following:"
@ -1214,7 +1214,7 @@ msgstr "История общения"

 #: ../../mod/localtime.php:26
 msgid ""
-"Friendika provides this service for sharing events with other networks and "
+"Friendica provides this service for sharing events with other networks and "
 "friends in unknown timezones."
 msgstr ""

--- a/view/ru/strings.php
+++ b/view/ru/strings.php
@ -184,7 +184,7 @@ $a->strings["Please enter your 'Identity Address' from one of the following supp
 $a->strings["<strike>Connect as an email follower</strike> (Coming soon)"] = "";
 $a->strings["If you are not yet a member of the free social web, <a href=\"http://dir.friendica.com/siteinfo\">follow this link to find a public Friendica site and join us today</a>."] = "";
 $a->strings["Friend/Connection Request"] = "Запрос в друзья / на подключение";
-$a->strings["Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@identi.ca"] = "Примеры: jojo@demo.friendika.com, http://demo.friendika.com/profile/jojo, testuser@identi.ca";
+$a->strings["Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@identi.ca"] = "Примеры: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@identi.ca";
 $a->strings["Please answer the following:"] = "Пожалуйста, ответьте следующее:";
 $a->strings["Does %s know you?"] = "%s знает вас?";
 $a->strings["Add a personal note:"] = "Добавить личную заметку:";
@ -250,7 +250,7 @@ $a->strings["<h1>What next</h1>"] = "";
 $a->strings["IMPORTANT: You will need to [manually] setup a scheduled task for the poller."] = "ВАЖНО: Вам нужно будет [вручную] установить запланированное задание для регистратора.";
 $a->strings["l F d, Y \\@ g:i A"] = "l F d, Y \\@ g:i A";
 $a->strings["Time Conversion"] = "История общения";
-$a->strings["Friendika provides this service for sharing events with other networks and friends in unknown timezones."] = "";
+$a->strings["Friendica provides this service for sharing events with other networks and friends in unknown timezones."] = "";
 $a->strings["UTC time: %s"] = "UTC время: %s";
 $a->strings["Current timezone: %s"] = "Ваш часовой пояс: %s";
 $a->strings["Converted localtime: %s"] = "Ваше изменённое время: %s";
--- a/view/sv/follow_notify_eml.tpl
+++ b/view/sv/follow_notify_eml.tpl
@ -1,6 +1,6 @@
 $myname,

-'$requestor' på $sitename vill följa dina uppdateringar här på Friendika.
+'$requestor' på $sitename vill följa dina uppdateringar här på Friendica.

 Besök dennes profil på $url.

--- a/view/sv/mail_received_html_body_eml.tpl
+++ b/view/sv/mail_received_html_body_eml.tpl
@ -1,13 +1,13 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN">
 <html>
 <head>
-	<title>Meddelande p&aring; Friendika</title>
+	<title>Meddelande p&aring; 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;">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/friendica-32.png'><span style="padding:7px;">Friendica</span></td></tr>

 	<tr><td style="padding-top:22px;" colspan="2">$from har skickat ett personligt meddelande till dig p&aring; $siteName.</td></tr>

--- a/view/sv/strings.php
+++ b/view/sv/strings.php
@ -204,14 +204,14 @@ $a->strings['Confirm'] = 'Bekr&auml;fta';
 $a->strings['[Name Withheld]'] = '[Namnet visas inte]';
 $a->strings["Introduction received at "] = "Inkommen kontaktf&ouml;rfr&aring;gan/presentation - ";
 $a->strings['Friend/Connection Request'] = 'V&auml;n- eller kontaktf&ouml;rfr&aring;gan';
-$a->strings['Examples: jojo@demo.friendika.com, http://demo.friendika.com/profile/jojo, testuser@identi.ca'] = 'Examples: jojo@demo.friendika.com, http://demo.friendika.com/profile/jojo, testuser@identi.ca';
+$a->strings['Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@identi.ca'] = 'Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@identi.ca';
 $a->strings['Please answer the following:'] = 'Var v&auml;nlig besvara f&ouml;ljande:';
 $a->strings['Does $name know you?'] = 'K&auml;nner $name dig?';
 $a->strings['Yes'] = 'Ja';
 $a->strings['No'] = 'Nej';
 $a->strings['Add a personal note:'] = 'L&auml;gg till ett personligt meddelande:';
 $a->strings["Please enter your 'Identity Address' from one of the following supported social networks:"] = "Ange din adress, ditt ID, p&aring; ett av f&ouml;ljande sociala n&auml;tverk:";
-$a->strings['Friendika'] = 'Friendika';
+$a->strings['Friendica'] = 'Friendica';
 $a->strings['StatusNet/Federated Social Web'] = 'StatusNet/Federated Social Web';
 $a->strings["Private \x28secure\x29 network"] = "Privat (s&auml;kert) n&auml;tverk";
 $a->strings["Public \x28insecure\x29 network"] = "Offentligt (os&auml;kert) n&auml;tverk";
@ -236,12 +236,12 @@ $a->strings['The profile address specified does not provide adequate information
 $a->strings['Limited profile. This person will be unable to receive direct/personal notifications from you.'] = 'Begr&auml;nsad profil. Den h&auml;r personen kommer inte att kunna ta emot personliga meddelanden fr&aring;n dig.';
 $a->strings['Unable to retrieve contact information.'] = 'Det gick inte att komma &aring;t kontaktinformationen.';
 $a->strings['following'] = 'f&ouml;ljer';
-$a->strings['This is Friendika version'] = 'Det h&auml;r &auml;r Friendika version';
+$a->strings['This is Friendica version'] = 'Det h&auml;r &auml;r Friendica version';
 $a->strings['running at web location'] = 'som k&ouml;rs p&aring;';
-$a->strings['Shared content within the Friendika network is provided under the <a href="http://creativecommons.org/licenses/by/3.0/">Creative Commons Attribution 3.0 license</a>'] = 'Inneh&aring;ll som publiceras inom Friendikan&auml;tverket omfattas av licensen <a href="http://creativecommons.org/licenses/by/3.0/">Creative Commons Attribution 3.0 license</a>';
-$a->strings['Please visit <a href="http://project.friendika.com">Project.Friendika.com</a> to learn more about the Friendika project.'] = 'G&aring; till <a href="http://project.friendika.com">Project.Friendika.com</a> om du vill l&auml;sa mer om friendikaprojektet.';
+$a->strings['Shared content within the Friendica network is provided under the <a href="http://creativecommons.org/licenses/by/3.0/">Creative Commons Attribution 3.0 license</a>'] = 'Inneh&aring;ll som publiceras inom Friendican&auml;tverket omfattas av licensen <a href="http://creativecommons.org/licenses/by/3.0/">Creative Commons Attribution 3.0 license</a>';
+$a->strings['Please visit <a href="http://project.friendica.com">Project.Friendica.com</a> to learn more about the Friendica project.'] = 'G&aring; till <a href="http://project.friendica.com">Project.Friendica.com</a> om du vill l&auml;sa mer om friendicaprojektet.';
 $a->strings['Bug reports and issues: please visit'] = 'Anm&auml;l buggar eller andra problem, g&aring; till';
-$a->strings['Suggestions, praise, donations, etc. - please email "Info" at Friendika - dot com'] = 'F&ouml;rslag, ber&ouml;m, donationer, etc. - skicka e-post till "info at friendika punkt com" ';
+$a->strings['Suggestions, praise, donations, etc. - please email "Info" at Friendica - dot com'] = 'F&ouml;rslag, ber&ouml;m, donationer, etc. - skicka e-post till "info at friendica punkt com" ';
 $a->strings['Installed plugins/addons/apps'] = 'Installerade insticksprogram/applikationer';
 $a->strings['No installed plugins/addons/apps'] = 'Inga installerade insticksprogram/applikationer';
 $a->strings['Group created.'] = 'Gruppen har skapats.';
@ -263,16 +263,16 @@ $a->strings["Welcome to %s"] = "V&auml;lkommen till %s";
 $a->strings['Could not create/connect to database.'] = 'Det gick inte att skapa eller ansluta till databasen.';
 $a->strings['Connected to database.'] = 'Ansluten till databasen.';
 $a->strings['Proceed with Installation'] = 'Forts&auml;tt med installationen';
-$a->strings['Your Friendika site database has been installed.'] = 'Databasen f&ouml;r din friendikasajt har installerats.';
+$a->strings['Your Friendica site database has been installed.'] = 'Databasen f&ouml;r din friendicasajt har installerats.';
 $a->strings['IMPORTANT: You will need to [manually] setup a scheduled task for the poller.'] = 'IMPORTANT: You will need to [manually] setup a scheduled task for the poller.';
 $a->strings['Please see the file "INSTALL.txt".'] = 'Se filen "INSTALL.txt".';
 $a->strings['Proceed to registration'] = 'G&aring; vidare till registreringen';
 $a->strings['Database import failed.'] = 'Det gick inte att importera databasen.';
 $a->strings['You may need to import the file "database.sql" manually using phpmyadmin or mysql.'] = 'Du kanske m&aring;ste importera filen "database.sql" manuellt med phpmyadmin eller mysql.';
-$a->strings['Welcome to Friendika.'] = 'V&auml;lkommen till Friendika.';
-$a->strings['Friendika Social Network'] = 'Det sociala n&auml;tverket Friendika';
+$a->strings['Welcome to Friendica.'] = 'V&auml;lkommen till Friendica.';
+$a->strings['Friendica Social Network'] = 'Det sociala n&auml;tverket Friendica';
 $a->strings['Installation'] = 'Installation';
-$a->strings['In order to install Friendika we need to know how to contact your database.'] = 'In order to install Friendika we need to know how to contact your database.';
+$a->strings['In order to install Friendica we need to know how to contact your database.'] = 'In order to install Friendica we need to know how to contact your database.';
 $a->strings['Please contact your hosting provider or site administrator if you have questions about these settings.'] = 'Please contact your hosting provider or site administrator if you have questions about these settings.';
 $a->strings['The database you specify below must already exist. If it does not, please create it before continuing.'] = 'The database you specify below must already exist. If it does not, please create it before continuing.';
 $a->strings['Database Server Name'] = 'Database Server Name';
@ -732,7 +732,7 @@ $a->strings['Randplace Settings'] = 'Randplace Settings';
 $a->strings['Enable Randplace Plugin'] = 'Enable Randplace Plugin';
 $a->strings['Post to StatusNet'] = 'L&auml;gg in p&aring; StatusNet';
 $a->strings['StatusNet Posting Settings'] = 'Inst&auml;llningar f&ouml;r inl&auml;gg p&aring; StatusNet';
-$a->strings['No consumer key pair for StatusNet found. Register your Friendika 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 Friendika installation at your favorited StatusNet installation.'] = 'No consumer key pair for StatusNet found. Register your Friendika 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 Friendika installation at your favorited StatusNet installation.';
+$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 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.';
 $a->strings['OAuth Consumer Key'] = 'OAuth Consumer Key';
 $a->strings['OAuth Consumer Secret'] = 'OAuth Consumer Secret';
 $a->strings["Base API Path \x28remember the trailing /\x29"] = "Base API Path \x28remember the trailing /\x29";
@ -758,7 +758,7 @@ $a->strings['I won!'] = 'Jag vann!';
 $a->strings['Post to Twitter'] = 'L&auml;gg in p&aring; Twitter';
 $a->strings['Twitter Posting Settings'] = 'Inst&auml;llningar f&ouml;r inl&auml;gg p&aring; Twitter';
 $a->strings['No consumer key pair for Twitter found. Please contact your site administrator.'] = 'No consumer key pair for Twitter found. Please contact your site administrator.';
-$a->strings['At this Friendika 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.'] = 'At this Friendika 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.';
+$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.'] = '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.';
 $a->strings['Copy the PIN from Twitter here'] = 'Ange PIN-koden fr&aring;n Twitter h&auml;r';
 $a->strings['If enabled all your <strong>public</strong> postings will be posted to the associated Twitter account as well.'] = 'If enabled all your <strong>public</strong> postings will be posted to the associated Twitter account as well.';
 $a->strings['Send public postings to Twitter'] = 'Send public postings to Twitter';
--- a/view/theme/cleanzero/nav.tpl
+++ b/view/theme/cleanzero/nav.tpl
@ -43,7 +43,7 @@
 	<span id="nav-link-wrapper">
 	{{ 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 }}
-	{{ if $nav.help }} <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>{{ endif }}
+	{{ if $nav.help }} <a id="nav-help-link" class="nav-link $nav.help.2" target="friendica-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a>{{ endif }}
 		
 	{{ 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/view/theme/darkzero/style.css
+++ b/view/theme/darkzero/style.css
@ -40,6 +40,9 @@ nav #banner #logo-text a { color: #ffffff; }
 	-moz-border-radius: 0px 0px 3px 3px;
 	border-radius: 0px 0px 3px 3px;	
 }
+.editicon {
+    	background-color: #333;
+}
 .comment-edit-preview{ color: #000000; }
 .wall-item-content-wrapper.comment { background-color: #444444; border: 0px;}
 .photo-top-album-name{ background-color: #333333; }
@ -67,6 +70,18 @@ nav #banner #logo-text a { color: #ffffff; }
 .wall-item-photo-menu li a:hover {
 	background-color: #CCCCCC; color: #333333;
 }
+
+code {
+  background:#2e2f2e !important;
+  color:#fff !important;
+}
+
+blockquote {
+  background:#2e2f2e !important;
+  color:#eec !important;
+}
+
+
 #page-footer { min-height: 1em;}
 footer {
 	margin: 0px 10%;
@ -108,14 +123,13 @@ input#dfrn-url {
 #jot-category:focus {
 	border: 1px solid #cccccc; 
 }
-blockquote {
-	background: #ddd;
-	color: #000;
-}

 .acl-list-item p, #profile-jot-email-label, div#jot-preview-content, div.profile-jot-net {
        color: #eec;
 }
+#fancybox-content{
+  background:#444;
+}

 input#acl-search {
        background-color: #aaa;
@ -138,45 +152,10 @@ input#acl-search {
  background:#2e2f2e;
 }

-code {
-  background:#2e2f2e !important;
-  color:#fff !important;
-}
-
-blockquote {
-  background:#2e2f2e !important;
-  color:#eec !important;
-}
-
 .group-selected, .nets-selected, .fileas-selected, .categories-selected{
  background:#2e2f2e;
 }

-#fancybox-content{
-  background:#444;
-}
-
-.editicon {
-    	background-color: #333;
-}
-
-#datebrowse-sidebar select {
-color:#99CCFF !important;
-}
-
-.settings-widget .selected {
-background: #666;
-}
-
-#adminpage table tr:hover {
-    color: #eec;
-    background-color: #666;
-}
-
-input#prvmail-subject {
-background: #222 !important;
-}
-
 /* Events */

 .fc-state-highlight {
@ -186,3 +165,25 @@ background: #666 !important;
 .fc-state-disabled, .fc-state-disabled .fc-button-inner {
 color: #000 !important;
 }
+
+/*Admin page */
+
+#adminpage table tr:hover {
+    color: #eec;
+    background-color: #666;
+}
+
+.settings-widget .selected {
+background: #666;
+}
+
+
+/* Stuff that doesn't seem to fit with anything else */
+
+#datebrowse-sidebar select {
+color:#99CCFF !important;
+}
+
+input#prvmail-subject {
+background: #222 !important;
+}
--- a/view/theme/diabook/admin_site.tpl
+++ b/view/theme/diabook/admin_site.tpl
@ -1,61 +0,0 @@
-<script>
-	$(function(){
-				var theme = $("#id_theme :selected").val();
-				$("#cnftheme").attr('href',"$baseurl/admin/themes/"+theme);
-	});
-</script>
-<div id='adminpage'>
-	<h1>$title - $page</h1>
-	
-	<form action="$baseurl/admin/site" method="post">
-	    <input type='hidden' name='form_security_token' value='$form_security_token'>
-	{{ inc field_input.tpl with $field=$sitename }}{{ endinc }}
-	{{ inc field_textarea.tpl with $field=$banner }}{{ endinc }}
-	{{ inc field_select.tpl with $field=$language }}{{ endinc }}
-	{{ inc field_select.tpl with $field=$theme }}{{ endinc }}
-	{{ inc field_select.tpl with $field=$ssl_policy }}{{ endinc }}
-	
-	<div class="submit"><input type="submit" name="page_site" value="$submit" /></div>
-	
-	<h3>$registration</h3>
-	{{ inc field_input.tpl with $field=$register_text }}{{ endinc }}
-	{{ inc field_select.tpl with $field=$register_policy }}{{ endinc }}
-	
-	{{ inc field_checkbox.tpl with $field=$no_multi_reg }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$no_openid }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$no_regfullname }}{{ endinc }}
-	
-	<div class="submit"><input type="submit" name="page_site" value="$submit" /></div>
-
-	<h3>$upload</h3>
-	{{ inc field_input.tpl with $field=$maximagesize }}{{ endinc }}
-	
-	<h3>$corporate</h3>
-	{{ inc field_input.tpl with $field=$allowed_sites }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$allowed_email }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$block_public }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$force_publish }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$no_community_page }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$ostatus_disabled }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$diaspora_enabled }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$dfrn_only }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$thread_allow }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$global_directory }}{{ endinc }}
-	
-	<div class="submit"><input type="submit" name="page_site" value="$submit" /></div>
-	
-	<h3>$advanced</h3>
-	{{ inc field_checkbox.tpl with $field=$no_utf }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$verifyssl }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$proxy }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$proxyuser }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$timeout }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$delivery_interval }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$poll_interval }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$maxloadavg }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$abandon_days }}{{ endinc }}
-	
-	<div class="submit"><input type="submit" name="page_site" value="$submit" /></div>
-	
-	</form>
-</div>
--- a/view/theme/diabook/admin_users.tpl
+++ b/view/theme/diabook/admin_users.tpl
@ -1,88 +0,0 @@
-<script>
-	function confirm_delete(uname){
-		return confirm( "$confirm_delete".format(uname));
-	}
-	function confirm_delete_multi(){
-		return confirm("$confirm_delete_multi");
-	}
-	function selectall(cls){
-		$("."+cls).attr('checked','checked');
-		return false;
-	}
-</script>
-<div id='adminpage'>
-	<h1>$title - $page</h1>
-	
-	<form action="$baseurl/admin/users" method="post">
-		        <input type='hidden' name='form_security_token' value='$form_security_token'>
-		<h3>$h_pending</h3>
-		{{ if $pending }}
-			<table id='pending'>
-				<thead>
-				<tr>
-					{{ for $th_pending as $th }}<th>$th</th>{{ endfor }}
-					<th></th>
-					<th></th>
-				</tr>
-				</thead>
-				<tbody>
-			{{ for $pending as $u }}
-				<tr>
-					<td class="created">$u.created</td>
-					<td class="name">$u.name</td>
-					<td class="email">$u.email</td>
-					<td class="checkbox"><input type="checkbox" class="pending_ckbx" id="id_pending_$u.hash" name="pending[]" value="$u.hash" /></td>
-					<td class="tools">
-						<a href="$baseurl/regmod/allow/$u.hash" title='$approve'><span class='icon like'></span></a>
-						<a href="$baseurl/regmod/deny/$u.hash" title='$deny'><span class='icon dislike'></span></a>
-					</td>
-				</tr>
-			{{ endfor }}
-				</tbody>
-			</table>
-			<div class='selectall'><a href='#' onclick="return selectall('pending_ckbx');">$select_all</a></div>
-			<div class="submit"><input type="submit" name="page_users_deny" value="$deny"/> <input type="submit" name="page_users_approve" value="$approve" /></div>			
-		{{ else }}
-			<p>$no_pending</p>
-		{{ endif }}
-	
-	
-		
-	
-		<h3>$h_users</h3>
-		{{ if $users }}
-			<table id='users'>
-				<thead>
-				<tr>
-					<th></th>
-					{{ for $th_users as $th }}<th>$th</th>{{ endfor }}
-					<th></th>
-					<th></th>
-				</tr>
-				</thead>
-				<tbody>
-				{{ for $users as $u }}
-					<tr>
-						<td><img src="$u.micro" alt="$u.nickname" title="$u.nickname"></td>
-						<td class='name'><a href="$u.url" title="$u.nickname" >$u.name</a></td>
-						<td class='email'>$u.email</td>
-						<td class='register_date'>$u.register_date</td>
-						<td class='login_date'>$u.login_date</td>
-						<td class='lastitem_date'>$u.lastitem_date</td>
-						<td class='login_date'>$u.page-flags</td>
-						<td class="checkbox"><input type="checkbox" class="users_ckbx" id="id_user_$u.uid" name="user[]" value="$u.uid"/></td>
-						<td class="tools" style="width:60px;">
-							<a href="$baseurl/admin/users/block/$u.uid?t=$form_security_token" title='{{ if $u.blocked }}$unblock{{ else }}$block{{ endif }}'><span class='icon block {{ if $u.blocked==0 }}dim{{ endif }}'></span></a>
-							<a href="$baseurl/admin/users/delete/$u.uid?t=$form_security_token" title='$delete' onclick="return confirm_delete('$u.name')"><span class='icon ad_drop'></span></a>
-						</td>
-					</tr>
-				{{ endfor }}
-				</tbody>
-			</table>
-			<div class='selectall'><a href='#' onclick="return selectall('users_ckbx');">$select_all</a></div>
-			<div class="submit"><input type="submit" name="page_users_block" value="$block/$unblock" /> <input type="submit" name="page_users_delete" value="$delete" onclick="return confirm_delete_multi()" /></div>						
-		{{ else }}
-			NO USERS?!?
-		{{ endif }}
-	</form>
-</div>
--- a/view/theme/diabook/contact_template.tpl
+++ b/view/theme/diabook/contact_template.tpl
@ -1,25 +0,0 @@
-
-<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>
--- a/view/theme/diabook/experimental
+++ b/view/theme/diabook/experimental
--- a/view/theme/diabook/message_side.tpl
+++ b/view/theme/diabook/message_side.tpl
@ -1,10 +0,0 @@
-<div id="message-sidebar" class="widget">
-	<div id="message-new" class="{{ if $new.sel }}selected{{ endif }}"><a href="$new.url">$new.label</a> </div>
-	
-	<ul class="message-ul">
-		{{ for $tabs as $t }}
-			<li class="tool {{ if $t.sel }}selected{{ endif }}"><a href="$t.url" class="message-link">$t.label</a></li>
-		{{ endfor }}
-	</ul>
-	
-</div>
--- a/view/theme/diabook/nav.tpl
+++ b/view/theme/diabook/nav.tpl
@ -68,7 +68,7 @@
 			<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 }}									
+				{{ if $nav.help }} <li><a class="$nav.help.2" target="friendica-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a></li>{{ endif }}									
 										
 										 <li><a class="$nav.search.2" href="friendica" title="Site Info / Impressum" >Info/Impressum</a></li>
 										
@ -158,7 +158,7 @@

 {{ 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>
+<a id="nav-help-link" class="nav-link $nav.help.2" target="friendica-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/view/theme/diabook/right_aside.tpl
+++ b/view/theme/diabook/right_aside.tpl
@ -11,7 +11,7 @@
 	<li id="profile-side-photos" class="menu-profile-list photos"><a class="menu-profile-list-item" href="$ps.usermenu.photos.0">$ps.usermenu.photos.1</a></li>
 	<li id="profile-side-events" class="menu-profile-list events"><a class="menu-profile-list-item" href="$ps.usermenu.events.0">$ps.usermenu.events.1</a></li>
 	<li id="profile-side-notes" class="menu-profile-list notes"><a class="menu-profile-list-item" href="$ps.usermenu.notes.0">$ps.usermenu.notes.1</a></li>
-	<li id="profile-side-foren" class="menu-profile-list foren"><a class="menu-profile-list-item" href="http://dir.friendika.com/directory/forum" target="blanc">Public Groups</a></li>
+	<li id="profile-side-foren" class="menu-profile-list foren"><a class="menu-profile-list-item" href="http://dir.friendica.com/directory/forum" target="blanc">Public Groups</a></li>
 	<li id="profile-side-foren" class="menu-profile-list com_side"><a class="menu-profile-list-item" href="$ps.usermenu.community.0">$ps.usermenu.community.1</a></li>
 </ul>

--- a/view/theme/diabook/theme.php
+++ b/view/theme/diabook/theme.php
@ -37,7 +37,6 @@ load_config("diabook");
 load_pconfig(local_user(), "diabook");

 //get statuses of boxes at right-hand-column
-$close_pages      = get_diabook_config( "close_pages", 1 );
 $close_profiles   = get_diabook_config( "close_profiles", 0 );
 $close_helpers    = get_diabook_config( "close_helpers", 0 );
 $close_services   = get_diabook_config( "close_services", 0 );
@ -297,11 +296,6 @@ if ($color=="dark") $color_path = "/diabook-dark/";
 	<script>
 	$("right_aside").ready(function(){

-	if('.$close_pages.')
-		{
-		document.getElementById( "close_pages" ).style.display = "none";
-			};
-
 	if('.$close_mapquery.')
 		{
 		document.getElementById( "close_mapquery" ).style.display = "none";
@ -368,7 +362,6 @@ if ($color=="dark") $color_path = "/diabook-dark/";
 function diabook_community_info() {
 	$a = get_app();

-	$close_pages      = get_diabook_config( "close_pages", 1 );
 	$close_profiles   = get_diabook_config( "close_profiles", 0 );
 	$close_helpers    = get_diabook_config( "close_helpers", 0 );
 	$close_services   = get_diabook_config( "close_services", 0 );
@ -520,7 +513,7 @@ if ($color=="dark") $color_path = "/diabook-dark/";
 	$nv['suggest'] = Array('suggest', t('Friend Suggestions'), "", "");
 	$nv['invite'] = Array('invite', t('Invite Friends'), "", "");

-	$nv['search'] = '<form name="simple_bar" method="get" action="http://dir.friendika.com/directory">
+	$nv['search'] = '<form name="simple_bar" method="get" action="http://dir.friendica.com/directory">
 						<span class="sbox_l"></span>
 						<span class="sbox">
 						<input type="text" name="search" size="13" maxlength="50">
@ -530,40 +523,6 @@ if ($color=="dark") $color_path = "/diabook-dark/";
 	$aside['$nv'] = $nv;
 	}}

-   //Community_Pages at right_aside
-   if($close_pages != "1") {
-   if(local_user()) {
-   $page = '
-			<h3 style="margin-top:0px;">'.t("Community Pages").'<a id="closeicon" href="#boxsettings" onClick="open_boxsettings(); return false;" style="text-decoration:none;" class="icon close_box" title="'.t("Settings").'"></a></h3>
-			<div id=""><ul style="margin-left: 7px;margin-top: 0px;padding-left: 0px;padding-top: 0px;">';
-
-	$pagelist = array();
-
-	$contacts = q("SELECT `id`, `url`, `name`, `micro`FROM `contact`
-			WHERE `network`= 'dfrn' AND `forum` = 1 AND `uid` = %d
-			ORDER BY `name` ASC",
-			intval($a->user['uid'])
-	);
-
-	$pageD = array();
-
-	// Look if the profile is a community page
-	foreach($contacts as $contact) {
-		$pageD[] = array("url"=>$contact["url"], "name"=>$contact["name"], "id"=>$contact["id"], "micro"=>$contact['micro']);
-	};
-
-
-	$contacts = $pageD;
-
-	foreach($contacts as $contact) {
-		$page .= '<li style="list-style-type: none;" class="tool"><img height="20" width="20" style="float: left; margin-right: 3px;" src="' . $contact['micro'] .'" alt="' . $contact['url'] . '" /> <a href="'.$a->get_baseurl().'/redir/'.$contact["id"].'" style="margin-top: 2px; word-wrap: break-word; width: 132px;" title="' . $contact['url'] . '" class="label" target="external-link">'.
-				$contact["name"]."</a></li>";
-	}
-	$page .= '</ul></div>';
-	//if (sizeof($contacts) > 0)
-		$aside['$page'] = $page;
-	}}
-  //END Community Page

   //mapquery

@ -616,7 +575,6 @@ if ($color=="dark") $color_path = "/diabook-dark/";
 	}
   //end twitter
   if($ccCookie != "10") {
-	$close_pages      = get_diabook_config( "close_pages", 1 );
 	$close_profiles   = get_diabook_config( "close_profiles", 0 );
 	$close_helpers    = get_diabook_config( "close_helpers", 0 );
 	$close_services   = get_diabook_config( "close_services", 0 );
@ -629,7 +587,6 @@ if ($color=="dark") $color_path = "/diabook-dark/";
 	$close_or_not = array('1'=>t("don't show"),	'0'=>t("show"),);
 	$boxsettings['title'] = Array("", t('Show/hide boxes at right-hand column:'), "", "");
 	$aside['$boxsettings'] = $boxsettings;
-	$aside['$close_pages'] = array('diabook_close_pages', t('Community Pages'), $close_pages, '', $close_or_not);
 	$aside['$close_mapquery'] = array('diabook_close_mapquery', t('Earth Layers'), $close_mapquery, '', $close_or_not);
 	$aside['$close_profiles'] = array('diabook_close_profiles', t('Community Profiles'), $close_profiles, '', $close_or_not);
 	$aside['$close_helpers'] = array('diabook_close_helpers', t('Help or @NewHere ?'), $close_helpers, '', $close_or_not);
@ -643,7 +600,6 @@ if ($color=="dark") $color_path = "/diabook-dark/";
   $baseurl = $a->get_baseurl($ssl_state);
   $aside['$baseurl'] = $baseurl;
   if (isset($_POST['diabook-settings-box-sub']) && $_POST['diabook-settings-box-sub']!=''){
-		set_pconfig(local_user(), 'diabook', 'close_pages', $_POST['diabook_close_pages']);
 		set_pconfig(local_user(), 'diabook', 'close_mapquery', $_POST['diabook_close_mapquery']);
 		set_pconfig(local_user(), 'diabook', 'close_profiles', $_POST['diabook_close_profiles']);
 		set_pconfig(local_user(), 'diabook', 'close_helpers', $_POST['diabook_close_helpers']);
--- a/view/theme/duepuntozero/nav.tpl
+++ b/view/theme/duepuntozero/nav.tpl
@ -10,7 +10,7 @@

 	{{ if $nav.register }}<a id="nav-register-link" class="nav-commlink $nav.register.2 $sel.register" href="$nav.register.0" title="$nav.register.3" >$nav.register.1</a>{{ endif }}
 		
-	{{ if $nav.help }} <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>{{ endif }}
+	{{ if $nav.help }} <a id="nav-help-link" class="nav-link $nav.help.2" target="friendica-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a>{{ endif }}
 		
 	{{ 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/view/theme/duepuntozero/style.css
+++ b/view/theme/duepuntozero/style.css
@ -194,7 +194,7 @@ aside {
 	border-radius: 5px;
 	padding: 5px;
 	font-weight: bold;
-	background: #3465a4 url('friendika-16.png') no-repeat 95% center;
+	background: #3465a4 url('friendica-16.png') no-repeat 95% center;
 }
 #wallmessage-link {
 	display: block;
@ -438,7 +438,7 @@ div.wall-item-content-wrapper.shiny {

 input#dfrn-url {
 	float: left;
-	background: url(friendika-16.png) no-repeat;
+	background: url(friendica-16.png) no-repeat;
 	background-position: 2px center;
 	font-size: 17px;
 	padding-left: 21px;
--- a/view/theme/facepark/nav.tpl
+++ b/view/theme/facepark/nav.tpl
@ -10,7 +10,7 @@

 	{{ if $nav.register }}<a id="nav-register-link" class="nav-commlink $nav.register.2 $sel.register" href="$nav.register.0" title="$nav.register.3" >$nav.register.1</a>{{ endif }}
 		
-	{{ if $nav.help }} <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>{{ endif }}
+	{{ if $nav.help }} <a id="nav-help-link" class="nav-link $nav.help.2" target="friendica-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a>{{ endif }}
 		
 	{{ 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/view/theme/facepark/style.css
+++ b/view/theme/facepark/style.css
@ -202,7 +202,7 @@ aside {
 	border-radius: 5px;
 	padding: 5px;
 	font-weight: bold;
-	background: #3465a4 url('friendika-16.png') no-repeat 95% center;
+	background: #3465a4 url('friendica-16.png') no-repeat 95% center;
 }

 /* section */
@ -434,7 +434,7 @@ div.wall-item-content-wrapper.shiny {

 input#dfrn-url {
 	float: left;
-	background: url(friendika-16.png) no-repeat;
+	background: url(friendica-16.png) no-repeat;
 	background-position: 2px center;
 	font-size: 17px;
 	padding-left: 21px;
--- a/view/theme/frost-mobile/default.php
+++ b/view/theme/frost-mobile/default.php
@ -11,7 +11,7 @@
 	<?php if( $a->module === 'home' ) { ?>
 	<center>
 	<div class="login-button">
-	<a href="login" class="login-button-link"><img class="login-button-image" src="/images/friendika-1600.png" title="Click to log in"></a>
+	<a href="login" class="login-button-link"><img class="login-button-image" src="/images/friendica-1600.png" title="Click to log in"></a>
 	</div>
 	</center>

--- a/view/theme/frost-mobile/nav.tpl
+++ b/view/theme/frost-mobile/nav.tpl
@ -44,7 +44,7 @@
 		{{ endif }}

 		{{ if $nav.help }}
-		<li><a id="nav-help-link" class="$nav.help.2 nav-load-page-link" target="friendika-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a></li>
+		<li><a id="nav-help-link" class="$nav.help.2 nav-load-page-link" target="friendica-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a></li>
 		{{ endif }}
 		
 		{{ if $nav.logout }}
--- a/view/theme/frost-mobile/style.css
+++ b/view/theme/frost-mobile/style.css
@ -308,7 +308,7 @@ div.main-container {
 	border-radius: 5px;
 	padding: 5px;
 	font-weight: bold;
-	background: #3465a4 url('friendika-16.png') no-repeat 95% center;
+	background: #3465a4 url('friendica-16.png') no-repeat 95% center;
 }
 #wallmessage-link {
 	display: block;
@ -589,7 +589,7 @@ footer {

 input#dfrn-url {
 	float: left;
-	background: url(friendika-16.png) no-repeat;
+	background: url(friendica-16.png) no-repeat;
 	background-position: 2px center;
 	font-size: 17px;
 	padding-left: 21px;
--- a/view/theme/frost/default.php
+++ b/view/theme/frost/default.php
@ -11,7 +11,7 @@
 	<?php if( $a->module === 'home' ) { ?>
 	<center>
 	<div class="login-button">
-	<a href="login" class="login-button-link"><img class="login-button-image" src="/images/friendika-1600.png" title="Click to log in"></a>
+	<a href="login" class="login-button-link"><img class="login-button-image" src="/images/friendica-1600.png" title="Click to log in"></a>
 	</div>
 	</center>

--- a/view/theme/frost/nav.tpl
+++ b/view/theme/frost/nav.tpl
@ -44,7 +44,7 @@
 		{{ endif }}

 		{{ if $nav.help }}
-		<li><a id="nav-help-link" class="$nav.help.2 nav-load-page-link" target="friendika-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a></li>
+		<li><a id="nav-help-link" class="$nav.help.2 nav-load-page-link" target="friendica-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a></li>
 		{{ endif }}
 		
 		{{ if $nav.logout }}
--- a/view/theme/frost/style.css
+++ b/view/theme/frost/style.css
@ -284,7 +284,7 @@ aside {
 	border-radius: 5px;
 	padding: 5px;
 	font-weight: bold;
-	background: #3465a4 url('friendika-16.png') no-repeat 95% center;
+	background: #3465a4 url('friendica-16.png') no-repeat 95% center;
 }
 #wallmessage-link {
 	display: block;
@ -551,7 +551,7 @@ div.wall-item-content-wrapper.shiny {

 input#dfrn-url {
 	float: left;
-	background: url(friendika-16.png) no-repeat;
+	background: url(friendica-16.png) no-repeat;
 	background-position: 2px center;
 	font-size: 17px;
 	padding-left: 21px;
--- a/view/theme/quattro/nav.tpl
+++ b/view/theme/quattro/nav.tpl
@ -64,7 +64,7 @@
 		
 		{{ if $nav.help }} 
 		<li id="nav-help-link" class="nav-menu $sel.help">
-			<a class="$nav.help.2" target="friendika-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a>
+			<a class="$nav.help.2" target="friendica-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a>
 		</li>
 		{{ endif }}

--- a/view/theme/quattro/theme.php
+++ b/view/theme/quattro/theme.php
@ -4,7 +4,7 @@
 * Version: 0.5
 * Author: Fabio <http://kirgroup.com/profile/fabrixxm>
 * Maintainer: Fabio <http://kirgroup.com/profile/fabrixxm>
- * Maintainer: Tobias <https://diekershoff.homeunix.net/friendika/profile/tobias>
+ * Maintainer: Tobias <https://diekershoff.homeunix.net/friendica/profile/tobias>
 */
 
 $a->theme_info = array();
--- a/view/theme/smoothly/css/typography.css
+++ b/view/theme/smoothly/css/typography.css
@ -0,0 +1,283 @@
+/* global basic typography settings */
+
+textarea,
+pre,
+code,
+kbd,
+samp,
+var,
+tt {
+	font-family:Consolas, "Lucida Console", "Andale Mono", "Bitstream Vera Sans Mono", "Courier New", Courier;
+}
+
+/* (en) base layout gets standard font size 15px */
+/* (de) Basis-Layout erhält Standardschriftgröße von 15 Pixeln */
+
+body {
+	margin: 0 auto;
+	padding-bottom: 3em;
+	width: 960px;
+	font-family: "Lucida Grande","Lucida Sans Unicode",Arial,Verdana,sans-serif;
+	font-size: 15px;
+	font-size-adjust: none;
+	font-style: normal;
+	font-variant: normal;
+	font-weight: normal;
+	line-height: 18px;
+	color: #626262;
+	background-color: #F2F2F2;
+	color: #333333;
+/* (en) Prevent auto-scaling of text in mobile webkit browsers */
+/* (de) Automatische Schriftvergrößerung in mobilen Webkit-Browsern vermeiden */
+	-webkit-text-size-adjust:100%;
+}
+
+/*--- Headings | Überschriften ------------------------------------------------------------------------*/
+
+h1,
+h2,
+h3,
+h4,
+h5,
+h6 {
+	font-family: "Lucida Grande","Lucida Sans Unicode",Arial,Verdana,sans-serif;
+	font-weight: 400;
+	color:#626262;
+	margin:0;
+}
+
+h1 {
+	font-size:200%;
+	line-height: 0.8571em;
+	margin: 0.4286em 0 0;
+}
+
+h2 {
+	font-size:170%;
+	line-height: 1.2em;
+	margin: 0.6em 0 0 0;
+}
+
+h3 {
+	font-size:145%;
+	margin:0 0 5px 0;
+}
+
+h4 {
+	font-size:133.33%;
+	line-height: 1.125em;
+	margin:1.125em 0 0 0;
+}
+
+h5 {
+	font-size:116.67%;
+	line-height: 1.2857em;
+	margin: 1.2857em 0 0 0;
+}
+
+h6 {
+	font-weight: bold;
+	font-size:100%;
+	line-height: 1.5em;
+	margin: 1.5em 0 0 0;
+}
+
+/*h3 > a, h4 > a {
+	font-size: 18px;
+	color: #626262;
+}*/
+
+/* --- Lists | Listen  -------------------------------------------------------------------------------- */
+
+ul,
+ol,
+dl {
+	font-size:1em;
+	line-height:1.5em;
+}
+
+ul {
+	list-style-type:disc;
+}
+
+ol {
+	list-style-type:decimal;
+}
+
+ul ul {
+	list-style-type:circle;
+	margin-top:0;
+}
+
+ol ol {
+	list-style-type:lower-latin;
+	margin-top:0;
+}
+
+ol ul {
+	list-style-type:circle;
+	margin-top:0;
+}
+
+li {
+	font-size:1em;
+	line-height:1.5em;
+	list-style: none outside none;
+}
+
+dt { font-weight:bold; }
+
+dd { margin:0 0 1.5em 0.8em; }
+
+
+/* --- general text formatting | Allgemeine Textauszeichnung ------------------------------------------ */
+
+p {
+	max-width: 600px;
+	font-size:1em;
+	/*line-height:1.5em;*/
+	/*margin: 1.5em 0 0 0;*/
+}
+
+blockquote, cite, q {
+	font-family: Georgia, "Times New Roman", Times, serif;
+	font-style:italic;
+}
+
+blockquote {
+    background-color: #F4F8F9;
+    border-left: 4px solid #DAE4EE;
+    padding: 0.4em;
+}
+
+strong, b { font-weight:bold; }
+
+em, i { font-style:italic; }
+
+big {
+	font-size:116.667%;
+}
+
+small {
+	font-size:85.71%;
+}
+
+pre,
+code,
+kbd,
+tt,
+samp,
+var {
+	font-size:100%;
+}
+
+pre {
+	line-height:1.5em;
+	margin: 1.5em 0 0 0;
+	white-space: pre;
+	white-space: pre-wrap;
+	word-wrap: break-word;
+}
+
+pre, code { color:#800; }
+
+kbd, samp, var, tt {
+	color:#666;
+	font-weight:bold;
+}
+
+var, dfn { font-style:italic; }
+
+acronym, abbr {
+	border-bottom:1px #aaa dotted;
+	font-variant:small-caps;
+	letter-spacing:.07em;
+	cursor:help;
+}
+
+sub,
+sup {
+	font-size: 75%;
+	line-height: 0;
+	position: relative;
+	vertical-align: baseline;
+}
+
+sup { top: -0.5em; }
+sub { bottom: -0.25em; }
+
+mark {
+	background: #ff0;
+	color: #000;
+}
+
+hr {
+	color:#fff;
+	background:transparent;
+	margin:0 0 0.75em 0;
+	padding:0 0 0.75em 0;
+	border:0;
+	border-bottom:1px #eee solid;
+}
+
+.required {
+	display: inline;
+	color: #1873a2;
+}
+
+.hidden { 
+	display: none!important; 
+}
+
+/*--- Links ----------------------------------------------------------------------------------------- */
+
+a {
+	color: #1873a2;
+	text-decoration: none;
+	margin-bottom: 1px;
+	background:transparent;
+}
+
+a:active { outline: none; }
+
+/* (en) maximum constrast for tab focus - change with great care */
+/* (en) Maximaler Kontrast für Tab Focus - Ändern Sie diese Regel mit Bedacht */
+a:hover,
+a:focus {
+	color: #6da6c4;
+	text-decoration:none;
+}
+
+/*--- Images ----------------------------------------------------------------------------------------- */
+
+img,
+figure {
+	border: 0 none;
+	max-width: 550px;
+	margin: 0;
+}
+
+.flexible {
+	margin-top: 1.5em;
+	max-width: 100%;
+	height: auto;
+}
+
+* html .flexible {	/* IE6 support */
+	width: 98%;		/* 2% space for borders */
+}
+
+.bordered {
+	margin-top: 1.5em;
+	border: 2px #eee solid;
+	border: 2px rgba(255,255,255,1) solid;
+	-webkit-box-shadow: 0 0 3px rgba(0,0,0,.25);
+	-moz-box-shadow: 0 0 3px rgba(0,0,0,.25);
+	box-shadow: 0 0 3px rgba(0,0,0,.25);
+}
+
+/*--- Tables ----------------------------------------------------------------------------------------- */
+
+tr {
+	border: 1px solid #eeeeee;
+}
--- a/view/theme/smoothly/default.php
+++ b/view/theme/smoothly/default.php
@ -3,6 +3,11 @@
 <head>
  <title><?php if(x($page,'title')) echo $page['title'] ?></title>
  <script>var baseurl="<?php echo $a->get_baseurl() ?>";</script>
+  <script type="text/javascript">
+	function ScrollToBottom(){
+	window.scrollTo(0,document.body.scrollHeight);
+	}
+  </script>
  <?php if(x($page,'htmlhead')) echo $page['htmlhead'] ?>
 </head>
 <body>
--- a/view/theme/smoothly/nav.tpl
+++ b/view/theme/smoothly/nav.tpl
@ -57,7 +57,8 @@
 </nav>

 <div id="scrollup" >
-<a href="javascript:scrollTo(0,0)"><img src="view/theme/smoothly/totop.png" alt="back to top" title="Back to top" /></a>
+<a href="javascript:scrollTo(0,0)"><img src="view/theme/smoothly/totop.png" alt="to top" title="to top" /></a><br />
+<a href="javascript:ScrollToBottom()"><img src="view/theme/smoothly/tobottom.png" alt="to bottom" title="to bottom" /></a>
 </div>

 <ul id="nav-notifications-template" style="display:none;" rel="template">
--- a/view/theme/smoothly/profile_vcard.tpl
+++ b/view/theme/smoothly/profile_vcard.tpl
@ -3,7 +3,7 @@
 				
 	
 	{{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }}
-	<div id="profile-photo-wrapper"><img class="photo" width="191" height="191" src="$profile.photo" alt="$profile.name"></div>
+	<div id="profile-photo-wrapper"><img class="photo" src="$profile.photo" alt="$profile.name"></div>



--- a/view/theme/smoothly/style.css
+++ b/view/theme/smoothly/style.css
--- a/view/theme/smoothly/theme.php
+++ b/view/theme/smoothly/theme.php
@ -3,7 +3,7 @@
 /*
 * Name: Smoothly
 * Description: Like coffee with milk. Theme works fine with iPad[2].
- * Version: Version 0.10.4
+ * Version: Version 0.10.24
 * Author: Alex <https://friendica.pixelbits.de/profile/alex>
 * Maintainer: Alex <https://friendica.pixelbits.de/profile/alex>
 * Screenshot: <a href="screenshot.png">Screenshot</a>
--- a/view/theme/smoothly/tobottom.png
+++ b/view/theme/smoothly/tobottom.png
--- a/view/theme/smoothly/vcard-widget.tpl
+++ b/view/theme/smoothly/vcard-widget.tpl
@ -0,0 +1,5 @@
+	<div class="vcard">
+		<div class="fn">$name</div>
+		<div id="profile-photo-wrapper"><img class="photo" src="$photo" alt="$name" /></div>
+	</div>
+
--- a/view/theme/vier/nav.tpl
+++ b/view/theme/vier/nav.tpl
@ -64,7 +64,7 @@
 		
 		{{ if $nav.help }} 
 		<li id="nav-help-link" class="nav-menu $sel.help">
-			<a class="$nav.help.2" target="friendika-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a>
+			<a class="$nav.help.2" target="friendica-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a>
 		</li>
 		{{ endif }}

@ -101,7 +101,7 @@

 {{ 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>
+<a id="nav-help-link" class="nav-link $nav.help.2" target="friendica-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 }}