From 2e464cb909ed12fbc6b9c51e8360daf3f53b6a2c Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Sat, 16 Nov 2013 19:27:06 -0800
Subject: make submit buttons look more or less like links

---
 view/theme/redbasic/css/style.css | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'view')

diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 07a838f0b..572eafdfb 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -64,7 +64,10 @@ input {
 }
 
 input[type="submit"] {
-	background-color: #F8F8F8;
+	background-color: #F0F0F0;
+	font-weight: bold;
+	color: #0080FF; 
+	text-decoration: none; 
 }
 
 code {
-- 
cgit v1.2.3


From 8893643da065fb12bf9b60e3d31f65cf64c6754b Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Sat, 16 Nov 2013 19:48:45 -0800
Subject: more photo menu positioning work for varying photo sizes

---
 view/theme/redbasic/css/style.css | 7 ++++---
 view/theme/redbasic/php/style.php | 6 +++---
 2 files changed, 7 insertions(+), 6 deletions(-)

(limited to 'view')

diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 572eafdfb..f7d641e6b 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -882,7 +882,7 @@ footer {
 }
 
 .wall-item-photo-wrapper {
-	margin-top: 10px;
+	margin-top: 0px;
 	margin-left: 10px;
 	margin-bottom: 10px;
 	width: 100px;
@@ -907,7 +907,8 @@ footer {
 	border: 2px solid #444444;
 	background: #FFFFFF;
 	position: absolute;
-	left: 10px; top: 90px;
+	left: 10px; 
+	top: $top_photo;
 	display: none;
 	z-index: 10000;
 }
@@ -917,7 +918,7 @@ footer {
 
 
 .comment .wall-item-photo-menu-button {	top: $pmenu_reply;}
-.comment .wall-item-photo-menu { top: 60px; }
+.comment .wall-item-photo-menu { top: $reply_photo; }
 
 .wallwall .wwto {
     left: 50px;
diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php
index 515356cb6..1eb5abfbb 100644
--- a/view/theme/redbasic/php/style.php
+++ b/view/theme/redbasic/php/style.php
@@ -93,13 +93,13 @@
     	$converse_width="1024px";
 	if(! $top_photo)
 		$top_photo = '64px';
-	$pmenu_top = intval($top_photo) - 6 . 'px';
-	$wwtop = intval($top_photo) - 5 . 'px';
+	$pmenu_top = intval($top_photo) - 16 . 'px';
+	$wwtop = intval($top_photo) - 15 . 'px';
 	$comment_indent = intval($top_photo) + 10 . 'px';
 
 	if(! $reply_photo)
 		$reply_photo = '32px';
-	$pmenu_reply = intval($reply_photo) - 6 . 'px';
+	$pmenu_reply = intval($reply_photo) - 16 . 'px';
 	
 	if($nav_min_opacity === false || $nav_min_opacity === '') {
 		$nav_float_min_opacity = 1.0;
-- 
cgit v1.2.3


From bec85f1494026a94eb521b802a74b67762b01a6c Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Sun, 17 Nov 2013 13:54:43 -0800
Subject: implement admin remove account

---
 view/theme/redbasic/css/style.css | 5 +++++
 view/tpl/admin_users.tpl          | 8 ++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

(limited to 'view')

diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index f7d641e6b..8e15d1eaf 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -3564,3 +3564,8 @@ text-decoration: none;
 .savedsearchdrop {
 	opacity: 0;
 }
+
+.admin-icons {
+	color: $toolicon_colour;
+	margin-right: 10px;
+}
\ No newline at end of file
diff --git a/view/tpl/admin_users.tpl b/view/tpl/admin_users.tpl
index 770df7eba..b51fa3559 100755
--- a/view/tpl/admin_users.tpl
+++ b/view/tpl/admin_users.tpl
@@ -34,8 +34,8 @@
 					<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>
+						<a href="{{$baseurl}}/regmod/allow/{{$u.hash}}" title='{{$approve}}'><i class='icon-thumbs-up-alt admin-icons'></i></a>
+						<a href="{{$baseurl}}/regmod/deny/{{$u.hash}}" title='{{$deny}}'><i class='icon-thumbs-down-alt admin-icons'></i></a>
 					</td>
 				</tr>
 			{{/foreach}}
@@ -71,8 +71,8 @@
 						<td class='service_class'>{{$u.account_service_class}}</td>
 						<td class="checkbox"><input type="checkbox" class="users_ckbx" id="id_user_{{$u.uid}}" name="user[]" value="{{$u.uid}}"/></td>
 						<td class="tools">
-							<a href="{{$baseurl}}/admin/users/block/{{$u.uid}}?t={{$form_security_token}}" title='{{if $u.blocked}}{{$unblock}}{{else}}{{$block}}{{/if}}'><span class='icon block {{if $u.blocked==0}}dim{{/if}}'></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 drop'></span></a>
+							<a href="{{$baseurl}}/admin/users/block/{{$u.uid}}?t={{$form_security_token}}" title='{{if $u.blocked}}{{$unblock}}{{else}}{{$block}}{{/if}}'><i class='icon-ban-circle admin-icons {{if $u.blocked==0}}dim{{/if}}'></i></a>
+							<a href="{{$baseurl}}/admin/users/delete/{{$u.uid}}?t={{$form_security_token}}" title='{{$delete}}' onclick="return confirm_delete('{{$u.name}}')"><i class='icon-remove admin-icons'></i></a>
 						</td>
 					</tr>
 				{{/foreach}}
-- 
cgit v1.2.3


From dc6cd8a701f2225070bf6c37833279768f1a3b10 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Mon, 18 Nov 2013 15:38:02 -0800
Subject: admin/users - add expiration date to table and ability to sort by
 reverse expiration and also filter by service class through url options

---
 view/tpl/admin_users.tpl | 1 +
 1 file changed, 1 insertion(+)

(limited to 'view')

diff --git a/view/tpl/admin_users.tpl b/view/tpl/admin_users.tpl
index b51fa3559..cedd55216 100755
--- a/view/tpl/admin_users.tpl
+++ b/view/tpl/admin_users.tpl
@@ -68,6 +68,7 @@
 						<td class='email'>{{$u.account_email}}</td>
 						<td class='register_date'>{{$u.account_created}}</td>
 						<td class='login_date'>{{$u.account_lastlog}}</td>
+						<td class='account_expires'>{{$u.account_expires}}</td>
 						<td class='service_class'>{{$u.account_service_class}}</td>
 						<td class="checkbox"><input type="checkbox" class="users_ckbx" id="id_user_{{$u.uid}}" name="user[]" value="{{$u.uid}}"/></td>
 						<td class="tools">
-- 
cgit v1.2.3


From ed129f19b01f4f8f34129e297f93c9926e36548a Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Mon, 18 Nov 2013 18:37:38 -0800
Subject: fix plugin and them toggles for the colourblind, add theme info block
 and recent screenshot to redbasic

---
 view/theme/redbasic/css/style.css      |   1 +
 view/theme/redbasic/img/screenshot.jpg | Bin 72559 -> 135205 bytes
 view/theme/redbasic/php/theme.php      |  10 ++++++++++
 view/tpl/admin_plugins.tpl             |   2 +-
 view/tpl/admin_plugins_details.tpl     |   2 +-
 5 files changed, 13 insertions(+), 2 deletions(-)

(limited to 'view')

diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 8e15d1eaf..d3779152d 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -3499,6 +3499,7 @@ margin-right: 50px;
 }
 
 .comment-icon,
+.admin-icons,
 .jot-icons {
 	font-size: 1.2em;
 	color: $toolicon_colour;
diff --git a/view/theme/redbasic/img/screenshot.jpg b/view/theme/redbasic/img/screenshot.jpg
index 5f00ec39e..51d4cbb0d 100644
Binary files a/view/theme/redbasic/img/screenshot.jpg and b/view/theme/redbasic/img/screenshot.jpg differ
diff --git a/view/theme/redbasic/php/theme.php b/view/theme/redbasic/php/theme.php
index ca280ef6a..e68533bb4 100644
--- a/view/theme/redbasic/php/theme.php
+++ b/view/theme/redbasic/php/theme.php
@@ -1,5 +1,15 @@
 <?php
 
+/**
+ *   * Name: Redbasic
+ *   * Description: RedMatrix standard theme
+ * 	 * Version: 1.0
+ *   * Author: Fabrixxm
+ *   * Maintainer: Mike Macgirvin
+ *   * Compat: Red [*]
+ *
+ */
+
 function redbasic_init(&$a) {
 
 }
diff --git a/view/tpl/admin_plugins.tpl b/view/tpl/admin_plugins.tpl
index 729ba5dc8..40821c534 100755
--- a/view/tpl/admin_plugins.tpl
+++ b/view/tpl/admin_plugins.tpl
@@ -4,7 +4,7 @@
 		<ul id='pluginslist'>
 		{{foreach $plugins as $p}}
 			<li class='plugin {{$p.1}}'>
-				<a class='toggleplugin' href='{{$baseurl}}/admin/{{$function}}/{{$p.0}}?a=t&amp;t={{$form_security_token}}' title="{{if $p.1==on}}Disable{{else}}Enable{{/if}}" ><span class='icon {{$p.1}}'></span></a>
+				<a class='toggleplugin' href='{{$baseurl}}/admin/{{$function}}/{{$p.0}}?a=t&amp;t={{$form_security_token}}' title="{{if $p.1==on}}Disable{{else}}Enable{{/if}}" ><i class='{{if $p.1==on}}icon-check{{else}}icon-check-empty{{/if}} admin-icons'></i></a>
 				<a href='{{$baseurl}}/admin/{{$function}}/{{$p.0}}'><span class='name'>{{$p.2.name}}</span></a> - <span class="version">{{$p.2.version}}</span>
 				{{if $p.2.experimental}} {{$experimental}} {{/if}}{{if $p.2.unsupported}} {{$unsupported}} {{/if}}
 
diff --git a/view/tpl/admin_plugins_details.tpl b/view/tpl/admin_plugins_details.tpl
index f72142e41..1c1a59879 100755
--- a/view/tpl/admin_plugins_details.tpl
+++ b/view/tpl/admin_plugins_details.tpl
@@ -1,7 +1,7 @@
 <div class = "generic-content-wrapper" id='adminpage'>
 	<h1>{{$title}} - {{$page}}</h1>
 	
-	<p><span class='toggleplugin icon {{$status}}'></span> {{$info.name}} - {{$info.version}} : <a href="{{$baseurl}}/admin/{{$function}}/{{$plugin}}/?a=t&amp;t={{$form_security_token}}">{{$action}}</a></p>
+	<p><i class='toggleplugin {{if $status==on}}icon-check{{else}}icon-check-empty{{/if}} admin-icons'></i> {{$info.name}} - {{$info.version}} : <a href="{{$baseurl}}/admin/{{$function}}/{{$plugin}}/?a=t&amp;t={{$form_security_token}}">{{$action}}</a></p>
 	<p>{{$info.description}}</p>
 	
 	<p class="author">{{$str_author}}
-- 
cgit v1.2.3


From eb3d8e2cd7e2bd51035918b4106d1c29b6605505 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Wed, 20 Nov 2013 16:28:17 -0800
Subject: provide a page template "none" which lets a webpage take over the
 entire page. Everything. The application is essentially bypassed. You'll need
 doctype and html and head and body tags in your content as none of them are
 supplied. There are no page regions. Nada. We should probably restrict this
 to those who have code exec in their account_roles but other folks won't be
 able to do very much useful with it anyway as their HTML is filtered.

---
 view/php/none.php | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 view/php/none.php

(limited to 'view')

diff --git a/view/php/none.php b/view/php/none.php
new file mode 100644
index 000000000..51d0e83dc
--- /dev/null
+++ b/view/php/none.php
@@ -0,0 +1 @@
+<?php if(x($page,'content')) echo $page['content']; ?>
-- 
cgit v1.2.3


From 1f9ef3e44d28c3b8507fed8c6e9841ae49c9461f Mon Sep 17 00:00:00 2001
From: marijus <mario@localhost.localdomain>
Date: Thu, 21 Nov 2013 15:18:18 +0100
Subject: not needed anymore with new defaults

---
 view/theme/redbasic/css/style.css | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'view')

diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index d3779152d..f5e99bdf7 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -2067,7 +2067,6 @@ a.mail-list-link {
 #nav-search-text {
 	height: 20px;
 	padding: 0px 5px 0px 5px;
-	font-size: 0.9em;
 	border-radius: 10px;
 	border: none;
 	background-color: $search_background;
@@ -3569,4 +3568,4 @@ text-decoration: none;
 .admin-icons {
 	color: $toolicon_colour;
 	margin-right: 10px;
-}
\ No newline at end of file
+}
-- 
cgit v1.2.3


From 353f5f049e5a42149cce2133f48b38529eeec678 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Thu, 21 Nov 2013 23:11:50 -0800
Subject: Empty commit message.

---
 view/php/theme_init.php | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'view')

diff --git a/view/php/theme_init.php b/view/php/theme_init.php
index 0867c989d..1fefa110e 100644
--- a/view/php/theme_init.php
+++ b/view/php/theme_init.php
@@ -1,6 +1,7 @@
 <?php
 
 
+
 require_once('include/plugin.php');
 
 
@@ -37,3 +38,13 @@ head_add_js('library/jslider/bin/jquery.slider.min.js');
 head_add_js('docready.js');
 head_add_js('library/prettyphoto/js/jquery.prettyPhoto.js');
 head_add_js('library/colorbox/jquery.colorbox-min.js');
+
+/**
+ * Those who require this feature will know what to do with it.
+ * Those who don't, won't.
+ */
+
+$channel = get_app()->get_channel();
+if($channel && file_exists($channel['channel_address'] . '.js'))
+	head_add_js('/' . $channel['channel_address'] . '.js');
+
-- 
cgit v1.2.3


From 34f8b215114f1041094784c9f931d185b78b0ec2 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Fri, 22 Nov 2013 11:52:38 -0800
Subject: init_groups_visitor() was still using old array of id output (not the
 newer array of hash which we need for permission queries)

---
 view/php/theme_init.php | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'view')

diff --git a/view/php/theme_init.php b/view/php/theme_init.php
index 1fefa110e..69d99893a 100644
--- a/view/php/theme_init.php
+++ b/view/php/theme_init.php
@@ -42,6 +42,9 @@ head_add_js('library/colorbox/jquery.colorbox-min.js');
 /**
  * Those who require this feature will know what to do with it.
  * Those who don't, won't.
+ * Eventually this functionality needs to be provided by a module
+ * such that permissions can be enforced. At the moment it's 
+ * more of a proof of concept; but sufficient for our immediate needs.  
  */
 
 $channel = get_app()->get_channel();
-- 
cgit v1.2.3


From 72e0bd6b28fbb2e13a02573a053430493f97c14b Mon Sep 17 00:00:00 2001
From: marijus <mario@localhost.localdomain>
Date: Fri, 22 Nov 2013 21:19:41 +0100
Subject: missing input type and use same font for password and text input

---
 view/theme/redbasic/css/style.css | 7 ++++---
 view/tpl/field_input.tpl          | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'view')

diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index f5e99bdf7..72413f283 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -51,7 +51,8 @@ a:hover, .fakelink:hover { color: #44AAFF; text-decoration: underline; }
 }
 
 
-input[type=text] {
+input[type=text],
+input[type=password] {
 	font-family: arial,freesans,sans-serif;
 }
 
@@ -458,9 +459,9 @@ footer {
 	clear: both;
 }
 
-#register-link, #lost-password-link {
+#register-link,
+#lost-password-link {
 	float: left;
-	font-size: 90%;
 	margin-left: 100px;
 }
 
diff --git a/view/tpl/field_input.tpl b/view/tpl/field_input.tpl
index d5b3d6b4e..a584f95e7 100755
--- a/view/tpl/field_input.tpl
+++ b/view/tpl/field_input.tpl
@@ -1,6 +1,6 @@
 	<div class='field input'>
 		<label for='id_{{$field.0}}' id='label_{{$field.0}}'>{{$field.1}}</label>
-		<input name='{{$field.0}}' id='id_{{$field.0}}' value="{{$field.2}}">{{if $field.4}} <span class="required">{{$field.4}}</span> {{/if}}
+		<input name='{{$field.0}}' id='id_{{$field.0}}' type="text" value="{{$field.2}}">{{if $field.4}} <span class="required">{{$field.4}}</span> {{/if}}
 		<span id='help_{{$field.0}}' class='field_help'>{{$field.3}}</span>
 		<div id='end_{{$field.0}}' class='field_end'></div>
 	</div>
-- 
cgit v1.2.3


From 45c10d6d0a4a971446390137676fe8c00712372b Mon Sep 17 00:00:00 2001
From: marijus <mario@localhost.localdomain>
Date: Fri, 22 Nov 2013 22:23:25 +0100
Subject: use same font for textarea aswell and some simplification

---
 view/theme/redbasic/css/style.css | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

(limited to 'view')

diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 72413f283..bdf1fb5fd 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -51,9 +51,12 @@ a:hover, .fakelink:hover { color: #44AAFF; text-decoration: underline; }
 }
 
 
-input[type=text],
-input[type=password] {
+input[type="text"],
+input[type="password"],
+input[type="submit"],
+textarea {
 	font-family: arial,freesans,sans-serif;
+	font-size: $body_font_size;
 }
 
 input {
@@ -61,14 +64,13 @@ input {
 	-moz-border-radius: $radiuspx;
 	border-radius: $radiuspx;	
 	padding: 3px;
-	font-size: $body_font_size;
 }
 
 input[type="submit"] {
 	background-color: #F0F0F0;
 	font-weight: bold;
 	color: #0080FF; 
-	text-decoration: none; 
+	text-decoration: none;
 }
 
 code {
@@ -1456,10 +1458,11 @@ tr.mceLast {
 	border: 1px solid #cccccc;
 	padding: 8px;
 	margin-right: 0px;
-	width: 90%; 
+	width: 90%;
 	-moz-border-radius: $radiuspx;
 	border-radius: $radiuspx;	
 }
+
 #profile-jot-text:hover {
 	color: #000000;
 }
-- 
cgit v1.2.3


From 35e8536c7ccb773152edbfaffef0ed5fb1410cf1 Mon Sep 17 00:00:00 2001
From: tuscanhobbit <tuscanhobbit@users.noreply.github.com>
Date: Fri, 22 Nov 2013 23:08:29 +0100
Subject: Italian translation updated

---
 view/it/messages.po | 6 +++---
 view/it/strings.php | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'view')

diff --git a/view/it/messages.po b/view/it/messages.po
index 7a77586bc..0143952d4 100644
--- a/view/it/messages.po
+++ b/view/it/messages.po
@@ -14,7 +14,7 @@ msgstr ""
 "Project-Id-Version: Red Matrix\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2013-11-15 00:03-0800\n"
-"PO-Revision-Date: 2013-11-15 11:55+0000\n"
+"PO-Revision-Date: 2013-11-22 22:02+0000\n"
 "Last-Translator: tuscanhobbit Pa <pynolo@tarine.net>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/red-matrix/language/it/)\n"
 "MIME-Version: 1.0\n"
@@ -6951,11 +6951,11 @@ msgstr "Imposta l'opacità minima della barra di navigazione per nasconderla"
 
 #: ../../view/theme/redbasic/php/config.php:98
 msgid "Sloppy photo albums"
-msgstr "Photo album semplificati"
+msgstr "Album fotografici semplificati"
 
 #: ../../view/theme/redbasic/php/config.php:98
 msgid "Are you a clean desk or a messy desk person?"
-msgstr "Hai una scrivania ordinata o sei una persona che lascia confusione?"
+msgstr "La tua scrivania è sempre a posto? Sei una persona disordinata?"
 
 #: ../../view/theme/apw/php/config.php:193
 #: ../../view/theme/apw/php/config.php:211
diff --git a/view/it/strings.php b/view/it/strings.php
index 62936964f..5c71824db 100644
--- a/view/it/strings.php
+++ b/view/it/strings.php
@@ -1635,8 +1635,8 @@ $a->strings["Set radius of corners"] = "Raggio degli angoli stondati";
 $a->strings["Set shadow depth of photos"] = "Profondità dell'ombra delle foto";
 $a->strings["Set maximum width of conversation regions"] = "Larghezza massima delle aree delle conversazioni";
 $a->strings["Set minimum opacity of nav bar - to hide it"] = "Imposta l'opacità minima della barra di navigazione per nasconderla";
-$a->strings["Sloppy photo albums"] = "Photo album semplificati";
-$a->strings["Are you a clean desk or a messy desk person?"] = "Hai una scrivania ordinata o sei una persona che lascia confusione?";
+$a->strings["Sloppy photo albums"] = "Album fotografici semplificati";
+$a->strings["Are you a clean desk or a messy desk person?"] = "La tua scrivania è sempre a posto? Sei una persona disordinata?";
 $a->strings["Schema Default"] = "Schema predefinito";
 $a->strings["Sans-Serif"] = "Sans-Serif";
 $a->strings["Monospace"] = "Monospace";
-- 
cgit v1.2.3


From adad1b75cd1fb6ef96e06d32ee5c2d89cd9e759b Mon Sep 17 00:00:00 2001
From: marijus <mario@localhost.localdomain>
Date: Sat, 23 Nov 2013 01:10:54 +0100
Subject: use placeholder for profile-jot-text and some minor alignment

---
 view/theme/redbasic/css/style.css | 7 ++++---
 view/tpl/jot.tpl                  | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'view')

diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index bdf1fb5fd..97f24c8df 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -54,6 +54,7 @@ a:hover, .fakelink:hover { color: #44AAFF; text-decoration: underline; }
 input[type="text"],
 input[type="password"],
 input[type="submit"],
+select,
 textarea {
 	font-family: arial,freesans,sans-serif;
 	font-size: $body_font_size;
@@ -1464,7 +1465,7 @@ tr.mceLast {
 }
 
 #profile-jot-text:hover {
-	color: #000000;
+       color: #000000;
 }
 
 #profile-jot-text-loading {
@@ -2545,7 +2546,7 @@ brain is weird like that */
 
 .field label {
 	float: left;
-	width: 200px;
+	width: 350px;
 }
 
 .field input,
@@ -2555,7 +2556,7 @@ brain is weird like that */
 .field textarea { height: 100px; }
 .field_help {
 	display: block;
-	margin-left: 200px;
+	margin-left: 350px;
 	color: #666666;
 	
 }
diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl
index ef91f45be..b9238f0c0 100755
--- a/view/tpl/jot.tpl
+++ b/view/tpl/jot.tpl
@@ -24,7 +24,7 @@
 		<div id="jot-pagetitle-wrap"><input name="pagetitle" id="jot-pagetitle" type="text" placeholder="{{$placeholdpagetitle}}" value="{{$pagetitle}}" class="jothidden" style="display:none" /></div>
 		{{/if}}
 		<div id="jot-text-wrap">
-		<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" >{{if $content}}{{$content}}{{else}}{{$share}}{{/if}}</textarea>
+		<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" placeholder="{{$share}}">{{$content}}</textarea>
 		</div>
 		<div id="profile-jot-text-loading"></div>
 
-- 
cgit v1.2.3


From 7f6f4d2e9e5ff0486382c41c76f6eac87af37ef2 Mon Sep 17 00:00:00 2001
From: marijus <mario@localhost.localdomain>
Date: Sat, 23 Nov 2013 01:12:30 +0100
Subject: typo

---
 view/theme/redbasic/css/style.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'view')

diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 97f24c8df..8c9266f62 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -1465,7 +1465,7 @@ tr.mceLast {
 }
 
 #profile-jot-text:hover {
-       color: #000000;
+	color: #000000;
 }
 
 #profile-jot-text-loading {
-- 
cgit v1.2.3


From ccba7d8d07a3d78693f764f0d5997782ac52bbda Mon Sep 17 00:00:00 2001
From: marijus <mario@localhost.localdomain>
Date: Sat, 23 Nov 2013 09:19:37 +0100
Subject: make profile-jot-text placeholder more prominent

---
 view/theme/redbasic/css/style.css | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

(limited to 'view')

diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 8c9266f62..e7ac112f6 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -1464,8 +1464,20 @@ tr.mceLast {
 	border-radius: $radiuspx;	
 }
 
-#profile-jot-text:hover {
-	color: #000000;
+#profile-jot-text::-moz-placeholder {
+	font-size:1.5em;
+}
+
+#profile-jot-text:focus::-moz-placeholder {
+	color: transparent;
+}
+
+#profile-jot-text::-webkit-input-placeholder {
+	font-size:1.5em;
+}
+
+#profile-jot-text:focus::-webkit-input-placeholder {
+	color: transparent;
 }
 
 #profile-jot-text-loading {
-- 
cgit v1.2.3


From a98685df760d40439fbcd61022dec7d2b9b58b5f Mon Sep 17 00:00:00 2001
From: marijus <mario@localhost.localdomain>
Date: Sat, 23 Nov 2013 09:49:12 +0100
Subject: make profile-jot-text and -title height scalable

---
 view/theme/redbasic/css/style.css | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'view')

diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index e7ac112f6..660651a7f 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -358,7 +358,7 @@ footer {
 	border: 0px;
 	margin: 0px;
 	padding: 8px;
-	height: 20px;
+	height: 1.8em;
 	width: 530px;
 	margin-bottom: 5px;
 	font-weight: bold;
@@ -1454,7 +1454,7 @@ tr.mceLast {
 /* Not MCE */
 
 #profile-jot-text {
-	height: 20px;
+	height: 1.8em;
 	color:#000;
 	border: 1px solid #cccccc;
 	padding: 8px;
-- 
cgit v1.2.3


From 2e4177796364ca4edb3a29e7646545649d57c56a Mon Sep 17 00:00:00 2001
From: tuscanhobbit <tuscanhobbit@users.noreply.github.com>
Date: Sat, 23 Nov 2013 19:46:07 +0100
Subject: a reference to account_id was missing in user admin table

---
 view/tpl/admin_users.tpl | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

(limited to 'view')

diff --git a/view/tpl/admin_users.tpl b/view/tpl/admin_users.tpl
index cedd55216..609289013 100755
--- a/view/tpl/admin_users.tpl
+++ b/view/tpl/admin_users.tpl
@@ -55,7 +55,6 @@
 			<table id='users'>
 				<thead>
 				<tr>
-					<th></th>
 					{{foreach $th_users as $th}}<th>{{$th}}</th>{{/foreach}}
 					<th></th>
 					<th></th>
@@ -64,16 +63,19 @@
 				<tbody>
 				{{foreach $users as $u}}
 					<tr>
-						<td><img src="{{$u.micro}}" alt="{{$u.nickname}}" title="{{$u.nickname}}"></td>
-						<td class='email'>{{$u.account_email}}</td>
+						<td class='email'>{{if $u.blocked}}
+							<i>{{$u.account_email}}</i>
+						{{else}}
+							<strong>{{$u.account_email}}</strong>
+						{{/if}}</td>
 						<td class='register_date'>{{$u.account_created}}</td>
 						<td class='login_date'>{{$u.account_lastlog}}</td>
 						<td class='account_expires'>{{$u.account_expires}}</td>
 						<td class='service_class'>{{$u.account_service_class}}</td>
-						<td class="checkbox"><input type="checkbox" class="users_ckbx" id="id_user_{{$u.uid}}" name="user[]" value="{{$u.uid}}"/></td>
+						<td class="checkbox"><input type="checkbox" class="users_ckbx" id="id_user_{{$u.account_id}}" name="user[]" value="{{$u.account_id}}"/></td>
 						<td class="tools">
-							<a href="{{$baseurl}}/admin/users/block/{{$u.uid}}?t={{$form_security_token}}" title='{{if $u.blocked}}{{$unblock}}{{else}}{{$block}}{{/if}}'><i class='icon-ban-circle admin-icons {{if $u.blocked==0}}dim{{/if}}'></i></a>
-							<a href="{{$baseurl}}/admin/users/delete/{{$u.uid}}?t={{$form_security_token}}" title='{{$delete}}' onclick="return confirm_delete('{{$u.name}}')"><i class='icon-remove admin-icons'></i></a>
+							<a href="{{$baseurl}}/admin/users/block/{{$u.account_id}}?t={{$form_security_token}}" title='{{if ($u.blocked)}}{{$unblock}}{{else}}{{$block}}{{/if}}'><i class='icon-ban-circle admin-icons {{if ($u.blocked)}}dim{{/if}}'></i></a>
+							<a href="{{$baseurl}}/admin/users/delete/{{$u.account_id}}?t={{$form_security_token}}" title='{{$delete}}' onclick="return confirm_delete('{{$u.name}}')"><i class='icon-remove admin-icons'></i></a>
 						</td>
 					</tr>
 				{{/foreach}}
-- 
cgit v1.2.3


From 2c6e1b7aee2928c077bc090b1c4fe65c599d5d12 Mon Sep 17 00:00:00 2001
From: tuscanhobbit <tuscanhobbit@users.noreply.github.com>
Date: Sat, 23 Nov 2013 20:01:11 +0100
Subject: replaced rhash icon

---
 view/tpl/email_notify_html.tpl | 2 +-
 view/tpl/opensearch.tpl        | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'view')

diff --git a/view/tpl/email_notify_html.tpl b/view/tpl/email_notify_html.tpl
index 85939ac22..41bbe16a9 100755
--- a/view/tpl/email_notify_html.tpl
+++ b/view/tpl/email_notify_html.tpl
@@ -7,7 +7,7 @@
 <body>
 <table style="border:1px solid #ccc">
 	<tbody>
-	<tr><td colspan="2" style="background:#ff0000; 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/rhash-32.png'><div style="padding:7px; margin-left: 5px; float:left; font-size:18px;letter-spacing:1px;">{{$product}}</div><div style="clear: both;"></div></td></tr>
+	<tr><td colspan="2" style="background:#c60032; 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/rm-32.png'><div style="padding:7px; margin-left: 5px; float:left; font-size:18px;letter-spacing:1px;">{{$product}}</div><div style="clear: both;"></div></td></tr>
 
 
 	<tr><td style="padding-top:22px;" colspan="2">{{$preamble}}</td></tr>
diff --git a/view/tpl/opensearch.tpl b/view/tpl/opensearch.tpl
index 26fb5a799..ea260c6ae 100755
--- a/view/tpl/opensearch.tpl
+++ b/view/tpl/opensearch.tpl
@@ -3,11 +3,11 @@
 	<ShortName>Red Matrix@{{$nodename}}</ShortName>
 	<Description>Search in The Red Matrix@{{$nodename}}</Description>
 	<Contact>http://github.com/friendica/red/</Contact>
-	<Image height="16" width="16" type="image/png">{{$baseurl}}/images/rhash-16.png</Image>
-	<Image height="64" width="64" type="image/png">{{$baseurl}}/images/rhash-64.png</Image>
+	<Image height="16" width="16" type="image/png">{{$baseurl}}/images/rm-16.png</Image>
+	<Image height="64" width="64" type="image/png">{{$baseurl}}/images/rm-64.png</Image>
 	<Url type="text/html" 
         template="{{$baseurl}}/search?search={searchTerms}"/>
 	<Url type="application/opensearchdescription+xml"
       	rel="self"
       	template="{{$baseurl}}/opensearch" />        
-</OpenSearchDescription>
\ No newline at end of file
+</OpenSearchDescription>
-- 
cgit v1.2.3


From d126c2bcaae4c25eda03b99b4422398ad781c582 Mon Sep 17 00:00:00 2001
From: tuscanhobbit <tuscanhobbit@users.noreply.github.com>
Date: Sat, 23 Nov 2013 20:04:09 +0100
Subject: redbasic nav bar gradient is now similar to the red shade in the logo

---
 view/theme/redbasic/php/style.php | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

(limited to 'view')

diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php
index 1eb5abfbb..9956ccd31 100644
--- a/view/theme/redbasic/php/style.php
+++ b/view/theme/redbasic/php/style.php
@@ -114,22 +114,20 @@
 // Nav colours have nested values, so we have to define the actual variables
 // used in the CSS from the higher level "red", "black", etc here
 		if ($nav_colour == "red") {
-					$nav_bg_1 = "#f88";
-					$nav_bg_2 = "#b00";
-					$nav_bg_3 = "#f00";
-					$nav_bg_4 = "#b00";
-					$search_background = '#FFDDDD';
+					$nav_bg_1 = $nav_bg_3 = "#ba002f";
+					$nav_bg_2 = $nav_bg_4 = "#ad002c";
+					$search_background = "#EEEEEE";
 					$active_colour = '#444444';
 		}
 
 		if ($nav_colour == "black") {
-				    $nav_bg_1 = $nav_bg_3 = "#000";
-		      		    $nav_bg_2 = $nav_bg_4 = "#222";
+					$nav_bg_1 = $nav_bg_3 = "#000";
+		      			$nav_bg_2 = $nav_bg_4 = "#222";
 					$search_background = '#EEEEEE';
 					$active_colour = '#AAAAAA';
 		}
 		if ($nav_colour == "silver") {
-				    $nav_bg_1 = $nav_bg_2 = $nav_bg_3 = $nav_bg_4 = "silver";
+					$nav_bg_1 = $nav_bg_2 = $nav_bg_3 = $nav_bg_4 = "silver";
 					$search_background = '#EEEEEE';
 		}
 
-- 
cgit v1.2.3


From 421cacfc8d968f981e6c3420017910c3a8d047ab Mon Sep 17 00:00:00 2001
From: tuscanhobbit <tuscanhobbit@users.noreply.github.com>
Date: Sun, 24 Nov 2013 23:06:03 +0100
Subject: admin user table now shows the channel list, minor changes to summary

---
 view/tpl/admin_summary.tpl | 20 ++++++++------------
 view/tpl/admin_users.tpl   |  2 ++
 2 files changed, 10 insertions(+), 12 deletions(-)

(limited to 'view')

diff --git a/view/tpl/admin_summary.tpl b/view/tpl/admin_summary.tpl
index d3665626f..24cdd57cc 100755
--- a/view/tpl/admin_summary.tpl
+++ b/view/tpl/admin_summary.tpl
@@ -14,27 +14,23 @@
 		<dt>{{$users.0}}</dt>
 		<dd>{{$users.1}}</dd>
 	</dl>
-	{{foreach $accounts as $p}}
+	<!-- $accounts is empty
+		{{foreach $accounts as $p}}
 		<dl>
 			<dt>{{$p.0}}</dt>
 			<dd>{{if $p.1}}{{$p.1}}{{else}}0{{/if}}</dd>
 		</dl>
-	{{/foreach}}
-
-
+	{{/foreach}} -->
 	<dl>
 		<dt>{{$plugins.0}}</dt>
-		
-		{{foreach $plugins.1 as $p}}
-			<dd>{{$p}}</dd>
-		{{/foreach}}
-		
+		<dd>
+		{{foreach $plugins.1 as $p}} {{$p}} {{/foreach}}
+		&nbsp;
+		</dd>
 	</dl>
-
 	<dl>
 		<dt>{{$version.0}}</dt>
-		<dd>{{$version.1}} - {{$build}}</dt>
+		<dd>{{$version.1}} - {{$build}}</dd>
 	</dl>
 
-
 </div>
diff --git a/view/tpl/admin_users.tpl b/view/tpl/admin_users.tpl
index 609289013..3549dc5c2 100755
--- a/view/tpl/admin_users.tpl
+++ b/view/tpl/admin_users.tpl
@@ -63,11 +63,13 @@
 				<tbody>
 				{{foreach $users as $u}}
 					<tr>
+						<td class='account_id'>{{$u.account_id}}</td>
 						<td class='email'>{{if $u.blocked}}
 							<i>{{$u.account_email}}</i>
 						{{else}}
 							<strong>{{$u.account_email}}</strong>
 						{{/if}}</td>
+						<td class='channels'>{{$u.channels}}</td>
 						<td class='register_date'>{{$u.account_created}}</td>
 						<td class='login_date'>{{$u.account_lastlog}}</td>
 						<td class='account_expires'>{{$u.account_expires}}</td>
-- 
cgit v1.2.3


From c0f2bc436c3fc53b48a588edbe766312fbcdc278 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Mon, 25 Nov 2013 00:07:00 -0800
Subject: force HTML notification mails to use predefined colours.

---
 view/tpl/email_notify_html.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'view')

diff --git a/view/tpl/email_notify_html.tpl b/view/tpl/email_notify_html.tpl
index 41bbe16a9..cf149341e 100755
--- a/view/tpl/email_notify_html.tpl
+++ b/view/tpl/email_notify_html.tpl
@@ -5,7 +5,7 @@
 	<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
 </head>
 <body>
-<table style="border:1px solid #ccc">
+<table style="border:1px solid #ccc; background-color: #FFFFFF; color: #000000;">
 	<tbody>
 	<tr><td colspan="2" style="background:#c60032; 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/rm-32.png'><div style="padding:7px; margin-left: 5px; float:left; font-size:18px;letter-spacing:1px;">{{$product}}</div><div style="clear: both;"></div></td></tr>
 
-- 
cgit v1.2.3


From 24acf29009149968a43dba8399346806fba25bea Mon Sep 17 00:00:00 2001
From: marijus <mario@localhost.localdomain>
Date: Mon, 25 Nov 2013 13:51:35 +0100
Subject: polish up share button a little

---
 view/theme/redbasic/css/style.css | 54 +++++++++++++++++----------------------
 1 file changed, 24 insertions(+), 30 deletions(-)

(limited to 'view')

diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 660651a7f..3c3851a65 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -1195,21 +1195,11 @@ footer {
 
 #profile-jot-perms {
 	float: right;
-	margin-left: 100px;
-	font-weight: bold;
-	font-size: 1.2em;
-	height: auto;
-	width: auto;
-	background-color: #0080FF;
-	border-radius: $radiuspx;
-	border: 2px outset;
-	box-shadow: 5px 5px 5px #666;
-	margin-right: 8px;
-	padding: 4px;
-}
-
-#profile-jot-perms:active {
-    box-shadow: 0 0 0 0;
+	background-color: $toolicon_colour;
+	border: 1px solid #666;
+	border-right: none;
+	border-radius: $radiuspx 0px 0px $radiuspx;
+	padding: 6px;
 }
 
 #profile-jot-perms-end {
@@ -1537,23 +1527,27 @@ tr.mceLast {
 }
 
 #profile-jot-submit {
-    height: auto;
-    background-color: #0080FF;
-    color: #eeeeec;
-    font-weight: bold;
-    -webkit-border-radius: $radiuspx;
-    -moz-border-radius: $radiuspx;
-    border-radius: $radiuspx;
-    border: 2px outset #222420 !important;
-    margin: 0;
-    float: right;
-    text-shadow: 1px 1px #111;
-    width: auto;
-    box-shadow: 5px 5px 5px #444;
+	height: 30px;
+	width: 70px;
+	background: linear-gradient(top, #0080ff 0%, #0080aa);
+	background: -webkit-linear-gradient(top, #0080ff 0%, #0080aa);
+	background: -moz-linear-gradient(top, #0080ff 0%, #0080aa);
+	background: -o-linear-gradient(top, #0080ff 0%, #0080aa);
+	background: -ms-linear-gradient(top, #0080ff 0%, #0080aa);
+	color: #fff;
+	font-weight: bold;
+	border-radius: 0px $radiuspx $radiuspx 0px;
+	float: right;
+	text-shadow: 1px 1px #111;
+	cursor: pointer;
 }
 
-#profile-jot-submit:active {
-    box-shadow: 0 0 0 0;
+#profile-jot-submit:hover {
+	background: linear-gradient(top, #0080aa 0%, #0080ff);
+	background: -webkit-linear-gradient(top, #0080aa 0%, #0080ff);
+	background: -moz-linear-gradient(top, #0080aa 0%, #0080ff);
+	background: -o-linear-gradient(top, #0080aa 0%, #0080ff);
+	background: -ms-linear-gradient(top, #0080aa 0%, #0080ff);
 }
 
 #sidebar-page-list .label {
-- 
cgit v1.2.3


From ba6d6876d62759156e9da12e5e1aede14c5c66e1 Mon Sep 17 00:00:00 2001
From: 23n <post@toktan.org>
Date: Mon, 25 Nov 2013 22:18:34 +0100
Subject: no underlined drop icon

---
 view/theme/redbasic/css/style.css | 1 +
 1 file changed, 1 insertion(+)

(limited to 'view')

diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 3c3851a65..ae3758c2e 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -3528,6 +3528,7 @@ margin-right: 50px;
 a .drop-icons {
 	color: #777;
 	font-size: 1.2em;
+	text-decoration: none;
 }
  
 .drop-icons:hover {
-- 
cgit v1.2.3


From fe9162395ae703adf91f7ac32833211ca60ac216 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Mon, 25 Nov 2013 14:54:14 -0800
Subject: sort out the preview icons

---
 view/theme/redbasic/css/style.css | 8 ++++++--
 view/tpl/comment_item.tpl         | 2 +-
 view/tpl/jot.tpl                  | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

(limited to 'view')

diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 3c3851a65..6b670126a 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -1133,8 +1133,8 @@ footer {
 
 #profile-jot-plugin-wrapper,
 #profile-jot-submit-wrapper {
-	margin-top: 15px;
-	width:90%;
+	margin-top: 10px;
+	width:92%;
 }
 
 #profile-upload-wrapper {
@@ -3515,6 +3515,10 @@ margin-right: 50px;
 	color: $toolicon_colour;
 }
 
+.comment-preview-icon {
+	margin-left: 15px;
+}
+
 .comment-icon:hover,
 .jot-icons:hover {
 	color: $toolicon_activecolour; 
diff --git a/view/tpl/comment_item.tpl b/view/tpl/comment_item.tpl
index b8e2b4730..1ea619774 100755
--- a/view/tpl/comment_item.tpl
+++ b/view/tpl/comment_item.tpl
@@ -61,7 +61,7 @@
 				<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-{{$id}}" style="display: none;" >
 					<input type="submit" onclick="post_comment({{$id}}); return false;" id="comment-edit-submit-{{$id}}" class="comment-edit-submit" name="submit" value="{{$submit}}" />
 					{{if $preview}}
-					<span onclick="preview_comment({{$id}});" id="comment-edit-preview-link-{{$id}}" class="fakelink">{{$preview}}</span>
+					<span onclick="preview_comment({{$id}});" id="comment-edit-preview-link-{{$id}}" class="fakelink"><i class="icon-eye-open comment-icon comment-preview-icon" title="{{$preview}}"></i></span>
 					<div id="comment-edit-preview-{{$id}}" class="comment-edit-preview" style="display:none;"></div>
 					{{/if}}
 				</div>
diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl
index b9238f0c0..666fae9cd 100755
--- a/view/tpl/jot.tpl
+++ b/view/tpl/jot.tpl
@@ -71,7 +71,7 @@
 	</div>
 	{{/if}}
 
-	{{if $preview}}<span onclick="preview_post();" id="jot-preview-link" class="fakelink">{{$preview}}</span>{{/if}}
+	{{if $preview}}<span onclick="preview_post();" id="jot-preview-link" class="fakelink"><i class="icon-eye-open jot-icons" title="{{$preview}}"></i></span>{{/if}}
 
 
 	<div id="profile-jot-perms-end"></div>
-- 
cgit v1.2.3


From 95824642a643ccee269f7bf1a5ac570bc966a2e2 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Mon, 25 Nov 2013 19:07:58 -0800
Subject: make font-asewome optional. Also include jquery.browser in js/main.js
 so we can turn off the migration toolkit.

---
 view/php/theme_init.php                | 7 ++-----
 view/theme/redbasic/php/theme_init.php | 5 +++++
 2 files changed, 7 insertions(+), 5 deletions(-)
 create mode 100644 view/theme/redbasic/php/theme_init.php

(limited to 'view')

diff --git a/view/php/theme_init.php b/view/php/theme_init.php
index 69d99893a..c33187797 100644
--- a/view/php/theme_init.php
+++ b/view/php/theme_init.php
@@ -1,20 +1,17 @@
 <?php
 
-
-
 require_once('include/plugin.php');
 
-
 head_add_css('library/fancybox/jquery.fancybox-1.3.4.css');
 head_add_css('library/tiptip/tipTip.css');
 head_add_css('library/jgrowl/jquery.jgrowl.css');
 head_add_css('library/jslider/css/jslider.css');
 head_add_css('library/prettyphoto/css/prettyPhoto.css');
 head_add_css('library/colorbox/colorbox.css');
-head_add_css('library/font_awesome/css/font-awesome.min.css');
+// head_add_css('library/font_awesome/css/font-awesome.min.css');
 
 head_add_js('js/jquery.js');
-head_add_js('js/jquery-migrate-1.1.1.js');
+// head_add_js('js/jquery-migrate-1.1.1.js');
 head_add_js('js/spin.js');
 head_add_js('js/jquery.spin.js');
 head_add_js('js/jquery.textinputs.js');
diff --git a/view/theme/redbasic/php/theme_init.php b/view/theme/redbasic/php/theme_init.php
new file mode 100644
index 000000000..ccb85a070
--- /dev/null
+++ b/view/theme/redbasic/php/theme_init.php
@@ -0,0 +1,5 @@
+<?php
+
+head_add_css('library/font_awesome/css/font-awesome.min.css');
+require_once('view/php/theme_init.php');
+
-- 
cgit v1.2.3


From ed71567e5ce3cc5c9dd30acc0c2bc527960fa3da Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Tue, 26 Nov 2013 13:24:36 -0800
Subject: create jquery-compat to hold deprecated jquery functions, load it
 before all the dependent js scripts

---
 view/php/theme_init.php           | 3 ++-
 view/theme/redbasic/css/style.css | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'view')

diff --git a/view/php/theme_init.php b/view/php/theme_init.php
index c33187797..1ba8d18a4 100644
--- a/view/php/theme_init.php
+++ b/view/php/theme_init.php
@@ -11,7 +11,8 @@ head_add_css('library/colorbox/colorbox.css');
 // head_add_css('library/font_awesome/css/font-awesome.min.css');
 
 head_add_js('js/jquery.js');
-// head_add_js('js/jquery-migrate-1.1.1.js');
+//head_add_js('js/jquery-migrate-1.1.1.js');
+head_add_js('js/jquery-compat.js');
 head_add_js('js/spin.js');
 head_add_js('js/jquery.spin.js');
 head_add_js('js/jquery.textinputs.js');
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index ce3bfaee9..4b7925ba9 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -1978,7 +1978,7 @@ a.mail-list-link {
 	display: block;
 	color: #FFFFFF;
 	margin-top: 15px;
-	background-color: #F80000;
+	background-color: $nav_bg_2;
 	-webkit-border-radius: $radiuspx ;
 	-moz-border-radius: $radiuspx;
 	border-radius: $radiuspx;
@@ -3002,7 +3002,7 @@ div.jGrowl div.info {
 	width: 90%;
 }
 
-
+a.rconnect,
 nav a,
 nav a:active,
 nav a:visited,
@@ -3012,7 +3012,7 @@ nav a:link {
   outline: none;
 }
 
-nav a:hover {
+a.rconnect:hover, nav a:hover {
 	color: #0080FF;
 }
 nav .fakelink {
-- 
cgit v1.2.3


From e3f5c4458bc637ca304b807d2125f332965e4126 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Wed, 27 Nov 2013 00:48:17 -0800
Subject: re-enable jquery migration tool until we sort out all the issues

---
 view/php/theme_init.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'view')

diff --git a/view/php/theme_init.php b/view/php/theme_init.php
index 1ba8d18a4..f49b9c043 100644
--- a/view/php/theme_init.php
+++ b/view/php/theme_init.php
@@ -11,8 +11,8 @@ head_add_css('library/colorbox/colorbox.css');
 // head_add_css('library/font_awesome/css/font-awesome.min.css');
 
 head_add_js('js/jquery.js');
-//head_add_js('js/jquery-migrate-1.1.1.js');
-head_add_js('js/jquery-compat.js');
+head_add_js('js/jquery-migrate-1.1.1.js');
+//head_add_js('js/jquery-compat.js');
 head_add_js('js/spin.js');
 head_add_js('js/jquery.spin.js');
 head_add_js('js/jquery.textinputs.js');
-- 
cgit v1.2.3


From df66c510c9e47750ec7382d6933ff72372c426c1 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Fri, 29 Nov 2013 00:57:47 -0800
Subject: allow zot-info to return results for address= with webbies or naked
 nicknames

---
 view/theme/redbasic/css/style.css | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'view')

diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 4b7925ba9..eaa3140c9 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -1131,10 +1131,9 @@ footer {
 	margin-left: 50px;
 }
 
-#profile-jot-plugin-wrapper,
 #profile-jot-submit-wrapper {
 	margin-top: 10px;
-	width:92%;
+	width: 90%;
 }
 
 #profile-upload-wrapper {
-- 
cgit v1.2.3


From 1c5f98440da1b4713d0f5b9f8f6a2d3ca39e23af Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Fri, 29 Nov 2013 14:08:37 -0800
Subject: quite a bit of work on default acl permissions and various acl quirks

---
 view/js/mod_settings.js | 5 +++++
 view/tpl/settings.tpl   | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

(limited to 'view')

diff --git a/view/js/mod_settings.js b/view/js/mod_settings.js
index e749cd761..7f9a9e960 100644
--- a/view/js/mod_settings.js
+++ b/view/js/mod_settings.js
@@ -3,6 +3,11 @@ var ispublic = aStr['everybody'] ;
 
 $(document).ready(function() {
 
+			  $("a#settings-default-perms-menu").colorbox({ 
+				  'inline' : true, 
+				  'transition' : 'elastic' 
+			});
+
 	$('#contact_allow, #contact_deny, #group_allow, #group_deny').change(function() {
 		var selstr;
 		$('#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected').each( function() {
diff --git a/view/tpl/settings.tpl b/view/tpl/settings.tpl
index 10378e599..8781304c1 100755
--- a/view/tpl/settings.tpl
+++ b/view/tpl/settings.tpl
@@ -4,7 +4,7 @@
 {{$nickname_block}}
 
 <form action="settings" id="settings-form" method="post" autocomplete="off" >
-<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
+<input type='hidden' name='form_security_token' value='{{$form_security_token}}' />
 
 <h3 class="settings-heading">{{$h_basic}}</h3>
 
@@ -73,7 +73,7 @@
 {{/if}}
 
 <div id="settings-default-perms" class="settings-default-perms" >
-	<a href="#profile-jot-acl-wrapper" id="settings-default-perms-menu" class='popupbox'>{{$permissions}} {{$permdesc}}</a>
+	<a href="#profile-jot-acl-wrapper" id="settings-default-perms-menu" >{{$permissions}} {{$permdesc}}</a>
 	<div id="settings-default-perms-menu-end"></div>
 
 	<div id="settings-default-perms-select" style="display: none; margin-bottom: 20px" >
-- 
cgit v1.2.3


From 57669c92163cb1067a6fc3622e4e4f66bacb16b0 Mon Sep 17 00:00:00 2001
From: tuscanhobbit <tuscanhobbit@users.noreply.github.com>
Date: Sun, 1 Dec 2013 11:02:50 +0100
Subject: italian translation

---
 view/it/messages.po | 1928 ++++++++++++++++++++++++++-------------------------
 view/it/strings.php |  201 +++---
 2 files changed, 1081 insertions(+), 1048 deletions(-)

(limited to 'view')

diff --git a/view/it/messages.po b/view/it/messages.po
index 0143952d4..8d86d3c87 100644
--- a/view/it/messages.po
+++ b/view/it/messages.po
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Red Matrix\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-11-15 00:03-0800\n"
-"PO-Revision-Date: 2013-11-22 22:02+0000\n"
+"POT-Creation-Date: 2013-11-29 00:03-0800\n"
+"PO-Revision-Date: 2013-12-01 09:46+0000\n"
 "Last-Translator: tuscanhobbit Pa <pynolo@tarine.net>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/red-matrix/language/it/)\n"
 "MIME-Version: 1.0\n"
@@ -58,14 +58,14 @@ msgstr "Guarda %2$s di %1$s "
 msgid "%1$s has an updated %2$s, changing %3$s."
 msgstr "%1$s ha aggiornato %2$s cambiando %3$s."
 
-#: ../../include/api.php:972
-msgid "Public Timeline"
-msgstr "Diario pubblico"
-
 #: ../../include/enotify.php:36
 msgid "Red Matrix Notification"
 msgstr "Notifica di Red Matrix"
 
+#: ../../include/enotify.php:37
+msgid "redmatrix"
+msgstr "redmatrix"
+
 #: ../../include/enotify.php:39
 msgid "Thank You,"
 msgstr "Grazie,"
@@ -87,8 +87,8 @@ msgstr "[Red:Notifica] Nuovo messaggio ricevuto alle %s"
 
 #: ../../include/enotify.php:82
 #, php-format
-msgid "%1$s sent you a new private message at %2$s."
-msgstr "%1$s ti ha mandato un messaggio privato alle %2$s."
+msgid "%1$s, %2$s sent you a new private message at %3$s."
+msgstr "%1$s, %2$s  ti ha mandato un messaggio privato alle %3$s."
 
 #: ../../include/enotify.php:83
 #, php-format
@@ -106,144 +106,145 @@ msgstr "Visita %s per leggere i tuoi messaggi privati e rispondere."
 
 #: ../../include/enotify.php:135
 #, php-format
-msgid "%1$s commented on [zrl=%2$s]a %3$s[/zrl]"
-msgstr "%1$s ha commentato [zrl=%2$s]%3$s[/zrl]"
+msgid "%1$s, %2$s commented on [zrl=%3$s]a %4$s[/zrl]"
+msgstr "%1$s, %2$s ha commentato [zrl=%3$s]%4$s[/zrl]"
 
-#: ../../include/enotify.php:142
+#: ../../include/enotify.php:143
 #, php-format
-msgid "%1$s commented on [zrl=%2$s]%3$s's %4$s[/zrl]"
-msgstr "%1$s ha commentato [zrl=%2$s]%4$s di %3$s[/zrl]"
+msgid "%1$s, %2$s commented on [zrl=%3$s]%4$s's %5$s[/zrl]"
+msgstr "%1$s, %2$s ha commentato [zrl=%3$s]%5$s di %4$s[/zrl]"
 
-#: ../../include/enotify.php:150
+#: ../../include/enotify.php:152
 #, php-format
-msgid "%1$s commented on [zrl=%2$s]your %3$s[/zrl]"
-msgstr "%1$s ha commentato [zrl=%2$s]%3$s[/zrl] che hai creato"
+msgid "%1$s, %2$s commented on [zrl=%3$s]your %4$s[/zrl]"
+msgstr "%1$s, %2$s ha commentato [zrl=%3$s]%4$s che hai creato[/zrl]"
 
-#: ../../include/enotify.php:160
+#: ../../include/enotify.php:163
 #, php-format
 msgid "[Red:Notify] Comment to conversation #%1$d by %2$s"
 msgstr "[Red:Notifica] Nuovo commento di %2$s alla conversazione #%1$d"
 
-#: ../../include/enotify.php:161
+#: ../../include/enotify.php:164
 #, php-format
-msgid "%s commented on an item/conversation you have been following."
-msgstr "%s ha commentato una conversazione che stai seguendo."
+msgid "%1$s, %2$s commented on an item/conversation you have been following."
+msgstr "%1$s, %2$s ha commentato un elemento che stavi seguendo."
 
-#: ../../include/enotify.php:164 ../../include/enotify.php:181
-#: ../../include/enotify.php:206 ../../include/enotify.php:224
-#: ../../include/enotify.php:237
+#: ../../include/enotify.php:167 ../../include/enotify.php:186
+#: ../../include/enotify.php:212 ../../include/enotify.php:231
+#: ../../include/enotify.php:245
 #, php-format
 msgid "Please visit %s to view and/or reply to the conversation."
 msgstr "Visita %s per leggere o commentare la conversazione."
 
-#: ../../include/enotify.php:171
+#: ../../include/enotify.php:174
 #, php-format
 msgid "[Red:Notify] %s posted to your profile wall"
 msgstr "[Red:Notifica] %s ha scritto sulla tua bacheca"
 
-#: ../../include/enotify.php:173
+#: ../../include/enotify.php:176
 #, php-format
-msgid "%1$s posted to your profile wall at %2$s"
-msgstr "%1$s ha scritto sulla tua bacheca alle %2$s"
+msgid "%1$s, %2$s posted to your profile wall at %3$s"
+msgstr "%1$s, %2$s ha scritto sulla bacheca del tuo profilo alle %3$s"
 
-#: ../../include/enotify.php:175
+#: ../../include/enotify.php:178
 #, php-format
-msgid "%1$s posted to [zrl=%2$s]your wall[/zrl]"
-msgstr "%1$s ha scritto sulla [zrl=%2$s]tua bacheca[/zrl]"
+msgid "%1$s, %2$s posted to [zrl=%3$s]your wall[/zrl]"
+msgstr "%1$s, %2$s ha scritto sulla [zrl=%3$s]tua bacheca[/zrl]"
 
-#: ../../include/enotify.php:200
+#: ../../include/enotify.php:205
 #, php-format
 msgid "[Red:Notify] %s tagged you"
 msgstr "[Red:Notifica] %s ti ha taggato"
 
-#: ../../include/enotify.php:201
+#: ../../include/enotify.php:206
 #, php-format
-msgid "%1$s tagged you at %2$s"
-msgstr "%1$s ti ha taggato alle %2$s"
+msgid "%1$s, %2$s tagged you at %3$s"
+msgstr "%1$s, %2$s ti ha taggato alle %3$s"
 
-#: ../../include/enotify.php:202
+#: ../../include/enotify.php:207
 #, php-format
-msgid "%1$s [zrl=%2$s]tagged you[/zrl]."
-msgstr "%1$s [zrl=%2$s]ti ha taggato[/zrl]."
+msgid "%1$s, %2$s [zrl=%3$s]tagged you[/zrl]."
+msgstr "%1$s, %2$s [zrl=%3$s]ti ha taggato[/zrl]."
 
-#: ../../include/enotify.php:214
+#: ../../include/enotify.php:220
 #, php-format
 msgid "[Red:Notify] %1$s poked you"
 msgstr "[Red:Notifica] %1$s ti ha mandato un poke"
 
-#: ../../include/enotify.php:215
+#: ../../include/enotify.php:221
 #, php-format
-msgid "%1$s poked you at %2$s"
-msgstr "%1$s ti ha mandato un poke alle %2$s"
+msgid "%1$s, %2$s poked you at %3$s"
+msgstr "%1$s, %2$s ti ha mandato un poke alle %3$s"
 
-#: ../../include/enotify.php:216
+#: ../../include/enotify.php:222
 #, php-format
-msgid "%1$s [zrl=%2$s]poked you[/zrl]."
-msgstr "%1$s [zrl=%2$s]ti ha mandato un poke[/zrl]."
+msgid "%1$s, %2$s [zrl=%2$s]poked you[/zrl]."
+msgstr "%1$s, %2$s [zrl=%2$s]ti ha mandato un poke[/zrl]."
 
-#: ../../include/enotify.php:231
+#: ../../include/enotify.php:238
 #, php-format
 msgid "[Red:Notify] %s tagged your post"
 msgstr "[Red:Notifica] %s ha taggato il tuo articolo"
 
-#: ../../include/enotify.php:232
+#: ../../include/enotify.php:239
 #, php-format
-msgid "%1$s tagged your post at %2$s"
-msgstr "%1$s ha taggato il tuo articolo alle %2$s"
+msgid "%1$s, %2$s tagged your post at %3$s"
+msgstr "%1$s, %2$s ha taggato il tuo articolo alle %3$s"
 
-#: ../../include/enotify.php:233
+#: ../../include/enotify.php:240
 #, php-format
-msgid "%1$s tagged [zrl=%2$s]your post[/zrl]"
-msgstr "%1$s ha taggato [zrl=%2$s]il tuo articolo[/zrl]"
+msgid "%1$s, %2$s tagged [zrl=%3$s]your post[/zrl]"
+msgstr "%1$s, %2$s ha taggato [zrl=%3$s]il tuo articolo[/zrl]"
 
-#: ../../include/enotify.php:244
+#: ../../include/enotify.php:252
 msgid "[Red:Notify] Introduction received"
 msgstr "[Red:Notifica] Hai una richiesta di amicizia"
 
-#: ../../include/enotify.php:245
+#: ../../include/enotify.php:253
 #, php-format
-msgid "You've received an introduction from '%1$s' at %2$s"
-msgstr "Hai ricevuto una richiesta di amicizia da '%1$s' alle %2$s"
+msgid "%1$s, you've received an introduction from '%2$s' at %3$s"
+msgstr "%1$s, hai ricevuto una richiesta di contatto da '%2$s' alle %3$s"
 
-#: ../../include/enotify.php:246
+#: ../../include/enotify.php:254
 #, php-format
-msgid "You've received [zrl=%1$s]an introduction[/zrl] from %2$s."
-msgstr "Hai ricevuto [zrl=%1$s]una richiesta di amicizia[/zrl] da %2$s."
+msgid "%1$s, you've received [zrl=%2$s]an introduction[/zrl] from %3$s."
+msgstr "%1$s, hai ricevuto [zrl=%2$s]una richiesta di amicizia[/zrl] da %3$s."
 
-#: ../../include/enotify.php:249 ../../include/enotify.php:267
+#: ../../include/enotify.php:258 ../../include/enotify.php:277
 #, php-format
 msgid "You may visit their profile at %s"
 msgstr "Puoi visitare il suo profilo su %s"
 
-#: ../../include/enotify.php:251
+#: ../../include/enotify.php:260
 #, php-format
 msgid "Please visit %s to approve or reject the introduction."
 msgstr "Visita %s per approvare o rifiutare la richiesta."
 
-#: ../../include/enotify.php:258
+#: ../../include/enotify.php:267
 msgid "[Red:Notify] Friend suggestion received"
 msgstr "[Red:Notifica] Ti è stato suggerito un amico"
 
-#: ../../include/enotify.php:259
+#: ../../include/enotify.php:268
 #, php-format
-msgid "You've received a friend suggestion from '%1$s' at %2$s"
-msgstr "Ti è stato suggerito un amico da '%1$s' alle %2$s"
+msgid "%1$s, you've received a friend suggestion from '%2$s' at %3$s"
+msgstr "%1$s, ti è stato suggerito un amico da '%2$s' alle %3$s"
 
-#: ../../include/enotify.php:260
+#: ../../include/enotify.php:269
 #, php-format
 msgid ""
-"You've received [zrl=%1$s]a friend suggestion[/zrl] for %2$s from %3$s."
-msgstr "%3$s ti ha [zrl=%1$s]suggerito %2$s[/zrl] come amico."
+"%1$s, you've received [zrl=%2$s]a friend suggestion[/zrl] for %3$s from "
+"%4$s."
+msgstr "%1$s, %4$s ti [zrl=%2$s]ha suggerito %3$s[/zrl] come amico."
 
-#: ../../include/enotify.php:265
+#: ../../include/enotify.php:275
 msgid "Name:"
 msgstr "Nome:"
 
-#: ../../include/enotify.php:266
+#: ../../include/enotify.php:276
 msgid "Photo:"
 msgstr "Foto:"
 
-#: ../../include/enotify.php:269
+#: ../../include/enotify.php:279
 #, php-format
 msgid "Please visit %s to approve or reject the suggestion."
 msgstr "Visita %s per approvare o rifiutare il suggerimento."
@@ -253,7 +254,7 @@ msgid "Private Message"
 msgstr "Messaggio privato"
 
 #: ../../include/ItemObject.php:95 ../../include/page_widgets.php:8
-#: ../../mod/webpages.php:101 ../../mod/settings.php:712 ../../mod/menu.php:55
+#: ../../mod/webpages.php:101 ../../mod/settings.php:713 ../../mod/menu.php:55
 #: ../../mod/layouts.php:102 ../../mod/editlayout.php:100
 #: ../../mod/editwebpage.php:119 ../../mod/blocks.php:93
 #: ../../mod/editpost.php:97 ../../mod/editblock.php:114
@@ -261,8 +262,8 @@ msgid "Edit"
 msgstr "Modifica"
 
 #: ../../include/ItemObject.php:107 ../../include/conversation.php:628
-#: ../../mod/settings.php:713 ../../mod/admin.php:677 ../../mod/group.php:182
-#: ../../mod/photos.php:1130 ../../mod/connections.php:354
+#: ../../mod/settings.php:714 ../../mod/admin.php:690 ../../mod/group.php:182
+#: ../../mod/photos.php:1130 ../../mod/connections.php:374
 #: ../../mod/filestorage.php:82
 msgid "Delete"
 msgstr "Elimina"
@@ -386,21 +387,23 @@ msgstr "Commento"
 
 #: ../../include/ItemObject.php:530 ../../mod/events.php:458
 #: ../../mod/thing.php:190 ../../mod/invite.php:154 ../../mod/setup.php:302
-#: ../../mod/setup.php:345 ../../mod/settings.php:650
-#: ../../mod/settings.php:762 ../../mod/settings.php:790
-#: ../../mod/settings.php:814 ../../mod/settings.php:885
-#: ../../mod/settings.php:1053 ../../mod/connect.php:96
+#: ../../mod/setup.php:345 ../../mod/settings.php:651
+#: ../../mod/settings.php:763 ../../mod/settings.php:791
+#: ../../mod/settings.php:815 ../../mod/settings.php:886
+#: ../../mod/settings.php:1054 ../../mod/connect.php:96
 #: ../../mod/sources.php:83 ../../mod/sources.php:110 ../../mod/admin.php:418
-#: ../../mod/admin.php:670 ../../mod/admin.php:810 ../../mod/admin.php:1009
-#: ../../mod/admin.php:1096 ../../mod/group.php:87 ../../mod/photos.php:685
+#: ../../mod/admin.php:683 ../../mod/admin.php:823 ../../mod/admin.php:1022
+#: ../../mod/admin.php:1109 ../../mod/group.php:87 ../../mod/photos.php:685
 #: ../../mod/photos.php:779 ../../mod/photos.php:1040
 #: ../../mod/photos.php:1080 ../../mod/photos.php:1167
 #: ../../mod/message.php:333 ../../mod/message.php:515
-#: ../../mod/connections.php:432 ../../mod/profiles.php:529
+#: ../../mod/connections.php:452 ../../mod/profiles.php:529
 #: ../../mod/import.php:385 ../../mod/crepair.php:166 ../../mod/poke.php:166
 #: ../../mod/fsuggest.php:108 ../../mod/mood.php:137
-#: ../../view/theme/redbasic/php/config.php:79
+#: ../../view/theme/redbasic/php/config.php:85
 #: ../../view/theme/apw/php/config.php:231
+#: ../../view/theme/blogga/view/theme/blog/config.php:67
+#: ../../view/theme/blogga/php/config.php:67
 msgid "Submit"
 msgstr "Salva"
 
@@ -451,9 +454,9 @@ msgstr "Crittografia del testo"
 
 #: ../../include/Contact.php:87 ../../include/contact_widgets.php:23
 #: ../../mod/match.php:58 ../../mod/suggest.php:56 ../../mod/directory.php:198
-#: ../../boot.php:1745
+#: ../../boot.php:1741
 msgid "Connect"
-msgstr "Connetti"
+msgstr "Entra in contatto/segui"
 
 #: ../../include/Contact.php:103
 msgid "New window"
@@ -472,8 +475,8 @@ msgid "View Status"
 msgstr "Guarda il messaggio di stato"
 
 #: ../../include/Contact.php:526 ../../include/nav.php:76
-#: ../../include/conversation.php:925 ../../mod/connections.php:307
-#: ../../mod/connections.php:421
+#: ../../include/conversation.php:925 ../../mod/connections.php:327
+#: ../../mod/connections.php:441
 msgid "View Profile"
 msgstr "Profilo"
 
@@ -553,8 +556,8 @@ msgstr "OStatus"
 msgid "RSS/Atom"
 msgstr "RSS/Atom"
 
-#: ../../include/contact_selectors.php:77 ../../mod/admin.php:673
-#: ../../mod/admin.php:682 ../../boot.php:1465
+#: ../../include/contact_selectors.php:77 ../../mod/admin.php:686
+#: ../../mod/admin.php:695 ../../boot.php:1461
 msgid "Email"
 msgstr "Email"
 
@@ -673,7 +676,7 @@ msgid "Finishes:"
 msgstr "Fine:"
 
 #: ../../include/event.php:40 ../../include/bb2diaspora.php:455
-#: ../../mod/events.php:450 ../../mod/directory.php:173 ../../boot.php:1795
+#: ../../mod/events.php:450 ../../mod/directory.php:173 ../../boot.php:1791
 msgid "Location:"
 msgstr "Luogo:"
 
@@ -796,8 +799,8 @@ msgstr "Filtra per insiemi di canali"
 msgid "Enable widget to display Network posts only from selected collections"
 msgstr "Mostra il riquadro per filtrare gli articoli di certi insiemi di canali"
 
-#: ../../include/features.php:47 ../../mod/network.php:173
-#: ../../mod/search.php:17
+#: ../../include/features.php:47 ../../mod/search.php:17
+#: ../../mod/network.php:173
 msgid "Saved Searches"
 msgstr "Ricerche salvate"
 
@@ -833,14 +836,6 @@ msgstr "Permette di selezionare i contenuti in base al livello di amicizia"
 msgid "Post/Comment Tools"
 msgstr "Gestione articoli e commenti"
 
-#: ../../include/features.php:56
-msgid "Multiple Deletion"
-msgstr "Eliminazione multipla"
-
-#: ../../include/features.php:56
-msgid "Select and delete multiple posts/comments at once"
-msgstr "Rendi possibile l'eliminazione di molti articoli o commenti con un solo comando"
-
 #: ../../include/features.php:57
 msgid "Edit Sent Posts"
 msgstr "Modifica gli articoli già inviati"
@@ -908,7 +903,7 @@ msgstr "È stato ripristinato un insieme con lo stesso nome che era stato elimin
 msgid "Default privacy group for new contacts"
 msgstr "Insieme predefinito per i nuovi canali che aggiungi"
 
-#: ../../include/group.php:242
+#: ../../include/group.php:242 ../../mod/admin.php:695
 msgid "All Channels"
 msgstr "Tutti i canali"
 
@@ -1065,12 +1060,12 @@ msgstr "Foto del profilo"
 msgid "Profile"
 msgstr "Profilo"
 
-#: ../../include/profile_advanced.php:15 ../../mod/settings.php:1061
+#: ../../include/profile_advanced.php:15 ../../mod/settings.php:1062
 msgid "Full Name:"
 msgstr "Nome completo:"
 
 #: ../../include/profile_advanced.php:17 ../../mod/directory.php:175
-#: ../../boot.php:1797
+#: ../../boot.php:1793
 msgid "Gender:"
 msgstr "Sesso:"
 
@@ -1091,7 +1086,7 @@ msgid "Age:"
 msgstr "Età:"
 
 #: ../../include/profile_advanced.php:37 ../../mod/directory.php:177
-#: ../../boot.php:1798
+#: ../../boot.php:1794
 msgid "Status:"
 msgstr "Stato:"
 
@@ -1105,7 +1100,7 @@ msgid "Sexual Preference:"
 msgstr "Preferenze sessuali:"
 
 #: ../../include/profile_advanced.php:48 ../../mod/directory.php:179
-#: ../../boot.php:1799
+#: ../../boot.php:1795
 msgid "Homepage:"
 msgstr "Home page:"
 
@@ -1173,343 +1168,347 @@ msgstr "Lavoro:"
 msgid "School/education:"
 msgstr "Scuola:"
 
-#: ../../include/text.php:309
+#: ../../include/text.php:312
 msgid "prev"
 msgstr "prec"
 
-#: ../../include/text.php:311
+#: ../../include/text.php:314
 msgid "first"
 msgstr "inizio"
 
-#: ../../include/text.php:340
+#: ../../include/text.php:343
 msgid "last"
 msgstr "fine"
 
-#: ../../include/text.php:343
+#: ../../include/text.php:346
 msgid "next"
 msgstr "succ"
 
-#: ../../include/text.php:355
+#: ../../include/text.php:358
 msgid "older"
 msgstr "più recenti"
 
-#: ../../include/text.php:357
+#: ../../include/text.php:360
 msgid "newer"
 msgstr "più nuovi"
 
-#: ../../include/text.php:648
+#: ../../include/text.php:651
 msgid "No connections"
 msgstr "Nessun contatto"
 
-#: ../../include/text.php:659
+#: ../../include/text.php:662
 #, php-format
 msgid "%d Connection"
 msgid_plural "%d Connections"
 msgstr[0] "%d contatto"
 msgstr[1] "%d contatti"
 
-#: ../../include/text.php:671
+#: ../../include/text.php:674
 msgid "View Connections"
 msgstr "Elenco contatti"
 
-#: ../../include/text.php:730 ../../include/nav.php:135
+#: ../../include/text.php:733 ../../include/nav.php:135
 #: ../../mod/search.php:96
 msgid "Search"
 msgstr "Cerca"
 
-#: ../../include/text.php:732 ../../mod/filer.php:36
+#: ../../include/text.php:735 ../../mod/filer.php:36
 msgid "Save"
 msgstr "Salva"
 
-#: ../../include/text.php:770
+#: ../../include/text.php:773
 msgid "poke"
 msgstr "poke"
 
-#: ../../include/text.php:770 ../../include/conversation.php:236
+#: ../../include/text.php:773 ../../include/conversation.php:236
 msgid "poked"
 msgstr "ha ricevuto un poke"
 
-#: ../../include/text.php:771
+#: ../../include/text.php:774
 msgid "ping"
 msgstr "ping"
 
-#: ../../include/text.php:771
+#: ../../include/text.php:774
 msgid "pinged"
 msgstr "ha ricevuto un ping"
 
-#: ../../include/text.php:772
+#: ../../include/text.php:775
 msgid "prod"
 msgstr "prod"
 
-#: ../../include/text.php:772
+#: ../../include/text.php:775
 msgid "prodded"
 msgstr "ha ricevuto un prod"
 
-#: ../../include/text.php:773
+#: ../../include/text.php:776
 msgid "slap"
 msgstr "schiaffo"
 
-#: ../../include/text.php:773
+#: ../../include/text.php:776
 msgid "slapped"
 msgstr "ha ricevuto uno schiaffo"
 
-#: ../../include/text.php:774
+#: ../../include/text.php:777
 msgid "finger"
 msgstr "finger"
 
-#: ../../include/text.php:774
+#: ../../include/text.php:777
 msgid "fingered"
 msgstr "ha ricevuto un finger"
 
-#: ../../include/text.php:775
+#: ../../include/text.php:778
 msgid "rebuff"
 msgstr "rifiuto"
 
-#: ../../include/text.php:775
+#: ../../include/text.php:778
 msgid "rebuffed"
 msgstr "ha ricevuto un rifiuto"
 
-#: ../../include/text.php:787
+#: ../../include/text.php:790
 msgid "happy"
 msgstr "allegro"
 
-#: ../../include/text.php:788
+#: ../../include/text.php:791
 msgid "sad"
 msgstr "triste"
 
-#: ../../include/text.php:789
+#: ../../include/text.php:792
 msgid "mellow"
 msgstr "calmo"
 
-#: ../../include/text.php:790
+#: ../../include/text.php:793
 msgid "tired"
 msgstr "stanco"
 
-#: ../../include/text.php:791
+#: ../../include/text.php:794
 msgid "perky"
 msgstr "vivace"
 
-#: ../../include/text.php:792
+#: ../../include/text.php:795
 msgid "angry"
 msgstr "arrabbiato"
 
-#: ../../include/text.php:793
+#: ../../include/text.php:796
 msgid "stupified"
 msgstr "stordito"
 
-#: ../../include/text.php:794
+#: ../../include/text.php:797
 msgid "puzzled"
 msgstr "confuso"
 
-#: ../../include/text.php:795
+#: ../../include/text.php:798
 msgid "interested"
 msgstr "attento"
 
-#: ../../include/text.php:796
+#: ../../include/text.php:799
 msgid "bitter"
 msgstr "amaro"
 
-#: ../../include/text.php:797
+#: ../../include/text.php:800
 msgid "cheerful"
 msgstr "allegro"
 
-#: ../../include/text.php:798
+#: ../../include/text.php:801
 msgid "alive"
 msgstr "vivace"
 
-#: ../../include/text.php:799
+#: ../../include/text.php:802
 msgid "annoyed"
 msgstr "seccato"
 
-#: ../../include/text.php:800
+#: ../../include/text.php:803
 msgid "anxious"
 msgstr "ansioso"
 
-#: ../../include/text.php:801
+#: ../../include/text.php:804
 msgid "cranky"
 msgstr "irritabile"
 
-#: ../../include/text.php:802
+#: ../../include/text.php:805
 msgid "disturbed"
 msgstr "turbato"
 
-#: ../../include/text.php:803
+#: ../../include/text.php:806
 msgid "frustrated"
 msgstr "frustrato"
 
-#: ../../include/text.php:804
+#: ../../include/text.php:807
 msgid "motivated"
 msgstr "motivato"
 
-#: ../../include/text.php:805
+#: ../../include/text.php:808
 msgid "relaxed"
 msgstr "rilassato"
 
-#: ../../include/text.php:806
+#: ../../include/text.php:809
 msgid "surprised"
 msgstr "sorpreso"
 
-#: ../../include/text.php:970
+#: ../../include/text.php:973
 msgid "Monday"
 msgstr "lunedì"
 
-#: ../../include/text.php:970
+#: ../../include/text.php:973
 msgid "Tuesday"
 msgstr "martedì"
 
-#: ../../include/text.php:970
+#: ../../include/text.php:973
 msgid "Wednesday"
 msgstr "mercoledì"
 
-#: ../../include/text.php:970
+#: ../../include/text.php:973
 msgid "Thursday"
 msgstr "giovedì"
 
-#: ../../include/text.php:970
+#: ../../include/text.php:973
 msgid "Friday"
 msgstr "venerdì"
 
-#: ../../include/text.php:970
+#: ../../include/text.php:973
 msgid "Saturday"
 msgstr "sabato"
 
-#: ../../include/text.php:970
+#: ../../include/text.php:973
 msgid "Sunday"
 msgstr "domenica"
 
-#: ../../include/text.php:974
+#: ../../include/text.php:977
 msgid "January"
 msgstr "gennaio"
 
-#: ../../include/text.php:974
+#: ../../include/text.php:977
 msgid "February"
 msgstr "febbraio"
 
-#: ../../include/text.php:974
+#: ../../include/text.php:977
 msgid "March"
 msgstr "marzo"
 
-#: ../../include/text.php:974
+#: ../../include/text.php:977
 msgid "April"
 msgstr "aprile"
 
-#: ../../include/text.php:974
+#: ../../include/text.php:977
 msgid "May"
 msgstr "maggio"
 
-#: ../../include/text.php:974
+#: ../../include/text.php:977
 msgid "June"
 msgstr "giugno"
 
-#: ../../include/text.php:974
+#: ../../include/text.php:977
 msgid "July"
 msgstr "luglio"
 
-#: ../../include/text.php:974
+#: ../../include/text.php:977
 msgid "August"
 msgstr "agosto"
 
-#: ../../include/text.php:974
+#: ../../include/text.php:977
 msgid "September"
 msgstr "settembre"
 
-#: ../../include/text.php:974
+#: ../../include/text.php:977
 msgid "October"
 msgstr "ottobre"
 
-#: ../../include/text.php:974
+#: ../../include/text.php:977
 msgid "November"
 msgstr "novembre"
 
-#: ../../include/text.php:974
+#: ../../include/text.php:977
 msgid "December"
 msgstr "dicembre"
 
-#: ../../include/text.php:1052 ../../mod/message.php:453
+#: ../../include/text.php:1055 ../../mod/message.php:453
 msgid "unknown.???"
 msgstr "sconosciuto???"
 
-#: ../../include/text.php:1053 ../../mod/message.php:454
+#: ../../include/text.php:1056 ../../mod/message.php:454
 msgid "bytes"
 msgstr "byte"
 
-#: ../../include/text.php:1088
+#: ../../include/text.php:1091
 msgid "remove category"
 msgstr "rimuovi la categoria"
 
-#: ../../include/text.php:1110
+#: ../../include/text.php:1113
 msgid "remove from file"
 msgstr "rimuovi dal file"
 
-#: ../../include/text.php:1164 ../../include/text.php:1176
+#: ../../include/text.php:1167 ../../include/text.php:1179
 msgid "Click to open/close"
 msgstr "Clicca per aprire/chiudere"
 
-#: ../../include/text.php:1352 ../../mod/events.php:326
+#: ../../include/text.php:1355 ../../mod/events.php:326
 msgid "link to source"
 msgstr "Link all'originale"
 
-#: ../../include/text.php:1371
+#: ../../include/text.php:1374
 msgid "Select a page layout: "
 msgstr "Scegli il layout della pagina:"
 
-#: ../../include/text.php:1374 ../../include/text.php:1439
+#: ../../include/text.php:1377 ../../include/text.php:1442
 msgid "default"
 msgstr "predefinito"
 
-#: ../../include/text.php:1410
+#: ../../include/text.php:1413
 msgid "Page content type: "
 msgstr "Contenuto della pagina:"
 
-#: ../../include/text.php:1451
+#: ../../include/text.php:1454
 msgid "Select an alternate language"
 msgstr "Seleziona una lingua diversa"
 
-#: ../../include/text.php:1603 ../../include/conversation.php:117
+#: ../../include/text.php:1606 ../../include/conversation.php:117
 #: ../../mod/like.php:103 ../../mod/subthread.php:89 ../../mod/tagger.php:45
 msgid "photo"
 msgstr "la foto"
 
-#: ../../include/text.php:1606 ../../include/conversation.php:120
+#: ../../include/text.php:1609 ../../include/conversation.php:120
 #: ../../mod/tagger.php:49
 msgid "event"
 msgstr "l'evento"
 
-#: ../../include/text.php:1609 ../../include/conversation.php:145
+#: ../../include/text.php:1612 ../../include/conversation.php:145
 #: ../../mod/like.php:103 ../../mod/subthread.php:89 ../../mod/tagger.php:53
 msgid "status"
 msgstr "il messaggio di stato"
 
-#: ../../include/text.php:1611 ../../include/conversation.php:147
+#: ../../include/text.php:1614 ../../include/conversation.php:147
 #: ../../mod/tagger.php:55
 msgid "comment"
 msgstr "il commento"
 
-#: ../../include/text.php:1616
+#: ../../include/text.php:1619
 msgid "activity"
 msgstr "l'attività"
 
-#: ../../include/text.php:1878
+#: ../../include/text.php:1881
 msgid "Design"
 msgstr "Design"
 
-#: ../../include/text.php:1880
+#: ../../include/text.php:1883
 msgid "Blocks"
 msgstr "Riquadri"
 
-#: ../../include/text.php:1881
+#: ../../include/text.php:1884
 msgid "Menus"
 msgstr "Menù"
 
-#: ../../include/text.php:1882
+#: ../../include/text.php:1885
 msgid "Layouts"
 msgstr "Layout"
 
-#: ../../include/text.php:1883
+#: ../../include/text.php:1886
 msgid "Pages"
 msgstr "Pagine"
 
-#: ../../include/identity.php:14 ../../mod/item.php:1131
+#: ../../include/api.php:972
+msgid "Public Timeline"
+msgstr "Diario pubblico"
+
+#: ../../include/identity.php:14 ../../mod/item.php:1148
 msgid "Unable to obtain identity information from database"
 msgstr "Impossibile ottenere le informazioni di identificazione dal database"
 
@@ -1543,7 +1542,7 @@ msgid "Default Profile"
 msgstr "Profilo predefinito"
 
 #: ../../include/identity.php:245 ../../include/profile_selectors.php:42
-#: ../../mod/network.php:387 ../../mod/connections.php:387
+#: ../../mod/network.php:387 ../../mod/connections.php:407
 msgid "Friends"
 msgstr "Amici"
 
@@ -1591,17 +1590,17 @@ msgstr "ha commentato l'articolo di %s"
 #: ../../include/attach.php:204 ../../include/attach.php:237
 #: ../../include/attach.php:251 ../../include/attach.php:272
 #: ../../include/attach.php:464 ../../include/attach.php:539
-#: ../../include/items.php:3572 ../../mod/common.php:43
+#: ../../include/items.php:3608 ../../mod/common.php:43
 #: ../../mod/events.php:134 ../../mod/invite.php:13 ../../mod/invite.php:102
 #: ../../mod/allfriends.php:10 ../../mod/webpages.php:40 ../../mod/api.php:26
 #: ../../mod/api.php:31 ../../mod/lastpost.php:93 ../../mod/page.php:30
-#: ../../mod/page.php:80 ../../mod/setup.php:200 ../../mod/settings.php:627
+#: ../../mod/page.php:80 ../../mod/setup.php:200 ../../mod/settings.php:628
 #: ../../mod/viewconnections.php:33 ../../mod/viewconnections.php:38
 #: ../../mod/delegate.php:6 ../../mod/sources.php:48 ../../mod/mitem.php:92
 #: ../../mod/group.php:15 ../../mod/photos.php:74 ../../mod/photos.php:654
 #: ../../mod/viewsrc.php:12 ../../mod/menu.php:40 ../../mod/message.php:208
 #: ../../mod/layouts.php:27 ../../mod/layouts.php:42 ../../mod/network.php:7
-#: ../../mod/intro.php:50 ../../mod/connections.php:177
+#: ../../mod/intro.php:50 ../../mod/connections.php:197
 #: ../../mod/profiles.php:163 ../../mod/profiles.php:476
 #: ../../mod/new_channel.php:66 ../../mod/new_channel.php:97
 #: ../../mod/filestorage.php:26 ../../mod/manage.php:6
@@ -1611,8 +1610,8 @@ msgstr "ha commentato l'articolo di %s"
 #: ../../mod/editwebpage.php:64 ../../mod/notifications.php:66
 #: ../../mod/blocks.php:29 ../../mod/blocks.php:44 ../../mod/editpost.php:13
 #: ../../mod/poke.php:128 ../../mod/channel.php:123 ../../mod/fsuggest.php:78
-#: ../../mod/editblock.php:48 ../../mod/item.php:173 ../../mod/item.php:181
-#: ../../mod/suggest.php:32 ../../mod/register.php:60 ../../mod/regmod.php:18
+#: ../../mod/editblock.php:48 ../../mod/item.php:181 ../../mod/item.php:189
+#: ../../mod/suggest.php:32 ../../mod/register.php:68 ../../mod/regmod.php:18
 #: ../../mod/mood.php:114 ../../index.php:178 ../../index.php:340
 msgid "Permission denied."
 msgstr "Permesso negato."
@@ -1634,7 +1633,7 @@ msgstr "Impossibile elaborare l'immagine"
 msgid "Photo storage failed."
 msgstr "Impossibile caricare la foto."
 
-#: ../../include/photos.php:288 ../../boot.php:2246
+#: ../../include/photos.php:288 ../../boot.php:2242
 msgid "Photo Albums"
 msgstr "Album foto"
 
@@ -1929,20 +1928,20 @@ msgstr "mkdir fallito."
 msgid "database storage failed."
 msgstr "scrittura su database fallita."
 
-#: ../../include/zot.php:426
+#: ../../include/zot.php:542
 msgid "Invalid data packet"
 msgstr "Dati non validi"
 
-#: ../../include/zot.php:436
+#: ../../include/zot.php:552
 msgid "Unable to verify channel signature"
 msgstr "Impossibile verificare la firma elettronica del canale"
 
-#: ../../include/zot.php:582
+#: ../../include/zot.php:697
 #, php-format
 msgid "Unable to verify site signature for %s"
 msgstr "Impossibile verificare la firma elettronica del sito %s"
 
-#: ../../include/nav.php:72 ../../include/nav.php:87 ../../boot.php:1462
+#: ../../include/nav.php:72 ../../include/nav.php:87 ../../boot.php:1458
 msgid "Logout"
 msgstr "Esci"
 
@@ -1970,7 +1969,7 @@ msgstr "Modifica i profili"
 msgid "Manage/Edit Profiles"
 msgstr "Gestisci e modifica i profili"
 
-#: ../../include/nav.php:79 ../../mod/fbrowser.php:25 ../../boot.php:2243
+#: ../../include/nav.php:79 ../../mod/fbrowser.php:25 ../../boot.php:2239
 msgid "Photos"
 msgstr "Foto"
 
@@ -1978,7 +1977,7 @@ msgstr "Foto"
 msgid "Your photos"
 msgstr "Le tue foto"
 
-#: ../../include/nav.php:85 ../../boot.php:1463
+#: ../../include/nav.php:85 ../../boot.php:1459
 msgid "Login"
 msgstr "Accedi"
 
@@ -1999,7 +1998,7 @@ msgstr "Clicca per autenticarti sul tuo server principale"
 msgid "Home Page"
 msgstr "Bacheca"
 
-#: ../../include/nav.php:125 ../../mod/register.php:187 ../../boot.php:1439
+#: ../../include/nav.php:125 ../../mod/register.php:195 ../../boot.php:1435
 msgid "Register"
 msgstr "Iscriviti"
 
@@ -2007,7 +2006,7 @@ msgstr "Iscriviti"
 msgid "Create an account"
 msgstr "Crea un account"
 
-#: ../../include/nav.php:130 ../../mod/help.php:34
+#: ../../include/nav.php:130 ../../mod/help.php:45 ../../mod/help.php:49
 msgid "Help"
 msgstr "Guida"
 
@@ -2071,7 +2070,7 @@ msgstr "Segna come lette le notifiche dei canali"
 msgid "Intros"
 msgstr "Richieste"
 
-#: ../../include/nav.php:158 ../../mod/connections.php:565
+#: ../../include/nav.php:158 ../../mod/connections.php:585
 msgid "New Connections"
 msgstr "Nuovi contatti"
 
@@ -2123,7 +2122,7 @@ msgstr "Inviati"
 msgid "New Message"
 msgstr "Nuovo messaggio"
 
-#: ../../include/nav.php:174 ../../mod/events.php:348 ../../boot.php:2254
+#: ../../include/nav.php:174 ../../mod/events.php:348 ../../boot.php:2250
 msgid "Events"
 msgstr "Eventi"
 
@@ -2148,7 +2147,7 @@ msgid "Manage Your Channels"
 msgstr "Gestisci i contatti dei tuoi canali"
 
 #: ../../include/nav.php:180 ../../mod/settings.php:131
-#: ../../mod/admin.php:769 ../../mod/admin.php:974
+#: ../../mod/admin.php:782 ../../mod/admin.php:987
 msgid "Settings"
 msgstr "Impostazioni"
 
@@ -2156,7 +2155,7 @@ msgstr "Impostazioni"
 msgid "Account/Channel Settings"
 msgstr "Impostazioni account e canali"
 
-#: ../../include/nav.php:182 ../../mod/connections.php:671
+#: ../../include/nav.php:182 ../../mod/connections.php:691
 msgid "Connections"
 msgstr "Contatti"
 
@@ -2172,11 +2171,11 @@ msgstr "Amministrazione"
 msgid "Site Setup and Configuration"
 msgstr "Configurazione del sito"
 
-#: ../../include/nav.php:212
+#: ../../include/nav.php:215
 msgid "Nothing new here"
 msgstr "Niente di nuovo qui"
 
-#: ../../include/nav.php:217
+#: ../../include/nav.php:220
 msgid "Please wait..."
 msgstr "Attendere..."
 
@@ -2236,381 +2235,137 @@ msgstr "Account approvato."
 msgid "Registration revoked for %s"
 msgstr "Registrazione revocata per %s"
 
-#: ../../include/auth.php:67
-msgid "Logged out."
-msgstr "Uscita effettuata."
-
-#: ../../include/auth.php:179
-msgid "Failed authentication"
-msgstr "Autenticazione fallita"
+#: ../../include/conversation.php:123
+msgid "channel"
+msgstr "canale"
 
-#: ../../include/auth.php:188
-msgid "Login failed."
-msgstr "Accesso fallito."
+#: ../../include/conversation.php:161 ../../mod/like.php:134
+#, php-format
+msgid "%1$s likes %2$s's %3$s"
+msgstr "A %1$s piace %3$s di %2$s"
 
-#: ../../include/contact_widgets.php:14
+#: ../../include/conversation.php:164 ../../mod/like.php:136
 #, php-format
-msgid "You have %1$.0f of %2$.0f allowed connections."
-msgstr "Hai attivato %1$.0f delle %2$.0f connessioni permesse."
+msgid "%1$s doesn't like %2$s's %3$s"
+msgstr "A %1$s non piace %3$s di %2$s"
 
-#: ../../include/contact_widgets.php:20
-msgid "Add New Connection"
-msgstr "Aggiungi un contatto"
+#: ../../include/conversation.php:201
+#, php-format
+msgid "%1$s is now connected with %2$s"
+msgstr "%1$s adesso è connesso con %2$s"
 
-#: ../../include/contact_widgets.php:21
-msgid "Enter the channel address"
-msgstr "Scrivi l'indirizzo del canale"
+#: ../../include/conversation.php:232
+#, php-format
+msgid "%1$s poked %2$s"
+msgstr "%1$s ha mandato un poke a %2$s"
 
-#: ../../include/contact_widgets.php:22
-msgid "Example: bob@example.com, http://example.com/barbara"
-msgstr "Per esempio: mario@pippo.it oppure http://pluto.com/barbara"
+#: ../../include/conversation.php:254 ../../mod/mood.php:63
+#, php-format
+msgid "%1$s is currently %2$s"
+msgstr "%1$s al momento è %2$s"
 
-#: ../../include/contact_widgets.php:38
+#: ../../include/conversation.php:658
 #, php-format
-msgid "%d invitation available"
-msgid_plural "%d invitations available"
-msgstr[0] "%d invito disponibile"
-msgstr[1] "%d inviti disponibili"
+msgid "View %s's profile @ %s"
+msgstr "Vedi il profilo di %s @ %s"
 
-#: ../../include/contact_widgets.php:44
-msgid "Find Channels"
-msgstr "Ricerca canali"
+#: ../../include/conversation.php:672
+msgid "Categories:"
+msgstr "Categorie:"
 
-#: ../../include/contact_widgets.php:45
-msgid "Enter name or interest"
-msgstr "Scrivi un nome o un interesse"
+#: ../../include/conversation.php:673
+msgid "Filed under:"
+msgstr "Classificato come:"
 
-#: ../../include/contact_widgets.php:46
-msgid "Connect/Follow"
-msgstr "Segui"
+#: ../../include/conversation.php:700
+msgid "View in context"
+msgstr "Vedi nel contesto"
 
-#: ../../include/contact_widgets.php:47
-msgid "Examples: Robert Morgenstein, Fishing"
-msgstr "Per esempio: Mario Rossi, Pesca"
+#: ../../include/conversation.php:826
+msgid "remove"
+msgstr "rimuovi"
 
-#: ../../include/contact_widgets.php:48 ../../mod/connections.php:677
-#: ../../mod/directory.php:221 ../../mod/directory.php:226
-msgid "Find"
-msgstr "Cerca"
+#: ../../include/conversation.php:830
+msgid "Loading..."
+msgstr "Caricamento in corso..."
 
-#: ../../include/contact_widgets.php:49 ../../mod/suggest.php:64
-msgid "Channel Suggestions"
-msgstr "Canali suggeriti"
+#: ../../include/conversation.php:831
+msgid "Delete Selected Items"
+msgstr "Elimina gli oggetti selezionati"
 
-#: ../../include/contact_widgets.php:51
-msgid "Random Profile"
-msgstr "Profilo casuale"
+#: ../../include/conversation.php:922
+msgid "View Source"
+msgstr "Vedi il sorgente"
 
-#: ../../include/contact_widgets.php:52
-msgid "Invite Friends"
-msgstr "Invita amici"
+#: ../../include/conversation.php:923
+msgid "Follow Thread"
+msgstr "Segui la discussione"
 
-#: ../../include/contact_widgets.php:79 ../../include/contact_widgets.php:113
-msgid "Everything"
-msgstr "Tutto"
+#: ../../include/conversation.php:927
+msgid "Matrix Activity"
+msgstr "Attività nella tua rete"
 
-#: ../../include/contact_widgets.php:110 ../../include/widgets.php:26
-msgid "Categories"
-msgstr "Categorie"
+#: ../../include/conversation.php:992
+#, php-format
+msgid "%s likes this."
+msgstr "Piace a %s."
 
-#: ../../include/contact_widgets.php:143
+#: ../../include/conversation.php:992
 #, php-format
-msgid "%d connection in common"
-msgid_plural "%d connections in common"
-msgstr[0] "%d contatto in comune"
-msgstr[1] "%d contatti in comune"
+msgid "%s doesn't like this."
+msgstr "Non piace a %s."
 
-#: ../../include/page_widgets.php:6
-msgid "New Page"
-msgstr "Nuova pagina web"
+#: ../../include/conversation.php:996
+#, php-format
+msgid "<span  %1$s>%2$d people</span> like this."
+msgid_plural "<span  %1$s>%2$d people</span> like this."
+msgstr[0] ""
+msgstr[1] "Piace a <span %1$s>%2$d persone</span>."
 
-#: ../../include/follow.php:21
-msgid "Channel is blocked on this site."
-msgstr "Il canale è bloccato per questo sito."
+#: ../../include/conversation.php:998
+#, php-format
+msgid "<span  %1$s>%2$d people</span> don't like this."
+msgid_plural "<span  %1$s>%2$d people</span> don't like this."
+msgstr[0] ""
+msgstr[1] "Non piace a <span %1$s>%2$d persone</span>."
 
-#: ../../include/follow.php:26
-msgid "Channel location missing."
-msgstr "Manca l'indirizzo del canale."
+#: ../../include/conversation.php:1004
+msgid "and"
+msgstr "e"
 
-#: ../../include/follow.php:43
-msgid "Channel discovery failed. Website may be down or misconfigured."
-msgstr "La ricerca del canale è fallita. Il sito potrebbe avere problemi o una configurazione sbagliata."
+#: ../../include/conversation.php:1007
+#, php-format
+msgid ", and %d other people"
+msgid_plural ", and %d other people"
+msgstr[0] ""
+msgstr[1] "e altre %d persone"
 
-#: ../../include/follow.php:51
-msgid "Response from remote channel was not understood."
-msgstr "La risposta dal canale non è comprensibile."
+#: ../../include/conversation.php:1008
+#, php-format
+msgid "%s like this."
+msgstr "Piace a %s."
 
-#: ../../include/follow.php:58
-msgid "Response from remote channel was incomplete."
-msgstr "La risposta dal canale non è completa."
+#: ../../include/conversation.php:1008
+#, php-format
+msgid "%s don't like this."
+msgstr "Non piace a %s."
 
-#: ../../include/follow.php:129
-msgid "local account not found."
-msgstr "l'account locale non è stato trovato."
+#: ../../include/conversation.php:1058
+msgid "Visible to <strong>everybody</strong>"
+msgstr "Visibile a <strong>tutti</strong>"
 
-#: ../../include/follow.php:138
-msgid "Cannot connect to yourself."
-msgstr "Non puoi connetterti a te stesso."
+#: ../../include/conversation.php:1059 ../../mod/message.php:281
+#: ../../mod/message.php:417
+msgid "Please enter a link URL:"
+msgstr "Inserisci l'indirizzo del link:"
 
-#: ../../include/permissions.php:13
-msgid "Can view my \"public\" stream and posts"
-msgstr "Può vedere i miei contenuti \"pubblici\""
+#: ../../include/conversation.php:1060
+msgid "Please enter a video link/URL:"
+msgstr "Inserisci l'indirizzo del video:"
 
-#: ../../include/permissions.php:14
-msgid "Can view my \"public\" channel profile"
-msgstr "Può vedere il profilo del mio canale \"pubblico\""
-
-#: ../../include/permissions.php:15
-msgid "Can view my \"public\" photo albums"
-msgstr "Può vedere il mio album fotografico \"pubblico\""
-
-#: ../../include/permissions.php:16
-msgid "Can view my \"public\" address book"
-msgstr "Può vedere il mio elenco contatti \"pubblico\""
-
-#: ../../include/permissions.php:17
-msgid "Can view my \"public\" file storage"
-msgstr "Può vedere il mio archivio file \"pubblico\""
-
-#: ../../include/permissions.php:18
-msgid "Can view my \"public\" pages"
-msgstr "Può vedere le mie pagine web \"pubbliche\""
-
-#: ../../include/permissions.php:21
-msgid "Can send me their channel stream and posts"
-msgstr "Può mostrarmi i contenuti del canale e gli articoli"
-
-#: ../../include/permissions.php:22
-msgid "Can post on my channel page (\"wall\")"
-msgstr "Può scrivere sulla bacheca del mio canale"
-
-#: ../../include/permissions.php:23
-msgid "Can comment on my posts"
-msgstr "Può commentare i miei articoli"
-
-#: ../../include/permissions.php:24
-msgid "Can send me private mail messages"
-msgstr "Può inviarmi messaggi privati"
-
-#: ../../include/permissions.php:25
-msgid "Can post photos to my photo albums"
-msgstr "Può aggiungere foto ai miei album"
-
-#: ../../include/permissions.php:26
-msgid "Can forward to all my channel contacts via post @mentions"
-msgstr "Può inoltrare articoli a tutti i contatti del canale tramite una @menzione"
-
-#: ../../include/permissions.php:26
-msgid "Advanced - useful for creating group forum channels"
-msgstr "Impostazione avanzata - utile per creare un canale-forum di discussione"
-
-#: ../../include/permissions.php:27
-msgid "Can chat with me (when available)"
-msgstr "Può aprire una chat con me (se disponibile)"
-
-#: ../../include/permissions.php:27
-msgid "Requires compatible chat plugin"
-msgstr "Necessita di un plugin di chat compatibile"
-
-#: ../../include/permissions.php:28
-msgid "Can write to my \"public\" file storage"
-msgstr "Può scrivere sul mio archivio di file \"pubblico\""
-
-#: ../../include/permissions.php:29
-msgid "Can edit my \"public\" pages"
-msgstr "Può modificare le mie pagine web \"pubbliche\""
-
-#: ../../include/permissions.php:31
-msgid "Can source my \"public\" posts in derived channels"
-msgstr "Può aggiungere i miei post \"pubblici\" a un suo canale derivato"
-
-#: ../../include/permissions.php:31
-msgid "Somewhat advanced - very useful in open communities"
-msgstr "Piuttosto avanzato - molto utile nelle comunità aperte"
-
-#: ../../include/permissions.php:32
-msgid "Can administer my channel resources"
-msgstr "Può amministrare i contenuti del mio canale"
-
-#: ../../include/permissions.php:32
-msgid ""
-"Extremely advanced. Leave this alone unless you know what you are doing"
-msgstr "Impostazione pericolosa - lasciare il valore predefinito se non si è assolutamente sicuri"
-
-#: ../../include/taxonomy.php:210
-msgid "Tags"
-msgstr "Tag"
-
-#: ../../include/taxonomy.php:224
-msgid "Keywords"
-msgstr "Parole chiave"
-
-#: ../../include/taxonomy.php:249
-msgid "have"
-msgstr "ho"
-
-#: ../../include/taxonomy.php:249
-msgid "has"
-msgstr "ha"
-
-#: ../../include/taxonomy.php:250
-msgid "want"
-msgstr "voglio"
-
-#: ../../include/taxonomy.php:250
-msgid "wants"
-msgstr "vuole"
-
-#: ../../include/taxonomy.php:251
-msgid "likes"
-msgstr "ama"
-
-#: ../../include/taxonomy.php:252
-msgid "dislikes"
-msgstr "non ama"
-
-#: ../../include/plugin.php:440 ../../include/plugin.php:442
-msgid "Click here to upgrade."
-msgstr "Clicca qui per aggiornare."
-
-#: ../../include/plugin.php:448
-msgid "This action exceeds the limits set by your subscription plan."
-msgstr "Questa operazione esce dai termini del tuo abbonamento."
-
-#: ../../include/plugin.php:453
-msgid "This action is not available under your subscription plan."
-msgstr "Questa operazione non è prevista dal tuo abbonamento."
-
-#: ../../include/comanche.php:35 ../../view/theme/redbasic/php/config.php:56
-#: ../../view/theme/apw/php/config.php:176
-msgid "Default"
-msgstr "Predefinito"
-
-#: ../../include/conversation.php:123
-msgid "channel"
-msgstr "canale"
-
-#: ../../include/conversation.php:161 ../../mod/like.php:134
-#, php-format
-msgid "%1$s likes %2$s's %3$s"
-msgstr "A %1$s piace %3$s di %2$s"
-
-#: ../../include/conversation.php:164 ../../mod/like.php:136
-#, php-format
-msgid "%1$s doesn't like %2$s's %3$s"
-msgstr "A %1$s non piace %3$s di %2$s"
-
-#: ../../include/conversation.php:201
-#, php-format
-msgid "%1$s is now connected with %2$s"
-msgstr "%1$s adesso è connesso con %2$s"
-
-#: ../../include/conversation.php:232
-#, php-format
-msgid "%1$s poked %2$s"
-msgstr "%1$s ha mandato un poke a %2$s"
-
-#: ../../include/conversation.php:254 ../../mod/mood.php:63
-#, php-format
-msgid "%1$s is currently %2$s"
-msgstr "%1$s al momento è %2$s"
-
-#: ../../include/conversation.php:658
-#, php-format
-msgid "View %s's profile @ %s"
-msgstr "Vedi il profilo di %s @ %s"
-
-#: ../../include/conversation.php:672
-msgid "Categories:"
-msgstr "Categorie:"
-
-#: ../../include/conversation.php:673
-msgid "Filed under:"
-msgstr "Classificato come:"
-
-#: ../../include/conversation.php:700
-msgid "View in context"
-msgstr "Vedi nel contesto"
-
-#: ../../include/conversation.php:826
-msgid "remove"
-msgstr "rimuovi"
-
-#: ../../include/conversation.php:830
-msgid "Loading..."
-msgstr "Caricamento in corso..."
-
-#: ../../include/conversation.php:831
-msgid "Delete Selected Items"
-msgstr "Elimina gli oggetti selezionati"
-
-#: ../../include/conversation.php:922
-msgid "View Source"
-msgstr "Vedi il sorgente"
-
-#: ../../include/conversation.php:923
-msgid "Follow Thread"
-msgstr "Segui la discussione"
-
-#: ../../include/conversation.php:927
-msgid "Matrix Activity"
-msgstr "Attività nella tua rete"
-
-#: ../../include/conversation.php:992
-#, php-format
-msgid "%s likes this."
-msgstr "Piace a %s."
-
-#: ../../include/conversation.php:992
-#, php-format
-msgid "%s doesn't like this."
-msgstr "Non piace a %s."
-
-#: ../../include/conversation.php:996
-#, php-format
-msgid "<span  %1$s>%2$d people</span> like this."
-msgstr "Piace a <span %1$s>%2$d persone</span>."
-
-#: ../../include/conversation.php:998
-#, php-format
-msgid "<span  %1$s>%2$d people</span> don't like this."
-msgstr "Non piace a <span %1$s>%2$d persone</span>."
-
-#: ../../include/conversation.php:1004
-msgid "and"
-msgstr "e"
-
-#: ../../include/conversation.php:1007
-#, php-format
-msgid ", and %d other people"
-msgstr "e altre %d persone"
-
-#: ../../include/conversation.php:1008
-#, php-format
-msgid "%s like this."
-msgstr "Piace a %s."
-
-#: ../../include/conversation.php:1008
-#, php-format
-msgid "%s don't like this."
-msgstr "Non piace a %s."
-
-#: ../../include/conversation.php:1058
-msgid "Visible to <strong>everybody</strong>"
-msgstr "Visibile a <strong>tutti</strong>"
-
-#: ../../include/conversation.php:1059 ../../mod/message.php:281
-#: ../../mod/message.php:417
-msgid "Please enter a link URL:"
-msgstr "Inserisci l'indirizzo del link:"
-
-#: ../../include/conversation.php:1060
-msgid "Please enter a video link/URL:"
-msgstr "Inserisci l'indirizzo del video:"
-
-#: ../../include/conversation.php:1061
-msgid "Please enter an audio link/URL:"
-msgstr "Inserisci l'indirizzo dell'audio:"
+#: ../../include/conversation.php:1061
+msgid "Please enter an audio link/URL:"
+msgstr "Inserisci l'indirizzo dell'audio:"
 
 #: ../../include/conversation.php:1062
 msgid "Tag term:"
@@ -2712,40 +2467,290 @@ msgstr "rimuovi la località"
 msgid "Set title"
 msgstr "Scegli un titolo"
 
-#: ../../include/conversation.php:1111 ../../mod/editlayout.php:123
-#: ../../mod/editwebpage.php:144 ../../mod/editpost.php:120
-#: ../../mod/editblock.php:138
-msgid "Categories (comma-separated list)"
-msgstr "Categorie (separate da virgola)"
+#: ../../include/conversation.php:1111 ../../mod/editlayout.php:123
+#: ../../mod/editwebpage.php:144 ../../mod/editpost.php:120
+#: ../../mod/editblock.php:138
+msgid "Categories (comma-separated list)"
+msgstr "Categorie (separate da virgola)"
+
+#: ../../include/conversation.php:1113 ../../mod/editlayout.php:110
+#: ../../mod/editwebpage.php:129 ../../mod/editpost.php:107
+#: ../../mod/editblock.php:124
+msgid "Permission settings"
+msgstr "Impostazioni permessi"
+
+#: ../../include/conversation.php:1114
+msgid "permissions"
+msgstr "permessi"
+
+#: ../../include/conversation.php:1122 ../../mod/editlayout.php:118
+#: ../../mod/editwebpage.php:137 ../../mod/editpost.php:115
+#: ../../mod/editblock.php:133
+msgid "Public post"
+msgstr "Articolo pubblico"
+
+#: ../../include/conversation.php:1124 ../../mod/editlayout.php:124
+#: ../../mod/editwebpage.php:145 ../../mod/editpost.php:121
+#: ../../mod/editblock.php:139
+msgid "Example: bob@example.com, mary@example.com"
+msgstr "Per esempio: mario@esempio.com, simona@esempio.com"
+
+#: ../../include/conversation.php:1137 ../../mod/message.php:336
+#: ../../mod/message.php:519 ../../mod/editlayout.php:134
+#: ../../mod/editwebpage.php:155 ../../mod/editpost.php:132
+#: ../../mod/editblock.php:149
+msgid "Set expiration date"
+msgstr "Data di scadenza"
+
+#: ../../include/auth.php:67
+msgid "Logged out."
+msgstr "Uscita effettuata."
+
+#: ../../include/auth.php:179
+msgid "Failed authentication"
+msgstr "Autenticazione fallita"
+
+#: ../../include/auth.php:188
+msgid "Login failed."
+msgstr "Accesso fallito."
+
+#: ../../include/contact_widgets.php:14
+#, php-format
+msgid "You have %1$.0f of %2$.0f allowed connections."
+msgstr "Hai attivato %1$.0f delle %2$.0f connessioni permesse."
+
+#: ../../include/contact_widgets.php:20
+msgid "Add New Connection"
+msgstr "Aggiungi un contatto"
+
+#: ../../include/contact_widgets.php:21
+msgid "Enter the channel address"
+msgstr "Scrivi l'indirizzo del canale"
+
+#: ../../include/contact_widgets.php:22
+msgid "Example: bob@example.com, http://example.com/barbara"
+msgstr "Per esempio: mario@pippo.it oppure http://pluto.com/barbara"
+
+#: ../../include/contact_widgets.php:38
+#, php-format
+msgid "%d invitation available"
+msgid_plural "%d invitations available"
+msgstr[0] "%d invito disponibile"
+msgstr[1] "%d inviti disponibili"
+
+#: ../../include/contact_widgets.php:44
+msgid "Find Channels"
+msgstr "Ricerca canali"
+
+#: ../../include/contact_widgets.php:45
+msgid "Enter name or interest"
+msgstr "Scrivi un nome o un interesse"
+
+#: ../../include/contact_widgets.php:46
+msgid "Connect/Follow"
+msgstr "Entra in contatto/segui"
+
+#: ../../include/contact_widgets.php:47
+msgid "Examples: Robert Morgenstein, Fishing"
+msgstr "Per esempio: Mario Rossi, Pesca"
+
+#: ../../include/contact_widgets.php:48 ../../mod/connections.php:697
+#: ../../mod/directory.php:221 ../../mod/directory.php:226
+msgid "Find"
+msgstr "Cerca"
+
+#: ../../include/contact_widgets.php:49 ../../mod/suggest.php:64
+msgid "Channel Suggestions"
+msgstr "Canali suggeriti"
+
+#: ../../include/contact_widgets.php:51
+msgid "Random Profile"
+msgstr "Profilo casuale"
+
+#: ../../include/contact_widgets.php:52
+msgid "Invite Friends"
+msgstr "Invita amici"
+
+#: ../../include/contact_widgets.php:79 ../../include/contact_widgets.php:113
+msgid "Everything"
+msgstr "Tutto"
+
+#: ../../include/contact_widgets.php:110 ../../include/widgets.php:26
+msgid "Categories"
+msgstr "Categorie"
+
+#: ../../include/contact_widgets.php:143
+#, php-format
+msgid "%d connection in common"
+msgid_plural "%d connections in common"
+msgstr[0] "%d contatto in comune"
+msgstr[1] "%d contatti in comune"
+
+#: ../../include/page_widgets.php:6
+msgid "New Page"
+msgstr "Nuova pagina web"
+
+#: ../../include/follow.php:21
+msgid "Channel is blocked on this site."
+msgstr "Il canale è bloccato per questo sito."
+
+#: ../../include/follow.php:26
+msgid "Channel location missing."
+msgstr "Manca l'indirizzo del canale."
+
+#: ../../include/follow.php:43
+msgid "Channel discovery failed. Website may be down or misconfigured."
+msgstr "La ricerca del canale è fallita. Il sito potrebbe avere problemi o una configurazione sbagliata."
+
+#: ../../include/follow.php:51
+msgid "Response from remote channel was not understood."
+msgstr "La risposta dal canale non è comprensibile."
+
+#: ../../include/follow.php:58
+msgid "Response from remote channel was incomplete."
+msgstr "La risposta dal canale non è completa."
+
+#: ../../include/follow.php:129
+msgid "local account not found."
+msgstr "l'account locale non è stato trovato."
+
+#: ../../include/follow.php:138
+msgid "Cannot connect to yourself."
+msgstr "Non puoi connetterti a te stesso."
+
+#: ../../include/permissions.php:13
+msgid "Can view my \"public\" stream and posts"
+msgstr "Può vedere i miei contenuti \"pubblici\""
+
+#: ../../include/permissions.php:14
+msgid "Can view my \"public\" channel profile"
+msgstr "Può vedere il profilo del mio canale \"pubblico\""
+
+#: ../../include/permissions.php:15
+msgid "Can view my \"public\" photo albums"
+msgstr "Può vedere il mio album fotografico \"pubblico\""
+
+#: ../../include/permissions.php:16
+msgid "Can view my \"public\" address book"
+msgstr "Può vedere il mio elenco contatti \"pubblico\""
+
+#: ../../include/permissions.php:17
+msgid "Can view my \"public\" file storage"
+msgstr "Può vedere il mio archivio file \"pubblico\""
+
+#: ../../include/permissions.php:18
+msgid "Can view my \"public\" pages"
+msgstr "Può vedere le mie pagine web \"pubbliche\""
+
+#: ../../include/permissions.php:21
+msgid "Can send me their channel stream and posts"
+msgstr "Può mostrarmi i contenuti del canale e gli articoli"
+
+#: ../../include/permissions.php:22
+msgid "Can post on my channel page (\"wall\")"
+msgstr "Può scrivere sulla bacheca del mio canale"
+
+#: ../../include/permissions.php:23
+msgid "Can comment on my posts"
+msgstr "Può commentare i miei articoli"
+
+#: ../../include/permissions.php:24
+msgid "Can send me private mail messages"
+msgstr "Può inviarmi messaggi privati"
+
+#: ../../include/permissions.php:25
+msgid "Can post photos to my photo albums"
+msgstr "Può aggiungere foto ai miei album"
+
+#: ../../include/permissions.php:26
+msgid "Can forward to all my channel contacts via post @mentions"
+msgstr "Può inoltrare articoli a tutti i contatti del canale tramite una @menzione"
+
+#: ../../include/permissions.php:26
+msgid "Advanced - useful for creating group forum channels"
+msgstr "Impostazione avanzata - utile per creare un canale-forum di discussione"
+
+#: ../../include/permissions.php:27
+msgid "Can chat with me (when available)"
+msgstr "Può aprire una chat con me (se disponibile)"
+
+#: ../../include/permissions.php:27
+msgid "Requires compatible chat plugin"
+msgstr "Necessita di un plugin di chat compatibile"
+
+#: ../../include/permissions.php:28
+msgid "Can write to my \"public\" file storage"
+msgstr "Può scrivere sul mio archivio di file \"pubblico\""
+
+#: ../../include/permissions.php:29
+msgid "Can edit my \"public\" pages"
+msgstr "Può modificare le mie pagine web \"pubbliche\""
+
+#: ../../include/permissions.php:31
+msgid "Can source my \"public\" posts in derived channels"
+msgstr "Può aggiungere i miei post \"pubblici\" a un suo canale derivato"
+
+#: ../../include/permissions.php:31
+msgid "Somewhat advanced - very useful in open communities"
+msgstr "Piuttosto avanzato - molto utile nelle comunità aperte"
+
+#: ../../include/permissions.php:32
+msgid "Can administer my channel resources"
+msgstr "Può amministrare i contenuti del mio canale"
+
+#: ../../include/permissions.php:32
+msgid ""
+"Extremely advanced. Leave this alone unless you know what you are doing"
+msgstr "Impostazione pericolosa - lasciare il valore predefinito se non si è assolutamente sicuri"
+
+#: ../../include/taxonomy.php:210
+msgid "Tags"
+msgstr "Tag"
+
+#: ../../include/taxonomy.php:224
+msgid "Keywords"
+msgstr "Parole chiave"
+
+#: ../../include/taxonomy.php:249
+msgid "have"
+msgstr "ho"
+
+#: ../../include/taxonomy.php:249
+msgid "has"
+msgstr "ha"
+
+#: ../../include/taxonomy.php:250
+msgid "want"
+msgstr "voglio"
+
+#: ../../include/taxonomy.php:250
+msgid "wants"
+msgstr "vuole"
+
+#: ../../include/taxonomy.php:251
+msgid "likes"
+msgstr "ama"
 
-#: ../../include/conversation.php:1113 ../../mod/editlayout.php:110
-#: ../../mod/editwebpage.php:129 ../../mod/editpost.php:107
-#: ../../mod/editblock.php:124
-msgid "Permission settings"
-msgstr "Impostazioni permessi"
+#: ../../include/taxonomy.php:252
+msgid "dislikes"
+msgstr "non ama"
 
-#: ../../include/conversation.php:1114
-msgid "permissions"
-msgstr "permessi"
+#: ../../include/plugin.php:473 ../../include/plugin.php:475
+msgid "Click here to upgrade."
+msgstr "Clicca qui per aggiornare."
 
-#: ../../include/conversation.php:1122 ../../mod/editlayout.php:118
-#: ../../mod/editwebpage.php:137 ../../mod/editpost.php:115
-#: ../../mod/editblock.php:133
-msgid "Public post"
-msgstr "Articolo pubblico"
+#: ../../include/plugin.php:481
+msgid "This action exceeds the limits set by your subscription plan."
+msgstr "Questa operazione esce dai termini del tuo abbonamento."
 
-#: ../../include/conversation.php:1124 ../../mod/editlayout.php:124
-#: ../../mod/editwebpage.php:145 ../../mod/editpost.php:121
-#: ../../mod/editblock.php:139
-msgid "Example: bob@example.com, mary@example.com"
-msgstr "Per esempio: mario@esempio.com, simona@esempio.com"
+#: ../../include/plugin.php:486
+msgid "This action is not available under your subscription plan."
+msgstr "Questa operazione non è prevista dal tuo abbonamento."
 
-#: ../../include/conversation.php:1137 ../../mod/message.php:336
-#: ../../mod/message.php:519 ../../mod/editlayout.php:134
-#: ../../mod/editwebpage.php:155 ../../mod/editpost.php:132
-#: ../../mod/editblock.php:149
-msgid "Set expiration date"
-msgstr "Data di scadenza"
+#: ../../include/comanche.php:35 ../../view/theme/redbasic/php/config.php:62
+#: ../../view/theme/apw/php/config.php:176
+msgid "Default"
+msgstr "Predefinito"
 
 #: ../../include/security.php:49
 msgid "Welcome "
@@ -2770,27 +2775,27 @@ msgstr "L'identificativo di sicurezza del modulo che hai riempito non è corrett
 msgid "Permission denied"
 msgstr "Permesso negato"
 
-#: ../../include/items.php:3521 ../../mod/admin.php:150
-#: ../../mod/admin.php:714 ../../mod/admin.php:917 ../../mod/viewsrc.php:18
+#: ../../include/items.php:3546 ../../mod/admin.php:150
+#: ../../mod/admin.php:727 ../../mod/admin.php:930 ../../mod/viewsrc.php:18
 #: ../../mod/home.php:64 ../../mod/display.php:32
 msgid "Item not found."
 msgstr "Elemento non trovato."
 
-#: ../../include/items.php:3693
+#: ../../include/items.php:3729
 msgid "Archives"
 msgstr "Archivi"
 
-#: ../../include/items.php:3854 ../../mod/group.php:44 ../../mod/group.php:146
+#: ../../include/items.php:3895 ../../mod/group.php:44 ../../mod/group.php:146
 msgid "Collection not found."
 msgstr "Insieme non trovato."
 
-#: ../../include/items.php:3870 ../../mod/network.php:469
+#: ../../include/items.php:3911 ../../mod/network.php:469
 msgid "Group is empty"
 msgstr "L'insieme è vuoto"
 
-#: ../../include/items.php:3886
+#: ../../include/items.php:3927
 msgid "Connection not found."
-msgstr "Gruppo non trovato."
+msgstr "Contatto non trovato."
 
 #: ../../include/dir_fns.php:15
 msgid "Sort Options"
@@ -3031,7 +3036,7 @@ msgstr "Nessun amico da visualizzare."
 
 #: ../../mod/webpages.php:8 ../../mod/connect.php:13 ../../mod/layouts.php:8
 #: ../../mod/filestorage.php:8 ../../mod/blocks.php:10 ../../mod/profile.php:8
-#: ../../boot.php:1644
+#: ../../boot.php:1640
 msgid "Requested profile is not available."
 msgstr "Il profilo richiesto non è disponibile."
 
@@ -3058,17 +3063,17 @@ msgid ""
 " and/or create new posts for you?"
 msgstr "Vuoi autorizzare questa app ad accedere ai messaggi e ai contatti o creare nuovi messaggi per te?"
 
-#: ../../mod/api.php:105 ../../mod/settings.php:1008
-#: ../../mod/settings.php:1013 ../../mod/settings.php:1036
-#: ../../mod/settings.php:1038 ../../mod/settings.php:1039
-#: ../../mod/settings.php:1040 ../../mod/profiles.php:506
+#: ../../mod/api.php:105 ../../mod/settings.php:1009
+#: ../../mod/settings.php:1014 ../../mod/settings.php:1037
+#: ../../mod/settings.php:1039 ../../mod/settings.php:1040
+#: ../../mod/settings.php:1041 ../../mod/profiles.php:506
 msgid "Yes"
 msgstr "Si"
 
-#: ../../mod/api.php:106 ../../mod/settings.php:1008
-#: ../../mod/settings.php:1013 ../../mod/settings.php:1036
-#: ../../mod/settings.php:1038 ../../mod/settings.php:1039
-#: ../../mod/settings.php:1040 ../../mod/profiles.php:507
+#: ../../mod/api.php:106 ../../mod/settings.php:1009
+#: ../../mod/settings.php:1014 ../../mod/settings.php:1037
+#: ../../mod/settings.php:1039 ../../mod/settings.php:1040
+#: ../../mod/settings.php:1041 ../../mod/profiles.php:507
 msgid "No"
 msgstr "No"
 
@@ -3089,11 +3094,11 @@ msgid "Invalid item."
 msgstr "Elemento non valido."
 
 #: ../../mod/page.php:47 ../../mod/chanview.php:78 ../../mod/home.php:51
-#: ../../mod/magic.php:77 ../../mod/wall_upload.php:35
+#: ../../mod/magic.php:95 ../../mod/wall_upload.php:35
 msgid "Channel not found."
 msgstr "Canale non trovato."
 
-#: ../../mod/page.php:83 ../../mod/help.php:41 ../../mod/display.php:92
+#: ../../mod/page.php:83 ../../mod/help.php:56 ../../mod/display.php:92
 #: ../../index.php:229
 msgid "Page not found."
 msgstr "Pagina non trovata."
@@ -3437,7 +3442,7 @@ msgid ""
 "poller."
 msgstr "IMPORTANTE: Devi creare [manualmente] la pianificazione del polling."
 
-#: ../../mod/rpost.php:83 ../../mod/editpost.php:42
+#: ../../mod/rpost.php:84 ../../mod/editpost.php:42
 msgid "Edit post"
 msgstr "Modifica articolo"
 
@@ -3505,7 +3510,7 @@ msgstr "Il nome è obbligatorio"
 msgid "Key and Secret are required"
 msgstr "Chiave e Segreto sono richiesti"
 
-#: ../../mod/settings.php:179 ../../mod/settings.php:676
+#: ../../mod/settings.php:179 ../../mod/settings.php:677
 msgid "Update"
 msgstr "Aggiorna"
 
@@ -3537,386 +3542,386 @@ msgstr "È un indirizzo email riservato. Non puoi sceglierlo."
 msgid "System failure storing new email. Please try again."
 msgstr "Errore di sistema. Non è stato possibile memorizzare il tuo messaggio, riprova per favore."
 
-#: ../../mod/settings.php:578
+#: ../../mod/settings.php:579
 msgid "Settings updated."
 msgstr "Impostazioni aggiornate."
 
-#: ../../mod/settings.php:649 ../../mod/settings.php:675
-#: ../../mod/settings.php:711
+#: ../../mod/settings.php:650 ../../mod/settings.php:676
+#: ../../mod/settings.php:712
 msgid "Add application"
 msgstr "Aggiungi una app"
 
-#: ../../mod/settings.php:651 ../../mod/settings.php:677
+#: ../../mod/settings.php:652 ../../mod/settings.php:678
 #: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94 ../../mod/fbrowser.php:82
 #: ../../mod/fbrowser.php:117
 msgid "Cancel"
 msgstr "Annulla"
 
-#: ../../mod/settings.php:652 ../../mod/settings.php:678
-#: ../../mod/admin.php:673 ../../mod/crepair.php:148
+#: ../../mod/settings.php:653 ../../mod/settings.php:679
+#: ../../mod/admin.php:686 ../../mod/crepair.php:148
 msgid "Name"
 msgstr "Nome"
 
-#: ../../mod/settings.php:652
+#: ../../mod/settings.php:653
 msgid "Name of application"
 msgstr "Nome dell'applicazione"
 
-#: ../../mod/settings.php:653 ../../mod/settings.php:679
+#: ../../mod/settings.php:654 ../../mod/settings.php:680
 msgid "Consumer Key"
 msgstr "Consumer Key"
 
-#: ../../mod/settings.php:653 ../../mod/settings.php:654
+#: ../../mod/settings.php:654 ../../mod/settings.php:655
 msgid "Automatically generated - change if desired. Max length 20"
 msgstr "Generato automaticamente - è possibile cambiarlo. Lunghezza massima 20"
 
-#: ../../mod/settings.php:654 ../../mod/settings.php:680
+#: ../../mod/settings.php:655 ../../mod/settings.php:681
 msgid "Consumer Secret"
 msgstr "Consumer Secret"
 
-#: ../../mod/settings.php:655 ../../mod/settings.php:681
+#: ../../mod/settings.php:656 ../../mod/settings.php:682
 msgid "Redirect"
 msgstr "Redirect"
 
-#: ../../mod/settings.php:655
+#: ../../mod/settings.php:656
 msgid ""
 "Redirect URI - leave blank unless your application specifically requires "
 "this"
 msgstr "URI ridirezionato - lasciare bianco se non richiesto specificamente dall'applicazione."
 
-#: ../../mod/settings.php:656 ../../mod/settings.php:682
+#: ../../mod/settings.php:657 ../../mod/settings.php:683
 msgid "Icon url"
 msgstr "Url icona"
 
-#: ../../mod/settings.php:656
+#: ../../mod/settings.php:657
 msgid "Optional"
 msgstr "Opzionale"
 
-#: ../../mod/settings.php:667
+#: ../../mod/settings.php:668
 msgid "You can't edit this application."
 msgstr "Non puoi modificare questa applicazione."
 
-#: ../../mod/settings.php:710
+#: ../../mod/settings.php:711
 msgid "Connected Apps"
 msgstr "App connesse"
 
-#: ../../mod/settings.php:714
+#: ../../mod/settings.php:715
 msgid "Client key starts with"
 msgstr "La client key inizia con"
 
-#: ../../mod/settings.php:715
+#: ../../mod/settings.php:716
 msgid "No name"
 msgstr "Nessun nome"
 
-#: ../../mod/settings.php:716
+#: ../../mod/settings.php:717
 msgid "Remove authorization"
 msgstr "Revoca l'autorizzazione"
 
-#: ../../mod/settings.php:727
+#: ../../mod/settings.php:728
 msgid "No feature settings configured"
 msgstr "Non ci sono funzionalità aggiuntive personalizzabili"
 
-#: ../../mod/settings.php:735
+#: ../../mod/settings.php:736
 msgid "Feature Settings"
 msgstr "Impostazioni aggiuntive"
 
-#: ../../mod/settings.php:758
+#: ../../mod/settings.php:759
 msgid "Account Settings"
 msgstr "Impostazioni account"
 
-#: ../../mod/settings.php:759
+#: ../../mod/settings.php:760
 msgid "Password Settings"
 msgstr "Impostazioni password"
 
-#: ../../mod/settings.php:760
+#: ../../mod/settings.php:761
 msgid "New Password:"
 msgstr "Nuova password:"
 
-#: ../../mod/settings.php:761
+#: ../../mod/settings.php:762
 msgid "Confirm:"
 msgstr "Conferma:"
 
-#: ../../mod/settings.php:761
+#: ../../mod/settings.php:762
 msgid "Leave password fields blank unless changing"
 msgstr "Lascia questi campi in bianco per non cambiare la password"
 
-#: ../../mod/settings.php:763 ../../mod/settings.php:1062
+#: ../../mod/settings.php:764 ../../mod/settings.php:1063
 msgid "Email Address:"
 msgstr "Indirizzo email:"
 
-#: ../../mod/settings.php:764
+#: ../../mod/settings.php:765
 msgid "Remove Account"
 msgstr "Elimina l'account"
 
-#: ../../mod/settings.php:765
+#: ../../mod/settings.php:766
 msgid "Warning: This action is permanent and cannot be reversed."
 msgstr "Attenzione: questa azione è permanente e non potrà più essere annullata."
 
-#: ../../mod/settings.php:781
+#: ../../mod/settings.php:782
 msgid "Off"
 msgstr "Off"
 
-#: ../../mod/settings.php:781
+#: ../../mod/settings.php:782
 msgid "On"
 msgstr "On"
 
-#: ../../mod/settings.php:788
+#: ../../mod/settings.php:789
 msgid "Additional Features"
 msgstr "Funzionalità aggiuntive"
 
-#: ../../mod/settings.php:813
+#: ../../mod/settings.php:814
 msgid "Connector Settings"
 msgstr "Impostazioni del connettore"
 
-#: ../../mod/settings.php:843 ../../mod/admin.php:369
+#: ../../mod/settings.php:844 ../../mod/admin.php:369
 msgid "No special theme for mobile devices"
 msgstr "Nessun tema per dispositivi mobili"
 
-#: ../../mod/settings.php:883
+#: ../../mod/settings.php:884
 msgid "Display Settings"
 msgstr "Impostazioni grafiche"
 
-#: ../../mod/settings.php:889
+#: ../../mod/settings.php:890
 msgid "Display Theme:"
 msgstr "Tema per monitor:"
 
-#: ../../mod/settings.php:890
+#: ../../mod/settings.php:891
 msgid "Mobile Theme:"
 msgstr "Tema per dispositivi mobili:"
 
-#: ../../mod/settings.php:891
+#: ../../mod/settings.php:892
 msgid "Update browser every xx seconds"
 msgstr "Aggiorna il browser ogni x secondi"
 
-#: ../../mod/settings.php:891
+#: ../../mod/settings.php:892
 msgid "Minimum of 10 seconds, no maximum"
 msgstr "Minimo 10 secondi, nessun limite massimo"
 
-#: ../../mod/settings.php:892
+#: ../../mod/settings.php:893
 msgid "Maximum number of conversations to load at any time:"
 msgstr "Massimo numero di conversazioni da mostrare ogni volta:"
 
-#: ../../mod/settings.php:892
+#: ../../mod/settings.php:893
 msgid "Maximum of 100 items"
 msgstr "Massimo 100"
 
-#: ../../mod/settings.php:893
+#: ../../mod/settings.php:894
 msgid "Don't show emoticons"
 msgstr "Non mostrare le emoticons"
 
-#: ../../mod/settings.php:929
+#: ../../mod/settings.php:930
 msgid "Nobody except yourself"
 msgstr "Nessuno tranne te"
 
-#: ../../mod/settings.php:930
+#: ../../mod/settings.php:931
 msgid "Only those you specifically allow"
 msgstr "Solo chi riceve il mio permesso"
 
-#: ../../mod/settings.php:931
+#: ../../mod/settings.php:932
 msgid "Anybody in your address book"
 msgstr "Chiunque tra i miei contatti"
 
-#: ../../mod/settings.php:932
+#: ../../mod/settings.php:933
 msgid "Anybody on this website"
 msgstr "Chiunque su questo sito"
 
-#: ../../mod/settings.php:933
+#: ../../mod/settings.php:934
 msgid "Anybody in this network"
 msgstr "Chiunque su Red"
 
-#: ../../mod/settings.php:934
+#: ../../mod/settings.php:935
 msgid "Anybody on the internet"
 msgstr "Chiunque su internet"
 
-#: ../../mod/settings.php:1008
+#: ../../mod/settings.php:1009
 msgid "Publish your default profile in the network directory"
 msgstr "Pubblica il mio profilo predefinito sull'elenco pubblico dei canali"
 
-#: ../../mod/settings.php:1013
+#: ../../mod/settings.php:1014
 msgid "Allow us to suggest you as a potential friend to new members?"
 msgstr "Vuoi essere suggerito come potenziale amico ai nuovi membri?"
 
-#: ../../mod/settings.php:1017 ../../mod/profile_photo.php:298
+#: ../../mod/settings.php:1018 ../../mod/profile_photo.php:298
 msgid "or"
 msgstr "o"
 
-#: ../../mod/settings.php:1022
+#: ../../mod/settings.php:1023
 msgid "Your channel address is"
 msgstr "L'indirizzo del tuo canale è"
 
-#: ../../mod/settings.php:1033
+#: ../../mod/settings.php:1034
 msgid "Automatically expire posts after this many days:"
 msgstr "Gli articoli scadono automaticamente dopo questo numero di giorni:"
 
-#: ../../mod/settings.php:1033
+#: ../../mod/settings.php:1034
 msgid "If empty, posts will not expire. Expired posts will be deleted"
 msgstr "Se lasci vuoto, i messaggi non scadranno mai. I messaggi scaduti saranno eliminati."
 
-#: ../../mod/settings.php:1034
+#: ../../mod/settings.php:1035
 msgid "Advanced expiration settings"
 msgstr "Impostazioni avanzate di scandenza"
 
-#: ../../mod/settings.php:1035
+#: ../../mod/settings.php:1036
 msgid "Advanced Expiration"
 msgstr "Scadenza"
 
-#: ../../mod/settings.php:1036
+#: ../../mod/settings.php:1037
 msgid "Expire posts:"
 msgstr "Fai scadere gli articoli:"
 
-#: ../../mod/settings.php:1038
+#: ../../mod/settings.php:1039
 msgid "Expire starred posts:"
 msgstr "Fai scadere gli articoli preferiti:"
 
-#: ../../mod/settings.php:1039
+#: ../../mod/settings.php:1040
 msgid "Expire photos:"
 msgstr "Fai scadere le foto:"
 
-#: ../../mod/settings.php:1040
+#: ../../mod/settings.php:1041
 msgid "Only expire posts by others:"
 msgstr "Fai scadere solo gli articoli scritti da altri:"
 
-#: ../../mod/settings.php:1051
+#: ../../mod/settings.php:1052
 msgid "Channel Settings"
 msgstr "Impostazioni del canale"
 
-#: ../../mod/settings.php:1060
+#: ../../mod/settings.php:1061
 msgid "Basic Settings"
 msgstr "Impostazioni di base"
 
-#: ../../mod/settings.php:1063
+#: ../../mod/settings.php:1064
 msgid "Your Timezone:"
 msgstr "Il tuo fuso orario:"
 
-#: ../../mod/settings.php:1064
+#: ../../mod/settings.php:1065
 msgid "Default Post Location:"
 msgstr "Località predefinita:"
 
-#: ../../mod/settings.php:1065
+#: ../../mod/settings.php:1066
 msgid "Use Browser Location:"
 msgstr "Usa la località rilevata dal browser:"
 
-#: ../../mod/settings.php:1067
+#: ../../mod/settings.php:1068
 msgid "Adult Content"
 msgstr "Contenuto per adulti"
 
-#: ../../mod/settings.php:1067
+#: ../../mod/settings.php:1068
 msgid "This channel publishes adult content."
 msgstr "Questo canale pubblica contenuto per adulti."
 
-#: ../../mod/settings.php:1069
+#: ../../mod/settings.php:1070
 msgid "Security and Privacy Settings"
 msgstr "Impostazioni di sicurezza e privacy"
 
-#: ../../mod/settings.php:1071
+#: ../../mod/settings.php:1072
 msgid "Quick Privacy Settings:"
 msgstr "Impostazioni veloci della privacy:"
 
-#: ../../mod/settings.php:1072
+#: ../../mod/settings.php:1073
 msgid "Very Public - extremely permissive"
 msgstr "Tutto pubblico - molto permissivo"
 
-#: ../../mod/settings.php:1073
+#: ../../mod/settings.php:1074
 msgid "Typical - default public, privacy when desired"
 msgstr "Normale - tutto sarà pubblico tranne quel che vorrai tu"
 
-#: ../../mod/settings.php:1074
+#: ../../mod/settings.php:1075
 msgid "Private - default private, rarely open or public"
 msgstr "Privato - i contenuti saranno privati ma, se vorrai, alcuni potrai renderli pubblici"
 
-#: ../../mod/settings.php:1075
+#: ../../mod/settings.php:1076
 msgid "Blocked - default blocked to/from everybody"
 msgstr "Bloccato - non ci saranno interazioni con altri a meno che tu non voglia"
 
-#: ../../mod/settings.php:1078
+#: ../../mod/settings.php:1079
 msgid "Maximum Friend Requests/Day:"
 msgstr "Numero massimo giornaliero di richieste di amicizia:"
 
-#: ../../mod/settings.php:1078
+#: ../../mod/settings.php:1079
 msgid "May reduce spam activity"
 msgstr "Serve e ridurre lo spam"
 
-#: ../../mod/settings.php:1079
+#: ../../mod/settings.php:1080
 msgid "Default Post Permissions"
 msgstr "Permessi predefiniti per gli articoli"
 
-#: ../../mod/settings.php:1080
+#: ../../mod/settings.php:1081
 msgid "(click to open/close)"
 msgstr "(clicca per aprire/chiudere)"
 
-#: ../../mod/settings.php:1093
+#: ../../mod/settings.php:1094
 msgid "Maximum private messages per day from unknown people:"
 msgstr "Numero massimo giornaliero di messaggi privati da utenti sconosciuti:"
 
-#: ../../mod/settings.php:1093
+#: ../../mod/settings.php:1094
 msgid "Useful to reduce spamming"
 msgstr "Serve e ridurre lo spam"
 
-#: ../../mod/settings.php:1096
+#: ../../mod/settings.php:1097
 msgid "Notification Settings"
 msgstr "Impostazioni di notifica"
 
-#: ../../mod/settings.php:1097
+#: ../../mod/settings.php:1098
 msgid "By default post a status message when:"
 msgstr "Pubblica un messaggio di stato quando:"
 
-#: ../../mod/settings.php:1098
+#: ../../mod/settings.php:1099
 msgid "accepting a friend request"
 msgstr "accetto una nuova amicizia"
 
-#: ../../mod/settings.php:1099
+#: ../../mod/settings.php:1100
 msgid "joining a forum/community"
 msgstr "entro a far parte di un forum"
 
-#: ../../mod/settings.php:1100
+#: ../../mod/settings.php:1101
 msgid "making an <em>interesting</em> profile change"
 msgstr "faccio un cambiamento <em>interessante</em> al mio profilo"
 
-#: ../../mod/settings.php:1101
+#: ../../mod/settings.php:1102
 msgid "Send a notification email when:"
 msgstr "Invia una email di notifica quando:"
 
-#: ../../mod/settings.php:1102
+#: ../../mod/settings.php:1103
 msgid "You receive an introduction"
 msgstr "Ricevi una richiesta di amicizia"
 
-#: ../../mod/settings.php:1103
+#: ../../mod/settings.php:1104
 msgid "Your introductions are confirmed"
 msgstr "Le tue richieste di amicizia sono state accettate"
 
-#: ../../mod/settings.php:1104
+#: ../../mod/settings.php:1105
 msgid "Someone writes on your profile wall"
 msgstr "Qualcuno scrive sulla tua bacheca"
 
-#: ../../mod/settings.php:1105
+#: ../../mod/settings.php:1106
 msgid "Someone writes a followup comment"
 msgstr "Qualcuno scrive un commento a un tuo articolo"
 
-#: ../../mod/settings.php:1106
+#: ../../mod/settings.php:1107
 msgid "You receive a private message"
 msgstr "Ricevi un messaggio privato"
 
-#: ../../mod/settings.php:1107
+#: ../../mod/settings.php:1108
 msgid "You receive a friend suggestion"
 msgstr "Ti viene suggerito un amico"
 
-#: ../../mod/settings.php:1108
+#: ../../mod/settings.php:1109
 msgid "You are tagged in a post"
 msgstr "Sei taggato in un articolo"
 
-#: ../../mod/settings.php:1109
+#: ../../mod/settings.php:1110
 msgid "You are poked/prodded/etc. in a post"
 msgstr "Ricevi un poke in un articolo"
 
-#: ../../mod/settings.php:1112
+#: ../../mod/settings.php:1113
 msgid "Advanced Account/Page Type Settings"
 msgstr "Impostazioni avanzate"
 
-#: ../../mod/settings.php:1113
+#: ../../mod/settings.php:1114
 msgid "Change the behaviour of this account for special situations"
 msgstr "Cambia il funzionamento di questo account in situazioni particolari"
 
-#: ../../mod/viewconnections.php:28 ../../mod/photos.php:576
-#: ../../mod/display.php:9 ../../mod/search.php:80 ../../mod/community.php:18
+#: ../../mod/viewconnections.php:28 ../../mod/search.php:80
+#: ../../mod/photos.php:576 ../../mod/display.php:9 ../../mod/community.php:18
 #: ../../mod/directory.php:32
 msgid "Public access denied."
 msgstr "Accesso pubblico negato."
@@ -4091,15 +4096,15 @@ msgstr "Le impostazioni del tema sono state aggiornate."
 msgid "Site"
 msgstr "Sito"
 
-#: ../../mod/admin.php:88 ../../mod/admin.php:669 ../../mod/admin.php:681
+#: ../../mod/admin.php:88 ../../mod/admin.php:682 ../../mod/admin.php:694
 msgid "Users"
 msgstr "Utenti"
 
-#: ../../mod/admin.php:89 ../../mod/admin.php:767 ../../mod/admin.php:809
+#: ../../mod/admin.php:89 ../../mod/admin.php:780 ../../mod/admin.php:822
 msgid "Plugins"
 msgstr "Plugin"
 
-#: ../../mod/admin.php:90 ../../mod/admin.php:972 ../../mod/admin.php:1008
+#: ../../mod/admin.php:90 ../../mod/admin.php:985 ../../mod/admin.php:1021
 msgid "Themes"
 msgstr "Temi"
 
@@ -4111,7 +4116,7 @@ msgstr "Server"
 msgid "DB updates"
 msgstr "Aggiornamenti al DB"
 
-#: ../../mod/admin.php:106 ../../mod/admin.php:113 ../../mod/admin.php:1095
+#: ../../mod/admin.php:106 ../../mod/admin.php:113 ../../mod/admin.php:1108
 msgid "Logs"
 msgstr "Log"
 
@@ -4121,15 +4126,15 @@ msgstr "Funzionalità dei componenti aggiuntivi"
 
 #: ../../mod/admin.php:114
 msgid "User registrations waiting for confirmation"
-msgstr "Utenti registrati in attesa di conferma"
+msgstr "Registrazioni in attesa"
 
 #: ../../mod/admin.php:188
 msgid "Message queues"
-msgstr "Coda dei messaggi"
+msgstr "Messaggi in attesa di recapito"
 
 #: ../../mod/admin.php:193 ../../mod/admin.php:416 ../../mod/admin.php:474
-#: ../../mod/admin.php:668 ../../mod/admin.php:766 ../../mod/admin.php:808
-#: ../../mod/admin.php:971 ../../mod/admin.php:1007 ../../mod/admin.php:1094
+#: ../../mod/admin.php:681 ../../mod/admin.php:779 ../../mod/admin.php:821
+#: ../../mod/admin.php:984 ../../mod/admin.php:1020 ../../mod/admin.php:1107
 msgid "Administration"
 msgstr "Amministrazione"
 
@@ -4143,7 +4148,7 @@ msgstr "Utenti registrati"
 
 #: ../../mod/admin.php:198 ../../mod/admin.php:478
 msgid "Pending registrations"
-msgstr "Registrazioni in attesa"
+msgstr "Registrazioni da approvare"
 
 #: ../../mod/admin.php:199
 msgid "Version"
@@ -4189,7 +4194,7 @@ msgstr "Servizio gratuito"
 msgid "Tiered Access"
 msgstr "Accesso multilivello"
 
-#: ../../mod/admin.php:419 ../../mod/register.php:172
+#: ../../mod/admin.php:419 ../../mod/register.php:180
 msgid "Registration"
 msgstr "Registrazione"
 
@@ -4279,7 +4284,7 @@ msgstr "Sarà mostrato ben visibile nella pagina di registrazione."
 
 #: ../../mod/admin.php:438
 msgid "Accounts abandoned after x days"
-msgstr "Account abbandonati dopo x giorni"
+msgstr "Account abbandonati dopo X giorni"
 
 #: ../../mod/admin.php:438
 msgid ""
@@ -4378,7 +4383,7 @@ msgstr "Carico di sistema massimo perché i processi di recapito e polling siano
 msgid "No server found"
 msgstr "Server non trovato"
 
-#: ../../mod/admin.php:473
+#: ../../mod/admin.php:473 ../../mod/admin.php:695
 msgid "ID"
 msgstr "ID"
 
@@ -4467,149 +4472,137 @@ msgstr "Utente '%s' sbloccato"
 msgid "User '%s' blocked"
 msgstr "Utente '%s' bloccato"
 
-#: ../../mod/admin.php:650
-msgid "Normal Account"
-msgstr "Account normale"
-
-#: ../../mod/admin.php:651
-msgid "Soapbox Account"
-msgstr "Account per comunicati e annunci"
-
-#: ../../mod/admin.php:652
-msgid "Community/Celebrity Account"
-msgstr "Account per celebrità o per comunità"
-
-#: ../../mod/admin.php:653
-msgid "Automatic Friend Account"
-msgstr "Account per amicizia automatizzato"
-
-#: ../../mod/admin.php:671
+#: ../../mod/admin.php:684
 msgid "select all"
 msgstr "seleziona tutti"
 
-#: ../../mod/admin.php:672
+#: ../../mod/admin.php:685
 msgid "User registrations waiting for confirm"
 msgstr "Richieste di registrazione in attesa di conferma"
 
-#: ../../mod/admin.php:673
+#: ../../mod/admin.php:686
 msgid "Request date"
 msgstr "Data richiesta"
 
-#: ../../mod/admin.php:674
+#: ../../mod/admin.php:687
 msgid "No registrations."
 msgstr "Nessuna registrazione."
 
-#: ../../mod/admin.php:675 ../../mod/intro.php:11 ../../mod/intro.php:98
+#: ../../mod/admin.php:688 ../../mod/intro.php:11 ../../mod/intro.php:98
 #: ../../mod/notifications.php:159 ../../mod/notifications.php:206
 msgid "Approve"
 msgstr "Approva"
 
-#: ../../mod/admin.php:676
+#: ../../mod/admin.php:689
 msgid "Deny"
 msgstr "Nega"
 
-#: ../../mod/admin.php:678 ../../mod/intro.php:14 ../../mod/intro.php:99
-#: ../../mod/connections.php:328 ../../mod/connections.php:470
+#: ../../mod/admin.php:691 ../../mod/intro.php:14 ../../mod/intro.php:99
+#: ../../mod/connections.php:348 ../../mod/connections.php:490
 msgid "Block"
 msgstr "Blocca"
 
-#: ../../mod/admin.php:679 ../../mod/connections.php:328
-#: ../../mod/connections.php:470
+#: ../../mod/admin.php:692 ../../mod/connections.php:348
+#: ../../mod/connections.php:490
 msgid "Unblock"
 msgstr "Sblocca"
 
-#: ../../mod/admin.php:682
+#: ../../mod/admin.php:695
 msgid "Register date"
 msgstr "Data registrazione"
 
-#: ../../mod/admin.php:682
+#: ../../mod/admin.php:695
 msgid "Last login"
 msgstr "Ultimo accesso"
 
-#: ../../mod/admin.php:682
+#: ../../mod/admin.php:695
+msgid "Expires"
+msgstr "Scadenza"
+
+#: ../../mod/admin.php:695
 msgid "Service Class"
 msgstr "Service Class"
 
-#: ../../mod/admin.php:684
+#: ../../mod/admin.php:697
 msgid ""
 "Selected users will be deleted!\\n\\nEverything these users had posted on "
 "this site will be permanently deleted!\\n\\nAre you sure?"
 msgstr "Gli utenti selezionati saranno eliminati!\\n\\nTutto quello che gli utenti hanno pubblicato su questo sito sarà permanentemente eliminato!\\n\\nConfermi?"
 
-#: ../../mod/admin.php:685
+#: ../../mod/admin.php:698
 msgid ""
 "The user {0} will be deleted!\\n\\nEverything this user has posted on this "
 "site will be permanently deleted!\\n\\nAre you sure?"
 msgstr "L'utente {0} sarà eliminato!\\n\\nTutto quello che ha pubblicato su questo sito sarà permanentemente eliminato!\\n\\nConfermi?"
 
-#: ../../mod/admin.php:726
+#: ../../mod/admin.php:739
 #, php-format
 msgid "Plugin %s disabled."
 msgstr "Plugin %s non attivo."
 
-#: ../../mod/admin.php:730
+#: ../../mod/admin.php:743
 #, php-format
 msgid "Plugin %s enabled."
 msgstr "Plugin %s attivo."
 
-#: ../../mod/admin.php:740 ../../mod/admin.php:942
+#: ../../mod/admin.php:753 ../../mod/admin.php:955
 msgid "Disable"
 msgstr "Disattiva"
 
-#: ../../mod/admin.php:742 ../../mod/admin.php:944
+#: ../../mod/admin.php:755 ../../mod/admin.php:957
 msgid "Enable"
 msgstr "Attiva"
 
-#: ../../mod/admin.php:768 ../../mod/admin.php:973
+#: ../../mod/admin.php:781 ../../mod/admin.php:986
 msgid "Toggle"
 msgstr "Attiva/disattiva"
 
-#: ../../mod/admin.php:776 ../../mod/admin.php:983
+#: ../../mod/admin.php:789 ../../mod/admin.php:996
 msgid "Author: "
 msgstr "Autore:"
 
-#: ../../mod/admin.php:777 ../../mod/admin.php:984
+#: ../../mod/admin.php:790 ../../mod/admin.php:997
 msgid "Maintainer: "
 msgstr "Gestore:"
 
-#: ../../mod/admin.php:906
+#: ../../mod/admin.php:919
 msgid "No themes found."
 msgstr "Nessun tema trovato."
 
-#: ../../mod/admin.php:965
+#: ../../mod/admin.php:978
 msgid "Screenshot"
 msgstr "Istantanea dello schermo"
 
-#: ../../mod/admin.php:1013
+#: ../../mod/admin.php:1026
 msgid "[Experimental]"
 msgstr "[Sperimentale]"
 
-#: ../../mod/admin.php:1014
+#: ../../mod/admin.php:1027
 msgid "[Unsupported]"
 msgstr "[Non supportato]"
 
-#: ../../mod/admin.php:1041
+#: ../../mod/admin.php:1054
 msgid "Log settings updated."
 msgstr "Impostazioni di log aggiornate."
 
-#: ../../mod/admin.php:1097
+#: ../../mod/admin.php:1110
 msgid "Clear"
 msgstr "Pulisci"
 
-#: ../../mod/admin.php:1103
+#: ../../mod/admin.php:1116
 msgid "Debugging"
 msgstr "Debugging"
 
-#: ../../mod/admin.php:1104
+#: ../../mod/admin.php:1117
 msgid "Log file"
 msgstr "File di log"
 
-#: ../../mod/admin.php:1104
+#: ../../mod/admin.php:1117
 msgid ""
 "Must be writable by web server. Relative to your Red top-level directory."
 msgstr "Deve essere scrivibile dal web server. È relativa alla cartella dove è installato Red."
 
-#: ../../mod/admin.php:1105
+#: ../../mod/admin.php:1118
 msgid "Log level"
 msgstr "Livello di log"
 
@@ -4773,6 +4766,10 @@ msgstr "Tutti i canali connessi"
 msgid "Click on a channel to add or remove."
 msgstr "Clicca su un canale per aggiungerlo o rimuoverlo."
 
+#: ../../mod/search.php:20 ../../mod/network.php:164
+msgid "Remove term"
+msgstr "Rimuovi termine"
+
 #: ../../mod/photos.php:83
 msgid "Page owner information could not be retrieved."
 msgstr "Impossibile ottenere informazioni sul proprietario della pagina."
@@ -4918,11 +4915,11 @@ msgstr "ti ha inviato un messaggio privato"
 msgid "added your channel"
 msgstr "ha aggiunto il tuo canale"
 
-#: ../../mod/ping.php:230 ../../boot.php:1862 ../../boot.php:1942
+#: ../../mod/ping.php:230 ../../boot.php:1858 ../../boot.php:1938
 msgid "g A l F d"
 msgstr "g A l d F"
 
-#: ../../mod/ping.php:252 ../../boot.php:1908 ../../boot.php:1983
+#: ../../mod/ping.php:252 ../../boot.php:1904 ../../boot.php:1979
 msgid "[today]"
 msgstr "[oggi]"
 
@@ -4959,7 +4956,7 @@ msgid "Drop"
 msgstr "Elimina"
 
 #: ../../mod/menu.php:57 ../../mod/network.php:321
-#: ../../mod/connections.php:532
+#: ../../mod/connections.php:552
 msgid "New"
 msgstr "Novità"
 
@@ -5126,11 +5123,11 @@ msgstr "La guida per questa funzionalità"
 msgid "Layout Name"
 msgstr "Nome layout"
 
-#: ../../mod/help.php:30
+#: ../../mod/help.php:41
 msgid "Help:"
 msgstr "Guida:"
 
-#: ../../mod/help.php:38 ../../index.php:226
+#: ../../mod/help.php:53 ../../index.php:226
 msgid "Not Found"
 msgstr "Non disponibile"
 
@@ -5146,10 +5143,6 @@ msgstr "Inserisci l'indirizzo del tuo canale (ad esempio lucia@esempio.com)"
 msgid "Authenticate"
 msgstr "Autenticazione"
 
-#: ../../mod/network.php:164 ../../mod/search.php:20
-msgid "Remove term"
-msgstr "Rimuovi termine"
-
 #: ../../mod/network.php:302
 msgid "Commented Order"
 msgstr "Ultimi commenti"
@@ -5198,11 +5191,11 @@ msgstr "Articoli marcati come spam"
 msgid "Refresh"
 msgstr "Aggiorna"
 
-#: ../../mod/network.php:385 ../../mod/connections.php:384
+#: ../../mod/network.php:385 ../../mod/connections.php:404
 msgid "Me"
 msgstr "Io"
 
-#: ../../mod/network.php:386 ../../mod/connections.php:386
+#: ../../mod/network.php:386 ../../mod/connections.php:406
 msgid "Best Friends"
 msgstr "Buoni amici"
 
@@ -5210,11 +5203,11 @@ msgstr "Buoni amici"
 msgid "Co-workers"
 msgstr "Colleghi"
 
-#: ../../mod/network.php:389 ../../mod/connections.php:388
+#: ../../mod/network.php:389 ../../mod/connections.php:408
 msgid "Former Friends"
 msgstr "Ex amici"
 
-#: ../../mod/network.php:390 ../../mod/connections.php:389
+#: ../../mod/network.php:390 ../../mod/connections.php:409
 msgid "Acquaintances"
 msgstr "Conoscenti"
 
@@ -5239,7 +5232,7 @@ msgid "Invalid connection."
 msgstr "Connessione non valida."
 
 #: ../../mod/intro.php:17 ../../mod/intro.php:100
-#: ../../mod/connections.php:335 ../../mod/connections.php:471
+#: ../../mod/connections.php:355 ../../mod/connections.php:491
 #: ../../mod/notifications.php:51 ../../mod/notifications.php:162
 #: ../../mod/notifications.php:208
 msgid "Ignore"
@@ -5255,7 +5248,7 @@ msgstr "Impossibile aggiornare il contatto."
 
 #: ../../mod/intro.php:56
 msgid "Introductions and Connection Requests"
-msgstr "Richieste di contatto e di amicizia"
+msgstr "Richieste per entrare in contatto"
 
 #: ../../mod/intro.php:67
 msgid "No pending introductions."
@@ -5265,7 +5258,7 @@ msgstr "Nessuna richiesta in attesa."
 msgid "System error. Please try again later."
 msgstr "Errore di sistema. Riprovare più tardi."
 
-#: ../../mod/intro.php:95 ../../mod/connections.php:476
+#: ../../mod/intro.php:95 ../../mod/connections.php:496
 #: ../../mod/notifications.php:155 ../../mod/notifications.php:202
 msgid "Hide this contact from others"
 msgstr "Nascondi questo contatto agli altri"
@@ -5295,375 +5288,375 @@ msgstr "Non riesco a trovare il profilo selezionato."
 
 #: ../../mod/connections.php:124
 msgid "Failed to update connection record."
-msgstr "Impossibile aggiornare le informazioni di contatto."
+msgstr "Impossibile aggiornare le informazioni del contatto."
 
-#: ../../mod/connections.php:199
+#: ../../mod/connections.php:219
 msgid "Could not access address book record."
 msgstr "Impossibile accedere alle informazioni della rubrica."
 
-#: ../../mod/connections.php:213
+#: ../../mod/connections.php:233
 msgid "Refresh failed - channel is currently unavailable."
 msgstr "Il canale non è disponibile - impossibile aggiornare."
 
-#: ../../mod/connections.php:220
+#: ../../mod/connections.php:240
 msgid "Channel has been unblocked"
 msgstr "Il canale è stato sbloccato"
 
-#: ../../mod/connections.php:221
+#: ../../mod/connections.php:241
 msgid "Channel has been blocked"
 msgstr "Il canale è stato bloccato"
 
-#: ../../mod/connections.php:225 ../../mod/connections.php:237
-#: ../../mod/connections.php:249 ../../mod/connections.php:261
-#: ../../mod/connections.php:276
+#: ../../mod/connections.php:245 ../../mod/connections.php:257
+#: ../../mod/connections.php:269 ../../mod/connections.php:281
+#: ../../mod/connections.php:296
 msgid "Unable to set address book parameters."
 msgstr "Impossibile impostare i parametri della rubrica."
 
-#: ../../mod/connections.php:232
+#: ../../mod/connections.php:252
 msgid "Channel has been unignored"
 msgstr "Il canale non sarà più ignorato"
 
-#: ../../mod/connections.php:233
+#: ../../mod/connections.php:253
 msgid "Channel has been ignored"
 msgstr "Il canale sarà ignorato"
 
-#: ../../mod/connections.php:244
+#: ../../mod/connections.php:264
 msgid "Channel has been unarchived"
 msgstr "Il canale non è più archiviato"
 
-#: ../../mod/connections.php:245
+#: ../../mod/connections.php:265
 msgid "Channel has been archived"
 msgstr "Il canale è stato archiviato"
 
-#: ../../mod/connections.php:256
+#: ../../mod/connections.php:276
 msgid "Channel has been unhidden"
 msgstr "Il canale non è più nascosto"
 
-#: ../../mod/connections.php:257
+#: ../../mod/connections.php:277
 msgid "Channel has been hidden"
 msgstr "Il canale è stato nascosto"
 
-#: ../../mod/connections.php:271
+#: ../../mod/connections.php:291
 msgid "Channel has been approved"
 msgstr "Il canale è stato approvato"
 
-#: ../../mod/connections.php:272
+#: ../../mod/connections.php:292
 msgid "Channel has been unapproved"
 msgstr "Il canale non è più approvato"
 
-#: ../../mod/connections.php:290
+#: ../../mod/connections.php:310
 msgid "Contact has been removed."
 msgstr "Il contatto è stato rimosso."
 
-#: ../../mod/connections.php:310
+#: ../../mod/connections.php:330
 #, php-format
 msgid "View %s's profile"
 msgstr "Guarda il profilo di %s"
 
-#: ../../mod/connections.php:314
+#: ../../mod/connections.php:334
 msgid "Refresh Permissions"
 msgstr "Aggiorna i permessi"
 
-#: ../../mod/connections.php:317
+#: ../../mod/connections.php:337
 msgid "Fetch updated permissions"
 msgstr "Scarica i permessi aggiornati"
 
-#: ../../mod/connections.php:321
+#: ../../mod/connections.php:341
 msgid "Recent Activity"
 msgstr "Attività recenti"
 
-#: ../../mod/connections.php:324
+#: ../../mod/connections.php:344
 msgid "View recent posts and comments"
 msgstr "Leggi i post recenti e i commenti"
 
-#: ../../mod/connections.php:331
+#: ../../mod/connections.php:351
 msgid "Block or Unblock this connection"
 msgstr "Per bloccare o meno questo contatto"
 
-#: ../../mod/connections.php:335 ../../mod/connections.php:471
+#: ../../mod/connections.php:355 ../../mod/connections.php:491
 msgid "Unignore"
 msgstr "Non ignorare"
 
-#: ../../mod/connections.php:338
+#: ../../mod/connections.php:358
 msgid "Ignore or Unignore this connection"
 msgstr "Per ignorare o meno questo contatto"
 
-#: ../../mod/connections.php:341
+#: ../../mod/connections.php:361
 msgid "Unarchive"
 msgstr "Non archiviare"
 
-#: ../../mod/connections.php:341
+#: ../../mod/connections.php:361
 msgid "Archive"
 msgstr "Archivia"
 
-#: ../../mod/connections.php:344
+#: ../../mod/connections.php:364
 msgid "Archive or Unarchive this connection"
 msgstr "Per archiviare o meno questo contatto"
 
-#: ../../mod/connections.php:347
+#: ../../mod/connections.php:367
 msgid "Unhide"
 msgstr "Non nascondere"
 
-#: ../../mod/connections.php:347
+#: ../../mod/connections.php:367
 msgid "Hide"
 msgstr "Nascondi"
 
-#: ../../mod/connections.php:350
+#: ../../mod/connections.php:370
 msgid "Hide or Unhide this connection"
 msgstr "Per nascondere o meno questo contatto"
 
-#: ../../mod/connections.php:357
+#: ../../mod/connections.php:377
 msgid "Delete this connection"
 msgstr "Elimina questo contatto"
 
-#: ../../mod/connections.php:390
+#: ../../mod/connections.php:410
 msgid "Unknown"
 msgstr "Sconosciuto"
 
-#: ../../mod/connections.php:400 ../../mod/connections.php:429
+#: ../../mod/connections.php:420 ../../mod/connections.php:449
 msgid "Approve this connection"
 msgstr "Approva questo contatto"
 
-#: ../../mod/connections.php:400
+#: ../../mod/connections.php:420
 msgid "Accept connection to allow communication"
-msgstr "Accetta il contatto per poter comunicare"
+msgstr "Entra in contatto per poter comunicare"
 
-#: ../../mod/connections.php:416
+#: ../../mod/connections.php:436
 msgid "Automatic Permissions Settings"
 msgstr "Permessi predefiniti"
 
-#: ../../mod/connections.php:416
+#: ../../mod/connections.php:436
 #, php-format
 msgid "Connections: settings for %s"
 msgstr "Contatti: impostazioni per %s"
 
-#: ../../mod/connections.php:420
+#: ../../mod/connections.php:440
 msgid ""
 "When receiving a channel introduction, any permissions provided here will be"
 " applied to the new connection automatically and the introduction approved. "
 "Leave this page if you do not wish to use this feature."
-msgstr "Quando ricevi una richiesta di amicizia da un canale, i permessi mostrati in questa pagina saranno applicati al nuovo contatto con l'approvazione della richiesta. Lascia questa pagina se non vuoi proseguire."
+msgstr "Hai ricevuto da un canale una richiesta di entrare in contatto, se prosegui la richiesta sarà approvata e saranno applicati i permessi mostrati. Lascia questa pagina se non vuoi proseguire."
 
-#: ../../mod/connections.php:422
+#: ../../mod/connections.php:442
 msgid "Slide to adjust your degree of friendship"
 msgstr "Trascina per restringere il grado di amicizia da mostrare"
 
-#: ../../mod/connections.php:428
+#: ../../mod/connections.php:448
 msgid "inherited"
 msgstr "derivato"
 
-#: ../../mod/connections.php:430
+#: ../../mod/connections.php:450
 msgid "Connection has no individual permissions!"
 msgstr "Non hai assegnato permessi individuali a questo contatto!"
 
-#: ../../mod/connections.php:431
+#: ../../mod/connections.php:451
 msgid ""
 "This may be appropriate based on your <a href=\"settings\">privacy "
 "settings</a>, though you may wish to review the \"Advanced Permissions\"."
 msgstr "Questo corrisponde alle tue <a href='settings'>impostazioni di privacy</a>, ma puoi anche dare un'occhiata ai 'Permessi avanzati' per opzioni più dettagliate."
 
-#: ../../mod/connections.php:433
+#: ../../mod/connections.php:453
 msgid "Profile Visibility"
 msgstr "Visibilità del profilo"
 
-#: ../../mod/connections.php:434
+#: ../../mod/connections.php:454
 #, php-format
 msgid ""
 "Please choose the profile you would like to display to %s when viewing your "
 "profile securely."
 msgstr "Seleziona il profilo che vuoi mostrare a %s quando visita il tuo profilo in modo sicuro."
 
-#: ../../mod/connections.php:435
+#: ../../mod/connections.php:455
 msgid "Contact Information / Notes"
 msgstr "Informazioni e annotazioni sul contatto"
 
-#: ../../mod/connections.php:436
+#: ../../mod/connections.php:456
 msgid "Edit contact notes"
 msgstr "Modifica le informazioni sul contatto"
 
-#: ../../mod/connections.php:438
+#: ../../mod/connections.php:458
 msgid "Their Settings"
 msgstr "Permessi concessi a te"
 
-#: ../../mod/connections.php:439
+#: ../../mod/connections.php:459
 msgid "My Settings"
 msgstr "I permessi che concedo"
 
-#: ../../mod/connections.php:441
+#: ../../mod/connections.php:461
 msgid "Forum Members"
 msgstr "Membro di un forum"
 
-#: ../../mod/connections.php:442
+#: ../../mod/connections.php:462
 msgid "Soapbox"
 msgstr "Comunicati e annunci"
 
-#: ../../mod/connections.php:443
+#: ../../mod/connections.php:463
 msgid "Full Sharing"
 msgstr "Condivisione totale"
 
-#: ../../mod/connections.php:444
+#: ../../mod/connections.php:464
 msgid "Cautious Sharing"
 msgstr "Condivisione prudente"
 
-#: ../../mod/connections.php:445
+#: ../../mod/connections.php:465
 msgid "Follow Only"
 msgstr "Follower"
 
-#: ../../mod/connections.php:446
+#: ../../mod/connections.php:466
 msgid "Individual Permissions"
 msgstr "Permessi individuali"
 
-#: ../../mod/connections.php:447
+#: ../../mod/connections.php:467
 msgid ""
-"Some permissions may be inherited from your <a href=\"settings\">privacy "
-"settings</a>, which have higher priority. Changing those on this page will "
-"have no effect."
-msgstr "Alcuni permessi possono derivano dalle <a href=\"settings\">impostazioni di privacy</a>, che hanno una priorità maggiore. Cambiarli in questa pagina non avrà alcun effetto."
+"Some permissions may be inherited from your channel <a "
+"href=\"settings\">privacy settings</a>, which have higher priority. Changing"
+" those inherited settings on this page will have no effect."
+msgstr "Alcuni permessi derivano dalle <a href=\"settings\">impostazioni di privacy</a>, che hanno una priorità maggiore. Cambiarli in questa pagina non avrà alcun effetto."
 
-#: ../../mod/connections.php:448
+#: ../../mod/connections.php:468
 msgid "Advanced Permissions"
 msgstr "Permessi avanzati"
 
-#: ../../mod/connections.php:449
+#: ../../mod/connections.php:469
 msgid "Quick Links"
 msgstr "Impostazioni veloci"
 
-#: ../../mod/connections.php:453
+#: ../../mod/connections.php:473
 #, php-format
 msgid "Visit %s's profile - %s"
 msgstr "Guarda il profilo di %s - %s"
 
-#: ../../mod/connections.php:454
+#: ../../mod/connections.php:474
 msgid "Block/Unblock contact"
 msgstr "Blocca/sblocca contatto"
 
-#: ../../mod/connections.php:455
+#: ../../mod/connections.php:475
 msgid "Ignore contact"
 msgstr "Ignora il contatto"
 
-#: ../../mod/connections.php:456
+#: ../../mod/connections.php:476
 msgid "Repair URL settings"
 msgstr "Ripara le impostazioni URL"
 
-#: ../../mod/connections.php:457
+#: ../../mod/connections.php:477
 msgid "View conversations"
 msgstr "Leggi le conversazioni"
 
-#: ../../mod/connections.php:459
+#: ../../mod/connections.php:479
 msgid "Delete contact"
 msgstr "Elimina contatto"
 
-#: ../../mod/connections.php:462
+#: ../../mod/connections.php:482
 msgid "Last update:"
 msgstr "Ultimo aggiornamento:"
 
-#: ../../mod/connections.php:464
+#: ../../mod/connections.php:484
 msgid "Update public posts"
 msgstr "Aggiorna gli articoli pubblici"
 
-#: ../../mod/connections.php:466
+#: ../../mod/connections.php:486
 msgid "Update now"
 msgstr "Aggiorna adesso"
 
-#: ../../mod/connections.php:472
+#: ../../mod/connections.php:492
 msgid "Currently blocked"
 msgstr "Attualmente bloccato"
 
-#: ../../mod/connections.php:473
+#: ../../mod/connections.php:493
 msgid "Currently ignored"
 msgstr "Attualmente ignorato"
 
-#: ../../mod/connections.php:474
+#: ../../mod/connections.php:494
 msgid "Currently archived"
 msgstr "Attualmente archiviato"
 
-#: ../../mod/connections.php:475
+#: ../../mod/connections.php:495
 msgid "Currently pending"
 msgstr "Attualmente da approvare"
 
-#: ../../mod/connections.php:476
+#: ../../mod/connections.php:496
 msgid ""
 "Replies/likes to your public posts <strong>may</strong> still be visible"
 msgstr "Le risposte ai tuoi articoli pubblici <strong>potrebbero</strong> restare comunque visibili"
 
-#: ../../mod/connections.php:512 ../../mod/connections.php:584
+#: ../../mod/connections.php:532 ../../mod/connections.php:604
 msgid "Blocked"
 msgstr "Bloccati"
 
-#: ../../mod/connections.php:517 ../../mod/connections.php:591
+#: ../../mod/connections.php:537 ../../mod/connections.php:611
 msgid "Ignored"
 msgstr "Ignorati"
 
-#: ../../mod/connections.php:522 ../../mod/connections.php:605
+#: ../../mod/connections.php:542 ../../mod/connections.php:625
 msgid "Hidden"
 msgstr "Nascosti"
 
-#: ../../mod/connections.php:527 ../../mod/connections.php:598
+#: ../../mod/connections.php:547 ../../mod/connections.php:618
 msgid "Archived"
 msgstr "Archiviati"
 
-#: ../../mod/connections.php:538
+#: ../../mod/connections.php:558
 msgid "All"
 msgstr "Tutti"
 
-#: ../../mod/connections.php:559
+#: ../../mod/connections.php:579
 msgid "Suggestions"
 msgstr "Suggerimenti"
 
-#: ../../mod/connections.php:562
+#: ../../mod/connections.php:582
 msgid "Suggest new connections"
 msgstr "Suggerisci nuovi contatti"
 
-#: ../../mod/connections.php:568
+#: ../../mod/connections.php:588
 msgid "Show pending (new) connections"
-msgstr "Richieste di amicizia in attesa"
+msgstr "Richieste per entrare in contatto"
 
-#: ../../mod/connections.php:571
+#: ../../mod/connections.php:591
 msgid "All Connections"
 msgstr "Tutti i contatti"
 
-#: ../../mod/connections.php:574
+#: ../../mod/connections.php:594
 msgid "Show all connections"
 msgstr "Mostra tutti i contatti"
 
-#: ../../mod/connections.php:577
+#: ../../mod/connections.php:597
 msgid "Unblocked"
 msgstr "Non bloccati"
 
-#: ../../mod/connections.php:580
+#: ../../mod/connections.php:600
 msgid "Only show unblocked connections"
 msgstr "Mostra solo i contatti non bloccati"
 
-#: ../../mod/connections.php:587
+#: ../../mod/connections.php:607
 msgid "Only show blocked connections"
 msgstr "Mostra solo i contatti bloccati"
 
-#: ../../mod/connections.php:594
+#: ../../mod/connections.php:614
 msgid "Only show ignored connections"
 msgstr "Mostra solo i contatti ignorati"
 
-#: ../../mod/connections.php:601
+#: ../../mod/connections.php:621
 msgid "Only show archived connections"
 msgstr "Mostra solo i contatti archiviati"
 
-#: ../../mod/connections.php:608
+#: ../../mod/connections.php:628
 msgid "Only show hidden connections"
 msgstr "Mostra solo i contatti nascosti"
 
-#: ../../mod/connections.php:650
+#: ../../mod/connections.php:670
 #, php-format
 msgid "%1$s [%2$s]"
 msgstr "%1$s [%2$s]"
 
-#: ../../mod/connections.php:651 ../../mod/nogroup.php:41
+#: ../../mod/connections.php:671 ../../mod/nogroup.php:41
 msgid "Edit contact"
 msgstr "Modifica il contatto"
 
-#: ../../mod/connections.php:675
+#: ../../mod/connections.php:695
 msgid "Search your connections"
 msgstr "Cerca tra i contatti"
 
-#: ../../mod/connections.php:676
+#: ../../mod/connections.php:696
 msgid "Finding: "
 msgstr "Ricerca: "
 
@@ -5923,23 +5916,23 @@ msgstr "Età:"
 msgid "Edit/Manage Profiles"
 msgstr "Modifica/gestisci i profili"
 
-#: ../../mod/profiles.php:624 ../../boot.php:1759
+#: ../../mod/profiles.php:624 ../../boot.php:1755
 msgid "Change profile photo"
 msgstr "Cambia la foto del profilo"
 
-#: ../../mod/profiles.php:625 ../../boot.php:1766
+#: ../../mod/profiles.php:625 ../../boot.php:1762
 msgid "Create New Profile"
 msgstr "Crea un nuovo profilo"
 
-#: ../../mod/profiles.php:636 ../../boot.php:1780
+#: ../../mod/profiles.php:636 ../../boot.php:1776
 msgid "Profile Image"
 msgstr "Immagine del profilo"
 
-#: ../../mod/profiles.php:639 ../../boot.php:1783
+#: ../../mod/profiles.php:639 ../../boot.php:1779
 msgid "visible to everybody"
 msgstr "visibile a tutti"
 
-#: ../../mod/profiles.php:640 ../../boot.php:1784
+#: ../../mod/profiles.php:640 ../../boot.php:1780
 msgid "Edit visibility"
 msgstr "Cambia la visibilità"
 
@@ -6017,7 +6010,7 @@ msgid ""
 "Password reset failed."
 msgstr "La richiesta non può essere verificata (potresti averla già usata precedentemente). La password non può essere reimpostata."
 
-#: ../../mod/lostpass.php:85 ../../boot.php:1473
+#: ../../mod/lostpass.php:85 ../../boot.php:1469
 msgid "Password Reset"
 msgstr "Reimposta la password"
 
@@ -6448,7 +6441,7 @@ msgstr "Fan/Ammiratore"
 
 #: ../../mod/notifications.php:194
 msgid "Friend/Connect Request"
-msgstr "Richiesta di amicizia"
+msgstr "Richiesta per entrare in contatto"
 
 #: ../../mod/notifications.php:194
 msgid "New Follower"
@@ -6559,7 +6552,7 @@ msgstr "Scegli cosa vuoi inviare al destinatario"
 msgid "Make this post private"
 msgstr "Rendi privato questo articolo"
 
-#: ../../mod/wall_upload.php:41 ../../mod/item.php:1057
+#: ../../mod/wall_upload.php:41 ../../mod/item.php:1074
 msgid "Wall Photos"
 msgstr "Foto della bacheca"
 
@@ -6624,28 +6617,28 @@ msgstr "Visibile a"
 msgid "All Contacts (with secure profile access)"
 msgstr "Tutti i contatti (con accesso fidato al profilo)"
 
-#: ../../mod/item.php:136
+#: ../../mod/item.php:144
 msgid "Unable to locate original post."
 msgstr "Impossibile trovare il messaggio originale."
 
-#: ../../mod/item.php:321
+#: ../../mod/item.php:341
 msgid "Empty post discarded."
 msgstr "L'articolo vuoto è stato ignorato."
 
-#: ../../mod/item.php:363
+#: ../../mod/item.php:383
 msgid "Executable content type not permitted to this channel."
 msgstr "I contenuti eseguibili non sono permessi su questo canale."
 
-#: ../../mod/item.php:772
+#: ../../mod/item.php:793
 msgid "System error. Post not saved."
 msgstr "Errore di sistema. Articolo non salvato."
 
-#: ../../mod/item.php:1136
+#: ../../mod/item.php:1153
 #, php-format
 msgid "You have reached your limit of %1$.0f top level posts."
 msgstr "Hai raggiunto il limite massimo di %1$.0f articoli sulla pagina principale."
 
-#: ../../mod/item.php:1142
+#: ../../mod/item.php:1159
 #, php-format
 msgid "You have reached your limit of %1$.0f webpages."
 msgstr "Hai raggiunto il limite massimo di %1$.0f pagine web."
@@ -6728,70 +6721,70 @@ msgstr "Tipo di accesso"
 msgid "Registration Policy"
 msgstr "Politica di registrazione"
 
-#: ../../mod/register.php:35
+#: ../../mod/register.php:43
 msgid "Maximum daily site registrations exceeded. Please try again tomorrow."
 msgstr "È stato superato il numero massimo giornaliero di registrazioni a questo sito. Riprova domani!"
 
-#: ../../mod/register.php:41
+#: ../../mod/register.php:49
 msgid ""
 "Please indicate acceptance of the Terms of Service. Registration failed."
 msgstr "Impossibile proseguire. Devi prima accettare le Condizioni d'Uso del servizio."
 
-#: ../../mod/register.php:69
+#: ../../mod/register.php:77
 msgid "Passwords do not match."
 msgstr "Le password non corrispondono."
 
-#: ../../mod/register.php:97
+#: ../../mod/register.php:105
 msgid ""
 "Registration successful. Please check your email for validation "
 "instructions."
 msgstr "La registrazione è terminata correttamente. Per continuare controlla l'email che ti è stata inviata."
 
-#: ../../mod/register.php:103
+#: ../../mod/register.php:111
 msgid "Your registration is pending approval by the site owner."
 msgstr "La tua richiesta è in attesa di approvazione da parte dell'amministratore del sito."
 
-#: ../../mod/register.php:106
+#: ../../mod/register.php:114
 msgid "Your registration can not be processed."
 msgstr "La tua registrazione non puo' essere acquisita."
 
-#: ../../mod/register.php:141
+#: ../../mod/register.php:149
 msgid ""
 "This site has exceeded the number of allowed daily account registrations. "
 "Please try again tomorrow."
 msgstr "Questo sito ha superato il numero di registrazioni giornaliere consentite. Prova di nuovo domani."
 
-#: ../../mod/register.php:152
+#: ../../mod/register.php:160
 msgid "Terms of Service"
 msgstr "Condizioni d'Uso"
 
-#: ../../mod/register.php:158
+#: ../../mod/register.php:166
 #, php-format
 msgid "I accept the %s for this website"
 msgstr "Accetto le %s di questo sito"
 
-#: ../../mod/register.php:160
+#: ../../mod/register.php:168
 #, php-format
 msgid "I am over 13 years of age and accept the %s for this website"
 msgstr "Ho più di 13 anni e accetto le %s di questo sito"
 
-#: ../../mod/register.php:175
+#: ../../mod/register.php:183
 msgid "Membership on this site is by invitation only."
 msgstr "Per registrarsi su questo sito è necessario un invito."
 
-#: ../../mod/register.php:176
+#: ../../mod/register.php:184
 msgid "Please enter your invitation code"
 msgstr "Inserisci il codice dell'invito"
 
-#: ../../mod/register.php:179
+#: ../../mod/register.php:187
 msgid "Your email address"
 msgstr "Il tuo indirizzo email"
 
-#: ../../mod/register.php:180
+#: ../../mod/register.php:188
 msgid "Choose a password"
 msgstr "Scegli una password"
 
-#: ../../mod/register.php:181
+#: ../../mod/register.php:189
 msgid "Please re-enter your password"
 msgstr "Ripeti la password per verifica"
 
@@ -6799,13 +6792,13 @@ msgstr "Ripeti la password per verifica"
 msgid "Please login."
 msgstr "Accedi."
 
-#: ../../mod/post.php:114
+#: ../../mod/post.php:119
 msgid ""
 "Remote authentication blocked. You are logged into this site locally. Please"
 " logout and retry."
 msgstr "L'autenticazione remota non è disponibile. Hai accesso solamente a questo sito. Puoi provare ad uscire per tentare di nuovo."
 
-#: ../../mod/post.php:127
+#: ../../mod/post.php:132
 #, php-format
 msgid "Welcome %s. Remote authentication successful."
 msgstr "Ciao %s. La tua autenticazione da remoto è avvenuta con successo."
@@ -6866,94 +6859,108 @@ msgstr "Umore"
 msgid "Set your current mood and tell your friends"
 msgstr "Scegli il tuo umore attuale per mostrarlo agli amici"
 
-#: ../../view/theme/redbasic/php/config.php:68
+#: ../../view/theme/redbasic/php/config.php:74
 msgid "Scheme Default"
 msgstr "Schema predefinito"
 
-#: ../../view/theme/redbasic/php/config.php:69
+#: ../../view/theme/redbasic/php/config.php:75
 msgid "red"
 msgstr "rosso"
 
-#: ../../view/theme/redbasic/php/config.php:70
+#: ../../view/theme/redbasic/php/config.php:76
 msgid "black"
 msgstr "nero"
 
-#: ../../view/theme/redbasic/php/config.php:71
+#: ../../view/theme/redbasic/php/config.php:77
 msgid "silver"
 msgstr "argento"
 
-#: ../../view/theme/redbasic/php/config.php:82
+#: ../../view/theme/redbasic/php/config.php:88
 #: ../../view/theme/apw/php/config.php:234
+#: ../../view/theme/blogga/view/theme/blog/config.php:69
+#: ../../view/theme/blogga/php/config.php:69
 msgid "Theme settings"
 msgstr "Impostazioni del tema"
 
-#: ../../view/theme/redbasic/php/config.php:83
+#: ../../view/theme/redbasic/php/config.php:89
 #: ../../view/theme/apw/php/config.php:235
 msgid "Set scheme"
 msgstr "Schema"
 
-#: ../../view/theme/redbasic/php/config.php:84
+#: ../../view/theme/redbasic/php/config.php:90
 msgid "Navigation bar colour"
 msgstr "Colore della barra di navigazione"
 
-#: ../../view/theme/redbasic/php/config.php:85
+#: ../../view/theme/redbasic/php/config.php:91
 msgid "Set font-colour for banner"
 msgstr "Colore del font del banner"
 
-#: ../../view/theme/redbasic/php/config.php:86
+#: ../../view/theme/redbasic/php/config.php:92
 msgid "Set the background colour"
 msgstr "Colore di sfondo"
 
-#: ../../view/theme/redbasic/php/config.php:87
+#: ../../view/theme/redbasic/php/config.php:93
 msgid "Set the background image"
 msgstr "Immagine di sfondo"
 
-#: ../../view/theme/redbasic/php/config.php:88
+#: ../../view/theme/redbasic/php/config.php:94
 msgid "Set the background colour of items"
 msgstr "Colore di sfondo degli elementi della pagina"
 
-#: ../../view/theme/redbasic/php/config.php:89
+#: ../../view/theme/redbasic/php/config.php:95
 msgid "Set the opacity of items"
 msgstr "Opacità degli oggetti"
 
-#: ../../view/theme/redbasic/php/config.php:90
+#: ../../view/theme/redbasic/php/config.php:96
 msgid "Set the basic colour for item icons"
 msgstr "Colore di base per le icone"
 
-#: ../../view/theme/redbasic/php/config.php:91
+#: ../../view/theme/redbasic/php/config.php:97
 msgid "Set the hover colour for item icons"
 msgstr "Colore per le icone in evidenza"
 
-#: ../../view/theme/redbasic/php/config.php:92
+#: ../../view/theme/redbasic/php/config.php:98
+msgid "Set font-size for the entire application"
+msgstr "Dimensione font per tutto il sito"
+
+#: ../../view/theme/redbasic/php/config.php:99
 #: ../../view/theme/apw/php/config.php:236
 msgid "Set font-size for posts and comments"
 msgstr "Dimensioni del carattere per articoli e commenti"
 
-#: ../../view/theme/redbasic/php/config.php:93
+#: ../../view/theme/redbasic/php/config.php:100
 msgid "Set font-colour for posts and comments"
 msgstr "Colore del carattere per articoli e commenti"
 
-#: ../../view/theme/redbasic/php/config.php:94
+#: ../../view/theme/redbasic/php/config.php:101
 msgid "Set radius of corners"
 msgstr "Raggio degli angoli stondati"
 
-#: ../../view/theme/redbasic/php/config.php:95
+#: ../../view/theme/redbasic/php/config.php:102
 msgid "Set shadow depth of photos"
 msgstr "Profondità dell'ombra delle foto"
 
-#: ../../view/theme/redbasic/php/config.php:96
+#: ../../view/theme/redbasic/php/config.php:103
 msgid "Set maximum width of conversation regions"
 msgstr "Larghezza massima delle aree delle conversazioni"
 
-#: ../../view/theme/redbasic/php/config.php:97
+#: ../../view/theme/redbasic/php/config.php:104
 msgid "Set minimum opacity of nav bar - to hide it"
 msgstr "Imposta l'opacità minima della barra di navigazione per nasconderla"
 
-#: ../../view/theme/redbasic/php/config.php:98
+#: ../../view/theme/redbasic/php/config.php:105
+msgid "Set size of conversation author photo"
+msgstr "Dimensione foto dell'autore della conversazione"
+
+#: ../../view/theme/redbasic/php/config.php:106
+msgid "Set size of followup author photos"
+msgstr "Dimensione foto dei partecipanti alla conversazione"
+
+#: ../../view/theme/redbasic/php/config.php:107
 msgid "Sloppy photo albums"
-msgstr "Album fotografici semplificati"
+msgstr "Album con foto storte"
 
-#: ../../view/theme/redbasic/php/config.php:98
+#: ../../view/theme/redbasic/php/config.php:107
 msgid "Are you a clean desk or a messy desk person?"
 msgstr "La tua scrivania è sempre a posto? Sei una persona disordinata?"
 
@@ -7082,113 +7089,128 @@ msgstr "Spazio a sinistra del aside"
 msgid "Right offset of the aside element"
 msgstr "Spazio a destra del aside"
 
-#: ../../boot.php:1278
+#: ../../view/theme/blogga/view/theme/blog/config.php:47
+#: ../../view/theme/blogga/php/config.php:47
+msgid "None"
+msgstr "Nessuno"
+
+#: ../../view/theme/blogga/view/theme/blog/config.php:70
+#: ../../view/theme/blogga/php/config.php:70
+msgid "Header image"
+msgstr "Immagine dell'intestazione"
+
+#: ../../view/theme/blogga/view/theme/blog/config.php:71
+#: ../../view/theme/blogga/php/config.php:71
+msgid "Header image only on profile pages"
+msgstr "È possibile mettere un'immagine solo nell'intestazione dei profili"
+
+#: ../../boot.php:1274
 #, php-format
 msgid "Update %s failed. See error logs."
 msgstr "%s: aggiornamento fallito. Controlla i log di errore."
 
-#: ../../boot.php:1281
+#: ../../boot.php:1277
 #, php-format
 msgid "Update Error at %s"
 msgstr "Errore di aggiornamento su %s"
 
-#: ../../boot.php:1438
+#: ../../boot.php:1434
 msgid ""
 "Create an account to access services and applications within the Red Matrix"
 msgstr "Registrati per accedere ai servizi e alle applicazioni di Red Matrix"
 
-#: ../../boot.php:1466
+#: ../../boot.php:1462
 msgid "Password"
 msgstr "Password"
 
-#: ../../boot.php:1467
+#: ../../boot.php:1463
 msgid "Remember me"
 msgstr "Resta connesso"
 
-#: ../../boot.php:1472
+#: ../../boot.php:1468
 msgid "Forgot your password?"
 msgstr "Hai dimenticato la password?"
 
-#: ../../boot.php:1537
+#: ../../boot.php:1533
 msgid "permission denied"
 msgstr "permesso negato"
 
-#: ../../boot.php:1538
+#: ../../boot.php:1534
 msgid "Got Zot?"
 msgstr "Hai Zot?"
 
-#: ../../boot.php:1597
+#: ../../boot.php:1593
 msgid "Requested channel is not available."
 msgstr "Il canale che cerchi non è disponibile."
 
-#: ../../boot.php:1609
+#: ../../boot.php:1605
 msgid " Sorry, you don't have the permission to view this profile. "
 msgstr "Purtroppo non hai il permesso di vedere questo profilo."
 
-#: ../../boot.php:1765
+#: ../../boot.php:1761
 msgid "Profiles"
 msgstr "Profili"
 
-#: ../../boot.php:1765
+#: ../../boot.php:1761
 msgid "Manage/edit profiles"
 msgstr "Gestisci/modifica i profili"
 
-#: ../../boot.php:1769
+#: ../../boot.php:1765
 msgid "Edit Profile"
 msgstr "Modifica il profilo"
 
-#: ../../boot.php:1863 ../../boot.php:1943
+#: ../../boot.php:1859 ../../boot.php:1939
 msgid "F d"
 msgstr "d F"
 
-#: ../../boot.php:1920
+#: ../../boot.php:1916
 msgid "Birthday Reminders"
 msgstr "Promemoria compleanni"
 
-#: ../../boot.php:1921
+#: ../../boot.php:1917
 msgid "Birthdays this week:"
 msgstr "Compleanni questa settimana:"
 
-#: ../../boot.php:1976
+#: ../../boot.php:1972
 msgid "[No description]"
 msgstr "[Nessuna descrizione]"
 
-#: ../../boot.php:1994
+#: ../../boot.php:1990
 msgid "Event Reminders"
 msgstr "Promemoria"
 
-#: ../../boot.php:1995
+#: ../../boot.php:1991
 msgid "Events this week:"
 msgstr "Eventi di questa settimana:"
 
-#: ../../boot.php:2229
+#: ../../boot.php:2225
 msgid "Channel"
 msgstr "Canale"
 
-#: ../../boot.php:2232
+#: ../../boot.php:2228
 msgid "Status Messages and Posts"
 msgstr "Articoli e messaggi di stato"
 
-#: ../../boot.php:2236
+#: ../../boot.php:2232
 msgid "About"
 msgstr "Informazioni"
 
-#: ../../boot.php:2239
+#: ../../boot.php:2235
 msgid "Profile Details"
 msgstr "Dettagli del profilo"
 
-#: ../../boot.php:2257
+#: ../../boot.php:2253
 msgid "Events and Calendar"
 msgstr "Calendario eventi"
 
-#: ../../boot.php:2262
+#: ../../boot.php:2258
 msgid "Webpages"
 msgstr "Pagine web"
 
-#: ../../boot.php:2265
+#: ../../boot.php:2261
 msgid "Manage Webpages"
 msgstr "Gestisci le pagine web"
 
-#: ../../boot.php:2547
+#: ../../boot.php:2546
 msgid "toggle mobile"
 msgstr "attiva/disattiva versione mobile"
diff --git a/view/it/strings.php b/view/it/strings.php
index 5c71824db..7068289b1 100644
--- a/view/it/strings.php
+++ b/view/it/strings.php
@@ -12,42 +12,42 @@ $a->strings["public profile"] = "profilo pubblico";
 $a->strings["%1\$s changed %2\$s to &ldquo;%3\$s&rdquo;"] = "%1\$s ha cambiato %2\$s in &ldquo;%3\$s&rdquo;";
 $a->strings["Visit %1\$s's %2\$s"] = "Guarda %2\$s di %1\$s ";
 $a->strings["%1\$s has an updated %2\$s, changing %3\$s."] = "%1\$s ha aggiornato %2\$s cambiando %3\$s.";
-$a->strings["Public Timeline"] = "Diario pubblico";
 $a->strings["Red Matrix Notification"] = "Notifica di Red Matrix";
+$a->strings["redmatrix"] = "redmatrix";
 $a->strings["Thank You,"] = "Grazie,";
 $a->strings["%s Administrator"] = "Amministratore %s";
 $a->strings["%s <!item_type!>"] = "%s <!item_type!>";
 $a->strings["[Red:Notify] New mail received at %s"] = "[Red:Notifica] Nuovo messaggio ricevuto alle %s";
-$a->strings["%1\$s sent you a new private message at %2\$s."] = "%1\$s ti ha mandato un messaggio privato alle %2\$s.";
+$a->strings["%1\$s, %2\$s sent you a new private message at %3\$s."] = "%1\$s, %2\$s  ti ha mandato un messaggio privato alle %3\$s.";
 $a->strings["%1\$s sent you %2\$s."] = "%1\$s ti ha mandato %2\$s.";
 $a->strings["a private message"] = "un messaggio privato";
 $a->strings["Please visit %s to view and/or reply to your private messages."] = "Visita %s per leggere i tuoi messaggi privati e rispondere.";
-$a->strings["%1\$s commented on [zrl=%2\$s]a %3\$s[/zrl]"] = "%1\$s ha commentato [zrl=%2\$s]%3\$s[/zrl]";
-$a->strings["%1\$s commented on [zrl=%2\$s]%3\$s's %4\$s[/zrl]"] = "%1\$s ha commentato [zrl=%2\$s]%4\$s di %3\$s[/zrl]";
-$a->strings["%1\$s commented on [zrl=%2\$s]your %3\$s[/zrl]"] = "%1\$s ha commentato [zrl=%2\$s]%3\$s[/zrl] che hai creato";
+$a->strings["%1\$s, %2\$s commented on [zrl=%3\$s]a %4\$s[/zrl]"] = "%1\$s, %2\$s ha commentato [zrl=%3\$s]%4\$s[/zrl]";
+$a->strings["%1\$s, %2\$s commented on [zrl=%3\$s]%4\$s's %5\$s[/zrl]"] = "%1\$s, %2\$s ha commentato [zrl=%3\$s]%5\$s di %4\$s[/zrl]";
+$a->strings["%1\$s, %2\$s commented on [zrl=%3\$s]your %4\$s[/zrl]"] = "%1\$s, %2\$s ha commentato [zrl=%3\$s]%4\$s che hai creato[/zrl]";
 $a->strings["[Red:Notify] Comment to conversation #%1\$d by %2\$s"] = "[Red:Notifica] Nuovo commento di %2\$s alla conversazione #%1\$d";
-$a->strings["%s commented on an item/conversation you have been following."] = "%s ha commentato una conversazione che stai seguendo.";
+$a->strings["%1\$s, %2\$s commented on an item/conversation you have been following."] = "%1\$s, %2\$s ha commentato un elemento che stavi seguendo.";
 $a->strings["Please visit %s to view and/or reply to the conversation."] = "Visita %s per leggere o commentare la conversazione.";
 $a->strings["[Red:Notify] %s posted to your profile wall"] = "[Red:Notifica] %s ha scritto sulla tua bacheca";
-$a->strings["%1\$s posted to your profile wall at %2\$s"] = "%1\$s ha scritto sulla tua bacheca alle %2\$s";
-$a->strings["%1\$s posted to [zrl=%2\$s]your wall[/zrl]"] = "%1\$s ha scritto sulla [zrl=%2\$s]tua bacheca[/zrl]";
+$a->strings["%1\$s, %2\$s posted to your profile wall at %3\$s"] = "%1\$s, %2\$s ha scritto sulla bacheca del tuo profilo alle %3\$s";
+$a->strings["%1\$s, %2\$s posted to [zrl=%3\$s]your wall[/zrl]"] = "%1\$s, %2\$s ha scritto sulla [zrl=%3\$s]tua bacheca[/zrl]";
 $a->strings["[Red:Notify] %s tagged you"] = "[Red:Notifica] %s ti ha taggato";
-$a->strings["%1\$s tagged you at %2\$s"] = "%1\$s ti ha taggato alle %2\$s";
-$a->strings["%1\$s [zrl=%2\$s]tagged you[/zrl]."] = "%1\$s [zrl=%2\$s]ti ha taggato[/zrl].";
+$a->strings["%1\$s, %2\$s tagged you at %3\$s"] = "%1\$s, %2\$s ti ha taggato alle %3\$s";
+$a->strings["%1\$s, %2\$s [zrl=%3\$s]tagged you[/zrl]."] = "%1\$s, %2\$s [zrl=%3\$s]ti ha taggato[/zrl].";
 $a->strings["[Red:Notify] %1\$s poked you"] = "[Red:Notifica] %1\$s ti ha mandato un poke";
-$a->strings["%1\$s poked you at %2\$s"] = "%1\$s ti ha mandato un poke alle %2\$s";
-$a->strings["%1\$s [zrl=%2\$s]poked you[/zrl]."] = "%1\$s [zrl=%2\$s]ti ha mandato un poke[/zrl].";
+$a->strings["%1\$s, %2\$s poked you at %3\$s"] = "%1\$s, %2\$s ti ha mandato un poke alle %3\$s";
+$a->strings["%1\$s, %2\$s [zrl=%2\$s]poked you[/zrl]."] = "%1\$s, %2\$s [zrl=%2\$s]ti ha mandato un poke[/zrl].";
 $a->strings["[Red:Notify] %s tagged your post"] = "[Red:Notifica] %s ha taggato il tuo articolo";
-$a->strings["%1\$s tagged your post at %2\$s"] = "%1\$s ha taggato il tuo articolo alle %2\$s";
-$a->strings["%1\$s tagged [zrl=%2\$s]your post[/zrl]"] = "%1\$s ha taggato [zrl=%2\$s]il tuo articolo[/zrl]";
+$a->strings["%1\$s, %2\$s tagged your post at %3\$s"] = "%1\$s, %2\$s ha taggato il tuo articolo alle %3\$s";
+$a->strings["%1\$s, %2\$s tagged [zrl=%3\$s]your post[/zrl]"] = "%1\$s, %2\$s ha taggato [zrl=%3\$s]il tuo articolo[/zrl]";
 $a->strings["[Red:Notify] Introduction received"] = "[Red:Notifica] Hai una richiesta di amicizia";
-$a->strings["You've received an introduction from '%1\$s' at %2\$s"] = "Hai ricevuto una richiesta di amicizia da '%1\$s' alle %2\$s";
-$a->strings["You've received [zrl=%1\$s]an introduction[/zrl] from %2\$s."] = "Hai ricevuto [zrl=%1\$s]una richiesta di amicizia[/zrl] da %2\$s.";
+$a->strings["%1\$s, you've received an introduction from '%2\$s' at %3\$s"] = "%1\$s, hai ricevuto una richiesta di contatto da '%2\$s' alle %3\$s";
+$a->strings["%1\$s, you've received [zrl=%2\$s]an introduction[/zrl] from %3\$s."] = "%1\$s, hai ricevuto [zrl=%2\$s]una richiesta di amicizia[/zrl] da %3\$s.";
 $a->strings["You may visit their profile at %s"] = "Puoi visitare il suo profilo su %s";
 $a->strings["Please visit %s to approve or reject the introduction."] = "Visita %s per approvare o rifiutare la richiesta.";
 $a->strings["[Red:Notify] Friend suggestion received"] = "[Red:Notifica] Ti è stato suggerito un amico";
-$a->strings["You've received a friend suggestion from '%1\$s' at %2\$s"] = "Ti è stato suggerito un amico da '%1\$s' alle %2\$s";
-$a->strings["You've received [zrl=%1\$s]a friend suggestion[/zrl] for %2\$s from %3\$s."] = "%3\$s ti ha [zrl=%1\$s]suggerito %2\$s[/zrl] come amico.";
+$a->strings["%1\$s, you've received a friend suggestion from '%2\$s' at %3\$s"] = "%1\$s, ti è stato suggerito un amico da '%2\$s' alle %3\$s";
+$a->strings["%1\$s, you've received [zrl=%2\$s]a friend suggestion[/zrl] for %3\$s from %4\$s."] = "%1\$s, %4\$s ti [zrl=%2\$s]ha suggerito %3\$s[/zrl] come amico.";
 $a->strings["Name:"] = "Nome:";
 $a->strings["Photo:"] = "Foto:";
 $a->strings["Please visit %s to approve or reject the suggestion."] = "Visita %s per approvare o rifiutare il suggerimento.";
@@ -94,7 +94,7 @@ $a->strings["Link"] = "Link";
 $a->strings["Video"] = "Video";
 $a->strings["Preview"] = "Anteprima";
 $a->strings["Encrypt text"] = "Crittografia del testo";
-$a->strings["Connect"] = "Connetti";
+$a->strings["Connect"] = "Entra in contatto/segui";
 $a->strings["New window"] = "Nuova finestra";
 $a->strings["Open the selected location in a different window or browser tab"] = "Apri l'indirizzo selezionato in una nuova scheda o finestra";
 $a->strings["Poke"] = "Poke";
@@ -187,8 +187,6 @@ $a->strings["Enable tab to display all new Network activity"] = "Abilita il link
 $a->strings["Affinity Tool"] = "Filtro per affinità";
 $a->strings["Filter stream activity by depth of relationships"] = "Permette di selezionare i contenuti in base al livello di amicizia";
 $a->strings["Post/Comment Tools"] = "Gestione articoli e commenti";
-$a->strings["Multiple Deletion"] = "Eliminazione multipla";
-$a->strings["Select and delete multiple posts/comments at once"] = "Rendi possibile l'eliminazione di molti articoli o commenti con un solo comando";
 $a->strings["Edit Sent Posts"] = "Modifica gli articoli già inviati";
 $a->strings["Edit and correct posts and comments after sending"] = "Modifica e correggi gli articoli o i commenti anche dopo l'invio";
 $a->strings["Tagging"] = "Tag";
@@ -353,6 +351,7 @@ $a->strings["Blocks"] = "Riquadri";
 $a->strings["Menus"] = "Menù";
 $a->strings["Layouts"] = "Layout";
 $a->strings["Pages"] = "Pagine";
+$a->strings["Public Timeline"] = "Diario pubblico";
 $a->strings["Unable to obtain identity information from database"] = "Impossibile ottenere le informazioni di identificazione dal database";
 $a->strings["Empty name"] = "Nome vuoto";
 $a->strings["Name too long"] = "Nome troppo lungo";
@@ -524,6 +523,70 @@ $a->strings["your registration password"] = "la password di registrazione";
 $a->strings["Registration details for %s"] = "Dettagli della registrazione di %s";
 $a->strings["Account approved."] = "Account approvato.";
 $a->strings["Registration revoked for %s"] = "Registrazione revocata per %s";
+$a->strings["channel"] = "canale";
+$a->strings["%1\$s likes %2\$s's %3\$s"] = "A %1\$s piace %3\$s di %2\$s";
+$a->strings["%1\$s doesn't like %2\$s's %3\$s"] = "A %1\$s non piace %3\$s di %2\$s";
+$a->strings["%1\$s is now connected with %2\$s"] = "%1\$s adesso è connesso con %2\$s";
+$a->strings["%1\$s poked %2\$s"] = "%1\$s ha mandato un poke a %2\$s";
+$a->strings["%1\$s is currently %2\$s"] = "%1\$s al momento è %2\$s";
+$a->strings["View %s's profile @ %s"] = "Vedi il profilo di %s @ %s";
+$a->strings["Categories:"] = "Categorie:";
+$a->strings["Filed under:"] = "Classificato come:";
+$a->strings["View in context"] = "Vedi nel contesto";
+$a->strings["remove"] = "rimuovi";
+$a->strings["Loading..."] = "Caricamento in corso...";
+$a->strings["Delete Selected Items"] = "Elimina gli oggetti selezionati";
+$a->strings["View Source"] = "Vedi il sorgente";
+$a->strings["Follow Thread"] = "Segui la discussione";
+$a->strings["Matrix Activity"] = "Attività nella tua rete";
+$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."] = array(
+	0 => "",
+	1 => "Piace a <span %1\$s>%2\$d persone</span>.",
+);
+$a->strings["<span  %1\$s>%2\$d people</span> don't like this."] = array(
+	0 => "",
+	1 => "Non piace a <span %1\$s>%2\$d persone</span>.",
+);
+$a->strings["and"] = "e";
+$a->strings[", and %d other people"] = array(
+	0 => "",
+	1 => "e altre %d persone",
+);
+$a->strings["%s like this."] = "Piace a %s.";
+$a->strings["%s don't like this."] = "Non piace a %s.";
+$a->strings["Visible to <strong>everybody</strong>"] = "Visibile a <strong>tutti</strong>";
+$a->strings["Please enter a link URL:"] = "Inserisci l'indirizzo del link:";
+$a->strings["Please enter a video link/URL:"] = "Inserisci l'indirizzo del video:";
+$a->strings["Please enter an audio link/URL:"] = "Inserisci l'indirizzo dell'audio:";
+$a->strings["Tag term:"] = "Tag:";
+$a->strings["Save to Folder:"] = "Salva nella cartella:";
+$a->strings["Where are you right now?"] = "Dove sei ora?";
+$a->strings["Expires YYYY-MM-DD HH:MM"] = "Scadenza il AAAA-MM-GG OO:MM";
+$a->strings["Share"] = "Condividi";
+$a->strings["Page link title"] = "Link del titolo";
+$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 un indirizzo web";
+$a->strings["web link"] = "link web";
+$a->strings["Insert video link"] = "Inserisci l'indirizzo di un video";
+$a->strings["video link"] = "link video";
+$a->strings["Insert audio link"] = "Inserisci l'indirizzo di un audio";
+$a->strings["audio link"] = "link audio";
+$a->strings["Set your location"] = "La tua località";
+$a->strings["set location"] = "la tua località";
+$a->strings["Clear browser location"] = "Rimuovi la località data dal browser";
+$a->strings["clear location"] = "rimuovi la località";
+$a->strings["Set title"] = "Scegli un titolo";
+$a->strings["Categories (comma-separated list)"] = "Categorie (separate da virgola)";
+$a->strings["Permission settings"] = "Impostazioni permessi";
+$a->strings["permissions"] = "permessi";
+$a->strings["Public post"] = "Articolo pubblico";
+$a->strings["Example: bob@example.com, mary@example.com"] = "Per esempio: mario@esempio.com, simona@esempio.com";
+$a->strings["Set expiration date"] = "Data di scadenza";
 $a->strings["Logged out."] = "Uscita effettuata.";
 $a->strings["Failed authentication"] = "Autenticazione fallita";
 $a->strings["Login failed."] = "Accesso fallito.";
@@ -537,7 +600,7 @@ $a->strings["%d invitation available"] = array(
 );
 $a->strings["Find Channels"] = "Ricerca canali";
 $a->strings["Enter name or interest"] = "Scrivi un nome o un interesse";
-$a->strings["Connect/Follow"] = "Segui";
+$a->strings["Connect/Follow"] = "Entra in contatto/segui";
 $a->strings["Examples: Robert Morgenstein, Fishing"] = "Per esempio: Mario Rossi, Pesca";
 $a->strings["Find"] = "Cerca";
 $a->strings["Channel Suggestions"] = "Canali suggeriti";
@@ -590,61 +653,6 @@ $a->strings["Click here to upgrade."] = "Clicca qui per aggiornare.";
 $a->strings["This action exceeds the limits set by your subscription plan."] = "Questa operazione esce dai termini del tuo abbonamento.";
 $a->strings["This action is not available under your subscription plan."] = "Questa operazione non è prevista dal tuo abbonamento.";
 $a->strings["Default"] = "Predefinito";
-$a->strings["channel"] = "canale";
-$a->strings["%1\$s likes %2\$s's %3\$s"] = "A %1\$s piace %3\$s di %2\$s";
-$a->strings["%1\$s doesn't like %2\$s's %3\$s"] = "A %1\$s non piace %3\$s di %2\$s";
-$a->strings["%1\$s is now connected with %2\$s"] = "%1\$s adesso è connesso con %2\$s";
-$a->strings["%1\$s poked %2\$s"] = "%1\$s ha mandato un poke a %2\$s";
-$a->strings["%1\$s is currently %2\$s"] = "%1\$s al momento è %2\$s";
-$a->strings["View %s's profile @ %s"] = "Vedi il profilo di %s @ %s";
-$a->strings["Categories:"] = "Categorie:";
-$a->strings["Filed under:"] = "Classificato come:";
-$a->strings["View in context"] = "Vedi nel contesto";
-$a->strings["remove"] = "rimuovi";
-$a->strings["Loading..."] = "Caricamento in corso...";
-$a->strings["Delete Selected Items"] = "Elimina gli oggetti selezionati";
-$a->strings["View Source"] = "Vedi il sorgente";
-$a->strings["Follow Thread"] = "Segui la discussione";
-$a->strings["Matrix Activity"] = "Attività nella tua rete";
-$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>.";
-$a->strings["<span  %1\$s>%2\$d people</span> don't like this."] = "Non piace a <span %1\$s>%2\$d persone</span>.";
-$a->strings["and"] = "e";
-$a->strings[", and %d other people"] = "e altre %d persone";
-$a->strings["%s like this."] = "Piace a %s.";
-$a->strings["%s don't like this."] = "Non piace a %s.";
-$a->strings["Visible to <strong>everybody</strong>"] = "Visibile a <strong>tutti</strong>";
-$a->strings["Please enter a link URL:"] = "Inserisci l'indirizzo del link:";
-$a->strings["Please enter a video link/URL:"] = "Inserisci l'indirizzo del video:";
-$a->strings["Please enter an audio link/URL:"] = "Inserisci l'indirizzo dell'audio:";
-$a->strings["Tag term:"] = "Tag:";
-$a->strings["Save to Folder:"] = "Salva nella cartella:";
-$a->strings["Where are you right now?"] = "Dove sei ora?";
-$a->strings["Expires YYYY-MM-DD HH:MM"] = "Scadenza il AAAA-MM-GG OO:MM";
-$a->strings["Share"] = "Condividi";
-$a->strings["Page link title"] = "Link del titolo";
-$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 un indirizzo web";
-$a->strings["web link"] = "link web";
-$a->strings["Insert video link"] = "Inserisci l'indirizzo di un video";
-$a->strings["video link"] = "link video";
-$a->strings["Insert audio link"] = "Inserisci l'indirizzo di un audio";
-$a->strings["audio link"] = "link audio";
-$a->strings["Set your location"] = "La tua località";
-$a->strings["set location"] = "la tua località";
-$a->strings["Clear browser location"] = "Rimuovi la località data dal browser";
-$a->strings["clear location"] = "rimuovi la località";
-$a->strings["Set title"] = "Scegli un titolo";
-$a->strings["Categories (comma-separated list)"] = "Categorie (separate da virgola)";
-$a->strings["Permission settings"] = "Impostazioni permessi";
-$a->strings["permissions"] = "permessi";
-$a->strings["Public post"] = "Articolo pubblico";
-$a->strings["Example: bob@example.com, mary@example.com"] = "Per esempio: mario@esempio.com, simona@esempio.com";
-$a->strings["Set expiration date"] = "Data di scadenza";
 $a->strings["Welcome "] = "Ciao";
 $a->strings["Please upload a profile photo."] = "Carica una foto per il profilo!";
 $a->strings["Welcome back "] = "Ciao, è bello rivederti";
@@ -654,7 +662,7 @@ $a->strings["Item not found."] = "Elemento non trovato.";
 $a->strings["Archives"] = "Archivi";
 $a->strings["Collection not found."] = "Insieme non trovato.";
 $a->strings["Group is empty"] = "L'insieme è vuoto";
-$a->strings["Connection not found."] = "Gruppo non trovato.";
+$a->strings["Connection not found."] = "Contatto non trovato.";
 $a->strings["Sort Options"] = "Opzioni di ordinamento";
 $a->strings["Alphabetic"] = "Alfabetico";
 $a->strings["Reverse Alphabetic"] = "Alfabetico inverso";
@@ -963,12 +971,12 @@ $a->strings["Server"] = "Server";
 $a->strings["DB updates"] = "Aggiornamenti al DB";
 $a->strings["Logs"] = "Log";
 $a->strings["Plugin Features"] = "Funzionalità dei componenti aggiuntivi";
-$a->strings["User registrations waiting for confirmation"] = "Utenti registrati in attesa di conferma";
-$a->strings["Message queues"] = "Coda dei messaggi";
+$a->strings["User registrations waiting for confirmation"] = "Registrazioni in attesa";
+$a->strings["Message queues"] = "Messaggi in attesa di recapito";
 $a->strings["Administration"] = "Amministrazione";
 $a->strings["Summary"] = "Riepilogo";
 $a->strings["Registered users"] = "Utenti registrati";
-$a->strings["Pending registrations"] = "Registrazioni in attesa";
+$a->strings["Pending registrations"] = "Registrazioni da approvare";
 $a->strings["Version"] = "Versione";
 $a->strings["Active plugins"] = "Plugin attivi";
 $a->strings["Site settings updated."] = "Impostazioni del sito aggiornate.";
@@ -1001,7 +1009,7 @@ $a->strings["Register policy"] = "Politica di registrazione";
 $a->strings["Access policy"] = "Tipo di accesso";
 $a->strings["Register text"] = "Testo diregistrazione";
 $a->strings["Will be displayed prominently on the registration page."] = "Sarà mostrato ben visibile nella pagina di registrazione.";
-$a->strings["Accounts abandoned after x days"] = "Account abbandonati dopo x giorni";
+$a->strings["Accounts abandoned after x days"] = "Account abbandonati dopo X giorni";
 $a->strings["Will not waste system resources polling external sites for abandonded accounts. Enter 0 for no time limit."] = "Eviterà di sprecare risorse di sistema controllando se i siti esterni hanno account abbandonati. Immettere 0 per non imporre nessun limite di tempo.";
 $a->strings["Allowed friend domains"] = "Domini fidati e consentiti";
 $a->strings["Comma separated list of domains which are allowed to establish friendships with this site. Wildcards are accepted. Empty to allow any domains"] = "Elenco separato da virglola dei domini che possono stabilire amicizie con questo sito. Sono accettati caratteri jolly. Lascia vuoto per accettare connessioni da qualsiasi dominio.";
@@ -1047,10 +1055,6 @@ $a->strings["Account not found"] = "Account non trovato";
 $a->strings["User '%s' deleted"] = "Utente '%s' eliminato";
 $a->strings["User '%s' unblocked"] = "Utente '%s' sbloccato";
 $a->strings["User '%s' blocked"] = "Utente '%s' bloccato";
-$a->strings["Normal Account"] = "Account normale";
-$a->strings["Soapbox Account"] = "Account per comunicati e annunci";
-$a->strings["Community/Celebrity Account"] = "Account per celebrità o per comunità";
-$a->strings["Automatic Friend Account"] = "Account per amicizia automatizzato";
 $a->strings["select all"] = "seleziona tutti";
 $a->strings["User registrations waiting for confirm"] = "Richieste di registrazione in attesa di conferma";
 $a->strings["Request date"] = "Data richiesta";
@@ -1061,6 +1065,7 @@ $a->strings["Block"] = "Blocca";
 $a->strings["Unblock"] = "Sblocca";
 $a->strings["Register date"] = "Data registrazione";
 $a->strings["Last login"] = "Ultimo accesso";
+$a->strings["Expires"] = "Scadenza";
 $a->strings["Service Class"] = "Service Class";
 $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 eliminati!\\n\\nTutto quello che gli utenti hanno pubblicato su questo sito sarà permanentemente eliminato!\\n\\nConfermi?";
 $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à eliminato!\\n\\nTutto quello che ha pubblicato su questo sito sarà permanentemente eliminato!\\n\\nConfermi?";
@@ -1121,6 +1126,7 @@ $a->strings["Collection Editor"] = "Modifica l'insieme";
 $a->strings["Members"] = "Membri";
 $a->strings["All Connected Channels"] = "Tutti i canali connessi";
 $a->strings["Click on a channel to add or remove."] = "Clicca su un canale per aggiungerlo o rimuoverlo.";
+$a->strings["Remove term"] = "Rimuovi termine";
 $a->strings["Page owner information could not be retrieved."] = "Impossibile ottenere informazioni sul proprietario della pagina.";
 $a->strings["Album not found."] = "Album non trovato.";
 $a->strings["Delete Album"] = "Elimina album";
@@ -1212,7 +1218,6 @@ $a->strings["Not Found"] = "Non disponibile";
 $a->strings["Remote Authentication"] = "Autenticazione a distanza";
 $a->strings["Enter your channel address (e.g. channel@example.com)"] = "Inserisci l'indirizzo del tuo canale (ad esempio lucia@esempio.com)";
 $a->strings["Authenticate"] = "Autenticazione";
-$a->strings["Remove term"] = "Rimuovi termine";
 $a->strings["Commented Order"] = "Ultimi commenti";
 $a->strings["Sort by Comment Date"] = "Per data del commento";
 $a->strings["Posted Order"] = "Ultimi articoli";
@@ -1238,7 +1243,7 @@ $a->strings["Invalid connection."] = "Connessione non valida.";
 $a->strings["Ignore"] = "Ignora";
 $a->strings["Connection updated."] = "Contatto aggiornato.";
 $a->strings["Connection update failed."] = "Impossibile aggiornare il contatto.";
-$a->strings["Introductions and Connection Requests"] = "Richieste di contatto e di amicizia";
+$a->strings["Introductions and Connection Requests"] = "Richieste per entrare in contatto";
 $a->strings["No pending introductions."] = "Nessuna richiesta in attesa.";
 $a->strings["System error. Please try again later."] = "Errore di sistema. Riprovare più tardi.";
 $a->strings["Hide this contact from others"] = "Nascondi questo contatto agli altri";
@@ -1247,7 +1252,7 @@ $a->strings["if applicable"] = "se possibile";
 $a->strings["Discard"] = "Rifiuta";
 $a->strings["Could not access contact record."] = "Non è possibile accedere alle informazioni sul contatto.";
 $a->strings["Could not locate selected profile."] = "Non riesco a trovare il profilo selezionato.";
-$a->strings["Failed to update connection record."] = "Impossibile aggiornare le informazioni di contatto.";
+$a->strings["Failed to update connection record."] = "Impossibile aggiornare le informazioni del contatto.";
 $a->strings["Could not access address book record."] = "Impossibile accedere alle informazioni della rubrica.";
 $a->strings["Refresh failed - channel is currently unavailable."] = "Il canale non è disponibile - impossibile aggiornare.";
 $a->strings["Channel has been unblocked"] = "Il canale è stato sbloccato";
@@ -1279,10 +1284,10 @@ $a->strings["Hide or Unhide this connection"] = "Per nascondere o meno questo co
 $a->strings["Delete this connection"] = "Elimina questo contatto";
 $a->strings["Unknown"] = "Sconosciuto";
 $a->strings["Approve this connection"] = "Approva questo contatto";
-$a->strings["Accept connection to allow communication"] = "Accetta il contatto per poter comunicare";
+$a->strings["Accept connection to allow communication"] = "Entra in contatto per poter comunicare";
 $a->strings["Automatic Permissions Settings"] = "Permessi predefiniti";
 $a->strings["Connections: settings for %s"] = "Contatti: impostazioni per %s";
-$a->strings["When receiving a channel introduction, any permissions provided here will be applied to the new connection automatically and the introduction approved. Leave this page if you do not wish to use this feature."] = "Quando ricevi una richiesta di amicizia da un canale, i permessi mostrati in questa pagina saranno applicati al nuovo contatto con l'approvazione della richiesta. Lascia questa pagina se non vuoi proseguire.";
+$a->strings["When receiving a channel introduction, any permissions provided here will be applied to the new connection automatically and the introduction approved. Leave this page if you do not wish to use this feature."] = "Hai ricevuto da un canale una richiesta di entrare in contatto, se prosegui la richiesta sarà approvata e saranno applicati i permessi mostrati. Lascia questa pagina se non vuoi proseguire.";
 $a->strings["Slide to adjust your degree of friendship"] = "Trascina per restringere il grado di amicizia da mostrare";
 $a->strings["inherited"] = "derivato";
 $a->strings["Connection has no individual permissions!"] = "Non hai assegnato permessi individuali a questo contatto!";
@@ -1299,7 +1304,7 @@ $a->strings["Full Sharing"] = "Condivisione totale";
 $a->strings["Cautious Sharing"] = "Condivisione prudente";
 $a->strings["Follow Only"] = "Follower";
 $a->strings["Individual Permissions"] = "Permessi individuali";
-$a->strings["Some permissions may be inherited from your <a href=\"settings\">privacy settings</a>, which have higher priority. Changing those on this page will have no effect."] = "Alcuni permessi possono derivano dalle <a href=\"settings\">impostazioni di privacy</a>, che hanno una priorità maggiore. Cambiarli in questa pagina non avrà alcun effetto.";
+$a->strings["Some permissions may be inherited from your channel <a href=\"settings\">privacy settings</a>, which have higher priority. Changing those inherited settings on this page will have no effect."] = "Alcuni permessi derivano dalle <a href=\"settings\">impostazioni di privacy</a>, che hanno una priorità maggiore. Cambiarli in questa pagina non avrà alcun effetto.";
 $a->strings["Advanced Permissions"] = "Permessi avanzati";
 $a->strings["Quick Links"] = "Impostazioni veloci";
 $a->strings["Visit %s's profile - %s"] = "Guarda il profilo di %s - %s";
@@ -1323,7 +1328,7 @@ $a->strings["Archived"] = "Archiviati";
 $a->strings["All"] = "Tutti";
 $a->strings["Suggestions"] = "Suggerimenti";
 $a->strings["Suggest new connections"] = "Suggerisci nuovi contatti";
-$a->strings["Show pending (new) connections"] = "Richieste di amicizia in attesa";
+$a->strings["Show pending (new) connections"] = "Richieste per entrare in contatto";
 $a->strings["All Connections"] = "Tutti i contatti";
 $a->strings["Show all connections"] = "Mostra tutti i contatti";
 $a->strings["Unblocked"] = "Non bloccati";
@@ -1520,7 +1525,7 @@ $a->strings["Approve as: "] = "Approva come: ";
 $a->strings["Friend"] = "Amico";
 $a->strings["Sharer"] = "Sharer";
 $a->strings["Fan/Admirer"] = "Fan/Ammiratore";
-$a->strings["Friend/Connect Request"] = "Richiesta di amicizia";
+$a->strings["Friend/Connect Request"] = "Richiesta per entrare in contatto";
 $a->strings["New Follower"] = "Nuovo follower";
 $a->strings["No introductions."] = "Nessuna richiesta di amicizia.";
 $a->strings["%s liked %s's post"] = "A %s è piaciuto l'articolo di %s";
@@ -1629,13 +1634,16 @@ $a->strings["Set the background colour of items"] = "Colore di sfondo degli elem
 $a->strings["Set the opacity of items"] = "Opacità degli oggetti";
 $a->strings["Set the basic colour for item icons"] = "Colore di base per le icone";
 $a->strings["Set the hover colour for item icons"] = "Colore per le icone in evidenza";
+$a->strings["Set font-size for the entire application"] = "Dimensione font per tutto il sito";
 $a->strings["Set font-size for posts and comments"] = "Dimensioni del carattere per articoli e commenti";
 $a->strings["Set font-colour for posts and comments"] = "Colore del carattere per articoli e commenti";
 $a->strings["Set radius of corners"] = "Raggio degli angoli stondati";
 $a->strings["Set shadow depth of photos"] = "Profondità dell'ombra delle foto";
 $a->strings["Set maximum width of conversation regions"] = "Larghezza massima delle aree delle conversazioni";
 $a->strings["Set minimum opacity of nav bar - to hide it"] = "Imposta l'opacità minima della barra di navigazione per nasconderla";
-$a->strings["Sloppy photo albums"] = "Album fotografici semplificati";
+$a->strings["Set size of conversation author photo"] = "Dimensione foto dell'autore della conversazione";
+$a->strings["Set size of followup author photos"] = "Dimensione foto dei partecipanti alla conversazione";
+$a->strings["Sloppy photo albums"] = "Album con foto storte";
 $a->strings["Are you a clean desk or a messy desk person?"] = "La tua scrivania è sempre a posto? Sei una persona disordinata?";
 $a->strings["Schema Default"] = "Schema predefinito";
 $a->strings["Sans-Serif"] = "Sans-Serif";
@@ -1668,6 +1676,9 @@ $a->strings["Right offset of the section element"] = "Spazio a destra dell'eleme
 $a->strings["Section width"] = "Larghezza section";
 $a->strings["Left offset of the aside"] = "Spazio a sinistra del aside";
 $a->strings["Right offset of the aside element"] = "Spazio a destra del aside";
+$a->strings["None"] = "Nessuno";
+$a->strings["Header image"] = "Immagine dell'intestazione";
+$a->strings["Header image only on profile pages"] = "È possibile mettere un'immagine solo nell'intestazione dei profili";
 $a->strings["Update %s failed. See error logs."] = "%s: aggiornamento fallito. Controlla i log di errore.";
 $a->strings["Update Error at %s"] = "Errore di aggiornamento su %s";
 $a->strings["Create an account to access services and applications within the Red Matrix"] = "Registrati per accedere ai servizi e alle applicazioni di Red Matrix";
-- 
cgit v1.2.3


From 55d8ed17a776dce059b861ee43eeea82138b48ce Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Sun, 1 Dec 2013 21:11:47 -0800
Subject: trimmed style.css by a few hundred lines. Needs many more such
 efforts

---
 view/css/mod_connections.css      |  34 +++++
 view/css/mod_profiles.css         | 144 +++++++++++++++++++++
 view/css/mod_settings.css         |  11 ++
 view/theme/redbasic/css/style.css | 261 +-------------------------------------
 4 files changed, 190 insertions(+), 260 deletions(-)
 create mode 100644 view/css/mod_connections.css
 create mode 100644 view/css/mod_profiles.css

(limited to 'view')

diff --git a/view/css/mod_connections.css b/view/css/mod_connections.css
new file mode 100644
index 000000000..c2f6eeff0
--- /dev/null
+++ b/view/css/mod_connections.css
@@ -0,0 +1,34 @@
+
+.field_abook_help {
+	color: #000;
+}
+.abook-them {
+	margin-left: 225px;
+	margin-bottom: 15px;
+}
+.abook-me {
+	margin-left: 36px;
+	margin-bottom: 15px;
+}
+.acheckbox {
+	margin-bottom: 5px !important;
+}
+
+.abook-pending-contact {
+	background: orange;
+	font-weight: bold;
+	margin: 10px;
+	padding: 20px 5px 10px;
+}
+
+#contact-slider {
+	width: 600px !important;
+}
+
+.abook-edit-them, .abook-edit-me {
+	float: left;
+	width: 100px !important;
+}
+.field_abook_help {
+	float: left;
+}
diff --git a/view/css/mod_profiles.css b/view/css/mod_profiles.css
new file mode 100644
index 000000000..8378245d2
--- /dev/null
+++ b/view/css/mod_profiles.css
@@ -0,0 +1,144 @@
+#profile-edit-default-desc {
+	color: #FF0000;
+	border: 1px solid #FF8888;
+	background-color: #FFEEEE;
+	padding: 7px;
+}
+
+#profile-edit-clone-link-wrapper {
+	float: left;
+	margin-left: 50px;
+	margin-bottom: 20px;
+	width: 300px;
+}
+
+
+#profile-edit-links-end {
+	clear: both;
+	margin-bottom: 15px;
+}
+
+.profile-listing-photo {
+	border: none;
+}
+
+.profile-edit-submit-wrapper {
+	margin-top: 20px;
+	margin-bottom: 20px;
+}
+
+#profile-photo-link-select-wrapper {
+	margin-top: 2em;
+}
+
+#profile-photo-submit-wrapper {
+	margin-top: 10px;
+}
+
+#profile-edit-with-label {
+	width: 175px;
+	margin-left: 20px;
+}
+
+#profile-edit-profile-name-label,
+#profile-edit-name-label,
+#profile-edit-pdesc-label,
+#profile-edit-gender-label,
+#profile-edit-dob-label,
+#profile-edit-address-label,
+#profile-edit-locality-label,
+#profile-edit-region-label,
+#profile-edit-postal-code-label,
+#profile-edit-country-name-label,
+#profile-edit-marital-label,
+#profile-edit-sexual-label,
+#profile-edit-politic-label,
+#profile-edit-religion-label,
+#profile-edit-pubkeywords-label,
+#profile-edit-prvkeywords-label,
+#profile-edit-homepage-label,
+#profile-edit-hometown-label {
+	float: left;
+	width: 175px;
+}
+
+#profile-edit-profile-name,
+#profile-edit-name,
+#profile-edit-pdesc,
+#gender-select,
+#profile-edit-dob,
+#profile-edit-address,
+#profile-edit-locality,
+#profile-edit-region,
+#profile-edit-postal-code,
+#profile-edit-country-name,
+#marital-select,
+#sexual-select,
+#profile-edit-politic,
+#profile-edit-religion,
+#profile-edit-pubkeywords,
+#profile-edit-prvkeywords,
+#profile-in-dir-yes,
+#profile-in-dir-no,
+#profile-in-netdir-yes,
+#profile-in-netdir-no,
+#hide-wall-yes,
+#hide-wall-no,
+#hide-friends-yes,
+#hide-friends-no {
+	float: left;
+	margin-bottom: 20px;
+}
+
+
+#profile-edit-pdesc-desc,
+#profile-edit-pubkeywords-desc,
+#profile-edit-prvkeywords-desc {
+	float: left;
+	margin-left: 20px;
+}
+
+
+#profile-edit-homepage, #profile-edit-hometown {
+	float: left;
+	margin-bottom: 35px;
+}
+
+#profile-edit-profile-name-end,
+#profile-edit-name-end,
+#profile-edit-pdesc-end,
+#profile-edit-gender-end,
+#profile-edit-dob-end,
+#profile-edit-address-end,
+#profile-edit-locality-end,
+#profile-edit-region-end,
+#profile-edit-postal-code-end,
+#profile-edit-country-name-end,
+#profile-edit-marital-end,
+#profile-edit-sexual-end,
+#profile-edit-politic-end,
+#profile-edit-religion-end,
+#profile-edit-pubkeywords-end,
+#profile-edit-prvkeywords-end,
+#profile-edit-homepage-end,
+#profile-edit-hometown-end,
+#profile-in-dir-break,
+#profile-in-dir-end,
+#profile-in-netdir-break,
+#profile-in-netdir-end,
+#hide-wall-break,
+#hide-wall-end,
+#hide-friends-break,
+#hide-friends-end {
+	clear: both;
+}
+
+
+#gender-select, #marital-select, #sexual-select {
+	width: 220px;
+}
+
+#profile-edit-profile-name-wrapper .required {
+	color: #FF0000;
+	float: left;
+}
diff --git a/view/css/mod_settings.css b/view/css/mod_settings.css
index 0532268f1..601cb2e0e 100644
--- a/view/css/mod_settings.css
+++ b/view/css/mod_settings.css
@@ -13,3 +13,14 @@
 	margin-top: 15px;
 	margin-bottom: 45px;
 }
+
+
+
+#settings-notifications label {
+	margin-left: 20px;
+}
+#settings-notify-desc, #settings-activity-desc {
+	font-weight: bold;
+	margin-bottom: 15px;
+}
+
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index eaa3140c9..cd0842683 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -577,42 +577,7 @@ footer {
 #viewconnections {
 	margin-top: 15px;
 }
-#profile-edit-default-desc {
-	color: #FF0000;
-	border: 1px solid #FF8888;
-	background-color: #FFEEEE;
-	padding: 7px;
-}
-
-#profile-edit-clone-link-wrapper {
-	float: left;
-	margin-left: 50px;
-	margin-bottom: 20px;
-	width: 300px;
-}
-
 
-#profile-edit-links-end {
-	clear: both;
-	margin-bottom: 15px;
-}
-
-.profile-listing-photo {
-	border: none;
-}
-
-.profile-edit-submit-wrapper {
-	margin-top: 20px;
-	margin-bottom: 20px;
-}
-
-#profile-photo-link-select-wrapper {
-	margin-top: 2em;
-}
-
-#profile-photo-submit-wrapper {
-	margin-top: 10px;
-}
 
 #profile-photo-wrapper img {
 	width:175px;
@@ -627,65 +592,6 @@ footer {
 }
 
 
-#profile-edit-profile-name-label,
-#profile-edit-name-label,
-#profile-edit-pdesc-label,
-#profile-edit-gender-label,
-#profile-edit-dob-label,
-#profile-edit-address-label,
-#profile-edit-locality-label,
-#profile-edit-region-label,
-#profile-edit-postal-code-label,
-#profile-edit-country-name-label,
-#profile-edit-marital-label,
-#profile-edit-sexual-label,
-#profile-edit-politic-label,
-#profile-edit-religion-label,
-#profile-edit-pubkeywords-label,
-#profile-edit-prvkeywords-label,
-#profile-edit-homepage-label,
-#profile-edit-hometown-label {
-	float: left;
-	width: 175px;
-}
-
-#profile-edit-profile-name,
-#profile-edit-name,
-#profile-edit-pdesc,
-#gender-select,
-#profile-edit-dob,
-#profile-edit-address,
-#profile-edit-locality,
-#profile-edit-region,
-#profile-edit-postal-code,
-#profile-edit-country-name,
-#marital-select,
-#sexual-select,
-#profile-edit-politic,
-#profile-edit-religion,
-#profile-edit-pubkeywords,
-#profile-edit-prvkeywords,
-#profile-in-dir-yes,
-#profile-in-dir-no,
-#profile-in-netdir-yes,
-#profile-in-netdir-no,
-#hide-wall-yes,
-#hide-wall-no,
-#hide-friends-yes,
-#hide-friends-no {
-	float: left;
-	margin-bottom: 20px;
-}
-
-
-#settings-notifications label {
-	margin-left: 20px;
-}
-#settings-notify-desc, #settings-activity-desc {
-	font-weight: bold;
-	margin-bottom: 15px;
-}
-
 
 #profile-in-dir-yes-label,
 #profile-in-dir-no-label,
@@ -700,10 +606,6 @@ footer {
 	width: 50px;
 }
 
-#profile-edit-with-label {
-	width: 175px;
-	margin-left: 20px;
-}
 
 #profile-publish-yes-reg,
 #profile-publish-no-reg {
@@ -724,48 +626,6 @@ footer {
 }
 
 
-#profile-edit-pdesc-desc,
-#profile-edit-pubkeywords-desc,
-#profile-edit-prvkeywords-desc {
-	float: left;
-	margin-left: 20px;
-}
-
-
-#profile-edit-homepage, #profile-edit-hometown {
-	float: left;
-	margin-bottom: 35px;
-}
-
-#profile-edit-profile-name-end,
-#profile-edit-name-end,
-#profile-edit-pdesc-end,
-#profile-edit-gender-end,
-#profile-edit-dob-end,
-#profile-edit-address-end,
-#profile-edit-locality-end,
-#profile-edit-region-end,
-#profile-edit-postal-code-end,
-#profile-edit-country-name-end,
-#profile-edit-marital-end,
-#profile-edit-sexual-end,
-#profile-edit-politic-end,
-#profile-edit-religion-end,
-#profile-edit-pubkeywords-end,
-#profile-edit-prvkeywords-end,
-#profile-edit-homepage-end,
-#profile-edit-hometown-end,
-#profile-in-dir-break,
-#profile-in-dir-end,
-#profile-in-netdir-break,
-#profile-in-netdir-end,
-#hide-wall-break,
-#hide-wall-end,
-#hide-friends-break,
-#hide-friends-end {
-	clear: both;
-}
-
 .settings-widget ul {
 	list-style-type: none;
 	padding: 0px;
@@ -777,15 +637,6 @@ footer {
 }
 
 
-#gender-select, #marital-select, #sexual-select {
-	width: 220px;
-}
-
-#profile-edit-profile-name-wrapper .required {
-	color: #FF0000;
-	float: left;
-}
-
 #contacts-main {
 	margin-top: 20px;
 	margin-bottom: 20px;
@@ -2566,40 +2417,6 @@ brain is weird like that */
 	
 }
 
-.field_abook_help {
-	color: #000;
-}
-.abook-them {
-	margin-left: 225px;
-	margin-bottom: 15px;
-}
-.abook-me {
-	margin-left: 36px;
-	margin-bottom: 15px;
-}
-.acheckbox {
-	margin-bottom: 5px !important;
-}
-
-.abook-pending-contact {
-	background: orange;
-	font-weight: bold;
-	margin: 10px;
-	padding: 20px 5px 10px;
-}
-
-#contact-slider {
-	width: 600px !important;
-}
-
-.abook-edit-them, .abook-edit-me {
-	float: left;
-	width: 100px !important;
-}
-.field_abook_help {
-	float: left;
-}
-
 .field .onoff {
 	float: left;
 	width: 80px;
@@ -2748,8 +2565,6 @@ brain is weird like that */
 .on { background-position: -144px -32px; }
 
 .off { background-position: 0px -48px; }
-/*.starred { background-position: -16px -48px; }
-.unstarred { background-position: -32px -48px; }*/
 .tagged { background-position: -48px -48px; }
 .yellow { background-position: -64px -48px; }
 
@@ -2757,12 +2572,8 @@ brain is weird like that */
 	color: gold;
 }
 
-.filer-icon {
-	display: block; width: 16px; height: 16px;
-	background-image: url('../img/file.gif');
-}
-
 .icon.dim { opacity: 0.3;filter:alpha(opacity=30); }
+
 [class^="comment-edit-bb"] {
 	list-style: none;
 	display: none;
@@ -2778,81 +2589,11 @@ brain is weird like that */
 [class^="comment-edit-bb-end"] {
 	clear: both;
 }
-.editicon {
-    display: inline-block;
-    width: 16px;
-    height: 16px;
-    background-image: url(../img/bbedit.png);
-	background-color: #fff;
-    text-decoration: none;
-}
-.editicon:hover {
-	background-color: #ccc;
-}
-.boldbb {
-	background-position: 0px 0px;
-}
-.boldbb:hover {
-	background-position: 0px -16px;
-}
-.italicbb {
-	background-position: -16px 0px;
-}
-.italicbb:hover {
-	background-position: -16px -16px;
-}
-.underlinebb {
-	background-position: -32px 0px;
-}
-.underlinebb:hover {
-	background-position: -32px -16px;
-}
-.quotebb {
-	background-position: -48px 0px;
-}
-.quotebb:hover {
-	background-position: -48px -16px;
-}
-.codebb {
-	background-position: -64px 0px;
-}
-.codebb:hover {
-	background-position: -64px -16px;
-}
-.imagebb {
-	background-position: -80px 0px;
-}
-.imagebb:hover {
-	background-position: -80px -16px;
-}
-.urlbb {
-	background-position: -96px 0px;
-}
-.urlbb:hover {
-	background-position: -96px -16px;
-}
-.videobb {
-	background-position: -112px 0px;
-}
-.videobb:hover {
-	background-position: -112px -16px;
-}
-
-.attachtype {
-	display: block; width: 20px; height: 23px;
-	float: left;
-	background-image: url('../../../../images/content-types.png');
-}
 
 .body-attach {
 	margin-top: 10px;
 }
 
-.type-video { background-position: 0px 0px; }
-.type-image { background-position: -20px 0px; }
-.type-audio { background-position: -40px 0px; }
-.type-text  { background-position: -60px 0px; }
-.type-unkn  { background-position: -80px 0px; }
 
 
 /* autocomplete popup */
-- 
cgit v1.2.3


From 3fdc3515b5dbfee4582467144d3c2d5eefc6a708 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Sun, 1 Dec 2013 23:49:52 -0800
Subject: some work on events permissions

---
 view/tpl/event_form.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'view')

diff --git a/view/tpl/event_form.tpl b/view/tpl/event_form.tpl
index f661eac87..da4dda82e 100755
--- a/view/tpl/event_form.tpl
+++ b/view/tpl/event_form.tpl
@@ -7,7 +7,7 @@
 <form action="{{$post}}" method="post" >
 
 <input type="hidden" name="event_id" value="{{$eid}}" />
-<input type="hidden" name="cid" value="{{$cid}}" />
+<input type="hidden" name="xchan" value="{{$xchan}}" />
 <input type="hidden" name="mid" value="{{$mid}}" />
 
 <div id="event-start-text">{{$s_text}}</div>
-- 
cgit v1.2.3


From 91b06b67a6861ff471f6656d36d91cd6c10ce548 Mon Sep 17 00:00:00 2001
From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Mon, 2 Dec 2013 09:24:24 +0100
Subject: DE: update to the strings

---
 view/de/messages.po | 2882 +++++++++++++++++++++++++++++----------------------
 view/de/strings.php |  310 ++++--
 2 files changed, 1827 insertions(+), 1365 deletions(-)

(limited to 'view')

diff --git a/view/de/messages.po b/view/de/messages.po
index 58cc1e25c..d8365eccd 100644
--- a/view/de/messages.po
+++ b/view/de/messages.po
@@ -4,17 +4,22 @@
 # 
 # Translators:
 # alexej <info@pixelbits.de>, 2013
+# alexej <info@pixelbits.de>, 2013
+# balder <andreas.bauer@ymail.com>, 2013
 # balder <andreas.bauer@ymail.com>, 2013
+# bavatar <tobias.diekershoff@gmx.net>, 2013
+# EinerVonVielen <tom@jfellow.net>, 2013
 # EinerVonVielen <tom@jfellow.net>, 2013
 # Fraengii <frank@lumina-verte.org>, 2013
+# Fraengii <frank@lumina-verte.org>, 2013
 # Oliver <post@toktan.org>, 2013
 # bavatar <tobias.diekershoff@gmx.net>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: Red Matrix\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-10-04 00:01-0700\n"
-"PO-Revision-Date: 2013-10-10 11:37+0000\n"
+"POT-Creation-Date: 2013-11-29 00:03-0800\n"
+"PO-Revision-Date: 2013-12-02 08:10+0000\n"
 "Last-Translator: bavatar <tobias.diekershoff@gmx.net>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/red-matrix/language/de/)\n"
 "MIME-Version: 1.0\n"
@@ -37,7 +42,7 @@ msgstr "Verbergen"
 
 #: ../../include/activities.php:37
 msgid " and "
-msgstr " und "
+msgstr "und"
 
 #: ../../include/activities.php:45
 msgid "public profile"
@@ -58,14 +63,14 @@ msgstr "Besuche %1$s's %2$s"
 msgid "%1$s has an updated %2$s, changing %3$s."
 msgstr "%1$s hat ein aktualisiertes %2$s, %3$s wurde verändert."
 
-#: ../../include/api.php:970
-msgid "Public Timeline"
-msgstr "Öffentliche Zeitleiste"
-
 #: ../../include/enotify.php:36
 msgid "Red Matrix Notification"
 msgstr "Red Matrix Benachrichtigung"
 
+#: ../../include/enotify.php:37
+msgid "redmatrix"
+msgstr ""
+
 #: ../../include/enotify.php:39
 msgid "Thank You,"
 msgstr "Danke."
@@ -75,199 +80,200 @@ msgstr "Danke."
 msgid "%s Administrator"
 msgstr "%s Administrator"
 
-#: ../../include/enotify.php:75
+#: ../../include/enotify.php:76
 #, php-format
 msgid "%s <!item_type!>"
 msgstr "%s <!item_type!>"
 
-#: ../../include/enotify.php:79
+#: ../../include/enotify.php:80
 #, php-format
 msgid "[Red:Notify] New mail received at %s"
 msgstr "[Red Notify] Neue Mail auf %s empfangen"
 
-#: ../../include/enotify.php:81
+#: ../../include/enotify.php:82
 #, php-format
-msgid "%1$s sent you a new private message at %2$s."
-msgstr "%1$s hat Dir eine private Nachricht auf %2$s geschickt."
+msgid "%1$s, %2$s sent you a new private message at %3$s."
+msgstr "%1$s, %2$s hat dir eine private Nachricht auf %3$s gesendet."
 
-#: ../../include/enotify.php:82
+#: ../../include/enotify.php:83
 #, php-format
 msgid "%1$s sent you %2$s."
 msgstr "%1$s hat dir %2$s geschickt."
 
-#: ../../include/enotify.php:82
+#: ../../include/enotify.php:83
 msgid "a private message"
 msgstr "eine private Nachricht"
 
-#: ../../include/enotify.php:83
+#: ../../include/enotify.php:84
 #, php-format
 msgid "Please visit %s to view and/or reply to your private messages."
 msgstr "Bitte besuche %s, um die private Nachricht anzusehen und/oder darauf zu antworten."
 
-#: ../../include/enotify.php:134
+#: ../../include/enotify.php:135
 #, php-format
-msgid "%1$s commented on [zrl=%2$s]a %3$s[/zrl]"
-msgstr "%1$s hat auf [zrl=%2$s]einen %3$s[/zrl] kommentiert"
+msgid "%1$s, %2$s commented on [zrl=%3$s]a %4$s[/zrl]"
+msgstr ""
 
-#: ../../include/enotify.php:141
+#: ../../include/enotify.php:143
 #, php-format
-msgid "%1$s commented on [zrl=%2$s]%3$s's %4$s[/zrl]"
-msgstr "%1$s kommentierte auf [zrl=%2$s]%3$s's %4$s[/zrl]"
+msgid "%1$s, %2$s commented on [zrl=%3$s]%4$s's %5$s[/zrl]"
+msgstr ""
 
-#: ../../include/enotify.php:149
+#: ../../include/enotify.php:152
 #, php-format
-msgid "%1$s commented on [zrl=%2$s]your %3$s[/zrl]"
-msgstr "%1$s hat auf [zrl=%2$s]Dein %3$s[/zrl] kommentiert"
+msgid "%1$s, %2$s commented on [zrl=%3$s]your %4$s[/zrl]"
+msgstr ""
 
-#: ../../include/enotify.php:159
+#: ../../include/enotify.php:163
 #, php-format
 msgid "[Red:Notify] Comment to conversation #%1$d by %2$s"
 msgstr "[Red:Notify] Kommentar in Unterhaltung #%1$d von %2$s"
 
-#: ../../include/enotify.php:160
+#: ../../include/enotify.php:164
 #, php-format
-msgid "%s commented on an item/conversation you have been following."
-msgstr "%s hat einen Beitrag/eine Konversation kommentiert, dem/der du folgst."
+msgid "%1$s, %2$s commented on an item/conversation you have been following."
+msgstr ""
 
-#: ../../include/enotify.php:163 ../../include/enotify.php:180
-#: ../../include/enotify.php:206 ../../include/enotify.php:224
-#: ../../include/enotify.php:237
+#: ../../include/enotify.php:167 ../../include/enotify.php:186
+#: ../../include/enotify.php:212 ../../include/enotify.php:231
+#: ../../include/enotify.php:245
 #, php-format
 msgid "Please visit %s to view and/or reply to the conversation."
 msgstr "Bitte besuche %s, um die Konversation anzusehen und/oder zu kommentieren."
 
-#: ../../include/enotify.php:170
+#: ../../include/enotify.php:174
 #, php-format
 msgid "[Red:Notify] %s posted to your profile wall"
 msgstr "[Red:Hinweis] %s schrieb auf Deine Pinnwand"
 
-#: ../../include/enotify.php:172
+#: ../../include/enotify.php:176
 #, php-format
-msgid "%1$s posted to your profile wall at %2$s"
-msgstr "%1$s schrieb auf Deine Pinnwand auf %2$s"
+msgid "%1$s, %2$s posted to your profile wall at %3$s"
+msgstr ""
 
-#: ../../include/enotify.php:174
+#: ../../include/enotify.php:178
 #, php-format
-msgid "%1$s posted to [zrl=%2$s]your wall[/zrl]"
-msgstr "%1$s schrieb auf [zrl=%2$s]Deine Pinnwand[/zrl]"
+msgid "%1$s, %2$s posted to [zrl=%3$s]your wall[/zrl]"
+msgstr ""
 
-#: ../../include/enotify.php:200
+#: ../../include/enotify.php:205
 #, php-format
 msgid "[Red:Notify] %s tagged you"
 msgstr "[Red Notify] %s hat dich getaggt"
 
-#: ../../include/enotify.php:201
+#: ../../include/enotify.php:206
 #, php-format
-msgid "%1$s tagged you at %2$s"
-msgstr "%1$s hat dich auf %2$s getaggt"
+msgid "%1$s, %2$s tagged you at %3$s"
+msgstr "%1$s, %2$s hat dich auf %3$s getaggt"
 
-#: ../../include/enotify.php:202
+#: ../../include/enotify.php:207
 #, php-format
-msgid "%1$s [zrl=%2$s]tagged you[/zrl]."
-msgstr "%1$s hat [zrl=%2$s]Dich getagged[/zrl]."
+msgid "%1$s, %2$s [zrl=%3$s]tagged you[/zrl]."
+msgstr ""
 
-#: ../../include/enotify.php:214
+#: ../../include/enotify.php:220
 #, php-format
 msgid "[Red:Notify] %1$s poked you"
 msgstr "[Red Notify] %1$s hat dich angestupst"
 
-#: ../../include/enotify.php:215
+#: ../../include/enotify.php:221
 #, php-format
-msgid "%1$s poked you at %2$s"
-msgstr "%1$s hat dich auf %2$s angestupst"
+msgid "%1$s, %2$s poked you at %3$s"
+msgstr "%1$s, %2$s hat dich auf %3$s angestubst"
 
-#: ../../include/enotify.php:216
+#: ../../include/enotify.php:222
 #, php-format
-msgid "%1$s [zrl=%2$s]poked you[/zrl]."
-msgstr "%1$s [zrl=%2$s]hat dich angestupst.[/zrl]."
+msgid "%1$s, %2$s [zrl=%2$s]poked you[/zrl]."
+msgstr ""
 
-#: ../../include/enotify.php:231
+#: ../../include/enotify.php:238
 #, php-format
 msgid "[Red:Notify] %s tagged your post"
 msgstr "[Red:Hinweis] %s hat Dich getagged"
 
-#: ../../include/enotify.php:232
+#: ../../include/enotify.php:239
 #, php-format
-msgid "%1$s tagged your post at %2$s"
-msgstr "%1$s hat Deinen Beitrag auf %2$s getagged"
+msgid "%1$s, %2$s tagged your post at %3$s"
+msgstr ""
 
-#: ../../include/enotify.php:233
+#: ../../include/enotify.php:240
 #, php-format
-msgid "%1$s tagged [zrl=%2$s]your post[/zrl]"
-msgstr "%1$s hat [zrl=%2$s]Deinen Beitrag[/zrl] getagged"
+msgid "%1$s, %2$s tagged [zrl=%3$s]your post[/zrl]"
+msgstr ""
 
-#: ../../include/enotify.php:244
+#: ../../include/enotify.php:252
 msgid "[Red:Notify] Introduction received"
 msgstr "[Red:Notify] Vorstellung erhalten"
 
-#: ../../include/enotify.php:245
+#: ../../include/enotify.php:253
 #, php-format
-msgid "You've received an introduction from '%1$s' at %2$s"
-msgstr "Du hast auf %2$s eine Vorstellung von %1$s erhalten."
+msgid "%1$s, you've received an introduction from '%2$s' at %3$s"
+msgstr ""
 
-#: ../../include/enotify.php:246
+#: ../../include/enotify.php:254
 #, php-format
-msgid "You've received [zrl=%1$s]an introduction[/zrl] from %2$s."
-msgstr "Du hast [zrl=%1$s]eine Vorstellung[/zrl] von %2$s erhalten."
+msgid "%1$s, you've received [zrl=%2$s]an introduction[/zrl] from %3$s."
+msgstr ""
 
-#: ../../include/enotify.php:249 ../../include/enotify.php:267
+#: ../../include/enotify.php:258 ../../include/enotify.php:277
 #, php-format
 msgid "You may visit their profile at %s"
 msgstr "Du kannst Dir das Profil unter %s ansehen"
 
-#: ../../include/enotify.php:251
+#: ../../include/enotify.php:260
 #, php-format
 msgid "Please visit %s to approve or reject the introduction."
 msgstr "Bitte besuche %s um sie anzunehmen oder abzulehnen."
 
-#: ../../include/enotify.php:258
+#: ../../include/enotify.php:267
 msgid "[Red:Notify] Friend suggestion received"
 msgstr "[Red:Hinweis] Freundschaftsvorschlag erhalten"
 
-#: ../../include/enotify.php:259
+#: ../../include/enotify.php:268
 #, php-format
-msgid "You've received a friend suggestion from '%1$s' at %2$s"
-msgstr "Du hast einen Freundschaftsvorschlag von %1$s auf %2$s erhalten"
+msgid "%1$s, you've received a friend suggestion from '%2$s' at %3$s"
+msgstr ""
 
-#: ../../include/enotify.php:260
+#: ../../include/enotify.php:269
 #, php-format
 msgid ""
-"You've received [zrl=%1$s]a friend suggestion[/zrl] for %2$s from %3$s."
-msgstr "Du hast einen [zrl=%1$s]Freundschaftsvorschlag[/zrl] für %2$s von %3$s erhalten."
+"%1$s, you've received [zrl=%2$s]a friend suggestion[/zrl] for %3$s from "
+"%4$s."
+msgstr ""
 
-#: ../../include/enotify.php:265
+#: ../../include/enotify.php:275
 msgid "Name:"
 msgstr "Name:"
 
-#: ../../include/enotify.php:266
+#: ../../include/enotify.php:276
 msgid "Photo:"
 msgstr "Foto:"
 
-#: ../../include/enotify.php:269
+#: ../../include/enotify.php:279
 #, php-format
 msgid "Please visit %s to approve or reject the suggestion."
 msgstr "Bitte besuche %s um den Vorschlag zu akzeptieren oder abzulehnen."
 
-#: ../../include/ItemObject.php:88 ../../mod/photos.php:960
+#: ../../include/ItemObject.php:88 ../../mod/photos.php:952
 msgid "Private Message"
 msgstr "Private Nachricht"
 
 #: ../../include/ItemObject.php:95 ../../include/page_widgets.php:8
-#: ../../mod/webpages.php:98 ../../mod/settings.php:710 ../../mod/menu.php:55
-#: ../../mod/layouts.php:89 ../../mod/editlayout.php:100
-#: ../../mod/editwebpage.php:119 ../../mod/blocks.php:92
-#: ../../mod/editpost.php:94 ../../mod/editblock.php:114
+#: ../../mod/webpages.php:101 ../../mod/settings.php:713 ../../mod/menu.php:55
+#: ../../mod/layouts.php:102 ../../mod/editlayout.php:100
+#: ../../mod/editwebpage.php:119 ../../mod/blocks.php:93
+#: ../../mod/editpost.php:97 ../../mod/editblock.php:114
 msgid "Edit"
 msgstr "Bearbeiten"
 
-#: ../../include/ItemObject.php:107 ../../include/conversation.php:631
-#: ../../mod/settings.php:711 ../../mod/admin.php:677 ../../mod/group.php:182
-#: ../../mod/photos.php:1141 ../../mod/connections.php:351
+#: ../../include/ItemObject.php:107 ../../include/conversation.php:628
+#: ../../mod/settings.php:714 ../../mod/admin.php:690 ../../mod/group.php:182
+#: ../../mod/photos.php:1130 ../../mod/connections.php:374
 #: ../../mod/filestorage.php:82
 msgid "Delete"
 msgstr "Löschen"
 
-#: ../../include/ItemObject.php:113 ../../include/conversation.php:630
+#: ../../include/ItemObject.php:113 ../../include/conversation.php:627
 msgid "Select"
 msgstr "Auswählen"
 
@@ -291,7 +297,7 @@ msgstr "Stern-Status umschalten"
 msgid "starred"
 msgstr "markiert"
 
-#: ../../include/ItemObject.php:160 ../../include/conversation.php:641
+#: ../../include/ItemObject.php:160 ../../include/conversation.php:638
 msgid "Message is verified"
 msgstr "Nachricht überprüft"
 
@@ -299,19 +305,19 @@ msgstr "Nachricht überprüft"
 msgid "add tag"
 msgstr "Schlagwort hinzufügen"
 
-#: ../../include/ItemObject.php:174 ../../mod/photos.php:1070
+#: ../../include/ItemObject.php:174 ../../mod/photos.php:1058
 msgid "I like this (toggle)"
 msgstr "Ich mag das (Umschalter)"
 
-#: ../../include/ItemObject.php:174 ../../include/taxonomy.php:249
+#: ../../include/ItemObject.php:174 ../../include/taxonomy.php:251
 msgid "like"
 msgstr "Gefällt-mir"
 
-#: ../../include/ItemObject.php:175 ../../mod/photos.php:1071
+#: ../../include/ItemObject.php:175 ../../mod/photos.php:1059
 msgid "I don't like this (toggle)"
 msgstr "Ich mag das nicht (Umschalter)"
 
-#: ../../include/ItemObject.php:175 ../../include/taxonomy.php:250
+#: ../../include/ItemObject.php:175 ../../include/taxonomy.php:252
 msgid "dislike"
 msgstr "Gefällt-mir-nicht"
 
@@ -333,110 +339,127 @@ msgid "to"
 msgstr "zu"
 
 #: ../../include/ItemObject.php:204
+msgid "via"
+msgstr "via"
+
+#: ../../include/ItemObject.php:205
 msgid "Wall-to-Wall"
 msgstr "Wall-to-Wall"
 
-#: ../../include/ItemObject.php:205
+#: ../../include/ItemObject.php:206
 msgid "via Wall-To-Wall:"
 msgstr "via Wall-To-Wall:"
 
-#: ../../include/ItemObject.php:215 ../../include/conversation.php:685
+#: ../../include/ItemObject.php:216 ../../include/conversation.php:682
 #, php-format
 msgid " from %s"
 msgstr "von %s"
 
-#: ../../include/ItemObject.php:244 ../../include/conversation.php:704
-#: ../../include/conversation.php:1104 ../../mod/photos.php:1073
-#: ../../mod/message.php:303 ../../mod/message.php:466
+#: ../../include/ItemObject.php:219 ../../include/conversation.php:685
+#, php-format
+msgid "last edited: %s"
+msgstr "zuletzt bearbeitet: %s"
+
+#: ../../include/ItemObject.php:246 ../../include/conversation.php:702
+#: ../../include/conversation.php:1112 ../../mod/photos.php:1061
+#: ../../mod/message.php:332 ../../mod/message.php:516
 #: ../../mod/editlayout.php:109 ../../mod/editwebpage.php:128
-#: ../../mod/editpost.php:103 ../../mod/editblock.php:123
+#: ../../mod/editpost.php:106 ../../mod/editblock.php:123
 msgid "Please wait"
 msgstr "Bitte warten"
 
-#: ../../include/ItemObject.php:265
+#: ../../include/ItemObject.php:267
 #, php-format
 msgid "%d comment"
 msgid_plural "%d comments"
 msgstr[0] "%d Kommentar"
 msgstr[1] "%d Kommentare"
 
-#: ../../include/ItemObject.php:266 ../../include/js_strings.php:7
+#: ../../include/ItemObject.php:268 ../../include/js_strings.php:7
 #: ../../include/contact_widgets.php:148
 msgid "show more"
 msgstr "mehr zeigen"
 
-#: ../../include/ItemObject.php:525 ../../mod/photos.php:1089
-#: ../../mod/photos.php:1175
+#: ../../include/ItemObject.php:527 ../../mod/photos.php:1077
+#: ../../mod/photos.php:1164
 msgid "This is you"
 msgstr "Das bist du"
 
-#: ../../include/ItemObject.php:527 ../../include/js_strings.php:6
-#: ../../mod/photos.php:1091 ../../mod/photos.php:1177
+#: ../../include/ItemObject.php:529 ../../include/js_strings.php:6
+#: ../../mod/photos.php:1079 ../../mod/photos.php:1166
 msgid "Comment"
 msgstr "Kommentar"
 
-#: ../../include/ItemObject.php:528 ../../mod/events.php:458
-#: ../../mod/thing.php:190 ../../mod/invite.php:153 ../../mod/setup.php:283
-#: ../../mod/setup.php:326 ../../mod/settings.php:648
-#: ../../mod/settings.php:760 ../../mod/settings.php:788
-#: ../../mod/settings.php:812 ../../mod/settings.php:883
-#: ../../mod/settings.php:1051 ../../mod/connect.php:96
+#: ../../include/ItemObject.php:530 ../../mod/events.php:458
+#: ../../mod/thing.php:190 ../../mod/invite.php:154 ../../mod/setup.php:302
+#: ../../mod/setup.php:345 ../../mod/settings.php:651
+#: ../../mod/settings.php:763 ../../mod/settings.php:791
+#: ../../mod/settings.php:815 ../../mod/settings.php:886
+#: ../../mod/settings.php:1054 ../../mod/connect.php:96
 #: ../../mod/sources.php:83 ../../mod/sources.php:110 ../../mod/admin.php:418
-#: ../../mod/admin.php:670 ../../mod/admin.php:810 ../../mod/admin.php:1009
-#: ../../mod/admin.php:1096 ../../mod/group.php:87 ../../mod/photos.php:693
-#: ../../mod/photos.php:787 ../../mod/photos.php:1052
-#: ../../mod/photos.php:1092 ../../mod/photos.php:1178
-#: ../../mod/message.php:304 ../../mod/message.php:465
-#: ../../mod/connections.php:428 ../../mod/profiles.php:529
+#: ../../mod/admin.php:683 ../../mod/admin.php:823 ../../mod/admin.php:1022
+#: ../../mod/admin.php:1109 ../../mod/group.php:87 ../../mod/photos.php:685
+#: ../../mod/photos.php:779 ../../mod/photos.php:1040
+#: ../../mod/photos.php:1080 ../../mod/photos.php:1167
+#: ../../mod/message.php:333 ../../mod/message.php:515
+#: ../../mod/connections.php:452 ../../mod/profiles.php:529
 #: ../../mod/import.php:385 ../../mod/crepair.php:166 ../../mod/poke.php:166
 #: ../../mod/fsuggest.php:108 ../../mod/mood.php:137
-#: ../../view/theme/redbasic/php/config.php:46
-#: ../../view/theme/redstrap/php/config.php:131
+#: ../../view/theme/redbasic/php/config.php:85
+#: ../../view/theme/apw/php/config.php:231
+#: ../../view/theme/blogga/view/theme/blog/config.php:67
+#: ../../view/theme/blogga/php/config.php:67
 msgid "Submit"
 msgstr "Bestätigen"
 
-#: ../../include/ItemObject.php:529
+#: ../../include/ItemObject.php:531
 msgid "Bold"
 msgstr "Fett"
 
-#: ../../include/ItemObject.php:530
+#: ../../include/ItemObject.php:532
 msgid "Italic"
 msgstr "Kursiv"
 
-#: ../../include/ItemObject.php:531
+#: ../../include/ItemObject.php:533
 msgid "Underline"
 msgstr "Unterstrichen"
 
-#: ../../include/ItemObject.php:532
+#: ../../include/ItemObject.php:534
 msgid "Quote"
 msgstr "Zitat"
 
-#: ../../include/ItemObject.php:533
+#: ../../include/ItemObject.php:535
 msgid "Code"
 msgstr "Code"
 
-#: ../../include/ItemObject.php:534
+#: ../../include/ItemObject.php:536
 msgid "Image"
 msgstr "Bild"
 
-#: ../../include/ItemObject.php:535
+#: ../../include/ItemObject.php:537
 msgid "Link"
 msgstr "Link"
 
-#: ../../include/ItemObject.php:536
+#: ../../include/ItemObject.php:538
 msgid "Video"
 msgstr "Video"
 
-#: ../../include/ItemObject.php:537 ../../include/conversation.php:1124
-#: ../../mod/photos.php:1093 ../../mod/editlayout.php:129
-#: ../../mod/editwebpage.php:150 ../../mod/editpost.php:123
-#: ../../mod/editblock.php:144
+#: ../../include/ItemObject.php:539 ../../include/conversation.php:1075
+#: ../../mod/webpages.php:105 ../../mod/photos.php:1081
+#: ../../mod/editlayout.php:129 ../../mod/editwebpage.php:150
+#: ../../mod/editpost.php:126 ../../mod/editblock.php:144
 msgid "Preview"
 msgstr "Vorschau"
 
+#: ../../include/ItemObject.php:542 ../../include/conversation.php:1139
+#: ../../mod/message.php:338 ../../mod/message.php:521
+#: ../../mod/editpost.php:134
+msgid "Encrypt text"
+msgstr "Text verschlüsseln"
+
 #: ../../include/Contact.php:87 ../../include/contact_widgets.php:23
-#: ../../mod/match.php:58 ../../mod/suggest.php:56 ../../mod/directory.php:183
-#: ../../boot.php:1710
+#: ../../mod/match.php:58 ../../mod/suggest.php:56 ../../mod/directory.php:198
+#: ../../boot.php:1741
 msgid "Connect"
 msgstr "Verbinden"
 
@@ -448,33 +471,33 @@ msgstr "Neues Fenster"
 msgid "Open the selected location in a different window or browser tab"
 msgstr "Öffne die markierte Adresse in einem neuen Browser Fenster oder Tab"
 
-#: ../../include/Contact.php:492 ../../include/conversation.php:932
+#: ../../include/Contact.php:524 ../../include/conversation.php:930
 msgid "Poke"
 msgstr "Anstupsen"
 
-#: ../../include/Contact.php:493 ../../include/conversation.php:926
+#: ../../include/Contact.php:525 ../../include/conversation.php:924
 msgid "View Status"
 msgstr "Status ansehen"
 
-#: ../../include/Contact.php:494 ../../include/nav.php:75
-#: ../../include/conversation.php:927 ../../mod/connections.php:304
-#: ../../mod/connections.php:418
+#: ../../include/Contact.php:526 ../../include/nav.php:76
+#: ../../include/conversation.php:925 ../../mod/connections.php:327
+#: ../../mod/connections.php:441
 msgid "View Profile"
 msgstr "Profil ansehen"
 
-#: ../../include/Contact.php:495 ../../include/conversation.php:928
+#: ../../include/Contact.php:527 ../../include/conversation.php:926
 msgid "View Photos"
 msgstr "Fotos ansehen"
 
-#: ../../include/Contact.php:496
+#: ../../include/Contact.php:528
 msgid "Network Posts"
 msgstr "Netzwerkbeiträge"
 
-#: ../../include/Contact.php:497 ../../include/conversation.php:930
+#: ../../include/Contact.php:529 ../../include/conversation.php:928
 msgid "Edit Contact"
 msgstr "Kontakt bearbeiten"
 
-#: ../../include/Contact.php:498 ../../include/conversation.php:931
+#: ../../include/Contact.php:530 ../../include/conversation.php:929
 msgid "Send PM"
 msgstr "Sende PN"
 
@@ -538,8 +561,8 @@ msgstr "OStatus"
 msgid "RSS/Atom"
 msgstr "RSS/Atom"
 
-#: ../../include/contact_selectors.php:77 ../../mod/admin.php:673
-#: ../../mod/admin.php:682 ../../boot.php:1438
+#: ../../include/contact_selectors.php:77 ../../mod/admin.php:686
+#: ../../mod/admin.php:695 ../../boot.php:1461
 msgid "Email"
 msgstr "E-Mail"
 
@@ -658,7 +681,7 @@ msgid "Finishes:"
 msgstr "Endet:"
 
 #: ../../include/event.php:40 ../../include/bb2diaspora.php:455
-#: ../../mod/events.php:450 ../../mod/directory.php:158 ../../boot.php:1760
+#: ../../mod/events.php:450 ../../mod/directory.php:173 ../../boot.php:1791
 msgid "Location:"
 msgstr "Ort:"
 
@@ -666,6 +689,14 @@ msgstr "Ort:"
 msgid "General Features"
 msgstr "Allgemeine Funktionen"
 
+#: ../../include/features.php:23
+msgid "Content Expiration"
+msgstr "Verfall von Inhalten"
+
+#: ../../include/features.php:23
+msgid "Remove posts/comments and/or private messages at a future time"
+msgstr "Lösche Beiträge, Kommentare und/oder private Nachrichten automatisch zu einem zukünftigen Datum."
+
 #: ../../include/features.php:24
 msgid "Multiple Profiles"
 msgstr "Mehrfachprofile"
@@ -694,7 +725,7 @@ msgstr "Aktiviere Fotoalbum mit erweiterten Funktionen"
 msgid "Extended Identity Sharing"
 msgstr "Erweitertes Teilen von Identitäten"
 
-#: ../../include/features.php:28 ../../include/js_strings.php:28
+#: ../../include/features.php:28 ../../include/js_strings.php:30
 msgid " "
 msgstr " "
 
@@ -736,7 +767,7 @@ msgstr "Voransicht"
 msgid "Allow previewing posts and comments before publishing them"
 msgstr "Erlaube Voransicht von Beiträgen und Kommentaren vor Veröffentlichung"
 
-#: ../../include/features.php:38 ../../mod/settings.php:118
+#: ../../include/features.php:38 ../../mod/settings.php:120
 #: ../../mod/sources.php:67
 msgid "Channel Sources"
 msgstr "Kanal Quellen"
@@ -745,124 +776,124 @@ msgstr "Kanal Quellen"
 msgid "Automatically import channel content from other channels or feeds"
 msgstr "Importiere automatisch Inhalte für diesen Kanal von anderen Kanälen oder Feeds."
 
-#: ../../include/features.php:43
+#: ../../include/features.php:39
+msgid "Even More Encryption"
+msgstr "Noch mehr Verschlüsselung"
+
+#: ../../include/features.php:39
+msgid "Allow encryption of content end-to-end with a shared secret key"
+msgstr "Erlaube Ende-zu-Ende Verschlüsselung von Inhalten, mit einem geteilten geheimen Schlüssel"
+
+#: ../../include/features.php:44
 msgid "Network and Stream Filtering"
 msgstr "Netzwerk- und Stream-Filter"
 
-#: ../../include/features.php:44
+#: ../../include/features.php:45
 msgid "Search by Date"
 msgstr "Suche nach Datum"
 
-#: ../../include/features.php:44
+#: ../../include/features.php:45
 msgid "Ability to select posts by date ranges"
 msgstr "Möglichkeit, Beiträge nach Zeiträumen auszuwählen"
 
-#: ../../include/features.php:45
+#: ../../include/features.php:46
 msgid "Collections Filter"
 msgstr "Filter für Sammlung"
 
-#: ../../include/features.php:45
+#: ../../include/features.php:46
 msgid "Enable widget to display Network posts only from selected collections"
 msgstr "Aktiviere nur Netzwerk-Beiträge von ausgewählten Sammlungen"
 
-#: ../../include/features.php:46 ../../mod/network.php:173
-#: ../../mod/search.php:17
+#: ../../include/features.php:47 ../../mod/search.php:17
+#: ../../mod/network.php:173
 msgid "Saved Searches"
 msgstr "Gesicherte Suchanfragen"
 
-#: ../../include/features.php:46
+#: ../../include/features.php:47
 msgid "Save search terms for re-use"
 msgstr "Gesicherte Suchbegriffe zur Wiederverwendung"
 
-#: ../../include/features.php:47
+#: ../../include/features.php:48
 msgid "Network Personal Tab"
 msgstr "Persönlicher Netzwerkreiter"
 
-#: ../../include/features.php:47
+#: ../../include/features.php:48
 msgid "Enable tab to display only Network posts that you've interacted on"
 msgstr "Aktiviere Reiter nur für die Netzwerk-Beiträge, mit denen Du interagiert hast"
 
-#: ../../include/features.php:48
+#: ../../include/features.php:49
 msgid "Network New Tab"
 msgstr "Netzwerkreiter Neu"
 
-#: ../../include/features.php:48
+#: ../../include/features.php:49
 msgid "Enable tab to display all new Network activity"
 msgstr "Aktiviere Reiter, um alle neuen Netzwerkaktivitäten zu zeigen"
 
-#: ../../include/features.php:49
+#: ../../include/features.php:50
 msgid "Affinity Tool"
 msgstr "Beziehungs-Tool"
 
-#: ../../include/features.php:49
+#: ../../include/features.php:50
 msgid "Filter stream activity by depth of relationships"
 msgstr "Filter Aktivitätenstream nach Tiefe der Beziehung"
 
-#: ../../include/features.php:54
+#: ../../include/features.php:55
 msgid "Post/Comment Tools"
 msgstr "Beitrag-/Kommentar-Tools"
 
-#: ../../include/features.php:55
-msgid "Multiple Deletion"
-msgstr "Mehrfachlöschung"
-
-#: ../../include/features.php:55
-msgid "Select and delete multiple posts/comments at once"
-msgstr "Mehrfachlöschung und -auswahl von Beiträgen/Kommentaren in einem Rutsch"
-
-#: ../../include/features.php:56
+#: ../../include/features.php:57
 msgid "Edit Sent Posts"
 msgstr "Bearbeite gesendete Beiträge"
 
-#: ../../include/features.php:56
+#: ../../include/features.php:57
 msgid "Edit and correct posts and comments after sending"
 msgstr "Bearbeite und korrigiere Beiträge und Kommentare nach dem Senden"
 
-#: ../../include/features.php:57
+#: ../../include/features.php:58
 msgid "Tagging"
 msgstr "Verschlagworten"
 
-#: ../../include/features.php:57
+#: ../../include/features.php:58
 msgid "Ability to tag existing posts"
 msgstr "Möglichkeit, um existierende Beiträge zu verschlagworten"
 
-#: ../../include/features.php:58
+#: ../../include/features.php:59
 msgid "Post Categories"
 msgstr "Beitrags-Kategorien"
 
-#: ../../include/features.php:58
+#: ../../include/features.php:59
 msgid "Add categories to your posts"
 msgstr "Kategorien für Beiträge"
 
-#: ../../include/features.php:59 ../../include/contact_widgets.php:76
+#: ../../include/features.php:60 ../../include/contact_widgets.php:76
 msgid "Saved Folders"
 msgstr "Gesicherte Ordner"
 
-#: ../../include/features.php:59
+#: ../../include/features.php:60
 msgid "Ability to file posts under folders"
 msgstr "Möglichkeit, Beiträge in Verzeichnissen zu sammeln"
 
-#: ../../include/features.php:60
+#: ../../include/features.php:61
 msgid "Dislike Posts"
 msgstr "Gefällt-mir-nicht Beiträge"
 
-#: ../../include/features.php:60
+#: ../../include/features.php:61
 msgid "Ability to dislike posts/comments"
 msgstr "Möglichkeit für Gefällt-mir-nicht für Beiträge/Kommentare"
 
-#: ../../include/features.php:61
+#: ../../include/features.php:62
 msgid "Star Posts"
 msgstr "Beiträge mit Sternchen versehen"
 
-#: ../../include/features.php:61
+#: ../../include/features.php:62
 msgid "Ability to mark special posts with a star indicator"
 msgstr "Möglichkeit, spezielle Beiträge mit Sternchen-Symbol zu markieren"
 
-#: ../../include/features.php:62
+#: ../../include/features.php:63
 msgid "Tag Cloud"
 msgstr "Tag Wolke"
 
-#: ../../include/features.php:62
+#: ../../include/features.php:63
 msgid "Provide a personal tag cloud on your channel page"
 msgstr "Persönliche Schlagwort-Wolke für deine Kanal-Seite anlegen"
 
@@ -877,7 +908,7 @@ msgstr "Ein gelöschte Gruppe mit diesem Namen wurde gefunden. Existierende Zuga
 msgid "Default privacy group for new contacts"
 msgstr "Standard-Privatsphärengruppe für neue Kontakte"
 
-#: ../../include/group.php:242
+#: ../../include/group.php:242 ../../mod/admin.php:695
 msgid "All Channels"
 msgstr "Alle Kanäle"
 
@@ -895,7 +926,7 @@ msgstr "Bearbeite Sammlungen"
 
 #: ../../include/group.php:287
 msgid "Create a new collection"
-msgstr "Erzeuge neue Sammlung"
+msgstr "Neue Sammlung erzeugen"
 
 #: ../../include/group.php:288
 msgid "Channels not in any collection"
@@ -925,72 +956,80 @@ msgstr "Kennwörter stimmen nicht überein"
 msgid "everybody"
 msgstr "alle"
 
+#: ../../include/js_strings.php:12
+msgid "Secret Passphrase"
+msgstr "geheime Passwort-Phrase"
+
 #: ../../include/js_strings.php:13
+msgid "Passphrase hint"
+msgstr "Hinweis zur Phrase"
+
+#: ../../include/js_strings.php:15
 msgid "timeago.prefixAgo"
 msgstr "timeago.prefixAgo"
 
-#: ../../include/js_strings.php:14
+#: ../../include/js_strings.php:16
 msgid "timeago.suffixAgo"
 msgstr "timeago.suffixAgo"
 
-#: ../../include/js_strings.php:15
+#: ../../include/js_strings.php:17
 msgid "ago"
 msgstr "her"
 
-#: ../../include/js_strings.php:16
+#: ../../include/js_strings.php:18
 msgid "from now"
 msgstr "von jetzt"
 
-#: ../../include/js_strings.php:17
+#: ../../include/js_strings.php:19
 msgid "less than a minute"
 msgstr "weniger als eine Minute"
 
-#: ../../include/js_strings.php:18
+#: ../../include/js_strings.php:20
 msgid "about a minute"
 msgstr "ungefähr eine Minute"
 
-#: ../../include/js_strings.php:19
+#: ../../include/js_strings.php:21
 #, php-format
 msgid "%d minutes"
 msgstr "%d Minuten"
 
-#: ../../include/js_strings.php:20
+#: ../../include/js_strings.php:22
 msgid "about an hour"
 msgstr "ungefähr eine Stunde"
 
-#: ../../include/js_strings.php:21
+#: ../../include/js_strings.php:23
 #, php-format
 msgid "about %d hours"
 msgstr "ungefähr %d Stunden"
 
-#: ../../include/js_strings.php:22
+#: ../../include/js_strings.php:24
 msgid "a day"
 msgstr "ein Tag"
 
-#: ../../include/js_strings.php:23
+#: ../../include/js_strings.php:25
 #, php-format
 msgid "%d days"
 msgstr "%d Tage"
 
-#: ../../include/js_strings.php:24
+#: ../../include/js_strings.php:26
 msgid "about a month"
 msgstr "ungefähr ein Monat"
 
-#: ../../include/js_strings.php:25
+#: ../../include/js_strings.php:27
 #, php-format
 msgid "%d months"
 msgstr "%d Monate"
 
-#: ../../include/js_strings.php:26
+#: ../../include/js_strings.php:28
 msgid "about a year"
 msgstr "ungefähr ein Jahr"
 
-#: ../../include/js_strings.php:27
+#: ../../include/js_strings.php:29
 #, php-format
 msgid "%d years"
 msgstr "%d Jahre"
 
-#: ../../include/js_strings.php:29
+#: ../../include/js_strings.php:31
 msgid "timeago.numbers"
 msgstr "timeago.numbers"
 
@@ -1002,11 +1041,11 @@ msgstr "Kein Empfänger angegeben"
 msgid "[no subject]"
 msgstr "[no subject]"
 
-#: ../../include/message.php:38
+#: ../../include/message.php:42
 msgid "Unable to determine sender."
 msgstr "Kann Absender nicht bestimmen."
 
-#: ../../include/message.php:138
+#: ../../include/message.php:143
 msgid "Stored post could not be verified."
 msgstr "Gespeicherter Beitrag konnten nicht überprüft werden."
 
@@ -1015,7 +1054,7 @@ msgid "view full size"
 msgstr "In Vollbildansicht anschauen"
 
 #: ../../include/photo/photo_driver.php:609 ../../include/photos.php:51
-#: ../../mod/photos.php:97 ../../mod/photos.php:772 ../../mod/photos.php:794
+#: ../../mod/photos.php:97 ../../mod/photos.php:764 ../../mod/photos.php:786
 #: ../../mod/profile_photo.php:88 ../../mod/profile_photo.php:235
 #: ../../mod/profile_photo.php:346
 msgid "Profile Photos"
@@ -1026,12 +1065,12 @@ msgstr "Profilfotos"
 msgid "Profile"
 msgstr "Profil"
 
-#: ../../include/profile_advanced.php:15 ../../mod/settings.php:1059
+#: ../../include/profile_advanced.php:15 ../../mod/settings.php:1062
 msgid "Full Name:"
 msgstr "Voller Name:"
 
-#: ../../include/profile_advanced.php:17 ../../mod/directory.php:160
-#: ../../boot.php:1762
+#: ../../include/profile_advanced.php:17 ../../mod/directory.php:175
+#: ../../boot.php:1793
 msgid "Gender:"
 msgstr "Geschlecht:"
 
@@ -1051,8 +1090,8 @@ msgstr "Geburtstag:"
 msgid "Age:"
 msgstr "Alter:"
 
-#: ../../include/profile_advanced.php:37 ../../mod/directory.php:162
-#: ../../boot.php:1763
+#: ../../include/profile_advanced.php:37 ../../mod/directory.php:177
+#: ../../boot.php:1794
 msgid "Status:"
 msgstr "Status:"
 
@@ -1065,8 +1104,8 @@ msgstr "für %1$d %2$s"
 msgid "Sexual Preference:"
 msgstr "Sexuelle Orientierung:"
 
-#: ../../include/profile_advanced.php:48 ../../mod/directory.php:164
-#: ../../boot.php:1764
+#: ../../include/profile_advanced.php:48 ../../mod/directory.php:179
+#: ../../boot.php:1795
 msgid "Homepage:"
 msgstr "Homepage:"
 
@@ -1086,7 +1125,7 @@ msgstr "Politische Ansichten:"
 msgid "Religion:"
 msgstr "Religion:"
 
-#: ../../include/profile_advanced.php:58 ../../mod/directory.php:166
+#: ../../include/profile_advanced.php:58 ../../mod/directory.php:181
 msgid "About:"
 msgstr "Über:"
 
@@ -1134,352 +1173,347 @@ msgstr "Arbeit/Anstellung:"
 msgid "School/education:"
 msgstr "Schule/Ausbildung:"
 
-#: ../../include/text.php:309
+#: ../../include/text.php:312
 msgid "prev"
 msgstr "vorherige"
 
-#: ../../include/text.php:311
+#: ../../include/text.php:314
 msgid "first"
 msgstr "erste"
 
-#: ../../include/text.php:340
+#: ../../include/text.php:343
 msgid "last"
 msgstr "letzte"
 
-#: ../../include/text.php:343
+#: ../../include/text.php:346
 msgid "next"
 msgstr "nächste"
 
-#: ../../include/text.php:355
+#: ../../include/text.php:358
 msgid "older"
 msgstr "älter"
 
-#: ../../include/text.php:357
+#: ../../include/text.php:360
 msgid "newer"
 msgstr "neuer"
 
-#: ../../include/text.php:648
+#: ../../include/text.php:651
 msgid "No connections"
 msgstr "Keine Verbindungen"
 
-#: ../../include/text.php:659
+#: ../../include/text.php:662
 #, php-format
 msgid "%d Connection"
 msgid_plural "%d Connections"
 msgstr[0] "%d Verbindung"
 msgstr[1] "%d Verbindungen"
 
-#: ../../include/text.php:671
+#: ../../include/text.php:674
 msgid "View Connections"
 msgstr "Zeige Verbindungen"
 
-#: ../../include/text.php:729 ../../include/text.php:730
-#: ../../include/nav.php:130 ../../mod/search.php:96
+#: ../../include/text.php:733 ../../include/nav.php:135
+#: ../../mod/search.php:96
 msgid "Search"
 msgstr "Suche"
 
-#: ../../include/text.php:732 ../../mod/filer.php:36
+#: ../../include/text.php:735 ../../mod/filer.php:36
 msgid "Save"
 msgstr "Speichern"
 
-#: ../../include/text.php:770
+#: ../../include/text.php:773
 msgid "poke"
 msgstr "anstupsen"
 
-#: ../../include/text.php:770 ../../include/conversation.php:236
+#: ../../include/text.php:773 ../../include/conversation.php:236
 msgid "poked"
 msgstr "stupste"
 
-#: ../../include/text.php:771
+#: ../../include/text.php:774
 msgid "ping"
 msgstr "anpingen"
 
-#: ../../include/text.php:771
+#: ../../include/text.php:774
 msgid "pinged"
 msgstr "pingte"
 
-#: ../../include/text.php:772
+#: ../../include/text.php:775
 msgid "prod"
 msgstr "knuffen"
 
-#: ../../include/text.php:772
+#: ../../include/text.php:775
 msgid "prodded"
 msgstr "knuffte"
 
-#: ../../include/text.php:773
+#: ../../include/text.php:776
 msgid "slap"
 msgstr "ohrfeigen"
 
-#: ../../include/text.php:773
+#: ../../include/text.php:776
 msgid "slapped"
 msgstr "ohrfeigte"
 
-#: ../../include/text.php:774
+#: ../../include/text.php:777
 msgid "finger"
 msgstr "befummeln"
 
-#: ../../include/text.php:774
+#: ../../include/text.php:777
 msgid "fingered"
 msgstr "befummelte"
 
-#: ../../include/text.php:775
+#: ../../include/text.php:778
 msgid "rebuff"
 msgstr "eine Abfuhr erteilen"
 
-#: ../../include/text.php:775
+#: ../../include/text.php:778
 msgid "rebuffed"
 msgstr "abfuhrerteilte"
 
-#: ../../include/text.php:787
+#: ../../include/text.php:790
 msgid "happy"
 msgstr "glücklich"
 
-#: ../../include/text.php:788
+#: ../../include/text.php:791
 msgid "sad"
 msgstr "traurig"
 
-#: ../../include/text.php:789
+#: ../../include/text.php:792
 msgid "mellow"
 msgstr "sanft"
 
-#: ../../include/text.php:790
+#: ../../include/text.php:793
 msgid "tired"
 msgstr "müde"
 
-#: ../../include/text.php:791
+#: ../../include/text.php:794
 msgid "perky"
 msgstr "frech"
 
-#: ../../include/text.php:792
+#: ../../include/text.php:795
 msgid "angry"
 msgstr "sauer"
 
-#: ../../include/text.php:793
+#: ../../include/text.php:796
 msgid "stupified"
 msgstr "verblüfft"
 
-#: ../../include/text.php:794
+#: ../../include/text.php:797
 msgid "puzzled"
 msgstr "verwirrt"
 
-#: ../../include/text.php:795
+#: ../../include/text.php:798
 msgid "interested"
 msgstr "interessiert"
 
-#: ../../include/text.php:796
+#: ../../include/text.php:799
 msgid "bitter"
 msgstr "verbittert"
 
-#: ../../include/text.php:797
+#: ../../include/text.php:800
 msgid "cheerful"
 msgstr "fröhlich"
 
-#: ../../include/text.php:798
+#: ../../include/text.php:801
 msgid "alive"
 msgstr "lebendig"
 
-#: ../../include/text.php:799
+#: ../../include/text.php:802
 msgid "annoyed"
 msgstr "verärgert"
 
-#: ../../include/text.php:800
+#: ../../include/text.php:803
 msgid "anxious"
 msgstr "unruhig"
 
-#: ../../include/text.php:801
+#: ../../include/text.php:804
 msgid "cranky"
 msgstr "schrullig"
 
-#: ../../include/text.php:802
+#: ../../include/text.php:805
 msgid "disturbed"
 msgstr "verstört"
 
-#: ../../include/text.php:803
+#: ../../include/text.php:806
 msgid "frustrated"
 msgstr "frustriert"
 
-#: ../../include/text.php:804
+#: ../../include/text.php:807
 msgid "motivated"
 msgstr "motiviert"
 
-#: ../../include/text.php:805
+#: ../../include/text.php:808
 msgid "relaxed"
 msgstr "entspannt"
 
-#: ../../include/text.php:806
+#: ../../include/text.php:809
 msgid "surprised"
 msgstr "überrascht"
 
-#: ../../include/text.php:968
+#: ../../include/text.php:973
 msgid "Monday"
 msgstr "Montag"
 
-#: ../../include/text.php:968
+#: ../../include/text.php:973
 msgid "Tuesday"
 msgstr "Dienstag"
 
-#: ../../include/text.php:968
+#: ../../include/text.php:973
 msgid "Wednesday"
 msgstr "Mittwoch"
 
-#: ../../include/text.php:968
+#: ../../include/text.php:973
 msgid "Thursday"
 msgstr "Donnerstag"
 
-#: ../../include/text.php:968
+#: ../../include/text.php:973
 msgid "Friday"
 msgstr "Freitag"
 
-#: ../../include/text.php:968
+#: ../../include/text.php:973
 msgid "Saturday"
 msgstr "Samstag"
 
-#: ../../include/text.php:968
+#: ../../include/text.php:973
 msgid "Sunday"
 msgstr "Sonntag"
 
-#: ../../include/text.php:972
+#: ../../include/text.php:977
 msgid "January"
 msgstr "Januar"
 
-#: ../../include/text.php:972
+#: ../../include/text.php:977
 msgid "February"
 msgstr "Februar"
 
-#: ../../include/text.php:972
+#: ../../include/text.php:977
 msgid "March"
 msgstr "März"
 
-#: ../../include/text.php:972
+#: ../../include/text.php:977
 msgid "April"
 msgstr "April"
 
-#: ../../include/text.php:972
+#: ../../include/text.php:977
 msgid "May"
 msgstr "Mai"
 
-#: ../../include/text.php:972
+#: ../../include/text.php:977
 msgid "June"
 msgstr "Juni"
 
-#: ../../include/text.php:972
+#: ../../include/text.php:977
 msgid "July"
 msgstr "Juli"
 
-#: ../../include/text.php:972
+#: ../../include/text.php:977
 msgid "August"
 msgstr "August"
 
-#: ../../include/text.php:972
+#: ../../include/text.php:977
 msgid "September"
 msgstr "September"
 
-#: ../../include/text.php:972
+#: ../../include/text.php:977
 msgid "October"
 msgstr "Oktober"
 
-#: ../../include/text.php:972
+#: ../../include/text.php:977
 msgid "November"
 msgstr "November"
 
-#: ../../include/text.php:972
+#: ../../include/text.php:977
 msgid "December"
 msgstr "Dezember"
 
-#: ../../include/text.php:1062 ../../mod/message.php:405
+#: ../../include/text.php:1055 ../../mod/message.php:453
 msgid "unknown.???"
 msgstr "unbekannt.???"
 
-#: ../../include/text.php:1063 ../../mod/message.php:406
+#: ../../include/text.php:1056 ../../mod/message.php:454
 msgid "bytes"
 msgstr "Bytes"
 
-#: ../../include/text.php:1099 ../../include/text.php:1114
-#: ../../include/conversation.php:828
-msgid "remove"
-msgstr "lösche"
-
-#: ../../include/text.php:1099 ../../include/text.php:1114
-msgid "[remove]"
-msgstr "[lösche]"
-
-#: ../../include/text.php:1102 ../../include/conversation.php:675
-msgid "Categories:"
-msgstr "Kategorien:"
+#: ../../include/text.php:1091
+msgid "remove category"
+msgstr "Kategorie entfernen"
 
-#: ../../include/text.php:1117 ../../include/conversation.php:676
-msgid "Filed under:"
-msgstr "Gespeichert unter:"
+#: ../../include/text.php:1113
+msgid "remove from file"
+msgstr "aus der Datei entfernen"
 
-#: ../../include/text.php:1133 ../../include/text.php:1145
+#: ../../include/text.php:1167 ../../include/text.php:1179
 msgid "Click to open/close"
 msgstr "Klicke zum Öffnen/Schließen"
 
-#: ../../include/text.php:1316 ../../mod/events.php:326
+#: ../../include/text.php:1355 ../../mod/events.php:326
 msgid "link to source"
 msgstr "Link zum Originalbeitrag"
 
-#: ../../include/text.php:1335
+#: ../../include/text.php:1374
 msgid "Select a page layout: "
 msgstr "Ein Seiten-Layout auswählen"
 
-#: ../../include/text.php:1338 ../../include/text.php:1403
+#: ../../include/text.php:1377 ../../include/text.php:1442
 msgid "default"
 msgstr "Standard"
 
-#: ../../include/text.php:1374
+#: ../../include/text.php:1413
 msgid "Page content type: "
 msgstr "Content-Typ der Seite"
 
-#: ../../include/text.php:1415
+#: ../../include/text.php:1454
 msgid "Select an alternate language"
 msgstr "Wähle eine alternative Sprache"
 
-#: ../../include/text.php:1567 ../../include/conversation.php:117
+#: ../../include/text.php:1606 ../../include/conversation.php:117
 #: ../../mod/like.php:103 ../../mod/subthread.php:89 ../../mod/tagger.php:45
 msgid "photo"
 msgstr "Foto"
 
-#: ../../include/text.php:1570 ../../include/conversation.php:120
+#: ../../include/text.php:1609 ../../include/conversation.php:120
 #: ../../mod/tagger.php:49
 msgid "event"
 msgstr "Ereignis"
 
-#: ../../include/text.php:1573 ../../include/conversation.php:145
+#: ../../include/text.php:1612 ../../include/conversation.php:145
 #: ../../mod/like.php:103 ../../mod/subthread.php:89 ../../mod/tagger.php:53
 msgid "status"
 msgstr "Status"
 
-#: ../../include/text.php:1575 ../../include/conversation.php:147
+#: ../../include/text.php:1614 ../../include/conversation.php:147
 #: ../../mod/tagger.php:55
 msgid "comment"
 msgstr "Kommentar"
 
-#: ../../include/text.php:1580
+#: ../../include/text.php:1619
 msgid "activity"
 msgstr "Aktivität"
 
-#: ../../include/text.php:1842
+#: ../../include/text.php:1881
 msgid "Design"
 msgstr "Design"
 
-#: ../../include/text.php:1844
+#: ../../include/text.php:1883
 msgid "Blocks"
 msgstr "Blöcke"
 
-#: ../../include/text.php:1845
+#: ../../include/text.php:1884
 msgid "Menus"
 msgstr "Menüs"
 
-#: ../../include/text.php:1846
+#: ../../include/text.php:1885
 msgid "Layouts"
 msgstr "Layouts"
 
-#: ../../include/text.php:1847
+#: ../../include/text.php:1886
 msgid "Pages"
 msgstr "Seiten"
 
-#: ../../include/identity.php:14 ../../mod/item.php:1172
+#: ../../include/api.php:972
+msgid "Public Timeline"
+msgstr "Öffentliche Zeitleiste"
+
+#: ../../include/identity.php:14 ../../mod/item.php:1148
 msgid "Unable to obtain identity information from database"
 msgstr "Kann keine Identitäts-Informationen aus Datenbank beziehen"
 
@@ -1495,45 +1529,57 @@ msgstr "Name ist zu lang"
 msgid "No account identifier"
 msgstr "Keine Account-Kennung"
 
-#: ../../include/identity.php:98
+#: ../../include/identity.php:90
+msgid "Nickname is required."
+msgstr "Spitzname ist erforderlich."
+
+#: ../../include/identity.php:104
 msgid ""
 "Nickname has unsupported characters or is already being used on this site."
 msgstr "Der Spitzname enthält nicht-unterstütze Zeichen oder wird bereits auf dieser Seite genutzt."
 
-#: ../../include/identity.php:157
+#: ../../include/identity.php:163
 msgid "Unable to retrieve created identity"
 msgstr "Kann die erstellte Identität nicht empfangen"
 
-#: ../../include/identity.php:214
+#: ../../include/identity.php:220
 msgid "Default Profile"
 msgstr "Standard-Profil"
 
-#: ../../include/identity.php:239 ../../include/profile_selectors.php:42
-#: ../../mod/network.php:387 ../../mod/connections.php:384
+#: ../../include/identity.php:245 ../../include/profile_selectors.php:42
+#: ../../mod/network.php:387 ../../mod/connections.php:407
 msgid "Friends"
 msgstr "Freunde"
 
-#: ../../include/bbcode.php:94 ../../include/bbcode.php:451
-#: ../../include/bbcode.php:454
+#: ../../include/bbcode.php:94 ../../include/bbcode.php:494
+#: ../../include/bbcode.php:497
 msgid "Image/photo"
 msgstr "Bild/Foto"
 
-#: ../../include/bbcode.php:141
+#: ../../include/bbcode.php:126 ../../include/bbcode.php:502
+msgid "Encrypted content"
+msgstr "Verschlüsselter Inhalt"
+
+#: ../../include/bbcode.php:173
 #, php-format
 msgid "%1$s wrote the following %2$s %3$s"
 msgstr "%1$s schrieb den folgenden %2$s %3$s"
 
-#: ../../include/bbcode.php:143
+#: ../../include/bbcode.php:175
 msgid "post"
 msgstr "Beitrag"
 
-#: ../../include/bbcode.php:411 ../../include/bbcode.php:431
+#: ../../include/bbcode.php:454 ../../include/bbcode.php:474
 msgid "$1 wrote:"
 msgstr "$1 schrieb:"
 
-#: ../../include/bbcode.php:458 ../../include/bbcode.php:459
-msgid "Encrypted content"
-msgstr "Verschlüsselter Inhalt"
+#: ../../include/oembed.php:149
+msgid "Embedded content"
+msgstr "Eingebetteter Inhalt"
+
+#: ../../include/oembed.php:158
+msgid "Embedding disabled"
+msgstr "Einbetten ausgeschaltet"
 
 #: ../../include/notify.php:23
 msgid "created a new post"
@@ -1544,41 +1590,33 @@ msgstr "Neuer Beitrag wurde erzeugt"
 msgid "commented on %s's post"
 msgstr "hat %s's Beitrag kommentiert"
 
-#: ../../include/oembed.php:148
-msgid "Embedded content"
-msgstr "Eingebetteter Inhalt"
-
-#: ../../include/oembed.php:157
-msgid "Embedding disabled"
-msgstr "Einbetten ausgeschaltet"
-
 #: ../../include/photos.php:15 ../../include/attach.php:102
 #: ../../include/attach.php:133 ../../include/attach.php:189
 #: ../../include/attach.php:204 ../../include/attach.php:237
 #: ../../include/attach.php:251 ../../include/attach.php:272
-#: ../../include/attach.php:464 ../../include/items.php:3513
-#: ../../mod/common.php:43 ../../mod/events.php:134 ../../mod/invite.php:13
-#: ../../mod/invite.php:102 ../../mod/allfriends.php:10
-#: ../../mod/webpages.php:40 ../../mod/api.php:26 ../../mod/api.php:31
-#: ../../mod/lastpost.php:93 ../../mod/page.php:30 ../../mod/setup.php:181
-#: ../../mod/settings.php:625 ../../mod/viewconnections.php:33
-#: ../../mod/viewconnections.php:38 ../../mod/delegate.php:6
-#: ../../mod/sources.php:48 ../../mod/mitem.php:92 ../../mod/group.php:15
-#: ../../mod/photos.php:74 ../../mod/photos.php:662 ../../mod/viewsrc.php:12
-#: ../../mod/menu.php:40 ../../mod/message.php:204 ../../mod/layouts.php:27
-#: ../../mod/layouts.php:42 ../../mod/network.php:7 ../../mod/intro.php:50
-#: ../../mod/connections.php:174 ../../mod/profiles.php:163
-#: ../../mod/profiles.php:476 ../../mod/new_channel.php:66
-#: ../../mod/new_channel.php:97 ../../mod/filestorage.php:26
-#: ../../mod/manage.php:6 ../../mod/crepair.php:115
-#: ../../mod/editlayout.php:48 ../../mod/nogroup.php:25
-#: ../../mod/profile_photo.php:197 ../../mod/profile_photo.php:210
-#: ../../mod/editwebpage.php:42 ../../mod/editwebpage.php:64
-#: ../../mod/notifications.php:66 ../../mod/blocks.php:29
-#: ../../mod/blocks.php:44 ../../mod/editpost.php:13 ../../mod/poke.php:128
-#: ../../mod/channel.php:118 ../../mod/fsuggest.php:78
-#: ../../mod/editblock.php:48 ../../mod/item.php:171 ../../mod/item.php:179
-#: ../../mod/suggest.php:32 ../../mod/register.php:60 ../../mod/regmod.php:18
+#: ../../include/attach.php:464 ../../include/attach.php:539
+#: ../../include/items.php:3608 ../../mod/common.php:43
+#: ../../mod/events.php:134 ../../mod/invite.php:13 ../../mod/invite.php:102
+#: ../../mod/allfriends.php:10 ../../mod/webpages.php:40 ../../mod/api.php:26
+#: ../../mod/api.php:31 ../../mod/lastpost.php:93 ../../mod/page.php:30
+#: ../../mod/page.php:80 ../../mod/setup.php:200 ../../mod/settings.php:628
+#: ../../mod/viewconnections.php:33 ../../mod/viewconnections.php:38
+#: ../../mod/delegate.php:6 ../../mod/sources.php:48 ../../mod/mitem.php:92
+#: ../../mod/group.php:15 ../../mod/photos.php:74 ../../mod/photos.php:654
+#: ../../mod/viewsrc.php:12 ../../mod/menu.php:40 ../../mod/message.php:208
+#: ../../mod/layouts.php:27 ../../mod/layouts.php:42 ../../mod/network.php:7
+#: ../../mod/intro.php:50 ../../mod/connections.php:197
+#: ../../mod/profiles.php:163 ../../mod/profiles.php:476
+#: ../../mod/new_channel.php:66 ../../mod/new_channel.php:97
+#: ../../mod/filestorage.php:26 ../../mod/manage.php:6
+#: ../../mod/crepair.php:115 ../../mod/editlayout.php:48
+#: ../../mod/nogroup.php:25 ../../mod/profile_photo.php:197
+#: ../../mod/profile_photo.php:210 ../../mod/editwebpage.php:42
+#: ../../mod/editwebpage.php:64 ../../mod/notifications.php:66
+#: ../../mod/blocks.php:29 ../../mod/blocks.php:44 ../../mod/editpost.php:13
+#: ../../mod/poke.php:128 ../../mod/channel.php:123 ../../mod/fsuggest.php:78
+#: ../../mod/editblock.php:48 ../../mod/item.php:181 ../../mod/item.php:189
+#: ../../mod/suggest.php:32 ../../mod/register.php:68 ../../mod/regmod.php:18
 #: ../../mod/mood.php:114 ../../index.php:178 ../../index.php:340
 msgid "Permission denied."
 msgstr "Zugang verweigert"
@@ -1600,12 +1638,12 @@ msgstr "Kann Bild nicht verarbeiten"
 msgid "Photo storage failed."
 msgstr "Foto speichern schlug fehl"
 
-#: ../../include/photos.php:288 ../../boot.php:2211
+#: ../../include/photos.php:288 ../../boot.php:2242
 msgid "Photo Albums"
 msgstr "Fotoalben"
 
-#: ../../include/photos.php:292 ../../mod/photos.php:810
-#: ../../mod/photos.php:1287
+#: ../../include/photos.php:292 ../../mod/photos.php:802
+#: ../../mod/photos.php:1276
 msgid "Upload New Photos"
 msgstr "Lade neue Fotos hoch"
 
@@ -1875,250 +1913,277 @@ msgstr "Gespeichert Datei konnte nicht verifiziert werden. Upload abgebrochen."
 msgid "Path not available."
 msgstr "Pfad nicht verfügbar."
 
-#: ../../include/nav.php:71 ../../include/nav.php:86 ../../boot.php:1435
+#: ../../include/attach.php:544
+msgid "Empty pathname"
+msgstr "leere Pfadangabe"
+
+#: ../../include/attach.php:562
+msgid "duplicate filename or path"
+msgstr "doppelter Dateiname oder Pfad"
+
+#: ../../include/attach.php:584
+msgid "Path not found."
+msgstr "Pfad nicht gefunden."
+
+#: ../../include/attach.php:628
+msgid "mkdir failed."
+msgstr "mkdir fehlgeschlagen."
+
+#: ../../include/attach.php:632
+msgid "database storage failed."
+msgstr "Speichern in der Datenbank fehlgeschlagen."
+
+#: ../../include/zot.php:542
+msgid "Invalid data packet"
+msgstr "Ungültiges Datenpaket"
+
+#: ../../include/zot.php:552
+msgid "Unable to verify channel signature"
+msgstr "Konnte die Signatur des Kanals nicht verifizieren"
+
+#: ../../include/zot.php:697
+#, php-format
+msgid "Unable to verify site signature for %s"
+msgstr "Kann die Signatur der Seite von %s nicht verifizieren"
+
+#: ../../include/nav.php:72 ../../include/nav.php:87 ../../boot.php:1458
 msgid "Logout"
 msgstr "Abmelden"
 
-#: ../../include/nav.php:71 ../../include/nav.php:86
+#: ../../include/nav.php:72 ../../include/nav.php:87
 msgid "End this session"
 msgstr "Beende diese Sitzung"
 
-#: ../../include/nav.php:74 ../../include/nav.php:116
-#: ../../include/nav.php:148
+#: ../../include/nav.php:75 ../../include/nav.php:121
 msgid "Home"
 msgstr "Home"
 
-#: ../../include/nav.php:74 ../../include/nav.php:148
+#: ../../include/nav.php:75
 msgid "Your posts and conversations"
 msgstr "Deine Beiträge und Unterhaltungen"
 
-#: ../../include/nav.php:75
+#: ../../include/nav.php:76
 msgid "Your profile page"
 msgstr "Deine Profilseite"
 
-#: ../../include/nav.php:77
+#: ../../include/nav.php:78
 msgid "Edit Profiles"
 msgstr "Profile bearbeiten"
 
-#: ../../include/nav.php:77
+#: ../../include/nav.php:78
 msgid "Manage/Edit Profiles"
 msgstr "Verwalte/Bearbeite Profile"
 
-#: ../../include/nav.php:78 ../../mod/fbrowser.php:25 ../../boot.php:2208
+#: ../../include/nav.php:79 ../../mod/fbrowser.php:25 ../../boot.php:2239
 msgid "Photos"
 msgstr "Fotos"
 
-#: ../../include/nav.php:78
+#: ../../include/nav.php:79
 msgid "Your photos"
 msgstr "Deine Bilder"
 
-#: ../../include/nav.php:84 ../../boot.php:1436
+#: ../../include/nav.php:85 ../../boot.php:1459
 msgid "Login"
 msgstr "Anmelden"
 
-#: ../../include/nav.php:84
+#: ../../include/nav.php:85
 msgid "Sign in"
 msgstr "Anmelden"
 
-#: ../../include/nav.php:100
+#: ../../include/nav.php:102
 #, php-format
 msgid "%s - click to logout"
 msgstr "%s - Klick zum Abmelden"
 
-#: ../../include/nav.php:103
+#: ../../include/nav.php:107
 msgid "Click to authenticate to your home hub"
 msgstr "Klick zum Authentifizieren bei Deinem Heimat-Hub"
 
-#: ../../include/nav.php:116
+#: ../../include/nav.php:121
 msgid "Home Page"
 msgstr "Homepage"
 
-#: ../../include/nav.php:120 ../../mod/register.php:187 ../../boot.php:1411
+#: ../../include/nav.php:125 ../../mod/register.php:195 ../../boot.php:1435
 msgid "Register"
 msgstr "Registrieren"
 
-#: ../../include/nav.php:120
+#: ../../include/nav.php:125
 msgid "Create an account"
 msgstr "Erzeuge ein Konto"
 
-#: ../../include/nav.php:125 ../../mod/help.php:34
+#: ../../include/nav.php:130 ../../mod/help.php:45 ../../mod/help.php:49
 msgid "Help"
 msgstr "Hilfe"
 
-#: ../../include/nav.php:125
+#: ../../include/nav.php:130
 msgid "Help and documentation"
 msgstr "Hilfe und Dokumentation"
 
-#: ../../include/nav.php:128
+#: ../../include/nav.php:133
 msgid "Apps"
 msgstr "Apps"
 
-#: ../../include/nav.php:128
+#: ../../include/nav.php:133
 msgid "Addon applications, utilities, games"
 msgstr "Addon Programme, Helferlein, Spiele"
 
-#: ../../include/nav.php:130
+#: ../../include/nav.php:135
 msgid "Search site content"
 msgstr "Durchsuche Seiten-Inhalt"
 
-#: ../../include/nav.php:133 ../../mod/directory.php:210
+#: ../../include/nav.php:138 ../../mod/directory.php:225
 msgid "Directory"
 msgstr "Verzeichnis"
 
-#: ../../include/nav.php:133
+#: ../../include/nav.php:138
 msgid "Channel Locator"
 msgstr "Kanal-Anzeiger"
 
-#: ../../include/nav.php:144
+#: ../../include/nav.php:149
 msgid "Matrix"
 msgstr "Matrix"
 
-#: ../../include/nav.php:144
-msgid "Conversations from your grid"
-msgstr "Unterhaltungen von Deinem Netz"
+#: ../../include/nav.php:149
+msgid "Your matrix"
+msgstr "Deine Matrix"
 
-#: ../../include/nav.php:145
+#: ../../include/nav.php:150
 msgid "See all matrix notifications"
 msgstr "Alle Matrix-Benachrichtigungen ansehen"
 
-#: ../../include/nav.php:146
+#: ../../include/nav.php:151
 msgid "Mark all matrix notifications seen"
 msgstr "Markiere alle Matrix-Benachrichtigungen als angesehen"
 
-#: ../../include/nav.php:149
+#: ../../include/nav.php:153
+msgid "Channel Home"
+msgstr "Mein Kanal"
+
+#: ../../include/nav.php:153
+msgid "Channel home"
+msgstr "Mein Kanal"
+
+#: ../../include/nav.php:154
 msgid "See all channel notifications"
 msgstr "Alle Kanal-Benachrichtigungen ansehen"
 
-#: ../../include/nav.php:150
+#: ../../include/nav.php:155
 msgid "Mark all channel notifications seen"
 msgstr "Markiere alle Kanal-Benachrichtigungen als angesehen"
 
-#: ../../include/nav.php:153
+#: ../../include/nav.php:158
 msgid "Intros"
 msgstr "Vorstellungen"
 
-#: ../../include/nav.php:153 ../../mod/connections.php:561
+#: ../../include/nav.php:158 ../../mod/connections.php:585
 msgid "New Connections"
 msgstr "Neue Verbindungen"
 
-#: ../../include/nav.php:154
+#: ../../include/nav.php:159
 msgid "See all channel introductions"
 msgstr "Alle Kanal-Einladungen ansehen"
 
-#: ../../include/nav.php:157
+#: ../../include/nav.php:162
 msgid "Notices"
 msgstr "Benachrichtigungen"
 
-#: ../../include/nav.php:157 ../../mod/notifications.php:218
+#: ../../include/nav.php:162 ../../mod/notifications.php:218
 msgid "Notifications"
 msgstr "Benachrichtigungen"
 
-#: ../../include/nav.php:158
+#: ../../include/nav.php:163
 msgid "See all notifications"
 msgstr "Alle Benachrichtigungen ansehen"
 
-#: ../../include/nav.php:159
+#: ../../include/nav.php:164
 msgid "Mark all system notifications seen"
 msgstr "Markiere alle System-Benachrichtigungen als gesehen"
 
-#: ../../include/nav.php:161
+#: ../../include/nav.php:166
 msgid "Mail"
 msgstr "Mail"
 
-#: ../../include/nav.php:161
+#: ../../include/nav.php:166
 msgid "Private mail"
 msgstr "Persönliche Mail"
 
-#: ../../include/nav.php:162
+#: ../../include/nav.php:167
 msgid "See all private messages"
 msgstr "Alle persönlichen Nachrichten ansehen"
 
-#: ../../include/nav.php:163
+#: ../../include/nav.php:168
 msgid "Mark all private messages seen"
 msgstr "Markiere alle persönlichen Nachrichten als gesehen"
 
-#: ../../include/nav.php:164
+#: ../../include/nav.php:169
 msgid "Inbox"
 msgstr "Eingang"
 
-#: ../../include/nav.php:165
+#: ../../include/nav.php:170
 msgid "Outbox"
 msgstr "Ausgang"
 
-#: ../../include/nav.php:166 ../../mod/message.php:21
+#: ../../include/nav.php:171 ../../mod/message.php:24
 msgid "New Message"
 msgstr "Neue Nachricht"
 
-#: ../../include/nav.php:169 ../../mod/events.php:348 ../../boot.php:2219
+#: ../../include/nav.php:174 ../../mod/events.php:348 ../../boot.php:2250
 msgid "Events"
 msgstr "Veranstaltungen"
 
-#: ../../include/nav.php:169
+#: ../../include/nav.php:174
 msgid "Event Calendar"
 msgstr "Veranstaltungskalender"
 
-#: ../../include/nav.php:170
+#: ../../include/nav.php:175
 msgid "See all events"
 msgstr "Alle Ereignisse ansehen"
 
-#: ../../include/nav.php:171
+#: ../../include/nav.php:176
 msgid "Mark all events seen"
 msgstr "Markiere alle Ereignisse als gesehen"
 
-#: ../../include/nav.php:173
+#: ../../include/nav.php:178
 msgid "Channel Select"
 msgstr "Kanal-Auswahl"
 
-#: ../../include/nav.php:173
+#: ../../include/nav.php:178
 msgid "Manage Your Channels"
 msgstr "Verwalte Deine Kanäle"
 
-#: ../../include/nav.php:175 ../../mod/settings.php:129
-#: ../../mod/admin.php:769 ../../mod/admin.php:974
+#: ../../include/nav.php:180 ../../mod/settings.php:131
+#: ../../mod/admin.php:782 ../../mod/admin.php:987
 msgid "Settings"
 msgstr "Einstellungen"
 
-#: ../../include/nav.php:175
+#: ../../include/nav.php:180
 msgid "Account/Channel Settings"
 msgstr "Konto-/Kanal-Einstellungen"
 
-#: ../../include/nav.php:177 ../../mod/connections.php:667
+#: ../../include/nav.php:182 ../../mod/connections.php:691
 msgid "Connections"
 msgstr "Verbindungen"
 
-#: ../../include/nav.php:177
+#: ../../include/nav.php:182
 msgid "Manage/Edit Friends and Connections"
 msgstr "Verwalte/Bearbeite Freunde und Verbindungen"
 
-#: ../../include/nav.php:184 ../../mod/admin.php:111
+#: ../../include/nav.php:189 ../../mod/admin.php:111
 msgid "Admin"
 msgstr "Admin"
 
-#: ../../include/nav.php:184
+#: ../../include/nav.php:189
 msgid "Site Setup and Configuration"
 msgstr "Seiten-Einrichtung und -Konfiguration"
 
-#: ../../include/nav.php:207
+#: ../../include/nav.php:215
 msgid "Nothing new here"
 msgstr "Nichts Neues hier"
 
-#: ../../include/nav.php:212
+#: ../../include/nav.php:220
 msgid "Please wait..."
 msgstr "Bitte warten..."
 
-#: ../../include/zot.php:426
-msgid "Invalid data packet"
-msgstr "Ungültiges Datenpaket"
-
-#: ../../include/zot.php:436
-msgid "Unable to verify channel signature"
-msgstr "Konnte die Signatur des Kanals nicht verifizieren"
-
-#: ../../include/zot.php:582
-#, php-format
-msgid "Unable to verify site signature for %s"
-msgstr "Kann die Signatur der Seite von %s nicht verifizieren"
-
 #: ../../include/account.php:23
 msgid "Not a valid email address"
 msgstr "Ungültige E-Mail-Adresse"
@@ -2175,15 +2240,282 @@ msgstr "Account bestätigt."
 msgid "Registration revoked for %s"
 msgstr "Registrierung für %s widerrufen"
 
-#: ../../include/auth.php:66
+#: ../../include/conversation.php:123
+msgid "channel"
+msgstr "Kanal"
+
+#: ../../include/conversation.php:161 ../../mod/like.php:134
+#, php-format
+msgid "%1$s likes %2$s's %3$s"
+msgstr "%1$s mag %2$s's %3$s"
+
+#: ../../include/conversation.php:164 ../../mod/like.php:136
+#, php-format
+msgid "%1$s doesn't like %2$s's %3$s"
+msgstr "%1$s mag %2$s's %3$s nicht"
+
+#: ../../include/conversation.php:201
+#, php-format
+msgid "%1$s is now connected with %2$s"
+msgstr "%1$s ist jetzt mit %2$s verbunden"
+
+#: ../../include/conversation.php:232
+#, php-format
+msgid "%1$s poked %2$s"
+msgstr "%1$s stupste %2$s"
+
+#: ../../include/conversation.php:254 ../../mod/mood.php:63
+#, php-format
+msgid "%1$s is currently %2$s"
+msgstr "%1$s ist momentan %2$s"
+
+#: ../../include/conversation.php:658
+#, php-format
+msgid "View %s's profile @ %s"
+msgstr "Schaue Dir %s's Profil auf %s an."
+
+#: ../../include/conversation.php:672
+msgid "Categories:"
+msgstr "Kategorien:"
+
+#: ../../include/conversation.php:673
+msgid "Filed under:"
+msgstr "Gespeichert unter:"
+
+#: ../../include/conversation.php:700
+msgid "View in context"
+msgstr "Im Zusammenhang anschauen"
+
+#: ../../include/conversation.php:826
+msgid "remove"
+msgstr "lösche"
+
+#: ../../include/conversation.php:830
+msgid "Loading..."
+msgstr "Lädt ..."
+
+#: ../../include/conversation.php:831
+msgid "Delete Selected Items"
+msgstr "Lösche die ausgewählten Elemente"
+
+#: ../../include/conversation.php:922
+msgid "View Source"
+msgstr "Quelle anzeigen"
+
+#: ../../include/conversation.php:923
+msgid "Follow Thread"
+msgstr "Unterhaltung folgen"
+
+#: ../../include/conversation.php:927
+msgid "Matrix Activity"
+msgstr "Matrix Aktivität"
+
+#: ../../include/conversation.php:992
+#, php-format
+msgid "%s likes this."
+msgstr "%s gefällt das."
+
+#: ../../include/conversation.php:992
+#, php-format
+msgid "%s doesn't like this."
+msgstr "%s gefällt das nicht."
+
+#: ../../include/conversation.php:996
+#, php-format
+msgid "<span  %1$s>%2$d people</span> like this."
+msgid_plural "<span  %1$s>%2$d people</span> like this."
+msgstr[0] ""
+msgstr[1] "<span  %1$s>%2$d Personen</span> mögen dies."
+
+#: ../../include/conversation.php:998
+#, php-format
+msgid "<span  %1$s>%2$d people</span> don't like this."
+msgid_plural "<span  %1$s>%2$d people</span> don't like this."
+msgstr[0] ""
+msgstr[1] "<span  %1$s>%2$d Personen</span> mögen dies nicht."
+
+#: ../../include/conversation.php:1004
+msgid "and"
+msgstr "und"
+
+#: ../../include/conversation.php:1007
+#, php-format
+msgid ", and %d other people"
+msgid_plural ", and %d other people"
+msgstr[0] ""
+msgstr[1] ", und %d andere"
+
+#: ../../include/conversation.php:1008
+#, php-format
+msgid "%s like this."
+msgstr "%s gefällt das."
+
+#: ../../include/conversation.php:1008
+#, php-format
+msgid "%s don't like this."
+msgstr "%s gefällt das nicht."
+
+#: ../../include/conversation.php:1058
+msgid "Visible to <strong>everybody</strong>"
+msgstr "Sichtbar für <strong>jeden</strong>"
+
+#: ../../include/conversation.php:1059 ../../mod/message.php:281
+#: ../../mod/message.php:417
+msgid "Please enter a link URL:"
+msgstr "Geben Sie eine URL ein:"
+
+#: ../../include/conversation.php:1060
+msgid "Please enter a video link/URL:"
+msgstr "Geben Sie einen Video-Link/URL ein:"
+
+#: ../../include/conversation.php:1061
+msgid "Please enter an audio link/URL:"
+msgstr "Geben Sie einen Audio-Link/URL ein:"
+
+#: ../../include/conversation.php:1062
+msgid "Tag term:"
+msgstr "Schlagwort:"
+
+#: ../../include/conversation.php:1063 ../../mod/filer.php:35
+msgid "Save to Folder:"
+msgstr "Speichern in Ordner:"
+
+#: ../../include/conversation.php:1064
+msgid "Where are you right now?"
+msgstr "Wo bist du jetzt grade?"
+
+#: ../../include/conversation.php:1065 ../../mod/message.php:282
+#: ../../mod/message.php:418 ../../mod/editpost.php:52
+msgid "Expires YYYY-MM-DD HH:MM"
+msgstr "Verfällt YYYY-MM-DD HH;MM"
+
+#: ../../include/conversation.php:1089 ../../mod/photos.php:1060
+msgid "Share"
+msgstr "Teilen"
+
+#: ../../include/conversation.php:1091
+msgid "Page link title"
+msgstr "Seitentitel-Link"
+
+#: ../../include/conversation.php:1093 ../../mod/message.php:329
+#: ../../mod/message.php:512 ../../mod/editlayout.php:101
+#: ../../mod/editwebpage.php:120 ../../mod/editpost.php:98
+#: ../../mod/editblock.php:115
+msgid "Upload photo"
+msgstr "Foto hochladen"
+
+#: ../../include/conversation.php:1094
+msgid "upload photo"
+msgstr "Foto hochladen"
+
+#: ../../include/conversation.php:1095 ../../mod/message.php:330
+#: ../../mod/message.php:513 ../../mod/editlayout.php:102
+#: ../../mod/editwebpage.php:121 ../../mod/editpost.php:99
+#: ../../mod/editblock.php:116
+msgid "Attach file"
+msgstr "Datei anhängen"
+
+#: ../../include/conversation.php:1096
+msgid "attach file"
+msgstr "Datei anfügen"
+
+#: ../../include/conversation.php:1097 ../../mod/message.php:331
+#: ../../mod/message.php:514 ../../mod/editlayout.php:103
+#: ../../mod/editwebpage.php:122 ../../mod/editpost.php:100
+#: ../../mod/editblock.php:117
+msgid "Insert web link"
+msgstr "Link einfügen"
+
+#: ../../include/conversation.php:1098
+msgid "web link"
+msgstr "Web-Link"
+
+#: ../../include/conversation.php:1099
+msgid "Insert video link"
+msgstr "Video-Link einfügen"
+
+#: ../../include/conversation.php:1100
+msgid "video link"
+msgstr "Video-Link"
+
+#: ../../include/conversation.php:1101
+msgid "Insert audio link"
+msgstr "Audio-Link einfügen"
+
+#: ../../include/conversation.php:1102
+msgid "audio link"
+msgstr "Audio-Link"
+
+#: ../../include/conversation.php:1103 ../../mod/editlayout.php:107
+#: ../../mod/editwebpage.php:126 ../../mod/editpost.php:104
+#: ../../mod/editblock.php:121
+msgid "Set your location"
+msgstr "Legen Sie Ihren Aufenthaltsort fest"
+
+#: ../../include/conversation.php:1104
+msgid "set location"
+msgstr "Ort festlegen"
+
+#: ../../include/conversation.php:1105 ../../mod/editlayout.php:108
+#: ../../mod/editwebpage.php:127 ../../mod/editpost.php:105
+#: ../../mod/editblock.php:122
+msgid "Clear browser location"
+msgstr "Browser-Standort löschen"
+
+#: ../../include/conversation.php:1106
+msgid "clear location"
+msgstr "Standort löschen"
+
+#: ../../include/conversation.php:1108 ../../mod/editlayout.php:121
+#: ../../mod/editwebpage.php:142 ../../mod/editpost.php:118
+#: ../../mod/editblock.php:136
+msgid "Set title"
+msgstr "Titel festlegen"
+
+#: ../../include/conversation.php:1111 ../../mod/editlayout.php:123
+#: ../../mod/editwebpage.php:144 ../../mod/editpost.php:120
+#: ../../mod/editblock.php:138
+msgid "Categories (comma-separated list)"
+msgstr "Kategorien (Kommagetrennte Liste)"
+
+#: ../../include/conversation.php:1113 ../../mod/editlayout.php:110
+#: ../../mod/editwebpage.php:129 ../../mod/editpost.php:107
+#: ../../mod/editblock.php:124
+msgid "Permission settings"
+msgstr "Berechtigungs-Einstellungen"
+
+#: ../../include/conversation.php:1114
+msgid "permissions"
+msgstr "Berechtigungen"
+
+#: ../../include/conversation.php:1122 ../../mod/editlayout.php:118
+#: ../../mod/editwebpage.php:137 ../../mod/editpost.php:115
+#: ../../mod/editblock.php:133
+msgid "Public post"
+msgstr "Öffentlicher Beitrag"
+
+#: ../../include/conversation.php:1124 ../../mod/editlayout.php:124
+#: ../../mod/editwebpage.php:145 ../../mod/editpost.php:121
+#: ../../mod/editblock.php:139
+msgid "Example: bob@example.com, mary@example.com"
+msgstr "Beispiel: bob@example.com, mary@example.com"
+
+#: ../../include/conversation.php:1137 ../../mod/message.php:336
+#: ../../mod/message.php:519 ../../mod/editlayout.php:134
+#: ../../mod/editwebpage.php:155 ../../mod/editpost.php:132
+#: ../../mod/editblock.php:149
+msgid "Set expiration date"
+msgstr "Verfallsdatum setzen"
+
+#: ../../include/auth.php:67
 msgid "Logged out."
 msgstr "Ausgeloggt."
 
-#: ../../include/auth.php:178
+#: ../../include/auth.php:179
 msgid "Failed authentication"
 msgstr "Authentifizierung fehlgeschlagen"
 
-#: ../../include/auth.php:187
+#: ../../include/auth.php:188
 msgid "Login failed."
 msgstr "Login fehlgeschlagen."
 
@@ -2227,8 +2559,8 @@ msgstr "Verbinden/Folgen"
 msgid "Examples: Robert Morgenstein, Fishing"
 msgstr "Beispiele: Robert Morgenstein, Angeln"
 
-#: ../../include/contact_widgets.php:48 ../../mod/connections.php:673
-#: ../../mod/directory.php:206 ../../mod/directory.php:211
+#: ../../include/contact_widgets.php:48 ../../mod/connections.php:697
+#: ../../mod/directory.php:221 ../../mod/directory.php:226
 msgid "Find"
 msgstr "Finde"
 
@@ -2248,7 +2580,7 @@ msgstr "Lade Freunde ein"
 msgid "Everything"
 msgstr "Alles"
 
-#: ../../include/contact_widgets.php:110
+#: ../../include/contact_widgets.php:110 ../../include/widgets.php:26
 msgid "Categories"
 msgstr "Kategorien"
 
@@ -2376,291 +2708,55 @@ msgid ""
 "Extremely advanced. Leave this alone unless you know what you are doing"
 msgstr "Sehr fortgeschritten. Bearbeite dies nur, wenn du genau weißt, was du machst"
 
-#: ../../include/taxonomy.php:208
+#: ../../include/taxonomy.php:210
 msgid "Tags"
 msgstr "Tags"
 
-#: ../../include/taxonomy.php:222
+#: ../../include/taxonomy.php:224
 msgid "Keywords"
 msgstr "Schlüsselbegriffe"
 
-#: ../../include/taxonomy.php:247
+#: ../../include/taxonomy.php:249
 msgid "have"
 msgstr "habe"
 
-#: ../../include/taxonomy.php:247
+#: ../../include/taxonomy.php:249
 msgid "has"
 msgstr "hat"
 
-#: ../../include/taxonomy.php:248
+#: ../../include/taxonomy.php:250
 msgid "want"
 msgstr "will"
 
-#: ../../include/taxonomy.php:248
+#: ../../include/taxonomy.php:250
 msgid "wants"
 msgstr "will"
 
-#: ../../include/taxonomy.php:249
+#: ../../include/taxonomy.php:251
 msgid "likes"
 msgstr "Gefällt-mir"
 
-#: ../../include/taxonomy.php:250
+#: ../../include/taxonomy.php:252
 msgid "dislikes"
 msgstr "Gefällt-mir-nicht"
 
-#: ../../include/plugin.php:440 ../../include/plugin.php:442
+#: ../../include/plugin.php:473 ../../include/plugin.php:475
 msgid "Click here to upgrade."
 msgstr "Klicke hier, um das Upgrade durchzuführen."
 
-#: ../../include/plugin.php:448
+#: ../../include/plugin.php:481
 msgid "This action exceeds the limits set by your subscription plan."
 msgstr "Diese Aktion überschreitet die Grenzen Ihres Abonnements."
 
-#: ../../include/plugin.php:453
+#: ../../include/plugin.php:486
 msgid "This action is not available under your subscription plan."
 msgstr "Diese Aktion ist in Ihrem Abonnement nicht verfügbar."
 
-#: ../../include/comanche.php:33
+#: ../../include/comanche.php:35 ../../view/theme/redbasic/php/config.php:62
+#: ../../view/theme/apw/php/config.php:176
 msgid "Default"
 msgstr "Standard"
 
-#: ../../include/conversation.php:123
-msgid "channel"
-msgstr "Kanal"
-
-#: ../../include/conversation.php:161 ../../mod/like.php:134
-#, php-format
-msgid "%1$s likes %2$s's %3$s"
-msgstr "%1$s mag %2$s's %3$s"
-
-#: ../../include/conversation.php:164 ../../mod/like.php:136
-#, php-format
-msgid "%1$s doesn't like %2$s's %3$s"
-msgstr "%1$s mag %2$s's %3$s nicht"
-
-#: ../../include/conversation.php:201
-#, php-format
-msgid "%1$s is now connected with %2$s"
-msgstr "%1$s ist jetzt mit %2$s verbunden"
-
-#: ../../include/conversation.php:232
-#, php-format
-msgid "%1$s poked %2$s"
-msgstr "%1$s stupste %2$s"
-
-#: ../../include/conversation.php:254 ../../mod/mood.php:63
-#, php-format
-msgid "%1$s is currently %2$s"
-msgstr "%1$s ist momentan %2$s"
-
-#: ../../include/conversation.php:661
-#, php-format
-msgid "View %s's profile @ %s"
-msgstr "Schaue Dir %s's Profil auf %s an."
-
-#: ../../include/conversation.php:702
-msgid "View in context"
-msgstr "Im Zusammenhang anschauen"
-
-#: ../../include/conversation.php:832
-msgid "Loading..."
-msgstr "Lädt ..."
-
-#: ../../include/conversation.php:833
-msgid "Delete Selected Items"
-msgstr "Lösche die ausgewählten Elemente"
-
-#: ../../include/conversation.php:924
-msgid "View Source"
-msgstr "Quelle anzeigen"
-
-#: ../../include/conversation.php:925
-msgid "Follow Thread"
-msgstr "Unterhaltung folgen"
-
-#: ../../include/conversation.php:929
-msgid "Matrix Activity"
-msgstr "Matrix Aktivität"
-
-#: ../../include/conversation.php:994
-#, php-format
-msgid "%s likes this."
-msgstr "%s gefällt das."
-
-#: ../../include/conversation.php:994
-#, php-format
-msgid "%s doesn't like this."
-msgstr "%s gefällt das nicht."
-
-#: ../../include/conversation.php:998
-#, php-format
-msgid "<span  %1$s>%2$d people</span> like this."
-msgstr "<span  %1$s>%2$d Personen</span> mögen dies."
-
-#: ../../include/conversation.php:1000
-#, php-format
-msgid "<span  %1$s>%2$d people</span> don't like this."
-msgstr "<span  %1$s>%2$d Personen</span> mögen dies nicht."
-
-#: ../../include/conversation.php:1006
-msgid "and"
-msgstr "und"
-
-#: ../../include/conversation.php:1009
-#, php-format
-msgid ", and %d other people"
-msgstr ", und %d andere"
-
-#: ../../include/conversation.php:1010
-#, php-format
-msgid "%s like this."
-msgstr "%s gefällt das."
-
-#: ../../include/conversation.php:1010
-#, php-format
-msgid "%s don't like this."
-msgstr "%s gefällt das nicht."
-
-#: ../../include/conversation.php:1060
-msgid "Visible to <strong>everybody</strong>"
-msgstr "Sichtbar für <strong>jeden</strong>"
-
-#: ../../include/conversation.php:1061 ../../mod/message.php:253
-#: ../../mod/message.php:370
-msgid "Please enter a link URL:"
-msgstr "Geben Sie eine URL ein:"
-
-#: ../../include/conversation.php:1062
-msgid "Please enter a video link/URL:"
-msgstr "Geben Sie einen Video-Link/URL ein:"
-
-#: ../../include/conversation.php:1063
-msgid "Please enter an audio link/URL:"
-msgstr "Geben Sie einen Audio-Link/URL ein:"
-
-#: ../../include/conversation.php:1064
-msgid "Tag term:"
-msgstr "Schlagwort:"
-
-#: ../../include/conversation.php:1065 ../../mod/filer.php:35
-msgid "Save to Folder:"
-msgstr "Speichern in Ordner:"
-
-#: ../../include/conversation.php:1066
-msgid "Where are you right now?"
-msgstr "Wo bist du jetzt grade?"
-
-#: ../../include/conversation.php:1081 ../../mod/photos.php:1072
-msgid "Share"
-msgstr "Teilen"
-
-#: ../../include/conversation.php:1083
-msgid "Page link title"
-msgstr "Seitentitel-Link"
-
-#: ../../include/conversation.php:1085 ../../mod/message.php:300
-#: ../../mod/message.php:462 ../../mod/editlayout.php:101
-#: ../../mod/editwebpage.php:120 ../../mod/editpost.php:95
-#: ../../mod/editblock.php:115
-msgid "Upload photo"
-msgstr "Foto hochladen"
-
-#: ../../include/conversation.php:1086
-msgid "upload photo"
-msgstr "Foto hochladen"
-
-#: ../../include/conversation.php:1087 ../../mod/message.php:301
-#: ../../mod/message.php:463 ../../mod/editlayout.php:102
-#: ../../mod/editwebpage.php:121 ../../mod/editpost.php:96
-#: ../../mod/editblock.php:116
-msgid "Attach file"
-msgstr "Datei anhängen"
-
-#: ../../include/conversation.php:1088
-msgid "attach file"
-msgstr "Datei anfügen"
-
-#: ../../include/conversation.php:1089 ../../mod/message.php:302
-#: ../../mod/message.php:464 ../../mod/editlayout.php:103
-#: ../../mod/editwebpage.php:122 ../../mod/editpost.php:97
-#: ../../mod/editblock.php:117
-msgid "Insert web link"
-msgstr "Link einfügen"
-
-#: ../../include/conversation.php:1090
-msgid "web link"
-msgstr "Web-Link"
-
-#: ../../include/conversation.php:1091
-msgid "Insert video link"
-msgstr "Video-Link einfügen"
-
-#: ../../include/conversation.php:1092
-msgid "video link"
-msgstr "Video-Link"
-
-#: ../../include/conversation.php:1093
-msgid "Insert audio link"
-msgstr "Audio-Link einfügen"
-
-#: ../../include/conversation.php:1094
-msgid "audio link"
-msgstr "Audio-Link"
-
-#: ../../include/conversation.php:1095 ../../mod/editlayout.php:107
-#: ../../mod/editwebpage.php:126 ../../mod/editpost.php:101
-#: ../../mod/editblock.php:121
-msgid "Set your location"
-msgstr "Legen Sie Ihren Aufenthaltsort fest"
-
-#: ../../include/conversation.php:1096
-msgid "set location"
-msgstr "Ort festlegen"
-
-#: ../../include/conversation.php:1097 ../../mod/editlayout.php:108
-#: ../../mod/editwebpage.php:127 ../../mod/editpost.php:102
-#: ../../mod/editblock.php:122
-msgid "Clear browser location"
-msgstr "Browser-Standort löschen"
-
-#: ../../include/conversation.php:1098
-msgid "clear location"
-msgstr "Standort löschen"
-
-#: ../../include/conversation.php:1100 ../../mod/editlayout.php:121
-#: ../../mod/editwebpage.php:142 ../../mod/editpost.php:115
-#: ../../mod/editblock.php:136
-msgid "Set title"
-msgstr "Titel festlegen"
-
-#: ../../include/conversation.php:1103 ../../mod/editlayout.php:123
-#: ../../mod/editwebpage.php:144 ../../mod/editpost.php:117
-#: ../../mod/editblock.php:138
-msgid "Categories (comma-separated list)"
-msgstr "Kategorien (Kommagetrennte Liste)"
-
-#: ../../include/conversation.php:1105 ../../mod/editlayout.php:110
-#: ../../mod/editwebpage.php:129 ../../mod/editpost.php:104
-#: ../../mod/editblock.php:124
-msgid "Permission settings"
-msgstr "Berechtigungs-Einstellungen"
-
-#: ../../include/conversation.php:1106
-msgid "permissions"
-msgstr "Berechtigungen"
-
-#: ../../include/conversation.php:1114 ../../mod/editlayout.php:118
-#: ../../mod/editwebpage.php:137 ../../mod/editpost.php:112
-#: ../../mod/editblock.php:133
-msgid "Public post"
-msgstr "Öffentlicher Beitrag"
-
-#: ../../include/conversation.php:1116 ../../mod/editlayout.php:124
-#: ../../mod/editwebpage.php:145 ../../mod/editpost.php:118
-#: ../../mod/editblock.php:139
-msgid "Example: bob@example.com, mary@example.com"
-msgstr "Beispiel: bob@example.com, mary@example.com"
-
 #: ../../include/security.php:49
 msgid "Welcome "
 msgstr "Willkommen"
@@ -2684,28 +2780,56 @@ msgstr "Das Security-Token des Formulars war nicht korrekt. Das ist wahrscheinli
 msgid "Permission denied"
 msgstr "Keine Berechtigung"
 
-#: ../../include/items.php:3462 ../../mod/page.php:66 ../../mod/admin.php:150
-#: ../../mod/admin.php:714 ../../mod/admin.php:917 ../../mod/viewsrc.php:18
+#: ../../include/items.php:3546 ../../mod/admin.php:150
+#: ../../mod/admin.php:727 ../../mod/admin.php:930 ../../mod/viewsrc.php:18
 #: ../../mod/home.php:64 ../../mod/display.php:32
 msgid "Item not found."
 msgstr "Element nicht gefunden."
 
-#: ../../include/items.php:3634
+#: ../../include/items.php:3729
 msgid "Archives"
 msgstr "Archive"
 
-#: ../../include/items.php:3795 ../../mod/group.php:44 ../../mod/group.php:146
+#: ../../include/items.php:3895 ../../mod/group.php:44 ../../mod/group.php:146
 msgid "Collection not found."
 msgstr "Sammlung nicht gefunden"
 
-#: ../../include/items.php:3811 ../../mod/network.php:469
+#: ../../include/items.php:3911 ../../mod/network.php:469
 msgid "Group is empty"
 msgstr "Gruppe ist leer"
 
-#: ../../include/items.php:3827
+#: ../../include/items.php:3927
 msgid "Connection not found."
 msgstr "Die Verbindung wurde nicht gefunden."
 
+#: ../../include/dir_fns.php:15
+msgid "Sort Options"
+msgstr "Sortieroptionen"
+
+#: ../../include/dir_fns.php:16
+msgid "Alphabetic"
+msgstr "alphabetisch"
+
+#: ../../include/dir_fns.php:17
+msgid "Reverse Alphabetic"
+msgstr "Entgegengesetzt alphabetisch"
+
+#: ../../include/dir_fns.php:18
+msgid "Newest to Oldest"
+msgstr "Neueste zuerst"
+
+#: ../../include/dir_fns.php:29
+msgid "Enable Safe Search"
+msgstr "Sichere Suche einschalten"
+
+#: ../../include/dir_fns.php:31
+msgid "Disable Safe Search"
+msgstr "Sichere Suche ausschalten"
+
+#: ../../include/dir_fns.php:33
+msgid "Safe Mode"
+msgstr "Sicherer Modus"
+
 #: ../../mod/common.php:10
 msgid "No channel."
 msgstr "Kein Channel."
@@ -2738,7 +2862,7 @@ msgstr "Neue Veranstaltung erstellen"
 msgid "Previous"
 msgstr "Voriges"
 
-#: ../../mod/events.php:351 ../../mod/setup.php:237
+#: ../../mod/events.php:351 ../../mod/setup.php:256
 msgid "Next"
 msgstr "Nächste"
 
@@ -2869,31 +2993,37 @@ msgstr "Einladungen senden"
 msgid "Enter email addresses, one per line:"
 msgstr "Email-Adressen eintragen, eine pro Zeile:"
 
-#: ../../mod/invite.php:141 ../../mod/message.php:297
-#: ../../mod/message.php:458
+#: ../../mod/invite.php:141 ../../mod/message.php:326
+#: ../../mod/message.php:508
 msgid "Your message:"
 msgstr "Deine Nachricht:"
 
 #: ../../mod/invite.php:142
 msgid ""
 "You are cordially invited to join me and some other close friends on the Red"
-" Matrix - a revolutionary new decentralised social and information tool."
-msgstr "Du bist herzlich dazu eingeladen mir und einigen anderen gute Freunde zur Red Matrix zu folgen, einem neuen revolutionären dezentralen sozialen Informationswerkzeug."
+" Matrix - a revolutionary new decentralised communication and information "
+"tool."
+msgstr "Du bist herzlich eingeladen mir und einigen anderen guten Freunden in die Red Matrix zu folgen - einem revolutionaren neuen, dezentralisiertem Kommunikations- und Informationsnetzwerk."
 
 #: ../../mod/invite.php:144
 msgid "You will need to supply this invitation code: $invite_code"
 msgstr "Du musst dann den folgenden Einladungs-Code angeben: $invite_code"
 
-#: ../../mod/invite.php:146
+#: ../../mod/invite.php:145
 msgid "Please visit my channel at"
 msgstr "Bitte besuche meinen Kanal auf"
 
-#: ../../mod/invite.php:150
+#: ../../mod/invite.php:149
 msgid ""
-"Once you have registered, please connect with my Red Matrix channel address:"
-msgstr "Sobald du dich registriert hat, verbinde dich bitte mit meinem Red Matrix Kanal unter folgender Adresse:"
+"Once you have registered (on ANY Red Matrix site - they are all inter-"
+"connected), please connect with my Red Matrix channel address:"
+msgstr "Wenn du dich registriert hast (egal auf welcher Seite in der Red Matrix, sie sind alle miteinander verbunden) verbinde dich bitte mit meinem Kanal in der Matrix."
+
+#: ../../mod/invite.php:151
+msgid "Click the [Register] link on the following page to join."
+msgstr ""
 
-#: ../../mod/invite.php:152
+#: ../../mod/invite.php:153
 msgid ""
 "For more information about the Red Matrix Project and why it has the "
 "potential to change the internet as we know it, please visit "
@@ -2911,11 +3041,12 @@ msgstr "Keine Freunde zum Anzeigen."
 
 #: ../../mod/webpages.php:8 ../../mod/connect.php:13 ../../mod/layouts.php:8
 #: ../../mod/filestorage.php:8 ../../mod/blocks.php:10 ../../mod/profile.php:8
-#: ../../boot.php:1609
+#: ../../boot.php:1640
 msgid "Requested profile is not available."
 msgstr "Erwünschte Profil ist nicht verfügbar."
 
-#: ../../mod/webpages.php:101 ../../mod/layouts.php:92 ../../mod/blocks.php:95
+#: ../../mod/webpages.php:104 ../../mod/layouts.php:105
+#: ../../mod/blocks.php:96
 msgid "View"
 msgstr "Ansicht"
 
@@ -2937,17 +3068,17 @@ msgid ""
 " and/or create new posts for you?"
 msgstr "Möchtest du der Anwendung erlauben deine Nachrichten und Kontakte abzurufen und/oder neue Nachrichten für dich zu erstellen?"
 
-#: ../../mod/api.php:105 ../../mod/settings.php:1006
-#: ../../mod/settings.php:1011 ../../mod/settings.php:1034
-#: ../../mod/settings.php:1036 ../../mod/settings.php:1037
-#: ../../mod/settings.php:1038 ../../mod/profiles.php:506
+#: ../../mod/api.php:105 ../../mod/settings.php:1009
+#: ../../mod/settings.php:1014 ../../mod/settings.php:1037
+#: ../../mod/settings.php:1039 ../../mod/settings.php:1040
+#: ../../mod/settings.php:1041 ../../mod/profiles.php:506
 msgid "Yes"
 msgstr "Ja"
 
-#: ../../mod/api.php:106 ../../mod/settings.php:1006
-#: ../../mod/settings.php:1011 ../../mod/settings.php:1034
-#: ../../mod/settings.php:1036 ../../mod/settings.php:1037
-#: ../../mod/settings.php:1038 ../../mod/profiles.php:507
+#: ../../mod/api.php:106 ../../mod/settings.php:1009
+#: ../../mod/settings.php:1014 ../../mod/settings.php:1037
+#: ../../mod/settings.php:1039 ../../mod/settings.php:1040
+#: ../../mod/settings.php:1041 ../../mod/profiles.php:507
 msgid "No"
 msgstr "Nein"
 
@@ -2968,349 +3099,358 @@ msgid "Invalid item."
 msgstr "Ungültiges Element."
 
 #: ../../mod/page.php:47 ../../mod/chanview.php:78 ../../mod/home.php:51
-#: ../../mod/magic.php:65 ../../mod/wall_upload.php:35
+#: ../../mod/magic.php:95 ../../mod/wall_upload.php:35
 msgid "Channel not found."
 msgstr "Kanal nicht gefunden."
 
+#: ../../mod/page.php:83 ../../mod/help.php:56 ../../mod/display.php:92
+#: ../../index.php:229
+msgid "Page not found."
+msgstr "Seite nicht gefunden."
+
 #: ../../mod/attach.php:9
 msgid "Item not available."
 msgstr "Element nicht verfügbar."
 
-#: ../../mod/setup.php:142
+#: ../../mod/setup.php:161
 msgid "Red Matrix Server - Setup"
 msgstr "Red Matrix Server - Installation"
 
-#: ../../mod/setup.php:148
+#: ../../mod/setup.php:167
 msgid "Could not connect to database."
 msgstr "Kann nicht mit der Datenbank verbinden."
 
-#: ../../mod/setup.php:152
+#: ../../mod/setup.php:171
 msgid ""
 "Could not connect to specified site URL. Possible SSL certificate or DNS "
 "issue."
 msgstr "Konnte die angegebene Webseiten URL nicht erreichen. Möglicherweise ein Problem mit dem SSL Zertifikat oder dem DNS."
 
-#: ../../mod/setup.php:157
+#: ../../mod/setup.php:176
 msgid "Could not create table."
 msgstr "Kann Tabelle nicht erstellen."
 
-#: ../../mod/setup.php:163
+#: ../../mod/setup.php:182
 msgid "Your site database has been installed."
 msgstr "Die Datenbank deiner Seite wurde installiert."
 
-#: ../../mod/setup.php:168
+#: ../../mod/setup.php:187
 msgid ""
 "You may need to import the file \"install/database.sql\" manually using "
 "phpmyadmin or mysql."
 msgstr "Eventuell musst du die Datei \"install/database.sql\" händisch mit phpmyadmin oder mysql importieren."
 
-#: ../../mod/setup.php:169 ../../mod/setup.php:236 ../../mod/setup.php:565
+#: ../../mod/setup.php:188 ../../mod/setup.php:255 ../../mod/setup.php:584
 msgid "Please see the file \"install/INSTALL.txt\"."
 msgstr "Lesen Sie die Datei \"install/INSTALL.txt\"."
 
-#: ../../mod/setup.php:233
+#: ../../mod/setup.php:252
 msgid "System check"
 msgstr "Systemprüfung"
 
-#: ../../mod/setup.php:238
+#: ../../mod/setup.php:257
 msgid "Check again"
 msgstr "Bitte nochmal prüfen"
 
-#: ../../mod/setup.php:260
+#: ../../mod/setup.php:279
 msgid "Database connection"
 msgstr "Datenbank Verbindung"
 
-#: ../../mod/setup.php:261
+#: ../../mod/setup.php:280
 msgid ""
 "In order to install Red Matrix we need to know how to connect to your "
 "database."
 msgstr "Um die Red Matrix installieren zu können, müssen wir wissen wie wir deine Datenbank kontaktieren können."
 
-#: ../../mod/setup.php:262
+#: ../../mod/setup.php:281
 msgid ""
 "Please contact your hosting provider or site administrator if you have "
 "questions about these settings."
 msgstr "Bitte kontaktiere deinen Hosting Provider oder den Administrator der Seite wenn du Fragen zu diesen Einstellungen haben solltest."
 
-#: ../../mod/setup.php:263
+#: ../../mod/setup.php:282
 msgid ""
 "The database you specify below should already exist. If it does not, please "
 "create it before continuing."
 msgstr "Die Datenbank die du weiter unten angibst sollte bereits existieren. Sollte dies nicht der Fall sein erzeuge sie bitte bevor du fortfärst."
 
-#: ../../mod/setup.php:267
+#: ../../mod/setup.php:286
 msgid "Database Server Name"
 msgstr "Datenbank-Servername"
 
-#: ../../mod/setup.php:267
+#: ../../mod/setup.php:286
 msgid "Default is localhost"
 msgstr "Standard ist localhost"
 
-#: ../../mod/setup.php:268
+#: ../../mod/setup.php:287
 msgid "Database Port"
 msgstr "Datenbank-Port"
 
-#: ../../mod/setup.php:268
+#: ../../mod/setup.php:287
 msgid "Communication port number - use 0 for default"
 msgstr "Port Nummer zur Kommunikation - verwende 0 für die Standardeinstellung:"
 
-#: ../../mod/setup.php:269
+#: ../../mod/setup.php:288
 msgid "Database Login Name"
 msgstr "Datenbank-Benutzername"
 
-#: ../../mod/setup.php:270
+#: ../../mod/setup.php:289
 msgid "Database Login Password"
 msgstr "Datenbank-Kennwort"
 
-#: ../../mod/setup.php:271
+#: ../../mod/setup.php:290
 msgid "Database Name"
 msgstr "Datenbank-Name"
 
-#: ../../mod/setup.php:273 ../../mod/setup.php:315
+#: ../../mod/setup.php:292 ../../mod/setup.php:334
 msgid "Site administrator email address"
 msgstr "E-Mail Adresse des Seiten-Administrators"
 
-#: ../../mod/setup.php:273 ../../mod/setup.php:315
+#: ../../mod/setup.php:292 ../../mod/setup.php:334
 msgid ""
 "Your account email address must match this in order to use the web admin "
 "panel."
-msgstr "Die Email-Adresse deines Accounts muss dieser Adresse entsprechen, damit du Zugriff zum Admin Panel erhälst."
+msgstr "Die Email-Adresse deines Accounts muss dieser Adresse entsprechen, damit du Zugriff zum Admin Panel erhältst."
 
-#: ../../mod/setup.php:274 ../../mod/setup.php:317
+#: ../../mod/setup.php:293 ../../mod/setup.php:336
 msgid "Website URL"
 msgstr "Webseiten URL"
 
-#: ../../mod/setup.php:274 ../../mod/setup.php:317
+#: ../../mod/setup.php:293 ../../mod/setup.php:336
 msgid "Please use SSL (https) URL if available."
 msgstr "Nutzen Sie bitte SSL (https) URL falls möglich."
 
-#: ../../mod/setup.php:277 ../../mod/setup.php:320
+#: ../../mod/setup.php:296 ../../mod/setup.php:339
 msgid "Please select a default timezone for your website"
 msgstr "Wählen Sie die Standard-Zeitzone für Ihre Webseite aus"
 
-#: ../../mod/setup.php:304
+#: ../../mod/setup.php:323
 msgid "Site settings"
 msgstr "Seiteneinstellungen"
 
-#: ../../mod/setup.php:360
+#: ../../mod/setup.php:379
 msgid "Could not find a command line version of PHP in the web server PATH."
 msgstr "Konnte die Kommandozeilen Version von PHP nicht im PATH des Servers finden."
 
-#: ../../mod/setup.php:361
+#: ../../mod/setup.php:380
 msgid ""
 "If you don't have a command line version of PHP installed on server, you "
 "will not be able to run background polling via cron."
 msgstr "Solltest du keine Kommandozeilen Version von PHP auf dem Server installiert haben wirst du nicht in der Lage sein Hintergrundprozesse via cron auszuführen."
 
-#: ../../mod/setup.php:365
+#: ../../mod/setup.php:384
 msgid "PHP executable path"
 msgstr "PHP Pfad zu ausführbarer Datei"
 
-#: ../../mod/setup.php:365
+#: ../../mod/setup.php:384
 msgid ""
 "Enter full path to php executable. You can leave this blank to continue the "
 "installation."
 msgstr "Gib den vollen Pfad zum PHP Interpreter an. Du kannst dieses Felds frei lassen und mit der Installation fortfahren."
 
-#: ../../mod/setup.php:370
+#: ../../mod/setup.php:389
 msgid "Command line PHP"
 msgstr "PHP Befehlszeile"
 
-#: ../../mod/setup.php:379
+#: ../../mod/setup.php:398
 msgid ""
 "The command line version of PHP on your system does not have "
 "\"register_argc_argv\" enabled."
 msgstr "Die Kommandozeilen Version von PHP auf deinem System hat \"register_argc_argv\" nicht aktiviert."
 
-#: ../../mod/setup.php:380
+#: ../../mod/setup.php:399
 msgid "This is required for message delivery to work."
 msgstr "Dies wird benötigt, damit die Auslieferung von Nachrichten funktioniert."
 
-#: ../../mod/setup.php:382
+#: ../../mod/setup.php:401
 msgid "PHP register_argc_argv"
 msgstr "PHP register_argc_argv"
 
-#: ../../mod/setup.php:403
+#: ../../mod/setup.php:422
 msgid ""
 "Error: the \"openssl_pkey_new\" function on this system is not able to "
 "generate encryption keys"
 msgstr "Fehler: Die \"openssl_pkey_new\" Funktion auf diesem System ist nicht in der Lage Schlüssel für die Verschlüsselung zu erzeugen."
 
-#: ../../mod/setup.php:404
+#: ../../mod/setup.php:423
 msgid ""
 "If running under Windows, please see "
 "\"http://www.php.net/manual/en/openssl.installation.php\"."
 msgstr "Wenn du Windows verwendest, siehe  \"http://www.php.net/manual/en/openssl.installation.php\" für eine Installationsanleitung."
 
-#: ../../mod/setup.php:406
+#: ../../mod/setup.php:425
 msgid "Generate encryption keys"
 msgstr "Verschlüsselungsschlüssel  generieren"
 
-#: ../../mod/setup.php:413
+#: ../../mod/setup.php:432
 msgid "libCurl PHP module"
 msgstr "libCurl PHP Modul"
 
-#: ../../mod/setup.php:414
+#: ../../mod/setup.php:433
 msgid "GD graphics PHP module"
 msgstr "GD Graphik PHP Modul"
 
-#: ../../mod/setup.php:415
+#: ../../mod/setup.php:434
 msgid "OpenSSL PHP module"
 msgstr "OpenSSL PHP Modul"
 
-#: ../../mod/setup.php:416
+#: ../../mod/setup.php:435
 msgid "mysqli PHP module"
 msgstr "mysqli PHP Modul"
 
-#: ../../mod/setup.php:417
+#: ../../mod/setup.php:436
 msgid "mb_string PHP module"
 msgstr "mb_string PHP Modul"
 
-#: ../../mod/setup.php:418
+#: ../../mod/setup.php:437
 msgid "mcrypt PHP module"
 msgstr "mcrypt PHP Modul"
 
-#: ../../mod/setup.php:423 ../../mod/setup.php:425
+#: ../../mod/setup.php:442 ../../mod/setup.php:444
 msgid "Apache mod_rewrite module"
 msgstr "Apache mod_rewrite Modul"
 
-#: ../../mod/setup.php:423
+#: ../../mod/setup.php:442
 msgid ""
 "Error: Apache webserver mod-rewrite module is required but not installed."
 msgstr "Fehler: Das Apache Modul mod-rewrite wird benötigt ist aber nicht installiert."
 
-#: ../../mod/setup.php:429 ../../mod/setup.php:432
+#: ../../mod/setup.php:448 ../../mod/setup.php:451
 msgid "proc_open"
 msgstr "proc_open"
 
-#: ../../mod/setup.php:429
+#: ../../mod/setup.php:448
 msgid ""
 "Error: proc_open is required but is either not installed or has been "
 "disabled in php.ini"
 msgstr "Fehler: proc_open wird benötigt ist aber entweder nicht installiert oder wurde in der php.ini deaktiviert"
 
-#: ../../mod/setup.php:437
+#: ../../mod/setup.php:456
 msgid "Error: libCURL PHP module required but not installed."
 msgstr "Fehler: das PHP Modul libCURL wird benütigt ist aber nicht installiert."
 
-#: ../../mod/setup.php:441
+#: ../../mod/setup.php:460
 msgid ""
 "Error: GD graphics PHP module with JPEG support required but not installed."
 msgstr "Fehler: das PHP Modul GD Grafik mit JPEG Unterstützung wird benötigt ist aber nicht installiert."
 
-#: ../../mod/setup.php:445
+#: ../../mod/setup.php:464
 msgid "Error: openssl PHP module required but not installed."
 msgstr "Fehler: das OpenSSL PHP Modul wird benötigt ist aber nicht installiert."
 
-#: ../../mod/setup.php:449
+#: ../../mod/setup.php:468
 msgid "Error: mysqli PHP module required but not installed."
 msgstr "Fehler: das PHP Modul mysqli wird benötigt ist aber nicht installiert."
 
-#: ../../mod/setup.php:453
+#: ../../mod/setup.php:472
 msgid "Error: mb_string PHP module required but not installed."
 msgstr "Fehler: das PHP Modul mb_string wird benötigt ist aber nicht installiert."
 
-#: ../../mod/setup.php:457
+#: ../../mod/setup.php:476
 msgid "Error: mcrypt PHP module required but not installed."
 msgstr "Fehler: das PHP Modul mcrypt wird benötigt ist aber nicht installiert."
 
-#: ../../mod/setup.php:473
+#: ../../mod/setup.php:492
 msgid ""
 "The web installer needs to be able to create a file called \".htconfig.php\""
 " in the top folder of your web server and it is unable to do so."
 msgstr "Der Installations-Assistent muss in der Lage sein die Datei \".htconfig.php\" im Stammverzeichnis des Web-Servers anzulegen, ist es aber nicht."
 
-#: ../../mod/setup.php:474
+#: ../../mod/setup.php:493
 msgid ""
 "This is most often a permission setting, as the web server may not be able "
 "to write files in your folder - even if you can."
 msgstr "Meist liegt dies daran, dass der Nutzer unter dem der Web-Server läuft keine Rechte zum Schreiben in dem Verzeichnis hat - selbst wenn du das kannst."
 
-#: ../../mod/setup.php:475
+#: ../../mod/setup.php:494
 msgid ""
 "At the end of this procedure, we will give you a text to save in a file "
 "named .htconfig.php in your Red top folder."
 msgstr "Am Schluss des Vorgangs wird ein Text generiert, den du unter dem Dateinamen .htconfig.php im Stammverzeichnis deiner Red Installation speichern."
 
-#: ../../mod/setup.php:476
+#: ../../mod/setup.php:495
 msgid ""
 "You can alternatively skip this procedure and perform a manual installation."
 " Please see the file \"install/INSTALL.txt\" for instructions."
 msgstr "Alternativ kannst du diesen Schritt überspringen und die Installation manuell vornehmen. Siehe dazu bitte die \"Install/INSTALL.txt\" Datei."
 
-#: ../../mod/setup.php:479
+#: ../../mod/setup.php:498
 msgid ".htconfig.php is writable"
 msgstr ".htconfig.php ist beschreibbar"
 
-#: ../../mod/setup.php:489
+#: ../../mod/setup.php:508
 msgid ""
 "Red uses the Smarty3 template engine to render its web views. Smarty3 "
 "compiles templates to PHP to speed up rendering."
 msgstr "Red verwendet Smarty3 um Vorlagen für die Webdarstellung zu übersetzen. Smarty3 übersetzt diese Vorlagen nach PHP um die Darstellung zu beschleunigen."
 
-#: ../../mod/setup.php:490
+#: ../../mod/setup.php:509
 msgid ""
 "In order to store these compiled templates, the web server needs to have "
 "write access to the directory view/tpl/smarty3/ under the Red top level "
 "folder."
 msgstr "Um die übersetzten Vorlagen speichern zu können muss der Webserver schreib Zugriff auf das Verzeichnis view/tpl/smarty3/ unterhalb des Red Stammverzeichnisses haben."
 
-#: ../../mod/setup.php:491
+#: ../../mod/setup.php:510
 msgid ""
 "Please ensure that the user that your web server runs as (e.g. www-data) has"
 " write access to this folder."
 msgstr "Bitte stelle sicher, dass der Nutzer unter dem der Webserver läuft (z.B. www-data) Zugriff zum Schreiben auf dieses Verzeichnis hat."
 
-#: ../../mod/setup.php:492
+#: ../../mod/setup.php:511
 msgid ""
 "Note: as a security measure, you should give the web server write access to "
 "view/tpl/smarty3/ only--not the template files (.tpl) that it contains."
 msgstr "Hinweis: Als Sicherheitsvorkehrung solltest du dem Webserver nur Schreib-Zugriff auf das Verzeichnis view/tpl/smarty3 geben, nicht dem Vorlagen (.tpl) die in diesem Verzeichnis liegen."
 
-#: ../../mod/setup.php:495
+#: ../../mod/setup.php:514
 msgid "view/tpl/smarty3 is writable"
 msgstr "view/tpl/smarty3 ist beschreibbar"
 
-#: ../../mod/setup.php:509
+#: ../../mod/setup.php:528
 msgid "SSL certificate validation"
 msgstr "SSL Zertifikatverifizierung"
 
-#: ../../mod/setup.php:509
+#: ../../mod/setup.php:528
 msgid ""
 "SSL certificate cannot be validated. Fix certificate or disable https access"
 " to this site."
 msgstr "Das SSL Zertifikat konnte nicht validiert werden. Korrigiere das Zertifikat oder schalte HTTPS ab um auf diese Seite zuzugreifen."
 
-#: ../../mod/setup.php:516
+#: ../../mod/setup.php:535
 msgid ""
 "Url rewrite in .htaccess is not working. Check your server configuration."
 msgstr "URL rewrite funktioniert in der .htaccess nicht. Überprüfe deine Server-Konfiguration."
 
-#: ../../mod/setup.php:518
+#: ../../mod/setup.php:537
 msgid "Url rewrite is working"
 msgstr "Url rewrite funktioniert"
 
-#: ../../mod/setup.php:528
+#: ../../mod/setup.php:547
 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 "Die Datenbank Konfigurationsdatei \".htconfig.php\" konnte nicht geschrieben werden. Bitte verwende den unten angegebenen Text um die Konfigurationsdatei im Stammverzeichnis des Webservers anzulegen."
 
-#: ../../mod/setup.php:552
+#: ../../mod/setup.php:571
 msgid "Errors encountered creating database tables."
 msgstr "Fehler während des Anlegens der Datenbank Tabellen aufgetreten."
 
-#: ../../mod/setup.php:563
+#: ../../mod/setup.php:582
 msgid "<h1>What next</h1>"
 msgstr "<h1>Was als Nächstes</h1>"
 
-#: ../../mod/setup.php:564
+#: ../../mod/setup.php:583
 msgid ""
 "IMPORTANT: You will need to [manually] setup a scheduled task for the "
 "poller."
 msgstr "WICHTIG: Du musst die geplanten Aufgaben für den Poller [manuell] einrichten."
 
+#: ../../mod/rpost.php:84 ../../mod/editpost.php:42
+msgid "Edit post"
+msgstr "Bearbeite Beitrag"
+
 #: ../../mod/subthread.php:105
 #, php-format
 msgid "%1$s is following %2$s's %3$s"
@@ -3331,463 +3471,463 @@ msgstr "auf Vollbildmodus umschalten"
 msgid "%1$s tagged %2$s's %3$s with %4$s"
 msgstr "%1$s hat %2$s's %3$s mit %4$s getaggt"
 
-#: ../../mod/settings.php:51
+#: ../../mod/settings.php:53
 msgid "Account settings"
 msgstr "Konto-Einstellungen"
 
-#: ../../mod/settings.php:57
+#: ../../mod/settings.php:59
 msgid "Channel settings"
 msgstr "Kanal-Einstellungen"
 
-#: ../../mod/settings.php:63
+#: ../../mod/settings.php:65
 msgid "Additional features"
 msgstr "Zusätzliche Funktionen"
 
-#: ../../mod/settings.php:69
+#: ../../mod/settings.php:71
 msgid "Feature settings"
 msgstr "Funktions-Einstellungen"
 
-#: ../../mod/settings.php:75
+#: ../../mod/settings.php:77
 msgid "Display settings"
 msgstr "Anzeige-Einstellungen"
 
-#: ../../mod/settings.php:81
+#: ../../mod/settings.php:83
 msgid "Connected apps"
 msgstr "Verbundene Apps"
 
-#: ../../mod/settings.php:87
+#: ../../mod/settings.php:89
 msgid "Export channel"
 msgstr "Kanal exportieren"
 
-#: ../../mod/settings.php:99
+#: ../../mod/settings.php:101
 msgid "Automatic Permissions (Advanced)"
 msgstr "Automatische Berechtigungen (Erweitert)"
 
-#: ../../mod/settings.php:109
+#: ../../mod/settings.php:111
 msgid "Premium Channel Settings"
 msgstr "Prämium-Kanal Einstellungen"
 
-#: ../../mod/settings.php:169
+#: ../../mod/settings.php:171
 msgid "Name is required"
 msgstr "Name wird benötigt"
 
-#: ../../mod/settings.php:173
+#: ../../mod/settings.php:175
 msgid "Key and Secret are required"
 msgstr "Schlüssel und Geheimnis werden benötigt"
 
-#: ../../mod/settings.php:177 ../../mod/settings.php:674
+#: ../../mod/settings.php:179 ../../mod/settings.php:677
 msgid "Update"
 msgstr "Update"
 
-#: ../../mod/settings.php:290
+#: ../../mod/settings.php:292
 msgid "Passwords do not match. Password unchanged."
 msgstr "Kennwörter stimmen nicht überein. Kennwort nicht verändert."
 
-#: ../../mod/settings.php:294
+#: ../../mod/settings.php:296
 msgid "Empty passwords are not allowed. Password unchanged."
 msgstr "Leere Kennwörter sind nicht erlaubt. Kennwort nicht verändert."
 
-#: ../../mod/settings.php:307
+#: ../../mod/settings.php:309
 msgid "Password changed."
 msgstr "Kennwort geändert."
 
-#: ../../mod/settings.php:309
+#: ../../mod/settings.php:311
 msgid "Password update failed. Please try again."
 msgstr "Kennwortänderung fehlgeschlagen. Wiederholen Sie den Vorgang."
 
-#: ../../mod/settings.php:323
+#: ../../mod/settings.php:325
 msgid "Not valid email."
 msgstr "Keine gültige E-Mail Adresse."
 
-#: ../../mod/settings.php:326
+#: ../../mod/settings.php:328
 msgid "Protected email address. Cannot change to that email."
 msgstr "Geschützte E-Mail Adresse. Diese kann nicht verändert werden."
 
-#: ../../mod/settings.php:335
+#: ../../mod/settings.php:337
 msgid "System failure storing new email. Please try again."
 msgstr "Systemfehler während des Speicherns der neuen Mail. Bitte versuche es noch einmal."
 
-#: ../../mod/settings.php:576
+#: ../../mod/settings.php:579
 msgid "Settings updated."
 msgstr "Einstellungen aktualisiert."
 
-#: ../../mod/settings.php:647 ../../mod/settings.php:673
-#: ../../mod/settings.php:709
+#: ../../mod/settings.php:650 ../../mod/settings.php:676
+#: ../../mod/settings.php:712
 msgid "Add application"
 msgstr "Anwendung hinzufügen"
 
-#: ../../mod/settings.php:649 ../../mod/settings.php:675
+#: ../../mod/settings.php:652 ../../mod/settings.php:678
 #: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94 ../../mod/fbrowser.php:82
 #: ../../mod/fbrowser.php:117
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: ../../mod/settings.php:650 ../../mod/settings.php:676
-#: ../../mod/admin.php:673 ../../mod/crepair.php:148
+#: ../../mod/settings.php:653 ../../mod/settings.php:679
+#: ../../mod/admin.php:686 ../../mod/crepair.php:148
 msgid "Name"
 msgstr "Name"
 
-#: ../../mod/settings.php:650
+#: ../../mod/settings.php:653
 msgid "Name of application"
 msgstr "Name der Anwendung"
 
-#: ../../mod/settings.php:651 ../../mod/settings.php:677
+#: ../../mod/settings.php:654 ../../mod/settings.php:680
 msgid "Consumer Key"
 msgstr "Consumer Key"
 
-#: ../../mod/settings.php:651 ../../mod/settings.php:652
+#: ../../mod/settings.php:654 ../../mod/settings.php:655
 msgid "Automatically generated - change if desired. Max length 20"
 msgstr "Automatisch erzeugt - ändern falls erwünscht. Maximale Länge 20"
 
-#: ../../mod/settings.php:652 ../../mod/settings.php:678
+#: ../../mod/settings.php:655 ../../mod/settings.php:681
 msgid "Consumer Secret"
 msgstr "Consumer Secret"
 
-#: ../../mod/settings.php:653 ../../mod/settings.php:679
+#: ../../mod/settings.php:656 ../../mod/settings.php:682
 msgid "Redirect"
 msgstr "Umleitung"
 
-#: ../../mod/settings.php:653
+#: ../../mod/settings.php:656
 msgid ""
 "Redirect URI - leave blank unless your application specifically requires "
 "this"
 msgstr "Umleitungs-URl - lasse dies frei außer deine Anwendung erfordert dies explizit"
 
-#: ../../mod/settings.php:654 ../../mod/settings.php:680
+#: ../../mod/settings.php:657 ../../mod/settings.php:683
 msgid "Icon url"
 msgstr "Symbol-URL"
 
-#: ../../mod/settings.php:654
+#: ../../mod/settings.php:657
 msgid "Optional"
 msgstr "Optional"
 
-#: ../../mod/settings.php:665
+#: ../../mod/settings.php:668
 msgid "You can't edit this application."
 msgstr "Diese Anwendung kann nicht bearbeitet werden."
 
-#: ../../mod/settings.php:708
+#: ../../mod/settings.php:711
 msgid "Connected Apps"
 msgstr "Verbundene Apps"
 
-#: ../../mod/settings.php:712
+#: ../../mod/settings.php:715
 msgid "Client key starts with"
 msgstr "Client key beginnt mit"
 
-#: ../../mod/settings.php:713
+#: ../../mod/settings.php:716
 msgid "No name"
 msgstr "Kein Name"
 
-#: ../../mod/settings.php:714
+#: ../../mod/settings.php:717
 msgid "Remove authorization"
 msgstr "Autorisierung aufheben"
 
-#: ../../mod/settings.php:725
+#: ../../mod/settings.php:728
 msgid "No feature settings configured"
 msgstr "Keine Funktions-Einstellungen konfiguriert"
 
-#: ../../mod/settings.php:733
+#: ../../mod/settings.php:736
 msgid "Feature Settings"
 msgstr "Funktions-Einstellungen"
 
-#: ../../mod/settings.php:756
+#: ../../mod/settings.php:759
 msgid "Account Settings"
 msgstr "Konto-Einstellungen"
 
-#: ../../mod/settings.php:757
+#: ../../mod/settings.php:760
 msgid "Password Settings"
 msgstr "Kennwort-Einstellungen"
 
-#: ../../mod/settings.php:758
+#: ../../mod/settings.php:761
 msgid "New Password:"
 msgstr "Neues Passwort:"
 
-#: ../../mod/settings.php:759
+#: ../../mod/settings.php:762
 msgid "Confirm:"
 msgstr "Bestätigen:"
 
-#: ../../mod/settings.php:759
+#: ../../mod/settings.php:762
 msgid "Leave password fields blank unless changing"
 msgstr "Lasse die Passwort -Felder leer außer du möchtest das Passwort ändern"
 
-#: ../../mod/settings.php:761 ../../mod/settings.php:1060
+#: ../../mod/settings.php:764 ../../mod/settings.php:1063
 msgid "Email Address:"
 msgstr "Email Adresse:"
 
-#: ../../mod/settings.php:762
+#: ../../mod/settings.php:765
 msgid "Remove Account"
 msgstr "Konto entfernen"
 
-#: ../../mod/settings.php:763
+#: ../../mod/settings.php:766
 msgid "Warning: This action is permanent and cannot be reversed."
 msgstr "Achtung: Diese Aktion ist permanent und kann nicht rückgänging gemacht werden."
 
-#: ../../mod/settings.php:779
+#: ../../mod/settings.php:782
 msgid "Off"
 msgstr "Aus"
 
-#: ../../mod/settings.php:779
+#: ../../mod/settings.php:782
 msgid "On"
 msgstr "An"
 
-#: ../../mod/settings.php:786
+#: ../../mod/settings.php:789
 msgid "Additional Features"
 msgstr "Zusätzliche Funktionen"
 
-#: ../../mod/settings.php:811
+#: ../../mod/settings.php:814
 msgid "Connector Settings"
 msgstr "Connector-Einstellungen"
 
-#: ../../mod/settings.php:841 ../../mod/admin.php:369
+#: ../../mod/settings.php:844 ../../mod/admin.php:369
 msgid "No special theme for mobile devices"
 msgstr "Keine spezielle Theme für mobile Geräte"
 
-#: ../../mod/settings.php:881
+#: ../../mod/settings.php:884
 msgid "Display Settings"
 msgstr "Anzeige-Einstellungen"
 
-#: ../../mod/settings.php:887
+#: ../../mod/settings.php:890
 msgid "Display Theme:"
 msgstr "Anzeige Theme:"
 
-#: ../../mod/settings.php:888
+#: ../../mod/settings.php:891
 msgid "Mobile Theme:"
 msgstr "Mobile Theme:"
 
-#: ../../mod/settings.php:889
+#: ../../mod/settings.php:892
 msgid "Update browser every xx seconds"
 msgstr "Browser alle xx Sekunden aktualisieren"
 
-#: ../../mod/settings.php:889
+#: ../../mod/settings.php:892
 msgid "Minimum of 10 seconds, no maximum"
 msgstr "Minimum von 10 Sekunden, kein Maximum"
 
-#: ../../mod/settings.php:890
+#: ../../mod/settings.php:893
 msgid "Maximum number of conversations to load at any time:"
 msgstr "Maximale Anzahl von Unterhaltungen die gleichzeitig geladen werden sollen:"
 
-#: ../../mod/settings.php:890
+#: ../../mod/settings.php:893
 msgid "Maximum of 100 items"
 msgstr "Maximum von 100 Beiträgen"
 
-#: ../../mod/settings.php:891
+#: ../../mod/settings.php:894
 msgid "Don't show emoticons"
 msgstr "Emoticons nicht zeigen"
 
-#: ../../mod/settings.php:927
+#: ../../mod/settings.php:930
 msgid "Nobody except yourself"
 msgstr "Niemand außer du selbst"
 
-#: ../../mod/settings.php:928
+#: ../../mod/settings.php:931
 msgid "Only those you specifically allow"
 msgstr "Nur diejenigen, die Sie erlauben"
 
-#: ../../mod/settings.php:929
+#: ../../mod/settings.php:932
 msgid "Anybody in your address book"
 msgstr "Jeder aus Ihrem Adressbuch"
 
-#: ../../mod/settings.php:930
+#: ../../mod/settings.php:933
 msgid "Anybody on this website"
 msgstr "Jeder auf dieser Website"
 
-#: ../../mod/settings.php:931
+#: ../../mod/settings.php:934
 msgid "Anybody in this network"
 msgstr "Jeder in diesem Netzwerk"
 
-#: ../../mod/settings.php:932
+#: ../../mod/settings.php:935
 msgid "Anybody on the internet"
 msgstr "Jeder im Internet"
 
-#: ../../mod/settings.php:1006
+#: ../../mod/settings.php:1009
 msgid "Publish your default profile in the network directory"
 msgstr "Veröffentliche dein Standard-Profil im Netzwerk-Verzeichnis"
 
-#: ../../mod/settings.php:1011
+#: ../../mod/settings.php:1014
 msgid "Allow us to suggest you as a potential friend to new members?"
 msgstr "Dürfen wir dich neuen Mitgliedern als potentiellen Kontakt vorschlagen?"
 
-#: ../../mod/settings.php:1015 ../../mod/profile_photo.php:298
+#: ../../mod/settings.php:1018 ../../mod/profile_photo.php:298
 msgid "or"
 msgstr "oder"
 
-#: ../../mod/settings.php:1020
+#: ../../mod/settings.php:1023
 msgid "Your channel address is"
 msgstr "Deine Kanal-Adresse lautet"
 
-#: ../../mod/settings.php:1031
+#: ../../mod/settings.php:1034
 msgid "Automatically expire posts after this many days:"
 msgstr "Lösche Beiträge automatisch nach dieser Anzahl von Tagen:"
 
-#: ../../mod/settings.php:1031
+#: ../../mod/settings.php:1034
 msgid "If empty, posts will not expire. Expired posts will be deleted"
 msgstr "Falls leer werden Beiträge nie verfallen. Verfallene Beiträge werden gelöscht"
 
-#: ../../mod/settings.php:1032
+#: ../../mod/settings.php:1035
 msgid "Advanced expiration settings"
 msgstr "Erweitere Verfalls-Einstellungen"
 
-#: ../../mod/settings.php:1033
+#: ../../mod/settings.php:1036
 msgid "Advanced Expiration"
 msgstr "Erweitertes Verfallen"
 
-#: ../../mod/settings.php:1034
+#: ../../mod/settings.php:1037
 msgid "Expire posts:"
 msgstr "Beiträge verfallen lassen:"
 
-#: ../../mod/settings.php:1036
+#: ../../mod/settings.php:1039
 msgid "Expire starred posts:"
 msgstr "Markierte Beiträge verfallen lassen:"
 
-#: ../../mod/settings.php:1037
+#: ../../mod/settings.php:1040
 msgid "Expire photos:"
 msgstr "Fotos verfallen lassen:"
 
-#: ../../mod/settings.php:1038
+#: ../../mod/settings.php:1041
 msgid "Only expire posts by others:"
 msgstr "Nur Beiträge anderer verfallen lassen:"
 
-#: ../../mod/settings.php:1049
+#: ../../mod/settings.php:1052
 msgid "Channel Settings"
 msgstr "Channel-Einstellungen"
 
-#: ../../mod/settings.php:1058
+#: ../../mod/settings.php:1061
 msgid "Basic Settings"
 msgstr "Grundeinstellungen"
 
-#: ../../mod/settings.php:1061
+#: ../../mod/settings.php:1064
 msgid "Your Timezone:"
 msgstr "Ihre Zeitzone:"
 
-#: ../../mod/settings.php:1062
+#: ../../mod/settings.php:1065
 msgid "Default Post Location:"
 msgstr "Standardstandort:"
 
-#: ../../mod/settings.php:1063
+#: ../../mod/settings.php:1066
 msgid "Use Browser Location:"
 msgstr "Standort des Browsers verwenden:"
 
-#: ../../mod/settings.php:1065
+#: ../../mod/settings.php:1068
 msgid "Adult Content"
 msgstr "Nicht Jugendfreie-Inhalte"
 
-#: ../../mod/settings.php:1065
+#: ../../mod/settings.php:1068
 msgid "This channel publishes adult content."
 msgstr "Dieser Kanal veröffentlicht nicht Jugendfreie-Inhalte"
 
-#: ../../mod/settings.php:1067
+#: ../../mod/settings.php:1070
 msgid "Security and Privacy Settings"
 msgstr "Sicherheits- und Datenschutz-Einstellungen"
 
-#: ../../mod/settings.php:1069
+#: ../../mod/settings.php:1072
 msgid "Quick Privacy Settings:"
 msgstr "Schnelle Datenschutz-Einstellungen:"
 
-#: ../../mod/settings.php:1070
+#: ../../mod/settings.php:1073
 msgid "Very Public - extremely permissive"
 msgstr "Sehr offen - extrem freizügig"
 
-#: ../../mod/settings.php:1071
+#: ../../mod/settings.php:1074
 msgid "Typical - default public, privacy when desired"
 msgstr "Typisch - Standard öffentlich, Privatheit wenn gewünscht"
 
-#: ../../mod/settings.php:1072
+#: ../../mod/settings.php:1075
 msgid "Private - default private, rarely open or public"
 msgstr "Privat - Standard privat, selten offen oder öffentlich"
 
-#: ../../mod/settings.php:1073
+#: ../../mod/settings.php:1076
 msgid "Blocked - default blocked to/from everybody"
 msgstr "Geschlossen - Standard zu und von jedem geblockt"
 
-#: ../../mod/settings.php:1076
+#: ../../mod/settings.php:1079
 msgid "Maximum Friend Requests/Day:"
 msgstr "Maximale Kontaktanfragen pro Tag:"
 
-#: ../../mod/settings.php:1076
+#: ../../mod/settings.php:1079
 msgid "May reduce spam activity"
 msgstr "Kann die Spam-Aktivität verringern"
 
-#: ../../mod/settings.php:1077
+#: ../../mod/settings.php:1080
 msgid "Default Post Permissions"
 msgstr "Beitragszugriffrechte Standardeinstellungen"
 
-#: ../../mod/settings.php:1078
+#: ../../mod/settings.php:1081
 msgid "(click to open/close)"
 msgstr "(zum öffnen/schließen anklicken)"
 
-#: ../../mod/settings.php:1091
+#: ../../mod/settings.php:1094
 msgid "Maximum private messages per day from unknown people:"
 msgstr "Maximale Anzahl privater Nachrichten pro Tag von unbekannten Leuten:"
 
-#: ../../mod/settings.php:1091
+#: ../../mod/settings.php:1094
 msgid "Useful to reduce spamming"
 msgstr "Nützlich um Spam zu verringern"
 
-#: ../../mod/settings.php:1094
+#: ../../mod/settings.php:1097
 msgid "Notification Settings"
 msgstr "Benachrichtigungs-Einstellungen"
 
-#: ../../mod/settings.php:1095
+#: ../../mod/settings.php:1098
 msgid "By default post a status message when:"
 msgstr "Sende standardmäßig Status-Nachrichten wenn:"
 
-#: ../../mod/settings.php:1096
+#: ../../mod/settings.php:1099
 msgid "accepting a friend request"
 msgstr "einer Kontaktanfrage stattgegeben wurde"
 
-#: ../../mod/settings.php:1097
+#: ../../mod/settings.php:1100
 msgid "joining a forum/community"
 msgstr "ein Forum beigetreten wurde"
 
-#: ../../mod/settings.php:1098
+#: ../../mod/settings.php:1101
 msgid "making an <em>interesting</em> profile change"
 msgstr "eine <em>interessante</em> Änderung am Profil vorgenommen wurde"
 
-#: ../../mod/settings.php:1099
+#: ../../mod/settings.php:1102
 msgid "Send a notification email when:"
 msgstr "Eine Email Benachrichtigung senden wenn:"
 
-#: ../../mod/settings.php:1100
+#: ../../mod/settings.php:1103
 msgid "You receive an introduction"
 msgstr "Du eine Vorstellung erhältst"
 
-#: ../../mod/settings.php:1101
+#: ../../mod/settings.php:1104
 msgid "Your introductions are confirmed"
 msgstr "Deine Vorstellung bestätigt wurde."
 
-#: ../../mod/settings.php:1102
+#: ../../mod/settings.php:1105
 msgid "Someone writes on your profile wall"
 msgstr "Jemand auf deine Pinnwand schreibt"
 
-#: ../../mod/settings.php:1103
+#: ../../mod/settings.php:1106
 msgid "Someone writes a followup comment"
 msgstr "Jemand einen Beitrag kommentiert"
 
-#: ../../mod/settings.php:1104
+#: ../../mod/settings.php:1107
 msgid "You receive a private message"
-msgstr "Du eine private Nachricht erhälst"
+msgstr "Du eine private Nachricht erhältst"
 
-#: ../../mod/settings.php:1105
+#: ../../mod/settings.php:1108
 msgid "You receive a friend suggestion"
-msgstr "Du einen Kontaktvorschlag erhälst"
+msgstr "Du einen Kontaktvorschlag erhältst"
 
-#: ../../mod/settings.php:1106
+#: ../../mod/settings.php:1109
 msgid "You are tagged in a post"
 msgstr "Du wurdest in einem Beitrag getaggt"
 
-#: ../../mod/settings.php:1107
+#: ../../mod/settings.php:1110
 msgid "You are poked/prodded/etc. in a post"
 msgstr "Du in einer Nachricht angestupst/geknufft/o.ä. wirst"
 
-#: ../../mod/settings.php:1110
+#: ../../mod/settings.php:1113
 msgid "Advanced Account/Page Type Settings"
 msgstr "Erweiterte Account / Seiten Arten Einstellungen"
 
-#: ../../mod/settings.php:1111
+#: ../../mod/settings.php:1114
 msgid "Change the behaviour of this account for special situations"
 msgstr "Ändere das Verhalten dieses Accounts unter speziellen Umständen"
 
-#: ../../mod/viewconnections.php:28 ../../mod/photos.php:576
-#: ../../mod/display.php:9 ../../mod/search.php:80 ../../mod/community.php:18
-#: ../../mod/directory.php:23
+#: ../../mod/viewconnections.php:28 ../../mod/search.php:80
+#: ../../mod/photos.php:576 ../../mod/display.php:9 ../../mod/community.php:18
+#: ../../mod/directory.php:32
 msgid "Public access denied."
 msgstr "Öffentlicher Zugang verweigert."
 
@@ -3961,15 +4101,15 @@ msgstr "Theme Einstellungen aktualisiert."
 msgid "Site"
 msgstr "Seite"
 
-#: ../../mod/admin.php:88 ../../mod/admin.php:669 ../../mod/admin.php:681
+#: ../../mod/admin.php:88 ../../mod/admin.php:682 ../../mod/admin.php:694
 msgid "Users"
 msgstr "Benutzer"
 
-#: ../../mod/admin.php:89 ../../mod/admin.php:767 ../../mod/admin.php:809
+#: ../../mod/admin.php:89 ../../mod/admin.php:780 ../../mod/admin.php:822
 msgid "Plugins"
 msgstr "Plug-Ins"
 
-#: ../../mod/admin.php:90 ../../mod/admin.php:972 ../../mod/admin.php:1008
+#: ../../mod/admin.php:90 ../../mod/admin.php:985 ../../mod/admin.php:1021
 msgid "Themes"
 msgstr "Themes"
 
@@ -3979,9 +4119,9 @@ msgstr "Server"
 
 #: ../../mod/admin.php:92
 msgid "DB updates"
-msgstr "Datenbankaktualisierungen"
+msgstr "DB Aktualisierungen"
 
-#: ../../mod/admin.php:106 ../../mod/admin.php:113 ../../mod/admin.php:1095
+#: ../../mod/admin.php:106 ../../mod/admin.php:113 ../../mod/admin.php:1108
 msgid "Logs"
 msgstr "Protokolle"
 
@@ -3998,8 +4138,8 @@ msgid "Message queues"
 msgstr "Nachrichten Warteschlange"
 
 #: ../../mod/admin.php:193 ../../mod/admin.php:416 ../../mod/admin.php:474
-#: ../../mod/admin.php:668 ../../mod/admin.php:766 ../../mod/admin.php:808
-#: ../../mod/admin.php:971 ../../mod/admin.php:1007 ../../mod/admin.php:1094
+#: ../../mod/admin.php:681 ../../mod/admin.php:779 ../../mod/admin.php:821
+#: ../../mod/admin.php:984 ../../mod/admin.php:1020 ../../mod/admin.php:1107
 msgid "Administration"
 msgstr "Administration"
 
@@ -4059,7 +4199,7 @@ msgstr "Kostenloser Zugang"
 msgid "Tiered Access"
 msgstr "Abgestufter Zugang"
 
-#: ../../mod/admin.php:419 ../../mod/register.php:172
+#: ../../mod/admin.php:419 ../../mod/register.php:180
 msgid "Registration"
 msgstr "Registrierung"
 
@@ -4248,7 +4388,7 @@ msgstr "Maximale Systemlast bevor Verteil- und Empfangsprozesse verschoben werde
 msgid "No server found"
 msgstr "Kein Server gefunden"
 
-#: ../../mod/admin.php:473
+#: ../../mod/admin.php:473 ../../mod/admin.php:695
 msgid "ID"
 msgstr "ID"
 
@@ -4337,149 +4477,137 @@ msgstr "Benutzer '%s' freigegeben"
 msgid "User '%s' blocked"
 msgstr "Benutzer '%s' blockiert"
 
-#: ../../mod/admin.php:650
-msgid "Normal Account"
-msgstr "Normales Konto"
-
-#: ../../mod/admin.php:651
-msgid "Soapbox Account"
-msgstr "Marktschreier Konto"
-
-#: ../../mod/admin.php:652
-msgid "Community/Celebrity Account"
-msgstr "Community/Celebrity Konto"
-
-#: ../../mod/admin.php:653
-msgid "Automatic Friend Account"
-msgstr "Automatisches Freundschafts- Konto"
-
-#: ../../mod/admin.php:671
+#: ../../mod/admin.php:684
 msgid "select all"
 msgstr "Alle auswählen"
 
-#: ../../mod/admin.php:672
+#: ../../mod/admin.php:685
 msgid "User registrations waiting for confirm"
 msgstr "Neuanmeldungen, die auf deine Bestätigung warten"
 
-#: ../../mod/admin.php:673
+#: ../../mod/admin.php:686
 msgid "Request date"
 msgstr "Antragsdatum"
 
-#: ../../mod/admin.php:674
+#: ../../mod/admin.php:687
 msgid "No registrations."
 msgstr "Keine Registrierungen."
 
-#: ../../mod/admin.php:675 ../../mod/intro.php:11 ../../mod/intro.php:98
+#: ../../mod/admin.php:688 ../../mod/intro.php:11 ../../mod/intro.php:98
 #: ../../mod/notifications.php:159 ../../mod/notifications.php:206
 msgid "Approve"
 msgstr "Genehmigen"
 
-#: ../../mod/admin.php:676
+#: ../../mod/admin.php:689
 msgid "Deny"
 msgstr "Verweigern"
 
-#: ../../mod/admin.php:678 ../../mod/intro.php:14 ../../mod/intro.php:99
-#: ../../mod/connections.php:325 ../../mod/connections.php:466
+#: ../../mod/admin.php:691 ../../mod/intro.php:14 ../../mod/intro.php:99
+#: ../../mod/connections.php:348 ../../mod/connections.php:490
 msgid "Block"
 msgstr "Blockieren"
 
-#: ../../mod/admin.php:679 ../../mod/connections.php:325
-#: ../../mod/connections.php:466
+#: ../../mod/admin.php:692 ../../mod/connections.php:348
+#: ../../mod/connections.php:490
 msgid "Unblock"
 msgstr "Freigeben"
 
-#: ../../mod/admin.php:682
+#: ../../mod/admin.php:695
 msgid "Register date"
 msgstr "Registrierungs-Datum"
 
-#: ../../mod/admin.php:682
+#: ../../mod/admin.php:695
 msgid "Last login"
 msgstr "Letzte Anmeldung"
 
-#: ../../mod/admin.php:682
+#: ../../mod/admin.php:695
+msgid "Expires"
+msgstr "Verfällt"
+
+#: ../../mod/admin.php:695
 msgid "Service Class"
 msgstr "Service-Klasse"
 
-#: ../../mod/admin.php:684
+#: ../../mod/admin.php:697
 msgid ""
 "Selected users will be deleted!\\n\\nEverything these users had posted on "
 "this site will be permanently deleted!\\n\\nAre you sure?"
 msgstr "Markierte Nutzer werden gelöscht\\n\\nAlles was diese Nutzer auf dieser Seite veröffentlicht haben wird permanent gelöscht\\n\\nBist du sicher?"
 
-#: ../../mod/admin.php:685
+#: ../../mod/admin.php:698
 msgid ""
 "The user {0} will be deleted!\\n\\nEverything this user has posted on this "
 "site will be permanently deleted!\\n\\nAre you sure?"
 msgstr "Der Nutzer {0} wird gelöscht\\n\\nAlles was dieser Nutzer auf dieser Seite veröffentlicht hat wird permanent gelöscht werden\\n\\nBist du sicher?"
 
-#: ../../mod/admin.php:726
+#: ../../mod/admin.php:739
 #, php-format
 msgid "Plugin %s disabled."
 msgstr "Plug-In %s deaktiviert."
 
-#: ../../mod/admin.php:730
+#: ../../mod/admin.php:743
 #, php-format
 msgid "Plugin %s enabled."
 msgstr "Plug-In %s aktiviert."
 
-#: ../../mod/admin.php:740 ../../mod/admin.php:942
+#: ../../mod/admin.php:753 ../../mod/admin.php:955
 msgid "Disable"
 msgstr "Deaktivieren"
 
-#: ../../mod/admin.php:742 ../../mod/admin.php:944
+#: ../../mod/admin.php:755 ../../mod/admin.php:957
 msgid "Enable"
 msgstr "Aktivieren"
 
-#: ../../mod/admin.php:768 ../../mod/admin.php:973
+#: ../../mod/admin.php:781 ../../mod/admin.php:986
 msgid "Toggle"
 msgstr "Umschalten"
 
-#: ../../mod/admin.php:776 ../../mod/admin.php:983
+#: ../../mod/admin.php:789 ../../mod/admin.php:996
 msgid "Author: "
 msgstr "Autor: "
 
-#: ../../mod/admin.php:777 ../../mod/admin.php:984
+#: ../../mod/admin.php:790 ../../mod/admin.php:997
 msgid "Maintainer: "
 msgstr "Betreuer:"
 
-#: ../../mod/admin.php:906
+#: ../../mod/admin.php:919
 msgid "No themes found."
 msgstr "Keine Theme gefunden."
 
-#: ../../mod/admin.php:965
+#: ../../mod/admin.php:978
 msgid "Screenshot"
 msgstr "Bildschirmfoto"
 
-#: ../../mod/admin.php:1013
+#: ../../mod/admin.php:1026
 msgid "[Experimental]"
 msgstr "[Experimentell]"
 
-#: ../../mod/admin.php:1014
+#: ../../mod/admin.php:1027
 msgid "[Unsupported]"
 msgstr "[Nicht unterstützt]"
 
-#: ../../mod/admin.php:1041
+#: ../../mod/admin.php:1054
 msgid "Log settings updated."
 msgstr "Protokoll-Einstellungen aktualisiert."
 
-#: ../../mod/admin.php:1097
+#: ../../mod/admin.php:1110
 msgid "Clear"
 msgstr "Leeren"
 
-#: ../../mod/admin.php:1103
+#: ../../mod/admin.php:1116
 msgid "Debugging"
 msgstr "Debugging"
 
-#: ../../mod/admin.php:1104
+#: ../../mod/admin.php:1117
 msgid "Log file"
 msgstr "Protokolldatei"
 
-#: ../../mod/admin.php:1104
+#: ../../mod/admin.php:1117
 msgid ""
 "Must be writable by web server. Relative to your Red top-level directory."
 msgstr "Muss für den Web-Server schreibbar sein. Relativ zum Red Stammverzeichnis."
 
-#: ../../mod/admin.php:1105
+#: ../../mod/admin.php:1118
 msgid "Log level"
 msgstr "Protokollstufe"
 
@@ -4643,6 +4771,10 @@ msgstr "Alle verbundene Channels"
 msgid "Click on a channel to add or remove."
 msgstr "Wähle einen Kanal zum hinzufügen oder entfernen aus."
 
+#: ../../mod/search.php:20 ../../mod/network.php:164
+msgid "Remove term"
+msgstr "Eintrag löschen"
+
 #: ../../mod/photos.php:83
 msgid "Page owner information could not be retrieved."
 msgstr "Informationen über den Betreiber der Seite konnten nicht gefunden werden."
@@ -4651,11 +4783,11 @@ msgstr "Informationen über den Betreiber der Seite konnten nicht gefunden werde
 msgid "Album not found."
 msgstr "Album nicht gefunden."
 
-#: ../../mod/photos.php:125 ../../mod/photos.php:788
+#: ../../mod/photos.php:125 ../../mod/photos.php:780
 msgid "Delete Album"
 msgstr "Album löschen"
 
-#: ../../mod/photos.php:165 ../../mod/photos.php:1053
+#: ../../mod/photos.php:165 ../../mod/photos.php:1041
 msgid "Delete Photo"
 msgstr "Foto löschen"
 
@@ -4672,111 +4804,111 @@ msgstr "Foto"
 msgid "No photos selected"
 msgstr "Keine Fotos ausgewählt"
 
-#: ../../mod/photos.php:640
+#: ../../mod/photos.php:631
 msgid "Access to this item is restricted."
 msgstr "Zugriff auf dieses Foto wurde eingeschränkt."
 
-#: ../../mod/photos.php:704
+#: ../../mod/photos.php:696
 #, php-format
 msgid "You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage."
 msgstr "Du benutzt %1$.2f MBytes deines %2$.2f MBytes großen Bilder-Speichers."
 
-#: ../../mod/photos.php:707
+#: ../../mod/photos.php:699
 #, php-format
 msgid "You have used %1$.2f Mbytes of photo storage."
 msgstr "Du verwendets %1$.2f MBytes deines Foto-Speichers."
 
-#: ../../mod/photos.php:715
+#: ../../mod/photos.php:707
 msgid "Upload Photos"
 msgstr "Fotos hochladen"
 
-#: ../../mod/photos.php:719 ../../mod/photos.php:783
+#: ../../mod/photos.php:711 ../../mod/photos.php:775
 msgid "New album name: "
 msgstr "Name des neuen Albums:"
 
-#: ../../mod/photos.php:720
+#: ../../mod/photos.php:712
 msgid "or existing album name: "
 msgstr "oder bestehenden Album Namen:"
 
-#: ../../mod/photos.php:721
+#: ../../mod/photos.php:713
 msgid "Do not show a status post for this upload"
 msgstr "Keine Statusnachricht für diesen Upload senden"
 
-#: ../../mod/photos.php:723 ../../mod/photos.php:1048
+#: ../../mod/photos.php:715 ../../mod/photos.php:1036
 msgid "Permissions"
 msgstr "Berechtigungen"
 
-#: ../../mod/photos.php:772 ../../mod/photos.php:794 ../../mod/photos.php:1223
-#: ../../mod/photos.php:1238
+#: ../../mod/photos.php:764 ../../mod/photos.php:786 ../../mod/photos.php:1212
+#: ../../mod/photos.php:1227
 msgid "Contact Photos"
 msgstr "Kontakt Bilder"
 
-#: ../../mod/photos.php:798
+#: ../../mod/photos.php:790
 msgid "Edit Album"
 msgstr "Album bearbeiten"
 
-#: ../../mod/photos.php:804
+#: ../../mod/photos.php:796
 msgid "Show Newest First"
 msgstr "Zeige neueste zuerst"
 
-#: ../../mod/photos.php:806
+#: ../../mod/photos.php:798
 msgid "Show Oldest First"
 msgstr "Zeige älteste zuerst"
 
-#: ../../mod/photos.php:850 ../../mod/photos.php:1270
+#: ../../mod/photos.php:842 ../../mod/photos.php:1259
 msgid "View Photo"
 msgstr "Foto ansehen"
 
-#: ../../mod/photos.php:894
+#: ../../mod/photos.php:886
 msgid "Permission denied. Access to this item may be restricted."
 msgstr "Berechtigung verweigert. Der Zugriff ist wahrscheinlich eingeschränkt worden."
 
-#: ../../mod/photos.php:896
+#: ../../mod/photos.php:888
 msgid "Photo not available"
 msgstr "Foto nicht verfügbar"
 
-#: ../../mod/photos.php:954
+#: ../../mod/photos.php:946
 msgid "Use as profile photo"
 msgstr "Als Profilfoto verwenden"
 
-#: ../../mod/photos.php:982
+#: ../../mod/photos.php:970
 msgid "View Full Size"
 msgstr "In voller Größe anzeigen"
 
-#: ../../mod/photos.php:1036
+#: ../../mod/photos.php:1024
 msgid "Edit photo"
 msgstr "Foto bearbeiten"
 
-#: ../../mod/photos.php:1038
+#: ../../mod/photos.php:1026
 msgid "Rotate CW (right)"
 msgstr "Drehen US (rechts)"
 
-#: ../../mod/photos.php:1039
+#: ../../mod/photos.php:1027
 msgid "Rotate CCW (left)"
 msgstr "Drehen EUS (links)"
 
-#: ../../mod/photos.php:1041
+#: ../../mod/photos.php:1029
 msgid "New album name"
 msgstr "Name des neuen Albums:"
 
-#: ../../mod/photos.php:1044
+#: ../../mod/photos.php:1032
 msgid "Caption"
 msgstr "Bildunterschrift"
 
-#: ../../mod/photos.php:1046
+#: ../../mod/photos.php:1034
 msgid "Add a Tag"
 msgstr "Schlagwort hinzufügen"
 
-#: ../../mod/photos.php:1050
+#: ../../mod/photos.php:1038
 msgid ""
 "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
 msgstr "Beispiel: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
 
-#: ../../mod/photos.php:1276
+#: ../../mod/photos.php:1265
 msgid "View Album"
 msgstr "Album ansehen"
 
-#: ../../mod/photos.php:1285
+#: ../../mod/photos.php:1274
 msgid "Recent Photos"
 msgstr "Neueste Fotos"
 
@@ -4788,11 +4920,11 @@ msgstr "eine private Nachricht schicken"
 msgid "added your channel"
 msgstr "hat deinen Kanal hinzugefügt"
 
-#: ../../mod/ping.php:230 ../../boot.php:1827 ../../boot.php:1907
+#: ../../mod/ping.php:230 ../../boot.php:1858 ../../boot.php:1938
 msgid "g A l F d"
 msgstr "l, d. F G \\\\U\\\\h\\\\r"
 
-#: ../../mod/ping.php:252 ../../boot.php:1873 ../../boot.php:1948
+#: ../../mod/ping.php:252 ../../boot.php:1904 ../../boot.php:1979
 msgid "[today]"
 msgstr "[Heute]"
 
@@ -4829,7 +4961,7 @@ msgid "Drop"
 msgstr "Löschen"
 
 #: ../../mod/menu.php:57 ../../mod/network.php:321
-#: ../../mod/connections.php:528
+#: ../../mod/connections.php:552
 msgid "New"
 msgstr "Neu"
 
@@ -4890,77 +5022,93 @@ msgstr "Einträge zu diesem Menü hinzufügen oder entfernen"
 msgid "Welcome to %s"
 msgstr "Willkommen auf %s"
 
-#: ../../mod/message.php:16
+#: ../../mod/message.php:19
 msgid "Check Mail"
 msgstr "E-Mails abrufen"
 
-#: ../../mod/message.php:52
+#: ../../mod/message.php:56
 msgid "Unable to lookup recipient."
 msgstr "Konnte den Empfänger nicht finden."
 
-#: ../../mod/message.php:60
+#: ../../mod/message.php:64
 msgid "Unable to communicate with requested channel."
 msgstr "Die Kommunikation mit dem ausgewählten Kanal ist fehlgeschlagen."
 
-#: ../../mod/message.php:67
+#: ../../mod/message.php:71
 msgid "Cannot verify requested channel."
 msgstr "Verifizierung des angeforderten Kanals fehlgeschlagen."
 
-#: ../../mod/message.php:93
+#: ../../mod/message.php:97
 msgid "Selected channel has private message restrictions. Send failed."
 msgstr "Der ausgewählte Kanal hat Einschränkungen bzgl. privater Nachrichten. Senden fehlgeschlagen."
 
-#: ../../mod/message.php:213 ../../mod/notifications.php:101
+#: ../../mod/message.php:223 ../../mod/notifications.php:101
 msgid "Messages"
 msgstr "Nachrichten"
 
-#: ../../mod/message.php:224
+#: ../../mod/message.php:234
 msgid "Message deleted."
 msgstr "Nachricht gelöscht."
 
-#: ../../mod/message.php:231
+#: ../../mod/message.php:241
 msgid "Conversation removed."
 msgstr "Unterhaltung gelöscht."
 
-#: ../../mod/message.php:287
+#: ../../mod/message.php:258
+msgid "Message recalled."
+msgstr "Nachricht widerrufen."
+
+#: ../../mod/message.php:316
 msgid "Send Private Message"
 msgstr "Private Nachricht senden"
 
-#: ../../mod/message.php:288 ../../mod/message.php:453
+#: ../../mod/message.php:317 ../../mod/message.php:503
 msgid "To:"
 msgstr "An:"
 
-#: ../../mod/message.php:293 ../../mod/message.php:455
+#: ../../mod/message.php:322 ../../mod/message.php:505
 msgid "Subject:"
 msgstr "Betreff:"
 
-#: ../../mod/message.php:322
+#: ../../mod/message.php:359
 msgid "No messages."
 msgstr "Keine Nachrichten."
 
-#: ../../mod/message.php:338 ../../mod/message.php:424
+#: ../../mod/message.php:375 ../../mod/message.php:472
 msgid "Delete message"
 msgstr "Nachricht löschen"
 
-#: ../../mod/message.php:340
+#: ../../mod/message.php:377
 msgid "D, d M Y - g:i A"
 msgstr "D, d. M Y - g:i A"
 
-#: ../../mod/message.php:359
+#: ../../mod/message.php:396
 msgid "Message not found."
 msgstr "Nachricht nicht gefunden."
 
-#: ../../mod/message.php:446
+#: ../../mod/message.php:473
+msgid "Recall message"
+msgstr "Widerrufe die Nachricht"
+
+#: ../../mod/message.php:475
+msgid "Message has been recalled."
+msgstr "Die Nachricht wurde widerrufen."
+
+#: ../../mod/message.php:492
+msgid "Private Conversation"
+msgstr "Private Unterhaltung"
+
+#: ../../mod/message.php:496
 msgid "Delete conversation"
 msgstr "Unterhaltung löschen"
 
-#: ../../mod/message.php:448
+#: ../../mod/message.php:498
 msgid ""
 "No secure communications available. You <strong>may</strong> be able to "
 "respond from the sender's profile page."
 msgstr "Keine sichere Kommunikation verfügbar. <strong>Eventuell</strong> kannst du von der Profilseite des Absenders antworten."
 
-#: ../../mod/message.php:452
+#: ../../mod/message.php:502
 msgid "Send Reply"
 msgstr "Antwort senden"
 
@@ -4968,18 +5116,26 @@ msgstr "Antwort senden"
 msgid "No profile"
 msgstr "Kein Profil"
 
-#: ../../mod/help.php:30
+#: ../../mod/layouts.php:52
+msgid "Layout Help"
+msgstr "Layout Hilfe"
+
+#: ../../mod/layouts.php:55
+msgid "Help with this feature"
+msgstr "Hilfe zu diesem Feature"
+
+#: ../../mod/layouts.php:74
+msgid "Layout Name"
+msgstr "Layout Name"
+
+#: ../../mod/help.php:41
 msgid "Help:"
 msgstr "Hilfe:"
 
-#: ../../mod/help.php:38 ../../index.php:226
+#: ../../mod/help.php:53 ../../index.php:226
 msgid "Not Found"
 msgstr "Nicht gefunden"
 
-#: ../../mod/help.php:41 ../../index.php:229
-msgid "Page not found."
-msgstr "Seite nicht gefunden."
-
 #: ../../mod/rmagic.php:56
 msgid "Remote Authentication"
 msgstr "Entfernte Authentifizierung"
@@ -4992,10 +5148,6 @@ msgstr "Geben Sie Ihre Kanal-Adresse (z.B. channel@example.com)"
 msgid "Authenticate"
 msgstr "Authentifizieren"
 
-#: ../../mod/network.php:164 ../../mod/search.php:20
-msgid "Remove term"
-msgstr "Eintrag löschen"
-
 #: ../../mod/network.php:302
 msgid "Commented Order"
 msgstr "Neueste Kommentare"
@@ -5044,11 +5196,11 @@ msgstr "Nachrichten die als SPAM markiert wurden"
 msgid "Refresh"
 msgstr "Aktualisieren"
 
-#: ../../mod/network.php:385 ../../mod/connections.php:381
+#: ../../mod/network.php:385 ../../mod/connections.php:404
 msgid "Me"
 msgstr "Ich"
 
-#: ../../mod/network.php:386 ../../mod/connections.php:383
+#: ../../mod/network.php:386 ../../mod/connections.php:406
 msgid "Best Friends"
 msgstr "Beste Freunde"
 
@@ -5056,11 +5208,11 @@ msgstr "Beste Freunde"
 msgid "Co-workers"
 msgstr "Kollegen"
 
-#: ../../mod/network.php:389 ../../mod/connections.php:385
+#: ../../mod/network.php:389 ../../mod/connections.php:408
 msgid "Former Friends"
 msgstr "ehem. Freunde"
 
-#: ../../mod/network.php:390 ../../mod/connections.php:386
+#: ../../mod/network.php:390 ../../mod/connections.php:409
 msgid "Acquaintances"
 msgstr "Bekanntschaften"
 
@@ -5085,13 +5237,13 @@ msgid "Invalid connection."
 msgstr "Ungültige Verbindung."
 
 #: ../../mod/intro.php:17 ../../mod/intro.php:100
-#: ../../mod/connections.php:332 ../../mod/connections.php:467
+#: ../../mod/connections.php:355 ../../mod/connections.php:491
 #: ../../mod/notifications.php:51 ../../mod/notifications.php:162
 #: ../../mod/notifications.php:208
 msgid "Ignore"
 msgstr "Ignorieren"
 
-#: ../../mod/intro.php:29 ../../mod/connections.php:119
+#: ../../mod/intro.php:29 ../../mod/connections.php:122
 msgid "Connection updated."
 msgstr "Verbindung aktualisiert."
 
@@ -5111,7 +5263,7 @@ msgstr "Keine wartenden Vorstellungen."
 msgid "System error. Please try again later."
 msgstr "Systemfehler. Bitte später erneut versuchen."
 
-#: ../../mod/intro.php:95 ../../mod/connections.php:472
+#: ../../mod/intro.php:95 ../../mod/connections.php:496
 #: ../../mod/notifications.php:155 ../../mod/notifications.php:202
 msgid "Hide this contact from others"
 msgstr "Diese Verbindung vor den anderen verbergen."
@@ -5131,381 +5283,385 @@ msgstr "falls anwendbar"
 msgid "Discard"
 msgstr "Verwerfen"
 
-#: ../../mod/connections.php:64
+#: ../../mod/connections.php:67
 msgid "Could not access contact record."
 msgstr "Konnte auf den Kontakteintrag nicht zugreifen."
 
-#: ../../mod/connections.php:78
+#: ../../mod/connections.php:81
 msgid "Could not locate selected profile."
 msgstr "Konnte das gewählte Profil nicht finden."
 
-#: ../../mod/connections.php:121
+#: ../../mod/connections.php:124
 msgid "Failed to update connection record."
 msgstr "Konnte den Verbindungseintrag nicht aktualisieren."
 
-#: ../../mod/connections.php:196
+#: ../../mod/connections.php:219
 msgid "Could not access address book record."
 msgstr "Konnte nicht auf den Eintrag im Adressbuch zugreifen."
 
-#: ../../mod/connections.php:210
+#: ../../mod/connections.php:233
 msgid "Refresh failed - channel is currently unavailable."
 msgstr "Aktualisierung fehlgeschlagen - der Kanal ist im Moment nicht erreichbar."
 
-#: ../../mod/connections.php:217
+#: ../../mod/connections.php:240
 msgid "Channel has been unblocked"
 msgstr "Kanal nicht mehr blockiert"
 
-#: ../../mod/connections.php:218
+#: ../../mod/connections.php:241
 msgid "Channel has been blocked"
 msgstr "Kanal blockiert"
 
-#: ../../mod/connections.php:222 ../../mod/connections.php:234
-#: ../../mod/connections.php:246 ../../mod/connections.php:258
-#: ../../mod/connections.php:273
+#: ../../mod/connections.php:245 ../../mod/connections.php:257
+#: ../../mod/connections.php:269 ../../mod/connections.php:281
+#: ../../mod/connections.php:296
 msgid "Unable to set address book parameters."
 msgstr "Konnte die Adressbuch Parameter nicht setzen."
 
-#: ../../mod/connections.php:229
+#: ../../mod/connections.php:252
 msgid "Channel has been unignored"
 msgstr "Kanal wird nicht mehr ignoriert"
 
-#: ../../mod/connections.php:230
+#: ../../mod/connections.php:253
 msgid "Channel has been ignored"
 msgstr "Kanal wird ignoriert"
 
-#: ../../mod/connections.php:241
+#: ../../mod/connections.php:264
 msgid "Channel has been unarchived"
 msgstr "Kanal wurde aus dem Archiv zurück geholt"
 
-#: ../../mod/connections.php:242
+#: ../../mod/connections.php:265
 msgid "Channel has been archived"
 msgstr "Kanal wurde archiviert"
 
-#: ../../mod/connections.php:253
+#: ../../mod/connections.php:276
 msgid "Channel has been unhidden"
 msgstr "Kanal wird nicht mehr versteckt"
 
-#: ../../mod/connections.php:254
+#: ../../mod/connections.php:277
 msgid "Channel has been hidden"
 msgstr "Kanal wurde versteckt"
 
-#: ../../mod/connections.php:268
+#: ../../mod/connections.php:291
 msgid "Channel has been approved"
 msgstr "Kanal wurde zugelassen"
 
-#: ../../mod/connections.php:269
+#: ../../mod/connections.php:292
 msgid "Channel has been unapproved"
 msgstr "Zulassung des Kanals entfernt"
 
-#: ../../mod/connections.php:287
+#: ../../mod/connections.php:310
 msgid "Contact has been removed."
 msgstr "Kontakt wurde entfernt."
 
-#: ../../mod/connections.php:307
+#: ../../mod/connections.php:330
 #, php-format
 msgid "View %s's profile"
 msgstr "%s's Profil ansehen"
 
-#: ../../mod/connections.php:311
+#: ../../mod/connections.php:334
 msgid "Refresh Permissions"
 msgstr "Zugriffsrechte auffrischen"
 
-#: ../../mod/connections.php:314
+#: ../../mod/connections.php:337
 msgid "Fetch updated permissions"
 msgstr "Aktualisierte Zugriffsrechte abfragen"
 
-#: ../../mod/connections.php:318
+#: ../../mod/connections.php:341
 msgid "Recent Activity"
 msgstr "Kürzliche Aktivitäten"
 
-#: ../../mod/connections.php:321
+#: ../../mod/connections.php:344
 msgid "View recent posts and comments"
 msgstr "Betrachte die neuesten Beiträge und Kommentare"
 
-#: ../../mod/connections.php:328
+#: ../../mod/connections.php:351
 msgid "Block or Unblock this connection"
 msgstr "Verbindung blockieren oder frei geben"
 
-#: ../../mod/connections.php:332 ../../mod/connections.php:467
+#: ../../mod/connections.php:355 ../../mod/connections.php:491
 msgid "Unignore"
 msgstr "Nicht ignorieren"
 
-#: ../../mod/connections.php:335
+#: ../../mod/connections.php:358
 msgid "Ignore or Unignore this connection"
 msgstr "Verbindung ignorieren oder wieder beachten"
 
-#: ../../mod/connections.php:338
+#: ../../mod/connections.php:361
 msgid "Unarchive"
 msgstr "Aus Archiv zurückholen"
 
-#: ../../mod/connections.php:338
+#: ../../mod/connections.php:361
 msgid "Archive"
 msgstr "Archivieren"
 
-#: ../../mod/connections.php:341
+#: ../../mod/connections.php:364
 msgid "Archive or Unarchive this connection"
 msgstr "Archiviere diese Verbindung oder hole sie aus dem Archiv zurück"
 
-#: ../../mod/connections.php:344
+#: ../../mod/connections.php:367
 msgid "Unhide"
 msgstr "aufdecken"
 
-#: ../../mod/connections.php:344
+#: ../../mod/connections.php:367
 msgid "Hide"
 msgstr "Verbergen"
 
-#: ../../mod/connections.php:347
+#: ../../mod/connections.php:370
 msgid "Hide or Unhide this connection"
 msgstr "Diese Verbindung verstecken oder aufdecken"
 
-#: ../../mod/connections.php:354
+#: ../../mod/connections.php:377
 msgid "Delete this connection"
 msgstr "Verbindung löschen"
 
-#: ../../mod/connections.php:387
+#: ../../mod/connections.php:410
 msgid "Unknown"
 msgstr "Unbekannt"
 
-#: ../../mod/connections.php:397 ../../mod/connections.php:425
+#: ../../mod/connections.php:420 ../../mod/connections.php:449
 msgid "Approve this connection"
 msgstr "Verbindung genehmigen"
 
-#: ../../mod/connections.php:397
+#: ../../mod/connections.php:420
 msgid "Accept connection to allow communication"
 msgstr "Aktzeptiere die Verbindung um Kommunikation zu ermöglichen"
 
-#: ../../mod/connections.php:413
+#: ../../mod/connections.php:436
 msgid "Automatic Permissions Settings"
 msgstr "Automatische Berechtigungs-Einstellungen"
 
-#: ../../mod/connections.php:413
+#: ../../mod/connections.php:436
 #, php-format
 msgid "Connections: settings for %s"
 msgstr "Verbindungseinstellungen für %s"
 
-#: ../../mod/connections.php:417
+#: ../../mod/connections.php:440
 msgid ""
 "When receiving a channel introduction, any permissions provided here will be"
 " applied to the new connection automatically and the introduction approved. "
 "Leave this page if you do not wish to use this feature."
 msgstr "Wenn eine Kanal-Vorstellung empfangen wird, werden die hier getroffenen Einstellungen automatisch angewandt und der Anfrage wird stattgegeben. Verlasse diese Seite, wenn du dieses Feature nicht verwanden möchtest."
 
-#: ../../mod/connections.php:419
+#: ../../mod/connections.php:442
 msgid "Slide to adjust your degree of friendship"
 msgstr "Schieben um den Grad der Freundschaft zu wählen"
 
-#: ../../mod/connections.php:426
+#: ../../mod/connections.php:448
+msgid "inherited"
+msgstr "Geerbt"
+
+#: ../../mod/connections.php:450
 msgid "Connection has no individual permissions!"
 msgstr "Diese Verbindung hat keine individuellen Zugriffseinstellungen."
 
-#: ../../mod/connections.php:427
+#: ../../mod/connections.php:451
 msgid ""
 "This may be appropriate based on your <a href=\"settings\">privacy "
 "settings</a>, though you may wish to review the \"Advanced Permissions\"."
 msgstr "Abhängig von deinen <a href=\"settings\">Privatsphären Einstellungen</a> könnte dies angebracht sein, eventuell solltest du aber die \"Erweiterte Zugriffsrechte\" überprüfen."
 
-#: ../../mod/connections.php:429
+#: ../../mod/connections.php:453
 msgid "Profile Visibility"
 msgstr "Sichtbarkeit des Profils"
 
-#: ../../mod/connections.php:430
+#: ../../mod/connections.php:454
 #, php-format
 msgid ""
 "Please choose the profile you would like to display to %s when viewing your "
 "profile securely."
 msgstr "Bitte wähle ein Profil, das wir %s zeigen sollen, wenn deine Profilseite über eine verifizierte Verbindung aufgerufen wird."
 
-#: ../../mod/connections.php:431
+#: ../../mod/connections.php:455
 msgid "Contact Information / Notes"
 msgstr "Kontaktinformationen / Notizen"
 
-#: ../../mod/connections.php:432
+#: ../../mod/connections.php:456
 msgid "Edit contact notes"
 msgstr "Kontaktnotizen editieren"
 
-#: ../../mod/connections.php:434
+#: ../../mod/connections.php:458
 msgid "Their Settings"
 msgstr "Deren Einstellungen"
 
-#: ../../mod/connections.php:435
+#: ../../mod/connections.php:459
 msgid "My Settings"
 msgstr "Meine Einstellungen"
 
-#: ../../mod/connections.php:437
+#: ../../mod/connections.php:461
 msgid "Forum Members"
 msgstr "Forum Mitglieder"
 
-#: ../../mod/connections.php:438
+#: ../../mod/connections.php:462
 msgid "Soapbox"
 msgstr "Marktschreier"
 
-#: ../../mod/connections.php:439
+#: ../../mod/connections.php:463
 msgid "Full Sharing"
 msgstr "Volles Teilen"
 
-#: ../../mod/connections.php:440
+#: ../../mod/connections.php:464
 msgid "Cautious Sharing"
 msgstr "Vorsichtiges Teilen"
 
-#: ../../mod/connections.php:441
+#: ../../mod/connections.php:465
 msgid "Follow Only"
 msgstr "Nur Folgen"
 
-#: ../../mod/connections.php:442
+#: ../../mod/connections.php:466
 msgid "Individual Permissions"
 msgstr "Individuelle Zugriffseinstellungen"
 
-#: ../../mod/connections.php:443
+#: ../../mod/connections.php:467
 msgid ""
-"Individual permissions are only enabled for <a href=\"settings\">privacy "
-"settings</a> which are set to \"Only those you specifically allow\". "
-"Otherwise they are controlled by your privacy settings."
-msgstr "Individuelle Zugriffseinstellungen sind nur aktive bei <a href=\"settings\">Privatspären Einstellungen</a> die auf \"Nur diejenigen, die Sie erlauben\" gesetzt sind. Andernfalls wird dies über deine Privatsphären Einstellungen geregelt."
+"Some permissions may be inherited from your channel <a "
+"href=\"settings\">privacy settings</a>, which have higher priority. Changing"
+" those inherited settings on this page will have no effect."
+msgstr ""
 
-#: ../../mod/connections.php:444
+#: ../../mod/connections.php:468
 msgid "Advanced Permissions"
 msgstr "Erweiterte Zugriffsrechte"
 
-#: ../../mod/connections.php:445
+#: ../../mod/connections.php:469
 msgid "Quick Links"
 msgstr "Quick Links"
 
-#: ../../mod/connections.php:449
+#: ../../mod/connections.php:473
 #, php-format
 msgid "Visit %s's profile - %s"
 msgstr "%s's Profil besuchen - %s"
 
-#: ../../mod/connections.php:450
+#: ../../mod/connections.php:474
 msgid "Block/Unblock contact"
 msgstr "Geblockt Status ein- / ausschalten"
 
-#: ../../mod/connections.php:451
+#: ../../mod/connections.php:475
 msgid "Ignore contact"
 msgstr "Kontakt ignorieren"
 
-#: ../../mod/connections.php:452
+#: ../../mod/connections.php:476
 msgid "Repair URL settings"
 msgstr "URL Einstellungen reparieren"
 
-#: ../../mod/connections.php:453
+#: ../../mod/connections.php:477
 msgid "View conversations"
 msgstr "Unterhaltungen anzeigen"
 
-#: ../../mod/connections.php:455
+#: ../../mod/connections.php:479
 msgid "Delete contact"
 msgstr "Kontakt löschen"
 
-#: ../../mod/connections.php:458
+#: ../../mod/connections.php:482
 msgid "Last update:"
 msgstr "Letzte Aktualisierung:"
 
-#: ../../mod/connections.php:460
+#: ../../mod/connections.php:484
 msgid "Update public posts"
 msgstr "Öffentliche Beiträge aktualisieren"
 
-#: ../../mod/connections.php:462
+#: ../../mod/connections.php:486
 msgid "Update now"
 msgstr "Jetzt aktualisieren"
 
-#: ../../mod/connections.php:468
+#: ../../mod/connections.php:492
 msgid "Currently blocked"
 msgstr "Derzeit blockiert"
 
-#: ../../mod/connections.php:469
+#: ../../mod/connections.php:493
 msgid "Currently ignored"
 msgstr "Derzeit ignoriert"
 
-#: ../../mod/connections.php:470
+#: ../../mod/connections.php:494
 msgid "Currently archived"
 msgstr "Derzeit archiviert"
 
-#: ../../mod/connections.php:471
+#: ../../mod/connections.php:495
 msgid "Currently pending"
 msgstr "Derzeit anstehend"
 
-#: ../../mod/connections.php:472
+#: ../../mod/connections.php:496
 msgid ""
 "Replies/likes to your public posts <strong>may</strong> still be visible"
 msgstr "Antworten/Likes auf deine öffentlichen Beiträge <strong>können</strong> immer noch sichtbar sein"
 
-#: ../../mod/connections.php:508 ../../mod/connections.php:580
+#: ../../mod/connections.php:532 ../../mod/connections.php:604
 msgid "Blocked"
 msgstr "Blockiert"
 
-#: ../../mod/connections.php:513 ../../mod/connections.php:587
+#: ../../mod/connections.php:537 ../../mod/connections.php:611
 msgid "Ignored"
 msgstr "Ignoriert"
 
-#: ../../mod/connections.php:518 ../../mod/connections.php:601
+#: ../../mod/connections.php:542 ../../mod/connections.php:625
 msgid "Hidden"
 msgstr "Versteckt"
 
-#: ../../mod/connections.php:523 ../../mod/connections.php:594
+#: ../../mod/connections.php:547 ../../mod/connections.php:618
 msgid "Archived"
 msgstr "Archiviert"
 
-#: ../../mod/connections.php:534
+#: ../../mod/connections.php:558
 msgid "All"
 msgstr "Alle"
 
-#: ../../mod/connections.php:555
+#: ../../mod/connections.php:579
 msgid "Suggestions"
 msgstr "Vorschläge"
 
-#: ../../mod/connections.php:558
+#: ../../mod/connections.php:582
 msgid "Suggest new connections"
 msgstr "Neue Verbindungen vorschlagen"
 
-#: ../../mod/connections.php:564
+#: ../../mod/connections.php:588
 msgid "Show pending (new) connections"
 msgstr "Zeige schwebende (neue) Verbindungen"
 
-#: ../../mod/connections.php:567
+#: ../../mod/connections.php:591
 msgid "All Connections"
 msgstr "Alle Verbindungen"
 
-#: ../../mod/connections.php:570
+#: ../../mod/connections.php:594
 msgid "Show all connections"
 msgstr "Zeige alle Verbindungen"
 
-#: ../../mod/connections.php:573
+#: ../../mod/connections.php:597
 msgid "Unblocked"
 msgstr "Freigegeben"
 
-#: ../../mod/connections.php:576
+#: ../../mod/connections.php:600
 msgid "Only show unblocked connections"
 msgstr "Zeige nur freigegebene Verbindungen"
 
-#: ../../mod/connections.php:583
+#: ../../mod/connections.php:607
 msgid "Only show blocked connections"
 msgstr "Zeige nur blockierte Verbindungen"
 
-#: ../../mod/connections.php:590
+#: ../../mod/connections.php:614
 msgid "Only show ignored connections"
 msgstr "Zeige nur ignorierte Verbindungen"
 
-#: ../../mod/connections.php:597
+#: ../../mod/connections.php:621
 msgid "Only show archived connections"
 msgstr "Zeige nur archivierte Verbindungen"
 
-#: ../../mod/connections.php:604
+#: ../../mod/connections.php:628
 msgid "Only show hidden connections"
 msgstr "Zeige nur versteckte Verbindungen"
 
-#: ../../mod/connections.php:646
+#: ../../mod/connections.php:670
 #, php-format
 msgid "%1$s [%2$s]"
 msgstr "%1$s [%2$s]"
 
-#: ../../mod/connections.php:647 ../../mod/nogroup.php:41
+#: ../../mod/connections.php:671 ../../mod/nogroup.php:41
 msgid "Edit contact"
 msgstr "Kontakt bearbeiten"
 
-#: ../../mod/connections.php:671
+#: ../../mod/connections.php:695
 msgid "Search your connections"
 msgstr "Verbindungen durchsuchen"
 
-#: ../../mod/connections.php:672
+#: ../../mod/connections.php:696
 msgid "Finding: "
 msgstr "Ergebnisse:"
 
@@ -5594,7 +5750,7 @@ msgstr "Hobbys/Interessen"
 msgid "Address"
 msgstr "Adresse"
 
-#: ../../mod/profiles.php:367
+#: ../../mod/profiles.php:367 ../../mod/pubsites.php:31
 msgid "Location"
 msgstr "Ort"
 
@@ -5757,7 +5913,7 @@ msgid ""
 "be visible to anybody using the internet."
 msgstr "Dies ist Dein <strong>öffentliches</strong> Profil.<br />Es <strong>könnte</strong> für jeden im Internet sichtbar sein."
 
-#: ../../mod/profiles.php:584 ../../mod/directory.php:145
+#: ../../mod/profiles.php:584 ../../mod/directory.php:160
 msgid "Age: "
 msgstr "Alter:"
 
@@ -5765,23 +5921,23 @@ msgstr "Alter:"
 msgid "Edit/Manage Profiles"
 msgstr "Bearbeite/Verwalte Profile"
 
-#: ../../mod/profiles.php:624 ../../boot.php:1724
+#: ../../mod/profiles.php:624 ../../boot.php:1755
 msgid "Change profile photo"
 msgstr "Ändere das Profilfoto"
 
-#: ../../mod/profiles.php:625 ../../boot.php:1731
+#: ../../mod/profiles.php:625 ../../boot.php:1762
 msgid "Create New Profile"
 msgstr "Neues Profil erstellen"
 
-#: ../../mod/profiles.php:636 ../../boot.php:1745
+#: ../../mod/profiles.php:636 ../../boot.php:1776
 msgid "Profile Image"
 msgstr "Profilfoto:"
 
-#: ../../mod/profiles.php:639 ../../boot.php:1748
+#: ../../mod/profiles.php:639 ../../boot.php:1779
 msgid "visible to everybody"
 msgstr "sichtbar für jeden"
 
-#: ../../mod/profiles.php:640 ../../boot.php:1749
+#: ../../mod/profiles.php:640 ../../boot.php:1780
 msgid "Edit visibility"
 msgstr "Sichtbarkeit bearbeiten"
 
@@ -5859,7 +6015,7 @@ msgid ""
 "Password reset failed."
 msgstr "Die Anfrage konnte nicht verifiziert werden. (Es könnte sein, dass du vorher bereits eine Anfrage eingereicht hast.) Passwort Anforderung fehlgeschlagen."
 
-#: ../../mod/lostpass.php:85 ../../boot.php:1446
+#: ../../mod/lostpass.php:85 ../../boot.php:1469
 msgid "Password Reset"
 msgstr "Zurücksetzen des Kennworts"
 
@@ -5985,32 +6141,32 @@ msgstr "Egal welche Option du wählst, bitte lege fest, ob dieser Hub deine neue
 msgid "Make this hub my primary location"
 msgstr "Dieser Hub ist mein primärer Server."
 
-#: ../../mod/manage.php:62
+#: ../../mod/manage.php:63
 #, php-format
 msgid "You have created %1$.0f of %2$.0f allowed channels."
 msgstr "Du hast %1$.0f von %2$.0f erlaubten Kanälen eingerichtet."
 
-#: ../../mod/manage.php:70
+#: ../../mod/manage.php:71
 msgid "Create a new channel"
 msgstr "Erzeuge neues Kanal"
 
-#: ../../mod/manage.php:75
+#: ../../mod/manage.php:76
 msgid "Channel Manager"
 msgstr "Kanal-Manager"
 
-#: ../../mod/manage.php:76
+#: ../../mod/manage.php:77
 msgid "Current Channel"
 msgstr "Aktueller Kanal"
 
-#: ../../mod/manage.php:78
+#: ../../mod/manage.php:79
 msgid "Attach to one of your channels by selecting it."
 msgstr "Wähle einen deiner Kanäle aus um ihn zu verwenden."
 
-#: ../../mod/manage.php:79
+#: ../../mod/manage.php:80
 msgid "Default Channel"
 msgstr "Standard Kanal"
 
-#: ../../mod/manage.php:80
+#: ../../mod/manage.php:81
 msgid "Make Default"
 msgstr "Zum Standard machen"
 
@@ -6121,21 +6277,21 @@ msgid "Edit Layout"
 msgstr "Layout bearbeiten"
 
 #: ../../mod/editlayout.php:104 ../../mod/editwebpage.php:123
-#: ../../mod/editpost.php:98 ../../mod/editblock.php:118
+#: ../../mod/editpost.php:101 ../../mod/editblock.php:118
 msgid "Insert YouTube video"
 msgstr "YouTube-Video einfügen"
 
 #: ../../mod/editlayout.php:105 ../../mod/editwebpage.php:124
-#: ../../mod/editpost.php:99 ../../mod/editblock.php:119
+#: ../../mod/editpost.php:102 ../../mod/editblock.php:119
 msgid "Insert Vorbis [.ogg] video"
 msgstr "Vorbis [.ogg]-Video einfügen"
 
 #: ../../mod/editlayout.php:106 ../../mod/editwebpage.php:125
-#: ../../mod/editpost.php:100 ../../mod/editblock.php:120
+#: ../../mod/editpost.php:103 ../../mod/editblock.php:120
 msgid "Insert Vorbis [.ogg] audio"
 msgstr "Vorbis [.ogg]-Audio einfügen"
 
-#: ../../mod/editlayout.php:137
+#: ../../mod/editlayout.php:140
 msgid "Delete Layout"
 msgstr "Layout löschen"
 
@@ -6223,7 +6379,7 @@ msgstr "Reduzierung der Bildgröße [%s] fehlgeschlagen."
 msgid "Edit Webpage"
 msgstr "Webseite bearbeiten"
 
-#: ../../mod/editwebpage.php:158
+#: ../../mod/editwebpage.php:162
 msgid "Delete Webpage"
 msgstr "Webseite löschen"
 
@@ -6361,7 +6517,15 @@ msgstr "Keine Pinwand-Benachrichtigungen mehr."
 msgid "Home Notifications"
 msgstr "Pinwand-Benachrichtigungen"
 
-#: ../../mod/oexchange.php:22
+#: ../../mod/blocks.php:65
+msgid "Block Name"
+msgstr "Block Name"
+
+#: ../../mod/oexchange.php:23
+msgid "Unable to find your hub."
+msgstr "Konnte den Hub nicht finden."
+
+#: ../../mod/oexchange.php:37
 msgid "Post successful."
 msgstr "Veröffentlichung erfolgreich."
 
@@ -6369,10 +6533,6 @@ msgstr "Veröffentlichung erfolgreich."
 msgid "Item is not editable"
 msgstr "Element kann nicht bearbeitet werden."
 
-#: ../../mod/editpost.php:40
-msgid "Edit post"
-msgstr "Bearbeite Beitrag"
-
 #: ../../mod/profile.php:111
 msgid "Access to this profile has been restricted."
 msgstr "Der Zugang zu diesem Profil ist begrenzt."
@@ -6397,10 +6557,14 @@ msgstr "Wähle was du mit dem/r Empfänger/in tun willst"
 msgid "Make this post private"
 msgstr "Diesen Beitrag privat machen"
 
-#: ../../mod/wall_upload.php:41 ../../mod/item.php:1098
+#: ../../mod/wall_upload.php:41 ../../mod/item.php:1074
 msgid "Wall Photos"
 msgstr "Wall Fotos"
 
+#: ../../mod/channel.php:120
+msgid "Insufficient permissions.  Request redirected to profile page."
+msgstr "Unzureichende Zugriffsrechte. Die Anfrage wurde zur Profil-Seite umgeleitet."
+
 #: ../../mod/community.php:23
 msgid "Not available."
 msgstr "Nicht verfügbar."
@@ -6434,7 +6598,7 @@ msgstr "Schlage %s einen Kontakt vor"
 msgid "Edit Block"
 msgstr "Block bearbeiten"
 
-#: ../../mod/editblock.php:153
+#: ../../mod/editblock.php:156
 msgid "Delete Block"
 msgstr "Block löschen"
 
@@ -6458,28 +6622,28 @@ msgstr "Sichtbar für"
 msgid "All Contacts (with secure profile access)"
 msgstr "Alle Kontakte (mit sicherem Zuging zum Profil)"
 
-#: ../../mod/item.php:133
+#: ../../mod/item.php:144
 msgid "Unable to locate original post."
 msgstr "Originalbeitrag kann nicht gefunden werden."
 
-#: ../../mod/item.php:317
+#: ../../mod/item.php:341
 msgid "Empty post discarded."
 msgstr "Leerer Beitrag verworfen."
 
-#: ../../mod/item.php:361
+#: ../../mod/item.php:383
 msgid "Executable content type not permitted to this channel."
 msgstr "Ausführbarer Content-Typ ist für diesen Kanal nicht freigegeben."
 
-#: ../../mod/item.php:813
+#: ../../mod/item.php:793
 msgid "System error. Post not saved."
 msgstr "Systemfehler. Beitrag nicht gespeichert."
 
-#: ../../mod/item.php:1177
+#: ../../mod/item.php:1153
 #, php-format
 msgid "You have reached your limit of %1$.0f top level posts."
 msgstr "Du hast die maximale Anzahl von %1$.0f Beiträgen erreicht."
 
-#: ../../mod/item.php:1183
+#: ../../mod/item.php:1159
 #, php-format
 msgid "You have reached your limit of %1$.0f webpages."
 msgstr "Du hast die maximale Anzahl von %1$.0f Webseiten erreicht."
@@ -6503,9 +6667,9 @@ msgstr "Red"
 
 #: ../../mod/siteinfo.php:82
 msgid ""
-"This is Red - another decentralized, distributed communications project by "
-"the folks at Friendica."
-msgstr "Dies ist Red - ein anderes dezentralisiertes, verteiltest Kommunikationsprojekt von den Machern von Friendica."
+"This is a hub of the Red Matrix - a global cooperative network of "
+"decentralised privacy enhanced websites."
+msgstr ""
 
 #: ../../mod/siteinfo.php:84
 msgid "Running at web location"
@@ -6513,9 +6677,9 @@ msgstr "Erreichbar unter der Web-Adresse"
 
 #: ../../mod/siteinfo.php:85
 msgid ""
-"Please visit <a href=\"http://friendica.com\">Friendica.com</a> to learn "
-"more about the Friendica and/or Red project."
-msgstr "Bitte besuche <a href=\"http://friendica.com\">Friendica.com</a> um mehr über das Friendica und/oder Red Projekt zu erfahren."
+"Please visit <a href=\"http://getzot.com\">GetZot.com</a> to learn more "
+"about the Red Matrix."
+msgstr "Besuche <a href=\"http://getzot.com\">GetZot.com</a> um mehr über die Red Matrix zu erfahren."
 
 #: ../../mod/siteinfo.php:86
 msgid "Bug reports and issues: please visit"
@@ -6523,9 +6687,9 @@ msgstr "Probleme oder Fehler gefunden? Bitte besuche"
 
 #: ../../mod/siteinfo.php:89
 msgid ""
-"Suggestions, praise, donations, etc. - please email \"Info\" at Friendica - "
-"dot com"
-msgstr "Vorschläge, Lob, Spenden usw.: E-Mail an \"Info\" at Friendica - dot com"
+"Suggestions, praise, donations, etc. - please email \"redmatrix\" at "
+"librelist - dot com"
+msgstr "Vorschläge, Lob, Spenden usw.: E-Mail an 'redmatrix' at librelist - dot - com"
 
 #: ../../mod/suggest.php:41
 msgid ""
@@ -6541,82 +6705,91 @@ msgstr "Ignorieren/Verstecken"
 msgid "Public Sites"
 msgstr "Öffentliche Seiten"
 
-#: ../../mod/pubsites.php:28
+#: ../../mod/pubsites.php:25
+msgid ""
+"The listed sites allow public registration into the Red Matrix. All sites in"
+" the matrix are interlinked so membership on any of them conveys membership "
+"in the matrix as a whole. Some sites may require subscription or provide "
+"tiered service plans. The provider links <strong>may</strong> provide "
+"additional details."
+msgstr "Die hier aufgeführten Seiten erlauben dir einen Account in der Red Matrix anzulegen. Alle Seiten der Matrix sind mit einander verbunden, so dass die Mitgliedschaft auf einer Seite die Mitgliedschaft auf einer beliebigen anderen Seite der Matrix beinhaltet. Es könnte sein, dass einige dieser Seiten Abonnements benötigen oder abgestufte Service-Pläne anbieten. Auf den jeweiligen Seiten <strong>könnten</strong> nähere Details diesbezüglich stehen."
+
+#: ../../mod/pubsites.php:31
 msgid "Site URL"
 msgstr "URL der Seite"
 
-#: ../../mod/pubsites.php:28
+#: ../../mod/pubsites.php:31
 msgid "Access Type"
 msgstr "Zugangs Typ"
 
-#: ../../mod/pubsites.php:28
+#: ../../mod/pubsites.php:31
 msgid "Registration Policy"
 msgstr "Registrierungsrichtlinien"
 
-#: ../../mod/register.php:35
+#: ../../mod/register.php:43
 msgid "Maximum daily site registrations exceeded. Please try again tomorrow."
 msgstr "Maximale Anzahl von Neuanmeldungen erreicht. Bitte versuche es morgen noch einmal."
 
-#: ../../mod/register.php:41
+#: ../../mod/register.php:49
 msgid ""
 "Please indicate acceptance of the Terms of Service. Registration failed."
 msgstr "Bitte stimme den Nutzungsbedingungen zu. Anmeldung fehlgeschlagen."
 
-#: ../../mod/register.php:69
+#: ../../mod/register.php:77
 msgid "Passwords do not match."
 msgstr "Passwörter stimmen nicht überein."
 
-#: ../../mod/register.php:97
+#: ../../mod/register.php:105
 msgid ""
 "Registration successful. Please check your email for validation "
 "instructions."
 msgstr "Registrierung erfolgreich. Eine E-Mail mit weiteren Anweisungen wurde an dich gesendet."
 
-#: ../../mod/register.php:103
+#: ../../mod/register.php:111
 msgid "Your registration is pending approval by the site owner."
 msgstr "Deine Registrierung muss noch vom Betreiber der Seite freigegeben werden."
 
-#: ../../mod/register.php:106
+#: ../../mod/register.php:114
 msgid "Your registration can not be processed."
 msgstr "Deine Registrierung konnte nicht verarbeitet werden."
 
-#: ../../mod/register.php:141
+#: ../../mod/register.php:149
 msgid ""
 "This site has exceeded the number of allowed daily account registrations. "
 "Please try again tomorrow."
 msgstr "Die maximale Anzahl täglicher Registrierungen auf dieser Seite wurde überschritten. Bitte versuche es morgen noch einmal."
 
-#: ../../mod/register.php:152
+#: ../../mod/register.php:160
 msgid "Terms of Service"
 msgstr "Nutzungsbedingungen"
 
-#: ../../mod/register.php:158
+#: ../../mod/register.php:166
 #, php-format
 msgid "I accept the %s for this website"
 msgstr "Ich akzeptiere die %s für diese Webseite"
 
-#: ../../mod/register.php:160
+#: ../../mod/register.php:168
 #, php-format
 msgid "I am over 13 years of age and accept the %s for this website"
 msgstr "Ich bin älter als 13 Jahre und akzeptiere die %s dieser Webseite"
 
-#: ../../mod/register.php:175
+#: ../../mod/register.php:183
 msgid "Membership on this site is by invitation only."
 msgstr "Mitgliedschaft auf dieser Seite ist nur nach vorheriger Einladung möglich."
 
-#: ../../mod/register.php:176
+#: ../../mod/register.php:184
 msgid "Please enter your invitation code"
 msgstr "Bitte trage deinen Einladungs-Code ein"
 
-#: ../../mod/register.php:179
+#: ../../mod/register.php:187
 msgid "Your email address"
 msgstr "Ihre E-Mail Adresse"
 
-#: ../../mod/register.php:180
+#: ../../mod/register.php:188
 msgid "Choose a password"
 msgstr "Wählen Sie ein Passwort"
 
-#: ../../mod/register.php:181
+#: ../../mod/register.php:189
 msgid "Please re-enter your password"
 msgstr "Bitte geben Sie erneut Ihr Passwort ein"
 
@@ -6624,48 +6797,62 @@ msgstr "Bitte geben Sie erneut Ihr Passwort ein"
 msgid "Please login."
 msgstr "Bitte loggen Sie sich ein."
 
-#: ../../mod/post.php:114
+#: ../../mod/post.php:119
 msgid ""
 "Remote authentication blocked. You are logged into this site locally. Please"
 " logout and retry."
 msgstr "Entfernte Authentifizierung blockiert. Du bist lokal auf dieser Seite angemeldet. Bitte melde dich ab und versuche es erneut."
 
-#: ../../mod/post.php:127
+#: ../../mod/post.php:132
 #, php-format
 msgid "Welcome %s. Remote authentication successful."
 msgstr "Willkommen %s. Entfernte Authentifizierung erfolgreich."
 
-#: ../../mod/removeme.php:45 ../../mod/removeme.php:48
-msgid "Remove My Account"
-msgstr "Mein Konto entfernen"
+#: ../../mod/removeme.php:49
+msgid "Remove This Channel"
+msgstr "Diesen Kanal löschen!"
 
-#: ../../mod/removeme.php:46
+#: ../../mod/removeme.php:50
 msgid ""
-"This will completely remove your account. Once this has been done it is not "
-"recoverable."
-msgstr "Dein Konto wird endgültig gelöscht. Es gibt keine Möglichkeit, es wiederherzustellen."
+"This will completely remove this channel from the network. Once this has "
+"been done it is not recoverable."
+msgstr "Hiermit wird dieser Kanal komplett aus dem Netzwerk gelöscht. Einmal eingeleitet ist dieser Prozess nicht widerrufbar."
 
-#: ../../mod/removeme.php:47
+#: ../../mod/removeme.php:51
 msgid "Please enter your password for verification:"
 msgstr "Bitte geben Sie Ihr Passwort zur Bestätigung ein:"
 
-#: ../../mod/directory.php:148
+#: ../../mod/removeme.php:52
+msgid "Remove this channel and all its clones from the network"
+msgstr "Lösche diesen Kanal und all seine Klone aus dem Netzwerk"
+
+#: ../../mod/removeme.php:52
+msgid ""
+"By default only the instance of the channel located on this hub will be "
+"removed from the network"
+msgstr "Standartmäßig wird der Kanal nur auf diesem Knoten gelöscht, seine Klone verbleiben im Netzwerk"
+
+#: ../../mod/removeme.php:53
+msgid "Remove My Account"
+msgstr "Mein Konto entfernen"
+
+#: ../../mod/directory.php:163
 msgid "Gender: "
 msgstr "Geschlecht:"
 
-#: ../../mod/directory.php:207
+#: ../../mod/directory.php:222
 msgid "Finding:"
 msgstr "Ergebnisse:"
 
-#: ../../mod/directory.php:215
+#: ../../mod/directory.php:230
 msgid "next page"
 msgstr "nächste Seite"
 
-#: ../../mod/directory.php:215
+#: ../../mod/directory.php:230
 msgid "previous page"
 msgstr "vorige Seite"
 
-#: ../../mod/directory.php:222
+#: ../../mod/directory.php:237
 msgid "No entries (some entries may be hidden)."
 msgstr "Keine Einträge gefunden (einige könnten versteckt sein)."
 
@@ -6677,175 +6864,358 @@ msgstr "Laune"
 msgid "Set your current mood and tell your friends"
 msgstr "Wähle deine aktuelle Stimmung und erzähle sie deinen Freunden"
 
-#: ../../view/theme/redbasic/php/config.php:48
-#: ../../view/theme/redstrap/php/config.php:133
+#: ../../view/theme/redbasic/php/config.php:74
+msgid "Scheme Default"
+msgstr ""
+
+#: ../../view/theme/redbasic/php/config.php:75
+msgid "red"
+msgstr "Rot"
+
+#: ../../view/theme/redbasic/php/config.php:76
+msgid "black"
+msgstr "Schwarz"
+
+#: ../../view/theme/redbasic/php/config.php:77
+msgid "silver"
+msgstr "Silber"
+
+#: ../../view/theme/redbasic/php/config.php:88
+#: ../../view/theme/apw/php/config.php:234
+#: ../../view/theme/blogga/view/theme/blog/config.php:69
+#: ../../view/theme/blogga/php/config.php:69
 msgid "Theme settings"
 msgstr "Theme-Einstellungen"
 
-#: ../../view/theme/redbasic/php/config.php:49
-#: ../../view/theme/redstrap/php/config.php:138
+#: ../../view/theme/redbasic/php/config.php:89
+#: ../../view/theme/apw/php/config.php:235
+msgid "Set scheme"
+msgstr "Schema wählen"
+
+#: ../../view/theme/redbasic/php/config.php:90
 msgid "Navigation bar colour"
 msgstr "Farbe der Navigationsleiste"
 
-#: ../../view/theme/redbasic/php/config.php:50
+#: ../../view/theme/redbasic/php/config.php:91
+msgid "Set font-colour for banner"
+msgstr "Farbe der Schrift des Banners setzen"
+
+#: ../../view/theme/redbasic/php/config.php:92
 msgid "Set the background colour"
 msgstr "Hintergrundfarbe wählen"
 
-#: ../../view/theme/redbasic/php/config.php:51
+#: ../../view/theme/redbasic/php/config.php:93
 msgid "Set the background image"
 msgstr "Hintergrundbild wählen"
 
-#: ../../view/theme/redbasic/php/config.php:52
+#: ../../view/theme/redbasic/php/config.php:94
 msgid "Set the background colour of items"
 msgstr "Hintergrundfarbe von Beiträgen wählen"
 
-#: ../../view/theme/redbasic/php/config.php:53
+#: ../../view/theme/redbasic/php/config.php:95
 msgid "Set the opacity of items"
 msgstr "Opazität von Beiträgen wählen"
 
-#: ../../view/theme/redbasic/php/config.php:54
-#: ../../view/theme/redstrap/php/config.php:134
+#: ../../view/theme/redbasic/php/config.php:96
+msgid "Set the basic colour for item icons"
+msgstr "Basis Farbe der Beitrags-Icons setzen"
+
+#: ../../view/theme/redbasic/php/config.php:97
+msgid "Set the hover colour for item icons"
+msgstr ""
+
+#: ../../view/theme/redbasic/php/config.php:98
+msgid "Set font-size for the entire application"
+msgstr ""
+
+#: ../../view/theme/redbasic/php/config.php:99
+#: ../../view/theme/apw/php/config.php:236
 msgid "Set font-size for posts and comments"
 msgstr "Wähle die Schriftgröße für Beiträge und Kommentare"
 
-#: ../../view/theme/redbasic/php/config.php:55
+#: ../../view/theme/redbasic/php/config.php:100
 msgid "Set font-colour for posts and comments"
 msgstr "Schriftfarbe für Beiträge und Kommentare wählen"
 
-#: ../../view/theme/redbasic/php/config.php:56
+#: ../../view/theme/redbasic/php/config.php:101
 msgid "Set radius of corners"
 msgstr "Radius von Ecken"
 
-#: ../../view/theme/redbasic/php/config.php:57
+#: ../../view/theme/redbasic/php/config.php:102
 msgid "Set shadow depth of photos"
 msgstr "Schattentiefe von Fotos"
 
-#: ../../view/theme/redstrap/php/config.php:135
+#: ../../view/theme/redbasic/php/config.php:103
+msgid "Set maximum width of conversation regions"
+msgstr ""
+
+#: ../../view/theme/redbasic/php/config.php:104
+msgid "Set minimum opacity of nav bar - to hide it"
+msgstr ""
+
+#: ../../view/theme/redbasic/php/config.php:105
+msgid "Set size of conversation author photo"
+msgstr ""
+
+#: ../../view/theme/redbasic/php/config.php:106
+msgid "Set size of followup author photos"
+msgstr ""
+
+#: ../../view/theme/redbasic/php/config.php:107
+msgid "Sloppy photo albums"
+msgstr ""
+
+#: ../../view/theme/redbasic/php/config.php:107
+msgid "Are you a clean desk or a messy desk person?"
+msgstr "Bist du jemand der einen aufgeräumten Schreibtisch hat, oder eher einen chaotischen?"
+
+#: ../../view/theme/apw/php/config.php:193
+#: ../../view/theme/apw/php/config.php:211
+msgid "Schema Default"
+msgstr "Standard-Schema"
+
+#: ../../view/theme/apw/php/config.php:194
+msgid "Sans-Serif"
+msgstr "Sans-Serif"
+
+#: ../../view/theme/apw/php/config.php:195
+msgid "Monospace"
+msgstr "Monospace"
+
+#: ../../view/theme/apw/php/config.php:237
+msgid "Set font face"
+msgstr "Schriftart wählen"
+
+#: ../../view/theme/apw/php/config.php:238
+msgid "Set iconset"
+msgstr "Iconset wählen"
+
+#: ../../view/theme/apw/php/config.php:239
+msgid "Set big shadow size, default 15px 15px 15px"
+msgstr ""
+
+#: ../../view/theme/apw/php/config.php:240
+msgid "Set small shadow size, default 5px 5px 5px"
+msgstr ""
+
+#: ../../view/theme/apw/php/config.php:241
+msgid "Set shadow colour, default #000"
+msgstr ""
+
+#: ../../view/theme/apw/php/config.php:242
+msgid "Set radius size, default 5px"
+msgstr ""
+
+#: ../../view/theme/apw/php/config.php:243
 msgid "Set line-height for posts and comments"
 msgstr "Wähle die Zeilenhöhe in Beiträgen und Kommentaren"
 
-#: ../../view/theme/redstrap/php/config.php:136
-msgid "Set colour scheme"
-msgstr "Wähle das Farbschema"
+#: ../../view/theme/apw/php/config.php:244
+msgid "Set background image"
+msgstr "Hintergrundbild wählen"
+
+#: ../../view/theme/apw/php/config.php:245
+msgid "Set background colour"
+msgstr "Hintergrundfarbe wählen"
+
+#: ../../view/theme/apw/php/config.php:246
+msgid "Set section background image"
+msgstr ""
+
+#: ../../view/theme/apw/php/config.php:247
+msgid "Set section background colour"
+msgstr ""
+
+#: ../../view/theme/apw/php/config.php:248
+msgid "Set colour of items - use hex"
+msgstr "Wähle die Farbe von Beiträgen - verwende HEX"
+
+#: ../../view/theme/apw/php/config.php:249
+msgid "Set colour of links - use hex"
+msgstr "Wähle die Farbe von Links - verwende HEX"
+
+#: ../../view/theme/apw/php/config.php:250
+msgid "Set max-width for items.  Default 400px"
+msgstr "Maximale Breite von Beiträgen. Standard ist 400px"
 
-#: ../../view/theme/redstrap/php/config.php:137
-msgid "Draw shadows"
-msgstr "Zeichne Schatten"
+#: ../../view/theme/apw/php/config.php:251
+msgid "Set min-width for items.  Default 240px"
+msgstr "Minimale Breite von Beiträgen. Standard ist 240px"
 
-#: ../../view/theme/redstrap/php/config.php:139
-msgid "Display style"
-msgstr "Anzeige Stiel"
+#: ../../view/theme/apw/php/config.php:252
+msgid "Set the generic content wrapper width.  Default 48%"
+msgstr "Breite des \"generic content wrapper\". Standard ist 48%"
 
-#: ../../view/theme/redstrap/php/config.php:140
-msgid "Display colour of links - hex value, do not include the #"
-msgstr "Farbe für Verweise - Hex Wert, die # nicht angeben"
+#: ../../view/theme/apw/php/config.php:253
+msgid "Set colour of fonts - use hex"
+msgstr "Schriftfarbe - verwende HEX"
 
-#: ../../view/theme/redstrap/php/config.php:141
-msgid "Icons"
-msgstr "Symbole"
+#: ../../view/theme/apw/php/config.php:254
+msgid "Set background-size element"
+msgstr "Größe des Hintergrund-Elements"
 
-#: ../../view/theme/redstrap/php/config.php:142
-msgid "Shiny style"
-msgstr "Glitzer Stiel"
+#: ../../view/theme/apw/php/config.php:255
+msgid "Item opacity"
+msgstr "Opazität von Beiträgen"
 
-#: ../../boot.php:1249
+#: ../../view/theme/apw/php/config.php:256
+msgid "Display post previews only"
+msgstr "Nur Beitragsvorschau anzeigen"
+
+#: ../../view/theme/apw/php/config.php:257
+msgid "Display side bar on channel page"
+msgstr "Zeige die Seitenleiste auf der Kanal-Seite"
+
+#: ../../view/theme/apw/php/config.php:258
+msgid "Colour of the navigation bar"
+msgstr "Farbe der Navigationsleiste"
+
+#: ../../view/theme/apw/php/config.php:259
+msgid "Item float"
+msgstr "Beitragsfluss"
+
+#: ../../view/theme/apw/php/config.php:260
+msgid "Left offset of the section element"
+msgstr "Linker Rand des Section Elements"
+
+#: ../../view/theme/apw/php/config.php:261
+msgid "Right offset of the section element"
+msgstr "Rechter Rand des Section Elements"
+
+#: ../../view/theme/apw/php/config.php:262
+msgid "Section width"
+msgstr "Breite der Section"
+
+#: ../../view/theme/apw/php/config.php:263
+msgid "Left offset of the aside"
+msgstr "Linker Rand der aside"
+
+#: ../../view/theme/apw/php/config.php:264
+msgid "Right offset of the aside element"
+msgstr "Rechter Rand der aside"
+
+#: ../../view/theme/blogga/view/theme/blog/config.php:47
+#: ../../view/theme/blogga/php/config.php:47
+msgid "None"
+msgstr "Keine"
+
+#: ../../view/theme/blogga/view/theme/blog/config.php:70
+#: ../../view/theme/blogga/php/config.php:70
+msgid "Header image"
+msgstr "Titelbild"
+
+#: ../../view/theme/blogga/view/theme/blog/config.php:71
+#: ../../view/theme/blogga/php/config.php:71
+msgid "Header image only on profile pages"
+msgstr "Titelbild nur auf Profil-Seiten anzeigen"
+
+#: ../../boot.php:1274
 #, php-format
 msgid "Update %s failed. See error logs."
 msgstr "Aktualisierung %s fehlgeschlagen. Details in den Fehlerlogs."
 
-#: ../../boot.php:1252
+#: ../../boot.php:1277
 #, php-format
 msgid "Update Error at %s"
 msgstr "Aktualisierungsfehler auf %s"
 
-#: ../../boot.php:1410
-msgid "Create a New Account"
-msgstr "Erzeuge ein neues Konto"
+#: ../../boot.php:1434
+msgid ""
+"Create an account to access services and applications within the Red Matrix"
+msgstr "Erstelle einen Account um Anwendungen und Dienste innerhalb der Red Matrix verwenden zu können."
 
-#: ../../boot.php:1439
+#: ../../boot.php:1462
 msgid "Password"
 msgstr "Kennwort"
 
-#: ../../boot.php:1440
+#: ../../boot.php:1463
 msgid "Remember me"
 msgstr "Angaben speichern"
 
-#: ../../boot.php:1445
+#: ../../boot.php:1468
 msgid "Forgot your password?"
 msgstr "Passwort vergessen?"
 
-#: ../../boot.php:1564
+#: ../../boot.php:1533
+msgid "permission denied"
+msgstr "Zugriff verweigert"
+
+#: ../../boot.php:1534
+msgid "Got Zot?"
+msgstr "Haste schon Zot?"
+
+#: ../../boot.php:1593
 msgid "Requested channel is not available."
 msgstr "Angeforderte Kanal nicht verfügbar."
 
-#: ../../boot.php:1576
+#: ../../boot.php:1605
 msgid " Sorry, you don't have the permission to view this profile. "
 msgstr "Entschuldigung, aber du besitzt nicht die nötigen Rechte um dieses Profil ansehen zu dürfen."
 
-#: ../../boot.php:1730
+#: ../../boot.php:1761
 msgid "Profiles"
 msgstr "Profile"
 
-#: ../../boot.php:1730
+#: ../../boot.php:1761
 msgid "Manage/edit profiles"
 msgstr "Verwalte/Bearbeite Profile"
 
-#: ../../boot.php:1734
+#: ../../boot.php:1765
 msgid "Edit Profile"
 msgstr "Profile bearbeiten"
 
-#: ../../boot.php:1828 ../../boot.php:1908
+#: ../../boot.php:1859 ../../boot.php:1939
 msgid "F d"
 msgstr "d. F"
 
-#: ../../boot.php:1885
+#: ../../boot.php:1916
 msgid "Birthday Reminders"
 msgstr "Geburtstags Erinnerungen"
 
-#: ../../boot.php:1886
+#: ../../boot.php:1917
 msgid "Birthdays this week:"
 msgstr "Geburtstage in dieser Woche:"
 
-#: ../../boot.php:1941
+#: ../../boot.php:1972
 msgid "[No description]"
 msgstr "[Keine Beschreibung]"
 
-#: ../../boot.php:1959
+#: ../../boot.php:1990
 msgid "Event Reminders"
 msgstr "Veranstaltungs- Erinnerungen"
 
-#: ../../boot.php:1960
+#: ../../boot.php:1991
 msgid "Events this week:"
 msgstr "Veranstaltungen in dieser Woche:"
 
-#: ../../boot.php:2194
+#: ../../boot.php:2225
 msgid "Channel"
 msgstr "Kanal"
 
-#: ../../boot.php:2197
+#: ../../boot.php:2228
 msgid "Status Messages and Posts"
 msgstr "Statusnachrichten und Beiträge"
 
-#: ../../boot.php:2201
+#: ../../boot.php:2232
 msgid "About"
 msgstr "Über"
 
-#: ../../boot.php:2204
+#: ../../boot.php:2235
 msgid "Profile Details"
 msgstr "Profil-Details"
 
-#: ../../boot.php:2222
+#: ../../boot.php:2253
 msgid "Events and Calendar"
 msgstr "Veranstaltungen und Kalender"
 
-#: ../../boot.php:2227
+#: ../../boot.php:2258
 msgid "Webpages"
 msgstr "Webseiten"
 
-#: ../../boot.php:2230
+#: ../../boot.php:2261
 msgid "Manage Webpages"
 msgstr "Webseiten verwalten"
 
-#: ../../boot.php:2512
+#: ../../boot.php:2546
 msgid "toggle mobile"
 msgstr "auf/von Mobile Ansicht wechseln"
diff --git a/view/de/strings.php b/view/de/strings.php
index 2aa913484..254e73bf9 100644
--- a/view/de/strings.php
+++ b/view/de/strings.php
@@ -7,47 +7,47 @@ function string_plural_select_de($n){
 $a->strings["Visible to everybody"] = "Für jeden sichtbar";
 $a->strings["show"] = "zeigen";
 $a->strings["don't show"] = "Verbergen";
-$a->strings[" and "] = " und ";
+$a->strings[" and "] = "und";
 $a->strings["public profile"] = "öffentliches Profil";
 $a->strings["%1\$s changed %2\$s to &ldquo;%3\$s&rdquo;"] = "%1\$s hat %2\$s auf &ldquo;%3\$s&rdquo; geändert";
 $a->strings["Visit %1\$s's %2\$s"] = "Besuche %1\$s's %2\$s";
 $a->strings["%1\$s has an updated %2\$s, changing %3\$s."] = "%1\$s hat ein aktualisiertes %2\$s, %3\$s wurde verändert.";
-$a->strings["Public Timeline"] = "Öffentliche Zeitleiste";
 $a->strings["Red Matrix Notification"] = "Red Matrix Benachrichtigung";
+$a->strings["redmatrix"] = "";
 $a->strings["Thank You,"] = "Danke.";
 $a->strings["%s Administrator"] = "%s Administrator";
 $a->strings["%s <!item_type!>"] = "%s <!item_type!>";
 $a->strings["[Red:Notify] New mail received at %s"] = "[Red Notify] Neue Mail auf %s empfangen";
-$a->strings["%1\$s sent you a new private message at %2\$s."] = "%1\$s hat Dir eine private Nachricht auf %2\$s geschickt.";
+$a->strings["%1\$s, %2\$s sent you a new private message at %3\$s."] = "%1\$s, %2\$s hat dir eine private Nachricht auf %3\$s gesendet.";
 $a->strings["%1\$s sent you %2\$s."] = "%1\$s hat dir %2\$s geschickt.";
 $a->strings["a private message"] = "eine private Nachricht";
 $a->strings["Please visit %s to view and/or reply to your private messages."] = "Bitte besuche %s, um die private Nachricht anzusehen und/oder darauf zu antworten.";
-$a->strings["%1\$s commented on [zrl=%2\$s]a %3\$s[/zrl]"] = "%1\$s hat auf [zrl=%2\$s]einen %3\$s[/zrl] kommentiert";
-$a->strings["%1\$s commented on [zrl=%2\$s]%3\$s's %4\$s[/zrl]"] = "%1\$s kommentierte auf [zrl=%2\$s]%3\$s's %4\$s[/zrl]";
-$a->strings["%1\$s commented on [zrl=%2\$s]your %3\$s[/zrl]"] = "%1\$s hat auf [zrl=%2\$s]Dein %3\$s[/zrl] kommentiert";
+$a->strings["%1\$s, %2\$s commented on [zrl=%3\$s]a %4\$s[/zrl]"] = "";
+$a->strings["%1\$s, %2\$s commented on [zrl=%3\$s]%4\$s's %5\$s[/zrl]"] = "";
+$a->strings["%1\$s, %2\$s commented on [zrl=%3\$s]your %4\$s[/zrl]"] = "";
 $a->strings["[Red:Notify] Comment to conversation #%1\$d by %2\$s"] = "[Red:Notify] Kommentar in Unterhaltung #%1\$d von %2\$s";
-$a->strings["%s commented on an item/conversation you have been following."] = "%s hat einen Beitrag/eine Konversation kommentiert, dem/der du folgst.";
+$a->strings["%1\$s, %2\$s commented on an item/conversation you have been following."] = "";
 $a->strings["Please visit %s to view and/or reply to the conversation."] = "Bitte besuche %s, um die Konversation anzusehen und/oder zu kommentieren.";
 $a->strings["[Red:Notify] %s posted to your profile wall"] = "[Red:Hinweis] %s schrieb auf Deine Pinnwand";
-$a->strings["%1\$s posted to your profile wall at %2\$s"] = "%1\$s schrieb auf Deine Pinnwand auf %2\$s";
-$a->strings["%1\$s posted to [zrl=%2\$s]your wall[/zrl]"] = "%1\$s schrieb auf [zrl=%2\$s]Deine Pinnwand[/zrl]";
+$a->strings["%1\$s, %2\$s posted to your profile wall at %3\$s"] = "";
+$a->strings["%1\$s, %2\$s posted to [zrl=%3\$s]your wall[/zrl]"] = "";
 $a->strings["[Red:Notify] %s tagged you"] = "[Red Notify] %s hat dich getaggt";
-$a->strings["%1\$s tagged you at %2\$s"] = "%1\$s hat dich auf %2\$s getaggt";
-$a->strings["%1\$s [zrl=%2\$s]tagged you[/zrl]."] = "%1\$s hat [zrl=%2\$s]Dich getagged[/zrl].";
+$a->strings["%1\$s, %2\$s tagged you at %3\$s"] = "%1\$s, %2\$s hat dich auf %3\$s getaggt";
+$a->strings["%1\$s, %2\$s [zrl=%3\$s]tagged you[/zrl]."] = "";
 $a->strings["[Red:Notify] %1\$s poked you"] = "[Red Notify] %1\$s hat dich angestupst";
-$a->strings["%1\$s poked you at %2\$s"] = "%1\$s hat dich auf %2\$s angestupst";
-$a->strings["%1\$s [zrl=%2\$s]poked you[/zrl]."] = "%1\$s [zrl=%2\$s]hat dich angestupst.[/zrl].";
+$a->strings["%1\$s, %2\$s poked you at %3\$s"] = "%1\$s, %2\$s hat dich auf %3\$s angestubst";
+$a->strings["%1\$s, %2\$s [zrl=%2\$s]poked you[/zrl]."] = "";
 $a->strings["[Red:Notify] %s tagged your post"] = "[Red:Hinweis] %s hat Dich getagged";
-$a->strings["%1\$s tagged your post at %2\$s"] = "%1\$s hat Deinen Beitrag auf %2\$s getagged";
-$a->strings["%1\$s tagged [zrl=%2\$s]your post[/zrl]"] = "%1\$s hat [zrl=%2\$s]Deinen Beitrag[/zrl] getagged";
+$a->strings["%1\$s, %2\$s tagged your post at %3\$s"] = "";
+$a->strings["%1\$s, %2\$s tagged [zrl=%3\$s]your post[/zrl]"] = "";
 $a->strings["[Red:Notify] Introduction received"] = "[Red:Notify] Vorstellung erhalten";
-$a->strings["You've received an introduction from '%1\$s' at %2\$s"] = "Du hast auf %2\$s eine Vorstellung von %1\$s erhalten.";
-$a->strings["You've received [zrl=%1\$s]an introduction[/zrl] from %2\$s."] = "Du hast [zrl=%1\$s]eine Vorstellung[/zrl] von %2\$s erhalten.";
+$a->strings["%1\$s, you've received an introduction from '%2\$s' at %3\$s"] = "";
+$a->strings["%1\$s, you've received [zrl=%2\$s]an introduction[/zrl] from %3\$s."] = "";
 $a->strings["You may visit their profile at %s"] = "Du kannst Dir das Profil unter %s ansehen";
 $a->strings["Please visit %s to approve or reject the introduction."] = "Bitte besuche %s um sie anzunehmen oder abzulehnen.";
 $a->strings["[Red:Notify] Friend suggestion received"] = "[Red:Hinweis] Freundschaftsvorschlag erhalten";
-$a->strings["You've received a friend suggestion from '%1\$s' at %2\$s"] = "Du hast einen Freundschaftsvorschlag von %1\$s auf %2\$s erhalten";
-$a->strings["You've received [zrl=%1\$s]a friend suggestion[/zrl] for %2\$s from %3\$s."] = "Du hast einen [zrl=%1\$s]Freundschaftsvorschlag[/zrl] für %2\$s von %3\$s erhalten.";
+$a->strings["%1\$s, you've received a friend suggestion from '%2\$s' at %3\$s"] = "";
+$a->strings["%1\$s, you've received [zrl=%2\$s]a friend suggestion[/zrl] for %3\$s from %4\$s."] = "";
 $a->strings["Name:"] = "Name:";
 $a->strings["Photo:"] = "Foto:";
 $a->strings["Please visit %s to approve or reject the suggestion."] = "Bitte besuche %s um den Vorschlag zu akzeptieren oder abzulehnen.";
@@ -70,9 +70,11 @@ $a->strings["Share this"] = "Teile dies";
 $a->strings["share"] = "Teilen";
 $a->strings["View %s's profile - %s"] = "Schaue dir %s's Profil an - %s";
 $a->strings["to"] = "zu";
+$a->strings["via"] = "via";
 $a->strings["Wall-to-Wall"] = "Wall-to-Wall";
 $a->strings["via Wall-To-Wall:"] = "via Wall-To-Wall:";
 $a->strings[" from %s"] = "von %s";
+$a->strings["last edited: %s"] = "zuletzt bearbeitet: %s";
 $a->strings["Please wait"] = "Bitte warten";
 $a->strings["%d comment"] = array(
 	0 => "%d Kommentar",
@@ -91,6 +93,7 @@ $a->strings["Image"] = "Bild";
 $a->strings["Link"] = "Link";
 $a->strings["Video"] = "Video";
 $a->strings["Preview"] = "Vorschau";
+$a->strings["Encrypt text"] = "Text verschlüsseln";
 $a->strings["Connect"] = "Verbinden";
 $a->strings["New window"] = "Neues Fenster";
 $a->strings["Open the selected location in a different window or browser tab"] = "Öffne die markierte Adresse in einem neuen Browser Fenster oder Tab";
@@ -147,6 +150,8 @@ $a->strings["Starts:"] = "Beginnt:";
 $a->strings["Finishes:"] = "Endet:";
 $a->strings["Location:"] = "Ort:";
 $a->strings["General Features"] = "Allgemeine Funktionen";
+$a->strings["Content Expiration"] = "Verfall von Inhalten";
+$a->strings["Remove posts/comments and/or private messages at a future time"] = "Lösche Beiträge, Kommentare und/oder private Nachrichten automatisch zu einem zukünftigen Datum.";
 $a->strings["Multiple Profiles"] = "Mehrfachprofile";
 $a->strings["Ability to create multiple profiles"] = "Mehrfachprofile anlegen können";
 $a->strings["Web Pages"] = "Webseiten";
@@ -166,6 +171,8 @@ $a->strings["Post Preview"] = "Voransicht";
 $a->strings["Allow previewing posts and comments before publishing them"] = "Erlaube Voransicht von Beiträgen und Kommentaren vor Veröffentlichung";
 $a->strings["Channel Sources"] = "Kanal Quellen";
 $a->strings["Automatically import channel content from other channels or feeds"] = "Importiere automatisch Inhalte für diesen Kanal von anderen Kanälen oder Feeds.";
+$a->strings["Even More Encryption"] = "Noch mehr Verschlüsselung";
+$a->strings["Allow encryption of content end-to-end with a shared secret key"] = "Erlaube Ende-zu-Ende Verschlüsselung von Inhalten, mit einem geteilten geheimen Schlüssel";
 $a->strings["Network and Stream Filtering"] = "Netzwerk- und Stream-Filter";
 $a->strings["Search by Date"] = "Suche nach Datum";
 $a->strings["Ability to select posts by date ranges"] = "Möglichkeit, Beiträge nach Zeiträumen auszuwählen";
@@ -180,8 +187,6 @@ $a->strings["Enable tab to display all new Network activity"] = "Aktiviere Reite
 $a->strings["Affinity Tool"] = "Beziehungs-Tool";
 $a->strings["Filter stream activity by depth of relationships"] = "Filter Aktivitätenstream nach Tiefe der Beziehung";
 $a->strings["Post/Comment Tools"] = "Beitrag-/Kommentar-Tools";
-$a->strings["Multiple Deletion"] = "Mehrfachlöschung";
-$a->strings["Select and delete multiple posts/comments at once"] = "Mehrfachlöschung und -auswahl von Beiträgen/Kommentaren in einem Rutsch";
 $a->strings["Edit Sent Posts"] = "Bearbeite gesendete Beiträge";
 $a->strings["Edit and correct posts and comments after sending"] = "Bearbeite und korrigiere Beiträge und Kommentare nach dem Senden";
 $a->strings["Tagging"] = "Verschlagworten";
@@ -202,7 +207,7 @@ $a->strings["All Channels"] = "Alle Kanäle";
 $a->strings["edit"] = "Bearbeiten";
 $a->strings["Collections"] = "Sammlungen";
 $a->strings["Edit collection"] = "Bearbeite Sammlungen";
-$a->strings["Create a new collection"] = "Erzeuge neue Sammlung";
+$a->strings["Create a new collection"] = "Neue Sammlung erzeugen";
 $a->strings["Channels not in any collection"] = "Kanäle, die nicht in einer Sammlung sind";
 $a->strings["add"] = "hinzufügen";
 $a->strings["Delete this item?"] = "Dieses Element löschen?";
@@ -210,6 +215,8 @@ $a->strings["show fewer"] = "Zeige weniger";
 $a->strings["Password too short"] = "Kennwort zu kurz";
 $a->strings["Passwords do not match"] = "Kennwörter stimmen nicht überein";
 $a->strings["everybody"] = "alle";
+$a->strings["Secret Passphrase"] = "geheime Passwort-Phrase";
+$a->strings["Passphrase hint"] = "Hinweis zur Phrase";
 $a->strings["timeago.prefixAgo"] = "timeago.prefixAgo";
 $a->strings["timeago.suffixAgo"] = "timeago.suffixAgo";
 $a->strings["ago"] = "her";
@@ -326,10 +333,8 @@ $a->strings["November"] = "November";
 $a->strings["December"] = "Dezember";
 $a->strings["unknown.???"] = "unbekannt.???";
 $a->strings["bytes"] = "Bytes";
-$a->strings["remove"] = "lösche";
-$a->strings["[remove]"] = "[lösche]";
-$a->strings["Categories:"] = "Kategorien:";
-$a->strings["Filed under:"] = "Gespeichert unter:";
+$a->strings["remove category"] = "Kategorie entfernen";
+$a->strings["remove from file"] = "aus der Datei entfernen";
 $a->strings["Click to open/close"] = "Klicke zum Öffnen/Schließen";
 $a->strings["link to source"] = "Link zum Originalbeitrag";
 $a->strings["Select a page layout: "] = "Ein Seiten-Layout auswählen";
@@ -346,23 +351,25 @@ $a->strings["Blocks"] = "Blöcke";
 $a->strings["Menus"] = "Menüs";
 $a->strings["Layouts"] = "Layouts";
 $a->strings["Pages"] = "Seiten";
+$a->strings["Public Timeline"] = "Öffentliche Zeitleiste";
 $a->strings["Unable to obtain identity information from database"] = "Kann keine Identitäts-Informationen aus Datenbank beziehen";
 $a->strings["Empty name"] = "Namensfeld leer";
 $a->strings["Name too long"] = "Name ist zu lang";
 $a->strings["No account identifier"] = "Keine Account-Kennung";
+$a->strings["Nickname is required."] = "Spitzname ist erforderlich.";
 $a->strings["Nickname has unsupported characters or is already being used on this site."] = "Der Spitzname enthält nicht-unterstütze Zeichen oder wird bereits auf dieser Seite genutzt.";
 $a->strings["Unable to retrieve created identity"] = "Kann die erstellte Identität nicht empfangen";
 $a->strings["Default Profile"] = "Standard-Profil";
 $a->strings["Friends"] = "Freunde";
 $a->strings["Image/photo"] = "Bild/Foto";
+$a->strings["Encrypted content"] = "Verschlüsselter Inhalt";
 $a->strings["%1\$s wrote the following %2\$s %3\$s"] = "%1\$s schrieb den folgenden %2\$s %3\$s";
 $a->strings["post"] = "Beitrag";
 $a->strings["$1 wrote:"] = "$1 schrieb:";
-$a->strings["Encrypted content"] = "Verschlüsselter Inhalt";
-$a->strings["created a new post"] = "Neuer Beitrag wurde erzeugt";
-$a->strings["commented on %s's post"] = "hat %s's Beitrag kommentiert";
 $a->strings["Embedded content"] = "Eingebetteter Inhalt";
 $a->strings["Embedding disabled"] = "Einbetten ausgeschaltet";
+$a->strings["created a new post"] = "Neuer Beitrag wurde erzeugt";
+$a->strings["commented on %s's post"] = "hat %s's Beitrag kommentiert";
 $a->strings["Permission denied."] = "Zugang verweigert";
 $a->strings["Image exceeds website size limit of %lu bytes"] = "Bild überschreitet das Limit der Webseite von %lu bytes";
 $a->strings["Image file is empty."] = "Bilddatei ist leer.";
@@ -436,6 +443,14 @@ $a->strings["You have reached your limit of %1$.0f Mbytes attachment storage."]
 $a->strings["File upload failed. Possible system limit or action terminated."] = "Datei-Upload fehlgeschlagen. Mögliche Systembegrenzung oder abgebrochener Prozess.";
 $a->strings["Stored file could not be verified. Upload failed."] = "Gespeichert Datei konnte nicht verifiziert werden. Upload abgebrochen.";
 $a->strings["Path not available."] = "Pfad nicht verfügbar.";
+$a->strings["Empty pathname"] = "leere Pfadangabe";
+$a->strings["duplicate filename or path"] = "doppelter Dateiname oder Pfad";
+$a->strings["Path not found."] = "Pfad nicht gefunden.";
+$a->strings["mkdir failed."] = "mkdir fehlgeschlagen.";
+$a->strings["database storage failed."] = "Speichern in der Datenbank fehlgeschlagen.";
+$a->strings["Invalid data packet"] = "Ungültiges Datenpaket";
+$a->strings["Unable to verify channel signature"] = "Konnte die Signatur des Kanals nicht verifizieren";
+$a->strings["Unable to verify site signature for %s"] = "Kann die Signatur der Seite von %s nicht verifizieren";
 $a->strings["Logout"] = "Abmelden";
 $a->strings["End this session"] = "Beende diese Sitzung";
 $a->strings["Home"] = "Home";
@@ -460,9 +475,11 @@ $a->strings["Search site content"] = "Durchsuche Seiten-Inhalt";
 $a->strings["Directory"] = "Verzeichnis";
 $a->strings["Channel Locator"] = "Kanal-Anzeiger";
 $a->strings["Matrix"] = "Matrix";
-$a->strings["Conversations from your grid"] = "Unterhaltungen von Deinem Netz";
+$a->strings["Your matrix"] = "Deine Matrix";
 $a->strings["See all matrix notifications"] = "Alle Matrix-Benachrichtigungen ansehen";
 $a->strings["Mark all matrix notifications seen"] = "Markiere alle Matrix-Benachrichtigungen als angesehen";
+$a->strings["Channel Home"] = "Mein Kanal";
+$a->strings["Channel home"] = "Mein Kanal";
 $a->strings["See all channel notifications"] = "Alle Kanal-Benachrichtigungen ansehen";
 $a->strings["Mark all channel notifications seen"] = "Markiere alle Kanal-Benachrichtigungen als angesehen";
 $a->strings["Intros"] = "Vorstellungen";
@@ -493,9 +510,6 @@ $a->strings["Admin"] = "Admin";
 $a->strings["Site Setup and Configuration"] = "Seiten-Einrichtung und -Konfiguration";
 $a->strings["Nothing new here"] = "Nichts Neues hier";
 $a->strings["Please wait..."] = "Bitte warten...";
-$a->strings["Invalid data packet"] = "Ungültiges Datenpaket";
-$a->strings["Unable to verify channel signature"] = "Konnte die Signatur des Kanals nicht verifizieren";
-$a->strings["Unable to verify site signature for %s"] = "Kann die Signatur der Seite von %s nicht verifizieren";
 $a->strings["Not a valid email address"] = "Ungültige E-Mail-Adresse";
 $a->strings["Your email domain is not among those allowed on this site"] = "Deine E-Mail-Adresse ist nicht unter denen, die auf dieser Seite erlaubt sind";
 $a->strings["Your email address is already registered at this site."] = "Deine E-Mail-Adresse ist auf dieser Seite bereits registriert.";
@@ -509,6 +523,70 @@ $a->strings["your registration password"] = "dein Registrierungspasswort";
 $a->strings["Registration details for %s"] = "Registrierungsdetails für %s";
 $a->strings["Account approved."] = "Account bestätigt.";
 $a->strings["Registration revoked for %s"] = "Registrierung für %s widerrufen";
+$a->strings["channel"] = "Kanal";
+$a->strings["%1\$s likes %2\$s's %3\$s"] = "%1\$s mag %2\$s's %3\$s";
+$a->strings["%1\$s doesn't like %2\$s's %3\$s"] = "%1\$s mag %2\$s's %3\$s nicht";
+$a->strings["%1\$s is now connected with %2\$s"] = "%1\$s ist jetzt mit %2\$s verbunden";
+$a->strings["%1\$s poked %2\$s"] = "%1\$s stupste %2\$s";
+$a->strings["%1\$s is currently %2\$s"] = "%1\$s ist momentan %2\$s";
+$a->strings["View %s's profile @ %s"] = "Schaue Dir %s's Profil auf %s an.";
+$a->strings["Categories:"] = "Kategorien:";
+$a->strings["Filed under:"] = "Gespeichert unter:";
+$a->strings["View in context"] = "Im Zusammenhang anschauen";
+$a->strings["remove"] = "lösche";
+$a->strings["Loading..."] = "Lädt ...";
+$a->strings["Delete Selected Items"] = "Lösche die ausgewählten Elemente";
+$a->strings["View Source"] = "Quelle anzeigen";
+$a->strings["Follow Thread"] = "Unterhaltung folgen";
+$a->strings["Matrix Activity"] = "Matrix Aktivität";
+$a->strings["%s likes this."] = "%s gefällt das.";
+$a->strings["%s doesn't like this."] = "%s gefällt das nicht.";
+$a->strings["<span  %1\$s>%2\$d people</span> like this."] = array(
+	0 => "",
+	1 => "<span  %1\$s>%2\$d Personen</span> mögen dies.",
+);
+$a->strings["<span  %1\$s>%2\$d people</span> don't like this."] = array(
+	0 => "",
+	1 => "<span  %1\$s>%2\$d Personen</span> mögen dies nicht.",
+);
+$a->strings["and"] = "und";
+$a->strings[", and %d other people"] = array(
+	0 => "",
+	1 => ", und %d andere",
+);
+$a->strings["%s like this."] = "%s gefällt das.";
+$a->strings["%s don't like this."] = "%s gefällt das nicht.";
+$a->strings["Visible to <strong>everybody</strong>"] = "Sichtbar für <strong>jeden</strong>";
+$a->strings["Please enter a link URL:"] = "Geben Sie eine URL ein:";
+$a->strings["Please enter a video link/URL:"] = "Geben Sie einen Video-Link/URL ein:";
+$a->strings["Please enter an audio link/URL:"] = "Geben Sie einen Audio-Link/URL ein:";
+$a->strings["Tag term:"] = "Schlagwort:";
+$a->strings["Save to Folder:"] = "Speichern in Ordner:";
+$a->strings["Where are you right now?"] = "Wo bist du jetzt grade?";
+$a->strings["Expires YYYY-MM-DD HH:MM"] = "Verfällt YYYY-MM-DD HH;MM";
+$a->strings["Share"] = "Teilen";
+$a->strings["Page link title"] = "Seitentitel-Link";
+$a->strings["Upload photo"] = "Foto hochladen";
+$a->strings["upload photo"] = "Foto hochladen";
+$a->strings["Attach file"] = "Datei anhängen";
+$a->strings["attach file"] = "Datei anfügen";
+$a->strings["Insert web link"] = "Link einfügen";
+$a->strings["web link"] = "Web-Link";
+$a->strings["Insert video link"] = "Video-Link einfügen";
+$a->strings["video link"] = "Video-Link";
+$a->strings["Insert audio link"] = "Audio-Link einfügen";
+$a->strings["audio link"] = "Audio-Link";
+$a->strings["Set your location"] = "Legen Sie Ihren Aufenthaltsort fest";
+$a->strings["set location"] = "Ort festlegen";
+$a->strings["Clear browser location"] = "Browser-Standort löschen";
+$a->strings["clear location"] = "Standort löschen";
+$a->strings["Set title"] = "Titel festlegen";
+$a->strings["Categories (comma-separated list)"] = "Kategorien (Kommagetrennte Liste)";
+$a->strings["Permission settings"] = "Berechtigungs-Einstellungen";
+$a->strings["permissions"] = "Berechtigungen";
+$a->strings["Public post"] = "Öffentlicher Beitrag";
+$a->strings["Example: bob@example.com, mary@example.com"] = "Beispiel: bob@example.com, mary@example.com";
+$a->strings["Set expiration date"] = "Verfallsdatum setzen";
 $a->strings["Logged out."] = "Ausgeloggt.";
 $a->strings["Failed authentication"] = "Authentifizierung fehlgeschlagen";
 $a->strings["Login failed."] = "Login fehlgeschlagen.";
@@ -575,56 +653,6 @@ $a->strings["Click here to upgrade."] = "Klicke hier, um das Upgrade durchzufüh
 $a->strings["This action exceeds the limits set by your subscription plan."] = "Diese Aktion überschreitet die Grenzen Ihres Abonnements.";
 $a->strings["This action is not available under your subscription plan."] = "Diese Aktion ist in Ihrem Abonnement nicht verfügbar.";
 $a->strings["Default"] = "Standard";
-$a->strings["channel"] = "Kanal";
-$a->strings["%1\$s likes %2\$s's %3\$s"] = "%1\$s mag %2\$s's %3\$s";
-$a->strings["%1\$s doesn't like %2\$s's %3\$s"] = "%1\$s mag %2\$s's %3\$s nicht";
-$a->strings["%1\$s is now connected with %2\$s"] = "%1\$s ist jetzt mit %2\$s verbunden";
-$a->strings["%1\$s poked %2\$s"] = "%1\$s stupste %2\$s";
-$a->strings["%1\$s is currently %2\$s"] = "%1\$s ist momentan %2\$s";
-$a->strings["View %s's profile @ %s"] = "Schaue Dir %s's Profil auf %s an.";
-$a->strings["View in context"] = "Im Zusammenhang anschauen";
-$a->strings["Loading..."] = "Lädt ...";
-$a->strings["Delete Selected Items"] = "Lösche die ausgewählten Elemente";
-$a->strings["View Source"] = "Quelle anzeigen";
-$a->strings["Follow Thread"] = "Unterhaltung folgen";
-$a->strings["Matrix Activity"] = "Matrix Aktivität";
-$a->strings["%s likes this."] = "%s gefällt das.";
-$a->strings["%s doesn't like this."] = "%s gefällt das nicht.";
-$a->strings["<span  %1\$s>%2\$d people</span> like this."] = "<span  %1\$s>%2\$d Personen</span> mögen dies.";
-$a->strings["<span  %1\$s>%2\$d people</span> don't like this."] = "<span  %1\$s>%2\$d Personen</span> mögen dies nicht.";
-$a->strings["and"] = "und";
-$a->strings[", and %d other people"] = ", und %d andere";
-$a->strings["%s like this."] = "%s gefällt das.";
-$a->strings["%s don't like this."] = "%s gefällt das nicht.";
-$a->strings["Visible to <strong>everybody</strong>"] = "Sichtbar für <strong>jeden</strong>";
-$a->strings["Please enter a link URL:"] = "Geben Sie eine URL ein:";
-$a->strings["Please enter a video link/URL:"] = "Geben Sie einen Video-Link/URL ein:";
-$a->strings["Please enter an audio link/URL:"] = "Geben Sie einen Audio-Link/URL ein:";
-$a->strings["Tag term:"] = "Schlagwort:";
-$a->strings["Save to Folder:"] = "Speichern in Ordner:";
-$a->strings["Where are you right now?"] = "Wo bist du jetzt grade?";
-$a->strings["Share"] = "Teilen";
-$a->strings["Page link title"] = "Seitentitel-Link";
-$a->strings["Upload photo"] = "Foto hochladen";
-$a->strings["upload photo"] = "Foto hochladen";
-$a->strings["Attach file"] = "Datei anhängen";
-$a->strings["attach file"] = "Datei anfügen";
-$a->strings["Insert web link"] = "Link einfügen";
-$a->strings["web link"] = "Web-Link";
-$a->strings["Insert video link"] = "Video-Link einfügen";
-$a->strings["video link"] = "Video-Link";
-$a->strings["Insert audio link"] = "Audio-Link einfügen";
-$a->strings["audio link"] = "Audio-Link";
-$a->strings["Set your location"] = "Legen Sie Ihren Aufenthaltsort fest";
-$a->strings["set location"] = "Ort festlegen";
-$a->strings["Clear browser location"] = "Browser-Standort löschen";
-$a->strings["clear location"] = "Standort löschen";
-$a->strings["Set title"] = "Titel festlegen";
-$a->strings["Categories (comma-separated list)"] = "Kategorien (Kommagetrennte Liste)";
-$a->strings["Permission settings"] = "Berechtigungs-Einstellungen";
-$a->strings["permissions"] = "Berechtigungen";
-$a->strings["Public post"] = "Öffentlicher Beitrag";
-$a->strings["Example: bob@example.com, mary@example.com"] = "Beispiel: bob@example.com, mary@example.com";
 $a->strings["Welcome "] = "Willkommen";
 $a->strings["Please upload a profile photo."] = "Bitte lade ein Profilfoto hoch.";
 $a->strings["Welcome back "] = "Willkommen zurück";
@@ -635,6 +663,13 @@ $a->strings["Archives"] = "Archive";
 $a->strings["Collection not found."] = "Sammlung nicht gefunden";
 $a->strings["Group is empty"] = "Gruppe ist leer";
 $a->strings["Connection not found."] = "Die Verbindung wurde nicht gefunden.";
+$a->strings["Sort Options"] = "Sortieroptionen";
+$a->strings["Alphabetic"] = "alphabetisch";
+$a->strings["Reverse Alphabetic"] = "Entgegengesetzt alphabetisch";
+$a->strings["Newest to Oldest"] = "Neueste zuerst";
+$a->strings["Enable Safe Search"] = "Sichere Suche einschalten";
+$a->strings["Disable Safe Search"] = "Sichere Suche ausschalten";
+$a->strings["Safe Mode"] = "Sicherer Modus";
 $a->strings["No channel."] = "Kein Channel.";
 $a->strings["Common connections"] = "Gemeinsame Verbindungen";
 $a->strings["No connections in common."] = "Keine gemeinsamen Verbindungen.";
@@ -678,10 +713,11 @@ $a->strings["You have no more invitations available"] = "Du hast keine weiteren
 $a->strings["Send invitations"] = "Einladungen senden";
 $a->strings["Enter email addresses, one per line:"] = "Email-Adressen eintragen, eine pro Zeile:";
 $a->strings["Your message:"] = "Deine Nachricht:";
-$a->strings["You are cordially invited to join me and some other close friends on the Red Matrix - a revolutionary new decentralised social and information tool."] = "Du bist herzlich dazu eingeladen mir und einigen anderen gute Freunde zur Red Matrix zu folgen, einem neuen revolutionären dezentralen sozialen Informationswerkzeug.";
+$a->strings["You are cordially invited to join me and some other close friends on the Red Matrix - a revolutionary new decentralised communication and information tool."] = "Du bist herzlich eingeladen mir und einigen anderen guten Freunden in die Red Matrix zu folgen - einem revolutionaren neuen, dezentralisiertem Kommunikations- und Informationsnetzwerk.";
 $a->strings["You will need to supply this invitation code: \$invite_code"] = "Du musst dann den folgenden Einladungs-Code angeben: \$invite_code";
 $a->strings["Please visit my channel at"] = "Bitte besuche meinen Kanal auf";
-$a->strings["Once you have registered, please connect with my Red Matrix channel address:"] = "Sobald du dich registriert hat, verbinde dich bitte mit meinem Red Matrix Kanal unter folgender Adresse:";
+$a->strings["Once you have registered (on ANY Red Matrix site - they are all inter-connected), please connect with my Red Matrix channel address:"] = "Wenn du dich registriert hast (egal auf welcher Seite in der Red Matrix, sie sind alle miteinander verbunden) verbinde dich bitte mit meinem Kanal in der Matrix.";
+$a->strings["Click the [Register] link on the following page to join."] = "";
 $a->strings["For more information about the Red Matrix Project and why it has the potential to change the internet as we know it, please visit http://getzot.com"] = "Für weitere Informationen über das Red Matrix Projekt und warum es das Potential hat das Internet wie wir es kennen grundlegend zu verändern schau dir bitte http://getzot.com an";
 $a->strings["Friends of %s"] = "Freunde von %s";
 $a->strings["No friends to display."] = "Keine Freunde zum Anzeigen.";
@@ -698,6 +734,7 @@ $a->strings["No installed applications."] = "Keine installierten Applikationen";
 $a->strings["Applications"] = "Anwendungen";
 $a->strings["Invalid item."] = "Ungültiges Element.";
 $a->strings["Channel not found."] = "Kanal nicht gefunden.";
+$a->strings["Page not found."] = "Seite nicht gefunden.";
 $a->strings["Item not available."] = "Element nicht verfügbar.";
 $a->strings["Red Matrix Server - Setup"] = "Red Matrix Server - Installation";
 $a->strings["Could not connect to database."] = "Kann nicht mit der Datenbank verbinden.";
@@ -720,7 +757,7 @@ $a->strings["Database Login Name"] = "Datenbank-Benutzername";
 $a->strings["Database Login Password"] = "Datenbank-Kennwort";
 $a->strings["Database Name"] = "Datenbank-Name";
 $a->strings["Site administrator email address"] = "E-Mail Adresse des Seiten-Administrators";
-$a->strings["Your account email address must match this in order to use the web admin panel."] = "Die Email-Adresse deines Accounts muss dieser Adresse entsprechen, damit du Zugriff zum Admin Panel erhälst.";
+$a->strings["Your account email address must match this in order to use the web admin panel."] = "Die Email-Adresse deines Accounts muss dieser Adresse entsprechen, damit du Zugriff zum Admin Panel erhältst.";
 $a->strings["Website URL"] = "Webseiten URL";
 $a->strings["Please use SSL (https) URL if available."] = "Nutzen Sie bitte SSL (https) URL falls möglich.";
 $a->strings["Please select a default timezone for your website"] = "Wählen Sie die Standard-Zeitzone für Ihre Webseite aus";
@@ -770,6 +807,7 @@ $a->strings["The database configuration file \".htconfig.php\" could not be writ
 $a->strings["Errors encountered creating database tables."] = "Fehler während des Anlegens der Datenbank Tabellen aufgetreten.";
 $a->strings["<h1>What next</h1>"] = "<h1>Was als Nächstes</h1>";
 $a->strings["IMPORTANT: You will need to [manually] setup a scheduled task for the poller."] = "WICHTIG: Du musst die geplanten Aufgaben für den Poller [manuell] einrichten.";
+$a->strings["Edit post"] = "Bearbeite Beitrag";
 $a->strings["%1\$s is following %2\$s's %3\$s"] = "%1\$s folgt nun %2\$s's %3\$s";
 $a->strings["[Embedded content - reload page to view]"] = "[Eingebetteter Inhalte - bitte lade die Seite zur Anzeige neu]";
 $a->strings["toggle full screen mode"] = "auf Vollbildmodus umschalten";
@@ -880,8 +918,8 @@ $a->strings["You receive an introduction"] = "Du eine Vorstellung erhältst";
 $a->strings["Your introductions are confirmed"] = "Deine Vorstellung bestätigt wurde.";
 $a->strings["Someone writes on your profile wall"] = "Jemand auf deine Pinnwand schreibt";
 $a->strings["Someone writes a followup comment"] = "Jemand einen Beitrag kommentiert";
-$a->strings["You receive a private message"] = "Du eine private Nachricht erhälst";
-$a->strings["You receive a friend suggestion"] = "Du einen Kontaktvorschlag erhälst";
+$a->strings["You receive a private message"] = "Du eine private Nachricht erhältst";
+$a->strings["You receive a friend suggestion"] = "Du einen Kontaktvorschlag erhältst";
 $a->strings["You are tagged in a post"] = "Du wurdest in einem Beitrag getaggt";
 $a->strings["You are poked/prodded/etc. in a post"] = "Du in einer Nachricht angestupst/geknufft/o.ä. wirst";
 $a->strings["Advanced Account/Page Type Settings"] = "Erweiterte Account / Seiten Arten Einstellungen";
@@ -930,7 +968,7 @@ $a->strings["Users"] = "Benutzer";
 $a->strings["Plugins"] = "Plug-Ins";
 $a->strings["Themes"] = "Themes";
 $a->strings["Server"] = "Server";
-$a->strings["DB updates"] = "Datenbankaktualisierungen";
+$a->strings["DB updates"] = "DB Aktualisierungen";
 $a->strings["Logs"] = "Protokolle";
 $a->strings["Plugin Features"] = "Plug-In Funktionen";
 $a->strings["User registrations waiting for confirmation"] = "Nutzer Anmeldungen die auf Bestätigung warten";
@@ -1017,10 +1055,6 @@ $a->strings["Account not found"] = "Konto nicht gefunden";
 $a->strings["User '%s' deleted"] = "Benutzer '%s' gelöscht";
 $a->strings["User '%s' unblocked"] = "Benutzer '%s' freigegeben";
 $a->strings["User '%s' blocked"] = "Benutzer '%s' blockiert";
-$a->strings["Normal Account"] = "Normales Konto";
-$a->strings["Soapbox Account"] = "Marktschreier Konto";
-$a->strings["Community/Celebrity Account"] = "Community/Celebrity Konto";
-$a->strings["Automatic Friend Account"] = "Automatisches Freundschafts- Konto";
 $a->strings["select all"] = "Alle auswählen";
 $a->strings["User registrations waiting for confirm"] = "Neuanmeldungen, die auf deine Bestätigung warten";
 $a->strings["Request date"] = "Antragsdatum";
@@ -1031,6 +1065,7 @@ $a->strings["Block"] = "Blockieren";
 $a->strings["Unblock"] = "Freigeben";
 $a->strings["Register date"] = "Registrierungs-Datum";
 $a->strings["Last login"] = "Letzte Anmeldung";
+$a->strings["Expires"] = "Verfällt";
 $a->strings["Service Class"] = "Service-Klasse";
 $a->strings["Selected users will be deleted!\\n\\nEverything these users had posted on this site will be permanently deleted!\\n\\nAre you sure?"] = "Markierte Nutzer werden gelöscht\\n\\nAlles was diese Nutzer auf dieser Seite veröffentlicht haben wird permanent gelöscht\\n\\nBist du sicher?";
 $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?"] = "Der Nutzer {0} wird gelöscht\\n\\nAlles was dieser Nutzer auf dieser Seite veröffentlicht hat wird permanent gelöscht werden\\n\\nBist du sicher?";
@@ -1091,6 +1126,7 @@ $a->strings["Collection Editor"] = "Sammlung-Editor";
 $a->strings["Members"] = "Mitglieder";
 $a->strings["All Connected Channels"] = "Alle verbundene Channels";
 $a->strings["Click on a channel to add or remove."] = "Wähle einen Kanal zum hinzufügen oder entfernen aus.";
+$a->strings["Remove term"] = "Eintrag löschen";
 $a->strings["Page owner information could not be retrieved."] = "Informationen über den Betreiber der Seite konnten nicht gefunden werden.";
 $a->strings["Album not found."] = "Album nicht gefunden.";
 $a->strings["Delete Album"] = "Album löschen";
@@ -1159,6 +1195,7 @@ $a->strings["Selected channel has private message restrictions. Send failed."] =
 $a->strings["Messages"] = "Nachrichten";
 $a->strings["Message deleted."] = "Nachricht gelöscht.";
 $a->strings["Conversation removed."] = "Unterhaltung gelöscht.";
+$a->strings["Message recalled."] = "Nachricht widerrufen.";
 $a->strings["Send Private Message"] = "Private Nachricht senden";
 $a->strings["To:"] = "An:";
 $a->strings["Subject:"] = "Betreff:";
@@ -1166,17 +1203,21 @@ $a->strings["No messages."] = "Keine Nachrichten.";
 $a->strings["Delete message"] = "Nachricht löschen";
 $a->strings["D, d M Y - g:i A"] = "D, d. M Y - g:i A";
 $a->strings["Message not found."] = "Nachricht nicht gefunden.";
+$a->strings["Recall message"] = "Widerrufe die Nachricht";
+$a->strings["Message has been recalled."] = "Die Nachricht wurde widerrufen.";
+$a->strings["Private Conversation"] = "Private Unterhaltung";
 $a->strings["Delete conversation"] = "Unterhaltung löschen";
 $a->strings["No secure communications available. You <strong>may</strong> be able to respond from the sender's profile page."] = "Keine sichere Kommunikation verfügbar. <strong>Eventuell</strong> kannst du von der Profilseite des Absenders antworten.";
 $a->strings["Send Reply"] = "Antwort senden";
 $a->strings["No profile"] = "Kein Profil";
+$a->strings["Layout Help"] = "Layout Hilfe";
+$a->strings["Help with this feature"] = "Hilfe zu diesem Feature";
+$a->strings["Layout Name"] = "Layout Name";
 $a->strings["Help:"] = "Hilfe:";
 $a->strings["Not Found"] = "Nicht gefunden";
-$a->strings["Page not found."] = "Seite nicht gefunden.";
 $a->strings["Remote Authentication"] = "Entfernte Authentifizierung";
 $a->strings["Enter your channel address (e.g. channel@example.com)"] = "Geben Sie Ihre Kanal-Adresse (z.B. channel@example.com)";
 $a->strings["Authenticate"] = "Authentifizieren";
-$a->strings["Remove term"] = "Eintrag löschen";
 $a->strings["Commented Order"] = "Neueste Kommentare";
 $a->strings["Sort by Comment Date"] = "Nach Kommentardatum sortiert";
 $a->strings["Posted Order"] = "Neueste Beiträge";
@@ -1248,6 +1289,7 @@ $a->strings["Automatic Permissions Settings"] = "Automatische Berechtigungs-Eins
 $a->strings["Connections: settings for %s"] = "Verbindungseinstellungen für %s";
 $a->strings["When receiving a channel introduction, any permissions provided here will be applied to the new connection automatically and the introduction approved. Leave this page if you do not wish to use this feature."] = "Wenn eine Kanal-Vorstellung empfangen wird, werden die hier getroffenen Einstellungen automatisch angewandt und der Anfrage wird stattgegeben. Verlasse diese Seite, wenn du dieses Feature nicht verwanden möchtest.";
 $a->strings["Slide to adjust your degree of friendship"] = "Schieben um den Grad der Freundschaft zu wählen";
+$a->strings["inherited"] = "Geerbt";
 $a->strings["Connection has no individual permissions!"] = "Diese Verbindung hat keine individuellen Zugriffseinstellungen.";
 $a->strings["This may be appropriate based on your <a href=\"settings\">privacy settings</a>, though you may wish to review the \"Advanced Permissions\"."] = "Abhängig von deinen <a href=\"settings\">Privatsphären Einstellungen</a> könnte dies angebracht sein, eventuell solltest du aber die \"Erweiterte Zugriffsrechte\" überprüfen.";
 $a->strings["Profile Visibility"] = "Sichtbarkeit des Profils";
@@ -1262,7 +1304,7 @@ $a->strings["Full Sharing"] = "Volles Teilen";
 $a->strings["Cautious Sharing"] = "Vorsichtiges Teilen";
 $a->strings["Follow Only"] = "Nur Folgen";
 $a->strings["Individual Permissions"] = "Individuelle Zugriffseinstellungen";
-$a->strings["Individual permissions are only enabled for <a href=\"settings\">privacy settings</a> which are set to \"Only those you specifically allow\". Otherwise they are controlled by your privacy settings."] = "Individuelle Zugriffseinstellungen sind nur aktive bei <a href=\"settings\">Privatspären Einstellungen</a> die auf \"Nur diejenigen, die Sie erlauben\" gesetzt sind. Andernfalls wird dies über deine Privatsphären Einstellungen geregelt.";
+$a->strings["Some permissions may be inherited from your channel <a href=\"settings\">privacy settings</a>, which have higher priority. Changing those inherited settings on this page will have no effect."] = "";
 $a->strings["Advanced Permissions"] = "Erweiterte Zugriffsrechte";
 $a->strings["Quick Links"] = "Quick Links";
 $a->strings["Visit %s's profile - %s"] = "%s's Profil besuchen - %s";
@@ -1499,9 +1541,10 @@ $a->strings["No more personal notifications."] = "Keine persönliche Benachricht
 $a->strings["Personal Notifications"] = "Persönliche Benachrichtigungen";
 $a->strings["No more home notifications."] = "Keine Pinwand-Benachrichtigungen mehr.";
 $a->strings["Home Notifications"] = "Pinwand-Benachrichtigungen";
+$a->strings["Block Name"] = "Block Name";
+$a->strings["Unable to find your hub."] = "Konnte den Hub nicht finden.";
 $a->strings["Post successful."] = "Veröffentlichung erfolgreich.";
 $a->strings["Item is not editable"] = "Element kann nicht bearbeitet werden.";
-$a->strings["Edit post"] = "Bearbeite Beitrag";
 $a->strings["Access to this profile has been restricted."] = "Der Zugang zu diesem Profil ist begrenzt.";
 $a->strings["Poke/Prod"] = "Anstupsen/Kuffen";
 $a->strings["poke, prod or do other things to somebody"] = "Stupse Leute an oder mache anderes mit ihnen";
@@ -1509,6 +1552,7 @@ $a->strings["Recipient"] = "Empfänger";
 $a->strings["Choose what you wish to do to recipient"] = "Wähle was du mit dem/r Empfänger/in tun willst";
 $a->strings["Make this post private"] = "Diesen Beitrag privat machen";
 $a->strings["Wall Photos"] = "Wall Fotos";
+$a->strings["Insufficient permissions.  Request redirected to profile page."] = "Unzureichende Zugriffsrechte. Die Anfrage wurde zur Profil-Seite umgeleitet.";
 $a->strings["Not available."] = "Nicht verfügbar.";
 $a->strings["Community"] = "Gemeinschaft";
 $a->strings["No results."] = "Keine Ergebnisse.";
@@ -1533,14 +1577,15 @@ $a->strings["Version %s"] = "Version %s";
 $a->strings["Installed plugins/addons/apps:"] = "Installierte Plugins/Addons/Apps";
 $a->strings["No installed plugins/addons/apps"] = "Keine installierten Plugins/Addons/Apps";
 $a->strings["Red"] = "Red";
-$a->strings["This is Red - another decentralized, distributed communications project by the folks at Friendica."] = "Dies ist Red - ein anderes dezentralisiertes, verteiltest Kommunikationsprojekt von den Machern von Friendica.";
+$a->strings["This is a hub of the Red Matrix - a global cooperative network of decentralised privacy enhanced websites."] = "";
 $a->strings["Running at web location"] = "Erreichbar unter der Web-Adresse";
-$a->strings["Please visit <a href=\"http://friendica.com\">Friendica.com</a> to learn more about the Friendica and/or Red project."] = "Bitte besuche <a href=\"http://friendica.com\">Friendica.com</a> um mehr über das Friendica und/oder Red Projekt zu erfahren.";
+$a->strings["Please visit <a href=\"http://getzot.com\">GetZot.com</a> to learn more about the Red Matrix."] = "Besuche <a href=\"http://getzot.com\">GetZot.com</a> um mehr über die Red Matrix zu erfahren.";
 $a->strings["Bug reports and issues: please visit"] = "Probleme oder Fehler gefunden? Bitte besuche";
-$a->strings["Suggestions, praise, donations, etc. - please email \"Info\" at Friendica - dot com"] = "Vorschläge, Lob, Spenden usw.: E-Mail an \"Info\" at Friendica - dot com";
+$a->strings["Suggestions, praise, donations, etc. - please email \"redmatrix\" at librelist - dot com"] = "Vorschläge, Lob, Spenden usw.: E-Mail an 'redmatrix' at librelist - dot - com";
 $a->strings["No suggestions available. If this is a new site, please try again in 24 hours."] = "Keine Vorschläge vorhanden. Wenn dies eine neue Seite ist versuche es bitte in 24 Stunden erneut.";
 $a->strings["Ignore/Hide"] = "Ignorieren/Verstecken";
 $a->strings["Public Sites"] = "Öffentliche Seiten";
+$a->strings["The listed sites allow public registration into the Red Matrix. All sites in the matrix are interlinked so membership on any of them conveys membership in the matrix as a whole. Some sites may require subscription or provide tiered service plans. The provider links <strong>may</strong> provide additional details."] = "Die hier aufgeführten Seiten erlauben dir einen Account in der Red Matrix anzulegen. Alle Seiten der Matrix sind mit einander verbunden, so dass die Mitgliedschaft auf einer Seite die Mitgliedschaft auf einer beliebigen anderen Seite der Matrix beinhaltet. Es könnte sein, dass einige dieser Seiten Abonnements benötigen oder abgestufte Service-Pläne anbieten. Auf den jeweiligen Seiten <strong>könnten</strong> nähere Details diesbezüglich stehen.";
 $a->strings["Site URL"] = "URL der Seite";
 $a->strings["Access Type"] = "Zugangs Typ";
 $a->strings["Registration Policy"] = "Registrierungsrichtlinien";
@@ -1562,9 +1607,12 @@ $a->strings["Please re-enter your password"] = "Bitte geben Sie erneut Ihr Passw
 $a->strings["Please login."] = "Bitte loggen Sie sich ein.";
 $a->strings["Remote authentication blocked. You are logged into this site locally. Please logout and retry."] = "Entfernte Authentifizierung blockiert. Du bist lokal auf dieser Seite angemeldet. Bitte melde dich ab und versuche es erneut.";
 $a->strings["Welcome %s. Remote authentication successful."] = "Willkommen %s. Entfernte Authentifizierung erfolgreich.";
-$a->strings["Remove My Account"] = "Mein Konto entfernen";
-$a->strings["This will completely remove your account. Once this has been done it is not recoverable."] = "Dein Konto wird endgültig gelöscht. Es gibt keine Möglichkeit, es wiederherzustellen.";
+$a->strings["Remove This Channel"] = "Diesen Kanal löschen!";
+$a->strings["This will completely remove this channel from the network. Once this has been done it is not recoverable."] = "Hiermit wird dieser Kanal komplett aus dem Netzwerk gelöscht. Einmal eingeleitet ist dieser Prozess nicht widerrufbar.";
 $a->strings["Please enter your password for verification:"] = "Bitte geben Sie Ihr Passwort zur Bestätigung ein:";
+$a->strings["Remove this channel and all its clones from the network"] = "Lösche diesen Kanal und all seine Klone aus dem Netzwerk";
+$a->strings["By default only the instance of the channel located on this hub will be removed from the network"] = "Standartmäßig wird der Kanal nur auf diesem Knoten gelöscht, seine Klone verbleiben im Netzwerk";
+$a->strings["Remove My Account"] = "Mein Konto entfernen";
 $a->strings["Gender: "] = "Geschlecht:";
 $a->strings["Finding:"] = "Ergebnisse:";
 $a->strings["next page"] = "nächste Seite";
@@ -1572,29 +1620,73 @@ $a->strings["previous page"] = "vorige Seite";
 $a->strings["No entries (some entries may be hidden)."] = "Keine Einträge gefunden (einige könnten versteckt sein).";
 $a->strings["Mood"] = "Laune";
 $a->strings["Set your current mood and tell your friends"] = "Wähle deine aktuelle Stimmung und erzähle sie deinen Freunden";
+$a->strings["Scheme Default"] = "";
+$a->strings["red"] = "Rot";
+$a->strings["black"] = "Schwarz";
+$a->strings["silver"] = "Silber";
 $a->strings["Theme settings"] = "Theme-Einstellungen";
+$a->strings["Set scheme"] = "Schema wählen";
 $a->strings["Navigation bar colour"] = "Farbe der Navigationsleiste";
+$a->strings["Set font-colour for banner"] = "Farbe der Schrift des Banners setzen";
 $a->strings["Set the background colour"] = "Hintergrundfarbe wählen";
 $a->strings["Set the background image"] = "Hintergrundbild wählen";
 $a->strings["Set the background colour of items"] = "Hintergrundfarbe von Beiträgen wählen";
 $a->strings["Set the opacity of items"] = "Opazität von Beiträgen wählen";
+$a->strings["Set the basic colour for item icons"] = "Basis Farbe der Beitrags-Icons setzen";
+$a->strings["Set the hover colour for item icons"] = "";
+$a->strings["Set font-size for the entire application"] = "";
 $a->strings["Set font-size for posts and comments"] = "Wähle die Schriftgröße für Beiträge und Kommentare";
 $a->strings["Set font-colour for posts and comments"] = "Schriftfarbe für Beiträge und Kommentare wählen";
 $a->strings["Set radius of corners"] = "Radius von Ecken";
 $a->strings["Set shadow depth of photos"] = "Schattentiefe von Fotos";
+$a->strings["Set maximum width of conversation regions"] = "";
+$a->strings["Set minimum opacity of nav bar - to hide it"] = "";
+$a->strings["Set size of conversation author photo"] = "";
+$a->strings["Set size of followup author photos"] = "";
+$a->strings["Sloppy photo albums"] = "";
+$a->strings["Are you a clean desk or a messy desk person?"] = "Bist du jemand der einen aufgeräumten Schreibtisch hat, oder eher einen chaotischen?";
+$a->strings["Schema Default"] = "Standard-Schema";
+$a->strings["Sans-Serif"] = "Sans-Serif";
+$a->strings["Monospace"] = "Monospace";
+$a->strings["Set font face"] = "Schriftart wählen";
+$a->strings["Set iconset"] = "Iconset wählen";
+$a->strings["Set big shadow size, default 15px 15px 15px"] = "";
+$a->strings["Set small shadow size, default 5px 5px 5px"] = "";
+$a->strings["Set shadow colour, default #000"] = "";
+$a->strings["Set radius size, default 5px"] = "";
 $a->strings["Set line-height for posts and comments"] = "Wähle die Zeilenhöhe in Beiträgen und Kommentaren";
-$a->strings["Set colour scheme"] = "Wähle das Farbschema";
-$a->strings["Draw shadows"] = "Zeichne Schatten";
-$a->strings["Display style"] = "Anzeige Stiel";
-$a->strings["Display colour of links - hex value, do not include the #"] = "Farbe für Verweise - Hex Wert, die # nicht angeben";
-$a->strings["Icons"] = "Symbole";
-$a->strings["Shiny style"] = "Glitzer Stiel";
+$a->strings["Set background image"] = "Hintergrundbild wählen";
+$a->strings["Set background colour"] = "Hintergrundfarbe wählen";
+$a->strings["Set section background image"] = "";
+$a->strings["Set section background colour"] = "";
+$a->strings["Set colour of items - use hex"] = "Wähle die Farbe von Beiträgen - verwende HEX";
+$a->strings["Set colour of links - use hex"] = "Wähle die Farbe von Links - verwende HEX";
+$a->strings["Set max-width for items.  Default 400px"] = "Maximale Breite von Beiträgen. Standard ist 400px";
+$a->strings["Set min-width for items.  Default 240px"] = "Minimale Breite von Beiträgen. Standard ist 240px";
+$a->strings["Set the generic content wrapper width.  Default 48%"] = "Breite des \"generic content wrapper\". Standard ist 48%";
+$a->strings["Set colour of fonts - use hex"] = "Schriftfarbe - verwende HEX";
+$a->strings["Set background-size element"] = "Größe des Hintergrund-Elements";
+$a->strings["Item opacity"] = "Opazität von Beiträgen";
+$a->strings["Display post previews only"] = "Nur Beitragsvorschau anzeigen";
+$a->strings["Display side bar on channel page"] = "Zeige die Seitenleiste auf der Kanal-Seite";
+$a->strings["Colour of the navigation bar"] = "Farbe der Navigationsleiste";
+$a->strings["Item float"] = "Beitragsfluss";
+$a->strings["Left offset of the section element"] = "Linker Rand des Section Elements";
+$a->strings["Right offset of the section element"] = "Rechter Rand des Section Elements";
+$a->strings["Section width"] = "Breite der Section";
+$a->strings["Left offset of the aside"] = "Linker Rand der aside";
+$a->strings["Right offset of the aside element"] = "Rechter Rand der aside";
+$a->strings["None"] = "Keine";
+$a->strings["Header image"] = "Titelbild";
+$a->strings["Header image only on profile pages"] = "Titelbild nur auf Profil-Seiten anzeigen";
 $a->strings["Update %s failed. See error logs."] = "Aktualisierung %s fehlgeschlagen. Details in den Fehlerlogs.";
 $a->strings["Update Error at %s"] = "Aktualisierungsfehler auf %s";
-$a->strings["Create a New Account"] = "Erzeuge ein neues Konto";
+$a->strings["Create an account to access services and applications within the Red Matrix"] = "Erstelle einen Account um Anwendungen und Dienste innerhalb der Red Matrix verwenden zu können.";
 $a->strings["Password"] = "Kennwort";
 $a->strings["Remember me"] = "Angaben speichern";
 $a->strings["Forgot your password?"] = "Passwort vergessen?";
+$a->strings["permission denied"] = "Zugriff verweigert";
+$a->strings["Got Zot?"] = "Haste schon Zot?";
 $a->strings["Requested channel is not available."] = "Angeforderte Kanal nicht verfügbar.";
 $a->strings[" Sorry, you don't have the permission to view this profile. "] = "Entschuldigung, aber du besitzt nicht die nötigen Rechte um dieses Profil ansehen zu dürfen.";
 $a->strings["Profiles"] = "Profile";
-- 
cgit v1.2.3


From d9f67876dce5da9ed056726f792e087d142699cb Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Mon, 2 Dec 2013 15:15:02 -0800
Subject: refactor magic-auth

---
 view/tpl/group_side.tpl | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'view')

diff --git a/view/tpl/group_side.tpl b/view/tpl/group_side.tpl
index ebc820530..d2d8a77e2 100755
--- a/view/tpl/group_side.tpl
+++ b/view/tpl/group_side.tpl
@@ -23,11 +23,6 @@
   <div id="sidebar-new-group">
   <a href="group/new">{{$createtext}}</a>
   </div>
-  {{if $ungrouped}}
-  <div id="sidebar-ungrouped">
-  <a href="nogroup">{{$ungrouped}}</a>
-  </div>
-  {{/if}}
 </div>
 
 
-- 
cgit v1.2.3


From 061725b97a1086a89a5542005b6b6e58d38437ff Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Mon, 2 Dec 2013 19:26:57 -0800
Subject: clear floats on the connect button

---
 view/theme/redbasic/css/style.css | 1 +
 1 file changed, 1 insertion(+)

(limited to 'view')

diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index cd0842683..33e89d3f2 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -1834,6 +1834,7 @@ a.mail-list-link {
 	border-radius: $radiuspx;
 	padding: 5px;
 	font-weight: bold;
+	clear: both;
 }
 
 
-- 
cgit v1.2.3


From 9f2efb0291e18ed9c042e8c018b8481c69179f26 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Mon, 2 Dec 2013 23:55:57 -0800
Subject: ensure that every imported channel has a primary hubloc

---
 view/css/mod_connections.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'view')

diff --git a/view/css/mod_connections.css b/view/css/mod_connections.css
index c2f6eeff0..978d81bc1 100644
--- a/view/css/mod_connections.css
+++ b/view/css/mod_connections.css
@@ -3,7 +3,7 @@
 	color: #000;
 }
 .abook-them {
-	margin-left: 225px;
+	margin-left: 375px;
 	margin-bottom: 15px;
 }
 .abook-me {
-- 
cgit v1.2.3


From 27e0f4e06123f3a3a9c6c064e21aec813585933a Mon Sep 17 00:00:00 2001
From: marijus <mario@localhost.localdomain>
Date: Tue, 3 Dec 2013 23:08:57 +0100
Subject: split out mod_message and a typo

---
 view/css/mod_message.css          | 102 ++++++++++++++++++++++++++++++++++++++
 view/theme/redbasic/css/style.css | 101 +++----------------------------------
 view/tpl/mail_list.tpl            |   2 +-
 3 files changed, 109 insertions(+), 96 deletions(-)
 create mode 100644 view/css/mod_message.css

(limited to 'view')

diff --git a/view/css/mod_message.css b/view/css/mod_message.css
new file mode 100644
index 000000000..c65747477
--- /dev/null
+++ b/view/css/mod_message.css
@@ -0,0 +1,102 @@
+/* message */
+
+#mail-list-wrapper {
+	border-top: 1px solid #ccc;
+	padding: 5px 5px 5px 5px;
+}
+
+span.mail-list {
+	float: left;
+	width: 20%;
+}
+
+img.mail-list-sender-photo {
+	height: 24px;
+	width: 24px;
+	float: left;
+	margin-right: 30px;
+	-moz-border-radius: $radiuspx;
+	border-radius: $radiuspx;
+}
+
+.mail-list-remove {
+	width: 5% !important;
+}
+
+/* message/new */
+
+#prvmail-to-label,
+#prvmail-subject-label,
+#prvmail-expires-label,
+#prvmail-message-label {
+	margin-bottom: 10px;
+	margin-top: 20px;
+}
+
+#prvmail-submit {
+	float: left;
+	margin-top: 10px;
+	margin-right: 30px;
+}
+
+#prvmail-upload-wrapper,
+#prvmail-attach-wrapper,
+#prvmail-link-wrapper,
+#prvmail-expire-wrapper,
+#prvmail-encrypt-wrapper,
+#prvmail-rotator-wrapper {
+	float: left;
+	margin-top: 10px;
+	margin-right: 10px;
+	width: 24px;
+	cursor: pointer;
+}
+
+#prvmail-end {
+	clear: both;
+}
+
+/* message/id */
+
+.mail-conv-outside-wrapper {
+	margin-top: 30px;
+}
+
+.mail-conv-sender,
+.mail-conv-detail {
+	float: left;
+}
+
+.mail-conv-detail {
+	margin-left: 20px;
+	width: 500px;
+}
+
+.mail-conv-subject {
+    font-size: 1.4em;
+    margin: 10px 0;
+}
+
+.mail-conv-delete-wrapper {
+	float: right;
+	margin-right: 30px;
+	margin-top: 15px;
+}
+
+.mail-conv-delete-icon {
+	border: none;
+}
+
+.mail-conv-recall-wrapper {
+	float: right;
+	margin-right: 10px;
+	margin-top: 15px;
+}
+
+.mail-conv-outside-wrapper-end {
+	clear: both;
+}
+
+.mail-conv-break {
+	clear: both;
+}
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 33e89d3f2..51654aeaa 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -1590,34 +1590,7 @@ tr.mceLast {
 	margin-left: 200px;
 }
 
-
-#prvmail-to-label, #prvmail-subject-label, #prvmail-expires-label, #prvmail-message-label {
-	margin-bottom: 10px;
-	margin-top: 20px;
-}
-
-#prvmail-submit {
-	float: left;
-	margin-top: 10px;
-	margin-right: 30px;
-}
-#prvmail-upload-wrapper,
-#prvmail-attach-wrapper,
-#prvmail-link-wrapper,
-#prvmail-expire-wrapper,
-#prvmail-encrypt-wrapper,
-#prvmail-rotator-wrapper {
-	float: left;
-	margin-top: 10px;
-	margin-right: 10px;
-	width: 24px;
-	cursor: pointer;
-}
-
-#prvmail-end {
-	clear: both;
-}
-
+/* might be obsolete
 .mail-list-sender,
 .mail-list-detail {
 	float: left;
@@ -1637,8 +1610,6 @@ a.mail-list-link {
     padding: 4px 0;
 }
 
-
-
 .mail-list-outside-wrapper-end {
 	clear: both;
 }
@@ -1656,48 +1627,10 @@ a.mail-list-link {
 .mail-list-delete-icon {
 	border: none;
 }
+*/
 
-.mail-conv-sender,
-.mail-conv-detail {
-	float: left;
-}
-.mail-conv-detail {
-	margin-left: 20px;
-	width: 500px;
-}
-
-.mail-conv-subject {
-    font-size: 1.4em;
-    margin: 10px 0;
-}
-
-.mail-conv-outside-wrapper-end {
-	clear: both;
-}
-
-.mail-conv-outside-wrapper {
-	margin-top: 30px;
-}
-
-.mail-conv-delete-wrapper {
-	float: right;
-	margin-right: 30px;
-	margin-top: 15px;
-}
-.mail-conv-recall-wrapper {
-	float: right;
-	margin-right: 10px;
-	margin-top: 15px;
-}
-
-.mail-conv-break {
-	clear: both;
-}
-
-.mail-conv-delete-icon {
-	border: none;
-}
 
+/* might be obsolete
 .message-links ul {
 	list-style-type: none;
 	padding: 0px;
@@ -1714,6 +1647,7 @@ a.mail-list-link {
 .message-links-end {
 	clear: both;
 }
+*/
 
 #sidebar-group-list ul {
 	list-style-type: none;
@@ -1818,7 +1752,6 @@ a.mail-list-link {
 	margin-bottom: 15px;
 }
 
-
 .group-delete-wrapper {
 	float: right;
 	margin-right: 50px;
@@ -3129,34 +3062,12 @@ ul.menu-popup {
 .reshared-content { margin-left: 30px; }
 .shared_header img { margin-right: 10px; }
 
-
-#mail-list-wrapper {
-border-top: 1px solid #ccc;
-padding: 5px 5px 5px 5px;
-}
-
-span.mail-list {
-float: left;
-width: 20%;
-}
-
-.mail-list-remove {
-width: 5% !important;
-}
-
+/* might be obsolete
 span.mail-delete {
 float: left;
 width: 30px;
 }
-
-img.mail-list-sender-photo {
-height: 24px;
-width: 24px;
-float: left;
-margin-right: 30px;
--moz-border-radius: $radiuspx;
-border-radius: $radiuspx;
-}
+*/
 
 .tag1 {
     font-size : 1.0em !important;
diff --git a/view/tpl/mail_list.tpl b/view/tpl/mail_list.tpl
index 24966ad1d..8566ca368 100755
--- a/view/tpl/mail_list.tpl
+++ b/view/tpl/mail_list.tpl
@@ -1,7 +1,7 @@
 <div class="generic-content-wrapper" id="mail-list-wrapper">
 	<a href="{{$from_url}}" class ="mail-list" ><img class="mail-list-sender-photo" src="{{$from_photo}}" alt="{{$from_name}}" /></a>
 	<span class="mail-list">{{$from_name}}</span>
-	<span class="mail-list" {{if $seen}}seen{{else}}unseen{{/if}}"><a href="message/{{$id}}" class="mail-link">{{$subject}}</a></span>
+	<span class="mail-list" {{if $seen}}seen{{else}}unseen{{/if}}><a href="message/{{$id}}" class="mail-link">{{$subject}}</a></span>
 	<span class="mail-list" title="{{$date}}">{{$date}}</span>
 	<span class="mail-list mail-list-remove"><a href="message/dropconv/{{$id}}" onclick="return confirmDelete();"  title="{{$delete}}" ><i class="icon-remove mail-icons drop-icons"></i></a></span>
 	<div class="clear">&nbsp;</div>
-- 
cgit v1.2.3


From 6d4a265ab27ab16c4cd6404876c91cb3ca0d5265 Mon Sep 17 00:00:00 2001
From: marijus <mario@localhost.localdomain>
Date: Tue, 3 Dec 2013 23:26:21 +0100
Subject: this should remain in style.css

---
 view/css/mod_message.css          | 2 --
 view/theme/redbasic/css/style.css | 7 +++++++
 2 files changed, 7 insertions(+), 2 deletions(-)

(limited to 'view')

diff --git a/view/css/mod_message.css b/view/css/mod_message.css
index c65747477..c278f4d53 100644
--- a/view/css/mod_message.css
+++ b/view/css/mod_message.css
@@ -15,8 +15,6 @@ img.mail-list-sender-photo {
 	width: 24px;
 	float: left;
 	margin-right: 30px;
-	-moz-border-radius: $radiuspx;
-	border-radius: $radiuspx;
 }
 
 .mail-list-remove {
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 51654aeaa..8251db4a2 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -3237,3 +3237,10 @@ text-decoration: none;
 	color: $toolicon_colour;
 	margin-right: 10px;
 }
+
+/* message */
+
+img.mail-list-sender-photo {
+	-moz-border-radius: $radiuspx;
+	border-radius: $radiuspx;
+}
-- 
cgit v1.2.3


From a03a198bc1dfd352484f270d0bcd9647b1b33f1c Mon Sep 17 00:00:00 2001
From: marijus <mario@localhost.localdomain>
Date: Tue, 3 Dec 2013 23:35:31 +0100
Subject: should fix typos the right way...

---
 view/tpl/mail_list.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'view')

diff --git a/view/tpl/mail_list.tpl b/view/tpl/mail_list.tpl
index 8566ca368..c96827996 100755
--- a/view/tpl/mail_list.tpl
+++ b/view/tpl/mail_list.tpl
@@ -1,7 +1,7 @@
 <div class="generic-content-wrapper" id="mail-list-wrapper">
 	<a href="{{$from_url}}" class ="mail-list" ><img class="mail-list-sender-photo" src="{{$from_photo}}" alt="{{$from_name}}" /></a>
 	<span class="mail-list">{{$from_name}}</span>
-	<span class="mail-list" {{if $seen}}seen{{else}}unseen{{/if}}><a href="message/{{$id}}" class="mail-link">{{$subject}}</a></span>
+	<span class="mail-list {{if $seen}}seen{{else}}unseen{{/if}}"><a href="message/{{$id}}" class="mail-link">{{$subject}}</a></span>
 	<span class="mail-list" title="{{$date}}">{{$date}}</span>
 	<span class="mail-list mail-list-remove"><a href="message/dropconv/{{$id}}" onclick="return confirmDelete();"  title="{{$delete}}" ><i class="icon-remove mail-icons drop-icons"></i></a></span>
 	<div class="clear">&nbsp;</div>
-- 
cgit v1.2.3


From 82388465e4d87816a01fc93fa062b722515256a0 Mon Sep 17 00:00:00 2001
From: marijus <mario@localhost.localdomain>
Date: Wed, 4 Dec 2013 23:32:49 +0100
Subject: split conversation.css out of style.css

---
 view/css/conversation.css         | 431 ++++++++++++++++++++
 view/php/theme_init.php           |   1 +
 view/theme/redbasic/css/style.css | 831 +++++++++++++-------------------------
 3 files changed, 715 insertions(+), 548 deletions(-)
 create mode 100644 view/css/conversation.css

(limited to 'view')

diff --git a/view/css/conversation.css b/view/css/conversation.css
new file mode 100644
index 000000000..bf8e0236e
--- /dev/null
+++ b/view/css/conversation.css
@@ -0,0 +1,431 @@
+/* jot */
+
+#profile-jot-wrapper {
+	margin-top: 25px;
+}
+
+#jot-title,
+#jot-category,
+#jot-pagetitle {
+	border: 0px;
+	margin: 0px;
+	padding: 8px;
+	height: 1.8em;
+	width: 530px;
+	margin-bottom: 5px;
+}
+
+.jothidden {
+	display:none;
+}
+
+#profile-jot-text {
+	height: 1.8em;
+	padding: 8px;
+	margin-right: 0px;
+	width: 90%;
+}
+
+#profile-jot-text-loading {
+	float: left;
+	margin: 14px 0px 0px 12px;
+}
+
+#profile-jot-submit-wrapper {
+	margin-top: 10px;
+	width: 90%;
+}
+
+#profile-jot-submit {
+	height: 30px;
+	width: 70px;
+	float: right;
+}
+
+#profile-upload-wrapper,
+#wall-image-upload-div,
+#wall-image-upload,
+#wall-file-upload-div,
+#wall-file-upload,
+#profile-link,
+#profile-video,
+#profile-audio,
+#profile-location,
+#profile-nolocation,
+#profile-expires, 
+#profile-expires, 
+#jot-perms-icon,
+.hover, .focus {
+	cursor: pointer;
+}
+
+#profile-upload-wrapper,
+#profile-attach-wrapper,
+#profile-link-wrapper,
+#profile-video-wrapper,
+#profile-audio-wrapper,
+#profile-location-wrapper,
+#profile-nolocation-wrapper,
+#profile-expire-wrapper,
+#profile-encrypt-wrapper {
+	float: left;
+	margin-left: 15px;
+}
+
+#profile-jot-perms {
+	float: right;
+	padding: 6px;
+}
+
+#jot-perms-icon {
+	float: left;
+}
+
+#jot-preview-link {
+	float: left;
+	margin-left: 45px;
+	margin-top: 0px;
+}
+
+#profile-jot-perms-end {
+	height: 30px;
+}
+
+#profile-jot-end {
+	margin-bottom: 30px;
+}
+
+#profile-rotator {
+	float: left;
+	margin: 8px 0px 0px 20px;
+}
+
+/* this is referenced in js/acl.js - not sure if it is still needed. */
+.profile-jot-net {
+	float: left;
+	margin-right: 10px;
+	margin-top: 5px;
+	margin-bottom: 5px;
+}
+
+/* conversation */
+
+.thread-wrapper .toplevel_item {
+	width: 92%;
+}
+
+/* conv_item */
+
+.hide-comments-outer {
+	margin-left: 10px;
+}
+
+.wall-item-content-wrapper {
+	margin-top: 10px;
+	position: relative;
+}
+
+.wall-item-info {
+	display: block;
+	float: left;
+	width:110px;
+	margin-right:10px;
+}
+
+.comment .wall-item-info {
+	width: 70px;
+}
+
+.wallwall .wwto {
+	left: 50px;
+	margin: 0;
+	position: absolute;
+	width: 30px
+}
+
+.wallwall .wwto img {
+	width: 30px !important;
+	height: 30px !important;
+}
+
+.wallwall .wall-item-photo-end {
+	clear: both;
+}
+
+.wall-item-photo-wrapper {
+	margin-top: 0px;
+	margin-left: 10px;
+	margin-bottom: 10px;
+	width: 100px;
+}
+
+.wall-item-photo-menu-button {
+	left:10px;
+	display: block;
+	position: absolute;
+	margin: 0px;
+	padding: 0px;
+	width: 16px;
+	height: 16px;
+	overflow: hidden;
+	text-indent: 40px;
+	display: none;
+}
+
+.wall-item-photo-menu {
+	left:10px;
+	width: auto;
+	position: absolute;
+	display: none;
+	z-index: 10000;
+}
+
+.wall-item-photo-menu ul {
+	margin:0px;
+	padding: 0px;
+}
+
+.wall-item-photo-menu li a {
+	display: block;
+	padding: 2px;
+}
+
+.wall-item-arrowphoto-wrapper {
+	position: absolute;
+	z-index: 99;
+}
+
+.wall-item-wrapper {
+	margin-left:10px;
+}
+
+
+.wall-item-arrowphoto-wrapper {
+	left: 75px;
+}
+
+.wall-item-lock {
+	position: absolute;
+	left: 105px;
+	top: 1px;
+}
+
+.comment .wall-item-lock {
+	left: 65px;
+}
+
+.wall-item-lock {
+
+}
+
+.lockview {
+	cursor: pointer;
+}
+
+.wall-item-location {
+	overflow: hidden;
+	/* add ellipsis on text overflow               */
+	/* this work on safari, opera, ie, chrome.     */
+	/* firefox users have to wait support or we    */
+	/* can use a jquery plugin http://bit.ly/zJskg */
+	text-overflow: ellipsis;
+	-o-text-overflow: ellipsis;
+	width: 100%;
+}
+
+.wall-item-author {
+	margin-top: 10px;
+}
+
+
+.wall-item-ago .icon-ok {
+	cursor: pointer;
+}
+
+.wall-item-content {
+	margin-left: 10px;
+	overflow: auto;
+}
+
+.wall-item-content img {
+    max-width: 95% !important;
+}
+
+.wall-item-title {
+	float: left;
+	font-weight: bold;
+}
+
+.wall-item-title-end {
+	clear: both;
+}
+
+.wall-item-body {
+	margin-top: 10px;
+}
+
+.wall-item-body.divmore {
+        padding-bottom: 15px;
+}
+
+.body-tag, .filesavetags, .categorytags {
+	opacity: 0.5;
+	filter:alpha(opacity=50);
+}
+
+.body-tag:hover, .filesavetags:hover, .categorytags:hover {
+	opacity: 1.0 !important;
+	filter:alpha(opacity=100) !important;
+}
+
+.body-tag {
+	margin-top: 15px;
+}
+
+.wall-item-tools {
+	clear: both;
+	padding: 5px 10px;
+}
+
+.item-tool {
+	float: left;
+	margin-right: 8px;
+	cursor: pointer;
+}
+
+.like-rotator {
+	float: left;
+	margin: 8px;
+	color: $toolicon_colour;
+}
+
+.wall-item-delete-wrapper {
+	float: right;
+}
+
+.wall-item-delete-end {
+	clear: both;
+}
+
+.item-select {
+	opacity: 0.1;
+	filter:alpha(opacity=10);
+	float: right;
+	margin-right: 10px;
+
+}
+
+.item-select:hover,
+.checkeditem {
+	opacity: 1;
+	filter:alpha(opacity=100);
+}
+
+.wall-item-like.comment,
+.wall-item-dislike.comment {
+	margin-left: 50px;
+}
+
+.wall-item-like,
+.wall-item-dislike {
+	margin-top: 5px;
+}
+
+.wall-item-wrapper-end {
+	clear: both;
+}
+
+/* comment_item */
+
+.comment-wwedit-wrapper.threaded > .comment-edit-form > .comment-edit-photo {
+	width: 40px;
+}
+
+.comment-wwedit-wrapper.threaded > .comment-edit-form > .comment-edit-text-empty {
+	height: 1.5em;
+}
+
+.comment-wwedit-wrapper.threaded > .comment-edit-form > .comment-edit-submit-wrapper > .comment-edit-submit {
+	margin-left: 50px;
+}
+
+.comment-edit-photo {
+	margin-top: 10px;
+	margin-left: 10px;
+	margin-bottom: 10px;
+	width: 100px;
+	float: left;
+}
+
+[class^="comment-edit-bb"] {
+	display: none;
+	margin: 0px 0 -5px 0px;
+	padding: 0px;
+	width: 75%;
+}
+
+[class^="comment-edit-bb"] > li {
+	display: inline-block;
+	margin: 10px 10px 0 0;
+	visibility: none;
+}
+
+[class^="comment-edit-bb-end"] {
+	clear: both;
+}
+
+.comment-edit-text-empty, .comment-edit-text-full {
+	float: left;
+	margin-top: 10px;
+	padding: 3px 1px 1px 3px;
+	padding: 8px;
+}
+
+.comment-edit-text-empty {
+	height: 1.0em;
+	width: 270px; 
+	overflow: auto;
+	margin-bottom: 10px;
+}
+
+.comment-edit-text-full {
+	height: 150px;
+	width: 80%;
+	overflow: auto;
+}
+
+.qcomment {
+	border: 1px solid #EEE;
+	padding: 3px;
+	margin-top: 15px;
+	margin-left: 25px;
+	width: 125px;
+	overflow-y: auto;
+}
+
+.qcomment option {
+	width: 125px;
+	overflow-x: hidden;
+}
+
+.qcomment {
+	opacity: 0.3;
+	filter:alpha(opacity=30);
+}
+
+.qcomment:hover {
+	opacity: 1.0;
+	filter:alpha(opacity=100);
+}
+
+.comment-edit-text-end {
+	clear: both;
+}
+
+.comment-edit-submit {
+	margin: 10px 0px 10px 110px;
+}
+
+.comment-preview-icon {
+	margin-left: 15px;
+}
diff --git a/view/php/theme_init.php b/view/php/theme_init.php
index f49b9c043..42badc01d 100644
--- a/view/php/theme_init.php
+++ b/view/php/theme_init.php
@@ -9,6 +9,7 @@ head_add_css('library/jslider/css/jslider.css');
 head_add_css('library/prettyphoto/css/prettyPhoto.css');
 head_add_css('library/colorbox/colorbox.css');
 // head_add_css('library/font_awesome/css/font-awesome.min.css');
+head_add_css('view/css/conversation.css');
 
 head_add_js('js/jquery.js');
 head_add_js('js/jquery-migrate-1.1.1.js');
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 8251db4a2..029a15978 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -98,14 +98,6 @@ blockquote {
 	padding: 5px;
 }
 
-.hide-comments {
-	margin-left: 5px;
-}
-
-.hide-comments-outer {
-	margin-left: 10px;
-}
-
 #panel {
 	background-color: ivory;
 	position: absolute;
@@ -330,72 +322,11 @@ footer {
 	margin: 15px 0 15px 150px;
 }
 
-/* from default */
-#jot-perms-icon, 
-#profile-location,
-#profile-nolocation,
-#profile-youtube, 
-#profile-video, 
-#profile-audio,
-#profile-link,
-#profile-title,
-#profile-expires, 
-#profile-encrypt, 
-#wall-image-upload,
-#wall-file-upload,
-#profile-upload-wrapper,
-#wall-image-upload-div,
-#wall-file-upload-div,
-.hover, .focus {
-	cursor: pointer;
-}
-
-#jot-perms-icon {
-	float: left;
-}
-
-#jot-title, #jot-category, #jot-pagetitle {
-	border: 0px;
-	margin: 0px;
-	padding: 8px;
-	height: 1.8em;
-	width: 530px;
-	margin-bottom: 5px;
-	font-weight: bold;
-	border: solid 1px #ffffff;
-	border-radius: $radiuspx;
-}
-
-#jot-title::-webkit-input-placeholder{font-weight: bold;}
-#jot-category::-webkit-input-placeholder{font-weight: bold;}
-#jot-title:-moz-placeholder{font-weight: bold;}
-#jot-category:-moz-placeholder{font-weight: bold;}
-#jot-pagetitle::-webkit-input-placeholder{font-weight: bold;}
-#jot-pagetitle:-moz-placeholder{font-weight: bold;}
-		
-#jot-title:hover,
-#jot-title:focus,
-#jot-pagetitle:hover,
-#jot-pagetitle:focus,
-#jot-category:hover,
-#jot-category:focus {
-	border: 1px solid #cccccc; 
-}
-
-.jothidden { display:none; }
-
-
-
 .fakebutton {
 	margin-top: 15px;
 	margin-bottom: 15px;
 }
 
-.lockview {
-	cursor: pointer;
-}
-
-
 #group-sidebar {
 	margin-bottom: 10px;
 }
@@ -703,382 +634,43 @@ footer {
 	margin-bottom: 15px;
 }
 
-
-.thread-wrapper .wall-item-comment-wrapper, .wall-item-content-wrapper.comment {
-	margin-left: $comment_indent;
-	border-left: 2px solid #eee;
-}
-
-.wall-item-content-wrapper {
-	margin-top: 10px;
-	position: relative;
-	border-radius: $radiuspx;
-	background-color: $item_colour;
-	opacity: $item_opacity;
-}
-
 .thread-end-wrapper {
     margin-left: 50px;
 }
 
-
-.wall-item-like.comment, .wall-item-dislike.comment {
-	margin-left: 50px;
-}
-
-.wall-item-info {
-	display: block;
-	float: left;
-	width:110px;
-	margin-right:10px;
-}
-.comment .wall-item-info {
-	width: 70px;
-}
-
-.wall-item-photo-wrapper {
-	margin-top: 0px;
-	margin-left: 10px;
-	margin-bottom: 10px;
-	width: 100px;
-}
-.wall-item-photo-menu-button {
-	display: block;
-	position: absolute;
-	background-image: url("../img/photo-menu.jpg");
-	background-position: top left; 
-	background-repeat: no-repeat;
-	margin: 0px; padding: 0px;
-	width: 16px;
-	height: 16px;
-	top: $pmenu_top; left:10px;
-	overflow: hidden;
-	text-indent: 40px;
-	display: none;
-	
-}
-.wall-item-photo-menu {
-	width: auto;
-	border: 2px solid #444444;
-	background: #FFFFFF;
-	position: absolute;
-	left: 10px; 
-	top: $top_photo;
-	display: none;
-	z-index: 10000;
-}
-.wall-item-photo-menu ul { margin:0px; padding: 0px; list-style: none }
-.wall-item-photo-menu li a { display: block; padding: 2px; }
-.wall-item-photo-menu li a:hover { color: #FFFFFF; background: #3465A4; text-decoration: none; }
-
-
-.comment .wall-item-photo-menu-button {	top: $pmenu_reply;}
-.comment .wall-item-photo-menu { top: $reply_photo; }
-
-.wallwall .wwto {
-    left: 50px;
-    margin: 0;
-    position: absolute;
-    top: $wwtop;
-    width: 30px
-}
-.wallwall .wwto img {
-	width: 30px !important;
-	height: 30px !important;
-}
-
-.wallwall .wall-item-photo-end {
-	clear: both;
-}
-
-.wall-item-arrowphoto-wrapper {
-    position: absolute;
-    left: 75px;
-    top: $wwtop;
-    z-index: 99;
-}
-.wall-item-wrapper {
-    margin-left:10px;
-}
-
-.wall-item-ago .icon-ok {
-	cursor: pointer;
-	color: darkgreen;
-}
-
-.wall-item-lock {
-	font-size: 1.2em;
-    left: 105px;
-    position: absolute;
-    top: 1px;
-	color: $toolicon_colour;	
-}
-.comment .wall-item-lock {
-	left: 65px;
-}
-
-.wall-item-ago {
-	color: #777;
-	font-size: 0.8em;
-}
-
-.wall-item-location {
-	overflow: hidden;
-	/* add ellipsis on text overflow               */
-	/* this work on safari, opera, ie, chrome.     */
-	/* firefox users have to wait support or we    */
-	/* can use a jquery plugin http://bit.ly/zJskg */
-	text-overflow: ellipsis;
-	-o-text-overflow: ellipsis;
-	width: 100%;
-}
-
-
-.item-tool {
-	float: left;
-	margin-right: 8px;
-	font-size: 1.2em;
-	cursor: pointer;
-	color: $toolicon_colour; 
-}
-
-.item-tool:hover {
-	color: $toolicon_activecolour; 
-}
-
-.drop-icons.item-tool {
-	color: $toolicon_colour;
-}
-
-.like-rotator {
-	float: left;
-	margin: 8px;
-	color: $toolicon_colour;
-}
-
-.wall-item-delete-wrapper {
-	float: right;
-}
-
-.wall-item-delete-end {
-	clear: both;
-}
-
+/* might be obsolete
 .wall-item-delete-icon {
 	border: none;
 }
+*/
 
-.wall-item-wrapper-end {
-	clear: both;
-}
-
-.wall-item-photo {
-	border: none;
-	width: $top_photo !important;
-	height: $top_photo !important;
-
-}
-.comment .wall-item-photo {
-	width: $reply_photo !important; 
-	height: $reply_photo !important;
-}
-.wall-item-content {
-	margin-left: 10px;
-	overflow: auto;
-	font-size: $font_size;
-}
-
-.wall-item-content img {
-    max-width: 95% !important;
-}
-
-.wall-item-title {
-	float: left;
-	font-weight: bold;
-}
-
-.wall-item-title-end {
-	clear: both;
-}
-
-.thread-wrapper.toplevel_item {
-	width: 92%;
-	max-width: $converse_width;
-}
-
-.wall-item-body {
-	margin-top: 10px;
-}
-
-.wall-item-body.divmore {
-        padding-bottom: 15px;
-}
-
-.wall-item-tools {
-	clear: both;
-    padding: 5px 10px;
-}    
-
-.wall-item-like, .wall-item-dislike {
-	margin-top: 5px;
-}
-
-.wall-item-author {
-	margin-top: 10px;
-}
-
-.comment-edit-photo {
-	margin-top: 10px;
-	margin-left: 10px;
-	margin-bottom: 10px;
-	width: 100px;
-	float: left;
-}
-.comment-wwedit-wrapper.threaded > .comment-edit-form > .comment-edit-photo {
-	width: 40px;
-}
-
-.comment-edit-photo img {
-	width: $reply_photo;
-}
-.comment-edit-text-empty, .comment-edit-text-full {
-	float: left;
-	margin-top: 10px;
-	padding: 3px 1px 1px 3px;
-	border: 1px solid #ccc;
-	padding: 8px;
-	border-radius: $radiuspx;
-}
-
-.comment-edit-text-empty {
-	color: gray;
-	height: 1.0em;
-	width: 270px; 
-	overflow: auto;
-	margin-bottom: 10px;
-}
-
-.comment-wwedit-wrapper.threaded > .comment-edit-form > .comment-edit-text-empty {
-	height: 1.5em;
-}
-
-.comment-edit-text-full {
-	color: black;
-	height: 150px;
-	width: 80%;
-	overflow: auto;
-}
-
-
-.comment-edit-text-end {
-	clear: both;
-}
-
-.comment-edit-submit {
-	margin: 10px 0px 10px 110px;
-}
-
-.comment-wwedit-wrapper.threaded > .comment-edit-form > .comment-edit-submit-wrapper > .comment-edit-submit {
-	margin-left: 50px;
-}
-
-#profile-jot-submit-wrapper {
-	margin-top: 10px;
-	width: 90%;
-}
-
-#profile-upload-wrapper {
-	float: left;
-	margin-left: 15px;
-}
-#profile-attach-wrapper {
-	float: left;
-	margin-left: 15px;
-}
-#profile-rotator {
-	float: left;
-	margin: 8px 0px 0px 20px;
-	color: #777;
-}
-#profile-link-wrapper {
-	float: left;
-	margin-left: 15px;
-}
+/* might be obsolete
 #profile-youtube-wrapper {
 	float: left;
 	margin-left: 15px;
 }
-#profile-video-wrapper {
-	float: left;
-	margin-left: 15px;
-}
-#profile-audio-wrapper {
-	float: left;
-	margin-left: 15px;
-}
-#profile-location-wrapper {
-	float: left;
-	margin-left: 15px;
-}
-#profile-expire-wrapper {
-	float: left;
-	margin-left: 15px;
-}
-#profile-encrypt-wrapper {
-	float: left;
-	margin-left: 15px;
-}
-#jot-preview-link {
-	float: left;
-	margin-left: 45px;
-	margin-top: 0px !important;
-}
 
-#profile-nolocation-wrapper {
-	float: left;
-	margin-left: 15px;
-}
 #profile-title-wrapper {
 	float: left;
 	margin-left: 15px;
 }
 
-#profile-jot-perms {
-	float: right;
-	background-color: $toolicon_colour;
-	border: 1px solid #666;
-	border-right: none;
-	border-radius: $radiuspx 0px 0px $radiuspx;
-	padding: 6px;
-}
-
-#profile-jot-perms-end {
-	height: 30px;
-}
-
 #profile-jot-plugin-end{
   clear: both;
 }
-.profile-jot-net {
-	float: left;
-	margin-right: 10px;
-	margin-top: 5px;
-	margin-bottom: 5px;
-}
 
 #profile-jot-networks-end {
 	clear: both;
 }
 
-#profile-jot-end {
-	margin-bottom: 30px;
-}
 #about-jot-submit-wrapper {
 	margin-top: 15px;
 }
 #about-jot-end {
 	margin-bottom: 30px;
 }
+*/
+
 #contacts-main {
 	margin-bottom: 30px;
 }
@@ -1277,6 +869,8 @@ div.dirtagblock.widget {
 
 /* TinyMCE */
 
+/* TODO: this should, if needed at all, probably go to custom_tinymce.css
+
 DIV#profile-jot-text_toolbargroup{
 background: #FFF;
 border: 1px #111;
@@ -1290,43 +884,9 @@ box-shadow: 5px 5px 5px #000 inset !important;}
 tr.mceLast {
 
 }
+*/
 
-/* Not MCE */
-
-#profile-jot-text {
-	height: 1.8em;
-	color:#000;
-	border: 1px solid #cccccc;
-	padding: 8px;
-	margin-right: 0px;
-	width: 90%;
-	-moz-border-radius: $radiuspx;
-	border-radius: $radiuspx;	
-}
-
-#profile-jot-text::-moz-placeholder {
-	font-size:1.5em;
-}
-
-#profile-jot-text:focus::-moz-placeholder {
-	color: transparent;
-}
-
-#profile-jot-text::-webkit-input-placeholder {
-	font-size:1.5em;
-}
-
-#profile-jot-text:focus::-webkit-input-placeholder {
-	color: transparent;
-}
-
-#profile-jot-text-loading {
-	float: left;
-	margin: 14px 0px 0px 12px;
-	color: #777;
-}
-
-.wall-item-photo, .photo, .contact-block-img, .my-comment-photo {
+.photo, .contact-block-img {
     border-radius: $radiuspx;
     -moz-border-radius: $radiuspx;
     box-shadow: $shadowpx $shadowpx $shadowpx 0 #444444;
@@ -1376,30 +936,6 @@ tr.mceLast {
     box-shadow: 4px 4px 3px 0 #444444;
 }
 
-#profile-jot-submit {
-	height: 30px;
-	width: 70px;
-	background: linear-gradient(top, #0080ff 0%, #0080aa);
-	background: -webkit-linear-gradient(top, #0080ff 0%, #0080aa);
-	background: -moz-linear-gradient(top, #0080ff 0%, #0080aa);
-	background: -o-linear-gradient(top, #0080ff 0%, #0080aa);
-	background: -ms-linear-gradient(top, #0080ff 0%, #0080aa);
-	color: #fff;
-	font-weight: bold;
-	border-radius: 0px $radiuspx $radiuspx 0px;
-	float: right;
-	text-shadow: 1px 1px #111;
-	cursor: pointer;
-}
-
-#profile-jot-submit:hover {
-	background: linear-gradient(top, #0080aa 0%, #0080ff);
-	background: -webkit-linear-gradient(top, #0080aa 0%, #0080ff);
-	background: -moz-linear-gradient(top, #0080aa 0%, #0080ff);
-	background: -o-linear-gradient(top, #0080aa 0%, #0080ff);
-	background: -ms-linear-gradient(top, #0080aa 0%, #0080ff);
-}
-
 #sidebar-page-list .label {
     margin-left: 5px;
 }
@@ -1742,11 +1278,6 @@ a.mail-list-link {
 
 }
 
-#profile-jot-wrapper {
-	margin-top: 25px;
-}
-
-
 #settings-default-perms-menu {
 	margin-top: 15px;
 	margin-bottom: 15px;
@@ -2245,32 +1776,21 @@ a.mail-list-link {
 	margin-top: 10px;
 }
 
-.posttags a, .body-tag, .filesavetags, .categorytags {
+/* might be obsolete
+.posttags {
 	opacity: 0.5;
 	filter:alpha(opacity=50);
 }
 
-.posttags a:hover, .body-tag:hover, .filesavetags:hover, .categorytags:hover {
+.posttags {
 	opacity: 1.0 !important;
 	filter:alpha(opacity=100) !important;
 }
 
-.posttags, .body-tag {
+.posttags {
 	margin-top: 15px;
 }
-
-.item-select {
-	opacity: 0.1;
-	filter:alpha(opacity=10);
-	float: right;
-	margin-right: 10px;
-
-}
-.item-select:hover, .checkeditem {
-	opacity: 1;
-	filter:alpha(opacity=100);
-}
-
+*/
 
 #item-delete-selected {
 	margin-top: 30px;
@@ -2456,10 +1976,6 @@ brain is weird like that */
 /*	visibility: visible; */
 }
 
-.wall-item-ago i {
-	font-size: 0.6em;
-}
-
 .icon {
 	display: block; width: 16px; height: 16px;
 	background-image: url('../../../../images/icons.png');
@@ -2508,21 +2024,7 @@ brain is weird like that */
 
 .icon.dim { opacity: 0.3;filter:alpha(opacity=30); }
 
-[class^="comment-edit-bb"] {
-	list-style: none;
-	display: none;
-	margin: 0px 0 -5px 0px;
-	padding: 0px;
-	width: 75%;
-}
-[class^="comment-edit-bb"] > li {
-	display: inline-block;
-	margin: 10px 10px 0 0;
-	visibility: none;
-}
-[class^="comment-edit-bb-end"] {
-	clear: both;
-}
+
 
 .body-attach {
 	margin-top: 10px;
@@ -2569,29 +2071,6 @@ div.jGrowl div.info {
 	top: 15px;
 	right: 15px;
 }
-.qcomment {
-	border: 1px solid #EEE;
-	padding: 3px;
-	margin-top: 15px;
-	margin-left: 25px;
-	width: 125px;
-	overflow-y: auto;
-}
-
-
-.qcomment option {
-	width: 125px;
-	overflow-x: hidden;
-}
-
-.qcomment {
-	opacity: 0.3;
-	filter:alpha(opacity=30);
-}
-.qcomment:hover {
-	opacity: 1.0;
-	filter:alpha(opacity=100);
-}
 
 
 #id_term_label {
@@ -3160,22 +2639,11 @@ margin-right: 50px;
 	margin-left: -20px;
 }
 
-.comment-icon,
-.admin-icons,
-.jot-icons {
+.admin-icons {
 	font-size: 1.2em;
 	color: $toolicon_colour;
 }
 
-.comment-preview-icon {
-	margin-left: 15px;
-}
-
-.comment-icon:hover,
-.jot-icons:hover {
-	color: $toolicon_activecolour; 
-}
-
 .nav-icon {
 	font-size: 1.4em;
 	margin-right: 15px;
@@ -3244,3 +2712,270 @@ img.mail-list-sender-photo {
 	-moz-border-radius: $radiuspx;
 	border-radius: $radiuspx;
 }
+
+/* jot */
+
+#jot-title,
+#jot-category,
+#jot-pagetitle {
+	font-weight: bold;
+	border: solid 1px #ffffff;
+	border-radius: $radiuspx;
+}
+
+#jot-category::-webkit-input-placeholder {
+	font-weight: bold;
+}
+
+#jot-category:-moz-placeholder {
+	font-weight: bold;
+}
+
+#jot-title::-webkit-input-placeholder {
+	font-weight: bold;
+}
+
+#jot-title:-moz-placeholder {
+	font-weight: bold;
+}
+
+#jot-pagetitle::-webkit-input-placeholder {
+	font-weight: bold;
+}
+
+#jot-pagetitle:-moz-placeholder {
+	font-weight: bold;
+}
+
+#jot-title:hover,
+#jot-title:focus,
+#jot-pagetitle:hover,
+#jot-pagetitle:focus,
+#jot-category:hover,
+#jot-category:focus {
+	border: 1px solid #cccccc;
+}
+
+#profile-jot-text {
+	color:#000;
+	border: 1px solid #cccccc;
+	-moz-border-radius: $radiuspx;
+	border-radius: $radiuspx;
+}
+
+#profile-jot-text::-webkit-input-placeholder {
+	font-size:1.5em;
+}
+
+#profile-jot-text::-moz-placeholder {
+	font-size:1.5em;
+}
+
+#profile-jot-text:focus::-webkit-input-placeholder {
+	color: transparent;
+}
+
+#profile-jot-text:focus::-moz-placeholder {
+	color: transparent;
+}
+
+#profile-jot-text-loading {
+	color: #777;
+}
+
+#profile-jot-submit {
+	background: linear-gradient(top, #0080ff 0%, #0080aa);
+	background: -webkit-linear-gradient(top, #0080ff 0%, #0080aa);
+	background: -moz-linear-gradient(top, #0080ff 0%, #0080aa);
+	background: -o-linear-gradient(top, #0080ff 0%, #0080aa);
+	background: -ms-linear-gradient(top, #0080ff 0%, #0080aa);
+	color: #fff;
+	font-weight: bold;
+	border-radius: 0px $radiuspx $radiuspx 0px;
+	text-shadow: 1px 1px #111;
+	cursor: pointer;
+}
+
+#profile-jot-submit:hover {
+	background: linear-gradient(top, #0080aa 0%, #0080ff);
+	background: -webkit-linear-gradient(top, #0080aa 0%, #0080ff);
+	background: -moz-linear-gradient(top, #0080aa 0%, #0080ff);
+	background: -o-linear-gradient(top, #0080aa 0%, #0080ff);
+	background: -ms-linear-gradient(top, #0080aa 0%, #0080ff);
+}
+
+#profile-jot-perms {
+	background-color: $toolicon_colour;
+	border: 1px solid #666;
+	border-right: none;
+	border-radius: $radiuspx 0px 0px $radiuspx;
+}
+
+#profile-rotator {
+	color: #777;
+}
+
+.jot-icons {
+	font-size: 1.2em;
+	color: $toolicon_colour;
+}
+
+.jot-icons:hover {
+	color: $toolicon_activecolour;
+}
+
+/* conversation */
+
+.thread-wrapper .wall-item-comment-wrapper,
+.wall-item-content-wrapper.comment {
+	margin-left: $comment_indent;
+	border-left: 2px solid #eee;
+}
+
+.thread-wrapper .toplevel_item {
+	max-width: $converse_width;
+}
+
+/* conv_item */
+
+.wall-item-content-wrapper {
+	border-radius: $radiuspx;
+	background-color: $item_colour;
+	opacity: $item_opacity;
+}
+
+.wallwall .wwto {
+	top: $wwtop;
+}
+
+.wall-item-photo-menu-button {
+	background-image: url("../img/photo-menu.jpg");
+	background-position: top left;
+	background-repeat: no-repeat;
+	top: $pmenu_top;
+}
+
+.wall-item-photo-menu {
+	border: 2px solid #444444;
+	background: #FFFFFF;
+	top: $top_photo;
+}
+
+.wall-item-photo-menu ul {
+	list-style: none
+}
+
+.wall-item-photo-menu li a:hover {
+	color: #FFFFFF;
+	background: #3465A4;
+	text-decoration: none;
+}
+
+.comment .wall-item-photo-menu-button {
+	top: $pmenu_reply;
+}
+
+.comment .wall-item-photo-menu {
+	top: $reply_photo;
+}
+
+.wall-item-photo {
+	border: none;
+	width: $top_photo !important;
+	height: $top_photo !important;
+
+}
+
+.comment .wall-item-photo {
+	width: $reply_photo !important;
+	height: $reply_photo !important;
+}
+
+.wall-item-photo {
+    border-radius: $radiuspx;
+    -moz-border-radius: $radiuspx;
+    box-shadow: $shadowpx $shadowpx $shadowpx 0 #444444;
+}
+
+.wall-item-arrowphoto-wrapper {
+	top: $wwtop;
+}
+
+.wall-item-lock {
+	font-size: 1.2em;
+	color: $toolicon_colour;
+}
+
+.wall-item-ago .icon-ok {
+	color: darkgreen;
+}
+
+
+.wall-item-ago {
+	color: #777;
+	font-size: 0.8em;
+}
+
+.wall-item-ago i {
+	font-size: 0.6em;
+}
+
+.wall-item-content {
+	font-size: $font_size;
+}
+
+.item-tool {
+	font-size: 1.2em;
+	color: $toolicon_colour;
+}
+
+.item-tool:hover {
+	color: $toolicon_activecolour;
+}
+
+.drop-icons.item-tool {
+	color: $toolicon_colour;
+}
+
+.like-rotator {
+	color: $toolicon_colour;
+}
+
+/* comment_item */
+
+.my-comment-photo {
+    border-radius: $radiuspx;
+    -moz-border-radius: $radiuspx;
+    box-shadow: $shadowpx $shadowpx $shadowpx 0 #444444;
+}
+
+.comment-edit-photo img {
+	width: $reply_photo;
+}
+
+[class^="comment-edit-bb"] {
+	list-style: none;
+}
+
+.comment-icon {
+	font-size: 1.2em;
+	color: $toolicon_colour;
+}
+
+.comment-icon:hover {
+	color: $toolicon_activecolour;
+}
+
+.comment-edit-text-empty,
+.comment-edit-text-full {
+	border: 1px solid #ccc;
+	border-radius: $radiuspx;
+}
+
+.comment-edit-text-empty {
+	color: gray;
+}
+
+.comment-edit-text-full {
+	color: black;
+}
-- 
cgit v1.2.3


From 307fcac86d8b6627389bdfaae048bcb24e146c72 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Wed, 4 Dec 2013 17:36:53 -0800
Subject: more icon updates

---
 view/theme/redbasic/css/style.css  | 20 ++++++++++----------
 view/theme/redbasic/js/redbasic.js | 10 +++++-----
 view/tpl/conv_frame.tpl            |  9 ---------
 view/tpl/conversation.tpl          |  8 --------
 view/tpl/event.tpl                 |  4 ++--
 view/tpl/group_drop.tpl            |  4 ++--
 view/tpl/group_side.tpl            |  2 +-
 view/tpl/install_checks.tpl        |  2 +-
 view/tpl/lang_selector.tpl         |  2 +-
 view/tpl/profile_vcard.tpl         |  2 +-
 view/tpl/threaded_conversation.tpl |  8 --------
 11 files changed, 23 insertions(+), 48 deletions(-)

(limited to 'view')

diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 029a15978..36e147502 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -458,6 +458,14 @@ footer {
 	clear: both;
 }
 
+.vcard-profile-edit-icon {
+	font-size: 1.2em;
+}
+.vcard-profile-edit-icon:hover {
+	text-decoration: none;
+}
+
+
 #profile-extra-links {
 	clear: both;
 	margin-top: 10px;
@@ -589,11 +597,6 @@ footer {
 	margin-bottom: 10px;
 }
 
-.contact-entry-direction-icon {
-	margin-top: 24px;
-	margin-right: 2px;
-}
-
 .contact-entry-photo img {
 	border: none;
 }
@@ -638,11 +641,7 @@ footer {
     margin-left: 50px;
 }
 
-/* might be obsolete
-.wall-item-delete-icon {
-	border: none;
-}
-*/
+
 
 /* might be obsolete
 #profile-youtube-wrapper {
@@ -2697,6 +2696,7 @@ text-decoration: none;
 	list-style-type: none;
 }
 
+.group-edit-icon,
 .savedsearchdrop {
 	opacity: 0;
 }
diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js
index e40a94fcc..12ff2c6fe 100644
--- a/view/theme/redbasic/js/redbasic.js
+++ b/view/theme/redbasic/js/redbasic.js
@@ -20,19 +20,19 @@ $(document).ready(function() {
 
 $('.group-edit-icon').hover(
 	function() {
-		$(this).addClass('icon'); $(this).removeClass('iconspacer');},
+		$(this).css('opacity','1.0');},
 	function() {
-		$(this).removeClass('icon'); $(this).addClass('iconspacer');}
-	);
+		$(this).css('opacity','0');}
+);
 
 $('.sidebar-group-element').hover(
 	function() {
 		id = $(this).attr('id');
-		$('#edit-' + id).addClass('icon'); $('#edit-' + id).removeClass('iconspacer');},
+		$('#edit-' + id).css('opacity','1.0');},
 
 	function() {
 		id = $(this).attr('id');
-		$('#edit-' + id).removeClass('icon');$('#edit-' + id).addClass('iconspacer');}
+		$('#edit-' + id).css('opacity','0');}
 	);
 
 
diff --git a/view/tpl/conv_frame.tpl b/view/tpl/conv_frame.tpl
index 596246708..aa7b55e9b 100755
--- a/view/tpl/conv_frame.tpl
+++ b/view/tpl/conv_frame.tpl
@@ -1,14 +1,5 @@
 <div id="threads-begin"></div>
 <div id="threads-end"></div>
 <div id="conversation-end"></div>
-
-{{if $dropping}}
-<div id="item-delete-selected" class="fakelink" onclick="deleteCheckedItems();">
-  <div id="item-delete-selected-icon" class="icon drophide" title="{{$dropping}}" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></div>
-  <div id="item-delete-selected-desc" >{{$dropping}}</div>
-</div>
-<div id="item-delete-selected-end"></div>
-{{/if}}
-
 <div id="page-spinner"></div>
 
diff --git a/view/tpl/conversation.tpl b/view/tpl/conversation.tpl
index 8948fd474..97d64327a 100755
--- a/view/tpl/conversation.tpl
+++ b/view/tpl/conversation.tpl
@@ -18,11 +18,3 @@
 {{/foreach}}
 <div id="threads-end"></div>
 <div id="conversation-end"></div>
-
-{{if $dropping}}
-<div id="item-delete-selected" class="fakelink" onclick="deleteCheckedItems();">
-  <div id="item-delete-selected-icon" class="icon drophide" title="{{$dropping}}" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></div>
-  <div id="item-delete-selected-desc" >{{$dropping}}</div>
-</div>
-<div id="item-delete-selected-end"></div>
-{{/if}}
diff --git a/view/tpl/event.tpl b/view/tpl/event.tpl
index 58a19eb76..e0977e262 100755
--- a/view/tpl/event.tpl
+++ b/view/tpl/event.tpl
@@ -3,8 +3,8 @@
 	
 	{{if $event.item.author.xchan_name}}<a href="{{$event.item.author.xchan_url}}" ><img src="{{$event.item.author.xchan_photo_s}}" height="32" width="32" />{{$event.item.author.xchan_name}}</a>{{/if}}
 	{{$event.html}}
-	{{if $event.item.plink}}<a href="{{$event.plink.0}}" title="{{$event.plink.1}}"  class="plink-event-link icon s22 remote-link"></a>{{/if}}
-	{{if $event.edit}}<a href="{{$event.edit.0}}" title="{{$event.edit.1}}" class="edit-event-link icon s22 pencil"></a>{{/if}}
+	{{if $event.item.plink}}<a href="{{$event.plink.0}}" title="{{$event.plink.1}}"  class="plink-event-link"><i class="icon-external-link" ></i></a>{{/if}}
+	{{if $event.edit}}<a href="{{$event.edit.0}}" title="{{$event.edit.1}}" class="edit-event-link"><i class="icon-pencil"></i></a>{{/if}}
 	</div>
 	<div class="clear"></div>
 {{/foreach}}
diff --git a/view/tpl/group_drop.tpl b/view/tpl/group_drop.tpl
index 670136db7..8cc9ab324 100755
--- a/view/tpl/group_drop.tpl
+++ b/view/tpl/group_drop.tpl
@@ -2,8 +2,8 @@
 	<a href="group/drop/{{$id}}?t={{$form_security_token}}" 
 		onclick="return confirmDelete();" 
 		id="group-delete-icon-{{$id}}" 
-		class="icon drophide group-delete-icon" 
+		class="group-delete-icon" 
 		onmouseover="imgbright(this);" 
-		onmouseout="imgdull(this);" ></a>
+		onmouseout="imgdull(this);" ><i class="icon-remove drop-icons"></i></a>
 </div>
 <div class="group-delete-end"></div>
diff --git a/view/tpl/group_side.tpl b/view/tpl/group_side.tpl
index d2d8a77e2..a0ed7a82d 100755
--- a/view/tpl/group_side.tpl
+++ b/view/tpl/group_side.tpl
@@ -13,7 +13,7 @@
 					/>
 				{{/if}}			
 				{{if $group.edit}}
-					<a class="groupsideedit" href="{{$group.edit.href}}" title="{{$edittext}}"><span id="edit-sidebar-group-element-{{$group.id}}" class="group-edit-icon iconspacer small-pencil"></span></a>
+					<a class="groupsideedit" href="{{$group.edit.href}}" title="{{$edittext}}"><i id="edit-sidebar-group-element-{{$group.id}}" class="group-edit-icon iconspacer icon-pencil"></i></a>
 				{{/if}}
 				<a id="sidebar-group-element-{{$group.id}}" class="sidebar-group-element {{if $group.selected}}group-selected{{/if}}" href="{{$group.href}}">{{$group.text}}</a>
 			</li>
diff --git a/view/tpl/install_checks.tpl b/view/tpl/install_checks.tpl
index 2068df916..2f773f746 100755
--- a/view/tpl/install_checks.tpl
+++ b/view/tpl/install_checks.tpl
@@ -3,7 +3,7 @@
 <form  action="{{$baseurl}}/index.php?q=setup" method="post">
 <table>
 {{foreach $checks as $check}}
-	<tr><td>{{$check.title}} </td><td><span class="icon s22 {{if $check.status}}on{{else}}{{if $check.required}}off{{else}}yellow{{/if}}{{/if}}"></td><td>{{if $check.required}}(required){{/if}}</td></tr>
+	<tr><td>{{$check.title}} </td><td><i class="{{if $check.status}}icon-check{{else}}{{if $check.required}}icon-check-empty{{else}}icon-exclamation{{/if}}{{/if}}"></i></td><td>{{if $check.required}}(required){{/if}}</td></tr>
 	{{if $check.help}}
 	<tr><td colspan="3"><blockquote>{{$check.help}}</blockquote></td></tr>
 	{{/if}}
diff --git a/view/tpl/lang_selector.tpl b/view/tpl/lang_selector.tpl
index 945cbf51e..159eeea7e 100755
--- a/view/tpl/lang_selector.tpl
+++ b/view/tpl/lang_selector.tpl
@@ -1,4 +1,4 @@
-<div id="lang-select-icon" class="icon s22 language" title="{{$title}}" onclick="openClose('language-selector');" ></div>
+<div id="lang-select-icon" title="{{$title}}" onclick="openClose('language-selector');" ><i class="icon-flag"></i></div>
 <div id="language-selector" style="display: none;" >
 	<form action="#" method="post" >
 		<select name="system_language" onchange="this.form.submit();" >
diff --git a/view/tpl/profile_vcard.tpl b/view/tpl/profile_vcard.tpl
index 31f601d86..aaee02ab5 100755
--- a/view/tpl/profile_vcard.tpl
+++ b/view/tpl/profile_vcard.tpl
@@ -2,7 +2,7 @@
 
 	{{if $profile.edit}}
 	<div class="action">
-	<a class="profile-edit-side-link icon edit" rel="#profiles-menu" title="{{$profile.edit.3}}" href="#" ><span>{{$profile.edit.1}}</span></a>
+	<a class="profile-edit-side-link" rel="#profiles-menu" title="{{$profile.edit.3}}" href="#" ><i class="icon-pencil vcard-profile-edit-icon" title="{{$profile.edit.1}}" ></i></a>
 	<ul id="profiles-menu" class="menu-popup">
 		{{foreach $profile.menu.entries as $e}}
 		<li>
diff --git a/view/tpl/threaded_conversation.tpl b/view/tpl/threaded_conversation.tpl
index 2d71f01ab..ea5c3c281 100755
--- a/view/tpl/threaded_conversation.tpl
+++ b/view/tpl/threaded_conversation.tpl
@@ -6,11 +6,3 @@
 {{/foreach}}
 
 <div id="conversation-end"></div>
-
-{{if $dropping}}
-<div id="item-delete-selected" class="fakelink" onclick="deleteCheckedItems();">
-  <div id="item-delete-selected-icon" class="icon drophide" title="{{$dropping}}" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></div>
-  <div id="item-delete-selected-desc" >{{$dropping}}</div>
-</div>
-<div id="item-delete-selected-end"></div>
-{{/if}}
-- 
cgit v1.2.3


From 3bcb76b01c14665b17ddae9185a01396e327dbb4 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Wed, 4 Dec 2013 19:11:46 -0800
Subject: more icon work

---
 view/tpl/conv_item.tpl      | 2 +-
 view/tpl/group_drop.tpl     | 4 +---
 view/tpl/profile_edlink.tpl | 2 --
 view/tpl/search_item.tpl    | 2 +-
 view/tpl/settings_oauth.tpl | 4 ++--
 5 files changed, 5 insertions(+), 9 deletions(-)
 delete mode 100755 view/tpl/profile_edlink.tpl

(limited to 'view')

diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl
index 781746b4b..fb36f5dca 100755
--- a/view/tpl/conv_item.tpl
+++ b/view/tpl/conv_item.tpl
@@ -89,7 +89,7 @@
 			<div id="like-rotator-{{$item.id}}" class="like-rotator"></div>
 
 			<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-{{$item.id}}" >
-				{{if $item.drop.dropping}}<a href="item/drop/{{$item.id}}" onclick="return confirmDelete();" title="{{$item.drop.delete}}" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ><i class="icon-remove drop-icons item-tool"></i></a>{{/if}}
+				{{if $item.drop.dropping}}<a href="item/drop/{{$item.id}}" onclick="return confirmDelete();" title="{{$item.drop.delete}}" ><i class="icon-remove drop-icons item-tool"></i></a>{{/if}}
 			</div>
 				{{if $item.drop.pagedrop}}<input type="checkbox" onclick="checkboxhighlight(this);" title="{{$item.drop.select}}" class="item-select" name="itemselected[]" value="{{$item.id}}" />{{/if}}
 			<div class="wall-item-delete-end"></div>
diff --git a/view/tpl/group_drop.tpl b/view/tpl/group_drop.tpl
index 8cc9ab324..850e7101f 100755
--- a/view/tpl/group_drop.tpl
+++ b/view/tpl/group_drop.tpl
@@ -2,8 +2,6 @@
 	<a href="group/drop/{{$id}}?t={{$form_security_token}}" 
 		onclick="return confirmDelete();" 
 		id="group-delete-icon-{{$id}}" 
-		class="group-delete-icon" 
-		onmouseover="imgbright(this);" 
-		onmouseout="imgdull(this);" ><i class="icon-remove drop-icons"></i></a>
+		class="group-delete-icon" ><i class="icon-remove drop-icons"></i></a>
 </div>
 <div class="group-delete-end"></div>
diff --git a/view/tpl/profile_edlink.tpl b/view/tpl/profile_edlink.tpl
deleted file mode 100755
index 247bfaace..000000000
--- a/view/tpl/profile_edlink.tpl
+++ /dev/null
@@ -1,2 +0,0 @@
-<div class="profile-edit-side-div"><a class="profile-edit-side-link icon edit" title="{{$editprofile}}" href="profiles/{{$profid}}" ></a></div>
-<div class="clear"></div>
diff --git a/view/tpl/search_item.tpl b/view/tpl/search_item.tpl
index 853bbfdcd..3018fc747 100755
--- a/view/tpl/search_item.tpl
+++ b/view/tpl/search_item.tpl
@@ -39,7 +39,7 @@
 		</div>
 		<div class="wall-item-tools" id="wall-item-tools-{{$item.id}}">
 			<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-{{$item.id}}" >
-				{{if $item.drop.dropping}}<a href="item/drop/{{$item.id}}" onclick="return confirmDelete();" class="icon drophide" title="{{$item.drop.delete}}" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{/if}}
+				{{if $item.drop.dropping}}<a href="item/drop/{{$item.id}}" onclick="return confirmDelete();" title="{{$item.drop.delete}}" ><i class="icon-remove drop-icons item-tool"></i></a>{{/if}}
 			</div>
 				{{if $item.drop.pagedropping}}<input type="checkbox" onclick="checkboxhighlight(this);" title="{{$item.drop.select}}" class="item-select" name="itemselected[]" value="{{$item.id}}" />{{/if}}
 			<div class="wall-item-delete-end"></div>
diff --git a/view/tpl/settings_oauth.tpl b/view/tpl/settings_oauth.tpl
index fa1d0946f..8b76e9eec 100755
--- a/view/tpl/settings_oauth.tpl
+++ b/view/tpl/settings_oauth.tpl
@@ -23,8 +23,8 @@
 			{{/if}}
 		{{/if}}
 		{{if $app.my}}
-		<a href="{{$baseurl}}/settings/oauth/edit/{{$app.client_id}}" class="icon s22 edit" title="{{$edit}}">&nbsp;</a>
-		<a href="{{$baseurl}}/settings/oauth/delete/{{$app.client_id}}?t={{$form_security_token}}" class="icon s22 delete" title="{{$delete}}">&nbsp;</a>
+		<a href="{{$baseurl}}/settings/oauth/edit/{{$app.client_id}}" title="{{$edit}}"><i class="icon-pencil"></i></a>
+		<a href="{{$baseurl}}/settings/oauth/delete/{{$app.client_id}}?t={{$form_security_token}}" title="{{$delete}}"><i class="icon-remove"></i></a>
 		{{/if}}		
 	</div>
 	{{/foreach}}
-- 
cgit v1.2.3


From cc1e906825dd30f74d0a30190a7dd2a26d6b1642 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Wed, 4 Dec 2013 23:54:46 -0800
Subject: generate a small amount of entropy to avoid duplicate notifications
 from essentially simultaneous deliveries.

---
 view/theme/redbasic/js/redbasic.js | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'view')

diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js
index 12ff2c6fe..e89c51119 100644
--- a/view/theme/redbasic/js/redbasic.js
+++ b/view/theme/redbasic/js/redbasic.js
@@ -16,6 +16,10 @@ function cmtBbClose(comment, id) {
 	return false;
 }
 
+//document.jotpermslock = 'icon-lock';
+//document.jotpermsunlock = 'icon-unlock';
+
+
 $(document).ready(function() {
 
 $('.group-edit-icon').hover(
-- 
cgit v1.2.3


From b3f622022608567334406475b190b315815361b3 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Thu, 5 Dec 2013 19:23:30 -0800
Subject: make some "selection-is-selected" classes work again

---
 view/theme/redbasic/css/style.css | 2 +-
 view/tpl/saved_searches_aside.tpl | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'view')

diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 36e147502..0ddbe1b86 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -331,7 +331,7 @@ footer {
 	margin-bottom: 10px;
 }
 
-.group-selected, .nets-selected, .fileas-selected, .categories-selected, .active {
+.group-selected, .nets-selected, .fileas-selected, .categories-selected, .search-selected, .active {
 	color: #444444 !important;
 }
 
diff --git a/view/tpl/saved_searches_aside.tpl b/view/tpl/saved_searches_aside.tpl
index ea336f969..615eca39d 100755
--- a/view/tpl/saved_searches_aside.tpl
+++ b/view/tpl/saved_searches_aside.tpl
@@ -6,7 +6,7 @@
 		{{foreach $saved as $search}}
 		<li id="search-term-{{$search.id}}" class="saved-search-li clear">
 			<a title="{{$search.delete}}" onclick="return confirmDelete();" id="drop-saved-search-term-{{$search.id}}" href="network/?f=&amp;remove=1&amp;search={{$search.encodedterm}}"><i id="dropicon-saved-search-term-{{$search.id}}" class="icon-remove drop-icons iconspacer savedsearchdrop" ></i></a>
-			<a id="saved-search-term-{{$search.id}}" class="savedsearchterm" href="network/?f=&amp;search={{$search.encodedterm}}">{{$search.displayterm}}</a>
+			<a id="saved-search-term-{{$search.id}}" class="savedsearchterm{{if $search.selected}} search-selected{{/if}}" href="network/?f=&amp;search={{$search.encodedterm}}">{{$search.displayterm}}</a>
 		</li>
 		{{/foreach}}
 	</ul>
-- 
cgit v1.2.3


From 1aa79d9ee69bbb7afb2c9b87579aad252ef66730 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Fri, 6 Dec 2013 00:02:39 -0800
Subject: some code cleanup - gad I forgot what a mess the "other"
 notifications tabs (everything but system) were in. Maybe I'll just remove
 them so we can start over.

---
 view/tpl/settings.tpl | 20 --------------------
 1 file changed, 20 deletions(-)

(limited to 'view')

diff --git a/view/tpl/settings.tpl b/view/tpl/settings.tpl
index 8781304c1..7b6add231 100755
--- a/view/tpl/settings.tpl
+++ b/view/tpl/settings.tpl
@@ -52,26 +52,6 @@
 
 {{include file="field_input.tpl" field=$cntunkmail}}
 
-
-{{if $expireisfixed}}
-{{* Remove above line when expire is working *}}
-{{include file="field_input.tpl" field=$expire.days}}
-
-
-<div class="field input">
-	<span class="field_help"><a href="#advanced-expire-popup" id="advanced-expire" class='popupbox' title="{{$expire.advanced}}">{{$expire.label}}</a></span>
-	<div style="display: none;">
-		<div id="advanced-expire-popup" style="width:auto;height:auto;overflow:auto;">
-			<h3>{{$expire.advanced}}</h3>
-			{{include file="field_yesno.tpl" field=$expire.items}}
-			{{include file="field_yesno.tpl" field=$expire.starred}}
-			{{include file="field_yesno.tpl" field=$expire.network_only}}
-		</div>
-	</div>
-
-</div>
-{{/if}}
-
 <div id="settings-default-perms" class="settings-default-perms" >
 	<a href="#profile-jot-acl-wrapper" id="settings-default-perms-menu" >{{$permissions}} {{$permdesc}}</a>
 	<div id="settings-default-perms-menu-end"></div>
-- 
cgit v1.2.3


From 8df66b8365dd280a8460e409bfe4bd682b308ec6 Mon Sep 17 00:00:00 2001
From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Fri, 6 Dec 2013 09:08:10 +0100
Subject: DE: update to the strings

---
 view/de/messages.po | 191 ++++++++++++++++++++++++++--------------------------
 view/de/strings.php | 186 +++++++++++++++++++++++++-------------------------
 2 files changed, 189 insertions(+), 188 deletions(-)

(limited to 'view')

diff --git a/view/de/messages.po b/view/de/messages.po
index d8365eccd..2221d039d 100644
--- a/view/de/messages.po
+++ b/view/de/messages.po
@@ -14,13 +14,14 @@
 # Fraengii <frank@lumina-verte.org>, 2013
 # Oliver <post@toktan.org>, 2013
 # bavatar <tobias.diekershoff@gmx.net>, 2013
+# zottel <transifex@zottel.net>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: Red Matrix\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2013-11-29 00:03-0800\n"
-"PO-Revision-Date: 2013-12-02 08:10+0000\n"
-"Last-Translator: bavatar <tobias.diekershoff@gmx.net>\n"
+"PO-Revision-Date: 2013-12-05 18:04+0000\n"
+"Last-Translator: zottel <transifex@zottel.net>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/red-matrix/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -69,7 +70,7 @@ msgstr "Red Matrix Benachrichtigung"
 
 #: ../../include/enotify.php:37
 msgid "redmatrix"
-msgstr ""
+msgstr "redmatrix"
 
 #: ../../include/enotify.php:39
 msgid "Thank You,"
@@ -112,17 +113,17 @@ msgstr "Bitte besuche %s, um die private Nachricht anzusehen und/oder darauf zu
 #: ../../include/enotify.php:135
 #, php-format
 msgid "%1$s, %2$s commented on [zrl=%3$s]a %4$s[/zrl]"
-msgstr ""
+msgstr "%1$s, %2$s hat [zrl=%3$s]a %4$s[/zrl] kommentiert"
 
 #: ../../include/enotify.php:143
 #, php-format
 msgid "%1$s, %2$s commented on [zrl=%3$s]%4$s's %5$s[/zrl]"
-msgstr ""
+msgstr "%1$s, %2$s hat [zrl=%3$s]%4$ss %5$s[/zrl] kommentiert"
 
 #: ../../include/enotify.php:152
 #, php-format
 msgid "%1$s, %2$s commented on [zrl=%3$s]your %4$s[/zrl]"
-msgstr ""
+msgstr "%1$s, %2$s hat [zrl=%3$s]deinen %4$s[/zrl] kommentiert"
 
 #: ../../include/enotify.php:163
 #, php-format
@@ -132,7 +133,7 @@ msgstr "[Red:Notify] Kommentar in Unterhaltung #%1$d von %2$s"
 #: ../../include/enotify.php:164
 #, php-format
 msgid "%1$s, %2$s commented on an item/conversation you have been following."
-msgstr ""
+msgstr "%1$s, %2$s hat ein Thema kommentiert, dem du folgst."
 
 #: ../../include/enotify.php:167 ../../include/enotify.php:186
 #: ../../include/enotify.php:212 ../../include/enotify.php:231
@@ -149,12 +150,12 @@ msgstr "[Red:Hinweis] %s schrieb auf Deine Pinnwand"
 #: ../../include/enotify.php:176
 #, php-format
 msgid "%1$s, %2$s posted to your profile wall at %3$s"
-msgstr ""
+msgstr "%1$s, %2$s hat auf deine Pinnwand auf %3$s geschrieben"
 
 #: ../../include/enotify.php:178
 #, php-format
 msgid "%1$s, %2$s posted to [zrl=%3$s]your wall[/zrl]"
-msgstr ""
+msgstr "%1$s, %2$s hat auf [zrl=%3$s]deine Pinnwand[/zrl] geschrieben"
 
 #: ../../include/enotify.php:205
 #, php-format
@@ -169,7 +170,7 @@ msgstr "%1$s, %2$s hat dich auf %3$s getaggt"
 #: ../../include/enotify.php:207
 #, php-format
 msgid "%1$s, %2$s [zrl=%3$s]tagged you[/zrl]."
-msgstr ""
+msgstr "%1$s, %2$s [zrl=%3$s]hat dich erwähnt[/zrl]."
 
 #: ../../include/enotify.php:220
 #, php-format
@@ -184,7 +185,7 @@ msgstr "%1$s, %2$s hat dich auf %3$s angestubst"
 #: ../../include/enotify.php:222
 #, php-format
 msgid "%1$s, %2$s [zrl=%2$s]poked you[/zrl]."
-msgstr ""
+msgstr "%1$s, %2$s [zrl=%2$s]hat dich angestupst[/zrl]."
 
 #: ../../include/enotify.php:238
 #, php-format
@@ -194,12 +195,12 @@ msgstr "[Red:Hinweis] %s hat Dich getagged"
 #: ../../include/enotify.php:239
 #, php-format
 msgid "%1$s, %2$s tagged your post at %3$s"
-msgstr ""
+msgstr "%1$s, %2$s hat deinen Beitrag auf %3$s getaggt"
 
 #: ../../include/enotify.php:240
 #, php-format
 msgid "%1$s, %2$s tagged [zrl=%3$s]your post[/zrl]"
-msgstr ""
+msgstr "%1$s, %2$s hat [zrl=%3$s]deinen Beitrag[/zrl] getaggt"
 
 #: ../../include/enotify.php:252
 msgid "[Red:Notify] Introduction received"
@@ -208,12 +209,12 @@ msgstr "[Red:Notify] Vorstellung erhalten"
 #: ../../include/enotify.php:253
 #, php-format
 msgid "%1$s, you've received an introduction from '%2$s' at %3$s"
-msgstr ""
+msgstr "%1$s, du hast eine Vorstellung von „%2$s“ auf %3$s erhalten"
 
 #: ../../include/enotify.php:254
 #, php-format
 msgid "%1$s, you've received [zrl=%2$s]an introduction[/zrl] from %3$s."
-msgstr ""
+msgstr "%1$s, du hast [zrl=%2$s]eine Vorstellung[/zrl] von %3$s erhalten."
 
 #: ../../include/enotify.php:258 ../../include/enotify.php:277
 #, php-format
@@ -232,14 +233,14 @@ msgstr "[Red:Hinweis] Freundschaftsvorschlag erhalten"
 #: ../../include/enotify.php:268
 #, php-format
 msgid "%1$s, you've received a friend suggestion from '%2$s' at %3$s"
-msgstr ""
+msgstr "%1$s, du hast einen Freundschaftsvorschlag von „%2$s“ auf %3$s erhalten"
 
 #: ../../include/enotify.php:269
 #, php-format
 msgid ""
 "%1$s, you've received [zrl=%2$s]a friend suggestion[/zrl] for %3$s from "
 "%4$s."
-msgstr ""
+msgstr "%1$s, du hast [zrl=%2$s]einen Freundschaftvorschlag[/zrl] für %3$s von %4$s erhalten."
 
 #: ../../include/enotify.php:275
 msgid "Name:"
@@ -2362,15 +2363,15 @@ msgstr "Sichtbar für <strong>jeden</strong>"
 #: ../../include/conversation.php:1059 ../../mod/message.php:281
 #: ../../mod/message.php:417
 msgid "Please enter a link URL:"
-msgstr "Geben Sie eine URL ein:"
+msgstr "Gib eine URL ein:"
 
 #: ../../include/conversation.php:1060
 msgid "Please enter a video link/URL:"
-msgstr "Geben Sie einen Video-Link/URL ein:"
+msgstr "Gib einen Video-Link/URL ein:"
 
 #: ../../include/conversation.php:1061
 msgid "Please enter an audio link/URL:"
-msgstr "Geben Sie einen Audio-Link/URL ein:"
+msgstr "Gib einen Audio-Link/URL ein:"
 
 #: ../../include/conversation.php:1062
 msgid "Tag term:"
@@ -2450,11 +2451,11 @@ msgstr "Audio-Link"
 #: ../../mod/editwebpage.php:126 ../../mod/editpost.php:104
 #: ../../mod/editblock.php:121
 msgid "Set your location"
-msgstr "Legen Sie Ihren Aufenthaltsort fest"
+msgstr "Standort"
 
 #: ../../include/conversation.php:1104
 msgid "set location"
-msgstr "Ort festlegen"
+msgstr "Standort"
 
 #: ../../include/conversation.php:1105 ../../mod/editlayout.php:108
 #: ../../mod/editwebpage.php:127 ../../mod/editpost.php:105
@@ -2470,7 +2471,7 @@ msgstr "Standort löschen"
 #: ../../mod/editwebpage.php:142 ../../mod/editpost.php:118
 #: ../../mod/editblock.php:136
 msgid "Set title"
-msgstr "Titel festlegen"
+msgstr "Titel"
 
 #: ../../include/conversation.php:1111 ../../mod/editlayout.php:123
 #: ../../mod/editwebpage.php:144 ../../mod/editpost.php:120
@@ -2505,7 +2506,7 @@ msgstr "Beispiel: bob@example.com, mary@example.com"
 #: ../../mod/editwebpage.php:155 ../../mod/editpost.php:132
 #: ../../mod/editblock.php:149
 msgid "Set expiration date"
-msgstr "Verfallsdatum setzen"
+msgstr "Verfallsdatum"
 
 #: ../../include/auth.php:67
 msgid "Logged out."
@@ -2934,7 +2935,7 @@ msgstr "Füge Sachen zu deinem Profil hinzu"
 
 #: ../../mod/thing.php:183
 msgid "Select a profile"
-msgstr "Wählen Sie ein Profil"
+msgstr "Wähle ein Profil"
 
 #: ../../mod/thing.php:185
 msgid "Select a category of stuff. e.g. I ______ something"
@@ -3003,7 +3004,7 @@ msgid ""
 "You are cordially invited to join me and some other close friends on the Red"
 " Matrix - a revolutionary new decentralised communication and information "
 "tool."
-msgstr "Du bist herzlich eingeladen mir und einigen anderen guten Freunden in die Red Matrix zu folgen - einem revolutionaren neuen, dezentralisiertem Kommunikations- und Informationsnetzwerk."
+msgstr "Du bist herzlich eingeladen, mir und einigen anderen guten Freunden in die Red-Matrix zu folgen – einem revolutionär neuen, dezentralisierten Kommunikations- und Informationsnetzwerk."
 
 #: ../../mod/invite.php:144
 msgid "You will need to supply this invitation code: $invite_code"
@@ -3017,11 +3018,11 @@ msgstr "Bitte besuche meinen Kanal auf"
 msgid ""
 "Once you have registered (on ANY Red Matrix site - they are all inter-"
 "connected), please connect with my Red Matrix channel address:"
-msgstr "Wenn du dich registriert hast (egal auf welcher Seite in der Red Matrix, sie sind alle miteinander verbunden) verbinde dich bitte mit meinem Kanal in der Matrix."
+msgstr "Wenn du dich registriert hast (egal auf welcher Seite in der Red Matrix, sie sind alle miteinander verbunden) verbinde dich bitte mit meinem Kanal in der Matrix. Adresse:"
 
 #: ../../mod/invite.php:151
 msgid "Click the [Register] link on the following page to join."
-msgstr ""
+msgstr "Klicke den [Registrieren]-Link auf der nächsten Seite, um dich anzumelden."
 
 #: ../../mod/invite.php:153
 msgid ""
@@ -3142,7 +3143,7 @@ msgstr "Eventuell musst du die Datei \"install/database.sql\" händisch mit phpm
 
 #: ../../mod/setup.php:188 ../../mod/setup.php:255 ../../mod/setup.php:584
 msgid "Please see the file \"install/INSTALL.txt\"."
-msgstr "Lesen Sie die Datei \"install/INSTALL.txt\"."
+msgstr "Lies die Datei \"install/INSTALL.txt\"."
 
 #: ../../mod/setup.php:252
 msgid "System check"
@@ -3172,7 +3173,7 @@ msgstr "Bitte kontaktiere deinen Hosting Provider oder den Administrator der Sei
 msgid ""
 "The database you specify below should already exist. If it does not, please "
 "create it before continuing."
-msgstr "Die Datenbank die du weiter unten angibst sollte bereits existieren. Sollte dies nicht der Fall sein erzeuge sie bitte bevor du fortfärst."
+msgstr "Die Datenbank, die du weiter unten angibst, sollte bereits existieren. Sollte das noch nicht der Fall sein, erzeuge sie bitte bevor du fortfährst."
 
 #: ../../mod/setup.php:286
 msgid "Database Server Name"
@@ -3218,11 +3219,11 @@ msgstr "Webseiten URL"
 
 #: ../../mod/setup.php:293 ../../mod/setup.php:336
 msgid "Please use SSL (https) URL if available."
-msgstr "Nutzen Sie bitte SSL (https) URL falls möglich."
+msgstr "Nutze wenn möglich eine SSL-URL (https)."
 
 #: ../../mod/setup.php:296 ../../mod/setup.php:339
 msgid "Please select a default timezone for your website"
-msgstr "Wählen Sie die Standard-Zeitzone für Ihre Webseite aus"
+msgstr "Standard-Zeitzone für deine Website"
 
 #: ../../mod/setup.php:323
 msgid "Site settings"
@@ -3276,7 +3277,7 @@ msgstr "Fehler: Die \"openssl_pkey_new\" Funktion auf diesem System ist nicht in
 msgid ""
 "If running under Windows, please see "
 "\"http://www.php.net/manual/en/openssl.installation.php\"."
-msgstr "Wenn du Windows verwendest, siehe  \"http://www.php.net/manual/en/openssl.installation.php\" für eine Installationsanleitung."
+msgstr "Wenn du Windows verwendest, siehe  http://www.php.net/manual/en/openssl.installation.php für eine Installationsanleitung."
 
 #: ../../mod/setup.php:425
 msgid "Generate encryption keys"
@@ -3372,7 +3373,7 @@ msgstr "Am Schluss des Vorgangs wird ein Text generiert, den du unter dem Datein
 msgid ""
 "You can alternatively skip this procedure and perform a manual installation."
 " Please see the file \"install/INSTALL.txt\" for instructions."
-msgstr "Alternativ kannst du diesen Schritt überspringen und die Installation manuell vornehmen. Siehe dazu bitte die \"Install/INSTALL.txt\" Datei."
+msgstr "Alternativ kannst du diesen Schritt überspringen und die Installation manuell vornehmen. Lies dazu die Datei install/INSTALL.txt."
 
 #: ../../mod/setup.php:498
 msgid ".htconfig.php is writable"
@@ -3533,7 +3534,7 @@ msgstr "Kennwort geändert."
 
 #: ../../mod/settings.php:311
 msgid "Password update failed. Please try again."
-msgstr "Kennwortänderung fehlgeschlagen. Wiederholen Sie den Vorgang."
+msgstr "Kennwortänderung fehlgeschlagen. Bitte versuche es noch einmal."
 
 #: ../../mod/settings.php:325
 msgid "Not valid email."
@@ -3619,7 +3620,7 @@ msgstr "Kein Name"
 
 #: ../../mod/settings.php:717
 msgid "Remove authorization"
-msgstr "Autorisierung aufheben"
+msgstr "Authorisierung aufheben"
 
 #: ../../mod/settings.php:728
 msgid "No feature settings configured"
@@ -3719,7 +3720,7 @@ msgstr "Niemand außer du selbst"
 
 #: ../../mod/settings.php:931
 msgid "Only those you specifically allow"
-msgstr "Nur diejenigen, die Sie erlauben"
+msgstr "Nur die, denen du es explizit erlaubst"
 
 #: ../../mod/settings.php:932
 msgid "Anybody in your address book"
@@ -4058,7 +4059,7 @@ msgstr "Neue Quelle"
 msgid ""
 "Import all or selected content from the following channel into this channel "
 "and distribute it according to your channel settings."
-msgstr "Importiere alle, oder nur ausgewählte, Inhalte des folgenden Kanals in diesen Kanal und verteile sie gemäß der Einstellungen dieses Kanals."
+msgstr "Importiere alle oder ausgewählte Inhalte des folgenden Kanals in diesen Kanal und verteile sie gemäß der Einstellungen dieses Kanals."
 
 #: ../../mod/sources.php:81 ../../mod/sources.php:107
 msgid "Only import content with these words (one per line)"
@@ -4095,7 +4096,7 @@ msgstr "Konnte die Quelle nicht löschen."
 
 #: ../../mod/admin.php:48
 msgid "Theme settings updated."
-msgstr "Theme Einstellungen aktualisiert."
+msgstr "Theme-Einstellungen aktualisiert."
 
 #: ../../mod/admin.php:87 ../../mod/admin.php:417
 msgid "Site"
@@ -4119,7 +4120,7 @@ msgstr "Server"
 
 #: ../../mod/admin.php:92
 msgid "DB updates"
-msgstr "DB Aktualisierungen"
+msgstr "DB-Aktualisierungen"
 
 #: ../../mod/admin.php:106 ../../mod/admin.php:113 ../../mod/admin.php:1108
 msgid "Logs"
@@ -4165,7 +4166,7 @@ msgstr "Aktive Plug-Ins"
 
 #: ../../mod/admin.php:340
 msgid "Site settings updated."
-msgstr "Seiten-Einstellungen aktualisiert."
+msgstr "Site-Einstellungen aktualisiert."
 
 #: ../../mod/admin.php:371
 msgid "No special theme for accessibility"
@@ -4617,11 +4618,11 @@ msgstr "Menü nicht gefunden"
 
 #: ../../mod/mitem.php:66
 msgid "Menu element updated."
-msgstr "Menü-Bestandteil aktualisiert."
+msgstr "Menü-Element aktualisiert."
 
 #: ../../mod/mitem.php:70
 msgid "Unable to update menu element."
-msgstr "Kann Menü-Bestandteil nicht aktualisieren."
+msgstr "Kann Menü-Element nicht aktualisieren."
 
 #: ../../mod/mitem.php:76
 msgid "Menu element added."
@@ -5142,7 +5143,7 @@ msgstr "Entfernte Authentifizierung"
 
 #: ../../mod/rmagic.php:57
 msgid "Enter your channel address (e.g. channel@example.com)"
-msgstr "Geben Sie Ihre Kanal-Adresse (z.B. channel@example.com)"
+msgstr "Deine Kanal-Adresse (z.B. channel@example.com)"
 
 #: ../../mod/rmagic.php:58
 msgid "Authenticate"
@@ -5182,7 +5183,7 @@ msgstr "Markiert"
 
 #: ../../mod/network.php:334
 msgid "Favourite Posts"
-msgstr "Favorisierte Beiträge"
+msgstr "Beiträge mit Sternchen"
 
 #: ../../mod/network.php:341
 msgid "Spam"
@@ -5249,7 +5250,7 @@ msgstr "Verbindung aktualisiert."
 
 #: ../../mod/intro.php:31
 msgid "Connection update failed."
-msgstr "Aktualisierung der Verbindung ist fehlgeschlagen."
+msgstr "Aktualisierung der Verbindung fehlgeschlagen."
 
 #: ../../mod/intro.php:56
 msgid "Introductions and Connection Requests"
@@ -5301,7 +5302,7 @@ msgstr "Konnte nicht auf den Eintrag im Adressbuch zugreifen."
 
 #: ../../mod/connections.php:233
 msgid "Refresh failed - channel is currently unavailable."
-msgstr "Aktualisierung fehlgeschlagen - der Kanal ist im Moment nicht erreichbar."
+msgstr "Aktualisierung fehlgeschlagen – der Kanal ist im Moment nicht erreichbar."
 
 #: ../../mod/connections.php:240
 msgid "Channel has been unblocked"
@@ -5516,7 +5517,7 @@ msgid ""
 "Some permissions may be inherited from your channel <a "
 "href=\"settings\">privacy settings</a>, which have higher priority. Changing"
 " those inherited settings on this page will have no effect."
-msgstr ""
+msgstr "Einige Genehmigungen können von deinen <a href=\"settings\">Sicherheits- und Datenschutz-Einstellungen</a> geerbt sein (siehe Kennzeichnung), da diese eine höhere Priorität haben. Wenn du solche Genehmigungen hier änderst, hat das keine Auswirkungen."
 
 #: ../../mod/connections.php:468
 msgid "Advanced Permissions"
@@ -6033,7 +6034,7 @@ msgstr "Speichere oder kopiere dein neues Passwort - und dann"
 
 #: ../../mod/lostpass.php:89
 msgid "click here to login"
-msgstr "Klicken Sie hier, um sich anzumelden"
+msgstr "Klicke hier, um dich anzumelden"
 
 #: ../../mod/lostpass.php:90
 msgid ""
@@ -6344,11 +6345,11 @@ msgstr "Hochladen"
 
 #: ../../mod/profile_photo.php:298
 msgid "skip this step"
-msgstr "überspringen Sie diesen Schritt"
+msgstr "diesen Schritt überspringen"
 
 #: ../../mod/profile_photo.php:298
 msgid "select a photo from your photo albums"
-msgstr "Wählen Sie ein Foto aus Ihren Fotoalben"
+msgstr "ein Foto aus meinen Fotoalben"
 
 #: ../../mod/profile_photo.php:312
 msgid "Crop Image"
@@ -6669,7 +6670,7 @@ msgstr "Red"
 msgid ""
 "This is a hub of the Red Matrix - a global cooperative network of "
 "decentralised privacy enhanced websites."
-msgstr ""
+msgstr "Dieser Server ist Teil der Red-Matrix – einem global vernetzten Verbund aus dezentralen Websites mit Rücksicht auf die Privatsphäre."
 
 #: ../../mod/siteinfo.php:84
 msgid "Running at web location"
@@ -6787,15 +6788,15 @@ msgstr "Ihre E-Mail Adresse"
 
 #: ../../mod/register.php:188
 msgid "Choose a password"
-msgstr "Wählen Sie ein Passwort"
+msgstr "Passwort"
 
 #: ../../mod/register.php:189
 msgid "Please re-enter your password"
-msgstr "Bitte geben Sie erneut Ihr Passwort ein"
+msgstr "Bitte gib dein Passwort noch einmal ein"
 
 #: ../../mod/regmod.php:12
 msgid "Please login."
-msgstr "Bitte loggen Sie sich ein."
+msgstr "Bitte melde dich an."
 
 #: ../../mod/post.php:119
 msgid ""
@@ -6820,7 +6821,7 @@ msgstr "Hiermit wird dieser Kanal komplett aus dem Netzwerk gelöscht. Einmal ei
 
 #: ../../mod/removeme.php:51
 msgid "Please enter your password for verification:"
-msgstr "Bitte geben Sie Ihr Passwort zur Bestätigung ein:"
+msgstr "Bitte gib zur Bestätigung dein Passwort ein:"
 
 #: ../../mod/removeme.php:52
 msgid "Remove this channel and all its clones from the network"
@@ -6866,7 +6867,7 @@ msgstr "Wähle deine aktuelle Stimmung und erzähle sie deinen Freunden"
 
 #: ../../view/theme/redbasic/php/config.php:74
 msgid "Scheme Default"
-msgstr ""
+msgstr "Standard-Schema"
 
 #: ../../view/theme/redbasic/php/config.php:75
 msgid "red"
@@ -6890,7 +6891,7 @@ msgstr "Theme-Einstellungen"
 #: ../../view/theme/redbasic/php/config.php:89
 #: ../../view/theme/apw/php/config.php:235
 msgid "Set scheme"
-msgstr "Schema wählen"
+msgstr "Schema"
 
 #: ../../view/theme/redbasic/php/config.php:90
 msgid "Navigation bar colour"
@@ -6898,35 +6899,35 @@ msgstr "Farbe der Navigationsleiste"
 
 #: ../../view/theme/redbasic/php/config.php:91
 msgid "Set font-colour for banner"
-msgstr "Farbe der Schrift des Banners setzen"
+msgstr "Farbe des Banners"
 
 #: ../../view/theme/redbasic/php/config.php:92
 msgid "Set the background colour"
-msgstr "Hintergrundfarbe wählen"
+msgstr "Hintergrundfarbe"
 
 #: ../../view/theme/redbasic/php/config.php:93
 msgid "Set the background image"
-msgstr "Hintergrundbild wählen"
+msgstr "Hintergrundbild"
 
 #: ../../view/theme/redbasic/php/config.php:94
 msgid "Set the background colour of items"
-msgstr "Hintergrundfarbe von Beiträgen wählen"
+msgstr "Hintergrundfarbe von Beiträgen"
 
 #: ../../view/theme/redbasic/php/config.php:95
 msgid "Set the opacity of items"
-msgstr "Opazität von Beiträgen wählen"
+msgstr "Deckkraft von Beiträgen"
 
 #: ../../view/theme/redbasic/php/config.php:96
 msgid "Set the basic colour for item icons"
-msgstr "Basis Farbe der Beitrags-Icons setzen"
+msgstr "Basisfarbe der Beitrags-Icons"
 
 #: ../../view/theme/redbasic/php/config.php:97
 msgid "Set the hover colour for item icons"
-msgstr ""
+msgstr "Farbe für Beitrags-Icons unter dem Mauszeiger"
 
 #: ../../view/theme/redbasic/php/config.php:98
 msgid "Set font-size for the entire application"
-msgstr ""
+msgstr "Schriftgröße für die ganze Applikation"
 
 #: ../../view/theme/redbasic/php/config.php:99
 #: ../../view/theme/apw/php/config.php:236
@@ -6935,11 +6936,11 @@ msgstr "Wähle die Schriftgröße für Beiträge und Kommentare"
 
 #: ../../view/theme/redbasic/php/config.php:100
 msgid "Set font-colour for posts and comments"
-msgstr "Schriftfarbe für Beiträge und Kommentare wählen"
+msgstr "Schriftfarbe für Beiträge und Kommentare"
 
 #: ../../view/theme/redbasic/php/config.php:101
 msgid "Set radius of corners"
-msgstr "Radius von Ecken"
+msgstr "Ecken-Radius"
 
 #: ../../view/theme/redbasic/php/config.php:102
 msgid "Set shadow depth of photos"
@@ -6947,23 +6948,23 @@ msgstr "Schattentiefe von Fotos"
 
 #: ../../view/theme/redbasic/php/config.php:103
 msgid "Set maximum width of conversation regions"
-msgstr ""
+msgstr "Maximalbreite der Konversationsbereiche"
 
 #: ../../view/theme/redbasic/php/config.php:104
 msgid "Set minimum opacity of nav bar - to hide it"
-msgstr ""
+msgstr "Mindest-Deckkraft der Navigationsleiste ( - versteckt sie)"
 
 #: ../../view/theme/redbasic/php/config.php:105
 msgid "Set size of conversation author photo"
-msgstr ""
+msgstr "Größe der Avatare von Themenstartern"
 
 #: ../../view/theme/redbasic/php/config.php:106
 msgid "Set size of followup author photos"
-msgstr ""
+msgstr "Größe der Avatare von Kommentatoren"
 
 #: ../../view/theme/redbasic/php/config.php:107
 msgid "Sloppy photo albums"
-msgstr ""
+msgstr "Schräge Fotoalben"
 
 #: ../../view/theme/redbasic/php/config.php:107
 msgid "Are you a clean desk or a messy desk person?"
@@ -6984,27 +6985,27 @@ msgstr "Monospace"
 
 #: ../../view/theme/apw/php/config.php:237
 msgid "Set font face"
-msgstr "Schriftart wählen"
+msgstr "Schriftart"
 
 #: ../../view/theme/apw/php/config.php:238
 msgid "Set iconset"
-msgstr "Iconset wählen"
+msgstr "Iconset"
 
 #: ../../view/theme/apw/php/config.php:239
 msgid "Set big shadow size, default 15px 15px 15px"
-msgstr ""
+msgstr "Ausmaß der großen Schatten (Default 15px 15px 15px)"
 
 #: ../../view/theme/apw/php/config.php:240
 msgid "Set small shadow size, default 5px 5px 5px"
-msgstr ""
+msgstr "Ausmaß der kleinen Schatten (Default 5px 5px 5px)"
 
 #: ../../view/theme/apw/php/config.php:241
 msgid "Set shadow colour, default #000"
-msgstr ""
+msgstr "Farbe der Schatten (Default #000)"
 
 #: ../../view/theme/apw/php/config.php:242
 msgid "Set radius size, default 5px"
-msgstr ""
+msgstr "Ecken-Radius (Default 5px)"
 
 #: ../../view/theme/apw/php/config.php:243
 msgid "Set line-height for posts and comments"
@@ -7012,43 +7013,43 @@ msgstr "Wähle die Zeilenhöhe in Beiträgen und Kommentaren"
 
 #: ../../view/theme/apw/php/config.php:244
 msgid "Set background image"
-msgstr "Hintergrundbild wählen"
+msgstr "Hintergrundbild"
 
 #: ../../view/theme/apw/php/config.php:245
 msgid "Set background colour"
-msgstr "Hintergrundfarbe wählen"
+msgstr "Hintergrundfarbe"
 
 #: ../../view/theme/apw/php/config.php:246
 msgid "Set section background image"
-msgstr ""
+msgstr "Hintergrundbild des mittleren Bereichs"
 
 #: ../../view/theme/apw/php/config.php:247
 msgid "Set section background colour"
-msgstr ""
+msgstr "Hintergrundfarbe des mittleren Bereichs"
 
 #: ../../view/theme/apw/php/config.php:248
 msgid "Set colour of items - use hex"
-msgstr "Wähle die Farbe von Beiträgen - verwende HEX"
+msgstr "Farbe von Beiträgen (HEX)"
 
 #: ../../view/theme/apw/php/config.php:249
 msgid "Set colour of links - use hex"
-msgstr "Wähle die Farbe von Links - verwende HEX"
+msgstr "Farbe von Links (HEX)"
 
 #: ../../view/theme/apw/php/config.php:250
 msgid "Set max-width for items.  Default 400px"
-msgstr "Maximale Breite von Beiträgen. Standard ist 400px"
+msgstr "Maximalbreite von Beiträgen (Default 400px)"
 
 #: ../../view/theme/apw/php/config.php:251
 msgid "Set min-width for items.  Default 240px"
-msgstr "Minimale Breite von Beiträgen. Standard ist 240px"
+msgstr "Minimalbreite von Beiträgen (Default 240px)"
 
 #: ../../view/theme/apw/php/config.php:252
 msgid "Set the generic content wrapper width.  Default 48%"
-msgstr "Breite des \"generic content wrapper\". Standard ist 48%"
+msgstr "Breite des „generic content wrapper“ (Default 48%)"
 
 #: ../../view/theme/apw/php/config.php:253
 msgid "Set colour of fonts - use hex"
-msgstr "Schriftfarbe - verwende HEX"
+msgstr "Schriftfarbe (HEX)"
 
 #: ../../view/theme/apw/php/config.php:254
 msgid "Set background-size element"
@@ -7076,23 +7077,23 @@ msgstr "Beitragsfluss"
 
 #: ../../view/theme/apw/php/config.php:260
 msgid "Left offset of the section element"
-msgstr "Linker Rand des Section Elements"
+msgstr "Linker Rand des mittleren Bereichs"
 
 #: ../../view/theme/apw/php/config.php:261
 msgid "Right offset of the section element"
-msgstr "Rechter Rand des Section Elements"
+msgstr "Rechter Rand des mittleren Bereichs"
 
 #: ../../view/theme/apw/php/config.php:262
 msgid "Section width"
-msgstr "Breite der Section"
+msgstr "Breite des mittleren Bereichs"
 
 #: ../../view/theme/apw/php/config.php:263
 msgid "Left offset of the aside"
-msgstr "Linker Rand der aside"
+msgstr "Linker Rand des seitlichen Bereichs"
 
 #: ../../view/theme/apw/php/config.php:264
 msgid "Right offset of the aside element"
-msgstr "Rechter Rand der aside"
+msgstr "Rechter Rand des seitlichen Bereichs"
 
 #: ../../view/theme/blogga/view/theme/blog/config.php:47
 #: ../../view/theme/blogga/php/config.php:47
@@ -7112,7 +7113,7 @@ msgstr "Titelbild nur auf Profil-Seiten anzeigen"
 #: ../../boot.php:1274
 #, php-format
 msgid "Update %s failed. See error logs."
-msgstr "Aktualisierung %s fehlgeschlagen. Details in den Fehlerlogs."
+msgstr "Aktualisierung %s fehlgeschlagen. Details in den Fehlerprotokollen."
 
 #: ../../boot.php:1277
 #, php-format
diff --git a/view/de/strings.php b/view/de/strings.php
index 254e73bf9..92360da79 100644
--- a/view/de/strings.php
+++ b/view/de/strings.php
@@ -13,7 +13,7 @@ $a->strings["%1\$s changed %2\$s to &ldquo;%3\$s&rdquo;"] = "%1\$s hat %2\$s auf
 $a->strings["Visit %1\$s's %2\$s"] = "Besuche %1\$s's %2\$s";
 $a->strings["%1\$s has an updated %2\$s, changing %3\$s."] = "%1\$s hat ein aktualisiertes %2\$s, %3\$s wurde verändert.";
 $a->strings["Red Matrix Notification"] = "Red Matrix Benachrichtigung";
-$a->strings["redmatrix"] = "";
+$a->strings["redmatrix"] = "redmatrix";
 $a->strings["Thank You,"] = "Danke.";
 $a->strings["%s Administrator"] = "%s Administrator";
 $a->strings["%s <!item_type!>"] = "%s <!item_type!>";
@@ -22,32 +22,32 @@ $a->strings["%1\$s, %2\$s sent you a new private message at %3\$s."] = "%1\$s, %
 $a->strings["%1\$s sent you %2\$s."] = "%1\$s hat dir %2\$s geschickt.";
 $a->strings["a private message"] = "eine private Nachricht";
 $a->strings["Please visit %s to view and/or reply to your private messages."] = "Bitte besuche %s, um die private Nachricht anzusehen und/oder darauf zu antworten.";
-$a->strings["%1\$s, %2\$s commented on [zrl=%3\$s]a %4\$s[/zrl]"] = "";
-$a->strings["%1\$s, %2\$s commented on [zrl=%3\$s]%4\$s's %5\$s[/zrl]"] = "";
-$a->strings["%1\$s, %2\$s commented on [zrl=%3\$s]your %4\$s[/zrl]"] = "";
+$a->strings["%1\$s, %2\$s commented on [zrl=%3\$s]a %4\$s[/zrl]"] = "%1\$s, %2\$s hat [zrl=%3\$s]a %4\$s[/zrl] kommentiert";
+$a->strings["%1\$s, %2\$s commented on [zrl=%3\$s]%4\$s's %5\$s[/zrl]"] = "%1\$s, %2\$s hat [zrl=%3\$s]%4\$ss %5\$s[/zrl] kommentiert";
+$a->strings["%1\$s, %2\$s commented on [zrl=%3\$s]your %4\$s[/zrl]"] = "%1\$s, %2\$s hat [zrl=%3\$s]deinen %4\$s[/zrl] kommentiert";
 $a->strings["[Red:Notify] Comment to conversation #%1\$d by %2\$s"] = "[Red:Notify] Kommentar in Unterhaltung #%1\$d von %2\$s";
-$a->strings["%1\$s, %2\$s commented on an item/conversation you have been following."] = "";
+$a->strings["%1\$s, %2\$s commented on an item/conversation you have been following."] = "%1\$s, %2\$s hat ein Thema kommentiert, dem du folgst.";
 $a->strings["Please visit %s to view and/or reply to the conversation."] = "Bitte besuche %s, um die Konversation anzusehen und/oder zu kommentieren.";
 $a->strings["[Red:Notify] %s posted to your profile wall"] = "[Red:Hinweis] %s schrieb auf Deine Pinnwand";
-$a->strings["%1\$s, %2\$s posted to your profile wall at %3\$s"] = "";
-$a->strings["%1\$s, %2\$s posted to [zrl=%3\$s]your wall[/zrl]"] = "";
+$a->strings["%1\$s, %2\$s posted to your profile wall at %3\$s"] = "%1\$s, %2\$s hat auf deine Pinnwand auf %3\$s geschrieben";
+$a->strings["%1\$s, %2\$s posted to [zrl=%3\$s]your wall[/zrl]"] = "%1\$s, %2\$s hat auf [zrl=%3\$s]deine Pinnwand[/zrl] geschrieben";
 $a->strings["[Red:Notify] %s tagged you"] = "[Red Notify] %s hat dich getaggt";
 $a->strings["%1\$s, %2\$s tagged you at %3\$s"] = "%1\$s, %2\$s hat dich auf %3\$s getaggt";
-$a->strings["%1\$s, %2\$s [zrl=%3\$s]tagged you[/zrl]."] = "";
+$a->strings["%1\$s, %2\$s [zrl=%3\$s]tagged you[/zrl]."] = "%1\$s, %2\$s [zrl=%3\$s]hat dich erwähnt[/zrl].";
 $a->strings["[Red:Notify] %1\$s poked you"] = "[Red Notify] %1\$s hat dich angestupst";
 $a->strings["%1\$s, %2\$s poked you at %3\$s"] = "%1\$s, %2\$s hat dich auf %3\$s angestubst";
-$a->strings["%1\$s, %2\$s [zrl=%2\$s]poked you[/zrl]."] = "";
+$a->strings["%1\$s, %2\$s [zrl=%2\$s]poked you[/zrl]."] = "%1\$s, %2\$s [zrl=%2\$s]hat dich angestupst[/zrl].";
 $a->strings["[Red:Notify] %s tagged your post"] = "[Red:Hinweis] %s hat Dich getagged";
-$a->strings["%1\$s, %2\$s tagged your post at %3\$s"] = "";
-$a->strings["%1\$s, %2\$s tagged [zrl=%3\$s]your post[/zrl]"] = "";
+$a->strings["%1\$s, %2\$s tagged your post at %3\$s"] = "%1\$s, %2\$s hat deinen Beitrag auf %3\$s getaggt";
+$a->strings["%1\$s, %2\$s tagged [zrl=%3\$s]your post[/zrl]"] = "%1\$s, %2\$s hat [zrl=%3\$s]deinen Beitrag[/zrl] getaggt";
 $a->strings["[Red:Notify] Introduction received"] = "[Red:Notify] Vorstellung erhalten";
-$a->strings["%1\$s, you've received an introduction from '%2\$s' at %3\$s"] = "";
-$a->strings["%1\$s, you've received [zrl=%2\$s]an introduction[/zrl] from %3\$s."] = "";
+$a->strings["%1\$s, you've received an introduction from '%2\$s' at %3\$s"] = "%1\$s, du hast eine Vorstellung von „%2\$s“ auf %3\$s erhalten";
+$a->strings["%1\$s, you've received [zrl=%2\$s]an introduction[/zrl] from %3\$s."] = "%1\$s, du hast [zrl=%2\$s]eine Vorstellung[/zrl] von %3\$s erhalten.";
 $a->strings["You may visit their profile at %s"] = "Du kannst Dir das Profil unter %s ansehen";
 $a->strings["Please visit %s to approve or reject the introduction."] = "Bitte besuche %s um sie anzunehmen oder abzulehnen.";
 $a->strings["[Red:Notify] Friend suggestion received"] = "[Red:Hinweis] Freundschaftsvorschlag erhalten";
-$a->strings["%1\$s, you've received a friend suggestion from '%2\$s' at %3\$s"] = "";
-$a->strings["%1\$s, you've received [zrl=%2\$s]a friend suggestion[/zrl] for %3\$s from %4\$s."] = "";
+$a->strings["%1\$s, you've received a friend suggestion from '%2\$s' at %3\$s"] = "%1\$s, du hast einen Freundschaftsvorschlag von „%2\$s“ auf %3\$s erhalten";
+$a->strings["%1\$s, you've received [zrl=%2\$s]a friend suggestion[/zrl] for %3\$s from %4\$s."] = "%1\$s, du hast [zrl=%2\$s]einen Freundschaftvorschlag[/zrl] für %3\$s von %4\$s erhalten.";
 $a->strings["Name:"] = "Name:";
 $a->strings["Photo:"] = "Foto:";
 $a->strings["Please visit %s to approve or reject the suggestion."] = "Bitte besuche %s um den Vorschlag zu akzeptieren oder abzulehnen.";
@@ -557,9 +557,9 @@ $a->strings[", and %d other people"] = array(
 $a->strings["%s like this."] = "%s gefällt das.";
 $a->strings["%s don't like this."] = "%s gefällt das nicht.";
 $a->strings["Visible to <strong>everybody</strong>"] = "Sichtbar für <strong>jeden</strong>";
-$a->strings["Please enter a link URL:"] = "Geben Sie eine URL ein:";
-$a->strings["Please enter a video link/URL:"] = "Geben Sie einen Video-Link/URL ein:";
-$a->strings["Please enter an audio link/URL:"] = "Geben Sie einen Audio-Link/URL ein:";
+$a->strings["Please enter a link URL:"] = "Gib eine URL ein:";
+$a->strings["Please enter a video link/URL:"] = "Gib einen Video-Link/URL ein:";
+$a->strings["Please enter an audio link/URL:"] = "Gib einen Audio-Link/URL ein:";
 $a->strings["Tag term:"] = "Schlagwort:";
 $a->strings["Save to Folder:"] = "Speichern in Ordner:";
 $a->strings["Where are you right now?"] = "Wo bist du jetzt grade?";
@@ -576,17 +576,17 @@ $a->strings["Insert video link"] = "Video-Link einfügen";
 $a->strings["video link"] = "Video-Link";
 $a->strings["Insert audio link"] = "Audio-Link einfügen";
 $a->strings["audio link"] = "Audio-Link";
-$a->strings["Set your location"] = "Legen Sie Ihren Aufenthaltsort fest";
-$a->strings["set location"] = "Ort festlegen";
+$a->strings["Set your location"] = "Standort";
+$a->strings["set location"] = "Standort";
 $a->strings["Clear browser location"] = "Browser-Standort löschen";
 $a->strings["clear location"] = "Standort löschen";
-$a->strings["Set title"] = "Titel festlegen";
+$a->strings["Set title"] = "Titel";
 $a->strings["Categories (comma-separated list)"] = "Kategorien (Kommagetrennte Liste)";
 $a->strings["Permission settings"] = "Berechtigungs-Einstellungen";
 $a->strings["permissions"] = "Berechtigungen";
 $a->strings["Public post"] = "Öffentlicher Beitrag";
 $a->strings["Example: bob@example.com, mary@example.com"] = "Beispiel: bob@example.com, mary@example.com";
-$a->strings["Set expiration date"] = "Verfallsdatum setzen";
+$a->strings["Set expiration date"] = "Verfallsdatum";
 $a->strings["Logged out."] = "Ausgeloggt.";
 $a->strings["Failed authentication"] = "Authentifizierung fehlgeschlagen";
 $a->strings["Login failed."] = "Login fehlgeschlagen.";
@@ -695,7 +695,7 @@ $a->strings["thing/stuff added"] = "Ding/Zeugs hinzugefügt";
 $a->strings["OBJ: %1\$s %2\$s %3\$s"] = "OBJ: %1\$s %2\$s %3\$s";
 $a->strings["not yet implemented."] = "noch nicht eingebaut.";
 $a->strings["Add Stuff to your Profile"] = "Füge Sachen zu deinem Profil hinzu";
-$a->strings["Select a profile"] = "Wählen Sie ein Profil";
+$a->strings["Select a profile"] = "Wähle ein Profil";
 $a->strings["Select a category of stuff. e.g. I ______ something"] = "Wähle eine Kategorie für das Zeugs, z.B. Ich ______ etwas";
 $a->strings["Name of thing or stuff e.g. something"] = "Name des Dings/Zeugs, z.B. etwas";
 $a->strings["URL of thing or stuff (optional)"] = "URL des Dings oder Zeugs (optional)";
@@ -713,11 +713,11 @@ $a->strings["You have no more invitations available"] = "Du hast keine weiteren
 $a->strings["Send invitations"] = "Einladungen senden";
 $a->strings["Enter email addresses, one per line:"] = "Email-Adressen eintragen, eine pro Zeile:";
 $a->strings["Your message:"] = "Deine Nachricht:";
-$a->strings["You are cordially invited to join me and some other close friends on the Red Matrix - a revolutionary new decentralised communication and information tool."] = "Du bist herzlich eingeladen mir und einigen anderen guten Freunden in die Red Matrix zu folgen - einem revolutionaren neuen, dezentralisiertem Kommunikations- und Informationsnetzwerk.";
+$a->strings["You are cordially invited to join me and some other close friends on the Red Matrix - a revolutionary new decentralised communication and information tool."] = "Du bist herzlich eingeladen, mir und einigen anderen guten Freunden in die Red-Matrix zu folgen – einem revolutionär neuen, dezentralisierten Kommunikations- und Informationsnetzwerk.";
 $a->strings["You will need to supply this invitation code: \$invite_code"] = "Du musst dann den folgenden Einladungs-Code angeben: \$invite_code";
 $a->strings["Please visit my channel at"] = "Bitte besuche meinen Kanal auf";
-$a->strings["Once you have registered (on ANY Red Matrix site - they are all inter-connected), please connect with my Red Matrix channel address:"] = "Wenn du dich registriert hast (egal auf welcher Seite in der Red Matrix, sie sind alle miteinander verbunden) verbinde dich bitte mit meinem Kanal in der Matrix.";
-$a->strings["Click the [Register] link on the following page to join."] = "";
+$a->strings["Once you have registered (on ANY Red Matrix site - they are all inter-connected), please connect with my Red Matrix channel address:"] = "Wenn du dich registriert hast (egal auf welcher Seite in der Red Matrix, sie sind alle miteinander verbunden) verbinde dich bitte mit meinem Kanal in der Matrix. Adresse:";
+$a->strings["Click the [Register] link on the following page to join."] = "Klicke den [Registrieren]-Link auf der nächsten Seite, um dich anzumelden.";
 $a->strings["For more information about the Red Matrix Project and why it has the potential to change the internet as we know it, please visit http://getzot.com"] = "Für weitere Informationen über das Red Matrix Projekt und warum es das Potential hat das Internet wie wir es kennen grundlegend zu verändern schau dir bitte http://getzot.com an";
 $a->strings["Friends of %s"] = "Freunde von %s";
 $a->strings["No friends to display."] = "Keine Freunde zum Anzeigen.";
@@ -742,13 +742,13 @@ $a->strings["Could not connect to specified site URL. Possible SSL certificate o
 $a->strings["Could not create table."] = "Kann Tabelle nicht erstellen.";
 $a->strings["Your site database has been installed."] = "Die Datenbank deiner Seite wurde installiert.";
 $a->strings["You may need to import the file \"install/database.sql\" manually using phpmyadmin or mysql."] = "Eventuell musst du die Datei \"install/database.sql\" händisch mit phpmyadmin oder mysql importieren.";
-$a->strings["Please see the file \"install/INSTALL.txt\"."] = "Lesen Sie die Datei \"install/INSTALL.txt\".";
+$a->strings["Please see the file \"install/INSTALL.txt\"."] = "Lies die Datei \"install/INSTALL.txt\".";
 $a->strings["System check"] = "Systemprüfung";
 $a->strings["Check again"] = "Bitte nochmal prüfen";
 $a->strings["Database connection"] = "Datenbank Verbindung";
 $a->strings["In order to install Red Matrix we need to know how to connect to your database."] = "Um die Red Matrix installieren zu können, müssen wir wissen wie wir deine Datenbank kontaktieren können.";
 $a->strings["Please contact your hosting provider or site administrator if you have questions about these settings."] = "Bitte kontaktiere deinen Hosting Provider oder den Administrator der Seite wenn du Fragen zu diesen Einstellungen haben solltest.";
-$a->strings["The database you specify below should already exist. If it does not, please create it before continuing."] = "Die Datenbank die du weiter unten angibst sollte bereits existieren. Sollte dies nicht der Fall sein erzeuge sie bitte bevor du fortfärst.";
+$a->strings["The database you specify below should already exist. If it does not, please create it before continuing."] = "Die Datenbank, die du weiter unten angibst, sollte bereits existieren. Sollte das noch nicht der Fall sein, erzeuge sie bitte bevor du fortfährst.";
 $a->strings["Database Server Name"] = "Datenbank-Servername";
 $a->strings["Default is localhost"] = "Standard ist localhost";
 $a->strings["Database Port"] = "Datenbank-Port";
@@ -759,8 +759,8 @@ $a->strings["Database Name"] = "Datenbank-Name";
 $a->strings["Site administrator email address"] = "E-Mail Adresse des Seiten-Administrators";
 $a->strings["Your account email address must match this in order to use the web admin panel."] = "Die Email-Adresse deines Accounts muss dieser Adresse entsprechen, damit du Zugriff zum Admin Panel erhältst.";
 $a->strings["Website URL"] = "Webseiten URL";
-$a->strings["Please use SSL (https) URL if available."] = "Nutzen Sie bitte SSL (https) URL falls möglich.";
-$a->strings["Please select a default timezone for your website"] = "Wählen Sie die Standard-Zeitzone für Ihre Webseite aus";
+$a->strings["Please use SSL (https) URL if available."] = "Nutze wenn möglich eine SSL-URL (https).";
+$a->strings["Please select a default timezone for your website"] = "Standard-Zeitzone für deine Website";
 $a->strings["Site settings"] = "Seiteneinstellungen";
 $a->strings["Could not find a command line version of PHP in the web server PATH."] = "Konnte die Kommandozeilen Version von PHP nicht im PATH des Servers finden.";
 $a->strings["If you don't have a command line version of PHP installed on server, you will not be able to run background polling via cron."] = "Solltest du keine Kommandozeilen Version von PHP auf dem Server installiert haben wirst du nicht in der Lage sein Hintergrundprozesse via cron auszuführen.";
@@ -771,7 +771,7 @@ $a->strings["The command line version of PHP on your system does not have \"regi
 $a->strings["This is required for message delivery to work."] = "Dies wird benötigt, damit die Auslieferung von Nachrichten funktioniert.";
 $a->strings["PHP register_argc_argv"] = "PHP register_argc_argv";
 $a->strings["Error: the \"openssl_pkey_new\" function on this system is not able to generate encryption keys"] = "Fehler: Die \"openssl_pkey_new\" Funktion auf diesem System ist nicht in der Lage Schlüssel für die Verschlüsselung zu erzeugen.";
-$a->strings["If running under Windows, please see \"http://www.php.net/manual/en/openssl.installation.php\"."] = "Wenn du Windows verwendest, siehe  \"http://www.php.net/manual/en/openssl.installation.php\" für eine Installationsanleitung.";
+$a->strings["If running under Windows, please see \"http://www.php.net/manual/en/openssl.installation.php\"."] = "Wenn du Windows verwendest, siehe  http://www.php.net/manual/en/openssl.installation.php für eine Installationsanleitung.";
 $a->strings["Generate encryption keys"] = "Verschlüsselungsschlüssel  generieren";
 $a->strings["libCurl PHP module"] = "libCurl PHP Modul";
 $a->strings["GD graphics PHP module"] = "GD Graphik PHP Modul";
@@ -792,7 +792,7 @@ $a->strings["Error: mcrypt PHP module required but not installed."] = "Fehler: d
 $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."] = "Der Installations-Assistent muss in der Lage sein die Datei \".htconfig.php\" im Stammverzeichnis des Web-Servers anzulegen, ist es aber nicht.";
 $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."] = "Meist liegt dies daran, dass der Nutzer unter dem der Web-Server läuft keine Rechte zum Schreiben in dem Verzeichnis hat - selbst wenn du das kannst.";
 $a->strings["At the end of this procedure, we will give you a text to save in a file named .htconfig.php in your Red top folder."] = "Am Schluss des Vorgangs wird ein Text generiert, den du unter dem Dateinamen .htconfig.php im Stammverzeichnis deiner Red Installation speichern.";
-$a->strings["You can alternatively skip this procedure and perform a manual installation. Please see the file \"install/INSTALL.txt\" for instructions."] = "Alternativ kannst du diesen Schritt überspringen und die Installation manuell vornehmen. Siehe dazu bitte die \"Install/INSTALL.txt\" Datei.";
+$a->strings["You can alternatively skip this procedure and perform a manual installation. Please see the file \"install/INSTALL.txt\" for instructions."] = "Alternativ kannst du diesen Schritt überspringen und die Installation manuell vornehmen. Lies dazu die Datei install/INSTALL.txt.";
 $a->strings[".htconfig.php is writable"] = ".htconfig.php ist beschreibbar";
 $a->strings["Red uses the Smarty3 template engine to render its web views. Smarty3 compiles templates to PHP to speed up rendering."] = "Red verwendet Smarty3 um Vorlagen für die Webdarstellung zu übersetzen. Smarty3 übersetzt diese Vorlagen nach PHP um die Darstellung zu beschleunigen.";
 $a->strings["In order to store these compiled templates, the web server needs to have write access to the directory view/tpl/smarty3/ under the Red top level folder."] = "Um die übersetzten Vorlagen speichern zu können muss der Webserver schreib Zugriff auf das Verzeichnis view/tpl/smarty3/ unterhalb des Red Stammverzeichnisses haben.";
@@ -827,7 +827,7 @@ $a->strings["Update"] = "Update";
 $a->strings["Passwords do not match. Password unchanged."] = "Kennwörter stimmen nicht überein. Kennwort nicht verändert.";
 $a->strings["Empty passwords are not allowed. Password unchanged."] = "Leere Kennwörter sind nicht erlaubt. Kennwort nicht verändert.";
 $a->strings["Password changed."] = "Kennwort geändert.";
-$a->strings["Password update failed. Please try again."] = "Kennwortänderung fehlgeschlagen. Wiederholen Sie den Vorgang.";
+$a->strings["Password update failed. Please try again."] = "Kennwortänderung fehlgeschlagen. Bitte versuche es noch einmal.";
 $a->strings["Not valid email."] = "Keine gültige E-Mail Adresse.";
 $a->strings["Protected email address. Cannot change to that email."] = "Geschützte E-Mail Adresse. Diese kann nicht verändert werden.";
 $a->strings["System failure storing new email. Please try again."] = "Systemfehler während des Speicherns der neuen Mail. Bitte versuche es noch einmal.";
@@ -847,7 +847,7 @@ $a->strings["You can't edit this application."] = "Diese Anwendung kann nicht be
 $a->strings["Connected Apps"] = "Verbundene Apps";
 $a->strings["Client key starts with"] = "Client key beginnt mit";
 $a->strings["No name"] = "Kein Name";
-$a->strings["Remove authorization"] = "Autorisierung aufheben";
+$a->strings["Remove authorization"] = "Authorisierung aufheben";
 $a->strings["No feature settings configured"] = "Keine Funktions-Einstellungen konfiguriert";
 $a->strings["Feature Settings"] = "Funktions-Einstellungen";
 $a->strings["Account Settings"] = "Konto-Einstellungen";
@@ -872,7 +872,7 @@ $a->strings["Maximum number of conversations to load at any time:"] = "Maximale
 $a->strings["Maximum of 100 items"] = "Maximum von 100 Beiträgen";
 $a->strings["Don't show emoticons"] = "Emoticons nicht zeigen";
 $a->strings["Nobody except yourself"] = "Niemand außer du selbst";
-$a->strings["Only those you specifically allow"] = "Nur diejenigen, die Sie erlauben";
+$a->strings["Only those you specifically allow"] = "Nur die, denen du es explizit erlaubst";
 $a->strings["Anybody in your address book"] = "Jeder aus Ihrem Adressbuch";
 $a->strings["Anybody on this website"] = "Jeder auf dieser Website";
 $a->strings["Anybody in this network"] = "Jeder in diesem Netzwerk";
@@ -953,7 +953,7 @@ $a->strings["Source created."] = "Quelle erstellt.";
 $a->strings["Source updated."] = "Quelle aktualisiert.";
 $a->strings["Manage remote sources of content for your channel."] = "Entfernte Quellen von Inhalten deines Kanals verwalten.";
 $a->strings["New Source"] = "Neue Quelle";
-$a->strings["Import all or selected content from the following channel into this channel and distribute it according to your channel settings."] = "Importiere alle, oder nur ausgewählte, Inhalte des folgenden Kanals in diesen Kanal und verteile sie gemäß der Einstellungen dieses Kanals.";
+$a->strings["Import all or selected content from the following channel into this channel and distribute it according to your channel settings."] = "Importiere alle oder ausgewählte Inhalte des folgenden Kanals in diesen Kanal und verteile sie gemäß der Einstellungen dieses Kanals.";
 $a->strings["Only import content with these words (one per line)"] = "Importiere ausschließlich Beiträge, die folgende Wörter (eines pro Zeile) enthalten";
 $a->strings["Leave blank to import all public content"] = "Leer lassen um alle öffentlichen Beiträge zu importieren";
 $a->strings["Channel Name"] = "Channel-Name";
@@ -962,13 +962,13 @@ $a->strings["Edit Source"] = "Quelle bearbeiten";
 $a->strings["Delete Source"] = "Quelle löschen";
 $a->strings["Source removed"] = "Quelle gelöscht";
 $a->strings["Unable to remove source."] = "Konnte die Quelle nicht löschen.";
-$a->strings["Theme settings updated."] = "Theme Einstellungen aktualisiert.";
+$a->strings["Theme settings updated."] = "Theme-Einstellungen aktualisiert.";
 $a->strings["Site"] = "Seite";
 $a->strings["Users"] = "Benutzer";
 $a->strings["Plugins"] = "Plug-Ins";
 $a->strings["Themes"] = "Themes";
 $a->strings["Server"] = "Server";
-$a->strings["DB updates"] = "DB Aktualisierungen";
+$a->strings["DB updates"] = "DB-Aktualisierungen";
 $a->strings["Logs"] = "Protokolle";
 $a->strings["Plugin Features"] = "Plug-In Funktionen";
 $a->strings["User registrations waiting for confirmation"] = "Nutzer Anmeldungen die auf Bestätigung warten";
@@ -979,7 +979,7 @@ $a->strings["Registered users"] = "Registrierte Benutzer";
 $a->strings["Pending registrations"] = "Ausstehende Registrierungen";
 $a->strings["Version"] = "Version";
 $a->strings["Active plugins"] = "Aktive Plug-Ins";
-$a->strings["Site settings updated."] = "Seiten-Einstellungen aktualisiert.";
+$a->strings["Site settings updated."] = "Site-Einstellungen aktualisiert.";
 $a->strings["No special theme for accessibility"] = "Kein spezielles Accessibility Theme vorhanden";
 $a->strings["Closed"] = "Geschlossen";
 $a->strings["Requires approval"] = "Genehmigung erforderlich";
@@ -1087,8 +1087,8 @@ $a->strings["Log file"] = "Protokolldatei";
 $a->strings["Must be writable by web server. Relative to your Red top-level directory."] = "Muss für den Web-Server schreibbar sein. Relativ zum Red Stammverzeichnis.";
 $a->strings["Log level"] = "Protokollstufe";
 $a->strings["Menu not found."] = "Menü nicht gefunden";
-$a->strings["Menu element updated."] = "Menü-Bestandteil aktualisiert.";
-$a->strings["Unable to update menu element."] = "Kann Menü-Bestandteil nicht aktualisieren.";
+$a->strings["Menu element updated."] = "Menü-Element aktualisiert.";
+$a->strings["Unable to update menu element."] = "Kann Menü-Element nicht aktualisieren.";
 $a->strings["Menu element added."] = "Menü-Bestandteil hinzugefügt.";
 $a->strings["Unable to add menu element."] = "Kann Menü-Bestandteil nicht hinzufügen.";
 $a->strings["Not found."] = "Nicht gefunden.";
@@ -1216,7 +1216,7 @@ $a->strings["Layout Name"] = "Layout Name";
 $a->strings["Help:"] = "Hilfe:";
 $a->strings["Not Found"] = "Nicht gefunden";
 $a->strings["Remote Authentication"] = "Entfernte Authentifizierung";
-$a->strings["Enter your channel address (e.g. channel@example.com)"] = "Geben Sie Ihre Kanal-Adresse (z.B. channel@example.com)";
+$a->strings["Enter your channel address (e.g. channel@example.com)"] = "Deine Kanal-Adresse (z.B. channel@example.com)";
 $a->strings["Authenticate"] = "Authentifizieren";
 $a->strings["Commented Order"] = "Neueste Kommentare";
 $a->strings["Sort by Comment Date"] = "Nach Kommentardatum sortiert";
@@ -1226,7 +1226,7 @@ $a->strings["Personal"] = "Persönlich";
 $a->strings["Posts that mention or involve you"] = "Beiträge, in denen es um dich geht";
 $a->strings["Activity Stream - by date"] = "Activity Stream - nach Datum sortiert";
 $a->strings["Starred"] = "Markiert";
-$a->strings["Favourite Posts"] = "Favorisierte Beiträge";
+$a->strings["Favourite Posts"] = "Beiträge mit Sternchen";
 $a->strings["Spam"] = "Spam";
 $a->strings["Posts flagged as SPAM"] = "Nachrichten die als SPAM markiert wurden";
 $a->strings["Refresh"] = "Aktualisieren";
@@ -1242,7 +1242,7 @@ $a->strings["Connection: "] = "Verbindung:";
 $a->strings["Invalid connection."] = "Ungültige Verbindung.";
 $a->strings["Ignore"] = "Ignorieren";
 $a->strings["Connection updated."] = "Verbindung aktualisiert.";
-$a->strings["Connection update failed."] = "Aktualisierung der Verbindung ist fehlgeschlagen.";
+$a->strings["Connection update failed."] = "Aktualisierung der Verbindung fehlgeschlagen.";
 $a->strings["Introductions and Connection Requests"] = "Vorstellungen und Kontaktanfragen";
 $a->strings["No pending introductions."] = "Keine wartenden Vorstellungen.";
 $a->strings["System error. Please try again later."] = "Systemfehler. Bitte später erneut versuchen.";
@@ -1254,7 +1254,7 @@ $a->strings["Could not access contact record."] = "Konnte auf den Kontakteintrag
 $a->strings["Could not locate selected profile."] = "Konnte das gewählte Profil nicht finden.";
 $a->strings["Failed to update connection record."] = "Konnte den Verbindungseintrag nicht aktualisieren.";
 $a->strings["Could not access address book record."] = "Konnte nicht auf den Eintrag im Adressbuch zugreifen.";
-$a->strings["Refresh failed - channel is currently unavailable."] = "Aktualisierung fehlgeschlagen - der Kanal ist im Moment nicht erreichbar.";
+$a->strings["Refresh failed - channel is currently unavailable."] = "Aktualisierung fehlgeschlagen – der Kanal ist im Moment nicht erreichbar.";
 $a->strings["Channel has been unblocked"] = "Kanal nicht mehr blockiert";
 $a->strings["Channel has been blocked"] = "Kanal blockiert";
 $a->strings["Unable to set address book parameters."] = "Konnte die Adressbuch Parameter nicht setzen.";
@@ -1304,7 +1304,7 @@ $a->strings["Full Sharing"] = "Volles Teilen";
 $a->strings["Cautious Sharing"] = "Vorsichtiges Teilen";
 $a->strings["Follow Only"] = "Nur Folgen";
 $a->strings["Individual Permissions"] = "Individuelle Zugriffseinstellungen";
-$a->strings["Some permissions may be inherited from your channel <a href=\"settings\">privacy settings</a>, which have higher priority. Changing those inherited settings on this page will have no effect."] = "";
+$a->strings["Some permissions may be inherited from your channel <a href=\"settings\">privacy settings</a>, which have higher priority. Changing those inherited settings on this page will have no effect."] = "Einige Genehmigungen können von deinen <a href=\"settings\">Sicherheits- und Datenschutz-Einstellungen</a> geerbt sein (siehe Kennzeichnung), da diese eine höhere Priorität haben. Wenn du solche Genehmigungen hier änderst, hat das keine Auswirkungen.";
 $a->strings["Advanced Permissions"] = "Erweiterte Zugriffsrechte";
 $a->strings["Quick Links"] = "Quick Links";
 $a->strings["Visit %s's profile - %s"] = "%s's Profil besuchen - %s";
@@ -1429,7 +1429,7 @@ $a->strings["Password Reset"] = "Zurücksetzen des Kennworts";
 $a->strings["Your password has been reset as requested."] = "Dein Passwort wurde wie angefordert neu erstellt.";
 $a->strings["Your new password is"] = "Dein neues Passwort lautet";
 $a->strings["Save or copy your new password - and then"] = "Speichere oder kopiere dein neues Passwort - und dann";
-$a->strings["click here to login"] = "Klicken Sie hier, um sich anzumelden";
+$a->strings["click here to login"] = "Klicke hier, um dich anzumelden";
 $a->strings["Your password may be changed from the <em>Settings</em> page after successful login."] = "Dein Passwort kann unter <em>Einstellungen</em> nach einer erfolgreichen Anmeldung geändert werden.";
 $a->strings["Your password has changed at %s"] = "Auf %s wurde dein Passwort geändert";
 $a->strings["Forgot your Password?"] = "Kennwort vergessen?";
@@ -1500,8 +1500,8 @@ $a->strings["Upload File:"] = "Datei hochladen:";
 $a->strings["Select a profile:"] = "Wählen Sie ein Profil:";
 $a->strings["Upload Profile Photo"] = "Lade neues Profilfoto hoch";
 $a->strings["Upload"] = "Hochladen";
-$a->strings["skip this step"] = "überspringen Sie diesen Schritt";
-$a->strings["select a photo from your photo albums"] = "Wählen Sie ein Foto aus Ihren Fotoalben";
+$a->strings["skip this step"] = "diesen Schritt überspringen";
+$a->strings["select a photo from your photo albums"] = "ein Foto aus meinen Fotoalben";
 $a->strings["Crop Image"] = "Bild zuschneiden";
 $a->strings["Please adjust the image cropping for optimum viewing."] = "Bitte passe das Bild zur optimalen Anzeige an.";
 $a->strings["Done Editing"] = "Bearbeitung fertigstellen";
@@ -1577,7 +1577,7 @@ $a->strings["Version %s"] = "Version %s";
 $a->strings["Installed plugins/addons/apps:"] = "Installierte Plugins/Addons/Apps";
 $a->strings["No installed plugins/addons/apps"] = "Keine installierten Plugins/Addons/Apps";
 $a->strings["Red"] = "Red";
-$a->strings["This is a hub of the Red Matrix - a global cooperative network of decentralised privacy enhanced websites."] = "";
+$a->strings["This is a hub of the Red Matrix - a global cooperative network of decentralised privacy enhanced websites."] = "Dieser Server ist Teil der Red-Matrix – einem global vernetzten Verbund aus dezentralen Websites mit Rücksicht auf die Privatsphäre.";
 $a->strings["Running at web location"] = "Erreichbar unter der Web-Adresse";
 $a->strings["Please visit <a href=\"http://getzot.com\">GetZot.com</a> to learn more about the Red Matrix."] = "Besuche <a href=\"http://getzot.com\">GetZot.com</a> um mehr über die Red Matrix zu erfahren.";
 $a->strings["Bug reports and issues: please visit"] = "Probleme oder Fehler gefunden? Bitte besuche";
@@ -1602,14 +1602,14 @@ $a->strings["I am over 13 years of age and accept the %s for this website"] = "I
 $a->strings["Membership on this site is by invitation only."] = "Mitgliedschaft auf dieser Seite ist nur nach vorheriger Einladung möglich.";
 $a->strings["Please enter your invitation code"] = "Bitte trage deinen Einladungs-Code ein";
 $a->strings["Your email address"] = "Ihre E-Mail Adresse";
-$a->strings["Choose a password"] = "Wählen Sie ein Passwort";
-$a->strings["Please re-enter your password"] = "Bitte geben Sie erneut Ihr Passwort ein";
-$a->strings["Please login."] = "Bitte loggen Sie sich ein.";
+$a->strings["Choose a password"] = "Passwort";
+$a->strings["Please re-enter your password"] = "Bitte gib dein Passwort noch einmal ein";
+$a->strings["Please login."] = "Bitte melde dich an.";
 $a->strings["Remote authentication blocked. You are logged into this site locally. Please logout and retry."] = "Entfernte Authentifizierung blockiert. Du bist lokal auf dieser Seite angemeldet. Bitte melde dich ab und versuche es erneut.";
 $a->strings["Welcome %s. Remote authentication successful."] = "Willkommen %s. Entfernte Authentifizierung erfolgreich.";
 $a->strings["Remove This Channel"] = "Diesen Kanal löschen!";
 $a->strings["This will completely remove this channel from the network. Once this has been done it is not recoverable."] = "Hiermit wird dieser Kanal komplett aus dem Netzwerk gelöscht. Einmal eingeleitet ist dieser Prozess nicht widerrufbar.";
-$a->strings["Please enter your password for verification:"] = "Bitte geben Sie Ihr Passwort zur Bestätigung ein:";
+$a->strings["Please enter your password for verification:"] = "Bitte gib zur Bestätigung dein Passwort ein:";
 $a->strings["Remove this channel and all its clones from the network"] = "Lösche diesen Kanal und all seine Klone aus dem Netzwerk";
 $a->strings["By default only the instance of the channel located on this hub will be removed from the network"] = "Standartmäßig wird der Kanal nur auf diesem Knoten gelöscht, seine Klone verbleiben im Netzwerk";
 $a->strings["Remove My Account"] = "Mein Konto entfernen";
@@ -1620,66 +1620,66 @@ $a->strings["previous page"] = "vorige Seite";
 $a->strings["No entries (some entries may be hidden)."] = "Keine Einträge gefunden (einige könnten versteckt sein).";
 $a->strings["Mood"] = "Laune";
 $a->strings["Set your current mood and tell your friends"] = "Wähle deine aktuelle Stimmung und erzähle sie deinen Freunden";
-$a->strings["Scheme Default"] = "";
+$a->strings["Scheme Default"] = "Standard-Schema";
 $a->strings["red"] = "Rot";
 $a->strings["black"] = "Schwarz";
 $a->strings["silver"] = "Silber";
 $a->strings["Theme settings"] = "Theme-Einstellungen";
-$a->strings["Set scheme"] = "Schema wählen";
+$a->strings["Set scheme"] = "Schema";
 $a->strings["Navigation bar colour"] = "Farbe der Navigationsleiste";
-$a->strings["Set font-colour for banner"] = "Farbe der Schrift des Banners setzen";
-$a->strings["Set the background colour"] = "Hintergrundfarbe wählen";
-$a->strings["Set the background image"] = "Hintergrundbild wählen";
-$a->strings["Set the background colour of items"] = "Hintergrundfarbe von Beiträgen wählen";
-$a->strings["Set the opacity of items"] = "Opazität von Beiträgen wählen";
-$a->strings["Set the basic colour for item icons"] = "Basis Farbe der Beitrags-Icons setzen";
-$a->strings["Set the hover colour for item icons"] = "";
-$a->strings["Set font-size for the entire application"] = "";
+$a->strings["Set font-colour for banner"] = "Farbe des Banners";
+$a->strings["Set the background colour"] = "Hintergrundfarbe";
+$a->strings["Set the background image"] = "Hintergrundbild";
+$a->strings["Set the background colour of items"] = "Hintergrundfarbe von Beiträgen";
+$a->strings["Set the opacity of items"] = "Deckkraft von Beiträgen";
+$a->strings["Set the basic colour for item icons"] = "Basisfarbe der Beitrags-Icons";
+$a->strings["Set the hover colour for item icons"] = "Farbe für Beitrags-Icons unter dem Mauszeiger";
+$a->strings["Set font-size for the entire application"] = "Schriftgröße für die ganze Applikation";
 $a->strings["Set font-size for posts and comments"] = "Wähle die Schriftgröße für Beiträge und Kommentare";
-$a->strings["Set font-colour for posts and comments"] = "Schriftfarbe für Beiträge und Kommentare wählen";
-$a->strings["Set radius of corners"] = "Radius von Ecken";
+$a->strings["Set font-colour for posts and comments"] = "Schriftfarbe für Beiträge und Kommentare";
+$a->strings["Set radius of corners"] = "Ecken-Radius";
 $a->strings["Set shadow depth of photos"] = "Schattentiefe von Fotos";
-$a->strings["Set maximum width of conversation regions"] = "";
-$a->strings["Set minimum opacity of nav bar - to hide it"] = "";
-$a->strings["Set size of conversation author photo"] = "";
-$a->strings["Set size of followup author photos"] = "";
-$a->strings["Sloppy photo albums"] = "";
+$a->strings["Set maximum width of conversation regions"] = "Maximalbreite der Konversationsbereiche";
+$a->strings["Set minimum opacity of nav bar - to hide it"] = "Mindest-Deckkraft der Navigationsleiste ( - versteckt sie)";
+$a->strings["Set size of conversation author photo"] = "Größe der Avatare von Themenstartern";
+$a->strings["Set size of followup author photos"] = "Größe der Avatare von Kommentatoren";
+$a->strings["Sloppy photo albums"] = "Schräge Fotoalben";
 $a->strings["Are you a clean desk or a messy desk person?"] = "Bist du jemand der einen aufgeräumten Schreibtisch hat, oder eher einen chaotischen?";
 $a->strings["Schema Default"] = "Standard-Schema";
 $a->strings["Sans-Serif"] = "Sans-Serif";
 $a->strings["Monospace"] = "Monospace";
-$a->strings["Set font face"] = "Schriftart wählen";
-$a->strings["Set iconset"] = "Iconset wählen";
-$a->strings["Set big shadow size, default 15px 15px 15px"] = "";
-$a->strings["Set small shadow size, default 5px 5px 5px"] = "";
-$a->strings["Set shadow colour, default #000"] = "";
-$a->strings["Set radius size, default 5px"] = "";
+$a->strings["Set font face"] = "Schriftart";
+$a->strings["Set iconset"] = "Iconset";
+$a->strings["Set big shadow size, default 15px 15px 15px"] = "Ausmaß der großen Schatten (Default 15px 15px 15px)";
+$a->strings["Set small shadow size, default 5px 5px 5px"] = "Ausmaß der kleinen Schatten (Default 5px 5px 5px)";
+$a->strings["Set shadow colour, default #000"] = "Farbe der Schatten (Default #000)";
+$a->strings["Set radius size, default 5px"] = "Ecken-Radius (Default 5px)";
 $a->strings["Set line-height for posts and comments"] = "Wähle die Zeilenhöhe in Beiträgen und Kommentaren";
-$a->strings["Set background image"] = "Hintergrundbild wählen";
-$a->strings["Set background colour"] = "Hintergrundfarbe wählen";
-$a->strings["Set section background image"] = "";
-$a->strings["Set section background colour"] = "";
-$a->strings["Set colour of items - use hex"] = "Wähle die Farbe von Beiträgen - verwende HEX";
-$a->strings["Set colour of links - use hex"] = "Wähle die Farbe von Links - verwende HEX";
-$a->strings["Set max-width for items.  Default 400px"] = "Maximale Breite von Beiträgen. Standard ist 400px";
-$a->strings["Set min-width for items.  Default 240px"] = "Minimale Breite von Beiträgen. Standard ist 240px";
-$a->strings["Set the generic content wrapper width.  Default 48%"] = "Breite des \"generic content wrapper\". Standard ist 48%";
-$a->strings["Set colour of fonts - use hex"] = "Schriftfarbe - verwende HEX";
+$a->strings["Set background image"] = "Hintergrundbild";
+$a->strings["Set background colour"] = "Hintergrundfarbe";
+$a->strings["Set section background image"] = "Hintergrundbild des mittleren Bereichs";
+$a->strings["Set section background colour"] = "Hintergrundfarbe des mittleren Bereichs";
+$a->strings["Set colour of items - use hex"] = "Farbe von Beiträgen (HEX)";
+$a->strings["Set colour of links - use hex"] = "Farbe von Links (HEX)";
+$a->strings["Set max-width for items.  Default 400px"] = "Maximalbreite von Beiträgen (Default 400px)";
+$a->strings["Set min-width for items.  Default 240px"] = "Minimalbreite von Beiträgen (Default 240px)";
+$a->strings["Set the generic content wrapper width.  Default 48%"] = "Breite des „generic content wrapper“ (Default 48%)";
+$a->strings["Set colour of fonts - use hex"] = "Schriftfarbe (HEX)";
 $a->strings["Set background-size element"] = "Größe des Hintergrund-Elements";
 $a->strings["Item opacity"] = "Opazität von Beiträgen";
 $a->strings["Display post previews only"] = "Nur Beitragsvorschau anzeigen";
 $a->strings["Display side bar on channel page"] = "Zeige die Seitenleiste auf der Kanal-Seite";
 $a->strings["Colour of the navigation bar"] = "Farbe der Navigationsleiste";
 $a->strings["Item float"] = "Beitragsfluss";
-$a->strings["Left offset of the section element"] = "Linker Rand des Section Elements";
-$a->strings["Right offset of the section element"] = "Rechter Rand des Section Elements";
-$a->strings["Section width"] = "Breite der Section";
-$a->strings["Left offset of the aside"] = "Linker Rand der aside";
-$a->strings["Right offset of the aside element"] = "Rechter Rand der aside";
+$a->strings["Left offset of the section element"] = "Linker Rand des mittleren Bereichs";
+$a->strings["Right offset of the section element"] = "Rechter Rand des mittleren Bereichs";
+$a->strings["Section width"] = "Breite des mittleren Bereichs";
+$a->strings["Left offset of the aside"] = "Linker Rand des seitlichen Bereichs";
+$a->strings["Right offset of the aside element"] = "Rechter Rand des seitlichen Bereichs";
 $a->strings["None"] = "Keine";
 $a->strings["Header image"] = "Titelbild";
 $a->strings["Header image only on profile pages"] = "Titelbild nur auf Profil-Seiten anzeigen";
-$a->strings["Update %s failed. See error logs."] = "Aktualisierung %s fehlgeschlagen. Details in den Fehlerlogs.";
+$a->strings["Update %s failed. See error logs."] = "Aktualisierung %s fehlgeschlagen. Details in den Fehlerprotokollen.";
 $a->strings["Update Error at %s"] = "Aktualisierungsfehler auf %s";
 $a->strings["Create an account to access services and applications within the Red Matrix"] = "Erstelle einen Account um Anwendungen und Dienste innerhalb der Red Matrix verwenden zu können.";
 $a->strings["Password"] = "Kennwort";
-- 
cgit v1.2.3


From 6c6c8a245150a49dbd6191d15452366c3522f56e Mon Sep 17 00:00:00 2001
From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Fri, 6 Dec 2013 12:00:43 +0100
Subject: add option to hide login form from homepage

---
 view/tpl/admin_site.tpl | 1 +
 1 file changed, 1 insertion(+)

(limited to 'view')

diff --git a/view/tpl/admin_site.tpl b/view/tpl/admin_site.tpl
index d0a5254fe..b0f9d4a74 100755
--- a/view/tpl/admin_site.tpl
+++ b/view/tpl/admin_site.tpl
@@ -47,6 +47,7 @@
     {{include file="field_select.tpl" field=$theme_mobile}}
     {{include file="field_select.tpl" field=$theme_accessibility}}
     {{include file="field_input.tpl" field=$site_channel}}
+    {{include file="field_checkbox.tpl" field=$no_login_on_homepage}}
 
 	
 	<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
-- 
cgit v1.2.3


From f45b06ffa004c6e6920214b64efe18e3cfe2d667 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Fri, 6 Dec 2013 21:40:01 -0800
Subject: suggestion widget

---
 view/theme/redbasic/css/style.css |  3 ++-
 view/tpl/suggest_friends.tpl      |  2 +-
 view/tpl/suggest_widget.tpl       | 10 ++++++++++
 3 files changed, 13 insertions(+), 2 deletions(-)
 create mode 100644 view/tpl/suggest_widget.tpl

(limited to 'view')

diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 0ddbe1b86..2e00fde41 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -932,7 +932,7 @@ tr.mceLast {
 .contact-entry-photo img, .profile-match-photo img, #photo-photo img, .directory-photo-img, .photo-album-photo, .photo-top-photo {
     border-radius: $radiuspx;
     -moz-border-radius: $radiuspx;
-    box-shadow: 4px 4px 3px 0 #444444;
+    box-shadow: $shadowpx $shadowpx $shadowpx 0 #444444;
 }
 
 #sidebar-page-list .label {
@@ -2979,3 +2979,4 @@ img.mail-list-sender-photo {
 .comment-edit-text-full {
 	color: black;
 }
+.suggest-widget-more { margin-top: 10px; }
\ No newline at end of file
diff --git a/view/tpl/suggest_friends.tpl b/view/tpl/suggest_friends.tpl
index 80a606912..baece361a 100755
--- a/view/tpl/suggest_friends.tpl
+++ b/view/tpl/suggest_friends.tpl
@@ -1,5 +1,5 @@
 <div class="profile-match-wrapper">
-	<a href="{{$entry.ignlnk}}" title="{{$entry.ignore}}" class="icon drophide smalldrop profile-match-ignore" onmouseout="imgdull(this);" onmouseover="imgbright(this);" onclick="return confirmDelete();" ></a>
+	<a href="{{$entry.ignlnk}}" title="{{$entry.ignore}}" class="profile-match-ignore" onclick="return confirmDelete();" ><i class="icon-remove drop-icons"></i></a>
 	<div class="profile-match-photo">
 		<a href="{{$entry.url}}">
 			<img src="{{$entry.photo}}" alt="{{$entry.name}}" width="80" height="80" title="{{$entry.name}} [{{$entry.url}}]" />
diff --git a/view/tpl/suggest_widget.tpl b/view/tpl/suggest_widget.tpl
new file mode 100644
index 000000000..eba8b496e
--- /dev/null
+++ b/view/tpl/suggest_widget.tpl
@@ -0,0 +1,10 @@
+<div class="widget">
+<h3>{{$title}}</h3>
+{{if $entries}}
+{{foreach $entries as $child}}
+{{include file="suggest_friends.tpl" entry=$child}}
+{{/foreach}}
+{{/if}}
+<div class="clear"></div>
+<div class="suggest-widget-more"><a href="suggest">{{$more}}</a></div>
+</div>
\ No newline at end of file
-- 
cgit v1.2.3


From a1a5b7047605eb595c6f97e8719a0af7f3aaf973 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Fri, 6 Dec 2013 21:53:32 -0800
Subject: more overflow hidden important so it works

---
 view/theme/redbasic/css/style.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'view')

diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 2e00fde41..dd11fa144 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -1634,7 +1634,7 @@ a.mail-list-link {
 	float: left;
 	text-align: center;
 	width: 120px;
-	overflow: hidden;
+	overflow: hidden !important;
 }
 
 .profile-match-note {
-- 
cgit v1.2.3


From 4123d3aa54e1655300ae7aac8cd8860524178e41 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Fri, 6 Dec 2013 22:04:07 -0800
Subject: tweaking of the name field size and limits so it doesn't push the
 content around

---
 view/theme/redbasic/css/style.css | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'view')

diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index dd11fa144..491f0a60e 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -1631,9 +1631,10 @@ a.mail-list-link {
 }
 
 .profile-match-name {
-	float: left;
+/*	float: left; */
 	text-align: center;
 	width: 120px;
+	height: 18px;
 	overflow: hidden !important;
 }
 
-- 
cgit v1.2.3


From 08bbab9a06e56e2305ec3d48f5507ce3b909d286 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Fri, 6 Dec 2013 22:54:21 -0800
Subject: show a clean url in the hovertip for suggested friends

---
 view/tpl/suggest_friends.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'view')

diff --git a/view/tpl/suggest_friends.tpl b/view/tpl/suggest_friends.tpl
index baece361a..0388504d2 100755
--- a/view/tpl/suggest_friends.tpl
+++ b/view/tpl/suggest_friends.tpl
@@ -2,7 +2,7 @@
 	<a href="{{$entry.ignlnk}}" title="{{$entry.ignore}}" class="profile-match-ignore" onclick="return confirmDelete();" ><i class="icon-remove drop-icons"></i></a>
 	<div class="profile-match-photo">
 		<a href="{{$entry.url}}">
-			<img src="{{$entry.photo}}" alt="{{$entry.name}}" width="80" height="80" title="{{$entry.name}} [{{$entry.url}}]" />
+			<img src="{{$entry.photo}}" alt="{{$entry.name}}" width="80" height="80" title="{{$entry.name}} [{{$entry.profile}}]" />
 		</a>
 	</div>
 	<div class="profile-match-break"></div>
-- 
cgit v1.2.3


From e33d9d358a8cee4851e7db22258bc70c9ac9dab3 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Sat, 7 Dec 2013 00:59:36 -0800
Subject: make suggestion photo sizes match top level post sizes

---
 view/theme/redbasic/css/style.css | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'view')

diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 491f0a60e..14a708e55 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -935,6 +935,11 @@ tr.mceLast {
     box-shadow: $shadowpx $shadowpx $shadowpx 0 #444444;
 }
 
+.profile-match-photo img {
+	width: $top_photo !important;
+	height: $top_photo !important;
+}
+
 #sidebar-page-list .label {
     margin-left: 5px;
 }
-- 
cgit v1.2.3


From 6dc157a9f9f46dbb4fe694d32e733eb1a2f5444f Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Sat, 7 Dec 2013 13:05:17 -0800
Subject: finish ACL's in personal menus

---
 view/js/mod_mitem.js   | 22 ++++++++++++++++++++++
 view/tpl/mitemedit.tpl | 20 ++++++++++++++++++++
 2 files changed, 42 insertions(+)
 create mode 100644 view/js/mod_mitem.js

(limited to 'view')

diff --git a/view/js/mod_mitem.js b/view/js/mod_mitem.js
new file mode 100644
index 000000000..d33713ee3
--- /dev/null
+++ b/view/js/mod_mitem.js
@@ -0,0 +1,22 @@
+$(document).ready(function() {
+
+	$("a#settings-default-perms-menu").colorbox({ 
+		'inline' : true, 
+		'transition' : 'elastic' 
+	});
+
+
+	$('#contact_allow, #contact_deny, #group_allow, #group_deny').change(function() {
+		var selstr;
+		$('#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected').each( function() {
+			selstr = $(this).text();
+			$('#jot-perms-icon').removeClass('unlock').addClass('lock');
+			$('#jot-public').hide();
+		});
+		if(selstr == null) { 
+			$('#jot-perms-icon').removeClass('lock').addClass('unlock');
+			$('#jot-public').show();
+		}
+
+	}).trigger('change');
+});
diff --git a/view/tpl/mitemedit.tpl b/view/tpl/mitemedit.tpl
index ef61be809..8f13f80c9 100644
--- a/view/tpl/mitemedit.tpl
+++ b/view/tpl/mitemedit.tpl
@@ -14,6 +14,26 @@
 {{include file="field_input.tpl" field=$mitem_order}}
 {{include file="field_checkbox.tpl" field=$usezid}}
 {{include file="field_checkbox.tpl" field=$newwin}}
+
+<div id="settings-default-perms" class="settings-default-perms" >
+	<a href="#profile-jot-acl-wrapper" id="settings-default-perms-menu" >{{$permissions}} {{$permdesc}}</a>
+	<div id="settings-default-perms-menu-end"></div>
+
+	<div id="settings-default-perms-select" style="display: none; margin-bottom: 20px" >
+	
+	<div style="display: none;">
+		<div id="profile-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;">
+			{{$aclselect}}
+		</div>
+	</div>
+
+	</div>
+</div>
+<br/>
+<div id="settings-default-perms-end"></div>
+
+
+
 <div class="mitemedit-submit-wrapper" >
 <input type="submit" name="submit" class="mitemedit-submit" value="{{$submit}}" />
 </div>
-- 
cgit v1.2.3


From d6d6387a7b788165ffb0a46703252271d546bd8a Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Sat, 7 Dec 2013 22:46:52 -0800
Subject: typo in mod_poke.js

---
 view/js/mod_poke.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'view')

diff --git a/view/js/mod_poke.js b/view/js/mod_poke.js
index edd53bb6a..78972888f 100644
--- a/view/js/mod_poke.js
+++ b/view/js/mod_poke.js
@@ -4,7 +4,7 @@ $(document).ready(function() {
 		serviceUrl: baseurl + '/acl',
 		minChars: 2,
 		width: 250,
-		id: 'poke-recip-ac';
+		id: 'poke-recip-ac',
 		onSelect: function(value,data) {
 			$("#poke-recip-complete").val(data);
 		}			
-- 
cgit v1.2.3


From 5aa6b69320c1e53e184361490cb13e3710fbe539 Mon Sep 17 00:00:00 2001
From: Christian Vogeley <christian.vogeley@hotmail.de>
Date: Sun, 8 Dec 2013 16:57:05 +0100
Subject: submit button height

---
 view/css/conversation.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'view')

diff --git a/view/css/conversation.css b/view/css/conversation.css
index bf8e0236e..5bf6a3607 100644
--- a/view/css/conversation.css
+++ b/view/css/conversation.css
@@ -37,7 +37,7 @@
 }
 
 #profile-jot-submit {
-	height: 30px;
+	height: 22px;
 	width: 70px;
 	float: right;
 }
-- 
cgit v1.2.3


From 2dfd65f90b23e92da692311f2c5b7c6503e0ce25 Mon Sep 17 00:00:00 2001
From: Christian Vogeley <christian.vogeley@hotmail.de>
Date: Sun, 8 Dec 2013 18:49:48 +0100
Subject: override bootstrap in bootstrap-red

so theme developers are not forced to change anything
---
 view/css/bootstrap-red.css | 67 ++++++++++++++++++++++++++++++++++++++++++++
 view/css/default.css       | 69 ----------------------------------------------
 view/php/theme_init.php    |  1 +
 3 files changed, 68 insertions(+), 69 deletions(-)
 create mode 100644 view/css/bootstrap-red.css

(limited to 'view')

diff --git a/view/css/bootstrap-red.css b/view/css/bootstrap-red.css
new file mode 100644
index 000000000..73c06fd4b
--- /dev/null
+++ b/view/css/bootstrap-red.css
@@ -0,0 +1,67 @@
+/* override some bootstrap settings */
+*,
+*:before,
+*:after {
+  -webkit-box-sizing: content-box;
+     -moz-box-sizing: content-box;
+          box-sizing: content-box;
+}
+
+html {
+font-size: 100%;
+}
+
+.panel-body .form-control{
+  -webkit-box-sizing: border-box;
+     -moz-box-sizing: border-box;
+          box-sizing: border-box;
+} 
+.profile-jot-text{
+  -webkit-box-sizing: content-box;
+     -moz-box-sizing: content-box;
+          box-sizing: content-box;
+} 
+
+
+h1,
+.h1 {
+  font-size: 24px;
+}
+
+h2,
+.h2 {
+  font-size: 18px;
+}
+
+h3,
+.h3 {
+  font-size: 16px;
+}
+
+h4,
+.h4 {
+  font-size: 14px;
+}
+
+h5,
+.h5 {
+  font-size: 12px;
+}
+
+h6,
+.h6 {
+  font-size: 10px;
+}
+textarea {
+line-height: initial;
+}
+
+.radio, .checkbox{
+padding-left: 0px;
+margin-left: 0px;
+}
+
+.checkbox input[type="checkbox"], inline input[type="checkbox"]{
+float:none;
+margin-left:0px;
+}
diff --git a/view/css/default.css b/view/css/default.css
index eb39b31d5..27df38dee 100644
--- a/view/css/default.css
+++ b/view/css/default.css
@@ -30,72 +30,3 @@ section {
 	right: 15px;
 	padding-bottom: 350px;
 }
-
-
-/* override some bootstrap settings */
-*,
-*:before,
-*:after {
-  -webkit-box-sizing: content-box;
-     -moz-box-sizing: content-box;
-          box-sizing: content-box;
-}
-
-html {
-font-size: 100%;
-}
-
-.panel-body .form-control{
-  -webkit-box-sizing: border-box;
-     -moz-box-sizing: border-box;
-          box-sizing: border-box;
-} 
-.profile-jot-text{
-  -webkit-box-sizing: content-box;
-     -moz-box-sizing: content-box;
-          box-sizing: content-box;
-} 
-
-
-h1,
-.h1 {
-  font-size: 24px;
-}
-
-h2,
-.h2 {
-  font-size: 18px;
-}
-
-h3,
-.h3 {
-  font-size: 16px;
-}
-
-h4,
-.h4 {
-  font-size: 14px;
-}
-
-h5,
-.h5 {
-  font-size: 12px;
-}
-
-h6,
-.h6 {
-  font-size: 10px;
-}
-textarea {
-line-height: initial;
-}
-
-.radio, .checkbox{
-padding-left: 0px;
-margin-left: 0px;
-}
-
-.checkbox input[type="checkbox"], inline input[type="checkbox"]{
-float:none;
-margin-left:0px;
-}
diff --git a/view/php/theme_init.php b/view/php/theme_init.php
index e0992f0f0..e2c536812 100644
--- a/view/php/theme_init.php
+++ b/view/php/theme_init.php
@@ -12,6 +12,7 @@ head_add_css('library/prettyphoto/css/prettyPhoto.css');
 head_add_css('library/colorbox/colorbox.css');
 // head_add_css('library/font_awesome/css/font-awesome.min.css');
 head_add_css('view/css/conversation.css');
+head_add_css('view/css/bootstrap-red.css');
 
 head_add_js('js/jquery.js');
 head_add_js('library/bootstrap/js/bootstrap.min.js');
-- 
cgit v1.2.3


From 9f185b95f5a35b841a0c1ba9b49a0b7de47cda5e Mon Sep 17 00:00:00 2001
From: Christian Vogeley <christian.vogeley@hotmail.de>
Date: Sun, 8 Dec 2013 19:06:43 +0100
Subject: Minified bootstrap css

---
 view/php/theme_init.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'view')

diff --git a/view/php/theme_init.php b/view/php/theme_init.php
index e2c536812..ffbc02e48 100644
--- a/view/php/theme_init.php
+++ b/view/php/theme_init.php
@@ -3,7 +3,7 @@
 require_once('include/plugin.php');
 
 head_add_css('library/bootstrap/css/bootstrap-theme.min.css');
-head_add_css('library/bootstrap/css/bootstrap.css'); 
+head_add_css('library/bootstrap/css/bootstrap.min.css'); 
 head_add_css('library/fancybox/jquery.fancybox-1.3.4.css');
 head_add_css('library/tiptip/tipTip.css');
 head_add_css('library/jgrowl/jquery.jgrowl.css');
-- 
cgit v1.2.3


From 77fd6e71379f78d2abb94f85ce4ad68caa7aa370 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Sun, 8 Dec 2013 21:00:52 -0800
Subject: icon update

---
 view/tpl/photo_drop.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'view')

diff --git a/view/tpl/photo_drop.tpl b/view/tpl/photo_drop.tpl
index 94ef5a3ee..cb7ae17ba 100755
--- a/view/tpl/photo_drop.tpl
+++ b/view/tpl/photo_drop.tpl
@@ -1,4 +1,4 @@
 <div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-{{$id}}" >
-	<a href="item/drop/{{$id}}" onclick="return confirmDelete();" class="icon drophide" title="{{$delete}}" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>
+	<a href="item/drop/{{$id}}" onclick="return confirmDelete();" title="{{$delete}}" ><i class="icon-remove drop-icons"></i></a>
 </div>
 <div class="wall-item-delete-end"></div>
-- 
cgit v1.2.3


From 860966ce421210e9f48d36dee72b8aa10a39c7c6 Mon Sep 17 00:00:00 2001
From: marijus <mario@localhost.localdomain>
Date: Mon, 9 Dec 2013 10:07:24 +0100
Subject: this reduces pageloadsize by 355,93KB

---
 view/php/theme_init.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'view')

diff --git a/view/php/theme_init.php b/view/php/theme_init.php
index ffbc02e48..a2024d658 100644
--- a/view/php/theme_init.php
+++ b/view/php/theme_init.php
@@ -29,7 +29,7 @@ head_add_js('library/jquery.divgrow/jquery.divgrow-1.3.1.js');
 head_add_js('library/jquery_ac/friendica.complete.js');
 head_add_js('library/tiptip/jquery.tipTip.minified.js');
 head_add_js('library/jgrowl/jquery.jgrowl_minimized.js');
-head_add_js('library/tinymce/jscripts/tiny_mce/tiny_mce_src.js');
+head_add_js('library/tinymce/jscripts/tiny_mce/tiny_mce.js');
 head_add_js('library/cryptojs/components/core-min.js');
 head_add_js('library/cryptojs/rollups/aes.js');
 head_add_js('library/cryptojs/rollups/rabbit.js');
-- 
cgit v1.2.3


From f85cba10eb3d976d715c7a80fe69fe15d9dc468c Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Mon, 9 Dec 2013 15:27:46 -0800
Subject: notes widget

---
 view/theme/redbasic/css/style.css |  9 ++++++++-
 view/tpl/notes.tpl                | 13 +++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 view/tpl/notes.tpl

(limited to 'view')

diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 14a708e55..31aa45995 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -2985,4 +2985,11 @@ img.mail-list-sender-photo {
 .comment-edit-text-full {
 	color: black;
 }
-.suggest-widget-more { margin-top: 10px; }
\ No newline at end of file
+.suggest-widget-more { margin-top: 10px; }
+
+#note-text {
+	width: 190px;
+	max-width: 190px;
+	height: 150px;
+}
+#note-save { margin-top: 10px; }
\ No newline at end of file
diff --git a/view/tpl/notes.tpl b/view/tpl/notes.tpl
new file mode 100644
index 000000000..7300779f4
--- /dev/null
+++ b/view/tpl/notes.tpl
@@ -0,0 +1,13 @@
+<div class="widget">
+<script>
+function notePost() {
+	$('#note-rotator').spin('tiny');
+	$.post('notes', { 'note_text' : $('#note-text').val() },function(data) { $('#note-rotator').spin(false); });
+}
+</script>
+
+<h3>{{$banner}}</h3>
+<textarea name="note_text" id="note-text">{{$text}}</textarea>
+<input type="submit" name="submit" id="note-save" value="{{$save}}" onclick="notePost(); return true;">
+<div id="note-rotator"></div>
+</div>
-- 
cgit v1.2.3


From 76d8501d671ae7d4234f1a905cd0e506c7f9b23e Mon Sep 17 00:00:00 2001
From: marijus <mario@localhost.localdomain>
Date: Tue, 10 Dec 2013 00:32:49 +0100
Subject: saved search icon work and bugfixes for #tags not beeing deletable
 and save button showing if saved search is disabled

---
 view/theme/redbasic/css/style.css | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

(limited to 'view')

diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 14a708e55..ede7c4abd 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -1232,13 +1232,26 @@ a.mail-list-link {
 .groupsideedit {
 	margin-right: 10px;
 }
+
 #saved-search-ul {
 	list-style-type: none;
 }
+
+.saved-search-li i {
+	opacity: 0;
+}
+
+.saved-search-li:hover i {
+	opacity: 1;
+}
+
+/*
 .savedsearchdrop, .savedsearchterm {
 	float: left;
 	margin-top: 10px;
 }
+*/
+
 .savedsearchterm {
 	margin-left: 10px;
 }
@@ -2985,4 +2998,4 @@ img.mail-list-sender-photo {
 .comment-edit-text-full {
 	color: black;
 }
-.suggest-widget-more { margin-top: 10px; }
\ No newline at end of file
+.suggest-widget-more { margin-top: 10px; }
-- 
cgit v1.2.3


From bc78334be73d3f78aa13ec5a6917e6adb5143975 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Mon, 9 Dec 2013 18:28:52 -0800
Subject: more css shrinkage

---
 view/css/mod_connections.css      | 122 +++++++++++++
 view/css/mod_directory.css        |  39 ++++
 view/css/mod_photos.css           | 154 ++++++++++++++++
 view/theme/redbasic/css/style.css | 374 +-------------------------------------
 view/tpl/photo_album.tpl          |   4 +-
 5 files changed, 323 insertions(+), 370 deletions(-)
 create mode 100644 view/css/mod_directory.css
 create mode 100644 view/css/mod_photos.css

(limited to 'view')

diff --git a/view/css/mod_connections.css b/view/css/mod_connections.css
index 978d81bc1..ee2ea52ac 100644
--- a/view/css/mod_connections.css
+++ b/view/css/mod_connections.css
@@ -32,3 +32,125 @@
 .field_abook_help {
 	float: left;
 }
+
+#contacts-main {
+	margin-top: 20px;
+	margin-bottom: 20px;
+}
+
+.contact-entry-wrapper {
+	float: left;
+	width: 120px;
+	height: 120px;
+	padding: 10px;
+}
+
+#contacts-search {
+	font-size: 1em;
+	width: 300px;
+}
+
+#contacts-search-end {
+	margin-bottom: 10px;
+}
+
+.contact-entry-photo img {
+	border: none;
+}
+.contact-entry-photo-end {
+	clear: both;
+}
+.contact-entry-name {
+	float: left;
+	margin-left: 0px;
+	margin-right: 10px;
+	width: 120px;
+	overflow: hidden;
+}
+.contact-entry-edit-links {
+	margin-top: 6px;
+	margin-left: 10px;
+	width: 16px;
+}
+.contact-entry-nav-wrapper {
+	float: left;
+	margin-left: 10px;
+}
+
+.contact-entry-edit-links img {
+	border: none;
+	margin-right: 15px;
+}
+.contact-entry-photo {
+	float: left;
+	position: relative;
+}
+.contact-entry-end {
+	clear: both;
+}
+
+
+#contact-edit-wrapper {
+	margin-top: 10px;
+}
+
+#contact-edit-banner-name {
+	font-size: 1.4em;
+	font-weight: bold;
+}
+
+#contact-edit-poll-wrapper {
+	margin-top: 15px;
+}
+
+#contact-edit-poll-text {
+	margin-top: 15px;
+	margin-bottom: 5px;
+}
+
+#contact-edit-update-now {
+	margin-top: 15px;
+}
+
+#contact-edit-links{
+	clear: both;
+}
+
+#contact-edit-links ul {
+	list-style: none;
+	list-style-type: none;
+	margin-left: 0px;
+	padding-left: 0px;
+}
+
+#contact-edit-links li {
+	margin-top: 5px;
+}
+
+#contact-edit-drop-link {
+	float: right;
+	margin-right: 20px;
+}
+
+#contact-edit-nav-end {
+	clear: both;
+}
+
+#contact-edit-wrapper {
+	width: 100%;
+}
+
+#contact-edit-end {
+	clear: both;
+	margin-top: 15px;
+}
+
+#contact-profile-selector {
+	width: 175px;
+	margin-left: 175px;
+}
+
+.contact-edit-submit {
+	margin-top: 20px;
+}
+
diff --git a/view/css/mod_directory.css b/view/css/mod_directory.css
new file mode 100644
index 000000000..578777054
--- /dev/null
+++ b/view/css/mod_directory.css
@@ -0,0 +1,39 @@
+
+.directory-end {
+	clear: both;
+}
+.directory-name {
+	text-align: center;
+}
+.directory-photo {
+	margin-left: 25px;
+}
+.directory-details {
+	text-align: center;
+	margin-left: 5px;
+	margin-right: 5px;
+}
+.directory-item {
+	float: left;
+	width: 225px;
+	height: 260px;
+	overflow: hidden;
+	margin: 2px;
+}
+
+#directory-search-wrapper {
+	margin-top: 20px;
+	margin-right: 20px;
+	margin-bottom: 50px;
+}
+
+#directory-search-end {
+}
+
+.directory-photo-img {
+	border: none;
+}
+
+div.dirtagblock.widget {
+  overflow: hidden;
+}
diff --git a/view/css/mod_photos.css b/view/css/mod_photos.css
new file mode 100644
index 000000000..80508142a
--- /dev/null
+++ b/view/css/mod_photos.css
@@ -0,0 +1,154 @@
+
+
+.photo-top-photo, .photo-album-photo {
+    padding: 10px;
+    max-width: 300px;
+}
+
+
+.photos-end {
+	clear: both;
+	margin-bottom: 25px;
+}
+
+.photo-album-image-wrapper {
+	float: left;
+	margin-top: 15px;
+	margin-right: 15px;
+	margin-left: 15px;
+}
+.photo-album-image-wrapper .caption {
+	display: none; 
+ 	width: 100%;
+ 	bottom: 0px; 
+ 	padding: 0.5em 0.5em 0px 0.5em;
+ 	margin: 0px;
+}
+.photo-album-image-wrapper a:hover .caption {
+	display:block;
+}
+
+#photo-album-end {
+	clear: both;
+	margin-bottom: 25px;
+}
+
+.photo-top-image-wrapper {
+	float: left;
+	margin-top: 15px;
+	margin-right: 15px;
+	margin-left: 15px;
+	margin-bottom: 15px;
+}
+.photo-top-album-name {
+ 	width: 100%;
+ 	min-height: 2em;
+ 	bottom: 0px; 
+ 	padding: 0px 3px;
+ 	padding-top: 0.5em;
+}
+#photo-top-end {
+	clear: both;
+}
+
+#photo-top-links {
+	margin-bottom: 30px;
+	margin-left: 30px;
+}
+
+#photos-upload-newalbum-div {
+	float: left;
+	width: 175px;
+}
+
+#photos-upload-noshare {
+	margin-bottom: 10px;
+}
+#photos-upload-existing-album-text {
+	float: left;
+	width: 175px;
+}
+#photos-upload-newalbum {
+	float: left;
+}
+#photos-upload-album-select {
+	float: left;
+}
+
+#photos-upload-spacer {
+	margin-top: 25px;
+}
+#photos-upload-new-end, #photos-upload-exist-end {
+	clear: both;
+}
+#photos-upload-exist-end {
+	margin-bottom: 15px;
+}
+#photos-upload-submit {
+	margin-top: 15px;
+}
+
+
+#photos-upload-select-files-text {
+	margin-top: 15px;
+	margin-bottom: 15px;
+}
+
+#photo-edit-caption-label, #photo-edit-tags-label, #photo-edit-albumname-label, #photo-edit-rotate-label {
+	float: left;
+	width: 150px;
+}
+
+#photo-edit-perms-end {
+	margin-bottom: 15px;
+}
+
+#photo-edit-caption, #photo-edit-newtag, #photo-edit-albumname, #photo-edit-rotate {
+	float: left;
+	margin-bottom: 25px;
+}
+#photo-edit-link-wrap {
+	margin-bottom: 15px;
+}
+#photo-like-div {
+	margin-bottom: 25px;
+}
+
+#photo-edit-caption-end, #photo-edit-tags-end, #photo-edit-albumname-end, #photo-edit-rotate-end {
+	clear: both;
+}
+
+#photo-edit-rotate-end {
+	margin-bottom: 15px;
+}
+
+#photo-edit-delete-button {
+	margin-left: 200px;
+}
+#photo-edit-end {
+	margin-bottom: 35px;
+}
+#photo-caption {
+	margin-top: 15px;
+	margin-bottom: 15px;
+}
+
+#in-this-photo-text {
+	margin-left: 30px;
+}
+
+#in-this-photo {
+	margin-left: 60px;
+	margin-top: 10px;
+	margin-bottom: 20px;
+}
+
+#photo-album-edit-submit, #photo-album-edit-drop {
+	margin-top: 15px;
+	margin-bottom: 15px;
+}
+
+#photo-album-edit-drop {
+	margin-left: 200px;
+}
+
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 83781ebb9..708085b02 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -576,61 +576,6 @@ footer {
 }
 
 
-#contacts-main {
-	margin-top: 20px;
-	margin-bottom: 20px;
-}
-
-.contact-entry-wrapper {
-	float: left;
-	width: 120px;
-	height: 120px;
-	padding: 10px;
-}
-
-#contacts-search {
-	font-size: 1em;
-	width: 300px;
-}
-
-#contacts-search-end {
-	margin-bottom: 10px;
-}
-
-.contact-entry-photo img {
-	border: none;
-}
-.contact-entry-photo-end {
-	clear: both;
-}
-.contact-entry-name {
-	float: left;
-	margin-left: 0px;
-	margin-right: 10px;
-	width: 120px;
-	overflow: hidden;
-}
-.contact-entry-edit-links {
-	margin-top: 6px;
-	margin-left: 10px;
-	width: 16px;
-}
-.contact-entry-nav-wrapper {
-	float: left;
-	margin-left: 10px;
-}
-
-.contact-entry-edit-links img {
-	border: none;
-	margin-right: 15px;
-}
-.contact-entry-photo {
-	float: left;
-	position: relative;
-}
-.contact-entry-end {
-	clear: both;
-}
 
 #fsuggest-desc, #fsuggest-submit-wrapper {
 	margin-top: 15px;
@@ -714,44 +659,8 @@ footer {
 }
 
 
-.directory-end {
-	clear: both;
-}
-.directory-name {
-	text-align: center;
-}
-.directory-photo {
-	margin-left: 25px;
-}
 .directory-details {
 	font-size: 0.7em;
-	text-align: center;
-	margin-left: 5px;
-	margin-right: 5px;
-}
-.directory-item {
-	float: left;
-	width: 225px;
-	height: 260px;
-	overflow: hidden;
-	margin: 2px;
-}
-
-#directory-search-wrapper {
-	margin-top: 20px;
-	margin-right: 20px;
-	margin-bottom: 50px;
-}
-
-#directory-search-end {
-}
-
-.directory-photo-img {
-	border: none;
-}
-
-div.dirtagblock.widget {
-  overflow: hidden;
 }
 
 .pager {
@@ -785,72 +694,6 @@ div.dirtagblock.widget {
   padding: 4px;
 }
 
-
-#contact-edit-wrapper {
-	margin-top: 10px;
-}
-
-#contact-edit-banner-name {
-	font-size: 1.4em;
-	font-weight: bold;
-}
-
-#contact-edit-poll-wrapper {
-	margin-top: 15px;
-}
-
-#contact-edit-poll-text {
-	margin-top: 15px;
-	margin-bottom: 5px;
-}
-
-#contact-edit-update-now {
-	margin-top: 15px;
-}
-
-#contact-edit-links{
-	clear: both;
-}
-
-#contact-edit-links ul {
-	list-style: none;
-	list-style-type: none;
-	margin-left: 0px;
-	padding-left: 0px;
-}
-
-#contact-edit-links li {
-	margin-top: 5px;
-}
-
-#contact-edit-drop-link {
-	float: right;
-	margin-right: 20px;
-}
-
-#contact-edit-nav-end {
-	clear: both;
-}
-
-#contact-edit-wrapper {
-	width: 100%;
-}
-
-#contact-edit-end {
-	clear: both;
-	margin-top: 15px;
-}
-
-#contact-profile-selector {
-	width: 175px;
-	margin-left: 175px;
-}
-
-.contact-edit-submit {
-	margin-top: 20px;
-}
-
-
 #block-message, #ignore-message, #archive-message, #lost-contact-message {
 	color: #FF0000;
 }
@@ -944,8 +787,6 @@ tr.mceLast {
     margin-left: 5px;
 }
 
-/*TODO - there appears to be significant redundancy here */
-
 .photo {
     border: 1px solid #AAAAAA;
 }
@@ -957,104 +798,14 @@ tr.mceLast {
 }
 
 
-.photos-end {
-	clear: both;
-	margin-bottom: 25px;
-}
-
-.photo-album-image-wrapper {
-	float: left;
-	margin-top: 15px;
-	margin-right: 15px;
-	margin-left: 15px;
-}
 .photo-album-image-wrapper .caption {
-	display: none; 
- 	width: 100%;
- 	bottom: 0px; 
- 	padding: 0.5em 0.5em 0px 0.5em;
  	background-color: rgba(245, 245, 255, 0.8);
  	border-bottom: 2px solid #CCC;
- 	margin: 0px;
-}
-.photo-album-image-wrapper a:hover .caption {
-	display:block;
-}
-
-#photo-album-end {
-	clear: both;
-	margin-bottom: 25px;
 }
 
-.photo-top-image-wrapper {
-	float: left;
-	margin-top: 15px;
-	margin-right: 15px;
-	margin-left: 15px;
-	margin-bottom: 15px;
-}
 .photo-top-album-name {
- 	width: 100%;
- 	min-height: 2em;
- 	bottom: 0px; 
- 	padding: 0px 3px;
- 	padding-top: 0.5em;
  	background-color: rgb(255, 255, 255);
 }
-#photo-top-end {
-	clear: both;
-}
-
-#photo-top-links {
-	margin-bottom: 30px;
-	margin-left: 30px;
-}
-
-#photos-upload-newalbum-div {
-	float: left;
-	width: 175px;
-}
-
-#photos-upload-noshare {
-	margin-bottom: 10px;
-}
-#photos-upload-existing-album-text {
-	float: left;
-	width: 175px;
-}
-#photos-upload-newalbum {
-	float: left;
-}
-#photos-upload-album-select {
-	float: left;
-}
-
-#photos-upload-spacer {
-	margin-top: 25px;
-}
-#photos-upload-new-end, #photos-upload-exist-end {
-	clear: both;
-}
-#photos-upload-exist-end {
-	margin-bottom: 15px;
-}
-#photos-upload-submit {
-	margin-top: 15px;
-}
-
-#photos_upload_applet_wrapper {
-	margin-bottom: 15px;
-}
-
-#photos-upload-no-java-message {
-	margin-bottom: 15px;
-}
-
-
-#photos-upload-select-files-text {
-	margin-top: 15px;
-	margin-bottom: 15px;
-}
 
 #photos-upload-perms-menu, #photos-upload-perms-menu:visited, #photos-upload-perms-menu:link {
 	color: #8888FF;
@@ -1068,126 +819,16 @@ tr.mceLast {
 	cursor: pointer;
 }
 
-
-#photo-edit-caption-label, #photo-edit-tags-label, #photo-edit-albumname-label, #photo-edit-rotate-label {
-	float: left;
-	width: 150px;
-}
-
-#photo-edit-perms-end {
-	margin-bottom: 15px;
-}
-
-#photo-edit-caption, #photo-edit-newtag, #photo-edit-albumname, #photo-edit-rotate {
-	float: left;
-	margin-bottom: 25px;
-}
-#photo-edit-link-wrap {
-	margin-bottom: 15px;
-}
-#photo-like-div {
-	margin-bottom: 25px;
-}
-
-#photo-edit-caption-end, #photo-edit-tags-end, #photo-edit-albumname-end, #photo-edit-rotate-end {
-	clear: both;
-}
-
-#photo-edit-rotate-end {
-	margin-bottom: 15px;
-}
-
-#photo-edit-delete-button {
-	margin-left: 200px;
-}
-#photo-edit-end {
-	margin-bottom: 35px;
-}
 #photo-caption {
 	font-size: 110%;
 	font-weight: bold;
-	margin-top: 15px;
-	margin-bottom: 15px;
 }
 
 #in-this-photo-text {
 	color: #0080FF;
-	margin-left: 30px;
-}
-
-#in-this-photo {
-	margin-left: 60px;
-	margin-top: 10px;
-	margin-bottom: 20px;
-}
-
-#photo-album-edit-submit, #photo-album-edit-drop {
-	margin-top: 15px;
-	margin-bottom: 15px;
-}
-
-#photo-album-edit-drop {
-	margin-left: 200px;
-}
-
-/* might be obsolete
-.mail-list-sender,
-.mail-list-detail {
-	float: left;
-}
-.mail-list-detail {
-	margin-left: 20px;
-}
-
-.mail-list-subject {
-	font-size: 1.1em;
-	margin-top: 10px;
-}
-a.mail-list-link {
-	font-weight: normal;
-    display: block;
-    font-size: 1.3em;
-    padding: 4px 0;
-}
-
-.mail-list-outside-wrapper-end {
-	clear: both;
-}
-
-.mail-list-outside-wrapper {
-	margin-top: 30px;
-}
-
-.mail-list-delete-wrapper {
-	float: right;
-	margin-right: 30px;
-	margin-top: 15px;
-}
-
-.mail-list-delete-icon {
-	border: none;
-}
-*/
-
-
-/* might be obsolete
-.message-links ul {
-	list-style-type: none;
-	padding: 0px;
 }
 
-.message-links li {
-	margin-top: 10px;
-	float: left;
-}
-.message-links a {
-	padding: 3px 5px;
-}
-
-.message-links-end {
-	clear: both;
-}
-*/
+#netsearch-box { margin-bottom: 5px; }
 
 #sidebar-group-list ul {
 	list-style-type: none;
@@ -1199,10 +840,12 @@ a.mail-list-link {
 	width: 12px;
 }
 
-#sidebar-group-list li {
-	margin-top: 10px;
+#sidebar-group-list li, 
+.saved-search-li {
+	margin-top: 3px;
 }
 
+
 .nets-ul, .fileas-ul, .categories-ul {
 	list-style-type: none;
 }
@@ -1245,12 +888,7 @@ a.mail-list-link {
 	opacity: 1;
 }
 
-/*
-.savedsearchdrop, .savedsearchterm {
-	float: left;
-	margin-top: 10px;
-}
-*/
+
 
 .savedsearchterm {
 	margin-left: 10px;
diff --git a/view/tpl/photo_album.tpl b/view/tpl/photo_album.tpl
index d2016e41c..c170d47a3 100755
--- a/view/tpl/photo_album.tpl
+++ b/view/tpl/photo_album.tpl
@@ -1,7 +1,7 @@
 {{include file="prettyphoto.tpl"}}
-<div class="photo-album-image-wrapper" id="photo-album-image-wrapper-{{$id}}">
+<div class="photo-album-image-wrapper{{$twist}}" id="photo-album-image-wrapper-{{$id}}">
 	<a href="{{$photolink}}" class="photo-album-photo-link" id="photo-album-photo-link-{{$id}}" title="{{$phototitle}}" rel="{{$rel}}">
-		<img src="{{$imgsrc}}" alt="{{$imgalt}}" title="{{$phototitle}}" class="photo-album-photo lframe resize{{$twist}}" id="photo-album-photo-{{$id}}" />
+		<img src="{{$imgsrc}}" alt="{{$imgalt}}" title="{{$phototitle}}" class="photo-album-photo lframe resize" id="photo-album-photo-{{$id}}" />
 		<p class='caption'>{{$desc}}</p>		
 	</a>
 </div>
-- 
cgit v1.2.3


From d13f693f85b9528559130ed642e3128607e1967c Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Mon, 9 Dec 2013 18:44:09 -0800
Subject: more css cleanup

---
 view/css/mod_photos.css           | 13 ++++++
 view/theme/redbasic/css/style.css | 98 ---------------------------------------
 2 files changed, 13 insertions(+), 98 deletions(-)

(limited to 'view')

diff --git a/view/css/mod_photos.css b/view/css/mod_photos.css
index 80508142a..58a9bea38 100644
--- a/view/css/mod_photos.css
+++ b/view/css/mod_photos.css
@@ -11,6 +11,19 @@
 	margin-bottom: 25px;
 }
 
+#photo-prev-link, #photo-next-link {
+	padding: 10px;
+	float: left;
+}
+
+#photo-photo {
+	float: left;
+}
+
+#photo-photo-end {
+	clear: both;
+}
+
 .photo-album-image-wrapper {
 	float: left;
 	margin-top: 15px;
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 708085b02..e13bc1edb 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -586,39 +586,6 @@ footer {
     margin-left: 50px;
 }
 
-
-
-/* might be obsolete
-#profile-youtube-wrapper {
-	float: left;
-	margin-left: 15px;
-}
-
-#profile-title-wrapper {
-	float: left;
-	margin-left: 15px;
-}
-
-#profile-jot-plugin-end{
-  clear: both;
-}
-
-#profile-jot-networks-end {
-	clear: both;
-}
-
-#about-jot-submit-wrapper {
-	margin-top: 15px;
-}
-#about-jot-end {
-	margin-bottom: 30px;
-}
-*/
-
-#contacts-main {
-	margin-bottom: 30px;
-}
-
 #profile-listing-desc {
 	margin-left: 30px;
 }
@@ -698,36 +665,6 @@ footer {
 	color: #FF0000;
 }
 
-#profile-edit-insecure {
-	margin-top: 20px;
-	color: #FF0000;
-	font-size: 1.1em;
-	border: 1px solid #FF8888;
-	background-color: #FFEEEE;
-	padding-left: 5px;
-	/*: 3px 3px 3px 5px; */
-	width: 587px;
-}
-
-/* TinyMCE */
-
-/* TODO: this should, if needed at all, probably go to custom_tinymce.css
-
-DIV#profile-jot-text_toolbargroup{
-background: #FFF;
-border: 1px #111;
-}
-
-
-iframe#profile-jot-text_ifr {
-width: 100% !important;
-box-shadow: 5px 5px 5px #000 inset !important;}
-
-tr.mceLast {
-
-}
-*/
-
 .photo, .contact-block-img {
     border-radius: $radiuspx;
     -moz-border-radius: $radiuspx;
@@ -1112,11 +1049,6 @@ tr.mceLast {
 	clear: both;
 }
 
-.cc-license {
-	margin-top: 50px;
-	font-size: 70%;
-}
-
 .descriptive-text {
 	color: #888;
 }
@@ -1267,19 +1199,6 @@ tr.mceLast {
 	margin-top: 20px;
 }
 
-#photo-prev-link, #photo-next-link {
-	padding: 10px;
-	float: left;
-}
-
-#photo-photo {
-	float: left;
-}
-
-#photo-photo-end {
-	clear: both;
-}
-
 .profile-match-photo {
 	float: left;
 	text-align: center;
@@ -1287,7 +1206,6 @@ tr.mceLast {
 }
 
 .profile-match-name {
-/*	float: left; */
 	text-align: center;
 	width: 120px;
 	height: 18px;
@@ -1432,22 +1350,6 @@ tr.mceLast {
 	margin-top: 10px;
 }
 
-/* might be obsolete
-.posttags {
-	opacity: 0.5;
-	filter:alpha(opacity=50);
-}
-
-.posttags {
-	opacity: 1.0 !important;
-	filter:alpha(opacity=100) !important;
-}
-
-.posttags {
-	margin-top: 15px;
-}
-*/
-
 #item-delete-selected {
 	margin-top: 30px;
 }
-- 
cgit v1.2.3


From ed9f10872240231125007cf32b95007281558cac Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Mon, 9 Dec 2013 21:20:55 -0800
Subject: comanchify the savedsearch widget

---
 view/tpl/saved_searches.tpl | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 view/tpl/saved_searches.tpl

(limited to 'view')

diff --git a/view/tpl/saved_searches.tpl b/view/tpl/saved_searches.tpl
new file mode 100644
index 000000000..bdff72ba1
--- /dev/null
+++ b/view/tpl/saved_searches.tpl
@@ -0,0 +1,14 @@
+<div class="widget" id="saved-search-list">
+	<h3 id="search">{{$title}}</h3>
+	{{$searchbox}}
+	
+	<ul id="saved-search-ul">
+		{{foreach $saved as $search}}
+		<li id="search-term-{{$search.id}}" class="saved-search-li clear">
+			<a title="{{$search.delete}}" onclick="return confirmDelete();" id="drop-saved-search-term-{{$search.id}}" href="{{$search.dellink}}"><i id="dropicon-saved-search-term-{{$search.id}}" class="icon-remove drop-icons iconspacer savedsearchdrop" ></i></a>
+			<a id="saved-search-term-{{$search.id}}" class="savedsearchterm{{if $search.selected}} search-selected{{/if}}" href="{{$search.srchlink}}">{{$search.displayterm}}</a>
+		</li>
+		{{/foreach}}
+	</ul>
+	<div class="clear"></div>
+</div>
-- 
cgit v1.2.3


From 0043ef66b68cbdf1ae978e04f8bdeca39e6efa64 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Tue, 10 Dec 2013 00:25:32 -0800
Subject: mod_network is now running under Comanche. Yay.

---
 view/pdl/mod_network.pdl | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 view/pdl/mod_network.pdl

(limited to 'view')

diff --git a/view/pdl/mod_network.pdl b/view/pdl/mod_network.pdl
new file mode 100644
index 000000000..e3d469842
--- /dev/null
+++ b/view/pdl/mod_network.pdl
@@ -0,0 +1,8 @@
+[region=aside]
+[widget=collections][/widget]
+[widget=archive][/widget]
+[widget=suggestions][/widget]
+[widget=savedsearch][/widget]
+[widget=filer][/widget]
+[widget=notes][/widget]
+[/region]
-- 
cgit v1.2.3


From 65e4fa3dcba55659b6fb38d5d212a5a2bda68099 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Tue, 10 Dec 2013 00:58:58 -0800
Subject: matrix/network page under Comanche cont.

---
 view/pdl/mod_network.pdl | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'view')

diff --git a/view/pdl/mod_network.pdl b/view/pdl/mod_network.pdl
index e3d469842..168ca6acb 100644
--- a/view/pdl/mod_network.pdl
+++ b/view/pdl/mod_network.pdl
@@ -1,3 +1,4 @@
+[region=nav]$nav[/region]
 [region=aside]
 [widget=collections][/widget]
 [widget=archive][/widget]
@@ -6,3 +7,4 @@
 [widget=filer][/widget]
 [widget=notes][/widget]
 [/region]
+[region=section]$content[/region]
\ No newline at end of file
-- 
cgit v1.2.3


From e5ea4a009b81c7f3fa987ba34d20a996055775d6 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Tue, 10 Dec 2013 20:36:11 -0800
Subject: mod channel is now Comanchified

---
 view/pdl/mod_channel.pdl | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 view/pdl/mod_channel.pdl

(limited to 'view')

diff --git a/view/pdl/mod_channel.pdl b/view/pdl/mod_channel.pdl
new file mode 100644
index 000000000..dde8830ee
--- /dev/null
+++ b/view/pdl/mod_channel.pdl
@@ -0,0 +1,6 @@
+[region=aside]
+[widget=fullprofile][/widget]
+[widget=archive][var=wall]1[/var][/widget]
+[widget=categories][/widget]
+[widget=tagcloud_wall][var=limit]24[/var][/widget]
+[/region]
-- 
cgit v1.2.3


From 652959678f47b84830123df4fac8add31657b4c9 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Tue, 10 Dec 2013 23:27:17 -0800
Subject: cleanup and Comanchification of mod_profile

---
 view/pdl/mod_profile.pdl | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 view/pdl/mod_profile.pdl

(limited to 'view')

diff --git a/view/pdl/mod_profile.pdl b/view/pdl/mod_profile.pdl
new file mode 100644
index 000000000..f12bf39c3
--- /dev/null
+++ b/view/pdl/mod_profile.pdl
@@ -0,0 +1,3 @@
+[region=aside]
+[widget=fullprofile][/widget]
+[/region]
-- 
cgit v1.2.3


From 8077b393a4bd54a0ba6fe3438c5a0b88e6f08acb Mon Sep 17 00:00:00 2001
From: "p.tacconi" <pynolo@tarine.net>
Date: Wed, 11 Dec 2013 09:18:56 +0100
Subject: italian translation

---
 view/it/messages.po | 4376 +++++++++++++++++++++++++--------------------------
 view/it/strings.php |  496 +++---
 2 files changed, 2417 insertions(+), 2455 deletions(-)

(limited to 'view')

diff --git a/view/it/messages.po b/view/it/messages.po
index 8d86d3c87..693e76cee 100644
--- a/view/it/messages.po
+++ b/view/it/messages.po
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Red Matrix\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-11-29 00:03-0800\n"
-"PO-Revision-Date: 2013-12-01 09:46+0000\n"
+"POT-Creation-Date: 2013-12-06 00:02-0800\n"
+"PO-Revision-Date: 2013-12-10 16:05+0000\n"
 "Last-Translator: tuscanhobbit Pa <pynolo@tarine.net>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/red-matrix/language/it/)\n"
 "MIME-Version: 1.0\n"
@@ -58,203 +58,203 @@ msgstr "Guarda %2$s di %1$s "
 msgid "%1$s has an updated %2$s, changing %3$s."
 msgstr "%1$s ha aggiornato %2$s cambiando %3$s."
 
-#: ../../include/enotify.php:36
+#: ../../include/enotify.php:40
 msgid "Red Matrix Notification"
 msgstr "Notifica di Red Matrix"
 
-#: ../../include/enotify.php:37
+#: ../../include/enotify.php:41
 msgid "redmatrix"
 msgstr "redmatrix"
 
-#: ../../include/enotify.php:39
+#: ../../include/enotify.php:43
 msgid "Thank You,"
 msgstr "Grazie,"
 
-#: ../../include/enotify.php:41
+#: ../../include/enotify.php:45
 #, php-format
 msgid "%s Administrator"
 msgstr "Amministratore %s"
 
-#: ../../include/enotify.php:76
+#: ../../include/enotify.php:80
 #, php-format
 msgid "%s <!item_type!>"
 msgstr "%s <!item_type!>"
 
-#: ../../include/enotify.php:80
+#: ../../include/enotify.php:84
 #, php-format
 msgid "[Red:Notify] New mail received at %s"
 msgstr "[Red:Notifica] Nuovo messaggio ricevuto alle %s"
 
-#: ../../include/enotify.php:82
+#: ../../include/enotify.php:86
 #, php-format
 msgid "%1$s, %2$s sent you a new private message at %3$s."
 msgstr "%1$s, %2$s  ti ha mandato un messaggio privato alle %3$s."
 
-#: ../../include/enotify.php:83
+#: ../../include/enotify.php:87
 #, php-format
 msgid "%1$s sent you %2$s."
 msgstr "%1$s ti ha mandato %2$s."
 
-#: ../../include/enotify.php:83
+#: ../../include/enotify.php:87
 msgid "a private message"
 msgstr "un messaggio privato"
 
-#: ../../include/enotify.php:84
+#: ../../include/enotify.php:88
 #, php-format
 msgid "Please visit %s to view and/or reply to your private messages."
 msgstr "Visita %s per leggere i tuoi messaggi privati e rispondere."
 
-#: ../../include/enotify.php:135
+#: ../../include/enotify.php:139
 #, php-format
 msgid "%1$s, %2$s commented on [zrl=%3$s]a %4$s[/zrl]"
 msgstr "%1$s, %2$s ha commentato [zrl=%3$s]%4$s[/zrl]"
 
-#: ../../include/enotify.php:143
+#: ../../include/enotify.php:147
 #, php-format
 msgid "%1$s, %2$s commented on [zrl=%3$s]%4$s's %5$s[/zrl]"
 msgstr "%1$s, %2$s ha commentato [zrl=%3$s]%5$s di %4$s[/zrl]"
 
-#: ../../include/enotify.php:152
+#: ../../include/enotify.php:156
 #, php-format
 msgid "%1$s, %2$s commented on [zrl=%3$s]your %4$s[/zrl]"
 msgstr "%1$s, %2$s ha commentato [zrl=%3$s]%4$s che hai creato[/zrl]"
 
-#: ../../include/enotify.php:163
+#: ../../include/enotify.php:167
 #, php-format
 msgid "[Red:Notify] Comment to conversation #%1$d by %2$s"
 msgstr "[Red:Notifica] Nuovo commento di %2$s alla conversazione #%1$d"
 
-#: ../../include/enotify.php:164
+#: ../../include/enotify.php:168
 #, php-format
 msgid "%1$s, %2$s commented on an item/conversation you have been following."
 msgstr "%1$s, %2$s ha commentato un elemento che stavi seguendo."
 
-#: ../../include/enotify.php:167 ../../include/enotify.php:186
-#: ../../include/enotify.php:212 ../../include/enotify.php:231
-#: ../../include/enotify.php:245
+#: ../../include/enotify.php:171 ../../include/enotify.php:190
+#: ../../include/enotify.php:216 ../../include/enotify.php:235
+#: ../../include/enotify.php:249
 #, php-format
 msgid "Please visit %s to view and/or reply to the conversation."
 msgstr "Visita %s per leggere o commentare la conversazione."
 
-#: ../../include/enotify.php:174
+#: ../../include/enotify.php:178
 #, php-format
 msgid "[Red:Notify] %s posted to your profile wall"
 msgstr "[Red:Notifica] %s ha scritto sulla tua bacheca"
 
-#: ../../include/enotify.php:176
+#: ../../include/enotify.php:180
 #, php-format
 msgid "%1$s, %2$s posted to your profile wall at %3$s"
 msgstr "%1$s, %2$s ha scritto sulla bacheca del tuo profilo alle %3$s"
 
-#: ../../include/enotify.php:178
+#: ../../include/enotify.php:182
 #, php-format
 msgid "%1$s, %2$s posted to [zrl=%3$s]your wall[/zrl]"
 msgstr "%1$s, %2$s ha scritto sulla [zrl=%3$s]tua bacheca[/zrl]"
 
-#: ../../include/enotify.php:205
+#: ../../include/enotify.php:209
 #, php-format
 msgid "[Red:Notify] %s tagged you"
 msgstr "[Red:Notifica] %s ti ha taggato"
 
-#: ../../include/enotify.php:206
+#: ../../include/enotify.php:210
 #, php-format
 msgid "%1$s, %2$s tagged you at %3$s"
 msgstr "%1$s, %2$s ti ha taggato alle %3$s"
 
-#: ../../include/enotify.php:207
+#: ../../include/enotify.php:211
 #, php-format
 msgid "%1$s, %2$s [zrl=%3$s]tagged you[/zrl]."
 msgstr "%1$s, %2$s [zrl=%3$s]ti ha taggato[/zrl]."
 
-#: ../../include/enotify.php:220
+#: ../../include/enotify.php:224
 #, php-format
 msgid "[Red:Notify] %1$s poked you"
 msgstr "[Red:Notifica] %1$s ti ha mandato un poke"
 
-#: ../../include/enotify.php:221
+#: ../../include/enotify.php:225
 #, php-format
 msgid "%1$s, %2$s poked you at %3$s"
 msgstr "%1$s, %2$s ti ha mandato un poke alle %3$s"
 
-#: ../../include/enotify.php:222
+#: ../../include/enotify.php:226
 #, php-format
 msgid "%1$s, %2$s [zrl=%2$s]poked you[/zrl]."
 msgstr "%1$s, %2$s [zrl=%2$s]ti ha mandato un poke[/zrl]."
 
-#: ../../include/enotify.php:238
+#: ../../include/enotify.php:242
 #, php-format
 msgid "[Red:Notify] %s tagged your post"
 msgstr "[Red:Notifica] %s ha taggato il tuo articolo"
 
-#: ../../include/enotify.php:239
+#: ../../include/enotify.php:243
 #, php-format
 msgid "%1$s, %2$s tagged your post at %3$s"
 msgstr "%1$s, %2$s ha taggato il tuo articolo alle %3$s"
 
-#: ../../include/enotify.php:240
+#: ../../include/enotify.php:244
 #, php-format
 msgid "%1$s, %2$s tagged [zrl=%3$s]your post[/zrl]"
 msgstr "%1$s, %2$s ha taggato [zrl=%3$s]il tuo articolo[/zrl]"
 
-#: ../../include/enotify.php:252
+#: ../../include/enotify.php:256
 msgid "[Red:Notify] Introduction received"
 msgstr "[Red:Notifica] Hai una richiesta di amicizia"
 
-#: ../../include/enotify.php:253
+#: ../../include/enotify.php:257
 #, php-format
 msgid "%1$s, you've received an introduction from '%2$s' at %3$s"
 msgstr "%1$s, hai ricevuto una richiesta di contatto da '%2$s' alle %3$s"
 
-#: ../../include/enotify.php:254
+#: ../../include/enotify.php:258
 #, php-format
 msgid "%1$s, you've received [zrl=%2$s]an introduction[/zrl] from %3$s."
 msgstr "%1$s, hai ricevuto [zrl=%2$s]una richiesta di amicizia[/zrl] da %3$s."
 
-#: ../../include/enotify.php:258 ../../include/enotify.php:277
+#: ../../include/enotify.php:262 ../../include/enotify.php:281
 #, php-format
 msgid "You may visit their profile at %s"
 msgstr "Puoi visitare il suo profilo su %s"
 
-#: ../../include/enotify.php:260
+#: ../../include/enotify.php:264
 #, php-format
 msgid "Please visit %s to approve or reject the introduction."
 msgstr "Visita %s per approvare o rifiutare la richiesta."
 
-#: ../../include/enotify.php:267
+#: ../../include/enotify.php:271
 msgid "[Red:Notify] Friend suggestion received"
 msgstr "[Red:Notifica] Ti è stato suggerito un amico"
 
-#: ../../include/enotify.php:268
+#: ../../include/enotify.php:272
 #, php-format
 msgid "%1$s, you've received a friend suggestion from '%2$s' at %3$s"
 msgstr "%1$s, ti è stato suggerito un amico da '%2$s' alle %3$s"
 
-#: ../../include/enotify.php:269
+#: ../../include/enotify.php:273
 #, php-format
 msgid ""
 "%1$s, you've received [zrl=%2$s]a friend suggestion[/zrl] for %3$s from "
 "%4$s."
 msgstr "%1$s, %4$s ti [zrl=%2$s]ha suggerito %3$s[/zrl] come amico."
 
-#: ../../include/enotify.php:275
+#: ../../include/enotify.php:279
 msgid "Name:"
 msgstr "Nome:"
 
-#: ../../include/enotify.php:276
+#: ../../include/enotify.php:280
 msgid "Photo:"
 msgstr "Foto:"
 
-#: ../../include/enotify.php:279
+#: ../../include/enotify.php:283
 #, php-format
 msgid "Please visit %s to approve or reject the suggestion."
 msgstr "Visita %s per approvare o rifiutare il suggerimento."
 
-#: ../../include/ItemObject.php:88 ../../mod/photos.php:952
+#: ../../include/ItemObject.php:88 ../../mod/photos.php:963
 msgid "Private Message"
 msgstr "Messaggio privato"
 
 #: ../../include/ItemObject.php:95 ../../include/page_widgets.php:8
-#: ../../mod/webpages.php:101 ../../mod/settings.php:713 ../../mod/menu.php:55
+#: ../../mod/webpages.php:101 ../../mod/settings.php:671 ../../mod/menu.php:55
 #: ../../mod/layouts.php:102 ../../mod/editlayout.php:100
 #: ../../mod/editwebpage.php:119 ../../mod/blocks.php:93
 #: ../../mod/editpost.php:97 ../../mod/editblock.php:114
@@ -262,8 +262,8 @@ msgid "Edit"
 msgstr "Modifica"
 
 #: ../../include/ItemObject.php:107 ../../include/conversation.php:628
-#: ../../mod/settings.php:714 ../../mod/admin.php:690 ../../mod/group.php:182
-#: ../../mod/photos.php:1130 ../../mod/connections.php:374
+#: ../../mod/settings.php:672 ../../mod/admin.php:690 ../../mod/group.php:182
+#: ../../mod/photos.php:1141 ../../mod/connections.php:374
 #: ../../mod/filestorage.php:82
 msgid "Delete"
 msgstr "Elimina"
@@ -300,7 +300,7 @@ msgstr "Messaggio verificato"
 msgid "add tag"
 msgstr "Aggiungi tag"
 
-#: ../../include/ItemObject.php:174 ../../mod/photos.php:1058
+#: ../../include/ItemObject.php:174 ../../mod/photos.php:1069
 msgid "I like this (toggle)"
 msgstr "Attiva/disattiva Mi piace"
 
@@ -308,7 +308,7 @@ msgstr "Attiva/disattiva Mi piace"
 msgid "like"
 msgstr "mi piace"
 
-#: ../../include/ItemObject.php:175 ../../mod/photos.php:1059
+#: ../../include/ItemObject.php:175 ../../mod/photos.php:1070
 msgid "I don't like this (toggle)"
 msgstr "Attiva/disattiva Non mi piace"
 
@@ -356,7 +356,7 @@ msgid "last edited: %s"
 msgstr "ultima modifica: %s"
 
 #: ../../include/ItemObject.php:246 ../../include/conversation.php:702
-#: ../../include/conversation.php:1112 ../../mod/photos.php:1061
+#: ../../include/conversation.php:1112 ../../mod/photos.php:1072
 #: ../../mod/message.php:332 ../../mod/message.php:516
 #: ../../mod/editlayout.php:109 ../../mod/editwebpage.php:128
 #: ../../mod/editpost.php:106 ../../mod/editblock.php:123
@@ -375,30 +375,30 @@ msgstr[1] "%d commenti"
 msgid "show more"
 msgstr "mostra tutto"
 
-#: ../../include/ItemObject.php:527 ../../mod/photos.php:1077
-#: ../../mod/photos.php:1164
+#: ../../include/ItemObject.php:527 ../../mod/photos.php:1088
+#: ../../mod/photos.php:1175
 msgid "This is you"
 msgstr "Questo sei tu"
 
 #: ../../include/ItemObject.php:529 ../../include/js_strings.php:6
-#: ../../mod/photos.php:1079 ../../mod/photos.php:1166
+#: ../../mod/photos.php:1090 ../../mod/photos.php:1177
 msgid "Comment"
 msgstr "Commento"
 
-#: ../../include/ItemObject.php:530 ../../mod/events.php:458
+#: ../../include/ItemObject.php:530 ../../mod/events.php:469
 #: ../../mod/thing.php:190 ../../mod/invite.php:154 ../../mod/setup.php:302
-#: ../../mod/setup.php:345 ../../mod/settings.php:651
-#: ../../mod/settings.php:763 ../../mod/settings.php:791
-#: ../../mod/settings.php:815 ../../mod/settings.php:886
-#: ../../mod/settings.php:1054 ../../mod/connect.php:96
+#: ../../mod/setup.php:345 ../../mod/settings.php:609
+#: ../../mod/settings.php:721 ../../mod/settings.php:749
+#: ../../mod/settings.php:773 ../../mod/settings.php:844
+#: ../../mod/settings.php:1005 ../../mod/connect.php:96
 #: ../../mod/sources.php:83 ../../mod/sources.php:110 ../../mod/admin.php:418
 #: ../../mod/admin.php:683 ../../mod/admin.php:823 ../../mod/admin.php:1022
 #: ../../mod/admin.php:1109 ../../mod/group.php:87 ../../mod/photos.php:685
-#: ../../mod/photos.php:779 ../../mod/photos.php:1040
-#: ../../mod/photos.php:1080 ../../mod/photos.php:1167
+#: ../../mod/photos.php:790 ../../mod/photos.php:1051
+#: ../../mod/photos.php:1091 ../../mod/photos.php:1178
 #: ../../mod/message.php:333 ../../mod/message.php:515
-#: ../../mod/connections.php:452 ../../mod/profiles.php:529
-#: ../../mod/import.php:385 ../../mod/crepair.php:166 ../../mod/poke.php:166
+#: ../../mod/profiles.php:529 ../../mod/connections.php:452
+#: ../../mod/import.php:387 ../../mod/crepair.php:166 ../../mod/poke.php:166
 #: ../../mod/fsuggest.php:108 ../../mod/mood.php:137
 #: ../../view/theme/redbasic/php/config.php:85
 #: ../../view/theme/apw/php/config.php:231
@@ -440,7 +440,7 @@ msgid "Video"
 msgstr "Video"
 
 #: ../../include/ItemObject.php:539 ../../include/conversation.php:1075
-#: ../../mod/webpages.php:105 ../../mod/photos.php:1081
+#: ../../mod/webpages.php:105 ../../mod/photos.php:1092
 #: ../../mod/editlayout.php:129 ../../mod/editwebpage.php:150
 #: ../../mod/editpost.php:126 ../../mod/editblock.php:144
 msgid "Preview"
@@ -453,8 +453,8 @@ msgid "Encrypt text"
 msgstr "Crittografia del testo"
 
 #: ../../include/Contact.php:87 ../../include/contact_widgets.php:23
-#: ../../mod/match.php:58 ../../mod/suggest.php:56 ../../mod/directory.php:198
-#: ../../boot.php:1741
+#: ../../include/identity.php:613 ../../mod/match.php:62
+#: ../../mod/suggest.php:56 ../../mod/directory.php:198
 msgid "Connect"
 msgstr "Entra in contatto/segui"
 
@@ -466,36 +466,6 @@ msgstr "Nuova finestra"
 msgid "Open the selected location in a different window or browser tab"
 msgstr "Apri l'indirizzo selezionato in una nuova scheda o finestra"
 
-#: ../../include/Contact.php:524 ../../include/conversation.php:930
-msgid "Poke"
-msgstr "Poke"
-
-#: ../../include/Contact.php:525 ../../include/conversation.php:924
-msgid "View Status"
-msgstr "Guarda il messaggio di stato"
-
-#: ../../include/Contact.php:526 ../../include/nav.php:76
-#: ../../include/conversation.php:925 ../../mod/connections.php:327
-#: ../../mod/connections.php:441
-msgid "View Profile"
-msgstr "Profilo"
-
-#: ../../include/Contact.php:527 ../../include/conversation.php:926
-msgid "View Photos"
-msgstr "Guarda le foto"
-
-#: ../../include/Contact.php:528
-msgid "Network Posts"
-msgstr "Articoli dalla tua rete"
-
-#: ../../include/Contact.php:529 ../../include/conversation.php:928
-msgid "Edit Contact"
-msgstr "Modifica il contatto"
-
-#: ../../include/Contact.php:530 ../../include/conversation.php:929
-msgid "Send PM"
-msgstr "Invia messaggio privato"
-
 #: ../../include/contact_selectors.php:30
 msgid "Unknown | Not categorised"
 msgstr "Sconosciuto | Senza categoria"
@@ -557,7 +527,7 @@ msgid "RSS/Atom"
 msgstr "RSS/Atom"
 
 #: ../../include/contact_selectors.php:77 ../../mod/admin.php:686
-#: ../../mod/admin.php:695 ../../boot.php:1461
+#: ../../mod/admin.php:695 ../../boot.php:1442
 msgid "Email"
 msgstr "Email"
 
@@ -675,8 +645,9 @@ msgstr "Inizio:"
 msgid "Finishes:"
 msgstr "Fine:"
 
-#: ../../include/event.php:40 ../../include/bb2diaspora.php:455
-#: ../../mod/events.php:450 ../../mod/directory.php:173 ../../boot.php:1791
+#: ../../include/event.php:40 ../../include/identity.php:663
+#: ../../include/bb2diaspora.php:455 ../../mod/events.php:462
+#: ../../mod/directory.php:173
 msgid "Location:"
 msgstr "Luogo:"
 
@@ -800,7 +771,7 @@ msgid "Enable widget to display Network posts only from selected collections"
 msgstr "Mostra il riquadro per filtrare gli articoli di certi insiemi di canali"
 
 #: ../../include/features.php:47 ../../mod/search.php:17
-#: ../../mod/network.php:173
+#: ../../mod/network.php:122
 msgid "Saved Searches"
 msgstr "Ricerche salvate"
 
@@ -927,7 +898,7 @@ msgstr "Crea un nuovo insieme"
 msgid "Channels not in any collection"
 msgstr "Canali che non sono in un insieme"
 
-#: ../../include/group.php:290 ../../mod/network.php:174
+#: ../../include/group.php:290 ../../mod/network.php:123
 msgid "add"
 msgstr "aggiungi"
 
@@ -1044,1551 +1015,1510 @@ msgstr "Impossibile determinare il mittente."
 msgid "Stored post could not be verified."
 msgstr "Non è stato possibile verificare l'articolo inserito."
 
-#: ../../include/network.php:1113
-msgid "view full size"
-msgstr "guarda nelle dimensioni reali"
-
 #: ../../include/photo/photo_driver.php:609 ../../include/photos.php:51
-#: ../../mod/photos.php:97 ../../mod/photos.php:764 ../../mod/photos.php:786
+#: ../../mod/photos.php:97 ../../mod/photos.php:775 ../../mod/photos.php:797
 #: ../../mod/profile_photo.php:88 ../../mod/profile_photo.php:235
 #: ../../mod/profile_photo.php:346
 msgid "Profile Photos"
 msgstr "Foto del profilo"
 
-#: ../../include/profile_advanced.php:7 ../../include/profile_advanced.php:118
-#: ../../mod/profperm.php:112
-msgid "Profile"
-msgstr "Profilo"
-
-#: ../../include/profile_advanced.php:15 ../../mod/settings.php:1062
-msgid "Full Name:"
-msgstr "Nome completo:"
+#: ../../include/api.php:972
+msgid "Public Timeline"
+msgstr "Diario pubblico"
 
-#: ../../include/profile_advanced.php:17 ../../mod/directory.php:175
-#: ../../boot.php:1793
-msgid "Gender:"
-msgstr "Sesso:"
+#: ../../include/network.php:640
+msgid "view full size"
+msgstr "guarda nelle dimensioni reali"
 
-#: ../../include/profile_advanced.php:22
-msgid "j F, Y"
-msgstr "j F Y"
+#: ../../include/bbcode.php:94 ../../include/bbcode.php:494
+#: ../../include/bbcode.php:497
+msgid "Image/photo"
+msgstr "Immagine"
 
-#: ../../include/profile_advanced.php:23
-msgid "j F"
-msgstr "j F"
+#: ../../include/bbcode.php:126 ../../include/bbcode.php:502
+msgid "Encrypted content"
+msgstr "Contenuto crittografato"
 
-#: ../../include/profile_advanced.php:30
-msgid "Birthday:"
-msgstr "Compleanno:"
+#: ../../include/bbcode.php:173
+#, php-format
+msgid "%1$s wrote the following %2$s %3$s"
+msgstr "%1$s ha scritto %2$s seguente %3$s"
 
-#: ../../include/profile_advanced.php:34
-msgid "Age:"
-msgstr "Età:"
+#: ../../include/bbcode.php:175
+msgid "post"
+msgstr "l'articolo"
 
-#: ../../include/profile_advanced.php:37 ../../mod/directory.php:177
-#: ../../boot.php:1794
-msgid "Status:"
-msgstr "Stato:"
+#: ../../include/bbcode.php:454 ../../include/bbcode.php:474
+msgid "$1 wrote:"
+msgstr "$1 ha scritto:"
 
-#: ../../include/profile_advanced.php:43
-#, php-format
-msgid "for %1$d %2$s"
-msgstr "per %1$d %2$s"
+#: ../../include/oembed.php:150
+msgid "Embedded content"
+msgstr "Contenuti incorporati"
 
-#: ../../include/profile_advanced.php:46 ../../mod/profiles.php:549
-msgid "Sexual Preference:"
-msgstr "Preferenze sessuali:"
+#: ../../include/oembed.php:159
+msgid "Embedding disabled"
+msgstr "Contenuti incorporati - funzione disabilitata"
 
-#: ../../include/profile_advanced.php:48 ../../mod/directory.php:179
-#: ../../boot.php:1795
-msgid "Homepage:"
-msgstr "Home page:"
+#: ../../include/notify.php:23
+msgid "created a new post"
+msgstr "Ha creato un nuovo articolo"
 
-#: ../../include/profile_advanced.php:50 ../../mod/profiles.php:551
-msgid "Hometown:"
-msgstr "Città dove vivo:"
+#: ../../include/notify.php:24
+#, php-format
+msgid "commented on %s's post"
+msgstr "ha commentato l'articolo di %s"
 
-#: ../../include/profile_advanced.php:52
-msgid "Tags:"
-msgstr "Tag:"
+#: ../../include/photos.php:15 ../../include/attach.php:102
+#: ../../include/attach.php:133 ../../include/attach.php:189
+#: ../../include/attach.php:204 ../../include/attach.php:237
+#: ../../include/attach.php:251 ../../include/attach.php:272
+#: ../../include/attach.php:464 ../../include/attach.php:539
+#: ../../include/items.php:3412 ../../mod/common.php:43
+#: ../../mod/events.php:139 ../../mod/invite.php:13 ../../mod/invite.php:102
+#: ../../mod/allfriends.php:10 ../../mod/webpages.php:40 ../../mod/api.php:26
+#: ../../mod/api.php:31 ../../mod/lastpost.php:93 ../../mod/page.php:30
+#: ../../mod/page.php:80 ../../mod/setup.php:200 ../../mod/settings.php:586
+#: ../../mod/viewconnections.php:33 ../../mod/viewconnections.php:38
+#: ../../mod/delegate.php:6 ../../mod/sources.php:48 ../../mod/mitem.php:92
+#: ../../mod/group.php:15 ../../mod/photos.php:74 ../../mod/photos.php:654
+#: ../../mod/viewsrc.php:12 ../../mod/menu.php:40 ../../mod/message.php:208
+#: ../../mod/layouts.php:27 ../../mod/layouts.php:42 ../../mod/network.php:12
+#: ../../mod/intro.php:50 ../../mod/profiles.php:163
+#: ../../mod/profiles.php:476 ../../mod/new_channel.php:66
+#: ../../mod/new_channel.php:97 ../../mod/connections.php:197
+#: ../../mod/filestorage.php:26 ../../mod/manage.php:6
+#: ../../mod/crepair.php:115 ../../mod/editlayout.php:48
+#: ../../mod/profile_photo.php:197 ../../mod/profile_photo.php:210
+#: ../../mod/editwebpage.php:42 ../../mod/editwebpage.php:64
+#: ../../mod/notifications.php:66 ../../mod/blocks.php:29
+#: ../../mod/blocks.php:44 ../../mod/editpost.php:13 ../../mod/poke.php:128
+#: ../../mod/channel.php:110 ../../mod/fsuggest.php:78
+#: ../../mod/editblock.php:48 ../../mod/item.php:181 ../../mod/item.php:189
+#: ../../mod/suggest.php:32 ../../mod/register.php:68 ../../mod/regmod.php:18
+#: ../../mod/authtest.php:13 ../../mod/mood.php:114 ../../index.php:178
+#: ../../index.php:340
+msgid "Permission denied."
+msgstr "Permesso negato."
 
-#: ../../include/profile_advanced.php:54 ../../mod/profiles.php:552
-msgid "Political Views:"
-msgstr "Orientamento politico:"
+#: ../../include/photos.php:88
+#, php-format
+msgid "Image exceeds website size limit of %lu bytes"
+msgstr "L'immagine supera il limite massimo di %lu bytes"
 
-#: ../../include/profile_advanced.php:56
-msgid "Religion:"
-msgstr "Religione:"
+#: ../../include/photos.php:95
+msgid "Image file is empty."
+msgstr "Il file dell'immagine è vuoto."
 
-#: ../../include/profile_advanced.php:58 ../../mod/directory.php:181
-msgid "About:"
-msgstr "Informazioni:"
+#: ../../include/photos.php:124 ../../mod/profile_photo.php:157
+msgid "Unable to process image"
+msgstr "Impossibile elaborare l'immagine"
 
-#: ../../include/profile_advanced.php:60
-msgid "Hobbies/Interests:"
-msgstr "Interessi e hobby:"
+#: ../../include/photos.php:186
+msgid "Photo storage failed."
+msgstr "Impossibile caricare la foto."
 
-#: ../../include/profile_advanced.php:62 ../../mod/profiles.php:555
-msgid "Likes:"
-msgstr "Mi piace:"
+#: ../../include/photos.php:288 ../../include/conversation.php:1453
+msgid "Photo Albums"
+msgstr "Album foto"
 
-#: ../../include/profile_advanced.php:64 ../../mod/profiles.php:556
-msgid "Dislikes:"
-msgstr "Non mi piace:"
+#: ../../include/photos.php:292 ../../mod/photos.php:813
+#: ../../mod/photos.php:1287
+msgid "Upload New Photos"
+msgstr "Carica nuove foto"
 
-#: ../../include/profile_advanced.php:67
-msgid "Contact information and Social Networks:"
-msgstr "Contatti e social network:"
+#: ../../include/profile_selectors.php:6
+msgid "Male"
+msgstr "Maschio"
 
-#: ../../include/profile_advanced.php:69
-msgid "Musical interests:"
-msgstr "Gusti musicali:"
+#: ../../include/profile_selectors.php:6
+msgid "Female"
+msgstr "Femmina"
 
-#: ../../include/profile_advanced.php:71
-msgid "Books, literature:"
-msgstr "Libri, letteratura:"
+#: ../../include/profile_selectors.php:6
+msgid "Currently Male"
+msgstr "Al momento maschio"
 
-#: ../../include/profile_advanced.php:73
-msgid "Television:"
-msgstr "Televisione:"
+#: ../../include/profile_selectors.php:6
+msgid "Currently Female"
+msgstr "Al momento femmina"
 
-#: ../../include/profile_advanced.php:75
-msgid "Film/dance/culture/entertainment:"
-msgstr "Film, danza, cultura, intrattenimento:"
+#: ../../include/profile_selectors.php:6
+msgid "Mostly Male"
+msgstr "Prevalentemente maschio"
 
-#: ../../include/profile_advanced.php:77
-msgid "Love/Romance:"
-msgstr "Amore:"
+#: ../../include/profile_selectors.php:6
+msgid "Mostly Female"
+msgstr "Prevalentemente femmina"
 
-#: ../../include/profile_advanced.php:79
-msgid "Work/employment:"
-msgstr "Lavoro:"
+#: ../../include/profile_selectors.php:6
+msgid "Transgender"
+msgstr "Transgender"
 
-#: ../../include/profile_advanced.php:81
-msgid "School/education:"
-msgstr "Scuola:"
+#: ../../include/profile_selectors.php:6
+msgid "Intersex"
+msgstr "Intersex"
 
-#: ../../include/text.php:312
-msgid "prev"
-msgstr "prec"
+#: ../../include/profile_selectors.php:6
+msgid "Transsexual"
+msgstr "Transessuale"
 
-#: ../../include/text.php:314
-msgid "first"
-msgstr "inizio"
+#: ../../include/profile_selectors.php:6
+msgid "Hermaphrodite"
+msgstr "Ermafrodito"
 
-#: ../../include/text.php:343
-msgid "last"
-msgstr "fine"
+#: ../../include/profile_selectors.php:6
+msgid "Neuter"
+msgstr "Neutro"
 
-#: ../../include/text.php:346
-msgid "next"
-msgstr "succ"
+#: ../../include/profile_selectors.php:6
+msgid "Non-specific"
+msgstr "Non specificato"
 
-#: ../../include/text.php:358
-msgid "older"
-msgstr "più recenti"
+#: ../../include/profile_selectors.php:6
+msgid "Other"
+msgstr "Altro"
 
-#: ../../include/text.php:360
-msgid "newer"
-msgstr "più nuovi"
+#: ../../include/profile_selectors.php:6
+msgid "Undecided"
+msgstr "Indeciso"
 
-#: ../../include/text.php:651
-msgid "No connections"
-msgstr "Nessun contatto"
+#: ../../include/profile_selectors.php:23
+msgid "Males"
+msgstr "Maschi"
 
-#: ../../include/text.php:662
-#, php-format
-msgid "%d Connection"
-msgid_plural "%d Connections"
-msgstr[0] "%d contatto"
-msgstr[1] "%d contatti"
+#: ../../include/profile_selectors.php:23
+msgid "Females"
+msgstr "Femmine"
 
-#: ../../include/text.php:674
-msgid "View Connections"
-msgstr "Elenco contatti"
+#: ../../include/profile_selectors.php:23
+msgid "Gay"
+msgstr "Gay"
 
-#: ../../include/text.php:733 ../../include/nav.php:135
-#: ../../mod/search.php:96
-msgid "Search"
-msgstr "Cerca"
+#: ../../include/profile_selectors.php:23
+msgid "Lesbian"
+msgstr "Lesbica"
 
-#: ../../include/text.php:735 ../../mod/filer.php:36
-msgid "Save"
-msgstr "Salva"
+#: ../../include/profile_selectors.php:23
+msgid "No Preference"
+msgstr "Senza preferenza"
 
-#: ../../include/text.php:773
-msgid "poke"
-msgstr "poke"
+#: ../../include/profile_selectors.php:23
+msgid "Bisexual"
+msgstr "Bisessuale"
 
-#: ../../include/text.php:773 ../../include/conversation.php:236
-msgid "poked"
-msgstr "ha ricevuto un poke"
+#: ../../include/profile_selectors.php:23
+msgid "Autosexual"
+msgstr "Autosessuale"
 
-#: ../../include/text.php:774
-msgid "ping"
-msgstr "ping"
+#: ../../include/profile_selectors.php:23
+msgid "Abstinent"
+msgstr "Astinente"
 
-#: ../../include/text.php:774
-msgid "pinged"
-msgstr "ha ricevuto un ping"
-
-#: ../../include/text.php:775
-msgid "prod"
-msgstr "prod"
+#: ../../include/profile_selectors.php:23
+msgid "Virgin"
+msgstr "Vergine"
 
-#: ../../include/text.php:775
-msgid "prodded"
-msgstr "ha ricevuto un prod"
+#: ../../include/profile_selectors.php:23
+msgid "Deviant"
+msgstr "Deviato"
 
-#: ../../include/text.php:776
-msgid "slap"
-msgstr "schiaffo"
+#: ../../include/profile_selectors.php:23
+msgid "Fetish"
+msgstr "Feticista"
 
-#: ../../include/text.php:776
-msgid "slapped"
-msgstr "ha ricevuto uno schiaffo"
+#: ../../include/profile_selectors.php:23
+msgid "Oodles"
+msgstr "Un sacco"
 
-#: ../../include/text.php:777
-msgid "finger"
-msgstr "finger"
+#: ../../include/profile_selectors.php:23
+msgid "Nonsexual"
+msgstr "Asessuato"
 
-#: ../../include/text.php:777
-msgid "fingered"
-msgstr "ha ricevuto un finger"
+#: ../../include/profile_selectors.php:42
+msgid "Single"
+msgstr "Single"
 
-#: ../../include/text.php:778
-msgid "rebuff"
-msgstr "rifiuto"
+#: ../../include/profile_selectors.php:42
+msgid "Lonely"
+msgstr "Da solo"
 
-#: ../../include/text.php:778
-msgid "rebuffed"
-msgstr "ha ricevuto un rifiuto"
+#: ../../include/profile_selectors.php:42
+msgid "Available"
+msgstr "Disponibile"
 
-#: ../../include/text.php:790
-msgid "happy"
-msgstr "allegro"
+#: ../../include/profile_selectors.php:42
+msgid "Unavailable"
+msgstr "Non disponibile"
 
-#: ../../include/text.php:791
-msgid "sad"
-msgstr "triste"
+#: ../../include/profile_selectors.php:42
+msgid "Has crush"
+msgstr "Ha una cotta"
 
-#: ../../include/text.php:792
-msgid "mellow"
-msgstr "calmo"
+#: ../../include/profile_selectors.php:42
+msgid "Infatuated"
+msgstr "Infatuato/a"
 
-#: ../../include/text.php:793
-msgid "tired"
-msgstr "stanco"
+#: ../../include/profile_selectors.php:42
+msgid "Dating"
+msgstr "Disponibile a un incontro"
 
-#: ../../include/text.php:794
-msgid "perky"
-msgstr "vivace"
+#: ../../include/profile_selectors.php:42
+msgid "Unfaithful"
+msgstr "Infedele"
 
-#: ../../include/text.php:795
-msgid "angry"
-msgstr "arrabbiato"
+#: ../../include/profile_selectors.php:42
+msgid "Sex Addict"
+msgstr "Sesso-dipendente"
 
-#: ../../include/text.php:796
-msgid "stupified"
-msgstr "stordito"
+#: ../../include/profile_selectors.php:42 ../../include/identity.php:298
+#: ../../mod/network.php:215 ../../mod/connections.php:407
+msgid "Friends"
+msgstr "Amici"
 
-#: ../../include/text.php:797
-msgid "puzzled"
-msgstr "confuso"
+#: ../../include/profile_selectors.php:42
+msgid "Friends/Benefits"
+msgstr "Amici piccanti"
 
-#: ../../include/text.php:798
-msgid "interested"
-msgstr "attento"
+#: ../../include/profile_selectors.php:42
+msgid "Casual"
+msgstr "Casual"
 
-#: ../../include/text.php:799
-msgid "bitter"
-msgstr "amaro"
+#: ../../include/profile_selectors.php:42
+msgid "Engaged"
+msgstr "Impegnato"
 
-#: ../../include/text.php:800
-msgid "cheerful"
-msgstr "allegro"
+#: ../../include/profile_selectors.php:42
+msgid "Married"
+msgstr "Sposato/a"
 
-#: ../../include/text.php:801
-msgid "alive"
-msgstr "vivace"
+#: ../../include/profile_selectors.php:42
+msgid "Imaginarily married"
+msgstr "Sogna il matrimonio"
 
-#: ../../include/text.php:802
-msgid "annoyed"
-msgstr "seccato"
+#: ../../include/profile_selectors.php:42
+msgid "Partners"
+msgstr "Partner"
 
-#: ../../include/text.php:803
-msgid "anxious"
-msgstr "ansioso"
+#: ../../include/profile_selectors.php:42
+msgid "Cohabiting"
+msgstr "Convivente"
 
-#: ../../include/text.php:804
-msgid "cranky"
-msgstr "irritabile"
+#: ../../include/profile_selectors.php:42
+msgid "Common law"
+msgstr "Matrimonio regolare"
 
-#: ../../include/text.php:805
-msgid "disturbed"
-msgstr "turbato"
+#: ../../include/profile_selectors.php:42
+msgid "Happy"
+msgstr "Felice"
 
-#: ../../include/text.php:806
-msgid "frustrated"
-msgstr "frustrato"
+#: ../../include/profile_selectors.php:42
+msgid "Not looking"
+msgstr "Non in cerca"
 
-#: ../../include/text.php:807
-msgid "motivated"
-msgstr "motivato"
+#: ../../include/profile_selectors.php:42
+msgid "Swinger"
+msgstr "Scambista"
 
-#: ../../include/text.php:808
-msgid "relaxed"
-msgstr "rilassato"
+#: ../../include/profile_selectors.php:42
+msgid "Betrayed"
+msgstr "Tradito/a"
 
-#: ../../include/text.php:809
-msgid "surprised"
-msgstr "sorpreso"
+#: ../../include/profile_selectors.php:42
+msgid "Separated"
+msgstr "Separato/a"
 
-#: ../../include/text.php:973
-msgid "Monday"
-msgstr "lunedì"
+#: ../../include/profile_selectors.php:42
+msgid "Unstable"
+msgstr "Instabile"
 
-#: ../../include/text.php:973
-msgid "Tuesday"
-msgstr "martedì"
+#: ../../include/profile_selectors.php:42
+msgid "Divorced"
+msgstr "Divorziato/a"
 
-#: ../../include/text.php:973
-msgid "Wednesday"
-msgstr "mercoledì"
+#: ../../include/profile_selectors.php:42
+msgid "Imaginarily divorced"
+msgstr "Sogna il divorzio"
 
-#: ../../include/text.php:973
-msgid "Thursday"
-msgstr "giovedì"
+#: ../../include/profile_selectors.php:42
+msgid "Widowed"
+msgstr "Vedovo/a"
 
-#: ../../include/text.php:973
-msgid "Friday"
-msgstr "venerdì"
+#: ../../include/profile_selectors.php:42
+msgid "Uncertain"
+msgstr "Incerto/a"
 
-#: ../../include/text.php:973
-msgid "Saturday"
-msgstr "sabato"
+#: ../../include/profile_selectors.php:42
+msgid "It's complicated"
+msgstr "Relazione complicata"
 
-#: ../../include/text.php:973
-msgid "Sunday"
-msgstr "domenica"
+#: ../../include/profile_selectors.php:42
+msgid "Don't care"
+msgstr "Chi se ne frega"
 
-#: ../../include/text.php:977
-msgid "January"
-msgstr "gennaio"
+#: ../../include/profile_selectors.php:42
+msgid "Ask me"
+msgstr "Chiedimelo"
 
-#: ../../include/text.php:977
-msgid "February"
-msgstr "febbraio"
+#: ../../include/attach.php:184 ../../include/attach.php:232
+msgid "Item was not found."
+msgstr "Elemento non trovato."
 
-#: ../../include/text.php:977
-msgid "March"
-msgstr "marzo"
+#: ../../include/attach.php:285
+msgid "No source file."
+msgstr "Nessun file di origine."
 
-#: ../../include/text.php:977
-msgid "April"
-msgstr "aprile"
+#: ../../include/attach.php:302
+msgid "Cannot locate file to replace"
+msgstr "Il file da sostituire non è stato trovato"
 
-#: ../../include/text.php:977
-msgid "May"
-msgstr "maggio"
+#: ../../include/attach.php:320
+msgid "Cannot locate file to revise/update"
+msgstr "Il file da aggiornare non è stato trovato"
 
-#: ../../include/text.php:977
-msgid "June"
-msgstr "giugno"
+#: ../../include/attach.php:331
+#, php-format
+msgid "File exceeds size limit of %d"
+msgstr "Il file supera la dimensione massima di %d"
 
-#: ../../include/text.php:977
-msgid "July"
-msgstr "luglio"
+#: ../../include/attach.php:342
+#, php-format
+msgid "You have reached your limit of %1$.0f Mbytes attachment storage."
+msgstr "Hai raggiunto il limite complessivo di %1$.0f Mbytes per gli allegati."
 
-#: ../../include/text.php:977
-msgid "August"
-msgstr "agosto"
+#: ../../include/attach.php:424
+msgid "File upload failed. Possible system limit or action terminated."
+msgstr "Caricamento file fallito, potrebbe aver superato i limiti o l'azione potrebbe essere stata interrotta."
 
-#: ../../include/text.php:977
-msgid "September"
-msgstr "settembre"
+#: ../../include/attach.php:436
+msgid "Stored file could not be verified. Upload failed."
+msgstr "Il file non può essere verificato. Caricamento fallito."
 
-#: ../../include/text.php:977
-msgid "October"
-msgstr "ottobre"
+#: ../../include/attach.php:480 ../../include/attach.php:497
+msgid "Path not available."
+msgstr "Percorso non disponibile."
 
-#: ../../include/text.php:977
-msgid "November"
-msgstr "novembre"
+#: ../../include/attach.php:544
+msgid "Empty pathname"
+msgstr "Il percorso del file è vuoto"
 
-#: ../../include/text.php:977
-msgid "December"
-msgstr "dicembre"
-
-#: ../../include/text.php:1055 ../../mod/message.php:453
-msgid "unknown.???"
-msgstr "sconosciuto???"
+#: ../../include/attach.php:562
+msgid "duplicate filename or path"
+msgstr "il file o percorso del file è duplicato"
 
-#: ../../include/text.php:1056 ../../mod/message.php:454
-msgid "bytes"
-msgstr "byte"
+#: ../../include/attach.php:584
+msgid "Path not found."
+msgstr "Percorso del file non trovato."
 
-#: ../../include/text.php:1091
-msgid "remove category"
-msgstr "rimuovi la categoria"
+#: ../../include/attach.php:628
+msgid "mkdir failed."
+msgstr "mkdir fallito."
 
-#: ../../include/text.php:1113
-msgid "remove from file"
-msgstr "rimuovi dal file"
+#: ../../include/attach.php:632
+msgid "database storage failed."
+msgstr "scrittura su database fallita."
 
-#: ../../include/text.php:1167 ../../include/text.php:1179
-msgid "Click to open/close"
-msgstr "Clicca per aprire/chiudere"
+#: ../../include/zot.php:545
+msgid "Invalid data packet"
+msgstr "Dati non validi"
 
-#: ../../include/text.php:1355 ../../mod/events.php:326
-msgid "link to source"
-msgstr "Link all'originale"
+#: ../../include/zot.php:555
+msgid "Unable to verify channel signature"
+msgstr "Impossibile verificare la firma elettronica del canale"
 
-#: ../../include/text.php:1374
-msgid "Select a page layout: "
-msgstr "Scegli il layout della pagina:"
+#: ../../include/zot.php:732
+#, php-format
+msgid "Unable to verify site signature for %s"
+msgstr "Impossibile verificare la firma elettronica del sito %s"
 
-#: ../../include/text.php:1377 ../../include/text.php:1442
-msgid "default"
-msgstr "predefinito"
+#: ../../include/nav.php:72 ../../include/nav.php:87 ../../boot.php:1439
+msgid "Logout"
+msgstr "Esci"
 
-#: ../../include/text.php:1413
-msgid "Page content type: "
-msgstr "Contenuto della pagina:"
+#: ../../include/nav.php:72 ../../include/nav.php:87
+msgid "End this session"
+msgstr "Chiudi questa sessione"
 
-#: ../../include/text.php:1454
-msgid "Select an alternate language"
-msgstr "Seleziona una lingua diversa"
+#: ../../include/nav.php:75 ../../include/nav.php:121
+msgid "Home"
+msgstr "Bacheca"
 
-#: ../../include/text.php:1606 ../../include/conversation.php:117
-#: ../../mod/like.php:103 ../../mod/subthread.php:89 ../../mod/tagger.php:45
-msgid "photo"
-msgstr "la foto"
+#: ../../include/nav.php:75
+msgid "Your posts and conversations"
+msgstr "I tuoi articoli e conversazioni"
 
-#: ../../include/text.php:1609 ../../include/conversation.php:120
-#: ../../mod/tagger.php:49
-msgid "event"
-msgstr "l'evento"
+#: ../../include/nav.php:76 ../../include/conversation.php:925
+#: ../../mod/connections.php:327 ../../mod/connections.php:441
+msgid "View Profile"
+msgstr "Profilo"
 
-#: ../../include/text.php:1612 ../../include/conversation.php:145
-#: ../../mod/like.php:103 ../../mod/subthread.php:89 ../../mod/tagger.php:53
-msgid "status"
-msgstr "il messaggio di stato"
+#: ../../include/nav.php:76
+msgid "Your profile page"
+msgstr "Il tuo profilo"
 
-#: ../../include/text.php:1614 ../../include/conversation.php:147
-#: ../../mod/tagger.php:55
-msgid "comment"
-msgstr "il commento"
+#: ../../include/nav.php:78
+msgid "Edit Profiles"
+msgstr "Modifica i profili"
 
-#: ../../include/text.php:1619
-msgid "activity"
-msgstr "l'attività"
+#: ../../include/nav.php:78
+msgid "Manage/Edit Profiles"
+msgstr "Gestisci e modifica i profili"
 
-#: ../../include/text.php:1881
-msgid "Design"
-msgstr "Design"
+#: ../../include/nav.php:79 ../../include/conversation.php:1450
+#: ../../mod/fbrowser.php:25
+msgid "Photos"
+msgstr "Foto"
 
-#: ../../include/text.php:1883
-msgid "Blocks"
-msgstr "Riquadri"
+#: ../../include/nav.php:79
+msgid "Your photos"
+msgstr "Le tue foto"
 
-#: ../../include/text.php:1884
-msgid "Menus"
-msgstr "Menù"
+#: ../../include/nav.php:85 ../../boot.php:1440
+msgid "Login"
+msgstr "Accedi"
 
-#: ../../include/text.php:1885
-msgid "Layouts"
-msgstr "Layout"
+#: ../../include/nav.php:85
+msgid "Sign in"
+msgstr "Entra"
 
-#: ../../include/text.php:1886
-msgid "Pages"
-msgstr "Pagine"
+#: ../../include/nav.php:102
+#, php-format
+msgid "%s - click to logout"
+msgstr "%s - clicca per uscire"
 
-#: ../../include/api.php:972
-msgid "Public Timeline"
-msgstr "Diario pubblico"
+#: ../../include/nav.php:107
+msgid "Click to authenticate to your home hub"
+msgstr "Clicca per autenticarti sul tuo server principale"
 
-#: ../../include/identity.php:14 ../../mod/item.php:1148
-msgid "Unable to obtain identity information from database"
-msgstr "Impossibile ottenere le informazioni di identificazione dal database"
+#: ../../include/nav.php:121
+msgid "Home Page"
+msgstr "Bacheca"
 
-#: ../../include/identity.php:36
-msgid "Empty name"
-msgstr "Nome vuoto"
+#: ../../include/nav.php:125 ../../mod/register.php:195 ../../boot.php:1416
+msgid "Register"
+msgstr "Iscriviti"
 
-#: ../../include/identity.php:38
-msgid "Name too long"
-msgstr "Nome troppo lungo"
+#: ../../include/nav.php:125
+msgid "Create an account"
+msgstr "Crea un account"
 
-#: ../../include/identity.php:80
-msgid "No account identifier"
-msgstr "Account senza identificativo"
+#: ../../include/nav.php:130 ../../mod/help.php:45 ../../mod/help.php:49
+msgid "Help"
+msgstr "Guida"
 
-#: ../../include/identity.php:90
-msgid "Nickname is required."
-msgstr "Il nome dell'account è obbligatorio."
+#: ../../include/nav.php:130
+msgid "Help and documentation"
+msgstr "Guida e documentazione"
 
-#: ../../include/identity.php:104
-msgid ""
-"Nickname has unsupported characters or is already being used on this site."
-msgstr "Il nome dell'account è già in uso oppure ha dei caratteri non supportati."
+#: ../../include/nav.php:133
+msgid "Apps"
+msgstr "Apps"
 
-#: ../../include/identity.php:163
-msgid "Unable to retrieve created identity"
-msgstr "Impossibile caricare l'identità creata"
+#: ../../include/nav.php:133
+msgid "Addon applications, utilities, games"
+msgstr "App, strumenti e giochi aggiuntivi"
 
-#: ../../include/identity.php:220
-msgid "Default Profile"
-msgstr "Profilo predefinito"
+#: ../../include/nav.php:135 ../../include/text.php:736
+#: ../../mod/search.php:96
+msgid "Search"
+msgstr "Cerca"
 
-#: ../../include/identity.php:245 ../../include/profile_selectors.php:42
-#: ../../mod/network.php:387 ../../mod/connections.php:407
-msgid "Friends"
-msgstr "Amici"
+#: ../../include/nav.php:135
+msgid "Search site content"
+msgstr "Cerca nel sito"
 
-#: ../../include/bbcode.php:94 ../../include/bbcode.php:494
-#: ../../include/bbcode.php:497
-msgid "Image/photo"
-msgstr "Immagine"
+#: ../../include/nav.php:138 ../../mod/directory.php:225
+msgid "Directory"
+msgstr "Tutti i canali"
 
-#: ../../include/bbcode.php:126 ../../include/bbcode.php:502
-msgid "Encrypted content"
-msgstr "Contenuto crittografato"
+#: ../../include/nav.php:138
+msgid "Channel Locator"
+msgstr "Ricerca canali"
 
-#: ../../include/bbcode.php:173
-#, php-format
-msgid "%1$s wrote the following %2$s %3$s"
-msgstr "%1$s ha scritto %2$s seguente %3$s"
+#: ../../include/nav.php:149
+msgid "Matrix"
+msgstr "La tua rete"
 
-#: ../../include/bbcode.php:175
-msgid "post"
-msgstr "l'articolo"
+#: ../../include/nav.php:149
+msgid "Your matrix"
+msgstr "La tua rete"
 
-#: ../../include/bbcode.php:454 ../../include/bbcode.php:474
-msgid "$1 wrote:"
-msgstr "$1 ha scritto:"
+#: ../../include/nav.php:150
+msgid "See all matrix notifications"
+msgstr "Notifiche dalla tua rete"
 
-#: ../../include/oembed.php:149
-msgid "Embedded content"
-msgstr "Contenuti incorporati"
+#: ../../include/nav.php:151
+msgid "Mark all matrix notifications seen"
+msgstr "Segna come lette le notifiche della tua rete"
 
-#: ../../include/oembed.php:158
-msgid "Embedding disabled"
-msgstr "Contenuti incorporati - funzione disabilitata"
+#: ../../include/nav.php:153
+msgid "Channel Home"
+msgstr "Bacheca del canale"
 
-#: ../../include/notify.php:23
-msgid "created a new post"
-msgstr "Ha creato un nuovo articolo"
+#: ../../include/nav.php:153
+msgid "Channel home"
+msgstr "Bacheca del canale"
 
-#: ../../include/notify.php:24
-#, php-format
-msgid "commented on %s's post"
-msgstr "ha commentato l'articolo di %s"
+#: ../../include/nav.php:154
+msgid "See all channel notifications"
+msgstr "Guarda le notifiche dei canali"
 
-#: ../../include/photos.php:15 ../../include/attach.php:102
-#: ../../include/attach.php:133 ../../include/attach.php:189
-#: ../../include/attach.php:204 ../../include/attach.php:237
-#: ../../include/attach.php:251 ../../include/attach.php:272
-#: ../../include/attach.php:464 ../../include/attach.php:539
-#: ../../include/items.php:3608 ../../mod/common.php:43
-#: ../../mod/events.php:134 ../../mod/invite.php:13 ../../mod/invite.php:102
-#: ../../mod/allfriends.php:10 ../../mod/webpages.php:40 ../../mod/api.php:26
-#: ../../mod/api.php:31 ../../mod/lastpost.php:93 ../../mod/page.php:30
-#: ../../mod/page.php:80 ../../mod/setup.php:200 ../../mod/settings.php:628
-#: ../../mod/viewconnections.php:33 ../../mod/viewconnections.php:38
-#: ../../mod/delegate.php:6 ../../mod/sources.php:48 ../../mod/mitem.php:92
-#: ../../mod/group.php:15 ../../mod/photos.php:74 ../../mod/photos.php:654
-#: ../../mod/viewsrc.php:12 ../../mod/menu.php:40 ../../mod/message.php:208
-#: ../../mod/layouts.php:27 ../../mod/layouts.php:42 ../../mod/network.php:7
-#: ../../mod/intro.php:50 ../../mod/connections.php:197
-#: ../../mod/profiles.php:163 ../../mod/profiles.php:476
-#: ../../mod/new_channel.php:66 ../../mod/new_channel.php:97
-#: ../../mod/filestorage.php:26 ../../mod/manage.php:6
-#: ../../mod/crepair.php:115 ../../mod/editlayout.php:48
-#: ../../mod/nogroup.php:25 ../../mod/profile_photo.php:197
-#: ../../mod/profile_photo.php:210 ../../mod/editwebpage.php:42
-#: ../../mod/editwebpage.php:64 ../../mod/notifications.php:66
-#: ../../mod/blocks.php:29 ../../mod/blocks.php:44 ../../mod/editpost.php:13
-#: ../../mod/poke.php:128 ../../mod/channel.php:123 ../../mod/fsuggest.php:78
-#: ../../mod/editblock.php:48 ../../mod/item.php:181 ../../mod/item.php:189
-#: ../../mod/suggest.php:32 ../../mod/register.php:68 ../../mod/regmod.php:18
-#: ../../mod/mood.php:114 ../../index.php:178 ../../index.php:340
-msgid "Permission denied."
-msgstr "Permesso negato."
+#: ../../include/nav.php:155
+msgid "Mark all channel notifications seen"
+msgstr "Segna come lette le notifiche dei canali"
 
-#: ../../include/photos.php:88
-#, php-format
-msgid "Image exceeds website size limit of %lu bytes"
-msgstr "L'immagine supera il limite massimo di %lu bytes"
+#: ../../include/nav.php:158
+msgid "Intros"
+msgstr "Richieste"
 
-#: ../../include/photos.php:95
-msgid "Image file is empty."
-msgstr "Il file dell'immagine è vuoto."
+#: ../../include/nav.php:158 ../../mod/connections.php:585
+msgid "New Connections"
+msgstr "Nuovi contatti"
 
-#: ../../include/photos.php:124 ../../mod/profile_photo.php:157
-msgid "Unable to process image"
-msgstr "Impossibile elaborare l'immagine"
+#: ../../include/nav.php:159
+msgid "See all channel introductions"
+msgstr "Guarda tutte le richieste di amicizia"
 
-#: ../../include/photos.php:186
-msgid "Photo storage failed."
-msgstr "Impossibile caricare la foto."
+#: ../../include/nav.php:162
+msgid "Notices"
+msgstr "Notifiche"
 
-#: ../../include/photos.php:288 ../../boot.php:2242
-msgid "Photo Albums"
-msgstr "Album foto"
+#: ../../include/nav.php:162 ../../mod/notifications.php:218
+msgid "Notifications"
+msgstr "Notifiche"
 
-#: ../../include/photos.php:292 ../../mod/photos.php:802
-#: ../../mod/photos.php:1276
-msgid "Upload New Photos"
-msgstr "Carica nuove foto"
+#: ../../include/nav.php:163
+msgid "See all notifications"
+msgstr "Vedi tutte le notifiche"
 
-#: ../../include/profile_selectors.php:6
-msgid "Male"
-msgstr "Maschio"
+#: ../../include/nav.php:164
+msgid "Mark all system notifications seen"
+msgstr "Segna come lette le notifiche di sistema"
 
-#: ../../include/profile_selectors.php:6
-msgid "Female"
-msgstr "Femmina"
+#: ../../include/nav.php:166
+msgid "Mail"
+msgstr "Messaggi"
 
-#: ../../include/profile_selectors.php:6
-msgid "Currently Male"
-msgstr "Al momento maschio"
+#: ../../include/nav.php:166
+msgid "Private mail"
+msgstr "Messaggi privati"
 
-#: ../../include/profile_selectors.php:6
-msgid "Currently Female"
-msgstr "Al momento femmina"
+#: ../../include/nav.php:167
+msgid "See all private messages"
+msgstr "Guarda tutti i messaggi privati"
 
-#: ../../include/profile_selectors.php:6
-msgid "Mostly Male"
-msgstr "Prevalentemente maschio"
+#: ../../include/nav.php:168
+msgid "Mark all private messages seen"
+msgstr "Segna come letti tutti i messaggi privati"
 
-#: ../../include/profile_selectors.php:6
-msgid "Mostly Female"
-msgstr "Prevalentemente femmina"
+#: ../../include/nav.php:169
+msgid "Inbox"
+msgstr "In arrivo"
 
-#: ../../include/profile_selectors.php:6
-msgid "Transgender"
-msgstr "Transgender"
+#: ../../include/nav.php:170
+msgid "Outbox"
+msgstr "Inviati"
 
-#: ../../include/profile_selectors.php:6
-msgid "Intersex"
-msgstr "Intersex"
+#: ../../include/nav.php:171 ../../mod/message.php:24
+msgid "New Message"
+msgstr "Nuovo messaggio"
 
-#: ../../include/profile_selectors.php:6
-msgid "Transsexual"
-msgstr "Transessuale"
+#: ../../include/nav.php:174 ../../include/conversation.php:1461
+#: ../../mod/events.php:353
+msgid "Events"
+msgstr "Eventi"
 
-#: ../../include/profile_selectors.php:6
-msgid "Hermaphrodite"
-msgstr "Ermafrodito"
+#: ../../include/nav.php:174
+msgid "Event Calendar"
+msgstr "Calendario"
 
-#: ../../include/profile_selectors.php:6
-msgid "Neuter"
-msgstr "Neutro"
+#: ../../include/nav.php:175
+msgid "See all events"
+msgstr "Guarda tutti gli eventi"
 
-#: ../../include/profile_selectors.php:6
-msgid "Non-specific"
-msgstr "Non specificato"
+#: ../../include/nav.php:176
+msgid "Mark all events seen"
+msgstr "Marca come letti tutti gli eventi"
 
-#: ../../include/profile_selectors.php:6
-msgid "Other"
-msgstr "Altro"
+#: ../../include/nav.php:178
+msgid "Channel Select"
+msgstr "Gestisci i canali"
 
-#: ../../include/profile_selectors.php:6
-msgid "Undecided"
-msgstr "Indeciso"
+#: ../../include/nav.php:178
+msgid "Manage Your Channels"
+msgstr "Gestisci i contatti dei tuoi canali"
 
-#: ../../include/profile_selectors.php:23
-msgid "Males"
-msgstr "Maschi"
+#: ../../include/nav.php:180 ../../mod/settings.php:131
+#: ../../mod/admin.php:782 ../../mod/admin.php:987
+msgid "Settings"
+msgstr "Impostazioni"
 
-#: ../../include/profile_selectors.php:23
-msgid "Females"
-msgstr "Femmine"
+#: ../../include/nav.php:180
+msgid "Account/Channel Settings"
+msgstr "Impostazioni account e canali"
 
-#: ../../include/profile_selectors.php:23
-msgid "Gay"
-msgstr "Gay"
+#: ../../include/nav.php:182 ../../mod/connections.php:690
+msgid "Connections"
+msgstr "Contatti"
 
-#: ../../include/profile_selectors.php:23
-msgid "Lesbian"
-msgstr "Lesbica"
+#: ../../include/nav.php:182
+msgid "Manage/Edit Friends and Connections"
+msgstr "Modifica amici e contatti"
 
-#: ../../include/profile_selectors.php:23
-msgid "No Preference"
-msgstr "Senza preferenza"
+#: ../../include/nav.php:189 ../../mod/admin.php:111
+msgid "Admin"
+msgstr "Amministrazione"
 
-#: ../../include/profile_selectors.php:23
-msgid "Bisexual"
-msgstr "Bisessuale"
+#: ../../include/nav.php:189
+msgid "Site Setup and Configuration"
+msgstr "Configurazione del sito"
 
-#: ../../include/profile_selectors.php:23
-msgid "Autosexual"
-msgstr "Autosessuale"
+#: ../../include/nav.php:215
+msgid "Nothing new here"
+msgstr "Niente di nuovo qui"
 
-#: ../../include/profile_selectors.php:23
-msgid "Abstinent"
-msgstr "Astinente"
+#: ../../include/nav.php:220
+msgid "Please wait..."
+msgstr "Attendere..."
 
-#: ../../include/profile_selectors.php:23
-msgid "Virgin"
-msgstr "Vergine"
+#: ../../include/account.php:23
+msgid "Not a valid email address"
+msgstr "Email non valida"
 
-#: ../../include/profile_selectors.php:23
-msgid "Deviant"
-msgstr "Deviato"
+#: ../../include/account.php:25
+msgid "Your email domain is not among those allowed on this site"
+msgstr "Il dominio della tua email attualmente non è permesso su questo sito"
 
-#: ../../include/profile_selectors.php:23
-msgid "Fetish"
-msgstr "Feticista"
+#: ../../include/account.php:31
+msgid "Your email address is already registered at this site."
+msgstr "La tua email è già registrata su questo sito."
 
-#: ../../include/profile_selectors.php:23
-msgid "Oodles"
-msgstr "Un sacco"
+#: ../../include/account.php:64
+msgid "An invitation is required."
+msgstr "È necessario un invito."
 
-#: ../../include/profile_selectors.php:23
-msgid "Nonsexual"
-msgstr "Asessuato"
+#: ../../include/account.php:68
+msgid "Invitation could not be verified."
+msgstr "L'invito non può essere verificato."
 
-#: ../../include/profile_selectors.php:42
-msgid "Single"
-msgstr "Single"
+#: ../../include/account.php:118
+msgid "Please enter the required information."
+msgstr "Inserisci le informazioni richieste."
 
-#: ../../include/profile_selectors.php:42
-msgid "Lonely"
-msgstr "Da solo"
+#: ../../include/account.php:186
+msgid "Failed to store account information."
+msgstr "Non è stato possibile salvare le informazioni del tuo account."
 
-#: ../../include/profile_selectors.php:42
-msgid "Available"
-msgstr "Disponibile"
+#: ../../include/account.php:272
+#, php-format
+msgid "Registration request at %s"
+msgstr "Richiesta di registrazione su %s"
 
-#: ../../include/profile_selectors.php:42
-msgid "Unavailable"
-msgstr "Non disponibile"
+#: ../../include/account.php:274 ../../include/account.php:301
+#: ../../include/account.php:358
+msgid "Administrator"
+msgstr "Amministratore"
 
-#: ../../include/profile_selectors.php:42
-msgid "Has crush"
-msgstr "Ha una cotta"
+#: ../../include/account.php:296
+msgid "your registration password"
+msgstr "la password di registrazione"
 
-#: ../../include/profile_selectors.php:42
-msgid "Infatuated"
-msgstr "Infatuato/a"
+#: ../../include/account.php:299 ../../include/account.php:356
+#, php-format
+msgid "Registration details for %s"
+msgstr "Dettagli della registrazione di %s"
 
-#: ../../include/profile_selectors.php:42
-msgid "Dating"
-msgstr "Disponibile a un incontro"
+#: ../../include/account.php:365
+msgid "Account approved."
+msgstr "Account approvato."
 
-#: ../../include/profile_selectors.php:42
-msgid "Unfaithful"
-msgstr "Infedele"
+#: ../../include/account.php:399
+#, php-format
+msgid "Registration revoked for %s"
+msgstr "Registrazione revocata per %s"
 
-#: ../../include/profile_selectors.php:42
-msgid "Sex Addict"
-msgstr "Sesso-dipendente"
+#: ../../include/conversation.php:117 ../../include/text.php:1609
+#: ../../mod/like.php:103 ../../mod/subthread.php:89 ../../mod/tagger.php:45
+msgid "photo"
+msgstr "la foto"
 
-#: ../../include/profile_selectors.php:42
-msgid "Friends/Benefits"
-msgstr "Amici piccanti"
+#: ../../include/conversation.php:120 ../../include/text.php:1612
+#: ../../mod/tagger.php:49
+msgid "event"
+msgstr "l'evento"
 
-#: ../../include/profile_selectors.php:42
-msgid "Casual"
-msgstr "Casual"
+#: ../../include/conversation.php:123
+msgid "channel"
+msgstr "canale"
 
-#: ../../include/profile_selectors.php:42
-msgid "Engaged"
-msgstr "Impegnato"
+#: ../../include/conversation.php:145 ../../include/text.php:1615
+#: ../../mod/like.php:103 ../../mod/subthread.php:89 ../../mod/tagger.php:53
+msgid "status"
+msgstr "il messaggio di stato"
 
-#: ../../include/profile_selectors.php:42
-msgid "Married"
-msgstr "Sposato/a"
+#: ../../include/conversation.php:147 ../../include/text.php:1617
+#: ../../mod/tagger.php:55
+msgid "comment"
+msgstr "il commento"
 
-#: ../../include/profile_selectors.php:42
-msgid "Imaginarily married"
-msgstr "Sogna il matrimonio"
+#: ../../include/conversation.php:161 ../../mod/like.php:134
+#, php-format
+msgid "%1$s likes %2$s's %3$s"
+msgstr "A %1$s piace %3$s di %2$s"
 
-#: ../../include/profile_selectors.php:42
-msgid "Partners"
-msgstr "Partner"
+#: ../../include/conversation.php:164 ../../mod/like.php:136
+#, php-format
+msgid "%1$s doesn't like %2$s's %3$s"
+msgstr "A %1$s non piace %3$s di %2$s"
 
-#: ../../include/profile_selectors.php:42
-msgid "Cohabiting"
-msgstr "Convivente"
+#: ../../include/conversation.php:201
+#, php-format
+msgid "%1$s is now connected with %2$s"
+msgstr "%1$s adesso è connesso con %2$s"
 
-#: ../../include/profile_selectors.php:42
-msgid "Common law"
-msgstr "Matrimonio regolare"
+#: ../../include/conversation.php:232
+#, php-format
+msgid "%1$s poked %2$s"
+msgstr "%1$s ha mandato un poke a %2$s"
 
-#: ../../include/profile_selectors.php:42
-msgid "Happy"
-msgstr "Felice"
+#: ../../include/conversation.php:236 ../../include/text.php:776
+msgid "poked"
+msgstr "ha ricevuto un poke"
 
-#: ../../include/profile_selectors.php:42
-msgid "Not looking"
-msgstr "Non in cerca"
+#: ../../include/conversation.php:254 ../../mod/mood.php:63
+#, php-format
+msgid "%1$s is currently %2$s"
+msgstr "%1$s al momento è %2$s"
 
-#: ../../include/profile_selectors.php:42
-msgid "Swinger"
-msgstr "Scambista"
+#: ../../include/conversation.php:658
+#, php-format
+msgid "View %s's profile @ %s"
+msgstr "Vedi il profilo di %s @ %s"
 
-#: ../../include/profile_selectors.php:42
-msgid "Betrayed"
-msgstr "Tradito/a"
+#: ../../include/conversation.php:672
+msgid "Categories:"
+msgstr "Categorie:"
 
-#: ../../include/profile_selectors.php:42
-msgid "Separated"
-msgstr "Separato/a"
+#: ../../include/conversation.php:673
+msgid "Filed under:"
+msgstr "Classificato come:"
 
-#: ../../include/profile_selectors.php:42
-msgid "Unstable"
-msgstr "Instabile"
+#: ../../include/conversation.php:700
+msgid "View in context"
+msgstr "Vedi nel contesto"
 
-#: ../../include/profile_selectors.php:42
-msgid "Divorced"
-msgstr "Divorziato/a"
+#: ../../include/conversation.php:826
+msgid "remove"
+msgstr "rimuovi"
 
-#: ../../include/profile_selectors.php:42
-msgid "Imaginarily divorced"
-msgstr "Sogna il divorzio"
+#: ../../include/conversation.php:830
+msgid "Loading..."
+msgstr "Caricamento in corso..."
 
-#: ../../include/profile_selectors.php:42
-msgid "Widowed"
-msgstr "Vedovo/a"
+#: ../../include/conversation.php:831
+msgid "Delete Selected Items"
+msgstr "Elimina gli oggetti selezionati"
 
-#: ../../include/profile_selectors.php:42
-msgid "Uncertain"
-msgstr "Incerto/a"
+#: ../../include/conversation.php:922
+msgid "View Source"
+msgstr "Vedi il sorgente"
 
-#: ../../include/profile_selectors.php:42
-msgid "It's complicated"
-msgstr "Relazione complicata"
+#: ../../include/conversation.php:923
+msgid "Follow Thread"
+msgstr "Segui la discussione"
 
-#: ../../include/profile_selectors.php:42
-msgid "Don't care"
-msgstr "Chi se ne frega"
+#: ../../include/conversation.php:924
+msgid "View Status"
+msgstr "Guarda il messaggio di stato"
 
-#: ../../include/profile_selectors.php:42
-msgid "Ask me"
-msgstr "Chiedimelo"
+#: ../../include/conversation.php:926
+msgid "View Photos"
+msgstr "Guarda le foto"
 
-#: ../../include/attach.php:184 ../../include/attach.php:232
-msgid "Item was not found."
-msgstr "Elemento non trovato."
+#: ../../include/conversation.php:927
+msgid "Matrix Activity"
+msgstr "Attività nella tua rete"
 
-#: ../../include/attach.php:285
-msgid "No source file."
-msgstr "Nessun file di origine."
+#: ../../include/conversation.php:928
+msgid "Edit Contact"
+msgstr "Modifica il contatto"
 
-#: ../../include/attach.php:302
-msgid "Cannot locate file to replace"
-msgstr "Il file da sostituire non è stato trovato"
+#: ../../include/conversation.php:929
+msgid "Send PM"
+msgstr "Invia messaggio privato"
 
-#: ../../include/attach.php:320
-msgid "Cannot locate file to revise/update"
-msgstr "Il file da aggiornare non è stato trovato"
+#: ../../include/conversation.php:930
+msgid "Poke"
+msgstr "Poke"
 
-#: ../../include/attach.php:331
+#: ../../include/conversation.php:992
 #, php-format
-msgid "File exceeds size limit of %d"
-msgstr "Il file supera la dimensione massima di %d"
+msgid "%s likes this."
+msgstr "Piace a %s."
 
-#: ../../include/attach.php:342
+#: ../../include/conversation.php:992
 #, php-format
-msgid "You have reached your limit of %1$.0f Mbytes attachment storage."
-msgstr "Hai raggiunto il limite complessivo di %1$.0f Mbytes per gli allegati."
+msgid "%s doesn't like this."
+msgstr "Non piace a %s."
 
-#: ../../include/attach.php:424
-msgid "File upload failed. Possible system limit or action terminated."
-msgstr "Caricamento file fallito, potrebbe aver superato i limiti o l'azione potrebbe essere stata interrotta."
+#: ../../include/conversation.php:996
+#, php-format
+msgid "<span  %1$s>%2$d people</span> like this."
+msgid_plural "<span  %1$s>%2$d people</span> like this."
+msgstr[0] ""
+msgstr[1] "Piace a <span %1$s>%2$d persone</span>."
 
-#: ../../include/attach.php:436
-msgid "Stored file could not be verified. Upload failed."
-msgstr "Il file non può essere verificato. Caricamento fallito."
+#: ../../include/conversation.php:998
+#, php-format
+msgid "<span  %1$s>%2$d people</span> don't like this."
+msgid_plural "<span  %1$s>%2$d people</span> don't like this."
+msgstr[0] ""
+msgstr[1] "Non piace a <span %1$s>%2$d persone</span>."
 
-#: ../../include/attach.php:480 ../../include/attach.php:497
-msgid "Path not available."
-msgstr "Percorso non disponibile."
+#: ../../include/conversation.php:1004
+msgid "and"
+msgstr "e"
 
-#: ../../include/attach.php:544
-msgid "Empty pathname"
-msgstr "Il percorso del file è vuoto"
+#: ../../include/conversation.php:1007
+#, php-format
+msgid ", and %d other people"
+msgid_plural ", and %d other people"
+msgstr[0] ""
+msgstr[1] "e altre %d persone"
 
-#: ../../include/attach.php:562
-msgid "duplicate filename or path"
-msgstr "il file o percorso del file è duplicato"
+#: ../../include/conversation.php:1008
+#, php-format
+msgid "%s like this."
+msgstr "Piace a %s."
 
-#: ../../include/attach.php:584
-msgid "Path not found."
-msgstr "Percorso del file non trovato."
+#: ../../include/conversation.php:1008
+#, php-format
+msgid "%s don't like this."
+msgstr "Non piace a %s."
 
-#: ../../include/attach.php:628
-msgid "mkdir failed."
-msgstr "mkdir fallito."
+#: ../../include/conversation.php:1058
+msgid "Visible to <strong>everybody</strong>"
+msgstr "Visibile a <strong>tutti</strong>"
 
-#: ../../include/attach.php:632
-msgid "database storage failed."
-msgstr "scrittura su database fallita."
+#: ../../include/conversation.php:1059 ../../mod/message.php:281
+#: ../../mod/message.php:417
+msgid "Please enter a link URL:"
+msgstr "Inserisci l'indirizzo del link:"
 
-#: ../../include/zot.php:542
-msgid "Invalid data packet"
-msgstr "Dati non validi"
+#: ../../include/conversation.php:1060
+msgid "Please enter a video link/URL:"
+msgstr "Inserisci l'indirizzo del video:"
 
-#: ../../include/zot.php:552
-msgid "Unable to verify channel signature"
-msgstr "Impossibile verificare la firma elettronica del canale"
+#: ../../include/conversation.php:1061
+msgid "Please enter an audio link/URL:"
+msgstr "Inserisci l'indirizzo dell'audio:"
 
-#: ../../include/zot.php:697
-#, php-format
-msgid "Unable to verify site signature for %s"
-msgstr "Impossibile verificare la firma elettronica del sito %s"
+#: ../../include/conversation.php:1062
+msgid "Tag term:"
+msgstr "Tag:"
 
-#: ../../include/nav.php:72 ../../include/nav.php:87 ../../boot.php:1458
-msgid "Logout"
-msgstr "Esci"
+#: ../../include/conversation.php:1063 ../../mod/filer.php:35
+msgid "Save to Folder:"
+msgstr "Salva nella cartella:"
 
-#: ../../include/nav.php:72 ../../include/nav.php:87
-msgid "End this session"
-msgstr "Chiudi questa sessione"
+#: ../../include/conversation.php:1064
+msgid "Where are you right now?"
+msgstr "Dove sei ora?"
 
-#: ../../include/nav.php:75 ../../include/nav.php:121
-msgid "Home"
-msgstr "Bacheca"
+#: ../../include/conversation.php:1065 ../../mod/message.php:282
+#: ../../mod/message.php:418 ../../mod/editpost.php:52
+msgid "Expires YYYY-MM-DD HH:MM"
+msgstr "Scadenza il AAAA-MM-GG OO:MM"
 
-#: ../../include/nav.php:75
-msgid "Your posts and conversations"
-msgstr "I tuoi articoli e conversazioni"
+#: ../../include/conversation.php:1089 ../../mod/photos.php:1071
+msgid "Share"
+msgstr "Condividi"
 
-#: ../../include/nav.php:76
-msgid "Your profile page"
-msgstr "Il tuo profilo"
+#: ../../include/conversation.php:1091
+msgid "Page link title"
+msgstr "Link del titolo"
 
-#: ../../include/nav.php:78
-msgid "Edit Profiles"
-msgstr "Modifica i profili"
+#: ../../include/conversation.php:1093 ../../mod/message.php:329
+#: ../../mod/message.php:512 ../../mod/editlayout.php:101
+#: ../../mod/editwebpage.php:120 ../../mod/editpost.php:98
+#: ../../mod/editblock.php:115
+msgid "Upload photo"
+msgstr "Carica foto"
 
-#: ../../include/nav.php:78
-msgid "Manage/Edit Profiles"
-msgstr "Gestisci e modifica i profili"
+#: ../../include/conversation.php:1094
+msgid "upload photo"
+msgstr "carica foto"
 
-#: ../../include/nav.php:79 ../../mod/fbrowser.php:25 ../../boot.php:2239
-msgid "Photos"
-msgstr "Foto"
-
-#: ../../include/nav.php:79
-msgid "Your photos"
-msgstr "Le tue foto"
+#: ../../include/conversation.php:1095 ../../mod/message.php:330
+#: ../../mod/message.php:513 ../../mod/editlayout.php:102
+#: ../../mod/editwebpage.php:121 ../../mod/editpost.php:99
+#: ../../mod/editblock.php:116
+msgid "Attach file"
+msgstr "Allega file"
 
-#: ../../include/nav.php:85 ../../boot.php:1459
-msgid "Login"
-msgstr "Accedi"
+#: ../../include/conversation.php:1096
+msgid "attach file"
+msgstr "allega file"
 
-#: ../../include/nav.php:85
-msgid "Sign in"
-msgstr "Entra"
+#: ../../include/conversation.php:1097 ../../mod/message.php:331
+#: ../../mod/message.php:514 ../../mod/editlayout.php:103
+#: ../../mod/editwebpage.php:122 ../../mod/editpost.php:100
+#: ../../mod/editblock.php:117
+msgid "Insert web link"
+msgstr "Inserisci un indirizzo web"
 
-#: ../../include/nav.php:102
-#, php-format
-msgid "%s - click to logout"
-msgstr "%s - clicca per uscire"
+#: ../../include/conversation.php:1098
+msgid "web link"
+msgstr "link web"
 
-#: ../../include/nav.php:107
-msgid "Click to authenticate to your home hub"
-msgstr "Clicca per autenticarti sul tuo server principale"
+#: ../../include/conversation.php:1099
+msgid "Insert video link"
+msgstr "Inserisci l'indirizzo di un video"
 
-#: ../../include/nav.php:121
-msgid "Home Page"
-msgstr "Bacheca"
+#: ../../include/conversation.php:1100
+msgid "video link"
+msgstr "link video"
 
-#: ../../include/nav.php:125 ../../mod/register.php:195 ../../boot.php:1435
-msgid "Register"
-msgstr "Iscriviti"
+#: ../../include/conversation.php:1101
+msgid "Insert audio link"
+msgstr "Inserisci l'indirizzo di un audio"
 
-#: ../../include/nav.php:125
-msgid "Create an account"
-msgstr "Crea un account"
+#: ../../include/conversation.php:1102
+msgid "audio link"
+msgstr "link audio"
 
-#: ../../include/nav.php:130 ../../mod/help.php:45 ../../mod/help.php:49
-msgid "Help"
-msgstr "Guida"
+#: ../../include/conversation.php:1103 ../../mod/editlayout.php:107
+#: ../../mod/editwebpage.php:126 ../../mod/editpost.php:104
+#: ../../mod/editblock.php:121
+msgid "Set your location"
+msgstr "La tua località"
 
-#: ../../include/nav.php:130
-msgid "Help and documentation"
-msgstr "Guida e documentazione"
+#: ../../include/conversation.php:1104
+msgid "set location"
+msgstr "la tua località"
 
-#: ../../include/nav.php:133
-msgid "Apps"
-msgstr "Apps"
+#: ../../include/conversation.php:1105 ../../mod/editlayout.php:108
+#: ../../mod/editwebpage.php:127 ../../mod/editpost.php:105
+#: ../../mod/editblock.php:122
+msgid "Clear browser location"
+msgstr "Rimuovi la località data dal browser"
 
-#: ../../include/nav.php:133
-msgid "Addon applications, utilities, games"
-msgstr "App, strumenti e giochi aggiuntivi"
+#: ../../include/conversation.php:1106
+msgid "clear location"
+msgstr "rimuovi la località"
 
-#: ../../include/nav.php:135
-msgid "Search site content"
-msgstr "Cerca nel sito"
+#: ../../include/conversation.php:1108 ../../mod/editlayout.php:121
+#: ../../mod/editwebpage.php:142 ../../mod/editpost.php:118
+#: ../../mod/editblock.php:136
+msgid "Set title"
+msgstr "Scegli un titolo"
 
-#: ../../include/nav.php:138 ../../mod/directory.php:225
-msgid "Directory"
-msgstr "Tutti i canali"
+#: ../../include/conversation.php:1111 ../../mod/editlayout.php:123
+#: ../../mod/editwebpage.php:144 ../../mod/editpost.php:120
+#: ../../mod/editblock.php:138
+msgid "Categories (comma-separated list)"
+msgstr "Categorie (separate da virgola)"
 
-#: ../../include/nav.php:138
-msgid "Channel Locator"
-msgstr "Ricerca canali"
+#: ../../include/conversation.php:1113 ../../mod/editlayout.php:110
+#: ../../mod/editwebpage.php:129 ../../mod/editpost.php:107
+#: ../../mod/editblock.php:124
+msgid "Permission settings"
+msgstr "Impostazioni permessi"
 
-#: ../../include/nav.php:149
-msgid "Matrix"
-msgstr "La tua rete"
+#: ../../include/conversation.php:1114
+msgid "permissions"
+msgstr "permessi"
 
-#: ../../include/nav.php:149
-msgid "Your matrix"
-msgstr "La tua rete"
+#: ../../include/conversation.php:1122 ../../mod/editlayout.php:118
+#: ../../mod/editwebpage.php:137 ../../mod/editpost.php:115
+#: ../../mod/editblock.php:133
+msgid "Public post"
+msgstr "Articolo pubblico"
 
-#: ../../include/nav.php:150
-msgid "See all matrix notifications"
-msgstr "Notifiche dalla tua rete"
+#: ../../include/conversation.php:1124 ../../mod/editlayout.php:124
+#: ../../mod/editwebpage.php:145 ../../mod/editpost.php:121
+#: ../../mod/editblock.php:139
+msgid "Example: bob@example.com, mary@example.com"
+msgstr "Per esempio: mario@esempio.com, simona@esempio.com"
 
-#: ../../include/nav.php:151
-msgid "Mark all matrix notifications seen"
-msgstr "Segna come lette le notifiche della tua rete"
+#: ../../include/conversation.php:1137 ../../mod/message.php:336
+#: ../../mod/message.php:519 ../../mod/editlayout.php:134
+#: ../../mod/editwebpage.php:155 ../../mod/editpost.php:132
+#: ../../mod/editblock.php:149
+msgid "Set expiration date"
+msgstr "Data di scadenza"
 
-#: ../../include/nav.php:153
-msgid "Channel Home"
-msgstr "Bacheca del canale"
+#: ../../include/conversation.php:1364
+msgid "Commented Order"
+msgstr "Ultimi commenti"
 
-#: ../../include/nav.php:153
-msgid "Channel home"
-msgstr "Bacheca del canale"
+#: ../../include/conversation.php:1367
+msgid "Sort by Comment Date"
+msgstr "Per data del commento"
 
-#: ../../include/nav.php:154
-msgid "See all channel notifications"
-msgstr "Guarda le notifiche dei canali"
+#: ../../include/conversation.php:1370
+msgid "Posted Order"
+msgstr "Ultimi articoli"
 
-#: ../../include/nav.php:155
-msgid "Mark all channel notifications seen"
-msgstr "Segna come lette le notifiche dei canali"
+#: ../../include/conversation.php:1373
+msgid "Sort by Post Date"
+msgstr "Per data di creazione"
 
-#: ../../include/nav.php:158
-msgid "Intros"
-msgstr "Richieste"
+#: ../../include/conversation.php:1377 ../../mod/notifications.php:86
+msgid "Personal"
+msgstr "Personali"
 
-#: ../../include/nav.php:158 ../../mod/connections.php:585
-msgid "New Connections"
-msgstr "Nuovi contatti"
+#: ../../include/conversation.php:1380
+msgid "Posts that mention or involve you"
+msgstr "Articoli che ti riguardano o ti menzionano"
 
-#: ../../include/nav.php:159
-msgid "See all channel introductions"
-msgstr "Guarda tutte le richieste di amicizia"
+#: ../../include/conversation.php:1383 ../../mod/menu.php:57
+#: ../../mod/connections.php:552
+msgid "New"
+msgstr "Novità"
 
-#: ../../include/nav.php:162
-msgid "Notices"
-msgstr "Notifiche"
+#: ../../include/conversation.php:1386
+msgid "Activity Stream - by date"
+msgstr "Elenco attività - per data"
 
-#: ../../include/nav.php:162 ../../mod/notifications.php:218
-msgid "Notifications"
-msgstr "Notifiche"
+#: ../../include/conversation.php:1393
+msgid "Starred"
+msgstr "Preferiti"
 
-#: ../../include/nav.php:163
-msgid "See all notifications"
-msgstr "Vedi tutte le notifiche"
+#: ../../include/conversation.php:1396
+msgid "Favourite Posts"
+msgstr "Articoli preferiti"
 
-#: ../../include/nav.php:164
-msgid "Mark all system notifications seen"
-msgstr "Segna come lette le notifiche di sistema"
+#: ../../include/conversation.php:1403
+msgid "Spam"
+msgstr "Spam"
 
-#: ../../include/nav.php:166
-msgid "Mail"
-msgstr "Messaggi"
+#: ../../include/conversation.php:1406
+msgid "Posts flagged as SPAM"
+msgstr "Articoli marcati come spam"
 
-#: ../../include/nav.php:166
-msgid "Private mail"
-msgstr "Messaggi privati"
+#: ../../include/conversation.php:1436
+msgid "Channel"
+msgstr "Canale"
 
-#: ../../include/nav.php:167
-msgid "See all private messages"
-msgstr "Guarda tutti i messaggi privati"
+#: ../../include/conversation.php:1439
+msgid "Status Messages and Posts"
+msgstr "Articoli e messaggi di stato"
 
-#: ../../include/nav.php:168
-msgid "Mark all private messages seen"
-msgstr "Segna come letti tutti i messaggi privati"
+#: ../../include/conversation.php:1443
+msgid "About"
+msgstr "Informazioni"
 
-#: ../../include/nav.php:169
-msgid "Inbox"
-msgstr "In arrivo"
+#: ../../include/conversation.php:1446
+msgid "Profile Details"
+msgstr "Dettagli del profilo"
 
-#: ../../include/nav.php:170
-msgid "Outbox"
-msgstr "Inviati"
+#: ../../include/conversation.php:1464
+msgid "Events and Calendar"
+msgstr "Calendario eventi"
 
-#: ../../include/nav.php:171 ../../mod/message.php:24
-msgid "New Message"
-msgstr "Nuovo messaggio"
+#: ../../include/conversation.php:1469
+msgid "Webpages"
+msgstr "Pagine web"
 
-#: ../../include/nav.php:174 ../../mod/events.php:348 ../../boot.php:2250
-msgid "Events"
-msgstr "Eventi"
+#: ../../include/conversation.php:1472
+msgid "Manage Webpages"
+msgstr "Gestisci le pagine web"
 
-#: ../../include/nav.php:174
-msgid "Event Calendar"
-msgstr "Calendario"
+#: ../../include/auth.php:69
+msgid "Logged out."
+msgstr "Uscita effettuata."
 
-#: ../../include/nav.php:175
-msgid "See all events"
-msgstr "Guarda tutti gli eventi"
+#: ../../include/auth.php:181
+msgid "Failed authentication"
+msgstr "Autenticazione fallita"
 
-#: ../../include/nav.php:176
-msgid "Mark all events seen"
-msgstr "Marca come letti tutti gli eventi"
+#: ../../include/auth.php:190
+msgid "Login failed."
+msgstr "Accesso fallito."
 
-#: ../../include/nav.php:178
-msgid "Channel Select"
-msgstr "Gestisci i canali"
+#: ../../include/contact_widgets.php:14
+#, php-format
+msgid "You have %1$.0f of %2$.0f allowed connections."
+msgstr "Hai attivato %1$.0f delle %2$.0f connessioni permesse."
 
-#: ../../include/nav.php:178
-msgid "Manage Your Channels"
-msgstr "Gestisci i contatti dei tuoi canali"
-
-#: ../../include/nav.php:180 ../../mod/settings.php:131
-#: ../../mod/admin.php:782 ../../mod/admin.php:987
-msgid "Settings"
-msgstr "Impostazioni"
-
-#: ../../include/nav.php:180
-msgid "Account/Channel Settings"
-msgstr "Impostazioni account e canali"
+#: ../../include/contact_widgets.php:20
+msgid "Add New Connection"
+msgstr "Aggiungi un contatto"
 
-#: ../../include/nav.php:182 ../../mod/connections.php:691
-msgid "Connections"
-msgstr "Contatti"
+#: ../../include/contact_widgets.php:21
+msgid "Enter the channel address"
+msgstr "Scrivi l'indirizzo del canale"
 
-#: ../../include/nav.php:182
-msgid "Manage/Edit Friends and Connections"
-msgstr "Modifica amici e contatti"
+#: ../../include/contact_widgets.php:22
+msgid "Example: bob@example.com, http://example.com/barbara"
+msgstr "Per esempio: mario@pippo.it oppure http://pluto.com/barbara"
 
-#: ../../include/nav.php:189 ../../mod/admin.php:111
-msgid "Admin"
-msgstr "Amministrazione"
+#: ../../include/contact_widgets.php:38
+#, php-format
+msgid "%d invitation available"
+msgid_plural "%d invitations available"
+msgstr[0] "%d invito disponibile"
+msgstr[1] "%d inviti disponibili"
 
-#: ../../include/nav.php:189
-msgid "Site Setup and Configuration"
-msgstr "Configurazione del sito"
+#: ../../include/contact_widgets.php:44
+msgid "Find Channels"
+msgstr "Ricerca canali"
 
-#: ../../include/nav.php:215
-msgid "Nothing new here"
-msgstr "Niente di nuovo qui"
+#: ../../include/contact_widgets.php:45
+msgid "Enter name or interest"
+msgstr "Scrivi un nome o un interesse"
 
-#: ../../include/nav.php:220
-msgid "Please wait..."
-msgstr "Attendere..."
+#: ../../include/contact_widgets.php:46
+msgid "Connect/Follow"
+msgstr "Entra in contatto/segui"
 
-#: ../../include/account.php:23
-msgid "Not a valid email address"
-msgstr "Email non valida"
+#: ../../include/contact_widgets.php:47
+msgid "Examples: Robert Morgenstein, Fishing"
+msgstr "Per esempio: Mario Rossi, Pesca"
 
-#: ../../include/account.php:25
-msgid "Your email domain is not among those allowed on this site"
-msgstr "Il dominio della tua email attualmente non è permesso su questo sito"
+#: ../../include/contact_widgets.php:48 ../../mod/connections.php:696
+#: ../../mod/directory.php:221 ../../mod/directory.php:226
+msgid "Find"
+msgstr "Cerca"
 
-#: ../../include/account.php:31
-msgid "Your email address is already registered at this site."
-msgstr "La tua email è già registrata su questo sito."
+#: ../../include/contact_widgets.php:49 ../../mod/suggest.php:64
+msgid "Channel Suggestions"
+msgstr "Canali suggeriti"
 
-#: ../../include/account.php:64
-msgid "An invitation is required."
-msgstr "È necessario un invito."
+#: ../../include/contact_widgets.php:51
+msgid "Random Profile"
+msgstr "Profilo casuale"
 
-#: ../../include/account.php:68
-msgid "Invitation could not be verified."
-msgstr "L'invito non può essere verificato."
+#: ../../include/contact_widgets.php:52
+msgid "Invite Friends"
+msgstr "Invita amici"
 
-#: ../../include/account.php:118
-msgid "Please enter the required information."
-msgstr "Inserisci le informazioni richieste."
+#: ../../include/contact_widgets.php:79 ../../include/contact_widgets.php:113
+msgid "Everything"
+msgstr "Tutto"
 
-#: ../../include/account.php:186
-msgid "Failed to store account information."
-msgstr "Non è stato possibile salvare le informazioni del tuo account."
+#: ../../include/contact_widgets.php:110 ../../include/widgets.php:26
+msgid "Categories"
+msgstr "Categorie"
 
-#: ../../include/account.php:272
+#: ../../include/contact_widgets.php:143
 #, php-format
-msgid "Registration request at %s"
-msgstr "Richiesta di registrazione su %s"
+msgid "%d connection in common"
+msgid_plural "%d connections in common"
+msgstr[0] "%d contatto in comune"
+msgstr[1] "%d contatti in comune"
 
-#: ../../include/account.php:274 ../../include/account.php:301
-#: ../../include/account.php:358
-msgid "Administrator"
-msgstr "Amministratore"
+#: ../../include/page_widgets.php:6
+msgid "New Page"
+msgstr "Nuova pagina web"
 
-#: ../../include/account.php:296
-msgid "your registration password"
-msgstr "la password di registrazione"
+#: ../../include/text.php:315
+msgid "prev"
+msgstr "prec"
 
-#: ../../include/account.php:299 ../../include/account.php:356
-#, php-format
-msgid "Registration details for %s"
-msgstr "Dettagli della registrazione di %s"
+#: ../../include/text.php:317
+msgid "first"
+msgstr "inizio"
 
-#: ../../include/account.php:365
-msgid "Account approved."
-msgstr "Account approvato."
+#: ../../include/text.php:346
+msgid "last"
+msgstr "fine"
 
-#: ../../include/account.php:399
-#, php-format
-msgid "Registration revoked for %s"
-msgstr "Registrazione revocata per %s"
+#: ../../include/text.php:349
+msgid "next"
+msgstr "succ"
 
-#: ../../include/conversation.php:123
-msgid "channel"
-msgstr "canale"
+#: ../../include/text.php:361
+msgid "older"
+msgstr "più recenti"
 
-#: ../../include/conversation.php:161 ../../mod/like.php:134
-#, php-format
-msgid "%1$s likes %2$s's %3$s"
-msgstr "A %1$s piace %3$s di %2$s"
+#: ../../include/text.php:363
+msgid "newer"
+msgstr "più nuovi"
 
-#: ../../include/conversation.php:164 ../../mod/like.php:136
-#, php-format
-msgid "%1$s doesn't like %2$s's %3$s"
-msgstr "A %1$s non piace %3$s di %2$s"
+#: ../../include/text.php:654
+msgid "No connections"
+msgstr "Nessun contatto"
 
-#: ../../include/conversation.php:201
+#: ../../include/text.php:665
 #, php-format
-msgid "%1$s is now connected with %2$s"
-msgstr "%1$s adesso è connesso con %2$s"
+msgid "%d Connection"
+msgid_plural "%d Connections"
+msgstr[0] "%d contatto"
+msgstr[1] "%d contatti"
 
-#: ../../include/conversation.php:232
-#, php-format
-msgid "%1$s poked %2$s"
-msgstr "%1$s ha mandato un poke a %2$s"
+#: ../../include/text.php:677
+msgid "View Connections"
+msgstr "Elenco contatti"
 
-#: ../../include/conversation.php:254 ../../mod/mood.php:63
-#, php-format
-msgid "%1$s is currently %2$s"
-msgstr "%1$s al momento è %2$s"
+#: ../../include/text.php:738 ../../mod/filer.php:36
+msgid "Save"
+msgstr "Salva"
 
-#: ../../include/conversation.php:658
-#, php-format
-msgid "View %s's profile @ %s"
-msgstr "Vedi il profilo di %s @ %s"
+#: ../../include/text.php:776
+msgid "poke"
+msgstr "poke"
 
-#: ../../include/conversation.php:672
-msgid "Categories:"
-msgstr "Categorie:"
+#: ../../include/text.php:777
+msgid "ping"
+msgstr "ping"
 
-#: ../../include/conversation.php:673
-msgid "Filed under:"
-msgstr "Classificato come:"
+#: ../../include/text.php:777
+msgid "pinged"
+msgstr "ha ricevuto un ping"
 
-#: ../../include/conversation.php:700
-msgid "View in context"
-msgstr "Vedi nel contesto"
+#: ../../include/text.php:778
+msgid "prod"
+msgstr "prod"
 
-#: ../../include/conversation.php:826
-msgid "remove"
-msgstr "rimuovi"
+#: ../../include/text.php:778
+msgid "prodded"
+msgstr "ha ricevuto un prod"
 
-#: ../../include/conversation.php:830
-msgid "Loading..."
-msgstr "Caricamento in corso..."
+#: ../../include/text.php:779
+msgid "slap"
+msgstr "schiaffo"
 
-#: ../../include/conversation.php:831
-msgid "Delete Selected Items"
-msgstr "Elimina gli oggetti selezionati"
+#: ../../include/text.php:779
+msgid "slapped"
+msgstr "ha ricevuto uno schiaffo"
 
-#: ../../include/conversation.php:922
-msgid "View Source"
-msgstr "Vedi il sorgente"
+#: ../../include/text.php:780
+msgid "finger"
+msgstr "finger"
 
-#: ../../include/conversation.php:923
-msgid "Follow Thread"
-msgstr "Segui la discussione"
+#: ../../include/text.php:780
+msgid "fingered"
+msgstr "ha ricevuto un finger"
 
-#: ../../include/conversation.php:927
-msgid "Matrix Activity"
-msgstr "Attività nella tua rete"
+#: ../../include/text.php:781
+msgid "rebuff"
+msgstr "rifiuto"
 
-#: ../../include/conversation.php:992
-#, php-format
-msgid "%s likes this."
-msgstr "Piace a %s."
+#: ../../include/text.php:781
+msgid "rebuffed"
+msgstr "ha ricevuto un rifiuto"
 
-#: ../../include/conversation.php:992
-#, php-format
-msgid "%s doesn't like this."
-msgstr "Non piace a %s."
+#: ../../include/text.php:793
+msgid "happy"
+msgstr "allegro"
 
-#: ../../include/conversation.php:996
-#, php-format
-msgid "<span  %1$s>%2$d people</span> like this."
-msgid_plural "<span  %1$s>%2$d people</span> like this."
-msgstr[0] ""
-msgstr[1] "Piace a <span %1$s>%2$d persone</span>."
+#: ../../include/text.php:794
+msgid "sad"
+msgstr "triste"
 
-#: ../../include/conversation.php:998
-#, php-format
-msgid "<span  %1$s>%2$d people</span> don't like this."
-msgid_plural "<span  %1$s>%2$d people</span> don't like this."
-msgstr[0] ""
-msgstr[1] "Non piace a <span %1$s>%2$d persone</span>."
+#: ../../include/text.php:795
+msgid "mellow"
+msgstr "calmo"
 
-#: ../../include/conversation.php:1004
-msgid "and"
-msgstr "e"
+#: ../../include/text.php:796
+msgid "tired"
+msgstr "stanco"
 
-#: ../../include/conversation.php:1007
-#, php-format
-msgid ", and %d other people"
-msgid_plural ", and %d other people"
-msgstr[0] ""
-msgstr[1] "e altre %d persone"
+#: ../../include/text.php:797
+msgid "perky"
+msgstr "vivace"
 
-#: ../../include/conversation.php:1008
-#, php-format
-msgid "%s like this."
-msgstr "Piace a %s."
+#: ../../include/text.php:798
+msgid "angry"
+msgstr "arrabbiato"
 
-#: ../../include/conversation.php:1008
-#, php-format
-msgid "%s don't like this."
-msgstr "Non piace a %s."
+#: ../../include/text.php:799
+msgid "stupified"
+msgstr "stordito"
 
-#: ../../include/conversation.php:1058
-msgid "Visible to <strong>everybody</strong>"
-msgstr "Visibile a <strong>tutti</strong>"
+#: ../../include/text.php:800
+msgid "puzzled"
+msgstr "confuso"
 
-#: ../../include/conversation.php:1059 ../../mod/message.php:281
-#: ../../mod/message.php:417
-msgid "Please enter a link URL:"
-msgstr "Inserisci l'indirizzo del link:"
+#: ../../include/text.php:801
+msgid "interested"
+msgstr "attento"
 
-#: ../../include/conversation.php:1060
-msgid "Please enter a video link/URL:"
-msgstr "Inserisci l'indirizzo del video:"
+#: ../../include/text.php:802
+msgid "bitter"
+msgstr "amaro"
 
-#: ../../include/conversation.php:1061
-msgid "Please enter an audio link/URL:"
-msgstr "Inserisci l'indirizzo dell'audio:"
+#: ../../include/text.php:803
+msgid "cheerful"
+msgstr "allegro"
 
-#: ../../include/conversation.php:1062
-msgid "Tag term:"
-msgstr "Tag:"
+#: ../../include/text.php:804
+msgid "alive"
+msgstr "vivace"
 
-#: ../../include/conversation.php:1063 ../../mod/filer.php:35
-msgid "Save to Folder:"
-msgstr "Salva nella cartella:"
+#: ../../include/text.php:805
+msgid "annoyed"
+msgstr "seccato"
 
-#: ../../include/conversation.php:1064
-msgid "Where are you right now?"
-msgstr "Dove sei ora?"
+#: ../../include/text.php:806
+msgid "anxious"
+msgstr "ansioso"
 
-#: ../../include/conversation.php:1065 ../../mod/message.php:282
-#: ../../mod/message.php:418 ../../mod/editpost.php:52
-msgid "Expires YYYY-MM-DD HH:MM"
-msgstr "Scadenza il AAAA-MM-GG OO:MM"
+#: ../../include/text.php:807
+msgid "cranky"
+msgstr "irritabile"
 
-#: ../../include/conversation.php:1089 ../../mod/photos.php:1060
-msgid "Share"
-msgstr "Condividi"
+#: ../../include/text.php:808
+msgid "disturbed"
+msgstr "turbato"
 
-#: ../../include/conversation.php:1091
-msgid "Page link title"
-msgstr "Link del titolo"
+#: ../../include/text.php:809
+msgid "frustrated"
+msgstr "frustrato"
 
-#: ../../include/conversation.php:1093 ../../mod/message.php:329
-#: ../../mod/message.php:512 ../../mod/editlayout.php:101
-#: ../../mod/editwebpage.php:120 ../../mod/editpost.php:98
-#: ../../mod/editblock.php:115
-msgid "Upload photo"
-msgstr "Carica foto"
+#: ../../include/text.php:810
+msgid "motivated"
+msgstr "motivato"
 
-#: ../../include/conversation.php:1094
-msgid "upload photo"
-msgstr "carica foto"
+#: ../../include/text.php:811
+msgid "relaxed"
+msgstr "rilassato"
 
-#: ../../include/conversation.php:1095 ../../mod/message.php:330
-#: ../../mod/message.php:513 ../../mod/editlayout.php:102
-#: ../../mod/editwebpage.php:121 ../../mod/editpost.php:99
-#: ../../mod/editblock.php:116
-msgid "Attach file"
-msgstr "Allega file"
+#: ../../include/text.php:812
+msgid "surprised"
+msgstr "sorpreso"
 
-#: ../../include/conversation.php:1096
-msgid "attach file"
-msgstr "allega file"
+#: ../../include/text.php:976
+msgid "Monday"
+msgstr "lunedì"
 
-#: ../../include/conversation.php:1097 ../../mod/message.php:331
-#: ../../mod/message.php:514 ../../mod/editlayout.php:103
-#: ../../mod/editwebpage.php:122 ../../mod/editpost.php:100
-#: ../../mod/editblock.php:117
-msgid "Insert web link"
-msgstr "Inserisci un indirizzo web"
+#: ../../include/text.php:976
+msgid "Tuesday"
+msgstr "martedì"
 
-#: ../../include/conversation.php:1098
-msgid "web link"
-msgstr "link web"
+#: ../../include/text.php:976
+msgid "Wednesday"
+msgstr "mercoledì"
 
-#: ../../include/conversation.php:1099
-msgid "Insert video link"
-msgstr "Inserisci l'indirizzo di un video"
+#: ../../include/text.php:976
+msgid "Thursday"
+msgstr "giovedì"
 
-#: ../../include/conversation.php:1100
-msgid "video link"
-msgstr "link video"
+#: ../../include/text.php:976
+msgid "Friday"
+msgstr "venerdì"
 
-#: ../../include/conversation.php:1101
-msgid "Insert audio link"
-msgstr "Inserisci l'indirizzo di un audio"
+#: ../../include/text.php:976
+msgid "Saturday"
+msgstr "sabato"
 
-#: ../../include/conversation.php:1102
-msgid "audio link"
-msgstr "link audio"
+#: ../../include/text.php:976
+msgid "Sunday"
+msgstr "domenica"
 
-#: ../../include/conversation.php:1103 ../../mod/editlayout.php:107
-#: ../../mod/editwebpage.php:126 ../../mod/editpost.php:104
-#: ../../mod/editblock.php:121
-msgid "Set your location"
-msgstr "La tua località"
+#: ../../include/text.php:980
+msgid "January"
+msgstr "gennaio"
 
-#: ../../include/conversation.php:1104
-msgid "set location"
-msgstr "la tua località"
+#: ../../include/text.php:980
+msgid "February"
+msgstr "febbraio"
 
-#: ../../include/conversation.php:1105 ../../mod/editlayout.php:108
-#: ../../mod/editwebpage.php:127 ../../mod/editpost.php:105
-#: ../../mod/editblock.php:122
-msgid "Clear browser location"
-msgstr "Rimuovi la località data dal browser"
+#: ../../include/text.php:980
+msgid "March"
+msgstr "marzo"
 
-#: ../../include/conversation.php:1106
-msgid "clear location"
-msgstr "rimuovi la località"
+#: ../../include/text.php:980
+msgid "April"
+msgstr "aprile"
 
-#: ../../include/conversation.php:1108 ../../mod/editlayout.php:121
-#: ../../mod/editwebpage.php:142 ../../mod/editpost.php:118
-#: ../../mod/editblock.php:136
-msgid "Set title"
-msgstr "Scegli un titolo"
+#: ../../include/text.php:980
+msgid "May"
+msgstr "maggio"
 
-#: ../../include/conversation.php:1111 ../../mod/editlayout.php:123
-#: ../../mod/editwebpage.php:144 ../../mod/editpost.php:120
-#: ../../mod/editblock.php:138
-msgid "Categories (comma-separated list)"
-msgstr "Categorie (separate da virgola)"
+#: ../../include/text.php:980
+msgid "June"
+msgstr "giugno"
 
-#: ../../include/conversation.php:1113 ../../mod/editlayout.php:110
-#: ../../mod/editwebpage.php:129 ../../mod/editpost.php:107
-#: ../../mod/editblock.php:124
-msgid "Permission settings"
-msgstr "Impostazioni permessi"
+#: ../../include/text.php:980
+msgid "July"
+msgstr "luglio"
 
-#: ../../include/conversation.php:1114
-msgid "permissions"
-msgstr "permessi"
+#: ../../include/text.php:980
+msgid "August"
+msgstr "agosto"
 
-#: ../../include/conversation.php:1122 ../../mod/editlayout.php:118
-#: ../../mod/editwebpage.php:137 ../../mod/editpost.php:115
-#: ../../mod/editblock.php:133
-msgid "Public post"
-msgstr "Articolo pubblico"
+#: ../../include/text.php:980
+msgid "September"
+msgstr "settembre"
 
-#: ../../include/conversation.php:1124 ../../mod/editlayout.php:124
-#: ../../mod/editwebpage.php:145 ../../mod/editpost.php:121
-#: ../../mod/editblock.php:139
-msgid "Example: bob@example.com, mary@example.com"
-msgstr "Per esempio: mario@esempio.com, simona@esempio.com"
+#: ../../include/text.php:980
+msgid "October"
+msgstr "ottobre"
 
-#: ../../include/conversation.php:1137 ../../mod/message.php:336
-#: ../../mod/message.php:519 ../../mod/editlayout.php:134
-#: ../../mod/editwebpage.php:155 ../../mod/editpost.php:132
-#: ../../mod/editblock.php:149
-msgid "Set expiration date"
-msgstr "Data di scadenza"
+#: ../../include/text.php:980
+msgid "November"
+msgstr "novembre"
 
-#: ../../include/auth.php:67
-msgid "Logged out."
-msgstr "Uscita effettuata."
+#: ../../include/text.php:980
+msgid "December"
+msgstr "dicembre"
 
-#: ../../include/auth.php:179
-msgid "Failed authentication"
-msgstr "Autenticazione fallita"
+#: ../../include/text.php:1058 ../../mod/message.php:453
+msgid "unknown.???"
+msgstr "sconosciuto???"
 
-#: ../../include/auth.php:188
-msgid "Login failed."
-msgstr "Accesso fallito."
+#: ../../include/text.php:1059 ../../mod/message.php:454
+msgid "bytes"
+msgstr "byte"
 
-#: ../../include/contact_widgets.php:14
-#, php-format
-msgid "You have %1$.0f of %2$.0f allowed connections."
-msgstr "Hai attivato %1$.0f delle %2$.0f connessioni permesse."
+#: ../../include/text.php:1094
+msgid "remove category"
+msgstr "rimuovi la categoria"
 
-#: ../../include/contact_widgets.php:20
-msgid "Add New Connection"
-msgstr "Aggiungi un contatto"
+#: ../../include/text.php:1116
+msgid "remove from file"
+msgstr "rimuovi dal file"
 
-#: ../../include/contact_widgets.php:21
-msgid "Enter the channel address"
-msgstr "Scrivi l'indirizzo del canale"
+#: ../../include/text.php:1170 ../../include/text.php:1182
+msgid "Click to open/close"
+msgstr "Clicca per aprire/chiudere"
 
-#: ../../include/contact_widgets.php:22
-msgid "Example: bob@example.com, http://example.com/barbara"
-msgstr "Per esempio: mario@pippo.it oppure http://pluto.com/barbara"
+#: ../../include/text.php:1358 ../../mod/events.php:331
+msgid "link to source"
+msgstr "Link all'originale"
 
-#: ../../include/contact_widgets.php:38
-#, php-format
-msgid "%d invitation available"
-msgid_plural "%d invitations available"
-msgstr[0] "%d invito disponibile"
-msgstr[1] "%d inviti disponibili"
-
-#: ../../include/contact_widgets.php:44
-msgid "Find Channels"
-msgstr "Ricerca canali"
-
-#: ../../include/contact_widgets.php:45
-msgid "Enter name or interest"
-msgstr "Scrivi un nome o un interesse"
-
-#: ../../include/contact_widgets.php:46
-msgid "Connect/Follow"
-msgstr "Entra in contatto/segui"
+#: ../../include/text.php:1377
+msgid "Select a page layout: "
+msgstr "Scegli il layout della pagina:"
 
-#: ../../include/contact_widgets.php:47
-msgid "Examples: Robert Morgenstein, Fishing"
-msgstr "Per esempio: Mario Rossi, Pesca"
+#: ../../include/text.php:1380 ../../include/text.php:1445
+msgid "default"
+msgstr "predefinito"
 
-#: ../../include/contact_widgets.php:48 ../../mod/connections.php:697
-#: ../../mod/directory.php:221 ../../mod/directory.php:226
-msgid "Find"
-msgstr "Cerca"
+#: ../../include/text.php:1416
+msgid "Page content type: "
+msgstr "Contenuto della pagina:"
 
-#: ../../include/contact_widgets.php:49 ../../mod/suggest.php:64
-msgid "Channel Suggestions"
-msgstr "Canali suggeriti"
+#: ../../include/text.php:1457
+msgid "Select an alternate language"
+msgstr "Seleziona una lingua diversa"
 
-#: ../../include/contact_widgets.php:51
-msgid "Random Profile"
-msgstr "Profilo casuale"
+#: ../../include/text.php:1622
+msgid "activity"
+msgstr "l'attività"
 
-#: ../../include/contact_widgets.php:52
-msgid "Invite Friends"
-msgstr "Invita amici"
+#: ../../include/text.php:1884
+msgid "Design"
+msgstr "Design"
 
-#: ../../include/contact_widgets.php:79 ../../include/contact_widgets.php:113
-msgid "Everything"
-msgstr "Tutto"
+#: ../../include/text.php:1886
+msgid "Blocks"
+msgstr "Riquadri"
 
-#: ../../include/contact_widgets.php:110 ../../include/widgets.php:26
-msgid "Categories"
-msgstr "Categorie"
+#: ../../include/text.php:1887
+msgid "Menus"
+msgstr "Menù"
 
-#: ../../include/contact_widgets.php:143
-#, php-format
-msgid "%d connection in common"
-msgid_plural "%d connections in common"
-msgstr[0] "%d contatto in comune"
-msgstr[1] "%d contatti in comune"
+#: ../../include/text.php:1888
+msgid "Layouts"
+msgstr "Layout"
 
-#: ../../include/page_widgets.php:6
-msgid "New Page"
-msgstr "Nuova pagina web"
+#: ../../include/text.php:1889
+msgid "Pages"
+msgstr "Pagine"
 
 #: ../../include/follow.php:21
 msgid "Channel is blocked on this site."
@@ -2735,15 +2665,15 @@ msgstr "ama"
 msgid "dislikes"
 msgstr "non ama"
 
-#: ../../include/plugin.php:473 ../../include/plugin.php:475
+#: ../../include/plugin.php:475 ../../include/plugin.php:477
 msgid "Click here to upgrade."
 msgstr "Clicca qui per aggiornare."
 
-#: ../../include/plugin.php:481
+#: ../../include/plugin.php:483
 msgid "This action exceeds the limits set by your subscription plan."
 msgstr "Questa operazione esce dai termini del tuo abbonamento."
 
-#: ../../include/plugin.php:486
+#: ../../include/plugin.php:488
 msgid "This action is not available under your subscription plan."
 msgstr "Questa operazione non è prevista dal tuo abbonamento."
 
@@ -2752,6 +2682,233 @@ msgstr "Questa operazione non è prevista dal tuo abbonamento."
 msgid "Default"
 msgstr "Predefinito"
 
+#: ../../include/identity.php:29 ../../mod/item.php:1148
+msgid "Unable to obtain identity information from database"
+msgstr "Impossibile ottenere le informazioni di identificazione dal database"
+
+#: ../../include/identity.php:62
+msgid "Empty name"
+msgstr "Nome vuoto"
+
+#: ../../include/identity.php:64
+msgid "Name too long"
+msgstr "Nome troppo lungo"
+
+#: ../../include/identity.php:132
+msgid "No account identifier"
+msgstr "Account senza identificativo"
+
+#: ../../include/identity.php:142
+msgid "Nickname is required."
+msgstr "Il nome dell'account è obbligatorio."
+
+#: ../../include/identity.php:156
+msgid ""
+"Nickname has unsupported characters or is already being used on this site."
+msgstr "Il nome dell'account è già in uso oppure ha dei caratteri non supportati."
+
+#: ../../include/identity.php:215
+msgid "Unable to retrieve created identity"
+msgstr "Impossibile caricare l'identità creata"
+
+#: ../../include/identity.php:273
+msgid "Default Profile"
+msgstr "Profilo predefinito"
+
+#: ../../include/identity.php:465
+msgid "Requested channel is not available."
+msgstr "Il canale che cerchi non è disponibile."
+
+#: ../../include/identity.php:477
+msgid " Sorry, you don't have the permission to view this profile. "
+msgstr "Purtroppo non hai il permesso di vedere questo profilo."
+
+#: ../../include/identity.php:512 ../../mod/webpages.php:8
+#: ../../mod/connect.php:13 ../../mod/layouts.php:8
+#: ../../mod/filestorage.php:8 ../../mod/blocks.php:10
+#: ../../mod/profile.php:16
+msgid "Requested profile is not available."
+msgstr "Il profilo richiesto non è disponibile."
+
+#: ../../include/identity.php:627 ../../mod/profiles.php:624
+msgid "Change profile photo"
+msgstr "Cambia la foto del profilo"
+
+#: ../../include/identity.php:633
+msgid "Profiles"
+msgstr "Profili"
+
+#: ../../include/identity.php:633
+msgid "Manage/edit profiles"
+msgstr "Gestisci/modifica i profili"
+
+#: ../../include/identity.php:634 ../../mod/profiles.php:625
+msgid "Create New Profile"
+msgstr "Crea un nuovo profilo"
+
+#: ../../include/identity.php:637
+msgid "Edit Profile"
+msgstr "Modifica il profilo"
+
+#: ../../include/identity.php:648 ../../mod/profiles.php:636
+msgid "Profile Image"
+msgstr "Immagine del profilo"
+
+#: ../../include/identity.php:651 ../../mod/profiles.php:639
+msgid "visible to everybody"
+msgstr "visibile a tutti"
+
+#: ../../include/identity.php:652 ../../mod/profiles.php:640
+msgid "Edit visibility"
+msgstr "Cambia la visibilità"
+
+#: ../../include/identity.php:665 ../../include/identity.php:883
+#: ../../mod/directory.php:175
+msgid "Gender:"
+msgstr "Sesso:"
+
+#: ../../include/identity.php:666 ../../include/identity.php:903
+#: ../../mod/directory.php:177
+msgid "Status:"
+msgstr "Stato:"
+
+#: ../../include/identity.php:667 ../../include/identity.php:914
+#: ../../mod/directory.php:179
+msgid "Homepage:"
+msgstr "Home page:"
+
+#: ../../include/identity.php:730 ../../include/identity.php:810
+#: ../../mod/ping.php:230
+msgid "g A l F d"
+msgstr "g A l d F"
+
+#: ../../include/identity.php:731 ../../include/identity.php:811
+msgid "F d"
+msgstr "d F"
+
+#: ../../include/identity.php:776 ../../include/identity.php:851
+#: ../../mod/ping.php:252
+msgid "[today]"
+msgstr "[oggi]"
+
+#: ../../include/identity.php:788
+msgid "Birthday Reminders"
+msgstr "Promemoria compleanni"
+
+#: ../../include/identity.php:789
+msgid "Birthdays this week:"
+msgstr "Compleanni questa settimana:"
+
+#: ../../include/identity.php:844
+msgid "[No description]"
+msgstr "[Nessuna descrizione]"
+
+#: ../../include/identity.php:862
+msgid "Event Reminders"
+msgstr "Promemoria"
+
+#: ../../include/identity.php:863
+msgid "Events this week:"
+msgstr "Eventi di questa settimana:"
+
+#: ../../include/identity.php:873 ../../include/identity.php:984
+#: ../../mod/profperm.php:112
+msgid "Profile"
+msgstr "Profilo"
+
+#: ../../include/identity.php:881 ../../mod/settings.php:1013
+msgid "Full Name:"
+msgstr "Nome completo:"
+
+#: ../../include/identity.php:888
+msgid "j F, Y"
+msgstr "j F Y"
+
+#: ../../include/identity.php:889
+msgid "j F"
+msgstr "j F"
+
+#: ../../include/identity.php:896
+msgid "Birthday:"
+msgstr "Compleanno:"
+
+#: ../../include/identity.php:900
+msgid "Age:"
+msgstr "Età:"
+
+#: ../../include/identity.php:909
+#, php-format
+msgid "for %1$d %2$s"
+msgstr "per %1$d %2$s"
+
+#: ../../include/identity.php:912 ../../mod/profiles.php:549
+msgid "Sexual Preference:"
+msgstr "Preferenze sessuali:"
+
+#: ../../include/identity.php:916 ../../mod/profiles.php:551
+msgid "Hometown:"
+msgstr "Città dove vivo:"
+
+#: ../../include/identity.php:918
+msgid "Tags:"
+msgstr "Tag:"
+
+#: ../../include/identity.php:920 ../../mod/profiles.php:552
+msgid "Political Views:"
+msgstr "Orientamento politico:"
+
+#: ../../include/identity.php:922
+msgid "Religion:"
+msgstr "Religione:"
+
+#: ../../include/identity.php:924 ../../mod/directory.php:181
+msgid "About:"
+msgstr "Informazioni:"
+
+#: ../../include/identity.php:926
+msgid "Hobbies/Interests:"
+msgstr "Interessi e hobby:"
+
+#: ../../include/identity.php:928 ../../mod/profiles.php:555
+msgid "Likes:"
+msgstr "Mi piace:"
+
+#: ../../include/identity.php:930 ../../mod/profiles.php:556
+msgid "Dislikes:"
+msgstr "Non mi piace:"
+
+#: ../../include/identity.php:933
+msgid "Contact information and Social Networks:"
+msgstr "Contatti e social network:"
+
+#: ../../include/identity.php:935
+msgid "Musical interests:"
+msgstr "Gusti musicali:"
+
+#: ../../include/identity.php:937
+msgid "Books, literature:"
+msgstr "Libri, letteratura:"
+
+#: ../../include/identity.php:939
+msgid "Television:"
+msgstr "Televisione:"
+
+#: ../../include/identity.php:941
+msgid "Film/dance/culture/entertainment:"
+msgstr "Film, danza, cultura, intrattenimento:"
+
+#: ../../include/identity.php:943
+msgid "Love/Romance:"
+msgstr "Amore:"
+
+#: ../../include/identity.php:945
+msgid "Work/employment:"
+msgstr "Lavoro:"
+
+#: ../../include/identity.php:947
+msgid "School/education:"
+msgstr "Scuola:"
+
 #: ../../include/security.php:49
 msgid "Welcome "
 msgstr "Ciao"
@@ -2775,25 +2932,25 @@ msgstr "L'identificativo di sicurezza del modulo che hai riempito non è corrett
 msgid "Permission denied"
 msgstr "Permesso negato"
 
-#: ../../include/items.php:3546 ../../mod/admin.php:150
+#: ../../include/items.php:3350 ../../mod/admin.php:150
 #: ../../mod/admin.php:727 ../../mod/admin.php:930 ../../mod/viewsrc.php:18
 #: ../../mod/home.php:64 ../../mod/display.php:32
 msgid "Item not found."
 msgstr "Elemento non trovato."
 
-#: ../../include/items.php:3729
+#: ../../include/items.php:3533
 msgid "Archives"
 msgstr "Archivi"
 
-#: ../../include/items.php:3895 ../../mod/group.php:44 ../../mod/group.php:146
+#: ../../include/items.php:3699 ../../mod/group.php:44 ../../mod/group.php:146
 msgid "Collection not found."
 msgstr "Insieme non trovato."
 
-#: ../../include/items.php:3911 ../../mod/network.php:469
+#: ../../include/items.php:3715 ../../mod/network.php:288
 msgid "Group is empty"
 msgstr "L'insieme è vuoto"
 
-#: ../../include/items.php:3927
+#: ../../include/items.php:3731
 msgid "Connection not found."
 msgstr "Contatto non trovato."
 
@@ -2837,72 +2994,72 @@ msgstr "Contatti in comune"
 msgid "No connections in common."
 msgstr "Nessun contatto in comune."
 
-#: ../../mod/events.php:66
+#: ../../mod/events.php:71
 msgid "Event title and start time are required."
 msgstr "Sono necessari il titolo e l'ora d'inizio dell'evento."
 
-#: ../../mod/events.php:281
+#: ../../mod/events.php:286
 msgid "l, F j"
 msgstr "l j F"
 
-#: ../../mod/events.php:303
+#: ../../mod/events.php:308
 msgid "Edit event"
 msgstr "Modifica l'evento"
 
-#: ../../mod/events.php:349
+#: ../../mod/events.php:354
 msgid "Create New Event"
 msgstr "Crea un nuovo evento"
 
-#: ../../mod/events.php:350
+#: ../../mod/events.php:355
 msgid "Previous"
 msgstr "Precendente"
 
-#: ../../mod/events.php:351 ../../mod/setup.php:256
+#: ../../mod/events.php:356 ../../mod/setup.php:256
 msgid "Next"
 msgstr "Successivo"
 
-#: ../../mod/events.php:425
+#: ../../mod/events.php:428
 msgid "hour:minute"
 msgstr "ora:minuti"
 
-#: ../../mod/events.php:435
+#: ../../mod/events.php:447
 msgid "Event details"
 msgstr "Dettagli evento"
 
-#: ../../mod/events.php:436
+#: ../../mod/events.php:448
 #, php-format
 msgid "Format is %s %s. Starting date and Title are required."
 msgstr "Il formato è %s %s. L'inizio e il titolo sono obbligatori."
 
-#: ../../mod/events.php:438
+#: ../../mod/events.php:450
 msgid "Event Starts:"
 msgstr "Inizio:"
 
-#: ../../mod/events.php:438 ../../mod/events.php:452
+#: ../../mod/events.php:450 ../../mod/events.php:464
 msgid "Required"
 msgstr "Obbligatorio"
 
-#: ../../mod/events.php:441
+#: ../../mod/events.php:453
 msgid "Finish date/time is not known or not relevant"
 msgstr "La data/ora di fine non è rilevante"
 
-#: ../../mod/events.php:443
+#: ../../mod/events.php:455
 msgid "Event Finishes:"
 msgstr "Fine:"
 
-#: ../../mod/events.php:446
+#: ../../mod/events.php:458
 msgid "Adjust for viewer timezone"
 msgstr "Adatta al fuso orario di chi legge"
 
-#: ../../mod/events.php:448
+#: ../../mod/events.php:460
 msgid "Description:"
 msgstr "Descrizione:"
 
-#: ../../mod/events.php:452
+#: ../../mod/events.php:464
 msgid "Title:"
 msgstr "Titolo:"
 
-#: ../../mod/events.php:454
+#: ../../mod/events.php:466
 msgid "Share this event"
 msgstr "Condividi questo evento"
 
@@ -3034,12 +3191,6 @@ msgstr "Amici di %s"
 msgid "No friends to display."
 msgstr "Nessun amico da visualizzare."
 
-#: ../../mod/webpages.php:8 ../../mod/connect.php:13 ../../mod/layouts.php:8
-#: ../../mod/filestorage.php:8 ../../mod/blocks.php:10 ../../mod/profile.php:8
-#: ../../boot.php:1640
-msgid "Requested profile is not available."
-msgstr "Il profilo richiesto non è disponibile."
-
 #: ../../mod/webpages.php:104 ../../mod/layouts.php:105
 #: ../../mod/blocks.php:96
 msgid "View"
@@ -3063,21 +3214,17 @@ msgid ""
 " and/or create new posts for you?"
 msgstr "Vuoi autorizzare questa app ad accedere ai messaggi e ai contatti o creare nuovi messaggi per te?"
 
-#: ../../mod/api.php:105 ../../mod/settings.php:1009
-#: ../../mod/settings.php:1014 ../../mod/settings.php:1037
-#: ../../mod/settings.php:1039 ../../mod/settings.php:1040
-#: ../../mod/settings.php:1041 ../../mod/profiles.php:506
+#: ../../mod/api.php:105 ../../mod/settings.php:967 ../../mod/settings.php:972
+#: ../../mod/profiles.php:506
 msgid "Yes"
 msgstr "Si"
 
-#: ../../mod/api.php:106 ../../mod/settings.php:1009
-#: ../../mod/settings.php:1014 ../../mod/settings.php:1037
-#: ../../mod/settings.php:1039 ../../mod/settings.php:1040
-#: ../../mod/settings.php:1041 ../../mod/profiles.php:507
+#: ../../mod/api.php:106 ../../mod/settings.php:967 ../../mod/settings.php:972
+#: ../../mod/profiles.php:507
 msgid "No"
 msgstr "No"
 
-#: ../../mod/lastpost.php:16 ../../mod/channel.php:16
+#: ../../mod/lastpost.php:16 ../../mod/channel.php:25
 msgid "You must be logged in to see this page."
 msgstr "Devi aver effettuato l'accesso per vedere questa pagina."
 
@@ -3094,11 +3241,11 @@ msgid "Invalid item."
 msgstr "Elemento non valido."
 
 #: ../../mod/page.php:47 ../../mod/chanview.php:78 ../../mod/home.php:51
-#: ../../mod/magic.php:95 ../../mod/wall_upload.php:35
+#: ../../mod/wall_upload.php:35
 msgid "Channel not found."
 msgstr "Canale non trovato."
 
-#: ../../mod/page.php:83 ../../mod/help.php:56 ../../mod/display.php:92
+#: ../../mod/page.php:83 ../../mod/help.php:56 ../../mod/display.php:100
 #: ../../index.php:229
 msgid "Page not found."
 msgstr "Pagina non trovata."
@@ -3502,421 +3649,389 @@ msgstr "Permessi predefiniti (avanzato)"
 msgid "Premium Channel Settings"
 msgstr "Canale premium - impostazioni"
 
-#: ../../mod/settings.php:171
+#: ../../mod/settings.php:173
 msgid "Name is required"
 msgstr "Il nome è obbligatorio"
 
-#: ../../mod/settings.php:175
+#: ../../mod/settings.php:177
 msgid "Key and Secret are required"
 msgstr "Chiave e Segreto sono richiesti"
 
-#: ../../mod/settings.php:179 ../../mod/settings.php:677
+#: ../../mod/settings.php:181 ../../mod/settings.php:635
 msgid "Update"
 msgstr "Aggiorna"
 
-#: ../../mod/settings.php:292
+#: ../../mod/settings.php:294
 msgid "Passwords do not match. Password unchanged."
 msgstr "Le password non corrispondono. Password non cambiata."
 
-#: ../../mod/settings.php:296
+#: ../../mod/settings.php:298
 msgid "Empty passwords are not allowed. Password unchanged."
 msgstr "Le password non possono essere vuote. Password non cambiata."
 
-#: ../../mod/settings.php:309
+#: ../../mod/settings.php:311
 msgid "Password changed."
 msgstr "Password cambiata."
 
-#: ../../mod/settings.php:311
+#: ../../mod/settings.php:313
 msgid "Password update failed. Please try again."
 msgstr "Aggiornamento password fallito. Prova ancora."
 
-#: ../../mod/settings.php:325
+#: ../../mod/settings.php:327
 msgid "Not valid email."
 msgstr "Email non valida."
 
-#: ../../mod/settings.php:328
+#: ../../mod/settings.php:330
 msgid "Protected email address. Cannot change to that email."
 msgstr "È un indirizzo email riservato. Non puoi sceglierlo."
 
-#: ../../mod/settings.php:337
+#: ../../mod/settings.php:339
 msgid "System failure storing new email. Please try again."
 msgstr "Errore di sistema. Non è stato possibile memorizzare il tuo messaggio, riprova per favore."
 
-#: ../../mod/settings.php:579
+#: ../../mod/settings.php:537
 msgid "Settings updated."
 msgstr "Impostazioni aggiornate."
 
-#: ../../mod/settings.php:650 ../../mod/settings.php:676
-#: ../../mod/settings.php:712
+#: ../../mod/settings.php:608 ../../mod/settings.php:634
+#: ../../mod/settings.php:670
 msgid "Add application"
 msgstr "Aggiungi una app"
 
-#: ../../mod/settings.php:652 ../../mod/settings.php:678
+#: ../../mod/settings.php:610 ../../mod/settings.php:636
 #: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94 ../../mod/fbrowser.php:82
 #: ../../mod/fbrowser.php:117
 msgid "Cancel"
 msgstr "Annulla"
 
-#: ../../mod/settings.php:653 ../../mod/settings.php:679
+#: ../../mod/settings.php:611 ../../mod/settings.php:637
 #: ../../mod/admin.php:686 ../../mod/crepair.php:148
 msgid "Name"
 msgstr "Nome"
 
-#: ../../mod/settings.php:653
+#: ../../mod/settings.php:611
 msgid "Name of application"
 msgstr "Nome dell'applicazione"
 
-#: ../../mod/settings.php:654 ../../mod/settings.php:680
+#: ../../mod/settings.php:612 ../../mod/settings.php:638
 msgid "Consumer Key"
 msgstr "Consumer Key"
 
-#: ../../mod/settings.php:654 ../../mod/settings.php:655
+#: ../../mod/settings.php:612 ../../mod/settings.php:613
 msgid "Automatically generated - change if desired. Max length 20"
 msgstr "Generato automaticamente - è possibile cambiarlo. Lunghezza massima 20"
 
-#: ../../mod/settings.php:655 ../../mod/settings.php:681
+#: ../../mod/settings.php:613 ../../mod/settings.php:639
 msgid "Consumer Secret"
 msgstr "Consumer Secret"
 
-#: ../../mod/settings.php:656 ../../mod/settings.php:682
+#: ../../mod/settings.php:614 ../../mod/settings.php:640
 msgid "Redirect"
 msgstr "Redirect"
 
-#: ../../mod/settings.php:656
+#: ../../mod/settings.php:614
 msgid ""
 "Redirect URI - leave blank unless your application specifically requires "
 "this"
 msgstr "URI ridirezionato - lasciare bianco se non richiesto specificamente dall'applicazione."
 
-#: ../../mod/settings.php:657 ../../mod/settings.php:683
+#: ../../mod/settings.php:615 ../../mod/settings.php:641
 msgid "Icon url"
 msgstr "Url icona"
 
-#: ../../mod/settings.php:657
+#: ../../mod/settings.php:615
 msgid "Optional"
 msgstr "Opzionale"
 
-#: ../../mod/settings.php:668
+#: ../../mod/settings.php:626
 msgid "You can't edit this application."
 msgstr "Non puoi modificare questa applicazione."
 
-#: ../../mod/settings.php:711
+#: ../../mod/settings.php:669
 msgid "Connected Apps"
 msgstr "App connesse"
 
-#: ../../mod/settings.php:715
+#: ../../mod/settings.php:673
 msgid "Client key starts with"
 msgstr "La client key inizia con"
 
-#: ../../mod/settings.php:716
+#: ../../mod/settings.php:674
 msgid "No name"
 msgstr "Nessun nome"
 
-#: ../../mod/settings.php:717
+#: ../../mod/settings.php:675
 msgid "Remove authorization"
 msgstr "Revoca l'autorizzazione"
 
-#: ../../mod/settings.php:728
+#: ../../mod/settings.php:686
 msgid "No feature settings configured"
 msgstr "Non ci sono funzionalità aggiuntive personalizzabili"
 
-#: ../../mod/settings.php:736
+#: ../../mod/settings.php:694
 msgid "Feature Settings"
 msgstr "Impostazioni aggiuntive"
 
-#: ../../mod/settings.php:759
+#: ../../mod/settings.php:717
 msgid "Account Settings"
 msgstr "Impostazioni account"
 
-#: ../../mod/settings.php:760
+#: ../../mod/settings.php:718
 msgid "Password Settings"
 msgstr "Impostazioni password"
 
-#: ../../mod/settings.php:761
+#: ../../mod/settings.php:719
 msgid "New Password:"
 msgstr "Nuova password:"
 
-#: ../../mod/settings.php:762
+#: ../../mod/settings.php:720
 msgid "Confirm:"
 msgstr "Conferma:"
 
-#: ../../mod/settings.php:762
+#: ../../mod/settings.php:720
 msgid "Leave password fields blank unless changing"
 msgstr "Lascia questi campi in bianco per non cambiare la password"
 
-#: ../../mod/settings.php:764 ../../mod/settings.php:1063
+#: ../../mod/settings.php:722 ../../mod/settings.php:1014
 msgid "Email Address:"
 msgstr "Indirizzo email:"
 
-#: ../../mod/settings.php:765
+#: ../../mod/settings.php:723
 msgid "Remove Account"
 msgstr "Elimina l'account"
 
-#: ../../mod/settings.php:766
+#: ../../mod/settings.php:724
 msgid "Warning: This action is permanent and cannot be reversed."
 msgstr "Attenzione: questa azione è permanente e non potrà più essere annullata."
 
-#: ../../mod/settings.php:782
+#: ../../mod/settings.php:740
 msgid "Off"
 msgstr "Off"
 
-#: ../../mod/settings.php:782
+#: ../../mod/settings.php:740
 msgid "On"
 msgstr "On"
 
-#: ../../mod/settings.php:789
+#: ../../mod/settings.php:747
 msgid "Additional Features"
 msgstr "Funzionalità aggiuntive"
 
-#: ../../mod/settings.php:814
+#: ../../mod/settings.php:772
 msgid "Connector Settings"
 msgstr "Impostazioni del connettore"
 
-#: ../../mod/settings.php:844 ../../mod/admin.php:369
+#: ../../mod/settings.php:802 ../../mod/admin.php:369
 msgid "No special theme for mobile devices"
 msgstr "Nessun tema per dispositivi mobili"
 
-#: ../../mod/settings.php:884
+#: ../../mod/settings.php:842
 msgid "Display Settings"
 msgstr "Impostazioni grafiche"
 
-#: ../../mod/settings.php:890
+#: ../../mod/settings.php:848
 msgid "Display Theme:"
 msgstr "Tema per monitor:"
 
-#: ../../mod/settings.php:891
+#: ../../mod/settings.php:849
 msgid "Mobile Theme:"
 msgstr "Tema per dispositivi mobili:"
 
-#: ../../mod/settings.php:892
+#: ../../mod/settings.php:850
 msgid "Update browser every xx seconds"
 msgstr "Aggiorna il browser ogni x secondi"
 
-#: ../../mod/settings.php:892
+#: ../../mod/settings.php:850
 msgid "Minimum of 10 seconds, no maximum"
 msgstr "Minimo 10 secondi, nessun limite massimo"
 
-#: ../../mod/settings.php:893
+#: ../../mod/settings.php:851
 msgid "Maximum number of conversations to load at any time:"
 msgstr "Massimo numero di conversazioni da mostrare ogni volta:"
 
-#: ../../mod/settings.php:893
+#: ../../mod/settings.php:851
 msgid "Maximum of 100 items"
 msgstr "Massimo 100"
 
-#: ../../mod/settings.php:894
+#: ../../mod/settings.php:852
 msgid "Don't show emoticons"
 msgstr "Non mostrare le emoticons"
 
-#: ../../mod/settings.php:930
+#: ../../mod/settings.php:888
 msgid "Nobody except yourself"
 msgstr "Nessuno tranne te"
 
-#: ../../mod/settings.php:931
+#: ../../mod/settings.php:889
 msgid "Only those you specifically allow"
 msgstr "Solo chi riceve il mio permesso"
 
-#: ../../mod/settings.php:932
+#: ../../mod/settings.php:890
 msgid "Anybody in your address book"
 msgstr "Chiunque tra i miei contatti"
 
-#: ../../mod/settings.php:933
+#: ../../mod/settings.php:891
 msgid "Anybody on this website"
 msgstr "Chiunque su questo sito"
 
-#: ../../mod/settings.php:934
+#: ../../mod/settings.php:892
 msgid "Anybody in this network"
 msgstr "Chiunque su Red"
 
-#: ../../mod/settings.php:935
+#: ../../mod/settings.php:893
 msgid "Anybody on the internet"
 msgstr "Chiunque su internet"
 
-#: ../../mod/settings.php:1009
+#: ../../mod/settings.php:967
 msgid "Publish your default profile in the network directory"
 msgstr "Pubblica il mio profilo predefinito sull'elenco pubblico dei canali"
 
-#: ../../mod/settings.php:1014
+#: ../../mod/settings.php:972
 msgid "Allow us to suggest you as a potential friend to new members?"
 msgstr "Vuoi essere suggerito come potenziale amico ai nuovi membri?"
 
-#: ../../mod/settings.php:1018 ../../mod/profile_photo.php:298
+#: ../../mod/settings.php:976 ../../mod/profile_photo.php:298
 msgid "or"
 msgstr "o"
 
-#: ../../mod/settings.php:1023
+#: ../../mod/settings.php:981
 msgid "Your channel address is"
 msgstr "L'indirizzo del tuo canale è"
 
-#: ../../mod/settings.php:1034
-msgid "Automatically expire posts after this many days:"
-msgstr "Gli articoli scadono automaticamente dopo questo numero di giorni:"
+#: ../../mod/settings.php:1003
+msgid "Channel Settings"
+msgstr "Impostazioni del canale"
 
-#: ../../mod/settings.php:1034
-msgid "If empty, posts will not expire. Expired posts will be deleted"
-msgstr "Se lasci vuoto, i messaggi non scadranno mai. I messaggi scaduti saranno eliminati."
+#: ../../mod/settings.php:1012
+msgid "Basic Settings"
+msgstr "Impostazioni di base"
 
-#: ../../mod/settings.php:1035
-msgid "Advanced expiration settings"
-msgstr "Impostazioni avanzate di scandenza"
-
-#: ../../mod/settings.php:1036
-msgid "Advanced Expiration"
-msgstr "Scadenza"
-
-#: ../../mod/settings.php:1037
-msgid "Expire posts:"
-msgstr "Fai scadere gli articoli:"
-
-#: ../../mod/settings.php:1039
-msgid "Expire starred posts:"
-msgstr "Fai scadere gli articoli preferiti:"
-
-#: ../../mod/settings.php:1040
-msgid "Expire photos:"
-msgstr "Fai scadere le foto:"
-
-#: ../../mod/settings.php:1041
-msgid "Only expire posts by others:"
-msgstr "Fai scadere solo gli articoli scritti da altri:"
-
-#: ../../mod/settings.php:1052
-msgid "Channel Settings"
-msgstr "Impostazioni del canale"
-
-#: ../../mod/settings.php:1061
-msgid "Basic Settings"
-msgstr "Impostazioni di base"
-
-#: ../../mod/settings.php:1064
+#: ../../mod/settings.php:1015
 msgid "Your Timezone:"
 msgstr "Il tuo fuso orario:"
 
-#: ../../mod/settings.php:1065
+#: ../../mod/settings.php:1016
 msgid "Default Post Location:"
 msgstr "Località predefinita:"
 
-#: ../../mod/settings.php:1066
+#: ../../mod/settings.php:1017
 msgid "Use Browser Location:"
 msgstr "Usa la località rilevata dal browser:"
 
-#: ../../mod/settings.php:1068
+#: ../../mod/settings.php:1019
 msgid "Adult Content"
 msgstr "Contenuto per adulti"
 
-#: ../../mod/settings.php:1068
+#: ../../mod/settings.php:1019
 msgid "This channel publishes adult content."
 msgstr "Questo canale pubblica contenuto per adulti."
 
-#: ../../mod/settings.php:1070
+#: ../../mod/settings.php:1021
 msgid "Security and Privacy Settings"
 msgstr "Impostazioni di sicurezza e privacy"
 
-#: ../../mod/settings.php:1072
+#: ../../mod/settings.php:1023
 msgid "Quick Privacy Settings:"
 msgstr "Impostazioni veloci della privacy:"
 
-#: ../../mod/settings.php:1073
+#: ../../mod/settings.php:1024
 msgid "Very Public - extremely permissive"
 msgstr "Tutto pubblico - molto permissivo"
 
-#: ../../mod/settings.php:1074
+#: ../../mod/settings.php:1025
 msgid "Typical - default public, privacy when desired"
 msgstr "Normale - tutto sarà pubblico tranne quel che vorrai tu"
 
-#: ../../mod/settings.php:1075
+#: ../../mod/settings.php:1026
 msgid "Private - default private, rarely open or public"
 msgstr "Privato - i contenuti saranno privati ma, se vorrai, alcuni potrai renderli pubblici"
 
-#: ../../mod/settings.php:1076
+#: ../../mod/settings.php:1027
 msgid "Blocked - default blocked to/from everybody"
 msgstr "Bloccato - non ci saranno interazioni con altri a meno che tu non voglia"
 
-#: ../../mod/settings.php:1079
+#: ../../mod/settings.php:1030
 msgid "Maximum Friend Requests/Day:"
 msgstr "Numero massimo giornaliero di richieste di amicizia:"
 
-#: ../../mod/settings.php:1079
+#: ../../mod/settings.php:1030
 msgid "May reduce spam activity"
 msgstr "Serve e ridurre lo spam"
 
-#: ../../mod/settings.php:1080
+#: ../../mod/settings.php:1031
 msgid "Default Post Permissions"
 msgstr "Permessi predefiniti per gli articoli"
 
-#: ../../mod/settings.php:1081
+#: ../../mod/settings.php:1032
 msgid "(click to open/close)"
 msgstr "(clicca per aprire/chiudere)"
 
-#: ../../mod/settings.php:1094
+#: ../../mod/settings.php:1043
 msgid "Maximum private messages per day from unknown people:"
 msgstr "Numero massimo giornaliero di messaggi privati da utenti sconosciuti:"
 
-#: ../../mod/settings.php:1094
+#: ../../mod/settings.php:1043
 msgid "Useful to reduce spamming"
 msgstr "Serve e ridurre lo spam"
 
-#: ../../mod/settings.php:1097
+#: ../../mod/settings.php:1046
 msgid "Notification Settings"
 msgstr "Impostazioni di notifica"
 
-#: ../../mod/settings.php:1098
+#: ../../mod/settings.php:1047
 msgid "By default post a status message when:"
 msgstr "Pubblica un messaggio di stato quando:"
 
-#: ../../mod/settings.php:1099
+#: ../../mod/settings.php:1048
 msgid "accepting a friend request"
 msgstr "accetto una nuova amicizia"
 
-#: ../../mod/settings.php:1100
+#: ../../mod/settings.php:1049
 msgid "joining a forum/community"
 msgstr "entro a far parte di un forum"
 
-#: ../../mod/settings.php:1101
+#: ../../mod/settings.php:1050
 msgid "making an <em>interesting</em> profile change"
 msgstr "faccio un cambiamento <em>interessante</em> al mio profilo"
 
-#: ../../mod/settings.php:1102
+#: ../../mod/settings.php:1051
 msgid "Send a notification email when:"
 msgstr "Invia una email di notifica quando:"
 
-#: ../../mod/settings.php:1103
+#: ../../mod/settings.php:1052
 msgid "You receive an introduction"
 msgstr "Ricevi una richiesta di amicizia"
 
-#: ../../mod/settings.php:1104
+#: ../../mod/settings.php:1053
 msgid "Your introductions are confirmed"
 msgstr "Le tue richieste di amicizia sono state accettate"
 
-#: ../../mod/settings.php:1105
+#: ../../mod/settings.php:1054
 msgid "Someone writes on your profile wall"
 msgstr "Qualcuno scrive sulla tua bacheca"
 
-#: ../../mod/settings.php:1106
+#: ../../mod/settings.php:1055
 msgid "Someone writes a followup comment"
 msgstr "Qualcuno scrive un commento a un tuo articolo"
 
-#: ../../mod/settings.php:1107
+#: ../../mod/settings.php:1056
 msgid "You receive a private message"
 msgstr "Ricevi un messaggio privato"
 
-#: ../../mod/settings.php:1108
+#: ../../mod/settings.php:1057
 msgid "You receive a friend suggestion"
 msgstr "Ti viene suggerito un amico"
 
-#: ../../mod/settings.php:1109
+#: ../../mod/settings.php:1058
 msgid "You are tagged in a post"
 msgstr "Sei taggato in un articolo"
 
-#: ../../mod/settings.php:1110
+#: ../../mod/settings.php:1059
 msgid "You are poked/prodded/etc. in a post"
 msgstr "Ricevi un poke in un articolo"
 
-#: ../../mod/settings.php:1113
+#: ../../mod/settings.php:1062
 msgid "Advanced Account/Page Type Settings"
 msgstr "Impostazioni avanzate"
 
-#: ../../mod/settings.php:1114
+#: ../../mod/settings.php:1063
 msgid "Change the behaviour of this account for special situations"
 msgstr "Cambia il funzionamento di questo account in situazioni particolari"
 
@@ -3930,7 +4045,7 @@ msgstr "Accesso pubblico negato."
 msgid "No connections."
 msgstr "Nessun contatto."
 
-#: ../../mod/viewconnections.php:69 ../../mod/nogroup.php:40
+#: ../../mod/viewconnections.php:69
 #, php-format
 msgid "Visit %s's profile [%s]"
 msgstr "Visita il profilo di %s [%s]"
@@ -4727,8 +4842,8 @@ msgid "Could not create collection."
 msgstr "Impossibile creare l'insieme."
 
 #: ../../mod/group.php:60
-msgid "Collection name changed."
-msgstr "Il nome dell'insieme di canali è stato cambiato."
+msgid "Collection updated."
+msgstr "Insieme aggiornato."
 
 #: ../../mod/group.php:92
 msgid "Create a collection of channels."
@@ -4766,7 +4881,7 @@ msgstr "Tutti i canali connessi"
 msgid "Click on a channel to add or remove."
 msgstr "Clicca su un canale per aggiungerlo o rimuoverlo."
 
-#: ../../mod/search.php:20 ../../mod/network.php:164
+#: ../../mod/search.php:20 ../../mod/network.php:113
 msgid "Remove term"
 msgstr "Rimuovi termine"
 
@@ -4778,11 +4893,11 @@ msgstr "Impossibile ottenere informazioni sul proprietario della pagina."
 msgid "Album not found."
 msgstr "Album non trovato."
 
-#: ../../mod/photos.php:125 ../../mod/photos.php:780
+#: ../../mod/photos.php:125 ../../mod/photos.php:791
 msgid "Delete Album"
 msgstr "Elimina album"
 
-#: ../../mod/photos.php:165 ../../mod/photos.php:1041
+#: ../../mod/photos.php:165 ../../mod/photos.php:1052
 msgid "Delete Photo"
 msgstr "Elimina foto"
 
@@ -4813,97 +4928,97 @@ msgstr "Hai usato %1$.2f Mb di %2$.2f Mb disponibili per le foto."
 msgid "You have used %1$.2f Mbytes of photo storage."
 msgstr "Hai usato %1$.2f Mb di spazio per le foto."
 
-#: ../../mod/photos.php:707
+#: ../../mod/photos.php:718
 msgid "Upload Photos"
 msgstr "Carica foto"
 
-#: ../../mod/photos.php:711 ../../mod/photos.php:775
+#: ../../mod/photos.php:722 ../../mod/photos.php:786
 msgid "New album name: "
 msgstr "Nome del nuovo album: "
 
-#: ../../mod/photos.php:712
+#: ../../mod/photos.php:723
 msgid "or existing album name: "
 msgstr "o nome di un album esistente: "
 
-#: ../../mod/photos.php:713
+#: ../../mod/photos.php:724
 msgid "Do not show a status post for this upload"
 msgstr "Non creare un messaggio di stato per questo caricamento"
 
-#: ../../mod/photos.php:715 ../../mod/photos.php:1036
+#: ../../mod/photos.php:726 ../../mod/photos.php:1047
 msgid "Permissions"
 msgstr "Permessi"
 
-#: ../../mod/photos.php:764 ../../mod/photos.php:786 ../../mod/photos.php:1212
-#: ../../mod/photos.php:1227
+#: ../../mod/photos.php:775 ../../mod/photos.php:797 ../../mod/photos.php:1223
+#: ../../mod/photos.php:1238
 msgid "Contact Photos"
 msgstr "Foto dei contatti"
 
-#: ../../mod/photos.php:790
+#: ../../mod/photos.php:801
 msgid "Edit Album"
 msgstr "Modifica album"
 
-#: ../../mod/photos.php:796
+#: ../../mod/photos.php:807
 msgid "Show Newest First"
 msgstr "Prima i più recenti"
 
-#: ../../mod/photos.php:798
+#: ../../mod/photos.php:809
 msgid "Show Oldest First"
 msgstr "Prima i più vecchi"
 
-#: ../../mod/photos.php:842 ../../mod/photos.php:1259
+#: ../../mod/photos.php:853 ../../mod/photos.php:1270
 msgid "View Photo"
 msgstr "Guarda la foto"
 
-#: ../../mod/photos.php:886
+#: ../../mod/photos.php:897
 msgid "Permission denied. Access to this item may be restricted."
 msgstr "Permesso negato. L'accesso a questo elemento può essere stato limitato."
 
-#: ../../mod/photos.php:888
+#: ../../mod/photos.php:899
 msgid "Photo not available"
 msgstr "Foto non disponibile"
 
-#: ../../mod/photos.php:946
+#: ../../mod/photos.php:957
 msgid "Use as profile photo"
 msgstr "Usa come foto del profilo"
 
-#: ../../mod/photos.php:970
+#: ../../mod/photos.php:981
 msgid "View Full Size"
 msgstr "Vedi nelle dimensioni originali"
 
-#: ../../mod/photos.php:1024
+#: ../../mod/photos.php:1035
 msgid "Edit photo"
 msgstr "Modifica la foto"
 
-#: ../../mod/photos.php:1026
+#: ../../mod/photos.php:1037
 msgid "Rotate CW (right)"
 msgstr "Ruota (senso orario)"
 
-#: ../../mod/photos.php:1027
+#: ../../mod/photos.php:1038
 msgid "Rotate CCW (left)"
 msgstr "Ruota (senso antiorario)"
 
-#: ../../mod/photos.php:1029
+#: ../../mod/photos.php:1040
 msgid "New album name"
 msgstr "Nuovo nome dell'album"
 
-#: ../../mod/photos.php:1032
+#: ../../mod/photos.php:1043
 msgid "Caption"
 msgstr "Titolo"
 
-#: ../../mod/photos.php:1034
+#: ../../mod/photos.php:1045
 msgid "Add a Tag"
 msgstr "Aggiungi tag"
 
-#: ../../mod/photos.php:1038
+#: ../../mod/photos.php:1049
 msgid ""
 "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
 msgstr "Per esempio: @luca, @Maria_Bianchi, @bob@example.com, #California, #camping"
 
-#: ../../mod/photos.php:1265
+#: ../../mod/photos.php:1276
 msgid "View Album"
 msgstr "Guarda l'album"
 
-#: ../../mod/photos.php:1274
+#: ../../mod/photos.php:1285
 msgid "Recent Photos"
 msgstr "Foto recenti"
 
@@ -4915,14 +5030,6 @@ msgstr "ti ha inviato un messaggio privato"
 msgid "added your channel"
 msgstr "ha aggiunto il tuo canale"
 
-#: ../../mod/ping.php:230 ../../boot.php:1858 ../../boot.php:1938
-msgid "g A l F d"
-msgstr "g A l d F"
-
-#: ../../mod/ping.php:252 ../../boot.php:1904 ../../boot.php:1979
-msgid "[today]"
-msgstr "[oggi]"
-
 #: ../../mod/ping.php:262
 msgid "posted an event"
 msgstr "ha creato un evento"
@@ -4955,11 +5062,6 @@ msgstr "Gestione menù"
 msgid "Drop"
 msgstr "Elimina"
 
-#: ../../mod/menu.php:57 ../../mod/network.php:321
-#: ../../mod/connections.php:552
-msgid "New"
-msgstr "Novità"
-
 #: ../../mod/menu.php:58
 msgid "Create a new menu"
 msgstr "Crea un nuovo menù"
@@ -5143,91 +5245,51 @@ msgstr "Inserisci l'indirizzo del tuo canale (ad esempio lucia@esempio.com)"
 msgid "Authenticate"
 msgstr "Autenticazione"
 
-#: ../../mod/network.php:302
-msgid "Commented Order"
-msgstr "Ultimi commenti"
-
-#: ../../mod/network.php:305
-msgid "Sort by Comment Date"
-msgstr "Per data del commento"
-
-#: ../../mod/network.php:308
-msgid "Posted Order"
-msgstr "Ultimi articoli"
-
-#: ../../mod/network.php:311
-msgid "Sort by Post Date"
-msgstr "Per data di creazione"
-
-#: ../../mod/network.php:315 ../../mod/notifications.php:86
-msgid "Personal"
-msgstr "Personali"
-
-#: ../../mod/network.php:318
-msgid "Posts that mention or involve you"
-msgstr "Articoli che ti riguardano o ti menzionano"
-
-#: ../../mod/network.php:324
-msgid "Activity Stream - by date"
-msgstr "Elenco attività - per data"
-
-#: ../../mod/network.php:331
-msgid "Starred"
-msgstr "Preferiti"
-
-#: ../../mod/network.php:334
-msgid "Favourite Posts"
-msgstr "Articoli preferiti"
-
-#: ../../mod/network.php:341
-msgid "Spam"
-msgstr "Spam"
-
-#: ../../mod/network.php:344
-msgid "Posts flagged as SPAM"
-msgstr "Articoli marcati come spam"
+#: ../../mod/network.php:172
+msgid "No such group"
+msgstr "Impossibile trovare l'insieme"
 
-#: ../../mod/network.php:384
+#: ../../mod/network.php:212
 msgid "Refresh"
 msgstr "Aggiorna"
 
-#: ../../mod/network.php:385 ../../mod/connections.php:404
+#: ../../mod/network.php:213 ../../mod/connections.php:404
 msgid "Me"
 msgstr "Io"
 
-#: ../../mod/network.php:386 ../../mod/connections.php:406
+#: ../../mod/network.php:214 ../../mod/connections.php:406
 msgid "Best Friends"
 msgstr "Buoni amici"
 
-#: ../../mod/network.php:388
+#: ../../mod/network.php:216
 msgid "Co-workers"
 msgstr "Colleghi"
 
-#: ../../mod/network.php:389 ../../mod/connections.php:408
+#: ../../mod/network.php:217 ../../mod/connections.php:408
 msgid "Former Friends"
 msgstr "Ex amici"
 
-#: ../../mod/network.php:390 ../../mod/connections.php:409
+#: ../../mod/network.php:218 ../../mod/connections.php:409
 msgid "Acquaintances"
 msgstr "Conoscenti"
 
-#: ../../mod/network.php:391
+#: ../../mod/network.php:219
 msgid "Everybody"
 msgstr "Tutti"
 
-#: ../../mod/network.php:408
+#: ../../mod/network.php:234
 msgid "Search Results For:"
 msgstr "Cerca risultati con:"
 
-#: ../../mod/network.php:453
-msgid "No such group"
-msgstr "Impossibile trovare l'insieme"
+#: ../../mod/network.php:296
+msgid "Collection: "
+msgstr "Insieme:"
 
-#: ../../mod/network.php:484
+#: ../../mod/network.php:309
 msgid "Connection: "
 msgstr "Connessione:"
 
-#: ../../mod/network.php:487
+#: ../../mod/network.php:312
 msgid "Invalid connection."
 msgstr "Connessione non valida."
 
@@ -5248,7 +5310,7 @@ msgstr "Impossibile aggiornare il contatto."
 
 #: ../../mod/intro.php:56
 msgid "Introductions and Connection Requests"
-msgstr "Richieste per entrare in contatto"
+msgstr "Richieste di entrare in contatto"
 
 #: ../../mod/intro.php:67
 msgid "No pending introductions."
@@ -5278,693 +5340,688 @@ msgstr "se possibile"
 msgid "Discard"
 msgstr "Rifiuta"
 
-#: ../../mod/connections.php:67
-msgid "Could not access contact record."
-msgstr "Non è possibile accedere alle informazioni sul contatto."
+#: ../../mod/post.php:222
+msgid ""
+"Remote authentication blocked. You are logged into this site locally. Please"
+" logout and retry."
+msgstr "L'autenticazione remota non è disponibile. Hai accesso solamente a questo sito. Puoi provare ad uscire per tentare di nuovo."
 
-#: ../../mod/connections.php:81
-msgid "Could not locate selected profile."
-msgstr "Non riesco a trovare il profilo selezionato."
+#: ../../mod/post.php:251
+#, php-format
+msgid "Welcome %s. Remote authentication successful."
+msgstr "Ciao %s. La tua autenticazione da remoto è avvenuta con successo."
 
-#: ../../mod/connections.php:124
-msgid "Failed to update connection record."
-msgstr "Impossibile aggiornare le informazioni del contatto."
+#: ../../mod/dirsearch.php:21
+msgid "This site is not a directory server"
+msgstr "Questo sito non fornisce l'elenco generale dei canali"
 
-#: ../../mod/connections.php:219
-msgid "Could not access address book record."
-msgstr "Impossibile accedere alle informazioni della rubrica."
+#: ../../mod/lockview.php:34
+msgid "Remote privacy information not available."
+msgstr "Le informazioni remote sulla privacy non sono disponibili."
 
-#: ../../mod/connections.php:233
-msgid "Refresh failed - channel is currently unavailable."
-msgstr "Il canale non è disponibile - impossibile aggiornare."
+#: ../../mod/lockview.php:43
+msgid "Visible to:"
+msgstr "Visibile a:"
 
-#: ../../mod/connections.php:240
-msgid "Channel has been unblocked"
-msgstr "Il canale è stato sbloccato"
+#: ../../mod/magic.php:63
+msgid "Hub not found."
+msgstr "Server non trovato."
 
-#: ../../mod/connections.php:241
-msgid "Channel has been blocked"
-msgstr "Il canale è stato bloccato"
+#: ../../mod/profiles.php:18 ../../mod/profiles.php:138
+#: ../../mod/profiles.php:179 ../../mod/profiles.php:486
+msgid "Profile not found."
+msgstr "Profilo non trovato."
 
-#: ../../mod/connections.php:245 ../../mod/connections.php:257
-#: ../../mod/connections.php:269 ../../mod/connections.php:281
-#: ../../mod/connections.php:296
-msgid "Unable to set address book parameters."
-msgstr "Impossibile impostare i parametri della rubrica."
+#: ../../mod/profiles.php:38
+msgid "Profile deleted."
+msgstr "Profilo eliminato."
 
-#: ../../mod/connections.php:252
-msgid "Channel has been unignored"
-msgstr "Il canale non sarà più ignorato"
+#: ../../mod/profiles.php:56 ../../mod/profiles.php:92
+msgid "Profile-"
+msgstr "Profilo-"
 
-#: ../../mod/connections.php:253
-msgid "Channel has been ignored"
-msgstr "Il canale sarà ignorato"
+#: ../../mod/profiles.php:77 ../../mod/profiles.php:120
+msgid "New profile created."
+msgstr "Il nuovo profilo è stato creato."
 
-#: ../../mod/connections.php:264
-msgid "Channel has been unarchived"
-msgstr "Il canale non è più archiviato"
+#: ../../mod/profiles.php:98
+msgid "Profile unavailable to clone."
+msgstr "Impossibile duplicare il profilo."
 
-#: ../../mod/connections.php:265
-msgid "Channel has been archived"
-msgstr "Il canale è stato archiviato"
+#: ../../mod/profiles.php:189
+msgid "Profile Name is required."
+msgstr "Il nome del profilo è obbligatorio ."
 
-#: ../../mod/connections.php:276
-msgid "Channel has been unhidden"
-msgstr "Il canale non è più nascosto"
+#: ../../mod/profiles.php:317
+msgid "Marital Status"
+msgstr "Stato sentimentale"
 
-#: ../../mod/connections.php:277
-msgid "Channel has been hidden"
-msgstr "Il canale è stato nascosto"
+#: ../../mod/profiles.php:321
+msgid "Romantic Partner"
+msgstr "Partner affettivo"
 
-#: ../../mod/connections.php:291
-msgid "Channel has been approved"
-msgstr "Il canale è stato approvato"
+#: ../../mod/profiles.php:325
+msgid "Likes"
+msgstr "Cosa gli piace"
 
-#: ../../mod/connections.php:292
-msgid "Channel has been unapproved"
-msgstr "Il canale non è più approvato"
+#: ../../mod/profiles.php:329
+msgid "Dislikes"
+msgstr "Cosa non gli piace"
 
-#: ../../mod/connections.php:310
-msgid "Contact has been removed."
-msgstr "Il contatto è stato rimosso."
+#: ../../mod/profiles.php:333
+msgid "Work/Employment"
+msgstr "Lavoro/impiego"
 
-#: ../../mod/connections.php:330
-#, php-format
-msgid "View %s's profile"
-msgstr "Guarda il profilo di %s"
+#: ../../mod/profiles.php:336
+msgid "Religion"
+msgstr "Religione"
 
-#: ../../mod/connections.php:334
-msgid "Refresh Permissions"
-msgstr "Aggiorna i permessi"
+#: ../../mod/profiles.php:340
+msgid "Political Views"
+msgstr "Orientamento politico"
 
-#: ../../mod/connections.php:337
-msgid "Fetch updated permissions"
-msgstr "Scarica i permessi aggiornati"
+#: ../../mod/profiles.php:344
+msgid "Gender"
+msgstr "Sesso"
 
-#: ../../mod/connections.php:341
-msgid "Recent Activity"
-msgstr "Attività recenti"
+#: ../../mod/profiles.php:348
+msgid "Sexual Preference"
+msgstr "Preferenze sessuali"
 
-#: ../../mod/connections.php:344
-msgid "View recent posts and comments"
-msgstr "Leggi i post recenti e i commenti"
+#: ../../mod/profiles.php:352
+msgid "Homepage"
+msgstr "Home page"
 
-#: ../../mod/connections.php:351
-msgid "Block or Unblock this connection"
-msgstr "Per bloccare o meno questo contatto"
+#: ../../mod/profiles.php:356
+msgid "Interests"
+msgstr "Interessi"
 
-#: ../../mod/connections.php:355 ../../mod/connections.php:491
-msgid "Unignore"
-msgstr "Non ignorare"
+#: ../../mod/profiles.php:360
+msgid "Address"
+msgstr "Indirizzo"
 
-#: ../../mod/connections.php:358
-msgid "Ignore or Unignore this connection"
-msgstr "Per ignorare o meno questo contatto"
+#: ../../mod/profiles.php:367 ../../mod/pubsites.php:31
+msgid "Location"
+msgstr "Luogo attuale"
 
-#: ../../mod/connections.php:361
-msgid "Unarchive"
-msgstr "Non archiviare"
+#: ../../mod/profiles.php:450
+msgid "Profile updated."
+msgstr "Profilo aggiornato."
 
-#: ../../mod/connections.php:361
-msgid "Archive"
-msgstr "Archivia"
+#: ../../mod/profiles.php:505
+msgid "Hide your contact/friend list from viewers of this profile?"
+msgstr "Nascondi la tua lista di contatti/amici ai visitatori di questo profilo?"
 
-#: ../../mod/connections.php:364
-msgid "Archive or Unarchive this connection"
-msgstr "Per archiviare o meno questo contatto"
+#: ../../mod/profiles.php:528
+msgid "Edit Profile Details"
+msgstr "Modifica i dettagli del profilo"
 
-#: ../../mod/connections.php:367
-msgid "Unhide"
-msgstr "Non nascondere"
+#: ../../mod/profiles.php:530
+msgid "View this profile"
+msgstr "Guarda questo profilo"
 
-#: ../../mod/connections.php:367
-msgid "Hide"
-msgstr "Nascondi"
+#: ../../mod/profiles.php:531
+msgid "Change Profile Photo"
+msgstr "Cambia la foto del profilo"
 
-#: ../../mod/connections.php:370
-msgid "Hide or Unhide this connection"
-msgstr "Per nascondere o meno questo contatto"
+#: ../../mod/profiles.php:532
+msgid "Create a new profile using these settings"
+msgstr "Crea un nuovo profilo usando queste impostazioni"
 
-#: ../../mod/connections.php:377
-msgid "Delete this connection"
-msgstr "Elimina questo contatto"
-
-#: ../../mod/connections.php:410
-msgid "Unknown"
-msgstr "Sconosciuto"
-
-#: ../../mod/connections.php:420 ../../mod/connections.php:449
-msgid "Approve this connection"
-msgstr "Approva questo contatto"
-
-#: ../../mod/connections.php:420
-msgid "Accept connection to allow communication"
-msgstr "Entra in contatto per poter comunicare"
+#: ../../mod/profiles.php:533
+msgid "Clone this profile"
+msgstr "Clona questo profilo"
 
-#: ../../mod/connections.php:436
-msgid "Automatic Permissions Settings"
-msgstr "Permessi predefiniti"
+#: ../../mod/profiles.php:534
+msgid "Delete this profile"
+msgstr "Elimina questo profilo"
 
-#: ../../mod/connections.php:436
-#, php-format
-msgid "Connections: settings for %s"
-msgstr "Contatti: impostazioni per %s"
+#: ../../mod/profiles.php:535
+msgid "Profile Name:"
+msgstr "Nome del profilo:"
 
-#: ../../mod/connections.php:440
-msgid ""
-"When receiving a channel introduction, any permissions provided here will be"
-" applied to the new connection automatically and the introduction approved. "
-"Leave this page if you do not wish to use this feature."
-msgstr "Hai ricevuto da un canale una richiesta di entrare in contatto, se prosegui la richiesta sarà approvata e saranno applicati i permessi mostrati. Lascia questa pagina se non vuoi proseguire."
+#: ../../mod/profiles.php:536
+msgid "Your Full Name:"
+msgstr "Il tuo nome completo:"
 
-#: ../../mod/connections.php:442
-msgid "Slide to adjust your degree of friendship"
-msgstr "Trascina per restringere il grado di amicizia da mostrare"
+#: ../../mod/profiles.php:537
+msgid "Title/Description:"
+msgstr "Titolo/descrizione:"
 
-#: ../../mod/connections.php:448
-msgid "inherited"
-msgstr "derivato"
+#: ../../mod/profiles.php:538
+msgid "Your Gender:"
+msgstr "Sesso:"
 
-#: ../../mod/connections.php:450
-msgid "Connection has no individual permissions!"
-msgstr "Non hai assegnato permessi individuali a questo contatto!"
+#: ../../mod/profiles.php:539
+#, php-format
+msgid "Birthday (%s):"
+msgstr "Compleanno (%s):"
 
-#: ../../mod/connections.php:451
-msgid ""
-"This may be appropriate based on your <a href=\"settings\">privacy "
-"settings</a>, though you may wish to review the \"Advanced Permissions\"."
-msgstr "Questo corrisponde alle tue <a href='settings'>impostazioni di privacy</a>, ma puoi anche dare un'occhiata ai 'Permessi avanzati' per opzioni più dettagliate."
+#: ../../mod/profiles.php:540
+msgid "Street Address:"
+msgstr "Indirizzo (via/piazza):"
 
-#: ../../mod/connections.php:453
-msgid "Profile Visibility"
-msgstr "Visibilità del profilo"
+#: ../../mod/profiles.php:541
+msgid "Locality/City:"
+msgstr "Località:"
 
-#: ../../mod/connections.php:454
-#, php-format
-msgid ""
-"Please choose the profile you would like to display to %s when viewing your "
-"profile securely."
-msgstr "Seleziona il profilo che vuoi mostrare a %s quando visita il tuo profilo in modo sicuro."
+#: ../../mod/profiles.php:542
+msgid "Postal/Zip Code:"
+msgstr "CAP:"
 
-#: ../../mod/connections.php:455
-msgid "Contact Information / Notes"
-msgstr "Informazioni e annotazioni sul contatto"
+#: ../../mod/profiles.php:543
+msgid "Country:"
+msgstr "Nazione:"
 
-#: ../../mod/connections.php:456
-msgid "Edit contact notes"
-msgstr "Modifica le informazioni sul contatto"
+#: ../../mod/profiles.php:544
+msgid "Region/State:"
+msgstr "Regione/stato:"
 
-#: ../../mod/connections.php:458
-msgid "Their Settings"
-msgstr "Permessi concessi a te"
+#: ../../mod/profiles.php:545
+msgid "<span class=\"heart\">&hearts;</span> Marital Status:"
+msgstr "<span class=\"heart\">&hearts;</span> Stato sentimentale:"
 
-#: ../../mod/connections.php:459
-msgid "My Settings"
-msgstr "I permessi che concedo"
+#: ../../mod/profiles.php:546
+msgid "Who: (if applicable)"
+msgstr "Con chi: (se possibile)"
 
-#: ../../mod/connections.php:461
-msgid "Forum Members"
-msgstr "Membro di un forum"
+#: ../../mod/profiles.php:547
+msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
+msgstr "Per esempio: cathy123, Cathy Williams, cathy@example.com"
 
-#: ../../mod/connections.php:462
-msgid "Soapbox"
-msgstr "Comunicati e annunci"
+#: ../../mod/profiles.php:548
+msgid "Since [date]:"
+msgstr "dal [data]:"
 
-#: ../../mod/connections.php:463
-msgid "Full Sharing"
-msgstr "Condivisione totale"
+#: ../../mod/profiles.php:550
+msgid "Homepage URL:"
+msgstr "Indirizzo home page:"
 
-#: ../../mod/connections.php:464
-msgid "Cautious Sharing"
-msgstr "Condivisione prudente"
+#: ../../mod/profiles.php:553
+msgid "Religious Views:"
+msgstr "Orientamento religioso:"
 
-#: ../../mod/connections.php:465
-msgid "Follow Only"
-msgstr "Follower"
+#: ../../mod/profiles.php:554
+msgid "Keywords:"
+msgstr "Parole chiave, tag:"
 
-#: ../../mod/connections.php:466
-msgid "Individual Permissions"
-msgstr "Permessi individuali"
+#: ../../mod/profiles.php:557
+msgid "Example: fishing photography software"
+msgstr "Per esempio: pesca fotografia programmazione"
 
-#: ../../mod/connections.php:467
-msgid ""
-"Some permissions may be inherited from your channel <a "
-"href=\"settings\">privacy settings</a>, which have higher priority. Changing"
-" those inherited settings on this page will have no effect."
-msgstr "Alcuni permessi derivano dalle <a href=\"settings\">impostazioni di privacy</a>, che hanno una priorità maggiore. Cambiarli in questa pagina non avrà alcun effetto."
+#: ../../mod/profiles.php:558
+msgid "Used in directory listings"
+msgstr "Visibile nell'elenco pubblico di canali"
 
-#: ../../mod/connections.php:468
-msgid "Advanced Permissions"
-msgstr "Permessi avanzati"
+#: ../../mod/profiles.php:559
+msgid "Tell us about yourself..."
+msgstr "Raccontaci di te..."
 
-#: ../../mod/connections.php:469
-msgid "Quick Links"
-msgstr "Impostazioni veloci"
+#: ../../mod/profiles.php:560
+msgid "Hobbies/Interests"
+msgstr "Hobby/interessi"
 
-#: ../../mod/connections.php:473
-#, php-format
-msgid "Visit %s's profile - %s"
-msgstr "Guarda il profilo di %s - %s"
+#: ../../mod/profiles.php:561
+msgid "Contact information and Social Networks"
+msgstr "Contatti personali e i tuoi social network"
 
-#: ../../mod/connections.php:474
-msgid "Block/Unblock contact"
-msgstr "Blocca/sblocca contatto"
+#: ../../mod/profiles.php:562
+msgid "My other channels"
+msgstr "I miei altri canali"
 
-#: ../../mod/connections.php:475
-msgid "Ignore contact"
-msgstr "Ignora il contatto"
+#: ../../mod/profiles.php:563
+msgid "Musical interests"
+msgstr "Interessi musicali"
 
-#: ../../mod/connections.php:476
-msgid "Repair URL settings"
-msgstr "Ripara le impostazioni URL"
+#: ../../mod/profiles.php:564
+msgid "Books, literature"
+msgstr "Libri, letteratura"
 
-#: ../../mod/connections.php:477
-msgid "View conversations"
-msgstr "Leggi le conversazioni"
+#: ../../mod/profiles.php:565
+msgid "Television"
+msgstr "Televisione"
 
-#: ../../mod/connections.php:479
-msgid "Delete contact"
-msgstr "Elimina contatto"
+#: ../../mod/profiles.php:566
+msgid "Film/dance/culture/entertainment"
+msgstr "Film/danza/cultura/intrattenimento"
 
-#: ../../mod/connections.php:482
-msgid "Last update:"
-msgstr "Ultimo aggiornamento:"
+#: ../../mod/profiles.php:567
+msgid "Love/romance"
+msgstr "Amore"
 
-#: ../../mod/connections.php:484
-msgid "Update public posts"
-msgstr "Aggiorna gli articoli pubblici"
+#: ../../mod/profiles.php:568
+msgid "Work/employment"
+msgstr "Lavoro/impiego"
 
-#: ../../mod/connections.php:486
-msgid "Update now"
-msgstr "Aggiorna adesso"
+#: ../../mod/profiles.php:569
+msgid "School/education"
+msgstr "Scuola/educazione"
 
-#: ../../mod/connections.php:492
-msgid "Currently blocked"
-msgstr "Attualmente bloccato"
+#: ../../mod/profiles.php:574
+msgid ""
+"This is your <strong>public</strong> profile.<br />It <strong>may</strong> "
+"be visible to anybody using the internet."
+msgstr "Questo è il tuo profilo <strong>publico</strong>.<br /><strong>Potrebbe</strong> essere visto da chiunque attraverso internet."
 
-#: ../../mod/connections.php:493
-msgid "Currently ignored"
-msgstr "Attualmente ignorato"
+#: ../../mod/profiles.php:584 ../../mod/directory.php:160
+msgid "Age: "
+msgstr "Età:"
 
-#: ../../mod/connections.php:494
-msgid "Currently archived"
-msgstr "Attualmente archiviato"
+#: ../../mod/profiles.php:623
+msgid "Edit/Manage Profiles"
+msgstr "Modifica/gestisci i profili"
 
-#: ../../mod/connections.php:495
-msgid "Currently pending"
-msgstr "Attualmente da approvare"
+#: ../../mod/new_channel.php:107
+msgid "Add a Channel"
+msgstr "Aggiungi un canale"
 
-#: ../../mod/connections.php:496
+#: ../../mod/new_channel.php:108
 msgid ""
-"Replies/likes to your public posts <strong>may</strong> still be visible"
-msgstr "Le risposte ai tuoi articoli pubblici <strong>potrebbero</strong> restare comunque visibili"
+"A channel is your own collection of related web pages. A channel can be used"
+" to hold social network profiles, blogs, conversation groups and forums, "
+"celebrity pages, and much more. You may create as many channels as your "
+"service provider allows."
+msgstr "I contenuti che pubblichi finiscono in un \"canale\". Un canale può essere usato per mantenere un tuo profilo personale, per avere un blog, per creare forum di discussione o gruppi di interesse, per pagine di celebrità e molto altro. Puoi creare quanti canali vuoi a meno di limiti dati dal gestore del sito."
 
-#: ../../mod/connections.php:532 ../../mod/connections.php:604
-msgid "Blocked"
-msgstr "Bloccati"
+#: ../../mod/new_channel.php:111
+msgid "Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation Group\" "
+msgstr "Per esempio: \"Mario Rossi\", \"Lisa e le sue ricette\", \"Il campionato\", \"Il gruppo di escursionismo\""
 
-#: ../../mod/connections.php:537 ../../mod/connections.php:611
-msgid "Ignored"
-msgstr "Ignorati"
+#: ../../mod/new_channel.php:112
+msgid "Choose a short nickname"
+msgstr "Scegli un nome breve"
 
-#: ../../mod/connections.php:542 ../../mod/connections.php:625
-msgid "Hidden"
-msgstr "Nascosti"
+#: ../../mod/new_channel.php:113
+msgid ""
+"Your nickname will be used to create an easily remembered channel address "
+"(like an email address) which you can share with others."
+msgstr "Il nome breve sarà usato per creare un indirizzo facile da ricordare per il tuo canale (simile a una email). Così potrai condividerlo e gli altri potranno trovarti."
 
-#: ../../mod/connections.php:547 ../../mod/connections.php:618
-msgid "Archived"
-msgstr "Archiviati"
+#: ../../mod/new_channel.php:114
+msgid "Or <a href=\"import\">import an existing channel</a> from another location"
+msgstr "Oppure <a href=\"import\">importa un tuo canale esistente</a> da un altro server/hub"
 
-#: ../../mod/connections.php:558
-msgid "All"
-msgstr "Tutti"
+#: ../../mod/connections.php:67
+msgid "Could not access contact record."
+msgstr "Non è possibile accedere alle informazioni sul contatto."
 
-#: ../../mod/connections.php:579
-msgid "Suggestions"
-msgstr "Suggerimenti"
+#: ../../mod/connections.php:81
+msgid "Could not locate selected profile."
+msgstr "Non riesco a trovare il profilo selezionato."
 
-#: ../../mod/connections.php:582
-msgid "Suggest new connections"
-msgstr "Suggerisci nuovi contatti"
+#: ../../mod/connections.php:124
+msgid "Failed to update connection record."
+msgstr "Impossibile aggiornare le informazioni del contatto."
 
-#: ../../mod/connections.php:588
-msgid "Show pending (new) connections"
-msgstr "Richieste per entrare in contatto"
+#: ../../mod/connections.php:219
+msgid "Could not access address book record."
+msgstr "Impossibile accedere alle informazioni della rubrica."
 
-#: ../../mod/connections.php:591
-msgid "All Connections"
-msgstr "Tutti i contatti"
+#: ../../mod/connections.php:233
+msgid "Refresh failed - channel is currently unavailable."
+msgstr "Il canale non è disponibile - impossibile aggiornare."
 
-#: ../../mod/connections.php:594
-msgid "Show all connections"
-msgstr "Mostra tutti i contatti"
+#: ../../mod/connections.php:240
+msgid "Channel has been unblocked"
+msgstr "Il canale è stato sbloccato"
 
-#: ../../mod/connections.php:597
-msgid "Unblocked"
-msgstr "Non bloccati"
+#: ../../mod/connections.php:241
+msgid "Channel has been blocked"
+msgstr "Il canale è stato bloccato"
 
-#: ../../mod/connections.php:600
-msgid "Only show unblocked connections"
-msgstr "Mostra solo i contatti non bloccati"
+#: ../../mod/connections.php:245 ../../mod/connections.php:257
+#: ../../mod/connections.php:269 ../../mod/connections.php:281
+#: ../../mod/connections.php:296
+msgid "Unable to set address book parameters."
+msgstr "Impossibile impostare i parametri della rubrica."
 
-#: ../../mod/connections.php:607
-msgid "Only show blocked connections"
-msgstr "Mostra solo i contatti bloccati"
+#: ../../mod/connections.php:252
+msgid "Channel has been unignored"
+msgstr "Il canale non sarà più ignorato"
 
-#: ../../mod/connections.php:614
-msgid "Only show ignored connections"
-msgstr "Mostra solo i contatti ignorati"
+#: ../../mod/connections.php:253
+msgid "Channel has been ignored"
+msgstr "Il canale sarà ignorato"
 
-#: ../../mod/connections.php:621
-msgid "Only show archived connections"
-msgstr "Mostra solo i contatti archiviati"
+#: ../../mod/connections.php:264
+msgid "Channel has been unarchived"
+msgstr "Il canale non è più archiviato"
 
-#: ../../mod/connections.php:628
-msgid "Only show hidden connections"
-msgstr "Mostra solo i contatti nascosti"
+#: ../../mod/connections.php:265
+msgid "Channel has been archived"
+msgstr "Il canale è stato archiviato"
 
-#: ../../mod/connections.php:670
-#, php-format
-msgid "%1$s [%2$s]"
-msgstr "%1$s [%2$s]"
+#: ../../mod/connections.php:276
+msgid "Channel has been unhidden"
+msgstr "Il canale non è più nascosto"
 
-#: ../../mod/connections.php:671 ../../mod/nogroup.php:41
-msgid "Edit contact"
-msgstr "Modifica il contatto"
+#: ../../mod/connections.php:277
+msgid "Channel has been hidden"
+msgstr "Il canale è stato nascosto"
 
-#: ../../mod/connections.php:695
-msgid "Search your connections"
-msgstr "Cerca tra i contatti"
+#: ../../mod/connections.php:291
+msgid "Channel has been approved"
+msgstr "Il canale è stato approvato"
 
-#: ../../mod/connections.php:696
-msgid "Finding: "
-msgstr "Ricerca: "
+#: ../../mod/connections.php:292
+msgid "Channel has been unapproved"
+msgstr "Il canale non è più approvato"
 
-#: ../../mod/dirsearch.php:21
-msgid "This site is not a directory server"
-msgstr "Questo sito non fornisce l'elenco generale dei canali"
+#: ../../mod/connections.php:310
+msgid "Contact has been removed."
+msgstr "Il contatto è stato rimosso."
 
-#: ../../mod/lockview.php:34
-msgid "Remote privacy information not available."
-msgstr "Le informazioni remote sulla privacy non sono disponibili."
+#: ../../mod/connections.php:330
+#, php-format
+msgid "View %s's profile"
+msgstr "Guarda il profilo di %s"
 
-#: ../../mod/lockview.php:43
-msgid "Visible to:"
-msgstr "Visibile a:"
+#: ../../mod/connections.php:334
+msgid "Refresh Permissions"
+msgstr "Aggiorna i permessi"
 
-#: ../../mod/profiles.php:18 ../../mod/profiles.php:138
-#: ../../mod/profiles.php:179 ../../mod/profiles.php:486
-msgid "Profile not found."
-msgstr "Profilo non trovato."
+#: ../../mod/connections.php:337
+msgid "Fetch updated permissions"
+msgstr "Scarica i permessi aggiornati"
 
-#: ../../mod/profiles.php:38
-msgid "Profile deleted."
-msgstr "Profilo eliminato."
+#: ../../mod/connections.php:341
+msgid "Recent Activity"
+msgstr "Attività recenti"
 
-#: ../../mod/profiles.php:56 ../../mod/profiles.php:92
-msgid "Profile-"
-msgstr "Profilo-"
+#: ../../mod/connections.php:344
+msgid "View recent posts and comments"
+msgstr "Leggi i post recenti e i commenti"
 
-#: ../../mod/profiles.php:77 ../../mod/profiles.php:120
-msgid "New profile created."
-msgstr "Il nuovo profilo è stato creato."
+#: ../../mod/connections.php:351
+msgid "Block or Unblock this connection"
+msgstr "Per bloccare o meno questo contatto"
 
-#: ../../mod/profiles.php:98
-msgid "Profile unavailable to clone."
-msgstr "Impossibile duplicare il profilo."
+#: ../../mod/connections.php:355 ../../mod/connections.php:491
+msgid "Unignore"
+msgstr "Non ignorare"
 
-#: ../../mod/profiles.php:189
-msgid "Profile Name is required."
-msgstr "Il nome del profilo è obbligatorio ."
+#: ../../mod/connections.php:358
+msgid "Ignore or Unignore this connection"
+msgstr "Per ignorare o meno questo contatto"
 
-#: ../../mod/profiles.php:317
-msgid "Marital Status"
-msgstr "Stato sentimentale"
+#: ../../mod/connections.php:361
+msgid "Unarchive"
+msgstr "Non archiviare"
 
-#: ../../mod/profiles.php:321
-msgid "Romantic Partner"
-msgstr "Partner affettivo"
+#: ../../mod/connections.php:361
+msgid "Archive"
+msgstr "Archivia"
 
-#: ../../mod/profiles.php:325
-msgid "Likes"
-msgstr "Cosa gli piace"
+#: ../../mod/connections.php:364
+msgid "Archive or Unarchive this connection"
+msgstr "Per archiviare o meno questo contatto"
 
-#: ../../mod/profiles.php:329
-msgid "Dislikes"
-msgstr "Cosa non gli piace"
+#: ../../mod/connections.php:367
+msgid "Unhide"
+msgstr "Non nascondere"
 
-#: ../../mod/profiles.php:333
-msgid "Work/Employment"
-msgstr "Lavoro/impiego"
+#: ../../mod/connections.php:367
+msgid "Hide"
+msgstr "Nascondi"
 
-#: ../../mod/profiles.php:336
-msgid "Religion"
-msgstr "Religione"
+#: ../../mod/connections.php:370
+msgid "Hide or Unhide this connection"
+msgstr "Per nascondere o meno questo contatto"
 
-#: ../../mod/profiles.php:340
-msgid "Political Views"
-msgstr "Orientamento politico"
+#: ../../mod/connections.php:377
+msgid "Delete this connection"
+msgstr "Elimina questo contatto"
 
-#: ../../mod/profiles.php:344
-msgid "Gender"
-msgstr "Sesso"
+#: ../../mod/connections.php:410
+msgid "Unknown"
+msgstr "Sconosciuto"
 
-#: ../../mod/profiles.php:348
-msgid "Sexual Preference"
-msgstr "Preferenze sessuali"
+#: ../../mod/connections.php:420 ../../mod/connections.php:449
+msgid "Approve this connection"
+msgstr "Approva questo contatto"
 
-#: ../../mod/profiles.php:352
-msgid "Homepage"
-msgstr "Home page"
+#: ../../mod/connections.php:420
+msgid "Accept connection to allow communication"
+msgstr "Entra in contatto per poter comunicare"
 
-#: ../../mod/profiles.php:356
-msgid "Interests"
-msgstr "Interessi"
+#: ../../mod/connections.php:436
+msgid "Automatic Permissions Settings"
+msgstr "Permessi predefiniti"
 
-#: ../../mod/profiles.php:360
-msgid "Address"
-msgstr "Indirizzo"
+#: ../../mod/connections.php:436
+#, php-format
+msgid "Connections: settings for %s"
+msgstr "Contatti: impostazioni per %s"
 
-#: ../../mod/profiles.php:367 ../../mod/pubsites.php:31
-msgid "Location"
-msgstr "Luogo attuale"
+#: ../../mod/connections.php:440
+msgid ""
+"When receiving a channel introduction, any permissions provided here will be"
+" applied to the new connection automatically and the introduction approved. "
+"Leave this page if you do not wish to use this feature."
+msgstr "Hai ricevuto da un canale una richiesta di entrare in contatto, se prosegui la richiesta sarà approvata e saranno applicati i permessi mostrati. Lascia questa pagina se non vuoi proseguire."
 
-#: ../../mod/profiles.php:450
-msgid "Profile updated."
-msgstr "Profilo aggiornato."
+#: ../../mod/connections.php:442
+msgid "Slide to adjust your degree of friendship"
+msgstr "Trascina per restringere il grado di amicizia da mostrare"
 
-#: ../../mod/profiles.php:505
-msgid "Hide your contact/friend list from viewers of this profile?"
-msgstr "Nascondi la tua lista di contatti/amici ai visitatori di questo profilo?"
+#: ../../mod/connections.php:448
+msgid "inherited"
+msgstr "derivato"
 
-#: ../../mod/profiles.php:528
-msgid "Edit Profile Details"
-msgstr "Modifica i dettagli del profilo"
+#: ../../mod/connections.php:450
+msgid "Connection has no individual permissions!"
+msgstr "Non hai assegnato permessi individuali a questo contatto!"
 
-#: ../../mod/profiles.php:530
-msgid "View this profile"
-msgstr "Guarda questo profilo"
+#: ../../mod/connections.php:451
+msgid ""
+"This may be appropriate based on your <a href=\"settings\">privacy "
+"settings</a>, though you may wish to review the \"Advanced Permissions\"."
+msgstr "Questo corrisponde alle tue <a href='settings'>impostazioni di privacy</a>, ma puoi anche dare un'occhiata ai 'Permessi avanzati' per opzioni più dettagliate."
 
-#: ../../mod/profiles.php:531
-msgid "Change Profile Photo"
-msgstr "Cambia la foto del profilo"
+#: ../../mod/connections.php:453
+msgid "Profile Visibility"
+msgstr "Visibilità del profilo"
 
-#: ../../mod/profiles.php:532
-msgid "Create a new profile using these settings"
-msgstr "Crea un nuovo profilo usando queste impostazioni"
+#: ../../mod/connections.php:454
+#, php-format
+msgid ""
+"Please choose the profile you would like to display to %s when viewing your "
+"profile securely."
+msgstr "Seleziona il profilo che vuoi mostrare a %s quando visita il tuo profilo in modo sicuro."
 
-#: ../../mod/profiles.php:533
-msgid "Clone this profile"
-msgstr "Clona questo profilo"
+#: ../../mod/connections.php:455
+msgid "Contact Information / Notes"
+msgstr "Informazioni e annotazioni sul contatto"
 
-#: ../../mod/profiles.php:534
-msgid "Delete this profile"
-msgstr "Elimina questo profilo"
+#: ../../mod/connections.php:456
+msgid "Edit contact notes"
+msgstr "Modifica le informazioni sul contatto"
 
-#: ../../mod/profiles.php:535
-msgid "Profile Name:"
-msgstr "Nome del profilo:"
+#: ../../mod/connections.php:458
+msgid "Their Settings"
+msgstr "Permessi concessi a te"
 
-#: ../../mod/profiles.php:536
-msgid "Your Full Name:"
-msgstr "Il tuo nome completo:"
+#: ../../mod/connections.php:459
+msgid "My Settings"
+msgstr "I permessi che concedo"
 
-#: ../../mod/profiles.php:537
-msgid "Title/Description:"
-msgstr "Titolo/descrizione:"
+#: ../../mod/connections.php:461
+msgid "Forum Members"
+msgstr "Membro di un forum"
 
-#: ../../mod/profiles.php:538
-msgid "Your Gender:"
-msgstr "Sesso:"
+#: ../../mod/connections.php:462
+msgid "Soapbox"
+msgstr "Comunicati e annunci"
 
-#: ../../mod/profiles.php:539
-#, php-format
-msgid "Birthday (%s):"
-msgstr "Compleanno (%s):"
+#: ../../mod/connections.php:463
+msgid "Full Sharing"
+msgstr "Condivisione totale"
 
-#: ../../mod/profiles.php:540
-msgid "Street Address:"
-msgstr "Indirizzo (via/piazza):"
+#: ../../mod/connections.php:464
+msgid "Cautious Sharing"
+msgstr "Condivisione prudente"
 
-#: ../../mod/profiles.php:541
-msgid "Locality/City:"
-msgstr "Località:"
+#: ../../mod/connections.php:465
+msgid "Follow Only"
+msgstr "Follower"
 
-#: ../../mod/profiles.php:542
-msgid "Postal/Zip Code:"
-msgstr "CAP:"
+#: ../../mod/connections.php:466
+msgid "Individual Permissions"
+msgstr "Permessi individuali"
 
-#: ../../mod/profiles.php:543
-msgid "Country:"
-msgstr "Nazione:"
+#: ../../mod/connections.php:467
+msgid ""
+"Some permissions may be inherited from your channel <a "
+"href=\"settings\">privacy settings</a>, which have higher priority. Changing"
+" those inherited settings on this page will have no effect."
+msgstr "Alcuni permessi derivano dalle <a href=\"settings\">impostazioni di privacy</a>, che hanno una priorità maggiore. Cambiarli in questa pagina non avrà alcun effetto."
 
-#: ../../mod/profiles.php:544
-msgid "Region/State:"
-msgstr "Regione/stato:"
+#: ../../mod/connections.php:468
+msgid "Advanced Permissions"
+msgstr "Permessi avanzati"
 
-#: ../../mod/profiles.php:545
-msgid "<span class=\"heart\">&hearts;</span> Marital Status:"
-msgstr "<span class=\"heart\">&hearts;</span> Stato sentimentale:"
+#: ../../mod/connections.php:469
+msgid "Quick Links"
+msgstr "Impostazioni veloci"
 
-#: ../../mod/profiles.php:546
-msgid "Who: (if applicable)"
-msgstr "Con chi: (se possibile)"
+#: ../../mod/connections.php:473
+#, php-format
+msgid "Visit %s's profile - %s"
+msgstr "Guarda il profilo di %s - %s"
 
-#: ../../mod/profiles.php:547
-msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
-msgstr "Per esempio: cathy123, Cathy Williams, cathy@example.com"
+#: ../../mod/connections.php:474
+msgid "Block/Unblock contact"
+msgstr "Blocca/sblocca contatto"
 
-#: ../../mod/profiles.php:548
-msgid "Since [date]:"
-msgstr "dal [data]:"
+#: ../../mod/connections.php:475
+msgid "Ignore contact"
+msgstr "Ignora il contatto"
 
-#: ../../mod/profiles.php:550
-msgid "Homepage URL:"
-msgstr "Indirizzo home page:"
+#: ../../mod/connections.php:476
+msgid "Repair URL settings"
+msgstr "Ripara le impostazioni URL"
+
+#: ../../mod/connections.php:477
+msgid "View conversations"
+msgstr "Leggi le conversazioni"
 
-#: ../../mod/profiles.php:553
-msgid "Religious Views:"
-msgstr "Orientamento religioso:"
+#: ../../mod/connections.php:479
+msgid "Delete contact"
+msgstr "Elimina contatto"
 
-#: ../../mod/profiles.php:554
-msgid "Keywords:"
-msgstr "Parole chiave, tag:"
+#: ../../mod/connections.php:482
+msgid "Last update:"
+msgstr "Ultimo aggiornamento:"
 
-#: ../../mod/profiles.php:557
-msgid "Example: fishing photography software"
-msgstr "Per esempio: pesca fotografia programmazione"
+#: ../../mod/connections.php:484
+msgid "Update public posts"
+msgstr "Aggiorna gli articoli pubblici"
 
-#: ../../mod/profiles.php:558
-msgid "Used in directory listings"
-msgstr "Visibile nell'elenco pubblico di canali"
+#: ../../mod/connections.php:486
+msgid "Update now"
+msgstr "Aggiorna adesso"
 
-#: ../../mod/profiles.php:559
-msgid "Tell us about yourself..."
-msgstr "Raccontaci di te..."
+#: ../../mod/connections.php:492
+msgid "Currently blocked"
+msgstr "Attualmente bloccato"
 
-#: ../../mod/profiles.php:560
-msgid "Hobbies/Interests"
-msgstr "Hobby/interessi"
+#: ../../mod/connections.php:493
+msgid "Currently ignored"
+msgstr "Attualmente ignorato"
 
-#: ../../mod/profiles.php:561
-msgid "Contact information and Social Networks"
-msgstr "Contatti personali e i tuoi social network"
+#: ../../mod/connections.php:494
+msgid "Currently archived"
+msgstr "Attualmente archiviato"
 
-#: ../../mod/profiles.php:562
-msgid "My other channels"
-msgstr "I miei altri canali"
+#: ../../mod/connections.php:495
+msgid "Currently pending"
+msgstr "Attualmente da approvare"
 
-#: ../../mod/profiles.php:563
-msgid "Musical interests"
-msgstr "Interessi musicali"
+#: ../../mod/connections.php:496
+msgid ""
+"Replies/likes to your public posts <strong>may</strong> still be visible"
+msgstr "Le risposte ai tuoi articoli pubblici <strong>potrebbero</strong> restare comunque visibili"
 
-#: ../../mod/profiles.php:564
-msgid "Books, literature"
-msgstr "Libri, letteratura"
+#: ../../mod/connections.php:532 ../../mod/connections.php:604
+msgid "Blocked"
+msgstr "Bloccati"
 
-#: ../../mod/profiles.php:565
-msgid "Television"
-msgstr "Televisione"
+#: ../../mod/connections.php:537 ../../mod/connections.php:611
+msgid "Ignored"
+msgstr "Ignorati"
 
-#: ../../mod/profiles.php:566
-msgid "Film/dance/culture/entertainment"
-msgstr "Film/danza/cultura/intrattenimento"
+#: ../../mod/connections.php:542 ../../mod/connections.php:625
+msgid "Hidden"
+msgstr "Nascosti"
 
-#: ../../mod/profiles.php:567
-msgid "Love/romance"
-msgstr "Amore"
+#: ../../mod/connections.php:547 ../../mod/connections.php:618
+msgid "Archived"
+msgstr "Archiviati"
 
-#: ../../mod/profiles.php:568
-msgid "Work/employment"
-msgstr "Lavoro/impiego"
+#: ../../mod/connections.php:558
+msgid "All"
+msgstr "Tutti"
 
-#: ../../mod/profiles.php:569
-msgid "School/education"
-msgstr "Scuola/educazione"
+#: ../../mod/connections.php:579
+msgid "Suggestions"
+msgstr "Suggerimenti"
 
-#: ../../mod/profiles.php:574
-msgid ""
-"This is your <strong>public</strong> profile.<br />It <strong>may</strong> "
-"be visible to anybody using the internet."
-msgstr "Questo è il tuo profilo <strong>publico</strong>.<br /><strong>Potrebbe</strong> essere visto da chiunque attraverso internet."
+#: ../../mod/connections.php:582
+msgid "Suggest new connections"
+msgstr "Suggerisci nuovi contatti"
 
-#: ../../mod/profiles.php:584 ../../mod/directory.php:160
-msgid "Age: "
-msgstr "Età:"
+#: ../../mod/connections.php:588
+msgid "Show pending (new) connections"
+msgstr "Richieste di entrare in contatto"
 
-#: ../../mod/profiles.php:623
-msgid "Edit/Manage Profiles"
-msgstr "Modifica/gestisci i profili"
+#: ../../mod/connections.php:591
+msgid "All Connections"
+msgstr "Tutti i contatti"
 
-#: ../../mod/profiles.php:624 ../../boot.php:1755
-msgid "Change profile photo"
-msgstr "Cambia la foto del profilo"
+#: ../../mod/connections.php:594
+msgid "Show all connections"
+msgstr "Mostra tutti i contatti"
 
-#: ../../mod/profiles.php:625 ../../boot.php:1762
-msgid "Create New Profile"
-msgstr "Crea un nuovo profilo"
+#: ../../mod/connections.php:597
+msgid "Unblocked"
+msgstr "Non bloccati"
 
-#: ../../mod/profiles.php:636 ../../boot.php:1776
-msgid "Profile Image"
-msgstr "Immagine del profilo"
+#: ../../mod/connections.php:600
+msgid "Only show unblocked connections"
+msgstr "Mostra solo i contatti non bloccati"
 
-#: ../../mod/profiles.php:639 ../../boot.php:1779
-msgid "visible to everybody"
-msgstr "visibile a tutti"
+#: ../../mod/connections.php:607
+msgid "Only show blocked connections"
+msgstr "Mostra solo i contatti bloccati"
 
-#: ../../mod/profiles.php:640 ../../boot.php:1780
-msgid "Edit visibility"
-msgstr "Cambia la visibilità"
+#: ../../mod/connections.php:614
+msgid "Only show ignored connections"
+msgstr "Mostra solo i contatti ignorati"
 
-#: ../../mod/new_channel.php:107
-msgid "Add a Channel"
-msgstr "Aggiungi un canale"
+#: ../../mod/connections.php:621
+msgid "Only show archived connections"
+msgstr "Mostra solo i contatti archiviati"
 
-#: ../../mod/new_channel.php:108
-msgid ""
-"A channel is your own collection of related web pages. A channel can be used"
-" to hold social network profiles, blogs, conversation groups and forums, "
-"celebrity pages, and much more. You may create as many channels as your "
-"service provider allows."
-msgstr "I contenuti che pubblichi finiscono in un \"canale\". Un canale può essere usato per mantenere un tuo profilo personale, per avere un blog, per creare forum di discussione o gruppi di interesse, per pagine di celebrità e molto altro. Puoi creare quanti canali vuoi a meno di limiti dati dal gestore del sito."
+#: ../../mod/connections.php:628
+msgid "Only show hidden connections"
+msgstr "Mostra solo i contatti nascosti"
 
-#: ../../mod/new_channel.php:111
-msgid "Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation Group\" "
-msgstr "Per esempio: \"Mario Rossi\", \"Lisa e le sue ricette\", \"Il campionato\", \"Il gruppo di escursionismo\""
+#: ../../mod/connections.php:670
+#, php-format
+msgid "%1$s [%2$s]"
+msgstr "%1$s [%2$s]"
 
-#: ../../mod/new_channel.php:112
-msgid "Choose a short nickname"
-msgstr "Scegli un nome breve"
+#: ../../mod/connections.php:671
+msgid "Edit contact"
+msgstr "Modifica il contatto"
 
-#: ../../mod/new_channel.php:113
-msgid ""
-"Your nickname will be used to create an easily remembered channel address "
-"(like an email address) which you can share with others."
-msgstr "Il nome breve sarà usato per creare un indirizzo facile da ricordare per il tuo canale (simile a una email). Così potrai condividerlo e gli altri potranno trovarti."
+#: ../../mod/connections.php:694
+msgid "Search your connections"
+msgstr "Cerca tra i contatti"
 
-#: ../../mod/new_channel.php:114
-msgid "Or <a href=\"import\">import an existing channel</a> from another location"
-msgstr "Oppure <a href=\"import\">importa un tuo canale esistente</a> da un altro server/hub"
+#: ../../mod/connections.php:695
+msgid "Finding: "
+msgstr "Ricerca: "
 
 #: ../../mod/filestorage.php:35
 msgid "Permission Denied."
@@ -6010,7 +6067,7 @@ msgid ""
 "Password reset failed."
 msgstr "La richiesta non può essere verificata (potresti averla già usata precedentemente). La password non può essere reimpostata."
 
-#: ../../mod/lostpass.php:85 ../../boot.php:1469
+#: ../../mod/lostpass.php:85 ../../boot.php:1450
 msgid "Password Reset"
 msgstr "Reimposta la password"
 
@@ -6084,19 +6141,19 @@ msgstr "Impossibile clonare il canale. L'importazione è fallita."
 msgid "Cloned channel not found. Import failed."
 msgstr "Impossibile trovare il canale clonato. L'importazione è fallita."
 
-#: ../../mod/import.php:356
+#: ../../mod/import.php:358
 msgid "Import completed."
 msgstr "L'importazione è terminata con successo!"
 
-#: ../../mod/import.php:369
+#: ../../mod/import.php:371
 msgid "You must be logged in to use this feature."
 msgstr "Per questa funzionalità devi aver effettuato l'accesso."
 
-#: ../../mod/import.php:374
+#: ../../mod/import.php:376
 msgid "Import Channel"
 msgstr "Importa un canale"
 
-#: ../../mod/import.php:375
+#: ../../mod/import.php:377
 msgid ""
 "Use this form to import an existing channel from a different server/hub. You"
 " may retrieve the channel identity from the old server/hub via the network "
@@ -6104,27 +6161,27 @@ msgid ""
 "be imported. Importation of content is not yet available."
 msgstr "Usa questo modulo per importare un tuo canale da un altro server/hub. Puoi scaricare i dati identificativi del canale direttamente dall'altro server/hub oppure tramite un file che hai esportato. Saranno importati solamente l'identità e i contatti. L'importazione dei contenuti non è ancora disponibile."
 
-#: ../../mod/import.php:376
+#: ../../mod/import.php:378
 msgid "File to Upload"
 msgstr "File da caricare"
 
-#: ../../mod/import.php:377
+#: ../../mod/import.php:379
 msgid "Or provide the old server/hub details"
 msgstr "Oppure fornisci i dettagli del vecchio server/hub"
 
-#: ../../mod/import.php:378
+#: ../../mod/import.php:380
 msgid "Your old identity address (xyz@example.com)"
 msgstr "Il tuo vecchio identificativo (per esempio pippo@esempio.com)"
 
-#: ../../mod/import.php:379
+#: ../../mod/import.php:381
 msgid "Your old login email address"
 msgstr "L'email che usavi per accedere sul vecchio server"
 
-#: ../../mod/import.php:380
+#: ../../mod/import.php:382
 msgid "Your old login password"
 msgstr "La password per il vecchio server"
 
-#: ../../mod/import.php:381
+#: ../../mod/import.php:383
 msgid ""
 "For either option, please choose whether to make this hub your new primary "
 "address, or whether your old location should continue this role. You will be"
@@ -6132,7 +6189,7 @@ msgid ""
 "primary location for files, photos, and media."
 msgstr "Per ciascuna opzione, scegli se vuoi rendere questo server il tuo indirizzo primario, oppure se preferisci che lo rimanga il vecchio. Potrai pubblicare da entrambi i server, ma solamente uno sarà marcato come primario per i tuoi file, foto, ecc."
 
-#: ../../mod/import.php:382
+#: ../../mod/import.php:384
 msgid "Make this hub my primary location"
 msgstr "Rendi questo server il mio indirizzo primario"
 
@@ -6173,19 +6230,19 @@ msgstr "Totale voti"
 msgid "Average Rating"
 msgstr "Media"
 
-#: ../../mod/match.php:12
+#: ../../mod/match.php:16
 msgid "Profile Match"
 msgstr "Profili corrispondenti"
 
-#: ../../mod/match.php:20
+#: ../../mod/match.php:24
 msgid "No keywords to match. Please add keywords to your default profile."
 msgstr "Nessuna parola chiave per le ricerche. Aggiungi parole chiave al tuo profilo predefinito."
 
-#: ../../mod/match.php:57
+#: ../../mod/match.php:61
 msgid "is interested in:"
 msgstr "interessi personali:"
 
-#: ../../mod/match.php:65
+#: ../../mod/match.php:69
 msgid "No matches"
 msgstr "Nessun risultato"
 
@@ -6290,10 +6347,6 @@ msgstr "Inserisci audio Vorbis [.ogg]"
 msgid "Delete Layout"
 msgstr "Elimina il layout"
 
-#: ../../mod/nogroup.php:58
-msgid "Contacts who are not members of a group"
-msgstr "Contatti che non sono in nessun insieme"
-
 #: ../../mod/profile_photo.php:54
 msgid "Image uploaded but image cropping failed."
 msgstr "L'immagine è stata caricata, ma il non è stato possibile ritagliarla."
@@ -6441,7 +6494,7 @@ msgstr "Fan/Ammiratore"
 
 #: ../../mod/notifications.php:194
 msgid "Friend/Connect Request"
-msgstr "Richiesta per entrare in contatto"
+msgstr "Richiesta di entrare in contatto"
 
 #: ../../mod/notifications.php:194
 msgid "New Follower"
@@ -6528,7 +6581,7 @@ msgstr "Inviato!"
 msgid "Item is not editable"
 msgstr "L'elemento non è modificabile"
 
-#: ../../mod/profile.php:111
+#: ../../mod/profile.php:112
 msgid "Access to this profile has been restricted."
 msgstr "L'accesso a questo profilo è stato limitato."
 
@@ -6556,7 +6609,7 @@ msgstr "Rendi privato questo articolo"
 msgid "Wall Photos"
 msgstr "Foto della bacheca"
 
-#: ../../mod/channel.php:120
+#: ../../mod/channel.php:107
 msgid "Insufficient permissions.  Request redirected to profile page."
 msgstr "Permessi insufficienti. Sarà visualizzata la pagina del profilo."
 
@@ -6792,17 +6845,6 @@ msgstr "Ripeti la password per verifica"
 msgid "Please login."
 msgstr "Accedi."
 
-#: ../../mod/post.php:119
-msgid ""
-"Remote authentication blocked. You are logged into this site locally. Please"
-" logout and retry."
-msgstr "L'autenticazione remota non è disponibile. Hai accesso solamente a questo sito. Puoi provare ad uscire per tentare di nuovo."
-
-#: ../../mod/post.php:132
-#, php-format
-msgid "Welcome %s. Remote authentication successful."
-msgstr "Ciao %s. La tua autenticazione da remoto è avvenuta con successo."
-
 #: ../../mod/removeme.php:49
 msgid "Remove This Channel"
 msgstr "Elimina questo canale"
@@ -7104,113 +7146,41 @@ msgstr "Immagine dell'intestazione"
 msgid "Header image only on profile pages"
 msgstr "È possibile mettere un'immagine solo nell'intestazione dei profili"
 
-#: ../../boot.php:1274
+#: ../../boot.php:1255
 #, php-format
 msgid "Update %s failed. See error logs."
 msgstr "%s: aggiornamento fallito. Controlla i log di errore."
 
-#: ../../boot.php:1277
+#: ../../boot.php:1258
 #, php-format
 msgid "Update Error at %s"
 msgstr "Errore di aggiornamento su %s"
 
-#: ../../boot.php:1434
+#: ../../boot.php:1415
 msgid ""
 "Create an account to access services and applications within the Red Matrix"
 msgstr "Registrati per accedere ai servizi e alle applicazioni di Red Matrix"
 
-#: ../../boot.php:1462
+#: ../../boot.php:1443
 msgid "Password"
 msgstr "Password"
 
-#: ../../boot.php:1463
+#: ../../boot.php:1444
 msgid "Remember me"
 msgstr "Resta connesso"
 
-#: ../../boot.php:1468
+#: ../../boot.php:1449
 msgid "Forgot your password?"
 msgstr "Hai dimenticato la password?"
 
-#: ../../boot.php:1533
+#: ../../boot.php:1514
 msgid "permission denied"
 msgstr "permesso negato"
 
-#: ../../boot.php:1534
+#: ../../boot.php:1515
 msgid "Got Zot?"
 msgstr "Hai Zot?"
 
-#: ../../boot.php:1593
-msgid "Requested channel is not available."
-msgstr "Il canale che cerchi non è disponibile."
-
-#: ../../boot.php:1605
-msgid " Sorry, you don't have the permission to view this profile. "
-msgstr "Purtroppo non hai il permesso di vedere questo profilo."
-
-#: ../../boot.php:1761
-msgid "Profiles"
-msgstr "Profili"
-
-#: ../../boot.php:1761
-msgid "Manage/edit profiles"
-msgstr "Gestisci/modifica i profili"
-
-#: ../../boot.php:1765
-msgid "Edit Profile"
-msgstr "Modifica il profilo"
-
-#: ../../boot.php:1859 ../../boot.php:1939
-msgid "F d"
-msgstr "d F"
-
-#: ../../boot.php:1916
-msgid "Birthday Reminders"
-msgstr "Promemoria compleanni"
-
-#: ../../boot.php:1917
-msgid "Birthdays this week:"
-msgstr "Compleanni questa settimana:"
-
-#: ../../boot.php:1972
-msgid "[No description]"
-msgstr "[Nessuna descrizione]"
-
-#: ../../boot.php:1990
-msgid "Event Reminders"
-msgstr "Promemoria"
-
-#: ../../boot.php:1991
-msgid "Events this week:"
-msgstr "Eventi di questa settimana:"
-
-#: ../../boot.php:2225
-msgid "Channel"
-msgstr "Canale"
-
-#: ../../boot.php:2228
-msgid "Status Messages and Posts"
-msgstr "Articoli e messaggi di stato"
-
-#: ../../boot.php:2232
-msgid "About"
-msgstr "Informazioni"
-
-#: ../../boot.php:2235
-msgid "Profile Details"
-msgstr "Dettagli del profilo"
-
-#: ../../boot.php:2253
-msgid "Events and Calendar"
-msgstr "Calendario eventi"
-
-#: ../../boot.php:2258
-msgid "Webpages"
-msgstr "Pagine web"
-
-#: ../../boot.php:2261
-msgid "Manage Webpages"
-msgstr "Gestisci le pagine web"
-
-#: ../../boot.php:2546
+#: ../../boot.php:1902
 msgid "toggle mobile"
 msgstr "attiva/disattiva versione mobile"
diff --git a/view/it/strings.php b/view/it/strings.php
index 7068289b1..dde964c00 100644
--- a/view/it/strings.php
+++ b/view/it/strings.php
@@ -97,13 +97,6 @@ $a->strings["Encrypt text"] = "Crittografia del testo";
 $a->strings["Connect"] = "Entra in contatto/segui";
 $a->strings["New window"] = "Nuova finestra";
 $a->strings["Open the selected location in a different window or browser tab"] = "Apri l'indirizzo selezionato in una nuova scheda o finestra";
-$a->strings["Poke"] = "Poke";
-$a->strings["View Status"] = "Guarda il messaggio di stato";
-$a->strings["View Profile"] = "Profilo";
-$a->strings["View Photos"] = "Guarda le foto";
-$a->strings["Network Posts"] = "Articoli dalla tua rete";
-$a->strings["Edit Contact"] = "Modifica il contatto";
-$a->strings["Send PM"] = "Invia messaggio privato";
 $a->strings["Unknown | Not categorised"] = "Sconosciuto | Senza categoria";
 $a->strings["Block immediately"] = "Blocca subito";
 $a->strings["Shady, spammer, self-marketer"] = "Spammer o dedito al marketing";
@@ -237,130 +230,9 @@ $a->strings["No recipient provided."] = "Devi scegliere un destinatario.";
 $a->strings["[no subject]"] = "[nessun titolo]";
 $a->strings["Unable to determine sender."] = "Impossibile determinare il mittente.";
 $a->strings["Stored post could not be verified."] = "Non è stato possibile verificare l'articolo inserito.";
-$a->strings["view full size"] = "guarda nelle dimensioni reali";
 $a->strings["Profile Photos"] = "Foto del profilo";
-$a->strings["Profile"] = "Profilo";
-$a->strings["Full Name:"] = "Nome completo:";
-$a->strings["Gender:"] = "Sesso:";
-$a->strings["j F, Y"] = "j F Y";
-$a->strings["j F"] = "j F";
-$a->strings["Birthday:"] = "Compleanno:";
-$a->strings["Age:"] = "Età:";
-$a->strings["Status:"] = "Stato:";
-$a->strings["for %1\$d %2\$s"] = "per %1\$d %2\$s";
-$a->strings["Sexual Preference:"] = "Preferenze sessuali:";
-$a->strings["Homepage:"] = "Home page:";
-$a->strings["Hometown:"] = "Città dove vivo:";
-$a->strings["Tags:"] = "Tag:";
-$a->strings["Political Views:"] = "Orientamento politico:";
-$a->strings["Religion:"] = "Religione:";
-$a->strings["About:"] = "Informazioni:";
-$a->strings["Hobbies/Interests:"] = "Interessi e hobby:";
-$a->strings["Likes:"] = "Mi piace:";
-$a->strings["Dislikes:"] = "Non mi piace:";
-$a->strings["Contact information and Social Networks:"] = "Contatti e social network:";
-$a->strings["Musical interests:"] = "Gusti musicali:";
-$a->strings["Books, literature:"] = "Libri, letteratura:";
-$a->strings["Television:"] = "Televisione:";
-$a->strings["Film/dance/culture/entertainment:"] = "Film, danza, cultura, intrattenimento:";
-$a->strings["Love/Romance:"] = "Amore:";
-$a->strings["Work/employment:"] = "Lavoro:";
-$a->strings["School/education:"] = "Scuola:";
-$a->strings["prev"] = "prec";
-$a->strings["first"] = "inizio";
-$a->strings["last"] = "fine";
-$a->strings["next"] = "succ";
-$a->strings["older"] = "più recenti";
-$a->strings["newer"] = "più nuovi";
-$a->strings["No connections"] = "Nessun contatto";
-$a->strings["%d Connection"] = array(
-	0 => "%d contatto",
-	1 => "%d contatti",
-);
-$a->strings["View Connections"] = "Elenco contatti";
-$a->strings["Search"] = "Cerca";
-$a->strings["Save"] = "Salva";
-$a->strings["poke"] = "poke";
-$a->strings["poked"] = "ha ricevuto un poke";
-$a->strings["ping"] = "ping";
-$a->strings["pinged"] = "ha ricevuto un ping";
-$a->strings["prod"] = "prod";
-$a->strings["prodded"] = "ha ricevuto un prod";
-$a->strings["slap"] = "schiaffo";
-$a->strings["slapped"] = "ha ricevuto uno schiaffo";
-$a->strings["finger"] = "finger";
-$a->strings["fingered"] = "ha ricevuto un finger";
-$a->strings["rebuff"] = "rifiuto";
-$a->strings["rebuffed"] = "ha ricevuto un rifiuto";
-$a->strings["happy"] = "allegro";
-$a->strings["sad"] = "triste";
-$a->strings["mellow"] = "calmo";
-$a->strings["tired"] = "stanco";
-$a->strings["perky"] = "vivace";
-$a->strings["angry"] = "arrabbiato";
-$a->strings["stupified"] = "stordito";
-$a->strings["puzzled"] = "confuso";
-$a->strings["interested"] = "attento";
-$a->strings["bitter"] = "amaro";
-$a->strings["cheerful"] = "allegro";
-$a->strings["alive"] = "vivace";
-$a->strings["annoyed"] = "seccato";
-$a->strings["anxious"] = "ansioso";
-$a->strings["cranky"] = "irritabile";
-$a->strings["disturbed"] = "turbato";
-$a->strings["frustrated"] = "frustrato";
-$a->strings["motivated"] = "motivato";
-$a->strings["relaxed"] = "rilassato";
-$a->strings["surprised"] = "sorpreso";
-$a->strings["Monday"] = "lunedì";
-$a->strings["Tuesday"] = "martedì";
-$a->strings["Wednesday"] = "mercoledì";
-$a->strings["Thursday"] = "giovedì";
-$a->strings["Friday"] = "venerdì";
-$a->strings["Saturday"] = "sabato";
-$a->strings["Sunday"] = "domenica";
-$a->strings["January"] = "gennaio";
-$a->strings["February"] = "febbraio";
-$a->strings["March"] = "marzo";
-$a->strings["April"] = "aprile";
-$a->strings["May"] = "maggio";
-$a->strings["June"] = "giugno";
-$a->strings["July"] = "luglio";
-$a->strings["August"] = "agosto";
-$a->strings["September"] = "settembre";
-$a->strings["October"] = "ottobre";
-$a->strings["November"] = "novembre";
-$a->strings["December"] = "dicembre";
-$a->strings["unknown.???"] = "sconosciuto???";
-$a->strings["bytes"] = "byte";
-$a->strings["remove category"] = "rimuovi la categoria";
-$a->strings["remove from file"] = "rimuovi dal file";
-$a->strings["Click to open/close"] = "Clicca per aprire/chiudere";
-$a->strings["link to source"] = "Link all'originale";
-$a->strings["Select a page layout: "] = "Scegli il layout della pagina:";
-$a->strings["default"] = "predefinito";
-$a->strings["Page content type: "] = "Contenuto della pagina:";
-$a->strings["Select an alternate language"] = "Seleziona una lingua diversa";
-$a->strings["photo"] = "la foto";
-$a->strings["event"] = "l'evento";
-$a->strings["status"] = "il messaggio di stato";
-$a->strings["comment"] = "il commento";
-$a->strings["activity"] = "l'attività";
-$a->strings["Design"] = "Design";
-$a->strings["Blocks"] = "Riquadri";
-$a->strings["Menus"] = "Menù";
-$a->strings["Layouts"] = "Layout";
-$a->strings["Pages"] = "Pagine";
 $a->strings["Public Timeline"] = "Diario pubblico";
-$a->strings["Unable to obtain identity information from database"] = "Impossibile ottenere le informazioni di identificazione dal database";
-$a->strings["Empty name"] = "Nome vuoto";
-$a->strings["Name too long"] = "Nome troppo lungo";
-$a->strings["No account identifier"] = "Account senza identificativo";
-$a->strings["Nickname is required."] = "Il nome dell'account è obbligatorio.";
-$a->strings["Nickname has unsupported characters or is already being used on this site."] = "Il nome dell'account è già in uso oppure ha dei caratteri non supportati.";
-$a->strings["Unable to retrieve created identity"] = "Impossibile caricare l'identità creata";
-$a->strings["Default Profile"] = "Profilo predefinito";
-$a->strings["Friends"] = "Amici";
+$a->strings["view full size"] = "guarda nelle dimensioni reali";
 $a->strings["Image/photo"] = "Immagine";
 $a->strings["Encrypted content"] = "Contenuto crittografato";
 $a->strings["%1\$s wrote the following %2\$s %3\$s"] = "%1\$s ha scritto %2\$s seguente %3\$s";
@@ -413,6 +285,7 @@ $a->strings["Infatuated"] = "Infatuato/a";
 $a->strings["Dating"] = "Disponibile a un incontro";
 $a->strings["Unfaithful"] = "Infedele";
 $a->strings["Sex Addict"] = "Sesso-dipendente";
+$a->strings["Friends"] = "Amici";
 $a->strings["Friends/Benefits"] = "Amici piccanti";
 $a->strings["Casual"] = "Casual";
 $a->strings["Engaged"] = "Impegnato";
@@ -455,6 +328,7 @@ $a->strings["Logout"] = "Esci";
 $a->strings["End this session"] = "Chiudi questa sessione";
 $a->strings["Home"] = "Bacheca";
 $a->strings["Your posts and conversations"] = "I tuoi articoli e conversazioni";
+$a->strings["View Profile"] = "Profilo";
 $a->strings["Your profile page"] = "Il tuo profilo";
 $a->strings["Edit Profiles"] = "Modifica i profili";
 $a->strings["Manage/Edit Profiles"] = "Gestisci e modifica i profili";
@@ -471,6 +345,7 @@ $a->strings["Help"] = "Guida";
 $a->strings["Help and documentation"] = "Guida e documentazione";
 $a->strings["Apps"] = "Apps";
 $a->strings["Addon applications, utilities, games"] = "App, strumenti e giochi aggiuntivi";
+$a->strings["Search"] = "Cerca";
 $a->strings["Search site content"] = "Cerca nel sito";
 $a->strings["Directory"] = "Tutti i canali";
 $a->strings["Channel Locator"] = "Ricerca canali";
@@ -523,11 +398,16 @@ $a->strings["your registration password"] = "la password di registrazione";
 $a->strings["Registration details for %s"] = "Dettagli della registrazione di %s";
 $a->strings["Account approved."] = "Account approvato.";
 $a->strings["Registration revoked for %s"] = "Registrazione revocata per %s";
+$a->strings["photo"] = "la foto";
+$a->strings["event"] = "l'evento";
 $a->strings["channel"] = "canale";
+$a->strings["status"] = "il messaggio di stato";
+$a->strings["comment"] = "il commento";
 $a->strings["%1\$s likes %2\$s's %3\$s"] = "A %1\$s piace %3\$s di %2\$s";
 $a->strings["%1\$s doesn't like %2\$s's %3\$s"] = "A %1\$s non piace %3\$s di %2\$s";
 $a->strings["%1\$s is now connected with %2\$s"] = "%1\$s adesso è connesso con %2\$s";
 $a->strings["%1\$s poked %2\$s"] = "%1\$s ha mandato un poke a %2\$s";
+$a->strings["poked"] = "ha ricevuto un poke";
 $a->strings["%1\$s is currently %2\$s"] = "%1\$s al momento è %2\$s";
 $a->strings["View %s's profile @ %s"] = "Vedi il profilo di %s @ %s";
 $a->strings["Categories:"] = "Categorie:";
@@ -538,7 +418,12 @@ $a->strings["Loading..."] = "Caricamento in corso...";
 $a->strings["Delete Selected Items"] = "Elimina gli oggetti selezionati";
 $a->strings["View Source"] = "Vedi il sorgente";
 $a->strings["Follow Thread"] = "Segui la discussione";
+$a->strings["View Status"] = "Guarda il messaggio di stato";
+$a->strings["View Photos"] = "Guarda le foto";
 $a->strings["Matrix Activity"] = "Attività nella tua rete";
+$a->strings["Edit Contact"] = "Modifica il contatto";
+$a->strings["Send PM"] = "Invia messaggio privato";
+$a->strings["Poke"] = "Poke";
 $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."] = array(
@@ -587,6 +472,25 @@ $a->strings["permissions"] = "permessi";
 $a->strings["Public post"] = "Articolo pubblico";
 $a->strings["Example: bob@example.com, mary@example.com"] = "Per esempio: mario@esempio.com, simona@esempio.com";
 $a->strings["Set expiration date"] = "Data di scadenza";
+$a->strings["Commented Order"] = "Ultimi commenti";
+$a->strings["Sort by Comment Date"] = "Per data del commento";
+$a->strings["Posted Order"] = "Ultimi articoli";
+$a->strings["Sort by Post Date"] = "Per data di creazione";
+$a->strings["Personal"] = "Personali";
+$a->strings["Posts that mention or involve you"] = "Articoli che ti riguardano o ti menzionano";
+$a->strings["New"] = "Novità";
+$a->strings["Activity Stream - by date"] = "Elenco attività - per data";
+$a->strings["Starred"] = "Preferiti";
+$a->strings["Favourite Posts"] = "Articoli preferiti";
+$a->strings["Spam"] = "Spam";
+$a->strings["Posts flagged as SPAM"] = "Articoli marcati come spam";
+$a->strings["Channel"] = "Canale";
+$a->strings["Status Messages and Posts"] = "Articoli e messaggi di stato";
+$a->strings["About"] = "Informazioni";
+$a->strings["Profile Details"] = "Dettagli del profilo";
+$a->strings["Events and Calendar"] = "Calendario eventi";
+$a->strings["Webpages"] = "Pagine web";
+$a->strings["Manage Webpages"] = "Gestisci le pagine web";
 $a->strings["Logged out."] = "Uscita effettuata.";
 $a->strings["Failed authentication"] = "Autenticazione fallita";
 $a->strings["Login failed."] = "Accesso fallito.";
@@ -613,6 +517,85 @@ $a->strings["%d connection in common"] = array(
 	1 => "%d contatti in comune",
 );
 $a->strings["New Page"] = "Nuova pagina web";
+$a->strings["prev"] = "prec";
+$a->strings["first"] = "inizio";
+$a->strings["last"] = "fine";
+$a->strings["next"] = "succ";
+$a->strings["older"] = "più recenti";
+$a->strings["newer"] = "più nuovi";
+$a->strings["No connections"] = "Nessun contatto";
+$a->strings["%d Connection"] = array(
+	0 => "%d contatto",
+	1 => "%d contatti",
+);
+$a->strings["View Connections"] = "Elenco contatti";
+$a->strings["Save"] = "Salva";
+$a->strings["poke"] = "poke";
+$a->strings["ping"] = "ping";
+$a->strings["pinged"] = "ha ricevuto un ping";
+$a->strings["prod"] = "prod";
+$a->strings["prodded"] = "ha ricevuto un prod";
+$a->strings["slap"] = "schiaffo";
+$a->strings["slapped"] = "ha ricevuto uno schiaffo";
+$a->strings["finger"] = "finger";
+$a->strings["fingered"] = "ha ricevuto un finger";
+$a->strings["rebuff"] = "rifiuto";
+$a->strings["rebuffed"] = "ha ricevuto un rifiuto";
+$a->strings["happy"] = "allegro";
+$a->strings["sad"] = "triste";
+$a->strings["mellow"] = "calmo";
+$a->strings["tired"] = "stanco";
+$a->strings["perky"] = "vivace";
+$a->strings["angry"] = "arrabbiato";
+$a->strings["stupified"] = "stordito";
+$a->strings["puzzled"] = "confuso";
+$a->strings["interested"] = "attento";
+$a->strings["bitter"] = "amaro";
+$a->strings["cheerful"] = "allegro";
+$a->strings["alive"] = "vivace";
+$a->strings["annoyed"] = "seccato";
+$a->strings["anxious"] = "ansioso";
+$a->strings["cranky"] = "irritabile";
+$a->strings["disturbed"] = "turbato";
+$a->strings["frustrated"] = "frustrato";
+$a->strings["motivated"] = "motivato";
+$a->strings["relaxed"] = "rilassato";
+$a->strings["surprised"] = "sorpreso";
+$a->strings["Monday"] = "lunedì";
+$a->strings["Tuesday"] = "martedì";
+$a->strings["Wednesday"] = "mercoledì";
+$a->strings["Thursday"] = "giovedì";
+$a->strings["Friday"] = "venerdì";
+$a->strings["Saturday"] = "sabato";
+$a->strings["Sunday"] = "domenica";
+$a->strings["January"] = "gennaio";
+$a->strings["February"] = "febbraio";
+$a->strings["March"] = "marzo";
+$a->strings["April"] = "aprile";
+$a->strings["May"] = "maggio";
+$a->strings["June"] = "giugno";
+$a->strings["July"] = "luglio";
+$a->strings["August"] = "agosto";
+$a->strings["September"] = "settembre";
+$a->strings["October"] = "ottobre";
+$a->strings["November"] = "novembre";
+$a->strings["December"] = "dicembre";
+$a->strings["unknown.???"] = "sconosciuto???";
+$a->strings["bytes"] = "byte";
+$a->strings["remove category"] = "rimuovi la categoria";
+$a->strings["remove from file"] = "rimuovi dal file";
+$a->strings["Click to open/close"] = "Clicca per aprire/chiudere";
+$a->strings["link to source"] = "Link all'originale";
+$a->strings["Select a page layout: "] = "Scegli il layout della pagina:";
+$a->strings["default"] = "predefinito";
+$a->strings["Page content type: "] = "Contenuto della pagina:";
+$a->strings["Select an alternate language"] = "Seleziona una lingua diversa";
+$a->strings["activity"] = "l'attività";
+$a->strings["Design"] = "Design";
+$a->strings["Blocks"] = "Riquadri";
+$a->strings["Menus"] = "Menù";
+$a->strings["Layouts"] = "Layout";
+$a->strings["Pages"] = "Pagine";
 $a->strings["Channel is blocked on this site."] = "Il canale è bloccato per questo sito.";
 $a->strings["Channel location missing."] = "Manca l'indirizzo del canale.";
 $a->strings["Channel discovery failed. Website may be down or misconfigured."] = "La ricerca del canale è fallita. Il sito potrebbe avere problemi o una configurazione sbagliata.";
@@ -653,6 +636,60 @@ $a->strings["Click here to upgrade."] = "Clicca qui per aggiornare.";
 $a->strings["This action exceeds the limits set by your subscription plan."] = "Questa operazione esce dai termini del tuo abbonamento.";
 $a->strings["This action is not available under your subscription plan."] = "Questa operazione non è prevista dal tuo abbonamento.";
 $a->strings["Default"] = "Predefinito";
+$a->strings["Unable to obtain identity information from database"] = "Impossibile ottenere le informazioni di identificazione dal database";
+$a->strings["Empty name"] = "Nome vuoto";
+$a->strings["Name too long"] = "Nome troppo lungo";
+$a->strings["No account identifier"] = "Account senza identificativo";
+$a->strings["Nickname is required."] = "Il nome dell'account è obbligatorio.";
+$a->strings["Nickname has unsupported characters or is already being used on this site."] = "Il nome dell'account è già in uso oppure ha dei caratteri non supportati.";
+$a->strings["Unable to retrieve created identity"] = "Impossibile caricare l'identità creata";
+$a->strings["Default Profile"] = "Profilo predefinito";
+$a->strings["Requested channel is not available."] = "Il canale che cerchi non è disponibile.";
+$a->strings[" Sorry, you don't have the permission to view this profile. "] = "Purtroppo non hai il permesso di vedere questo profilo.";
+$a->strings["Requested profile is not available."] = "Il profilo richiesto non è disponibile.";
+$a->strings["Change profile photo"] = "Cambia la foto del profilo";
+$a->strings["Profiles"] = "Profili";
+$a->strings["Manage/edit profiles"] = "Gestisci/modifica i profili";
+$a->strings["Create New Profile"] = "Crea un nuovo profilo";
+$a->strings["Edit Profile"] = "Modifica il profilo";
+$a->strings["Profile Image"] = "Immagine del profilo";
+$a->strings["visible to everybody"] = "visibile a tutti";
+$a->strings["Edit visibility"] = "Cambia la visibilità";
+$a->strings["Gender:"] = "Sesso:";
+$a->strings["Status:"] = "Stato:";
+$a->strings["Homepage:"] = "Home page:";
+$a->strings["g A l F d"] = "g A l d F";
+$a->strings["F d"] = "d F";
+$a->strings["[today]"] = "[oggi]";
+$a->strings["Birthday Reminders"] = "Promemoria compleanni";
+$a->strings["Birthdays this week:"] = "Compleanni questa settimana:";
+$a->strings["[No description]"] = "[Nessuna descrizione]";
+$a->strings["Event Reminders"] = "Promemoria";
+$a->strings["Events this week:"] = "Eventi di questa settimana:";
+$a->strings["Profile"] = "Profilo";
+$a->strings["Full Name:"] = "Nome completo:";
+$a->strings["j F, Y"] = "j F Y";
+$a->strings["j F"] = "j F";
+$a->strings["Birthday:"] = "Compleanno:";
+$a->strings["Age:"] = "Età:";
+$a->strings["for %1\$d %2\$s"] = "per %1\$d %2\$s";
+$a->strings["Sexual Preference:"] = "Preferenze sessuali:";
+$a->strings["Hometown:"] = "Città dove vivo:";
+$a->strings["Tags:"] = "Tag:";
+$a->strings["Political Views:"] = "Orientamento politico:";
+$a->strings["Religion:"] = "Religione:";
+$a->strings["About:"] = "Informazioni:";
+$a->strings["Hobbies/Interests:"] = "Interessi e hobby:";
+$a->strings["Likes:"] = "Mi piace:";
+$a->strings["Dislikes:"] = "Non mi piace:";
+$a->strings["Contact information and Social Networks:"] = "Contatti e social network:";
+$a->strings["Musical interests:"] = "Gusti musicali:";
+$a->strings["Books, literature:"] = "Libri, letteratura:";
+$a->strings["Television:"] = "Televisione:";
+$a->strings["Film/dance/culture/entertainment:"] = "Film, danza, cultura, intrattenimento:";
+$a->strings["Love/Romance:"] = "Amore:";
+$a->strings["Work/employment:"] = "Lavoro:";
+$a->strings["School/education:"] = "Scuola:";
 $a->strings["Welcome "] = "Ciao";
 $a->strings["Please upload a profile photo."] = "Carica una foto per il profilo!";
 $a->strings["Welcome back "] = "Ciao, è bello rivederti";
@@ -721,7 +758,6 @@ $a->strings["Click the [Register] link on the following page to join."] = "Fai c
 $a->strings["For more information about the Red Matrix Project and why it has the potential to change the internet as we know it, please visit http://getzot.com"] = "Per saperne di più sul progetto Red Matrix e sul perché potrebbe cambiare internet per come la conosciamo, visita http://getzot.com";
 $a->strings["Friends of %s"] = "Amici di %s";
 $a->strings["No friends to display."] = "Nessun amico da visualizzare.";
-$a->strings["Requested profile is not available."] = "Il profilo richiesto non è disponibile.";
 $a->strings["View"] = "Guarda";
 $a->strings["Authorize application connection"] = "Autorizza la app";
 $a->strings["Return to your app and insert this Securty Code:"] = "Torna alla app e inserisci questo codice di sicurezza:";
@@ -881,14 +917,6 @@ $a->strings["Publish your default profile in the network directory"] = "Pubblica
 $a->strings["Allow us to suggest you as a potential friend to new members?"] = "Vuoi essere suggerito come potenziale amico ai nuovi membri?";
 $a->strings["or"] = "o";
 $a->strings["Your channel address is"] = "L'indirizzo del tuo canale è";
-$a->strings["Automatically expire posts after this many days:"] = "Gli articoli scadono automaticamente dopo questo numero di giorni:";
-$a->strings["If empty, posts will not expire. Expired posts will be deleted"] = "Se lasci vuoto, i messaggi non scadranno mai. I messaggi scaduti saranno eliminati.";
-$a->strings["Advanced expiration settings"] = "Impostazioni avanzate di scandenza";
-$a->strings["Advanced Expiration"] = "Scadenza";
-$a->strings["Expire posts:"] = "Fai scadere gli articoli:";
-$a->strings["Expire starred posts:"] = "Fai scadere gli articoli preferiti:";
-$a->strings["Expire photos:"] = "Fai scadere le foto:";
-$a->strings["Only expire posts by others:"] = "Fai scadere solo gli articoli scritti da altri:";
 $a->strings["Channel Settings"] = "Impostazioni del canale";
 $a->strings["Basic Settings"] = "Impostazioni di base";
 $a->strings["Your Timezone:"] = "Il tuo fuso orario:";
@@ -1116,7 +1144,7 @@ $a->strings["Edit Menu Element"] = "Modifica l'elemento del menù";
 $a->strings["Modify"] = "Modifica";
 $a->strings["Collection created."] = "L'insieme di canali è stato creato.";
 $a->strings["Could not create collection."] = "Impossibile creare l'insieme.";
-$a->strings["Collection name changed."] = "Il nome dell'insieme di canali è stato cambiato.";
+$a->strings["Collection updated."] = "Insieme aggiornato.";
 $a->strings["Create a collection of channels."] = "Crea un insieme di canali.";
 $a->strings["Collection Name: "] = "Nome del'insieme:";
 $a->strings["Members are visible to other channels"] = "I membri saranno visibili agli altri canali";
@@ -1162,8 +1190,6 @@ $a->strings["View Album"] = "Guarda l'album";
 $a->strings["Recent Photos"] = "Foto recenti";
 $a->strings["sent you a private message"] = "ti ha inviato un messaggio privato";
 $a->strings["added your channel"] = "ha aggiunto il tuo canale";
-$a->strings["g A l F d"] = "g A l d F";
-$a->strings["[today]"] = "[oggi]";
 $a->strings["posted an event"] = "ha creato un evento";
 $a->strings["- select -"] = "- scegli -";
 $a->strings["Menu updated."] = "Menù aggiornato.";
@@ -1172,7 +1198,6 @@ $a->strings["Menu created."] = "Menù creato.";
 $a->strings["Unable to create menu."] = "Impossibile creare il menù.";
 $a->strings["Manage Menus"] = "Gestione menù";
 $a->strings["Drop"] = "Elimina";
-$a->strings["New"] = "Novità";
 $a->strings["Create a new menu"] = "Crea un nuovo menù";
 $a->strings["Delete this menu"] = "Elimina questo menù";
 $a->strings["Edit menu contents"] = "Modifica i contenuti del menù";
@@ -1218,17 +1243,7 @@ $a->strings["Not Found"] = "Non disponibile";
 $a->strings["Remote Authentication"] = "Autenticazione a distanza";
 $a->strings["Enter your channel address (e.g. channel@example.com)"] = "Inserisci l'indirizzo del tuo canale (ad esempio lucia@esempio.com)";
 $a->strings["Authenticate"] = "Autenticazione";
-$a->strings["Commented Order"] = "Ultimi commenti";
-$a->strings["Sort by Comment Date"] = "Per data del commento";
-$a->strings["Posted Order"] = "Ultimi articoli";
-$a->strings["Sort by Post Date"] = "Per data di creazione";
-$a->strings["Personal"] = "Personali";
-$a->strings["Posts that mention or involve you"] = "Articoli che ti riguardano o ti menzionano";
-$a->strings["Activity Stream - by date"] = "Elenco attività - per data";
-$a->strings["Starred"] = "Preferiti";
-$a->strings["Favourite Posts"] = "Articoli preferiti";
-$a->strings["Spam"] = "Spam";
-$a->strings["Posts flagged as SPAM"] = "Articoli marcati come spam";
+$a->strings["No such group"] = "Impossibile trovare l'insieme";
 $a->strings["Refresh"] = "Aggiorna";
 $a->strings["Me"] = "Io";
 $a->strings["Best Friends"] = "Buoni amici";
@@ -1237,19 +1252,91 @@ $a->strings["Former Friends"] = "Ex amici";
 $a->strings["Acquaintances"] = "Conoscenti";
 $a->strings["Everybody"] = "Tutti";
 $a->strings["Search Results For:"] = "Cerca risultati con:";
-$a->strings["No such group"] = "Impossibile trovare l'insieme";
+$a->strings["Collection: "] = "Insieme:";
 $a->strings["Connection: "] = "Connessione:";
 $a->strings["Invalid connection."] = "Connessione non valida.";
 $a->strings["Ignore"] = "Ignora";
 $a->strings["Connection updated."] = "Contatto aggiornato.";
 $a->strings["Connection update failed."] = "Impossibile aggiornare il contatto.";
-$a->strings["Introductions and Connection Requests"] = "Richieste per entrare in contatto";
+$a->strings["Introductions and Connection Requests"] = "Richieste di entrare in contatto";
 $a->strings["No pending introductions."] = "Nessuna richiesta in attesa.";
 $a->strings["System error. Please try again later."] = "Errore di sistema. Riprovare più tardi.";
 $a->strings["Hide this contact from others"] = "Nascondi questo contatto agli altri";
 $a->strings["Post a new friend activity"] = "Pubblica sulla bacheca che hai un nuovo contatto";
 $a->strings["if applicable"] = "se possibile";
 $a->strings["Discard"] = "Rifiuta";
+$a->strings["Remote authentication blocked. You are logged into this site locally. Please logout and retry."] = "L'autenticazione remota non è disponibile. Hai accesso solamente a questo sito. Puoi provare ad uscire per tentare di nuovo.";
+$a->strings["Welcome %s. Remote authentication successful."] = "Ciao %s. La tua autenticazione da remoto è avvenuta con successo.";
+$a->strings["This site is not a directory server"] = "Questo sito non fornisce l'elenco generale dei canali";
+$a->strings["Remote privacy information not available."] = "Le informazioni remote sulla privacy non sono disponibili.";
+$a->strings["Visible to:"] = "Visibile a:";
+$a->strings["Hub not found."] = "Server non trovato.";
+$a->strings["Profile not found."] = "Profilo non trovato.";
+$a->strings["Profile deleted."] = "Profilo eliminato.";
+$a->strings["Profile-"] = "Profilo-";
+$a->strings["New profile created."] = "Il nuovo profilo è stato creato.";
+$a->strings["Profile unavailable to clone."] = "Impossibile duplicare il profilo.";
+$a->strings["Profile Name is required."] = "Il nome del profilo è obbligatorio .";
+$a->strings["Marital Status"] = "Stato sentimentale";
+$a->strings["Romantic Partner"] = "Partner affettivo";
+$a->strings["Likes"] = "Cosa gli piace";
+$a->strings["Dislikes"] = "Cosa non gli piace";
+$a->strings["Work/Employment"] = "Lavoro/impiego";
+$a->strings["Religion"] = "Religione";
+$a->strings["Political Views"] = "Orientamento politico";
+$a->strings["Gender"] = "Sesso";
+$a->strings["Sexual Preference"] = "Preferenze sessuali";
+$a->strings["Homepage"] = "Home page";
+$a->strings["Interests"] = "Interessi";
+$a->strings["Address"] = "Indirizzo";
+$a->strings["Location"] = "Luogo attuale";
+$a->strings["Profile updated."] = "Profilo aggiornato.";
+$a->strings["Hide your contact/friend list from viewers of this profile?"] = "Nascondi la tua lista di contatti/amici ai visitatori di questo profilo?";
+$a->strings["Edit Profile Details"] = "Modifica i dettagli del profilo";
+$a->strings["View this profile"] = "Guarda questo profilo";
+$a->strings["Change Profile Photo"] = "Cambia la foto del profilo";
+$a->strings["Create a new profile using these settings"] = "Crea un nuovo profilo usando queste impostazioni";
+$a->strings["Clone this profile"] = "Clona questo profilo";
+$a->strings["Delete this profile"] = "Elimina questo profilo";
+$a->strings["Profile Name:"] = "Nome del profilo:";
+$a->strings["Your Full Name:"] = "Il tuo nome completo:";
+$a->strings["Title/Description:"] = "Titolo/descrizione:";
+$a->strings["Your Gender:"] = "Sesso:";
+$a->strings["Birthday (%s):"] = "Compleanno (%s):";
+$a->strings["Street Address:"] = "Indirizzo (via/piazza):";
+$a->strings["Locality/City:"] = "Località:";
+$a->strings["Postal/Zip Code:"] = "CAP:";
+$a->strings["Country:"] = "Nazione:";
+$a->strings["Region/State:"] = "Regione/stato:";
+$a->strings["<span class=\"heart\">&hearts;</span> Marital Status:"] = "<span class=\"heart\">&hearts;</span> Stato sentimentale:";
+$a->strings["Who: (if applicable)"] = "Con chi: (se possibile)";
+$a->strings["Examples: cathy123, Cathy Williams, cathy@example.com"] = "Per esempio: cathy123, Cathy Williams, cathy@example.com";
+$a->strings["Since [date]:"] = "dal [data]:";
+$a->strings["Homepage URL:"] = "Indirizzo home page:";
+$a->strings["Religious Views:"] = "Orientamento religioso:";
+$a->strings["Keywords:"] = "Parole chiave, tag:";
+$a->strings["Example: fishing photography software"] = "Per esempio: pesca fotografia programmazione";
+$a->strings["Used in directory listings"] = "Visibile nell'elenco pubblico di canali";
+$a->strings["Tell us about yourself..."] = "Raccontaci di te...";
+$a->strings["Hobbies/Interests"] = "Hobby/interessi";
+$a->strings["Contact information and Social Networks"] = "Contatti personali e i tuoi social network";
+$a->strings["My other channels"] = "I miei altri canali";
+$a->strings["Musical interests"] = "Interessi musicali";
+$a->strings["Books, literature"] = "Libri, letteratura";
+$a->strings["Television"] = "Televisione";
+$a->strings["Film/dance/culture/entertainment"] = "Film/danza/cultura/intrattenimento";
+$a->strings["Love/romance"] = "Amore";
+$a->strings["Work/employment"] = "Lavoro/impiego";
+$a->strings["School/education"] = "Scuola/educazione";
+$a->strings["This is your <strong>public</strong> profile.<br />It <strong>may</strong> be visible to anybody using the internet."] = "Questo è il tuo profilo <strong>publico</strong>.<br /><strong>Potrebbe</strong> essere visto da chiunque attraverso internet.";
+$a->strings["Age: "] = "Età:";
+$a->strings["Edit/Manage Profiles"] = "Modifica/gestisci i profili";
+$a->strings["Add a Channel"] = "Aggiungi un canale";
+$a->strings["A channel is your own collection of related web pages. A channel can be used to hold social network profiles, blogs, conversation groups and forums, celebrity pages, and much more. You may create as many channels as your service provider allows."] = "I contenuti che pubblichi finiscono in un \"canale\". Un canale può essere usato per mantenere un tuo profilo personale, per avere un blog, per creare forum di discussione o gruppi di interesse, per pagine di celebrità e molto altro. Puoi creare quanti canali vuoi a meno di limiti dati dal gestore del sito.";
+$a->strings["Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation Group\" "] = "Per esempio: \"Mario Rossi\", \"Lisa e le sue ricette\", \"Il campionato\", \"Il gruppo di escursionismo\"";
+$a->strings["Choose a short nickname"] = "Scegli un nome breve";
+$a->strings["Your nickname will be used to create an easily remembered channel address (like an email address) which you can share with others."] = "Il nome breve sarà usato per creare un indirizzo facile da ricordare per il tuo canale (simile a una email). Così potrai condividerlo e gli altri potranno trovarti.";
+$a->strings["Or <a href=\"import\">import an existing channel</a> from another location"] = "Oppure <a href=\"import\">importa un tuo canale esistente</a> da un altro server/hub";
 $a->strings["Could not access contact record."] = "Non è possibile accedere alle informazioni sul contatto.";
 $a->strings["Could not locate selected profile."] = "Non riesco a trovare il profilo selezionato.";
 $a->strings["Failed to update connection record."] = "Impossibile aggiornare le informazioni del contatto.";
@@ -1328,7 +1415,7 @@ $a->strings["Archived"] = "Archiviati";
 $a->strings["All"] = "Tutti";
 $a->strings["Suggestions"] = "Suggerimenti";
 $a->strings["Suggest new connections"] = "Suggerisci nuovi contatti";
-$a->strings["Show pending (new) connections"] = "Richieste per entrare in contatto";
+$a->strings["Show pending (new) connections"] = "Richieste di entrare in contatto";
 $a->strings["All Connections"] = "Tutti i contatti";
 $a->strings["Show all connections"] = "Mostra tutti i contatti";
 $a->strings["Unblocked"] = "Non bloccati";
@@ -1341,80 +1428,6 @@ $a->strings["%1\$s [%2\$s]"] = "%1\$s [%2\$s]";
 $a->strings["Edit contact"] = "Modifica il contatto";
 $a->strings["Search your connections"] = "Cerca tra i contatti";
 $a->strings["Finding: "] = "Ricerca: ";
-$a->strings["This site is not a directory server"] = "Questo sito non fornisce l'elenco generale dei canali";
-$a->strings["Remote privacy information not available."] = "Le informazioni remote sulla privacy non sono disponibili.";
-$a->strings["Visible to:"] = "Visibile a:";
-$a->strings["Profile not found."] = "Profilo non trovato.";
-$a->strings["Profile deleted."] = "Profilo eliminato.";
-$a->strings["Profile-"] = "Profilo-";
-$a->strings["New profile created."] = "Il nuovo profilo è stato creato.";
-$a->strings["Profile unavailable to clone."] = "Impossibile duplicare il profilo.";
-$a->strings["Profile Name is required."] = "Il nome del profilo è obbligatorio .";
-$a->strings["Marital Status"] = "Stato sentimentale";
-$a->strings["Romantic Partner"] = "Partner affettivo";
-$a->strings["Likes"] = "Cosa gli piace";
-$a->strings["Dislikes"] = "Cosa non gli piace";
-$a->strings["Work/Employment"] = "Lavoro/impiego";
-$a->strings["Religion"] = "Religione";
-$a->strings["Political Views"] = "Orientamento politico";
-$a->strings["Gender"] = "Sesso";
-$a->strings["Sexual Preference"] = "Preferenze sessuali";
-$a->strings["Homepage"] = "Home page";
-$a->strings["Interests"] = "Interessi";
-$a->strings["Address"] = "Indirizzo";
-$a->strings["Location"] = "Luogo attuale";
-$a->strings["Profile updated."] = "Profilo aggiornato.";
-$a->strings["Hide your contact/friend list from viewers of this profile?"] = "Nascondi la tua lista di contatti/amici ai visitatori di questo profilo?";
-$a->strings["Edit Profile Details"] = "Modifica i dettagli del profilo";
-$a->strings["View this profile"] = "Guarda questo profilo";
-$a->strings["Change Profile Photo"] = "Cambia la foto del profilo";
-$a->strings["Create a new profile using these settings"] = "Crea un nuovo profilo usando queste impostazioni";
-$a->strings["Clone this profile"] = "Clona questo profilo";
-$a->strings["Delete this profile"] = "Elimina questo profilo";
-$a->strings["Profile Name:"] = "Nome del profilo:";
-$a->strings["Your Full Name:"] = "Il tuo nome completo:";
-$a->strings["Title/Description:"] = "Titolo/descrizione:";
-$a->strings["Your Gender:"] = "Sesso:";
-$a->strings["Birthday (%s):"] = "Compleanno (%s):";
-$a->strings["Street Address:"] = "Indirizzo (via/piazza):";
-$a->strings["Locality/City:"] = "Località:";
-$a->strings["Postal/Zip Code:"] = "CAP:";
-$a->strings["Country:"] = "Nazione:";
-$a->strings["Region/State:"] = "Regione/stato:";
-$a->strings["<span class=\"heart\">&hearts;</span> Marital Status:"] = "<span class=\"heart\">&hearts;</span> Stato sentimentale:";
-$a->strings["Who: (if applicable)"] = "Con chi: (se possibile)";
-$a->strings["Examples: cathy123, Cathy Williams, cathy@example.com"] = "Per esempio: cathy123, Cathy Williams, cathy@example.com";
-$a->strings["Since [date]:"] = "dal [data]:";
-$a->strings["Homepage URL:"] = "Indirizzo home page:";
-$a->strings["Religious Views:"] = "Orientamento religioso:";
-$a->strings["Keywords:"] = "Parole chiave, tag:";
-$a->strings["Example: fishing photography software"] = "Per esempio: pesca fotografia programmazione";
-$a->strings["Used in directory listings"] = "Visibile nell'elenco pubblico di canali";
-$a->strings["Tell us about yourself..."] = "Raccontaci di te...";
-$a->strings["Hobbies/Interests"] = "Hobby/interessi";
-$a->strings["Contact information and Social Networks"] = "Contatti personali e i tuoi social network";
-$a->strings["My other channels"] = "I miei altri canali";
-$a->strings["Musical interests"] = "Interessi musicali";
-$a->strings["Books, literature"] = "Libri, letteratura";
-$a->strings["Television"] = "Televisione";
-$a->strings["Film/dance/culture/entertainment"] = "Film/danza/cultura/intrattenimento";
-$a->strings["Love/romance"] = "Amore";
-$a->strings["Work/employment"] = "Lavoro/impiego";
-$a->strings["School/education"] = "Scuola/educazione";
-$a->strings["This is your <strong>public</strong> profile.<br />It <strong>may</strong> be visible to anybody using the internet."] = "Questo è il tuo profilo <strong>publico</strong>.<br /><strong>Potrebbe</strong> essere visto da chiunque attraverso internet.";
-$a->strings["Age: "] = "Età:";
-$a->strings["Edit/Manage Profiles"] = "Modifica/gestisci i profili";
-$a->strings["Change profile photo"] = "Cambia la foto del profilo";
-$a->strings["Create New Profile"] = "Crea un nuovo profilo";
-$a->strings["Profile Image"] = "Immagine del profilo";
-$a->strings["visible to everybody"] = "visibile a tutti";
-$a->strings["Edit visibility"] = "Cambia la visibilità";
-$a->strings["Add a Channel"] = "Aggiungi un canale";
-$a->strings["A channel is your own collection of related web pages. A channel can be used to hold social network profiles, blogs, conversation groups and forums, celebrity pages, and much more. You may create as many channels as your service provider allows."] = "I contenuti che pubblichi finiscono in un \"canale\". Un canale può essere usato per mantenere un tuo profilo personale, per avere un blog, per creare forum di discussione o gruppi di interesse, per pagine di celebrità e molto altro. Puoi creare quanti canali vuoi a meno di limiti dati dal gestore del sito.";
-$a->strings["Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation Group\" "] = "Per esempio: \"Mario Rossi\", \"Lisa e le sue ricette\", \"Il campionato\", \"Il gruppo di escursionismo\"";
-$a->strings["Choose a short nickname"] = "Scegli un nome breve";
-$a->strings["Your nickname will be used to create an easily remembered channel address (like an email address) which you can share with others."] = "Il nome breve sarà usato per creare un indirizzo facile da ricordare per il tuo canale (simile a una email). Così potrai condividerlo e gli altri potranno trovarti.";
-$a->strings["Or <a href=\"import\">import an existing channel</a> from another location"] = "Oppure <a href=\"import\">importa un tuo canale esistente</a> da un altro server/hub";
 $a->strings["Permission Denied."] = "Permesso negato.";
 $a->strings["Permission denied.  VS."] = "Permesso negato.";
 $a->strings["Download"] = "Scaricamento dati";
@@ -1489,7 +1502,6 @@ $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["Delete Layout"] = "Elimina il layout";
-$a->strings["Contacts who are not members of a group"] = "Contatti che non sono in nessun insieme";
 $a->strings["Image uploaded but image cropping failed."] = "L'immagine è stata caricata, ma il non è stato possibile ritagliarla.";
 $a->strings["Image resize failed."] = "Il ridimensionamento dell'immagine è fallito.";
 $a->strings["Shift-reload the page or clear browser cache if the new photo does not display immediately."] = "Ricarica la pagina con shift+F5 o cancella la cache del browser se la nuova foto non viene mostrata immediatamente.";
@@ -1525,7 +1537,7 @@ $a->strings["Approve as: "] = "Approva come: ";
 $a->strings["Friend"] = "Amico";
 $a->strings["Sharer"] = "Sharer";
 $a->strings["Fan/Admirer"] = "Fan/Ammiratore";
-$a->strings["Friend/Connect Request"] = "Richiesta per entrare in contatto";
+$a->strings["Friend/Connect Request"] = "Richiesta di entrare in contatto";
 $a->strings["New Follower"] = "Nuovo follower";
 $a->strings["No introductions."] = "Nessuna richiesta di amicizia.";
 $a->strings["%s liked %s's post"] = "A %s è piaciuto l'articolo di %s";
@@ -1605,8 +1617,6 @@ $a->strings["Your email address"] = "Il tuo indirizzo email";
 $a->strings["Choose a password"] = "Scegli una password";
 $a->strings["Please re-enter your password"] = "Ripeti la password per verifica";
 $a->strings["Please login."] = "Accedi.";
-$a->strings["Remote authentication blocked. You are logged into this site locally. Please logout and retry."] = "L'autenticazione remota non è disponibile. Hai accesso solamente a questo sito. Puoi provare ad uscire per tentare di nuovo.";
-$a->strings["Welcome %s. Remote authentication successful."] = "Ciao %s. La tua autenticazione da remoto è avvenuta con successo.";
 $a->strings["Remove This Channel"] = "Elimina questo canale";
 $a->strings["This will completely remove this channel from the network. Once this has been done it is not recoverable."] = "Questo comando rimuoverà completamente il canale che stai usando. Una volta fatto non sarà più possibile ripristinarlo.";
 $a->strings["Please enter your password for verification:"] = "Inserisci la tua password per verifica:";
@@ -1687,22 +1697,4 @@ $a->strings["Remember me"] = "Resta connesso";
 $a->strings["Forgot your password?"] = "Hai dimenticato la password?";
 $a->strings["permission denied"] = "permesso negato";
 $a->strings["Got Zot?"] = "Hai Zot?";
-$a->strings["Requested channel is not available."] = "Il canale che cerchi non è disponibile.";
-$a->strings[" Sorry, you don't have the permission to view this profile. "] = "Purtroppo non hai il permesso di vedere questo profilo.";
-$a->strings["Profiles"] = "Profili";
-$a->strings["Manage/edit profiles"] = "Gestisci/modifica i profili";
-$a->strings["Edit Profile"] = "Modifica il profilo";
-$a->strings["F d"] = "d F";
-$a->strings["Birthday Reminders"] = "Promemoria compleanni";
-$a->strings["Birthdays this week:"] = "Compleanni questa settimana:";
-$a->strings["[No description]"] = "[Nessuna descrizione]";
-$a->strings["Event Reminders"] = "Promemoria";
-$a->strings["Events this week:"] = "Eventi di questa settimana:";
-$a->strings["Channel"] = "Canale";
-$a->strings["Status Messages and Posts"] = "Articoli e messaggi di stato";
-$a->strings["About"] = "Informazioni";
-$a->strings["Profile Details"] = "Dettagli del profilo";
-$a->strings["Events and Calendar"] = "Calendario eventi";
-$a->strings["Webpages"] = "Pagine web";
-$a->strings["Manage Webpages"] = "Gestisci le pagine web";
 $a->strings["toggle mobile"] = "attiva/disattiva versione mobile";
-- 
cgit v1.2.3


From 1add7d381d67708fe4b85fee3a7022e361f704ce Mon Sep 17 00:00:00 2001
From: marijus <mario@localhost.localdomain>
Date: Wed, 11 Dec 2013 19:05:50 +0100
Subject: this saves notes on the fly. i think this is appropriate behavior for
 a notes widget. btw... one would get mad at oneself if noting something
 important and forget to save it. with this behavior one can at least get mad
 at the developer if something goes wrong :)

---
 view/tpl/notes.tpl | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

(limited to 'view')

diff --git a/view/tpl/notes.tpl b/view/tpl/notes.tpl
index 7300779f4..09932e545 100644
--- a/view/tpl/notes.tpl
+++ b/view/tpl/notes.tpl
@@ -1,13 +1,10 @@
 <div class="widget">
 <script>
-function notePost() {
-	$('#note-rotator').spin('tiny');
-	$.post('notes', { 'note_text' : $('#note-text').val() },function(data) { $('#note-rotator').spin(false); });
-}
+$("#note-text").live('input paste',function(e){
+	$.post('notes', { 'note_text' : $('#note-text').val() });
+});
 </script>
 
 <h3>{{$banner}}</h3>
 <textarea name="note_text" id="note-text">{{$text}}</textarea>
-<input type="submit" name="submit" id="note-save" value="{{$save}}" onclick="notePost(); return true;">
-<div id="note-rotator"></div>
 </div>
-- 
cgit v1.2.3


From 88761ec9ecf46dd3a3468fbff8a83651480c2a22 Mon Sep 17 00:00:00 2001
From: marijus <mario@localhost.localdomain>
Date: Wed, 11 Dec 2013 20:02:17 +0100
Subject: we dont use doubble tagging in /network and /channel anymore...
 remove it from /search as well

---
 view/tpl/search_item.tpl | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

(limited to 'view')

diff --git a/view/tpl/search_item.tpl b/view/tpl/search_item.tpl
index 3018fc747..c5acfa4a4 100755
--- a/view/tpl/search_item.tpl
+++ b/view/tpl/search_item.tpl
@@ -29,13 +29,7 @@
 		<div class="wall-item-content" id="wall-item-content-{{$item.id}}" >
 			<div class="wall-item-title" id="wall-item-title-{{$item.id}}">{{$item.title}}</div>
 			<div class="wall-item-title-end"></div>
-			<div class="wall-item-body" id="wall-item-body-{{$item.id}}" >{{$item.body}}
-				<div class="body-tag">
-				{{foreach $item.tags as $tag}}
-					<span class='tag'>{{$tag}}</span>
-				{{/foreach}}
-				</div>
-			</div>
+			<div class="wall-item-body" id="wall-item-body-{{$item.id}}" >{{$item.body}}</div>
 		</div>
 		<div class="wall-item-tools" id="wall-item-tools-{{$item.id}}">
 			<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-{{$item.id}}" >
-- 
cgit v1.2.3


From dd7fea10c1b70534b76bc4d5ea044187cd4cb77b Mon Sep 17 00:00:00 2001
From: marijus <mario@localhost.localdomain>
Date: Wed, 11 Dec 2013 21:28:42 +0100
Subject: split out widgets.css

---
 view/css/widgets.css              |  98 +++++++++++++++++++++++++++++++++
 view/php/theme_init.php           |   1 +
 view/theme/redbasic/css/style.css | 112 +++++++++++---------------------------
 3 files changed, 132 insertions(+), 79 deletions(-)
 create mode 100644 view/css/widgets.css

(limited to 'view')

diff --git a/view/css/widgets.css b/view/css/widgets.css
new file mode 100644
index 000000000..3eb72eafc
--- /dev/null
+++ b/view/css/widgets.css
@@ -0,0 +1,98 @@
+.widget {
+	padding: 8px;
+	margin-top: 5px;
+}
+
+/* suggest */
+
+.suggest-widget-more {
+	margin-top: 10px;
+}
+
+/* follow */
+
+#side-follow-url {
+	margin-top: 5px;
+}
+
+#side-follow-submit {
+	margin-top: 15px;
+}
+
+/* notes */ 
+
+#note-text {
+	width: 190px;
+	max-width: 190px;
+	height: 150px;
+}
+
+#note-save {
+	margin-top: 10px;
+}
+
+/* saved searches */
+
+.saved-search-li {
+	margin-top: 3px;
+}
+
+.saved-search-li i {
+	opacity: 0;
+}
+
+.saved-search-li:hover i {
+	opacity: 1;
+}
+
+.savedsearchdrop {
+	opacity: 0;
+}
+
+/* fileas */
+
+.fileas-ul li {
+	margin-top: 10px;
+}
+
+.fileas-link {
+	margin-left: 24px;
+}
+
+.fileas-all {
+	margin-left: 0px;
+}
+
+/* posted date */
+
+#datebrowse-sidebar select {
+	margin-left: 25px;
+	opacity: 0.3;
+	filter:alpha(opacity=30);
+}
+
+#datebrowse-sidebar select:hover {
+	opacity: 1.0;
+	filter:alpha(opacity=100);
+}
+
+#posted-date-selector {
+	margin-left: 30px !important;
+	margin-top: 5px !important;
+	margin-right: 0px !important;
+	margin-bottom: 0px !important;
+}
+
+/* categories */
+
+.categories-ul li {
+	margin-top: 10px;
+}
+
+.categories-link {
+	margin-left: 24px;
+}
+
+.categories-all {
+	margin-left: 0px;
+}
diff --git a/view/php/theme_init.php b/view/php/theme_init.php
index a2024d658..e1625b3e5 100644
--- a/view/php/theme_init.php
+++ b/view/php/theme_init.php
@@ -13,6 +13,7 @@ head_add_css('library/colorbox/colorbox.css');
 // head_add_css('library/font_awesome/css/font-awesome.min.css');
 head_add_css('view/css/conversation.css');
 head_add_css('view/css/bootstrap-red.css');
+head_add_css('view/css/widgets.css');
 
 head_add_js('js/jquery.js');
 head_add_js('library/bootstrap/js/bootstrap.min.js');
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index e13bc1edb..d716680ce 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -331,7 +331,8 @@ footer {
 	margin-bottom: 10px;
 }
 
-.group-selected, .nets-selected, .fileas-selected, .categories-selected, .search-selected, .active {
+/*TODO: we should use .active class for all this, nets-selected probably obsolete */
+.group-selected, /* .nets-selected, */ .fileas-selected, .categories-selected, .search-selected, .active {
 	color: #444444 !important;
 }
 
@@ -671,36 +672,6 @@ footer {
     box-shadow: $shadowpx $shadowpx $shadowpx 0 #444444;
 }
 
-
-#datebrowse-sidebar select {
-    margin-left: 25px;
-    border-radius: $radiuspx;
-    -moz-border-radius: $radiuspx;
-    opacity: 0.3;
-    filter:alpha(opacity=30);
-}
-
-#datebrowse-sidebar select:hover {
-    opacity: 1.0;
-    filter:alpha(opacity=100);
-}
-
-#posted-date-selector {
-    margin-left: 30px !important;
-    margin-top: 5px !important;
-    margin-right: 0px !important;
-    margin-bottom: 0px !important;
-}
-
-#posted-date-selector:hover {
-    box-shadow: 4px 4px 3px 0 #444444;
-    margin-left: 25px !important;
-    margin-top: 0px !important;
-    margin-right: 5px !important;
-    margin-bottom: 5px !important;
-
-}
-
 #side-bar-photos-albums {
 	margin-top: 15px;
 }
@@ -777,17 +748,16 @@ footer {
 	width: 12px;
 }
 
-#sidebar-group-list li, 
-.saved-search-li {
+#sidebar-group-list li {
 	margin-top: 3px;
 }
 
-
-.nets-ul, .fileas-ul, .categories-ul {
+/* might be obsolete
+.nets-ul {
 	list-style-type: none;
 }
 
-.nets-ul li, .fileas-ul li, .categories-ul li {
+.nets-ul li {
 	margin-top: 10px;
 }
 
@@ -797,14 +767,7 @@ footer {
 .nets-all {
 	margin-left: 42px;
 }
-
-.fileas-link, .categories-link {
-	margin-left: 24px;
-}
-
-.fileas-all, .categories-all {
-	margin-left: 0px;
-}
+*/
 
 #search-save {
 	margin-left: 5px;
@@ -813,20 +776,6 @@ footer {
 	margin-right: 10px;
 }
 
-#saved-search-ul {
-	list-style-type: none;
-}
-
-.saved-search-li i {
-	opacity: 0;
-}
-
-.saved-search-li:hover i {
-	opacity: 1;
-}
-
-
-
 .savedsearchterm {
 	margin-left: 10px;
 }
@@ -835,7 +784,8 @@ footer {
 #side-follow-wrapper {
 	margin-top: 20px;
 }
-#side-follow-url, #side-peoplefind-url {
+
+#side-peoplefind-url {
 	margin-top: 5px;
 }
 
@@ -851,7 +801,7 @@ footer {
 	font-family: FontAwesome;
 }
 
-#side-follow-submit, #side-peoplefind-submit {
+#side-peoplefind-submit {
 	margin-top: 15px;
 }
 
@@ -860,7 +810,7 @@ footer {
 }
 
 
-.widget, .pmenu {
+.pmenu {
 	border-bottom: 1px solid #eec;
 	padding: 8px;
 	margin-top: 5px;
@@ -1679,12 +1629,6 @@ div.jGrowl div.info {
 	text-overflow: ellipsis;
 }
 
-#datebrowse-sidebar select {
-	margin-left: 25px;
-}
-
-
-
 .jslider .jslider-scale ins {
     color: #333;
 	font-size: $body_font_size;
@@ -2255,8 +2199,7 @@ text-decoration: none;
 	list-style-type: none;
 }
 
-.group-edit-icon,
-.savedsearchdrop {
+.group-edit-icon {
 	opacity: 0;
 }
 
@@ -2395,8 +2338,6 @@ img.mail-list-sender-photo {
 	max-width: $converse_width;
 }
 
-/* conv_item */
-
 .wall-item-content-wrapper {
 	border-radius: $radiuspx;
 	background-color: $item_colour;
@@ -2500,8 +2441,6 @@ img.mail-list-sender-photo {
 	color: $toolicon_colour;
 }
 
-/* comment_item */
-
 .my-comment-photo {
     border-radius: $radiuspx;
     -moz-border-radius: $radiuspx;
@@ -2538,14 +2477,29 @@ img.mail-list-sender-photo {
 .comment-edit-text-full {
 	color: black;
 }
-.suggest-widget-more { margin-top: 10px; }
 
+/* widgets */
 
-#note-text {
-	width: 190px;
-	max-width: 190px;
-	height: 150px;
+.widget {
+	border-bottom: 1px solid #eec;
+	-moz-border-radius: $radiuspx;
+	-webkit-border-radius: $radiuspx;
+	border-radius: $radiuspx;
+}
+
+#saved-search-ul {
+	list-style-type: none;
 }
-#note-save { margin-top: 10px; }
 
+.fileas-ul {
+	list-style-type: none;
+}
 
+#datebrowse-sidebar select {
+	border-radius: $radiuspx;
+	-moz-border-radius: $radiuspx;
+}
+
+.categories-ul {
+	list-style-type: none;
+}
-- 
cgit v1.2.3


From 169266b4547460296355b63c06dd0643667093d0 Mon Sep 17 00:00:00 2001
From: marijus <mario@localhost.localdomain>
Date: Wed, 11 Dec 2013 21:46:03 +0100
Subject: unify styling a little

---
 view/css/widgets.css              | 18 +++---------------
 view/theme/redbasic/css/style.css |  7 +++++++
 2 files changed, 10 insertions(+), 15 deletions(-)

(limited to 'view')

diff --git a/view/css/widgets.css b/view/css/widgets.css
index 3eb72eafc..117751e43 100644
--- a/view/css/widgets.css
+++ b/view/css/widgets.css
@@ -66,21 +66,9 @@
 /* posted date */
 
 #datebrowse-sidebar select {
-	margin-left: 25px;
-	opacity: 0.3;
-	filter:alpha(opacity=30);
-}
-
-#datebrowse-sidebar select:hover {
-	opacity: 1.0;
-	filter:alpha(opacity=100);
-}
-
-#posted-date-selector {
-	margin-left: 30px !important;
-	margin-top: 5px !important;
-	margin-right: 0px !important;
-	margin-bottom: 0px !important;
+	width: 190px;
+	max-width: 190px;
+	height: 150px;
 }
 
 /* categories */
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index d716680ce..ce13fa94c 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -2487,6 +2487,12 @@ img.mail-list-sender-photo {
 	border-radius: $radiuspx;
 }
 
+#note-text {
+	border: 1px solid #ccc;
+	border-radius: $radiuspx;
+	-moz-border-radius: $radiuspx;
+}
+
 #saved-search-ul {
 	list-style-type: none;
 }
@@ -2496,6 +2502,7 @@ img.mail-list-sender-photo {
 }
 
 #datebrowse-sidebar select {
+	border: 1px solid #ccc;
 	border-radius: $radiuspx;
 	-moz-border-radius: $radiuspx;
 }
-- 
cgit v1.2.3


From ebc788a69af4ee93bf683a856ac02956d413aec8 Mon Sep 17 00:00:00 2001
From: marijus <mario@localhost.localdomain>
Date: Wed, 11 Dec 2013 22:02:46 +0100
Subject: also add group widget to widgets.css

---
 view/css/widgets.css              | 28 ++++++++++++++++++++++++++++
 view/theme/redbasic/css/style.css | 36 +++++-------------------------------
 2 files changed, 33 insertions(+), 31 deletions(-)

(limited to 'view')

diff --git a/view/css/widgets.css b/view/css/widgets.css
index 117751e43..2008b10e0 100644
--- a/view/css/widgets.css
+++ b/view/css/widgets.css
@@ -45,6 +45,10 @@
 	opacity: 1;
 }
 
+.savedsearchterm {
+	margin-left: 10px;
+}
+
 .savedsearchdrop {
 	opacity: 0;
 }
@@ -84,3 +88,27 @@
 .categories-all {
 	margin-left: 0px;
 }
+
+/* group */
+
+#group-sidebar {
+	margin-bottom: 10px;
+}
+
+#sidebar-group-list .icon, #sidebar-group-list .iconspacer {
+	display: inline-block;
+	height: 12px;
+	width: 12px;
+}
+
+#sidebar-group-list li {
+	margin-top: 3px;
+}
+
+.groupsideedit {
+	margin-right: 10px;
+}
+
+.group-edit-icon {
+	opacity: 0;
+}
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index ce13fa94c..4df791e73 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -327,11 +327,7 @@ footer {
 	margin-bottom: 15px;
 }
 
-#group-sidebar {
-	margin-bottom: 10px;
-}
-
-/*TODO: we should use .active class for all this, nets-selected probably obsolete */
+/*TODO: we should use .selected class for all this, nets-selected probably obsolete */
 .group-selected, /* .nets-selected, */ .fileas-selected, .categories-selected, .search-selected, .active {
 	color: #444444 !important;
 }
@@ -738,20 +734,6 @@ footer {
 
 #netsearch-box { margin-bottom: 5px; }
 
-#sidebar-group-list ul {
-	list-style-type: none;
-}
-
-#sidebar-group-list .icon, #sidebar-group-list .iconspacer {
-	display: inline-block;
-	height: 12px;
-	width: 12px;
-}
-
-#sidebar-group-list li {
-	margin-top: 3px;
-}
-
 /* might be obsolete
 .nets-ul {
 	list-style-type: none;
@@ -772,14 +754,6 @@ footer {
 #search-save {
 	margin-left: 5px;
 }
-.groupsideedit {
-	margin-right: 10px;
-}
-
-.savedsearchterm {
-	margin-left: 10px;
-}
-
 
 #side-follow-wrapper {
 	margin-top: 20px;
@@ -2199,10 +2173,6 @@ text-decoration: none;
 	list-style-type: none;
 }
 
-.group-edit-icon {
-	opacity: 0;
-}
-
 .admin-icons {
 	color: $toolicon_colour;
 	margin-right: 10px;
@@ -2510,3 +2480,7 @@ img.mail-list-sender-photo {
 .categories-ul {
 	list-style-type: none;
 }
+
+#sidebar-group-list ul {
+	list-style-type: none;
+}
-- 
cgit v1.2.3


From e8821d78d517c838a630766bfc3bafb145a6be15 Mon Sep 17 00:00:00 2001
From: marijus <mario@localhost.localdomain>
Date: Wed, 11 Dec 2013 22:11:06 +0100
Subject: .selected is in use for something else already

---
 view/theme/redbasic/css/style.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'view')

diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 4df791e73..fa5bf51ef 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -327,7 +327,7 @@ footer {
 	margin-bottom: 15px;
 }
 
-/*TODO: we should use .selected class for all this, nets-selected probably obsolete */
+/*TODO: we should use one class for all this, nets-selected probably obsolete */
 .group-selected, /* .nets-selected, */ .fileas-selected, .categories-selected, .search-selected, .active {
 	color: #444444 !important;
 }
-- 
cgit v1.2.3


From 1fa4133d430d2cb2753a9fd7e6bf9bfcdc35659b Mon Sep 17 00:00:00 2001
From: marijus <mario@localhost.localdomain>
Date: Wed, 11 Dec 2013 23:52:34 +0100
Subject: this is not needed anymore

---
 view/css/widgets.css        | 4 ----
 view/tpl/saved_searches.tpl | 2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

(limited to 'view')

diff --git a/view/css/widgets.css b/view/css/widgets.css
index 2008b10e0..a95152888 100644
--- a/view/css/widgets.css
+++ b/view/css/widgets.css
@@ -49,10 +49,6 @@
 	margin-left: 10px;
 }
 
-.savedsearchdrop {
-	opacity: 0;
-}
-
 /* fileas */
 
 .fileas-ul li {
diff --git a/view/tpl/saved_searches.tpl b/view/tpl/saved_searches.tpl
index bdff72ba1..d0f9e2b0e 100644
--- a/view/tpl/saved_searches.tpl
+++ b/view/tpl/saved_searches.tpl
@@ -5,7 +5,7 @@
 	<ul id="saved-search-ul">
 		{{foreach $saved as $search}}
 		<li id="search-term-{{$search.id}}" class="saved-search-li clear">
-			<a title="{{$search.delete}}" onclick="return confirmDelete();" id="drop-saved-search-term-{{$search.id}}" href="{{$search.dellink}}"><i id="dropicon-saved-search-term-{{$search.id}}" class="icon-remove drop-icons iconspacer savedsearchdrop" ></i></a>
+			<a title="{{$search.delete}}" onclick="return confirmDelete();" id="drop-saved-search-term-{{$search.id}}" href="{{$search.dellink}}"><i id="dropicon-saved-search-term-{{$search.id}}" class="icon-remove drop-icons iconspacer" ></i></a>
 			<a id="saved-search-term-{{$search.id}}" class="savedsearchterm{{if $search.selected}} search-selected{{/if}}" href="{{$search.srchlink}}">{{$search.displayterm}}</a>
 		</li>
 		{{/foreach}}
-- 
cgit v1.2.3


From 40e2900326a25ba0e2feedb802d38b7052b194cc Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Wed, 11 Dec 2013 14:54:36 -0800
Subject: comanchify all the simple cases - those that only load a profile.
 Rework permission checks for the profile sidebar so that it is all done
 internally. Remove crepair which we aren't using.

---
 view/css/mod_connections.css      | 50 -------------------------------------
 view/pdl/mod_common.pdl           |  3 +++
 view/pdl/mod_profile_photo.pdl    |  3 +++
 view/pdl/mod_profiles.pdl         |  3 +++
 view/pdl/mod_profperm.pdl         |  3 +++
 view/pdl/mod_viewconnections.pdl  |  3 +++
 view/theme/redbasic/css/style.css | 52 +++++++++++++++++++++++++++++++++++++++
 7 files changed, 67 insertions(+), 50 deletions(-)
 create mode 100644 view/pdl/mod_common.pdl
 create mode 100644 view/pdl/mod_profile_photo.pdl
 create mode 100644 view/pdl/mod_profiles.pdl
 create mode 100644 view/pdl/mod_profperm.pdl
 create mode 100644 view/pdl/mod_viewconnections.pdl

(limited to 'view')

diff --git a/view/css/mod_connections.css b/view/css/mod_connections.css
index ee2ea52ac..d133a1b99 100644
--- a/view/css/mod_connections.css
+++ b/view/css/mod_connections.css
@@ -38,56 +38,6 @@
 	margin-bottom: 20px;
 }
 
-.contact-entry-wrapper {
-	float: left;
-	width: 120px;
-	height: 120px;
-	padding: 10px;
-}
-
-#contacts-search {
-	font-size: 1em;
-	width: 300px;
-}
-
-#contacts-search-end {
-	margin-bottom: 10px;
-}
-
-.contact-entry-photo img {
-	border: none;
-}
-.contact-entry-photo-end {
-	clear: both;
-}
-.contact-entry-name {
-	float: left;
-	margin-left: 0px;
-	margin-right: 10px;
-	width: 120px;
-	overflow: hidden;
-}
-.contact-entry-edit-links {
-	margin-top: 6px;
-	margin-left: 10px;
-	width: 16px;
-}
-.contact-entry-nav-wrapper {
-	float: left;
-	margin-left: 10px;
-}
-
-.contact-entry-edit-links img {
-	border: none;
-	margin-right: 15px;
-}
-.contact-entry-photo {
-	float: left;
-	position: relative;
-}
-.contact-entry-end {
-	clear: both;
-}
 
 
 #contact-edit-wrapper {
diff --git a/view/pdl/mod_common.pdl b/view/pdl/mod_common.pdl
new file mode 100644
index 000000000..f12bf39c3
--- /dev/null
+++ b/view/pdl/mod_common.pdl
@@ -0,0 +1,3 @@
+[region=aside]
+[widget=fullprofile][/widget]
+[/region]
diff --git a/view/pdl/mod_profile_photo.pdl b/view/pdl/mod_profile_photo.pdl
new file mode 100644
index 000000000..f12bf39c3
--- /dev/null
+++ b/view/pdl/mod_profile_photo.pdl
@@ -0,0 +1,3 @@
+[region=aside]
+[widget=fullprofile][/widget]
+[/region]
diff --git a/view/pdl/mod_profiles.pdl b/view/pdl/mod_profiles.pdl
new file mode 100644
index 000000000..f12bf39c3
--- /dev/null
+++ b/view/pdl/mod_profiles.pdl
@@ -0,0 +1,3 @@
+[region=aside]
+[widget=fullprofile][/widget]
+[/region]
diff --git a/view/pdl/mod_profperm.pdl b/view/pdl/mod_profperm.pdl
new file mode 100644
index 000000000..f12bf39c3
--- /dev/null
+++ b/view/pdl/mod_profperm.pdl
@@ -0,0 +1,3 @@
+[region=aside]
+[widget=fullprofile][/widget]
+[/region]
diff --git a/view/pdl/mod_viewconnections.pdl b/view/pdl/mod_viewconnections.pdl
new file mode 100644
index 000000000..f12bf39c3
--- /dev/null
+++ b/view/pdl/mod_viewconnections.pdl
@@ -0,0 +1,3 @@
+[region=aside]
+[widget=fullprofile][/widget]
+[/region]
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index e13bc1edb..b7883f42e 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -2549,3 +2549,55 @@ img.mail-list-sender-photo {
 #note-save { margin-top: 10px; }
 
 
+/* need to put these back in the theme for now - used in more than one module */
+
+.contact-entry-wrapper {
+	float: left;
+	width: 120px;
+	height: 120px;
+	padding: 10px;
+}
+
+#contacts-search {
+	font-size: 1em;
+	width: 300px;
+}
+
+#contacts-search-end {
+	margin-bottom: 10px;
+}
+
+.contact-entry-photo img {
+	border: none;
+}
+.contact-entry-photo-end {
+	clear: both;
+}
+.contact-entry-name {
+	float: left;
+	margin-left: 0px;
+	margin-right: 10px;
+	width: 120px;
+	overflow: hidden;
+}
+.contact-entry-edit-links {
+	margin-top: 6px;
+	margin-left: 10px;
+	width: 16px;
+}
+.contact-entry-nav-wrapper {
+	float: left;
+	margin-left: 10px;
+}
+
+.contact-entry-edit-links img {
+	border: none;
+	margin-right: 15px;
+}
+.contact-entry-photo {
+	float: left;
+	position: relative;
+}
+.contact-entry-end {
+	clear: both;
+}
-- 
cgit v1.2.3


From 4d187918528f12256ee7ae145b0e0e25578df8b4 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Wed, 11 Dec 2013 15:42:28 -0800
Subject: missing brace in redbasic style.css

---
 view/css/widgets.css              | 1 +
 view/theme/redbasic/css/style.css | 1 +
 2 files changed, 2 insertions(+)

(limited to 'view')

diff --git a/view/css/widgets.css b/view/css/widgets.css
index a95152888..2e424a8dc 100644
--- a/view/css/widgets.css
+++ b/view/css/widgets.css
@@ -97,6 +97,7 @@
 	width: 12px;
 }
 
+
 #sidebar-group-list li {
 	margin-top: 3px;
 }
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 9b45102cf..a67742c81 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -2529,6 +2529,7 @@ img.mail-list-sender-photo {
 }
 .contact-entry-end {
 	clear: both;
+}
 
 .categories-ul {
 	list-style-type: none;
-- 
cgit v1.2.3


From b4e1e8a4a43721d0134e41944afaa9f45bcd8aa8 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Wed, 11 Dec 2013 19:43:41 -0800
Subject: The affinity tool is not a "traditional" widget. But it is
 nevertheless a widget. It just makes fewer page layout decisions which are
 hard-coded. If you want to shrink it down and put it on the sidebar in your
 theme, go for it.

---
 view/pdl/mod_network.pdl | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'view')

diff --git a/view/pdl/mod_network.pdl b/view/pdl/mod_network.pdl
index 168ca6acb..7624ace01 100644
--- a/view/pdl/mod_network.pdl
+++ b/view/pdl/mod_network.pdl
@@ -1,4 +1,5 @@
 [region=nav]$nav[/region]
+
 [region=aside]
 [widget=collections][/widget]
 [widget=archive][/widget]
@@ -7,4 +8,8 @@
 [widget=filer][/widget]
 [widget=notes][/widget]
 [/region]
-[region=section]$content[/region]
\ No newline at end of file
+
+[region=content]
+[widget=affinity][/widget]
+$content
+[/region]
\ No newline at end of file
-- 
cgit v1.2.3


From 8f6af66a730250c7688168eecf8ba9b99df2536b Mon Sep 17 00:00:00 2001
From: marijus <mario@localhost.localdomain>
Date: Thu, 12 Dec 2013 14:39:21 +0100
Subject: move affinity slider to widgets.css and minor cleanup

---
 view/css/widgets.css              | 14 +++++++++++++-
 view/theme/redbasic/css/style.css | 30 +++++++-----------------------
 2 files changed, 20 insertions(+), 24 deletions(-)

(limited to 'view')

diff --git a/view/css/widgets.css b/view/css/widgets.css
index 2e424a8dc..a34508961 100644
--- a/view/css/widgets.css
+++ b/view/css/widgets.css
@@ -97,7 +97,6 @@
 	width: 12px;
 }
 
-
 #sidebar-group-list li {
 	margin-top: 3px;
 }
@@ -109,3 +108,16 @@
 .group-edit-icon {
 	opacity: 0;
 }
+
+/* affinity - slider */
+
+#main-slider {
+	position: relative; 
+	left: 5px; 
+	width: 90%;
+}
+
+.slider {
+	margin-top: 10px;
+	margin-bottom: 45px;
+}
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index a67742c81..e02f55520 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -1610,21 +1610,6 @@ div.jGrowl div.info {
 	text-align: center;
 }
 
-
-.slider {
-	margin-top: 10px;
-	margin-bottom: 45px;
-}
-
-
-#main-slider {
-	position: relative; 
-	left: 5px; 
-	width: 90%;
-
-}
-
-
 #contact-slider {
 	position: relative; 
 	left: 5%; 
@@ -2477,6 +2462,13 @@ img.mail-list-sender-photo {
 	-moz-border-radius: $radiuspx;
 }
 
+.categories-ul {
+	list-style-type: none;
+}
+
+#sidebar-group-list ul {
+	list-style-type: none;
+}
 
 /* need to put these back in the theme for now - used in more than one module */
 
@@ -2530,11 +2522,3 @@ img.mail-list-sender-photo {
 .contact-entry-end {
 	clear: both;
 }
-
-.categories-ul {
-	list-style-type: none;
-}
-
-#sidebar-group-list ul {
-	list-style-type: none;
-}
-- 
cgit v1.2.3


From b994faee9d24a6290e342b6389c56fa7f9ecfac1 Mon Sep 17 00:00:00 2001
From: marijus <mario@localhost.localdomain>
Date: Thu, 12 Dec 2013 15:15:01 +0100
Subject: mark some things for deletion

---
 view/theme/redbasic/css/style.css | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'view')

diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index e02f55520..0db9caa4e 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -676,7 +676,7 @@ footer {
 	list-style: none;
 }
 
-.contact-entry-photo img, .profile-match-photo img, #photo-photo img, .directory-photo-img, .photo-album-photo, .photo-top-photo {
+/* .contact-entry-photo img, */ .profile-match-photo img, #photo-photo img, .directory-photo-img, .photo-album-photo, .photo-top-photo {
     border-radius: $radiuspx;
     -moz-border-radius: $radiuspx;
     box-shadow: $shadowpx $shadowpx $shadowpx 0 #444444;
@@ -2488,12 +2488,16 @@ img.mail-list-sender-photo {
 	margin-bottom: 10px;
 }
 
+/* seems oblolete
 .contact-entry-photo img {
 	border: none;
 }
+*/
+
 .contact-entry-photo-end {
 	clear: both;
 }
+
 .contact-entry-name {
 	float: left;
 	margin-left: 0px;
@@ -2501,11 +2505,14 @@ img.mail-list-sender-photo {
 	width: 120px;
 	overflow: hidden;
 }
+
+/* seems obsolete
 .contact-entry-edit-links {
 	margin-top: 6px;
 	margin-left: 10px;
 	width: 16px;
 }
+
 .contact-entry-nav-wrapper {
 	float: left;
 	margin-left: 10px;
@@ -2515,10 +2522,13 @@ img.mail-list-sender-photo {
 	border: none;
 	margin-right: 15px;
 }
+
 .contact-entry-photo {
 	float: left;
 	position: relative;
 }
+*/
+
 .contact-entry-end {
 	clear: both;
 }
-- 
cgit v1.2.3


From c00f0d4b282f2242b9c2e154a5381029cf0dc812 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Sat, 14 Dec 2013 13:26:40 -0800
Subject: a couple more comanche conversions

---
 view/pdl/mod_message.pdl  | 3 +++
 view/pdl/mod_settings.pdl | 4 ++++
 2 files changed, 7 insertions(+)
 create mode 100644 view/pdl/mod_message.pdl
 create mode 100644 view/pdl/mod_settings.pdl

(limited to 'view')

diff --git a/view/pdl/mod_message.pdl b/view/pdl/mod_message.pdl
new file mode 100644
index 000000000..2efb3de79
--- /dev/null
+++ b/view/pdl/mod_message.pdl
@@ -0,0 +1,3 @@
+[region=aside]
+[widget=mailmenu][/widget]
+[/region]
diff --git a/view/pdl/mod_settings.pdl b/view/pdl/mod_settings.pdl
new file mode 100644
index 000000000..0b0a99638
--- /dev/null
+++ b/view/pdl/mod_settings.pdl
@@ -0,0 +1,4 @@
+[region=aside]
+[widget=settings_menu][/widget]
+[/region]
+
-- 
cgit v1.2.3


From d14e2db6b436b3190db0c506cf5f907bd1a7fcc9 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Sat, 14 Dec 2013 17:03:37 -0800
Subject: make home.html fullpage mode - make directory search work for
 non-logged in, but leave off suggest and invite

---
 view/tpl/peoplefind.tpl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'view')

diff --git a/view/tpl/peoplefind.tpl b/view/tpl/peoplefind.tpl
index aef341d41..45b3d7d4b 100755
--- a/view/tpl/peoplefind.tpl
+++ b/view/tpl/peoplefind.tpl
@@ -7,8 +7,8 @@
 	</form>
 	<br />
 	{{if $similar}}<a href="match" >{{$similar}}</a><br />{{/if}}
-	<a href="suggest" >{{$suggest}}</a><br />
+	{{if $loggedin}}<a href="suggest" >{{$suggest}}</a><br />{{/if}}
 	<a href="randprof" >{{$random}}</a><br />
-	{{if $inv}}<a href="invite" >{{$inv}}</a>{{/if}}
+	{{if $loggedin}}{{if $inv}}<a href="invite" >{{$inv}}</a>{{/if}}{{/if}}
 </div>
 
-- 
cgit v1.2.3


From 0272ab4cd9a6428396489d88c7a1a89be76e5810 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Sun, 15 Dec 2013 14:36:43 -0800
Subject: Provide a fallback channel to probe for magic-auth when we have no
 prior communications with a site. This will be a system channel if one
 exists, otherwise any channel will do. We'll try to use the first valid
 channel on the site because that was probably created when the site was
 installed and is the closest thing to a system channel we've got.

---
 view/css/mod_profiles.css | 6 ++++--
 view/tpl/profile_edit.tpl | 2 ++
 2 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'view')

diff --git a/view/css/mod_profiles.css b/view/css/mod_profiles.css
index 8378245d2..6d935ee4d 100644
--- a/view/css/mod_profiles.css
+++ b/view/css/mod_profiles.css
@@ -35,9 +35,11 @@
 	margin-top: 10px;
 }
 
-#profile-edit-with-label {
+#profile-edit-with-label, #profile-edit-howlong-label {
+
 	width: 175px;
-	margin-left: 20px;
+	margin-left: 50px;
+	margin-bottom: 20px;
 }
 
 #profile-edit-profile-name-label,
diff --git a/view/tpl/profile_edit.tpl b/view/tpl/profile_edit.tpl
index 183389b9b..196b3ac6d 100755
--- a/view/tpl/profile_edit.tpl
+++ b/view/tpl/profile_edit.tpl
@@ -108,8 +108,10 @@
 <label id="profile-edit-marital-label" for="profile-edit-marital" >{{$lbl_marital}} </label>
 {{$marital}}
 </div>
+<div class="clear"></div>
 <label id="profile-edit-with-label" for="profile-edit-with" > {{$lbl_with}} </label>
 <input type="text" size="32" name="with" id="profile-edit-with" title="{{$lbl_ex1}}" value="{{$with}}" />
+<div class="clear"></div>
 <label id="profile-edit-howlong-label" for="profile-edit-howlong" > {{$lbl_howlong}} </label>
 <input type="text" size="32" name="howlong" id="profile-edit-howlong" title="{{$lbl_howlong}}" value="{{$howlong}}" />
 
-- 
cgit v1.2.3


From 61a7bfb9426c36b7cac0058f5fe5a0c5c6d4ae71 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Sun, 15 Dec 2013 20:30:37 -0800
Subject: use 'a' ACL search instead of 'm' ACL search for mod_sources

---
 view/js/mod_sources.js | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'view')

diff --git a/view/js/mod_sources.js b/view/js/mod_sources.js
index fda952cae..2efc7ad5d 100644
--- a/view/js/mod_sources.js
+++ b/view/js/mod_sources.js
@@ -10,4 +10,6 @@ $(document).ready(function() {
 		}			
 	});
 
+	a.setOptions({ autoSubmit: true, params: { type: 'a' }});
+
 }); 
-- 
cgit v1.2.3


From 5a3a72604bf0e1c7ec04fbdbdee7a08c2a340c5a Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Sun, 15 Dec 2013 20:59:52 -0800
Subject: some re-work of mod_sources

---
 view/js/mod_sources.js    | 4 ++--
 view/tpl/sources_edit.tpl | 2 +-
 view/tpl/sources_new.tpl  | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'view')

diff --git a/view/js/mod_sources.js b/view/js/mod_sources.js
index 2efc7ad5d..49880b38f 100644
--- a/view/js/mod_sources.js
+++ b/view/js/mod_sources.js
@@ -6,10 +6,10 @@ $(document).ready(function() {
 		width: 250,
 		id: 'id-name-ac',
 		onSelect: function(value,data) {
-			$("#id_xchan").val(data);
+			$("#id_abook").val(data);
 		}			
 	});
 
-	a.setOptions({ autoSubmit: true, params: { type: 'a' }});
+	a.setOptions({ params: { type: 'a' }});
 
 }); 
diff --git a/view/tpl/sources_edit.tpl b/view/tpl/sources_edit.tpl
index 6e9cee32b..34023e03f 100644
--- a/view/tpl/sources_edit.tpl
+++ b/view/tpl/sources_edit.tpl
@@ -4,7 +4,7 @@
 
 <form action="sources" method="post">
 <input type="hidden" name="source" value="{{$id}}" />
-<input type="hidden" id="id_xchan" name="xchan" value="{{$xchan}}" />
+<input type="hidden" id="id_abook" name="abook" value="{{$abook}}" />
 {{include file="field_input.tpl" field=$name}}
 {{include file="field_textarea.tpl" field=$words}}
 
diff --git a/view/tpl/sources_new.tpl b/view/tpl/sources_new.tpl
index 267245ae4..3c6a4be30 100644
--- a/view/tpl/sources_new.tpl
+++ b/view/tpl/sources_new.tpl
@@ -3,7 +3,7 @@
 <div class="descriptive-text">{{$desc}}</div>
 
 <form action="sources" method="post">
-<input type="hidden" id="id_xchan" name="xchan" value="{{$xchan}}" />
+<input type="hidden" id="id_abook" name="abook" value="{{$abook}}" />
 {{include file="field_input.tpl" field=$name}}
 {{include file="field_textarea.tpl" field=$words}}
 
-- 
cgit v1.2.3


From ae95269c6dd5b354d5f807c96a4b237b543a9b53 Mon Sep 17 00:00:00 2001
From: marijus <mario@localhost.localdomain>
Date: Mon, 16 Dec 2013 15:41:23 +0100
Subject: remove some cruft and a typo

---
 view/theme/redbasic/css/style.css | 61 +++------------------------------------
 1 file changed, 4 insertions(+), 57 deletions(-)

(limited to 'view')

diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 0db9caa4e..7c7d450aa 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -234,7 +234,7 @@ header #banner #logo-text {
 	background-color: #aec0d3;
 	color: #565854;		
 	-moz-border-radius: $radiuspx;
-	border-radius: $radiuspx;;	
+	border-radius: $radiuspx;
 }
 
 nav .nav-link {
@@ -327,8 +327,8 @@ footer {
 	margin-bottom: 15px;
 }
 
-/*TODO: we should use one class for all this, nets-selected probably obsolete */
-.group-selected, /* .nets-selected, */ .fileas-selected, .categories-selected, .search-selected, .active {
+/*TODO: we should use one class for all this. */
+.group-selected, .fileas-selected, .categories-selected, .search-selected, .active {
 	color: #444444 !important;
 }
 
@@ -676,7 +676,7 @@ footer {
 	list-style: none;
 }
 
-/* .contact-entry-photo img, */ .profile-match-photo img, #photo-photo img, .directory-photo-img, .photo-album-photo, .photo-top-photo {
+.profile-match-photo img, #photo-photo img, .directory-photo-img, .photo-album-photo, .photo-top-photo {
     border-radius: $radiuspx;
     -moz-border-radius: $radiuspx;
     box-shadow: $shadowpx $shadowpx $shadowpx 0 #444444;
@@ -734,23 +734,6 @@ footer {
 
 #netsearch-box { margin-bottom: 5px; }
 
-/* might be obsolete
-.nets-ul {
-	list-style-type: none;
-}
-
-.nets-ul li {
-	margin-top: 10px;
-}
-
-.nets-link {
-	margin-left: 24px;
-}
-.nets-all {
-	margin-left: 42px;
-}
-*/
-
 #search-save {
 	margin-left: 5px;
 }
@@ -2002,13 +1985,6 @@ ul.menu-popup {
 .reshared-content { margin-left: 30px; }
 .shared_header img { margin-right: 10px; }
 
-/* might be obsolete
-span.mail-delete {
-float: left;
-width: 30px;
-}
-*/
-
 .tag1 {
     font-size : 1.0em !important;
   }
@@ -2488,12 +2464,6 @@ img.mail-list-sender-photo {
 	margin-bottom: 10px;
 }
 
-/* seems oblolete
-.contact-entry-photo img {
-	border: none;
-}
-*/
-
 .contact-entry-photo-end {
 	clear: both;
 }
@@ -2506,29 +2476,6 @@ img.mail-list-sender-photo {
 	overflow: hidden;
 }
 
-/* seems obsolete
-.contact-entry-edit-links {
-	margin-top: 6px;
-	margin-left: 10px;
-	width: 16px;
-}
-
-.contact-entry-nav-wrapper {
-	float: left;
-	margin-left: 10px;
-}
-
-.contact-entry-edit-links img {
-	border: none;
-	margin-right: 15px;
-}
-
-.contact-entry-photo {
-	float: left;
-	position: relative;
-}
-*/
-
 .contact-entry-end {
 	clear: both;
 }
-- 
cgit v1.2.3


From afc86875d242027434cb4ffca10e086d53cbbbb8 Mon Sep 17 00:00:00 2001
From: marijus <mario@localhost.localdomain>
Date: Mon, 16 Dec 2013 15:46:18 +0100
Subject: move some stuff back to mod_connections.css

---
 view/css/mod_connections.css      | 31 +++++++++++++++++++++++++++++++
 view/theme/redbasic/css/style.css | 34 ----------------------------------
 2 files changed, 31 insertions(+), 34 deletions(-)

(limited to 'view')

diff --git a/view/css/mod_connections.css b/view/css/mod_connections.css
index d133a1b99..c460fec28 100644
--- a/view/css/mod_connections.css
+++ b/view/css/mod_connections.css
@@ -104,3 +104,34 @@
 	margin-top: 20px;
 }
 
+.contact-entry-wrapper {
+	float: left;
+	width: 120px;
+	height: 120px;
+	padding: 10px;
+}
+
+#contacts-search {
+	font-size: 1em;
+	width: 300px;
+}
+
+#contacts-search-end {
+	margin-bottom: 10px;
+}
+
+.contact-entry-photo-end {
+	clear: both;
+}
+
+.contact-entry-name {
+	float: left;
+	margin-left: 0px;
+	margin-right: 10px;
+	width: 120px;
+	overflow: hidden;
+}
+
+.contact-entry-end {
+	clear: both;
+}
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 7c7d450aa..9ac021a54 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -2445,37 +2445,3 @@ img.mail-list-sender-photo {
 #sidebar-group-list ul {
 	list-style-type: none;
 }
-
-/* need to put these back in the theme for now - used in more than one module */
-
-.contact-entry-wrapper {
-	float: left;
-	width: 120px;
-	height: 120px;
-	padding: 10px;
-}
-
-#contacts-search {
-	font-size: 1em;
-	width: 300px;
-}
-
-#contacts-search-end {
-	margin-bottom: 10px;
-}
-
-.contact-entry-photo-end {
-	clear: both;
-}
-
-.contact-entry-name {
-	float: left;
-	margin-left: 0px;
-	margin-right: 10px;
-	width: 120px;
-	overflow: hidden;
-}
-
-.contact-entry-end {
-	clear: both;
-}
-- 
cgit v1.2.3


From 98b0e0221d66fe93104328e7027efe77f9c84008 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Tue, 17 Dec 2013 20:03:45 -0800
Subject: more comanche stuff

---
 view/pdl/mod_new_channel.pdl | 1 +
 view/pdl/mod_register.pdl    | 1 +
 view/php/mod_new_channel.php | 3 ---
 view/php/mod_register.php    | 3 ---
 4 files changed, 2 insertions(+), 6 deletions(-)
 create mode 100644 view/pdl/mod_new_channel.pdl
 create mode 100644 view/pdl/mod_register.pdl
 delete mode 100644 view/php/mod_new_channel.php
 delete mode 100644 view/php/mod_register.php

(limited to 'view')

diff --git a/view/pdl/mod_new_channel.pdl b/view/pdl/mod_new_channel.pdl
new file mode 100644
index 000000000..733bc248a
--- /dev/null
+++ b/view/pdl/mod_new_channel.pdl
@@ -0,0 +1 @@
+[layout]full[/layout]
diff --git a/view/pdl/mod_register.pdl b/view/pdl/mod_register.pdl
new file mode 100644
index 000000000..733bc248a
--- /dev/null
+++ b/view/pdl/mod_register.pdl
@@ -0,0 +1 @@
+[layout]full[/layout]
diff --git a/view/php/mod_new_channel.php b/view/php/mod_new_channel.php
deleted file mode 100644
index e7709cbd8..000000000
--- a/view/php/mod_new_channel.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-
-$a->page['template'] = 'full';
diff --git a/view/php/mod_register.php b/view/php/mod_register.php
deleted file mode 100644
index e7709cbd8..000000000
--- a/view/php/mod_register.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-
-$a->page['template'] = 'full';
-- 
cgit v1.2.3


From 38fd8410eb5c66928cb24bb87ad38657f53aec3a Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Wed, 18 Dec 2013 01:00:08 -0800
Subject: split off mod_connections into mod_connections & mod_connedit - lots
 of links to fix

---
 view/css/mod_connedit.css | 137 ++++++++++++++++++++++++++++++++++++++++++++++
 view/tpl/abook_edit.tpl   |   2 +-
 2 files changed, 138 insertions(+), 1 deletion(-)
 create mode 100644 view/css/mod_connedit.css

(limited to 'view')

diff --git a/view/css/mod_connedit.css b/view/css/mod_connedit.css
new file mode 100644
index 000000000..c460fec28
--- /dev/null
+++ b/view/css/mod_connedit.css
@@ -0,0 +1,137 @@
+
+.field_abook_help {
+	color: #000;
+}
+.abook-them {
+	margin-left: 375px;
+	margin-bottom: 15px;
+}
+.abook-me {
+	margin-left: 36px;
+	margin-bottom: 15px;
+}
+.acheckbox {
+	margin-bottom: 5px !important;
+}
+
+.abook-pending-contact {
+	background: orange;
+	font-weight: bold;
+	margin: 10px;
+	padding: 20px 5px 10px;
+}
+
+#contact-slider {
+	width: 600px !important;
+}
+
+.abook-edit-them, .abook-edit-me {
+	float: left;
+	width: 100px !important;
+}
+.field_abook_help {
+	float: left;
+}
+
+#contacts-main {
+	margin-top: 20px;
+	margin-bottom: 20px;
+}
+
+
+
+#contact-edit-wrapper {
+	margin-top: 10px;
+}
+
+#contact-edit-banner-name {
+	font-size: 1.4em;
+	font-weight: bold;
+}
+
+#contact-edit-poll-wrapper {
+	margin-top: 15px;
+}
+
+#contact-edit-poll-text {
+	margin-top: 15px;
+	margin-bottom: 5px;
+}
+
+#contact-edit-update-now {
+	margin-top: 15px;
+}
+
+#contact-edit-links{
+	clear: both;
+}
+
+#contact-edit-links ul {
+	list-style: none;
+	list-style-type: none;
+	margin-left: 0px;
+	padding-left: 0px;
+}
+
+#contact-edit-links li {
+	margin-top: 5px;
+}
+
+#contact-edit-drop-link {
+	float: right;
+	margin-right: 20px;
+}
+
+#contact-edit-nav-end {
+	clear: both;
+}
+
+#contact-edit-wrapper {
+	width: 100%;
+}
+
+#contact-edit-end {
+	clear: both;
+	margin-top: 15px;
+}
+
+#contact-profile-selector {
+	width: 175px;
+	margin-left: 175px;
+}
+
+.contact-edit-submit {
+	margin-top: 20px;
+}
+
+.contact-entry-wrapper {
+	float: left;
+	width: 120px;
+	height: 120px;
+	padding: 10px;
+}
+
+#contacts-search {
+	font-size: 1em;
+	width: 300px;
+}
+
+#contacts-search-end {
+	margin-bottom: 10px;
+}
+
+.contact-entry-photo-end {
+	clear: both;
+}
+
+.contact-entry-name {
+	float: left;
+	margin-left: 0px;
+	margin-right: 10px;
+	width: 120px;
+	overflow: hidden;
+}
+
+.contact-entry-end {
+	clear: both;
+}
diff --git a/view/tpl/abook_edit.tpl b/view/tpl/abook_edit.tpl
index 30abcc6b3..23368f2f7 100755
--- a/view/tpl/abook_edit.tpl
+++ b/view/tpl/abook_edit.tpl
@@ -30,7 +30,7 @@
 <h3>{{$permlbl}}</h3>
 <div id="perm-desc" class="descriptive-text">{{$permnote}}</div>
 
-<form id="abook-edit-form" action="connections/{{$contact_id}}" method="post" >
+<form id="abook-edit-form" action="connedit/{{$contact_id}}" method="post" >
 <input type="hidden" name="contact_id" value="{{$contact_id}}">
 <input id="contact-closeness-mirror" type="hidden" name="closeness" value="{{$close}}" />
 
-- 
cgit v1.2.3


From 10ef0cd997cd5e391b30c4342be40cf66710cf38 Mon Sep 17 00:00:00 2001
From: "p.tacconi" <p.tacconi@giunti.it>
Date: Wed, 18 Dec 2013 15:19:02 +0100
Subject: corrections to italian translation

---
 view/it/messages.po | 2510 ++++++++++++++++++++++++---------------------------
 view/it/strings.php |  263 +++---
 2 files changed, 1291 insertions(+), 1482 deletions(-)

(limited to 'view')

diff --git a/view/it/messages.po b/view/it/messages.po
index 693e76cee..14d92e170 100644
--- a/view/it/messages.po
+++ b/view/it/messages.po
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Red Matrix\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-12-06 00:02-0800\n"
-"PO-Revision-Date: 2013-12-10 16:05+0000\n"
+"POT-Creation-Date: 2013-12-13 00:04-0800\n"
+"PO-Revision-Date: 2013-12-18 14:07+0000\n"
 "Last-Translator: tuscanhobbit Pa <pynolo@tarine.net>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/red-matrix/language/it/)\n"
 "MIME-Version: 1.0\n"
@@ -58,6 +58,34 @@ msgstr "Guarda %2$s di %1$s "
 msgid "%1$s has an updated %2$s, changing %3$s."
 msgstr "%1$s ha aggiornato %2$s cambiando %3$s."
 
+#: ../../include/dir_fns.php:15
+msgid "Sort Options"
+msgstr "Opzioni di ordinamento"
+
+#: ../../include/dir_fns.php:16
+msgid "Alphabetic"
+msgstr "Alfabetico"
+
+#: ../../include/dir_fns.php:17
+msgid "Reverse Alphabetic"
+msgstr "Alfabetico inverso"
+
+#: ../../include/dir_fns.php:18
+msgid "Newest to Oldest"
+msgstr "Dal più nuovo al più vecchio"
+
+#: ../../include/dir_fns.php:30
+msgid "Enable Safe Search"
+msgstr "Abilita SafeSearch"
+
+#: ../../include/dir_fns.php:32
+msgid "Disable Safe Search"
+msgstr "Disabilita SafeSearch"
+
+#: ../../include/dir_fns.php:34
+msgid "Safe Mode"
+msgstr "Modalità SafeSearch"
+
 #: ../../include/enotify.php:40
 msgid "Red Matrix Notification"
 msgstr "Notifica di Red Matrix"
@@ -254,21 +282,21 @@ msgid "Private Message"
 msgstr "Messaggio privato"
 
 #: ../../include/ItemObject.php:95 ../../include/page_widgets.php:8
-#: ../../mod/webpages.php:101 ../../mod/settings.php:671 ../../mod/menu.php:55
+#: ../../mod/webpages.php:118 ../../mod/settings.php:671 ../../mod/menu.php:55
 #: ../../mod/layouts.php:102 ../../mod/editlayout.php:100
-#: ../../mod/editwebpage.php:119 ../../mod/blocks.php:93
+#: ../../mod/editwebpage.php:143 ../../mod/blocks.php:93
 #: ../../mod/editpost.php:97 ../../mod/editblock.php:114
 msgid "Edit"
 msgstr "Modifica"
 
-#: ../../include/ItemObject.php:107 ../../include/conversation.php:628
-#: ../../mod/settings.php:672 ../../mod/admin.php:690 ../../mod/group.php:182
-#: ../../mod/photos.php:1141 ../../mod/connections.php:374
+#: ../../include/ItemObject.php:107 ../../include/conversation.php:632
+#: ../../mod/settings.php:672 ../../mod/admin.php:693 ../../mod/group.php:182
+#: ../../mod/photos.php:1141 ../../mod/connections.php:378
 #: ../../mod/filestorage.php:82
 msgid "Delete"
 msgstr "Elimina"
 
-#: ../../include/ItemObject.php:113 ../../include/conversation.php:627
+#: ../../include/ItemObject.php:113 ../../include/conversation.php:631
 msgid "Select"
 msgstr "Seleziona"
 
@@ -292,7 +320,7 @@ msgstr "Attiva/disattiva preferito"
 msgid "starred"
 msgstr "preferito"
 
-#: ../../include/ItemObject.php:160 ../../include/conversation.php:638
+#: ../../include/ItemObject.php:160 ../../include/conversation.php:642
 msgid "Message is verified"
 msgstr "Messaggio verificato"
 
@@ -345,20 +373,20 @@ msgstr "Da bacheca a bacheca"
 msgid "via Wall-To-Wall:"
 msgstr "da bacheca a bacheca:"
 
-#: ../../include/ItemObject.php:216 ../../include/conversation.php:682
+#: ../../include/ItemObject.php:216 ../../include/conversation.php:686
 #, php-format
 msgid " from %s"
 msgstr " da %s"
 
-#: ../../include/ItemObject.php:219 ../../include/conversation.php:685
+#: ../../include/ItemObject.php:219 ../../include/conversation.php:689
 #, php-format
 msgid "last edited: %s"
 msgstr "ultima modifica: %s"
 
-#: ../../include/ItemObject.php:246 ../../include/conversation.php:702
-#: ../../include/conversation.php:1112 ../../mod/photos.php:1072
-#: ../../mod/message.php:332 ../../mod/message.php:516
-#: ../../mod/editlayout.php:109 ../../mod/editwebpage.php:128
+#: ../../include/ItemObject.php:246 ../../include/conversation.php:706
+#: ../../include/conversation.php:1116 ../../mod/photos.php:1072
+#: ../../mod/message.php:332 ../../mod/message.php:484
+#: ../../mod/editlayout.php:109 ../../mod/editwebpage.php:152
 #: ../../mod/editpost.php:106 ../../mod/editblock.php:123
 msgid "Please wait"
 msgstr "Attendere"
@@ -371,7 +399,7 @@ msgstr[0] "%d commento"
 msgstr[1] "%d commenti"
 
 #: ../../include/ItemObject.php:268 ../../include/js_strings.php:7
-#: ../../include/contact_widgets.php:148
+#: ../../include/contact_widgets.php:124
 msgid "show more"
 msgstr "mostra tutto"
 
@@ -385,22 +413,21 @@ msgstr "Questo sei tu"
 msgid "Comment"
 msgstr "Commento"
 
-#: ../../include/ItemObject.php:530 ../../mod/events.php:469
+#: ../../include/ItemObject.php:530 ../../mod/events.php:470
 #: ../../mod/thing.php:190 ../../mod/invite.php:154 ../../mod/setup.php:302
 #: ../../mod/setup.php:345 ../../mod/settings.php:609
 #: ../../mod/settings.php:721 ../../mod/settings.php:749
 #: ../../mod/settings.php:773 ../../mod/settings.php:844
 #: ../../mod/settings.php:1005 ../../mod/connect.php:96
-#: ../../mod/sources.php:83 ../../mod/sources.php:110 ../../mod/admin.php:418
-#: ../../mod/admin.php:683 ../../mod/admin.php:823 ../../mod/admin.php:1022
-#: ../../mod/admin.php:1109 ../../mod/group.php:87 ../../mod/photos.php:685
+#: ../../mod/sources.php:83 ../../mod/sources.php:110 ../../mod/admin.php:420
+#: ../../mod/admin.php:686 ../../mod/admin.php:826 ../../mod/admin.php:1025
+#: ../../mod/admin.php:1112 ../../mod/group.php:87 ../../mod/photos.php:685
 #: ../../mod/photos.php:790 ../../mod/photos.php:1051
 #: ../../mod/photos.php:1091 ../../mod/photos.php:1178
-#: ../../mod/message.php:333 ../../mod/message.php:515
-#: ../../mod/profiles.php:529 ../../mod/connections.php:452
-#: ../../mod/import.php:387 ../../mod/crepair.php:166 ../../mod/poke.php:166
-#: ../../mod/fsuggest.php:108 ../../mod/mood.php:137
-#: ../../view/theme/redbasic/php/config.php:85
+#: ../../mod/message.php:333 ../../mod/message.php:483
+#: ../../mod/profiles.php:518 ../../mod/connections.php:456
+#: ../../mod/import.php:387 ../../mod/poke.php:166 ../../mod/fsuggest.php:108
+#: ../../mod/mood.php:137 ../../view/theme/redbasic/php/config.php:85
 #: ../../view/theme/apw/php/config.php:231
 #: ../../view/theme/blogga/view/theme/blog/config.php:67
 #: ../../view/theme/blogga/php/config.php:67
@@ -439,24 +466,24 @@ msgstr "Link"
 msgid "Video"
 msgstr "Video"
 
-#: ../../include/ItemObject.php:539 ../../include/conversation.php:1075
-#: ../../mod/webpages.php:105 ../../mod/photos.php:1092
-#: ../../mod/editlayout.php:129 ../../mod/editwebpage.php:150
+#: ../../include/ItemObject.php:539 ../../include/conversation.php:1079
+#: ../../mod/webpages.php:122 ../../mod/photos.php:1092
+#: ../../mod/editlayout.php:129 ../../mod/editwebpage.php:176
 #: ../../mod/editpost.php:126 ../../mod/editblock.php:144
 msgid "Preview"
 msgstr "Anteprima"
 
-#: ../../include/ItemObject.php:542 ../../include/conversation.php:1139
-#: ../../mod/message.php:338 ../../mod/message.php:521
+#: ../../include/ItemObject.php:542 ../../include/conversation.php:1143
+#: ../../mod/message.php:338 ../../mod/message.php:489
 #: ../../mod/editpost.php:134
 msgid "Encrypt text"
 msgstr "Crittografia del testo"
 
-#: ../../include/Contact.php:87 ../../include/contact_widgets.php:23
-#: ../../include/identity.php:613 ../../mod/match.php:62
-#: ../../mod/suggest.php:56 ../../mod/directory.php:198
+#: ../../include/Contact.php:87 ../../include/widgets.php:96
+#: ../../include/widgets.php:136 ../../include/identity.php:613
+#: ../../mod/match.php:62 ../../mod/suggest.php:58 ../../mod/directory.php:199
 msgid "Connect"
-msgstr "Entra in contatto/segui"
+msgstr "Entra in contatto"
 
 #: ../../include/Contact.php:103
 msgid "New window"
@@ -466,6 +493,128 @@ msgstr "Nuova finestra"
 msgid "Open the selected location in a different window or browser tab"
 msgstr "Apri l'indirizzo selezionato in una nuova scheda o finestra"
 
+#: ../../include/widgets.php:5
+msgid "Displays a full channel profile"
+msgstr "Mostra il profilo completo del canale"
+
+#: ../../include/widgets.php:6
+msgid "Tag cloud of webpage categories"
+msgstr "Nuvola dei tag"
+
+#: ../../include/widgets.php:7
+msgid "List and filter by collection"
+msgstr "Filtra per insiemi di canali"
+
+#: ../../include/widgets.php:8
+msgid "Show a couple of channel suggestion"
+msgstr "Mostra i canali suggeriti"
+
+#: ../../include/widgets.php:9
+msgid "Provide a channel follow form"
+msgstr "Mostra il link connettersi al canale"
+
+#: ../../include/widgets.php:39 ../../include/contact_widgets.php:86
+msgid "Categories"
+msgstr "Categorie"
+
+#: ../../include/widgets.php:98 ../../mod/suggest.php:60
+msgid "Ignore/Hide"
+msgstr "Ignora/nascondi"
+
+#: ../../include/widgets.php:104 ../../mod/connections.php:583
+msgid "Suggestions"
+msgstr "Suggerimenti"
+
+#: ../../include/widgets.php:105
+msgid "See more..."
+msgstr "Altro..."
+
+#: ../../include/widgets.php:127
+#, php-format
+msgid "You have %1$.0f of %2$.0f allowed connections."
+msgstr "Hai attivato %1$.0f delle %2$.0f connessioni permesse."
+
+#: ../../include/widgets.php:133
+msgid "Add New Connection"
+msgstr "Aggiungi un contatto"
+
+#: ../../include/widgets.php:134
+msgid "Enter the channel address"
+msgstr "Scrivi l'indirizzo del canale"
+
+#: ../../include/widgets.php:135
+msgid "Example: bob@example.com, http://example.com/barbara"
+msgstr "Per esempio: mario@pippo.it oppure http://pluto.com/barbara"
+
+#: ../../include/widgets.php:152
+msgid "Notes"
+msgstr "Note"
+
+#: ../../include/widgets.php:154 ../../include/text.php:738
+#: ../../include/text.php:752 ../../mod/filer.php:36
+msgid "Save"
+msgstr "Salva"
+
+#: ../../include/widgets.php:224 ../../mod/search.php:20
+msgid "Remove term"
+msgstr "Rimuovi termine"
+
+#: ../../include/widgets.php:233 ../../include/features.php:48
+#: ../../mod/search.php:17
+msgid "Saved Searches"
+msgstr "Ricerche salvate"
+
+#: ../../include/widgets.php:234 ../../include/group.php:290
+msgid "add"
+msgstr "aggiungi"
+
+#: ../../include/widgets.php:264 ../../include/features.php:62
+#: ../../include/contact_widgets.php:52
+msgid "Saved Folders"
+msgstr "Cartelle salvate"
+
+#: ../../include/widgets.php:267 ../../include/contact_widgets.php:55
+#: ../../include/contact_widgets.php:89
+msgid "Everything"
+msgstr "Tutto"
+
+#: ../../include/widgets.php:299 ../../include/items.php:3550
+msgid "Archives"
+msgstr "Archivi"
+
+#: ../../include/widgets.php:351
+msgid "Refresh"
+msgstr "Aggiorna"
+
+#: ../../include/widgets.php:352 ../../mod/connections.php:408
+msgid "Me"
+msgstr "Io"
+
+#: ../../include/widgets.php:353 ../../mod/connections.php:410
+msgid "Best Friends"
+msgstr "Buoni amici"
+
+#: ../../include/widgets.php:354 ../../include/profile_selectors.php:42
+#: ../../include/identity.php:298 ../../mod/connections.php:411
+msgid "Friends"
+msgstr "Amici"
+
+#: ../../include/widgets.php:355
+msgid "Co-workers"
+msgstr "Colleghi"
+
+#: ../../include/widgets.php:356 ../../mod/connections.php:412
+msgid "Former Friends"
+msgstr "Ex amici"
+
+#: ../../include/widgets.php:357 ../../mod/connections.php:413
+msgid "Acquaintances"
+msgstr "Conoscenti"
+
+#: ../../include/widgets.php:358
+msgid "Everybody"
+msgstr "Tutti"
+
 #: ../../include/contact_selectors.php:30
 msgid "Unknown | Not categorised"
 msgstr "Sconosciuto | Senza categoria"
@@ -526,8 +675,8 @@ msgstr "OStatus"
 msgid "RSS/Atom"
 msgstr "RSS/Atom"
 
-#: ../../include/contact_selectors.php:77 ../../mod/admin.php:686
-#: ../../mod/admin.php:695 ../../boot.php:1442
+#: ../../include/contact_selectors.php:77 ../../mod/admin.php:689
+#: ../../mod/admin.php:698 ../../boot.php:1442
 msgid "Email"
 msgstr "Email"
 
@@ -643,225 +792,13 @@ msgstr "Inizio:"
 
 #: ../../include/event.php:30 ../../include/bb2diaspora.php:447
 msgid "Finishes:"
-msgstr "Fine:"
-
-#: ../../include/event.php:40 ../../include/identity.php:663
-#: ../../include/bb2diaspora.php:455 ../../mod/events.php:462
-#: ../../mod/directory.php:173
-msgid "Location:"
-msgstr "Luogo:"
-
-#: ../../include/features.php:21
-msgid "General Features"
-msgstr "Funzionalità generali"
-
-#: ../../include/features.php:23
-msgid "Content Expiration"
-msgstr "Scadenza"
-
-#: ../../include/features.php:23
-msgid "Remove posts/comments and/or private messages at a future time"
-msgstr "Elimina gli articoli, i commenti o i messaggi privati dopo che è trascorso del tempo"
-
-#: ../../include/features.php:24
-msgid "Multiple Profiles"
-msgstr "Profili multipli"
-
-#: ../../include/features.php:24
-msgid "Ability to create multiple profiles"
-msgstr "Abilitazione a creare profili multipli"
-
-#: ../../include/features.php:25
-msgid "Web Pages"
-msgstr "Pagine web"
-
-#: ../../include/features.php:25
-msgid "Provide managed web pages on your channel"
-msgstr "Attiva la creazione di pagine web sul tuo canale"
-
-#: ../../include/features.php:26
-msgid "Enhanced Photo Albums"
-msgstr "Album fotografici avanzati"
-
-#: ../../include/features.php:26
-msgid "Enable photo album with enhanced features"
-msgstr "Abilita gli album fotografici con funzionalità avanzate"
-
-#: ../../include/features.php:28
-msgid "Extended Identity Sharing"
-msgstr "Condivisione avanzata dell'identità"
-
-#: ../../include/features.php:28 ../../include/js_strings.php:30
-msgid " "
-msgstr " "
-
-#: ../../include/features.php:29
-msgid "Expert Mode"
-msgstr "Modalità esperto"
-
-#: ../../include/features.php:29
-msgid "Enable Expert Mode to provide advanced configuration options"
-msgstr "Abilita la modalità esperto per vedere le opzioni di configurazione avanzate"
-
-#: ../../include/features.php:30
-msgid "Premium Channel"
-msgstr "Canale premium"
-
-#: ../../include/features.php:30
-msgid ""
-"Allows you to set restrictions and terms on those that connect with your "
-"channel"
-msgstr "Ti permette di imporre delle restrizioni e dei termini d'uso a chi segue il canale"
-
-#: ../../include/features.php:35
-msgid "Post Composition Features"
-msgstr "Modalità di scrittura articoli"
-
-#: ../../include/features.php:36
-msgid "Richtext Editor"
-msgstr "Editor grafico"
-
-#: ../../include/features.php:36
-msgid "Enable richtext editor"
-msgstr "Abilita l'editor grafico"
-
-#: ../../include/features.php:37
-msgid "Post Preview"
-msgstr "Anteprima articolo"
-
-#: ../../include/features.php:37
-msgid "Allow previewing posts and comments before publishing them"
-msgstr "Abilita l'anteprima degli articoli e dei commenti prima di pubblicarli"
-
-#: ../../include/features.php:38 ../../mod/settings.php:120
-#: ../../mod/sources.php:67
-msgid "Channel Sources"
-msgstr "Sorgenti del canale"
-
-#: ../../include/features.php:38
-msgid "Automatically import channel content from other channels or feeds"
-msgstr "Importa automaticamente il contenuto del canale da altri canali o feed"
-
-#: ../../include/features.php:39
-msgid "Even More Encryption"
-msgstr "Crittografia addizionale"
-
-#: ../../include/features.php:39
-msgid "Allow encryption of content end-to-end with a shared secret key"
-msgstr "Abilita la crittografia dei contenuti tra il mittente e i destinatari con una chiave segreta"
-
-#: ../../include/features.php:44
-msgid "Network and Stream Filtering"
-msgstr "Filtraggio dei contenuti"
-
-#: ../../include/features.php:45
-msgid "Search by Date"
-msgstr "Ricerca per data"
-
-#: ../../include/features.php:45
-msgid "Ability to select posts by date ranges"
-msgstr "Per selezionare gli articoli in un intervallo tra date"
-
-#: ../../include/features.php:46
-msgid "Collections Filter"
-msgstr "Filtra per insiemi di canali"
-
-#: ../../include/features.php:46
-msgid "Enable widget to display Network posts only from selected collections"
-msgstr "Mostra il riquadro per filtrare gli articoli di certi insiemi di canali"
-
-#: ../../include/features.php:47 ../../mod/search.php:17
-#: ../../mod/network.php:122
-msgid "Saved Searches"
-msgstr "Ricerche salvate"
-
-#: ../../include/features.php:47
-msgid "Save search terms for re-use"
-msgstr "Salva i termini delle ricerche per poterle ripetere"
-
-#: ../../include/features.php:48
-msgid "Network Personal Tab"
-msgstr "Attività personale"
-
-#: ../../include/features.php:48
-msgid "Enable tab to display only Network posts that you've interacted on"
-msgstr "Abilita il link per mostrare solamente i contenuti con cui hai interagito"
-
-#: ../../include/features.php:49
-msgid "Network New Tab"
-msgstr "Contenuti nuovi"
-
-#: ../../include/features.php:49
-msgid "Enable tab to display all new Network activity"
-msgstr "Abilita il link per visualizzare solo i nuovi contenuti"
-
-#: ../../include/features.php:50
-msgid "Affinity Tool"
-msgstr "Filtro per affinità"
-
-#: ../../include/features.php:50
-msgid "Filter stream activity by depth of relationships"
-msgstr "Permette di selezionare i contenuti in base al livello di amicizia"
-
-#: ../../include/features.php:55
-msgid "Post/Comment Tools"
-msgstr "Gestione articoli e commenti"
-
-#: ../../include/features.php:57
-msgid "Edit Sent Posts"
-msgstr "Modifica gli articoli già inviati"
-
-#: ../../include/features.php:57
-msgid "Edit and correct posts and comments after sending"
-msgstr "Modifica e correggi gli articoli o i commenti anche dopo l'invio"
-
-#: ../../include/features.php:58
-msgid "Tagging"
-msgstr "Tag"
-
-#: ../../include/features.php:58
-msgid "Ability to tag existing posts"
-msgstr "Permetti l'aggiunta di tag su articoli già esistenti"
-
-#: ../../include/features.php:59
-msgid "Post Categories"
-msgstr "Categorie degli articoli"
-
-#: ../../include/features.php:59
-msgid "Add categories to your posts"
-msgstr "Abilita le categorie per i tuoi articoli"
-
-#: ../../include/features.php:60 ../../include/contact_widgets.php:76
-msgid "Saved Folders"
-msgstr "Cartelle salvate"
-
-#: ../../include/features.php:60
-msgid "Ability to file posts under folders"
-msgstr "Abilita la raccolta dei tuoi articoli in cartelle"
-
-#: ../../include/features.php:61
-msgid "Dislike Posts"
-msgstr "Non mi piace"
-
-#: ../../include/features.php:61
-msgid "Ability to dislike posts/comments"
-msgstr "Abilità la funzionalità \"non mi piace\" per i tuoi articoli"
-
-#: ../../include/features.php:62
-msgid "Star Posts"
-msgstr "Articoli stella (preferiti)"
-
-#: ../../include/features.php:62
-msgid "Ability to mark special posts with a star indicator"
-msgstr "Mostra la stella per scegliere gli articoli preferiti"
-
-#: ../../include/features.php:63
-msgid "Tag Cloud"
-msgstr "Nuvola di tag"
+msgstr "Fine:"
 
-#: ../../include/features.php:63
-msgid "Provide a personal tag cloud on your channel page"
-msgstr "Mostra la nuvola dei tag che usi di più sulla pagina del tuo canale"
+#: ../../include/event.php:40 ../../include/identity.php:664
+#: ../../include/bb2diaspora.php:455 ../../mod/events.php:463
+#: ../../mod/directory.php:174
+msgid "Location:"
+msgstr "Luogo:"
 
 #: ../../include/group.php:25
 msgid ""
@@ -874,7 +811,7 @@ msgstr "È stato ripristinato un insieme con lo stesso nome che era stato elimin
 msgid "Default privacy group for new contacts"
 msgstr "Insieme predefinito per i nuovi canali che aggiungi"
 
-#: ../../include/group.php:242 ../../mod/admin.php:695
+#: ../../include/group.php:242 ../../mod/admin.php:698
 msgid "All Channels"
 msgstr "Tutti i canali"
 
@@ -898,10 +835,6 @@ msgstr "Crea un nuovo insieme"
 msgid "Channels not in any collection"
 msgstr "Canali che non sono in un insieme"
 
-#: ../../include/group.php:290 ../../mod/network.php:123
-msgid "add"
-msgstr "aggiungi"
-
 #: ../../include/js_strings.php:5
 msgid "Delete this item?"
 msgstr "Eliminare questo elemento?"
@@ -995,6 +928,10 @@ msgstr "circa un anno"
 msgid "%d years"
 msgstr "%d anni"
 
+#: ../../include/js_strings.php:30 ../../include/features.php:29
+msgid " "
+msgstr " "
+
 #: ../../include/js_strings.php:31
 msgid "timeago.numbers"
 msgstr "timeago.numbers"
@@ -1017,8 +954,8 @@ msgstr "Non è stato possibile verificare l'articolo inserito."
 
 #: ../../include/photo/photo_driver.php:609 ../../include/photos.php:51
 #: ../../mod/photos.php:97 ../../mod/photos.php:775 ../../mod/photos.php:797
-#: ../../mod/profile_photo.php:88 ../../mod/profile_photo.php:235
-#: ../../mod/profile_photo.php:346
+#: ../../mod/profile_photo.php:78 ../../mod/profile_photo.php:225
+#: ../../mod/profile_photo.php:336
 msgid "Profile Photos"
 msgstr "Foto del profilo"
 
@@ -1060,6 +997,221 @@ msgstr "Contenuti incorporati"
 msgid "Embedding disabled"
 msgstr "Contenuti incorporati - funzione disabilitata"
 
+#: ../../include/features.php:21
+msgid "General Features"
+msgstr "Funzionalità generali"
+
+#: ../../include/features.php:23
+msgid "Content Expiration"
+msgstr "Scadenza"
+
+#: ../../include/features.php:23
+msgid "Remove posts/comments and/or private messages at a future time"
+msgstr "Elimina gli articoli, i commenti o i messaggi privati dopo che è trascorso del tempo"
+
+#: ../../include/features.php:24
+msgid "Multiple Profiles"
+msgstr "Profili multipli"
+
+#: ../../include/features.php:24
+msgid "Ability to create multiple profiles"
+msgstr "Abilitazione a creare profili multipli"
+
+#: ../../include/features.php:25
+msgid "Web Pages"
+msgstr "Pagine web"
+
+#: ../../include/features.php:25
+msgid "Provide managed web pages on your channel"
+msgstr "Attiva la creazione di pagine web sul tuo canale"
+
+#: ../../include/features.php:26
+msgid "Private Notes"
+msgstr "Note private"
+
+#: ../../include/features.php:26
+msgid "Enables a tool to store notes and reminders"
+msgstr "Abilita il riquadro per scrivere annotazioni"
+
+#: ../../include/features.php:27
+msgid "Enhanced Photo Albums"
+msgstr "Album fotografici avanzati"
+
+#: ../../include/features.php:27
+msgid "Enable photo album with enhanced features"
+msgstr "Abilita gli album fotografici con funzionalità avanzate"
+
+#: ../../include/features.php:29
+msgid "Extended Identity Sharing"
+msgstr "Condivisione avanzata dell'identità"
+
+#: ../../include/features.php:30
+msgid "Expert Mode"
+msgstr "Modalità esperto"
+
+#: ../../include/features.php:30
+msgid "Enable Expert Mode to provide advanced configuration options"
+msgstr "Abilita la modalità esperto per vedere le opzioni di configurazione avanzate"
+
+#: ../../include/features.php:31
+msgid "Premium Channel"
+msgstr "Canale premium"
+
+#: ../../include/features.php:31
+msgid ""
+"Allows you to set restrictions and terms on those that connect with your "
+"channel"
+msgstr "Ti permette di imporre delle restrizioni e dei termini d'uso a chi segue il canale"
+
+#: ../../include/features.php:36
+msgid "Post Composition Features"
+msgstr "Modalità di scrittura articoli"
+
+#: ../../include/features.php:37
+msgid "Richtext Editor"
+msgstr "Editor grafico"
+
+#: ../../include/features.php:37
+msgid "Enable richtext editor"
+msgstr "Abilita l'editor grafico"
+
+#: ../../include/features.php:38
+msgid "Post Preview"
+msgstr "Anteprima articolo"
+
+#: ../../include/features.php:38
+msgid "Allow previewing posts and comments before publishing them"
+msgstr "Abilita l'anteprima degli articoli e dei commenti prima di pubblicarli"
+
+#: ../../include/features.php:39 ../../mod/settings.php:120
+#: ../../mod/sources.php:67
+msgid "Channel Sources"
+msgstr "Sorgenti del canale"
+
+#: ../../include/features.php:39
+msgid "Automatically import channel content from other channels or feeds"
+msgstr "Importa automaticamente il contenuto del canale da altri canali o feed"
+
+#: ../../include/features.php:40
+msgid "Even More Encryption"
+msgstr "Crittografia addizionale"
+
+#: ../../include/features.php:40
+msgid "Allow encryption of content end-to-end with a shared secret key"
+msgstr "Abilita la crittografia dei contenuti tra il mittente e i destinatari con una chiave segreta"
+
+#: ../../include/features.php:45
+msgid "Network and Stream Filtering"
+msgstr "Filtraggio dei contenuti"
+
+#: ../../include/features.php:46
+msgid "Search by Date"
+msgstr "Ricerca per data"
+
+#: ../../include/features.php:46
+msgid "Ability to select posts by date ranges"
+msgstr "Per selezionare gli articoli in un intervallo tra date"
+
+#: ../../include/features.php:47
+msgid "Collections Filter"
+msgstr "Filtra per insiemi di canali"
+
+#: ../../include/features.php:47
+msgid "Enable widget to display Network posts only from selected collections"
+msgstr "Mostra il riquadro per filtrare gli articoli di certi insiemi di canali"
+
+#: ../../include/features.php:48
+msgid "Save search terms for re-use"
+msgstr "Salva i termini delle ricerche per poterle ripetere"
+
+#: ../../include/features.php:49
+msgid "Network Personal Tab"
+msgstr "Attività personale"
+
+#: ../../include/features.php:49
+msgid "Enable tab to display only Network posts that you've interacted on"
+msgstr "Abilita il link per mostrare solamente i contenuti con cui hai interagito"
+
+#: ../../include/features.php:50
+msgid "Network New Tab"
+msgstr "Contenuti nuovi"
+
+#: ../../include/features.php:50
+msgid "Enable tab to display all new Network activity"
+msgstr "Abilita il link per visualizzare solo i nuovi contenuti"
+
+#: ../../include/features.php:51
+msgid "Affinity Tool"
+msgstr "Filtro per affinità"
+
+#: ../../include/features.php:51
+msgid "Filter stream activity by depth of relationships"
+msgstr "Permette di selezionare i contenuti in base al livello di amicizia"
+
+#: ../../include/features.php:52
+msgid "Suggest Channels"
+msgstr "Suggerisci canali"
+
+#: ../../include/features.php:52
+msgid "Show channel suggestions"
+msgstr "Mostra alcuni canali che potrebbero interessarti"
+
+#: ../../include/features.php:57
+msgid "Post/Comment Tools"
+msgstr "Gestione articoli e commenti"
+
+#: ../../include/features.php:59
+msgid "Edit Sent Posts"
+msgstr "Modifica gli articoli già inviati"
+
+#: ../../include/features.php:59
+msgid "Edit and correct posts and comments after sending"
+msgstr "Modifica e correggi gli articoli o i commenti anche dopo l'invio"
+
+#: ../../include/features.php:60
+msgid "Tagging"
+msgstr "Tag"
+
+#: ../../include/features.php:60
+msgid "Ability to tag existing posts"
+msgstr "Permetti l'aggiunta di tag su articoli già esistenti"
+
+#: ../../include/features.php:61
+msgid "Post Categories"
+msgstr "Categorie degli articoli"
+
+#: ../../include/features.php:61
+msgid "Add categories to your posts"
+msgstr "Abilita le categorie per i tuoi articoli"
+
+#: ../../include/features.php:62
+msgid "Ability to file posts under folders"
+msgstr "Abilita la raccolta dei tuoi articoli in cartelle"
+
+#: ../../include/features.php:63
+msgid "Dislike Posts"
+msgstr "Non mi piace"
+
+#: ../../include/features.php:63
+msgid "Ability to dislike posts/comments"
+msgstr "Abilità la funzionalità \"non mi piace\" per i tuoi articoli"
+
+#: ../../include/features.php:64
+msgid "Star Posts"
+msgstr "Articoli stella (preferiti)"
+
+#: ../../include/features.php:64
+msgid "Ability to mark special posts with a star indicator"
+msgstr "Mostra la stella per scegliere gli articoli preferiti"
+
+#: ../../include/features.php:65
+msgid "Tag Cloud"
+msgstr "Nuvola di tag"
+
+#: ../../include/features.php:65
+msgid "Provide a personal tag cloud on your channel page"
+msgstr "Mostra la nuvola dei tag che usi di più sulla pagina del tuo canale"
+
 #: ../../include/notify.php:23
 msgid "created a new post"
 msgstr "Ha creato un nuovo articolo"
@@ -1074,30 +1226,29 @@ msgstr "ha commentato l'articolo di %s"
 #: ../../include/attach.php:204 ../../include/attach.php:237
 #: ../../include/attach.php:251 ../../include/attach.php:272
 #: ../../include/attach.php:464 ../../include/attach.php:539
-#: ../../include/items.php:3412 ../../mod/common.php:43
-#: ../../mod/events.php:139 ../../mod/invite.php:13 ../../mod/invite.php:102
+#: ../../include/items.php:3429 ../../mod/common.php:35
+#: ../../mod/events.php:140 ../../mod/invite.php:13 ../../mod/invite.php:102
 #: ../../mod/allfriends.php:10 ../../mod/webpages.php:40 ../../mod/api.php:26
-#: ../../mod/api.php:31 ../../mod/lastpost.php:93 ../../mod/page.php:30
-#: ../../mod/page.php:80 ../../mod/setup.php:200 ../../mod/settings.php:586
-#: ../../mod/viewconnections.php:33 ../../mod/viewconnections.php:38
-#: ../../mod/delegate.php:6 ../../mod/sources.php:48 ../../mod/mitem.php:92
+#: ../../mod/api.php:31 ../../mod/page.php:30 ../../mod/page.php:80
+#: ../../mod/setup.php:200 ../../mod/settings.php:586
+#: ../../mod/viewconnections.php:22 ../../mod/viewconnections.php:27
+#: ../../mod/delegate.php:6 ../../mod/sources.php:48 ../../mod/mitem.php:73
 #: ../../mod/group.php:15 ../../mod/photos.php:74 ../../mod/photos.php:654
 #: ../../mod/viewsrc.php:12 ../../mod/menu.php:40 ../../mod/message.php:208
 #: ../../mod/layouts.php:27 ../../mod/layouts.php:42 ../../mod/network.php:12
-#: ../../mod/intro.php:50 ../../mod/profiles.php:163
-#: ../../mod/profiles.php:476 ../../mod/new_channel.php:66
-#: ../../mod/new_channel.php:97 ../../mod/connections.php:197
-#: ../../mod/filestorage.php:26 ../../mod/manage.php:6
-#: ../../mod/crepair.php:115 ../../mod/editlayout.php:48
-#: ../../mod/profile_photo.php:197 ../../mod/profile_photo.php:210
-#: ../../mod/editwebpage.php:42 ../../mod/editwebpage.php:64
+#: ../../mod/profiles.php:152 ../../mod/profiles.php:465
+#: ../../mod/new_channel.php:66 ../../mod/new_channel.php:97
+#: ../../mod/connections.php:201 ../../mod/filestorage.php:26
+#: ../../mod/manage.php:6 ../../mod/editlayout.php:48
+#: ../../mod/profile_photo.php:187 ../../mod/profile_photo.php:200
+#: ../../mod/editwebpage.php:44 ../../mod/editwebpage.php:83
 #: ../../mod/notifications.php:66 ../../mod/blocks.php:29
 #: ../../mod/blocks.php:44 ../../mod/editpost.php:13 ../../mod/poke.php:128
-#: ../../mod/channel.php:110 ../../mod/fsuggest.php:78
+#: ../../mod/channel.php:86 ../../mod/fsuggest.php:78
 #: ../../mod/editblock.php:48 ../../mod/item.php:181 ../../mod/item.php:189
-#: ../../mod/suggest.php:32 ../../mod/register.php:68 ../../mod/regmod.php:18
+#: ../../mod/suggest.php:33 ../../mod/register.php:68 ../../mod/regmod.php:18
 #: ../../mod/authtest.php:13 ../../mod/mood.php:114 ../../index.php:178
-#: ../../index.php:340
+#: ../../index.php:346
 msgid "Permission denied."
 msgstr "Permesso negato."
 
@@ -1110,7 +1261,7 @@ msgstr "L'immagine supera il limite massimo di %lu bytes"
 msgid "Image file is empty."
 msgstr "Il file dell'immagine è vuoto."
 
-#: ../../include/photos.php:124 ../../mod/profile_photo.php:157
+#: ../../include/photos.php:124 ../../mod/profile_photo.php:147
 msgid "Unable to process image"
 msgstr "Impossibile elaborare l'immagine"
 
@@ -1118,7 +1269,7 @@ msgstr "Impossibile elaborare l'immagine"
 msgid "Photo storage failed."
 msgstr "Impossibile caricare la foto."
 
-#: ../../include/photos.php:288 ../../include/conversation.php:1453
+#: ../../include/photos.php:288 ../../include/conversation.php:1457
 msgid "Photo Albums"
 msgstr "Album foto"
 
@@ -1271,11 +1422,6 @@ msgstr "Infedele"
 msgid "Sex Addict"
 msgstr "Sesso-dipendente"
 
-#: ../../include/profile_selectors.php:42 ../../include/identity.php:298
-#: ../../mod/network.php:215 ../../mod/connections.php:407
-msgid "Friends"
-msgstr "Amici"
-
 #: ../../include/profile_selectors.php:42
 msgid "Friends/Benefits"
 msgstr "Amici piccanti"
@@ -1447,8 +1593,8 @@ msgstr "Bacheca"
 msgid "Your posts and conversations"
 msgstr "I tuoi articoli e conversazioni"
 
-#: ../../include/nav.php:76 ../../include/conversation.php:925
-#: ../../mod/connections.php:327 ../../mod/connections.php:441
+#: ../../include/nav.php:76 ../../include/conversation.php:929
+#: ../../mod/connections.php:331 ../../mod/connections.php:445
 msgid "View Profile"
 msgstr "Profilo"
 
@@ -1464,7 +1610,7 @@ msgstr "Modifica i profili"
 msgid "Manage/Edit Profiles"
 msgstr "Gestisci e modifica i profili"
 
-#: ../../include/nav.php:79 ../../include/conversation.php:1450
+#: ../../include/nav.php:79 ../../include/conversation.php:1454
 #: ../../mod/fbrowser.php:25
 msgid "Photos"
 msgstr "Foto"
@@ -1519,7 +1665,7 @@ msgid "Addon applications, utilities, games"
 msgstr "App, strumenti e giochi aggiuntivi"
 
 #: ../../include/nav.php:135 ../../include/text.php:736
-#: ../../mod/search.php:96
+#: ../../include/text.php:750 ../../mod/search.php:96
 msgid "Search"
 msgstr "Cerca"
 
@@ -1527,7 +1673,7 @@ msgstr "Cerca"
 msgid "Search site content"
 msgstr "Cerca nel sito"
 
-#: ../../include/nav.php:138 ../../mod/directory.php:225
+#: ../../include/nav.php:138 ../../mod/directory.php:228
 msgid "Directory"
 msgstr "Tutti i canali"
 
@@ -1544,142 +1690,162 @@ msgid "Your matrix"
 msgstr "La tua rete"
 
 #: ../../include/nav.php:150
-msgid "See all matrix notifications"
-msgstr "Notifiche dalla tua rete"
-
-#: ../../include/nav.php:151
 msgid "Mark all matrix notifications seen"
 msgstr "Segna come lette le notifiche della tua rete"
 
-#: ../../include/nav.php:153
+#: ../../include/nav.php:152
 msgid "Channel Home"
 msgstr "Bacheca del canale"
 
-#: ../../include/nav.php:153
+#: ../../include/nav.php:152
 msgid "Channel home"
 msgstr "Bacheca del canale"
 
-#: ../../include/nav.php:154
-msgid "See all channel notifications"
-msgstr "Guarda le notifiche dei canali"
-
-#: ../../include/nav.php:155
+#: ../../include/nav.php:153
 msgid "Mark all channel notifications seen"
 msgstr "Segna come lette le notifiche dei canali"
 
-#: ../../include/nav.php:158
+#: ../../include/nav.php:156
 msgid "Intros"
 msgstr "Richieste"
 
-#: ../../include/nav.php:158 ../../mod/connections.php:585
+#: ../../include/nav.php:156 ../../mod/connections.php:589
 msgid "New Connections"
 msgstr "Nuovi contatti"
 
 #: ../../include/nav.php:159
-msgid "See all channel introductions"
-msgstr "Guarda tutte le richieste di amicizia"
-
-#: ../../include/nav.php:162
 msgid "Notices"
 msgstr "Notifiche"
 
-#: ../../include/nav.php:162 ../../mod/notifications.php:218
+#: ../../include/nav.php:159
 msgid "Notifications"
 msgstr "Notifiche"
 
-#: ../../include/nav.php:163
+#: ../../include/nav.php:160
 msgid "See all notifications"
 msgstr "Vedi tutte le notifiche"
 
-#: ../../include/nav.php:164
+#: ../../include/nav.php:161
 msgid "Mark all system notifications seen"
 msgstr "Segna come lette le notifiche di sistema"
 
-#: ../../include/nav.php:166
+#: ../../include/nav.php:163
 msgid "Mail"
 msgstr "Messaggi"
 
-#: ../../include/nav.php:166
+#: ../../include/nav.php:163
 msgid "Private mail"
 msgstr "Messaggi privati"
 
-#: ../../include/nav.php:167
+#: ../../include/nav.php:164
 msgid "See all private messages"
 msgstr "Guarda tutti i messaggi privati"
 
-#: ../../include/nav.php:168
+#: ../../include/nav.php:165
 msgid "Mark all private messages seen"
 msgstr "Segna come letti tutti i messaggi privati"
 
-#: ../../include/nav.php:169
+#: ../../include/nav.php:166
 msgid "Inbox"
 msgstr "In arrivo"
 
-#: ../../include/nav.php:170
+#: ../../include/nav.php:167
 msgid "Outbox"
 msgstr "Inviati"
 
-#: ../../include/nav.php:171 ../../mod/message.php:24
+#: ../../include/nav.php:168 ../../mod/message.php:24
 msgid "New Message"
 msgstr "Nuovo messaggio"
 
-#: ../../include/nav.php:174 ../../include/conversation.php:1461
-#: ../../mod/events.php:353
+#: ../../include/nav.php:171 ../../include/conversation.php:1465
+#: ../../mod/events.php:354
 msgid "Events"
 msgstr "Eventi"
 
-#: ../../include/nav.php:174
+#: ../../include/nav.php:171
 msgid "Event Calendar"
 msgstr "Calendario"
 
-#: ../../include/nav.php:175
+#: ../../include/nav.php:172
 msgid "See all events"
 msgstr "Guarda tutti gli eventi"
 
-#: ../../include/nav.php:176
+#: ../../include/nav.php:173
 msgid "Mark all events seen"
 msgstr "Marca come letti tutti gli eventi"
 
-#: ../../include/nav.php:178
+#: ../../include/nav.php:175
 msgid "Channel Select"
 msgstr "Gestisci i canali"
 
-#: ../../include/nav.php:178
+#: ../../include/nav.php:175
 msgid "Manage Your Channels"
 msgstr "Gestisci i contatti dei tuoi canali"
 
-#: ../../include/nav.php:180 ../../mod/settings.php:131
-#: ../../mod/admin.php:782 ../../mod/admin.php:987
+#: ../../include/nav.php:177 ../../mod/settings.php:131
+#: ../../mod/admin.php:785 ../../mod/admin.php:990
 msgid "Settings"
 msgstr "Impostazioni"
 
-#: ../../include/nav.php:180
+#: ../../include/nav.php:177
 msgid "Account/Channel Settings"
 msgstr "Impostazioni account e canali"
 
-#: ../../include/nav.php:182 ../../mod/connections.php:690
+#: ../../include/nav.php:179 ../../mod/connections.php:694
 msgid "Connections"
 msgstr "Contatti"
 
-#: ../../include/nav.php:182
+#: ../../include/nav.php:179
 msgid "Manage/Edit Friends and Connections"
 msgstr "Modifica amici e contatti"
 
-#: ../../include/nav.php:189 ../../mod/admin.php:111
+#: ../../include/nav.php:186 ../../mod/admin.php:111
 msgid "Admin"
 msgstr "Amministrazione"
 
-#: ../../include/nav.php:189
-msgid "Site Setup and Configuration"
-msgstr "Configurazione del sito"
+#: ../../include/nav.php:186
+msgid "Site Setup and Configuration"
+msgstr "Configurazione del sito"
+
+#: ../../include/nav.php:212
+msgid "Nothing new here"
+msgstr "Niente di nuovo qui"
+
+#: ../../include/nav.php:217
+msgid "Please wait..."
+msgstr "Attendere..."
+
+#: ../../include/taxonomy.php:210
+msgid "Tags"
+msgstr "Tag"
+
+#: ../../include/taxonomy.php:224
+msgid "Keywords"
+msgstr "Parole chiave"
+
+#: ../../include/taxonomy.php:249
+msgid "have"
+msgstr "ho"
+
+#: ../../include/taxonomy.php:249
+msgid "has"
+msgstr "ha"
+
+#: ../../include/taxonomy.php:250
+msgid "want"
+msgstr "voglio"
+
+#: ../../include/taxonomy.php:250
+msgid "wants"
+msgstr "vuole"
 
-#: ../../include/nav.php:215
-msgid "Nothing new here"
-msgstr "Niente di nuovo qui"
+#: ../../include/taxonomy.php:251
+msgid "likes"
+msgstr "ama"
 
-#: ../../include/nav.php:220
-msgid "Please wait..."
-msgstr "Attendere..."
+#: ../../include/taxonomy.php:252
+msgid "dislikes"
+msgstr "non ama"
 
 #: ../../include/account.php:23
 msgid "Not a valid email address"
@@ -1737,12 +1903,12 @@ msgstr "Account approvato."
 msgid "Registration revoked for %s"
 msgstr "Registrazione revocata per %s"
 
-#: ../../include/conversation.php:117 ../../include/text.php:1609
+#: ../../include/conversation.php:117 ../../include/text.php:1621
 #: ../../mod/like.php:103 ../../mod/subthread.php:89 ../../mod/tagger.php:45
 msgid "photo"
 msgstr "la foto"
 
-#: ../../include/conversation.php:120 ../../include/text.php:1612
+#: ../../include/conversation.php:120 ../../include/text.php:1624
 #: ../../mod/tagger.php:49
 msgid "event"
 msgstr "l'evento"
@@ -1751,12 +1917,12 @@ msgstr "l'evento"
 msgid "channel"
 msgstr "canale"
 
-#: ../../include/conversation.php:145 ../../include/text.php:1615
+#: ../../include/conversation.php:145 ../../include/text.php:1627
 #: ../../mod/like.php:103 ../../mod/subthread.php:89 ../../mod/tagger.php:53
 msgid "status"
 msgstr "il messaggio di stato"
 
-#: ../../include/conversation.php:147 ../../include/text.php:1617
+#: ../../include/conversation.php:147 ../../include/text.php:1629
 #: ../../mod/tagger.php:55
 msgid "comment"
 msgstr "il commento"
@@ -1776,352 +1942,352 @@ msgstr "A %1$s non piace %3$s di %2$s"
 msgid "%1$s is now connected with %2$s"
 msgstr "%1$s adesso è connesso con %2$s"
 
-#: ../../include/conversation.php:232
+#: ../../include/conversation.php:236
 #, php-format
 msgid "%1$s poked %2$s"
 msgstr "%1$s ha mandato un poke a %2$s"
 
-#: ../../include/conversation.php:236 ../../include/text.php:776
+#: ../../include/conversation.php:240 ../../include/text.php:790
 msgid "poked"
 msgstr "ha ricevuto un poke"
 
-#: ../../include/conversation.php:254 ../../mod/mood.php:63
+#: ../../include/conversation.php:258 ../../mod/mood.php:63
 #, php-format
 msgid "%1$s is currently %2$s"
 msgstr "%1$s al momento è %2$s"
 
-#: ../../include/conversation.php:658
+#: ../../include/conversation.php:662
 #, php-format
 msgid "View %s's profile @ %s"
 msgstr "Vedi il profilo di %s @ %s"
 
-#: ../../include/conversation.php:672
+#: ../../include/conversation.php:676
 msgid "Categories:"
 msgstr "Categorie:"
 
-#: ../../include/conversation.php:673
+#: ../../include/conversation.php:677
 msgid "Filed under:"
 msgstr "Classificato come:"
 
-#: ../../include/conversation.php:700
+#: ../../include/conversation.php:704
 msgid "View in context"
 msgstr "Vedi nel contesto"
 
-#: ../../include/conversation.php:826
+#: ../../include/conversation.php:830
 msgid "remove"
 msgstr "rimuovi"
 
-#: ../../include/conversation.php:830
+#: ../../include/conversation.php:834
 msgid "Loading..."
 msgstr "Caricamento in corso..."
 
-#: ../../include/conversation.php:831
+#: ../../include/conversation.php:835
 msgid "Delete Selected Items"
 msgstr "Elimina gli oggetti selezionati"
 
-#: ../../include/conversation.php:922
+#: ../../include/conversation.php:926
 msgid "View Source"
 msgstr "Vedi il sorgente"
 
-#: ../../include/conversation.php:923
+#: ../../include/conversation.php:927
 msgid "Follow Thread"
 msgstr "Segui la discussione"
 
-#: ../../include/conversation.php:924
+#: ../../include/conversation.php:928
 msgid "View Status"
 msgstr "Guarda il messaggio di stato"
 
-#: ../../include/conversation.php:926
+#: ../../include/conversation.php:930
 msgid "View Photos"
 msgstr "Guarda le foto"
 
-#: ../../include/conversation.php:927
+#: ../../include/conversation.php:931
 msgid "Matrix Activity"
 msgstr "Attività nella tua rete"
 
-#: ../../include/conversation.php:928
+#: ../../include/conversation.php:932
 msgid "Edit Contact"
 msgstr "Modifica il contatto"
 
-#: ../../include/conversation.php:929
+#: ../../include/conversation.php:933
 msgid "Send PM"
 msgstr "Invia messaggio privato"
 
-#: ../../include/conversation.php:930
+#: ../../include/conversation.php:934
 msgid "Poke"
 msgstr "Poke"
 
-#: ../../include/conversation.php:992
+#: ../../include/conversation.php:996
 #, php-format
 msgid "%s likes this."
 msgstr "Piace a %s."
 
-#: ../../include/conversation.php:992
+#: ../../include/conversation.php:996
 #, php-format
 msgid "%s doesn't like this."
 msgstr "Non piace a %s."
 
-#: ../../include/conversation.php:996
+#: ../../include/conversation.php:1000
 #, php-format
 msgid "<span  %1$s>%2$d people</span> like this."
 msgid_plural "<span  %1$s>%2$d people</span> like this."
 msgstr[0] ""
 msgstr[1] "Piace a <span %1$s>%2$d persone</span>."
 
-#: ../../include/conversation.php:998
+#: ../../include/conversation.php:1002
 #, php-format
 msgid "<span  %1$s>%2$d people</span> don't like this."
 msgid_plural "<span  %1$s>%2$d people</span> don't like this."
 msgstr[0] ""
 msgstr[1] "Non piace a <span %1$s>%2$d persone</span>."
 
-#: ../../include/conversation.php:1004
+#: ../../include/conversation.php:1008
 msgid "and"
 msgstr "e"
 
-#: ../../include/conversation.php:1007
+#: ../../include/conversation.php:1011
 #, php-format
 msgid ", and %d other people"
 msgid_plural ", and %d other people"
 msgstr[0] ""
 msgstr[1] "e altre %d persone"
 
-#: ../../include/conversation.php:1008
+#: ../../include/conversation.php:1012
 #, php-format
 msgid "%s like this."
 msgstr "Piace a %s."
 
-#: ../../include/conversation.php:1008
+#: ../../include/conversation.php:1012
 #, php-format
 msgid "%s don't like this."
 msgstr "Non piace a %s."
 
-#: ../../include/conversation.php:1058
+#: ../../include/conversation.php:1062
 msgid "Visible to <strong>everybody</strong>"
 msgstr "Visibile a <strong>tutti</strong>"
 
-#: ../../include/conversation.php:1059 ../../mod/message.php:281
+#: ../../include/conversation.php:1063 ../../mod/message.php:281
 #: ../../mod/message.php:417
 msgid "Please enter a link URL:"
 msgstr "Inserisci l'indirizzo del link:"
 
-#: ../../include/conversation.php:1060
+#: ../../include/conversation.php:1064
 msgid "Please enter a video link/URL:"
 msgstr "Inserisci l'indirizzo del video:"
 
-#: ../../include/conversation.php:1061
+#: ../../include/conversation.php:1065
 msgid "Please enter an audio link/URL:"
 msgstr "Inserisci l'indirizzo dell'audio:"
 
-#: ../../include/conversation.php:1062
+#: ../../include/conversation.php:1066
 msgid "Tag term:"
 msgstr "Tag:"
 
-#: ../../include/conversation.php:1063 ../../mod/filer.php:35
+#: ../../include/conversation.php:1067 ../../mod/filer.php:35
 msgid "Save to Folder:"
 msgstr "Salva nella cartella:"
 
-#: ../../include/conversation.php:1064
+#: ../../include/conversation.php:1068
 msgid "Where are you right now?"
 msgstr "Dove sei ora?"
 
-#: ../../include/conversation.php:1065 ../../mod/message.php:282
+#: ../../include/conversation.php:1069 ../../mod/message.php:282
 #: ../../mod/message.php:418 ../../mod/editpost.php:52
 msgid "Expires YYYY-MM-DD HH:MM"
 msgstr "Scadenza il AAAA-MM-GG OO:MM"
 
-#: ../../include/conversation.php:1089 ../../mod/photos.php:1071
+#: ../../include/conversation.php:1093 ../../mod/photos.php:1071
 msgid "Share"
 msgstr "Condividi"
 
-#: ../../include/conversation.php:1091
+#: ../../include/conversation.php:1095 ../../mod/editwebpage.php:139
 msgid "Page link title"
 msgstr "Link del titolo"
 
-#: ../../include/conversation.php:1093 ../../mod/message.php:329
-#: ../../mod/message.php:512 ../../mod/editlayout.php:101
-#: ../../mod/editwebpage.php:120 ../../mod/editpost.php:98
+#: ../../include/conversation.php:1097 ../../mod/message.php:329
+#: ../../mod/message.php:480 ../../mod/editlayout.php:101
+#: ../../mod/editwebpage.php:144 ../../mod/editpost.php:98
 #: ../../mod/editblock.php:115
 msgid "Upload photo"
 msgstr "Carica foto"
 
-#: ../../include/conversation.php:1094
+#: ../../include/conversation.php:1098
 msgid "upload photo"
 msgstr "carica foto"
 
-#: ../../include/conversation.php:1095 ../../mod/message.php:330
-#: ../../mod/message.php:513 ../../mod/editlayout.php:102
-#: ../../mod/editwebpage.php:121 ../../mod/editpost.php:99
+#: ../../include/conversation.php:1099 ../../mod/message.php:330
+#: ../../mod/message.php:481 ../../mod/editlayout.php:102
+#: ../../mod/editwebpage.php:145 ../../mod/editpost.php:99
 #: ../../mod/editblock.php:116
 msgid "Attach file"
 msgstr "Allega file"
 
-#: ../../include/conversation.php:1096
+#: ../../include/conversation.php:1100
 msgid "attach file"
 msgstr "allega file"
 
-#: ../../include/conversation.php:1097 ../../mod/message.php:331
-#: ../../mod/message.php:514 ../../mod/editlayout.php:103
-#: ../../mod/editwebpage.php:122 ../../mod/editpost.php:100
+#: ../../include/conversation.php:1101 ../../mod/message.php:331
+#: ../../mod/message.php:482 ../../mod/editlayout.php:103
+#: ../../mod/editwebpage.php:146 ../../mod/editpost.php:100
 #: ../../mod/editblock.php:117
 msgid "Insert web link"
 msgstr "Inserisci un indirizzo web"
 
-#: ../../include/conversation.php:1098
+#: ../../include/conversation.php:1102
 msgid "web link"
 msgstr "link web"
 
-#: ../../include/conversation.php:1099
+#: ../../include/conversation.php:1103
 msgid "Insert video link"
 msgstr "Inserisci l'indirizzo di un video"
 
-#: ../../include/conversation.php:1100
+#: ../../include/conversation.php:1104
 msgid "video link"
 msgstr "link video"
 
-#: ../../include/conversation.php:1101
+#: ../../include/conversation.php:1105
 msgid "Insert audio link"
 msgstr "Inserisci l'indirizzo di un audio"
 
-#: ../../include/conversation.php:1102
+#: ../../include/conversation.php:1106
 msgid "audio link"
 msgstr "link audio"
 
-#: ../../include/conversation.php:1103 ../../mod/editlayout.php:107
-#: ../../mod/editwebpage.php:126 ../../mod/editpost.php:104
+#: ../../include/conversation.php:1107 ../../mod/editlayout.php:107
+#: ../../mod/editwebpage.php:150 ../../mod/editpost.php:104
 #: ../../mod/editblock.php:121
 msgid "Set your location"
 msgstr "La tua località"
 
-#: ../../include/conversation.php:1104
+#: ../../include/conversation.php:1108
 msgid "set location"
 msgstr "la tua località"
 
-#: ../../include/conversation.php:1105 ../../mod/editlayout.php:108
-#: ../../mod/editwebpage.php:127 ../../mod/editpost.php:105
+#: ../../include/conversation.php:1109 ../../mod/editlayout.php:108
+#: ../../mod/editwebpage.php:151 ../../mod/editpost.php:105
 #: ../../mod/editblock.php:122
 msgid "Clear browser location"
 msgstr "Rimuovi la località data dal browser"
 
-#: ../../include/conversation.php:1106
+#: ../../include/conversation.php:1110
 msgid "clear location"
 msgstr "rimuovi la località"
 
-#: ../../include/conversation.php:1108 ../../mod/editlayout.php:121
-#: ../../mod/editwebpage.php:142 ../../mod/editpost.php:118
+#: ../../include/conversation.php:1112 ../../mod/editlayout.php:121
+#: ../../mod/editwebpage.php:168 ../../mod/editpost.php:118
 #: ../../mod/editblock.php:136
 msgid "Set title"
 msgstr "Scegli un titolo"
 
-#: ../../include/conversation.php:1111 ../../mod/editlayout.php:123
-#: ../../mod/editwebpage.php:144 ../../mod/editpost.php:120
+#: ../../include/conversation.php:1115 ../../mod/editlayout.php:123
+#: ../../mod/editwebpage.php:170 ../../mod/editpost.php:120
 #: ../../mod/editblock.php:138
 msgid "Categories (comma-separated list)"
 msgstr "Categorie (separate da virgola)"
 
-#: ../../include/conversation.php:1113 ../../mod/editlayout.php:110
-#: ../../mod/editwebpage.php:129 ../../mod/editpost.php:107
+#: ../../include/conversation.php:1117 ../../mod/editlayout.php:110
+#: ../../mod/editwebpage.php:153 ../../mod/editpost.php:107
 #: ../../mod/editblock.php:124
 msgid "Permission settings"
 msgstr "Impostazioni permessi"
 
-#: ../../include/conversation.php:1114
+#: ../../include/conversation.php:1118
 msgid "permissions"
 msgstr "permessi"
 
-#: ../../include/conversation.php:1122 ../../mod/editlayout.php:118
-#: ../../mod/editwebpage.php:137 ../../mod/editpost.php:115
+#: ../../include/conversation.php:1126 ../../mod/editlayout.php:118
+#: ../../mod/editwebpage.php:163 ../../mod/editpost.php:115
 #: ../../mod/editblock.php:133
 msgid "Public post"
 msgstr "Articolo pubblico"
 
-#: ../../include/conversation.php:1124 ../../mod/editlayout.php:124
-#: ../../mod/editwebpage.php:145 ../../mod/editpost.php:121
+#: ../../include/conversation.php:1128 ../../mod/editlayout.php:124
+#: ../../mod/editwebpage.php:171 ../../mod/editpost.php:121
 #: ../../mod/editblock.php:139
 msgid "Example: bob@example.com, mary@example.com"
 msgstr "Per esempio: mario@esempio.com, simona@esempio.com"
 
-#: ../../include/conversation.php:1137 ../../mod/message.php:336
-#: ../../mod/message.php:519 ../../mod/editlayout.php:134
-#: ../../mod/editwebpage.php:155 ../../mod/editpost.php:132
+#: ../../include/conversation.php:1141 ../../mod/message.php:336
+#: ../../mod/message.php:487 ../../mod/editlayout.php:134
+#: ../../mod/editwebpage.php:181 ../../mod/editpost.php:132
 #: ../../mod/editblock.php:149
 msgid "Set expiration date"
 msgstr "Data di scadenza"
 
-#: ../../include/conversation.php:1364
+#: ../../include/conversation.php:1368
 msgid "Commented Order"
 msgstr "Ultimi commenti"
 
-#: ../../include/conversation.php:1367
+#: ../../include/conversation.php:1371
 msgid "Sort by Comment Date"
 msgstr "Per data del commento"
 
-#: ../../include/conversation.php:1370
+#: ../../include/conversation.php:1374
 msgid "Posted Order"
 msgstr "Ultimi articoli"
 
-#: ../../include/conversation.php:1373
+#: ../../include/conversation.php:1377
 msgid "Sort by Post Date"
 msgstr "Per data di creazione"
 
-#: ../../include/conversation.php:1377 ../../mod/notifications.php:86
+#: ../../include/conversation.php:1381
 msgid "Personal"
 msgstr "Personali"
 
-#: ../../include/conversation.php:1380
+#: ../../include/conversation.php:1384
 msgid "Posts that mention or involve you"
 msgstr "Articoli che ti riguardano o ti menzionano"
 
-#: ../../include/conversation.php:1383 ../../mod/menu.php:57
-#: ../../mod/connections.php:552
+#: ../../include/conversation.php:1387 ../../mod/menu.php:57
+#: ../../mod/connections.php:556
 msgid "New"
 msgstr "Novità"
 
-#: ../../include/conversation.php:1386
+#: ../../include/conversation.php:1390
 msgid "Activity Stream - by date"
 msgstr "Elenco attività - per data"
 
-#: ../../include/conversation.php:1393
+#: ../../include/conversation.php:1397
 msgid "Starred"
 msgstr "Preferiti"
 
-#: ../../include/conversation.php:1396
+#: ../../include/conversation.php:1400
 msgid "Favourite Posts"
 msgstr "Articoli preferiti"
 
-#: ../../include/conversation.php:1403
+#: ../../include/conversation.php:1407
 msgid "Spam"
 msgstr "Spam"
 
-#: ../../include/conversation.php:1406
+#: ../../include/conversation.php:1410
 msgid "Posts flagged as SPAM"
 msgstr "Articoli marcati come spam"
 
-#: ../../include/conversation.php:1436
+#: ../../include/conversation.php:1440
 msgid "Channel"
 msgstr "Canale"
 
-#: ../../include/conversation.php:1439
+#: ../../include/conversation.php:1443
 msgid "Status Messages and Posts"
 msgstr "Articoli e messaggi di stato"
 
-#: ../../include/conversation.php:1443
+#: ../../include/conversation.php:1447
 msgid "About"
 msgstr "Informazioni"
 
-#: ../../include/conversation.php:1446
+#: ../../include/conversation.php:1450
 msgid "Profile Details"
 msgstr "Dettagli del profilo"
 
-#: ../../include/conversation.php:1464
+#: ../../include/conversation.php:1468
 msgid "Events and Calendar"
 msgstr "Calendario eventi"
 
-#: ../../include/conversation.php:1469
+#: ../../include/conversation.php:1473
 msgid "Webpages"
 msgstr "Pagine web"
 
-#: ../../include/conversation.php:1472
+#: ../../include/conversation.php:1476
 msgid "Manage Webpages"
 msgstr "Gestisci le pagine web"
 
@@ -2139,70 +2305,45 @@ msgstr "Accesso fallito."
 
 #: ../../include/contact_widgets.php:14
 #, php-format
-msgid "You have %1$.0f of %2$.0f allowed connections."
-msgstr "Hai attivato %1$.0f delle %2$.0f connessioni permesse."
-
-#: ../../include/contact_widgets.php:20
-msgid "Add New Connection"
-msgstr "Aggiungi un contatto"
-
-#: ../../include/contact_widgets.php:21
-msgid "Enter the channel address"
-msgstr "Scrivi l'indirizzo del canale"
-
-#: ../../include/contact_widgets.php:22
-msgid "Example: bob@example.com, http://example.com/barbara"
-msgstr "Per esempio: mario@pippo.it oppure http://pluto.com/barbara"
-
-#: ../../include/contact_widgets.php:38
-#, php-format
 msgid "%d invitation available"
 msgid_plural "%d invitations available"
 msgstr[0] "%d invito disponibile"
 msgstr[1] "%d inviti disponibili"
 
-#: ../../include/contact_widgets.php:44
+#: ../../include/contact_widgets.php:20
 msgid "Find Channels"
 msgstr "Ricerca canali"
 
-#: ../../include/contact_widgets.php:45
+#: ../../include/contact_widgets.php:21
 msgid "Enter name or interest"
 msgstr "Scrivi un nome o un interesse"
 
-#: ../../include/contact_widgets.php:46
+#: ../../include/contact_widgets.php:22
 msgid "Connect/Follow"
-msgstr "Entra in contatto/segui"
+msgstr "Entra in contatto"
 
-#: ../../include/contact_widgets.php:47
+#: ../../include/contact_widgets.php:23
 msgid "Examples: Robert Morgenstein, Fishing"
 msgstr "Per esempio: Mario Rossi, Pesca"
 
-#: ../../include/contact_widgets.php:48 ../../mod/connections.php:696
-#: ../../mod/directory.php:221 ../../mod/directory.php:226
+#: ../../include/contact_widgets.php:24 ../../mod/connections.php:700
+#: ../../mod/directory.php:224 ../../mod/directory.php:229
 msgid "Find"
 msgstr "Cerca"
 
-#: ../../include/contact_widgets.php:49 ../../mod/suggest.php:64
+#: ../../include/contact_widgets.php:25 ../../mod/suggest.php:66
 msgid "Channel Suggestions"
 msgstr "Canali suggeriti"
 
-#: ../../include/contact_widgets.php:51
+#: ../../include/contact_widgets.php:27
 msgid "Random Profile"
 msgstr "Profilo casuale"
 
-#: ../../include/contact_widgets.php:52
+#: ../../include/contact_widgets.php:28
 msgid "Invite Friends"
 msgstr "Invita amici"
 
-#: ../../include/contact_widgets.php:79 ../../include/contact_widgets.php:113
-msgid "Everything"
-msgstr "Tutto"
-
-#: ../../include/contact_widgets.php:110 ../../include/widgets.php:26
-msgid "Categories"
-msgstr "Categorie"
-
-#: ../../include/contact_widgets.php:143
+#: ../../include/contact_widgets.php:119
 #, php-format
 msgid "%d connection in common"
 msgid_plural "%d connections in common"
@@ -2252,274 +2393,282 @@ msgstr[1] "%d contatti"
 msgid "View Connections"
 msgstr "Elenco contatti"
 
-#: ../../include/text.php:738 ../../mod/filer.php:36
-msgid "Save"
-msgstr "Salva"
-
-#: ../../include/text.php:776
+#: ../../include/text.php:790
 msgid "poke"
 msgstr "poke"
 
-#: ../../include/text.php:777
+#: ../../include/text.php:791
 msgid "ping"
 msgstr "ping"
 
-#: ../../include/text.php:777
+#: ../../include/text.php:791
 msgid "pinged"
 msgstr "ha ricevuto un ping"
 
-#: ../../include/text.php:778
+#: ../../include/text.php:792
 msgid "prod"
 msgstr "prod"
 
-#: ../../include/text.php:778
+#: ../../include/text.php:792
 msgid "prodded"
 msgstr "ha ricevuto un prod"
 
-#: ../../include/text.php:779
+#: ../../include/text.php:793
 msgid "slap"
 msgstr "schiaffo"
 
-#: ../../include/text.php:779
+#: ../../include/text.php:793
 msgid "slapped"
 msgstr "ha ricevuto uno schiaffo"
 
-#: ../../include/text.php:780
+#: ../../include/text.php:794
 msgid "finger"
 msgstr "finger"
 
-#: ../../include/text.php:780
+#: ../../include/text.php:794
 msgid "fingered"
 msgstr "ha ricevuto un finger"
 
-#: ../../include/text.php:781
+#: ../../include/text.php:795
 msgid "rebuff"
 msgstr "rifiuto"
 
-#: ../../include/text.php:781
+#: ../../include/text.php:795
 msgid "rebuffed"
 msgstr "ha ricevuto un rifiuto"
 
-#: ../../include/text.php:793
+#: ../../include/text.php:807
 msgid "happy"
 msgstr "allegro"
 
-#: ../../include/text.php:794
+#: ../../include/text.php:808
 msgid "sad"
 msgstr "triste"
 
-#: ../../include/text.php:795
+#: ../../include/text.php:809
 msgid "mellow"
 msgstr "calmo"
 
-#: ../../include/text.php:796
+#: ../../include/text.php:810
 msgid "tired"
 msgstr "stanco"
 
-#: ../../include/text.php:797
+#: ../../include/text.php:811
 msgid "perky"
 msgstr "vivace"
 
-#: ../../include/text.php:798
+#: ../../include/text.php:812
 msgid "angry"
 msgstr "arrabbiato"
 
-#: ../../include/text.php:799
+#: ../../include/text.php:813
 msgid "stupified"
 msgstr "stordito"
 
-#: ../../include/text.php:800
+#: ../../include/text.php:814
 msgid "puzzled"
 msgstr "confuso"
 
-#: ../../include/text.php:801
+#: ../../include/text.php:815
 msgid "interested"
 msgstr "attento"
 
-#: ../../include/text.php:802
+#: ../../include/text.php:816
 msgid "bitter"
 msgstr "amaro"
 
-#: ../../include/text.php:803
+#: ../../include/text.php:817
 msgid "cheerful"
 msgstr "allegro"
 
-#: ../../include/text.php:804
+#: ../../include/text.php:818
 msgid "alive"
 msgstr "vivace"
 
-#: ../../include/text.php:805
+#: ../../include/text.php:819
 msgid "annoyed"
 msgstr "seccato"
 
-#: ../../include/text.php:806
+#: ../../include/text.php:820
 msgid "anxious"
 msgstr "ansioso"
 
-#: ../../include/text.php:807
+#: ../../include/text.php:821
 msgid "cranky"
 msgstr "irritabile"
 
-#: ../../include/text.php:808
+#: ../../include/text.php:822
 msgid "disturbed"
 msgstr "turbato"
 
-#: ../../include/text.php:809
+#: ../../include/text.php:823
 msgid "frustrated"
 msgstr "frustrato"
 
-#: ../../include/text.php:810
+#: ../../include/text.php:824
 msgid "motivated"
 msgstr "motivato"
 
-#: ../../include/text.php:811
+#: ../../include/text.php:825
 msgid "relaxed"
 msgstr "rilassato"
 
-#: ../../include/text.php:812
+#: ../../include/text.php:826
 msgid "surprised"
 msgstr "sorpreso"
 
-#: ../../include/text.php:976
+#: ../../include/text.php:988
 msgid "Monday"
 msgstr "lunedì"
 
-#: ../../include/text.php:976
+#: ../../include/text.php:988
 msgid "Tuesday"
 msgstr "martedì"
 
-#: ../../include/text.php:976
+#: ../../include/text.php:988
 msgid "Wednesday"
 msgstr "mercoledì"
 
-#: ../../include/text.php:976
+#: ../../include/text.php:988
 msgid "Thursday"
 msgstr "giovedì"
 
-#: ../../include/text.php:976
+#: ../../include/text.php:988
 msgid "Friday"
 msgstr "venerdì"
 
-#: ../../include/text.php:976
+#: ../../include/text.php:988
 msgid "Saturday"
 msgstr "sabato"
 
-#: ../../include/text.php:976
+#: ../../include/text.php:988
 msgid "Sunday"
 msgstr "domenica"
 
-#: ../../include/text.php:980
+#: ../../include/text.php:992
 msgid "January"
 msgstr "gennaio"
 
-#: ../../include/text.php:980
+#: ../../include/text.php:992
 msgid "February"
 msgstr "febbraio"
 
-#: ../../include/text.php:980
+#: ../../include/text.php:992
 msgid "March"
 msgstr "marzo"
 
-#: ../../include/text.php:980
+#: ../../include/text.php:992
 msgid "April"
 msgstr "aprile"
 
-#: ../../include/text.php:980
+#: ../../include/text.php:992
 msgid "May"
 msgstr "maggio"
 
-#: ../../include/text.php:980
+#: ../../include/text.php:992
 msgid "June"
 msgstr "giugno"
 
-#: ../../include/text.php:980
+#: ../../include/text.php:992
 msgid "July"
 msgstr "luglio"
 
-#: ../../include/text.php:980
+#: ../../include/text.php:992
 msgid "August"
 msgstr "agosto"
 
-#: ../../include/text.php:980
+#: ../../include/text.php:992
 msgid "September"
 msgstr "settembre"
 
-#: ../../include/text.php:980
+#: ../../include/text.php:992
 msgid "October"
 msgstr "ottobre"
 
-#: ../../include/text.php:980
+#: ../../include/text.php:992
 msgid "November"
 msgstr "novembre"
 
-#: ../../include/text.php:980
+#: ../../include/text.php:992
 msgid "December"
 msgstr "dicembre"
 
-#: ../../include/text.php:1058 ../../mod/message.php:453
+#: ../../include/text.php:1070
 msgid "unknown.???"
 msgstr "sconosciuto???"
 
-#: ../../include/text.php:1059 ../../mod/message.php:454
+#: ../../include/text.php:1071
 msgid "bytes"
 msgstr "byte"
 
-#: ../../include/text.php:1094
+#: ../../include/text.php:1106
 msgid "remove category"
 msgstr "rimuovi la categoria"
 
-#: ../../include/text.php:1116
+#: ../../include/text.php:1128
 msgid "remove from file"
 msgstr "rimuovi dal file"
 
-#: ../../include/text.php:1170 ../../include/text.php:1182
+#: ../../include/text.php:1182 ../../include/text.php:1194
 msgid "Click to open/close"
 msgstr "Clicca per aprire/chiudere"
 
-#: ../../include/text.php:1358 ../../mod/events.php:331
+#: ../../include/text.php:1370 ../../mod/events.php:332
 msgid "link to source"
 msgstr "Link all'originale"
 
-#: ../../include/text.php:1377
+#: ../../include/text.php:1389
 msgid "Select a page layout: "
 msgstr "Scegli il layout della pagina:"
 
-#: ../../include/text.php:1380 ../../include/text.php:1445
+#: ../../include/text.php:1392 ../../include/text.php:1457
 msgid "default"
 msgstr "predefinito"
 
-#: ../../include/text.php:1416
+#: ../../include/text.php:1428
 msgid "Page content type: "
 msgstr "Contenuto della pagina:"
 
-#: ../../include/text.php:1457
+#: ../../include/text.php:1469
 msgid "Select an alternate language"
 msgstr "Seleziona una lingua diversa"
 
-#: ../../include/text.php:1622
+#: ../../include/text.php:1634
 msgid "activity"
 msgstr "l'attività"
 
-#: ../../include/text.php:1884
+#: ../../include/text.php:1896
 msgid "Design"
 msgstr "Design"
 
-#: ../../include/text.php:1886
+#: ../../include/text.php:1898
 msgid "Blocks"
 msgstr "Riquadri"
 
-#: ../../include/text.php:1887
+#: ../../include/text.php:1899
 msgid "Menus"
 msgstr "Menù"
 
-#: ../../include/text.php:1888
+#: ../../include/text.php:1900
 msgid "Layouts"
 msgstr "Layout"
 
-#: ../../include/text.php:1889
+#: ../../include/text.php:1901
 msgid "Pages"
 msgstr "Pagine"
 
+#: ../../include/plugin.php:475 ../../include/plugin.php:477
+msgid "Click here to upgrade."
+msgstr "Clicca qui per aggiornare."
+
+#: ../../include/plugin.php:483
+msgid "This action exceeds the limits set by your subscription plan."
+msgstr "Questa operazione esce dai termini del tuo abbonamento."
+
+#: ../../include/plugin.php:488
+msgid "This action is not available under your subscription plan."
+msgstr "Questa operazione non è prevista dal tuo abbonamento."
+
 #: ../../include/follow.php:21
 msgid "Channel is blocked on this site."
 msgstr "Il canale è bloccato per questo sito."
@@ -2574,7 +2723,7 @@ msgstr "Può vedere le mie pagine web \"pubbliche\""
 
 #: ../../include/permissions.php:21
 msgid "Can send me their channel stream and posts"
-msgstr "Può mostrarmi i contenuti del canale e gli articoli"
+msgstr "Seguo i contenuti e gli articoli del suo canale"
 
 #: ../../include/permissions.php:22
 msgid "Can post on my channel page (\"wall\")"
@@ -2633,56 +2782,12 @@ msgid ""
 "Extremely advanced. Leave this alone unless you know what you are doing"
 msgstr "Impostazione pericolosa - lasciare il valore predefinito se non si è assolutamente sicuri"
 
-#: ../../include/taxonomy.php:210
-msgid "Tags"
-msgstr "Tag"
-
-#: ../../include/taxonomy.php:224
-msgid "Keywords"
-msgstr "Parole chiave"
-
-#: ../../include/taxonomy.php:249
-msgid "have"
-msgstr "ho"
-
-#: ../../include/taxonomy.php:249
-msgid "has"
-msgstr "ha"
-
-#: ../../include/taxonomy.php:250
-msgid "want"
-msgstr "voglio"
-
-#: ../../include/taxonomy.php:250
-msgid "wants"
-msgstr "vuole"
-
-#: ../../include/taxonomy.php:251
-msgid "likes"
-msgstr "ama"
-
-#: ../../include/taxonomy.php:252
-msgid "dislikes"
-msgstr "non ama"
-
-#: ../../include/plugin.php:475 ../../include/plugin.php:477
-msgid "Click here to upgrade."
-msgstr "Clicca qui per aggiornare."
-
-#: ../../include/plugin.php:483
-msgid "This action exceeds the limits set by your subscription plan."
-msgstr "Questa operazione esce dai termini del tuo abbonamento."
-
-#: ../../include/plugin.php:488
-msgid "This action is not available under your subscription plan."
-msgstr "Questa operazione non è prevista dal tuo abbonamento."
-
 #: ../../include/comanche.php:35 ../../view/theme/redbasic/php/config.php:62
 #: ../../view/theme/apw/php/config.php:176
 msgid "Default"
 msgstr "Predefinito"
 
-#: ../../include/identity.php:29 ../../mod/item.php:1148
+#: ../../include/identity.php:29 ../../mod/item.php:1151
 msgid "Unable to obtain identity information from database"
 msgstr "Impossibile ottenere le informazioni di identificazione dal database"
 
@@ -2730,7 +2835,7 @@ msgstr "Purtroppo non hai il permesso di vedere questo profilo."
 msgid "Requested profile is not available."
 msgstr "Il profilo richiesto non è disponibile."
 
-#: ../../include/identity.php:627 ../../mod/profiles.php:624
+#: ../../include/identity.php:627 ../../mod/profiles.php:613
 msgid "Change profile photo"
 msgstr "Cambia la foto del profilo"
 
@@ -2742,7 +2847,7 @@ msgstr "Profili"
 msgid "Manage/edit profiles"
 msgstr "Gestisci/modifica i profili"
 
-#: ../../include/identity.php:634 ../../mod/profiles.php:625
+#: ../../include/identity.php:634 ../../mod/profiles.php:614
 msgid "Create New Profile"
 msgstr "Crea un nuovo profilo"
 
@@ -2750,162 +2855,162 @@ msgstr "Crea un nuovo profilo"
 msgid "Edit Profile"
 msgstr "Modifica il profilo"
 
-#: ../../include/identity.php:648 ../../mod/profiles.php:636
+#: ../../include/identity.php:648 ../../mod/profiles.php:625
 msgid "Profile Image"
 msgstr "Immagine del profilo"
 
-#: ../../include/identity.php:651 ../../mod/profiles.php:639
+#: ../../include/identity.php:651 ../../mod/profiles.php:628
 msgid "visible to everybody"
 msgstr "visibile a tutti"
 
-#: ../../include/identity.php:652 ../../mod/profiles.php:640
+#: ../../include/identity.php:652 ../../mod/profiles.php:629
 msgid "Edit visibility"
 msgstr "Cambia la visibilità"
 
-#: ../../include/identity.php:665 ../../include/identity.php:883
-#: ../../mod/directory.php:175
+#: ../../include/identity.php:666 ../../include/identity.php:891
+#: ../../mod/directory.php:176
 msgid "Gender:"
 msgstr "Sesso:"
 
-#: ../../include/identity.php:666 ../../include/identity.php:903
-#: ../../mod/directory.php:177
+#: ../../include/identity.php:667 ../../include/identity.php:911
+#: ../../mod/directory.php:178
 msgid "Status:"
 msgstr "Stato:"
 
-#: ../../include/identity.php:667 ../../include/identity.php:914
-#: ../../mod/directory.php:179
+#: ../../include/identity.php:668 ../../include/identity.php:922
+#: ../../mod/directory.php:180
 msgid "Homepage:"
 msgstr "Home page:"
 
-#: ../../include/identity.php:730 ../../include/identity.php:810
+#: ../../include/identity.php:735 ../../include/identity.php:815
 #: ../../mod/ping.php:230
 msgid "g A l F d"
 msgstr "g A l d F"
 
-#: ../../include/identity.php:731 ../../include/identity.php:811
+#: ../../include/identity.php:736 ../../include/identity.php:816
 msgid "F d"
 msgstr "d F"
 
-#: ../../include/identity.php:776 ../../include/identity.php:851
+#: ../../include/identity.php:781 ../../include/identity.php:856
 #: ../../mod/ping.php:252
 msgid "[today]"
 msgstr "[oggi]"
 
-#: ../../include/identity.php:788
+#: ../../include/identity.php:793
 msgid "Birthday Reminders"
 msgstr "Promemoria compleanni"
 
-#: ../../include/identity.php:789
+#: ../../include/identity.php:794
 msgid "Birthdays this week:"
 msgstr "Compleanni questa settimana:"
 
-#: ../../include/identity.php:844
+#: ../../include/identity.php:849
 msgid "[No description]"
 msgstr "[Nessuna descrizione]"
 
-#: ../../include/identity.php:862
+#: ../../include/identity.php:867
 msgid "Event Reminders"
 msgstr "Promemoria"
 
-#: ../../include/identity.php:863
+#: ../../include/identity.php:868
 msgid "Events this week:"
 msgstr "Eventi di questa settimana:"
 
-#: ../../include/identity.php:873 ../../include/identity.php:984
-#: ../../mod/profperm.php:112
+#: ../../include/identity.php:881 ../../include/identity.php:992
+#: ../../mod/profperm.php:103
 msgid "Profile"
 msgstr "Profilo"
 
-#: ../../include/identity.php:881 ../../mod/settings.php:1013
+#: ../../include/identity.php:889 ../../mod/settings.php:1013
 msgid "Full Name:"
 msgstr "Nome completo:"
 
-#: ../../include/identity.php:888
+#: ../../include/identity.php:896
 msgid "j F, Y"
 msgstr "j F Y"
 
-#: ../../include/identity.php:889
+#: ../../include/identity.php:897
 msgid "j F"
 msgstr "j F"
 
-#: ../../include/identity.php:896
+#: ../../include/identity.php:904
 msgid "Birthday:"
 msgstr "Compleanno:"
 
-#: ../../include/identity.php:900
+#: ../../include/identity.php:908
 msgid "Age:"
 msgstr "Età:"
 
-#: ../../include/identity.php:909
+#: ../../include/identity.php:917
 #, php-format
 msgid "for %1$d %2$s"
 msgstr "per %1$d %2$s"
 
-#: ../../include/identity.php:912 ../../mod/profiles.php:549
+#: ../../include/identity.php:920 ../../mod/profiles.php:538
 msgid "Sexual Preference:"
 msgstr "Preferenze sessuali:"
 
-#: ../../include/identity.php:916 ../../mod/profiles.php:551
+#: ../../include/identity.php:924 ../../mod/profiles.php:540
 msgid "Hometown:"
 msgstr "Città dove vivo:"
 
-#: ../../include/identity.php:918
+#: ../../include/identity.php:926
 msgid "Tags:"
 msgstr "Tag:"
 
-#: ../../include/identity.php:920 ../../mod/profiles.php:552
+#: ../../include/identity.php:928 ../../mod/profiles.php:541
 msgid "Political Views:"
 msgstr "Orientamento politico:"
 
-#: ../../include/identity.php:922
+#: ../../include/identity.php:930
 msgid "Religion:"
 msgstr "Religione:"
 
-#: ../../include/identity.php:924 ../../mod/directory.php:181
+#: ../../include/identity.php:932 ../../mod/directory.php:182
 msgid "About:"
 msgstr "Informazioni:"
 
-#: ../../include/identity.php:926
+#: ../../include/identity.php:934
 msgid "Hobbies/Interests:"
 msgstr "Interessi e hobby:"
 
-#: ../../include/identity.php:928 ../../mod/profiles.php:555
+#: ../../include/identity.php:936 ../../mod/profiles.php:544
 msgid "Likes:"
 msgstr "Mi piace:"
 
-#: ../../include/identity.php:930 ../../mod/profiles.php:556
+#: ../../include/identity.php:938 ../../mod/profiles.php:545
 msgid "Dislikes:"
 msgstr "Non mi piace:"
 
-#: ../../include/identity.php:933
+#: ../../include/identity.php:941
 msgid "Contact information and Social Networks:"
 msgstr "Contatti e social network:"
 
-#: ../../include/identity.php:935
+#: ../../include/identity.php:943
 msgid "Musical interests:"
 msgstr "Gusti musicali:"
 
-#: ../../include/identity.php:937
+#: ../../include/identity.php:945
 msgid "Books, literature:"
 msgstr "Libri, letteratura:"
 
-#: ../../include/identity.php:939
+#: ../../include/identity.php:947
 msgid "Television:"
 msgstr "Televisione:"
 
-#: ../../include/identity.php:941
+#: ../../include/identity.php:949
 msgid "Film/dance/culture/entertainment:"
 msgstr "Film, danza, cultura, intrattenimento:"
 
-#: ../../include/identity.php:943
+#: ../../include/identity.php:951
 msgid "Love/Romance:"
 msgstr "Amore:"
 
-#: ../../include/identity.php:945
+#: ../../include/identity.php:953
 msgid "Work/employment:"
 msgstr "Lavoro:"
 
-#: ../../include/identity.php:947
+#: ../../include/identity.php:955
 msgid "School/education:"
 msgstr "Scuola:"
 
@@ -2928,138 +3033,116 @@ msgid ""
 msgstr "L'identificativo di sicurezza del modulo che hai riempito non è corretto. Probabilmente è accaduto perché la pagina è stata tenuta aperta troppo a lungo (ore?) prima di inviare il contenuto."
 
 #: ../../include/items.php:201 ../../mod/like.php:55 ../../mod/group.php:74
-#: ../../mod/profperm.php:28 ../../index.php:339
+#: ../../mod/profperm.php:19 ../../index.php:345
 msgid "Permission denied"
 msgstr "Permesso negato"
 
-#: ../../include/items.php:3350 ../../mod/admin.php:150
-#: ../../mod/admin.php:727 ../../mod/admin.php:930 ../../mod/viewsrc.php:18
+#: ../../include/items.php:3367 ../../mod/admin.php:150
+#: ../../mod/admin.php:730 ../../mod/admin.php:933 ../../mod/viewsrc.php:18
 #: ../../mod/home.php:64 ../../mod/display.php:32
 msgid "Item not found."
 msgstr "Elemento non trovato."
 
-#: ../../include/items.php:3533
-msgid "Archives"
-msgstr "Archivi"
-
-#: ../../include/items.php:3699 ../../mod/group.php:44 ../../mod/group.php:146
+#: ../../include/items.php:3718 ../../mod/group.php:44 ../../mod/group.php:146
 msgid "Collection not found."
 msgstr "Insieme non trovato."
 
-#: ../../include/items.php:3715 ../../mod/network.php:288
-msgid "Group is empty"
-msgstr "L'insieme è vuoto"
-
-#: ../../include/items.php:3731
-msgid "Connection not found."
-msgstr "Contatto non trovato."
-
-#: ../../include/dir_fns.php:15
-msgid "Sort Options"
-msgstr "Opzioni di ordinamento"
-
-#: ../../include/dir_fns.php:16
-msgid "Alphabetic"
-msgstr "Alfabetico"
-
-#: ../../include/dir_fns.php:17
-msgid "Reverse Alphabetic"
-msgstr "Alfabetico inverso"
-
-#: ../../include/dir_fns.php:18
-msgid "Newest to Oldest"
-msgstr "Dal più nuovo al più vecchio"
+#: ../../include/items.php:3733
+msgid "Collection is empty."
+msgstr "L'insieme di canali è vuoto."
 
-#: ../../include/dir_fns.php:29
-msgid "Enable Safe Search"
-msgstr "Abilita SafeSearch"
+#: ../../include/items.php:3740
+#, php-format
+msgid "Collection: %s"
+msgstr "Insieme: %s"
 
-#: ../../include/dir_fns.php:31
-msgid "Disable Safe Search"
-msgstr "Disabilita SafeSearch"
+#: ../../include/items.php:3751
+#, php-format
+msgid "Connection: %s"
+msgstr "Contatto: %s"
 
-#: ../../include/dir_fns.php:33
-msgid "Safe Mode"
-msgstr "Modalità SafeSearch"
+#: ../../include/items.php:3754
+msgid "Connection not found."
+msgstr "Contatto non trovato."
 
 #: ../../mod/common.php:10
 msgid "No channel."
 msgstr "Nessun canale."
 
-#: ../../mod/common.php:47
+#: ../../mod/common.php:39
 msgid "Common connections"
 msgstr "Contatti in comune"
 
-#: ../../mod/common.php:52
+#: ../../mod/common.php:44
 msgid "No connections in common."
 msgstr "Nessun contatto in comune."
 
-#: ../../mod/events.php:71
+#: ../../mod/events.php:72
 msgid "Event title and start time are required."
 msgstr "Sono necessari il titolo e l'ora d'inizio dell'evento."
 
-#: ../../mod/events.php:286
+#: ../../mod/events.php:287
 msgid "l, F j"
 msgstr "l j F"
 
-#: ../../mod/events.php:308
+#: ../../mod/events.php:309
 msgid "Edit event"
 msgstr "Modifica l'evento"
 
-#: ../../mod/events.php:354
+#: ../../mod/events.php:355
 msgid "Create New Event"
 msgstr "Crea un nuovo evento"
 
-#: ../../mod/events.php:355
+#: ../../mod/events.php:356
 msgid "Previous"
 msgstr "Precendente"
 
-#: ../../mod/events.php:356 ../../mod/setup.php:256
+#: ../../mod/events.php:357 ../../mod/setup.php:256
 msgid "Next"
 msgstr "Successivo"
 
-#: ../../mod/events.php:428
+#: ../../mod/events.php:429
 msgid "hour:minute"
 msgstr "ora:minuti"
 
-#: ../../mod/events.php:447
+#: ../../mod/events.php:448
 msgid "Event details"
 msgstr "Dettagli evento"
 
-#: ../../mod/events.php:448
+#: ../../mod/events.php:449
 #, php-format
 msgid "Format is %s %s. Starting date and Title are required."
 msgstr "Il formato è %s %s. L'inizio e il titolo sono obbligatori."
 
-#: ../../mod/events.php:450
+#: ../../mod/events.php:451
 msgid "Event Starts:"
 msgstr "Inizio:"
 
-#: ../../mod/events.php:450 ../../mod/events.php:464
+#: ../../mod/events.php:451 ../../mod/events.php:465
 msgid "Required"
 msgstr "Obbligatorio"
 
-#: ../../mod/events.php:453
+#: ../../mod/events.php:454
 msgid "Finish date/time is not known or not relevant"
 msgstr "La data/ora di fine non è rilevante"
 
-#: ../../mod/events.php:455
+#: ../../mod/events.php:456
 msgid "Event Finishes:"
 msgstr "Fine:"
 
-#: ../../mod/events.php:458
+#: ../../mod/events.php:459
 msgid "Adjust for viewer timezone"
 msgstr "Adatta al fuso orario di chi legge"
 
-#: ../../mod/events.php:460
+#: ../../mod/events.php:461
 msgid "Description:"
 msgstr "Descrizione:"
 
-#: ../../mod/events.php:464
+#: ../../mod/events.php:465
 msgid "Title:"
 msgstr "Titolo:"
 
-#: ../../mod/events.php:466
+#: ../../mod/events.php:467
 msgid "Share this event"
 msgstr "Condividi questo evento"
 
@@ -3146,7 +3229,7 @@ msgid "Enter email addresses, one per line:"
 msgstr "Inserisci gli indirizzi email, uno per riga:"
 
 #: ../../mod/invite.php:141 ../../mod/message.php:326
-#: ../../mod/message.php:508
+#: ../../mod/message.php:476
 msgid "Your message:"
 msgstr "Il tuo messaggio:"
 
@@ -3191,7 +3274,7 @@ msgstr "Amici di %s"
 msgid "No friends to display."
 msgstr "Nessun amico da visualizzare."
 
-#: ../../mod/webpages.php:104 ../../mod/layouts.php:105
+#: ../../mod/webpages.php:121 ../../mod/layouts.php:105
 #: ../../mod/blocks.php:96
 msgid "View"
 msgstr "Guarda"
@@ -3215,19 +3298,15 @@ msgid ""
 msgstr "Vuoi autorizzare questa app ad accedere ai messaggi e ai contatti o creare nuovi messaggi per te?"
 
 #: ../../mod/api.php:105 ../../mod/settings.php:967 ../../mod/settings.php:972
-#: ../../mod/profiles.php:506
+#: ../../mod/profiles.php:495
 msgid "Yes"
 msgstr "Si"
 
 #: ../../mod/api.php:106 ../../mod/settings.php:967 ../../mod/settings.php:972
-#: ../../mod/profiles.php:507
+#: ../../mod/profiles.php:496
 msgid "No"
 msgstr "No"
 
-#: ../../mod/lastpost.php:16 ../../mod/channel.php:25
-msgid "You must be logged in to see this page."
-msgstr "Devi aver effettuato l'accesso per vedere questa pagina."
-
 #: ../../mod/apps.php:8
 msgid "No installed applications."
 msgstr "Nessuna app installata."
@@ -3705,7 +3784,7 @@ msgid "Cancel"
 msgstr "Annulla"
 
 #: ../../mod/settings.php:611 ../../mod/settings.php:637
-#: ../../mod/admin.php:686 ../../mod/crepair.php:148
+#: ../../mod/admin.php:689
 msgid "Name"
 msgstr "Nome"
 
@@ -3819,7 +3898,7 @@ msgstr "Funzionalità aggiuntive"
 msgid "Connector Settings"
 msgstr "Impostazioni del connettore"
 
-#: ../../mod/settings.php:802 ../../mod/admin.php:369
+#: ../../mod/settings.php:802 ../../mod/admin.php:371
 msgid "No special theme for mobile devices"
 msgstr "Nessun tema per dispositivi mobili"
 
@@ -3887,7 +3966,7 @@ msgstr "Pubblica il mio profilo predefinito sull'elenco pubblico dei canali"
 msgid "Allow us to suggest you as a potential friend to new members?"
 msgstr "Vuoi essere suggerito come potenziale amico ai nuovi membri?"
 
-#: ../../mod/settings.php:976 ../../mod/profile_photo.php:298
+#: ../../mod/settings.php:976 ../../mod/profile_photo.php:288
 msgid "or"
 msgstr "o"
 
@@ -3959,7 +4038,7 @@ msgstr "Serve e ridurre lo spam"
 msgid "Default Post Permissions"
 msgstr "Permessi predefiniti per gli articoli"
 
-#: ../../mod/settings.php:1032
+#: ../../mod/settings.php:1032 ../../mod/mitem.php:137 ../../mod/mitem.php:180
 msgid "(click to open/close)"
 msgstr "(clicca per aprire/chiudere)"
 
@@ -4035,22 +4114,22 @@ msgstr "Impostazioni avanzate"
 msgid "Change the behaviour of this account for special situations"
 msgstr "Cambia il funzionamento di questo account in situazioni particolari"
 
-#: ../../mod/viewconnections.php:28 ../../mod/search.php:80
+#: ../../mod/viewconnections.php:17 ../../mod/search.php:80
 #: ../../mod/photos.php:576 ../../mod/display.php:9 ../../mod/community.php:18
-#: ../../mod/directory.php:32
+#: ../../mod/directory.php:33
 msgid "Public access denied."
 msgstr "Accesso pubblico negato."
 
-#: ../../mod/viewconnections.php:57
+#: ../../mod/viewconnections.php:43
 msgid "No connections."
 msgstr "Nessun contatto."
 
-#: ../../mod/viewconnections.php:69
+#: ../../mod/viewconnections.php:55
 #, php-format
 msgid "Visit %s's profile [%s]"
 msgstr "Visita il profilo di %s [%s]"
 
-#: ../../mod/viewconnections.php:84
+#: ../../mod/viewconnections.php:70
 msgid "View Connnections"
 msgstr "Guarda i contatti"
 
@@ -4207,23 +4286,23 @@ msgstr "Impossibile rimuovere la sorgente."
 msgid "Theme settings updated."
 msgstr "Le impostazioni del tema sono state aggiornate."
 
-#: ../../mod/admin.php:87 ../../mod/admin.php:417
+#: ../../mod/admin.php:87 ../../mod/admin.php:419
 msgid "Site"
 msgstr "Sito"
 
-#: ../../mod/admin.php:88 ../../mod/admin.php:682 ../../mod/admin.php:694
+#: ../../mod/admin.php:88 ../../mod/admin.php:685 ../../mod/admin.php:697
 msgid "Users"
 msgstr "Utenti"
 
-#: ../../mod/admin.php:89 ../../mod/admin.php:780 ../../mod/admin.php:822
+#: ../../mod/admin.php:89 ../../mod/admin.php:783 ../../mod/admin.php:825
 msgid "Plugins"
 msgstr "Plugin"
 
-#: ../../mod/admin.php:90 ../../mod/admin.php:985 ../../mod/admin.php:1021
+#: ../../mod/admin.php:90 ../../mod/admin.php:988 ../../mod/admin.php:1024
 msgid "Themes"
 msgstr "Temi"
 
-#: ../../mod/admin.php:91 ../../mod/admin.php:475
+#: ../../mod/admin.php:91 ../../mod/admin.php:478
 msgid "Server"
 msgstr "Server"
 
@@ -4231,7 +4310,7 @@ msgstr "Server"
 msgid "DB updates"
 msgstr "Aggiornamenti al DB"
 
-#: ../../mod/admin.php:106 ../../mod/admin.php:113 ../../mod/admin.php:1108
+#: ../../mod/admin.php:106 ../../mod/admin.php:113 ../../mod/admin.php:1111
 msgid "Logs"
 msgstr "Log"
 
@@ -4247,9 +4326,9 @@ msgstr "Registrazioni in attesa"
 msgid "Message queues"
 msgstr "Messaggi in attesa di recapito"
 
-#: ../../mod/admin.php:193 ../../mod/admin.php:416 ../../mod/admin.php:474
-#: ../../mod/admin.php:681 ../../mod/admin.php:779 ../../mod/admin.php:821
-#: ../../mod/admin.php:984 ../../mod/admin.php:1020 ../../mod/admin.php:1107
+#: ../../mod/admin.php:193 ../../mod/admin.php:418 ../../mod/admin.php:477
+#: ../../mod/admin.php:684 ../../mod/admin.php:782 ../../mod/admin.php:824
+#: ../../mod/admin.php:987 ../../mod/admin.php:1023 ../../mod/admin.php:1110
 msgid "Administration"
 msgstr "Amministrazione"
 
@@ -4261,7 +4340,7 @@ msgstr "Riepilogo"
 msgid "Registered users"
 msgstr "Utenti registrati"
 
-#: ../../mod/admin.php:198 ../../mod/admin.php:478
+#: ../../mod/admin.php:198 ../../mod/admin.php:481
 msgid "Pending registrations"
 msgstr "Registrazioni da approvare"
 
@@ -4269,567 +4348,581 @@ msgstr "Registrazioni da approvare"
 msgid "Version"
 msgstr "Versione"
 
-#: ../../mod/admin.php:201 ../../mod/admin.php:479
+#: ../../mod/admin.php:201 ../../mod/admin.php:482
 msgid "Active plugins"
 msgstr "Plugin attivi"
 
-#: ../../mod/admin.php:340
+#: ../../mod/admin.php:342
 msgid "Site settings updated."
 msgstr "Impostazioni del sito aggiornate."
 
-#: ../../mod/admin.php:371
+#: ../../mod/admin.php:373
 msgid "No special theme for accessibility"
 msgstr "Nessun tema speciale per l'accessibilità"
 
-#: ../../mod/admin.php:396
+#: ../../mod/admin.php:398
 msgid "Closed"
 msgstr "Chiusa"
 
-#: ../../mod/admin.php:397
+#: ../../mod/admin.php:399
 msgid "Requires approval"
 msgstr "Richiede l'approvazione"
 
-#: ../../mod/admin.php:398
+#: ../../mod/admin.php:400
 msgid "Open"
 msgstr "Aperta"
 
-#: ../../mod/admin.php:403
+#: ../../mod/admin.php:405
 msgid "Private"
 msgstr "Privato"
 
-#: ../../mod/admin.php:404
+#: ../../mod/admin.php:406
 msgid "Paid Access"
 msgstr "Servizio a pagamento"
 
-#: ../../mod/admin.php:405
+#: ../../mod/admin.php:407
 msgid "Free Access"
 msgstr "Servizio gratuito"
 
-#: ../../mod/admin.php:406
+#: ../../mod/admin.php:408
 msgid "Tiered Access"
 msgstr "Accesso multilivello"
 
-#: ../../mod/admin.php:419 ../../mod/register.php:180
+#: ../../mod/admin.php:421 ../../mod/register.php:180
 msgid "Registration"
 msgstr "Registrazione"
 
-#: ../../mod/admin.php:420
+#: ../../mod/admin.php:422
 msgid "File upload"
 msgstr "Caricamento file"
 
-#: ../../mod/admin.php:421
+#: ../../mod/admin.php:423
 msgid "Policies"
 msgstr "Politiche"
 
-#: ../../mod/admin.php:422
+#: ../../mod/admin.php:424
 msgid "Advanced"
 msgstr "Avanzate"
 
-#: ../../mod/admin.php:426
+#: ../../mod/admin.php:428
 msgid "Site name"
 msgstr "Nome del sito"
 
-#: ../../mod/admin.php:427
+#: ../../mod/admin.php:429
 msgid "Banner/Logo"
 msgstr "Banner o logo"
 
-#: ../../mod/admin.php:428
+#: ../../mod/admin.php:430
 msgid "System language"
 msgstr "Lingua di sistema"
 
-#: ../../mod/admin.php:429
+#: ../../mod/admin.php:431
 msgid "System theme"
 msgstr "Tema di sistema"
 
-#: ../../mod/admin.php:429
+#: ../../mod/admin.php:431
 msgid ""
 "Default system theme - may be over-ridden by user profiles - <a href='#' "
 "id='cnftheme'>change theme settings</a>"
 msgstr "Il tema di sistema può essere cambiato dai profili dei singoli utenti - <a href='#' id='cnftheme'>Cambia le impostazioni del tema</a>"
 
-#: ../../mod/admin.php:430
+#: ../../mod/admin.php:432
 msgid "Mobile system theme"
 msgstr "Tema di sistema per dispositivi mobili"
 
-#: ../../mod/admin.php:430
+#: ../../mod/admin.php:432
 msgid "Theme for mobile devices"
 msgstr "Tema per i dispositivi mobili"
 
-#: ../../mod/admin.php:431
+#: ../../mod/admin.php:433
 msgid "Accessibility system theme"
 msgstr "Tema di sistema ad alta accessibilità"
 
-#: ../../mod/admin.php:431
+#: ../../mod/admin.php:433
 msgid "Accessibility theme"
 msgstr "Tema ad alta accessibilità"
 
-#: ../../mod/admin.php:432
+#: ../../mod/admin.php:434
 msgid "Channel to use for this website's static pages"
 msgstr "Canale da usare per le pagine statiche di questo sito"
 
-#: ../../mod/admin.php:432
+#: ../../mod/admin.php:434
 msgid "Site Channel"
 msgstr "Canale del sito"
 
-#: ../../mod/admin.php:434
+#: ../../mod/admin.php:436
 msgid "Maximum image size"
 msgstr "Dimensione massima immagini"
 
-#: ../../mod/admin.php:434
+#: ../../mod/admin.php:436
 msgid ""
 "Maximum size in bytes of uploaded images. Default is 0, which means no "
 "limits."
 msgstr "Massima dimensione in byte delle immagini caricate. Il default è 0, cioè nessun limite."
 
-#: ../../mod/admin.php:435
+#: ../../mod/admin.php:437
 msgid "Register policy"
 msgstr "Politica di registrazione"
 
-#: ../../mod/admin.php:436
+#: ../../mod/admin.php:438
 msgid "Access policy"
 msgstr "Tipo di accesso"
 
-#: ../../mod/admin.php:437
+#: ../../mod/admin.php:439
 msgid "Register text"
 msgstr "Testo diregistrazione"
 
-#: ../../mod/admin.php:437
+#: ../../mod/admin.php:439
 msgid "Will be displayed prominently on the registration page."
 msgstr "Sarà mostrato ben visibile nella pagina di registrazione."
 
-#: ../../mod/admin.php:438
+#: ../../mod/admin.php:440
 msgid "Accounts abandoned after x days"
 msgstr "Account abbandonati dopo X giorni"
 
-#: ../../mod/admin.php:438
+#: ../../mod/admin.php:440
 msgid ""
 "Will not waste system resources polling external sites for abandonded "
 "accounts. Enter 0 for no time limit."
 msgstr "Eviterà di sprecare risorse di sistema controllando se i siti esterni hanno account abbandonati. Immettere 0 per non imporre nessun limite di tempo."
 
-#: ../../mod/admin.php:439
+#: ../../mod/admin.php:441
 msgid "Allowed friend domains"
 msgstr "Domini fidati e consentiti"
 
-#: ../../mod/admin.php:439
+#: ../../mod/admin.php:441
 msgid ""
 "Comma separated list of domains which are allowed to establish friendships "
 "with this site. Wildcards are accepted. Empty to allow any domains"
 msgstr "Elenco separato da virglola dei domini che possono stabilire amicizie con questo sito. Sono accettati caratteri jolly. Lascia vuoto per accettare connessioni da qualsiasi dominio."
 
-#: ../../mod/admin.php:440
+#: ../../mod/admin.php:442
 msgid "Allowed email domains"
 msgstr "Domini email consentiti"
 
-#: ../../mod/admin.php:440
+#: ../../mod/admin.php:442
 msgid ""
 "Comma separated list of domains which are allowed in email addresses for "
 "registrations to this site. Wildcards are accepted. Empty to allow any "
 "domains"
 msgstr "Elenco separato da virgola dei domini permessi come indirizzi email in fase di registrazione. Sono accettati caratteri jolly. Lascia vuoto per accettare qualsiasi dominio."
 
-#: ../../mod/admin.php:441
+#: ../../mod/admin.php:443
 msgid "Block public"
 msgstr "Blocca pagine pubbliche"
 
-#: ../../mod/admin.php:441
+#: ../../mod/admin.php:443
 msgid ""
 "Check to block public access to all otherwise public personal pages on this "
 "site unless you are currently logged in."
 msgstr "Seleziona per impedire di vedere le pagine personali di questo sito a chi non ha effettuato l'accesso."
 
-#: ../../mod/admin.php:442
+#: ../../mod/admin.php:444
 msgid "Force publish"
 msgstr "Forza la publicazione del profilo"
 
-#: ../../mod/admin.php:442
+#: ../../mod/admin.php:444
 msgid ""
 "Check to force all profiles on this site to be listed in the site directory."
 msgstr "Seleziona per mostrare nell'elenco dei canali del sito <strong>tutti</strong> i profili registrati."
 
-#: ../../mod/admin.php:444
+#: ../../mod/admin.php:445
+msgid "No login on Homepage"
+msgstr "Non mostrare il login sulla homepage"
+
+#: ../../mod/admin.php:445
+msgid ""
+"Check to hide the login form from your sites homepage when visitors arrive "
+"who are not logged in (e.g. when you put the content of the homepage in via "
+"the site channel)."
+msgstr "Per nascondere la possibilità di fare login ai visitatori (per esempio, quando il contenuto della homepage del sito è alimentato dal canale)."
+
+#: ../../mod/admin.php:447
 msgid "Proxy user"
 msgstr "Utente proxy"
 
-#: ../../mod/admin.php:445
+#: ../../mod/admin.php:448
 msgid "Proxy URL"
 msgstr "URL proxy"
 
-#: ../../mod/admin.php:446
+#: ../../mod/admin.php:449
 msgid "Network timeout"
 msgstr "Timeout rete"
 
-#: ../../mod/admin.php:446
+#: ../../mod/admin.php:449
 msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
 msgstr "Valore in secondi. Imposta a 0 per illimitato (sconsigliato)."
 
-#: ../../mod/admin.php:447
+#: ../../mod/admin.php:450
 msgid "Delivery interval"
 msgstr "Recapito ritardato"
 
-#: ../../mod/admin.php:447
+#: ../../mod/admin.php:450
 msgid ""
 "Delay background delivery processes by this many seconds to reduce system "
 "load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 "
 "for large dedicated servers."
 msgstr "RItarda il processo di recapito di questo numero di secondi per ridurre il carico di sistema. Consigliati: 4-5 secondi per hosting condiviso, 2-3 per i VPS, 0-1 per grandi server dedicati."
 
-#: ../../mod/admin.php:448
+#: ../../mod/admin.php:451
 msgid "Poll interval"
 msgstr "Intervallo di polling"
 
-#: ../../mod/admin.php:448
+#: ../../mod/admin.php:451
 msgid ""
 "Delay background polling processes by this many seconds to reduce system "
 "load. If 0, use delivery interval."
 msgstr "Ritarda i processi di polling in background di questo numero di secondi per ridurre il carico del sistema. Se 0, verrà usato lo stesso valore del 'Recapito ritardato'."
 
-#: ../../mod/admin.php:449
+#: ../../mod/admin.php:452
 msgid "Maximum Load Average"
 msgstr "Carico massimo medio"
 
-#: ../../mod/admin.php:449
+#: ../../mod/admin.php:452
 msgid ""
 "Maximum system load before delivery and poll processes are deferred - "
 "default 50."
 msgstr "Carico di sistema massimo perché i processi di recapito e polling siano ritardati - il valore predefinito è 50."
 
-#: ../../mod/admin.php:466
+#: ../../mod/admin.php:469
 msgid "No server found"
 msgstr "Server non trovato"
 
-#: ../../mod/admin.php:473 ../../mod/admin.php:695
+#: ../../mod/admin.php:476 ../../mod/admin.php:698
 msgid "ID"
 msgstr "ID"
 
-#: ../../mod/admin.php:473
+#: ../../mod/admin.php:476
 msgid "for channel"
 msgstr "per canale"
 
-#: ../../mod/admin.php:473
+#: ../../mod/admin.php:476
 msgid "on server"
 msgstr "sul server"
 
-#: ../../mod/admin.php:473
+#: ../../mod/admin.php:476
 msgid "Status"
 msgstr "Stato"
 
-#: ../../mod/admin.php:493
+#: ../../mod/admin.php:496
 msgid "Update has been marked successful"
 msgstr "L'aggiornamento è stato marcato come eseguito."
 
-#: ../../mod/admin.php:503
+#: ../../mod/admin.php:506
 #, php-format
 msgid "Executing %s failed. Check system logs."
 msgstr "Fallita l'esecuzione di %s. Maggiori informazioni sui log di sistema."
 
-#: ../../mod/admin.php:506
+#: ../../mod/admin.php:509
 #, php-format
 msgid "Update %s was successfully applied."
 msgstr "L'aggiornamento %s è terminato correttamente."
 
-#: ../../mod/admin.php:510
+#: ../../mod/admin.php:513
 #, php-format
 msgid "Update %s did not return a status. Unknown if it succeeded."
 msgstr "L'aggiornamento %s non ha dato risposta. Impossibile determinare se è terminato correttamente."
 
-#: ../../mod/admin.php:513
+#: ../../mod/admin.php:516
 #, php-format
 msgid "Update function %s could not be found."
 msgstr "Impossibile trovare la funzione di aggiornamento %s"
 
-#: ../../mod/admin.php:528
+#: ../../mod/admin.php:531
 msgid "No failed updates."
 msgstr "Nessun aggiornamento fallito."
 
-#: ../../mod/admin.php:532
+#: ../../mod/admin.php:535
 msgid "Failed Updates"
 msgstr "Aggiornamenti falliti."
 
-#: ../../mod/admin.php:534
+#: ../../mod/admin.php:537
 msgid "Mark success (if update was manually applied)"
 msgstr "Marca come eseguito (se applicato manualmente)."
 
-#: ../../mod/admin.php:535
+#: ../../mod/admin.php:538
 msgid "Attempt to execute this update step automatically"
 msgstr "Tenta di eseguire in automatico questo passaggio dell'aggiornamento."
 
-#: ../../mod/admin.php:561
+#: ../../mod/admin.php:564
 #, php-format
 msgid "%s user blocked/unblocked"
 msgid_plural "%s users blocked/unblocked"
 msgstr[0] "%s utente bloccato/sbloccato"
 msgstr[1] "%s utenti bloccati/sbloccati"
 
-#: ../../mod/admin.php:568
+#: ../../mod/admin.php:571
 #, php-format
 msgid "%s user deleted"
 msgid_plural "%s users deleted"
 msgstr[0] "%s utente cancellato"
 msgstr[1] "%s utenti cancellati"
 
-#: ../../mod/admin.php:599
+#: ../../mod/admin.php:602
 msgid "Account not found"
 msgstr "Account non trovato"
 
-#: ../../mod/admin.php:610
+#: ../../mod/admin.php:613
 #, php-format
 msgid "User '%s' deleted"
 msgstr "Utente '%s' eliminato"
 
-#: ../../mod/admin.php:619
+#: ../../mod/admin.php:622
 #, php-format
 msgid "User '%s' unblocked"
 msgstr "Utente '%s' sbloccato"
 
-#: ../../mod/admin.php:619
+#: ../../mod/admin.php:622
 #, php-format
 msgid "User '%s' blocked"
 msgstr "Utente '%s' bloccato"
 
-#: ../../mod/admin.php:684
+#: ../../mod/admin.php:687
 msgid "select all"
 msgstr "seleziona tutti"
 
-#: ../../mod/admin.php:685
+#: ../../mod/admin.php:688
 msgid "User registrations waiting for confirm"
 msgstr "Richieste di registrazione in attesa di conferma"
 
-#: ../../mod/admin.php:686
+#: ../../mod/admin.php:689
 msgid "Request date"
 msgstr "Data richiesta"
 
-#: ../../mod/admin.php:687
+#: ../../mod/admin.php:690
 msgid "No registrations."
 msgstr "Nessuna registrazione."
 
-#: ../../mod/admin.php:688 ../../mod/intro.php:11 ../../mod/intro.php:98
-#: ../../mod/notifications.php:159 ../../mod/notifications.php:206
+#: ../../mod/admin.php:691
 msgid "Approve"
 msgstr "Approva"
 
-#: ../../mod/admin.php:689
+#: ../../mod/admin.php:692
 msgid "Deny"
 msgstr "Nega"
 
-#: ../../mod/admin.php:691 ../../mod/intro.php:14 ../../mod/intro.php:99
-#: ../../mod/connections.php:348 ../../mod/connections.php:490
+#: ../../mod/admin.php:694 ../../mod/connections.php:352
+#: ../../mod/connections.php:494
 msgid "Block"
 msgstr "Blocca"
 
-#: ../../mod/admin.php:692 ../../mod/connections.php:348
-#: ../../mod/connections.php:490
+#: ../../mod/admin.php:695 ../../mod/connections.php:352
+#: ../../mod/connections.php:494
 msgid "Unblock"
 msgstr "Sblocca"
 
-#: ../../mod/admin.php:695
+#: ../../mod/admin.php:698
 msgid "Register date"
 msgstr "Data registrazione"
 
-#: ../../mod/admin.php:695
+#: ../../mod/admin.php:698
 msgid "Last login"
 msgstr "Ultimo accesso"
 
-#: ../../mod/admin.php:695
+#: ../../mod/admin.php:698
 msgid "Expires"
 msgstr "Scadenza"
 
-#: ../../mod/admin.php:695
+#: ../../mod/admin.php:698
 msgid "Service Class"
 msgstr "Service Class"
 
-#: ../../mod/admin.php:697
+#: ../../mod/admin.php:700
 msgid ""
 "Selected users will be deleted!\\n\\nEverything these users had posted on "
 "this site will be permanently deleted!\\n\\nAre you sure?"
 msgstr "Gli utenti selezionati saranno eliminati!\\n\\nTutto quello che gli utenti hanno pubblicato su questo sito sarà permanentemente eliminato!\\n\\nConfermi?"
 
-#: ../../mod/admin.php:698
+#: ../../mod/admin.php:701
 msgid ""
 "The user {0} will be deleted!\\n\\nEverything this user has posted on this "
 "site will be permanently deleted!\\n\\nAre you sure?"
 msgstr "L'utente {0} sarà eliminato!\\n\\nTutto quello che ha pubblicato su questo sito sarà permanentemente eliminato!\\n\\nConfermi?"
 
-#: ../../mod/admin.php:739
+#: ../../mod/admin.php:742
 #, php-format
 msgid "Plugin %s disabled."
 msgstr "Plugin %s non attivo."
 
-#: ../../mod/admin.php:743
+#: ../../mod/admin.php:746
 #, php-format
 msgid "Plugin %s enabled."
 msgstr "Plugin %s attivo."
 
-#: ../../mod/admin.php:753 ../../mod/admin.php:955
+#: ../../mod/admin.php:756 ../../mod/admin.php:958
 msgid "Disable"
 msgstr "Disattiva"
 
-#: ../../mod/admin.php:755 ../../mod/admin.php:957
+#: ../../mod/admin.php:758 ../../mod/admin.php:960
 msgid "Enable"
 msgstr "Attiva"
 
-#: ../../mod/admin.php:781 ../../mod/admin.php:986
+#: ../../mod/admin.php:784 ../../mod/admin.php:989
 msgid "Toggle"
 msgstr "Attiva/disattiva"
 
-#: ../../mod/admin.php:789 ../../mod/admin.php:996
+#: ../../mod/admin.php:792 ../../mod/admin.php:999
 msgid "Author: "
 msgstr "Autore:"
 
-#: ../../mod/admin.php:790 ../../mod/admin.php:997
+#: ../../mod/admin.php:793 ../../mod/admin.php:1000
 msgid "Maintainer: "
 msgstr "Gestore:"
 
-#: ../../mod/admin.php:919
+#: ../../mod/admin.php:922
 msgid "No themes found."
 msgstr "Nessun tema trovato."
 
-#: ../../mod/admin.php:978
+#: ../../mod/admin.php:981
 msgid "Screenshot"
 msgstr "Istantanea dello schermo"
 
-#: ../../mod/admin.php:1026
+#: ../../mod/admin.php:1029
 msgid "[Experimental]"
 msgstr "[Sperimentale]"
 
-#: ../../mod/admin.php:1027
+#: ../../mod/admin.php:1030
 msgid "[Unsupported]"
 msgstr "[Non supportato]"
 
-#: ../../mod/admin.php:1054
+#: ../../mod/admin.php:1057
 msgid "Log settings updated."
 msgstr "Impostazioni di log aggiornate."
 
-#: ../../mod/admin.php:1110
+#: ../../mod/admin.php:1113
 msgid "Clear"
 msgstr "Pulisci"
 
-#: ../../mod/admin.php:1116
+#: ../../mod/admin.php:1119
 msgid "Debugging"
 msgstr "Debugging"
 
-#: ../../mod/admin.php:1117
+#: ../../mod/admin.php:1120
 msgid "Log file"
 msgstr "File di log"
 
-#: ../../mod/admin.php:1117
+#: ../../mod/admin.php:1120
 msgid ""
 "Must be writable by web server. Relative to your Red top-level directory."
 msgstr "Deve essere scrivibile dal web server. È relativa alla cartella dove è installato Red."
 
-#: ../../mod/admin.php:1118
+#: ../../mod/admin.php:1121
 msgid "Log level"
 msgstr "Livello di log"
 
-#: ../../mod/mitem.php:13 ../../mod/menu.php:87
+#: ../../mod/mitem.php:14 ../../mod/menu.php:87
 msgid "Menu not found."
 msgstr "Menù non trovato."
 
-#: ../../mod/mitem.php:66
+#: ../../mod/mitem.php:47
 msgid "Menu element updated."
 msgstr "L'elemento del menù è stato aggiornato."
 
-#: ../../mod/mitem.php:70
+#: ../../mod/mitem.php:51
 msgid "Unable to update menu element."
 msgstr "Non è possibile aggiornare l'elemento del menù."
 
-#: ../../mod/mitem.php:76
+#: ../../mod/mitem.php:57
 msgid "Menu element added."
 msgstr "Elemento aggiunto al menù."
 
-#: ../../mod/mitem.php:80
+#: ../../mod/mitem.php:61
 msgid "Unable to add menu element."
 msgstr "Impossibile aggiungere l'elemento al menù."
 
-#: ../../mod/mitem.php:97 ../../mod/xchan.php:25 ../../mod/menu.php:113
+#: ../../mod/mitem.php:78 ../../mod/xchan.php:25 ../../mod/menu.php:113
 msgid "Not found."
 msgstr "Non trovato."
 
-#: ../../mod/mitem.php:116
+#: ../../mod/mitem.php:99
 msgid "Manage Menu Elements"
 msgstr "Gestione elementi del menù"
 
-#: ../../mod/mitem.php:119
+#: ../../mod/mitem.php:102
 msgid "Edit menu"
 msgstr "Modifica il menù"
 
-#: ../../mod/mitem.php:122
+#: ../../mod/mitem.php:105
 msgid "Edit element"
 msgstr "Modifica l'elemento"
 
-#: ../../mod/mitem.php:123
+#: ../../mod/mitem.php:106
 msgid "Drop element"
 msgstr "Elimina l'elemento"
 
-#: ../../mod/mitem.php:124
+#: ../../mod/mitem.php:107
 msgid "New element"
 msgstr "Nuovo elemento"
 
-#: ../../mod/mitem.php:125
+#: ../../mod/mitem.php:108
 msgid "Edit this menu container"
 msgstr "Modifica il contenitore del menù"
 
-#: ../../mod/mitem.php:126
+#: ../../mod/mitem.php:109
 msgid "Add menu element"
 msgstr "Aggiungi un elemento al menù"
 
-#: ../../mod/mitem.php:127
+#: ../../mod/mitem.php:110
 msgid "Delete this menu item"
 msgstr "Elimina questo elemento del menù"
 
-#: ../../mod/mitem.php:128
+#: ../../mod/mitem.php:111
 msgid "Edit this menu item"
 msgstr "Modifica questo elemento del menù"
 
-#: ../../mod/mitem.php:141
+#: ../../mod/mitem.php:134
 msgid "New Menu Element"
 msgstr "Nuovo elemento del menù"
 
-#: ../../mod/mitem.php:143 ../../mod/mitem.php:184
+#: ../../mod/mitem.php:136 ../../mod/mitem.php:179
+msgid "Menu Item Permissions"
+msgstr "Permessi del menu"
+
+#: ../../mod/mitem.php:139 ../../mod/mitem.php:183
 msgid "Link text"
 msgstr "Testo del link"
 
-#: ../../mod/mitem.php:144 ../../mod/mitem.php:185
+#: ../../mod/mitem.php:140 ../../mod/mitem.php:184
 msgid "URL of link"
 msgstr "Indirizzo del link"
 
-#: ../../mod/mitem.php:145 ../../mod/mitem.php:186
+#: ../../mod/mitem.php:141 ../../mod/mitem.php:185
 msgid "Use Red magic-auth if available"
 msgstr "Usa l'autenticazione magica di Red, se disponibile"
 
-#: ../../mod/mitem.php:146 ../../mod/mitem.php:187
+#: ../../mod/mitem.php:142 ../../mod/mitem.php:186
 msgid "Open link in new window"
 msgstr "Apri il link in una nuova finestra"
 
-#: ../../mod/mitem.php:148 ../../mod/mitem.php:189
+#: ../../mod/mitem.php:144 ../../mod/mitem.php:188
 msgid "Order in list"
 msgstr "Ordine dell'elenco"
 
-#: ../../mod/mitem.php:148 ../../mod/mitem.php:189
+#: ../../mod/mitem.php:144 ../../mod/mitem.php:188
 msgid "Higher numbers will sink to bottom of listing"
 msgstr "I numeri più alti andranno in fondo all'elenco"
 
-#: ../../mod/mitem.php:149 ../../mod/menu.php:79 ../../mod/new_channel.php:117
+#: ../../mod/mitem.php:145 ../../mod/menu.php:79 ../../mod/new_channel.php:117
 msgid "Create"
 msgstr "Crea"
 
-#: ../../mod/mitem.php:161
+#: ../../mod/mitem.php:157
 msgid "Menu item not found."
 msgstr "L'elemento del menù non è stato trovato."
 
-#: ../../mod/mitem.php:170
+#: ../../mod/mitem.php:166
 msgid "Menu item deleted."
 msgstr "L'elemento del menù è stato eliminato."
 
-#: ../../mod/mitem.php:172
+#: ../../mod/mitem.php:168
 msgid "Menu item could not be deleted."
 msgstr "L'elemento del menù non può essere eliminato."
 
-#: ../../mod/mitem.php:181
+#: ../../mod/mitem.php:177
 msgid "Edit Menu Element"
 msgstr "Modifica l'elemento del menù"
 
-#: ../../mod/mitem.php:190 ../../mod/menu.php:107
+#: ../../mod/mitem.php:189 ../../mod/menu.php:107
 msgid "Modify"
 msgstr "Modifica"
 
@@ -4881,10 +4974,6 @@ msgstr "Tutti i canali connessi"
 msgid "Click on a channel to add or remove."
 msgstr "Clicca su un canale per aggiungerlo o rimuoverlo."
 
-#: ../../mod/search.php:20 ../../mod/network.php:113
-msgid "Remove term"
-msgstr "Rimuovi termine"
-
 #: ../../mod/photos.php:83
 msgid "Page owner information could not be retrieved."
 msgstr "Impossibile ottenere informazioni sul proprietario della pagina."
@@ -5139,7 +5228,7 @@ msgstr "Impossibile verificare il canale richiesto."
 msgid "Selected channel has private message restrictions. Send failed."
 msgstr "Il canale ha delle regole restrittive per la ricezione dei messaggi privati. Invio fallito."
 
-#: ../../mod/message.php:223 ../../mod/notifications.php:101
+#: ../../mod/message.php:223
 msgid "Messages"
 msgstr "Messaggi"
 
@@ -5159,11 +5248,11 @@ msgstr "Messaggio revocato."
 msgid "Send Private Message"
 msgstr "Invia un messaggio privato"
 
-#: ../../mod/message.php:317 ../../mod/message.php:503
+#: ../../mod/message.php:317 ../../mod/message.php:471
 msgid "To:"
 msgstr "A:"
 
-#: ../../mod/message.php:322 ../../mod/message.php:505
+#: ../../mod/message.php:322 ../../mod/message.php:473
 msgid "Subject:"
 msgstr "Oggetto:"
 
@@ -5171,7 +5260,7 @@ msgstr "Oggetto:"
 msgid "No messages."
 msgstr "Nessun messaggio."
 
-#: ../../mod/message.php:375 ../../mod/message.php:472
+#: ../../mod/message.php:375 ../../mod/message.php:440
 msgid "Delete message"
 msgstr "Elimina il messaggio"
 
@@ -5183,36 +5272,32 @@ msgstr "D d M Y - G:i"
 msgid "Message not found."
 msgstr "Messaggio non trovato."
 
-#: ../../mod/message.php:473
+#: ../../mod/message.php:441
 msgid "Recall message"
 msgstr "Revoca il messaggio"
 
-#: ../../mod/message.php:475
+#: ../../mod/message.php:443
 msgid "Message has been recalled."
 msgstr "Il messaggio è stato revocato."
 
-#: ../../mod/message.php:492
+#: ../../mod/message.php:460
 msgid "Private Conversation"
 msgstr "Conversazione privata"
 
-#: ../../mod/message.php:496
+#: ../../mod/message.php:464
 msgid "Delete conversation"
 msgstr "Elimina la conversazione"
 
-#: ../../mod/message.php:498
+#: ../../mod/message.php:466
 msgid ""
 "No secure communications available. You <strong>may</strong> be able to "
 "respond from the sender's profile page."
 msgstr "Non è disponibile alcun sistema per comunicare in modo sicuro. Puoi verificare se <strong>eventualmente</strong> è possibile rispondere dalla pagina del profilo del mittente."
 
-#: ../../mod/message.php:502
+#: ../../mod/message.php:470
 msgid "Send Reply"
 msgstr "Invia la risposta"
 
-#: ../../mod/hcard.php:10
-msgid "No profile"
-msgstr "Nessun profilo"
-
 #: ../../mod/layouts.php:52
 msgid "Layout Help"
 msgstr "Guida al layout"
@@ -5245,101 +5330,30 @@ msgstr "Inserisci l'indirizzo del tuo canale (ad esempio lucia@esempio.com)"
 msgid "Authenticate"
 msgstr "Autenticazione"
 
-#: ../../mod/network.php:172
+#: ../../mod/network.php:79
 msgid "No such group"
 msgstr "Impossibile trovare l'insieme"
 
-#: ../../mod/network.php:212
-msgid "Refresh"
-msgstr "Aggiorna"
-
-#: ../../mod/network.php:213 ../../mod/connections.php:404
-msgid "Me"
-msgstr "Io"
-
-#: ../../mod/network.php:214 ../../mod/connections.php:406
-msgid "Best Friends"
-msgstr "Buoni amici"
-
-#: ../../mod/network.php:216
-msgid "Co-workers"
-msgstr "Colleghi"
-
-#: ../../mod/network.php:217 ../../mod/connections.php:408
-msgid "Former Friends"
-msgstr "Ex amici"
-
-#: ../../mod/network.php:218 ../../mod/connections.php:409
-msgid "Acquaintances"
-msgstr "Conoscenti"
-
-#: ../../mod/network.php:219
-msgid "Everybody"
-msgstr "Tutti"
-
-#: ../../mod/network.php:234
+#: ../../mod/network.php:118
 msgid "Search Results For:"
 msgstr "Cerca risultati con:"
 
-#: ../../mod/network.php:296
+#: ../../mod/network.php:172
+msgid "Collection is empty"
+msgstr "L'insieme di canali è vuoto"
+
+#: ../../mod/network.php:180
 msgid "Collection: "
 msgstr "Insieme:"
 
-#: ../../mod/network.php:309
+#: ../../mod/network.php:193
 msgid "Connection: "
 msgstr "Connessione:"
 
-#: ../../mod/network.php:312
+#: ../../mod/network.php:196
 msgid "Invalid connection."
 msgstr "Connessione non valida."
 
-#: ../../mod/intro.php:17 ../../mod/intro.php:100
-#: ../../mod/connections.php:355 ../../mod/connections.php:491
-#: ../../mod/notifications.php:51 ../../mod/notifications.php:162
-#: ../../mod/notifications.php:208
-msgid "Ignore"
-msgstr "Ignora"
-
-#: ../../mod/intro.php:29 ../../mod/connections.php:122
-msgid "Connection updated."
-msgstr "Contatto aggiornato."
-
-#: ../../mod/intro.php:31
-msgid "Connection update failed."
-msgstr "Impossibile aggiornare il contatto."
-
-#: ../../mod/intro.php:56
-msgid "Introductions and Connection Requests"
-msgstr "Richieste di entrare in contatto"
-
-#: ../../mod/intro.php:67
-msgid "No pending introductions."
-msgstr "Nessuna richiesta in attesa."
-
-#: ../../mod/intro.php:72
-msgid "System error. Please try again later."
-msgstr "Errore di sistema. Riprovare più tardi."
-
-#: ../../mod/intro.php:95 ../../mod/connections.php:496
-#: ../../mod/notifications.php:155 ../../mod/notifications.php:202
-msgid "Hide this contact from others"
-msgstr "Nascondi questo contatto agli altri"
-
-#: ../../mod/intro.php:96 ../../mod/notifications.php:156
-#: ../../mod/notifications.php:203
-msgid "Post a new friend activity"
-msgstr "Pubblica sulla bacheca che hai un nuovo contatto"
-
-#: ../../mod/intro.php:96 ../../mod/notifications.php:156
-#: ../../mod/notifications.php:203
-msgid "if applicable"
-msgstr "se possibile"
-
-#: ../../mod/intro.php:101 ../../mod/notifications.php:35
-#: ../../mod/notifications.php:163 ../../mod/notifications.php:209
-msgid "Discard"
-msgstr "Rifiuta"
-
 #: ../../mod/post.php:222
 msgid ""
 "Remote authentication blocked. You are logged into this site locally. Please"
@@ -5368,7 +5382,7 @@ msgid "Hub not found."
 msgstr "Server non trovato."
 
 #: ../../mod/profiles.php:18 ../../mod/profiles.php:138
-#: ../../mod/profiles.php:179 ../../mod/profiles.php:486
+#: ../../mod/profiles.php:168 ../../mod/profiles.php:475
 msgid "Profile not found."
 msgstr "Profilo non trovato."
 
@@ -5388,226 +5402,226 @@ msgstr "Il nuovo profilo è stato creato."
 msgid "Profile unavailable to clone."
 msgstr "Impossibile duplicare il profilo."
 
-#: ../../mod/profiles.php:189
+#: ../../mod/profiles.php:178
 msgid "Profile Name is required."
 msgstr "Il nome del profilo è obbligatorio ."
 
-#: ../../mod/profiles.php:317
+#: ../../mod/profiles.php:306
 msgid "Marital Status"
 msgstr "Stato sentimentale"
 
-#: ../../mod/profiles.php:321
+#: ../../mod/profiles.php:310
 msgid "Romantic Partner"
 msgstr "Partner affettivo"
 
-#: ../../mod/profiles.php:325
+#: ../../mod/profiles.php:314
 msgid "Likes"
 msgstr "Cosa gli piace"
 
-#: ../../mod/profiles.php:329
+#: ../../mod/profiles.php:318
 msgid "Dislikes"
 msgstr "Cosa non gli piace"
 
-#: ../../mod/profiles.php:333
+#: ../../mod/profiles.php:322
 msgid "Work/Employment"
 msgstr "Lavoro/impiego"
 
-#: ../../mod/profiles.php:336
+#: ../../mod/profiles.php:325
 msgid "Religion"
 msgstr "Religione"
 
-#: ../../mod/profiles.php:340
+#: ../../mod/profiles.php:329
 msgid "Political Views"
 msgstr "Orientamento politico"
 
-#: ../../mod/profiles.php:344
+#: ../../mod/profiles.php:333
 msgid "Gender"
 msgstr "Sesso"
 
-#: ../../mod/profiles.php:348
+#: ../../mod/profiles.php:337
 msgid "Sexual Preference"
 msgstr "Preferenze sessuali"
 
-#: ../../mod/profiles.php:352
+#: ../../mod/profiles.php:341
 msgid "Homepage"
 msgstr "Home page"
 
-#: ../../mod/profiles.php:356
+#: ../../mod/profiles.php:345
 msgid "Interests"
 msgstr "Interessi"
 
-#: ../../mod/profiles.php:360
+#: ../../mod/profiles.php:349
 msgid "Address"
 msgstr "Indirizzo"
 
-#: ../../mod/profiles.php:367 ../../mod/pubsites.php:31
+#: ../../mod/profiles.php:356 ../../mod/pubsites.php:31
 msgid "Location"
 msgstr "Luogo attuale"
 
-#: ../../mod/profiles.php:450
+#: ../../mod/profiles.php:439
 msgid "Profile updated."
 msgstr "Profilo aggiornato."
 
-#: ../../mod/profiles.php:505
+#: ../../mod/profiles.php:494
 msgid "Hide your contact/friend list from viewers of this profile?"
 msgstr "Nascondi la tua lista di contatti/amici ai visitatori di questo profilo?"
 
-#: ../../mod/profiles.php:528
+#: ../../mod/profiles.php:517
 msgid "Edit Profile Details"
 msgstr "Modifica i dettagli del profilo"
 
-#: ../../mod/profiles.php:530
+#: ../../mod/profiles.php:519
 msgid "View this profile"
 msgstr "Guarda questo profilo"
 
-#: ../../mod/profiles.php:531
+#: ../../mod/profiles.php:520
 msgid "Change Profile Photo"
 msgstr "Cambia la foto del profilo"
 
-#: ../../mod/profiles.php:532
+#: ../../mod/profiles.php:521
 msgid "Create a new profile using these settings"
 msgstr "Crea un nuovo profilo usando queste impostazioni"
 
-#: ../../mod/profiles.php:533
+#: ../../mod/profiles.php:522
 msgid "Clone this profile"
 msgstr "Clona questo profilo"
 
-#: ../../mod/profiles.php:534
+#: ../../mod/profiles.php:523
 msgid "Delete this profile"
 msgstr "Elimina questo profilo"
 
-#: ../../mod/profiles.php:535
+#: ../../mod/profiles.php:524
 msgid "Profile Name:"
 msgstr "Nome del profilo:"
 
-#: ../../mod/profiles.php:536
+#: ../../mod/profiles.php:525
 msgid "Your Full Name:"
 msgstr "Il tuo nome completo:"
 
-#: ../../mod/profiles.php:537
+#: ../../mod/profiles.php:526
 msgid "Title/Description:"
 msgstr "Titolo/descrizione:"
 
-#: ../../mod/profiles.php:538
+#: ../../mod/profiles.php:527
 msgid "Your Gender:"
 msgstr "Sesso:"
 
-#: ../../mod/profiles.php:539
+#: ../../mod/profiles.php:528
 #, php-format
 msgid "Birthday (%s):"
 msgstr "Compleanno (%s):"
 
-#: ../../mod/profiles.php:540
+#: ../../mod/profiles.php:529
 msgid "Street Address:"
 msgstr "Indirizzo (via/piazza):"
 
-#: ../../mod/profiles.php:541
+#: ../../mod/profiles.php:530
 msgid "Locality/City:"
 msgstr "Località:"
 
-#: ../../mod/profiles.php:542
+#: ../../mod/profiles.php:531
 msgid "Postal/Zip Code:"
 msgstr "CAP:"
 
-#: ../../mod/profiles.php:543
+#: ../../mod/profiles.php:532
 msgid "Country:"
 msgstr "Nazione:"
 
-#: ../../mod/profiles.php:544
+#: ../../mod/profiles.php:533
 msgid "Region/State:"
 msgstr "Regione/stato:"
 
-#: ../../mod/profiles.php:545
+#: ../../mod/profiles.php:534
 msgid "<span class=\"heart\">&hearts;</span> Marital Status:"
 msgstr "<span class=\"heart\">&hearts;</span> Stato sentimentale:"
 
-#: ../../mod/profiles.php:546
+#: ../../mod/profiles.php:535
 msgid "Who: (if applicable)"
 msgstr "Con chi: (se possibile)"
 
-#: ../../mod/profiles.php:547
+#: ../../mod/profiles.php:536
 msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
 msgstr "Per esempio: cathy123, Cathy Williams, cathy@example.com"
 
-#: ../../mod/profiles.php:548
+#: ../../mod/profiles.php:537
 msgid "Since [date]:"
 msgstr "dal [data]:"
 
-#: ../../mod/profiles.php:550
+#: ../../mod/profiles.php:539
 msgid "Homepage URL:"
 msgstr "Indirizzo home page:"
 
-#: ../../mod/profiles.php:553
+#: ../../mod/profiles.php:542
 msgid "Religious Views:"
 msgstr "Orientamento religioso:"
 
-#: ../../mod/profiles.php:554
+#: ../../mod/profiles.php:543
 msgid "Keywords:"
 msgstr "Parole chiave, tag:"
 
-#: ../../mod/profiles.php:557
+#: ../../mod/profiles.php:546
 msgid "Example: fishing photography software"
 msgstr "Per esempio: pesca fotografia programmazione"
 
-#: ../../mod/profiles.php:558
+#: ../../mod/profiles.php:547
 msgid "Used in directory listings"
 msgstr "Visibile nell'elenco pubblico di canali"
 
-#: ../../mod/profiles.php:559
+#: ../../mod/profiles.php:548
 msgid "Tell us about yourself..."
 msgstr "Raccontaci di te..."
 
-#: ../../mod/profiles.php:560
+#: ../../mod/profiles.php:549
 msgid "Hobbies/Interests"
 msgstr "Hobby/interessi"
 
-#: ../../mod/profiles.php:561
+#: ../../mod/profiles.php:550
 msgid "Contact information and Social Networks"
 msgstr "Contatti personali e i tuoi social network"
 
-#: ../../mod/profiles.php:562
+#: ../../mod/profiles.php:551
 msgid "My other channels"
 msgstr "I miei altri canali"
 
-#: ../../mod/profiles.php:563
+#: ../../mod/profiles.php:552
 msgid "Musical interests"
 msgstr "Interessi musicali"
 
-#: ../../mod/profiles.php:564
+#: ../../mod/profiles.php:553
 msgid "Books, literature"
 msgstr "Libri, letteratura"
 
-#: ../../mod/profiles.php:565
+#: ../../mod/profiles.php:554
 msgid "Television"
 msgstr "Televisione"
 
-#: ../../mod/profiles.php:566
+#: ../../mod/profiles.php:555
 msgid "Film/dance/culture/entertainment"
 msgstr "Film/danza/cultura/intrattenimento"
 
-#: ../../mod/profiles.php:567
+#: ../../mod/profiles.php:556
 msgid "Love/romance"
 msgstr "Amore"
 
-#: ../../mod/profiles.php:568
+#: ../../mod/profiles.php:557
 msgid "Work/employment"
 msgstr "Lavoro/impiego"
 
-#: ../../mod/profiles.php:569
+#: ../../mod/profiles.php:558
 msgid "School/education"
 msgstr "Scuola/educazione"
 
-#: ../../mod/profiles.php:574
+#: ../../mod/profiles.php:563
 msgid ""
 "This is your <strong>public</strong> profile.<br />It <strong>may</strong> "
 "be visible to anybody using the internet."
 msgstr "Questo è il tuo profilo <strong>publico</strong>.<br /><strong>Potrebbe</strong> essere visto da chiunque attraverso internet."
 
-#: ../../mod/profiles.php:584 ../../mod/directory.php:160
+#: ../../mod/profiles.php:573 ../../mod/directory.php:161
 msgid "Age: "
 msgstr "Età:"
 
-#: ../../mod/profiles.php:623
+#: ../../mod/profiles.php:612
 msgid "Edit/Manage Profiles"
 msgstr "Modifica/gestisci i profili"
 
@@ -5641,385 +5655,394 @@ msgstr "Il nome breve sarà usato per creare un indirizzo facile da ricordare pe
 msgid "Or <a href=\"import\">import an existing channel</a> from another location"
 msgstr "Oppure <a href=\"import\">importa un tuo canale esistente</a> da un altro server/hub"
 
-#: ../../mod/connections.php:67
+#: ../../mod/connections.php:71
 msgid "Could not access contact record."
 msgstr "Non è possibile accedere alle informazioni sul contatto."
 
-#: ../../mod/connections.php:81
+#: ../../mod/connections.php:85
 msgid "Could not locate selected profile."
 msgstr "Non riesco a trovare il profilo selezionato."
 
-#: ../../mod/connections.php:124
+#: ../../mod/connections.php:126
+msgid "Connection updated."
+msgstr "Contatto aggiornato."
+
+#: ../../mod/connections.php:128
 msgid "Failed to update connection record."
 msgstr "Impossibile aggiornare le informazioni del contatto."
 
-#: ../../mod/connections.php:219
+#: ../../mod/connections.php:223
 msgid "Could not access address book record."
 msgstr "Impossibile accedere alle informazioni della rubrica."
 
-#: ../../mod/connections.php:233
+#: ../../mod/connections.php:237
 msgid "Refresh failed - channel is currently unavailable."
 msgstr "Il canale non è disponibile - impossibile aggiornare."
 
-#: ../../mod/connections.php:240
+#: ../../mod/connections.php:244
 msgid "Channel has been unblocked"
 msgstr "Il canale è stato sbloccato"
 
-#: ../../mod/connections.php:241
+#: ../../mod/connections.php:245
 msgid "Channel has been blocked"
 msgstr "Il canale è stato bloccato"
 
-#: ../../mod/connections.php:245 ../../mod/connections.php:257
-#: ../../mod/connections.php:269 ../../mod/connections.php:281
-#: ../../mod/connections.php:296
+#: ../../mod/connections.php:249 ../../mod/connections.php:261
+#: ../../mod/connections.php:273 ../../mod/connections.php:285
+#: ../../mod/connections.php:300
 msgid "Unable to set address book parameters."
 msgstr "Impossibile impostare i parametri della rubrica."
 
-#: ../../mod/connections.php:252
+#: ../../mod/connections.php:256
 msgid "Channel has been unignored"
 msgstr "Il canale non sarà più ignorato"
 
-#: ../../mod/connections.php:253
+#: ../../mod/connections.php:257
 msgid "Channel has been ignored"
 msgstr "Il canale sarà ignorato"
 
-#: ../../mod/connections.php:264
+#: ../../mod/connections.php:268
 msgid "Channel has been unarchived"
 msgstr "Il canale non è più archiviato"
 
-#: ../../mod/connections.php:265
+#: ../../mod/connections.php:269
 msgid "Channel has been archived"
 msgstr "Il canale è stato archiviato"
 
-#: ../../mod/connections.php:276
+#: ../../mod/connections.php:280
 msgid "Channel has been unhidden"
 msgstr "Il canale non è più nascosto"
 
-#: ../../mod/connections.php:277
+#: ../../mod/connections.php:281
 msgid "Channel has been hidden"
 msgstr "Il canale è stato nascosto"
 
-#: ../../mod/connections.php:291
+#: ../../mod/connections.php:295
 msgid "Channel has been approved"
 msgstr "Il canale è stato approvato"
 
-#: ../../mod/connections.php:292
+#: ../../mod/connections.php:296
 msgid "Channel has been unapproved"
 msgstr "Il canale non è più approvato"
 
-#: ../../mod/connections.php:310
+#: ../../mod/connections.php:314
 msgid "Contact has been removed."
 msgstr "Il contatto è stato rimosso."
 
-#: ../../mod/connections.php:330
+#: ../../mod/connections.php:334
 #, php-format
 msgid "View %s's profile"
 msgstr "Guarda il profilo di %s"
 
-#: ../../mod/connections.php:334
+#: ../../mod/connections.php:338
 msgid "Refresh Permissions"
 msgstr "Aggiorna i permessi"
 
-#: ../../mod/connections.php:337
+#: ../../mod/connections.php:341
 msgid "Fetch updated permissions"
 msgstr "Scarica i permessi aggiornati"
 
-#: ../../mod/connections.php:341
+#: ../../mod/connections.php:345
 msgid "Recent Activity"
 msgstr "Attività recenti"
 
-#: ../../mod/connections.php:344
+#: ../../mod/connections.php:348
 msgid "View recent posts and comments"
 msgstr "Leggi i post recenti e i commenti"
 
-#: ../../mod/connections.php:351
+#: ../../mod/connections.php:355
 msgid "Block or Unblock this connection"
 msgstr "Per bloccare o meno questo contatto"
 
-#: ../../mod/connections.php:355 ../../mod/connections.php:491
+#: ../../mod/connections.php:359 ../../mod/connections.php:495
 msgid "Unignore"
 msgstr "Non ignorare"
 
-#: ../../mod/connections.php:358
+#: ../../mod/connections.php:359 ../../mod/connections.php:495
+#: ../../mod/notifications.php:51
+msgid "Ignore"
+msgstr "Ignora"
+
+#: ../../mod/connections.php:362
 msgid "Ignore or Unignore this connection"
 msgstr "Per ignorare o meno questo contatto"
 
-#: ../../mod/connections.php:361
+#: ../../mod/connections.php:365
 msgid "Unarchive"
 msgstr "Non archiviare"
 
-#: ../../mod/connections.php:361
+#: ../../mod/connections.php:365
 msgid "Archive"
 msgstr "Archivia"
 
-#: ../../mod/connections.php:364
+#: ../../mod/connections.php:368
 msgid "Archive or Unarchive this connection"
 msgstr "Per archiviare o meno questo contatto"
 
-#: ../../mod/connections.php:367
+#: ../../mod/connections.php:371
 msgid "Unhide"
 msgstr "Non nascondere"
 
-#: ../../mod/connections.php:367
+#: ../../mod/connections.php:371
 msgid "Hide"
 msgstr "Nascondi"
 
-#: ../../mod/connections.php:370
+#: ../../mod/connections.php:374
 msgid "Hide or Unhide this connection"
 msgstr "Per nascondere o meno questo contatto"
 
-#: ../../mod/connections.php:377
+#: ../../mod/connections.php:381
 msgid "Delete this connection"
 msgstr "Elimina questo contatto"
 
-#: ../../mod/connections.php:410
+#: ../../mod/connections.php:414
 msgid "Unknown"
 msgstr "Sconosciuto"
 
-#: ../../mod/connections.php:420 ../../mod/connections.php:449
+#: ../../mod/connections.php:424 ../../mod/connections.php:453
 msgid "Approve this connection"
 msgstr "Approva questo contatto"
 
-#: ../../mod/connections.php:420
+#: ../../mod/connections.php:424
 msgid "Accept connection to allow communication"
 msgstr "Entra in contatto per poter comunicare"
 
-#: ../../mod/connections.php:436
+#: ../../mod/connections.php:440
 msgid "Automatic Permissions Settings"
 msgstr "Permessi predefiniti"
 
-#: ../../mod/connections.php:436
+#: ../../mod/connections.php:440
 #, php-format
 msgid "Connections: settings for %s"
 msgstr "Contatti: impostazioni per %s"
 
-#: ../../mod/connections.php:440
+#: ../../mod/connections.php:444
 msgid ""
 "When receiving a channel introduction, any permissions provided here will be"
 " applied to the new connection automatically and the introduction approved. "
 "Leave this page if you do not wish to use this feature."
 msgstr "Hai ricevuto da un canale una richiesta di entrare in contatto, se prosegui la richiesta sarà approvata e saranno applicati i permessi mostrati. Lascia questa pagina se non vuoi proseguire."
 
-#: ../../mod/connections.php:442
+#: ../../mod/connections.php:446
 msgid "Slide to adjust your degree of friendship"
 msgstr "Trascina per restringere il grado di amicizia da mostrare"
 
-#: ../../mod/connections.php:448
+#: ../../mod/connections.php:452
 msgid "inherited"
 msgstr "derivato"
 
-#: ../../mod/connections.php:450
+#: ../../mod/connections.php:454
 msgid "Connection has no individual permissions!"
 msgstr "Non hai assegnato permessi individuali a questo contatto!"
 
-#: ../../mod/connections.php:451
+#: ../../mod/connections.php:455
 msgid ""
 "This may be appropriate based on your <a href=\"settings\">privacy "
 "settings</a>, though you may wish to review the \"Advanced Permissions\"."
 msgstr "Questo corrisponde alle tue <a href='settings'>impostazioni di privacy</a>, ma puoi anche dare un'occhiata ai 'Permessi avanzati' per opzioni più dettagliate."
 
-#: ../../mod/connections.php:453
+#: ../../mod/connections.php:457
 msgid "Profile Visibility"
 msgstr "Visibilità del profilo"
 
-#: ../../mod/connections.php:454
+#: ../../mod/connections.php:458
 #, php-format
 msgid ""
 "Please choose the profile you would like to display to %s when viewing your "
 "profile securely."
 msgstr "Seleziona il profilo che vuoi mostrare a %s quando visita il tuo profilo in modo sicuro."
 
-#: ../../mod/connections.php:455
+#: ../../mod/connections.php:459
 msgid "Contact Information / Notes"
 msgstr "Informazioni e annotazioni sul contatto"
 
-#: ../../mod/connections.php:456
+#: ../../mod/connections.php:460
 msgid "Edit contact notes"
 msgstr "Modifica le informazioni sul contatto"
 
-#: ../../mod/connections.php:458
+#: ../../mod/connections.php:462
 msgid "Their Settings"
 msgstr "Permessi concessi a te"
 
-#: ../../mod/connections.php:459
+#: ../../mod/connections.php:463
 msgid "My Settings"
 msgstr "I permessi che concedo"
 
-#: ../../mod/connections.php:461
+#: ../../mod/connections.php:465
 msgid "Forum Members"
 msgstr "Membro di un forum"
 
-#: ../../mod/connections.php:462
+#: ../../mod/connections.php:466
 msgid "Soapbox"
 msgstr "Comunicati e annunci"
 
-#: ../../mod/connections.php:463
+#: ../../mod/connections.php:467
 msgid "Full Sharing"
 msgstr "Condivisione totale"
 
-#: ../../mod/connections.php:464
+#: ../../mod/connections.php:468
 msgid "Cautious Sharing"
 msgstr "Condivisione prudente"
 
-#: ../../mod/connections.php:465
+#: ../../mod/connections.php:469
 msgid "Follow Only"
 msgstr "Follower"
 
-#: ../../mod/connections.php:466
+#: ../../mod/connections.php:470
 msgid "Individual Permissions"
 msgstr "Permessi individuali"
 
-#: ../../mod/connections.php:467
+#: ../../mod/connections.php:471
 msgid ""
 "Some permissions may be inherited from your channel <a "
 "href=\"settings\">privacy settings</a>, which have higher priority. Changing"
 " those inherited settings on this page will have no effect."
 msgstr "Alcuni permessi derivano dalle <a href=\"settings\">impostazioni di privacy</a>, che hanno una priorità maggiore. Cambiarli in questa pagina non avrà alcun effetto."
 
-#: ../../mod/connections.php:468
+#: ../../mod/connections.php:472
 msgid "Advanced Permissions"
 msgstr "Permessi avanzati"
 
-#: ../../mod/connections.php:469
+#: ../../mod/connections.php:473
 msgid "Quick Links"
 msgstr "Impostazioni veloci"
 
-#: ../../mod/connections.php:473
+#: ../../mod/connections.php:477
 #, php-format
 msgid "Visit %s's profile - %s"
 msgstr "Guarda il profilo di %s - %s"
 
-#: ../../mod/connections.php:474
+#: ../../mod/connections.php:478
 msgid "Block/Unblock contact"
 msgstr "Blocca/sblocca contatto"
 
-#: ../../mod/connections.php:475
+#: ../../mod/connections.php:479
 msgid "Ignore contact"
 msgstr "Ignora il contatto"
 
-#: ../../mod/connections.php:476
+#: ../../mod/connections.php:480
 msgid "Repair URL settings"
 msgstr "Ripara le impostazioni URL"
 
-#: ../../mod/connections.php:477
+#: ../../mod/connections.php:481
 msgid "View conversations"
 msgstr "Leggi le conversazioni"
 
-#: ../../mod/connections.php:479
+#: ../../mod/connections.php:483
 msgid "Delete contact"
 msgstr "Elimina contatto"
 
-#: ../../mod/connections.php:482
+#: ../../mod/connections.php:486
 msgid "Last update:"
 msgstr "Ultimo aggiornamento:"
 
-#: ../../mod/connections.php:484
+#: ../../mod/connections.php:488
 msgid "Update public posts"
 msgstr "Aggiorna gli articoli pubblici"
 
-#: ../../mod/connections.php:486
+#: ../../mod/connections.php:490
 msgid "Update now"
 msgstr "Aggiorna adesso"
 
-#: ../../mod/connections.php:492
+#: ../../mod/connections.php:496
 msgid "Currently blocked"
 msgstr "Attualmente bloccato"
 
-#: ../../mod/connections.php:493
+#: ../../mod/connections.php:497
 msgid "Currently ignored"
 msgstr "Attualmente ignorato"
 
-#: ../../mod/connections.php:494
+#: ../../mod/connections.php:498
 msgid "Currently archived"
 msgstr "Attualmente archiviato"
 
-#: ../../mod/connections.php:495
+#: ../../mod/connections.php:499
 msgid "Currently pending"
 msgstr "Attualmente da approvare"
 
-#: ../../mod/connections.php:496
+#: ../../mod/connections.php:500
+msgid "Hide this contact from others"
+msgstr "Nascondi questo contatto agli altri"
+
+#: ../../mod/connections.php:500
 msgid ""
 "Replies/likes to your public posts <strong>may</strong> still be visible"
 msgstr "Le risposte ai tuoi articoli pubblici <strong>potrebbero</strong> restare comunque visibili"
 
-#: ../../mod/connections.php:532 ../../mod/connections.php:604
+#: ../../mod/connections.php:536 ../../mod/connections.php:608
 msgid "Blocked"
 msgstr "Bloccati"
 
-#: ../../mod/connections.php:537 ../../mod/connections.php:611
+#: ../../mod/connections.php:541 ../../mod/connections.php:615
 msgid "Ignored"
 msgstr "Ignorati"
 
-#: ../../mod/connections.php:542 ../../mod/connections.php:625
+#: ../../mod/connections.php:546 ../../mod/connections.php:629
 msgid "Hidden"
 msgstr "Nascosti"
 
-#: ../../mod/connections.php:547 ../../mod/connections.php:618
+#: ../../mod/connections.php:551 ../../mod/connections.php:622
 msgid "Archived"
 msgstr "Archiviati"
 
-#: ../../mod/connections.php:558
+#: ../../mod/connections.php:562
 msgid "All"
 msgstr "Tutti"
 
-#: ../../mod/connections.php:579
-msgid "Suggestions"
-msgstr "Suggerimenti"
-
-#: ../../mod/connections.php:582
+#: ../../mod/connections.php:586
 msgid "Suggest new connections"
 msgstr "Suggerisci nuovi contatti"
 
-#: ../../mod/connections.php:588
+#: ../../mod/connections.php:592
 msgid "Show pending (new) connections"
-msgstr "Richieste di entrare in contatto"
+msgstr "Richieste di contatto in attesa"
 
-#: ../../mod/connections.php:591
+#: ../../mod/connections.php:595
 msgid "All Connections"
 msgstr "Tutti i contatti"
 
-#: ../../mod/connections.php:594
+#: ../../mod/connections.php:598
 msgid "Show all connections"
 msgstr "Mostra tutti i contatti"
 
-#: ../../mod/connections.php:597
+#: ../../mod/connections.php:601
 msgid "Unblocked"
 msgstr "Non bloccati"
 
-#: ../../mod/connections.php:600
+#: ../../mod/connections.php:604
 msgid "Only show unblocked connections"
 msgstr "Mostra solo i contatti non bloccati"
 
-#: ../../mod/connections.php:607
+#: ../../mod/connections.php:611
 msgid "Only show blocked connections"
 msgstr "Mostra solo i contatti bloccati"
 
-#: ../../mod/connections.php:614
+#: ../../mod/connections.php:618
 msgid "Only show ignored connections"
 msgstr "Mostra solo i contatti ignorati"
 
-#: ../../mod/connections.php:621
+#: ../../mod/connections.php:625
 msgid "Only show archived connections"
 msgstr "Mostra solo i contatti archiviati"
 
-#: ../../mod/connections.php:628
+#: ../../mod/connections.php:632
 msgid "Only show hidden connections"
 msgstr "Mostra solo i contatti nascosti"
 
-#: ../../mod/connections.php:670
+#: ../../mod/connections.php:674
 #, php-format
 msgid "%1$s [%2$s]"
 msgstr "%1$s [%2$s]"
 
-#: ../../mod/connections.php:671
+#: ../../mod/connections.php:675
 msgid "Edit contact"
 msgstr "Modifica il contatto"
 
-#: ../../mod/connections.php:694
+#: ../../mod/connections.php:698
 msgid "Search your connections"
 msgstr "Cerca tra i contatti"
 
-#: ../../mod/connections.php:695
+#: ../../mod/connections.php:699
 msgid "Finding: "
 msgstr "Ricerca: "
 
@@ -6246,71 +6269,6 @@ msgstr "interessi personali:"
 msgid "No matches"
 msgstr "Nessun risultato"
 
-#: ../../mod/crepair.php:102
-msgid "Contact settings applied."
-msgstr "Contatto modificato."
-
-#: ../../mod/crepair.php:104
-msgid "Contact update failed."
-msgstr "Le modifiche al contatto non sono state salvate."
-
-#: ../../mod/crepair.php:129 ../../mod/fsuggest.php:20
-#: ../../mod/fsuggest.php:92
-msgid "Contact not found."
-msgstr "Contatto non trovato."
-
-#: ../../mod/crepair.php:135
-msgid "Repair Contact Settings"
-msgstr "Ripara le impostazioni del contatto"
-
-#: ../../mod/crepair.php:137
-msgid ""
-"<strong>WARNING: This is highly advanced</strong> and if you enter incorrect"
-" information your communications with this contact may stop working."
-msgstr "<strong>ATTENZIONE: Queste sono impostazioni avanzate</strong> e se inserisci informazioni errate le tue comunicazioni con questo contatto potrebbero non funzionare più"
-
-#: ../../mod/crepair.php:138
-msgid ""
-"Please use your browser 'Back' button <strong>now</strong> if you are "
-"uncertain what to do on this page."
-msgstr "Clicca <strong>adesso</strong> il tasto 'Indietro' del browser se non hai la certezza assoluta di quel che stai facendo."
-
-#: ../../mod/crepair.php:144
-msgid "Return to contact editor"
-msgstr "Ritorna alla modifica del contatto"
-
-#: ../../mod/crepair.php:149
-msgid "Account Nickname"
-msgstr "Nome utente"
-
-#: ../../mod/crepair.php:150
-msgid "@Tagname - overrides Name/Nickname"
-msgstr "@TagName - sostituirà il nome utente"
-
-#: ../../mod/crepair.php:151
-msgid "Account URL"
-msgstr "URL dell'utente"
-
-#: ../../mod/crepair.php:152
-msgid "Friend Request URL"
-msgstr "URL di richiesta amicizia"
-
-#: ../../mod/crepair.php:153
-msgid "Friend Confirm URL"
-msgstr "URL di conferma amicizia"
-
-#: ../../mod/crepair.php:154
-msgid "Notification Endpoint URL"
-msgstr "URL per le notifiche"
-
-#: ../../mod/crepair.php:155
-msgid "Poll/Feed URL"
-msgstr "URL del feed"
-
-#: ../../mod/crepair.php:156
-msgid "New photo from this URL"
-msgstr "Nuova foto da questo URL"
-
 #: ../../mod/zfinger.php:23
 msgid "invalid target signature"
 msgstr "la firma riscontrata non è valida"
@@ -6319,7 +6277,7 @@ msgstr "la firma riscontrata non è valida"
 msgid "Channel added."
 msgstr "Canale aggiunto."
 
-#: ../../mod/editlayout.php:36 ../../mod/editwebpage.php:30
+#: ../../mod/editlayout.php:36 ../../mod/editwebpage.php:32
 #: ../../mod/editpost.php:20 ../../mod/editblock.php:36
 msgid "Item not found"
 msgstr "Elemento non trovato"
@@ -6328,17 +6286,17 @@ msgstr "Elemento non trovato"
 msgid "Edit Layout"
 msgstr "Modifica il layout"
 
-#: ../../mod/editlayout.php:104 ../../mod/editwebpage.php:123
+#: ../../mod/editlayout.php:104 ../../mod/editwebpage.php:147
 #: ../../mod/editpost.php:101 ../../mod/editblock.php:118
 msgid "Insert YouTube video"
 msgstr "Inserisci video da YouTube"
 
-#: ../../mod/editlayout.php:105 ../../mod/editwebpage.php:124
+#: ../../mod/editlayout.php:105 ../../mod/editwebpage.php:148
 #: ../../mod/editpost.php:102 ../../mod/editblock.php:119
 msgid "Insert Vorbis [.ogg] video"
 msgstr "Inserisci video Vorbis [.ogg]"
 
-#: ../../mod/editlayout.php:106 ../../mod/editwebpage.php:125
+#: ../../mod/editlayout.php:106 ../../mod/editwebpage.php:149
 #: ../../mod/editpost.php:103 ../../mod/editblock.php:120
 msgid "Insert Vorbis [.ogg] audio"
 msgstr "Inserisci audio Vorbis [.ogg]"
@@ -6347,87 +6305,87 @@ msgstr "Inserisci audio Vorbis [.ogg]"
 msgid "Delete Layout"
 msgstr "Elimina il layout"
 
-#: ../../mod/profile_photo.php:54
+#: ../../mod/profile_photo.php:44
 msgid "Image uploaded but image cropping failed."
 msgstr "L'immagine è stata caricata, ma il non è stato possibile ritagliarla."
 
-#: ../../mod/profile_photo.php:107
+#: ../../mod/profile_photo.php:97
 msgid "Image resize failed."
 msgstr "Il ridimensionamento dell'immagine è fallito."
 
-#: ../../mod/profile_photo.php:151
+#: ../../mod/profile_photo.php:141
 msgid ""
 "Shift-reload the page or clear browser cache if the new photo does not "
 "display immediately."
 msgstr "Ricarica la pagina con shift+F5 o cancella la cache del browser se la nuova foto non viene mostrata immediatamente."
 
-#: ../../mod/profile_photo.php:173
+#: ../../mod/profile_photo.php:163
 #, php-format
 msgid "Image exceeds size limit of %d"
 msgstr "La dimensione dell'immagine supera il limite di %d"
 
-#: ../../mod/profile_photo.php:182
+#: ../../mod/profile_photo.php:172
 msgid "Unable to process image."
 msgstr "Impossibile elaborare l'immagine."
 
-#: ../../mod/profile_photo.php:224 ../../mod/profile_photo.php:272
+#: ../../mod/profile_photo.php:214 ../../mod/profile_photo.php:262
 msgid "Photo not available."
 msgstr "Foto non disponibile."
 
-#: ../../mod/profile_photo.php:291
+#: ../../mod/profile_photo.php:281
 msgid "Upload File:"
 msgstr "Carica un file:"
 
-#: ../../mod/profile_photo.php:292
+#: ../../mod/profile_photo.php:282
 msgid "Select a profile:"
 msgstr "Seleziona un profilo:"
 
-#: ../../mod/profile_photo.php:293
+#: ../../mod/profile_photo.php:283
 msgid "Upload Profile Photo"
 msgstr "Carica la foto del profilo"
 
-#: ../../mod/profile_photo.php:294
+#: ../../mod/profile_photo.php:284
 msgid "Upload"
 msgstr "Carica"
 
-#: ../../mod/profile_photo.php:298
+#: ../../mod/profile_photo.php:288
 msgid "skip this step"
 msgstr "salta questo passaggio"
 
-#: ../../mod/profile_photo.php:298
+#: ../../mod/profile_photo.php:288
 msgid "select a photo from your photo albums"
 msgstr "seleziona una foto dai tuoi album"
 
-#: ../../mod/profile_photo.php:312
+#: ../../mod/profile_photo.php:302
 msgid "Crop Image"
 msgstr "Ritaglia immagine"
 
-#: ../../mod/profile_photo.php:313
+#: ../../mod/profile_photo.php:303
 msgid "Please adjust the image cropping for optimum viewing."
 msgstr "Ritaglia l'immagine per migliorarne la visualizzazione."
 
-#: ../../mod/profile_photo.php:315
+#: ../../mod/profile_photo.php:305
 msgid "Done Editing"
 msgstr "Modifica terminata"
 
-#: ../../mod/profile_photo.php:350
+#: ../../mod/profile_photo.php:340
 msgid "Image uploaded successfully."
 msgstr "Immagine caricata con successo."
 
-#: ../../mod/profile_photo.php:352
+#: ../../mod/profile_photo.php:342
 msgid "Image upload failed."
 msgstr "Il caricamento dell'immagine è fallito."
 
-#: ../../mod/profile_photo.php:361
+#: ../../mod/profile_photo.php:351
 #, php-format
 msgid "Image size reduction [%s] failed."
 msgstr "Il ridimensionamento del'immagine [%s] è fallito."
 
-#: ../../mod/editwebpage.php:87
+#: ../../mod/editwebpage.php:106
 msgid "Edit Webpage"
 msgstr "Modifica la pagina web"
 
-#: ../../mod/editwebpage.php:162
+#: ../../mod/editwebpage.php:188
 msgid "Delete Webpage"
 msgstr "Elimina la pagina web"
 
@@ -6435,136 +6393,18 @@ msgstr "Elimina la pagina web"
 msgid "Invalid request identifier."
 msgstr "L'identificativo della richiesta non è valido."
 
-#: ../../mod/notifications.php:76
-msgid "System"
-msgstr "Sistema"
-
-#: ../../mod/notifications.php:96
-msgid "Introductions"
-msgstr "Richieste di amicizia"
-
-#: ../../mod/notifications.php:121
-msgid "Show Ignored Requests"
-msgstr "Mostra le richieste ignorate"
-
-#: ../../mod/notifications.php:121
-msgid "Hide Ignored Requests"
-msgstr "Nascondi le richieste ignorate"
-
-#: ../../mod/notifications.php:147 ../../mod/notifications.php:193
-msgid "Notification type: "
-msgstr "Tipo di notifica: "
-
-#: ../../mod/notifications.php:148
-msgid "Friend Suggestion"
-msgstr "Suggerimento di amicizia"
-
-#: ../../mod/notifications.php:150
-#, php-format
-msgid "suggested by %s"
-msgstr "suggerito da %s"
-
-#: ../../mod/notifications.php:179
-msgid "Claims to be known to you: "
-msgstr "Dice di conoscerti: "
-
-#: ../../mod/notifications.php:179
-msgid "yes"
-msgstr "si"
-
-#: ../../mod/notifications.php:179
-msgid "no"
-msgstr "no"
-
-#: ../../mod/notifications.php:186
-msgid "Approve as: "
-msgstr "Approva come: "
-
-#: ../../mod/notifications.php:187
-msgid "Friend"
-msgstr "Amico"
-
-#: ../../mod/notifications.php:188
-msgid "Sharer"
-msgstr "Sharer"
-
-#: ../../mod/notifications.php:188
-msgid "Fan/Admirer"
-msgstr "Fan/Ammiratore"
-
-#: ../../mod/notifications.php:194
-msgid "Friend/Connect Request"
-msgstr "Richiesta di entrare in contatto"
-
-#: ../../mod/notifications.php:194
-msgid "New Follower"
-msgstr "Nuovo follower"
-
-#: ../../mod/notifications.php:215
-msgid "No introductions."
-msgstr "Nessuna richiesta di amicizia."
-
-#: ../../mod/notifications.php:257 ../../mod/notifications.php:382
-#: ../../mod/notifications.php:465
-#, php-format
-msgid "%s liked %s's post"
-msgstr "A %s è piaciuto l'articolo di %s"
-
-#: ../../mod/notifications.php:266 ../../mod/notifications.php:391
-#: ../../mod/notifications.php:474
-#, php-format
-msgid "%s disliked %s's post"
-msgstr "A %s non è piaciuto l'articolo di %s"
-
-#: ../../mod/notifications.php:280 ../../mod/notifications.php:405
-#: ../../mod/notifications.php:488
-#, php-format
-msgid "%s is now friends with %s"
-msgstr "%s è ora amico di %s"
-
-#: ../../mod/notifications.php:287 ../../mod/notifications.php:412
-#, php-format
-msgid "%s created a new post"
-msgstr "%s ha creato un nuovo articolo"
-
-#: ../../mod/notifications.php:288 ../../mod/notifications.php:413
-#: ../../mod/notifications.php:497
-#, php-format
-msgid "%s commented on %s's post"
-msgstr "%s ha commentato l'articolo di %s"
-
-#: ../../mod/notifications.php:302
-msgid "No more network notifications."
-msgstr "Non ci sono nuove notifiche dalla rete."
-
-#: ../../mod/notifications.php:306
-msgid "Network Notifications"
-msgstr "Notifiche dalla rete"
+#: ../../mod/notifications.php:35
+msgid "Discard"
+msgstr "Rifiuta"
 
-#: ../../mod/notifications.php:332 ../../mod/notify.php:54
+#: ../../mod/notifications.php:93 ../../mod/notify.php:54
 msgid "No more system notifications."
 msgstr "Non ci sono nuove notifiche di sistema."
 
-#: ../../mod/notifications.php:336 ../../mod/notify.php:58
+#: ../../mod/notifications.php:97 ../../mod/notify.php:58
 msgid "System Notifications"
 msgstr "Notifiche di sistema"
 
-#: ../../mod/notifications.php:427
-msgid "No more personal notifications."
-msgstr "Non ci sono nuove notifiche personali."
-
-#: ../../mod/notifications.php:431
-msgid "Personal Notifications"
-msgstr "Notifiche personali"
-
-#: ../../mod/notifications.php:504
-msgid "No more home notifications."
-msgstr "Non ci sono nuove notifiche dalla bacheca."
-
-#: ../../mod/notifications.php:508
-msgid "Home Notifications"
-msgstr "Notifiche dalla bacheca"
-
 #: ../../mod/blocks.php:65
 msgid "Block Name"
 msgstr "Nome del riquadro"
@@ -6581,7 +6421,7 @@ msgstr "Inviato!"
 msgid "Item is not editable"
 msgstr "L'elemento non è modificabile"
 
-#: ../../mod/profile.php:112
+#: ../../mod/profile.php:64 ../../mod/profile.php:72
 msgid "Access to this profile has been restricted."
 msgstr "L'accesso a questo profilo è stato limitato."
 
@@ -6605,11 +6445,15 @@ msgstr "Scegli cosa vuoi inviare al destinatario"
 msgid "Make this post private"
 msgstr "Rendi privato questo articolo"
 
-#: ../../mod/wall_upload.php:41 ../../mod/item.php:1074
+#: ../../mod/wall_upload.php:41 ../../mod/item.php:1077
 msgid "Wall Photos"
 msgstr "Foto della bacheca"
 
-#: ../../mod/channel.php:107
+#: ../../mod/channel.php:25
+msgid "You must be logged in to see this page."
+msgstr "Devi aver effettuato l'accesso per vedere questa pagina."
+
+#: ../../mod/channel.php:83
 msgid "Insufficient permissions.  Request redirected to profile page."
 msgstr "Permessi insufficienti. Sarà visualizzata la pagina del profilo."
 
@@ -6629,6 +6473,10 @@ msgstr "Nessun risultato."
 msgid "Files"
 msgstr "Elenco file"
 
+#: ../../mod/fsuggest.php:20 ../../mod/fsuggest.php:92
+msgid "Contact not found."
+msgstr "Contatto non trovato."
+
 #: ../../mod/fsuggest.php:63
 msgid "Friend suggestion sent."
 msgstr "Suggerimento di amicizia inviato."
@@ -6650,23 +6498,23 @@ msgstr "Modifica il riquadro"
 msgid "Delete Block"
 msgstr "Elimina il riquadro"
 
-#: ../../mod/profperm.php:34 ../../mod/profperm.php:64
+#: ../../mod/profperm.php:25 ../../mod/profperm.php:55
 msgid "Invalid profile identifier."
 msgstr "Indentificativo del profilo non valido."
 
-#: ../../mod/profperm.php:110
+#: ../../mod/profperm.php:101
 msgid "Profile Visibility Editor"
 msgstr "Modifica la visibilità del profilo"
 
-#: ../../mod/profperm.php:114
+#: ../../mod/profperm.php:105
 msgid "Click on a contact to add or remove."
 msgstr "Clicca su un contatto per aggiungerlo o rimuoverlo."
 
-#: ../../mod/profperm.php:123
+#: ../../mod/profperm.php:114
 msgid "Visible To"
 msgstr "Visibile a"
 
-#: ../../mod/profperm.php:139
+#: ../../mod/profperm.php:130
 msgid "All Contacts (with secure profile access)"
 msgstr "Tutti i contatti (con accesso fidato al profilo)"
 
@@ -6686,12 +6534,12 @@ msgstr "I contenuti eseguibili non sono permessi su questo canale."
 msgid "System error. Post not saved."
 msgstr "Errore di sistema. Articolo non salvato."
 
-#: ../../mod/item.php:1153
+#: ../../mod/item.php:1156
 #, php-format
 msgid "You have reached your limit of %1$.0f top level posts."
 msgstr "Hai raggiunto il limite massimo di %1$.0f articoli sulla pagina principale."
 
-#: ../../mod/item.php:1159
+#: ../../mod/item.php:1162
 #, php-format
 msgid "You have reached your limit of %1$.0f webpages."
 msgstr "Hai raggiunto il limite massimo di %1$.0f pagine web."
@@ -6739,16 +6587,12 @@ msgid ""
 "librelist - dot com"
 msgstr "Per consigli, ringraziamenti, donazioni, ecc. - scrivi a \"redmatrix\" at librelist - dot com"
 
-#: ../../mod/suggest.php:41
+#: ../../mod/suggest.php:42
 msgid ""
 "No suggestions available. If this is a new site, please try again in 24 "
 "hours."
 msgstr "Nessun suggerimento disponibile. Se questo è un sito nuovo, riprova tra 24 ore."
 
-#: ../../mod/suggest.php:58
-msgid "Ignore/Hide"
-msgstr "Ignora/nascondi"
-
 #: ../../mod/pubsites.php:22
 msgid "Public Sites"
 msgstr "Siti pubblici"
@@ -6873,23 +6717,23 @@ msgstr "L'impostazione predefinita è che sia eliminata solo l'istanza del canal
 msgid "Remove My Account"
 msgstr "Elimina il mio account"
 
-#: ../../mod/directory.php:163
+#: ../../mod/directory.php:164
 msgid "Gender: "
 msgstr "Sesso:"
 
-#: ../../mod/directory.php:222
+#: ../../mod/directory.php:225
 msgid "Finding:"
 msgstr "Ricerca:"
 
-#: ../../mod/directory.php:230
+#: ../../mod/directory.php:233
 msgid "next page"
 msgstr "pagina succ."
 
-#: ../../mod/directory.php:230
+#: ../../mod/directory.php:233
 msgid "previous page"
 msgstr "pagina prec."
 
-#: ../../mod/directory.php:237
+#: ../../mod/directory.php:240
 msgid "No entries (some entries may be hidden)."
 msgstr "Nessun risultato (qualcosa potrebbe essere nascosto)."
 
@@ -7181,6 +7025,6 @@ msgstr "permesso negato"
 msgid "Got Zot?"
 msgstr "Hai Zot?"
 
-#: ../../boot.php:1902
+#: ../../boot.php:1907
 msgid "toggle mobile"
 msgstr "attiva/disattiva versione mobile"
diff --git a/view/it/strings.php b/view/it/strings.php
index dde964c00..5a3279eda 100644
--- a/view/it/strings.php
+++ b/view/it/strings.php
@@ -12,6 +12,13 @@ $a->strings["public profile"] = "profilo pubblico";
 $a->strings["%1\$s changed %2\$s to &ldquo;%3\$s&rdquo;"] = "%1\$s ha cambiato %2\$s in &ldquo;%3\$s&rdquo;";
 $a->strings["Visit %1\$s's %2\$s"] = "Guarda %2\$s di %1\$s ";
 $a->strings["%1\$s has an updated %2\$s, changing %3\$s."] = "%1\$s ha aggiornato %2\$s cambiando %3\$s.";
+$a->strings["Sort Options"] = "Opzioni di ordinamento";
+$a->strings["Alphabetic"] = "Alfabetico";
+$a->strings["Reverse Alphabetic"] = "Alfabetico inverso";
+$a->strings["Newest to Oldest"] = "Dal più nuovo al più vecchio";
+$a->strings["Enable Safe Search"] = "Abilita SafeSearch";
+$a->strings["Disable Safe Search"] = "Disabilita SafeSearch";
+$a->strings["Safe Mode"] = "Modalità SafeSearch";
 $a->strings["Red Matrix Notification"] = "Notifica di Red Matrix";
 $a->strings["redmatrix"] = "redmatrix";
 $a->strings["Thank You,"] = "Grazie,";
@@ -94,9 +101,38 @@ $a->strings["Link"] = "Link";
 $a->strings["Video"] = "Video";
 $a->strings["Preview"] = "Anteprima";
 $a->strings["Encrypt text"] = "Crittografia del testo";
-$a->strings["Connect"] = "Entra in contatto/segui";
+$a->strings["Connect"] = "Entra in contatto";
 $a->strings["New window"] = "Nuova finestra";
 $a->strings["Open the selected location in a different window or browser tab"] = "Apri l'indirizzo selezionato in una nuova scheda o finestra";
+$a->strings["Displays a full channel profile"] = "Mostra il profilo completo del canale";
+$a->strings["Tag cloud of webpage categories"] = "Nuvola dei tag";
+$a->strings["List and filter by collection"] = "Filtra per insiemi di canali";
+$a->strings["Show a couple of channel suggestion"] = "Mostra i canali suggeriti";
+$a->strings["Provide a channel follow form"] = "Mostra il link connettersi al canale";
+$a->strings["Categories"] = "Categorie";
+$a->strings["Ignore/Hide"] = "Ignora/nascondi";
+$a->strings["Suggestions"] = "Suggerimenti";
+$a->strings["See more..."] = "Altro...";
+$a->strings["You have %1$.0f of %2$.0f allowed connections."] = "Hai attivato %1$.0f delle %2$.0f connessioni permesse.";
+$a->strings["Add New Connection"] = "Aggiungi un contatto";
+$a->strings["Enter the channel address"] = "Scrivi l'indirizzo del canale";
+$a->strings["Example: bob@example.com, http://example.com/barbara"] = "Per esempio: mario@pippo.it oppure http://pluto.com/barbara";
+$a->strings["Notes"] = "Note";
+$a->strings["Save"] = "Salva";
+$a->strings["Remove term"] = "Rimuovi termine";
+$a->strings["Saved Searches"] = "Ricerche salvate";
+$a->strings["add"] = "aggiungi";
+$a->strings["Saved Folders"] = "Cartelle salvate";
+$a->strings["Everything"] = "Tutto";
+$a->strings["Archives"] = "Archivi";
+$a->strings["Refresh"] = "Aggiorna";
+$a->strings["Me"] = "Io";
+$a->strings["Best Friends"] = "Buoni amici";
+$a->strings["Friends"] = "Amici";
+$a->strings["Co-workers"] = "Colleghi";
+$a->strings["Former Friends"] = "Ex amici";
+$a->strings["Acquaintances"] = "Conoscenti";
+$a->strings["Everybody"] = "Tutti";
 $a->strings["Unknown | Not categorised"] = "Sconosciuto | Senza categoria";
 $a->strings["Block immediately"] = "Blocca subito";
 $a->strings["Shady, spammer, self-marketer"] = "Spammer o dedito al marketing";
@@ -142,6 +178,52 @@ $a->strings["l F d, Y \\@ g:i A"] = "l d F Y \\@ G:i";
 $a->strings["Starts:"] = "Inizio:";
 $a->strings["Finishes:"] = "Fine:";
 $a->strings["Location:"] = "Luogo:";
+$a->strings["A deleted group with this name was revived. Existing item permissions <strong>may</strong> apply to this group and any future members. If this is not what you intended, please create another group with a different name."] = "È stato ripristinato un insieme con lo stesso nome che era stato eliminato in precedenza. I permessi già presenti <strong>potrebbero</strong> rimanere validi per i nuovi canali. Se non vuoi che ciò accada, devi creare un altro insieme con un nome diverso.";
+$a->strings["Default privacy group for new contacts"] = "Insieme predefinito per i nuovi canali che aggiungi";
+$a->strings["All Channels"] = "Tutti i canali";
+$a->strings["edit"] = "modifica";
+$a->strings["Collections"] = "Insiemi di canali";
+$a->strings["Edit collection"] = "Modifica l'insieme di canali";
+$a->strings["Create a new collection"] = "Crea un nuovo insieme";
+$a->strings["Channels not in any collection"] = "Canali che non sono in un insieme";
+$a->strings["Delete this item?"] = "Eliminare questo elemento?";
+$a->strings["show fewer"] = "riduci";
+$a->strings["Password too short"] = "Password troppo corta";
+$a->strings["Passwords do not match"] = "Le password non corrispondono";
+$a->strings["everybody"] = "tutti";
+$a->strings["Secret Passphrase"] = "Chiave segreta";
+$a->strings["Passphrase hint"] = "Suggerimento per la chiave segreta";
+$a->strings["timeago.prefixAgo"] = "timeago.prefixAgo";
+$a->strings["timeago.suffixAgo"] = "timeago.suffixAgo";
+$a->strings["ago"] = "fa";
+$a->strings["from now"] = "da adesso";
+$a->strings["less than a minute"] = "meno di un minuto";
+$a->strings["about a minute"] = "circa un minuto";
+$a->strings["%d minutes"] = "%d minuti";
+$a->strings["about an hour"] = "circa un’ora";
+$a->strings["about %d hours"] = "circa %d ore";
+$a->strings["a day"] = "un giorno";
+$a->strings["%d days"] = "%d giorni";
+$a->strings["about a month"] = "circa un mese";
+$a->strings["%d months"] = "%d mesi";
+$a->strings["about a year"] = "circa un anno";
+$a->strings["%d years"] = "%d anni";
+$a->strings[" "] = " ";
+$a->strings["timeago.numbers"] = "timeago.numbers";
+$a->strings["No recipient provided."] = "Devi scegliere un destinatario.";
+$a->strings["[no subject]"] = "[nessun titolo]";
+$a->strings["Unable to determine sender."] = "Impossibile determinare il mittente.";
+$a->strings["Stored post could not be verified."] = "Non è stato possibile verificare l'articolo inserito.";
+$a->strings["Profile Photos"] = "Foto del profilo";
+$a->strings["Public Timeline"] = "Diario pubblico";
+$a->strings["view full size"] = "guarda nelle dimensioni reali";
+$a->strings["Image/photo"] = "Immagine";
+$a->strings["Encrypted content"] = "Contenuto crittografato";
+$a->strings["%1\$s wrote the following %2\$s %3\$s"] = "%1\$s ha scritto %2\$s seguente %3\$s";
+$a->strings["post"] = "l'articolo";
+$a->strings["$1 wrote:"] = "$1 ha scritto:";
+$a->strings["Embedded content"] = "Contenuti incorporati";
+$a->strings["Embedding disabled"] = "Contenuti incorporati - funzione disabilitata";
 $a->strings["General Features"] = "Funzionalità generali";
 $a->strings["Content Expiration"] = "Scadenza";
 $a->strings["Remove posts/comments and/or private messages at a future time"] = "Elimina gli articoli, i commenti o i messaggi privati dopo che è trascorso del tempo";
@@ -149,10 +231,11 @@ $a->strings["Multiple Profiles"] = "Profili multipli";
 $a->strings["Ability to create multiple profiles"] = "Abilitazione a creare profili multipli";
 $a->strings["Web Pages"] = "Pagine web";
 $a->strings["Provide managed web pages on your channel"] = "Attiva la creazione di pagine web sul tuo canale";
+$a->strings["Private Notes"] = "Note private";
+$a->strings["Enables a tool to store notes and reminders"] = "Abilita il riquadro per scrivere annotazioni";
 $a->strings["Enhanced Photo Albums"] = "Album fotografici avanzati";
 $a->strings["Enable photo album with enhanced features"] = "Abilita gli album fotografici con funzionalità avanzate";
 $a->strings["Extended Identity Sharing"] = "Condivisione avanzata dell'identità";
-$a->strings[" "] = " ";
 $a->strings["Expert Mode"] = "Modalità esperto";
 $a->strings["Enable Expert Mode to provide advanced configuration options"] = "Abilita la modalità esperto per vedere le opzioni di configurazione avanzate";
 $a->strings["Premium Channel"] = "Canale premium";
@@ -171,7 +254,6 @@ $a->strings["Search by Date"] = "Ricerca per data";
 $a->strings["Ability to select posts by date ranges"] = "Per selezionare gli articoli in un intervallo tra date";
 $a->strings["Collections Filter"] = "Filtra per insiemi di canali";
 $a->strings["Enable widget to display Network posts only from selected collections"] = "Mostra il riquadro per filtrare gli articoli di certi insiemi di canali";
-$a->strings["Saved Searches"] = "Ricerche salvate";
 $a->strings["Save search terms for re-use"] = "Salva i termini delle ricerche per poterle ripetere";
 $a->strings["Network Personal Tab"] = "Attività personale";
 $a->strings["Enable tab to display only Network posts that you've interacted on"] = "Abilita il link per mostrare solamente i contenuti con cui hai interagito";
@@ -179,6 +261,8 @@ $a->strings["Network New Tab"] = "Contenuti nuovi";
 $a->strings["Enable tab to display all new Network activity"] = "Abilita il link per visualizzare solo i nuovi contenuti";
 $a->strings["Affinity Tool"] = "Filtro per affinità";
 $a->strings["Filter stream activity by depth of relationships"] = "Permette di selezionare i contenuti in base al livello di amicizia";
+$a->strings["Suggest Channels"] = "Suggerisci canali";
+$a->strings["Show channel suggestions"] = "Mostra alcuni canali che potrebbero interessarti";
 $a->strings["Post/Comment Tools"] = "Gestione articoli e commenti";
 $a->strings["Edit Sent Posts"] = "Modifica gli articoli già inviati";
 $a->strings["Edit and correct posts and comments after sending"] = "Modifica e correggi gli articoli o i commenti anche dopo l'invio";
@@ -186,7 +270,6 @@ $a->strings["Tagging"] = "Tag";
 $a->strings["Ability to tag existing posts"] = "Permetti l'aggiunta di tag su articoli già esistenti";
 $a->strings["Post Categories"] = "Categorie degli articoli";
 $a->strings["Add categories to your posts"] = "Abilita le categorie per i tuoi articoli";
-$a->strings["Saved Folders"] = "Cartelle salvate";
 $a->strings["Ability to file posts under folders"] = "Abilita la raccolta dei tuoi articoli in cartelle";
 $a->strings["Dislike Posts"] = "Non mi piace";
 $a->strings["Ability to dislike posts/comments"] = "Abilità la funzionalità \"non mi piace\" per i tuoi articoli";
@@ -194,52 +277,6 @@ $a->strings["Star Posts"] = "Articoli stella (preferiti)";
 $a->strings["Ability to mark special posts with a star indicator"] = "Mostra la stella per scegliere gli articoli preferiti";
 $a->strings["Tag Cloud"] = "Nuvola di tag";
 $a->strings["Provide a personal tag cloud on your channel page"] = "Mostra la nuvola dei tag che usi di più sulla pagina del tuo canale";
-$a->strings["A deleted group with this name was revived. Existing item permissions <strong>may</strong> apply to this group and any future members. If this is not what you intended, please create another group with a different name."] = "È stato ripristinato un insieme con lo stesso nome che era stato eliminato in precedenza. I permessi già presenti <strong>potrebbero</strong> rimanere validi per i nuovi canali. Se non vuoi che ciò accada, devi creare un altro insieme con un nome diverso.";
-$a->strings["Default privacy group for new contacts"] = "Insieme predefinito per i nuovi canali che aggiungi";
-$a->strings["All Channels"] = "Tutti i canali";
-$a->strings["edit"] = "modifica";
-$a->strings["Collections"] = "Insiemi di canali";
-$a->strings["Edit collection"] = "Modifica l'insieme di canali";
-$a->strings["Create a new collection"] = "Crea un nuovo insieme";
-$a->strings["Channels not in any collection"] = "Canali che non sono in un insieme";
-$a->strings["add"] = "aggiungi";
-$a->strings["Delete this item?"] = "Eliminare questo elemento?";
-$a->strings["show fewer"] = "riduci";
-$a->strings["Password too short"] = "Password troppo corta";
-$a->strings["Passwords do not match"] = "Le password non corrispondono";
-$a->strings["everybody"] = "tutti";
-$a->strings["Secret Passphrase"] = "Chiave segreta";
-$a->strings["Passphrase hint"] = "Suggerimento per la chiave segreta";
-$a->strings["timeago.prefixAgo"] = "timeago.prefixAgo";
-$a->strings["timeago.suffixAgo"] = "timeago.suffixAgo";
-$a->strings["ago"] = "fa";
-$a->strings["from now"] = "da adesso";
-$a->strings["less than a minute"] = "meno di un minuto";
-$a->strings["about a minute"] = "circa un minuto";
-$a->strings["%d minutes"] = "%d minuti";
-$a->strings["about an hour"] = "circa un’ora";
-$a->strings["about %d hours"] = "circa %d ore";
-$a->strings["a day"] = "un giorno";
-$a->strings["%d days"] = "%d giorni";
-$a->strings["about a month"] = "circa un mese";
-$a->strings["%d months"] = "%d mesi";
-$a->strings["about a year"] = "circa un anno";
-$a->strings["%d years"] = "%d anni";
-$a->strings["timeago.numbers"] = "timeago.numbers";
-$a->strings["No recipient provided."] = "Devi scegliere un destinatario.";
-$a->strings["[no subject]"] = "[nessun titolo]";
-$a->strings["Unable to determine sender."] = "Impossibile determinare il mittente.";
-$a->strings["Stored post could not be verified."] = "Non è stato possibile verificare l'articolo inserito.";
-$a->strings["Profile Photos"] = "Foto del profilo";
-$a->strings["Public Timeline"] = "Diario pubblico";
-$a->strings["view full size"] = "guarda nelle dimensioni reali";
-$a->strings["Image/photo"] = "Immagine";
-$a->strings["Encrypted content"] = "Contenuto crittografato";
-$a->strings["%1\$s wrote the following %2\$s %3\$s"] = "%1\$s ha scritto %2\$s seguente %3\$s";
-$a->strings["post"] = "l'articolo";
-$a->strings["$1 wrote:"] = "$1 ha scritto:";
-$a->strings["Embedded content"] = "Contenuti incorporati";
-$a->strings["Embedding disabled"] = "Contenuti incorporati - funzione disabilitata";
 $a->strings["created a new post"] = "Ha creato un nuovo articolo";
 $a->strings["commented on %s's post"] = "ha commentato l'articolo di %s";
 $a->strings["Permission denied."] = "Permesso negato.";
@@ -285,7 +322,6 @@ $a->strings["Infatuated"] = "Infatuato/a";
 $a->strings["Dating"] = "Disponibile a un incontro";
 $a->strings["Unfaithful"] = "Infedele";
 $a->strings["Sex Addict"] = "Sesso-dipendente";
-$a->strings["Friends"] = "Amici";
 $a->strings["Friends/Benefits"] = "Amici piccanti";
 $a->strings["Casual"] = "Casual";
 $a->strings["Engaged"] = "Impegnato";
@@ -351,15 +387,12 @@ $a->strings["Directory"] = "Tutti i canali";
 $a->strings["Channel Locator"] = "Ricerca canali";
 $a->strings["Matrix"] = "La tua rete";
 $a->strings["Your matrix"] = "La tua rete";
-$a->strings["See all matrix notifications"] = "Notifiche dalla tua rete";
 $a->strings["Mark all matrix notifications seen"] = "Segna come lette le notifiche della tua rete";
 $a->strings["Channel Home"] = "Bacheca del canale";
 $a->strings["Channel home"] = "Bacheca del canale";
-$a->strings["See all channel notifications"] = "Guarda le notifiche dei canali";
 $a->strings["Mark all channel notifications seen"] = "Segna come lette le notifiche dei canali";
 $a->strings["Intros"] = "Richieste";
 $a->strings["New Connections"] = "Nuovi contatti";
-$a->strings["See all channel introductions"] = "Guarda tutte le richieste di amicizia";
 $a->strings["Notices"] = "Notifiche";
 $a->strings["Notifications"] = "Notifiche";
 $a->strings["See all notifications"] = "Vedi tutte le notifiche";
@@ -385,6 +418,14 @@ $a->strings["Admin"] = "Amministrazione";
 $a->strings["Site Setup and Configuration"] = "Configurazione del sito";
 $a->strings["Nothing new here"] = "Niente di nuovo qui";
 $a->strings["Please wait..."] = "Attendere...";
+$a->strings["Tags"] = "Tag";
+$a->strings["Keywords"] = "Parole chiave";
+$a->strings["have"] = "ho";
+$a->strings["has"] = "ha";
+$a->strings["want"] = "voglio";
+$a->strings["wants"] = "vuole";
+$a->strings["likes"] = "ama";
+$a->strings["dislikes"] = "non ama";
 $a->strings["Not a valid email address"] = "Email non valida";
 $a->strings["Your email domain is not among those allowed on this site"] = "Il dominio della tua email attualmente non è permesso su questo sito";
 $a->strings["Your email address is already registered at this site."] = "La tua email è già registrata su questo sito.";
@@ -494,24 +535,18 @@ $a->strings["Manage Webpages"] = "Gestisci le pagine web";
 $a->strings["Logged out."] = "Uscita effettuata.";
 $a->strings["Failed authentication"] = "Autenticazione fallita";
 $a->strings["Login failed."] = "Accesso fallito.";
-$a->strings["You have %1$.0f of %2$.0f allowed connections."] = "Hai attivato %1$.0f delle %2$.0f connessioni permesse.";
-$a->strings["Add New Connection"] = "Aggiungi un contatto";
-$a->strings["Enter the channel address"] = "Scrivi l'indirizzo del canale";
-$a->strings["Example: bob@example.com, http://example.com/barbara"] = "Per esempio: mario@pippo.it oppure http://pluto.com/barbara";
 $a->strings["%d invitation available"] = array(
 	0 => "%d invito disponibile",
 	1 => "%d inviti disponibili",
 );
 $a->strings["Find Channels"] = "Ricerca canali";
 $a->strings["Enter name or interest"] = "Scrivi un nome o un interesse";
-$a->strings["Connect/Follow"] = "Entra in contatto/segui";
+$a->strings["Connect/Follow"] = "Entra in contatto";
 $a->strings["Examples: Robert Morgenstein, Fishing"] = "Per esempio: Mario Rossi, Pesca";
 $a->strings["Find"] = "Cerca";
 $a->strings["Channel Suggestions"] = "Canali suggeriti";
 $a->strings["Random Profile"] = "Profilo casuale";
 $a->strings["Invite Friends"] = "Invita amici";
-$a->strings["Everything"] = "Tutto";
-$a->strings["Categories"] = "Categorie";
 $a->strings["%d connection in common"] = array(
 	0 => "%d contatto in comune",
 	1 => "%d contatti in comune",
@@ -529,7 +564,6 @@ $a->strings["%d Connection"] = array(
 	1 => "%d contatti",
 );
 $a->strings["View Connections"] = "Elenco contatti";
-$a->strings["Save"] = "Salva";
 $a->strings["poke"] = "poke";
 $a->strings["ping"] = "ping";
 $a->strings["pinged"] = "ha ricevuto un ping";
@@ -596,6 +630,9 @@ $a->strings["Blocks"] = "Riquadri";
 $a->strings["Menus"] = "Menù";
 $a->strings["Layouts"] = "Layout";
 $a->strings["Pages"] = "Pagine";
+$a->strings["Click here to upgrade."] = "Clicca qui per aggiornare.";
+$a->strings["This action exceeds the limits set by your subscription plan."] = "Questa operazione esce dai termini del tuo abbonamento.";
+$a->strings["This action is not available under your subscription plan."] = "Questa operazione non è prevista dal tuo abbonamento.";
 $a->strings["Channel is blocked on this site."] = "Il canale è bloccato per questo sito.";
 $a->strings["Channel location missing."] = "Manca l'indirizzo del canale.";
 $a->strings["Channel discovery failed. Website may be down or misconfigured."] = "La ricerca del canale è fallita. Il sito potrebbe avere problemi o una configurazione sbagliata.";
@@ -609,7 +646,7 @@ $a->strings["Can view my \"public\" photo albums"] = "Può vedere il mio album f
 $a->strings["Can view my \"public\" address book"] = "Può vedere il mio elenco contatti \"pubblico\"";
 $a->strings["Can view my \"public\" file storage"] = "Può vedere il mio archivio file \"pubblico\"";
 $a->strings["Can view my \"public\" pages"] = "Può vedere le mie pagine web \"pubbliche\"";
-$a->strings["Can send me their channel stream and posts"] = "Può mostrarmi i contenuti del canale e gli articoli";
+$a->strings["Can send me their channel stream and posts"] = "Seguo i contenuti e gli articoli del suo canale";
 $a->strings["Can post on my channel page (\"wall\")"] = "Può scrivere sulla bacheca del mio canale";
 $a->strings["Can comment on my posts"] = "Può commentare i miei articoli";
 $a->strings["Can send me private mail messages"] = "Può inviarmi messaggi privati";
@@ -624,17 +661,6 @@ $a->strings["Can source my \"public\" posts in derived channels"] = "Può aggiun
 $a->strings["Somewhat advanced - very useful in open communities"] = "Piuttosto avanzato - molto utile nelle comunità aperte";
 $a->strings["Can administer my channel resources"] = "Può amministrare i contenuti del mio canale";
 $a->strings["Extremely advanced. Leave this alone unless you know what you are doing"] = "Impostazione pericolosa - lasciare il valore predefinito se non si è assolutamente sicuri";
-$a->strings["Tags"] = "Tag";
-$a->strings["Keywords"] = "Parole chiave";
-$a->strings["have"] = "ho";
-$a->strings["has"] = "ha";
-$a->strings["want"] = "voglio";
-$a->strings["wants"] = "vuole";
-$a->strings["likes"] = "ama";
-$a->strings["dislikes"] = "non ama";
-$a->strings["Click here to upgrade."] = "Clicca qui per aggiornare.";
-$a->strings["This action exceeds the limits set by your subscription plan."] = "Questa operazione esce dai termini del tuo abbonamento.";
-$a->strings["This action is not available under your subscription plan."] = "Questa operazione non è prevista dal tuo abbonamento.";
 $a->strings["Default"] = "Predefinito";
 $a->strings["Unable to obtain identity information from database"] = "Impossibile ottenere le informazioni di identificazione dal database";
 $a->strings["Empty name"] = "Nome vuoto";
@@ -696,17 +722,11 @@ $a->strings["Welcome back "] = "Ciao, è bello rivederti";
 $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."] = "L'identificativo di sicurezza del modulo che hai riempito non è corretto. Probabilmente è accaduto perché la pagina è stata tenuta aperta troppo a lungo (ore?) prima di inviare il contenuto.";
 $a->strings["Permission denied"] = "Permesso negato";
 $a->strings["Item not found."] = "Elemento non trovato.";
-$a->strings["Archives"] = "Archivi";
 $a->strings["Collection not found."] = "Insieme non trovato.";
-$a->strings["Group is empty"] = "L'insieme è vuoto";
+$a->strings["Collection is empty."] = "L'insieme di canali è vuoto.";
+$a->strings["Collection: %s"] = "Insieme: %s";
+$a->strings["Connection: %s"] = "Contatto: %s";
 $a->strings["Connection not found."] = "Contatto non trovato.";
-$a->strings["Sort Options"] = "Opzioni di ordinamento";
-$a->strings["Alphabetic"] = "Alfabetico";
-$a->strings["Reverse Alphabetic"] = "Alfabetico inverso";
-$a->strings["Newest to Oldest"] = "Dal più nuovo al più vecchio";
-$a->strings["Enable Safe Search"] = "Abilita SafeSearch";
-$a->strings["Disable Safe Search"] = "Disabilita SafeSearch";
-$a->strings["Safe Mode"] = "Modalità SafeSearch";
 $a->strings["No channel."] = "Nessun canale.";
 $a->strings["Common connections"] = "Contatti in comune";
 $a->strings["No connections in common."] = "Nessun contatto in comune.";
@@ -765,7 +785,6 @@ $a->strings["Please login to continue."] = "Accedi al sito per continuare.";
 $a->strings["Do you want to authorize this application to access your posts and contacts, and/or create new posts for you?"] = "Vuoi autorizzare questa app ad accedere ai messaggi e ai contatti o creare nuovi messaggi per te?";
 $a->strings["Yes"] = "Si";
 $a->strings["No"] = "No";
-$a->strings["You must be logged in to see this page."] = "Devi aver effettuato l'accesso per vedere questa pagina.";
 $a->strings["No installed applications."] = "Nessuna app installata.";
 $a->strings["Applications"] = "Applicazioni";
 $a->strings["Invalid item."] = "Elemento non valido.";
@@ -1047,6 +1066,8 @@ $a->strings["Block public"] = "Blocca pagine pubbliche";
 $a->strings["Check to block public access to all otherwise public personal pages on this site unless you are currently logged in."] = "Seleziona per impedire di vedere le pagine personali di questo sito a chi non ha effettuato l'accesso.";
 $a->strings["Force publish"] = "Forza la publicazione del profilo";
 $a->strings["Check to force all profiles on this site to be listed in the site directory."] = "Seleziona per mostrare nell'elenco dei canali del sito <strong>tutti</strong> i profili registrati.";
+$a->strings["No login on Homepage"] = "Non mostrare il login sulla homepage";
+$a->strings["Check to hide the login form from your sites homepage when visitors arrive who are not logged in (e.g. when you put the content of the homepage in via the site channel)."] = "Per nascondere la possibilità di fare login ai visitatori (per esempio, quando il contenuto della homepage del sito è alimentato dal canale).";
 $a->strings["Proxy user"] = "Utente proxy";
 $a->strings["Proxy URL"] = "URL proxy";
 $a->strings["Network timeout"] = "Timeout rete";
@@ -1130,6 +1151,7 @@ $a->strings["Add menu element"] = "Aggiungi un elemento al menù";
 $a->strings["Delete this menu item"] = "Elimina questo elemento del menù";
 $a->strings["Edit this menu item"] = "Modifica questo elemento del menù";
 $a->strings["New Menu Element"] = "Nuovo elemento del menù";
+$a->strings["Menu Item Permissions"] = "Permessi del menu";
 $a->strings["Link text"] = "Testo del link";
 $a->strings["URL of link"] = "Indirizzo del link";
 $a->strings["Use Red magic-auth if available"] = "Usa l'autenticazione magica di Red, se disponibile";
@@ -1154,7 +1176,6 @@ $a->strings["Collection Editor"] = "Modifica l'insieme";
 $a->strings["Members"] = "Membri";
 $a->strings["All Connected Channels"] = "Tutti i canali connessi";
 $a->strings["Click on a channel to add or remove."] = "Clicca su un canale per aggiungerlo o rimuoverlo.";
-$a->strings["Remove term"] = "Rimuovi termine";
 $a->strings["Page owner information could not be retrieved."] = "Impossibile ottenere informazioni sul proprietario della pagina.";
 $a->strings["Album not found."] = "Album non trovato.";
 $a->strings["Delete Album"] = "Elimina album";
@@ -1234,7 +1255,6 @@ $a->strings["Private Conversation"] = "Conversazione privata";
 $a->strings["Delete conversation"] = "Elimina la conversazione";
 $a->strings["No secure communications available. You <strong>may</strong> be able to respond from the sender's profile page."] = "Non è disponibile alcun sistema per comunicare in modo sicuro. Puoi verificare se <strong>eventualmente</strong> è possibile rispondere dalla pagina del profilo del mittente.";
 $a->strings["Send Reply"] = "Invia la risposta";
-$a->strings["No profile"] = "Nessun profilo";
 $a->strings["Layout Help"] = "Guida al layout";
 $a->strings["Help with this feature"] = "La guida per questa funzionalità";
 $a->strings["Layout Name"] = "Nome layout";
@@ -1244,27 +1264,11 @@ $a->strings["Remote Authentication"] = "Autenticazione a distanza";
 $a->strings["Enter your channel address (e.g. channel@example.com)"] = "Inserisci l'indirizzo del tuo canale (ad esempio lucia@esempio.com)";
 $a->strings["Authenticate"] = "Autenticazione";
 $a->strings["No such group"] = "Impossibile trovare l'insieme";
-$a->strings["Refresh"] = "Aggiorna";
-$a->strings["Me"] = "Io";
-$a->strings["Best Friends"] = "Buoni amici";
-$a->strings["Co-workers"] = "Colleghi";
-$a->strings["Former Friends"] = "Ex amici";
-$a->strings["Acquaintances"] = "Conoscenti";
-$a->strings["Everybody"] = "Tutti";
 $a->strings["Search Results For:"] = "Cerca risultati con:";
+$a->strings["Collection is empty"] = "L'insieme di canali è vuoto";
 $a->strings["Collection: "] = "Insieme:";
 $a->strings["Connection: "] = "Connessione:";
 $a->strings["Invalid connection."] = "Connessione non valida.";
-$a->strings["Ignore"] = "Ignora";
-$a->strings["Connection updated."] = "Contatto aggiornato.";
-$a->strings["Connection update failed."] = "Impossibile aggiornare il contatto.";
-$a->strings["Introductions and Connection Requests"] = "Richieste di entrare in contatto";
-$a->strings["No pending introductions."] = "Nessuna richiesta in attesa.";
-$a->strings["System error. Please try again later."] = "Errore di sistema. Riprovare più tardi.";
-$a->strings["Hide this contact from others"] = "Nascondi questo contatto agli altri";
-$a->strings["Post a new friend activity"] = "Pubblica sulla bacheca che hai un nuovo contatto";
-$a->strings["if applicable"] = "se possibile";
-$a->strings["Discard"] = "Rifiuta";
 $a->strings["Remote authentication blocked. You are logged into this site locally. Please logout and retry."] = "L'autenticazione remota non è disponibile. Hai accesso solamente a questo sito. Puoi provare ad uscire per tentare di nuovo.";
 $a->strings["Welcome %s. Remote authentication successful."] = "Ciao %s. La tua autenticazione da remoto è avvenuta con successo.";
 $a->strings["This site is not a directory server"] = "Questo sito non fornisce l'elenco generale dei canali";
@@ -1339,6 +1343,7 @@ $a->strings["Your nickname will be used to create an easily remembered channel a
 $a->strings["Or <a href=\"import\">import an existing channel</a> from another location"] = "Oppure <a href=\"import\">importa un tuo canale esistente</a> da un altro server/hub";
 $a->strings["Could not access contact record."] = "Non è possibile accedere alle informazioni sul contatto.";
 $a->strings["Could not locate selected profile."] = "Non riesco a trovare il profilo selezionato.";
+$a->strings["Connection updated."] = "Contatto aggiornato.";
 $a->strings["Failed to update connection record."] = "Impossibile aggiornare le informazioni del contatto.";
 $a->strings["Could not access address book record."] = "Impossibile accedere alle informazioni della rubrica.";
 $a->strings["Refresh failed - channel is currently unavailable."] = "Il canale non è disponibile - impossibile aggiornare.";
@@ -1361,6 +1366,7 @@ $a->strings["Recent Activity"] = "Attività recenti";
 $a->strings["View recent posts and comments"] = "Leggi i post recenti e i commenti";
 $a->strings["Block or Unblock this connection"] = "Per bloccare o meno questo contatto";
 $a->strings["Unignore"] = "Non ignorare";
+$a->strings["Ignore"] = "Ignora";
 $a->strings["Ignore or Unignore this connection"] = "Per ignorare o meno questo contatto";
 $a->strings["Unarchive"] = "Non archiviare";
 $a->strings["Archive"] = "Archivia";
@@ -1407,15 +1413,15 @@ $a->strings["Currently blocked"] = "Attualmente bloccato";
 $a->strings["Currently ignored"] = "Attualmente ignorato";
 $a->strings["Currently archived"] = "Attualmente archiviato";
 $a->strings["Currently pending"] = "Attualmente da approvare";
+$a->strings["Hide this contact from others"] = "Nascondi questo contatto agli altri";
 $a->strings["Replies/likes to your public posts <strong>may</strong> still be visible"] = "Le risposte ai tuoi articoli pubblici <strong>potrebbero</strong> restare comunque visibili";
 $a->strings["Blocked"] = "Bloccati";
 $a->strings["Ignored"] = "Ignorati";
 $a->strings["Hidden"] = "Nascosti";
 $a->strings["Archived"] = "Archiviati";
 $a->strings["All"] = "Tutti";
-$a->strings["Suggestions"] = "Suggerimenti";
 $a->strings["Suggest new connections"] = "Suggerisci nuovi contatti";
-$a->strings["Show pending (new) connections"] = "Richieste di entrare in contatto";
+$a->strings["Show pending (new) connections"] = "Richieste di contatto in attesa";
 $a->strings["All Connections"] = "Tutti i contatti";
 $a->strings["Show all connections"] = "Mostra tutti i contatti";
 $a->strings["Unblocked"] = "Non bloccati";
@@ -1479,21 +1485,6 @@ $a->strings["Profile Match"] = "Profili corrispondenti";
 $a->strings["No keywords to match. Please add keywords to your default profile."] = "Nessuna parola chiave per le ricerche. Aggiungi parole chiave al tuo profilo predefinito.";
 $a->strings["is interested in:"] = "interessi personali:";
 $a->strings["No matches"] = "Nessun risultato";
-$a->strings["Contact settings applied."] = "Contatto modificato.";
-$a->strings["Contact update failed."] = "Le modifiche al contatto non sono state salvate.";
-$a->strings["Contact not found."] = "Contatto non trovato.";
-$a->strings["Repair Contact Settings"] = "Ripara le impostazioni del contatto";
-$a->strings["<strong>WARNING: This is highly advanced</strong> and if you enter incorrect information your communications with this contact may stop working."] = "<strong>ATTENZIONE: Queste sono impostazioni avanzate</strong> e se inserisci informazioni errate le tue comunicazioni con questo contatto potrebbero non funzionare più";
-$a->strings["Please use your browser 'Back' button <strong>now</strong> if you are uncertain what to do on this page."] = "Clicca <strong>adesso</strong> il tasto 'Indietro' del browser se non hai la certezza assoluta di quel che stai facendo.";
-$a->strings["Return to contact editor"] = "Ritorna alla modifica del contatto";
-$a->strings["Account Nickname"] = "Nome utente";
-$a->strings["@Tagname - overrides Name/Nickname"] = "@TagName - sostituirà il nome utente";
-$a->strings["Account URL"] = "URL dell'utente";
-$a->strings["Friend Request URL"] = "URL di richiesta amicizia";
-$a->strings["Friend Confirm URL"] = "URL di conferma amicizia";
-$a->strings["Notification Endpoint URL"] = "URL per le notifiche";
-$a->strings["Poll/Feed URL"] = "URL del feed";
-$a->strings["New photo from this URL"] = "Nuova foto da questo URL";
 $a->strings["invalid target signature"] = "la firma riscontrata non è valida";
 $a->strings["Channel added."] = "Canale aggiunto.";
 $a->strings["Item not found"] = "Elemento non trovato";
@@ -1523,36 +1514,9 @@ $a->strings["Image size reduction [%s] failed."] = "Il ridimensionamento del'imm
 $a->strings["Edit Webpage"] = "Modifica la pagina web";
 $a->strings["Delete Webpage"] = "Elimina la pagina web";
 $a->strings["Invalid request identifier."] = "L'identificativo della richiesta non è valido.";
-$a->strings["System"] = "Sistema";
-$a->strings["Introductions"] = "Richieste di amicizia";
-$a->strings["Show Ignored Requests"] = "Mostra le richieste ignorate";
-$a->strings["Hide Ignored Requests"] = "Nascondi le richieste ignorate";
-$a->strings["Notification type: "] = "Tipo di notifica: ";
-$a->strings["Friend Suggestion"] = "Suggerimento di amicizia";
-$a->strings["suggested by %s"] = "suggerito da %s";
-$a->strings["Claims to be known to you: "] = "Dice di conoscerti: ";
-$a->strings["yes"] = "si";
-$a->strings["no"] = "no";
-$a->strings["Approve as: "] = "Approva come: ";
-$a->strings["Friend"] = "Amico";
-$a->strings["Sharer"] = "Sharer";
-$a->strings["Fan/Admirer"] = "Fan/Ammiratore";
-$a->strings["Friend/Connect Request"] = "Richiesta di entrare in contatto";
-$a->strings["New Follower"] = "Nuovo follower";
-$a->strings["No introductions."] = "Nessuna richiesta di amicizia.";
-$a->strings["%s liked %s's post"] = "A %s è piaciuto l'articolo di %s";
-$a->strings["%s disliked %s's post"] = "A %s non è piaciuto l'articolo di %s";
-$a->strings["%s is now friends with %s"] = "%s è ora amico di %s";
-$a->strings["%s created a new post"] = "%s ha creato un nuovo articolo";
-$a->strings["%s commented on %s's post"] = "%s ha commentato l'articolo di %s";
-$a->strings["No more network notifications."] = "Non ci sono nuove notifiche dalla rete.";
-$a->strings["Network Notifications"] = "Notifiche dalla rete";
+$a->strings["Discard"] = "Rifiuta";
 $a->strings["No more system notifications."] = "Non ci sono nuove notifiche di sistema.";
 $a->strings["System Notifications"] = "Notifiche di sistema";
-$a->strings["No more personal notifications."] = "Non ci sono nuove notifiche personali.";
-$a->strings["Personal Notifications"] = "Notifiche personali";
-$a->strings["No more home notifications."] = "Non ci sono nuove notifiche dalla bacheca.";
-$a->strings["Home Notifications"] = "Notifiche dalla bacheca";
 $a->strings["Block Name"] = "Nome del riquadro";
 $a->strings["Unable to find your hub."] = "Impossibile raggiungere il tuo hub.";
 $a->strings["Post successful."] = "Inviato!";
@@ -1564,11 +1528,13 @@ $a->strings["Recipient"] = "Destinatario";
 $a->strings["Choose what you wish to do to recipient"] = "Scegli cosa vuoi inviare al destinatario";
 $a->strings["Make this post private"] = "Rendi privato questo articolo";
 $a->strings["Wall Photos"] = "Foto della bacheca";
+$a->strings["You must be logged in to see this page."] = "Devi aver effettuato l'accesso per vedere questa pagina.";
 $a->strings["Insufficient permissions.  Request redirected to profile page."] = "Permessi insufficienti. Sarà visualizzata la pagina del profilo.";
 $a->strings["Not available."] = "Non disponibile.";
 $a->strings["Community"] = "Comunità";
 $a->strings["No results."] = "Nessun risultato.";
 $a->strings["Files"] = "Elenco file";
+$a->strings["Contact not found."] = "Contatto non trovato.";
 $a->strings["Friend suggestion sent."] = "Suggerimento di amicizia inviato.";
 $a->strings["Suggest Friends"] = "Suggerisci amici";
 $a->strings["Suggest a friend for %s"] = "Suggerisci un amico a %s";
@@ -1595,7 +1561,6 @@ $a->strings["Please visit <a href=\"http://getzot.com\">GetZot.com</a> to learn
 $a->strings["Bug reports and issues: please visit"] = "Per segnalare bug e problemi: visita";
 $a->strings["Suggestions, praise, donations, etc. - please email \"redmatrix\" at librelist - dot com"] = "Per consigli, ringraziamenti, donazioni, ecc. - scrivi a \"redmatrix\" at librelist - dot com";
 $a->strings["No suggestions available. If this is a new site, please try again in 24 hours."] = "Nessun suggerimento disponibile. Se questo è un sito nuovo, riprova tra 24 ore.";
-$a->strings["Ignore/Hide"] = "Ignora/nascondi";
 $a->strings["Public Sites"] = "Siti pubblici";
 $a->strings["The listed sites allow public registration into the Red Matrix. All sites in the matrix are interlinked so membership on any of them conveys membership in the matrix as a whole. Some sites may require subscription or provide tiered service plans. The provider links <strong>may</strong> provide additional details."] = "Gli indirizzi elencati permettono la registrazione su Red Matrix. Tutti i siti di questa rete sono interconnessi, quindi essere registrati su uno è come essere registrati ovunque. Alcuni potrebbero richiedere un'iscrizione a pagamento o prevedere tipi diversi di abbonamento. Potrai trovare maggiori informazioni al riguardo visitando ciascun sito.";
 $a->strings["Site URL"] = "URL del sito";
-- 
cgit v1.2.3


From b6bb3c02525843caeaee3f6409f1b97b160ea8a2 Mon Sep 17 00:00:00 2001
From: marijus <mario@localhost.localdomain>
Date: Wed, 18 Dec 2013 19:47:00 +0100
Subject: fix a typo

---
 view/css/conversation.css         | 2 +-
 view/theme/redbasic/css/style.css | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'view')

diff --git a/view/css/conversation.css b/view/css/conversation.css
index 5bf6a3607..5abc9c66a 100644
--- a/view/css/conversation.css
+++ b/view/css/conversation.css
@@ -110,7 +110,7 @@
 
 /* conversation */
 
-.thread-wrapper .toplevel_item {
+.thread-wrapper.toplevel_item {
 	width: 92%;
 }
 
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 9ac021a54..68ddcf7a2 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -2265,7 +2265,7 @@ img.mail-list-sender-photo {
 	border-left: 2px solid #eee;
 }
 
-.thread-wrapper .toplevel_item {
+.thread-wrapper.toplevel_item {
 	max-width: $converse_width;
 }
 
-- 
cgit v1.2.3


From 6e28c40c2732daa40d4e54ad3231af5798964fa2 Mon Sep 17 00:00:00 2001
From: marijus <mario@localhost.localdomain>
Date: Wed, 18 Dec 2013 20:22:22 +0100
Subject: we make this with css now

---
 view/theme/redbasic/js/redbasic.js | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

(limited to 'view')

diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js
index e89c51119..e41fde2b8 100644
--- a/view/theme/redbasic/js/redbasic.js
+++ b/view/theme/redbasic/js/redbasic.js
@@ -47,16 +47,6 @@ $('.savedsearchdrop').hover(
 		$(this).css('opacity','0');}
 	);
 
-$('.savedsearchterm').hover(
-	function() {
-		id = $(this).attr('id');
-		$('#dropicon-' + id).css('opacity','1.0');},
-
-	function() {
-		id = $(this).attr('id');
-		$('#dropicon-' + id).css('opacity','0');
-	});
-
 });
 
 
@@ -72,4 +62,4 @@ $(document).ready(function(){
 		}
 	};
 	setInterval(function () {checkNotify();}, 10 * 1000);
-});
\ No newline at end of file
+});
-- 
cgit v1.2.3


From 176fe3256428c8a2226030c4e1de89723e37cca7 Mon Sep 17 00:00:00 2001
From: marijus <mario@localhost.localdomain>
Date: Wed, 18 Dec 2013 21:13:48 +0100
Subject: show drop-icon on wall-item hover only

---
 view/css/conversation.css         | 8 ++++++++
 view/theme/redbasic/css/style.css | 8 ++------
 2 files changed, 10 insertions(+), 6 deletions(-)

(limited to 'view')

diff --git a/view/css/conversation.css b/view/css/conversation.css
index 5abc9c66a..8125b6278 100644
--- a/view/css/conversation.css
+++ b/view/css/conversation.css
@@ -125,6 +125,14 @@
 	position: relative;
 }
 
+.wall-item-content-wrapper .wall-item-delete-wrapper {
+	opacity: 0;
+}
+
+.wall-item-content-wrapper:hover .wall-item-delete-wrapper {
+	opacity: 1;
+}
+
 .wall-item-info {
 	display: block;
 	float: left;
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 68ddcf7a2..411356d80 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -2087,12 +2087,12 @@ margin-right: 50px;
 }
 
 a .drop-icons {
-	color: #777;
+	color: $toolicon_colour;;
 	font-size: 1.2em;
 	text-decoration: none;
 }
  
-.drop-icons:hover {
+a .drop-icons:hover {
 	color: #FF0000;
 }
 
@@ -2364,10 +2364,6 @@ img.mail-list-sender-photo {
 	color: $toolicon_activecolour;
 }
 
-.drop-icons.item-tool {
-	color: $toolicon_colour;
-}
-
 .like-rotator {
 	color: $toolicon_colour;
 }
-- 
cgit v1.2.3


From 2089a1379a57ba5c27e220e664cb76ffb0acc1dd Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Wed, 18 Dec 2013 18:29:53 -0800
Subject: provide git revision in siteinfo if possible and if not instructed
 otherwise

---
 view/tpl/siteinfo.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'view')

diff --git a/view/tpl/siteinfo.tpl b/view/tpl/siteinfo.tpl
index f6647110c..a60b406cf 100755
--- a/view/tpl/siteinfo.tpl
+++ b/view/tpl/siteinfo.tpl
@@ -2,7 +2,7 @@
 <p></p>
 <p>{{$description}}</p>
 {{if $version}}
-<p>{{$version}}</p>
+<p>{{$version}}{{if $commit}}+{{$commit}}{{/if}}</p>
 {{/if}}
 <p>{{$web_location}}</p>
 <p>{{$visit}}</p>
-- 
cgit v1.2.3


From 125543adedfe00b3d5cea8548d1a66096a173a6b Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Thu, 19 Dec 2013 02:16:14 -0800
Subject: more comanche migration

---
 view/pdl/mod_blocks.pdl           | 3 +++
 view/pdl/mod_layouts.pdl          | 3 +++
 view/pdl/mod_menu.pdl             | 3 +++
 view/pdl/mod_webpages.pdl         | 3 +++
 view/theme/redbasic/css/style.css | 4 ++++
 view/tpl/design_tools.tpl         | 2 ++
 6 files changed, 18 insertions(+)
 create mode 100644 view/pdl/mod_blocks.pdl
 create mode 100644 view/pdl/mod_layouts.pdl
 create mode 100644 view/pdl/mod_menu.pdl
 create mode 100644 view/pdl/mod_webpages.pdl

(limited to 'view')

diff --git a/view/pdl/mod_blocks.pdl b/view/pdl/mod_blocks.pdl
new file mode 100644
index 000000000..cef69f194
--- /dev/null
+++ b/view/pdl/mod_blocks.pdl
@@ -0,0 +1,3 @@
+[region=aside]
+[widget=design_tools][/widget]
+[/region]
\ No newline at end of file
diff --git a/view/pdl/mod_layouts.pdl b/view/pdl/mod_layouts.pdl
new file mode 100644
index 000000000..cef69f194
--- /dev/null
+++ b/view/pdl/mod_layouts.pdl
@@ -0,0 +1,3 @@
+[region=aside]
+[widget=design_tools][/widget]
+[/region]
\ No newline at end of file
diff --git a/view/pdl/mod_menu.pdl b/view/pdl/mod_menu.pdl
new file mode 100644
index 000000000..cef69f194
--- /dev/null
+++ b/view/pdl/mod_menu.pdl
@@ -0,0 +1,3 @@
+[region=aside]
+[widget=design_tools][/widget]
+[/region]
\ No newline at end of file
diff --git a/view/pdl/mod_webpages.pdl b/view/pdl/mod_webpages.pdl
new file mode 100644
index 000000000..cef69f194
--- /dev/null
+++ b/view/pdl/mod_webpages.pdl
@@ -0,0 +1,3 @@
+[region=aside]
+[widget=design_tools][/widget]
+[/region]
\ No newline at end of file
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 411356d80..5f532a861 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -2122,6 +2122,10 @@ a .drop-icons:hover {
 	margin-right: 10px;
 }
 
+.design-tools ul {
+	list-style-type: none;
+}
+
 .design-icons {
 	margin-right: 10px;
 }
diff --git a/view/tpl/design_tools.tpl b/view/tpl/design_tools.tpl
index eb082dc37..80a538231 100644
--- a/view/tpl/design_tools.tpl
+++ b/view/tpl/design_tools.tpl
@@ -1,7 +1,9 @@
 <div id="design-tools" class="widget design-tools">
 <h3>{{$title}}</h3>
+<ul>
 <li><a href="blocks/{{$who}}">{{$blocks}}</a></li>
 <li><a href="menu">{{$menus}}</a></li>
 <li><a href="layouts/{{$who}}">{{$layout}}</a></li>
 <li><a href="webpages/{{$who}}">{{$pages}}</a></li>
+</ul>
 </div>
-- 
cgit v1.2.3


From b28a37c38e3fc68b1d0a59e4f5e6054ce13cb680 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Thu, 19 Dec 2013 02:25:44 -0800
Subject: more comanche

---
 view/pdl/mod_suggest.pdl | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 view/pdl/mod_suggest.pdl

(limited to 'view')

diff --git a/view/pdl/mod_suggest.pdl b/view/pdl/mod_suggest.pdl
new file mode 100644
index 000000000..c2889f2fe
--- /dev/null
+++ b/view/pdl/mod_suggest.pdl
@@ -0,0 +1,4 @@
+[region=aside]
+[widget=follow][/widget]
+[widget=findpeople][/widget]
+[/region]
\ No newline at end of file
-- 
cgit v1.2.3


From 825492407e3e064b6cd806b3ed7d484d2cc9f50e Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Thu, 19 Dec 2013 02:35:45 -0800
Subject: more comanche

---
 view/pdl/mod_connections.pdl | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 view/pdl/mod_connections.pdl

(limited to 'view')

diff --git a/view/pdl/mod_connections.pdl b/view/pdl/mod_connections.pdl
new file mode 100644
index 000000000..fc86e4490
--- /dev/null
+++ b/view/pdl/mod_connections.pdl
@@ -0,0 +1,5 @@
+[region=aside]
+[widget=follow][/widget]
+[widget=suggestions][/widget]
+[widget=findpeople][/widget]
+[/region]
-- 
cgit v1.2.3


From 564f431551672d706136559a4fed3a3c4f98c0ec Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Thu, 19 Dec 2013 17:36:31 -0800
Subject: comanchificate mod_photos

---
 view/pdl/mod_photos.pdl | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 view/pdl/mod_photos.pdl

(limited to 'view')

diff --git a/view/pdl/mod_photos.pdl b/view/pdl/mod_photos.pdl
new file mode 100644
index 000000000..c37cf02fe
--- /dev/null
+++ b/view/pdl/mod_photos.pdl
@@ -0,0 +1,4 @@
+[region=aside]
+[widget=vcard][/widget]
+[widget=photo_albums][/widget]
+[/region]
-- 
cgit v1.2.3


From bccc20f38c3919d453b0dee1ed354aa4eb13b398 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Thu, 19 Dec 2013 19:16:46 -0800
Subject: default photo issue, and connections page showing deleted accounts.
 Also show last updated on connedit page

---
 view/tpl/abook_edit.tpl | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'view')

diff --git a/view/tpl/abook_edit.tpl b/view/tpl/abook_edit.tpl
index 23368f2f7..590213fd3 100755
--- a/view/tpl/abook_edit.tpl
+++ b/view/tpl/abook_edit.tpl
@@ -16,6 +16,10 @@
 
 <div id="contact-edit-wrapper">
 
+{{if $last_update}}
+{{$lastupdtext}} {{$last_update}}
+{{/if}}
+
 {{if $notself}}
 {{if $slide}}
 <h3>{{$lbl_slider}}</h3>
-- 
cgit v1.2.3


From 2c0fbc508e44ebc96b00e4e8a5e166324fbcf9b3 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Thu, 19 Dec 2013 23:56:37 -0800
Subject: comanchify connedit, group

---
 view/pdl/mod_connedit.pdl | 6 ++++++
 view/pdl/mod_group.pdl    | 3 +++
 2 files changed, 9 insertions(+)
 create mode 100644 view/pdl/mod_connedit.pdl
 create mode 100644 view/pdl/mod_group.pdl

(limited to 'view')

diff --git a/view/pdl/mod_connedit.pdl b/view/pdl/mod_connedit.pdl
new file mode 100644
index 000000000..4b468e34c
--- /dev/null
+++ b/view/pdl/mod_connedit.pdl
@@ -0,0 +1,6 @@
+[region=aside]
+[widget=vcard][/widget]
+[widget=collections][var=mode]abook[/var][/widget]
+[widget=suggestions][/widget]
+[widget=findpeople][/widget]
+[/region]
diff --git a/view/pdl/mod_group.pdl b/view/pdl/mod_group.pdl
new file mode 100644
index 000000000..8db29cf78
--- /dev/null
+++ b/view/pdl/mod_group.pdl
@@ -0,0 +1,3 @@
+[region=aside]
+[widget=collections][var=mode]groups[/var][/widget]
+[/region]
-- 
cgit v1.2.3


From a084a3fa47879f00a535501f14f32c3ff55f7d29 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Fri, 20 Dec 2013 01:39:42 -0800
Subject: comanchify mod_search - we've got three modules left to Comanchify:
 admin, directory and message - each of which introduces "interesting
 challenges"

---
 view/pdl/mod_search.pdl | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 view/pdl/mod_search.pdl

(limited to 'view')

diff --git a/view/pdl/mod_search.pdl b/view/pdl/mod_search.pdl
new file mode 100644
index 000000000..7de4a270f
--- /dev/null
+++ b/view/pdl/mod_search.pdl
@@ -0,0 +1,3 @@
+[region=aside]
+[widget=savedsearch][/widget]
+[/region]
-- 
cgit v1.2.3


From aa312f72bf48f3ffeb62606541b39e5243ce819e Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Fri, 20 Dec 2013 12:43:04 -0800
Subject: comanchify mod_directory. Two modules remaining. Actually three
 because message needs to be split.

---
 view/pdl/mod_directory.pdl | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 view/pdl/mod_directory.pdl

(limited to 'view')

diff --git a/view/pdl/mod_directory.pdl b/view/pdl/mod_directory.pdl
new file mode 100644
index 000000000..0bc8ed936
--- /dev/null
+++ b/view/pdl/mod_directory.pdl
@@ -0,0 +1,7 @@
+[region=aside]
+[widget=findpeople][/widget]
+[widget=dirsafemode][/widget]
+[widget=dirsort][/widget]
+[widget=dirtags][/widget]
+[widget=suggestions][/widget]
+[/region]
-- 
cgit v1.2.3


From d32bbaf599c77aa415ee403a896b77f091f0e9fc Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Sat, 21 Dec 2013 23:47:44 -0800
Subject: split private messages into two modules - "message" is just for
 message lists, "mail" is for reading and writing conversations. This is so we
 can Comanchify it cleanly.

---
 view/css/mod_mail.css    | 100 +++++++++++++++++++++++++++++++++++++++++++++++
 view/js/mod_mail.js      |  13 ++++++
 view/pdl/mod_mail.pdl    |   3 ++
 view/tpl/mail_conv.tpl   |   4 +-
 view/tpl/mail_list.tpl   |   2 +-
 view/tpl/prv_message.tpl |   2 +-
 6 files changed, 120 insertions(+), 4 deletions(-)
 create mode 100644 view/css/mod_mail.css
 create mode 100644 view/js/mod_mail.js
 create mode 100644 view/pdl/mod_mail.pdl

(limited to 'view')

diff --git a/view/css/mod_mail.css b/view/css/mod_mail.css
new file mode 100644
index 000000000..c278f4d53
--- /dev/null
+++ b/view/css/mod_mail.css
@@ -0,0 +1,100 @@
+/* message */
+
+#mail-list-wrapper {
+	border-top: 1px solid #ccc;
+	padding: 5px 5px 5px 5px;
+}
+
+span.mail-list {
+	float: left;
+	width: 20%;
+}
+
+img.mail-list-sender-photo {
+	height: 24px;
+	width: 24px;
+	float: left;
+	margin-right: 30px;
+}
+
+.mail-list-remove {
+	width: 5% !important;
+}
+
+/* message/new */
+
+#prvmail-to-label,
+#prvmail-subject-label,
+#prvmail-expires-label,
+#prvmail-message-label {
+	margin-bottom: 10px;
+	margin-top: 20px;
+}
+
+#prvmail-submit {
+	float: left;
+	margin-top: 10px;
+	margin-right: 30px;
+}
+
+#prvmail-upload-wrapper,
+#prvmail-attach-wrapper,
+#prvmail-link-wrapper,
+#prvmail-expire-wrapper,
+#prvmail-encrypt-wrapper,
+#prvmail-rotator-wrapper {
+	float: left;
+	margin-top: 10px;
+	margin-right: 10px;
+	width: 24px;
+	cursor: pointer;
+}
+
+#prvmail-end {
+	clear: both;
+}
+
+/* message/id */
+
+.mail-conv-outside-wrapper {
+	margin-top: 30px;
+}
+
+.mail-conv-sender,
+.mail-conv-detail {
+	float: left;
+}
+
+.mail-conv-detail {
+	margin-left: 20px;
+	width: 500px;
+}
+
+.mail-conv-subject {
+    font-size: 1.4em;
+    margin: 10px 0;
+}
+
+.mail-conv-delete-wrapper {
+	float: right;
+	margin-right: 30px;
+	margin-top: 15px;
+}
+
+.mail-conv-delete-icon {
+	border: none;
+}
+
+.mail-conv-recall-wrapper {
+	float: right;
+	margin-right: 10px;
+	margin-top: 15px;
+}
+
+.mail-conv-outside-wrapper-end {
+	clear: both;
+}
+
+.mail-conv-break {
+	clear: both;
+}
diff --git a/view/js/mod_mail.js b/view/js/mod_mail.js
new file mode 100644
index 000000000..82f60f46f
--- /dev/null
+++ b/view/js/mod_mail.js
@@ -0,0 +1,13 @@
+$(document).ready(function() { 
+	var a; 
+	a = $("#recip").autocomplete({ 
+		serviceUrl: baseurl + '/acl',
+		minChars: 2,
+		width: 250,
+		id: 'recip-ac',
+		onSelect: function(value,data) {
+			$("#recip-complete").val(data);
+		},
+	});
+
+}); 
diff --git a/view/pdl/mod_mail.pdl b/view/pdl/mod_mail.pdl
new file mode 100644
index 000000000..d8f50ad7a
--- /dev/null
+++ b/view/pdl/mod_mail.pdl
@@ -0,0 +1,3 @@
+[region=aside]
+[widget=vcard][/widget]
+[/region]
diff --git a/view/tpl/mail_conv.tpl b/view/tpl/mail_conv.tpl
index 84bdb451a..f794ffc78 100755
--- a/view/tpl/mail_conv.tpl
+++ b/view/tpl/mail_conv.tpl
@@ -8,9 +8,9 @@
 		<div class="mail-conv-date">{{$mail.date}}</div>
 		<div class="mail-conv-subject">{{$mail.subject}}</div>
 		<div class="mail-conv-body">{{$mail.body}}</div>
-	<div class="mail-conv-delete-wrapper" id="mail-conv-delete-wrapper-{{$mail.id}}" ><a href="message/drop/{{$mail.id}}" onclick="return confirmDelete();" title="{{$mail.delete}}" id="mail-conv-delete-icon-{{$mail.id}}" class="mail-conv-delete-icon" ><i class="icon-remove mail-icons drop-icons"></i></a></div><div class="mail-conv-delete-end"></div>
+	<div class="mail-conv-delete-wrapper" id="mail-conv-delete-wrapper-{{$mail.id}}" ><a href="mail/drop/{{$mail.id}}" onclick="return confirmDelete();" title="{{$mail.delete}}" id="mail-conv-delete-icon-{{$mail.id}}" class="mail-conv-delete-icon" ><i class="icon-remove mail-icons drop-icons"></i></a></div><div class="mail-conv-delete-end"></div>
 	{{if $mail.can_recall}}
-	<div class="mail-conv-recall-wrapper" id="mail-conv-recall-wrapper-{{$mail.id}}" ><a href="message/recall/{{$mail.id}}" title="{{$mail.recall}}" id="mail-conv-recall-icon-{{$mail.id}}" class="mail-conv-recall-icon" ><i class="icon-undo mail-icons drop-icons"></i></a></div><div class="mail-conv-recall-end"></div>
+	<div class="mail-conv-recall-wrapper" id="mail-conv-recall-wrapper-{{$mail.id}}" ><a href="mail/recall/{{$mail.id}}" title="{{$mail.recall}}" id="mail-conv-recall-icon-{{$mail.id}}" class="mail-conv-recall-icon" ><i class="icon-undo mail-icons drop-icons"></i></a></div><div class="mail-conv-recall-end"></div>
 	{{/if}}
 	<div class="mail-conv-outside-wrapper-end"></div>
 </div>
diff --git a/view/tpl/mail_list.tpl b/view/tpl/mail_list.tpl
index c96827996..e17a206a0 100755
--- a/view/tpl/mail_list.tpl
+++ b/view/tpl/mail_list.tpl
@@ -1,7 +1,7 @@
 <div class="generic-content-wrapper" id="mail-list-wrapper">
 	<a href="{{$from_url}}" class ="mail-list" ><img class="mail-list-sender-photo" src="{{$from_photo}}" alt="{{$from_name}}" /></a>
 	<span class="mail-list">{{$from_name}}</span>
-	<span class="mail-list {{if $seen}}seen{{else}}unseen{{/if}}"><a href="message/{{$id}}" class="mail-link">{{$subject}}</a></span>
+	<span class="mail-list {{if $seen}}seen{{else}}unseen{{/if}}"><a href="mail/{{$id}}" class="mail-link">{{$subject}}</a></span>
 	<span class="mail-list" title="{{$date}}">{{$date}}</span>
 	<span class="mail-list mail-list-remove"><a href="message/dropconv/{{$id}}" onclick="return confirmDelete();"  title="{{$delete}}" ><i class="icon-remove mail-icons drop-icons"></i></a></span>
 	<div class="clear">&nbsp;</div>
diff --git a/view/tpl/prv_message.tpl b/view/tpl/prv_message.tpl
index b7654dc2d..3330a338f 100755
--- a/view/tpl/prv_message.tpl
+++ b/view/tpl/prv_message.tpl
@@ -1,7 +1,7 @@
 <h3>{{$header}}</h3>
 
 <div id="prvmail-wrapper" >
-<form id="prvmail-form" action="message" method="post" >
+<form id="prvmail-form" action="mail" method="post" >
 
 {{$parent}}
 
-- 
cgit v1.2.3


From 0366991b45a9b54da66850bce44b4b9dc1d939a7 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Sun, 22 Dec 2013 02:04:55 -0800
Subject: appears that I missed a few files for Comanchification. so here's
 mitem.

---
 view/pdl/mod_mitem.pdl | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 view/pdl/mod_mitem.pdl

(limited to 'view')

diff --git a/view/pdl/mod_mitem.pdl b/view/pdl/mod_mitem.pdl
new file mode 100644
index 000000000..c210606d0
--- /dev/null
+++ b/view/pdl/mod_mitem.pdl
@@ -0,0 +1,4 @@
+[region=aside]
+[widget=design_tools][/widget]
+[widget=menu_preview][/widget]
+[/region]
\ No newline at end of file
-- 
cgit v1.2.3


From 7e7b5bfa4930493a8feae10b0550e29797956c70 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Sun, 22 Dec 2013 02:16:45 -0800
Subject: last remaining files to be Comanchified with the exception of
 mod_admin. Though I should probably take a third look to see if anything else
 uses widgets. In fact - it appears that the flattrwidget does.

---
 view/pdl/mod_chanview.pdl | 3 +++
 view/pdl/mod_connect.pdl  | 3 +++
 2 files changed, 6 insertions(+)
 create mode 100644 view/pdl/mod_chanview.pdl
 create mode 100644 view/pdl/mod_connect.pdl

(limited to 'view')

diff --git a/view/pdl/mod_chanview.pdl b/view/pdl/mod_chanview.pdl
new file mode 100644
index 000000000..d8f50ad7a
--- /dev/null
+++ b/view/pdl/mod_chanview.pdl
@@ -0,0 +1,3 @@
+[region=aside]
+[widget=vcard][/widget]
+[/region]
diff --git a/view/pdl/mod_connect.pdl b/view/pdl/mod_connect.pdl
new file mode 100644
index 000000000..6b1d2a15e
--- /dev/null
+++ b/view/pdl/mod_connect.pdl
@@ -0,0 +1,3 @@
+[region=aside]
+[widget=profile][/widget]
+[/region]
-- 
cgit v1.2.3