diff --git a/boot.php b/boot.php
index 5fe0d7dd26..b49c92bf05 100644
--- a/boot.php
+++ b/boot.php
@@ -11,7 +11,7 @@ require_once('include/cache.php');
 require_once('library/Mobile_Detect/Mobile_Detect.php');
 
 define ( 'FRIENDICA_PLATFORM',     'Friendica');
-define ( 'FRIENDICA_VERSION',      '3.0.1439' );
+define ( 'FRIENDICA_VERSION',      '3.0.1443' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
 define ( 'DB_UPDATE_VERSION',      1154      );
 
@@ -253,6 +253,7 @@ define ( 'ACTIVITY_TAG',         NAMESPACE_ACTIVITY_SCHEMA . 'tag' );
 define ( 'ACTIVITY_FAVORITE',    NAMESPACE_ACTIVITY_SCHEMA . 'favorite' );
 
 define ( 'ACTIVITY_POKE',        NAMESPACE_ZOT . '/activity/poke' );
+define ( 'ACTIVITY_MOOD',        NAMESPACE_ZOT . '/activity/mood' );
 
 define ( 'ACTIVITY_OBJ_COMMENT', NAMESPACE_ACTIVITY_SCHEMA . 'comment' );
 define ( 'ACTIVITY_OBJ_NOTE',    NAMESPACE_ACTIVITY_SCHEMA . 'note' );
diff --git a/include/conversation.php b/include/conversation.php
index 1b17bb0df4..93532dfcc2 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -205,6 +205,20 @@ function localize_item(&$item){
 		$item['body'] = sprintf($txt, $A, $B). "\n\n\n" . $Bphoto;
 
 	}
+	if (stristr($item['verb'],ACTIVITY_MOOD)) {
+		$verb = urldecode(substr($item['verb'],strpos($item['verb'],'#')+1));
+		if(! $verb)
+			return;
+
+		$Aname = $item['author-name'];
+		$Alink = $item['author-link'];
+		$A = '[url=' . zrl($Alink) . ']' . $Aname . '[/url]';
+		
+		$txt = t('%1$s is currently %2$s');
+
+		$item['body'] = sprintf($txt, $A, t($verb));
+	}
+
     if ($item['verb']===ACTIVITY_TAG){
 		$r = q("SELECT * from `item`,`contact` WHERE 
 		`item`.`contact-id`=`contact`.`id` AND `item`.`uri`='%s';",
@@ -508,6 +522,13 @@ function prepare_threads_body($a, $items, $cmnt_tpl, $page_writeable, $mode, $pr
 			}
 		}
 
+		if(intval(get_config('system','thread_allow')) && $a->theme_thread_allow) {
+			$comments_threaded = true;
+		}
+		else {
+			$comments_threaded = false;
+		}
+
 		if($page_writeable) {
 			$buttons = array(
 				'like' => array( t("I like this \x28toggle\x29"), t("like")),
@@ -524,7 +545,8 @@ function prepare_threads_body($a, $items, $cmnt_tpl, $page_writeable, $mode, $pr
 					$qcomment = (($qc) ? explode("\n",$qc) : null);
 				}
 				$comment = replace_macros($cmnt_tpl,array(
-					'$return_path' => '', 
+					'$return_path' => '',
+					'$threaded' => $comments_threaded, 
 					'$jsreload' => (($mode === 'display') ? $_SESSION['return_url'] : ''),
 					'$type' => (($mode === 'profile') ? 'wall-comment' : 'net-comment'),
 					'$id' => $item['item_id'],
@@ -583,6 +605,8 @@ function prepare_threads_body($a, $items, $cmnt_tpl, $page_writeable, $mode, $pr
 			'osparkle' => $osparkle,
 			'sparkle' => $sparkle,
 			'title' => template_escape($item['title']),
+			'localtime' => datetime_convert('UTC', date_default_timezone_get(), $item['created'], 'r'),
+
 			'ago' => (($item['app']) ? sprintf( t('%s from %s'),relative_date($item['created']),$item['app']) : relative_date($item['created'])),
 			'lock' => $lock,
 			'location' => template_escape($location),
@@ -815,6 +839,7 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
 					'title' => template_escape($item['title']),
 					'body' => template_escape($body),
 					'text' => strip_tags(template_escape($body)),
+					'localtime' => datetime_convert('UTC', date_default_timezone_get(), $item['created'], 'r'),
 					'ago' => (($item['app']) ? sprintf( t('%s from %s'),relative_date($item['created']),$item['app']) : relative_date($item['created'])),
 					'location' => template_escape($location),
 					'indent' => '',
diff --git a/include/text.php b/include/text.php
index 85ba99dd31..3783d2accd 100644
--- a/include/text.php
+++ b/include/text.php
@@ -727,6 +727,39 @@ function get_poke_verbs() {
 	return $arr;
 }
 
+function get_mood_verbs() {
+	
+	// index is present tense verb
+	// value is array containing past tense verb, translation of present, translation of past
+
+	$arr = array(
+		'happy'      => t('happy'),
+		'sad'        => t('sad'),
+		'mellow'     => t('mellow'),
+		'tired'      => t('tired'),
+		'perky'      => t('perky'),
+		'angry'      => t('angry'),
+		'stupefied'  => t('stupified'),
+		'puzzled'    => t('puzzled'),
+		'interested' => t('interested'),
+		'bitter'     => t('bitter'),
+		'cheerful'   => t('cheerful'),
+		'alive'      => t('alive'),
+		'annoyed'    => t('annoyed'),
+		'anxious'    => t('anxious'),
+		'cranky'     => t('cranky'),
+		'disturbed'  => t('disturbed'),
+		'frustrated' => t('frustrated'),
+		'motivated'  => t('motivated'),
+		'relaxed'    => t('relaxed'),
+		'surprised'  => t('surprised'),
+	);
+
+	call_hooks('mood_verbs', $arr);
+	return $arr;
+}
+
+
 /**
  * 
  * Function: smilies
diff --git a/mod/mood.php b/mod/mood.php
new file mode 100644
index 0000000000..7a793c71e0
--- /dev/null
+++ b/mod/mood.php
@@ -0,0 +1,142 @@
+<?php
+
+require_once('include/security.php');
+require_once('include/bbcode.php');
+require_once('include/items.php');
+
+
+function mood_init(&$a) {
+
+	if(! local_user())
+		return;
+
+	$uid = local_user();
+	$verb = notags(trim($_GET['verb']));
+	
+	if(! $verb) 
+		return;
+
+	$verbs = get_mood_verbs();
+
+	if(! in_array($verb,$verbs))
+		return;
+
+	$activity = ACTIVITY_MOOD . '#' . urlencode($verb);
+
+	$parent = ((x($_GET,'parent')) ? intval($_GET['parent']) : 0);
+
+
+	logger('mood: verb ' . $verb, LOGGER_DEBUG);
+
+
+	if($parent) {
+		$r = q("select uri, private, allow_cid, allow_gid, deny_cid, deny_gid 
+			from item where id = %d and parent = %d and uid = %d limit 1",
+			intval($parent),
+			intval($parent),
+			intval($uid)
+		);
+		if(count($r)) {
+			$parent_uri = $r[0]['uri'];
+			$private    = $r[0]['private'];
+			$allow_cid  = $r[0]['allow_cid'];
+			$allow_gid  = $r[0]['allow_gid'];
+			$deny_cid   = $r[0]['deny_cid'];
+			$deny_gid   = $r[0]['deny_gid'];
+		}
+	}
+	else {
+
+		$private = 0;
+
+		$allow_cid     =  $a->user['allow_cid'];
+		$allow_gid     =  $a->user['allow_gid'];
+		$deny_cid      =  $a->user['deny_cid'];
+		$deny_gid      =  $a->user['deny_gid'];
+	}
+
+	$poster = $a->contact;
+
+	$uri = item_new_uri($a->get_hostname(),$uid);
+
+	$action = sprintf( t('%1$s is currently %2$s'), '[url=' . $poster['url'] . ']' . $poster['name'] . '[/url]' , $verbs[$verb]); 
+
+	$arr = array();
+
+	$arr['uid']           = $uid;
+	$arr['uri']           = $uri;
+	$arr['parent-uri']    = (($parent_uri) ? $parent_uri : $uri);
+	$arr['type']          = 'activity';
+	$arr['wall']          = 1;
+	$arr['contact-id']    = $poster['id'];
+	$arr['owner-name']    = $poster['name'];
+	$arr['owner-link']    = $poster['url'];
+	$arr['owner-avatar']  = $poster['thumb'];
+	$arr['author-name']   = $poster['name'];
+	$arr['author-link']   = $poster['url'];
+	$arr['author-avatar'] = $poster['thumb'];
+	$arr['title']         = '';
+	$arr['allow_cid']     = $allow_cid;
+	$arr['allow_gid']     = $allow_gid;
+	$arr['deny_cid']      = $deny_cid;
+	$arr['deny_gid']      = $deny_gid;
+	$arr['last-child']    = 1;
+	$arr['visible']       = 1;
+	$arr['verb']          = $activity;
+	$arr['private']       = $private;
+
+	$arr['origin']        = 1;
+	$arr['body']          = $action;
+
+	$item_id = item_store($arr);
+	if($item_id) {
+		q("UPDATE `item` SET `plink` = '%s' WHERE `uid` = %d AND `id` = %d LIMIT 1",
+			dbesc($a->get_baseurl() . '/display/' . $poster['nickname'] . '/' . $item_id),
+			intval($uid),
+			intval($item_id)
+		);
+		proc_run('php',"include/notifier.php","tag","$item_id");
+	}
+
+
+	call_hooks('post_local_end', $arr);
+
+	proc_run('php',"include/notifier.php","like","$post_id");
+
+	return;
+}
+
+
+
+function mood_content(&$a) {
+
+	if(! local_user()) {
+		notice( t('Permission denied.') . EOL);
+		return;
+	}
+
+	$parent = ((x($_GET,'parent')) ? intval($_GET['parent']) : '0');
+
+
+
+	$verbs = get_mood_verbs();
+
+	$shortlist = array();
+	foreach($verbs as $k => $v)
+		if($v !== 'NOTRANSLATION')
+			$shortlist[] = array($k,$v);
+
+
+	$tpl = get_markup_template('mood_content.tpl');
+
+	$o = replace_macros($tpl,array(
+		'$title' => t('Mood'),
+		'$desc' => t('Set your current mood and tell your friends'),
+		'$verbs' => $shortlist,
+		'$parent' => $parent,
+		'$submit' => t('Submit'),
+	));
+
+	return $o;
+
+}
\ No newline at end of file
diff --git a/mod/poke.php b/mod/poke.php
index 5cd88d7e2a..edcb27d021 100644
--- a/mod/poke.php
+++ b/mod/poke.php
@@ -73,7 +73,7 @@ function poke_init(&$a) {
 
 	$poster = $a->contact;
 
-	$uri = item_new_uri($a->get_hostname(),$owner_uid);
+	$uri = item_new_uri($a->get_hostname(),$uid);
 
 	$arr = array();
 
diff --git a/mod/profiles.php b/mod/profiles.php
index 975a8c2127..74844ff42e 100644
--- a/mod/profiles.php
+++ b/mod/profiles.php
@@ -48,10 +48,15 @@ function profiles_post(&$a) {
 			
 		$name = notags(trim($_POST['name']));
 
+		if(! strlen($name)) {
+			$name = '[No Name]';
+		}
+
 		if($orig[0]['name'] != $name)
 			$namechanged = true;
 
 
+
 		$pdesc = notags(trim($_POST['pdesc']));
 		$gender = notags(trim($_POST['gender']));
 		$address = notags(trim($_POST['address']));
diff --git a/util/messages.po b/util/messages.po
index 82b79605b0..b05275c163 100644
--- a/util/messages.po
+++ b/util/messages.po
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: 3.0.1439\n"
+"Project-Id-Version: 3.0.1443\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-18 10:00-0700\n"
+"POT-Creation-Date: 2012-08-22 10:00-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -52,7 +52,7 @@ msgstr ""
 #: ../../mod/message.php:168 ../../mod/allfriends.php:9
 #: ../../mod/nogroup.php:25 ../../mod/wall_upload.php:53
 #: ../../mod/follow.php:9 ../../mod/display.php:131 ../../mod/profiles.php:7
-#: ../../mod/profiles.php:408 ../../mod/delegate.php:6
+#: ../../mod/profiles.php:413 ../../mod/delegate.php:6
 #: ../../mod/suggest.php:28 ../../mod/invite.php:13 ../../mod/invite.php:81
 #: ../../mod/dfrn_confirm.php:53 ../../addon/facebook/facebook.php:510
 #: ../../addon/facebook/facebook.php:516
@@ -134,7 +134,7 @@ msgstr ""
 #: ../../mod/settings.php:958 ../../mod/group.php:85 ../../mod/message.php:294
 #: ../../mod/message.php:478 ../../mod/admin.php:435 ../../mod/admin.php:676
 #: ../../mod/admin.php:812 ../../mod/admin.php:1011 ../../mod/admin.php:1098
-#: ../../mod/profiles.php:578 ../../mod/invite.php:119
+#: ../../mod/profiles.php:583 ../../mod/invite.php:119
 #: ../../addon/fromgplus/fromgplus.php:40
 #: ../../addon/facebook/facebook.php:619
 #: ../../addon/snautofollow/snautofollow.php:64 ../../addon/bg/bg.php:90
@@ -173,7 +173,7 @@ msgstr ""
 #: ../../view/theme/diabook/theme.php:757
 #: ../../view/theme/diabook/config.php:190
 #: ../../view/theme/quattro/config.php:52 ../../view/theme/dispy/config.php:70
-#: ../../include/conversation.php:538
+#: ../../include/conversation.php:546
 msgid "Submit"
 msgstr ""
 
@@ -233,7 +233,7 @@ msgid "link to source"
 msgstr ""
 
 #: ../../mod/events.php:331 ../../view/theme/diabook/theme.php:131
-#: ../../include/nav.php:52 ../../boot.php:1651
+#: ../../include/nav.php:52 ../../boot.php:1655
 msgid "Events"
 msgstr ""
 
@@ -289,7 +289,7 @@ msgstr ""
 
 #: ../../mod/events.php:432 ../../mod/directory.php:132
 #: ../../include/event.php:40 ../../include/bb2diaspora.php:455
-#: ../../boot.php:1203
+#: ../../boot.php:1207
 msgid "Location:"
 msgstr ""
 
@@ -355,7 +355,7 @@ msgstr ""
 #: ../../mod/settings.php:945 ../../mod/settings.php:946
 #: ../../mod/settings.php:947 ../../mod/settings.php:948
 #: ../../mod/settings.php:949 ../../mod/register.php:234
-#: ../../mod/profiles.php:558
+#: ../../mod/profiles.php:563
 msgid "Yes"
 msgstr ""
 
@@ -367,11 +367,11 @@ msgstr ""
 #: ../../mod/settings.php:945 ../../mod/settings.php:946
 #: ../../mod/settings.php:947 ../../mod/settings.php:948
 #: ../../mod/settings.php:949 ../../mod/register.php:235
-#: ../../mod/profiles.php:559
+#: ../../mod/profiles.php:564
 msgid "No"
 msgstr ""
 
-#: ../../mod/photos.php:46 ../../boot.php:1644
+#: ../../mod/photos.php:46 ../../boot.php:1648
 msgid "Photo Albums"
 msgstr ""
 
@@ -566,49 +566,49 @@ msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
 msgstr ""
 
 #: ../../mod/photos.php:1303 ../../mod/content.php:665
-#: ../../include/conversation.php:513
+#: ../../include/conversation.php:520
 msgid "I like this (toggle)"
 msgstr ""
 
 #: ../../mod/photos.php:1304 ../../mod/content.php:666
-#: ../../include/conversation.php:514
+#: ../../include/conversation.php:521
 msgid "I don't like this (toggle)"
 msgstr ""
 
-#: ../../mod/photos.php:1305 ../../include/conversation.php:1139
+#: ../../mod/photos.php:1305 ../../include/conversation.php:1150
 msgid "Share"
 msgstr ""
 
 #: ../../mod/photos.php:1306 ../../mod/editpost.php:112
 #: ../../mod/content.php:482 ../../mod/content.php:843
 #: ../../mod/wallmessage.php:152 ../../mod/message.php:293
-#: ../../mod/message.php:479 ../../include/conversation.php:604
-#: ../../include/conversation.php:835 ../../include/conversation.php:1158
+#: ../../mod/message.php:479 ../../include/conversation.php:614
+#: ../../include/conversation.php:846 ../../include/conversation.php:1169
 msgid "Please wait"
 msgstr ""
 
 #: ../../mod/photos.php:1322 ../../mod/photos.php:1363
 #: ../../mod/photos.php:1395 ../../mod/content.php:688
-#: ../../include/conversation.php:535
+#: ../../include/conversation.php:543
 msgid "This is you"
 msgstr ""
 
 #: ../../mod/photos.php:1324 ../../mod/photos.php:1365
 #: ../../mod/photos.php:1397 ../../mod/content.php:690
-#: ../../include/conversation.php:537 ../../boot.php:582
+#: ../../include/conversation.php:545 ../../boot.php:582
 msgid "Comment"
 msgstr ""
 
 #: ../../mod/photos.php:1326 ../../mod/editpost.php:133
-#: ../../mod/content.php:700 ../../include/conversation.php:547
-#: ../../include/conversation.php:1176
+#: ../../mod/content.php:700 ../../include/conversation.php:555
+#: ../../include/conversation.php:1187
 msgid "Preview"
 msgstr ""
 
 #: ../../mod/photos.php:1426 ../../mod/content.php:439
 #: ../../mod/content.php:721 ../../mod/settings.php:600
 #: ../../mod/settings.php:689 ../../mod/group.php:168 ../../mod/admin.php:683
-#: ../../include/conversation.php:395 ../../include/conversation.php:792
+#: ../../include/conversation.php:395 ../../include/conversation.php:802
 msgid "Delete"
 msgstr ""
 
@@ -674,7 +674,7 @@ msgstr ""
 msgid "Edit post"
 msgstr ""
 
-#: ../../mod/editpost.php:88 ../../include/conversation.php:1125
+#: ../../mod/editpost.php:88 ../../include/conversation.php:1136
 msgid "Post to Email"
 msgstr ""
 
@@ -685,17 +685,17 @@ msgstr ""
 
 #: ../../mod/editpost.php:104 ../../mod/wallmessage.php:150
 #: ../../mod/message.php:291 ../../mod/message.php:476
-#: ../../include/conversation.php:1140
+#: ../../include/conversation.php:1151
 msgid "Upload photo"
 msgstr ""
 
-#: ../../mod/editpost.php:105 ../../include/conversation.php:1142
+#: ../../mod/editpost.php:105 ../../include/conversation.php:1153
 msgid "Attach file"
 msgstr ""
 
 #: ../../mod/editpost.php:106 ../../mod/wallmessage.php:151
 #: ../../mod/message.php:292 ../../mod/message.php:477
-#: ../../include/conversation.php:1144
+#: ../../include/conversation.php:1155
 msgid "Insert web link"
 msgstr ""
 
@@ -711,35 +711,35 @@ msgstr ""
 msgid "Insert Vorbis [.ogg] audio"
 msgstr ""
 
-#: ../../mod/editpost.php:110 ../../include/conversation.php:1150
+#: ../../mod/editpost.php:110 ../../include/conversation.php:1161
 msgid "Set your location"
 msgstr ""
 
-#: ../../mod/editpost.php:111 ../../include/conversation.php:1152
+#: ../../mod/editpost.php:111 ../../include/conversation.php:1163
 msgid "Clear browser location"
 msgstr ""
 
-#: ../../mod/editpost.php:113 ../../include/conversation.php:1159
+#: ../../mod/editpost.php:113 ../../include/conversation.php:1170
 msgid "Permission settings"
 msgstr ""
 
-#: ../../mod/editpost.php:121 ../../include/conversation.php:1168
+#: ../../mod/editpost.php:121 ../../include/conversation.php:1179
 msgid "CC: email addresses"
 msgstr ""
 
-#: ../../mod/editpost.php:122 ../../include/conversation.php:1169
+#: ../../mod/editpost.php:122 ../../include/conversation.php:1180
 msgid "Public post"
 msgstr ""
 
-#: ../../mod/editpost.php:125 ../../include/conversation.php:1155
+#: ../../mod/editpost.php:125 ../../include/conversation.php:1166
 msgid "Set title"
 msgstr ""
 
-#: ../../mod/editpost.php:127 ../../include/conversation.php:1157
+#: ../../mod/editpost.php:127 ../../include/conversation.php:1168
 msgid "Categories (comma-separated list)"
 msgstr ""
 
-#: ../../mod/editpost.php:128 ../../include/conversation.php:1171
+#: ../../mod/editpost.php:128 ../../include/conversation.php:1182
 msgid "Example: bob@example.com, mary@example.com"
 msgstr ""
 
@@ -1252,7 +1252,7 @@ msgid "is interested in:"
 msgstr ""
 
 #: ../../mod/match.php:58 ../../mod/suggest.php:59
-#: ../../include/contact_widgets.php:9 ../../boot.php:1147
+#: ../../include/contact_widgets.php:9 ../../boot.php:1151
 msgid "Connect"
 msgstr ""
 
@@ -1281,28 +1281,28 @@ msgid "Group: "
 msgstr ""
 
 #: ../../mod/content.php:438 ../../mod/content.php:720
-#: ../../include/conversation.php:394 ../../include/conversation.php:791
+#: ../../include/conversation.php:394 ../../include/conversation.php:801
 msgid "Select"
 msgstr ""
 
 #: ../../mod/content.php:455 ../../mod/content.php:813
-#: ../../mod/content.php:814 ../../include/conversation.php:574
-#: ../../include/conversation.php:575 ../../include/conversation.php:808
+#: ../../mod/content.php:814 ../../include/conversation.php:582
+#: ../../include/conversation.php:583 ../../include/conversation.php:818
 #, php-format
 msgid "View %s's profile @ %s"
 msgstr ""
 
 #: ../../mod/content.php:465 ../../mod/content.php:825
-#: ../../include/conversation.php:586 ../../include/conversation.php:818
+#: ../../include/conversation.php:596 ../../include/conversation.php:829
 #, php-format
 msgid "%s from %s"
 msgstr ""
 
-#: ../../mod/content.php:480 ../../include/conversation.php:833
+#: ../../mod/content.php:480 ../../include/conversation.php:844
 msgid "View in context"
 msgstr ""
 
-#: ../../mod/content.php:586 ../../include/conversation.php:613
+#: ../../mod/content.php:586 ../../include/conversation.php:623
 #, php-format
 msgid "%d comment"
 msgid_plural "%d comments"
@@ -1311,56 +1311,56 @@ msgstr[1] ""
 
 #: ../../mod/content.php:587 ../../addon/page/page.php:76
 #: ../../addon/page/page.php:110 ../../addon/showmore/showmore.php:119
-#: ../../include/contact_widgets.php:188 ../../include/conversation.php:614
+#: ../../include/contact_widgets.php:188 ../../include/conversation.php:624
 #: ../../boot.php:583
 msgid "show more"
 msgstr ""
 
-#: ../../mod/content.php:665 ../../include/conversation.php:513
+#: ../../mod/content.php:665 ../../include/conversation.php:520
 msgid "like"
 msgstr ""
 
-#: ../../mod/content.php:666 ../../include/conversation.php:514
+#: ../../mod/content.php:666 ../../include/conversation.php:521
 msgid "dislike"
 msgstr ""
 
-#: ../../mod/content.php:668 ../../include/conversation.php:516
+#: ../../mod/content.php:668 ../../include/conversation.php:523
 msgid "Share this"
 msgstr ""
 
-#: ../../mod/content.php:668 ../../include/conversation.php:516
+#: ../../mod/content.php:668 ../../include/conversation.php:523
 msgid "share"
 msgstr ""
 
-#: ../../mod/content.php:692 ../../include/conversation.php:539
+#: ../../mod/content.php:692 ../../include/conversation.php:547
 msgid "Bold"
 msgstr ""
 
-#: ../../mod/content.php:693 ../../include/conversation.php:540
+#: ../../mod/content.php:693 ../../include/conversation.php:548
 msgid "Italic"
 msgstr ""
 
-#: ../../mod/content.php:694 ../../include/conversation.php:541
+#: ../../mod/content.php:694 ../../include/conversation.php:549
 msgid "Underline"
 msgstr ""
 
-#: ../../mod/content.php:695 ../../include/conversation.php:542
+#: ../../mod/content.php:695 ../../include/conversation.php:550
 msgid "Quote"
 msgstr ""
 
-#: ../../mod/content.php:696 ../../include/conversation.php:543
+#: ../../mod/content.php:696 ../../include/conversation.php:551
 msgid "Code"
 msgstr ""
 
-#: ../../mod/content.php:697 ../../include/conversation.php:544
+#: ../../mod/content.php:697 ../../include/conversation.php:552
 msgid "Image"
 msgstr ""
 
-#: ../../mod/content.php:698 ../../include/conversation.php:545
+#: ../../mod/content.php:698 ../../include/conversation.php:553
 msgid "Link"
 msgstr ""
 
-#: ../../mod/content.php:699 ../../include/conversation.php:546
+#: ../../mod/content.php:699 ../../include/conversation.php:554
 msgid "Video"
 msgstr ""
 
@@ -1388,15 +1388,15 @@ msgstr ""
 msgid "save to folder"
 msgstr ""
 
-#: ../../mod/content.php:815 ../../include/conversation.php:576
+#: ../../mod/content.php:815 ../../include/conversation.php:584
 msgid "to"
 msgstr ""
 
-#: ../../mod/content.php:816 ../../include/conversation.php:577
+#: ../../mod/content.php:816 ../../include/conversation.php:585
 msgid "Wall-to-Wall"
 msgstr ""
 
-#: ../../mod/content.php:817 ../../include/conversation.php:578
+#: ../../mod/content.php:817 ../../include/conversation.php:586
 msgid "via Wall-To-Wall:"
 msgstr ""
 
@@ -1925,7 +1925,7 @@ msgid ""
 "Password reset failed."
 msgstr ""
 
-#: ../../mod/lostpass.php:83 ../../boot.php:929
+#: ../../mod/lostpass.php:83 ../../boot.php:933
 msgid "Password Reset"
 msgstr ""
 
@@ -2593,7 +2593,7 @@ msgstr ""
 msgid "Invalid contact."
 msgstr ""
 
-#: ../../mod/notes.php:44 ../../boot.php:1658
+#: ../../mod/notes.php:44 ../../boot.php:1662
 msgid "Personal Notes"
 msgstr ""
 
@@ -2636,7 +2636,7 @@ msgstr ""
 
 #: ../../mod/wallmessage.php:123 ../../mod/wallmessage.php:131
 #: ../../mod/message.php:242 ../../mod/message.php:250
-#: ../../include/conversation.php:1076 ../../include/conversation.php:1093
+#: ../../include/conversation.php:1087 ../../include/conversation.php:1104
 msgid "Please enter a link URL:"
 msgstr ""
 
@@ -2846,7 +2846,7 @@ msgstr ""
 
 #: ../../mod/profperm.php:103 ../../view/theme/diabook/theme.php:128
 #: ../../include/profile_advanced.php:7 ../../include/profile_advanced.php:84
-#: ../../include/nav.php:50 ../../boot.php:1634
+#: ../../include/nav.php:50 ../../boot.php:1638
 msgid "Profile"
 msgstr ""
 
@@ -2993,7 +2993,7 @@ msgid "Access denied."
 msgstr ""
 
 #: ../../mod/fbrowser.php:25 ../../view/theme/diabook/theme.php:130
-#: ../../include/nav.php:51 ../../boot.php:1641
+#: ../../include/nav.php:51 ../../boot.php:1645
 msgid "Photos"
 msgstr ""
 
@@ -3825,7 +3825,7 @@ msgstr ""
 msgid "FTP Password"
 msgstr ""
 
-#: ../../mod/profile.php:22 ../../boot.php:1060
+#: ../../mod/profile.php:22 ../../boot.php:1064
 msgid "Requested profile is not available."
 msgstr ""
 
@@ -3933,8 +3933,8 @@ msgstr ""
 msgid "Search"
 msgstr ""
 
-#: ../../mod/profiles.php:21 ../../mod/profiles.php:418
-#: ../../mod/profiles.php:532 ../../mod/dfrn_confirm.php:62
+#: ../../mod/profiles.php:21 ../../mod/profiles.php:423
+#: ../../mod/profiles.php:537 ../../mod/dfrn_confirm.php:62
 msgid "Profile not found."
 msgstr ""
 
@@ -3942,306 +3942,306 @@ msgstr ""
 msgid "Profile Name is required."
 msgstr ""
 
-#: ../../mod/profiles.php:155
+#: ../../mod/profiles.php:160
 msgid "Marital Status"
 msgstr ""
 
-#: ../../mod/profiles.php:159
+#: ../../mod/profiles.php:164
 msgid "Romantic Partner"
 msgstr ""
 
-#: ../../mod/profiles.php:163
+#: ../../mod/profiles.php:168
 msgid "Likes"
 msgstr ""
 
-#: ../../mod/profiles.php:167
+#: ../../mod/profiles.php:172
 msgid "Dislikes"
 msgstr ""
 
-#: ../../mod/profiles.php:171
+#: ../../mod/profiles.php:176
 msgid "Work/Employment"
 msgstr ""
 
-#: ../../mod/profiles.php:174
+#: ../../mod/profiles.php:179
 msgid "Religion"
 msgstr ""
 
-#: ../../mod/profiles.php:178
+#: ../../mod/profiles.php:183
 msgid "Political Views"
 msgstr ""
 
-#: ../../mod/profiles.php:182
+#: ../../mod/profiles.php:187
 msgid "Gender"
 msgstr ""
 
-#: ../../mod/profiles.php:186
+#: ../../mod/profiles.php:191
 msgid "Sexual Preference"
 msgstr ""
 
-#: ../../mod/profiles.php:190
+#: ../../mod/profiles.php:195
 msgid "Homepage"
 msgstr ""
 
-#: ../../mod/profiles.php:194
+#: ../../mod/profiles.php:199
 msgid "Interests"
 msgstr ""
 
-#: ../../mod/profiles.php:198
+#: ../../mod/profiles.php:203
 msgid "Address"
 msgstr ""
 
-#: ../../mod/profiles.php:205 ../../addon/dav/common/wdcal_edit.inc.php:183
+#: ../../mod/profiles.php:210 ../../addon/dav/common/wdcal_edit.inc.php:183
 msgid "Location"
 msgstr ""
 
-#: ../../mod/profiles.php:288
+#: ../../mod/profiles.php:293
 msgid "Profile updated."
 msgstr ""
 
-#: ../../mod/profiles.php:355
+#: ../../mod/profiles.php:360
 msgid " and "
 msgstr ""
 
-#: ../../mod/profiles.php:363
+#: ../../mod/profiles.php:368
 msgid "public profile"
 msgstr ""
 
-#: ../../mod/profiles.php:366
+#: ../../mod/profiles.php:371
 #, php-format
 msgid "%1$s changed %2$s to &ldquo;%3$s&rdquo;"
 msgstr ""
 
-#: ../../mod/profiles.php:367
+#: ../../mod/profiles.php:372
 #, php-format
 msgid " - Visit %1$s's %2$s"
 msgstr ""
 
-#: ../../mod/profiles.php:370
+#: ../../mod/profiles.php:375
 #, php-format
 msgid "%1$s has an updated %2$s, changing %3$s."
 msgstr ""
 
-#: ../../mod/profiles.php:437
+#: ../../mod/profiles.php:442
 msgid "Profile deleted."
 msgstr ""
 
-#: ../../mod/profiles.php:455 ../../mod/profiles.php:489
+#: ../../mod/profiles.php:460 ../../mod/profiles.php:494
 msgid "Profile-"
 msgstr ""
 
-#: ../../mod/profiles.php:474 ../../mod/profiles.php:516
+#: ../../mod/profiles.php:479 ../../mod/profiles.php:521
 msgid "New profile created."
 msgstr ""
 
-#: ../../mod/profiles.php:495
+#: ../../mod/profiles.php:500
 msgid "Profile unavailable to clone."
 msgstr ""
 
-#: ../../mod/profiles.php:557
+#: ../../mod/profiles.php:562
 msgid "Hide your contact/friend list from viewers of this profile?"
 msgstr ""
 
-#: ../../mod/profiles.php:577
+#: ../../mod/profiles.php:582
 msgid "Edit Profile Details"
 msgstr ""
 
-#: ../../mod/profiles.php:579
+#: ../../mod/profiles.php:584
 msgid "View this profile"
 msgstr ""
 
-#: ../../mod/profiles.php:580
+#: ../../mod/profiles.php:585
 msgid "Create a new profile using these settings"
 msgstr ""
 
-#: ../../mod/profiles.php:581
+#: ../../mod/profiles.php:586
 msgid "Clone this profile"
 msgstr ""
 
-#: ../../mod/profiles.php:582
+#: ../../mod/profiles.php:587
 msgid "Delete this profile"
 msgstr ""
 
-#: ../../mod/profiles.php:583
+#: ../../mod/profiles.php:588
 msgid "Profile Name:"
 msgstr ""
 
-#: ../../mod/profiles.php:584
+#: ../../mod/profiles.php:589
 msgid "Your Full Name:"
 msgstr ""
 
-#: ../../mod/profiles.php:585
+#: ../../mod/profiles.php:590
 msgid "Title/Description:"
 msgstr ""
 
-#: ../../mod/profiles.php:586
+#: ../../mod/profiles.php:591
 msgid "Your Gender:"
 msgstr ""
 
-#: ../../mod/profiles.php:587
+#: ../../mod/profiles.php:592
 #, php-format
 msgid "Birthday (%s):"
 msgstr ""
 
-#: ../../mod/profiles.php:588
+#: ../../mod/profiles.php:593
 msgid "Street Address:"
 msgstr ""
 
-#: ../../mod/profiles.php:589
+#: ../../mod/profiles.php:594
 msgid "Locality/City:"
 msgstr ""
 
-#: ../../mod/profiles.php:590
+#: ../../mod/profiles.php:595
 msgid "Postal/Zip Code:"
 msgstr ""
 
-#: ../../mod/profiles.php:591
+#: ../../mod/profiles.php:596
 msgid "Country:"
 msgstr ""
 
-#: ../../mod/profiles.php:592
+#: ../../mod/profiles.php:597
 msgid "Region/State:"
 msgstr ""
 
-#: ../../mod/profiles.php:593
+#: ../../mod/profiles.php:598
 msgid "<span class=\"heart\">&hearts;</span> Marital Status:"
 msgstr ""
 
-#: ../../mod/profiles.php:594
+#: ../../mod/profiles.php:599
 msgid "Who: (if applicable)"
 msgstr ""
 
-#: ../../mod/profiles.php:595
+#: ../../mod/profiles.php:600
 msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
 msgstr ""
 
-#: ../../mod/profiles.php:596
+#: ../../mod/profiles.php:601
 msgid "Since [date]:"
 msgstr ""
 
-#: ../../mod/profiles.php:597 ../../include/profile_advanced.php:46
+#: ../../mod/profiles.php:602 ../../include/profile_advanced.php:46
 msgid "Sexual Preference:"
 msgstr ""
 
-#: ../../mod/profiles.php:598
+#: ../../mod/profiles.php:603
 msgid "Homepage URL:"
 msgstr ""
 
-#: ../../mod/profiles.php:599 ../../include/profile_advanced.php:50
+#: ../../mod/profiles.php:604 ../../include/profile_advanced.php:50
 msgid "Hometown:"
 msgstr ""
 
-#: ../../mod/profiles.php:600 ../../include/profile_advanced.php:54
+#: ../../mod/profiles.php:605 ../../include/profile_advanced.php:54
 msgid "Political Views:"
 msgstr ""
 
-#: ../../mod/profiles.php:601
+#: ../../mod/profiles.php:606
 msgid "Religious Views:"
 msgstr ""
 
-#: ../../mod/profiles.php:602
+#: ../../mod/profiles.php:607
 msgid "Public Keywords:"
 msgstr ""
 
-#: ../../mod/profiles.php:603
+#: ../../mod/profiles.php:608
 msgid "Private Keywords:"
 msgstr ""
 
-#: ../../mod/profiles.php:604 ../../include/profile_advanced.php:62
+#: ../../mod/profiles.php:609 ../../include/profile_advanced.php:62
 msgid "Likes:"
 msgstr ""
 
-#: ../../mod/profiles.php:605 ../../include/profile_advanced.php:64
+#: ../../mod/profiles.php:610 ../../include/profile_advanced.php:64
 msgid "Dislikes:"
 msgstr ""
 
-#: ../../mod/profiles.php:606
+#: ../../mod/profiles.php:611
 msgid "Example: fishing photography software"
 msgstr ""
 
-#: ../../mod/profiles.php:607
+#: ../../mod/profiles.php:612
 msgid "(Used for suggesting potential friends, can be seen by others)"
 msgstr ""
 
-#: ../../mod/profiles.php:608
+#: ../../mod/profiles.php:613
 msgid "(Used for searching profiles, never shown to others)"
 msgstr ""
 
-#: ../../mod/profiles.php:609
+#: ../../mod/profiles.php:614
 msgid "Tell us about yourself..."
 msgstr ""
 
-#: ../../mod/profiles.php:610
+#: ../../mod/profiles.php:615
 msgid "Hobbies/Interests"
 msgstr ""
 
-#: ../../mod/profiles.php:611
+#: ../../mod/profiles.php:616
 msgid "Contact information and Social Networks"
 msgstr ""
 
-#: ../../mod/profiles.php:612
+#: ../../mod/profiles.php:617
 msgid "Musical interests"
 msgstr ""
 
-#: ../../mod/profiles.php:613
+#: ../../mod/profiles.php:618
 msgid "Books, literature"
 msgstr ""
 
-#: ../../mod/profiles.php:614
+#: ../../mod/profiles.php:619
 msgid "Television"
 msgstr ""
 
-#: ../../mod/profiles.php:615
+#: ../../mod/profiles.php:620
 msgid "Film/dance/culture/entertainment"
 msgstr ""
 
-#: ../../mod/profiles.php:616
+#: ../../mod/profiles.php:621
 msgid "Love/romance"
 msgstr ""
 
-#: ../../mod/profiles.php:617
+#: ../../mod/profiles.php:622
 msgid "Work/employment"
 msgstr ""
 
-#: ../../mod/profiles.php:618
+#: ../../mod/profiles.php:623
 msgid "School/education"
 msgstr ""
 
-#: ../../mod/profiles.php:623
+#: ../../mod/profiles.php:628
 msgid ""
 "This is your <strong>public</strong> profile.<br />It <strong>may</strong> "
 "be visible to anybody using the internet."
 msgstr ""
 
-#: ../../mod/profiles.php:633 ../../mod/directory.php:109
+#: ../../mod/profiles.php:638 ../../mod/directory.php:109
 msgid "Age: "
 msgstr ""
 
-#: ../../mod/profiles.php:672
+#: ../../mod/profiles.php:677
 msgid "Edit/Manage Profiles"
 msgstr ""
 
-#: ../../mod/profiles.php:673 ../../boot.php:1169
+#: ../../mod/profiles.php:678 ../../boot.php:1173
 msgid "Change profile photo"
 msgstr ""
 
-#: ../../mod/profiles.php:674 ../../boot.php:1170
+#: ../../mod/profiles.php:679 ../../boot.php:1174
 msgid "Create New Profile"
 msgstr ""
 
-#: ../../mod/profiles.php:685 ../../boot.php:1180
+#: ../../mod/profiles.php:690 ../../boot.php:1184
 msgid "Profile Image"
 msgstr ""
 
-#: ../../mod/profiles.php:687 ../../boot.php:1183
+#: ../../mod/profiles.php:692 ../../boot.php:1187
 msgid "visible to everybody"
 msgstr ""
 
-#: ../../mod/profiles.php:688 ../../boot.php:1184
+#: ../../mod/profiles.php:693 ../../boot.php:1188
 msgid "Edit visibility"
 msgstr ""
 
-#: ../../mod/filer.php:29 ../../include/conversation.php:1080
-#: ../../include/conversation.php:1097
+#: ../../mod/filer.php:29 ../../include/conversation.php:1091
+#: ../../include/conversation.php:1108
 msgid "Save to Folder:"
 msgstr ""
 
@@ -4365,17 +4365,17 @@ msgid "Gender: "
 msgstr ""
 
 #: ../../mod/directory.php:134 ../../include/profile_advanced.php:17
-#: ../../boot.php:1205
+#: ../../boot.php:1209
 msgid "Gender:"
 msgstr ""
 
 #: ../../mod/directory.php:136 ../../include/profile_advanced.php:37
-#: ../../boot.php:1208
+#: ../../boot.php:1212
 msgid "Status:"
 msgstr ""
 
 #: ../../mod/directory.php:138 ../../include/profile_advanced.php:48
-#: ../../boot.php:1210
+#: ../../boot.php:1214
 msgid "Homepage:"
 msgstr ""
 
@@ -5134,7 +5134,7 @@ msgstr ""
 #: ../../addon/communityhome/communityhome.php:34
 #: ../../addon/communityhome/twillingham/communityhome.php:28
 #: ../../addon/communityhome/twillingham/communityhome.php:34
-#: ../../include/nav.php:64 ../../boot.php:916
+#: ../../include/nav.php:64 ../../boot.php:920
 msgid "Login"
 msgstr ""
 
@@ -7587,7 +7587,7 @@ msgstr ""
 msgid "Contacts not in any group"
 msgstr ""
 
-#: ../../include/nav.php:46 ../../boot.php:915
+#: ../../include/nav.php:46 ../../boot.php:919
 msgid "Logout"
 msgstr ""
 
@@ -7595,7 +7595,7 @@ msgstr ""
 msgid "End this session"
 msgstr ""
 
-#: ../../include/nav.php:49 ../../boot.php:1627
+#: ../../include/nav.php:49 ../../boot.php:1631
 msgid "Status"
 msgstr ""
 
@@ -7675,11 +7675,11 @@ msgstr ""
 msgid "Manage other pages"
 msgstr ""
 
-#: ../../include/nav.php:138 ../../boot.php:1163
+#: ../../include/nav.php:138 ../../boot.php:1167
 msgid "Profiles"
 msgstr ""
 
-#: ../../include/nav.php:138 ../../boot.php:1163
+#: ../../include/nav.php:138 ../../boot.php:1167
 msgid "Manage/edit profiles"
 msgstr ""
 
@@ -7847,7 +7847,7 @@ msgstr ""
 msgid "$1 wrote:"
 msgstr ""
 
-#: ../../include/bbcode.php:327
+#: ../../include/bbcode.php:327 ../../include/bbcode.php:328
 msgid "Encrypted content"
 msgstr ""
 
@@ -8206,34 +8206,34 @@ msgstr ""
 msgid "stopped following"
 msgstr ""
 
-#: ../../include/Contact.php:220 ../../include/conversation.php:977
+#: ../../include/Contact.php:220 ../../include/conversation.php:988
 msgid "Poke"
 msgstr ""
 
-#: ../../include/Contact.php:221 ../../include/conversation.php:971
+#: ../../include/Contact.php:221 ../../include/conversation.php:982
 msgid "View Status"
 msgstr ""
 
-#: ../../include/Contact.php:222 ../../include/conversation.php:972
+#: ../../include/Contact.php:222 ../../include/conversation.php:983
 msgid "View Profile"
 msgstr ""
 
-#: ../../include/Contact.php:223 ../../include/conversation.php:973
+#: ../../include/Contact.php:223 ../../include/conversation.php:984
 msgid "View Photos"
 msgstr ""
 
 #: ../../include/Contact.php:224 ../../include/Contact.php:237
-#: ../../include/conversation.php:974
+#: ../../include/conversation.php:985
 msgid "Network Posts"
 msgstr ""
 
 #: ../../include/Contact.php:225 ../../include/Contact.php:237
-#: ../../include/conversation.php:975
+#: ../../include/conversation.php:986
 msgid "Edit Contact"
 msgstr ""
 
 #: ../../include/Contact.php:226 ../../include/Contact.php:237
-#: ../../include/conversation.php:976
+#: ../../include/conversation.php:987
 msgid "Send PM"
 msgstr ""
 
@@ -8251,106 +8251,106 @@ msgstr ""
 msgid "%1$s marked %2$s's %3$s as favorite"
 msgstr ""
 
-#: ../../include/conversation.php:877
+#: ../../include/conversation.php:888
 msgid "Delete Selected Items"
 msgstr ""
 
-#: ../../include/conversation.php:1035
+#: ../../include/conversation.php:1046
 #, php-format
 msgid "%s likes this."
 msgstr ""
 
-#: ../../include/conversation.php:1035
+#: ../../include/conversation.php:1046
 #, php-format
 msgid "%s doesn't like this."
 msgstr ""
 
-#: ../../include/conversation.php:1039
+#: ../../include/conversation.php:1050
 #, php-format
 msgid "<span  %1$s>%2$d people</span> like this."
 msgstr ""
 
-#: ../../include/conversation.php:1041
+#: ../../include/conversation.php:1052
 #, php-format
 msgid "<span  %1$s>%2$d people</span> don't like this."
 msgstr ""
 
-#: ../../include/conversation.php:1047
+#: ../../include/conversation.php:1058
 msgid "and"
 msgstr ""
 
-#: ../../include/conversation.php:1050
+#: ../../include/conversation.php:1061
 #, php-format
 msgid ", and %d other people"
 msgstr ""
 
-#: ../../include/conversation.php:1051
+#: ../../include/conversation.php:1062
 #, php-format
 msgid "%s like this."
 msgstr ""
 
-#: ../../include/conversation.php:1051
+#: ../../include/conversation.php:1062
 #, php-format
 msgid "%s don't like this."
 msgstr ""
 
-#: ../../include/conversation.php:1075 ../../include/conversation.php:1092
+#: ../../include/conversation.php:1086 ../../include/conversation.php:1103
 msgid "Visible to <strong>everybody</strong>"
 msgstr ""
 
-#: ../../include/conversation.php:1077 ../../include/conversation.php:1094
+#: ../../include/conversation.php:1088 ../../include/conversation.php:1105
 msgid "Please enter a video link/URL:"
 msgstr ""
 
-#: ../../include/conversation.php:1078 ../../include/conversation.php:1095
+#: ../../include/conversation.php:1089 ../../include/conversation.php:1106
 msgid "Please enter an audio link/URL:"
 msgstr ""
 
-#: ../../include/conversation.php:1079 ../../include/conversation.php:1096
+#: ../../include/conversation.php:1090 ../../include/conversation.php:1107
 msgid "Tag term:"
 msgstr ""
 
-#: ../../include/conversation.php:1081 ../../include/conversation.php:1098
+#: ../../include/conversation.php:1092 ../../include/conversation.php:1109
 msgid "Where are you right now?"
 msgstr ""
 
-#: ../../include/conversation.php:1141
+#: ../../include/conversation.php:1152
 msgid "upload photo"
 msgstr ""
 
-#: ../../include/conversation.php:1143
+#: ../../include/conversation.php:1154
 msgid "attach file"
 msgstr ""
 
-#: ../../include/conversation.php:1145
+#: ../../include/conversation.php:1156
 msgid "web link"
 msgstr ""
 
-#: ../../include/conversation.php:1146
+#: ../../include/conversation.php:1157
 msgid "Insert video link"
 msgstr ""
 
-#: ../../include/conversation.php:1147
+#: ../../include/conversation.php:1158
 msgid "video link"
 msgstr ""
 
-#: ../../include/conversation.php:1148
+#: ../../include/conversation.php:1159
 msgid "Insert audio link"
 msgstr ""
 
-#: ../../include/conversation.php:1149
+#: ../../include/conversation.php:1160
 msgid "audio link"
 msgstr ""
 
-#: ../../include/conversation.php:1151
+#: ../../include/conversation.php:1162
 msgid "set location"
 msgstr ""
 
-#: ../../include/conversation.php:1153
+#: ../../include/conversation.php:1164
 msgid "clear location"
 msgstr ""
 
-#: ../../include/conversation.php:1160
+#: ../../include/conversation.php:1171
 msgid "permissions"
 msgstr ""
 
@@ -8388,74 +8388,74 @@ msgstr ""
 msgid "Create a New Account"
 msgstr ""
 
-#: ../../boot.php:918
+#: ../../boot.php:922
 msgid "Nickname or Email address: "
 msgstr ""
 
-#: ../../boot.php:919
+#: ../../boot.php:923
 msgid "Password: "
 msgstr ""
 
-#: ../../boot.php:922
+#: ../../boot.php:926
 msgid "Or login using OpenID: "
 msgstr ""
 
-#: ../../boot.php:928
+#: ../../boot.php:932
 msgid "Forgot your password?"
 msgstr ""
 
-#: ../../boot.php:1095
+#: ../../boot.php:1099
 msgid "Edit profile"
 msgstr ""
 
-#: ../../boot.php:1155
+#: ../../boot.php:1159
 msgid "Message"
 msgstr ""
 
-#: ../../boot.php:1277 ../../boot.php:1363
+#: ../../boot.php:1281 ../../boot.php:1367
 msgid "g A l F d"
 msgstr ""
 
-#: ../../boot.php:1278 ../../boot.php:1364
+#: ../../boot.php:1282 ../../boot.php:1368
 msgid "F d"
 msgstr ""
 
-#: ../../boot.php:1323 ../../boot.php:1404
+#: ../../boot.php:1327 ../../boot.php:1408
 msgid "[today]"
 msgstr ""
 
-#: ../../boot.php:1335
+#: ../../boot.php:1339
 msgid "Birthday Reminders"
 msgstr ""
 
-#: ../../boot.php:1336
+#: ../../boot.php:1340
 msgid "Birthdays this week:"
 msgstr ""
 
-#: ../../boot.php:1397
+#: ../../boot.php:1401
 msgid "[No description]"
 msgstr ""
 
-#: ../../boot.php:1415
+#: ../../boot.php:1419
 msgid "Event Reminders"
 msgstr ""
 
-#: ../../boot.php:1416
+#: ../../boot.php:1420
 msgid "Events this week:"
 msgstr ""
 
-#: ../../boot.php:1630
+#: ../../boot.php:1634
 msgid "Status Messages and Posts"
 msgstr ""
 
-#: ../../boot.php:1637
+#: ../../boot.php:1641
 msgid "Profile Details"
 msgstr ""
 
-#: ../../boot.php:1654
+#: ../../boot.php:1658
 msgid "Events and Calendar"
 msgstr ""
 
-#: ../../boot.php:1661
+#: ../../boot.php:1665
 msgid "Only You Can See This"
 msgstr ""
diff --git a/view/comment_item.tpl b/view/comment_item.tpl
index b2be6f94e3..98173aa306 100644
--- a/view/comment_item.tpl
+++ b/view/comment_item.tpl
@@ -1,6 +1,10 @@
 		<div class="comment-wwedit-wrapper" id="comment-edit-wrapper-$id" style="display: block;">
+			{{ if $threaded }}
 			<span id="hide-commentbox-$id" class="hide-commentbox fakelink" onclick="showHideCommentBox($id);">$comment</span>
 			<form class="comment-edit-form" style="display: none;" id="comment-edit-form-$id" action="item" method="post" onsubmit="post_comment($id); return false;">
+			{{ else }}
+			<form class="comment-edit-form" style="display: block;" id="comment-edit-form-$id" action="item" method="post" onsubmit="post_comment($id); return false;">
+			{{ endif }}
 				<input type="hidden" name="type" value="$type" />
 				<input type="hidden" name="profile_uid" value="$profile_uid" />
 				<input type="hidden" name="parent" value="$parent" />
diff --git a/view/de/messages.po b/view/de/messages.po
index 24cb55d4f1..55afe8df7c 100644
--- a/view/de/messages.po
+++ b/view/de/messages.po
@@ -21,9 +21,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: http://bugs.friendica.com/\n"
-"POT-Creation-Date: 2012-08-13 10:00-0700\n"
-"PO-Revision-Date: 2012-08-14 10:36+0000\n"
-"Last-Translator: bavatar <tobias.diekershoff@gmx.net>\n"
+"POT-Creation-Date: 2012-08-19 10:00-0700\n"
+"PO-Revision-Date: 2012-08-20 22:08+0000\n"
+"Last-Translator: Oliver <post@toktan.org>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/friendica/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -66,11 +66,12 @@ msgstr "Konnte den Kontakt nicht aktualisieren."
 #: ../../mod/message.php:168 ../../mod/allfriends.php:9
 #: ../../mod/nogroup.php:25 ../../mod/wall_upload.php:53
 #: ../../mod/follow.php:9 ../../mod/display.php:131 ../../mod/profiles.php:7
-#: ../../mod/profiles.php:408 ../../mod/delegate.php:6
+#: ../../mod/profiles.php:413 ../../mod/delegate.php:6
 #: ../../mod/suggest.php:28 ../../mod/invite.php:13 ../../mod/invite.php:81
 #: ../../mod/dfrn_confirm.php:53 ../../addon/facebook/facebook.php:510
-#: ../../addon/facebook/facebook.php:516 ../../addon/dav/layout.fnk.php:354
-#: ../../include/items.php:3816 ../../index.php:315
+#: ../../addon/facebook/facebook.php:516
+#: ../../addon/dav/friendica/layout.fnk.php:354 ../../include/items.php:3819
+#: ../../index.php:315
 msgid "Permission denied."
 msgstr "Zugriff verweigert."
 
@@ -100,7 +101,7 @@ msgid "Return to contact editor"
 msgstr "Zurück zum Kontakteditor"
 
 #: ../../mod/crepair.php:148 ../../mod/settings.php:539
-#: ../../mod/settings.php:565 ../../mod/admin.php:667 ../../mod/admin.php:676
+#: ../../mod/settings.php:565 ../../mod/admin.php:679 ../../mod/admin.php:688
 msgid "Name"
 msgstr "Name"
 
@@ -145,9 +146,9 @@ msgstr "Neues Foto von dieser URL"
 #: ../../mod/contacts.php:341 ../../mod/settings.php:537
 #: ../../mod/settings.php:691 ../../mod/settings.php:752
 #: ../../mod/settings.php:958 ../../mod/group.php:85 ../../mod/message.php:294
-#: ../../mod/message.php:478 ../../mod/admin.php:424 ../../mod/admin.php:664
-#: ../../mod/admin.php:800 ../../mod/admin.php:999 ../../mod/admin.php:1086
-#: ../../mod/profiles.php:578 ../../mod/invite.php:119
+#: ../../mod/message.php:478 ../../mod/admin.php:435 ../../mod/admin.php:676
+#: ../../mod/admin.php:812 ../../mod/admin.php:1011 ../../mod/admin.php:1098
+#: ../../mod/profiles.php:583 ../../mod/invite.php:119
 #: ../../addon/fromgplus/fromgplus.php:40
 #: ../../addon/facebook/facebook.php:619
 #: ../../addon/snautofollow/snautofollow.php:64 ../../addon/bg/bg.php:90
@@ -194,7 +195,7 @@ msgstr "Senden"
 msgid "Help:"
 msgstr "Hilfe:"
 
-#: ../../mod/help.php:34 ../../addon/dav/layout.fnk.php:225
+#: ../../mod/help.php:34 ../../addon/dav/friendica/layout.fnk.php:225
 #: ../../include/nav.php:86
 msgid "Help"
 msgstr "Hilfe"
@@ -246,7 +247,7 @@ msgid "link to source"
 msgstr "Link zum Originalbeitrag"
 
 #: ../../mod/events.php:331 ../../view/theme/diabook/theme.php:131
-#: ../../include/nav.php:52 ../../boot.php:1647
+#: ../../include/nav.php:52 ../../boot.php:1655
 msgid "Events"
 msgstr "Veranstaltungen"
 
@@ -254,12 +255,12 @@ msgstr "Veranstaltungen"
 msgid "Create New Event"
 msgstr "Neue Veranstaltung erstellen"
 
-#: ../../mod/events.php:333 ../../addon/dav/layout.fnk.php:263
+#: ../../mod/events.php:333 ../../addon/dav/friendica/layout.fnk.php:263
 msgid "Previous"
 msgstr "Vorherige"
 
 #: ../../mod/events.php:334 ../../mod/install.php:205
-#: ../../addon/dav/layout.fnk.php:266
+#: ../../addon/dav/friendica/layout.fnk.php:266
 msgid "Next"
 msgstr "Nächste"
 
@@ -302,7 +303,7 @@ msgstr "Beschreibung"
 
 #: ../../mod/events.php:432 ../../mod/directory.php:132
 #: ../../include/event.php:40 ../../include/bb2diaspora.php:455
-#: ../../boot.php:1199
+#: ../../boot.php:1207
 msgid "Location:"
 msgstr "Ort:"
 
@@ -368,7 +369,7 @@ msgstr "Möchtest du dieser Anwendung den Zugriff auf deine Beiträge und Kontak
 #: ../../mod/settings.php:945 ../../mod/settings.php:946
 #: ../../mod/settings.php:947 ../../mod/settings.php:948
 #: ../../mod/settings.php:949 ../../mod/register.php:234
-#: ../../mod/profiles.php:558
+#: ../../mod/profiles.php:563
 msgid "Yes"
 msgstr "Ja"
 
@@ -380,11 +381,11 @@ msgstr "Ja"
 #: ../../mod/settings.php:945 ../../mod/settings.php:946
 #: ../../mod/settings.php:947 ../../mod/settings.php:948
 #: ../../mod/settings.php:949 ../../mod/register.php:235
-#: ../../mod/profiles.php:559
+#: ../../mod/profiles.php:564
 msgid "No"
 msgstr "Nein"
 
-#: ../../mod/photos.php:46 ../../boot.php:1640
+#: ../../mod/photos.php:46 ../../boot.php:1648
 msgid "Photo Albums"
 msgstr "Fotoalben"
 
@@ -621,7 +622,7 @@ msgstr "Vorschau"
 
 #: ../../mod/photos.php:1426 ../../mod/content.php:439
 #: ../../mod/content.php:721 ../../mod/settings.php:600
-#: ../../mod/settings.php:689 ../../mod/group.php:168 ../../mod/admin.php:671
+#: ../../mod/settings.php:689 ../../mod/group.php:168 ../../mod/admin.php:683
 #: ../../include/conversation.php:395 ../../include/conversation.php:792
 msgid "Delete"
 msgstr "Löschen"
@@ -874,7 +875,7 @@ msgstr "Bitte bestätige deine Kontaktanfrage bei %s."
 msgid "Confirm"
 msgstr "Bestätigen"
 
-#: ../../mod/dfrn_request.php:715 ../../include/items.php:3207
+#: ../../mod/dfrn_request.php:715 ../../include/items.php:3210
 msgid "[Name Withheld]"
 msgstr "[Name unterdrückt]"
 
@@ -1267,7 +1268,7 @@ msgid "is interested in:"
 msgstr "ist interessiert an:"
 
 #: ../../mod/match.php:58 ../../mod/suggest.php:59
-#: ../../include/contact_widgets.php:9 ../../boot.php:1143
+#: ../../include/contact_widgets.php:9 ../../boot.php:1151
 msgid "Connect"
 msgstr "Verbinden"
 
@@ -1496,7 +1497,7 @@ msgid "if applicable"
 msgstr "falls anwendbar"
 
 #: ../../mod/notifications.php:157 ../../mod/notifications.php:204
-#: ../../mod/admin.php:669
+#: ../../mod/admin.php:681
 msgid "Approve"
 msgstr "Genehmigen"
 
@@ -1697,12 +1698,12 @@ msgid "View all contacts"
 msgstr "Alle Kontakte anzeigen"
 
 #: ../../mod/contacts.php:308 ../../mod/contacts.php:367
-#: ../../mod/admin.php:673
+#: ../../mod/admin.php:685
 msgid "Unblock"
 msgstr "Entsperren"
 
 #: ../../mod/contacts.php:308 ../../mod/contacts.php:367
-#: ../../mod/admin.php:672
+#: ../../mod/admin.php:684
 msgid "Block"
 msgstr "Sperren"
 
@@ -1799,7 +1800,7 @@ msgstr "letzte Aktualisierung:"
 msgid "Update public posts"
 msgstr "Öffentliche Beiträge aktualisieren"
 
-#: ../../mod/contacts.php:364 ../../mod/admin.php:1144
+#: ../../mod/contacts.php:364 ../../mod/admin.php:1156
 msgid "Update now"
 msgstr "Jetzt aktualisieren"
 
@@ -1929,8 +1930,8 @@ msgstr "Anfrage zum Zurücksetzen des Passworts auf %s erhalten"
 #: ../../addon/facebook/facebook.php:702
 #: ../../addon/facebook/facebook.php:1200
 #: ../../addon/public_server/public_server.php:62
-#: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:3216
-#: ../../boot.php:792
+#: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:3219
+#: ../../boot.php:796
 msgid "Administrator"
 msgstr "Administrator"
 
@@ -1940,7 +1941,7 @@ msgid ""
 "Password reset failed."
 msgstr "Anfrage konnte nicht verifiziert werden. (Eventuell hast du bereits eine ähnliche Anfrage gestellt.) Zurücksetzen des Passworts gescheitert."
 
-#: ../../mod/lostpass.php:83 ../../boot.php:925
+#: ../../mod/lostpass.php:83 ../../boot.php:933
 msgid "Password Reset"
 msgstr "Passwort zurücksetzen"
 
@@ -2012,9 +2013,9 @@ msgstr "Persönliche Daten exportieren"
 msgid "Remove account"
 msgstr "Konto löschen"
 
-#: ../../mod/settings.php:69 ../../mod/admin.php:759 ../../mod/admin.php:964
-#: ../../addon/dav/layout.fnk.php:225 ../../addon/mathjax/mathjax.php:36
-#: ../../view/theme/diabook/theme.php:643
+#: ../../mod/settings.php:69 ../../mod/admin.php:771 ../../mod/admin.php:976
+#: ../../addon/dav/friendica/layout.fnk.php:225
+#: ../../addon/mathjax/mathjax.php:36 ../../view/theme/diabook/theme.php:643
 #: ../../view/theme/diabook/theme.php:773 ../../include/nav.php:137
 msgid "Settings"
 msgstr "Einstellungen"
@@ -2609,15 +2610,15 @@ msgstr "Private Nachrichten an diese Person könnten an die Öffentlichkeit gela
 msgid "Invalid contact."
 msgstr "Ungültiger Kontakt."
 
-#: ../../mod/notes.php:44 ../../boot.php:1654
+#: ../../mod/notes.php:44 ../../boot.php:1662
 msgid "Personal Notes"
 msgstr "Persönliche Notizen"
 
 #: ../../mod/notes.php:63 ../../mod/filer.php:30
 #: ../../addon/facebook/facebook.php:770
 #: ../../addon/privacy_image_cache/privacy_image_cache.php:263
-#: ../../addon/dav/layout.fnk.php:441 ../../addon/dav/layout.fnk.php:488
-#: ../../include/text.php:681
+#: ../../addon/dav/friendica/layout.fnk.php:441
+#: ../../addon/dav/friendica/layout.fnk.php:488 ../../include/text.php:681
 msgid "Save"
 msgstr "Speichern"
 
@@ -2701,9 +2702,9 @@ msgstr "Wir möchten dir einige Tipps und Links anbieten, die dir helfen könnte
 #: ../../mod/newmember.php:16
 msgid ""
 "On your <em>Quick Start</em> page - find a brief introduction to your "
-"profile and network tabs, connect to Facebook, make some new connections, "
-"and find some groups to join."
-msgstr "Auf der <em>Quick Start</em> Seite findest du eine kurze Einleitung in die einzelnen Funktionen deines Profils und die Netzwerk-Reiter, wo du interessante Foren findest, wie du alte Freunde von Facebook wieder findest und neue Kontakte knüpfst."
+"profile and network tabs, make some new connections, and find some groups to"
+" join."
+msgstr "Auf der <em>Quick Start</em> Seite findest du eine kurze Einleitung in die einzelnen Funktionen deines Profils und die Netzwerk-Reiter, wo du interessante Foren findest und neue Kontakte knüpfst."
 
 #: ../../mod/newmember.php:18
 msgid ""
@@ -2862,7 +2863,7 @@ msgstr "Editor für die Profil-Sichtbarkeit"
 
 #: ../../mod/profperm.php:103 ../../view/theme/diabook/theme.php:128
 #: ../../include/profile_advanced.php:7 ../../include/profile_advanced.php:84
-#: ../../include/nav.php:50 ../../boot.php:1630
+#: ../../include/nav.php:50 ../../boot.php:1638
 msgid "Profile"
 msgstr "Profil"
 
@@ -2943,7 +2944,7 @@ msgstr "Mitgliedschaft auf dieser Seite ist nur nach vorheriger Einladung mögli
 msgid "Your invitation ID: "
 msgstr "ID deiner Einladung: "
 
-#: ../../mod/register.php:255 ../../mod/admin.php:425
+#: ../../mod/register.php:255 ../../mod/admin.php:436
 msgid "Registration"
 msgstr "Registrierung"
 
@@ -2966,7 +2967,7 @@ msgstr "Wähle einen Spitznamen für dein Profil. Dieser muss mit einem Buchstab
 msgid "Choose a nickname: "
 msgstr "Spitznamen wählen: "
 
-#: ../../mod/register.php:269 ../../include/nav.php:81 ../../boot.php:891
+#: ../../mod/register.php:269 ../../include/nav.php:81 ../../boot.php:895
 msgid "Register"
 msgstr "Registrieren"
 
@@ -2999,8 +3000,8 @@ msgid "%1$s doesn't like %2$s's %3$s"
 msgstr "%1$s mag %2$ss %3$s nicht"
 
 #: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:159
-#: ../../mod/admin.php:708 ../../mod/admin.php:907 ../../mod/display.php:29
-#: ../../mod/display.php:135 ../../include/items.php:3694
+#: ../../mod/admin.php:720 ../../mod/admin.php:919 ../../mod/display.php:29
+#: ../../mod/display.php:135 ../../include/items.php:3697
 msgid "Item not found."
 msgstr "Beitrag nicht gefunden."
 
@@ -3009,7 +3010,7 @@ msgid "Access denied."
 msgstr "Zugriff verweigert."
 
 #: ../../mod/fbrowser.php:25 ../../view/theme/diabook/theme.php:130
-#: ../../include/nav.php:51 ../../boot.php:1637
+#: ../../include/nav.php:51 ../../boot.php:1645
 msgid "Photos"
 msgstr "Bilder"
 
@@ -3044,29 +3045,29 @@ msgstr "Leerer Beitrag wurde verworfen."
 msgid "Wall Photos"
 msgstr "Pinnwand-Bilder"
 
-#: ../../mod/item.php:808
+#: ../../mod/item.php:809
 msgid "System error. Post not saved."
 msgstr "Systemfehler. Beitrag konnte nicht gespeichert werden."
 
-#: ../../mod/item.php:833
+#: ../../mod/item.php:834
 #, php-format
 msgid ""
 "This message was sent to you by %s, a member of the Friendica social "
 "network."
 msgstr "Diese Nachricht wurde dir von %s geschickt, einem Mitglied des Sozialen Netzwerks Friendica."
 
-#: ../../mod/item.php:835
+#: ../../mod/item.php:836
 #, php-format
 msgid "You may visit them online at %s"
 msgstr "Du kannst sie online unter %s besuchen"
 
-#: ../../mod/item.php:836
+#: ../../mod/item.php:837
 msgid ""
 "Please contact the sender by replying to this post if you do not wish to "
 "receive these messages."
 msgstr "Falls du diese Beiträge nicht erhalten möchtest, kontaktiere bitte den Autor, indem du auf diese Nachricht antwortest."
 
-#: ../../mod/item.php:838
+#: ../../mod/item.php:839
 #, php-format
 msgid "%s posted an update."
 msgstr "%s hat ein Update veröffentlicht."
@@ -3104,7 +3105,8 @@ msgstr "Datei hochladen:"
 msgid "Upload Profile Photo"
 msgstr "Profilbild hochladen"
 
-#: ../../mod/profile_photo.php:212 ../../addon/dav/layout.fnk.php:152
+#: ../../mod/profile_photo.php:212
+#: ../../addon/dav/friendica/layout.fnk.php:152
 msgid "Upload"
 msgstr "Hochladen"
 
@@ -3231,19 +3233,19 @@ msgstr "Keine Freunde zum Anzeigen."
 msgid "Theme settings updated."
 msgstr "Themeneinstellungen aktualisiert."
 
-#: ../../mod/admin.php:96 ../../mod/admin.php:423
+#: ../../mod/admin.php:96 ../../mod/admin.php:434
 msgid "Site"
 msgstr "Seite"
 
-#: ../../mod/admin.php:97 ../../mod/admin.php:663 ../../mod/admin.php:675
+#: ../../mod/admin.php:97 ../../mod/admin.php:675 ../../mod/admin.php:687
 msgid "Users"
 msgstr "Nutzer"
 
-#: ../../mod/admin.php:98 ../../mod/admin.php:757 ../../mod/admin.php:799
+#: ../../mod/admin.php:98 ../../mod/admin.php:769 ../../mod/admin.php:811
 msgid "Plugins"
 msgstr "Plugins"
 
-#: ../../mod/admin.php:99 ../../mod/admin.php:962 ../../mod/admin.php:998
+#: ../../mod/admin.php:99 ../../mod/admin.php:974 ../../mod/admin.php:1010
 msgid "Themes"
 msgstr "Themen"
 
@@ -3251,7 +3253,7 @@ msgstr "Themen"
 msgid "DB updates"
 msgstr "DB Updates"
 
-#: ../../mod/admin.php:115 ../../mod/admin.php:122 ../../mod/admin.php:1085
+#: ../../mod/admin.php:115 ../../mod/admin.php:122 ../../mod/admin.php:1097
 msgid "Logs"
 msgstr "Protokolle"
 
@@ -3267,25 +3269,25 @@ msgstr "Plugin Features"
 msgid "User registrations waiting for confirmation"
 msgstr "Nutzeranmeldungen die auf Bestätigung warten"
 
-#: ../../mod/admin.php:183 ../../mod/admin.php:645
+#: ../../mod/admin.php:183 ../../mod/admin.php:657
 msgid "Normal Account"
 msgstr "Normales Konto"
 
-#: ../../mod/admin.php:184 ../../mod/admin.php:646
+#: ../../mod/admin.php:184 ../../mod/admin.php:658
 msgid "Soapbox Account"
 msgstr "Marktschreier-Konto"
 
-#: ../../mod/admin.php:185 ../../mod/admin.php:647
+#: ../../mod/admin.php:185 ../../mod/admin.php:659
 msgid "Community/Celebrity Account"
 msgstr "Forum/Promi-Konto"
 
-#: ../../mod/admin.php:186 ../../mod/admin.php:648
+#: ../../mod/admin.php:186 ../../mod/admin.php:660
 msgid "Automatic Friend Account"
 msgstr "Automatisches Freundekonto"
 
 #: ../../mod/admin.php:187
 msgid "Blog Account"
-msgstr ""
+msgstr "Blog Account"
 
 #: ../../mod/admin.php:188
 msgid "Private Forum"
@@ -3295,9 +3297,9 @@ msgstr "Privates Forum"
 msgid "Message queues"
 msgstr "Nachrichten-Warteschlangen"
 
-#: ../../mod/admin.php:212 ../../mod/admin.php:422 ../../mod/admin.php:662
-#: ../../mod/admin.php:756 ../../mod/admin.php:798 ../../mod/admin.php:961
-#: ../../mod/admin.php:997 ../../mod/admin.php:1084
+#: ../../mod/admin.php:212 ../../mod/admin.php:433 ../../mod/admin.php:674
+#: ../../mod/admin.php:768 ../../mod/admin.php:810 ../../mod/admin.php:973
+#: ../../mod/admin.php:1009 ../../mod/admin.php:1096
 msgid "Administration"
 msgstr "Administration"
 
@@ -3321,515 +3323,527 @@ msgstr "Version"
 msgid "Active plugins"
 msgstr "Aktive Plugins"
 
-#: ../../mod/admin.php:361
+#: ../../mod/admin.php:367
 msgid "Site settings updated."
 msgstr "Seiteneinstellungen aktualisiert."
 
-#: ../../mod/admin.php:409
+#: ../../mod/admin.php:396
+msgid "Don't apply a special theme for mobile devices."
+msgstr "Kein spezielles Theme für mobile Geräte verwenden."
+
+#: ../../mod/admin.php:420
 msgid "Closed"
 msgstr "Geschlossen"
 
-#: ../../mod/admin.php:410
+#: ../../mod/admin.php:421
 msgid "Requires approval"
 msgstr "Bedarf der Zustimmung"
 
-#: ../../mod/admin.php:411
+#: ../../mod/admin.php:422
 msgid "Open"
 msgstr "Offen"
 
-#: ../../mod/admin.php:415
+#: ../../mod/admin.php:426
 msgid "No SSL policy, links will track page SSL state"
 msgstr "Keine SSL Richtlinie, Links werden das verwendete Protokoll beibehalten"
 
-#: ../../mod/admin.php:416
+#: ../../mod/admin.php:427
 msgid "Force all links to use SSL"
 msgstr "SSL für alle Links erzwingen"
 
-#: ../../mod/admin.php:417
+#: ../../mod/admin.php:428
 msgid "Self-signed certificate, use SSL for local links only (discouraged)"
 msgstr "Selbst-unterzeichnetes Zertifikat, SSL nur für lokale Links verwenden (nicht empfohlen)"
 
-#: ../../mod/admin.php:426
+#: ../../mod/admin.php:437
 msgid "File upload"
 msgstr "Datei hochladen"
 
-#: ../../mod/admin.php:427
+#: ../../mod/admin.php:438
 msgid "Policies"
 msgstr "Regeln"
 
-#: ../../mod/admin.php:428
+#: ../../mod/admin.php:439
 msgid "Advanced"
 msgstr "Erweitert"
 
-#: ../../mod/admin.php:432 ../../addon/statusnet/statusnet.php:567
+#: ../../mod/admin.php:443 ../../addon/statusnet/statusnet.php:567
 msgid "Site name"
 msgstr "Seitenname"
 
-#: ../../mod/admin.php:433
+#: ../../mod/admin.php:444
 msgid "Banner/Logo"
 msgstr "Banner/Logo"
 
-#: ../../mod/admin.php:434
+#: ../../mod/admin.php:445
 msgid "System language"
 msgstr "Systemsprache"
 
-#: ../../mod/admin.php:435
+#: ../../mod/admin.php:446
 msgid "System theme"
 msgstr "Systemweites Thema"
 
-#: ../../mod/admin.php:435
+#: ../../mod/admin.php:446
 msgid ""
 "Default system theme - may be over-ridden by user profiles - <a href='#' "
 "id='cnftheme'>change theme settings</a>"
 msgstr "Vorgabe für das System-Theme - kann von Benutzerprofilen überschrieben werden - <a href='#' id='cnftheme'>Theme-Einstellungen ändern</a>"
 
-#: ../../mod/admin.php:436
+#: ../../mod/admin.php:447
+msgid "Mobile system theme"
+msgstr "Systemweites mobiles Thema"
+
+#: ../../mod/admin.php:447
+msgid "Theme for mobile devices"
+msgstr "Thema für mobile Geräte"
+
+#: ../../mod/admin.php:448
 msgid "SSL link policy"
 msgstr "Regeln für SSL Links"
 
-#: ../../mod/admin.php:436
+#: ../../mod/admin.php:448
 msgid "Determines whether generated links should be forced to use SSL"
 msgstr "Bestimmt, ob generierte Links SSL verwenden müssen"
 
-#: ../../mod/admin.php:437
+#: ../../mod/admin.php:449
 msgid "Maximum image size"
 msgstr "Maximale Größe von Bildern"
 
-#: ../../mod/admin.php:437
+#: ../../mod/admin.php:449
 msgid ""
 "Maximum size in bytes of uploaded images. Default is 0, which means no "
 "limits."
 msgstr "Maximale Upload-Größe von Bildern in Bytes. Standard ist 0, d.h. ohne Limit."
 
-#: ../../mod/admin.php:439
+#: ../../mod/admin.php:451
 msgid "Register policy"
 msgstr "Registrierungsmethode"
 
-#: ../../mod/admin.php:440
+#: ../../mod/admin.php:452
 msgid "Register text"
 msgstr "Registrierungstext"
 
-#: ../../mod/admin.php:440
+#: ../../mod/admin.php:452
 msgid "Will be displayed prominently on the registration page."
 msgstr "Wird gut sichtbar auf der Registrierungsseite angezeigt."
 
-#: ../../mod/admin.php:441
+#: ../../mod/admin.php:453
 msgid "Accounts abandoned after x days"
 msgstr "Nutzerkonten gelten nach x Tagen als unbenutzt"
 
-#: ../../mod/admin.php:441
+#: ../../mod/admin.php:453
 msgid ""
 "Will not waste system resources polling external sites for abandonded "
 "accounts. Enter 0 for no time limit."
 msgstr "Verschwende keine System-Ressourcen auf das Pollen externer Seiten, wenn Konten nicht mehr benutzt werden. 0 eingeben für kein Limit."
 
-#: ../../mod/admin.php:442
+#: ../../mod/admin.php:454
 msgid "Allowed friend domains"
 msgstr "Erlaubte Domains für Kontakte"
 
-#: ../../mod/admin.php:442
+#: ../../mod/admin.php:454
 msgid ""
 "Comma separated list of domains which are allowed to establish friendships "
 "with this site. Wildcards are accepted. Empty to allow any domains"
 msgstr "Liste der Domains, die für Freundschaften erlaubt sind, durch Kommas getrennt. Platzhalter werden akzeptiert. Leer lassen, um alle Domains zu erlauben."
 
-#: ../../mod/admin.php:443
+#: ../../mod/admin.php:455
 msgid "Allowed email domains"
 msgstr "Erlaubte Domains für E-Mails"
 
-#: ../../mod/admin.php:443
+#: ../../mod/admin.php:455
 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 "Liste der Domains, die für E-Mail-Adressen bei der Registrierung erlaubt sind, durch Kommas getrennt. Platzhalter werden akzeptiert. Leer lassen, um alle Domains zu erlauben."
 
-#: ../../mod/admin.php:444
+#: ../../mod/admin.php:456
 msgid "Block public"
 msgstr "Öffentlichen Zugriff blockieren"
 
-#: ../../mod/admin.php:444
+#: ../../mod/admin.php:456
 msgid ""
 "Check to block public access to all otherwise public personal pages on this "
 "site unless you are currently logged in."
 msgstr "Klicken, um öffentlichen Zugriff auf sonst öffentliche Profile zu blockieren, wenn man nicht eingeloggt ist."
 
-#: ../../mod/admin.php:445
+#: ../../mod/admin.php:457
 msgid "Force publish"
 msgstr "Erzwinge Veröffentlichung"
 
-#: ../../mod/admin.php:445
+#: ../../mod/admin.php:457
 msgid ""
 "Check to force all profiles on this site to be listed in the site directory."
 msgstr "Klicken, um Anzeige aller Profile dieses Servers im Verzeichnis zu erzwingen."
 
-#: ../../mod/admin.php:446
+#: ../../mod/admin.php:458
 msgid "Global directory update URL"
 msgstr "URL für Updates beim weltweiten Verzeichnis"
 
-#: ../../mod/admin.php:446
+#: ../../mod/admin.php:458
 msgid ""
 "URL to update the global directory. If this is not set, the global directory"
 " is completely unavailable to the application."
 msgstr "URL für Update des globalen Verzeichnisses. Wenn nichts eingetragen ist, bleibt das globale Verzeichnis unerreichbar."
 
-#: ../../mod/admin.php:447
+#: ../../mod/admin.php:459
 msgid "Allow threaded items"
-msgstr ""
+msgstr "Erlaube Threads in Diskussionen"
 
-#: ../../mod/admin.php:447
+#: ../../mod/admin.php:459
 msgid "Allow infinite level threading for items on this site."
-msgstr ""
+msgstr "Erlaube ein unendliches Level für Threads auf dieser Seite."
 
-#: ../../mod/admin.php:449
+#: ../../mod/admin.php:461
 msgid "Block multiple registrations"
 msgstr "Unterbinde Mehrfachregistrierung"
 
-#: ../../mod/admin.php:449
+#: ../../mod/admin.php:461
 msgid "Disallow users to register additional accounts for use as pages."
 msgstr "Benutzern nicht erlauben, weitere Konten als zusätzliche Profile anzulegen."
 
-#: ../../mod/admin.php:450
+#: ../../mod/admin.php:462
 msgid "OpenID support"
 msgstr "OpenID Unterstützung"
 
-#: ../../mod/admin.php:450
+#: ../../mod/admin.php:462
 msgid "OpenID support for registration and logins."
 msgstr "OpenID-Unterstützung für Registrierung und Login."
 
-#: ../../mod/admin.php:451
+#: ../../mod/admin.php:463
 msgid "Fullname check"
 msgstr "Namen auf Vollständigkeit überprüfen"
 
-#: ../../mod/admin.php:451
+#: ../../mod/admin.php:463
 msgid ""
 "Force users to register with a space between firstname and lastname in Full "
 "name, as an antispam measure"
 msgstr "Leerzeichen zwischen Vor- und Nachname im vollständigen Namen erzwingen, um SPAM zu vermeiden."
 
-#: ../../mod/admin.php:452
+#: ../../mod/admin.php:464
 msgid "UTF-8 Regular expressions"
 msgstr "UTF-8 Reguläre Ausdrücke"
 
-#: ../../mod/admin.php:452
+#: ../../mod/admin.php:464
 msgid "Use PHP UTF8 regular expressions"
 msgstr "PHP UTF8 Ausdrücke verwenden"
 
-#: ../../mod/admin.php:453
+#: ../../mod/admin.php:465
 msgid "Show Community Page"
 msgstr "Gemeinschaftsseite anzeigen"
 
-#: ../../mod/admin.php:453
+#: ../../mod/admin.php:465
 msgid ""
 "Display a Community page showing all recent public postings on this site."
 msgstr "Zeige die Gemeinschaftsseite mit allen öffentlichen Beiträgen auf diesem Server."
 
-#: ../../mod/admin.php:454
+#: ../../mod/admin.php:466
 msgid "Enable OStatus support"
 msgstr "OStatus Unterstützung aktivieren"
 
-#: ../../mod/admin.php:454
+#: ../../mod/admin.php:466
 msgid ""
 "Provide built-in OStatus (identi.ca, status.net, etc.) compatibility. All "
 "communications in OStatus are public, so privacy warnings will be "
 "occasionally displayed."
 msgstr "Biete die eingebaute OStatus (identi.ca, status.net, etc.) Unterstützung an. Jede Kommunikation in OStatus ist öffentlich, so Privatsphäre Warnungen werden bei Bedarf angezeigt."
 
-#: ../../mod/admin.php:455
+#: ../../mod/admin.php:467
 msgid "Enable Diaspora support"
 msgstr "Diaspora-Support aktivieren"
 
-#: ../../mod/admin.php:455
+#: ../../mod/admin.php:467
 msgid "Provide built-in Diaspora network compatibility."
 msgstr "Verwende die eingebaute Diaspora-Verknüpfung."
 
-#: ../../mod/admin.php:456
+#: ../../mod/admin.php:468
 msgid "Only allow Friendica contacts"
 msgstr "Nur Friendica-Kontakte erlauben"
 
-#: ../../mod/admin.php:456
+#: ../../mod/admin.php:468
 msgid ""
 "All contacts must use Friendica protocols. All other built-in communication "
 "protocols disabled."
 msgstr "Alle Kontakte müssen das Friendica Protokoll nutzen. Alle anderen Kommunikationsprotokolle werden deaktiviert."
 
-#: ../../mod/admin.php:457
+#: ../../mod/admin.php:469
 msgid "Verify SSL"
 msgstr "SSL Überprüfen"
 
-#: ../../mod/admin.php:457
+#: ../../mod/admin.php:469
 msgid ""
 "If you wish, you can turn on strict certificate checking. This will mean you"
 " cannot connect (at all) to self-signed SSL sites."
 msgstr "Wenn gewollt, kann man hier eine strenge Zertifikatkontrolle einstellen. Das bedeutet, dass man zu keinen Seiten mit selbst unterzeichnetem SSL eine Verbindung herstellen kann."
 
-#: ../../mod/admin.php:458
+#: ../../mod/admin.php:470
 msgid "Proxy user"
 msgstr "Proxy Nutzer"
 
-#: ../../mod/admin.php:459
+#: ../../mod/admin.php:471
 msgid "Proxy URL"
 msgstr "Proxy URL"
 
-#: ../../mod/admin.php:460
+#: ../../mod/admin.php:472
 msgid "Network timeout"
 msgstr "Netzwerk Wartezeit"
 
-#: ../../mod/admin.php:460
+#: ../../mod/admin.php:472
 msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
 msgstr "Der Wert ist in Sekunden. Setze 0 für unbegrenzt (nicht empfohlen)."
 
-#: ../../mod/admin.php:461
+#: ../../mod/admin.php:473
 msgid "Delivery interval"
 msgstr "Zustellungsintervall"
 
-#: ../../mod/admin.php:461
+#: ../../mod/admin.php:473
 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 "Verzögere im Hintergrund laufende Auslieferungsprozesse um die angegebene Anzahl an Sekunden, um die Systemlast zu verringern. Empfehlungen: 4-5 für Shared-Hosts, 2-3 für VPS, 0-1 für große dedizierte Server."
 
-#: ../../mod/admin.php:462
+#: ../../mod/admin.php:474
 msgid "Poll interval"
 msgstr "Abfrageintervall"
 
-#: ../../mod/admin.php:462
+#: ../../mod/admin.php:474
 msgid ""
 "Delay background polling processes by this many seconds to reduce system "
 "load. If 0, use delivery interval."
 msgstr "Verzögere Hintergrundprozesse, um diese Anzahl an Sekunden um die Systemlast zu reduzieren. Bei 0 Sekunden wird das Auslieferungsintervall verwendet."
 
-#: ../../mod/admin.php:463
+#: ../../mod/admin.php:475
 msgid "Maximum Load Average"
 msgstr "Maximum Load Average"
 
-#: ../../mod/admin.php:463
+#: ../../mod/admin.php:475
 msgid ""
 "Maximum system load before delivery and poll processes are deferred - "
 "default 50."
 msgstr "Maximale Systemlast bevor Verteil- und Empfangsprozesse verschoben werden - Standard 50"
 
-#: ../../mod/admin.php:480
+#: ../../mod/admin.php:492
 msgid "Update has been marked successful"
 msgstr "Update wurde als erfolgreich markiert"
 
-#: ../../mod/admin.php:490
+#: ../../mod/admin.php:502
 #, php-format
 msgid "Executing %s failed. Check system logs."
 msgstr "Ausführung von %s schlug fehl. Systemprotokolle prüfen."
 
-#: ../../mod/admin.php:493
+#: ../../mod/admin.php:505
 #, php-format
 msgid "Update %s was successfully applied."
 msgstr "Update %s war erfolgreich."
 
-#: ../../mod/admin.php:497
+#: ../../mod/admin.php:509
 #, php-format
 msgid "Update %s did not return a status. Unknown if it succeeded."
 msgstr "Update %s hat keinen Status zurückgegeben. Unbekannter Status."
 
-#: ../../mod/admin.php:500
+#: ../../mod/admin.php:512
 #, php-format
 msgid "Update function %s could not be found."
 msgstr "Updatefunktion %s konnte nicht gefunden werden."
 
-#: ../../mod/admin.php:515
+#: ../../mod/admin.php:527
 msgid "No failed updates."
 msgstr "Keine fehlgeschlagenen Updates."
 
-#: ../../mod/admin.php:519
+#: ../../mod/admin.php:531
 msgid "Failed Updates"
 msgstr "Fehlgeschlagene Updates"
 
-#: ../../mod/admin.php:520
+#: ../../mod/admin.php:532
 msgid ""
 "This does not include updates prior to 1139, which did not return a status."
 msgstr "Ohne Updates vor 1139, da diese keinen Status zurückgegeben haben."
 
-#: ../../mod/admin.php:521
+#: ../../mod/admin.php:533
 msgid "Mark success (if update was manually applied)"
 msgstr "Als erfolgreich markieren (falls das Update manuell installiert wurde)"
 
-#: ../../mod/admin.php:522
+#: ../../mod/admin.php:534
 msgid "Attempt to execute this update step automatically"
 msgstr "Versuchen, diesen Schritt automatisch auszuführen"
 
-#: ../../mod/admin.php:547
+#: ../../mod/admin.php:559
 #, php-format
 msgid "%s user blocked/unblocked"
 msgid_plural "%s users blocked/unblocked"
 msgstr[0] "%s Benutzer geblockt/freigegeben"
 msgstr[1] "%s Benutzer geblockt/freigegeben"
 
-#: ../../mod/admin.php:554
+#: ../../mod/admin.php:566
 #, php-format
 msgid "%s user deleted"
 msgid_plural "%s users deleted"
 msgstr[0] "%s Nutzer gelöscht"
 msgstr[1] "%s Nutzer gelöscht"
 
-#: ../../mod/admin.php:593
+#: ../../mod/admin.php:605
 #, php-format
 msgid "User '%s' deleted"
 msgstr "Nutzer '%s' gelöscht"
 
-#: ../../mod/admin.php:601
+#: ../../mod/admin.php:613
 #, php-format
 msgid "User '%s' unblocked"
 msgstr "Nutzer '%s' entsperrt"
 
-#: ../../mod/admin.php:601
+#: ../../mod/admin.php:613
 #, php-format
 msgid "User '%s' blocked"
 msgstr "Nutzer '%s' gesperrt"
 
-#: ../../mod/admin.php:665
+#: ../../mod/admin.php:677
 msgid "select all"
 msgstr "Alle auswählen"
 
-#: ../../mod/admin.php:666
+#: ../../mod/admin.php:678
 msgid "User registrations waiting for confirm"
 msgstr "Neuanmeldungen, die auf deine Bestätigung warten"
 
-#: ../../mod/admin.php:667
+#: ../../mod/admin.php:679
 msgid "Request date"
 msgstr "Anfragedatum"
 
-#: ../../mod/admin.php:667 ../../mod/admin.php:676
+#: ../../mod/admin.php:679 ../../mod/admin.php:688
 #: ../../include/contact_selectors.php:79
 msgid "Email"
 msgstr "E-Mail"
 
-#: ../../mod/admin.php:668
+#: ../../mod/admin.php:680
 msgid "No registrations."
 msgstr "Keine Neuanmeldungen."
 
-#: ../../mod/admin.php:670
+#: ../../mod/admin.php:682
 msgid "Deny"
 msgstr "Verwehren"
 
-#: ../../mod/admin.php:676
+#: ../../mod/admin.php:688
 msgid "Register date"
 msgstr "Anmeldedatum"
 
-#: ../../mod/admin.php:676
+#: ../../mod/admin.php:688
 msgid "Last login"
 msgstr "Letzte Anmeldung"
 
-#: ../../mod/admin.php:676
+#: ../../mod/admin.php:688
 msgid "Last item"
 msgstr "Letzter Beitrag"
 
-#: ../../mod/admin.php:676
+#: ../../mod/admin.php:688
 msgid "Account"
 msgstr "Nutzerkonto"
 
-#: ../../mod/admin.php:678
+#: ../../mod/admin.php:690
 msgid ""
 "Selected users will be deleted!\\n\\nEverything these users had posted on "
 "this site will be permanently deleted!\\n\\nAre you sure?"
 msgstr "Die markierten Nutzer werden gelöscht!\\n\\nAlle Beiträge, die diese Nutzer auf dieser Seite veröffentlicht haben, werden permanent gelöscht!\\n\\nBist du sicher?"
 
-#: ../../mod/admin.php:679
+#: ../../mod/admin.php:691
 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!\\n\\nBist du sicher?"
 
-#: ../../mod/admin.php:720
+#: ../../mod/admin.php:732
 #, php-format
 msgid "Plugin %s disabled."
 msgstr "Plugin %s deaktiviert."
 
-#: ../../mod/admin.php:724
+#: ../../mod/admin.php:736
 #, php-format
 msgid "Plugin %s enabled."
 msgstr "Plugin %s aktiviert."
 
-#: ../../mod/admin.php:734 ../../mod/admin.php:932
+#: ../../mod/admin.php:746 ../../mod/admin.php:944
 msgid "Disable"
 msgstr "Ausschalten"
 
-#: ../../mod/admin.php:736 ../../mod/admin.php:934
+#: ../../mod/admin.php:748 ../../mod/admin.php:946
 msgid "Enable"
 msgstr "Einschalten"
 
-#: ../../mod/admin.php:758 ../../mod/admin.php:963
+#: ../../mod/admin.php:770 ../../mod/admin.php:975
 msgid "Toggle"
 msgstr "Umschalten"
 
-#: ../../mod/admin.php:766 ../../mod/admin.php:973
+#: ../../mod/admin.php:778 ../../mod/admin.php:985
 msgid "Author: "
 msgstr "Autor:"
 
-#: ../../mod/admin.php:767 ../../mod/admin.php:974
+#: ../../mod/admin.php:779 ../../mod/admin.php:986
 msgid "Maintainer: "
 msgstr "Betreuer:"
 
-#: ../../mod/admin.php:896
+#: ../../mod/admin.php:908
 msgid "No themes found."
 msgstr "Keine Themen gefunden."
 
-#: ../../mod/admin.php:955
+#: ../../mod/admin.php:967
 msgid "Screenshot"
 msgstr "Bildschirmfoto"
 
-#: ../../mod/admin.php:1003
+#: ../../mod/admin.php:1015
 msgid "[Experimental]"
 msgstr "[Experimentell]"
 
-#: ../../mod/admin.php:1004
+#: ../../mod/admin.php:1016
 msgid "[Unsupported]"
 msgstr "[Nicht unterstützt]"
 
-#: ../../mod/admin.php:1031
+#: ../../mod/admin.php:1043
 msgid "Log settings updated."
 msgstr "Protokolleinstellungen aktualisiert."
 
-#: ../../mod/admin.php:1087
+#: ../../mod/admin.php:1099
 msgid "Clear"
 msgstr "löschen"
 
-#: ../../mod/admin.php:1093
+#: ../../mod/admin.php:1105
 msgid "Debugging"
 msgstr "Protokoll führen"
 
-#: ../../mod/admin.php:1094
+#: ../../mod/admin.php:1106
 msgid "Log file"
 msgstr "Protokolldatei"
 
-#: ../../mod/admin.php:1094
+#: ../../mod/admin.php:1106
 msgid ""
 "Must be writable by web server. Relative to your Friendica top-level "
 "directory."
 msgstr "Webserver muss Schreibrechte besitzen. Abhängig vom Friendica-Installationsverzeichnis."
 
-#: ../../mod/admin.php:1095
+#: ../../mod/admin.php:1107
 msgid "Log level"
 msgstr "Protokoll-Level"
 
-#: ../../mod/admin.php:1145
+#: ../../mod/admin.php:1157
 msgid "Close"
 msgstr "Schließen"
 
-#: ../../mod/admin.php:1151
+#: ../../mod/admin.php:1163
 msgid "FTP Host"
 msgstr "FTP Host"
 
-#: ../../mod/admin.php:1152
+#: ../../mod/admin.php:1164
 msgid "FTP Path"
 msgstr "FTP Pfad"
 
-#: ../../mod/admin.php:1153
+#: ../../mod/admin.php:1165
 msgid "FTP User"
 msgstr "FTP Nutzername"
 
-#: ../../mod/admin.php:1154
+#: ../../mod/admin.php:1166
 msgid "FTP Password"
 msgstr "FTP Passwort"
 
-#: ../../mod/profile.php:22 ../../boot.php:1056
+#: ../../mod/profile.php:22 ../../boot.php:1064
 msgid "Requested profile is not available."
 msgstr "Das angefragte Profil ist nicht vorhanden."
 
@@ -3937,8 +3951,8 @@ msgstr "Keine Applikationen installiert."
 msgid "Search"
 msgstr "Suche"
 
-#: ../../mod/profiles.php:21 ../../mod/profiles.php:418
-#: ../../mod/profiles.php:532 ../../mod/dfrn_confirm.php:62
+#: ../../mod/profiles.php:21 ../../mod/profiles.php:423
+#: ../../mod/profiles.php:537 ../../mod/dfrn_confirm.php:62
 msgid "Profile not found."
 msgstr "Profil nicht gefunden."
 
@@ -3946,301 +3960,301 @@ msgstr "Profil nicht gefunden."
 msgid "Profile Name is required."
 msgstr "Profilname ist erforderlich."
 
-#: ../../mod/profiles.php:155
+#: ../../mod/profiles.php:160
 msgid "Marital Status"
 msgstr "Familienstand"
 
-#: ../../mod/profiles.php:159
+#: ../../mod/profiles.php:164
 msgid "Romantic Partner"
 msgstr "Romanze"
 
-#: ../../mod/profiles.php:163
+#: ../../mod/profiles.php:168
 msgid "Likes"
 msgstr "Likes"
 
-#: ../../mod/profiles.php:167
+#: ../../mod/profiles.php:172
 msgid "Dislikes"
 msgstr "Dislikes"
 
-#: ../../mod/profiles.php:171
+#: ../../mod/profiles.php:176
 msgid "Work/Employment"
 msgstr "Arbeit / Beschäftigung"
 
-#: ../../mod/profiles.php:174
+#: ../../mod/profiles.php:179
 msgid "Religion"
 msgstr "Religion"
 
-#: ../../mod/profiles.php:178
+#: ../../mod/profiles.php:183
 msgid "Political Views"
 msgstr "Politische Ansichten"
 
-#: ../../mod/profiles.php:182
+#: ../../mod/profiles.php:187
 msgid "Gender"
 msgstr "Geschlecht"
 
-#: ../../mod/profiles.php:186
+#: ../../mod/profiles.php:191
 msgid "Sexual Preference"
 msgstr "Sexuelle Vorlieben"
 
-#: ../../mod/profiles.php:190
+#: ../../mod/profiles.php:195
 msgid "Homepage"
 msgstr "Webseite"
 
-#: ../../mod/profiles.php:194
+#: ../../mod/profiles.php:199
 msgid "Interests"
 msgstr "Interessen"
 
-#: ../../mod/profiles.php:198
+#: ../../mod/profiles.php:203
 msgid "Address"
 msgstr "Adresse"
 
-#: ../../mod/profiles.php:205 ../../addon/dav/common/wdcal_edit.inc.php:183
+#: ../../mod/profiles.php:210 ../../addon/dav/common/wdcal_edit.inc.php:183
 msgid "Location"
 msgstr "Wohnort"
 
-#: ../../mod/profiles.php:288
+#: ../../mod/profiles.php:293
 msgid "Profile updated."
 msgstr "Profil aktualisiert."
 
-#: ../../mod/profiles.php:355
+#: ../../mod/profiles.php:360
 msgid " and "
 msgstr " und "
 
-#: ../../mod/profiles.php:363
+#: ../../mod/profiles.php:368
 msgid "public profile"
 msgstr "öffentliches Profil"
 
-#: ../../mod/profiles.php:366
+#: ../../mod/profiles.php:371
 #, php-format
 msgid "%1$s changed %2$s to &ldquo;%3$s&rdquo;"
 msgstr "%1$s hat %2$s geändert auf &ldquo;%3$s&rdquo;"
 
-#: ../../mod/profiles.php:367
+#: ../../mod/profiles.php:372
 #, php-format
 msgid " - Visit %1$s's %2$s"
 msgstr " – %1$ss %2$s besuchen"
 
-#: ../../mod/profiles.php:370
+#: ../../mod/profiles.php:375
 #, php-format
 msgid "%1$s has an updated %2$s, changing %3$s."
 msgstr "%1$s hat folgendes aktualisiert %2$s, verändert wurde %3$s."
 
-#: ../../mod/profiles.php:437
+#: ../../mod/profiles.php:442
 msgid "Profile deleted."
 msgstr "Profil gelöscht."
 
-#: ../../mod/profiles.php:455 ../../mod/profiles.php:489
+#: ../../mod/profiles.php:460 ../../mod/profiles.php:494
 msgid "Profile-"
 msgstr "Profil-"
 
-#: ../../mod/profiles.php:474 ../../mod/profiles.php:516
+#: ../../mod/profiles.php:479 ../../mod/profiles.php:521
 msgid "New profile created."
 msgstr "Neues Profil angelegt."
 
-#: ../../mod/profiles.php:495
+#: ../../mod/profiles.php:500
 msgid "Profile unavailable to clone."
 msgstr "Profil nicht zum Duplizieren verfügbar."
 
-#: ../../mod/profiles.php:557
+#: ../../mod/profiles.php:562
 msgid "Hide your contact/friend list from viewers of this profile?"
 msgstr "Liste der Kontakte vor Betrachtern dieses Profils verbergen?"
 
-#: ../../mod/profiles.php:577
+#: ../../mod/profiles.php:582
 msgid "Edit Profile Details"
 msgstr "Profil bearbeiten"
 
-#: ../../mod/profiles.php:579
+#: ../../mod/profiles.php:584
 msgid "View this profile"
 msgstr "Dieses Profil anzeigen"
 
-#: ../../mod/profiles.php:580
+#: ../../mod/profiles.php:585
 msgid "Create a new profile using these settings"
 msgstr "Neues Profil anlegen und diese Einstellungen verwenden"
 
-#: ../../mod/profiles.php:581
+#: ../../mod/profiles.php:586
 msgid "Clone this profile"
 msgstr "Dieses Profil duplizieren"
 
-#: ../../mod/profiles.php:582
+#: ../../mod/profiles.php:587
 msgid "Delete this profile"
 msgstr "Dieses Profil löschen"
 
-#: ../../mod/profiles.php:583
+#: ../../mod/profiles.php:588
 msgid "Profile Name:"
 msgstr "Profilname:"
 
-#: ../../mod/profiles.php:584
+#: ../../mod/profiles.php:589
 msgid "Your Full Name:"
 msgstr "Dein kompletter Name:"
 
-#: ../../mod/profiles.php:585
+#: ../../mod/profiles.php:590
 msgid "Title/Description:"
 msgstr "Titel/Beschreibung:"
 
-#: ../../mod/profiles.php:586
+#: ../../mod/profiles.php:591
 msgid "Your Gender:"
 msgstr "Dein Geschlecht:"
 
-#: ../../mod/profiles.php:587
+#: ../../mod/profiles.php:592
 #, php-format
 msgid "Birthday (%s):"
 msgstr "Geburtstag (%s):"
 
-#: ../../mod/profiles.php:588
+#: ../../mod/profiles.php:593
 msgid "Street Address:"
 msgstr "Adresse:"
 
-#: ../../mod/profiles.php:589
+#: ../../mod/profiles.php:594
 msgid "Locality/City:"
 msgstr "Wohnort:"
 
-#: ../../mod/profiles.php:590
+#: ../../mod/profiles.php:595
 msgid "Postal/Zip Code:"
 msgstr "Postleitzahl:"
 
-#: ../../mod/profiles.php:591
+#: ../../mod/profiles.php:596
 msgid "Country:"
 msgstr "Land:"
 
-#: ../../mod/profiles.php:592
+#: ../../mod/profiles.php:597
 msgid "Region/State:"
 msgstr "Region/Bundesstaat:"
 
-#: ../../mod/profiles.php:593
+#: ../../mod/profiles.php:598
 msgid "<span class=\"heart\">&hearts;</span> Marital Status:"
 msgstr "<span class=\"heart\">&hearts;</span> Beziehungsstatus:"
 
-#: ../../mod/profiles.php:594
+#: ../../mod/profiles.php:599
 msgid "Who: (if applicable)"
 msgstr "Wer: (falls anwendbar)"
 
-#: ../../mod/profiles.php:595
+#: ../../mod/profiles.php:600
 msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
 msgstr "Beispiele: cathy123, Cathy Williams, cathy@example.com"
 
-#: ../../mod/profiles.php:596
+#: ../../mod/profiles.php:601
 msgid "Since [date]:"
 msgstr "Seit [Datum]:"
 
-#: ../../mod/profiles.php:597 ../../include/profile_advanced.php:46
+#: ../../mod/profiles.php:602 ../../include/profile_advanced.php:46
 msgid "Sexual Preference:"
 msgstr "Sexuelle Vorlieben:"
 
-#: ../../mod/profiles.php:598
+#: ../../mod/profiles.php:603
 msgid "Homepage URL:"
 msgstr "Adresse der Homepage:"
 
-#: ../../mod/profiles.php:599 ../../include/profile_advanced.php:50
+#: ../../mod/profiles.php:604 ../../include/profile_advanced.php:50
 msgid "Hometown:"
 msgstr "Heimatort:"
 
-#: ../../mod/profiles.php:600 ../../include/profile_advanced.php:54
+#: ../../mod/profiles.php:605 ../../include/profile_advanced.php:54
 msgid "Political Views:"
 msgstr "Politische Ansichten:"
 
-#: ../../mod/profiles.php:601
+#: ../../mod/profiles.php:606
 msgid "Religious Views:"
 msgstr "Religiöse Ansichten:"
 
-#: ../../mod/profiles.php:602
+#: ../../mod/profiles.php:607
 msgid "Public Keywords:"
 msgstr "Öffentliche Schlüsselwörter:"
 
-#: ../../mod/profiles.php:603
+#: ../../mod/profiles.php:608
 msgid "Private Keywords:"
 msgstr "Private Schlüsselwörter:"
 
-#: ../../mod/profiles.php:604 ../../include/profile_advanced.php:62
+#: ../../mod/profiles.php:609 ../../include/profile_advanced.php:62
 msgid "Likes:"
 msgstr "Likes:"
 
-#: ../../mod/profiles.php:605 ../../include/profile_advanced.php:64
+#: ../../mod/profiles.php:610 ../../include/profile_advanced.php:64
 msgid "Dislikes:"
 msgstr "Dislikes:"
 
-#: ../../mod/profiles.php:606
+#: ../../mod/profiles.php:611
 msgid "Example: fishing photography software"
 msgstr "Beispiel: Fischen Fotografie Software"
 
-#: ../../mod/profiles.php:607
+#: ../../mod/profiles.php:612
 msgid "(Used for suggesting potential friends, can be seen by others)"
 msgstr "(Wird verwendet, um potentielle Freunde zu finden, könnte von Fremden eingesehen werden)"
 
-#: ../../mod/profiles.php:608
+#: ../../mod/profiles.php:613
 msgid "(Used for searching profiles, never shown to others)"
 msgstr "(Wird für die Suche nach Profilen verwendet und niemals veröffentlicht)"
 
-#: ../../mod/profiles.php:609
+#: ../../mod/profiles.php:614
 msgid "Tell us about yourself..."
 msgstr "Erzähle uns ein bisschen von dir …"
 
-#: ../../mod/profiles.php:610
+#: ../../mod/profiles.php:615
 msgid "Hobbies/Interests"
 msgstr "Hobbies/Interessen"
 
-#: ../../mod/profiles.php:611
+#: ../../mod/profiles.php:616
 msgid "Contact information and Social Networks"
 msgstr "Kontaktinformationen und Soziale Netzwerke"
 
-#: ../../mod/profiles.php:612
+#: ../../mod/profiles.php:617
 msgid "Musical interests"
 msgstr "Musikalische Interessen"
 
-#: ../../mod/profiles.php:613
+#: ../../mod/profiles.php:618
 msgid "Books, literature"
 msgstr "Literatur/Bücher"
 
-#: ../../mod/profiles.php:614
+#: ../../mod/profiles.php:619
 msgid "Television"
 msgstr "Fernsehen"
 
-#: ../../mod/profiles.php:615
+#: ../../mod/profiles.php:620
 msgid "Film/dance/culture/entertainment"
 msgstr "Filme/Tänze/Kultur/Unterhaltung"
 
-#: ../../mod/profiles.php:616
+#: ../../mod/profiles.php:621
 msgid "Love/romance"
 msgstr "Liebesleben"
 
-#: ../../mod/profiles.php:617
+#: ../../mod/profiles.php:622
 msgid "Work/employment"
 msgstr "Arbeit/Beschäftigung"
 
-#: ../../mod/profiles.php:618
+#: ../../mod/profiles.php:623
 msgid "School/education"
 msgstr "Schule/Ausbildung"
 
-#: ../../mod/profiles.php:623
+#: ../../mod/profiles.php:628
 msgid ""
 "This is your <strong>public</strong> profile.<br />It <strong>may</strong> "
 "be visible to anybody using the internet."
 msgstr "Dies ist dein <strong>öffentliches</strong> Profil.<br />Es <strong>könnte</strong> für jeden Nutzer des Internets sichtbar sein."
 
-#: ../../mod/profiles.php:633 ../../mod/directory.php:109
+#: ../../mod/profiles.php:638 ../../mod/directory.php:109
 msgid "Age: "
 msgstr "Alter: "
 
-#: ../../mod/profiles.php:672
+#: ../../mod/profiles.php:677
 msgid "Edit/Manage Profiles"
 msgstr "Verwalte/Editiere Profile"
 
-#: ../../mod/profiles.php:673 ../../boot.php:1165
+#: ../../mod/profiles.php:678 ../../boot.php:1173
 msgid "Change profile photo"
 msgstr "Profilbild ändern"
 
-#: ../../mod/profiles.php:674 ../../boot.php:1166
+#: ../../mod/profiles.php:679 ../../boot.php:1174
 msgid "Create New Profile"
 msgstr "Neues Profil anlegen"
 
-#: ../../mod/profiles.php:685 ../../boot.php:1176
+#: ../../mod/profiles.php:690 ../../boot.php:1184
 msgid "Profile Image"
 msgstr "Profilbild"
 
-#: ../../mod/profiles.php:687 ../../boot.php:1179
+#: ../../mod/profiles.php:692 ../../boot.php:1187
 msgid "visible to everybody"
 msgstr "sichtbar für jeden"
 
-#: ../../mod/profiles.php:688 ../../boot.php:1180
+#: ../../mod/profiles.php:693 ../../boot.php:1188
 msgid "Edit visibility"
 msgstr "Sichtbarkeit bearbeiten"
 
@@ -4369,17 +4383,17 @@ msgid "Gender: "
 msgstr "Geschlecht:"
 
 #: ../../mod/directory.php:134 ../../include/profile_advanced.php:17
-#: ../../boot.php:1201
+#: ../../boot.php:1209
 msgid "Gender:"
 msgstr "Geschlecht:"
 
 #: ../../mod/directory.php:136 ../../include/profile_advanced.php:37
-#: ../../boot.php:1204
+#: ../../boot.php:1212
 msgid "Status:"
 msgstr "Status:"
 
 #: ../../mod/directory.php:138 ../../include/profile_advanced.php:48
-#: ../../boot.php:1206
+#: ../../boot.php:1214
 msgid "Homepage:"
 msgstr "Homepage:"
 
@@ -4745,7 +4759,8 @@ msgstr "Echtzeit-Updates nicht aktiviert."
 msgid "Activate Real-Time Updates"
 msgstr "Echtzeit-Updates aktivieren"
 
-#: ../../addon/facebook/facebook.php:799 ../../addon/dav/layout.fnk.php:361
+#: ../../addon/facebook/facebook.php:799
+#: ../../addon/dav/friendica/layout.fnk.php:361
 msgid "The new values have been saved."
 msgstr "Die neuen Einstellungen wurden gespeichert."
 
@@ -5136,7 +5151,7 @@ msgstr "Aktiviere Planeten Plugin"
 #: ../../addon/communityhome/communityhome.php:34
 #: ../../addon/communityhome/twillingham/communityhome.php:28
 #: ../../addon/communityhome/twillingham/communityhome.php:34
-#: ../../include/nav.php:64 ../../boot.php:912
+#: ../../include/nav.php:64 ../../boot.php:920
 msgid "Login"
 msgstr "Anmeldung"
 
@@ -5169,10 +5184,6 @@ msgstr "Neueste Favoriten"
 msgid "event"
 msgstr "Veranstaltung"
 
-#: ../../addon/dav/dav_caldav_backend_virtual_friendica.inc.php:36
-msgid "Friendicy-Native events"
-msgstr ""
-
 #: ../../addon/dav/common/wdcal_backend.inc.php:92
 #: ../../addon/dav/common/wdcal_backend.inc.php:166
 #: ../../addon/dav/common/wdcal_backend.inc.php:178
@@ -5188,25 +5199,27 @@ msgid "Could not open component for editing"
 msgstr ""
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:140
-#: ../../addon/dav/layout.fnk.php:143 ../../addon/dav/layout.fnk.php:422
+#: ../../addon/dav/friendica/layout.fnk.php:143
+#: ../../addon/dav/friendica/layout.fnk.php:422
 msgid "Go back to the calendar"
 msgstr "Zurück zum Kalender"
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:144
 msgid "Event data"
-msgstr ""
+msgstr "Veranstaltungsdetails"
 
-#: ../../addon/dav/common/wdcal_edit.inc.php:146 ../../addon/dav/main.php:206
+#: ../../addon/dav/common/wdcal_edit.inc.php:146
+#: ../../addon/dav/friendica/main.php:239
 msgid "Calendar"
 msgstr "Kalender"
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:163
 msgid "Special color"
-msgstr ""
+msgstr "Spezielle Farbe"
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:169
 msgid "Subject"
-msgstr ""
+msgstr "Betreff:"
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:173
 msgid "Starts"
@@ -5222,11 +5235,11 @@ msgstr "Beschreibung"
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:188
 msgid "Recurrence"
-msgstr ""
+msgstr "Wiederholungen:"
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:190
 msgid "Frequency"
-msgstr ""
+msgstr "Frequenz"
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:194
 #: ../../include/contact_selectors.php:59
@@ -5245,7 +5258,7 @@ msgstr "Monatlich"
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:203
 msgid "Yearly"
-msgstr ""
+msgstr "Jährlich"
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:214
 #: ../../include/datetime.php:288
@@ -5269,11 +5282,11 @@ msgstr "Jahre"
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:218
 msgid "Interval"
-msgstr ""
+msgstr "Intervall"
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:218
 msgid "All %select% %time%"
-msgstr ""
+msgstr "Jeden %select% %time%"
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:222
 #: ../../addon/dav/common/wdcal_edit.inc.php:260
@@ -5331,11 +5344,11 @@ msgstr "Tag des Monats"
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:354
 msgid "#num#th of each month"
-msgstr ""
+msgstr "#num#ten jedes Monats"
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:357
 msgid "#num#th-last of each month"
-msgstr ""
+msgstr "letzten #num#ten jedes Monats"
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:360
 msgid "#num#th #wkday# of each month"
@@ -5346,17 +5359,17 @@ msgid "#num#th-last #wkday# of each month"
 msgstr ""
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:372
-#: ../../addon/dav/layout.fnk.php:255
+#: ../../addon/dav/friendica/layout.fnk.php:255
 msgid "Month"
 msgstr "Monat"
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:377
 msgid "#num#th of the given month"
-msgstr ""
+msgstr "#num#ten des Monats"
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:380
 msgid "#num#th-last of the given month"
-msgstr ""
+msgstr "letzten #num#ten des Monats"
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:383
 msgid "#num#th #wkday# of the given month"
@@ -5368,27 +5381,27 @@ msgstr ""
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:413
 msgid "Repeat until"
-msgstr ""
+msgstr "Wiederholungen"
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:417
 msgid "Infinite"
-msgstr ""
+msgstr "unendlich"
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:420
 msgid "Until the following date"
-msgstr ""
+msgstr "bis zum folgenden Datum"
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:423
 msgid "Number of times"
-msgstr ""
+msgstr "Bestimmte Anzahl von Wiederholungen"
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:429
 msgid "Exceptions"
-msgstr ""
+msgstr "Ausnahmen"
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:432
 msgid "none"
-msgstr ""
+msgstr "keine"
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:449
 msgid "Notification"
@@ -5396,19 +5409,19 @@ msgstr "Benachrichtigung"
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:466
 msgid "Notify by"
-msgstr ""
+msgstr "Benarchrichtigungsmethode"
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:469
 msgid "E-Mail"
-msgstr ""
+msgstr "E-Mail"
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:470
 msgid "On Friendica / Display"
-msgstr ""
+msgstr "Bei Friendica / Anzeige"
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:474
 msgid "Time"
-msgstr ""
+msgstr "Zeit"
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:478
 msgid "Hours"
@@ -5420,39 +5433,39 @@ msgstr "Minuten"
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:480
 msgid "Seconds"
-msgstr ""
+msgstr "Sekunden"
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:482
 msgid "Weeks"
-msgstr ""
+msgstr "Wochen"
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:485
 msgid "before the"
-msgstr ""
+msgstr "vor dem"
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:486
 msgid "start of the event"
-msgstr ""
+msgstr "Beginn des Termins"
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:487
 msgid "end of the event"
-msgstr ""
+msgstr "Ende des Termins"
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:492
 msgid "Add a notification"
-msgstr ""
+msgstr "Benachrichtigung hinzufügen"
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:687
 msgid "The event #name# will start at #date"
-msgstr ""
+msgstr "Der Termin #name# wird am #date anfangen"
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:696
 msgid "#name# is about to begin."
-msgstr ""
+msgstr "#name# beginnt demnächst."
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:769
 msgid "Saved"
-msgstr ""
+msgstr "Gespeichert"
 
 #: ../../addon/dav/common/wdcal_configuration.php:148
 msgid "U.S. Time Format (mm/dd/YYYY)"
@@ -5464,180 +5477,191 @@ msgstr "Deutsches Datumsformat (dd.mm.YYYY)"
 
 #: ../../addon/dav/common/dav_caldav_backend_private.inc.php:39
 msgid "Private Events"
-msgstr ""
+msgstr "Privater Termin"
 
-#: ../../addon/dav/dav_carddav_backend_virtual_friendica.inc.php:53
+#: ../../addon/dav/common/dav_carddav_backend_private.inc.php:46
+msgid "Private Addressbooks"
+msgstr "Private Adressbücher"
+
+#: ../../addon/dav/friendica/dav_caldav_backend_virtual_friendica.inc.php:36
+msgid "Friendica-Native events"
+msgstr "Friendica Veranstaltungen"
+
+#: ../../addon/dav/friendica/dav_carddav_backend_virtual_friendica.inc.php:36
+#: ../../addon/dav/friendica/dav_carddav_backend_virtual_friendica.inc.php:59
 msgid "Friendica-Contacts"
 msgstr "Friendica-Kontakte"
 
-#: ../../addon/dav/dav_carddav_backend_virtual_friendica.inc.php:54
+#: ../../addon/dav/friendica/dav_carddav_backend_virtual_friendica.inc.php:60
 msgid "Your Friendica-Contacts"
 msgstr "Deine Friendica-Kontakte"
 
-#: ../../addon/dav/layout.fnk.php:99 ../../addon/dav/layout.fnk.php:136
+#: ../../addon/dav/friendica/layout.fnk.php:99
+#: ../../addon/dav/friendica/layout.fnk.php:136
 msgid ""
 "Something went wrong when trying to import the file. Sorry. Maybe some "
 "events were imported anyway."
-msgstr ""
+msgstr "Entschuldigung. Bei dem Versuch die Datei zu importieren ist etwas schief gelaufen. Vielleicht wurden aber einige der Termine dennoch importiert."
 
-#: ../../addon/dav/layout.fnk.php:131
+#: ../../addon/dav/friendica/layout.fnk.php:131
 msgid "Something went wrong when trying to import the file. Sorry."
-msgstr ""
+msgstr "Entschuldigung. Beim Importieren der Datei ist etwas schief gelaufen."
 
-#: ../../addon/dav/layout.fnk.php:134
+#: ../../addon/dav/friendica/layout.fnk.php:134
 msgid "The ICS-File has been imported."
 msgstr "Die ICS-Datei wurde importoert."
 
-#: ../../addon/dav/layout.fnk.php:138
+#: ../../addon/dav/friendica/layout.fnk.php:138
 msgid "No file was uploaded."
 msgstr "Es wurde keine Datei geladen."
 
-#: ../../addon/dav/layout.fnk.php:147
+#: ../../addon/dav/friendica/layout.fnk.php:147
 msgid "Import a ICS-file"
 msgstr "Importiere eine ICS-Datei"
 
-#: ../../addon/dav/layout.fnk.php:150
+#: ../../addon/dav/friendica/layout.fnk.php:150
 msgid "ICS-File"
 msgstr "ICS-Datei"
 
-#: ../../addon/dav/layout.fnk.php:151
+#: ../../addon/dav/friendica/layout.fnk.php:151
 msgid "Overwrite all #num# existing events"
 msgstr "Überschreibe alle #num# existierenden Einträge"
 
-#: ../../addon/dav/layout.fnk.php:228
+#: ../../addon/dav/friendica/layout.fnk.php:228
 msgid "New event"
 msgstr "Neue Veranstaltung"
 
-#: ../../addon/dav/layout.fnk.php:232
+#: ../../addon/dav/friendica/layout.fnk.php:232
 msgid "Today"
 msgstr "Heute"
 
-#: ../../addon/dav/layout.fnk.php:241
+#: ../../addon/dav/friendica/layout.fnk.php:241
 msgid "Day"
 msgstr "Tag"
 
-#: ../../addon/dav/layout.fnk.php:248
+#: ../../addon/dav/friendica/layout.fnk.php:248
 msgid "Week"
 msgstr "Woche"
 
-#: ../../addon/dav/layout.fnk.php:260
+#: ../../addon/dav/friendica/layout.fnk.php:260
 msgid "Reload"
 msgstr "Neu Laden"
 
-#: ../../addon/dav/layout.fnk.php:271
+#: ../../addon/dav/friendica/layout.fnk.php:271
 msgid "Date"
 msgstr "Datum"
 
-#: ../../addon/dav/layout.fnk.php:313
+#: ../../addon/dav/friendica/layout.fnk.php:313
 msgid "Error"
 msgstr "Fehler"
 
-#: ../../addon/dav/layout.fnk.php:380
+#: ../../addon/dav/friendica/layout.fnk.php:380
 msgid "The calendar has been updated."
 msgstr "Der Kalender wurde aktualisiert."
 
-#: ../../addon/dav/layout.fnk.php:393
+#: ../../addon/dav/friendica/layout.fnk.php:393
 msgid "The new calendar has been created."
 msgstr "Der neue Kalender wurde erstellt."
 
-#: ../../addon/dav/layout.fnk.php:417
+#: ../../addon/dav/friendica/layout.fnk.php:417
 msgid "The calendar has been deleted."
 msgstr "Der Kalender wurde gelöscht."
 
-#: ../../addon/dav/layout.fnk.php:424
+#: ../../addon/dav/friendica/layout.fnk.php:424
 msgid "Calendar Settings"
 msgstr "Kalendereinstellungen"
 
-#: ../../addon/dav/layout.fnk.php:430
+#: ../../addon/dav/friendica/layout.fnk.php:430
 msgid "Date format"
 msgstr "Datumsformat"
 
-#: ../../addon/dav/layout.fnk.php:439
+#: ../../addon/dav/friendica/layout.fnk.php:439
 msgid "Time zone"
 msgstr "Zeitzone"
 
-#: ../../addon/dav/layout.fnk.php:445
+#: ../../addon/dav/friendica/layout.fnk.php:445
 msgid "Calendars"
 msgstr "Kalender"
 
-#: ../../addon/dav/layout.fnk.php:487
+#: ../../addon/dav/friendica/layout.fnk.php:487
 msgid "Create a new calendar"
 msgstr "Neuen Kalender anlegen"
 
-#: ../../addon/dav/layout.fnk.php:496
+#: ../../addon/dav/friendica/layout.fnk.php:496
 msgid "Limitations"
 msgstr "Einschränkungen"
 
-#: ../../addon/dav/layout.fnk.php:500 ../../addon/libravatar/libravatar.php:82
+#: ../../addon/dav/friendica/layout.fnk.php:500
+#: ../../addon/libravatar/libravatar.php:82
 msgid "Warning"
 msgstr "Warnung"
 
-#: ../../addon/dav/layout.fnk.php:504
+#: ../../addon/dav/friendica/layout.fnk.php:504
 msgid "Synchronization (iPhone, Thunderbird Lightning, Android, ...)"
 msgstr "Synchronisation (iPhone, Thunderbird Lightning, Android, ...)"
 
-#: ../../addon/dav/layout.fnk.php:511
+#: ../../addon/dav/friendica/layout.fnk.php:511
 msgid "Synchronizing this calendar with the iPhone"
 msgstr "Diesen Kalender mit dem iPhone synchronisieren"
 
-#: ../../addon/dav/layout.fnk.php:522
+#: ../../addon/dav/friendica/layout.fnk.php:522
 msgid "Synchronizing your Friendica-Contacts with the iPhone"
 msgstr "Friendica-Kontakte mit dem iPhone synchronisieren"
 
-#: ../../addon/dav/main.php:169
+#: ../../addon/dav/friendica/main.php:202
 msgid ""
 "The current version of this plugin has not been set up correctly. Please "
 "contact the system administrator of your installation of friendica to fix "
 "this."
 msgstr "Die aktuelle Version dieses Plugins wurde nicht korrekt eingestellt. Bitte kontaktiere den System-Administrator deiner Friendica Installation um den Fehler zu beheben."
 
-#: ../../addon/dav/main.php:209
+#: ../../addon/dav/friendica/main.php:242
 msgid "Extended calendar with CalDAV-support"
 msgstr "Erweiterter Kalender mit CalDAV Unterstützung."
 
-#: ../../addon/dav/main.php:246 ../../addon/dav/main.php:247
-#: ../../include/delivery.php:463 ../../include/enotify.php:26
-#: ../../include/notifier.php:710
+#: ../../addon/dav/friendica/main.php:279
+#: ../../addon/dav/friendica/main.php:280 ../../include/delivery.php:463
+#: ../../include/enotify.php:28 ../../include/notifier.php:710
 msgid "noreply"
 msgstr "noreply"
 
-#: ../../addon/dav/main.php:249
+#: ../../addon/dav/friendica/main.php:282
 msgid "Notification: "
 msgstr "Benachrichtigungen: "
 
-#: ../../addon/dav/main.php:276
+#: ../../addon/dav/friendica/main.php:309
 msgid "The database tables have been installed."
 msgstr "Die Datenbanktabellen wurden installiert."
 
-#: ../../addon/dav/main.php:277
+#: ../../addon/dav/friendica/main.php:310
 msgid "An error occurred during the installation."
 msgstr "Während der Installation trat ein Fehler auf."
 
-#: ../../addon/dav/main.php:283
+#: ../../addon/dav/friendica/main.php:316
 msgid "The database tables have been updated."
 msgstr "Die Tabellen in der Datenbank wurden aktualisiert."
 
-#: ../../addon/dav/main.php:285
+#: ../../addon/dav/friendica/main.php:317
 msgid "An error occurred during the update."
 msgstr "Während der Aktualisierung trat ein Fehler auf."
 
-#: ../../addon/dav/main.php:301
+#: ../../addon/dav/friendica/main.php:333
 msgid "No system-wide settings yet."
 msgstr "Momentan keine systemweiten Einstellungen."
 
-#: ../../addon/dav/main.php:304
+#: ../../addon/dav/friendica/main.php:336
 msgid "Database status"
 msgstr "Datenbankstatus"
 
-#: ../../addon/dav/main.php:307
+#: ../../addon/dav/friendica/main.php:339
 msgid "Installed"
 msgstr "Installiert"
 
-#: ../../addon/dav/main.php:310
+#: ../../addon/dav/friendica/main.php:343
 msgid "Upgrade needed"
 msgstr "Upgrade erforderlich"
 
-#: ../../addon/dav/main.php:310
+#: ../../addon/dav/friendica/main.php:343
 msgid ""
 "Please back up all calendar data (the tables beginning with dav_*) before "
 "proceeding. While all calendar events <i>should</i> be converted to the new "
@@ -5646,23 +5670,23 @@ msgid ""
 "'update'-button."
 msgstr "Bitte sichere alle Kalenderdaten (die Tabellen mit dav_* beginnend) bevor du mit dem Update fortfährst. Eigentliche <i>sollten</i> alle Kalendereinträge in die neue Datenbankstruktur übernommen werden, aber sicher ist sicher. Weiter unten kannst du die Datenbank-Anfragen ansehen, die im Verlauf des Updates gemacht werden."
 
-#: ../../addon/dav/main.php:310
+#: ../../addon/dav/friendica/main.php:343
 msgid "Upgrade"
 msgstr "Upgrade"
 
-#: ../../addon/dav/main.php:313
+#: ../../addon/dav/friendica/main.php:346
 msgid "Not installed"
 msgstr "Nicht installiert"
 
-#: ../../addon/dav/main.php:313
+#: ../../addon/dav/friendica/main.php:346
 msgid "Install"
 msgstr "Installieren"
 
-#: ../../addon/dav/main.php:317
+#: ../../addon/dav/friendica/main.php:350
 msgid "Unknown"
 msgstr "Unbekannt"
 
-#: ../../addon/dav/main.php:317
+#: ../../addon/dav/friendica/main.php:350
 msgid ""
 "Something really went wrong. I cannot recover from this state automatically,"
 " sorry. Please go to the database backend, back up the data, and delete all "
@@ -5670,30 +5694,38 @@ msgid ""
 " should be able to reinitialize the tables automatically."
 msgstr "Irgendetwas ging schief. Ich kann leider von diesem Zustand der Datenbank leider nicht automatisch fortfahren. Bitte mache ein Backup der Daten aus der Datenbank und lösche anschließend alle Tabellen deren Name mit 'dav_' anfangen. Anschließend sollte diese Installations-Routine in der Lage sein die nötigen Tabellen automatisch neu anzulegen."
 
-#: ../../addon/dav/main.php:322
+#: ../../addon/dav/friendica/main.php:355
 msgid "Troubleshooting"
 msgstr "Problembehebung"
 
-#: ../../addon/dav/main.php:323
+#: ../../addon/dav/friendica/main.php:356
 msgid "Manual creation of the database tables:"
 msgstr "Manuelles Anlegen der Datenbanktabellen:"
 
-#: ../../addon/dav/main.php:324
+#: ../../addon/dav/friendica/main.php:357
 msgid "Show SQL-statements"
 msgstr "SQL-Anweisungen anzeigen"
 
-#: ../../addon/dav/calendar.friendica.fnk.php:193
+#: ../../addon/dav/friendica/calendar.friendica.fnk.php:206
 msgid "Private Calendar"
 msgstr "Privater Kalender"
 
-#: ../../addon/dav/calendar.friendica.fnk.php:194
+#: ../../addon/dav/friendica/calendar.friendica.fnk.php:207
 msgid "Friendica Events: Mine"
 msgstr "Meine Friendica-Veranstaltungen"
 
-#: ../../addon/dav/calendar.friendica.fnk.php:195
+#: ../../addon/dav/friendica/calendar.friendica.fnk.php:208
 msgid "Friendica Events: Contacts"
 msgstr "Friendica Veranstaltungen meiner Kontakte"
 
+#: ../../addon/dav/friendica/calendar.friendica.fnk.php:248
+msgid "Private Addresses"
+msgstr "Private Adressen"
+
+#: ../../addon/dav/friendica/calendar.friendica.fnk.php:249
+msgid "Friendica Contacts"
+msgstr "Friendica Kontakte"
+
 #: ../../addon/uhremotestorage/uhremotestorage.php:84
 #, php-format
 msgid ""
@@ -7329,7 +7361,7 @@ msgstr "Endet:"
 msgid "(no subject)"
 msgstr "(kein Betreff)"
 
-#: ../../include/Scrape.php:572
+#: ../../include/Scrape.php:575
 msgid " on Last.fm"
 msgstr " bei Last.fm"
 
@@ -7567,7 +7599,7 @@ msgstr "Neue Gruppe erstellen"
 msgid "Contacts not in any group"
 msgstr "Kontakte in keiner Gruppe"
 
-#: ../../include/nav.php:46 ../../boot.php:911
+#: ../../include/nav.php:46 ../../boot.php:919
 msgid "Logout"
 msgstr "Abmelden"
 
@@ -7575,7 +7607,7 @@ msgstr "Abmelden"
 msgid "End this session"
 msgstr "Diese Sitzung beenden"
 
-#: ../../include/nav.php:49 ../../boot.php:1623
+#: ../../include/nav.php:49 ../../boot.php:1631
 msgid "Status"
 msgstr "Status"
 
@@ -7655,11 +7687,11 @@ msgstr "Verwalten"
 msgid "Manage other pages"
 msgstr "Andere Seiten verwalten"
 
-#: ../../include/nav.php:138 ../../boot.php:1159
+#: ../../include/nav.php:138 ../../boot.php:1167
 msgid "Profiles"
 msgstr "Profile"
 
-#: ../../include/nav.php:138 ../../boot.php:1159
+#: ../../include/nav.php:138 ../../boot.php:1167
 msgid "Manage/edit profiles"
 msgstr "Profile verwalten/editieren"
 
@@ -7827,7 +7859,7 @@ msgstr "Bild/Foto"
 msgid "$1 wrote:"
 msgstr "$1 hat geschrieben:"
 
-#: ../../include/bbcode.php:327
+#: ../../include/bbcode.php:327 ../../include/bbcode.php:328
 msgid "Encrypted content"
 msgstr "Verschlüsselter Inhalt"
 
@@ -7844,188 +7876,188 @@ msgstr "[kein Betreff]"
 msgid "Visible to everybody"
 msgstr "Für jeden sichtbar"
 
-#: ../../include/enotify.php:14
+#: ../../include/enotify.php:16
 msgid "Friendica Notification"
 msgstr "Friendica-Benachrichtigung"
 
-#: ../../include/enotify.php:17
+#: ../../include/enotify.php:19
 msgid "Thank You,"
 msgstr "Danke,"
 
-#: ../../include/enotify.php:19
+#: ../../include/enotify.php:21
 #, php-format
 msgid "%s Administrator"
 msgstr "der Administrator von %s"
 
-#: ../../include/enotify.php:38
+#: ../../include/enotify.php:40
 #, php-format
 msgid "%s <!item_type!>"
 msgstr "%s <!item_type!>"
 
-#: ../../include/enotify.php:42
+#: ../../include/enotify.php:44
 #, php-format
 msgid "[Friendica:Notify] New mail received at %s"
 msgstr "[Friendica Meldung] Neue Nachricht erhalten von %s"
 
-#: ../../include/enotify.php:44
+#: ../../include/enotify.php:46
 #, php-format
 msgid "%1$s sent you a new private message at %2$s."
 msgstr "%1$s hat dir eine neue private Nachricht auf %2$s geschickt."
 
-#: ../../include/enotify.php:45
+#: ../../include/enotify.php:47
 #, php-format
 msgid "%1$s sent you %2$s."
 msgstr "%1$s schickte dir %2$s."
 
-#: ../../include/enotify.php:45
+#: ../../include/enotify.php:47
 msgid "a private message"
 msgstr "eine private Nachricht"
 
-#: ../../include/enotify.php:46
+#: ../../include/enotify.php:48
 #, php-format
 msgid "Please visit %s to view and/or reply to your private messages."
 msgstr "Bitte besuche %s, um deine privaten Nachrichten anzusehen und/oder zu beantworten."
 
-#: ../../include/enotify.php:87
+#: ../../include/enotify.php:89
 #, php-format
 msgid "%1$s commented on [url=%2$s]a %3$s[/url]"
 msgstr "%1$s kommentierte [url=%2$s]a %3$s[/url]"
 
-#: ../../include/enotify.php:94
+#: ../../include/enotify.php:96
 #, php-format
 msgid "%1$s commented on [url=%2$s]%3$s's %4$s[/url]"
 msgstr "%1$s kommentierte [url=%2$s]%3$ss %4$s[/url]"
 
-#: ../../include/enotify.php:102
+#: ../../include/enotify.php:104
 #, php-format
 msgid "%1$s commented on [url=%2$s]your %3$s[/url]"
-msgstr "%1$s kommentierte [url=%2$s]deinen Beitrag %3$s[/url]"
+msgstr "%1$s kommentierte [url=%2$s]deinen %3$s[/url]"
 
-#: ../../include/enotify.php:112
+#: ../../include/enotify.php:114
 #, php-format
 msgid "[Friendica:Notify] Comment to conversation #%1$d by %2$s"
 msgstr "[Friendica Meldung] Kommentar zum Beitrag #%1$d von %2$s"
 
-#: ../../include/enotify.php:113
+#: ../../include/enotify.php:115
 #, php-format
 msgid "%s commented on an item/conversation you have been following."
 msgstr "%s hat einen Beitrag kommentiert, dem du folgst."
 
-#: ../../include/enotify.php:116 ../../include/enotify.php:131
-#: ../../include/enotify.php:144 ../../include/enotify.php:162
-#: ../../include/enotify.php:175
+#: ../../include/enotify.php:118 ../../include/enotify.php:133
+#: ../../include/enotify.php:146 ../../include/enotify.php:164
+#: ../../include/enotify.php:177
 #, 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:123
+#: ../../include/enotify.php:125
 #, php-format
 msgid "[Friendica:Notify] %s posted to your profile wall"
 msgstr "[Friendica Meldung] %s hat auf deine Pinnwand geschrieben"
 
-#: ../../include/enotify.php:125
+#: ../../include/enotify.php:127
 #, php-format
 msgid "%1$s posted to your profile wall at %2$s"
 msgstr "%1$s schrieb auf %2$s auf deine Pinnwand"
 
-#: ../../include/enotify.php:127
+#: ../../include/enotify.php:129
 #, php-format
 msgid "%1$s posted to [url=%2$s]your wall[/url]"
 msgstr "%1$s hat etwas auf [url=%2$s]deiner Pinnwand[/url] gepostet"
 
-#: ../../include/enotify.php:138
+#: ../../include/enotify.php:140
 #, php-format
 msgid "[Friendica:Notify] %s tagged you"
 msgstr "[Friendica Meldung] %s hat dich erwähnt"
 
-#: ../../include/enotify.php:139
+#: ../../include/enotify.php:141
 #, php-format
 msgid "%1$s tagged you at %2$s"
 msgstr "%1$s erwähnte dich auf %2$s"
 
-#: ../../include/enotify.php:140
+#: ../../include/enotify.php:142
 #, php-format
 msgid "%1$s [url=%2$s]tagged you[/url]."
 msgstr "%1$s [url=%2$s]erwähnte dich[/url]."
 
-#: ../../include/enotify.php:152
+#: ../../include/enotify.php:154
 #, php-format
 msgid "[Friendica:Notify] %1$s poked you"
 msgstr ""
 
-#: ../../include/enotify.php:153
+#: ../../include/enotify.php:155
 #, php-format
 msgid "%1$s poked you at %2$s"
 msgstr ""
 
-#: ../../include/enotify.php:154
+#: ../../include/enotify.php:156
 #, php-format
 msgid "%1$s [url=%2$s]poked you[/url]."
 msgstr ""
 
-#: ../../include/enotify.php:169
+#: ../../include/enotify.php:171
 #, php-format
 msgid "[Friendica:Notify] %s tagged your post"
 msgstr "[Friendica Meldung] %s markierte deinen Beitrag"
 
-#: ../../include/enotify.php:170
+#: ../../include/enotify.php:172
 #, php-format
 msgid "%1$s tagged your post at %2$s"
 msgstr "%1$s erwähnte deinen Beitrag auf %2$s"
 
-#: ../../include/enotify.php:171
+#: ../../include/enotify.php:173
 #, php-format
 msgid "%1$s tagged [url=%2$s]your post[/url]"
 msgstr "%1$s erwähnte [url=%2$s]Deinen Beitrag[/url]"
 
-#: ../../include/enotify.php:182
+#: ../../include/enotify.php:184
 msgid "[Friendica:Notify] Introduction received"
 msgstr "[Friendica Meldung] Kontaktanfrage erhalten"
 
-#: ../../include/enotify.php:183
+#: ../../include/enotify.php:185
 #, php-format
 msgid "You've received an introduction from '%1$s' at %2$s"
 msgstr "Du hast eine Kontaktanfrage von '%1$s' auf %2$s erhalten"
 
-#: ../../include/enotify.php:184
+#: ../../include/enotify.php:186
 #, php-format
 msgid "You've received [url=%1$s]an introduction[/url] from %2$s."
 msgstr "Du hast eine [url=%1$s]Kontaktanfrage[/url] von %2$s erhalten."
 
-#: ../../include/enotify.php:187 ../../include/enotify.php:205
+#: ../../include/enotify.php:189 ../../include/enotify.php:207
 #, php-format
 msgid "You may visit their profile at %s"
 msgstr "Hier kannst du das Profil betrachten: %s"
 
-#: ../../include/enotify.php:189
+#: ../../include/enotify.php:191
 #, php-format
 msgid "Please visit %s to approve or reject the introduction."
 msgstr "Bitte besuche %s, um die Kontaktanfrage anzunehmen oder abzulehnen."
 
-#: ../../include/enotify.php:196
+#: ../../include/enotify.php:198
 msgid "[Friendica:Notify] Friend suggestion received"
 msgstr "[Friendica Meldung] Kontaktvorschlag erhalten"
 
-#: ../../include/enotify.php:197
+#: ../../include/enotify.php:199
 #, php-format
 msgid "You've received a friend suggestion from '%1$s' at %2$s"
 msgstr "Du hast einen Freunde-Vorschlag von '%1$s' auf %2$s erhalten"
 
-#: ../../include/enotify.php:198
+#: ../../include/enotify.php:200
 #, php-format
 msgid ""
 "You've received [url=%1$s]a friend suggestion[/url] for %2$s from %3$s."
 msgstr "Du hast einen [url=%1$s]Freunde-Vorschlag[/url] %2$s von %3$s erhalten."
 
-#: ../../include/enotify.php:203
+#: ../../include/enotify.php:205
 msgid "Name:"
 msgstr "Name:"
 
-#: ../../include/enotify.php:204
+#: ../../include/enotify.php:206
 msgid "Photo:"
 msgstr "Foto:"
 
-#: ../../include/enotify.php:207
+#: ../../include/enotify.php:209
 #, php-format
 msgid "Please visit %s to approve or reject the suggestion."
 msgstr "Bitte besuche %s, um den Vorschlag zu akzeptieren oder abzulehnen."
@@ -8085,15 +8117,15 @@ msgstr "Konnte die Kontaktinformationen nicht empfangen."
 msgid "following"
 msgstr "folgen"
 
-#: ../../include/items.php:3214
+#: ../../include/items.php:3217
 msgid "A new person is sharing with you at "
 msgstr "Eine neue Person teilt mit dir auf "
 
-#: ../../include/items.php:3214
+#: ../../include/items.php:3217
 msgid "You have a new follower at "
 msgstr "Du hast einen neuen Kontakt auf "
 
-#: ../../include/items.php:3883
+#: ../../include/items.php:3886
 msgid "Archives"
 msgstr "Archiv"
 
@@ -8355,88 +8387,88 @@ msgstr "Diesen Beitrag löschen?"
 msgid "show fewer"
 msgstr "weniger anzeigen"
 
-#: ../../boot.php:787
+#: ../../boot.php:791
 #, php-format
 msgid "Update %s failed. See error logs."
 msgstr "Update %s fehlgeschlagen. Bitte Fehlerprotokoll überprüfen."
 
-#: ../../boot.php:789
+#: ../../boot.php:793
 #, php-format
 msgid "Update Error at %s"
 msgstr "Updatefehler bei %s"
 
-#: ../../boot.php:890
+#: ../../boot.php:894
 msgid "Create a New Account"
 msgstr "Neues Konto erstellen"
 
-#: ../../boot.php:914
+#: ../../boot.php:922
 msgid "Nickname or Email address: "
 msgstr "Spitzname oder E-Mail-Adresse: "
 
-#: ../../boot.php:915
+#: ../../boot.php:923
 msgid "Password: "
 msgstr "Passwort: "
 
-#: ../../boot.php:918
+#: ../../boot.php:926
 msgid "Or login using OpenID: "
 msgstr "Oder melde dich mit deiner OpenID an: "
 
-#: ../../boot.php:924
+#: ../../boot.php:932
 msgid "Forgot your password?"
 msgstr "Passwort vergessen?"
 
-#: ../../boot.php:1091
+#: ../../boot.php:1099
 msgid "Edit profile"
 msgstr "Profil bearbeiten"
 
-#: ../../boot.php:1151
+#: ../../boot.php:1159
 msgid "Message"
 msgstr "Nachricht"
 
-#: ../../boot.php:1273 ../../boot.php:1359
+#: ../../boot.php:1281 ../../boot.php:1367
 msgid "g A l F d"
 msgstr "l, d. F G \\U\\h\\r"
 
-#: ../../boot.php:1274 ../../boot.php:1360
+#: ../../boot.php:1282 ../../boot.php:1368
 msgid "F d"
 msgstr "d. F"
 
-#: ../../boot.php:1319 ../../boot.php:1400
+#: ../../boot.php:1327 ../../boot.php:1408
 msgid "[today]"
 msgstr "[heute]"
 
-#: ../../boot.php:1331
+#: ../../boot.php:1339
 msgid "Birthday Reminders"
 msgstr "Geburtstagserinnerungen"
 
-#: ../../boot.php:1332
+#: ../../boot.php:1340
 msgid "Birthdays this week:"
 msgstr "Geburtstage diese Woche:"
 
-#: ../../boot.php:1393
+#: ../../boot.php:1401
 msgid "[No description]"
 msgstr "[keine Beschreibung]"
 
-#: ../../boot.php:1411
+#: ../../boot.php:1419
 msgid "Event Reminders"
 msgstr "Veranstaltungserinnerungen"
 
-#: ../../boot.php:1412
+#: ../../boot.php:1420
 msgid "Events this week:"
 msgstr "Veranstaltungen diese Woche"
 
-#: ../../boot.php:1626
+#: ../../boot.php:1634
 msgid "Status Messages and Posts"
 msgstr "Statusnachrichten und Beiträge"
 
-#: ../../boot.php:1633
+#: ../../boot.php:1641
 msgid "Profile Details"
 msgstr "Profildetails"
 
-#: ../../boot.php:1650
+#: ../../boot.php:1658
 msgid "Events and Calendar"
 msgstr "Ereignisse und Kalender"
 
-#: ../../boot.php:1657
+#: ../../boot.php:1665
 msgid "Only You Can See This"
 msgstr "Nur du kannst das sehen"
diff --git a/view/de/strings.php b/view/de/strings.php
index e0194dd130..42d0985f16 100644
--- a/view/de/strings.php
+++ b/view/de/strings.php
@@ -602,7 +602,7 @@ $a->strings["Your message:"] = "Deine Nachricht:";
 $a->strings["Welcome to Friendica"] = "Willkommen bei Friendica";
 $a->strings["New Member Checklist"] = "Checkliste für neue Mitglieder";
 $a->strings["We would like to offer some tips and links to help make your experience enjoyable. Click any item to visit the relevant page. A link to this page will be visible from your home page for two weeks after your initial registration and then will quietly disappear."] = "Wir möchten dir einige Tipps und Links anbieten, die dir helfen könnten, den Einstieg angenehmer zu machen. Klicke auf ein Element, um die entsprechende Seite zu besuchen. Ein Link zu dieser Seite hier bleibt für dich an Deiner Pinnwand für zwei Wochen nach dem Registrierungsdatum sichtbar und wird dann verschwinden.";
-$a->strings["On your <em>Quick Start</em> page - find a brief introduction to your profile and network tabs, connect to Facebook, make some new connections, and find some groups to join."] = "Auf der <em>Quick Start</em> Seite findest du eine kurze Einleitung in die einzelnen Funktionen deines Profils und die Netzwerk-Reiter, wo du interessante Foren findest, wie du alte Freunde von Facebook wieder findest und neue Kontakte knüpfst.";
+$a->strings["On your <em>Quick Start</em> page - find a brief introduction to your profile and network tabs, make some new connections, and find some groups to join."] = "Auf der <em>Quick Start</em> Seite findest du eine kurze Einleitung in die einzelnen Funktionen deines Profils und die Netzwerk-Reiter, wo du interessante Foren findest und neue Kontakte knüpfst.";
 $a->strings["On your <em>Settings</em> page -  change your initial password. Also make a note of your Identity Address. This looks just like an email address - and will be useful in making friends on the free social web."] = "Ändere bitte unter <em>Einstellungen</em> dein Passwort. Außerdem merke dir deine Identifikationsadresse. Diese sieht aus wie eine E-Mail-Adresse und wird benötigt, um Freundschaften mit anderen im Friendica Netzwerk zu schliessen.";
 $a->strings["Review the other settings, particularly the privacy settings. An unpublished directory listing is like having an unlisted phone number. In general, you should probably publish your listing - unless all of your friends and potential friends know exactly how to find you."] = "Überprüfe die restlichen Einstellungen, insbesondere die Einstellungen zur Privatsphäre. Wenn du dein Profil nicht veröffentlichst, ist das als wenn du deine Telefonnummer nicht ins Telefonbuch einträgst. Im Allgemeinen solltest du es veröffentlichen - außer all deine Freunde und potentiellen Freunde wissen genau, wie sie dich finden können.";
 $a->strings["Upload a profile photo if you have not done so already. Studies have shown that people with real photos of themselves are ten times more likely to make friends than people who do not."] = "Lade ein Profilbild hoch falls du es noch nicht getan hast. Studien haben gezeigt, dass es zehnmal wahrscheinlicher ist neue Freunde zu finden, wenn du ein Bild von dir selbst verwendest, als wenn du dies nicht tust.";
@@ -727,7 +727,7 @@ $a->strings["Normal Account"] = "Normales Konto";
 $a->strings["Soapbox Account"] = "Marktschreier-Konto";
 $a->strings["Community/Celebrity Account"] = "Forum/Promi-Konto";
 $a->strings["Automatic Friend Account"] = "Automatisches Freundekonto";
-$a->strings["Blog Account"] = "";
+$a->strings["Blog Account"] = "Blog Account";
 $a->strings["Private Forum"] = "Privates Forum";
 $a->strings["Message queues"] = "Nachrichten-Warteschlangen";
 $a->strings["Administration"] = "Administration";
@@ -737,6 +737,7 @@ $a->strings["Pending registrations"] = "Anstehende Anmeldungen";
 $a->strings["Version"] = "Version";
 $a->strings["Active plugins"] = "Aktive Plugins";
 $a->strings["Site settings updated."] = "Seiteneinstellungen aktualisiert.";
+$a->strings["Don't apply a special theme for mobile devices."] = "Kein spezielles Theme für mobile Geräte verwenden.";
 $a->strings["Closed"] = "Geschlossen";
 $a->strings["Requires approval"] = "Bedarf der Zustimmung";
 $a->strings["Open"] = "Offen";
@@ -751,6 +752,8 @@ $a->strings["Banner/Logo"] = "Banner/Logo";
 $a->strings["System language"] = "Systemsprache";
 $a->strings["System theme"] = "Systemweites Thema";
 $a->strings["Default system theme - may be over-ridden by user profiles - <a href='#' id='cnftheme'>change theme settings</a>"] = "Vorgabe für das System-Theme - kann von Benutzerprofilen überschrieben werden - <a href='#' id='cnftheme'>Theme-Einstellungen ändern</a>";
+$a->strings["Mobile system theme"] = "Systemweites mobiles Thema";
+$a->strings["Theme for mobile devices"] = "Thema für mobile Geräte";
 $a->strings["SSL link policy"] = "Regeln für SSL Links";
 $a->strings["Determines whether generated links should be forced to use SSL"] = "Bestimmt, ob generierte Links SSL verwenden müssen";
 $a->strings["Maximum image size"] = "Maximale Größe von Bildern";
@@ -770,8 +773,8 @@ $a->strings["Force publish"] = "Erzwinge Veröffentlichung";
 $a->strings["Check to force all profiles on this site to be listed in the site directory."] = "Klicken, um Anzeige aller Profile dieses Servers im Verzeichnis zu erzwingen.";
 $a->strings["Global directory update URL"] = "URL für Updates beim weltweiten Verzeichnis";
 $a->strings["URL to update the global directory. If this is not set, the global directory is completely unavailable to the application."] = "URL für Update des globalen Verzeichnisses. Wenn nichts eingetragen ist, bleibt das globale Verzeichnis unerreichbar.";
-$a->strings["Allow threaded items"] = "";
-$a->strings["Allow infinite level threading for items on this site."] = "";
+$a->strings["Allow threaded items"] = "Erlaube Threads in Diskussionen";
+$a->strings["Allow infinite level threading for items on this site."] = "Erlaube ein unendliches Level für Threads auf dieser Seite.";
 $a->strings["Block multiple registrations"] = "Unterbinde Mehrfachregistrierung";
 $a->strings["Disallow users to register additional accounts for use as pages."] = "Benutzern nicht erlauben, weitere Konten als zusätzliche Profile anzulegen.";
 $a->strings["OpenID support"] = "OpenID Unterstützung";
@@ -1169,29 +1172,28 @@ $a->strings["Most active users"] = "Aktivste Nutzer";
 $a->strings["Latest photos"] = "Neueste Fotos";
 $a->strings["Latest likes"] = "Neueste Favoriten";
 $a->strings["event"] = "Veranstaltung";
-$a->strings["Friendicy-Native events"] = "";
 $a->strings["No access"] = "Kein Zugriff";
 $a->strings["Could not open component for editing"] = "";
 $a->strings["Go back to the calendar"] = "Zurück zum Kalender";
-$a->strings["Event data"] = "";
+$a->strings["Event data"] = "Veranstaltungsdetails";
 $a->strings["Calendar"] = "Kalender";
-$a->strings["Special color"] = "";
-$a->strings["Subject"] = "";
+$a->strings["Special color"] = "Spezielle Farbe";
+$a->strings["Subject"] = "Betreff:";
 $a->strings["Starts"] = "Beginnt";
 $a->strings["Ends"] = "Endet";
 $a->strings["Description"] = "Beschreibung";
-$a->strings["Recurrence"] = "";
-$a->strings["Frequency"] = "";
+$a->strings["Recurrence"] = "Wiederholungen:";
+$a->strings["Frequency"] = "Frequenz";
 $a->strings["Daily"] = "Täglich";
 $a->strings["Weekly"] = "Wöchentlich";
 $a->strings["Monthly"] = "Monatlich";
-$a->strings["Yearly"] = "";
+$a->strings["Yearly"] = "Jährlich";
 $a->strings["days"] = "Tage";
 $a->strings["weeks"] = "Wochen";
 $a->strings["months"] = "Monate";
 $a->strings["years"] = "Jahre";
-$a->strings["Interval"] = "";
-$a->strings["All %select% %time%"] = "";
+$a->strings["Interval"] = "Intervall";
+$a->strings["All %select% %time%"] = "Jeden %select% %time%";
 $a->strings["Days"] = "Tage";
 $a->strings["Sunday"] = "Sonntag";
 $a->strings["Monday"] = "Montag";
@@ -1202,44 +1204,46 @@ $a->strings["Friday"] = "Freitag";
 $a->strings["Saturday"] = "Samstag";
 $a->strings["First day of week:"] = "Erster Tag der Woche";
 $a->strings["Day of month"] = "Tag des Monats";
-$a->strings["#num#th of each month"] = "";
-$a->strings["#num#th-last of each month"] = "";
+$a->strings["#num#th of each month"] = "#num#ten jedes Monats";
+$a->strings["#num#th-last of each month"] = "letzten #num#ten jedes Monats";
 $a->strings["#num#th #wkday# of each month"] = "";
 $a->strings["#num#th-last #wkday# of each month"] = "";
 $a->strings["Month"] = "Monat";
-$a->strings["#num#th of the given month"] = "";
-$a->strings["#num#th-last of the given month"] = "";
+$a->strings["#num#th of the given month"] = "#num#ten des Monats";
+$a->strings["#num#th-last of the given month"] = "letzten #num#ten des Monats";
 $a->strings["#num#th #wkday# of the given month"] = "";
 $a->strings["#num#th-last #wkday# of the given month"] = "";
-$a->strings["Repeat until"] = "";
-$a->strings["Infinite"] = "";
-$a->strings["Until the following date"] = "";
-$a->strings["Number of times"] = "";
-$a->strings["Exceptions"] = "";
-$a->strings["none"] = "";
+$a->strings["Repeat until"] = "Wiederholungen";
+$a->strings["Infinite"] = "unendlich";
+$a->strings["Until the following date"] = "bis zum folgenden Datum";
+$a->strings["Number of times"] = "Bestimmte Anzahl von Wiederholungen";
+$a->strings["Exceptions"] = "Ausnahmen";
+$a->strings["none"] = "keine";
 $a->strings["Notification"] = "Benachrichtigung";
-$a->strings["Notify by"] = "";
-$a->strings["E-Mail"] = "";
-$a->strings["On Friendica / Display"] = "";
-$a->strings["Time"] = "";
+$a->strings["Notify by"] = "Benarchrichtigungsmethode";
+$a->strings["E-Mail"] = "E-Mail";
+$a->strings["On Friendica / Display"] = "Bei Friendica / Anzeige";
+$a->strings["Time"] = "Zeit";
 $a->strings["Hours"] = "Stunden";
 $a->strings["Minutes"] = "Minuten";
-$a->strings["Seconds"] = "";
-$a->strings["Weeks"] = "";
-$a->strings["before the"] = "";
-$a->strings["start of the event"] = "";
-$a->strings["end of the event"] = "";
-$a->strings["Add a notification"] = "";
-$a->strings["The event #name# will start at #date"] = "";
-$a->strings["#name# is about to begin."] = "";
-$a->strings["Saved"] = "";
+$a->strings["Seconds"] = "Sekunden";
+$a->strings["Weeks"] = "Wochen";
+$a->strings["before the"] = "vor dem";
+$a->strings["start of the event"] = "Beginn des Termins";
+$a->strings["end of the event"] = "Ende des Termins";
+$a->strings["Add a notification"] = "Benachrichtigung hinzufügen";
+$a->strings["The event #name# will start at #date"] = "Der Termin #name# wird am #date anfangen";
+$a->strings["#name# is about to begin."] = "#name# beginnt demnächst.";
+$a->strings["Saved"] = "Gespeichert";
 $a->strings["U.S. Time Format (mm/dd/YYYY)"] = "U.S. Datumsformat (mm/dd/YYYY)";
 $a->strings["German Time Format (dd.mm.YYYY)"] = "Deutsches Datumsformat (dd.mm.YYYY)";
-$a->strings["Private Events"] = "";
+$a->strings["Private Events"] = "Privater Termin";
+$a->strings["Private Addressbooks"] = "Private Adressbücher";
+$a->strings["Friendica-Native events"] = "Friendica Veranstaltungen";
 $a->strings["Friendica-Contacts"] = "Friendica-Kontakte";
 $a->strings["Your Friendica-Contacts"] = "Deine Friendica-Kontakte";
-$a->strings["Something went wrong when trying to import the file. Sorry. Maybe some events were imported anyway."] = "";
-$a->strings["Something went wrong when trying to import the file. Sorry."] = "";
+$a->strings["Something went wrong when trying to import the file. Sorry. Maybe some events were imported anyway."] = "Entschuldigung. Bei dem Versuch die Datei zu importieren ist etwas schief gelaufen. Vielleicht wurden aber einige der Termine dennoch importiert.";
+$a->strings["Something went wrong when trying to import the file. Sorry."] = "Entschuldigung. Beim Importieren der Datei ist etwas schief gelaufen.";
 $a->strings["The ICS-File has been imported."] = "Die ICS-Datei wurde importoert.";
 $a->strings["No file was uploaded."] = "Es wurde keine Datei geladen.";
 $a->strings["Import a ICS-file"] = "Importiere eine ICS-Datei";
@@ -1289,6 +1293,8 @@ $a->strings["Show SQL-statements"] = "SQL-Anweisungen anzeigen";
 $a->strings["Private Calendar"] = "Privater Kalender";
 $a->strings["Friendica Events: Mine"] = "Meine Friendica-Veranstaltungen";
 $a->strings["Friendica Events: Contacts"] = "Friendica Veranstaltungen meiner Kontakte";
+$a->strings["Private Addresses"] = "Private Adressen";
+$a->strings["Friendica Contacts"] = "Friendica Kontakte";
 $a->strings["Allow to use your friendica id (%s) to connecto to external unhosted-enabled storage (like ownCloud). See <a href=\"http://www.w3.org/community/unhosted/wiki/RemoteStorage#WebFinger\">RemoteStorage WebFinger</a>"] = "Ermöglicht dir, deine Friendica ID (%s) mit externen unhosted-fähigen Speichern (z.B. ownCloud) zu verbinden. Siehe <a href=\"http://www.w3.org/community/unhosted/wiki/RemoteStorage#WebFinger\">RemoteStorage WebFinger</a>";
 $a->strings["Template URL (with {category})"] = "Vorlagen URL (mit {Kategorie})";
 $a->strings["OAuth end-point"] = "OAuth Endpunkt";
@@ -1802,7 +1808,7 @@ $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 deine privaten Nachrichten anzusehen und/oder zu beantworten.";
 $a->strings["%1\$s commented on [url=%2\$s]a %3\$s[/url]"] = "%1\$s kommentierte [url=%2\$s]a %3\$s[/url]";
 $a->strings["%1\$s commented on [url=%2\$s]%3\$s's %4\$s[/url]"] = "%1\$s kommentierte [url=%2\$s]%3\$ss %4\$s[/url]";
-$a->strings["%1\$s commented on [url=%2\$s]your %3\$s[/url]"] = "%1\$s kommentierte [url=%2\$s]deinen Beitrag %3\$s[/url]";
+$a->strings["%1\$s commented on [url=%2\$s]your %3\$s[/url]"] = "%1\$s kommentierte [url=%2\$s]deinen %3\$s[/url]";
 $a->strings["[Friendica:Notify] Comment to conversation #%1\$d by %2\$s"] = "[Friendica Meldung] Kommentar zum Beitrag #%1\$d von %2\$s";
 $a->strings["%s commented on an item/conversation you have been following."] = "%s hat einen Beitrag 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.";
diff --git a/view/mood_content.tpl b/view/mood_content.tpl
new file mode 100644
index 0000000000..9349c56aef
--- /dev/null
+++ b/view/mood_content.tpl
@@ -0,0 +1,20 @@
+<h3>$title</h3>
+
+<div id="mood-desc">$desc</div>
+
+<form action="mood" method="get">
+<br />
+<br />
+
+<input id="mood-parent" type="hidden" value="$parent" name="parent" />
+
+<select name="verb" id="mood-verb-select" >
+{{ for $verbs as $v }}
+<option value="$v.0">$v.1</option>
+{{ endfor }}
+</select>
+<br />
+<br />
+<input type="submit" name="submit" value="$submit" />
+</form>
+
diff --git a/view/search_item.tpl b/view/search_item.tpl
index f67bf0a254..8d8a0dbd4d 100644
--- a/view/search_item.tpl
+++ b/view/search_item.tpl
@@ -23,7 +23,7 @@
 		</div>
 		<div class="wall-item-author">
 				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle" id="wall-item-name-$item.id" >$item.name</span></a>
-				<div class="wall-item-ago"  id="wall-item-ago-$item.id">$item.ago</div>
+				<div class="wall-item-ago"  id="wall-item-ago-$item.id" title="$item.localtime">$item.ago</div>
 				
 		</div>			
 		<div class="wall-item-content" id="wall-item-content-$item.id" >
diff --git a/view/theme/duepuntozero/comment_item.tpl b/view/theme/duepuntozero/comment_item.tpl
index 63c05f335c..f64ae753b6 100755
--- a/view/theme/duepuntozero/comment_item.tpl
+++ b/view/theme/duepuntozero/comment_item.tpl
@@ -1,6 +1,10 @@
 		<div class="comment-wwedit-wrapper" id="comment-edit-wrapper-$id" style="display: block;">
+			{{ if $threaded }}
 			<span id="hide-commentbox-$id" class="hide-commentbox fakelink" onclick="showHideCommentBox($id);">$comment</span>
 			<form class="comment-edit-form" style="display: none;" id="comment-edit-form-$id" action="item" method="post" onsubmit="post_comment($id); return false;">
+			{{ else }}
+			<form class="comment-edit-form" style="display: block;" id="comment-edit-form-$id" action="item" method="post" onsubmit="post_comment($id); return false;">
+			{{ endif }}
 				<input type="hidden" name="type" value="$type" />
 				<input type="hidden" name="profile_uid" value="$profile_uid" />
 				<input type="hidden" name="parent" value="$parent" />
diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css
index 8a09792f48..5207cedf0d 100644
--- a/view/theme/duepuntozero/style.css
+++ b/view/theme/duepuntozero/style.css
@@ -938,6 +938,9 @@ input#dfrn-url {
 .tread-wrapper .tread-wrapper {
 	margin-left: 50px;
 }
+.tread-wrapper .wall-item-comment-wrapper {
+	margin-left: 50px;
+}
 
 .tread-end-wrapper {
 	margin-left: 50px;
diff --git a/view/theme/quattro/mail_conv.tpl b/view/theme/quattro/mail_conv.tpl
index 989f178781..f6df947d81 100644
--- a/view/theme/quattro/mail_conv.tpl
+++ b/view/theme/quattro/mail_conv.tpl
@@ -22,7 +22,10 @@
 		</div>
 		<div class="wall-item-actions">
 			<div class="wall-item-actions-author">
-				<a href="$mail.from_url" target="redir" class="wall-item-name-link"><span class="wall-item-name$mail.sparkle">$mail.from_name</span></a> <span class="wall-item-ago">$mail.date</span>
+				<a href="$mail.from_url" target="redir"
+                                class="wall-item-name-link"><span
+                                class="wall-item-name$mail.sparkle">$mail.from_name</span></a>
+                                <span class="wall-item-ago" title="$item.ago">$mail.date</span>
 			</div>
 			
 			<div class="wall-item-actions-social">
diff --git a/view/theme/quattro/profile_vcard.tpl b/view/theme/quattro/profile_vcard.tpl
index 7cd02f1648..cbb7dcc745 100644
--- a/view/theme/quattro/profile_vcard.tpl
+++ b/view/theme/quattro/profile_vcard.tpl
@@ -45,7 +45,9 @@
 
 	{{ if $marital }}<dl class="marital"><dt class="marital-label"><span class="heart">&hearts;</span>$marital</dt><dd class="marital-text">$profile.marital</dd></dl>{{ endif }}
 
-	{{ if $homepage }}<dl class="homepage"><dt class="homepage-label">$homepage</dt><dd class="homepage-url"><a href="$profile.homepage" target="external-link">$profile.homepage</a></dd></dl>{{ endif }}
+	{{ if $homepage }}<dl class="homepage"><dt
+        class="homepage-label">$homepage</dt><dd class="homepage-url"><a
+        href="$profile.homepage" target="external-link">$profile.homepage</a></dd></dl>{{ endif }}
 
 	{{ inc diaspora_vcard.tpl }}{{ endinc }}
 	
diff --git a/view/theme/quattro/search_item.tpl b/view/theme/quattro/search_item.tpl
index 80d6678fb3..e207484dc8 100644
--- a/view/theme/quattro/search_item.tpl
+++ b/view/theme/quattro/search_item.tpl
@@ -42,7 +42,7 @@
 		</div>
 		<div class="wall-item-actions">
 			<div class="wall-item-actions-author">
-				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle">$item.name</span></a> <span class="wall-item-ago">$item.ago</span>
+				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle">$item.name</span></a> <span class="wall-item-ago" title="$item.localtime">$item.ago</span>
 			</div>
 			
 			<div class="wall-item-actions-social">
diff --git a/view/theme/quattro/wall_item.tpl b/view/theme/quattro/wall_item.tpl
index 411879def3..731c2d2bfc 100644
--- a/view/theme/quattro/wall_item.tpl
+++ b/view/theme/quattro/wall_item.tpl
@@ -42,7 +42,11 @@
 		</div>
 		<div class="wall-item-actions">
 			<div class="wall-item-actions-author">
-				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle">$item.name</span></a> <span class="wall-item-ago">$item.ago</span>
+				<a href="$item.profile_url" target="redir"
+                                title="$item.linktitle"
+                                class="wall-item-name-link"><span
+                                class="wall-item-name$item.sparkle">$item.name</span></a>
+                                <span class="wall-item-ago" title="$item.localtime">$item.ago</span>
 			</div>
 			
 			<div class="wall-item-actions-social">
diff --git a/view/theme/quattro/wall_thread.tpl b/view/theme/quattro/wall_thread.tpl
index 01738b666b..757f175468 100644
--- a/view/theme/quattro/wall_thread.tpl
+++ b/view/theme/quattro/wall_thread.tpl
@@ -64,7 +64,7 @@
 		</div>
 		<div class="wall-item-actions">
 			<div class="wall-item-actions-author">
-				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle">$item.name</span></a> <span class="wall-item-ago">$item.ago</span>
+				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle">$item.name</span></a> <span class="wall-item-ago" title="$item.localtime">$item.ago</span>
 			</div>
 			
 			<div class="wall-item-actions-social">
diff --git a/view/theme/quattro/wallwall_item.tpl b/view/theme/quattro/wallwall_item.tpl
index 2e3cf821fb..e26b186360 100644
--- a/view/theme/quattro/wallwall_item.tpl
+++ b/view/theme/quattro/wallwall_item.tpl
@@ -46,7 +46,7 @@
 		</div>
 		<div class="wall-item-actions">
 			<div class="wall-item-actions-author">
-				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle">$item.name</span></a> <span class="wall-item-ago">$item.ago</span>
+				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle">$item.name</span></a> <span class="wall-item-ago" title="$item.localtime">$item.ago</span>
 				 <br/>$item.to <a href="$item.owner_url" target="redir" title="$item.olinktitle" class="wall-item-name-link"><span class="wall-item-name$item.osparkle" id="wall-item-ownername-$item.id">$item.owner_name</span></a> $item.vwall
 				 
 			</div>
diff --git a/view/theme/quattro/wallwall_thread.tpl b/view/theme/quattro/wallwall_thread.tpl
index 93a8838ebd..4589390089 100644
--- a/view/theme/quattro/wallwall_thread.tpl
+++ b/view/theme/quattro/wallwall_thread.tpl
@@ -69,7 +69,11 @@
 		</div>
 		<div class="wall-item-actions">
 			<div class="wall-item-actions-author">
-				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle">$item.name</span></a> <span class="wall-item-ago">$item.ago</span>
+				<a href="$item.profile_url" target="redir"
+                                title="$item.linktitle"
+                                class="wall-item-name-link"><span
+                                class="wall-item-name$item.sparkle">$item.name</span></a>
+                                <span class="wall-item-ago" title="$item.localtime">$item.ago</span>
 				 <br/>$item.to <a href="$item.owner_url" target="redir" title="$item.olinktitle" class="wall-item-name-link"><span class="wall-item-name$item.osparkle" id="wall-item-ownername-$item.id">$item.owner_name</span></a> $item.vwall
 				 
 			</div>
diff --git a/view/wall_item.tpl b/view/wall_item.tpl
index e278294315..e4eabb9e5c 100644
--- a/view/wall_item.tpl
+++ b/view/wall_item.tpl
@@ -24,7 +24,7 @@
 		</div>
 		<div class="wall-item-author">
 				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle" id="wall-item-name-$item.id" >$item.name</span></a>
-				<div class="wall-item-ago" id="wall-item-ago-$item.id" >$item.ago</div>
+				<div class="wall-item-ago" id="wall-item-ago-$item.id" title="$item.localtime">$item.ago</div>
 				
 		</div>	
 		<div class="wall-item-content" id="wall-item-content-$item.id" >
diff --git a/view/wall_thread.tpl b/view/wall_thread.tpl
index db7321466e..f64f2e44a0 100644
--- a/view/wall_thread.tpl
+++ b/view/wall_thread.tpl
@@ -31,7 +31,7 @@
 		</div>
 		<div class="wall-item-author">
 				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle" id="wall-item-name-$item.id" >$item.name</span></a>
-				<div class="wall-item-ago" id="wall-item-ago-$item.id" >$item.ago</div>
+				<div class="wall-item-ago" id="wall-item-ago-$item.id" title="$item.localtime">$item.ago</div>
 				
 		</div>	
 		<div class="wall-item-content" id="wall-item-content-$item.id" >
diff --git a/view/wallwall_item.tpl b/view/wallwall_item.tpl
index d7df45cfae..e8044532a3 100644
--- a/view/wallwall_item.tpl
+++ b/view/wallwall_item.tpl
@@ -29,7 +29,7 @@
 		</div>
 		<div class="wall-item-author">
 				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle" id="wall-item-name-$item.id" >$item.name</span></a> $item.to <a href="$item.owner_url" target="redir" title="$item.olinktitle" class="wall-item-name-link"><span class="wall-item-name$item.osparkle" id="wall-item-ownername-$item.id">$item.owner_name</span></a> $item.vwall<br />
-				<div class="wall-item-ago"  id="wall-item-ago-$item.id">$item.ago</div>				
+				<div class="wall-item-ago" id="wall-item-ago-$item.id" title="$item.localtime">$item.ago</div>
 		</div>			
 		<div class="wall-item-content" id="wall-item-content-$item.id" >
 			<div class="wall-item-title" id="wall-item-title-$item.id">$item.title</div>
diff --git a/view/wallwall_thread.tpl b/view/wallwall_thread.tpl
index 15c016c16c..68bb3bc9d5 100644
--- a/view/wallwall_thread.tpl
+++ b/view/wallwall_thread.tpl
@@ -36,7 +36,7 @@
 		</div>
 		<div class="wall-item-author">
 				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle" id="wall-item-name-$item.id" >$item.name</span></a> $item.to <a href="$item.owner_url" target="redir" title="$item.olinktitle" class="wall-item-name-link"><span class="wall-item-name$item.osparkle" id="wall-item-ownername-$item.id">$item.owner_name</span></a> $item.vwall<br />
-				<div class="wall-item-ago"  id="wall-item-ago-$item.id">$item.ago</div>				
+				<div class="wall-item-ago"  id="wall-item-ago-$item.id" title="$item.localtime">$item.ago</div>				
 		</div>			
 		<div class="wall-item-content" id="wall-item-content-$item.id" >
 			<div class="wall-item-title" id="wall-item-title-$item.id">$item.title</div>